diff --git a/.gitignore b/.gitignore
index b07af7464..b1e97de56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,21 @@ fix_qt6_gui_deps.py
 fix_rti_conditionals.py
 fix_target_checks.py
 build
+__pycache__/
+add_logger_bootstrap_include.py
+aqtinstall.log
+ces_fix.py
+ces_pass2.py
+fix_additem_enum.py
+fix_broken_includes.py
+fix_enum_as_int.py
+fix_enums.py
+fix_logger_init.py
+fix_logger_remnant.py
+fix_members.py
+fix_mlogger.py
+fix_pdm_combo.py
+fix_sco.py
+restore_underlying.py
+../../restore_ppm_dtc.py
+*.py
diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
index 002ecd75e..a9042d043 100755
--- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
@@ -82,6 +82,9 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 # (The qt5 legacy has no include/ tree; Lts/ is the real include root.)
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
 include_directories(${CMAKE_SOURCE_DIR}/include)
+# Legacy also used source-root-relative includes (<Lts/Services/<Svc>/logger.h>, ...);
+# the source root must be an include root so those resolve.
+include_directories(${CMAKE_SOURCE_DIR})
 # Include directory for generated export headers
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
@@ -89,10 +92,28 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology)
+# <Symbology/...> headers (symbol_dictionary.h, sidc_codec.h, ...) are consumed tree-wide
+# (e.g. AdvancedSymbology/asb_data_plugin_interface.h is pulled into PpmCommon), so the
+# parent dir must be a global root too, not only on the AdvancedSymbology target.
+include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap)
+# Generated SymbologyGui/advancedsymbologygui_export.h lives in the build dir; the source
+# SituationMap root above only covers the source Symbology headers.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Services)
+# Consumers include generated DDS service headers by service-prefixed name
+# (<ParticipantManagement/ppm.hpp>, <GuezNasat/gna_dtc.h>, ...). Those headers
+# live in the per-service BUILD dirs, so the binary Lts/Services ROOT must be
+# visible tree-wide (the per-service build dirs below only satisfy the bare
+# <ppm.hpp> form). Placed right after the source Lts/Services so a header
+# present in both still resolves to the source (binary only supplies the
+# generated headers). This mirrors the legacy <Services/...> form.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Services)
+# Generated DDS headers for Proxies (GuezNasat/gna_dtc.h, ...) live under the binary
+# Lts/Proxies dir; consumers include them by proxy-prefixed name (<GuezNasat/gna_dtc.h>).
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies)
 include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
@@ -120,6 +141,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
 # is added (same shape as FileManagement above, which has no stub tree either).
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
+# GuezNasat's generated export header (svcgnacommon_export.h) lives in the build dir;
+# logger.h includes it by bare name, so the build dir must be visible tree-wide.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies/GuezNasat)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
 # Generated DDS headers (BUILD_RTI=ON)
@@ -137,6 +161,9 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
 # directory holding the generated header has to be visible tree-wide. The directory contains
 # only that generated header, so appending it cannot shadow an existing include.
 include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings)
+# LtsUtilsGui ConnectDialog's generated ltsutilsguiconnectdialog_export.h is included by bare
+# name from connect_dialog.h / connect_dialog_nt.h; same tree-wide visibility as the dirs above.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog)
 # DDSConnector's generated ddsconnector_export.h is included by bare name from
 # dds_connector.h and pub_sub_base.h, and reaches targets (the AES ModuleTests) that include
 # DDSConnector headers without linking ddsconnector. Same shape as LtsUtilsSettings above: the
@@ -192,6 +219,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Lts)
 IF(BUILD_RTI)
   # Define BUILD_RTI as preprocessor macro for all targets
   ADD_COMPILE_DEFINITIONS(BUILD_RTI)
+  # External (RTI) DDS is available: compile the BUILD_WITH_EXTERNAL_DDS code paths
+  # (used by 73 guards across plugins, e.g. MrkCommon's MarkerManagementDialogModel /
+  # CustomViewMarker). Legacy always compiled this DDS code; the flag is a migration
+  # option that was never wired into CMake, so its absence silently dropped the
+  # definitions while the unguarded class declarations still referenced them (link error).
+  ADD_COMPILE_DEFINITIONS(BUILD_WITH_EXTERNAL_DDS)
 ENDIF()
 OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" ON)
 OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disabled for migration)" OFF)
@@ -232,6 +265,11 @@ ELSE()
     IF(EXISTS "${ARCGIS_SDK_DIR}")
       LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
       MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
+      # arcgisversion.h (a custom RME file in the SDK include dir) is pulled in via
+      # <SituationMap/Map/layer_factory.h> by many non-ArcGIS plugin targets (e.g.
+      # IsmResGuiPlugin); the ArcGIS::ArcGIS target include dir does not reach them, so
+      # expose the SDK include dir tree-wide when the SDK is present.
+      include_directories(${ARCGIS_SDK_DIR}/include)
     ELSE()
       MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
     ENDIF()
@@ -327,6 +365,14 @@ if(NOT TARGET Qt6::Core)
   find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
 endif()
 
+# Qt State Machine (QState/QStateMachine) was moved out of QtGui in Qt6 into the
+# separate "Qt State Machine" add-on (the qtscxml package). In Qt5 the state
+# machine classes lived inside QtGui/QtCore, so the ExerciseManagement state
+# machines (exercise_state_base/exercise_state_machine) compiled without an
+# explicit StateMachine dependency. Probe for the module now; if present the
+# affected targets link Qt6::StateMachine (guarded per-target below).
+find_package(Qt6 6.2 COMPONENTS StateMachine QUIET)
+
 # Create imported targets for all available Qt6 libraries
 # Use Qt6 installation path from find_package or fall back to system paths
 if(Qt6Core_DIR)
@@ -397,6 +443,30 @@ if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6")
   message(STATUS "Manually configured Qt6 Widgets target")
 endif()
 
+# Qt6::OpenGL - create manual target if not found (QOpenGLPaintDevice, used by ArcGIS SDK)
+if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
+  add_library(Qt6::OpenGL SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtGui;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core"
+  )
+  message(STATUS "Manually configured Qt6 OpenGL target")
+endif()
+
+# Qt6::OpenGLWidgets - create manual target if not found
+# (QOpenGLWidget, used by the ArcGIS SDK MapGraphicsView/SceneGraphicsView objects;
+#  Qt6 splits QOpenGLWidget into its own libQt6OpenGLWidgets.so)
+if(NOT TARGET Qt6::OpenGLWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6")
+  add_library(Qt6::OpenGLWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGLWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
+  )
+  message(STATUS "Manually configured Qt6 OpenGLWidgets target")
+endif()
+
 # Qt6::Sql - create manual target if not found
 if(NOT TARGET Qt6::Sql AND EXISTS "${QT6_LIB_DIR}/libQt6Sql.so.6")
   add_library(Qt6::Sql SHARED IMPORTED)
@@ -502,6 +572,30 @@ if(NOT TARGET Qt6::SerialPort)
   message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
 endif()
 
+# Qt6::WebEngineCore - real imported target if the library exists (stub below otherwise).
+# The stub carries no library, so targets linking it (e.g. SmoSystemMonitorGuiPlugin)
+# fail --no-undefined on QWebEngine* symbols.
+if(NOT TARGET Qt6::WebEngineCore AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6")
+  add_library(Qt6::WebEngineCore SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineCore PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineCore;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineCore target")
+endif()
+
+# Qt6::WebEngineWidgets - real imported target if the library exists.
+if(NOT TARGET Qt6::WebEngineWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6")
+  add_library(Qt6::WebEngineWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets;Qt6::WebEngineCore"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineWidgets target")
+endif()
+
 # Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
 if(NOT TARGET Qt6::WebEngineCore)
   add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
@@ -686,6 +780,26 @@ IF(BUILD_RTI)
     # reach the AutogenInfo MOC_INCLUDES.
     SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Common)
 
+    # The TrainingAreaBase tab plugins (tabPluginHla / tabPluginWlsTetra /
+    # tabPluginDebugJsonDir / ...) declare Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
+    # and include <TrainingAreaBase/tab_plugin_interface.h>. That include dir
+    # (Lts/Proxies) is only a target-level INTERFACE include of tabPluginInterface and
+    # is NOT part of the global include_directories that reach the AutogenInfo
+    # MOC_INCLUDES, so moc fails with "Undefined interface". Add the Lts/Proxies root
+    # explicitly so moc can resolve the interface. Must be set at root scope - subdir
+    # appends do not reach the AutogenInfo MOC_INCLUDES.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Proxies)
+
+    # Designer plugins (ltswidgetsplugin) declare Q_INTERFACES(QDesignerCustomWidgetInterface)
+    # and include <QtUiPlugin/QDesignerCustomWidgetInterface>. That interface's
+    # Q_DECLARE_INTERFACE lives in the Qt6 QtUiPlugin module, which moc cannot resolve
+    # without the Qt6 parent include dir (it is only a target-level INTERFACE include of
+    # Qt6::UiTools and does not reach the global AutogenInfo MOC_INCLUDES). Add Qt6::Core's
+    # interface include dirs (which expose the <QtModule>/header root) so moc finds the
+    # interface. Must be set at root scope.
+    get_target_property(_qt6_autmoc_incs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES)
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${_qt6_autmoc_incs})
+
     # IMPORTED Targets für RTI Libraries erstellen
     # Debug und Release Varianten korrekt konfigurieren
     FOREACH(lib nddsc nddscore nddscpp nddscpp2 nddsctesthelpers)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp
index 799b0d113..99c070c49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp
@@ -36,7 +36,6 @@
 #include <QInputDialog>
 #include <QNetworkProxy>
 #include <QtCore/QTimer>
-#include <QRandomGenerator>
 #include <QInputDevice>
 #include <algorithm>
 
@@ -175,7 +174,10 @@ public:
 // ------------------------------------------------------------------
 int main(int argc, char **argv) // TODO: json strings to lower
 {
-  QRandomGenerator::global()->seed(time(nullptr));
+  // (legacy: qsrand(time(nullptr));) — the Qt5 global RNG (qrand/qsrand) does not exist in Qt6.
+  // QRandomGenerator::global() is auto-seeded (non-deterministically) by Qt, and calling ->seed()
+  // on the global/system generator aborts in Qt 6.10 ("Attempted to overwrite a QRandomGenerator to
+  // system() or global()"), so no explicit seed is needed here.
 
   QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_building_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_building_settings.cpp
index bde8fe762..6e76feaa5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_building_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_building_settings.cpp
@@ -9,7 +9,7 @@
 
 #include "thp_building_settings.h"
 #include "ui_thp_building_settings.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 
 #include <LtsUtilsSettings/settings.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp
index 8c2734e52..b88b66cdc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp
@@ -69,7 +69,7 @@ QString MemberInformationWrapper::ddsToJsonElement() const
         return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
                QStringLiteral("element.") + memberAccess + cppToJsonPost();
 
-    const QString optionalAccess = cppMemberName() + QStringLiteral(".is_set()");
+    const QString optionalAccess = cppMemberName() + QStringLiteral(".has_value()");
     const QString getValue = cppMemberName();
     return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
            QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
index 96f2828ae..223a7f1e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
@@ -17,7 +17,13 @@ SET(SRCS
   printing.h
 )
 
-if (KDReports_FOUND AND QT6_GUI_AVAILABLE AND BUILD_CODIFICATION)
+# Legacy always built the real LtsPrinting when KDReports was available
+# (FIND_PACKAGE(KDReports REQUIRED)); it is a common lib consumed by many
+# targets (e.g. SitmapGuiPlugin::doPrint -> LtsPrinting::printImage), so it must
+# NOT be gated on the BUILD_CODIFICATION product flag (which only bundles the
+# CodificationManagement/ReportViewer plugins). Build the real lib whenever
+# KDReports is found; keep the stub only as a KDReports-absent fallback.
+if (KDReports_FOUND AND QT6_GUI_AVAILABLE)
   NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
   NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
     PUBLIC
@@ -38,5 +44,7 @@ if(QT6_GUI_AVAILABLE)
 endif()
   NGL_INSTALL_TARGET(LtsPrinting)
 else()
-  message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
+  message(STATUS "KDReports not found or Qt6 GUI unavailable; building LtsPrinting stub (link-only, no printing symbols)")
+  add_library(LtsPrinting SHARED lts_printing_stub.cpp)
+  NGL_INSTALL_TARGET(LtsPrinting)
 endif()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/lts_printing_stub.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/lts_printing_stub.cpp
new file mode 100644
index 000000000..d2b5ad628
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/lts_printing_stub.cpp
@@ -0,0 +1,14 @@
+// LtsPrinting link stub for the Qt6 migration.
+//
+// The real LtsPrinting library requires KDReports (a Qt5/KDE print-reporting
+// library that is not available in the Qt6 toolchain). When KDReports is not
+// found the real library is skipped (see CMakeLists.txt); this stub provides a
+// linkable `LtsPrinting` target so that consumers referencing the target name
+// (e.g. SmoCheckButtonHandler) still link. It exports no printing symbols.
+namespace lts_printing_stub
+{
+int lts_printing_stub_marker()
+{
+  return 0;
+}
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
index 45d5d77f0..cb6553321 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
@@ -84,7 +84,7 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, const QAb
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
     LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A4, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A4), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -118,8 +118,8 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, QAbstract
 }
 
 void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image, const QString& imageTitle,
-                const QString& description, const QPrinter::PageSize& pageSize,
-                const QPrinter::Orientation& pageOrientation)
+                const QString& description, const QPageSize& pageSize,
+                const QPageLayout::Orientation& pageOrientation)
 {
     QTextDocument doc;
     QTextCursor cursor(&doc);
@@ -141,7 +141,7 @@ void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QI
 
 void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                  QVector<QImage>& images, QVector<QString>& imageTitles, QVector<QString>& descriptions,
-                 const QPrinter::PageSize& pageSize, const QPrinter::Orientation& pageOrientation)
+                 const QPageSize& pageSize, const QPageLayout::Orientation& pageOrientation)
 
 {
     QTextDocument doc;
@@ -181,8 +181,8 @@ void printPDFImages(QWidget* dialogParent, const QString& docName, const QString
     QPrinter printer;
 
     printer.setColorMode(QPrinter::ColorMode::Color);
-    printer.setOrientation(QPrinter::Orientation::Portrait);
-    printer.setPageSize(QPrinter::PageSize::A4);
+    printer.setPageOrientation(QPageLayout::Portrait);
+    printer.setPageSize(QPageSize(QPageSize::A4));
     QString fn = docName;
     fn = fn.remove(QLatin1Char(' '));
     fn = fn.remove(QLatin1String(".."));
@@ -224,7 +224,7 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
     LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A3, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A3), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -233,8 +233,8 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
     cursor.movePosition(QTextCursor::End);
 
     report.setWidthForEndlessPrinter(0);
-    report.setPageSize(QPrinter::A3);
-    report.setOrientation(QPrinter::Landscape);
+    report.setPageSize(QPageSize::A3);
+    report.setPageOrientation(QPageLayout::Landscape);
 
     LtsPrinting::Base::printReportData(doc, report);
     nglPrinter.print(&doc);
@@ -249,8 +249,8 @@ void printWidget(LtsSession::LtsSession* session, QWidget* dialogParent, QWidget
 
     QString windowTitle = dialogParent->windowTitle();
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A3,
-                                 QPrinter::Landscape);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A3), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -271,8 +271,8 @@ void printMessage(LtsSession::LtsSession* session, QWidget* dialogParent, const
     QString windowTitle = subject;
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, subject);
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);
 
     QString str = QString(QStringLiteral("<H2><strong>%1</strong> %2 </H2>")).arg(subject).arg(subjectContent);
     str.append(QString(QStringLiteral("<strong>%1</strong> %2<br>")).arg(time).arg(timeContent));
@@ -302,8 +302,8 @@ void printStoryboard(LtsSession::LtsSession* session, QWidget* dialogParent, QAb
     QString windowTitle = dialogParent->windowTitle();
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
 
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);
 
     if (!nglPrinter.printer())
         return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.h
index cfb841b7e..61e5f236b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.h
@@ -3,6 +3,8 @@
 #pragma once
 
 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>
 
 #ifndef LTSPRINTING_EXPORT
 #ifdef BUILD_STATIC_LIBRARIES
@@ -42,13 +44,13 @@ LTSPRINTING_EXPORT void printStoryboard(LtsSession::LtsSession* session, QWidget
 
 LTSPRINTING_EXPORT void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image,
                                    const QString& imageTitle, const QString& description,
-                                   const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                   const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                   const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                   const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
 
 LTSPRINTING_EXPORT void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                                     QVector<QImage>& images, QVector<QString>& imageTitles,
-                                    QVector<QString>& descriptions, const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                    const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                    QVector<QString>& descriptions, const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                    const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
 
 LTSPRINTING_EXPORT void printPDFImages(QWidget* dialogParent, const QString& docName, const QString& printPath,
                                        QVector<QImage>& images);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
index 728aeec48..94a89196d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
@@ -50,8 +50,8 @@ Base::Base(QTextDocument &doc,
            QWidget *dialogParent,
            const QString &dialogTitle,
            const QString        &_fn,
-           QPrinter::PaperSize   _ps,
-           QPrinter::Orientation _or,
+           QPageSize             _ps,
+           QPageLayout::Orientation _or,
            QPrinter::ColorMode   _cm) : m_printer(new QPrinter),
     m_painter(new QPainter),
     m_iconFilenameNr(0),
@@ -61,9 +61,9 @@ Base::Base(QTextDocument &doc,
     headersize_(10), headerrule_(0.5), headertext_(HeaderText),
     footersize_(10), footerrule_(0.5), footertext_(FooterText),
     itemFontSize_(2),
-    m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
-    m_currentPage(1),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    m_settings(new NGL::Settings(NGL::findProjectConfigFile())),
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLPrinting")),
+    m_currentPage(1)
 {
     QString fn = _fn;
     fn = fn.remove(QLatin1Char(' '));
@@ -77,8 +77,8 @@ Base::Base(QTextDocument &doc,
 #endif
     m_printer->setOutputFormat(QPrinter::NativeFormat);
 
-    m_printer->setPaperSize(_ps);
-    m_printer->setOrientation(_or);
+    m_printer->setPageSize(_ps);
+    m_printer->setPageOrientation(_or);
     m_printer->setColorMode(_cm);
 
     m_printer->setFullPage(true);
@@ -101,13 +101,13 @@ Base::Base(QTextDocument &doc,
         QAbstractPrintDialog::PrintCollateCopies;
     dialog->setOptions(op);
     QString title = dialogTitle;
-    if (_ps == QPrinter::A2)
+    if (_ps.id() == QPageSize::A2)
         title += QLatin1String(" (A2)");
-    if (_ps == QPrinter::A3)
+    if (_ps.id() == QPageSize::A3)
         title += QLatin1String(" (A3)");
-    if (_ps == QPrinter::A4)
+    if (_ps.id() == QPageSize::A4)
         title += QLatin1String(" (A4)");
-    if (_ps == QPrinter::A5)
+    if (_ps.id() == QPageSize::A5)
         title += QLatin1String(" (A5)");
     dialog->setWindowTitle(title);
     if (dialog->exec() != QDialog::Accepted)
@@ -153,7 +153,7 @@ QString Base::styleSheet()
 
 QSize Base::printerPageSize() const
 {
-    return QSize(m_printer->pageRect().width() - 2 * DOC_MARGIN, m_printer->pageRect().height() - 2 * DOC_MARGIN);
+    return QSize(m_printer->pageRect(QPrinter::Point).width() - 2 * DOC_MARGIN, m_printer->pageRect(QPrinter::Point).height() - 2 * DOC_MARGIN);
 }
 
 bool Base::newPage()
@@ -543,7 +543,7 @@ bool Base::printItemData(QString& str, const QAbstractItemModel* model, const QM
         displayString += vdata.toString();
 
     QString fgColorString;
-    vdata = model->data(mi, Qt::TextColorRole);
+    vdata = model->data(mi, Qt::ForegroundRole);
     if (vdata.isValid())
         fgColorString = vdata.value<QColor>().name();
 
@@ -684,24 +684,24 @@ bool Base::printReportData(QTextDocument& doc, KDReports::Report& report)
     return true;
 }
 
-QPrinter::PageSize Base::pageSize() const
+QPageSize Base::pageSize() const
 {
-    return m_printer->pageSize();
+    return m_printer->pageLayout().pageSize();
 }
 
-void Base::setPageSize(QPrinter::PageSize size)
+void Base::setPageSize(QPageSize size)
 {
     m_printer->setPageSize(size);
 }
 
-QPrinter::Orientation Base::orientation() const
+QPageLayout::Orientation Base::orientation() const
 {
-    return m_printer->orientation();
+    return m_printer->pageLayout().orientation();
 }
 
-void Base::setOrientation(QPrinter::Orientation orientation)
+void Base::setOrientation(QPageLayout::Orientation orientation)
 {
-    m_printer->setOrientation(orientation);
+    m_printer->setPageOrientation(orientation);
 }
 
 double Base::leftMargin() const
@@ -711,7 +711,7 @@ double Base::leftMargin() const
 
 void Base::setLeftMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         leftmargin_ = margin;
     else
         leftmargin_ = 0;
@@ -724,7 +724,7 @@ double Base::rightMargin() const
 
 void Base::setRightMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         rightmargin_ = margin;
     else
         rightmargin_ = 0;
@@ -737,7 +737,7 @@ double Base::topMargin() const
 
 void Base::setTopMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
         topmargin_ = margin;
     else
         topmargin_ = 0;
@@ -750,7 +750,7 @@ double Base::bottomMargin() const
 
 void Base::setBottomMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
         bottommargin_ = margin;
     else
         bottommargin_ = 0;
@@ -758,7 +758,7 @@ void Base::setBottomMargin(double margin)
 
 void Base::setMargins(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 2) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 2) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = margin;
     else
         leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = 0;
@@ -771,7 +771,7 @@ double Base::spacing() const
 
 void Base::setSpacing(double spacing)
 {
-    if ((spacing > 0) && (spacing <= m_printer->paperRect().height() / 8))
+    if ((spacing > 0) && (spacing <= m_printer->paperRect(QPrinter::Point).height() / 8))
         spacing_ = spacing;
     else
         spacing_ = 0;
@@ -784,7 +784,7 @@ double Base::headerSize() const
 
 void Base::setHeaderSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
         headersize_ = size;
     else
         headersize_ = 0;
@@ -817,7 +817,7 @@ double Base::footerSize() const
 
 void Base::setFooterSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
         footersize_ = size;
     else
         footersize_ = 0;
@@ -851,7 +851,7 @@ void Base::setItemFontSize(int itemFontSize)
 QRectF Base::paperRect(QPaintDevice* device)
 {
 
-    QRectF rect = m_printer->paperRect();
+    QRectF rect = m_printer->paperRect(QPrinter::Point);
 
     rect.setWidth(rect.width() * device->logicalDpiX() / m_printer->logicalDpiX());
     rect.setHeight(rect.height() * device->logicalDpiY() / m_printer->logicalDpiY());
@@ -930,7 +930,7 @@ void Base::printSinglePage()
     m_tempdoc->setPageSize(contentRect(m_printer).size());
 
     QTextFrameFormat fmt = m_tempdoc->rootFrame()->frameFormat();
-    fmt.setContentsMargins(0, 0, 0, 0);
+    fmt.setMargin(0);
     m_tempdoc->rootFrame()->setFrameFormat(fmt);
 
     int doccopies;
@@ -938,11 +938,11 @@ void Base::printSinglePage()
     if (m_printer->collateCopies())
     {
         doccopies = 1;
-        pagecopies = m_printer->numCopies();
+        pagecopies = m_printer->copyCount();
     }
     else
     {
-        doccopies = m_printer->numCopies();
+        doccopies = m_printer->copyCount();
         pagecopies = 1;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h
index ae079a054..37eba5e27 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h
@@ -4,6 +4,8 @@
 
 #include <QtCore/QSet>
 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>
 
 namespace NGL
 {
@@ -50,7 +52,7 @@ class Base
 {
   public:
     Base(QTextDocument& doc, QWidget* dialogParent, const QString& dialogTitle, const QString& _fn,
-         QPrinter::PaperSize _ps = QPrinter::A4, QPrinter::Orientation _or = QPrinter::Portrait,
+         QPageSize _ps = QPageSize(QPageSize::A4), QPageLayout::Orientation _or = QPageLayout::Portrait,
          QPrinter::ColorMode _cm = QPrinter::Color);
 
     virtual ~Base();
@@ -61,13 +63,13 @@ class Base
 
     static QString styleSheet();
 
-    QPrinter::PageSize pageSize() const;
+    QPageSize pageSize() const;
 
-    void setPageSize(QPrinter::PageSize size);
+    void setPageSize(QPageSize size);
 
-    QPrinter::Orientation orientation() const;
+    QPageLayout::Orientation orientation() const;
 
-    void setOrientation(QPrinter::Orientation orientation);
+    void setOrientation(QPageLayout::Orientation orientation);
 
     bool newPage();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
index 8a78e3761..bcafc97ce 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
@@ -175,7 +175,13 @@ bool CTS::DisconnectRequest::hasValidData() const
     return true;
 }
 
-LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
+// Unqualified: we are already inside namespace LtsProjectionWorkstation, and the unity
+// build concatenates lts_projection_workstation.cpp (which declares
+// class LtsProjectionWorkstation in this same namespace) into this TU, so
+// "LtsProjectionWorkstation::ErrorMessage" would resolve to the class (which has no
+// such member) instead of the namespace. In a separate TU (legacy structure) the
+// class is not visible here and the qualified name resolved to the namespace.
+ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
     : Message(nullptr, nullptr, JsonKeys::ERROR_MESSAGE(), uuid, QJsonValue()), m_reason(reason)
 {
     QJsonObject result;
@@ -183,7 +189,7 @@ LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const
     m_replyData = result;
 }
 
-void LtsProjectionWorkstation::ErrorMessage::process()
+void ErrorMessage::process()
 {
     if (!m_handler || !m_client)
         return;
@@ -192,7 +198,7 @@ void LtsProjectionWorkstation::ErrorMessage::process()
     m_handler->handleMessage(this);
 }
 
-bool LtsProjectionWorkstation::ErrorMessage::hasValidData() const
+bool ErrorMessage::hasValidData() const
 {
     if (!m_handler || !m_client)
         return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
index 10875a013..ff64d79e0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
@@ -916,6 +916,11 @@ void LtsSession::setExerciseData(const LtsWidgets::ExerciseData& exerciseData)
     emit signalExerciseDataChanged();
 }
 
+const LtsWidgets::ExerciseData* LtsSession::exerciseData() const
+{
+    return m_exerciseData;
+}
+
 void LtsSession::setProfilePicture(const QPixmap& pixmap)
 {
     // partitionType(); ?!?
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
index b71b03ad1..e1c98d516 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
@@ -1,4 +1,5 @@
 #include "lts_session_lock_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QDebug>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
index 0f09f059c..ed7c3bc5d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
@@ -1,6 +1,7 @@
 
 
 #include "Event.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsSession/lts_session.h>
 #include <QtGui/QPainter>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
index ebd48b819..1b66b590b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
@@ -1,6 +1,7 @@
 
 
 #include "TimelineHeaderView.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "TimelineWidget.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
index 27ff46ed3..5590d0ffa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
@@ -53,6 +53,20 @@ NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
     REQUEST_HELPER_WITH_GUI
 )
 
+# The dds_vector_to_pixmap free functions (iconFromSvg / pixmapFromIcon / ...) are
+# declared with LTSUTILSCORE_EXPORT, but this TU's include
+# <LtsUtils/LtsUtilsCore/ltsutilscore_export.h> resolves to the SOURCE-tree header,
+# where the macro expands to Q_DECL_IMPORT (empty on Linux) because
+# MAKE_LTSUTILSCORE_LIB is only defined when building LtsUtilsCore itself. Under the
+# project-wide -fvisibility=hidden they therefore compile as hidden symbols and, with
+# USE_IPO=ON, LTO drops them from the DSO entirely (they are unreferenced inside this
+# lib), breaking every consumer that links them (LtsMultiMonitor, LtsSession, ...).
+# Legacy exported them because its include <LtsUtilsCore/ltsutilscore_export.h>
+# resolved to the GENERATED export header (visibility("default")). Restore that
+# default visibility for this target only (same fix shape as the PluginInterfaces
+# visibility preset); behavior-neutral.
+set_target_properties(LtsUtilsGuiDds PROPERTIES CXX_VISIBILITY_PRESET default)
+
 
 NGL_ADD_LIBRARY2(AAR HLA  SV LtsUtilsDds SHARED request_helper.cpp request_helper.h)
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
index f9df0badd..d248856db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
@@ -183,6 +183,13 @@ NGL_INSTALL_TARGET(LtsWidgets)
 SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
 NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
 NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
+# ltswidgetsplugin.cpp unconditionally includes <LtsReportDisplay/lts_report_display_widget.h>,
+# which pulls KDReports -> #include <QPrinter>. In Qt6 that forwarding header lives in
+# <QtInc>/QtPrintSupport. With BUILD_CODIFICATION=OFF the LtsReportDisplay->KDReports
+# include chain is not built, so expose the QtPrintSupport module dir directly.
+if(DEFINED QT6_INC_DIR AND EXISTS "${QT6_INC_DIR}/QtPrintSupport")
+  NGL_TARGET_INCLUDE_DIRECTORIES(ltswidgetsplugin PRIVATE "${QT6_INC_DIR}/QtPrintSupport")
+endif()
 NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
 NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_checkable_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_checkable_table_model.h
index ed95fd18e..08e4684eb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_checkable_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_checkable_table_model.h
@@ -59,7 +59,7 @@ public:
     {
       const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
       if (entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
     }
 
     return ids;
@@ -73,7 +73,7 @@ public:
     {
       const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
       if (!entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
     }
 
     return ids;
@@ -84,7 +84,7 @@ public:
     for (int row = 0; row < LtsAbstractTableModel<T>::rowCount(); ++row)
     {
       T &entry = LtsAbstractTableModel<T>::m_vecData[row];
-      bool bContains = vecCheckedIds.contains(entry.second.id());
+      bool bContains = vecCheckedIds.contains(entry.second.id);
       if (entry.first != bContains)
       {
         entry.first = bContains;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
index 1bf897677..c4d47a919 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
@@ -7,6 +7,7 @@
 */
 
 #include "lts_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "lts_progress_dialog_helper.h"
 #include "lts_message_dialog.h"
 #include "lts_dialog_helper.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
index 906d4cf7b..9a0c8d4e9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
@@ -327,7 +327,7 @@ protected:
    */
   void translate(T *ui, const S &data, const QString &custom, const QString &title) // same as 'void translate(T *ui, const S &data, const QString &title)', but for topics without the 'name' entry
   {
-    translate(ui, QString::fromUtf8(typeid(data).name()), data.id(), custom /* can be empty */, title);
+    translate(ui, QString::fromUtf8(typeid(data).name()), data.id, custom /* can be empty */, title);
   }
 
 
@@ -341,7 +341,7 @@ protected:
    */
   void translate(T *ui, const S &data, const QString &title)
   {
-    translate(ui, data, QString::fromStdString(data.name()), title);    // -> translate #5
+    translate(ui, data, QString::fromStdString(data.name), title);    // -> translate #5
   }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp
deleted file mode 100644
index 7419a0905..000000000
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-#include "requirement_widget.h"
-
-#include <LtsWidgets/lts_message_dialog.h>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-
-namespace LtsWidgets
-{
-UiRequirement::UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                             const QString& userWarningMessage)
-    : m_descriptionLabel(descriptionLabel), m_requirementCheck(requirementCheck), m_lastResult(true),
-      m_userWarningMessage(userWarningMessage)
-{
-    retranslate();
-}
-
-void UiRequirement::reset()
-{
-    if (!isValid())
-        return;
-    m_descriptionLabel->setText(m_originalText);
-    m_descriptionLabel->setToolTip(m_originalTooltip);
-}
-
-void UiRequirement::setTexts()
-{
-    if (!isValid())
-        return;
-    if (!m_lastResult)
-    {
-        m_descriptionLabel->setText(
-            QStringLiteral("<span style=\"color:#aa0000;\">\u2022 %1</span>").arg(m_originalText));
-
-        if (!m_userWarningMessage.isEmpty())
-        {
-            m_descriptionLabel->setCursor(Qt::WhatsThisCursor);
-            m_descriptionLabel->setToolTip(m_userWarningMessage);
-        }
-    }
-    else
-    {
-        if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-            return;
-
-        m_descriptionLabel->setText(QStringLiteral("\u2022 %1").arg(m_originalText));
-        m_descriptionLabel->setCursor(Qt::ArrowCursor);
-        m_descriptionLabel->setToolTip(m_originalTooltip);
-    }
-}
-
-void UiRequirement::retranslate()
-{
-    if (!isValid())
-        return;
-
-    if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    auto x = m_descriptionLabel->text();
-    if (x.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    m_originalText = x;
-
-    m_originalTooltip = m_descriptionLabel->toolTip();
-    setTexts();
-}
-
-bool UiRequirement::checkRequirement()
-{
-    if (!isValid())
-        return m_lastResult;
-
-    m_lastResult = m_requirementCheck();
-
-    if (!m_descriptionLabel->isVisible() && !m_descriptionLabel->property("checkMe").toBool())
-    {
-        return true;
-    }
-
-    setTexts();
-
-    return m_lastResult;
-}
-
-bool UiRequirementList::checkRequirements(QWidget* messageOnThisParent)
-{
-    bool result = true;
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        if (!r.isValid())
-            continue;
-
-        if (!r.checkRequirement())
-        {
-            result = false;
-        }
-    }
-
-    if (!result && messageOnThisParent)
-    {
-        LtsWidgets::LtsMessageDialog::showMessage(
-            messageOnThisParent,
-            QApplication::translate("LtsWidgets::LtsDialog",
-                                    "There are elements that have invalid or no value.<br>"
-                                    "Please change values in the elements which are marked with red text."),
-            QApplication::translate("LtsWidgets::LtsDialog", "Operation not complete"));
-    }
-
-    return result;
-}
-
-void UiRequirementList::addRequirement(const UiRequirement& uiRequirement)
-{
-    m_requirementList.append(uiRequirement);
-}
-
-void UiRequirementList::clear()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& uir = *i;
-        uir.reset();
-    }
-
-    m_requirementList.clear();
-}
-
-void UiRequirementList::retranslate()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        r.retranslate();
-    }
-}
-} // namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h
deleted file mode 100644
index 26259bf3f..000000000
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-#pragma once
-
-#include "lts_widgets_export.h"
-
-#include <QtCore/QVector>
-#include <QtWidgets/QWidget>
-#include <functional>
-
-class QLabel;
-
-namespace LtsWidgets
-{
-
-class LTSWIDGETS_EXPORT UiRequirement
-{
-  public:
-    explicit UiRequirement() = default;
-
-    UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                  const QString& userWarningMessage = QString());
-
-    void reset();
-
-    bool checkRequirement();
-
-    bool isValid() const
-    {
-        return m_descriptionLabel != nullptr;
-    }
-
-    void retranslate();
-
-  private:
-    void setTexts();
-
-    QLabel* m_descriptionLabel;
-    std::function<bool()> m_requirementCheck;
-    QString m_originalText;
-    QString m_originalTooltip;
-    bool m_lastResult;
-    QString m_userWarningMessage;
-};
-
-class LTSWIDGETS_EXPORT UiRequirementList
-{
-  public:
-    UiRequirementList() = default;
-
-    bool checkRequirements(QWidget* messageOnThisParent = nullptr);
-
-    void addRequirement(const UiRequirement& uiRequirement);
-
-    void clear();
-
-    void retranslate();
-
-  private:
-    QVector<UiRequirement> m_requirementList;
-};
-} // namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt
index 9313918c1..0a5ce328a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt
@@ -51,8 +51,27 @@ ADD_LIBRARY(TopicReplayInterface SHARED
   ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp
 )
-TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC 
+TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h
 )
 TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase)
+
+# These interface base classes (e.g. DataPluginBase::Plugin) are Q_OBJECT classes. The top-level
+# CMAKE_CXX_VISIBILITY_PRESET hidden compiles their Q_OBJECT meta symbols (staticMetaObject/vtable/
+# qt_metacall/typeinfo) as GLOBAL HIDDEN, so they are not exported from the .so. A cross-DSO
+# subclass (e.g. AsbDataPlugin) then fails with "undefined reference to ...::staticMetaObject".
+# Compile these interface libs with default visibility so the meta symbols are exported to consumers
+# (the legacy build, without LTO, exported them). This only widens the export surface of these tiny
+# interface libs; it changes no runtime behaviour.
+set_target_properties(
+  DataPluginInterface
+  GuiPluginInterface
+  ProjectPluginInterface
+  StylePluginInterface
+  RecordReplayPlugin
+  TopicReplayInterface
+  PROPERTIES
+    CXX_VISIBILITY_PRESET default
+    CXX_VISIBILITY_INLINES_HIDDEN OFF
+)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
index 00387ca36..ede043069 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
@@ -132,12 +132,12 @@ class Interface
 
   protected:
     LtsSession::LtsSession* m_session;
+    NGL::INGLLogger& m_logger;
 
   private:
     QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
     QStringList m_options;
     LtsAppDescriptor::App m_appId;
-    NGL::INGLLogger& m_logger;
 };
 
 } // namespace GuiPluginBase
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt
index 18158324c..a5ea91ab4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt
@@ -45,6 +45,7 @@ NGL_ADD_LIBRARY2(WS TopicEditorBase SHARED ${topic_editor_base_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR} # topiceditorbase_export.h (generated here)
     ${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
     ${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h
 )
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
index b94a27893..d6b5d007e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_dialog.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
index 47a6f4368..de610a721 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <LtsScriptTimeline/track_entry.h>
 #include <QtCore/QVector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
index 650cf9a4f..f8b1f7873 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
index 1e2a10b79..5fb7448cb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
index 6dae85406..0c278e567 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
@@ -59,7 +59,7 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons
 
 void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
 {
-    if (!m_state.ports.is_set())
+    if (!m_state.ports.has_value())
         m_state.ports = std::vector<Core::PortInformation>();
     m_state.ports.get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp
index 180704fc0..05b41d155 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp
@@ -1,6 +1,7 @@
 
 
 #include "function_topic_tests.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <DDS/DDSConnector/publisher.h>
 #include <DDS/DDSConnector/subscriber.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h
index 15db873ff..58d4773e6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h
@@ -86,7 +86,7 @@ template <typename TOPICTYPE> class GenericDataWriter final
             return false;
         }
 
-        if (si.is_set())
+        if (si.has_value())
         {
             rti::pub::WriteParams writeParams;
             rti::core::SampleIdentity sampleIdentity(si.get()->source_guid(), si.get()->publication_sequence_number());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp
index 58cb5672d..4bbf8287a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp
@@ -17,7 +17,7 @@ namespace AdvancedSymbology
 AdvancedSymbology::SidcDefinitions::Identity roleToIdentity(const ParticipantManagement::Role role)
 {
   AdvancedSymbology::SidcDefinitions::Identity identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
-  switch (role.underlying()) {
+  switch (role) {
   case ParticipantManagement::Role::Unknown:
     identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp
index 9d718adbc..870b30f5e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp
@@ -6,7 +6,7 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include "AreaEffectSimulation/aes_dtc.h"
-#include "ParticipantManagement/ppm.hpp"
+#include "ParticipantManagement/ppm_dtc.h"
 #endif
 #include "Symbology/symbol_data_to_render_role.h"
 #include "SymbologyImpl/advanced_symbology_logging.h"
@@ -18,6 +18,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantMana
                                            const std::shared_ptr<AreaEffectSimulation::Interface::Dtc>& aesDtc,
                                            const std::shared_ptr<GuezIedManagement::Interface::Dtc>& guezIedDtc)
     : m_ppmDtc(ppmDtc), m_aesDtc(aesDtc), m_guezIedDtc(guezIedDtc)
+    , m_logger(getLogger("AdvancedSymbologyPlugin"))
 {
     if (!m_ppmDtc)
     {
@@ -53,100 +54,100 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const SymbolDataToR
 QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantManagement::Participant& participant,
                                                              int sizeL, const QColor& desiredColor) const
 {
-    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol()), sizeL);
+    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol), sizeL);
 
     if (!m_ppmDtc)
         return findImage(symDataToRender);
 
-    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId());
-    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role());
+    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId);
+    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role);
 
-    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color()));
+    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color));
     symDataToRender.fillColorReplace = true;
 
     QColor injuryColor = QColor(100, 100, 0);
     ProjectDataManagement::VulnerabilityState currentState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 
-    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id());
+    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id);
 
-    if (dData.stateHistory().size())
+    if (dData.stateHistory.size())
     {
         const ParticipantManagement::StateInformation& lastState =
-            m_ppmDtc->youngestStateInformation(dData.stateHistory());
-        currentState = lastState.vulnerabilityState();
+            m_ppmDtc->youngestStateInformation(dData.stateHistory);
+        currentState = lastState.vulnerabilityState;
 
-        switch (lastState.originatorType().underlying())
+        switch (lastState.originatorType)
         {
-            case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice: {
                 if (m_guezIedDtc)
                 {
-                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId());
-                    if (gIed.id() > 0)
+                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId);
+                    if (gIed.id > 0)
                     {
-                        int injuryPartyId = gIed.partyId();
+                        int injuryPartyId = gIed.partyId;
                         if (injuryPartyId >= 0)
-                            injuryColor = m_ppmDtc->party(injuryPartyId).color();
+                            injuryColor = m_ppmDtc->party(injuryPartyId).color;
                     }
                 }
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::DusMine: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
-                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId());
+                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId);
                 if (partyId >= 0)
-                    injuryColor = m_ppmDtc->party(partyId).color();
+                    injuryColor = m_ppmDtc->party(partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-            case ProjectDataManagement::StateChangeOriginator::FunctionalArea: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
 
                 AreaEffectSimulation::AesItem aesItem;
-                m_aesDtc->aesItemFromId(lastState.originatorId(), aesItem);
+                m_aesDtc->aesItemFromId(lastState.originatorId, aesItem);
 
-                if (aesItem.partyId().is_set())
-                    injuryColor = m_ppmDtc->party(aesItem.partyId().get()).color();
+                if (aesItem.partyId.has_value())
+                    injuryColor = m_ppmDtc->party(aesItem.partyId.get()).color;
 
                 break;
             }
 
-            case ProjectDataManagement::StateChangeOriginator::Participant: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant: {
                 const ParticipantManagement::Participant& participantOrigin =
-                    m_ppmDtc->participant(lastState.originatorId());
+                    m_ppmDtc->participant(lastState.originatorId);
 
-                if (participantOrigin.id())
-                    injuryColor = m_ppmDtc->party(participantOrigin.partyId()).color();
+                if (participantOrigin.id)
+                    injuryColor = m_ppmDtc->party(participantOrigin.partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::Party: {
-                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId());
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party: {
+                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId);
 
-                if (partyOrigin.id())
-                    injuryColor = partyOrigin.color();
+                if (partyOrigin.id)
+                    injuryColor = partyOrigin.color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::ObserverController:
-            case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-            case ProjectDataManagement::StateChangeOriginator::Initialization:
-                injuryColor = m_ppmDtc->party(1).color();
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+                injuryColor = m_ppmDtc->party(1).color;
                 break;
-            case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-            case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-            case ProjectDataManagement::StateChangeOriginator::Sanitation:
-            case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-            case ProjectDataManagement::StateChangeOriginator::Unknown:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
                 break;
         }
     }
@@ -159,7 +160,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
 
 AdvancedSymbology::Injury ForeignInterfaceImpl::stateToInjury(const ProjectDataManagement::VulnerabilityState& state)
 {
-    switch (state.underlying())
+    switch (state)
     {
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp
index 08f383d6d..29afee21f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp
@@ -70,10 +70,10 @@ void SaveAsSymbol::onInputChanged(const QString &input)
 
 void SaveAsSymbol::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+  if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
     return;
 
-  QString name = QString::fromStdString(data.name());
+  QString name = QString::fromStdString(data.name);
 
   if (modType == DataModification::eRemoved)
     m_takenNames.removeAll(name);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
index 8c62bed75..4fd7f1428 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
@@ -19,7 +19,7 @@ class SelectTextDialog final : public LtsWidgets::LtsFramelessDialog
     ~SelectTextDialog();
 
   protected:
-    NGL::INGLLogger& m_logger;
+    //NGL::INGLLogger& m_logger;  // unused (legacy: commented out)
     Ui_SelectTextDialog* ui;
 
   private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
index af6abd01d..324e74833 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
@@ -125,7 +125,7 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent)
   : LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_ui(new Ui::SymbolEditor)
   , m_session(session)
-  .getNGLLogger("SymbolEditor"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SymbolEditor"))
 {
     DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")";
     m_ui->setupUi(this);
@@ -227,9 +227,9 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>& f
     m_internal->m_symbolColorsPreview.clear();
     m_internal->m_ppmDtc->partys([this](const ParticipantManagement::Party& data) {
         m_internal->m_symbolColorsPreview.append(
-            {ParticipantManagement::trPartyName(data.name()), QColor::fromRgb(data.color())});
-        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name())),
-                                                  QColor::fromRgb(data.fadingColor())});
+            {ParticipantManagement::trPartyName(data.name), QColor::fromRgb(data.color)});
+        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name)),
+                                                  QColor::fromRgb(data.fadingColor)});
     });
 
     m_internal->m_toolButtonGroup.addButton(m_ui->ToolButtonRect);
@@ -812,11 +812,9 @@ void SymbolEditor::updateSymbolAttributesWidgets()
     m_ui->ListViewMisc->clearSelection();
     m_ui->ListViewTruppengattung->clearSelection();
 
-    QLinkedList<SymbologyXML::Primitive*> primitives = m_internal->m_symbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(primitives);
-    while (pi.hasNext())
+    auto primitives = m_internal->m_symbol.getPrimitives();
+    for (auto* prim : primitives)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         int iconId = prim->icon();
         SymbologyXML::SymbolTypes::t_icon_type iconType = prim->iconType();
         SymbologyXML::SymbolTypes::t_sector_position sectorPosition = prim->position();
@@ -1445,7 +1443,7 @@ void SymbolEditor::slotImportTemplate()
         else
         {
             FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-            QString symbolName = QString::fromStdString(fc.name());
+            QString symbolName = QString::fromStdString(fc.name);
             SymbologyXML::SymbolReader sr;
             pushUndo();
             sr.read(content, m_internal->m_symbol);
@@ -1453,7 +1451,7 @@ void SymbolEditor::slotImportTemplate()
 
             m_internal->m_lastFileId = fileId;
             m_internal->m_lastFileName = symbolName;
-            m_internal->m_lastFolderId = fc.folderId();
+            m_internal->m_lastFolderId = fc.folderId;
 
             updateGUI();
             __unchange__();
@@ -1850,7 +1848,7 @@ void SymbolEditor::onToolButtonTextClicked()
 
 void SymbolEditor::resetToolButtonGroupState()
 {
-    m_ui->ToolButtonSelect->animateClick(1);
+    m_ui->ToolButtonSelect->animateClick();
 }
 
 void SymbolEditor::onPushButtonFillColorClicked()
@@ -1934,11 +1932,9 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol& tmpSymbol)
             m_internal->m_symbol.addBranch((SymbologyXML::SymbolTypes::t_branch)idx);
     }
 
-    QLinkedList<SymbologyXML::Primitive*> prims = tmpSymbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(prims);
-    while (pi.hasNext())
+    auto prims = tmpSymbol.getPrimitives();
+    for (auto* prim : prims)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         if ((prim->type() == SymbologyXML::Primitive::ICON) &&
             m_internal->m_symbol.containsPrimitive(prim->iconType(), prim->position(), prim->icon()))
             continue;
@@ -3016,8 +3012,8 @@ bool SymbolEditor::writeFile(bool saveAsNew)
         DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
         m_internal->m_lastFileId = fileId;
         FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-        m_internal->m_lastFolderId = fc.folderId();
-        const QString fileName = QString::fromStdString(fc.name());
+        m_internal->m_lastFolderId = fc.folderId;
+        const QString fileName = QString::fromStdString(fc.name);
         m_internal->m_lastFileName = fileName;
         m_internal->m_symbol.setName(fileName);
         bRet = true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h
index 6e003ef58..f8dd56675 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h
@@ -6,7 +6,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <NGLLogger/INGLLogger.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SymbologyXML/symbol_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h
index 913a679ad..03960367c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <AdvancedSymbology/asb_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp
index 7bdb7a19b..12bae56de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp
@@ -27,8 +27,8 @@ void FileManagementReplyHandler::requestReply(const Core::FunctionReplyObject &r
 
 void FileManagementReplyHandler::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply &replyObject)
 {
-  m_content = replyObject.content();
-  m_id = replyObject.id();
+  m_content = replyObject.content;
+  m_id = replyObject.id;
   m_requestHelper->requestReply(replyObject);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui
index d8bfb39b4..a9eb5660a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui
@@ -318,7 +318,7 @@
              <enum>Qt::ScrollBarAsNeeded</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>
@@ -576,7 +576,7 @@
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
index d88c881d8..e08604df9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
@@ -6,7 +6,7 @@
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <QtXml/QDomDocument>
 #include <QtGui/QImage>
@@ -152,7 +152,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 #ifdef SKIP_SOME_TO_TEST_REFETCHING
         if (fileContentId >= 98)
-            request.fileContentId(-1);
+            request.fileContentId = -1;
 #endif
 #endif
 
@@ -179,7 +179,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply& reply)
 {
-    const int32_t fileContentId = reply.id();
+    const int32_t fileContentId = reply.id;
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, " << fileContentId;
 
@@ -197,16 +197,16 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " fileContentId=" << fileContentId << " name=" << name
                         << " operatorName=" << operatorName << " lastModified=" << lastModified
-                        << " #bytes =" << reply.content().size();
+                        << " #bytes =" << reply.content.size();
 
-    fcData.monitoring.replyContentSize = reply.content().size();
+    fcData.monitoring.replyContentSize = reply.content.size();
 
     switch (fcData.type)
     {
         case FileContentStruct::SymbolType::EtsSymbol: {
             QImage image;
-            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)),
-                                                    reply.content().size()),
+            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content.at(0)),
+                                                    reply.content.size()),
                             image))
             {
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
@@ -225,7 +225,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
         case FileContentStruct::SymbolType::XmlSymbol: {
             FlmSymbolProxy::SymbolData symbolData(name, operatorName, lastModified,
-                                                  LtsUtils::toQByteArray(reply.content()));
+                                                  LtsUtils::toQByteArray(reply.content));
 
             if (symbolData.isXmlSymbol())
             {
@@ -277,7 +277,7 @@ bool FlmSubscriber::svgToImage(const QByteArray& svgByteArray, QImage& imageOut)
 QString FlmSubscriber::operatorName(int operatorId)
 {
     if (d->m_opmDtc)
-        return QString::fromStdString(d->m_opmDtc->user(operatorId).name());
+        return QString::fromStdString(d->m_opmDtc->user(operatorId).name);
     return QStringLiteral("unknown user<%1>").arg(operatorId);
 }
 
@@ -339,20 +339,20 @@ void FlmSubscriber::checkForReFetching()
 
 void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data, DataModification modType)
 {
-    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id()
-                        << " data.fileStatus=" << data.fileStatus().underlying() << " modType=" << modType
-                        << " data.name='" << data.name().c_str() << "'";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id
+                        << " data.fileStatus=" << data.fileStatus << " modType=" << modType
+                        << " data.name='" << data.name.c_str() << "'";
 
     if (!d->m_flmFtc)
         return;
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileType().underlying() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
     {
         switch (modType)
         {
@@ -367,7 +367,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
         }
     }
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
     switch (modType)
     {
         case DataModification::eAdded:
@@ -383,13 +383,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
 
         case DataModification::eRemoved: {
             DEBUG_LOG(m_logger) << Q_FUNC_INFO << " modType=" << modType << " fileContentId=" << fileContentId
-                                << " fileContentName=" << data.name();
+                                << " fileContentName=" << data.name;
 
             d->m_fileContentMap.remove(fileContentId);
 
             if (!d->m_symbolProxy.removeSymbol(fileContentId))
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " removeSymbol failed"
-                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name() << "'"
+                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name << "'"
                                     << " contains=" << d->m_fileContentMap.contains(fileContentId);
             break;
         }
@@ -400,35 +400,35 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
         return;
 
-    if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
 
     FileContentStruct fcData;
 
-    fcData.name = QString::fromStdString(data.name());
+    fcData.name = QString::fromStdString(data.name);
     fcData.type = FileContentStruct::SymbolType::UnsupportedSymbol;
-    fcData.operatorName = operatorName(data.operatorId());
-    fcData.lastModified = data.lastModified();
+    fcData.operatorName = operatorName(data.operatorId);
+    fcData.lastModified = data.lastModified;
 
     fcData.usrTags << QStringLiteral("file-id=%1").arg(fileContentId);
-    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId().is_set() ? data.exerciseId().get() : -1);
+    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId.has_value() ? data.exerciseId.get() : -1);
     fcData.usrTags << fcData.operatorName;
 
-    if (data.properties().size() != 0)
+    if (data.properties.size() != 0)
     {
-        const QByteArray attributesJson(QByteArray::fromRawData(data.properties().c_str(), data.properties().size()));
+        const QByteArray attributesJson(QByteArray::fromRawData(data.properties.c_str(), data.properties.size()));
         QJsonParseError parseError;
         QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
 
@@ -476,9 +476,9 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 }
 
 void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileContentId, const QString& name, const QImage& image,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h
index 11be5b551..2b207f0ba 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h
@@ -6,7 +6,7 @@
 #include <Lts/Services/FileManagement/flm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp
index f5502cfac..58bf42e3e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp
@@ -10,7 +10,7 @@
 #include <Symbology/sidc_codec.h>
 #include "flm_symbol_proxy.h"
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
index 3adbfcfc6..012565621 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
@@ -9,6 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 #include <QtGui/QImage>
+#include <QtCore/QObject>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp
index e7dddac76..2b708b980 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp
@@ -63,58 +63,47 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
         return QVariant();
 
     const AlarmManagement::AlarmConfig& alarmConfig = m_vecData.at(index.row());
-    if (alarmConfig.global() != m_global)
+    if (alarmConfig.global != m_global)
         return QVariant();
 
     switch (index.column())
     {
         case Id:
-            return alarmConfig.id();
+            return alarmConfig.id;
         case EquipmentNumber: {
-            const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId());
+            const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId);
             if (equipmentNumber == 0)
                 return tr("All");
             return equipmentNumber;
         }
         case Designator:
-            return m_alarmHistoryModel->getDesignator(alarmConfig.participantId());
+            return m_alarmHistoryModel->getDesignator(alarmConfig.participantId);
         case TactIdentifier:
-            return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId());
+            return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId);
         case VulnerabilityState: {
             QString vulnerabilityState = tr("All Types");
-            if (alarmConfig.vulnerabilityState() >= 0)
+            if (alarmConfig.vulnerabilityState >= 0)
             {
-                // participant() existiert nicht mehr, suche in participantsList()
-                auto participantIt = std::find_if(
-                    m_ppmDtc->participantsList().begin(), m_ppmDtc->participantsList().end(),
-                    [id = alarmConfig.participantId()](const ParticipantManagement::Participant& p) {
-                        return p.id() == id;
-                    });
-
-                ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Other;
-                // STUB: type()-Methode nicht verfügbar - verwende Default-Wert
-                // if (participantIt != m_ppmDtc->participantsList().end())
-                // {
-                //     typeClass = m_ppmDtc->type(participantIt->typeId()).typeClass();
-                // }
+                ParticipantManagement::TypeClass typeClass =
+                    m_ppmDtc->type(m_ppmDtc->participant(alarmConfig.participantId).typeId).typeClass;
 
                 const ProjectDataManagement::VulnerabilityClass vc =
                     typeClass == ParticipantManagement::TypeClass::Human
-                        ? ProjectDataManagement::VulnerabilityClass::SoldierInjuries
-                        : ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+                        ? ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries
+                        : ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
                 ProjectDataManagement::VulnerabilityState vs =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState());
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState);
                 vulnerabilityState = ProjectDataManagement::toString(vs, vc);
             }
             return vulnerabilityState;
         }
 
         case EventType:
-            return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId()));
+            return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId));
         case MessageWindow:
-            return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
+            return alarmConfig.messageWindow ? tr("Yes") : tr("No");
         case SetMarker:
-            return alarmConfig.setMarker() ? tr("Yes") : tr("No");
+            return alarmConfig.setMarker ? tr("Yes") : tr("No");
     }
 
     return QVariant();
@@ -122,15 +111,15 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
 
 void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType)
 {
-    const int id = data.id();
-    if (data.global() != m_global)
+    const int id = data.id;
+    if (data.global != m_global)
         return;
 
     int row = findRowForId(id);
 
-    const int eventTypeId = data.eventTypeId();
-    const bool messageWindow = data.messageWindow();
-    const bool setMarker = data.setMarker();
+    const int eventTypeId = static_cast<int>(data.eventTypeId);
+    const bool messageWindow = data.messageWindow;
+    const bool setMarker = data.setMarker;
     DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker"
                         << setMarker;
 
@@ -140,8 +129,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
 
             DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id;
             AlarmManagement::AlarmConfig data1 = data;
-            data1.setMessageWindow(false);
-            data1.setSetMarker(false);
+            data1.messageWindow = false;
+            data1.setMarker = false;
             setRowData(row, data1);
             removeRow(row);
             return;
@@ -153,7 +142,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
 
                 return;
             }
-            if (m_alarmHistoryModel->participantId2EquipNo(data.participantId()) > 0)
+            if (m_alarmHistoryModel->participantId2EquipNo(data.participantId) > 0)
                 setRowData(row, data);
             break;
         }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h
index cbe441272..81370595d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h
@@ -6,7 +6,6 @@
 #include "almcommon_export.h"
 
 #include <AlarmManagement/alm_dtc.h>
-#include <AlarmManagement/alm_types.h>
 #include <GuezNasat/logger.h>
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
index bc01f79a4..b3c677858 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
@@ -49,7 +49,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
 
     // Register callbacks instead of enableParticipant()
     const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) {
-        onParticipantChanged(participant, ParticipantManagement::DataModification::eAdded);
+        onParticipantChanged(participant, DataModification::eAdded);
     };
     m_ppmDtc->participants(cbParticipants);
 
@@ -66,7 +66,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
     auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
         onAesItemChanged(item, DataModification::eAdded);
     };
-    m_aesDtc->bcContaminations(cbAesItem);
+    m_aesDtc->bCContaminations(cbAesItem);
     m_aesDtc->boobyTraps(cbAesItem);
     m_aesDtc->offRouteMines(cbAesItem);
 
@@ -84,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
 
     if (role == Qt::BackgroundRole)
     {
-        if (notificationEx.eventType() == ProjectDataManagement::PdmEventType::Alarm)
+        if (notificationEx.eventType == ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
             return QColor(Qt::red);
         return QVariant();
     }
@@ -94,7 +94,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
         case Id:
             return notificationEx.id;
         case Date:
-            return QDateTime::fromMSecsSinceEpoch(notificationEx.time());
+            return QDateTime::fromMSecsSinceEpoch(notificationEx.time);
         case EquipmentNumber:
             if (notificationEx.equipmentNumber)
                 return notificationEx.equipmentNumber;
@@ -107,10 +107,10 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
             return notificationEx.participantId;
         case Position:
             if (role == Qt::DisplayRole)
-                return LtsCoordTrans::mgrsFromGeographic(notificationEx.position().lon(),
-                                                         notificationEx.position().lat());
+                return LtsCoordTrans::mgrsFromGeographic(notificationEx.position.lon,
+                                                         notificationEx.position.lat);
             else if (role == Qt::UserRole)
-                return QPointF(notificationEx.position().lon(), notificationEx.position().lat());
+                return QPointF(notificationEx.position.lon, notificationEx.position.lat);
             break;
         case AesId:
             return notificationEx.aesId;
@@ -124,9 +124,9 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
 bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const
 {
     Q_UNUSED(modType);
-    if (data.operatorId() == 0)
+    if (data.operatorId == 0)
         return false;
-    return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    return data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 }
 
 void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType)
@@ -135,16 +135,16 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
         return;
 
     NotificationEx notification(data);
-    const QByteArray properties = QByteArray::fromRawData(data.properties().c_str(), data.properties().size());
+    const QByteArray properties = QByteArray::fromRawData(data.properties.c_str(), data.properties.size());
     const QJsonDocument propertieJsonDoc = QJsonDocument::fromJson(properties);
     const QJsonObject propertieJsonObj = propertieJsonDoc.object();
 
-    notification.equipmentNumber = data.equipmentNumber();
-    if (data.participantId().has_value())
-        notification.participantId = data.participantId().value();
-    notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType());
-    if (data.aesId().has_value())
-        notification.aesId = data.aesId().value();
+    notification.equipmentNumber = data.equipmentNumber;
+    if (data.participantId.has_value())
+        notification.participantId = data.participantId.value();
+    notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType);
+    if (data.aesId.has_value())
+        notification.aesId = data.aesId.value();
     const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
     const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt();
 
@@ -155,19 +155,19 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
 }
 
 void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant,
-                                             const ParticipantManagement::DataModification modType)
+                                             const DataModification modType)
 {
-    if (modType == ParticipantManagement::DataModification::eRemoved)
+    if (modType == DataModification::eRemoved)
         return;
-    QString designator = participant.designator();
-    m_idDesignatorMap.insert(participant.id(), designator);
+    QString designator = QString::fromStdString(participant.designator);
+    m_idDesignatorMap.insert(participant.id, designator);
 
     const int equipNo = participant.equipmentNumber.has_value() ? participant.equipmentNumber.value() : 0;
-    m_partId2EquipNoMap.insert(participant.id(), equipNo);
+    m_partId2EquipNoMap.insert(participant.id, equipNo);
 
-    QString tacticalIdentifier = participant.tacticalIdentifier();
-    m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier);
-    DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator
+    QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier);
+    m_idTactIdentifierMap.insert(participant.id, tacticalIdentifier);
+    DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id << " designator=" << designator
                         << " tacticalIdentifier=" << tacticalIdentifier;
 }
 
@@ -199,8 +199,8 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "onBCContaminationChanged: id=" << id << " Name=" << name;
 }
@@ -209,8 +209,8 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "BoobyTrap: id=" << id << " Name=" << name;
 }
@@ -220,8 +220,8 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "OffRouteMine: id=" << id << " Name=" << name;
 }
@@ -230,8 +230,8 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& it
 {
     if (modType == DataModification::eRemoved)
         return;
-    QString name = QString::fromStdString(item.name());
-    int id = item.id();
+    QString name = QString::fromStdString(item.name);
+    int id = item.id;
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "AreaEffectSimulation::AesItem onAesItemChanged: id=" << id
                         << " Name=" << name;
@@ -253,7 +253,7 @@ bool AlarmHistoryProxyModel::lessThan(const QModelIndex& source_left, const QMod
     switch (source_left.column())
     {
         case AlarmHistoryModel::Date:
-            return dataLeft.time() < dataRight.time();
+            return dataLeft.time < dataRight.time;
 
         case AlarmHistoryModel::Id:
         case AlarmHistoryModel::Incident:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h
index 9c8f6f72b..0638999e2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h
@@ -11,7 +11,8 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
-#include <ProjectDataManagement/project_data_management.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace AlarmManagement
 {
@@ -50,7 +51,7 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT
     bool isFiltered(const NotificationEx& data, DataModification modType) const override;
   public slots:
     void onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType);
-    void onParticipantChanged(const ParticipantManagement::Participant& participant, const ParticipantManagement::DataModification modType);
+    void onParticipantChanged(const ParticipantManagement::Participant& participant, const DataModification modType);
     void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType);
     void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const DataModification modType);
     void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
index ccbd652b2..397828799 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
@@ -57,24 +57,24 @@ void InterfaceImpl::clearInterfaces()
 
 void InterfaceImpl::showEmergencyMessage(const AlarmManagement::Notification &data)
 {
-  if (data.eventType() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
+  if (data.eventType != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
     return;
 
-  const int issi = data.equipmentNumber();
-  const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position().lon(), data.position().lat());
+  const int issi = data.equipmentNumber;
+  const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position.lon, data.position.lat);
 
   
    new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(),
                                                           tr("ISSI: %1 --- Position: %2\n").arg(issi).arg(positionStr),
-                                                          tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time())));
+                                                          tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time)));
 }
 
 void InterfaceImpl::showAlarm(const AlarmManagement::Notification &data)
 {
   showEmergencyMessage(data);
 
-  if (data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
-      data.operatorId() == 0) 
+  if (data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
+      data.operatorId == 0) 
   {
     bool bWidgetExists = m_session->widgetExists(menuGroup(), m_alarmHistoryDialogIdentifier, m_alarmHistoryDialogLayoutArea);
     if (!bWidgetExists)
@@ -87,7 +87,7 @@ void InterfaceImpl::onNotificationChanged(const AlarmManagement::Notification &d
   if (mod != DataModification::eAdded)
     return;
 
-  INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId()
+  INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId
                      << "currentOperatorId: " << LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.h
index 069aad536..a1caf63b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.h
@@ -7,11 +7,12 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <AlarmManagement/alm_gui_plugin_interface.h>
 #include <AlarmManagement/alm_data_plugin_interface.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp
index e4df3c5f9..443d47736 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp
@@ -2,14 +2,15 @@
 
 #include "alm_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "alm_history.h"
 #include "ui_alm_dialog.h"
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <utility>
 
@@ -19,7 +20,7 @@ namespace AlarmManagement
 AlarmDialog::AlarmDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_configAlarmModel(nullptr),
       m_dtc(nullptr), m_ftc(nullptr), m_ui(new Ui::AlarmDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
-      m_operatorId(-1)
+      m_operatorId(-1), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     AlarmCheckBox alarmCheckBox;
     LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance();
@@ -158,23 +159,23 @@ void AlarmDialog::retranslate()
 
 void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, DataModification modType)
 {
-    bool setMarker = data.setMarker();
-    bool messageWindow = data.messageWindow();
+    bool setMarker = data.setMarker;
+    bool messageWindow = data.messageWindow;
     if (modType == DataModification::eRemoved)
         return;
 
     DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged "
-                        << " id=" << data.id() << " operatorId=" << data.operatorId()
-                        << " m_operatorId=" << m_operatorId << " participantId=" << data.participantId()
-                        << " eventTypeId=" << data.eventTypeId() << " messageWindow=" << messageWindow
+                        << " id=" << data.id << " operatorId=" << data.operatorId
+                        << " m_operatorId=" << m_operatorId << " participantId=" << data.participantId
+                        << " eventTypeId=" << data.eventTypeId << " messageWindow=" << messageWindow
                         << " setMarker=" << setMarker;
-    if (data.global() == false)
+    if (data.global == false)
         return;
 
-    if (data.operatorId() == m_operatorId)
+    if (data.operatorId == m_operatorId)
     {
         DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
-        switch (data.eventTypeId().underlying())
+        switch (data.eventTypeId)
         {
             case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: {
                 DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
@@ -247,28 +248,28 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
     ret.reserve(m_checkBoxes.size());
     for (const AlarmCheckBox& item : std::as_const(m_checkBoxes))
     {
-        alarmActionDds.eventTypeId(item.eventTypeId);
+        alarmActionDds.eventTypeId = item.eventTypeId;
         if (item.checkboxMarker->isChecked())
         {
-            alarmActionDds.setMarker(true);
+            alarmActionDds.setMarker = true;
             DEBUG_LOG(m_logger) << item.name << " setMarker = true";
         }
         else
         {
-            alarmActionDds.setMarker(false);
+            alarmActionDds.setMarker = false;
             DEBUG_LOG(m_logger) << item.name << " setMarker = false";
         }
         if (item.checkboxWindow->isChecked())
         {
-            alarmActionDds.messageWindow(true);
+            alarmActionDds.messageWindow = true;
             DEBUG_LOG(m_logger) << item.name << " messageWindow = true";
         }
         else
         {
-            alarmActionDds.messageWindow(false);
+            alarmActionDds.messageWindow = false;
             DEBUG_LOG(m_logger) << item.name << " messageWindow = false";
         }
-        if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
+        if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
             ret.push_back(alarmActionDds);
     }
     return ret;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h
index 124cf1200..5f7b42a00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h
@@ -7,6 +7,7 @@
 #include <AlarmManagement/alm_ftc.h>
 #include <AlarmManagement/alm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <AlarmManagement/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
index caa9ac5cc..723b4c7fc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
@@ -2,11 +2,12 @@
 
 #include "alm_history.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_alm_history.h"
 
 #include <LtsPrinting/printing.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 #include <QtWidgets/QTreeView>
 
 namespace AlarmManagement
@@ -14,7 +15,8 @@ namespace AlarmManagement
 
 AlarmView::AlarmView(LtsSession::LtsSession* session, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_alarmHistoryModel(nullptr),
-      m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView)
+      m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
     m_ui->setupUi(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp
index a377723a7..e72fd980c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp
@@ -50,13 +50,13 @@ ConfigParticipantsDialog::~ConfigParticipantsDialog()
 
 void ConfigParticipantsDialog::retranslate()
 {
-    if (!m_participantData.equipmentNumber().is_set())
+    if (!m_participantData.equipmentNumber.has_value())
     {
-        QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id());
+        QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id);
         translate(m_ui, m_participantData, hierarchy, tr("Participant Alarm"));
     }
     else
-        translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber().get()),
+        translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber.get()),
                   tr("Participant Alarm"));
 
     m_uiRequirements->clear();
@@ -82,12 +82,12 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
     m_operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
-    m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id()));
+    m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id));
 
     QString equipmentNumbersStr;
-    if (participantData.equipmentNumber().is_set())
+    if (participantData.equipmentNumber.has_value())
     {
-        equipmentNumbersStr.append(QString::number(participantData.equipmentNumber().get()));
+        equipmentNumbersStr.append(QString::number(participantData.equipmentNumber.get()));
         equipmentNumbersStr.append(QStringLiteral(": "));
     }
 
@@ -97,10 +97,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
     m_ui->equipmentNoContent->setText(equipmentNumbersStr);
 
-    DEBUG_LOG(m_logger) << "current participantId = " << participantData.id();
+    DEBUG_LOG(m_logger) << "current participantId = " << participantData.id;
 
-    m_typeClass = ppmDtc->type(participantData.typeId()).typeClass();
-    DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
+    m_typeClass = ppmDtc->type(participantData.typeId).typeClass;
+    DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId;
     fillCbx();
 
     m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig& alarm) { setAlaramData(alarm); });
@@ -110,21 +110,21 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& alarm)
 {
     DEBUG_LOG(m_logger) << "setAlaramData:" << alarm;
-    if (alarm.operatorId() != m_operatorId || alarm.participantId() != m_participantData.id() || alarm.global())
+    if (alarm.operatorId != m_operatorId || alarm.participantId != m_participantData.id || alarm.global)
         return;
 
-    switch (alarm.eventTypeId().underlying())
+    switch (alarm.eventTypeId)
     {
         case ProjectDataManagement::PdmEventType::EventType_Hit: {
             DEBUG_LOG(m_logger) << "Hit zuweisen ";
             m_ui->cbxDirectFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
-            if (alarm.vulnerabilityState() >= 0)
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
+            if (alarm.vulnerabilityState >= 0)
             {
                 ProjectDataManagement::VulnerabilityState vulState =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
-                int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
+                int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
                 m_ui->cbStatusDirect->setCurrentIndex(index);
             }
             break;
@@ -132,22 +132,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation: {
             DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
             m_ui->cbxIndirectFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_AirSupport: {
             DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
             m_ui->cbxAirSupport->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_HitMine: {
             DEBUG_LOG(m_logger) << "HitMine zuweisen ";
             m_ui->cbxMines->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_HitB:
@@ -155,20 +155,20 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_HitC: {
             DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen ";
             m_ui->cbxNbcAgent->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_FriendlyFire: {
             DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
             m_ui->cbxFriendlyFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
-            if (alarm.vulnerabilityState() >= 0)
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
+            if (alarm.vulnerabilityState >= 0)
             {
                 ProjectDataManagement::VulnerabilityState vulState =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
-                int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
+                int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
                 m_ui->cbStatusFriendly->setCurrentIndex(index);
             }
             break;
@@ -176,22 +176,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_Manipulation: {
             DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
             m_ui->cbxManipulation->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: {
             DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
             m_ui->cbxGlobalBorderLine->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: {
             DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
             m_ui->cbxLocalBorderLine->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         default: {
@@ -207,68 +207,68 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
 
     std::vector<AlarmManagement::AlarmAction> alarmsDds;
 
-    alarmActionDds.setMarker(m_ui->cbxSetMarker->isChecked());
-    alarmActionDds.messageWindow(m_ui->cbxMessageWindow->isChecked());
-    alarmActionDds.vulnerabilityState(-1);
+    alarmActionDds.setMarker = m_ui->cbxSetMarker->isChecked();
+    alarmActionDds.messageWindow = m_ui->cbxMessageWindow->isChecked();
+    alarmActionDds.vulnerabilityState = -1;
 
-    if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
+    if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
     {
         if (m_ui->cbxDirectFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit;
             int statusDirect = -1;
             if (m_ui->cbStatusDirect->currentIndex() > 0)
                 statusDirect = m_ui->cbStatusDirect->currentData().toInt();
-            alarmActionDds.vulnerabilityState(statusDirect);
+            alarmActionDds.vulnerabilityState = statusDirect;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxFriendlyFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_FriendlyFire);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FriendlyFire;
             int statusFriendly = -1;
             if (m_ui->cbStatusFriendly->currentIndex() > 0)
                 statusFriendly = m_ui->cbStatusFriendly->currentData().toInt();
-            alarmActionDds.vulnerabilityState(statusFriendly);
+            alarmActionDds.vulnerabilityState = statusFriendly;
             alarmsDds.push_back(alarmActionDds);
         }
-        alarmActionDds.vulnerabilityState(-1);
+        alarmActionDds.vulnerabilityState = -1;
         if (m_ui->cbxIndirectFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxAirSupport->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_AirSupport);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxMines->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitMine);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxNbcAgent->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitN);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitN;
             alarmsDds.push_back(alarmActionDds);
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitB);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitB;
             alarmsDds.push_back(alarmActionDds);
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitC);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitC;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxManipulation->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Manipulation);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Manipulation;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxGlobalBorderLine->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxLocalBorderLine->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline;
             alarmsDds.push_back(alarmActionDds);
         }
     }
@@ -279,11 +279,11 @@ bool ConfigParticipantsDialog::apply()
 {
     DEBUG_LOG(m_logger) << "apply";
     AlarmManagement::ConfigureAlarmsRequest req;
-    req.participantIds(m_participantVector);
-    req.alarms(getCheckedValues());
-    req.operatorId(m_operatorId);
-    req.global(false);
-    req.remove(false);
+    req.participantIds = m_participantVector;
+    req.alarms = getCheckedValues();
+    req.operatorId = m_operatorId;
+    req.global = false;
+    req.remove = false;
 
     return m_requestHelper->startSingleRequest([req, this]() { return m_almFtc->configureAlarmsRequest(req, this); });
 }
@@ -298,9 +298,9 @@ void ConfigParticipantsDialog::fillCbx()
     ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusDirect, m_typeClass);
     ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusFriendly, m_typeClass);
     m_ui->cbStatusDirect->removeItem(
-        m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
+        m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
     m_ui->cbStatusFriendly->removeItem(
-        m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
+        m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
 }
 
 } // namespace ParticipantAlarms
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
index 9f89efa1c..c6df740a9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
@@ -99,8 +99,8 @@ void ParticipantsDialog::onSelectionChanged()
     for (const QModelIndex& index : currentlySelectedParticipants)
     {
         const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(index));
-        if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
-            m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+        if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
+            m_ppmDtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
             configureAlarms = true;
         DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
     }
@@ -138,13 +138,13 @@ void ParticipantsDialog::onAddButtonClicked()
 
     QModelIndex participantIndex = m_ui->dvParticipants->currentIndex();
     ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex);
-    DEBUG_LOG(m_logger) << "current participantId = " << data.id();
-    m_participantVector.push_back(data.id());
+    DEBUG_LOG(m_logger) << "current participantId = " << data.id;
+    m_participantVector.push_back(data.id);
 
     const auto partData = m_participantModel->getParticipantData(participantIndex);
     addDialog(LtsWidgets::initDialog(new ConfigParticipantsDialog(this), m_ppmDtc, m_almDtc, m_almFtc, partData,
                                      m_participantVector, m_equipmentVector),
-              m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id()));
+              m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id));
 }
 
 void ParticipantsDialog::onPrint()
@@ -168,12 +168,12 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex& parent)
         DEBUG_LOG(m_logger) << "Setting row " << childIndex.row() << " selected";
 
         ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex);
-        DEBUG_LOG(m_logger) << "append participantId = " << data.id();
-        m_participantVector.push_back(data.id());
-        if (data.equipmentNumber().is_set())
+        DEBUG_LOG(m_logger) << "append participantId = " << data.id;
+        m_participantVector.push_back(data.id);
+        if (data.equipmentNumber.has_value())
         {
-            DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get();
-            m_equipmentVector.push_back(data.equipmentNumber().get());
+            DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber.get();
+            m_equipmentVector.push_back(data.equipmentNumber.get());
         }
 
         m_ui->dvParticipants->selectionModel()->select(m_participantProxyModel->mapFromSource(childIndex),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_gui_plugin.h
index 428d6b4cd..bbe2d064b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_gui_plugin.h
@@ -8,6 +8,7 @@
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AlarmManagement/alm_ftc.h>
 #include <AlarmManagement/alm_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp
index a3986188f..d49304806 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp
@@ -37,10 +37,10 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa
                                                  DataModification modType)
 {
     Q_UNUSED(modType);
-    if (data.partyId() != partyId())
+    if (data.partyId != partyId())
         return;
 
-    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
+    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated;
     onReinitModel(partyId());
     emit newData();
 }
@@ -50,17 +50,17 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex& index, bool*
     bool isSimulatable = false;
     const ParticipantManagement::ParticipantData data(getParticipantData(index));
 
-    if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
-        m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+    if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
+        m_dtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
         isSimulatable = true;
 
-    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated()
-                        << " equipmentNo:" << data.equipmentNumber() << " typeId=" << data.typeId()
-                        << " modId=" << data.modId() << " typeClass=" << m_dtc->type(data.typeId()).typeClass()
+    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id << " isSimulated:" << data.isSimulated
+                        << " equipmentNo:" << data.equipmentNumber << " typeId=" << data.typeId
+                        << " modId=" << data.modId << " typeClass=" << m_dtc->type(data.typeId).typeClass
                         << " isSimulatable=" << isSimulatable;
 
     if (bIsSimulated)
-        *bIsSimulated = data.isSimulated();
+        *bIsSimulated = data.isSimulated;
 
     return isSimulatable;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
index 46128d2cf..7299f3e37 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
@@ -96,28 +96,28 @@ void ParticipantShowConfigView::onShowAlarm()
 void ParticipantShowConfigView::onRemoveAlarm()
 {
     DEBUG_LOG(m_logger) << "onRemoveAlarm"
-                        << " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id()
+                        << " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id
                         << " eventTypeId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId()
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId
                         << " operatorId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId()
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId
                         << " participantId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId();
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId;
 
     const QModelIndex curIdx = m_ui->widget->currentIndex();
     if (!curIdx.isValid())
         return;
     const AlarmManagement::AlarmConfig& rowdata = m_configAlarmModel->getRowData(curIdx.row());
-    int operatorId = rowdata.operatorId();
+    int operatorId = rowdata.operatorId;
     std::vector<int32_t> ddsParticipantIds;
-    ddsParticipantIds.push_back(rowdata.participantId());
+    ddsParticipantIds.push_back(rowdata.participantId);
     bool globalEvent = true;
     bool remove = true;
     std::vector<AlarmManagement::AlarmAction> alarmsDds;
     alarmsDds.resize(1);
-    alarmsDds[0].setMarker(false);
-    alarmsDds[0].messageWindow(false);
-    alarmsDds[0].eventTypeId(rowdata.eventTypeId());
+    alarmsDds[0].setMarker = false;
+    alarmsDds[0].messageWindow = false;
+    alarmsDds[0].eventTypeId = rowdata.eventTypeId;
     AlarmManagement::ConfigureAlarmsRequest request(alarmsDds, operatorId, ddsParticipantIds, globalEvent, remove);
 
     m_requestHelper->startSingleRequest([request, this]() {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h
index ebd181123..a6982dc83 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h
@@ -6,7 +6,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm_dtc.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
 #include <AlarmManagement/alm_dtc.h>
 #include <AlarmManagement/alm_ftc.h>
 
@@ -41,7 +41,6 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
     void onPrint();
 
   protected:
-    NGL::INGLLogger& m_logger;
     void onConfigureAlarmsReply(const Core::FunctionReplyObject& replyObject) override final;
 
   private:
@@ -57,7 +56,8 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
     Ui::ParticipantShowConfigView* m_ui;
     LtsUtils::RequestHelper* m_requestHelper;
 
-    AlarmManagement::
+    AlarmManagement::LOGGER_T m_logger;
+
 };
 
 } // namespace ParticipantAlarms
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
index 294446220..943a88083 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
@@ -2,6 +2,7 @@
 
 #include "alm_emergency_call_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h"
 #include "ui_alm_emergency_call_dialog.h"
 
@@ -18,7 +19,8 @@ namespace AlarmManagement
 
 EmergencyCallDialog::EmergencyCallDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
-      m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this))
+      m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -104,10 +106,10 @@ void EmergencyCallDialog::enaDisa()
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, false);
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
 
-    if (!sos.expired())
+    if (!sos.expired)
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, true);
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, true);
@@ -158,7 +160,7 @@ void EmergencyCallDialog::onEditBtCliked()
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
     setAcknowledgeUi();
 
@@ -181,16 +183,16 @@ void EmergencyCallDialog::onFindEmergencyOnMap()
         return;
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
 
-    m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position().lon(), sos.position().lat()));
+    m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position.lon, sos.position.lat));
 }
 
 void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex& index)
 {
     Q_UNUSED(index)
-    emit openInfoDlg(getSelectedSOS().id());
+    emit openInfoDlg(getSelectedSOS().id);
 }
 
 void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
@@ -198,18 +200,18 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0 || sos.expired())
+    if (sos.id <= 0 || sos.expired)
         return;
 
     EmergencyCallAcknowledgeRequest request;
-    request.id(sos.id());
-    request.issi(sos.issi());
-    request.name(sos.name());
-    request.timestamp(QDateTime::currentMSecsSinceEpoch());
-    request.incomingTime(sos.incomingTime());
-    request.expired(true);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    request.comment(comment.toStdString());
+    request.id = sos.id;
+    request.issi = sos.issi;
+    request.name = sos.name;
+    request.timestamp = QDateTime::currentMSecsSinceEpoch();
+    request.incomingTime = sos.incomingTime;
+    request.expired = true;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    request.comment = comment.toStdString();
     m_requestHelper->startSingleRequest(
         [this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
index 0ac366b90..1808bb324 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
@@ -82,9 +82,9 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 
   auto cb = [this](const AlmEmergencyCall &data)
   {
-    if (data.id() <= 0 || data.expired())
+    if (data.id <= 0 || data.expired)
       return;
-    this->showEmergencyCallInfoWindow(data.id());
+    this->showEmergencyCallInfoWindow(data.id);
   };
   m_dtc->almEmergencyCalls(cb);
 
@@ -111,10 +111,10 @@ void InterfaceImpl::onEmergencyCallChanged(const AlmEmergencyCall &data, DataMod
 {
   if (modType != DataModification::eAdded)
     return;
-  if (data.id() <= 0 || data.expired())
+  if (data.id <= 0 || data.expired)
     return;
 
-  this->showEmergencyCallInfoWindow(data.id());
+  this->showEmergencyCallInfoWindow(data.id);
 }
 
 void InterfaceImpl::onOpenInfoDlg(const int &id)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp
index 623fb1799..2cc456eef 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp
@@ -2,6 +2,7 @@
 
 #include "alm_emergency_call_info_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_alm_emergency_call_info_dialog.h"
 
 #include <AlarmManagement/alm_operator_rights.h>
@@ -46,10 +47,11 @@ QImage renderEmergencySymbol(bool expired = false)
 
 EmergencyCallInfoDialog::EmergencyCallInfoDialog(int entryId, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
-      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog)
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
-    m_emergency.id(entryId);
+    m_emergency.id = entryId;
 }
 
 EmergencyCallInfoDialog::~EmergencyCallInfoDialog()
@@ -77,7 +79,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
     m_dtc->enableAlmEmergencyCall();
     m_ftc->enableEmergencyCallAcknowledge();
 
-    m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
+    m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
     setUiValues();
 
     connect(m_dtc.get(), &AlarmManagement::Interface::Dtc::almEmergencyCallChanged, this,
@@ -92,34 +94,34 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
 
 QString EmergencyCallInfoDialog::emergencyIdentifier() const
 {
-    return QStringLiteral("emergency_") + QString::number(m_emergency.id());
+    return QStringLiteral("emergency_") + QString::number(m_emergency.id);
 }
 
 bool EmergencyCallInfoDialog::setUiValues()
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-    if (!m_dtc || !m_ftc || m_emergency.id() < 0)
+    if (!m_dtc || !m_ftc || m_emergency.id < 0)
     {
         ERROR_LOG(m_logger) << " >> unabled to init EmergencyCallInfoDialog";
         return false;
     }
 
-    m_ui->lblEquipNr->setText(QString::number(m_emergency.issi()));
-    m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime())));
-    m_ui->lblStatus->setText(m_emergency.expired()
-                                 ? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted()))
+    m_ui->lblEquipNr->setText(QString::number(m_emergency.issi));
+    m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime)));
+    m_ui->lblStatus->setText(m_emergency.expired
+                                 ? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted))
                                  : QStringLiteral("--"));
-    m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment()));
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position().lon(), m_emergency.position().lat());
+    m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment));
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position.lon, m_emergency.position.lat);
     m_ui->lblPosition->setText(mgrs);
 
     const bool& hasOperatorRightEmergencyCall =
         LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::EmergencyCall);
     m_ui->pbAckEmergency->setIcon(QIcon(QStringLiteral("icon:edit.svg")));
-    m_ui->pbAckEmergency->setEnabled(m_emergency.expired() ? false : true);
+    m_ui->pbAckEmergency->setEnabled(m_emergency.expired ? false : true);
     m_ui->pbAckEmergency->setVisible(hasOperatorRightEmergencyCall);
 
-    QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired()));
+    QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired));
     m_ui->lblIcon->setPixmap(iconPixmap);
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -129,7 +131,7 @@ bool EmergencyCallInfoDialog::setUiValues()
 void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType)
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-    if (data.id() != m_emergency.id() || data.id() == 0)
+    if (data.id != m_emergency.id || data.id == 0)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -149,9 +151,9 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen
 
 void EmergencyCallInfoDialog::onFindEmergencyOnMap()
 {
-    if (!m_sitMapGuiIfc || m_emergency.id() <= 0)
+    if (!m_sitMapGuiIfc || m_emergency.id <= 0)
         return;
-    m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position().lon(), m_emergency.position().lat()));
+    m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position.lon, m_emergency.position.lat));
 }
 
 void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
@@ -191,18 +193,18 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
 
 void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString& comment)
 {
-    if (m_emergency.id() <= 0)
+    if (m_emergency.id <= 0)
         return;
 
     EmergencyCallAcknowledgeRequest request;
-    request.id(m_emergency.id());
-    request.name(m_emergency.name());
-    request.issi(m_emergency.issi());
-    request.timestamp(QDateTime::currentMSecsSinceEpoch());
-    request.incomingTime(m_emergency.incomingTime());
-    request.expired(true);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    request.comment(comment.toStdString());
+    request.id = m_emergency.id;
+    request.name = m_emergency.name;
+    request.issi = m_emergency.issi;
+    request.timestamp = QDateTime::currentMSecsSinceEpoch();
+    request.incomingTime = m_emergency.incomingTime;
+    request.expired = true;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    request.comment = comment.toStdString();
     bool ret = m_requestHelper->startSingleRequest(
         [this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
 
@@ -212,8 +214,8 @@ void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString&
 
 void EmergencyCallInfoDialog::retranslate()
 {
-    m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
-    const QString lbName = tr("SOS_%1").arg(m_emergency.issi());
+    m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
+    const QString lbName = tr("SOS_%1").arg(m_emergency.issi);
     translate(m_ui, lbName);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
index 93148f0be..cd3e9f1b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "alm_emergency_call_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 #include <QtCore/QDateTime>
@@ -24,6 +25,7 @@ EmergencyCallModel::EmergencyCallModel(QObject *parent)
       tr("Comment"),
 }, parent)
   , m_dtc(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
@@ -35,35 +37,35 @@ QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Columns::ID:
-    return almEmergency.id();
+    return almEmergency.id;
   case SAMPLE_TIME:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime);
   case INCOMING_TIME:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime);
   case NAME:
-    return QString::fromStdString(almEmergency.name());
+    return QString::fromStdString(almEmergency.name);
   case ISSI:
-    return almEmergency.issi();
+    return almEmergency.issi;
   case POSITION:
   {
-    if (std::isnan(almEmergency.position().lat()))
+    if (std::isnan(almEmergency.position.lat))
       return tr("---");
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position().lon(), almEmergency.position().lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position.lon, almEmergency.position.lat);
     return mgrs;
   }
   case EXPIRED:
-    return almEmergency.expired();
+    return almEmergency.expired;
   case OPERATION_ID:
   {
-    if (almEmergency.operatorId() == 0)
+    if (almEmergency.operatorId == 0)
       return QStringLiteral("-");
 
-    return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId()).name());
+    return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId).name);
   }
   case DELETED_TIMESTAMP:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted);
   case COMMENT:
-    return QString::fromStdString(almEmergency.comment());
+    return QString::fromStdString(almEmergency.comment);
   default:
     break;
   } 
@@ -89,7 +91,7 @@ bool EmergencyCallModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
 
 void EmergencyCallModel::onAlarmEmergencyCallChanged(const AlarmManagement::AlmEmergencyCall &data, const DataModification modType)
 {
-  const int id = data.id();
+  const int id = data.id;
   int row = findRowForId(id);
   switch (modType)
   {
@@ -148,7 +150,7 @@ bool EmergencyCallProxyModel::filterAcceptsRow(int source_row, const QModelIndex
 bool EmergencyCallProxyModel::checkFilter(int source_row) const
 {
   const auto sos = m_sourceModel->getRowData(source_row);
-  if ((sos.expired() && !showExpired()) || (exerciseStopped() && !sos.expired()))
+  if ((sos.expired && !showExpired()) || (exerciseStopped() && !sos.expired))
     return false;
 
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp
index faa34a56d..924a92f06 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp
@@ -8,16 +8,16 @@
 #include <ChargeEffect/aes_charge_effect_gui_plugin_interface.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AreaEffectSimulation/BCContamination/aes_bccontamination_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Borderline/aes_borderline_gui_plugin_interface.h>
-#include <AreaEffectSimulation/DangerArea/aes_danger_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Explosion/aes_explosion_gui_plugin_interface.h>
-#include <AreaEffectSimulation/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineArea/aes_mine_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
-#include <AreaEffectSimulation/NContamination/aes_ncontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
 
@@ -26,7 +26,7 @@ namespace AreaEffectSimulation
 
 AesChargeEffectItemInfo::AesChargeEffectItemInfo(int chargeEffectId, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(nullptr),
-      m_ChargeEffectId(chargeEffectId), m_ui(new Ui::AesChargeEffectItemInfo)
+      m_ChargeEffectId(chargeEffectId), m_ui(new Ui::AesChargeEffectItemInfo), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -77,8 +77,8 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession* session)
     m_ui->lblOriginatorType->hide();
 #endif
 
-    m_ui->lblOriginatorId->setText(QString::number(data.originatorId()));
-    m_ui->lblOriginatorType->setText(QString::number(data.originatorTypeId().underlying()));
+    m_ui->lblOriginatorId->setText(QString::number(data.originatorId));
+    m_ui->lblOriginatorType->setText(QString::number(static_cast<int>(data.originatorTypeId)));
 
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Charge_Effect"));
 
@@ -93,7 +93,7 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession* session)
 void AesChargeEffectItemInfo::retranslate()
 {
     const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
-    translate(m_ui, tr("ChargeEffect: \"%1\"").arg(QString::fromStdString(item.name()), 1, QLatin1Char('?')));
+    translate(m_ui, tr("ChargeEffect: \"%1\"").arg(QString::fromStdString(item.name), 1, QLatin1Char('?')));
 }
 
 void AesChargeEffectItemInfo::onFindOnMap() const
@@ -111,7 +111,7 @@ template <typename InterfaceType> bool AesChargeEffectItemInfo::tryShowStandardE
     std::shared_ptr<InterfaceType> ifc;
     if (m_session->getForeignGuiInterface<InterfaceType>(ifc))
     {
-        AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(aiv.aesItemId(), this);
+        AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(aiv.aesItemId, this);
         if (dialog)
         {
             addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
@@ -129,11 +129,11 @@ void AesChargeEffectItemInfo::onShowDetails()
 
     const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
 
-    if (item.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+    if (item.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
     {
         AesItemView aiv;
-        m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
-        DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
+        m_aesDtc->aesItemViewFromEntityId(item.originatorId, AreaEffectSimulation::AesType::AtUnknown, aiv);
+        DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id << ", aesType: " << aiv.aesTypeId;
 
         auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
             if (dialog)
@@ -142,7 +142,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             }
         };
 
-        switch (aiv.aesTypeId().underlying())
+        switch (aiv.aesTypeId)
         {
             case AreaEffectSimulation::AesType::AtNContamination: {
                 tryShowStandardEditDialog<AesNContamination::ForeignGuiInterface>(aiv);
@@ -179,11 +179,11 @@ void AesChargeEffectItemInfo::onShowDetails()
                 std::shared_ptr<AesBCContamination::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
                 {
-                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
-                    if (gearClass == ProjectDataManagement::GearClass::Biological)
-                        registerDialog(ifc->showEditWindow(aiv.aesItemId(), false, this));
-                    else if (gearClass == ProjectDataManagement::GearClass::Chemical)
-                        registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
+                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct.chargeTypeId);
+                    if (gearClass == ProjectDataManagement::GearClass::GearClass_Biological)
+                        registerDialog(ifc->showEditWindow(aiv.aesItemId, false, this));
+                    else if (gearClass == ProjectDataManagement::GearClass::GearClass_Chemical)
+                        registerDialog(ifc->showEditWindow(aiv.aesItemId, true, this));
                 }
                 else
                     WARNING_LOG(m_logger)
@@ -194,7 +194,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: {
                 std::shared_ptr<AesMineSingleVirtual::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
-                    registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
+                    registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId, this));
                 else
                     WARNING_LOG(m_logger)
                         << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
@@ -204,7 +204,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: {
                 std::shared_ptr<AesMineSingleVirtual::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
-                    registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
+                    registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId, this));
                 else
                     WARNING_LOG(m_logger)
                         << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
@@ -216,8 +216,8 @@ void AesChargeEffectItemInfo::onShowDetails()
                 if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
                 {
                     const bool isExplosionSingle =
-                        (aiv.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionSingle);
-                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
+                        (aiv.aesTypeId == AreaEffectSimulation::AesType::AtExplosionSingle);
+                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct.chargeTypeId);
 
                     for (auto gc :
                          {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
@@ -228,7 +228,7 @@ void AesChargeEffectItemInfo::onShowDetails()
 
                         if (gearClass == gc)
                         {
-                            registerDialog(ifc->showEditWindow(aiv.aesItemId(), isExplosionSingle, false, gc, this));
+                            registerDialog(ifc->showEditWindow(aiv.aesItemId, isExplosionSingle, false, gc, this));
                             break;
                         }
                     }
@@ -246,8 +246,8 @@ void AesChargeEffectItemInfo::onShowDetails()
                 {
 
                     AesItem ai;
-                    m_aesDtc->aesItemFromId(aiv.aesItemId(), ai);
-                    registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
+                    m_aesDtc->aesItemFromId(aiv.aesItemId, ai);
+                    registerDialog(ifc->showEditWindow(aiv.aesItemId, ai.effectSourceId, this));
                 }
                 else
                     WARNING_LOG(m_logger)
@@ -274,7 +274,7 @@ void AesChargeEffectItemInfo::onShowDetails()
                 break;
             case AreaEffectSimulation::AesType::AtUnknown:
                 Q_ASSERT(false);
-                WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
+                WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId;
                 break;
             default:
                 DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
@@ -298,33 +298,33 @@ void AesChargeEffectItemInfo::onShowDetails()
 
 void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
-    if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id;
+    if (data.id == m_ChargeEffectId && modType != DataModification::eRemoved)
         handleChargeEffect(data);
 }
 
 void AesChargeEffectItemInfo::handleChargeEffect(const ChargeEffect& data)
 {
 
-    m_ui->lblChargeEffectName->setText(QString::fromStdString(data.name()));
+    m_ui->lblChargeEffectName->setText(QString::fromStdString(data.name));
 
-    m_ui->lblEffectStart->setText(DTG::toStringMSec(data.effectStart()));
+    m_ui->lblEffectStart->setText(DTG::toStringMSec(data.effectStart));
 
-    m_ui->lblEffectDuration->setVisible(data.effectDuration() > 0);
-    m_ui->lbxEffectDuration->setVisible(data.effectDuration() > 0);
+    m_ui->lblEffectDuration->setVisible(data.effectDuration > 0);
+    m_ui->lbxEffectDuration->setVisible(data.effectDuration > 0);
 
-    m_ui->lblEffectDuration->setText(LtsWidgets::readableDuration(data.effectDuration()));
+    m_ui->lblEffectDuration->setText(LtsWidgets::readableDuration(data.effectDuration));
 
-    AreaEffectSimulation::AesEffectState st = data.state();
+    AreaEffectSimulation::AesEffectState st = data.state;
     m_ui->lblStatus->setText(AreaEffectSimulation::toString(st));
 
-    m_ui->lblChargeTypeId->setText(QString::number(data.chargeTypeId()));
+    m_ui->lblChargeTypeId->setText(QString::number(data.chargeTypeId));
 
-    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(data.chargeTypeId()));
-    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(data.chargeTypeId()));
+    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(data.chargeTypeId));
+    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(data.chargeTypeId));
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.position().lon(), data.position().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.position.lon, data.position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
index 2e43716e4..eb71fcf2c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
@@ -18,7 +18,7 @@ namespace AreaEffectSimulation
 
 DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_session(nullptr),
-      m_ui(new Ui::DangerAreaAesItemInfo), m_aesItemId(-1)
+      m_ui(new Ui::DangerAreaAesItemInfo), m_aesItemId(-1), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -34,35 +34,35 @@ void DangerAreaAesItemInfo::retranslate()
 {
 
     std::unique_ptr<AesItem> item(new BCContamination(m_dtc->bCContamination(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->bCContamination(m_aesItemId), tr("B/C-Contamination"));
         return;
     }
 
     item.reset(new NContamination(m_dtc->nContamination(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->nContamination(m_aesItemId), tr("N-Contamination"));
         return;
     }
 
     item.reset(new ExplosionArea(m_dtc->explosionArea(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->explosionArea(m_aesItemId), tr("Explosion Area"));
         return;
     }
 
     item.reset(new ExplosionSingle(m_dtc->explosionSingle(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->explosionSingle(m_aesItemId), tr("Single Explosion"));
         return;
     }
 
     item.reset(new MineArea(m_dtc->mineArea(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->mineArea(m_aesItemId), tr("Mine Area"));
         return;
@@ -114,7 +114,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
 {
     AesItem* item;
     item = new BCContamination(m_dtc->bCContamination(aesItemId));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         m_aesItems.insert(aesItemId, AesStruct(AesType::AtBCContamination, item));
         return;
@@ -131,7 +131,7 @@ void DangerAreaAesItemInfo::setText()
 
     for (const AesStruct& aesStruct : std::as_const(m_aesItems))
     {
-        if (aesStruct.item->effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+        if (aesStruct.item->effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
             aesItemInfo(aesStruct.item);
     }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp
index 366704d44..8f2c0e06e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp
@@ -11,18 +11,18 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtilsSettings/settings.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AreaEffectSimulation/BCContamination/aes_bccontamination_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
-#include <AreaEffectSimulation/Borderline/aes_borderline_gui_plugin_interface.h>
-#include <AreaEffectSimulation/DangerArea/aes_danger_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Explosion/aes_explosion_gui_plugin_interface.h>
-#include <AreaEffectSimulation/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineArea/aes_mine_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
-#include <AreaEffectSimulation/NContamination/aes_ncontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <ProjectDataManagement/pdm.hpp>
 #include <ProjectDataManagement/pdm_translation.h>
@@ -34,7 +34,7 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_aesEntityId(aesEntityId),
       m_aesType(aesType), m_bcChargeTypeId(-1), m_singleExpChargeTypeId(-1), m_areaExpChargeTypeId(-1),
       m_session(nullptr), m_dtc(nullptr), m_ftc(nullptr), m_pdmDtc(nullptr), m_ui(new Ui::AesInfoDialog),
-      m_requestHelper(new LtsUtils::RequestHelper(this))
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
     m_ui->setupUi(this);
@@ -64,18 +64,18 @@ void AesInfoDialog::retranslate()
 
 bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView)
 {
-    if (aesItemView.aesItemId() != m_aesEntityId)
+    if (aesItemView.aesItemId != m_aesEntityId)
         return false;
 
     DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
-                        << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
+                        << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId;
 
-    if (aesItemView.aesTypeId() != m_aesType)
+    if (aesItemView.aesTypeId != m_aesType)
     {
 
         return false;
     }
-    switch (aesItemView.aesTypeId().underlying())
+    switch (aesItemView.aesTypeId)
     {
         case AreaEffectSimulation::AesType::AtNContamination: {
             handleNContamination(aesItemView);
@@ -245,7 +245,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView)
             break;
         case AreaEffectSimulation::AesType::AtUnknown:
             WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": "
-                                  << aesItemView.aesTypeId();
+                                  << aesItemView.aesTypeId;
             Q_ASSERT(false);
             break;
     }
@@ -311,7 +311,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession* session, const std::shared_ptr<
 void AesInfoDialog::handleNContamination(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleNContamination(m_dtc->nContamination(m_aesEntityId));
 }
@@ -319,19 +319,19 @@ void AesInfoDialog::handleNContamination(const AesItemView& aesItemView)
 void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtNContamination);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleBCContamination(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
 }
@@ -339,21 +339,21 @@ void AesInfoDialog::handleBCContamination(const AesItemView& aesItemView)
 void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBCContamination);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleBoobyTrap(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
 }
@@ -361,11 +361,11 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView& aesItemView)
 void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBoobyTrap);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_bcChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_bcChargeTypeId, true));
@@ -373,14 +373,14 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data)
     m_ui->lblChargeTypeId->setText(QString::number(m_bcChargeTypeId));
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleOffRouteMine(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
 }
@@ -388,11 +388,11 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView& aesItemView)
 void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtOffRouteMine);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_bcChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_bcChargeTypeId, true));
@@ -401,14 +401,14 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine&
 
     m_ui->lblPosition->show();
     QString mgrs =
-        LtsCoordTrans::mgrsFromGeographic(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
+        LtsCoordTrans::mgrsFromGeographic(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleExplosionArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
 }
@@ -416,19 +416,19 @@ void AesInfoDialog::handleExplosionArea(const AesItemView& aesItemView)
 void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionArea);
 
-    m_areaExpChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_areaExpChargeTypeId = data.chargeStruct.chargeTypeId;
 
-    const Area& area = data.area();
-    if (!qFuzzyCompare(area.cornerBottomLeft().lon(), 0) || !qFuzzyCompare(area.cornerBottomLeft().lat(), 0))
+    const Area& area = data.area;
+    if (!qFuzzyCompare(area.cornerBottomLeft.lon, 0) || !qFuzzyCompare(area.cornerBottomLeft.lat, 0))
     {
         m_ui->lblPosition->show();
-        QPointF bottomLeft(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
+        QPointF bottomLeft(area.cornerBottomLeft.lon, area.cornerBottomLeft.lat);
         const QPointF& center =
-            Polygons::bottomLeft2CenterPoint(bottomLeft, area.width(), area.height(), area.rotation());
+            Polygons::bottomLeft2CenterPoint(bottomLeft, area.width, area.height, area.rotation);
         QString mgrs = LtsCoordTrans::mgrsFromGeographic(center.x(), center.y());
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
@@ -437,66 +437,66 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
 void AesInfoDialog::handleExplosionSingle(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
 }
 
 void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionSingle);
 
-    m_singleExpChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_singleExpChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleMineArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleMineArea(m_dtc->mineArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtMineArea);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.boundingRectCorner().lon(), data.boundingRectCorner().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.boundingRectCorner.lon, data.boundingRectCorner.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 
     bool bResetVisbile =
-        (data.isDus() || data.isConcrete()) &&
+        (data.isDus || data.isConcrete) &&
 
         LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::MineAreasResetDusMines) &&
         ((m_session->app() == LtsAppDescriptor::App::Situation ||
           m_session->app() == LtsAppDescriptor::App::SituationTablet) &&
          (!m_session->isReplayPartition()));
     m_ui->pbResetDusMines->setVisible(bResetVisbile);
-    m_mineIsReactivatable = data.isReactivatable();
-    m_ui->pbResetDusMines->setToolTip(data.isDus() ? tr("Reset DUS Mines matched to this Minearea")
+    m_mineIsReactivatable = data.isReactivatable;
+    m_ui->pbResetDusMines->setToolTip(data.isDus ? tr("Reset DUS Mines matched to this Minearea")
                                                    : tr("Reset Concrete Mines matched to this Minearea"));
 }
 
 void AesInfoDialog::handleMineCorridor(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
 }
 
 void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtMineCorridor);
 
@@ -510,14 +510,14 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor&
 void AesInfoDialog::handleGasPipe(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
 }
 
 void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtGasPipe);
 
@@ -531,23 +531,23 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe& data)
 void AesInfoDialog::handleDangerArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtDangerArea);
 
-    const auto& qv = data.segments();
+    const auto& qv = data.segments;
     if (qv.size() > 0)
     {
         m_ui->lblPosition->show();
         const Core::GeoPosition2D& pos = qv.at(0);
-        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
 
@@ -558,23 +558,23 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea& dat
 void AesInfoDialog::handleBorderline(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleBorderline(m_dtc->borderline(m_aesEntityId));
 }
 
 void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBorderline);
 
-    const auto& qv = data.segments();
+    const auto& qv = data.segments;
     if (qv.size() > 0)
     {
         m_ui->lblPosition->show();
         const Core::GeoPosition2D& pos = qv.at(0);
-        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
 }
@@ -582,30 +582,30 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline& dat
 void AesInfoDialog::handleFunctionalArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtFunctionalArea);
 
     QStringList chargeTypesNames;
     QStringList chargeTypesShortNames;
-    if (data.medicMode() != AesOperatingMode::OmNotUsed)
+    if (data.medicMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(411, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(411, true);
     }
-    if (data.maintMode() != AesOperatingMode::OmNotUsed)
+    if (data.maintMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(412, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(412, true);
     }
-    if (data.deconMode() != AesOperatingMode::OmNotUsed)
+    if (data.deconMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(413, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(413, true);
@@ -614,9 +614,9 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
     m_ui->lblChargeType->setToolTip(chargeTypesShortNames.join(QLatin1String(", ")));
 
     m_ui->lblPosition->show();
-    const QPointF bottomLeft(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
+    const QPointF bottomLeft(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
     const QPointF centerpoint =
-        Polygons::bottomLeft2CenterPoint(bottomLeft, data.area().width(), data.area().height(), 0.0);
+        Polygons::bottomLeft2CenterPoint(bottomLeft, data.area.width, data.area.height, 0.0);
     const QString mgrs = LtsCoordTrans::mgrsFromGeographic(centerpoint.x(), centerpoint.y());
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
@@ -624,25 +624,25 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
 void AesInfoDialog::handleAirSupportImpact(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
 }
 
 void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtAirSupportImpact);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 
     m_ui->lbFlightTime->show();
     m_ui->lblFlightTime->show();
 
-    m_ui->lblFlightTime->setText(LtsWidgets::readableDuration(data.flightTime()));
+    m_ui->lblFlightTime->setText(LtsWidgets::readableDuration(data.flightTime));
 }
 
 void AesInfoDialog::handleMineAraeSingleMine()
@@ -651,14 +651,14 @@ void AesInfoDialog::handleMineAraeSingleMine()
     if (!m_dtc->aesItemViewFromEntityId(0, m_aesType, itemView))
         return;
     const DusMineState dms = m_dtc->dusMineState(0);
-    for (size_t i = 0; i < dms.mines().size(); ++i)
+    for (size_t i = 0; i < dms.mines.size(); ++i)
     {
-        const DusMine& mine = dms.mines().at(i);
-        if (mine.eqId() == m_aesEntityId)
+        const DusMine& mine = dms.mines.at(i);
+        if (mine.eqId == m_aesEntityId)
         {
-            if (itemView.form().size() <= i)
+            if (itemView.form.size() <= i)
                 return;
-            handleMineAraeSingleMine(itemView.form().at(i), mine);
+            handleMineAraeSingleMine(itemView.form.at(i), mine);
             return;
         }
     }
@@ -679,12 +679,12 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     m_ui->lblAesDuration->hide();
     m_ui->pbDetails->hide();
 
-    m_aesEntityName = QString::number(mine.eqId());
+    m_aesEntityName = QString::number(mine.eqId);
 
-    m_ui->lblAesTypeId->setText(QString::number(m_aesType.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(m_aesType)));
     m_ui->lblAesType->setText(toString(m_aesType));
 
-    const int ctId = mine.chargeTypeId();
+    const int ctId = mine.chargeTypeId;
     if (ctId != 0)
     {
         m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(ctId, true));
@@ -699,11 +699,11 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     else
         m_ui->lbAesId->setText(tr("Mine Id:"));
 
-    m_ui->lblAesId->setText(QString::number(mine.eqId()));
+    m_ui->lblAesId->setText(QString::number(mine.eqId));
 
     bool bResetVisible = false;
 
-    if (mine.triggered() && isDus)
+    if (mine.triggered && isDus)
     {
         m_ui->lblStatus->setText(tr("Inactive"));
         if (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::MineAreasResetDusMines)
@@ -723,7 +723,7 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     m_ui->pbResetDusMines->setToolTip(isDus ? tr("Reset DUS Mines matched to this Minearea")
                                             : tr("Reset Concrete Mines matched to this Minearea"));
 
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     m_ui->lblPosition->show();
 
@@ -747,21 +747,21 @@ void AesInfoDialog::handleSingleDusMine()
     m_ui->lblAesDuration->hide();
     m_ui->pbDetails->hide();
 
-    m_aesEntityName = QString::number(dsm.id());
+    m_aesEntityName = QString::number(dsm.id);
 
-    m_ui->lblAesTypeId->setText(QString::number(m_aesType.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(m_aesType)));
     m_ui->lblAesType->setText(toString(m_aesType));
 
-    const int ctId = dsm.chargeStruct().chargeTypeId();
+    const int ctId = dsm.chargeStruct.chargeTypeId;
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(ctId));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(ctId));
     m_ui->lblChargeType->show();
     m_ui->lblChargeTypeId->setText(QString::number(ctId));
 
     m_ui->lbAesId->setText(tr("DUS Mine Id:"));
-    m_ui->lblAesId->setText(QString::number(dsm.id()));
+    m_ui->lblAesId->setText(QString::number(dsm.id));
 
-    switch (dsm.effectStateId().underlying())
+    switch (dsm.effectStateId)
     {
         case AesEffectState::EsExpired:
             m_ui->lblStatus->setText(tr("Inactive"));
@@ -792,7 +792,7 @@ void AesInfoDialog::handleSingleDusMine()
             break;
     }
 
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(dsm.position().lon(), dsm.position().lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(dsm.position.lon, dsm.position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     m_ui->lblPosition->show();
 
@@ -802,18 +802,18 @@ void AesInfoDialog::handleSingleDusMine()
 void AesInfoDialog::handleExplosionCluster(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleExplosionCluster(const ExplosionCluster& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionCluster);
 
-    const int m_explosionClusterChargeTypeId = data.chargeStruct().chargeTypeId();
+    const int m_explosionClusterChargeTypeId = data.chargeStruct.chargeTypeId;
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_explosionClusterChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_explosionClusterChargeTypeId, true));
     m_ui->lblChargeType->show();
@@ -823,32 +823,32 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster& data)
 void AesInfoDialog::handleEffectCluster(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleEffectCluster(const EffectCluster& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtEffectCluster);
 }
 
 void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId)
 {
-    m_aesEntityName = QString::fromStdString(aesData.name());
-    m_aesEffectSource = aesData.effectSourceId();
+    m_aesEntityName = QString::fromStdString(aesData.name);
+    m_aesEffectSource = aesData.effectSourceId;
 
-    m_ui->lblAesItemId->setText(QString::number(aesData.id()));
+    m_ui->lblAesItemId->setText(QString::number(aesData.id));
 
-    m_ui->lblAesTypeId->setText(QString::number(aesTypeId.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(aesTypeId)));
     const ProjectDataManagement::GearClass gearClass =
-        m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct().chargeTypeId());
-    switch (gearClass.underlying())
+        m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct.chargeTypeId);
+    switch (gearClass)
     {
-        case ProjectDataManagement::GearClass::Biological:
-        case ProjectDataManagement::GearClass::Chemical:
+        case ProjectDataManagement::GearClass::GearClass_Biological:
+        case ProjectDataManagement::GearClass::GearClass_Chemical:
             m_ui->lblAesType->setText(ProjectDataManagement::toString(gearClass));
             break;
         default:
@@ -857,28 +857,28 @@ void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId)
 
     m_ui->lblAesName->setText(m_aesEntityName);
 
-    if (aesData.effectStart().is_set())
-        m_ui->lblAesStart->setText(DTG::toStringMSec(aesData.effectStart().get()));
+    if (aesData.effectStart.has_value())
+        m_ui->lblAesStart->setText(DTG::toStringMSec(aesData.effectStart.get()));
     else
         m_ui->lblAesStart->setText(tr("None"));
 
-    if (aesData.effectDuration() == 0)
+    if (aesData.effectDuration == 0)
     {
         m_ui->lbAesDuration->hide();
         m_ui->lblAesDuration->hide();
     }
-    if (aesTypeId == AesType::AtEffectCluster && aesData.effectDuration() == DEFAULT_EFFECT_DURATION)
+    if (aesTypeId == AesType::AtEffectCluster && aesData.effectDuration == DEFAULT_EFFECT_DURATION)
         m_ui->lblAesDuration->setText(QStringLiteral("---"));
     else
-        m_ui->lblAesDuration->setText(LtsWidgets::readableDuration(aesData.effectDuration()));
+        m_ui->lblAesDuration->setText(LtsWidgets::readableDuration(aesData.effectDuration));
 
-    AreaEffectSimulation::AesEffectState st = aesData.effectStateId();
+    AreaEffectSimulation::AesEffectState st = aesData.effectStateId;
     m_ui->lblStatus->setText(toString(st));
 
-    m_ui->lblChargeTypeId->setText(QString::number(aesData.chargeStruct().chargeTypeId()));
+    m_ui->lblChargeTypeId->setText(QString::number(aesData.chargeStruct.chargeTypeId));
 
-    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(aesData.chargeStruct().chargeTypeId()));
-    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(aesData.chargeStruct().chargeTypeId()));
+    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(aesData.chargeStruct.chargeTypeId));
+    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(aesData.chargeStruct.chargeTypeId));
 }
 
 void AesInfoDialog::onFindOnMap()
@@ -895,7 +895,7 @@ void AesInfoDialog::onShowDetails()
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
-    switch (m_aesType.underlying())
+    switch (m_aesType)
     {
         case AreaEffectSimulation::AesType::AtNContamination: {
             std::shared_ptr<AesNContamination::ForeignGuiInterface> ifc;
@@ -916,7 +916,7 @@ void AesInfoDialog::onShowDetails()
             if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
             {
                 const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_bcChargeTypeId);
-                if (gearClass == ProjectDataManagement::GearClass::Biological)
+                if (gearClass == ProjectDataManagement::GearClass::GearClass_Biological)
                 {
                     AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, false, this);
                     if (dialog)
@@ -925,7 +925,7 @@ void AesInfoDialog::onShowDetails()
                     break;
                 }
 
-                if (gearClass == ProjectDataManagement::GearClass::Chemical)
+                if (gearClass == ProjectDataManagement::GearClass::GearClass_Chemical)
                 {
                     AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, true, this);
                     if (dialog)
@@ -1162,118 +1162,118 @@ bool AesInfoDialog::onResetDusMines()
 
 void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleNContamination(data);
 }
 
 void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data,
                                              DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBCContamination(data);
 }
 
 void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBoobyTrap(data);
 }
 
 void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleOffRouteMine(data);
 }
 
 void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionArea(data);
 }
 
 void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle& data,
                                              DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionSingle(data);
 }
 
 void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleMineArea(data);
 }
 
 void AesInfoDialog::onMineCorridorChanged(const MineCorridor& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleMineCorridor(data);
 }
 
 void AesInfoDialog::onGasPipeChanged(const GasPipe& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleGasPipe(data);
 }
 
 void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleDangerArea(data);
 }
 
 void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBorderline(data);
 }
 
 void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleFunctionalArea(data);
 }
 
 void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleAirSupportImpact(data);
 }
 
 void AesInfoDialog::onDusMineStateChanged(const DusMineState& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
 
     if (modType == DataModification::eRemoved)
         return;
-    if (data.id() != 0)
+    if (data.id != 0)
         return;
 
     AesItemView itemView;
     if (!m_dtc->aesItemViewFromEntityId(0, m_aesType, itemView))
         return;
 
-    for (size_t i = 0; i < data.mines().size(); ++i)
+    for (size_t i = 0; i < data.mines.size(); ++i)
     {
-        const DusMine& mine = data.mines().at(i);
-        if (mine.eqId() == m_aesEntityId)
+        const DusMine& mine = data.mines.at(i);
+        if (mine.eqId == m_aesEntityId)
         {
-            if (itemView.form().size() <= i)
+            if (itemView.form.size() <= i)
                 return;
-            handleMineAraeSingleMine(itemView.form().at(i), mine);
+            handleMineAraeSingleMine(itemView.form.at(i), mine);
             return;
         }
     }
@@ -1281,22 +1281,22 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState& data, DataModifica
 
 void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleSingleDusMine();
 }
 
 void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionCluster(data);
 }
 
 void AesInfoDialog::onEffectClusterChanged(const EffectCluster& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleEffectCluster(data);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CustomView/aes_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CustomView/aes_air_support_impact.cpp
index 87f560091..d830a0b73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CustomView/aes_air_support_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CustomView/aes_air_support_impact.cpp
@@ -61,17 +61,17 @@ bool CustomViewAirSupportImpact::init(const QModelIndex &idx)
 bool CustomViewAirSupportImpact::calculateIcon(const AirSupportImpact &asi, const QColor &color)
 {
   Database::AesAirSupportImpact dbAsi;
-  dbAsi.impactPosition = QPointF(asi.impactPosition().lon(), asi.impactPosition().lat());
+  dbAsi.impactPosition = QPointF(asi.impactPosition.lon, asi.impactPosition.lat);
 
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> pdmDtc;
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
     return false;
 
-  double radius = pdmDtc->impactRadius(asi.chargeStruct().chargeTypeId(),
-                                       asi.chargeStruct().igniterTypeId(),
-                                       asi.chargeStruct().igniterFunctionId());
+  double radius = pdmDtc->impactRadius(asi.chargeStruct.chargeTypeId,
+                                       asi.chargeStruct.igniterTypeId,
+                                       asi.chargeStruct.igniterFunctionId);
   QPolygonF poly = AreaEffectSimulation::Polygons::airSupportImpact(dbAsi, radius);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_list.h
index 1ef93df63..1193807c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include "aes_air_support_9liner_model.h"
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp
index 6a1e8760c..97e953f89 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp
@@ -48,36 +48,36 @@ QVariant AirSupport9LinerModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ParticipantId:
-    return item.participantId();
+    return item.participantId;
   case Participant:
   {
     if (!m_ppmDtc)
       return QString();
-    return m_ppmDtc->hierarchyFromParticipant(item.participantId());
+    return m_ppmDtc->hierarchyFromParticipant(item.participantId);
   }
   case Timestamp:
-    return QDateTime::fromMSecsSinceEpoch(item.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(item.sampleTime);
   case AttackHeading:
   {
-    if (item.finalAttackHeading() < 0)
+    if (item.finalAttackHeading < 0)
       return QVariant();
-    if (item.finalAttackHeadingHigh() < 0)
+    if (item.finalAttackHeadingHigh < 0)
       return tr("%1 degree")
-          .arg(item.finalAttackHeading());
+          .arg(item.finalAttackHeading);
     return tr("%1 degree (low: %2 degree, high: %3 degreee)", "degree as symbol!")
-        .arg(item.finalAttackHeading())
-        .arg(item.finalAttackHeadingLow())
-        .arg(item.finalAttackHeadingHigh());
+        .arg(item.finalAttackHeading)
+        .arg(item.finalAttackHeadingLow)
+        .arg(item.finalAttackHeadingHigh);
   }
   case TargetPosition:
   {
-    if (std::isnan(item.targetPosition().lat()))
+    if (std::isnan(item.targetPosition.lat))
       return tr("---");
-    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition().lon(),
-                                                                                    item.targetPosition().lat()));
+    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition.lon,
+                                                                                    item.targetPosition.lat));
     QString ret = coord.mgrs();
-    if (item.targetPosition().z() > 0)
-      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition().z()));
+    if (item.targetPosition.z > 0)
+      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition.z));
     return ret;
   }
   }
@@ -131,7 +131,7 @@ bool AirSupport9LinerProxyModel::filterAcceptsRow(int source_row, const QModelIn
     return true;
 
   const qint64 m_offset = 5 * 60 * 1000; 
-  if ((data.sampleTime() + m_offset) > m_session->partitionTime())
+  if ((data.sampleTime + m_offset) > m_session->partitionTime())
     return true;
   return false;
 }
@@ -150,27 +150,27 @@ bool AirSupport9LinerProxyModel::lessThan(const QModelIndex &source_left, const
   switch (source_left.column())
   {
   case AirSupport9LinerModel::ParticipantId:
-    if (left.participantId() != right.participantId())
-      return left.participantId() < right.participantId();
-    return left.sampleTime() < right.sampleTime();
+    if (left.participantId != right.participantId)
+      return left.participantId < right.participantId;
+    return left.sampleTime < right.sampleTime;
   case AirSupport9LinerModel::Participant:
   {
     const auto l = source_left.data();
     const auto r = source_right.data();
     if (l != r)
       return LtsUtils::lessThan(l, r);
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
   }
   case AirSupport9LinerModel::Timestamp:
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
   case AirSupport9LinerModel::AttackHeading:
-    if (left.finalAttackHeading() != right.finalAttackHeading())
-      return left.finalAttackHeading() < right.finalAttackHeading();
-    if (left.finalAttackHeadingLow() != right.finalAttackHeadingLow())
-      return left.finalAttackHeadingLow() < right.finalAttackHeadingLow();
-    if (left.finalAttackHeadingHigh() != right.finalAttackHeadingHigh())
-      return left.finalAttackHeadingHigh() < right.finalAttackHeadingHigh();
-    return left.sampleTime() < right.sampleTime();
+    if (left.finalAttackHeading != right.finalAttackHeading)
+      return left.finalAttackHeading < right.finalAttackHeading;
+    if (left.finalAttackHeadingLow != right.finalAttackHeadingLow)
+      return left.finalAttackHeadingLow < right.finalAttackHeadingLow;
+    if (left.finalAttackHeadingHigh != right.finalAttackHeadingHigh)
+      return left.finalAttackHeadingHigh < right.finalAttackHeadingHigh;
+    return left.sampleTime < right.sampleTime;
   }
   return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
index d149abd6f..3f44ee21e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <GuezNasat/gna_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsSession/lts_session.h>
 #include <QtCore/QSortFilterProxyModel>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_gui_plugin.h
index 6b07e94ec..82e30b50d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include <GuezNasat/gna_data_plugin_interface.h>
 #include "aes_air_support_gui_plugin_interface.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp
index 25622d131..2920058eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp
@@ -107,7 +107,7 @@ void AirSupportExplosionClusterImpactList::createModel()
 {
   m_model = new AesItemSortFilterProxyModelTmpl<EffectCluster>(m_session, this);
 
-  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::AirSupport}, this);
+  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::GearClass_AirSupport}, this);
   m_effectClusterModel->initModel(m_session);
   m_model->setSourceModel(m_effectClusterModel);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.h
index 16b64f375..6358a3079 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
-#include <AreaEffectSimulation/Explosion/aes_effect_cluster_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h>
 #include "aes_air_support_impact_model.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_model.h
index c7ea43149..7d2c254e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp
index 75eb0f8d0..09d428611 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp
@@ -66,19 +66,19 @@ bool CustomViewBCContamination::init(const QModelIndex &idx)
 bool CustomViewBCContamination::calculateIcon(const BCContamination &bcContamination, const QColor &color)
 {
   Database::AesBCContamination bcContaOut;
-  bcContaOut.id = bcContamination.id();
-  bcContaOut.chargeTypeId = bcContamination.chargeStruct().chargeTypeId();
-  bcContaOut.effectStart = QDateTime::fromMSecsSinceEpoch(bcContamination.effectStart().is_set() ? bcContamination.effectStart().get() : 0);
-  bcContaOut.impactPosition = QPointF(bcContamination.impactPosition().lon(), bcContamination.impactPosition().lat());
-  bcContaOut.impactRadius = bcContamination.impactRadius();
-  bcContaOut.propagationDirection = bcContamination.propagationDirection();
+  bcContaOut.id = bcContamination.id;
+  bcContaOut.chargeTypeId = bcContamination.chargeStruct.chargeTypeId;
+  bcContaOut.effectStart = QDateTime::fromMSecsSinceEpoch(bcContamination.effectStart.has_value() ? bcContamination.effectStart.get() : 0);
+  bcContaOut.impactPosition = QPointF(bcContamination.impactPosition.lon, bcContamination.impactPosition.lat);
+  bcContaOut.impactRadius = bcContamination.impactRadius;
+  bcContaOut.propagationDirection = bcContamination.propagationDirection;
 
   const QPolygonF poly = AreaEffectSimulation::Polygons::bcContamination(bcContaOut,
-                                                                         ProjectDataManagement::VolatilityType::get_default(),
-                                                                         bcContamination.impactRadius(),
+                                                                         ProjectDataManagement::VolatilityType::Unknown,
+                                                                         bcContamination.impactRadius,
                                                                          QDateTime::currentDateTime());
 
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bcContamination.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bcContamination.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
index 27e876514..9bfbb4002 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
@@ -4,7 +4,7 @@
 #include "aes_bccontamination_info.h"
 #include "ui_aes_bccontamination_info.h"
 
-#include <AreaEffectSimulation/Base/InfoView/aes_base_info.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/QDateTime>
@@ -33,13 +33,13 @@ bool BCContaminationInfo::setData(const BCContamination *item)
 {
   m_ui->wBaseData->setData(item);
 
-  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius()));
-  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition().lon(), item->impactPosition().lat()));
-  m_ui->lblPropagationDirection->setText(tr("%1° = %2 mil").arg(item->propagationDirection(),               0, 'f', 2)
-                                         .arg(item->propagationDirection() * 6400 / 360.0, 0, 'f', 0));
-  m_ui->lblWindSpeed->setText(QString::number(item->windSpeed(), 'f', 2));
-  m_ui->lblWeatherTimestamp->setText(QDateTime::fromMSecsSinceEpoch(item->weatherTimestamp()).toString());
-  m_ui->lblWeatherPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->weatherPosition().lon(), item->weatherPosition().lat()));
+  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius));
+  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition.lon, item->impactPosition.lat));
+  m_ui->lblPropagationDirection->setText(tr("%1° = %2 mil").arg(item->propagationDirection,               0, 'f', 2)
+                                         .arg(item->propagationDirection * 6400 / 360.0, 0, 'f', 0));
+  m_ui->lblWindSpeed->setText(QString::number(item->windSpeed, 'f', 2));
+  m_ui->lblWeatherTimestamp->setText(QDateTime::fromMSecsSinceEpoch(item->weatherTimestamp).toString());
+  m_ui->lblWeatherPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->weatherPosition.lon, item->weatherPosition.lat));
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp
index ec0a25f2d..93aae29b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp
@@ -69,8 +69,8 @@ BCContaminationEdit::BCContaminationEdit(const QString &menuGroup, bool isChemic
 
   
   
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), AesWeatherSource::AwsDynamic);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), AesWeatherSource::AwsStatic);
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), static_cast<int>(AesWeatherSource::AwsDynamic));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), static_cast<int>(AesWeatherSource::AwsStatic));
 
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
   const bool enableShowMeteoDataStations = ps->value(QStringLiteral("mdm"),
@@ -132,15 +132,15 @@ void BCContaminationEdit::enableUiElements(bool enable)
 
   m_ui->cbWeather->setEnabled(enable);
   m_ui->pbClear->setEnabled(enable);
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->bCContamination(m_aesItem.id());
+    auto baseData = m_dtc->bCContamination(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -193,8 +193,8 @@ bool BCContaminationEdit::init(int aesItemId, bool copy,
 
   auto cb = [this](const DangerAreaCorrelatedAesItem &item)
   {
-    if (item.aesItemId() == m_aesItem.id())
-      m_dangerAreaIds << item.dangerAreaId();
+    if (item.aesItemId == m_aesItem.id)
+      m_dangerAreaIds << item.dangerAreaId;
   };
   m_dtc->dangerAreaCorrelatedAesItems(cb);
   setPbDangerAreaText();
@@ -211,8 +211,8 @@ bool BCContaminationEdit::init(int aesItemId, bool copy,
 
   auto cbDangerArea = [this](const DangerArea  &data)
   {
-    if (data.effectStateId() != AesEffectState::EsRemoved && data.associatedAesId() == m_aesItem.id())
-      m_associatedDangerId = data.id();
+    if (data.effectStateId != AesEffectState::EsRemoved && data.associatedAesId == m_aesItem.id)
+      m_associatedDangerId = data.id;
   };
   m_dtc->dangerAreas(cbDangerArea);
   if (m_associatedDangerId)
@@ -229,7 +229,7 @@ void BCContaminationEdit::setPbDangerAreaText()
   sl.reserve(m_dangerAreaIds.size());
   for (int idx : std::as_const(m_dangerAreaIds))
   {
-    sl << QString::fromStdString(m_dtc->dangerArea(idx).name());
+    sl << QString::fromStdString(m_dtc->dangerArea(idx).name);
   }
   m_ui->pbDangerArea->setEnabled(sl.size());
   m_ui->pbDangerArea->setText(sl.join(QStringLiteral(", ")));
@@ -237,14 +237,14 @@ void BCContaminationEdit::setPbDangerAreaText()
 
 void BCContaminationEdit::onDangerAreaChanged(const DangerAreaCorrelatedAesItem &data, DataModification modType)
 {
-  if (data.aesItemId() != m_aesItem.id())
+  if (data.aesItemId != m_aesItem.id)
     return;
 
   if (modType == DataModification::eAdded)
-    m_dangerAreaIds += data.dangerAreaId();
+    m_dangerAreaIds += data.dangerAreaId;
 
   if (modType == DataModification::eRemoved)
-    m_dangerAreaIds -= data.dangerAreaId();
+    m_dangerAreaIds -= data.dangerAreaId;
   
 
   setPbDangerAreaText();
@@ -259,7 +259,7 @@ void BCContaminationEdit::onPbDangerAreaClicked()
   if (!m_session->getForeignGuiInterface<ForeignInfoGuiInterface>(infoGuiInterface))
     return;
 
-  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo(m_dangerAreaIds, {m_aesItem.id()});
+  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo(m_dangerAreaIds, {m_aesItem.id});
 
   addDialog(dialog, m_menuGroup, tr("Danger Areas for %1 %2").arg(m_isChemical ? tr("C-Contamination") : tr("B-Contamination"), m_ui->leIdentifier->text()), LtsWidgets::LayoutArea::eInfoTab);
 }
@@ -269,23 +269,23 @@ void BCContaminationEdit::setData(const BCContamination &contamination, bool cop
   m_aesItem = contamination;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart().is_set() ? contamination.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct().chargeTypeId()));  
-  m_ui->sbDurationHours->setValue(contamination.effectDuration() / 1000 / 60/ 60); 
-  m_ui->sbRadius->setValue(contamination.impactRadius());
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(contamination.partyId().is_set() ? contamination.partyId().get() : 0));
-  m_ui->cbWeather->setCurrentIndex(contamination.weatherSource().underlying());
+  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart.has_value() ? contamination.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct.chargeTypeId));  
+  m_ui->sbDurationHours->setValue(contamination.effectDuration / 1000 / 60/ 60); 
+  m_ui->sbRadius->setValue(contamination.impactRadius);
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(contamination.partyId.has_value() ? contamination.partyId.get() : 0));
+  m_ui->cbWeather->setCurrentIndex(static_cast<int>(contamination.weatherSource));
 
-  QPointF impactPosition(contamination.impactPosition().lon(), contamination.impactPosition().lat());
+  QPointF impactPosition(contamination.impactPosition.lon, contamination.impactPosition.lat);
   if (!impactPosition.isNull())
     m_ui->positionEdit->setCoordinate(impactPosition);
 
-  m_ui->sbAltitude->setValue(contamination.upperOffset());
-  m_ui->cbLowerLimit->setChecked(qFuzzyIsNull(contamination.lowerOffset()));
+  m_ui->sbAltitude->setValue(contamination.upperOffset);
+  m_ui->cbLowerLimit->setChecked(qFuzzyIsNull(contamination.lowerOffset));
 
 }
 
@@ -341,9 +341,9 @@ bool BCContaminationEdit::apply()
   const Core::GeoPosition2D pos(p.x(), p.y());
 
 
-  const BCContaminationModifyRequest req(m_aesItem.id(),
+  const BCContaminationModifyRequest req(m_aesItem.id,
                                          name,
-                                         LtsUtils::toOptional(effectStart),
+                                         LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                          duration,
                                          chargeType,
                                          pos,
@@ -354,18 +354,18 @@ bool BCContaminationEdit::apply()
                                          dds::core::optional<double>(),
                                          dds::core::optional<double>(),
                                          dds::core::optional<Core::GeoPosition2D>(),
-                                         dds::core::optional<rti::core::int64>(),
-                                         dds::core::optional<rti::core::int64>(),
+                                         dds::core::optional<int64_t>(),
+                                         dds::core::optional<int64_t>(),
                                          extrusionHeight,
                                          lowerOffset,
                                          m_ui->chbDangerArea->isChecked());
 
   INFO_LOG(m_logger) << "apply "
                      << " extrusionHeight=" << extrusionHeight
-                     << " req.upperOffset=" << req.upperOffset()
+                     << " req.upperOffset=" << req.upperOffset
                      << " lowerOf"
                         "fset=" << lowerOffset
-                     << " req.lowerOffset=" << req.lowerOffset();
+                     << " req.lowerOffset=" << req.lowerOffset;
 
   m_requestHelper->addRequest([this,req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.h
index 8e463fa60..ba9dfea87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 
 
@@ -29,8 +29,8 @@ public:
   QString dialogIdentifier() const override
   {
     if (m_isChemical)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddCContamination") : QStringLiteral("EditCContamination%1").arg(m_aesItem.id());
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddBContamination") : QStringLiteral("EditBContamination%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddCContamination") : QStringLiteral("EditCContamination%1").arg(m_aesItem.id);
+    return m_aesItem.id <= 0 ? QStringLiteral("AddBContamination") : QStringLiteral("EditBContamination%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin.h
index 008bf6b8a..224dfaac2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_bccontamination_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_list.h
index c43eea3db..0a578ccb1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
index 7b2161960..fd74e8495 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QtCore/QSet>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt
index 615c2e8b2..a51102cd3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt
@@ -36,6 +36,11 @@ NGL_WRAP_UI(aes_base_gui_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
+# aes_base_edit.h includes LtsWidgets/ui_requirement.h (a handwritten header, not a
+# UI file). Qt6's strict AUTOUIC auto-scan then demands a requirement.ui that does not
+# exist and fails the autogen step. The real .ui files are wrapped explicitly above via
+# NGL_WRAP_UI (qt6_wrap_ui), so disable the auto-scan (same approach as LtsWidgets).
+set_target_properties(AesBaseGui PROPERTIES AUTOUIC OFF)
 NGL_TARGET_INCLUDE_DIRECTORIES(AesBaseGui
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
index d4ca2c006..0994fa7e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
@@ -71,23 +71,23 @@ bool BaseInfo::setData(const AesItem *item)
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc) || !pdmDtc )
     return false;
 
-  setEffectDuration(item->effectDuration());
-  m_ui->lblIdentifier->setText(QString::fromStdString(item->name().c_str()));
-  m_ui->lblChargeType->setText(pdmDtc->trChargeTypeShortName(item->chargeStruct().chargeTypeId(), true));
-  m_ui->lblChargeType->setToolTip(pdmDtc->trChargeTypeName(item->chargeStruct().chargeTypeId(), true));
-  m_ui->lblEffectState->setText(AreaEffectSimulation::toString(item->effectStateId()));
+  setEffectDuration(item->effectDuration);
+  m_ui->lblIdentifier->setText(QString::fromStdString(item->name.c_str()));
+  m_ui->lblChargeType->setText(pdmDtc->trChargeTypeShortName(item->chargeStruct.chargeTypeId, true));
+  m_ui->lblChargeType->setToolTip(pdmDtc->trChargeTypeName(item->chargeStruct.chargeTypeId, true));
+  m_ui->lblEffectState->setText(AreaEffectSimulation::toString(item->effectStateId));
 
 
-  setEffectStart(item->effectStart().is_set() ? item->effectStart().get() : 0);
+  setEffectStart(item->effectStart.has_value() ? item->effectStart.get() : 0);
 
-  if (item->participantId().is_set())
+  if (item->participantId.has_value())
   {
     if (!ppmDtc)
-      m_ui->lblParticipant->setText(tr("ID: %1").arg(item->participantId().get()));
+      m_ui->lblParticipant->setText(tr("ID: %1").arg(item->participantId.get()));
     else
     {
-      ParticipantManagement::Participant participant = ppmDtc->participant(item->partyId().get());
-      m_ui->lblParticipant->setText(QString::fromStdString(participant.name()));
+      ParticipantManagement::Participant participant = ppmDtc->participant(item->partyId.get());
+      m_ui->lblParticipant->setText(QString::fromStdString(participant.name));
     }
   }
   else
@@ -96,14 +96,14 @@ bool BaseInfo::setData(const AesItem *item)
     m_ui->lbxParticipant->hide();
   }
 
-  if (item->partyId().is_set())
+  if (item->partyId.has_value())
   {
     if (!ppmDtc)
-      m_ui->lblParty->setText(tr("ID: %1").arg(item->partyId().get()));
+      m_ui->lblParty->setText(tr("ID: %1").arg(item->partyId.get()));
     else
     {
-      ParticipantManagement::Party party = ppmDtc->party(item->partyId().get());
-      m_ui->lblParty->setText(ParticipantManagement::trPartyName(party.name()));
+      ParticipantManagement::Party party = ppmDtc->party(item->partyId.get());
+      m_ui->lblParty->setText(ParticipantManagement::trPartyName(party.name));
     }
   }
   else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
index c8f900a83..0e4b813c7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
@@ -22,7 +22,7 @@ BaseEdit::BaseEdit(const QString& menuGroup, const QString& loggerName, QWidget*
       m_sitMapGuiIfc(nullptr), m_ppmGuiCbxIfc(nullptr), m_session(nullptr), m_menuGroup(menuGroup),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(getLogger(loggerName))
 {
-    m_aesItem.id(0);
+    m_aesItem.id = 0;
     connect(this, &BaseEdit::visibilityChanged, this, &BaseEdit::onVisibilityChanged);
 }
 
@@ -50,7 +50,7 @@ void BaseEdit::onAesItemModifyReply(const Core::FunctionReplyObject& replyObject
 
 bool BaseEdit::isModifiable() const
 {
-    AesEffectState effectState = m_aesItem.effectStateId();
+    AesEffectState effectState = m_aesItem.effectStateId;
     return (effectState == AreaEffectSimulation::AesEffectState::EsPaused ||
             effectState == AreaEffectSimulation::AesEffectState::EsActivated ||
             effectState == AreaEffectSimulation::AesEffectState::EsPrepared ||
@@ -62,7 +62,7 @@ bool BaseEdit::isModifiable() const
 
 bool BaseEdit::isOnlyNameModifiable() const
 {
-    AesEffectState effectState = m_aesItem.effectStateId();
+    AesEffectState effectState = m_aesItem.effectStateId;
     return (effectState == AreaEffectSimulation::AesEffectState::EsPaused ||
             effectState == AreaEffectSimulation::AesEffectState::EsActivated) &&
            (!m_session->isReplayPartition()) && (m_session->app() != LtsAppDescriptor::App::OC);
@@ -166,10 +166,10 @@ void BaseEdit::setEffectStartEnabled(LtsWidgets::LtsDateTimeEdit* dte, bool enab
         m_session->getDtc<ExerciseManagement::DataInterface>(exmDtc);
         ExerciseManagement::Exercise exercise = exmDtc->exercise(exerciseId);
 
-        enable = (exercise.state() == ExerciseManagement::ExerciseState::Started ||
-                  exercise.state() == ExerciseManagement::ExerciseState::Paused);
+        enable = (exercise.state == ExerciseManagement::ExerciseState::Started ||
+                  exercise.state == ExerciseManagement::ExerciseState::Paused);
 
-        if (exercise.state() == ExerciseManagement::ExerciseState::Created)
+        if (exercise.state == ExerciseManagement::ExerciseState::Created)
             dte->setChecked(false);
         else
             dte->setChecked(dte->msecsSinceEpoch() > 0);
@@ -217,7 +217,7 @@ void BaseEdit::setCoordinates(const std::vector<Core::GeoPosition2D>& coords)
     clearCoordinates();
     const auto cWidgets(coordWidgets());
     for (size_t i = 0; i < cWidgets.size() && i < static_cast<size_t>(coords.size()); ++i)
-        cWidgets.at(i)->setCoordinate(coords.at(i).lon(), coords.at(i).lat());
+        cWidgets.at(i)->setCoordinate(coords.at(i).lon, coords.at(i).lat);
 }
 
 std::vector<Core::GeoPosition2D> BaseEdit::getCoordinates() const
@@ -265,10 +265,10 @@ void BaseEdit::enabledCoordinates(bool enable)
 void BaseEdit::onAreaChanged(const AesItem& data, DataModification modType)
 {
 
-    if (data.id() != m_aesItem.id())
+    if (data.id != m_aesItem.id)
         return;
 
-    if (modType == DataModification::eRemoved || data.effectStateId() == AesEffectState::EsRemoved)
+    if (modType == DataModification::eRemoved || data.effectStateId == AesEffectState::EsRemoved)
     {
 
         __unchange__();
@@ -287,7 +287,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession* session)
         return false;
     }
     m_session = session;
-    m_aesItem.id(aesItemId);
+    m_aesItem.id = aesItemId;
 
     if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_dtc))
         return false;
@@ -302,7 +302,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession* session)
 
     if (aesItemId == 0)
     {
-        m_aesItem.effectSourceId(ProjectDataManagement::EffectSource::ES_Internal);
+        m_aesItem.effectSourceId = ProjectDataManagement::EffectSource::ES_Internal;
         m_buttonBox->setText(LtsWidgets::DialogButton::Ok, tr("Add"));
     }
 
@@ -311,8 +311,8 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession* session)
 
 double BaseEdit::distance(const Core::GeoPosition2D& p1, const Core::GeoPosition2D& p2)
 {
-    LtsCoordTrans::UtmCoordinate start = LtsCoordTrans::UtmCoordinate::fromGeographic(p1.lon(), p1.lat());
-    LtsCoordTrans::UtmCoordinate end = LtsCoordTrans::UtmCoordinate::fromGeographic(p2.lon(), p2.lat(), start.zone);
+    LtsCoordTrans::UtmCoordinate start = LtsCoordTrans::UtmCoordinate::fromGeographic(p1.lon, p1.lat);
+    LtsCoordTrans::UtmCoordinate end = LtsCoordTrans::UtmCoordinate::fromGeographic(p2.lon, p2.lat, start.zone);
     double dx = start.x - end.x;
     double dy = start.y - end.y;
     return std::sqrt(dx * dx + dy * dy);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h
index ecc3b91e2..2a91a5b2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h
@@ -7,7 +7,7 @@
 #include <AreaEffectSimulation/logger.h>
 #include <AreaEffectSimulation/aes.hpp>
 #include <LtsWidgets/lts_dialog.h>
-#include <LtsWidgets/requirement_widget.h>
+#include <LtsWidgets/ui_requirement.h>
 
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp
index aaea755b4..d02f3c5bd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "aes_base_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -15,7 +16,8 @@
 namespace AreaEffectSimulation
 {
 
-AesGuiBasHelpers::AesGuiBasHelpers() : m_aesDtc(nullptr), m_pdmDtc(nullptr), m_ppmDtc(nullptr) {}
+AesGuiBasHelpers::AesGuiBasHelpers() : m_aesDtc(nullptr), m_pdmDtc(nullptr), m_ppmDtc(nullptr)                                                                                                , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+{}
 
 bool AesGuiBasHelpers::initModel(LtsSession::LtsSession* session)
 {
@@ -38,24 +40,24 @@ bool AesGuiBasHelpers::initModel(LtsSession::LtsSession* session)
 
 QVariant AesGuiBasHelpers::stringFromPartyId(const dds::core::optional<int>& id) const
 {
-    if (!id.is_set())
+    if (!id.has_value())
         return QObject::tr("---");
     auto it = m_partyNames.find(id.get());
     if (it != m_partyNames.end())
         return it.value();
-    const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(id.get()).name());
+    const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(id.get()).name);
     m_partyNames.insert(id.get(), name);
     return name;
 }
 
 QIcon AesGuiBasHelpers::iconFromPartyId(const dds::core::optional<int>& id) const
 {
-    if (!id.is_set() || !m_ppmGuiCbxIfc)
+    if (!id.has_value() || !m_ppmGuiCbxIfc)
         return QIcon();
     auto it = m_partyIcons.find(id.get());
     if (it != m_partyIcons.end())
         return it.value();
-    const QRgb col = QRgb(m_ppmDtc->party(id.get()).color());
+    const QRgb col = QRgb(m_ppmDtc->party(id.get()).color);
     const QIcon icon = m_ppmGuiCbxIfc->pixmapFromParty(col);
     m_partyIcons.insert(id.get(), icon);
     return icon;
@@ -63,7 +65,7 @@ QIcon AesGuiBasHelpers::iconFromPartyId(const dds::core::optional<int>& id) cons
 
 QVariant AesGuiBasHelpers::hierarchyFromParticipantId(const dds::core::optional<int>& id) const
 {
-    if (!id.is_set())
+    if (!id.has_value())
         return QObject::tr("---");
     auto it = m_participantHierarchy.find(id.get());
     if (it != m_participantHierarchy.end())
@@ -109,7 +111,9 @@ void AesGuiBasHelpers::updateEffectStateComboboxFilterData(bool bWithPause)
     {
         if (!bWithPause && es == AesEffectState::EsPaused)
             continue;
-        cfd.data = es;
+        // Qt6 removed Qt5's QVariant template operator=, so store the enum via setValue
+        // (requires the Q_DECLARE_METATYPE added to aes_base_model.h).
+        cfd.data.setValue(es);
         cfd.text = AreaEffectSimulation::toString(es);
         cfc.data.push_back(cfd);
     }
@@ -134,7 +138,7 @@ void AesGuiBasHelpers::updateComboboxFilterData(const QSet<int>& availablePartyI
     for (const int i : std::as_const(availablePartyIds))
     {
         cfd.data = i;
-        cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name());
+        cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name);
         cfd.icon = iconFromPartyId(i);
         cfc.data.push_back(cfd);
     }
@@ -164,7 +168,7 @@ void AesGuiBasHelpers::fillAvailableChargeIds(ProjectDataManagement::GearClass g
     m_availableChargeIds.clear();
     const QVector<ProjectDataManagement::ChargeType> availableCharges = m_pdmDtc->chargesForGearClass(gc);
     for (const auto& charge : availableCharges)
-        m_availableChargeIds += charge.id();
+        m_availableChargeIds += charge.id;
 
     if (m_availableChargeIds.isEmpty())
         m_availableChargeIds += 0;
@@ -178,7 +182,7 @@ void AesGuiBasHelpers::fillAvailableChargeIds(const QVector<ProjectDataManagemen
     {
         const QVector<ProjectDataManagement::ChargeType>& availableCharges = m_pdmDtc->chargesForGearClass(gc);
         for (const auto& charge : std::as_const(availableCharges))
-            m_availableChargeIds += charge.id();
+            m_availableChargeIds += charge.id;
     }
 
     if (m_availableChargeIds.isEmpty())
@@ -192,7 +196,7 @@ AesItemSortFilterProxyModel::AesItemSortFilterProxyModel(LtsSession::LtsSession*
     if (m_session->getDtc<ParticipantManagement::DataInterface>(ppmDtc))
     {
         auto cb = [this](const ParticipantManagement::Party& party) {
-            m_partyColors[party.id()] = QColor::fromRgb(QRgb(party.color()));
+            m_partyColors[party.id] = QColor::fromRgb(QRgb(party.color));
         };
         ppmDtc->partys(cb);
     }
@@ -236,11 +240,11 @@ bool AesItemSortFilterProxyModel::lessThan(const QModelIndex& source_left, const
         case AesGuiBasHelpers::BcEffectStart: {
             const auto effectStartLeft = aesEffectStart(source_left.row());
             const auto effectStartRight = aesEffectStart(source_right.row());
-            if (effectStartLeft.is_set() && effectStartRight.is_set())
+            if (effectStartLeft.has_value() && effectStartRight.has_value())
                 return effectStartLeft.get() < effectStartRight.get();
-            if (effectStartRight.is_set())
+            if (effectStartRight.has_value())
                 return true;
-            if (effectStartLeft.is_set())
+            if (effectStartLeft.has_value())
                 return false;
             return aesId(source_left.row()) < aesId(source_right.row());
         }
@@ -307,10 +311,10 @@ bool AesItemSortFilterProxyModel::checkFilter(int source_row) const
 
     const auto effectStart = aesEffectStart(source_row);
     qint64 effectEnd = 0;
-    if (effectStart.is_set())
+    if (effectStart.has_value())
         effectEnd = effectStart.get() + aesEffectDuration(source_row);
 
-    if (effectStart.is_set() && effectEnd + m_offset > m_session->partitionTime())
+    if (effectStart.has_value() && effectEnd + m_offset > m_session->partitionTime())
         return true;
 
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
index 17b99a755..40a3ca732 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
@@ -22,6 +22,12 @@
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
+// Qt6's QVariant no longer has Qt5's permissive template operator, so a scoped
+// enum must be registered to be stored in / retrieved from a QVariant. The effect-state
+// combobox filter (ComboboxFilterData::data) and the model's ComboboxFilterRole both
+// hold AesEffectState in a QVariant for filtering, so register the meta-type here.
+Q_DECLARE_METATYPE(AreaEffectSimulation::AesEffectState)
+
 const static int DEFAULT_EFFECT_DURATION = 777777;
 
 namespace LtsSession
@@ -141,9 +147,9 @@ protected:
     QSet<int> availablePartyIds;
     for (const T &data : std::as_const(AesGuiBaseModel::m_vecData))
     {
-      availabelChargeIds.insert(data.chargeStruct().chargeTypeId());
-      if (data.partyId().is_set())
-        availablePartyIds.insert(data.partyId().get());
+      availabelChargeIds.insert(data.chargeStruct.chargeTypeId);
+      if (data.partyId.has_value())
+        availablePartyIds.insert(data.partyId.get());
     }
     updateComboboxFilterData(availablePartyIds, availabelChargeIds);
   }
@@ -195,22 +201,22 @@ protected:
       case BcIsCentral:
         return QVariant();
       case BcChargeType:
-        return QObject::tr("Id: %1").arg(item.chargeStruct().chargeTypeId());
+        return QObject::tr("Id: %1").arg(item.chargeStruct.chargeTypeId);
       case BcEffectDuration:
       {
-        if (item.effectDuration() == DEFAULT_EFFECT_DURATION)
+        if (item.effectDuration == DEFAULT_EFFECT_DURATION)
           return QStringLiteral("---");
         else
-          return QObject::tr("%1 secs").arg(QString::number(item.effectDuration() / 1000.0, 'f', 3));
+          return QObject::tr("%1 secs").arg(QString::number(item.effectDuration / 1000.0, 'f', 3));
       }
       case BcEffectState:
-        return QObject::tr("Id: %1").arg(item.effectStateId().underlying());
+        return QObject::tr("Id: %1").arg(static_cast<int>(item.effectStateId));
       case BcEffectSource:
-        return QObject::tr("Id: %1").arg(item.effectSourceId().underlying());
+        return QObject::tr("Id: %1").arg(static_cast<int>(item.effectSourceId));
       case BcParty:
-        return QObject::tr("Id: %1").arg(item.partyId().is_set() ? item.partyId().get() : -1);
+        return QObject::tr("Id: %1").arg(item.partyId.has_value() ? item.partyId.get() : -1);
       case BcParticipant:
-        return QObject::tr("Id: %1").arg(item.participantId().is_set() ? item.participantId().get() : -1);
+        return QObject::tr("Id: %1").arg(item.participantId.has_value() ? item.participantId.get() : -1);
       }
     }
 
@@ -219,28 +225,28 @@ protected:
       switch (column)
       {
       case BcId:
-        return item.id();
+        return item.id;
       case BcName:
-        return QString::fromUtf8(item.name().c_str());
+        return QString::fromUtf8(item.name.c_str());
       case BcChargeType:
-        return chargeTypeName(item.chargeStruct().chargeTypeId());
+        return chargeTypeName(item.chargeStruct.chargeTypeId);
       case BcEffectDuration:
-        if (item.effectDuration() == DEFAULT_EFFECT_DURATION)
+        if (item.effectDuration == DEFAULT_EFFECT_DURATION)
           return QStringLiteral("---");
         else
-          return LtsWidgets::readableDuration(item.effectDuration());
+          return LtsWidgets::readableDuration(item.effectDuration);
       case BcEffectStart:
-        return item.effectStart().is_set() ? DTG::toStringMSec(item.effectStart().get()) : QObject::tr("---");      
+        return item.effectStart.has_value() ? DTG::toStringMSec(item.effectStart.get()) : QObject::tr("---");      
       case BcEffectState:
-        return AreaEffectSimulation::toString(item.effectStateId());
+        return AreaEffectSimulation::toString(item.effectStateId);
       case BcEffectSource:
-        return ProjectDataManagement::toString(item.effectSourceId());
+        return ProjectDataManagement::toString(item.effectSourceId);
       case BcParty:
-        return stringFromPartyId(item.partyId());
+        return stringFromPartyId(item.partyId);
       case BcParticipant:
-        return hierarchyFromParticipantId(item.participantId());
+        return hierarchyFromParticipantId(item.participantId);
       case BcIsCentral:
-        return simulationTypeText(item.isCentral());
+        return simulationTypeText(item.isCentral);
       }
       return QVariant();
     }
@@ -250,7 +256,7 @@ protected:
       switch (column)
       {
       case BcParty:
-        return iconFromPartyId(item.partyId());
+        return iconFromPartyId(item.partyId);
       default:
         break;
       }
@@ -262,13 +268,17 @@ protected:
       switch (column)
       {
       case BcChargeType:
-        return item.chargeStruct().chargeTypeId();
+        return item.chargeStruct.chargeTypeId;
       case BcEffectState:
-        return item.effectStateId().underlying();
+        // Qt6 cannot implicitly construct a QVariant from a scoped enum; use the
+        // meta-type-aware helper (needs the Q_DECLARE_METATYPE above). A free
+        // qVariantFromValue is not visible at this template's definition point, so
+        // use the QVariant::fromValue member instead.
+        return QVariant::fromValue(item.effectStateId);
       case BcParty:
-        return item.partyId().is_set() ? item.partyId().get() : -1;
+        return item.partyId.has_value() ? item.partyId.get() : -1;
       case BcIsCentral:
-        return simulationTypeText(item.isCentral());
+        return simulationTypeText(item.isCentral);
       default:
         break;
       }
@@ -284,7 +294,7 @@ public:
 protected:
   bool isFiltered(const T &data, DataModification modType) const override
   {
-    if (!m_availableChargeIds.isEmpty() && !m_availableChargeIds.contains(data.chargeStruct().chargeTypeId()))
+    if (!m_availableChargeIds.isEmpty() && !m_availableChargeIds.contains(data.chargeStruct.chargeTypeId))
       return true;
     return LtsWidgets::LtsAbstractTableModel<T>::isFiltered(data, modType);
   }
@@ -342,10 +352,10 @@ public:
   }
   T aesItem(int row) const { return m_sourceModel->aesItem(row); }
 
-  int aesId(int row) const override { return aesItem(row).id(); }
+  int aesId(int row) const override { return aesItem(row).id; }
   bool isExpired(int row) const override
   {
-    const auto es = aesItem(row).effectStateId();
+    const auto es = aesItem(row).effectStateId;
     
     return es != AreaEffectSimulation::AesEffectState::EsCreated &&
         es != AreaEffectSimulation::AesEffectState::EsPrepared &&
@@ -355,14 +365,14 @@ public:
   }
   bool isExternal(int row) const override
   {
-    return aesItem(row).externalId() > 0;
+    return aesItem(row).externalId > 0;
   }
 protected:
-  AesEffectState aesEffectStateId(int row) const override { return aesItem(row).effectStateId(); }
-  ProjectDataManagement::EffectSource aesEffectSourceId(int row) const override { return aesItem(row).effectSourceId(); }
-  dds::core::optional<rti::core::int64> aesEffectStart(int row) const override { return aesItem(row).effectStart(); }
-  int32_t aesEffectDuration(int row) const  override { return aesItem(row).effectDuration(); }
-  virtual int32_t partyId(int row) const override { return aesItem(row).partyId().is_set()?aesItem(row).partyId().get():-1; }
+  AesEffectState aesEffectStateId(int row) const override { return aesItem(row).effectStateId; }
+  ProjectDataManagement::EffectSource aesEffectSourceId(int row) const override { return aesItem(row).effectSourceId; }
+  dds::core::optional<rti::core::int64> aesEffectStart(int row) const override { return aesItem(row).effectStart; }
+  int32_t aesEffectDuration(int row) const  override { return aesItem(row).effectDuration; }
+  virtual int32_t partyId(int row) const override { return aesItem(row).partyId.has_value()?aesItem(row).partyId.get():-1; }
 
   AesGuiBaseModel<T> *m_sourceModel = nullptr;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
index d3be4e2bb..fdc4a6b97 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
@@ -1,6 +1,7 @@
 
 
 #include "aes_itemlist.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "aes_base_model.h"
 #include "ui_aes_itemlist.h"
@@ -27,6 +28,7 @@ AesItemList::AesItemList(const QString& menuGroup, QWidget* parent)
       m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this)), m_showExpired(false),
       m_bHasAddEditOperatorRights(true), m_bHasAddAdlerOperatorRights(false), m_session(nullptr),
       m_ui(new Ui::AesItemList)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -174,15 +176,15 @@ void AesItemList::onAdlerBtn()
 
     DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState;
 
-    switch (aesEffectState.underlying())
+    switch (aesEffectState)
     {
         case AreaEffectSimulation::AesEffectState::EsReceived: {
-            switch (effectSource.underlying())
+            switch (effectSource)
             {
                 case ProjectDataManagement::EffectSource::ES_ADLER: {
                     AcknowledgeExternalAesItemRequest req;
                     int aesId = model()->aesId(currentRow());
-                    req.aesId(aesId);
+                    req.aesId = aesId;
                     m_requestHelper->startSingleRequest(
                         [req, this]() { return m_ftc->acknowledgeExternalAesItemRequest(req, this); });
 
@@ -191,7 +193,7 @@ void AesItemList::onAdlerBtn()
                 default: {
                     ExplosionClusterReleaseReceivedRequest req;
                     int aesId = model()->aesId(currentRow());
-                    req.id(aesId);
+                    req.id = aesId;
                     m_requestHelper->startSingleRequest(
                         [req, this]() { return m_ftc->explosionClusterReleaseReceivedRequest(req, this); });
                     break;
@@ -206,10 +208,10 @@ void AesItemList::onAdlerBtn()
                 effectSource == ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE)
             {
                 AreaEffectSimulation::SetAesItemEffectorStateRequest req;
-                req.aesId(model()->aesId(currentRow()));
-                req.newEffectorState(AesEffectorState::EsReadyToFire);
-                DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId()
-                                    << ", AesEffectorState: " << req.newEffectorState();
+                req.aesId = model()->aesId(currentRow());
+                req.newEffectorState = AesEffectorState::EsReadyToFire;
+                DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId
+                                    << ", AesEffectorState: " << req.newEffectorState;
 
                 m_requestHelper->startSingleRequest(
                     [req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); });
@@ -227,7 +229,7 @@ void AesItemList::onHandleAdler()
     DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState;
     auto* adlerBtn = m_buttonBox->getButton(ADLER_BTN);
 
-    switch (aesEffectState.underlying())
+    switch (aesEffectState)
     {
         case AreaEffectSimulation::AesEffectState::EsReceived: {
             adlerBtn->setText(tr("Mark received"));
@@ -238,11 +240,11 @@ void AesItemList::onHandleAdler()
         case AreaEffectSimulation::AesEffectState::EsCreated:
         case AreaEffectSimulation::AesEffectState::EsPrepared: {
             ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow());
-            if (effectSource.underlying() == ProjectDataManagement::EffectSource::ES_ADLER ||
-                effectSource.underlying() == ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE)
+            if (effectSource == ProjectDataManagement::EffectSource::ES_ADLER ||
+                effectSource == ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE)
             {
                 const EffectCluster& ecData = m_dtc->effectCluster(model()->aesId(currentRow()));
-                if (ecData.effectorState() == AreaEffectSimulation::AesEffectorState::EsNotReadyToFire)
+                if (ecData.effectorState == AreaEffectSimulation::AesEffectorState::EsNotReadyToFire)
                 {
                     adlerBtn->setText(tr("Ready To Fire"));
                     adlerBtn->show();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp
index d8446e74b..b901b90cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp
@@ -33,7 +33,7 @@ QPixmap PixmapLabel::scaledPixmap(const QSize &size, const Qt::AspectRatioMode &
 
 Qt::BrushStyle PixmapLabel::checkForBrushStyle(const AesEffectState &state)
 {
-  switch(state.underlying()) 
+  switch(state) 
   {
   case AesEffectState::EsUnknown:
     return Qt::BrushStyle::NoBrush;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CustomView/aes_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CustomView/aes_borderline.cpp
index 740703820..c77b62df7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CustomView/aes_borderline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CustomView/aes_borderline.cpp
@@ -45,15 +45,15 @@ bool CustomViewBorderline::init(const QModelIndex &idx)
 
 bool CustomViewBorderline::calculateIcon(const AreaEffectSimulation::Borderline &line, const QColor &color)
 {
-  if (line.segments().size() == 0)
+  if (line.segments.size() == 0)
     return false;
 
   QVector<QPointF> segments;
-  segments.reserve(line.segments().size());
+  segments.reserve(line.segments.size());
   int setZone = -1;
-  for (const Core::GeoPosition2D &s : line.segments())
+  for (const Core::GeoPosition2D &s : line.segments)
   {
-    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon(), s.lat(), setZone));
+    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon, s.lat, setZone));
     if (setZone < 0)
       setZone = coord.zone;
     segments.append(QPointF(coord.x, coord.y));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
index 1c83fd3b5..d8a00f275 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
@@ -83,15 +83,15 @@ void BorderlineEdit::enableUiElements(bool enable)
 
 
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->borderline(m_aesItem.id());
+    auto baseData = m_dtc->borderline(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -148,26 +148,26 @@ bool BorderlineEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess
 
 void BorderlineEdit::setData(const Borderline &borderline, bool copy)
 {
-  DEBUG_LOG(m_logger) << LOGFUNCTION << "borderlineId: " << borderline.id()
-                      << " operatorId: " << borderline.operatorId();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << "borderlineId: " << borderline.id
+                      << " operatorId: " << borderline.operatorId;
 
   m_aesItem = borderline;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(borderline.name()));
-  if ( borderline.partyId().is_set())
-    m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(borderline.partyId().get()));
-  m_ui->lbBorderlineId->setText(QString::number(borderline.id()));
+  m_ui->leIdentifier->setText(QString::fromStdString(borderline.name));
+  if ( borderline.partyId.has_value())
+    m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(borderline.partyId.get()));
+  m_ui->lbBorderlineId->setText(QString::number(borderline.id));
 
-  if (borderline.operatorId() > 0)
+  if (borderline.operatorId > 0)
     m_ui->cbLocalBorderline->setChecked(true);
   else
     m_ui->cbLocalBorderline->setChecked(false);
 
-  setCoordinates(borderline.segments());
+  setCoordinates(borderline.segments);
 } 
 
 
@@ -226,7 +226,7 @@ bool BorderlineEdit::apply()
                             LtsSessionData::LtsSessionData::getInstance()->getOperatorId() :
                             0);
 
-  const BorderlineModifyRequest req(m_aesItem.id(),
+  const BorderlineModifyRequest req(m_aesItem.id,
                                     operatorId,
                                     m_ui->cbParty->currentData().toInt(),
                                     m_ui->leIdentifier->text().toStdString(),
@@ -252,7 +252,7 @@ QByteArray BorderlineEdit::borderlineToJson()
 
   QJsonObject obj;
   obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AESBorderlineEdit);
-  obj[QStringLiteral("id")] = m_aesItem.id();
+  obj[QStringLiteral("id")] = m_aesItem.id;
   obj[QStringLiteral("operatorId")] = operatorId;
   obj[QStringLiteral("cbParty")] = m_ui->cbParty->currentData().toInt();
   obj[QStringLiteral("leIdentifier")] = m_ui->leIdentifier->text();
@@ -262,8 +262,8 @@ QByteArray BorderlineEdit::borderlineToJson()
   for (const Core::GeoPosition2D &segment : segments)
   {
     QJsonObject innerSeg;
-    innerSeg[QStringLiteral("lat")] = segment.lat();
-    innerSeg[QStringLiteral("lon")] = segment.lon();
+    innerSeg[QStringLiteral("lat")] = segment.lat;
+    innerSeg[QStringLiteral("lon")] = segment.lon;
 
     arrSeg += innerSeg;
   }
@@ -280,31 +280,31 @@ Borderline BorderlineEdit::jsonToBorderline(const QByteArray &content)
   const QJsonDocument doc(QJsonDocument::fromJson(content));
   const QJsonObject obj(doc.object());
 
-  borderline.chargeStruct().chargeTypeId(obj[QStringLiteral("chargeTypeId")].toInt());
-  borderline.effectDuration(obj[QStringLiteral("effectDuration")].toDouble());
-  borderline.effectMarkingInTa(obj[QStringLiteral("effectMarkingInTa")].toInt());
-  borderline.effectStart(obj[QStringLiteral("effectStart")].toDouble());
+  borderline.chargeStruct.chargeTypeId = obj[QStringLiteral("chargeTypeId")].toInt();
+  borderline.effectDuration = obj[QStringLiteral("effectDuration")].toDouble();
+  borderline.effectMarkingInTa = obj[QStringLiteral("effectMarkingInTa")].toInt();
+  borderline.effectStart = obj[QStringLiteral("effectStart")].toDouble();
   int effectStateId = obj[QStringLiteral("effectStateId")].toInt();
-  borderline.effectStateId(static_cast<AreaEffectSimulation::AesEffectState>(effectStateId));
-  borderline.operatorId(obj[QStringLiteral("operatorId")].toInt());
-  borderline.id(0);
-  borderline.name(obj[QStringLiteral("leIdentifier")].toString().toStdString());
+  borderline.effectStateId = static_cast<AreaEffectSimulation::AesEffectState>(effectStateId);
+  borderline.operatorId = obj[QStringLiteral("operatorId")].toInt();
+  borderline.id = 0;
+  borderline.name = obj[QStringLiteral("leIdentifier")].toString().toStdString();
   if (obj.contains(QStringLiteral("participantId")) )
-    borderline.participantId(obj[QStringLiteral("participantId")].toDouble());
+    borderline.participantId = obj[QStringLiteral("participantId")].toDouble();
   if (obj.contains(QStringLiteral("partyId")) )
-    borderline.partyId(obj[QStringLiteral("partyId")].toDouble());
-  borderline.sampleTime(obj[QStringLiteral("sampleTime")].toDouble());
+    borderline.partyId = obj[QStringLiteral("partyId")].toDouble();
+  borderline.sampleTime = obj[QStringLiteral("sampleTime")].toDouble();
 
   
   const QJsonArray arrSeg = (obj.value(QStringLiteral("segments")).toArray());
-  borderline.segments().reserve(arrSeg.size());
+  borderline.segments.reserve(arrSeg.size());
   for (const auto &ele : arrSeg)
   {
     const QJsonObject objSeg(ele.toObject());
     Core::GeoPosition2D segment;
-    segment.lat(objSeg[QStringLiteral("lat")].toDouble());
-    segment.lon(objSeg[QStringLiteral("lon")].toDouble());
-    borderline.segments().push_back(std::move(segment));
+    segment.lat = objSeg[QStringLiteral("lat")].toDouble();
+    segment.lon = objSeg[QStringLiteral("lon")].toDouble();
+    borderline.segments.push_back(std::move(segment));
   }
   
 
@@ -343,7 +343,7 @@ void BorderlineEdit::onImportButtonClicked()
     {
       Borderline borderline = jsonToBorderline(content);
       setData( borderline, true);
-      setCoordinates(borderline.segments());
+      setCoordinates(borderline.segments);
       QPolygonF coordinates = getCoordinatesQPointF();
 
       onPolylineData(coordinates);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.h
index c72563038..bd537f105 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
@@ -37,7 +37,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddBorderline") : QStringLiteral("EditBorderline%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddBorderline") : QStringLiteral("EditBorderline%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin.h
index d4142950b..36e7e144b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_borderline_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.cpp
index 90060b252..465defc86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.cpp
@@ -156,13 +156,13 @@ void BorderlineList::onImportButtonClicked()
       for(const auto &borderline : requests)
       {
         BorderlineModifyRequest request;
-        request.id(0);
-        request.name(borderline.name());
-        request.operatorId(borderline.operatorId());
-        if (borderline.partyId().is_set())
-          request.partyId(borderline.partyId().get());
-        request.name(borderline.name());
-        request.segments(borderline.segments());
+        request.id = 0;
+        request.name = borderline.name;
+        request.operatorId = borderline.operatorId;
+        if (borderline.partyId.has_value())
+          request.partyId = borderline.partyId.get();
+        request.name = borderline.name;
+        request.segments = borderline.segments;
         m_requestHelper->startSingleRequest([this, request]()
         {
           return m_ftc->borderlineModifyRequest(request, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.h
index 90f59e512..35937a0cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include "aes_borderlines_model.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
index 0f4fabb38..f3f359e76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
@@ -59,7 +59,7 @@ QVariant BorderlinesModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ColOperatorId:
-    if (item.operatorId() == 0)
+    if (item.operatorId == 0)
       return tr("Global");
     return tr("Local");
   default:
@@ -72,8 +72,8 @@ QVariant BorderlinesModel::data(const QModelIndex &index, int role) const
 bool BorderlinesModel::isFiltered(const Borderline &data, DataModification modType) const
 {
   
-  if ((data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) &&
-      (data.operatorId() != 0))
+  if ((data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) &&
+      (data.operatorId != 0))
     return true;
   return AesGuiBaseModel::isFiltered(data, modType);
 
@@ -92,29 +92,29 @@ QByteArray BorderlinesModel::borderlinesToJson()
     QJsonObject inner;
     const Borderline &borderline = m_vecData.at(row);
 
-    inner[QStringLiteral("chargeTypeId")] = borderline.chargeStruct().chargeTypeId();
-    inner[QStringLiteral("effectDuration")] = borderline.effectDuration();
-    inner[QStringLiteral("effectMarkingInTa")] = borderline.effectMarkingInTa();
+    inner[QStringLiteral("chargeTypeId")] = borderline.chargeStruct.chargeTypeId;
+    inner[QStringLiteral("effectDuration")] = borderline.effectDuration;
+    inner[QStringLiteral("effectMarkingInTa")] = borderline.effectMarkingInTa;
     
-    inner[QStringLiteral("effectStateId")] = borderline.effectStateId().underlying();
-    inner[QStringLiteral("id")] = borderline.id();
-    inner[QStringLiteral("isDeleted")] = borderline.isDeleted();
-    inner[QStringLiteral("isUsed")] = borderline.isUsed();
-    inner[QStringLiteral("name")] = QString::fromStdString(borderline.name());
-    inner[QStringLiteral("operatorId")] = borderline.operatorId();
-    if ( borderline.participantId().is_set())
-      inner[QStringLiteral("participantId")] = borderline.participantId().get();
-    if ( borderline.partyId().is_set())
-      inner[QStringLiteral("partyId")] = borderline.partyId().get();
-    inner[QStringLiteral("sampleTime")] = borderline.sampleTime();
+    inner[QStringLiteral("effectStateId")] = static_cast<int>(borderline.effectStateId);
+    inner[QStringLiteral("id")] = borderline.id;
+    inner[QStringLiteral("isDeleted")] = borderline.isDeleted;
+    inner[QStringLiteral("isUsed")] = borderline.isUsed;
+    inner[QStringLiteral("name")] = QString::fromStdString(borderline.name);
+    inner[QStringLiteral("operatorId")] = borderline.operatorId;
+    if ( borderline.participantId.has_value())
+      inner[QStringLiteral("participantId")] = borderline.participantId.get();
+    if ( borderline.partyId.has_value())
+      inner[QStringLiteral("partyId")] = borderline.partyId.get();
+    inner[QStringLiteral("sampleTime")] = static_cast<double>(borderline.sampleTime);
 
     arrSeg = {};
-    for (const Core::GeoPosition2D &segment : borderline.segments())
+    for (const Core::GeoPosition2D &segment : borderline.segments)
     {
       QJsonObject innerSeg;
 
-      innerSeg[QStringLiteral("lat")] = segment.lat();
-      innerSeg[QStringLiteral("lon")] = segment.lon();
+      innerSeg[QStringLiteral("lat")] = segment.lat;
+      innerSeg[QStringLiteral("lon")] = segment.lon;
 
       arrSeg += innerSeg;
     }
@@ -139,31 +139,31 @@ QVector<Borderline> BorderlinesModel::jsonToBorderlineVector(const QByteArray &c
   {
     const QJsonObject objArr(ele.toObject());
     Borderline borderline;
-    borderline.chargeStruct().chargeTypeId(objArr[QStringLiteral("chargeTypeId")].toInt());
-    borderline.effectDuration(objArr[QStringLiteral("effectDuration")].toDouble());
-    borderline.effectMarkingInTa(objArr[QStringLiteral("effectMarkingInTa")].toInt());
-    borderline.effectStart(objArr[QStringLiteral("effectStart")].toDouble());
+    borderline.chargeStruct.chargeTypeId = objArr[QStringLiteral("chargeTypeId")].toInt();
+    borderline.effectDuration = objArr[QStringLiteral("effectDuration")].toDouble();
+    borderline.effectMarkingInTa = objArr[QStringLiteral("effectMarkingInTa")].toInt();
+    borderline.effectStart = objArr[QStringLiteral("effectStart")].toDouble();
     int effectStateId = objArr[QStringLiteral("effectStateId")].toInt();
-    borderline.effectStateId(static_cast<AreaEffectSimulation::AesEffectState>(effectStateId));
-    borderline.operatorId(objArr[QStringLiteral("operatorId")].toInt());
-    borderline.id(0);
-    borderline.name(objArr[QStringLiteral("name")].toString().toStdString());
+    borderline.effectStateId = static_cast<AreaEffectSimulation::AesEffectState>(effectStateId);
+    borderline.operatorId = objArr[QStringLiteral("operatorId")].toInt();
+    borderline.id = 0;
+    borderline.name = objArr[QStringLiteral("name")].toString().toStdString();
     if (objArr.contains(QStringLiteral("participantId")) )
-      borderline.participantId(objArr[QStringLiteral("participantId")].toDouble());
+      borderline.participantId = objArr[QStringLiteral("participantId")].toDouble();
     if (objArr.contains(QStringLiteral("partyId")) )
-      borderline.partyId(objArr[QStringLiteral("partyId")].toDouble());
-    borderline.sampleTime(objArr[QStringLiteral("sampleTime")].toDouble());
+      borderline.partyId = objArr[QStringLiteral("partyId")].toDouble();
+    borderline.sampleTime = objArr[QStringLiteral("sampleTime")].toDouble();
 
     
     const QJsonArray arrSeg = (objArr.value(QStringLiteral("segments")).toArray());
-    borderline.segments().reserve(arrSeg.size());
+    borderline.segments.reserve(arrSeg.size());
     for (const auto &seg : arrSeg)
     {
       const QJsonObject objSeg(seg.toObject());
       Core::GeoPosition2D segment;
-      segment.lat(objSeg[QStringLiteral("lat")].toDouble());
-      segment.lon(objSeg[QStringLiteral("lon")].toDouble());
-      borderline.segments().push_back(std::move(segment));
+      segment.lat = objSeg[QStringLiteral("lat")].toDouble();
+      segment.lon = objSeg[QStringLiteral("lon")].toDouble();
+      borderline.segments.push_back(std::move(segment));
     }
     
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.h
index 3ea1bc655..ea1872516 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
index 95c493179..49b6c0941 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
@@ -21,7 +21,7 @@ namespace AreaEffectSimulation
 
 ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr), m_sourceModel(nullptr),
-      m_session(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::ChargeAdministrationList)
+      m_session(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::ChargeAdministrationList), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp
index 513ab3bfe..3092c43af 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp
@@ -48,7 +48,7 @@ void ChargeAdministrationAdlerSortFilterProxyModel::setParty(int party)
 ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<ChargeAdministrationAdler>(
           {tr("Id"), tr("Charge Type Id"), tr("Changed"), tr("Charge Type Name"), tr("Total Stock"), tr("Gear Class")},
-          parent)
+          parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -78,7 +78,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession* session)
 
     for (const ParticipantManagement::Party& p : std::as_const(parties))
     {
-        updateItem(p.id());
+        updateItem(p.id);
     }
 
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged, this,
@@ -99,7 +99,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
             DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
             updateParticipantChargeTypeMap(data);
 
-            updateItem(m_ppmDtc->participant(data.participantId()).partyId());
+            updateItem(m_ppmDtc->participant(data.participantId).partyId);
             break;
         }
         case DataModification::eRemoved: {
@@ -112,10 +112,10 @@ void ChargeAdministrationAdlerModel::onParticipantChanged(const ParticipantManag
                                                           DataModification modType)
 {
     Q_UNUSED(modType)
-    qint32 typeId = data.typeId();
-    qint32 participantId = data.id();
+    qint32 typeId = data.typeId;
+    qint32 participantId = data.id;
 
-    if (!data.isDeleted() || (!m_ppmDtc->isAdlerType(typeId) && (m_ppmDtc->type(typeId).typeClass().underlying() !=
+    if (!data.isDeleted || (!m_ppmDtc->isAdlerType(typeId) && (m_ppmDtc->type(typeId).typeClass !=
                                                                  ParticipantManagement::TypeClass::Unit)))
         return;
 
@@ -133,39 +133,39 @@ void ChargeAdministrationAdlerModel::onParticipantChanged(const ParticipantManag
         m_participantChargeTypeMap.remove(participantId);
     }
 
-    updateItem(data.partyId());
+    updateItem(data.partyId);
 }
 
 void ChargeAdministrationAdlerModel::updateParticipantChargeTypeMap(
     const ParticipantManagement::DynamicParticipantData& data)
 {
-    qint32 participantId = data.participantId();
-    qint64 sampleTime = data.sampleTime();
-    qint32 typeId = m_ppmDtc->participant(participantId).typeId();
-    bool isDeleted = m_ppmDtc->participant(participantId).isDeleted();
+    qint32 participantId = data.participantId;
+    qint64 sampleTime = data.sampleTime;
+    qint32 typeId = m_ppmDtc->participant(participantId).typeId;
+    bool isDeleted = m_ppmDtc->participant(participantId).isDeleted;
 
     if (isDeleted || (!m_ppmDtc->isAdlerType(typeId) &&
-                      (m_ppmDtc->type(typeId).typeClass().underlying() != ParticipantManagement::TypeClass::Unit)))
+                      (m_ppmDtc->type(typeId).typeClass != ParticipantManagement::TypeClass::Unit)))
         return;
 
     QMap<qint32, GearData> chargeTypeGearData;
-    for (const ParticipantManagement::GearInformation& ct : data.gear())
+    for (const ParticipantManagement::GearInformation& ct : data.gear)
     {
-        if (m_pdmDtc->adlerChargeTypeName(ct.chargeTypeId()).isEmpty())
+        if (m_pdmDtc->adlerChargeTypeName(ct.chargeTypeId).isEmpty())
             continue;
 
         GearData gearData;
-        gearData.remain = ct.remain();
-        gearData.lastUpdate = ct.lastUpdate();
-        if (chargeTypeGearData.contains(ct.chargeTypeId()))
+        gearData.remain = ct.remain;
+        gearData.lastUpdate = ct.lastUpdate;
+        if (chargeTypeGearData.contains(ct.chargeTypeId))
         {
-            gearData.remain += chargeTypeGearData.value(ct.chargeTypeId()).remain;
+            gearData.remain += chargeTypeGearData.value(ct.chargeTypeId).remain;
         }
-        chargeTypeGearData.insert(ct.chargeTypeId(), gearData);
+        chargeTypeGearData.insert(ct.chargeTypeId, gearData);
     }
     m_participantChargeTypeMap.insert(
         participantId,
-        ChargeStruct(participantId, m_ppmDtc->participant(participantId).partyId(), sampleTime, chargeTypeGearData));
+        ChargeStruct(participantId, m_ppmDtc->participant(participantId).partyId, sampleTime, chargeTypeGearData));
 }
 
 void ChargeAdministrationAdlerModel::updateItem(int partyId)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_gui_plugin.h
index 7d8cd85f7..4154d915d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
index a18515d6e..d80834f7c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
@@ -25,7 +25,7 @@ namespace AreaEffectSimulation
 ChargeAdministrationList::ChargeAdministrationList(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr), m_sourceModel(nullptr),
       m_session(nullptr), m_ftc(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)),
-      m_ui(new Ui::ChargeAdministrationList)
+      m_ui(new Ui::ChargeAdministrationList), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -154,15 +154,15 @@ void ChargeAdministrationList::onEditCharge()
 {
     ChargeAdministration item = m_sourceModel->getRowData(m_ui->widget->currentIndex().row());
 
-    if (item.id() < 0)
+    if (item.id < 0)
         return;
 
-    ProjectDataManagement::ChargeType ct = m_sourceModel->chargeType(item.chargeTypeId());
+    ProjectDataManagement::ChargeType ct = m_sourceModel->chargeType(item.chargeTypeId);
 
     const QModelIndex temp = m_ui->widget->currentIndex();
 
     const QModelIndex mi = temp.sibling(temp.row(), ChargeAdministrationModel::ColTypeName);
-    auto ce = new ChargeEdit(ct.id(), m_sourceModel->data(mi).toString(), item.amount(), this);
+    auto ce = new ChargeEdit(ct.id, m_sourceModel->data(mi).toString(), item.amount, this);
     connect(ce, &ChargeEdit::newStock, this, &ChargeAdministrationList::onChargeEditFinished);
     connect(ce, &ChargeEdit::newStock, ce, &ChargeEdit::deleteLater);
     ce->show();
@@ -172,16 +172,16 @@ void ChargeAdministrationList::onChargeEditFinished(int chargeId, int newStock)
 {
     ChargeAdministration item = m_sourceModel->getRowData(m_ui->widget->currentIndex().row());
 
-    if (item.chargeTypeId() != chargeId)
+    if (item.chargeTypeId != chargeId)
         return;
 
-    if (item.amount() == newStock)
+    if (item.amount == newStock)
         return;
-    item.amount(newStock);
+    item.amount = newStock;
 
     bool amountChangedByOperator = true;
-    const ChargeAdministrationModifyRequest req(item.id(), item.chargeTypeId(), item.partyId(), item.effectSourceId(),
-                                                item.amount(), amountChangedByOperator);
+    const ChargeAdministrationModifyRequest req(item.id, item.chargeTypeId, item.partyId, item.effectSourceId,
+                                                item.amount, amountChangedByOperator);
 
     m_requestHelper->addRequest([this, req]() { return m_ftc->chargeAdministrationModifyRequest(req, this); });
     m_requestHelper->startRequests();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp
index 10dfcc8e7..29affa117 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp
@@ -28,7 +28,7 @@ bool ChargeAdministrationSortFilterProxyModel::filterAcceptsRow(int source_row,
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
     const ChargeAdministration& item = m_sourceModel->m_vecData.at(source_row);
-    if (item.partyId() != m_party)
+    if (item.partyId != m_party)
         return false;
     return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
@@ -49,7 +49,7 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<ChargeAdministration>({tr("Id"), tr("Charge Type Id"), tr("Changed"),
                                                                tr("Charge Type Name"), tr("Total Stock"), tr("Planned"),
                                                                tr("Available"), tr("Used"), tr("Gear Class")},
-                                                              parent)
+                                                              parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -80,12 +80,12 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
 
     QVector<QPair<int, int>> chargesInserted;
     auto cb = [this, &chargesInserted](const ChargeAdministration& item) {
-        const int chargeTypeId = item.chargeTypeId();
+        const int chargeTypeId = item.chargeTypeId;
         if (m_pdmDtc->isAdlerChargeType(chargeTypeId))
             return;
 
         insertRow(item);
-        chargesInserted.append(qMakePair<int, int>(item.chargeTypeId(), item.partyId()));
+        chargesInserted.append(QPair<int, int>(item.chargeTypeId, item.partyId));
     };
     m_aesDtc->chargeAdministrations(cb);
 
@@ -98,22 +98,22 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
     }
 
     QVector<ProjectDataManagement::ChargeType> chargesForGearClass =
-        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Artillery) +
-        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Mortar);
+        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Artillery) +
+        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Mortar);
 
     LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance();
     const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
     if (enableRocket)
-        chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Rocket);
+        chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Rocket);
     for (const ParticipantManagement::Party& p : std::as_const(parties))
     {
         for (const ProjectDataManagement::ChargeType& ct : std::as_const(chargesForGearClass))
         {
-            if (chargesInserted.contains(qMakePair(ct.id(), p.id())) || isDummy(ct) ||
-                m_pdmDtc->isAdlerChargeType(ct.id()))
+            if (chargesInserted.contains(qMakePair(ct.id, p.id)) || isDummy(ct) ||
+                m_pdmDtc->isAdlerChargeType(ct.id))
                 continue;
 
-            reqs << ChargeAdministrationModifyRequest(0, ct.id(), p.id(),
+            reqs << ChargeAdministrationModifyRequest(0, ct.id, p.id,
                                                       ProjectDataManagement::EffectSource::ES_Internal, 0, true);
         }
     }
@@ -122,7 +122,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
 
 bool ChargeAdministrationModel::isDummy(const ProjectDataManagement::ChargeType& ct)
 {
-    return LtsUtils::JsonObject::fromJson(ct.properties()).valueOr<bool>("isDummy", false);
+    return LtsUtils::JsonObject::fromJson(ct.properties).valueOr<bool>("isDummy", false);
 }
 
 QVariant ChargeAdministrationModel::data(const QModelIndex& index, int role) const
@@ -135,23 +135,23 @@ QVariant ChargeAdministrationModel::data(const QModelIndex& index, int role) con
     switch (index.column())
     {
         case ColId:
-            return item.id();
+            return item.id;
         case ColTypeId:
-            return item.chargeTypeId();
+            return item.chargeTypeId;
         case ColChanged:
-            return QDateTime::fromMSecsSinceEpoch(item.sampleTime());
+            return QDateTime::fromMSecsSinceEpoch(item.sampleTime);
         case ColTypeName:
-            return m_pdmDtc->trChargeTypeShortName(item.chargeTypeId(), true);
+            return m_pdmDtc->trChargeTypeShortName(item.chargeTypeId, true);
         case ColStock:
-            return item.amount();
+            return item.amount;
         case ColAvailable:
-            return item.amount() - item.planned();
+            return item.amount - item.planned;
         case ColPlanned:
-            return item.planned();
+            return item.planned;
         case ColUsed:
-            return item.used();
+            return item.used;
         case ColGearClass:
-            return ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(item.chargeTypeId()));
+            return ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(item.chargeTypeId));
     }
     return QVariant();
 }
@@ -160,7 +160,7 @@ void ChargeAdministrationModel::onChargeAdministrationChanged(const ChargeAdmini
                                                               DataModification modType)
 {
 
-    if (m_pdmDtc->isAdlerChargeType(data.chargeTypeId()))
+    if (m_pdmDtc->isAdlerChargeType(data.chargeTypeId))
         return;
     onDataChanged(data, modType);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
index 8789cb5b5..a804eac66 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
@@ -163,15 +163,15 @@ void ChargeEffectEdit::onSelectionChanged()
     return;
 
   const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(m_ui->dvParticipants->selectedRows().first()));
-  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id;
 
-  if (m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+  if (m_ppmDtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
     return;
 
-  DEBUG_LOG(m_logger) << "typeClass: " << m_ppmDtc->type(data.typeId()).typeClass()
-                      << "  eqNr.isSet(): " << data.equipmentNumber().is_set();
+  DEBUG_LOG(m_logger) << "typeClass: " << m_ppmDtc->type(data.typeId).typeClass
+                      << "  eqNr.isSet(): " << data.equipmentNumber.has_value();
 
-  if (data.equipmentNumber().is_set())
+  if (data.equipmentNumber.has_value())
   {
     if (m_ui->cbChargeType->count())
       m_ui->pbPosition->setEnabled(true);
@@ -216,8 +216,8 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
 
   const int chargeTypeId = m_ui->cbChargeType->currentData().toInt();
   const int partyId = m_ui->cbParty->currentData().toInt();
-  DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id()
-                      << " EquipmentNr=" << participantData.equipmentNumber()
+  DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id
+                      << " EquipmentNr=" << participantData.equipmentNumber
                       << " partyId=" << partyId
                       << " chargeType=" << chargeTypeId
                       << " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y();
@@ -227,8 +227,8 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
   int gearType = 0;
   for (const auto &gtc : m_pdmDtc->gearTypeChargeTypes())
   {
-   if (gtc.chargeTypeId() == chargeTypeId)
-     gearType = gtc.gearTypeId();
+   if (gtc.chargeTypeId == chargeTypeId)
+     gearType = gtc.gearTypeId;
   }
 
   const auto chargeType = m_pdmDtc->chargeType(chargeTypeId);
@@ -240,25 +240,25 @@ void ChargeEffectEdit::onGetCoordinate(const QPointF &coordinate)
   ProjectDataManagement::StateChangeOriginator originatorTypeId;
   if (m_ui->cbPlayer->isChecked())
   {
-    id = participantData.id();
-    originatorTypeId = ProjectDataManagement::StateChangeOriginator::Participant;
+    id = participantData.id;
+    originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
   }
   else
   {
     id = partyId;
-    originatorTypeId = ProjectDataManagement::StateChangeOriginator::Party;
+    originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party;
   }
 
 
-  request.name(chargeType.shortName());
-  request.chargeTypeId(chargeTypeId);
-  request.igniterTypeId(0);
-  request.gearTypeId(gearType);
-  request.originatorId(id);
-  request.originatorTypeId(originatorTypeId);
-  request.effectDuration(1000);
-  request.effectStart(m_session->partitionTime() + 6000);
-  request.position(Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0));
+  request.name = chargeType.shortName;
+  request.chargeTypeId = chargeTypeId;
+  request.igniterTypeId = 0;
+  request.gearTypeId = gearType;
+  request.originatorId = id;
+  request.originatorTypeId = originatorTypeId;
+  request.effectDuration = 1000;
+  request.effectStart = m_session->partitionTime() + 6000;
+  request.position = Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0);
 
   m_requestHelper->addRequest([this,request]()
   {
@@ -288,10 +288,10 @@ void ChargeEffectEdit::fillCharges()
 
   for (const auto &charge : m_pdmDtc->chargeTypes())
   {
-    if(!m_pdmDtc->isVirtuallyFireable(charge.id()))
+    if(!m_pdmDtc->isVirtuallyFireable(charge.id))
       continue;
 
-    m_ui->cbChargeType->addItem(QString::fromStdString(charge.name()), charge.id());
+    m_ui->cbChargeType->addItem(QString::fromStdString(charge.name), charge.id);
   }
   m_ui->cbChargeType->setEnabled(m_ui->cbChargeType->count() > 1);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.h
index c249ad7ff..61064d7a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.h
@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -36,7 +37,7 @@ public:
 
     QString dialogIdentifier() const override
     {
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddChargeEffect") : QStringLiteral("EditChargeEffect%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddChargeEffect") : QStringLiteral("EditChargeEffect%1").arg(m_aesItem.id);
     }
     bool init(int areaId, bool copy, LtsSession::LtsSession *session);
     void onChargeEffectModifyReply(const Core::FunctionReplyObject &replyObject) override final { onAesItemModifyReply(replyObject); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_gui_plugin.h
index 8a46af9b4..8f150ee10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_charge_effect_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/CustomView/aes_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/CustomView/aes_danger_area.cpp
index 68b97295d..23a1bbda3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/CustomView/aes_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/CustomView/aes_danger_area.cpp
@@ -47,22 +47,22 @@ bool CustomViewDangerArea::init(const QModelIndex &idx)
 
 bool CustomViewDangerArea::calculateIcon(const AreaEffectSimulation::DangerArea &area, const QColor &color)
 {
-  if (area.segments().size() == 0)
+  if (area.segments.size() == 0)
     return false;
 
   QVector<QPointF> segments;
-  segments.reserve(area.segments().size());
+  segments.reserve(area.segments.size());
   int setZone = -1;
-  for (const Core::GeoPosition2D &s : area.segments())
+  for (const Core::GeoPosition2D &s : area.segments)
   {
-    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon(), s.lat(), setZone));
+    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon, s.lat, setZone));
     if (setZone < 0)
       setZone = coord.zone;
     segments.append(QPointF(coord.x, coord.y));
   }
 
   QPolygonF poly = AreaEffectSimulation::Polygons::dangerArea(segments);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(poly, color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp
index 74bcd12b3..12069d48b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp
@@ -66,15 +66,15 @@ void DangerAreaEdit::enableUiElements(bool enable)
   m_ui->pbClear->setEnabled(enable);
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
   setEffectStartEnabled(m_ui->dteEffectStart, enable);
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->dangerArea(m_aesItem.id());
+    auto baseData = m_dtc->dangerArea(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -112,8 +112,8 @@ bool DangerAreaEdit::init(int aesItemId, bool copy,
 
   auto cb = [this](const DangerAreaCorrelatedAesItem &item)
   {
-    if (item.dangerAreaId() == m_aesItem.id()) 
-      m_otherAesItemIds << item.aesItemId();
+    if (item.dangerAreaId == m_aesItem.id) 
+      m_otherAesItemIds << item.aesItemId;
   };
   m_dtc->dangerAreaCorrelatedAesItems(cb);
   setPbAesItemsText();
@@ -136,12 +136,12 @@ void DangerAreaEdit::setPbAesItemsText()
   {
     AesItem item;
     m_dtc->aesItemFromId(idx, item);
-    if (item.id() <= 0)
+    if (item.id <= 0)
       continue;
     
-    if (item.effectStateId() != AesEffectState::EsActivated)
+    if (item.effectStateId != AesEffectState::EsActivated)
       continue;
-    sl << QString::fromStdString(item.name().c_str());
+    sl << QString::fromStdString(item.name.c_str());
   }
   m_ui->pbAesItems->setEnabled(sl.size());
   m_ui->pbAesItems->setText(sl.join(QStringLiteral(", ")));
@@ -152,12 +152,12 @@ void DangerAreaEdit::setData(const DangerArea &aesItem, bool copy)
   m_aesItem = aesItem;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0);
-  setCoordinates(aesItem.segments());
+  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart.has_value() ? aesItem.effectStart.get() : 0);
+  setCoordinates(aesItem.segments);
 }
 
 void DangerAreaEdit::getPolygon()
@@ -194,11 +194,11 @@ bool DangerAreaEdit::apply()
 {
   std::string name       = m_ui->leIdentifier->text().toStdString();
   qint64 effectStart     = m_ui->dteEffectStart->msecsSinceEpoch();
-  const DangerAreaModifyRequest req(m_aesItem.id(),
+  const DangerAreaModifyRequest req(m_aesItem.id,
                                     name,
                                     0,
                                     311, 
-                                    LtsUtils::toOptional(effectStart),
+                                    LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                     getCoordinates(),
                                     dds::core::optional<int32_t>(),
                                     dds::core::optional<int32_t>(),
@@ -213,14 +213,14 @@ bool DangerAreaEdit::apply()
 
 void DangerAreaEdit::onCorrelatedItemsChanged(const DangerAreaCorrelatedAesItem &data, DataModification modType)
 {
-  if (data.dangerAreaId() != m_aesItem.id())
+  if (data.dangerAreaId != m_aesItem.id)
     return;
 
   if (modType == DataModification::eAdded)
-    m_otherAesItemIds += data.aesItemId();
+    m_otherAesItemIds += data.aesItemId;
 
   if (modType == DataModification::eRemoved)
-    m_otherAesItemIds -= data.aesItemId();
+    m_otherAesItemIds -= data.aesItemId;
   
 
   setPbAesItemsText();
@@ -235,7 +235,7 @@ void DangerAreaEdit::onPbAesItemsClicked()
   if (!m_session->getForeignGuiInterface<ForeignInfoGuiInterface>(infoGuiInterface))
     return;
 
-  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo({m_aesItem.id()}, m_otherAesItemIds);
+  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo({m_aesItem.id}, m_otherAesItemIds);
 
   addDialog(dialog, m_menuGroup, tr("Danger Areas for BC Contamination %1").arg(m_ui->leIdentifier->text()), LtsWidgets::LayoutArea::eInfoTab);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.h
index f0603c1ea..cc03620ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 
 class QDoubleSpinBox;
@@ -28,7 +28,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddDangerArea") : QStringLiteral("EditDangerArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddDangerArea") : QStringLiteral("EditDangerArea%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin.h
index aec5693fa..3aeaf74f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_danger_area_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_list.h
index aa9635103..8871a10f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_areas_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_areas_model.h
index b3541e160..b710be43e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_areas_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_areas_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CMakeLists.txt
index aae0777a8..85ec45d88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CMakeLists.txt
@@ -8,6 +8,15 @@
 #
 # LIBRARY for AesEffectClusterModel (which is used at AirSupportPlugin)
 #
+# Build the targets in this directory as separate translation units (NOT a unity
+# build). aes_explosions_edit_adler.cpp and
+# aes_explosions_edit_adler_standalone.cpp each define the same file-scope statics
+# (VALUE_VALID_PROPERTY_NAME / LAST_VALUE / s_timeUntilMinimumSec, internal linkage,
+# both in namespace AreaEffectSimulation). Separate TUs keep the copies independent
+# (legacy structure); a unity TU sees two definitions in one scope and fails with
+# "redefinition of '... AreaEffectSimulation::...'" (behavior-neutral to disable).
+set(CMAKE_UNITY_BUILD FALSE)
+
 # Make ${Qt6_Widgets} optional
 if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
   set(Qt6_Widgets ${Qt6_Widgets})
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CustomView/aes_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CustomView/aes_explosion.cpp
index c9b95b735..c48ff3727 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CustomView/aes_explosion.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CustomView/aes_explosion.cpp
@@ -74,14 +74,14 @@ bool CustomViewExplosion::init(const QModelIndex &idx)
 bool CustomViewExplosion::calculateIcon(const ExplosionArea &area, const QColor &color)
 {
   Database::AesExplosionArea ea;
-  ea.impactPosition = QPointF(area.area().cornerBottomLeft().lon(),
-                              area.area().cornerBottomLeft().lat());
-  ea.rotationAngle = area.area().rotation();
-  ea.impactWidth = area.area().width();
-  ea.impactLength = area.area().height(); 
+  ea.impactPosition = QPointF(area.area.cornerBottomLeft.lon,
+                              area.area.cornerBottomLeft.lat);
+  ea.rotationAngle = area.area.rotation;
+  ea.impactWidth = area.area.width;
+  ea.impactLength = area.area.height; 
 
   QPolygonF poly = AreaEffectSimulation::Polygons::explosionArea(ea);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
@@ -91,17 +91,17 @@ bool CustomViewExplosion::calculateIcon(const ExplosionArea &area, const QColor
 bool CustomViewExplosion::calculateIcon(const ExplosionSingle &single, const QColor &color)
 {
   Database::AesExplosionSingle es;
-  es.impactPosition = QPointF(single.impactPosition().lon(), single.impactPosition().lat());
+  es.impactPosition = QPointF(single.impactPosition.lon, single.impactPosition.lat);
 
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> pdmDtc;
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
     return false;
 
-  double radius = pdmDtc->impactRadius(single.chargeStruct().chargeTypeId(),
-                                       single.chargeStruct().igniterTypeId(),
-                                       single.chargeStruct().igniterFunctionId());
+  double radius = pdmDtc->impactRadius(single.chargeStruct.chargeTypeId,
+                                       single.chargeStruct.igniterTypeId,
+                                       single.chargeStruct.igniterFunctionId);
   QPolygonF poly = AreaEffectSimulation::Polygons::explosionSingle(es, radius);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(single.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(single.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/_aes_explosions_single_central_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/_aes_explosions_single_central_model.h
index 7cd8c9e44..b86130b85 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/_aes_explosions_single_central_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/_aes_explosions_single_central_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp
index 7b7ef758b..d77bcd28d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp
@@ -61,32 +61,32 @@ bool EffectClusterModel::initModel(LtsSession::LtsSession *session)
 EffectCluster EffectClusterModel::toEffectCluster(const ExplosionCluster &data)
 {
   EffectCluster ec;
-  ec.id(data.id());
-  ec.name(data.name());
-  ec.effectSourceId(data.effectSourceId());
-  ec.effectStateId(data.effectStateId());
-  ec.chargeStruct(data.chargeStruct());
-  ec.effectDuration(data.effectDuration());
-  ec.effectStart(data.effectStart());
-  ec.area(data.area());
-  ec.esmParticipantIds(data.esmParticipantIds());
-  ec.explosionGeometry(data.explosionGeometry());
-  ec.element(data.element());
-  ec.firePurposeId(data.firePurposeId());
-  ec.firingPosition(data.firingPosition());
-  ec.fireRequestTime(data.fireRequestTime());
-  ec.tla(data.tla());
-  ec.sampleTime(data.sampleTime());
-  ec.effectMarkingInTa(data.effectMarkingInTa());
-  ec.externalId(data.externalId());
-  ec.remainExplosionNumber(data.remainExplosionNumber());
-  ec.participantId(data.participantId());
-  ec.partyId(data.partyId());
-  ec.properties(data.properties());
+  ec.id = data.id;
+  ec.name = data.name;
+  ec.effectSourceId = data.effectSourceId;
+  ec.effectStateId = data.effectStateId;
+  ec.chargeStruct = data.chargeStruct;
+  ec.effectDuration = data.effectDuration;
+  ec.effectStart = data.effectStart;
+  ec.area = data.area;
+  ec.esmParticipantIds = data.esmParticipantIds;
+  ec.explosionGeometry = data.explosionGeometry;
+  ec.element = data.element;
+  ec.firePurposeId = data.firePurposeId;
+  ec.firingPosition = data.firingPosition;
+  ec.fireRequestTime = data.fireRequestTime;
+  ec.tla = data.tla;
+  ec.sampleTime = data.sampleTime;
+  ec.effectMarkingInTa = data.effectMarkingInTa;
+  ec.externalId = data.externalId;
+  ec.remainExplosionNumber = data.remainExplosionNumber;
+  ec.participantId = data.participantId;
+  ec.partyId = data.partyId;
+  ec.properties = data.properties;
 
-  ec.isCentral(data.isCentral());
-  ec.isDeleted(data.isDeleted());
-  ec.isUsed(data.isUsed());
+  ec.isCentral = data.isCentral;
+  ec.isDeleted = data.isDeleted;
+  ec.isUsed = data.isUsed;
 
   return ec;
 }
@@ -115,29 +115,29 @@ QVariant EffectClusterModel::data(const QModelIndex &idx, int role) const
     {
       case ColGearType:
       {
-        const int chargeTypeId = ec.chargeStruct().chargeTypeId();
+        const int chargeTypeId = ec.chargeStruct.chargeTypeId;
         
         const int gearTypeId = m_pdmDtc->gearTypeIdFromChargeTypeId(chargeTypeId).value(0, 0);
         return m_pdmDtc->trGearTypeName(gearTypeId);
       }
       break;
       case ColIgniterType:
-        return m_pdmDtc->trIgniterTypeShortName(ec.chargeStruct().igniterTypeId());
+        return m_pdmDtc->trIgniterTypeShortName(ec.chargeStruct.igniterTypeId);
         break;
       case ColFiringPosition:
       {
-        const Core::GeoPosition &firingPositionRef = ec.firingPosition();
-        QString mgrs = LtsCoordTrans::mgrsFromGeographic(firingPositionRef.lon(), firingPositionRef.lat());
-        if (!qFuzzyIsNull(firingPositionRef.z()))
-          mgrs.append(QStringLiteral(" ") + QString::number(firingPositionRef.z(), 'f', 2));
+        const Core::GeoPosition &firingPositionRef = ec.firingPosition;
+        QString mgrs = LtsCoordTrans::mgrsFromGeographic(firingPositionRef.lon, firingPositionRef.lat);
+        if (!qFuzzyIsNull(firingPositionRef.z))
+          mgrs.append(QStringLiteral(" ") + QString::number(firingPositionRef.z, 'f', 2));
         return mgrs;
       }
       break;
       case ColExplosionGeometry:
-        return AreaEffectSimulation::toString(ec.explosionGeometry());
+        return AreaEffectSimulation::toString(ec.explosionGeometry);
         break;
       case ColTlaZog:
-        return ec.tla();
+        return ec.tla;
         break;
       
       
@@ -149,11 +149,11 @@ QVariant EffectClusterModel::data(const QModelIndex &idx, int role) const
       
       
       case ColAnnotationString:
-        return QString::fromStdString(ec.annotationString());
+        return QString::fromStdString(ec.annotationString);
         break;
 
       case ColZpElement:
-        return QString::fromStdString(ec.element());
+        return QString::fromStdString(ec.element);
         break;
         
 
@@ -174,11 +174,11 @@ QVariant EffectClusterModel::data(const QModelIndex &idx, int role) const
         QString tooltip(QStringLiteral("<html>"));
 
         const QString &hdr = this->headerData(BcName, Qt::Horizontal, Qt::DisplayRole).toString();
-        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(ec.name())));
+        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(ec.name)));
 
-        bool bIsArtilleryOrMortar = m_gearClasses.contains(ProjectDataManagement::GearClass::Artillery)
-                                    || m_gearClasses.contains(ProjectDataManagement::GearClass::Mortar)
-                                    || m_gearClasses.contains(ProjectDataManagement::GearClass::Rocket);
+        bool bIsArtilleryOrMortar = m_gearClasses.contains(ProjectDataManagement::GearClass::GearClass_Artillery)
+                                    || m_gearClasses.contains(ProjectDataManagement::GearClass::GearClass_Mortar)
+                                    || m_gearClasses.contains(ProjectDataManagement::GearClass::GearClass_Rocket);
 
         toolTipHelper(this, idx, ColGearType, tooltip);
         if (bIsArtilleryOrMortar)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h
index ae1b4fd14..0639ac5e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <aeseffectclustermodel_export.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.cpp
index 8485747ab..2df735335 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.cpp
@@ -46,7 +46,7 @@ void AesEffector::setState(const AreaEffectSimulation::AesEffectorState &newStat
 {
   m_state = newState;
 
-  switch(newState.underlying())
+  switch(newState)
   {
   case AreaEffectSimulation::AesEffectorState::EsNotReadyToFire:
     m_ui->lblState->setText(tr("Not ready to fire"));
@@ -76,7 +76,7 @@ void AesEffector::setState(const AreaEffectSimulation::AesEffectorState &newStat
 
 void AesEffector::onPbNextStateClicked()
 {
-  switch (m_state.underlying()) {
+  switch (m_state) {
   case AreaEffectSimulation::AesEffectorState::EsFired:
     emit reportFired();
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
index 447431586..981037fb7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
@@ -137,7 +137,7 @@ ExplosionEdit::ExplosionEdit(const QString &menuGroup, ExplosionType type, Proje
     m_ui->cbParty->setEnabled(false);
   }
   else
-    m_uiRequirements->addRequirement({m_ui->lbxParticipant, [this]() { return (m_participant.id() != 0); }});
+    m_uiRequirements->addRequirement({m_ui->lbxParticipant, [this]() { return (m_participant.id != 0); }});
 
   enaDisa();
 
@@ -181,7 +181,7 @@ void ExplosionEdit::retranslate()
 {
   QString title;
 
-  switch (m_gearClass.underlying())
+  switch (m_gearClass)
   {
   case ProjectDataManagement::GearClass::GearClass_Artillery:
     if (m_type == etSingle)
@@ -217,7 +217,7 @@ void ExplosionEdit::retranslate()
     m_ui->lblDimension->setText(tr("Dimension [m]:"));
   }
 
-  setFireButton(m_aesItem.effectStateId());
+  setFireButton(m_aesItem.effectStateId);
 
   updateMaxLabel(false);
 }
@@ -274,40 +274,40 @@ void ExplosionEdit::enableUiElements(bool enable)
   if (!enable)
   {
     bool hasChanges = hasUnsavedChanges();
-    m_ui->sbDurationSeconds->setValue(m_aesItem.effectDuration() / 1000); 
+    m_ui->sbDurationSeconds->setValue(m_aesItem.effectDuration / 1000); 
     if (!hasChanges)
       __unchange__();
   }
 
-  setFireButton(m_aesItem.effectStateId());
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  setFireButton(m_aesItem.effectStateId);
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
     AesItem baseData;
     if (m_type == etSingle)
     {
-      ExplosionSingle singleData = m_dtc->explosionSingle(m_aesItem.id());
+      ExplosionSingle singleData = m_dtc->explosionSingle(m_aesItem.id);
       setSingleData(singleData);
       baseData = singleData;
     }
     else if (m_type == etArea)
     {
-      ExplosionArea areaData = m_dtc->explosionArea(m_aesItem.id());
+      ExplosionArea areaData = m_dtc->explosionArea(m_aesItem.id);
       setAreaData(areaData);
       baseData = areaData;
     }
     setBaseData(baseData, false);
-    setFireButton(baseData.effectStateId());
+    setFireButton(baseData.effectStateId);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
       m_ui->leIdentifier->setText(name);
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsPaused)
+  if (m_aesItem.effectStateId == AesEffectState::EsPaused)
     __unchange__();
 }
 
@@ -322,23 +322,23 @@ void ExplosionEdit::setBaseData(const AesItem &baseData, bool copy)
   m_aesItem = baseData;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromUtf8(baseData.name().c_str()));
-  int idx = m_ui->cbChargeType->findData(baseData.chargeStruct().chargeTypeId());
+  m_ui->leIdentifier->setText(QString::fromUtf8(baseData.name.c_str()));
+  int idx = m_ui->cbChargeType->findData(baseData.chargeStruct.chargeTypeId);
   if (idx < 0)
   {
-    auto ct = m_chargeTypeMap[baseData.chargeStruct().chargeTypeId()].chargeType;
-    m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(ct.id(), true), ct.id());
-    idx = m_ui->cbChargeType->findData(ct.id());
+    auto ct = m_chargeTypeMap[baseData.chargeStruct.chargeTypeId].chargeType;
+    m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(ct.id, true), ct.id);
+    idx = m_ui->cbChargeType->findData(ct.id);
   }
   m_ui->cbChargeType->setCurrentIndex(idx);
-  m_ui->dteEffectStart->setMsecsSinceEpoch(baseData.effectStart().is_set() ? baseData.effectStart().get() : 0);
-  m_ui->sbDurationSeconds->setValue(baseData.effectDuration() / 1000); 
+  m_ui->dteEffectStart->setMsecsSinceEpoch(baseData.effectStart.has_value() ? baseData.effectStart.get() : 0);
+  m_ui->sbDurationSeconds->setValue(baseData.effectDuration / 1000); 
 
   m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(partyForItem(baseData)));
-  m_ui->cbEffectMarkingInTa->setChecked(baseData.effectMarkingInTa());
+  m_ui->cbEffectMarkingInTa->setChecked(baseData.effectMarkingInTa);
   m_editable = m_editable && isModifiable() && !isOnlyNameModifiable() && m_session->app() != LtsAppDescriptor::App::OC;
 
 }
@@ -362,7 +362,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
     return false;
 
   bool readable = false;
-  switch (m_gearClass.underlying())
+  switch (m_gearClass)
   {
   case ProjectDataManagement::GearClass::GearClass_Artillery:
     m_editable = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditArtillery) && m_type == etSingle) ||
@@ -427,18 +427,18 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
 
   const auto firePurposes = m_pdmDtc->firePurposes();
   for (const auto &firePurpose : firePurposes)
-    m_ui->cbPurpose->addItem(m_pdmDtc->trFirePurposeName(firePurpose.id()), firePurpose.id());
+    m_ui->cbPurpose->addItem(m_pdmDtc->trFirePurposeName(firePurpose.id), firePurpose.id);
 
   const auto chargesForGearClass =
     m_pdmDtc->chargesForGearClass(m_gearClass);
   for (const ProjectDataManagement::ChargeType &chargeType : chargesForGearClass)
-    m_chargeTypeMap[chargeType.id()].chargeType = chargeType;
+    m_chargeTypeMap[chargeType.id].chargeType = chargeType;
   const auto chargeAdmins = m_dtc->chargeAdministrations();
   for (const ChargeAdministration &val : chargeAdmins)
   {
-    if (!m_chargeTypeMap.contains(val.chargeTypeId()))
+    if (!m_chargeTypeMap.contains(val.chargeTypeId))
       continue;
-    m_chargeTypeMap[val.chargeTypeId()].available.insert(val.partyId(), val.amount() - val.planned());
+    m_chargeTypeMap[val.chargeTypeId].available.insert(val.partyId, val.amount - val.planned);
   }
 
   m_ppmGuiCbxIfc->fillPartyComboBox(m_ui->cbParty);
@@ -460,7 +460,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
       baseData = areaData;
     }
     setBaseData(baseData, copy);
-    setFireButton(baseData.effectStateId());
+    setFireButton(baseData.effectStateId);
   }
   else
     setFireButton(AreaEffectSimulation::AesEffectState::EsUnknown);
@@ -479,22 +479,22 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
 
 QString ExplosionEdit::dialogIdentifier() const
 {
-  switch (m_gearClass.underlying())
+  switch (m_gearClass)
   {
   case ProjectDataManagement::GearClass::GearClass_Artillery:
     if (m_type == etSingle)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleArtillery") : QStringLiteral("EditExplosionSingleArtillery%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionSingleArtillery") : QStringLiteral("EditExplosionSingleArtillery%1").arg(m_aesItem.id);
     else if (m_type == etArea)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionAreaArtillery") : QStringLiteral("EditExplosionAreaArtillery%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionAreaArtillery") : QStringLiteral("EditExplosionAreaArtillery%1").arg(m_aesItem.id);
     else
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleCentralArtillery") : QStringLiteral("EditExplosionSingleCentralArtillery%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionSingleCentralArtillery") : QStringLiteral("EditExplosionSingleCentralArtillery%1").arg(m_aesItem.id);
   case ProjectDataManagement::GearClass::GearClass_Mortar:
     if (m_type == etSingle)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleMortar") : QStringLiteral("EditExplosionSingleMortar%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionSingleMortar") : QStringLiteral("EditExplosionSingleMortar%1").arg(m_aesItem.id);
     else if (m_type == etArea)
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionAreaMortar") : QStringLiteral("EditExplosionAreaMortar%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionAreaMortar") : QStringLiteral("EditExplosionAreaMortar%1").arg(m_aesItem.id);
     else
-      return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleCentralMortar") : QStringLiteral("EditExplosionSingleCentralMortar%1").arg(m_aesItem.id());
+      return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionSingleCentralMortar") : QStringLiteral("EditExplosionSingleCentralMortar%1").arg(m_aesItem.id);
   default:
     Q_ASSERT(false);
     break;
@@ -506,13 +506,13 @@ QString ExplosionEdit::dialogIdentifier() const
 void ExplosionEdit::onChargeCountChanged(const AreaEffectSimulation::ChargeAdministration &data, DataModification modType)
 {
   
-  if (!m_chargeTypeMap.contains(data.chargeTypeId()))
+  if (!m_chargeTypeMap.contains(data.chargeTypeId))
     return;
 
-  if (modType == DataModification::eRemoved || data.amount() - data.planned() <= 0)
-    m_chargeTypeMap[data.chargeTypeId()].available.remove(data.partyId());
+  if (modType == DataModification::eRemoved || data.amount - data.planned <= 0)
+    m_chargeTypeMap[data.chargeTypeId].available.remove(data.partyId);
   else
-    m_chargeTypeMap[data.chargeTypeId()].available.insert(data.partyId(), data.amount() - data.planned());
+    m_chargeTypeMap[data.chargeTypeId].available.insert(data.partyId, data.amount - data.planned);
   onPartyChanged();
   updateCannonsRounds(true);
   updateMaxLabel(true);
@@ -549,7 +549,7 @@ void ExplosionEdit::setFireButton(AreaEffectSimulation::AesEffectState effectSta
        effectState == AesEffectState::EsPrepared ||
        effectState == AesEffectState::EsCreated ||
        effectState == AesEffectState::EsPaused)
-      && m_aesItem.id() > 0)
+      && m_aesItem.id > 0)
     m_ui->pbFire->setEnabled(true);
   else
     m_ui->pbFire->setEnabled(false);
@@ -558,7 +558,7 @@ void ExplosionEdit::setFireButton(AreaEffectSimulation::AesEffectState effectSta
 void ExplosionEdit::updateCannonsRounds(bool modifiedFromExternal)
 {
   
-  if (m_ui->sbCannons->value() > maxAvailableRounds() && m_editable && m_aesItem.id() <= 0)
+  if (m_ui->sbCannons->value() > maxAvailableRounds() && m_editable && m_aesItem.id <= 0)
   {
     m_ui->sbCannons->setValue(1);
     m_ui->sbRounds->setValue(1);
@@ -586,64 +586,64 @@ void ExplosionEdit::updateMaxLabel(bool modifiedFromExternal)
 
 quint32 ExplosionEdit::partyForItem(const AesItem &aesItem) const
 {
-  if (aesItem.participantId().is_set())
+  if (aesItem.participantId.has_value())
   {
-    if (m_participant.id() == aesItem.participantId().get())
-      return m_participant.partyId();
+    if (m_participant.id == aesItem.participantId.get())
+      return m_participant.partyId;
     else
-      return m_ppmDtc->participant(aesItem.participantId().get()).partyId();
+      return m_ppmDtc->participant(aesItem.participantId.get()).partyId;
   }
-  else if (aesItem.partyId().is_set())
-    return aesItem.partyId().get();
+  else if (aesItem.partyId.has_value())
+    return aesItem.partyId.get();
 
   return {};
 }
 
 void ExplosionEdit::setSingleData(const ExplosionSingle &singleData)
 {
-  QPointF impactPosition(singleData.impactPosition().lon(), singleData.impactPosition().lat());
+  QPointF impactPosition(singleData.impactPosition.lon, singleData.impactPosition.lat);
   if (!impactPosition.isNull())
     m_ui->positionEdit->setCoordinate(impactPosition);
 
-  m_ui->dteRequestTime->setMsecsSinceEpoch(singleData.fireRequestTime());
-  m_ui->cbPurpose->setCurrentText(QString::fromUtf8(singleData.purpose().c_str()));
-  m_ui->sbAltitude->setValue(singleData.altitude());
+  m_ui->dteRequestTime->setMsecsSinceEpoch(singleData.fireRequestTime);
+  m_ui->cbPurpose->setCurrentText(QString::fromUtf8(singleData.purpose.c_str()));
+  m_ui->sbAltitude->setValue(singleData.altitude);
 
-  if (m_aesItem.id() > 0)
-    m_chargeTypeMap[singleData.chargeStruct().chargeTypeId()].available[partyForItem(singleData)] += 1;
+  if (m_aesItem.id > 0)
+    m_chargeTypeMap[singleData.chargeStruct.chargeTypeId].available[partyForItem(singleData)] += 1;
 
-  const double radius = m_pdmDtc->impactRadius(singleData.chargeStruct().chargeTypeId(),singleData.chargeStruct().igniterTypeId(), singleData.chargeStruct().igniterFunctionId());
+  const double radius = m_pdmDtc->impactRadius(singleData.chargeStruct.chargeTypeId,singleData.chargeStruct.igniterTypeId, singleData.chargeStruct.igniterFunctionId);
   m_ui->sbDimensionX->setValue(2 * radius);
 }
 
 void ExplosionEdit::setAreaData(const ExplosionArea &areaData, bool copy)
 {
-  const Area &area = areaData.area();
-  if (!qFuzzyCompare(area.cornerBottomLeft().lon(), 0) ||
-      !qFuzzyCompare(area.cornerBottomLeft().lat(), 0))
+  const Area &area = areaData.area;
+  if (!qFuzzyCompare(area.cornerBottomLeft.lon, 0) ||
+      !qFuzzyCompare(area.cornerBottomLeft.lat, 0))
   {
-    QPointF bottomLeft(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
-    m_ui->positionEdit->setCoordinate(Polygons::bottomLeft2CenterPoint(bottomLeft, area.width(), area.height(), area.rotation()));
+    QPointF bottomLeft(area.cornerBottomLeft.lon, area.cornerBottomLeft.lat);
+    m_ui->positionEdit->setCoordinate(Polygons::bottomLeft2CenterPoint(bottomLeft, area.width, area.height, area.rotation));
   }
 
-  m_ui->sbDimensionX->setValue(area.width());
-  m_ui->sbDimensionY->setValue(area.height());
-  m_ui->sbAimingAxis->setValue(fmod((90.0 + area.rotation()) * 6400 / 360, 6400));
-  m_ui->sbCannons->setValue(areaData.cannonCount() == 0 ? 4 : areaData.cannonCount());
-  m_ui->sbRounds->setValue(areaData.cannonRounds() == 0 ? 9 : areaData.cannonRounds());
-  if (m_aesItem.id() > 0 && !copy)
+  m_ui->sbDimensionX->setValue(area.width);
+  m_ui->sbDimensionY->setValue(area.height);
+  m_ui->sbAimingAxis->setValue(fmod((90.0 + area.rotation) * 6400 / 360, 6400));
+  m_ui->sbCannons->setValue(areaData.cannonCount == 0 ? 4 : areaData.cannonCount);
+  m_ui->sbRounds->setValue(areaData.cannonRounds == 0 ? 9 : areaData.cannonRounds);
+  if (m_aesItem.id > 0 && !copy)
   {
-    if (!m_chargeTypeMap.contains(areaData.chargeStruct().chargeTypeId()))
-      ERROR_LOG(m_logger) << "SetAreaData called with a charge Type, that has doesn't match. Id " << areaData.chargeStruct().chargeTypeId() << "is not in m_chargeTypeMap";
-    if (!areaData.partyId().is_set())
+    if (!m_chargeTypeMap.contains(areaData.chargeStruct.chargeTypeId))
+      ERROR_LOG(m_logger) << "SetAreaData called with a charge Type, that has doesn't match. Id " << areaData.chargeStruct.chargeTypeId << "is not in m_chargeTypeMap";
+    if (!areaData.partyId.has_value())
       ERROR_LOG(m_logger) << "SetAreaData called without a party set. m_chargeTypeMap might be corrupted.";
-    m_chargeTypeMap[areaData.chargeStruct().chargeTypeId()].available[areaData.partyId().get()] += areaData.cannonCount() * areaData.cannonRounds();
+    m_chargeTypeMap[areaData.chargeStruct.chargeTypeId].available[areaData.partyId.get()] += areaData.cannonCount * areaData.cannonRounds;
   }
 
 
-  m_ui->dteRequestTime->setMsecsSinceEpoch(areaData.fireRequestTime());
-  m_ui->cbPurpose->setCurrentText(QString::fromUtf8(areaData.purpose().c_str()));
-  m_ui->sbAltitude->setValue(areaData.altitude());
+  m_ui->dteRequestTime->setMsecsSinceEpoch(areaData.fireRequestTime);
+  m_ui->cbPurpose->setCurrentText(QString::fromUtf8(areaData.purpose.c_str()));
+  m_ui->sbAltitude->setValue(areaData.altitude);
 }
 
 
@@ -723,7 +723,7 @@ void ExplosionEdit::onPartyChanged()
   for (const Charges &charge : std::as_const(m_chargeTypeMap))
   {
     if (charge.available.contains(partyId) && charge.available[partyId] > 0)
-      m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(charge.chargeType.id(), true), charge.chargeType.id());
+      m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(charge.chargeType.id, true), charge.chargeType.id);
   }
 
   m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(chargeTypeId) < 0 ? 0 : m_ui->cbChargeType->findData(chargeTypeId));
@@ -761,19 +761,19 @@ bool ExplosionEdit::apply()
 
   if (m_type == etSingle)
   {
-    const ExplosionSingleModifyRequest req(m_aesItem.id(),
+    const ExplosionSingleModifyRequest req(m_aesItem.id,
                                            name,
-                                           LtsUtils::toOptional(effectStart),
-                                           m_aesItem.effectSourceId(),
+                                           LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
+                                           m_aesItem.effectSourceId,
                                            chargeType,
                                            pos,
                                            LtsUtils::toOptional(partyId),
                                            LtsUtils::toOptional(0), 
-                                           fireRequestTime,
+                                           static_cast<int64_t>(fireRequestTime),
                                            altitude,
                                            purpose,
                                            m_ui->cbEffectMarkingInTa->isChecked(),
-                                           dds::core::optional<rti::core::int64>());
+                                           dds::core::optional<int64_t>());
 
     m_requestHelper->addRequest([this, req]()
     {
@@ -782,22 +782,22 @@ bool ExplosionEdit::apply()
   }
   else if (m_type == etArea) 
   {
-    const ExplosionAreaModifyRequest req(m_aesItem.id(),
+    const ExplosionAreaModifyRequest req(m_aesItem.id,
                                          name,
-                                         LtsUtils::toOptional(effectStart),
+                                         LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                          duration,
-                                         m_aesItem.effectSourceId(),
+                                         m_aesItem.effectSourceId,
                                          chargeType,
                                          area,
                                          LtsUtils::toOptional(partyId),
                                          LtsUtils::toOptional(0), 
                                          cannons,
                                          rounds,
-                                         fireRequestTime,
+                                         static_cast<int64_t>(fireRequestTime),
                                          altitude,
                                          purpose,
                                          m_ui->cbEffectMarkingInTa->isChecked(),
-                                         dds::core::optional<rti::core::int64>());
+                                         dds::core::optional<int64_t>());
     m_requestHelper->addRequest([this, req]()
     {
       return m_ftc->explosionAreaModifyRequest(req, this);
@@ -810,16 +810,16 @@ bool ExplosionEdit::apply()
 void ExplosionEdit::onFireClicked()
 {
   m_ui->pbFire->setEnabled(false);
-  if ((m_aesItem.effectStateId() != AesEffectState::EsActivated &&
-       m_aesItem.effectStateId() != AesEffectState::EsPaused &&
-       m_aesItem.effectStateId() != AesEffectState::EsCreated &&
-       m_aesItem.effectStateId() != AesEffectState::EsPrepared)
-      || m_aesItem.id() <= 0)
+  if ((m_aesItem.effectStateId != AesEffectState::EsActivated &&
+       m_aesItem.effectStateId != AesEffectState::EsPaused &&
+       m_aesItem.effectStateId != AesEffectState::EsCreated &&
+       m_aesItem.effectStateId != AesEffectState::EsPrepared)
+      || m_aesItem.id <= 0)
     return;
 
   
-  if (m_aesItem.effectStateId() == AesEffectState::EsCreated ||
-      m_aesItem.effectStateId() == AesEffectState::EsPrepared)
+  if (m_aesItem.effectStateId == AesEffectState::EsCreated ||
+      m_aesItem.effectStateId == AesEffectState::EsPrepared)
   {
     m_ui->dteEffectStart->setMsecsSinceEpoch(m_session->partitionTime() + 3000);
     m_ui->dteEffectStart->setChecked(true);
@@ -835,9 +835,9 @@ void ExplosionEdit::onFireClicked()
   
   m_requestHelper->addRequest([ = ]()
   {
-    return m_ftc->explosionAreaPauseResumeRequest(ExplosionAreaPauseResumeRequest(m_aesItem.id(),
-                                                                                  m_aesItem.effectStateId() != AesEffectState::EsActivated,
-                                                                                  dds::core::optional<rti::core::int64>(),
+    return m_ftc->explosionAreaPauseResumeRequest(ExplosionAreaPauseResumeRequest(m_aesItem.id,
+                                                                                  m_aesItem.effectStateId != AesEffectState::EsActivated,
+                                                                                  dds::core::optional<int64_t>(),
                                                                                   dds::core::optional<int32_t>(),
                                                                                   dds::core::optional<int32_t>())
                                                   , this);
@@ -849,7 +849,7 @@ void ExplosionEdit::onParticipantClicked()
 {
   ParticipantManagement::ParticipantSelection *ps = new ParticipantManagement::ParticipantSelection(m_session, this);
   ps->init();
-  ps->setParticipantSelected(m_participant.partyId(), m_participant.id());
+  ps->setParticipantSelected(m_participant.partyId, m_participant.id);
 
   connect(ps, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, &ExplosionEdit::onParticipant);
   ps->exec();
@@ -860,16 +860,16 @@ void ExplosionEdit::onParticipant(const QVector<int> &participants)
   if (participants.isEmpty())
     return;
 
-  if (participants[0] == m_participant.id())
+  if (participants[0] == m_participant.id)
     return;
   m_participant = m_ppmDtc->participant(participants[0]);
 
   m_symbolWatcher->setSymbolResult(m_asbIfc->findImage(m_participant));
-  m_ui->lblDesignator->setText(QString::fromStdString(m_participant.designator()));
-  m_ui->lblTactIdentifier->setText(QString::fromStdString(m_participant.tacticalIdentifier()));
+  m_ui->lblDesignator->setText(QString::fromStdString(m_participant.designator));
+  m_ui->lblTactIdentifier->setText(QString::fromStdString(m_participant.tacticalIdentifier));
 
 
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(m_participant.partyId()));
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(m_participant.partyId));
   slotChangesMade();
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.h
index 51206b43d..ed984f7df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
index 07edb270f..461cd2c2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
@@ -232,7 +232,7 @@ AreaEffectSimulation::BaseEdit *InterfaceImpl::showEditWindow(int aesEntityId, b
 
 BaseEdit *InterfaceImpl::showEditWindow(int aesEntityId, ProjectDataManagement::EffectSource effectSource, QWidget *parent)
 {
-  switch (effectSource.underlying())
+  switch (effectSource)
   {
     case ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE:
     {
@@ -326,9 +326,9 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowExplosionClusterListDialog(QWidget *
   ExplosionList *listWidget;
 
   listWidget = new ExplosionClusterList(menuGroup(),
-                                        {ProjectDataManagement::GearClass::Artillery,
-                                         ProjectDataManagement::GearClass::Mortar,
-                                         ProjectDataManagement::GearClass::Rocket},
+                                        {ProjectDataManagement::GearClass::GearClass_Artillery,
+                                         ProjectDataManagement::GearClass::GearClass_Mortar,
+                                         ProjectDataManagement::GearClass::GearClass_Rocket},
                                         parent);
 
   if (listWidget->init(m_session))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.h
index ea2e2ead9..bffab2775 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_explosion_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp
index c53d59af2..a3a2bfd10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp
@@ -27,7 +27,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
     return false;
 
   m_bHasAddEditOperatorRights = false;
-  switch (m_gearClass.underlying())
+  switch (m_gearClass)
   {
     case ProjectDataManagement::GearClass::GearClass_Artillery:
 
@@ -288,7 +288,7 @@ void ExplosionAreaList::createModel()
 
 
 ExplosionClusterList::ExplosionClusterList(const QString &menuGroup, const QVector<ProjectDataManagement::GearClass> &gcs, QWidget *parent)
-    : ExplosionList(menuGroup, etExplosionCluster, ProjectDataManagement::GearClass::Artillery, parent), m_model(nullptr), m_gearClasses(gcs)
+    : ExplosionList(menuGroup, etExplosionCluster, ProjectDataManagement::GearClass::GearClass_Artillery, parent), m_model(nullptr), m_gearClasses(gcs)
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.h
index ad7cee195..814d52db5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_area_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_area_model.h
index b4c337704..9faee5830 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_area_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_area_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
index 20b25aec6..7a4897044 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
@@ -81,8 +81,8 @@ QPair<int, int> getMinMaxDistance(ProjectDataManagement::GearClass gearClass, in
   static QHash<int, QPair<int, int>> contraintsDistance;
   if (contraintsDistance.isEmpty())
   {
-    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {3500, 40000}); 
-    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {800, 7800});      
+    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {3500, 40000}); 
+    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {800, 7800});      
     
     
   }
@@ -90,8 +90,8 @@ QPair<int, int> getMinMaxDistance(ProjectDataManagement::GearClass gearClass, in
   static QHash<int, QPair<int, int>> contraintsDistanceVulcano;
   if (contraintsDistanceVulcano.isEmpty())
   {
-    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {10000, 70000}); 
-    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {10000, 70000});    
+    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {10000, 70000}); 
+    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {10000, 70000});    
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -121,15 +121,15 @@ QPair<int, int> getMinMaxFlightDurationSec(ProjectDataManagement::GearClass gear
   static QHash<int, QPair<int, int>> contraintsFlightDuration;
   if (contraintsFlightDuration.isEmpty())
   {
-    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {6, 150}); 
-    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {20, 60});    
+    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {6, 150}); 
+    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {20, 60});    
   }
 
   static QHash<int, QPair<int, int>> contraintsFlightDurationVulcano;
   if (contraintsFlightDurationVulcano.isEmpty())
   {
-    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {0, 999}); 
-    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {0, 999});    
+    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {0, 999}); 
+    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {0, 999});    
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -165,15 +165,15 @@ QPair<int, int> getMinMaxPeakHeight(ProjectDataManagement::GearClass gearClass,
   static QHash<int, QPair<int, int>> contraintsPeak;
   if (contraintsPeak.isEmpty())
   {
-    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {250, 15000}); 
-    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {500, 3000});     
+    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {250, 15000}); 
+    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {500, 3000});     
   }
 
   static QHash<int, QPair<int, int>> contraintsPeakVulcano;
   if (contraintsPeakVulcano.isEmpty())
   {
-    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {1000, 37500}); 
-    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {1000, 37500});    
+    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {1000, 37500}); 
+    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {1000, 37500});    
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -278,7 +278,7 @@ ExplosionsEdit::ExplosionsEdit(const QString &menuGroup, QWidget *parent)
                                       
 
                                       
-                                      if (!m_explosionClusterData.isObjectModifiable())
+                                      if (!m_explosionClusterData.isObjectModifiable)
                                         return true;
 
                                       bool bEffectStartValid = true;
@@ -416,7 +416,7 @@ bool ExplosionsEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess
   }
 
   
-  m_explosionClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry::EgArea);
+  m_explosionClusterData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgArea;
   onGeometrySelected(static_cast<int>(AreaEffectSimulation::AesExplosionGeometry::EgArea));
 
   
@@ -464,14 +464,14 @@ bool ExplosionsEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess
   {
     const ExplosionCluster &exData = m_dtc->explosionCluster(aesItemId);
     setExplosionClusterData(exData);
-    m_ui->gbEffectMarkingInTa->setChecked(exData.effectMarkingInTa());
+    m_ui->gbEffectMarkingInTa->setChecked(exData.effectMarkingInTa);
 
     if (copy)
     {
-      m_aesItem.id(0);
-      m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
-      m_explosionClusterData.id(m_aesItem.id());
-      m_explosionClusterData.effectStateId(m_aesItem.effectStateId());
+      m_aesItem.id = 0;
+      m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
+      m_explosionClusterData.id = m_aesItem.id;
+      m_explosionClusterData.effectStateId = m_aesItem.effectStateId;
     }
   }
   connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged, this, &ExplosionsEdit::onPartyChanged, Qt::UniqueConnection);
@@ -514,7 +514,7 @@ bool ExplosionsEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess
 
   doCalculations();
 
-  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry.underlying());
+  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry);
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
 
@@ -525,12 +525,12 @@ void ExplosionsEdit::setExplosionClusterData(const ExplosionCluster &ecData)
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START, ecData=" << ecData;
 
-  m_ui->leZpNumber->setText(QString::fromStdString(ecData.name()));
-  m_ui->leElement->setText(QString::fromStdString(ecData.element()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(ecData.effectStart().is_set() ? ecData.effectStart().get() : 0);
+  m_ui->leZpNumber->setText(QString::fromStdString(ecData.name));
+  m_ui->leElement->setText(QString::fromStdString(ecData.element));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(ecData.effectStart.has_value() ? ecData.effectStart.get() : 0);
 
   
-  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry());
+  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry);
   switch (geometryType)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint:
@@ -554,40 +554,40 @@ void ExplosionsEdit::setExplosionClusterData(const ExplosionCluster &ecData)
   } 
   onGeometrySelected(static_cast<int>(geometryType)); 
 
-  m_ui->sbDurationSec->setValue(ecData.effectDuration() / 1000); 
+  m_ui->sbDurationSec->setValue(ecData.effectDuration / 1000); 
 
   
   {
     QSignalBlocker locked(m_ui->cbGearClass);
-    ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct().chargeTypeId());
-    m_ui->cbGearClass->setCurrentIndex(m_ui->cbGearClass->findData(static_cast<int>(gc.underlying())));
+    ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct.chargeTypeId);
+    m_ui->cbGearClass->setCurrentIndex(m_ui->cbGearClass->findData(static_cast<int>(gc)));
     onGearClassChanged(); 
   }
 
   
   {
     QSignalBlocker locked(m_ui->cbParty);
-    if (ecData.partyId().is_set())
+    if (ecData.partyId.has_value())
     {
-      m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(ecData.partyId().get()));
+      m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(ecData.partyId.get()));
       onPartyChanged(); 
     }
   }
 
   
   {
-    if (ecData.participantId().is_set())
+    if (ecData.participantId.has_value())
     {
-      m_ui->cbParticipantUnits->setCurrentIndex(m_ui->cbParticipantUnits->findData(ecData.participantId().get()));
+      m_ui->cbParticipantUnits->setCurrentIndex(m_ui->cbParticipantUnits->findData(ecData.participantId.get()));
       onParticipantUnitChanged({});
     }
   }
 
   FlightCurve fc(-1, -1, -1, -1, -1, -1, -1, -1);
-  if (ecData.flightCurve().is_set())
-    fc = ecData.flightCurve().get();
+  if (ecData.flightCurve.has_value())
+    fc = ecData.flightCurve.get();
 
-  if (fc.dropAngle() <= s_dropAngleDown)
+  if (fc.dropAngle <= s_dropAngleDown)
   {
     m_ui->rbDropAngleDown->setChecked(true);
     m_ui->rbDropAngleUp->setChecked(false);
@@ -598,65 +598,65 @@ void ExplosionsEdit::setExplosionClusterData(const ExplosionCluster &ecData)
     m_ui->rbDropAngleUp->setChecked(true);
   }
 
-  m_ui->sbCannons->setValue(ecData.impactCount());
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(ecData.chargeStruct().chargeTypeId()));
-  m_ui->cbIgniterType->setCurrentIndex(m_ui->cbIgniterType->findData(ecData.chargeStruct().igniterTypeId()));
-  m_ui->cbFirePurpose->setCurrentIndex(m_ui->cbFirePurpose->findData(ecData.firePurposeId()));
+  m_ui->sbCannons->setValue(ecData.impactCount);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(ecData.chargeStruct.chargeTypeId));
+  m_ui->cbIgniterType->setCurrentIndex(m_ui->cbIgniterType->findData(ecData.chargeStruct.igniterTypeId));
+  m_ui->cbFirePurpose->setCurrentIndex(m_ui->cbFirePurpose->findData(ecData.firePurposeId));
 
-  m_ui->sbZog->setValue(ecData.tla()); 
+  m_ui->sbZog->setValue(ecData.tla); 
 
-  const AreaEffectSimulation::Area &areaRef = ecData.area();
-  const QPointF bottomLeft(areaRef.cornerBottomLeft().lon(), areaRef.cornerBottomLeft().lat());
-  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width(), areaRef.height(), areaRef.rotation());
+  const AreaEffectSimulation::Area &areaRef = ecData.area;
+  const QPointF bottomLeft(areaRef.cornerBottomLeft.lon, areaRef.cornerBottomLeft.lat);
+  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width, areaRef.height, areaRef.rotation);
   if (!bottomLeft.isNull())
   {
     m_ui->positionEdit->setCoordinate(centerpoint);
     setCoord(centerpoint);
   }
 
-  if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
+  if (ecData.explosionGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
   {
-    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height() / 2);
-    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width() / 2);
+    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height / 2);
+    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width / 2);
     m_ui->sbAimingAxis->setValue(0);
   }
   else
   {
-    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height());
-    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width());
-    m_ui->sbAimingAxis->setValue(fmod((90.0 + areaRef.rotation()) * 6400 / 360, 6400));
+    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height);
+    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width);
+    m_ui->sbAimingAxis->setValue(fmod((90.0 + areaRef.rotation) * 6400 / 360, 6400));
   }
 
-  if (!ecData.esmParticipantIds().empty())
+  if (!ecData.esmParticipantIds.empty())
   {
-    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds().at(0)));
-    if (ecData.esmParticipantIds().size() > 1)
-      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds().at(1)));
+    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds.at(0)));
+    if (ecData.esmParticipantIds.size() > 1)
+      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds.at(1)));
   }
 
   
   {
-    if (fc.requestedFlightDuration() > 0)
+    if (fc.requestedFlightDuration > 0)
     {
       
       switchTo(FlighDurationOrPeakHeight::FDPH_flightDuration);
-      setValueAccordingContraints(fc.requestedFlightDuration() / 1000.0, FlighDurationOrPeakHeight::FDPH_flightDuration);
+      setValueAccordingContraints(fc.requestedFlightDuration / 1000.0, FlighDurationOrPeakHeight::FDPH_flightDuration);
     }
-    if (fc.requestedRelativePeakHeight() > 0)
+    if (fc.requestedRelativePeakHeight > 0)
     {
       
       switchTo(FlighDurationOrPeakHeight::FDPH_peakHeight);
-      setValueAccordingContraints(fc.requestedRelativePeakHeight(), FlighDurationOrPeakHeight::FDPH_peakHeight);
+      setValueAccordingContraints(fc.requestedRelativePeakHeight, FlighDurationOrPeakHeight::FDPH_peakHeight);
     }
 
     LaserGuiding lg(0, 0, -1, std::numeric_limits<int>::min());
-    if (ecData.laserGuiding().is_set())
-      lg = ecData.laserGuiding().get();
+    if (ecData.laserGuiding.has_value())
+      lg = ecData.laserGuiding.get();
 
-    m_ui->sbLcAttack_Prf->setValue(lg.lcAttack());
-    m_ui->sbLcTermination_Prf->setValue(lg.lcTermination());
+    m_ui->sbLcAttack_Prf->setValue(lg.lcAttack);
+    m_ui->sbLcTermination_Prf->setValue(lg.lcTermination);
     
-    m_ui->spCloudBase->setValue(lg.cloudBase());
+    m_ui->spCloudBase->setValue(lg.cloudBase);
 
     onExplosionClusterChanged(ecData, DataModification::eAdded);
   }
@@ -700,7 +700,7 @@ void ExplosionsEdit::onChargeTypeChanged()
   setMinMaxConstraints(phfd, gearClassType, chargeTypeId);
 
   
-  if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint)
+  if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgPoint)
   {
     int igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
     const double impactRadius = m_pdmDtc->impactRadius(chargeTypeId, igniterTypeId, 0); 
@@ -790,7 +790,7 @@ void ExplosionsEdit::getPosition()
   m_previewPolygon.clear();
   m_previewCircleRadius = 0.0;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
     {
@@ -920,7 +920,7 @@ void ExplosionsEdit::onPolylineData(const QPolygonF &polyline)
   m_ui->sbDimensionX_BreiteRadius->setValue(distance);
 
   const Core::GeoPosition coordGeo2(utm2.geographic().x(), utm2.geographic().y(), 0);
-  const double height2 = getElevation(coordGeo2.lon(), coordGeo2.lat());
+  const double height2 = getElevation(coordGeo2.lon, coordGeo2.lat);
   m_ui->sbHeight2SBox->setValue(height2);
   DEBUG_LOG(m_logger) << "sbHeight2SBox setValue=" << height2;
 
@@ -948,7 +948,7 @@ void ExplosionsEdit::setCoord(const QPointF &coord)
   const Core::GeoPosition coordGeo(coord.x(), coord.y(), 0);
   m_coordGeo = coordGeo;
 
-  const double height = getElevation(coordGeo.lon(), coordGeo.lat());
+  const double height = getElevation(coordGeo.lon, coordGeo.lat);
   m_ui->sbHeight1SBox->setValue(height);
 
   updateActorComboBox(coordGeo);
@@ -986,8 +986,8 @@ void ExplosionsEdit::fillParticipantUnit()
   for (auto &superiorId : superiorIds)
   {
     const ParticipantManagement::Participant &part = m_ppmDtc->participant(superiorId);
-    unitList.push_back(std::tuple<QString, int, int>(QString::fromStdString(part.designator()) + QStringLiteral(" (%1)").arg(units.value(superiorId).count()),
-                                                     part.id(),
+    unitList.push_back(std::tuple<QString, int, int>(QString::fromStdString(part.designator) + QStringLiteral(" (%1)").arg(units.value(superiorId).count()),
+                                                     part.id,
                                                      units.value(superiorId).count()));
   }
   std::sort(unitList.begin(), unitList.end());
@@ -1065,7 +1065,7 @@ void ExplosionsEdit::onAimingAxisChanged(int aimingAxis)
   m_ui->positionEdit_2->setCoordinate(utm2New.geographic());
 
   const Core::GeoPosition coordGeo(utm2New.geographic().x(), utm2New.geographic().y(), 0);
-  const double height = getElevation(coordGeo.lon(), coordGeo.lat());
+  const double height = getElevation(coordGeo.lon, coordGeo.lat);
   m_ui->sbHeight1SBox->setValue(height);
 }
 
@@ -1273,7 +1273,7 @@ void ExplosionsEdit::doCalculations(bool executeEnableUiElements)
     return;
 
   
-  if ((m_explosionClusterData.effectStateId() == AesEffectState::EsPaused) || (m_explosionClusterData.effectStateId() == AesEffectState::EsExpired))
+  if ((m_explosionClusterData.effectStateId == AesEffectState::EsPaused) || (m_explosionClusterData.effectStateId == AesEffectState::EsExpired))
     return;
 
   DoCalculationsExitGuard exitGuard(this, executeEnableUiElements);
@@ -1421,7 +1421,7 @@ void ExplosionsEdit::doCalculations(bool executeEnableUiElements)
       return;
     }
 
-    const qint64 calculatedFlightDurationMsec = trajectoryOut.back().relativeTime();
+    const qint64 calculatedFlightDurationMsec = trajectoryOut.back().relativeTime;
     m_temporaryData.m_estimatedFlightDurationMsec = Polygons::explosionClusterEstimatedMaxFlightDuration2DMSec(calculatedFlightDurationMsec); 
     m_temporaryData.m_idealTapAbsoluteGeoOut = idealTapAbsoluteGeoOut;
 
@@ -1435,7 +1435,7 @@ void ExplosionsEdit::doCalculations(bool executeEnableUiElements)
                                                        .arg(std::round(betaRad * LtsCoordTrans::rad2deg() * 10) / 10)
                                                        .arg(std::round(vOut))
                                                        .arg(std::round(calculatedFlightDurationMsec / 1000.0))
-                                                       .arg(std::round(m_temporaryData.m_idealTapAbsoluteGeoOut.z()));
+                                                       .arg(std::round(m_temporaryData.m_idealTapAbsoluteGeoOut.z));
 
     QSignalBlocker locked(m_ui->sBox_flightDuration);
     m_ui->sBox_flightDuration->setValue(std::round(calculatedFlightDurationMsec / 1000.0));
@@ -1601,12 +1601,12 @@ void ExplosionsEdit::onPartitionTimeChanged(qint64 newPartitionTimeMsec)
 
 QString ExplosionsEdit::dialogIdentifier() const
 {
-  return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id());
+  return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id);
 }
 
 void ExplosionsEdit::onExplosionClusterChanged(const ExplosionCluster &ecData, DataModification modType)
 {
-  if (ecData.id() != m_aesItem.id())
+  if (ecData.id != m_aesItem.id)
     return;
 
   BaseEdit::onAreaChanged(ecData, modType);
@@ -1620,7 +1620,7 @@ void ExplosionsEdit::onExplosionClusterChanged(const ExplosionCluster &ecData, D
   
   if (
       
-      (!ecData.isObjectModifiable()))
+      (!ecData.isObjectModifiable))
   {
     INFO_LOG(m_logger) << " object becames not modifiable";
     enableUiFireButton(); 
@@ -1635,13 +1635,13 @@ void ExplosionsEdit::onExplosionClusterChanged(const ExplosionCluster &ecData, D
   }
 
   m_explosionClusterData = ecData;
-  m_currentGeometry = m_explosionClusterData.explosionGeometry();
+  m_currentGeometry = m_explosionClusterData.explosionGeometry;
 
-  if (ecData.flightCurve().is_set())
+  if (ecData.flightCurve.has_value())
   {
-    const FlightCurve &fc = ecData.flightCurve().get();
-    m_ui->leCalcFlightDuration->setText(QString(QStringLiteral("%1 sec")).arg(fc.calculatedFlightDuration() / 1000.0));
-    m_ui->leCalcPeakHeight->setText(QString(QStringLiteral("%1 m abs")).arg(fc.calculatedPeakHeightAbs()));
+    const FlightCurve &fc = ecData.flightCurve.get();
+    m_ui->leCalcFlightDuration->setText(QString(QStringLiteral("%1 sec")).arg(fc.calculatedFlightDuration / 1000.0));
+    m_ui->leCalcPeakHeight->setText(QString(QStringLiteral("%1 m abs")).arg(fc.calculatedPeakHeightAbs));
   }
   else
   {
@@ -1649,13 +1649,13 @@ void ExplosionsEdit::onExplosionClusterChanged(const ExplosionCluster &ecData, D
     m_ui->leCalcPeakHeight->setText(QString(QStringLiteral("- m abs")));
   }
 
-  m_ui->leDescription->setText(QString::fromStdString(ecData.annotationString()));
+  m_ui->leDescription->setText(QString::fromStdString(ecData.annotationString));
   m_ui->leDescription->setToolTip(m_ui->leDescription->text());
 
   if (!m_ui->sbDurationSec->isEnabled())
   {
     const bool hasChanges = hasUnsavedChanges();
-    m_ui->sbDurationSec->setValue(m_explosionClusterData.effectDuration() / 1000); 
+    m_ui->sbDurationSec->setValue(m_explosionClusterData.effectDuration / 1000); 
     if (!hasChanges)
       __unchange__();
   }
@@ -1740,10 +1740,10 @@ void ExplosionsEdit::retranslate()
 void ExplosionsEdit::enableUiElements()
 {
   DEBUG_LOG(m_logger) << " enableUiElements()"
-                      << ", m_explosionClusterData.id() = " << m_explosionClusterData.id() << ", isModifiable() = " << isModifiable()
+                      << ", m_explosionClusterData.id() = " << m_explosionClusterData.id << ", isModifiable() = " << isModifiable()
                       << ", isOnlyNameModifiable() = " << isOnlyNameModifiable() << ", ena = " << (isModifiable() && !isOnlyNameModifiable());
 
-  if (m_explosionClusterData.id() == 0) 
+  if (m_explosionClusterData.id == 0) 
     enableUiElements(true);
   else
     enableUiElements(isModifiable() && !isOnlyNameModifiable());
@@ -1792,8 +1792,8 @@ void ExplosionsEdit::enableUiElements(bool enable)
 
   
   
-  m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated);
-  m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated);
+  m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId != AesEffectState::EsActivated);
+  m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId != AesEffectState::EsActivated);
 
   m_ui->pbClear->setEnabled(enable);
 
@@ -1804,15 +1804,15 @@ void ExplosionsEdit::enableUiElements(bool enable)
 
   int numberTrajectoriesRef = 0;
   {
-    const int simToRestrict = m_aesItem.id();
+    const int simToRestrict = m_aesItem.id;
     
     auto cb = [simToRestrict, &numberTrajectoriesRef](const AreaEffectSimulation::TrajectoryTimeAware &traj)
     {
       
       
-      if (traj.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+      if (traj.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
         return;
-      const int aesItemId = traj.originatorId();
+      const int aesItemId = traj.originatorId;
       if (simToRestrict == aesItemId)
         ++numberTrajectoriesRef;
     };
@@ -1821,7 +1821,7 @@ void ExplosionsEdit::enableUiElements(bool enable)
 
   DEBUG_LOG(m_logger) << "************* enableUiElements numberTrajectoriesRef=" << numberTrajectoriesRef;
 
-  if ((numberTrajectoriesRef > 0) && !isPointSimilar(m_explosionClusterData.explosionGeometry()))
+  if ((numberTrajectoriesRef > 0) && !isPointSimilar(m_explosionClusterData.explosionGeometry))
   {
     
     enableUiFireButton();
@@ -1829,7 +1829,7 @@ void ExplosionsEdit::enableUiElements(bool enable)
   else
   {
     
-    m_ui->pbFire->setEnabled(enable && m_aesItem.id() > 0); 
+    m_ui->pbFire->setEnabled(enable && m_aesItem.id > 0); 
   }
 
   
@@ -1871,7 +1871,7 @@ void ExplosionsEdit::enableUiFireButton()
   
   
 
-  bool enableBasics = (m_aesItem.id() > 0) 
+  bool enableBasics = (m_aesItem.id > 0) 
                       && isDataSufficiant();
 
   INFO_LOG(m_logger) << " enableBasics = " << enableBasics;
@@ -1879,17 +1879,17 @@ void ExplosionsEdit::enableUiFireButton()
   if (!enableBasics)
     return; 
 
-  if (m_explosionClusterData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
+  if (m_explosionClusterData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
     return; 
 
   int numberTrajectoriesRef = 0;
   {
-    const int simToRestrict = m_aesItem.id();
+    const int simToRestrict = m_aesItem.id;
     
     auto cb = [simToRestrict, &numberTrajectoriesRef](const AreaEffectSimulation::TrajectoryTimeAware &traj)
     {
       
-      if ((traj.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) && (simToRestrict == traj.originatorId()))
+      if ((traj.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation) && (simToRestrict == traj.originatorId))
         ++numberTrajectoriesRef;
     };
     m_dtc->trajectoryTimeAwares(cb);
@@ -1900,12 +1900,12 @@ void ExplosionsEdit::enableUiFireButton()
   
   
   
-  if ((numberTrajectoriesRef <= 0) && (m_explosionClusterData.effectDuration() == m_explosionClusterData.originalEffectDuration()))
+  if ((numberTrajectoriesRef <= 0) && (m_explosionClusterData.effectDuration == m_explosionClusterData.originalEffectDuration))
   {
     INFO_LOG(m_logger) << " Firing has NOT started yet";
     return; 
   }
-  else if (numberTrajectoriesRef >= m_explosionClusterData.impactCount())
+  else if (numberTrajectoriesRef >= m_explosionClusterData.impactCount)
   {
     INFO_LOG(m_logger) << " Firing has finished";
     return; 
@@ -1927,7 +1927,7 @@ void ExplosionsEdit::enableUiFireButton()
     else
     {
       
-      if (m_explosionClusterData.effectStateId() == AesEffectState::EsPaused)
+      if (m_explosionClusterData.effectStateId == AesEffectState::EsPaused)
         bPause = false;
     }
   }
@@ -1944,7 +1944,7 @@ void ExplosionsEdit::enableUiFireButton()
   {
     
     
-    if ((m_explosionClusterData.impactCount() > 1) && (m_explosionClusterData.impactCount() >= m_explosionClusterData.remainExplosionNumber()))
+    if ((m_explosionClusterData.impactCount > 1) && (m_explosionClusterData.impactCount >= m_explosionClusterData.remainExplosionNumber))
     {
       m_ui->pbFire->setEnabled(true);
       m_ui->pbFire->setText(tr("Start"));
@@ -1964,7 +1964,7 @@ void ExplosionsEdit::showPreviewObject()
   if (!has2DMap(false)) 
     return;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       if (m_previewPolygon.isEmpty())
@@ -2011,7 +2011,7 @@ bool ExplosionsEdit::isDataSufficiant()
 
   
   bool bHasTargetArea = !m_coord.isNull();
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       bHasTargetArea &= m_ui->sbDimensionX_BreiteRadius->value() > 0;
@@ -2036,32 +2036,32 @@ bool ExplosionsEdit::isDataSufficiant()
 bool ExplosionsEdit::apply()
 {
   ExplosionClusterModifyRequest request;
-  request.id(m_aesItem.id());
-  request.element(m_ui->leElement->text().toStdString());
-  request.name(m_ui->leZpNumber->text().toStdString());
+  request.id = m_aesItem.id;
+  request.element = m_ui->leElement->text().toStdString();
+  request.name = m_ui->leZpNumber->text().toStdString();
 
   if (m_ui->dteEffectStart->isChecked())
-    request.effectStart().set(m_ui->dteEffectStart->msecsSinceEpoch());
+    request.effectStart.set(m_ui->dteEffectStart->msecsSinceEpoch());
   if (m_ui->sbDurationSec->isVisible())
-    request.effectDuration(m_ui->sbDurationSec->value() * 1000);
+    request.effectDuration = m_ui->sbDurationSec->value() * 1000;
 
   const bool bIsPoint = isPointSimilar(m_currentGeometry);
 
   
-  request.explosionGeometry(m_currentGeometry);
+  request.explosionGeometry = m_currentGeometry;
 
   Core::GeoPosition2D bottomLeftGeo;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AesExplosionGeometry::EgRadial:
     {
       QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, m_ui->sbDimensionX_BreiteRadius->value() * 2, m_ui->sbDimensionY_Tiefe->value() * 2, 0.0));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value() * 2);
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value() * 2);
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value() * 2;
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value() * 2;
 
       break;
     }
@@ -2075,9 +2075,9 @@ bool ExplosionsEdit::apply()
                                                           (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value());
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value());
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value();
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value();
 
       break;
     }
@@ -2092,9 +2092,9 @@ bool ExplosionsEdit::apply()
                                                           (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value());
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value());
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value();
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value();
 
       break;
     }
@@ -2111,24 +2111,24 @@ bool ExplosionsEdit::apply()
 
   if (esmParticipantId1 > 0 || esmParticipantId2 > 0)
   {
-    request.esmParticipantIds().reserve(2);
+    request.esmParticipantIds.reserve(2);
     if (esmParticipantId1 > 0)
-      request.esmParticipantIds().push_back(esmParticipantId1);
+      request.esmParticipantIds.push_back(esmParticipantId1);
     if (esmParticipantId2 > 0 && esmParticipantId1 != esmParticipantId2 && m_ui->cbActors_2->isEnabled())
-      request.esmParticipantIds().push_back(esmParticipantId2);
+      request.esmParticipantIds.push_back(esmParticipantId2);
   }
 
-  if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
-    request.area().rotation(0);
+  if (bIsPoint || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
+    request.area.rotation = 0;
   else
-    request.area().rotation((m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400);
+    request.area.rotation = (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400;
 
-  request.tla(m_ui->sbZog->value()); 
+  request.tla = m_ui->sbZog->value();
 
   
   if (bIsPoint)
   {
-    request.mhpCount(1);
+    request.mhpCount = 1;
   }
   else
   {
@@ -2144,43 +2144,43 @@ bool ExplosionsEdit::apply()
       }
       
       if (mtpCount > sbCannonsCount)
-        request.mhpCount(sbCannonsCount);
+        request.mhpCount = sbCannonsCount;
       else
-        request.mhpCount(mtpCount);
+        request.mhpCount = mtpCount;
     }
   }
 
   
-  request.partyId().set(m_ui->cbParty->currentData().toInt());
+  request.partyId.set(m_ui->cbParty->currentData().toInt());
   
   bool bOk = false;
-  request.participantId().set(m_ui->cbParticipantUnits->currentData(Qt::UserRole).toInt(&bOk));
+  request.participantId.set(m_ui->cbParticipantUnits->currentData(Qt::UserRole).toInt(&bOk));
   if (!bOk)
-    request.participantId(0); 
+    request.participantId = 0;
 
   
-  request.impactCount(m_ui->sbCannons->value());
+  request.impactCount = m_ui->sbCannons->value();
   
-  request.chargeStruct().chargeTypeId(m_ui->cbChargeType->currentData().toInt());
-  request.chargeStruct().igniterTypeId(m_ui->cbIgniterType->currentData().toInt());
-  request.firePurposeId(m_ui->cbFirePurpose->currentData().toInt());
+  request.chargeStruct.chargeTypeId = m_ui->cbChargeType->currentData().toInt();
+  request.chargeStruct.igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
+  request.firePurposeId = m_ui->cbFirePurpose->currentData().toInt();
 
   
   {
-    request.peakHeight(-1);
-    request.flightDuration(-1);
+    request.peakHeight = -1;
+    request.flightDuration = -1;
 
     const bool usePeakHeight = m_ui->sBox_peakHeight->styleSheet().isEmpty();
     const bool useFlightDuration = m_ui->sBox_flightDuration->styleSheet().isEmpty();
     if (usePeakHeight == useFlightDuration)
-      request.peakHeight(m_ui->sBox_peakHeight->value());
+      request.peakHeight = m_ui->sBox_peakHeight->value();
     else if (useFlightDuration)
-      request.flightDuration(m_ui->sBox_flightDuration->value() * 1000);
+      request.flightDuration = m_ui->sBox_flightDuration->value() * 1000;
     else
-      request.peakHeight(m_ui->sBox_peakHeight->value());
+      request.peakHeight = m_ui->sBox_peakHeight->value();
   }
 
-  if (request.flightDuration() >= 600 * 1000)
+  if (request.flightDuration >= 600 * 1000)
   {
     for (int i = 0; i < 10; ++i)
       FATAL_LOG(m_logger) << LOGFUNCTION << " !!!!!!!!!!!!!!"
@@ -2188,29 +2188,29 @@ bool ExplosionsEdit::apply()
                           << " m_ui->sBox_flightDuration->value() " << m_ui->sBox_flightDuration->value();
   }
 
-  request.partyId().set(m_ui->cbParty->currentData().toInt());
-  request.effectMarkingInTa(m_ui->gbEffectMarkingInTa->isChecked());
-  request.effectSourceId(ProjectDataManagement::EffectSource::ES_Internal);
+  request.partyId.set(m_ui->cbParty->currentData().toInt());
+  request.effectMarkingInTa = m_ui->gbEffectMarkingInTa->isChecked();
+  request.effectSourceId = ProjectDataManagement::EffectSource::ES_Internal;
 
   if (isGuiVulcano())
   {
-    request.launchVelocity(TrajectoryGeneratorVulcano::defaultv0()); 
-    request.launchAngleDeg(0);                                       
-    request.dropAngle(currentDropAngleDegree());
+    request.launchVelocity = TrajectoryGeneratorVulcano::defaultv0();
+    request.launchAngleDeg = 0;
+    request.dropAngle = currentDropAngleDegree();
 
-    if (request.effectStart().is_set())
-      request.tapTime(request.effectStart().get() - (TrajectoryGeneratorVulcano::defaultTapTimeSec() * 1000)); 
+    if (request.effectStart.has_value())
+      request.tapTime = request.effectStart.get() - (TrajectoryGeneratorVulcano::defaultTapTimeSec() * 1000);
 
-    request.lcAttack(m_ui->sbLcAttack_Prf->value());
-    request.lcTermination(m_ui->sbLcTermination_Prf->value());
+    request.lcAttack = m_ui->sbLcAttack_Prf->value();
+    request.lcTermination = m_ui->sbLcTermination_Prf->value();
 
     const int cloudBaseValue = m_ui->spCloudBase->value();
 
     
     if (cloudBaseValue == m_ui->spCloudBase->minimum())
-      request.cloudBase(std::numeric_limits<int>::min());
+      request.cloudBase = std::numeric_limits<int>::min();
     else
-      request.cloudBase(cloudBaseValue);
+      request.cloudBase = cloudBaseValue;
 
   } 
 
@@ -2229,7 +2229,7 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt)
 
   m_currentGeometry = newGeometry;
 
-  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry.underlying());
+  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry);
 
   
   if (m_sitMapGuiIfc)
@@ -2247,7 +2247,7 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt)
   if (m_sitMapGuiIfc)
     m_sitMapGuiIfc->removePreviewObject();
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: 
     case AreaEffectSimulation::AesExplosionGeometry::EgPoint:
@@ -2351,13 +2351,13 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt)
 void ExplosionsEdit::onFireClicked()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  if (((m_aesItem.effectStateId() == AesEffectState::EsUnknown) || 
-       (m_aesItem.effectStateId() == AesEffectState::EsError) || (m_aesItem.effectStateId() == AesEffectState::EsExpired)
-       || (m_aesItem.effectStateId() == AesEffectState::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState::EsReceived)
-       || (m_aesItem.effectStateId() == AesEffectState::EsFired)
+  if (((m_aesItem.effectStateId == AesEffectState::EsUnknown) || 
+       (m_aesItem.effectStateId == AesEffectState::EsError) || (m_aesItem.effectStateId == AesEffectState::EsExpired)
+       || (m_aesItem.effectStateId == AesEffectState::EsRemoved) || (m_aesItem.effectStateId == AesEffectState::EsReceived)
+       || (m_aesItem.effectStateId == AesEffectState::EsFired)
        
        )
-      || m_aesItem.id() <= 0)
+      || m_aesItem.id <= 0)
     return;
 
   if (!isDataSufficiant())
@@ -2373,9 +2373,9 @@ void ExplosionsEdit::onFireClicked()
 
   m_ui->pbFire->setEnabled(false);
 
-  const bool bIsObjectModifiable = m_explosionClusterData.isObjectModifiable();
+  const bool bIsObjectModifiable = m_explosionClusterData.isObjectModifiable;
 
-  if ((m_aesItem.effectStateId() == AesEffectState::EsCreated || m_aesItem.effectStateId() == AesEffectState::EsPrepared) && bIsObjectModifiable)
+  if ((m_aesItem.effectStateId == AesEffectState::EsCreated || m_aesItem.effectStateId == AesEffectState::EsPrepared) && bIsObjectModifiable)
   {
     m_ui->dteEffectStart->setMsecsSinceEpoch(m_session->partitionTime() + m_temporaryData.m_estimatedFlightDurationMsec + 5000);
     m_ui->dteEffectStart->setChecked(true);
@@ -2415,9 +2415,9 @@ void ExplosionsEdit::onFireClicked()
     m_requestHelper->addRequest(
         [=]()
         {
-          return m_ftc->explosionClusterPauseResumeRequest(ExplosionClusterPauseResumeRequest(m_aesItem.id(),
+          return m_ftc->explosionClusterPauseResumeRequest(ExplosionClusterPauseResumeRequest(m_aesItem.id,
                                                                                               resumeExecution, 
-                                                                                              dds::core::optional<rti::core::int64>(),
+                                                                                              dds::core::optional<int64_t>(),
                                                                                               dds::core::optional<int32_t>(),
                                                                                               dds::core::optional<int32_t>()),
                                                            this);
@@ -2441,7 +2441,7 @@ void ExplosionsEdit::onGearClassChanged()
   fillParties();
   onPartyChanged();
 
-  ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::Mortar;
+  ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::GearClass_Mortar;
   QVariant lastVal = m_ui->cbGearClass->property(LAST_VALUE);
   if (!lastVal.isNull())
     lastGearClassType = static_cast<ProjectDataManagement::GearClass>(lastVal.toInt());
@@ -2482,7 +2482,7 @@ void ExplosionsEdit::onGearClassChanged()
   }
 
   
-  m_ui->cbGearClass->setProperty(LAST_VALUE, newGearClassType);
+  m_ui->cbGearClass->setProperty(LAST_VALUE, static_cast<int>(newGearClassType));
 
   doCalculations();
 }
@@ -2501,24 +2501,24 @@ void ExplosionsEdit::gatherParticipantUnits(const int &partyId, QHash<int, QSet<
 
   auto cb = [this, &partyId, &units, gearClassId](const ParticipantManagement::Participant &part)
   {
-    if (part.isDeleted() || part.partyId() != partyId)
+    if (part.isDeleted || part.partyId != partyId)
       return;
 
     const ParticipantManagement::ParticipantData &ppData = m_ppmDtc->convertParticipantToParticipantData(part);
-    const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId());
+    const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId);
     
-    if (m_ppmDtc->isAdlerVerbund(ppType.id()))
+    if (m_ppmDtc->isAdlerVerbund(ppType.id))
       return;
-    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties())).object());
+    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties)).object());
     
     
     
     
-    if (typeProperties.isEmpty() || ppType.typeClass() == ParticipantManagement::TypeClass::Unit || 
+    if (typeProperties.isEmpty() || ppType.typeClass == ParticipantManagement::TypeClass::Unit || 
         !typeProperties[QStringLiteral("isArtillery")].toBool(false) || typeProperties[QStringLiteral("gearClassId")].toInt(-1) != gearClassId)
       return;
 
-    units[part.superiorId()] += part.id();
+    units[part.superiorId] += part.id;
   };
   m_ppmDtc->participants(cb);
 
@@ -2526,9 +2526,9 @@ void ExplosionsEdit::gatherParticipantUnits(const int &partyId, QHash<int, QSet<
   for (auto it = units.begin(); it != units.end();)
   {
     const ParticipantManagement::Participant &pp = m_ppmDtc->participant(it.key());
-    const ParticipantManagement::Type &typ = m_ppmDtc->type(pp.typeId());
-    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(typ.properties())).object());
-    if ((typ.typeClass() != ParticipantManagement::TypeClass::Unit && typ.typeClass() != ParticipantManagement::TypeClass::GroundVehicle)
+    const ParticipantManagement::Type &typ = m_ppmDtc->type(pp.typeId);
+    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(typ.properties)).object());
+    if ((typ.typeClass != ParticipantManagement::TypeClass::Unit && typ.typeClass != ParticipantManagement::TypeClass::GroundVehicle)
         || !typeProperties[QStringLiteral("isArtillery")].toBool(false))
       it = units.erase(it++);
     else
@@ -2563,11 +2563,11 @@ bool ExplosionsEdit::isValidParty(qint32 partyId)
   return m_ppmDtc->participants(static_cast<std::function<bool(const ParticipantManagement::Participant &)>>(
       [this, partyId, gearClassId](const ParticipantManagement::Participant &participant)
       {
-        if (participant.partyId() != partyId || participant.isDeleted())
+        if (participant.partyId != partyId || participant.isDeleted)
           return false;
 
-        const ParticipantManagement::Type type = m_ppmDtc->type(participant.typeId());
-        const QJsonObject typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties())).object();
+        const ParticipantManagement::Type type = m_ppmDtc->type(participant.typeId);
+        const QJsonObject typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties)).object();
         const qint32 typeGearClass = typeProperties.value(QStringLiteral("gearClassId")).toInt(-1);
 
         return typeGearClass == gearClassId;
@@ -2601,17 +2601,17 @@ void ExplosionsEdit::fillCharges()
   for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
   {
     
-    const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
+    const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id);
     
-    const double impactRadius4Debug = m_pdmDtc->impactRadius(chargeType.id(), 0, 0);
-    bool isAdlerChargeType = m_pdmDtc->isAdlerChargeType(chargeType.id());
+    const double impactRadius4Debug = m_pdmDtc->impactRadius(chargeType.id, 0, 0);
+    bool isAdlerChargeType = m_pdmDtc->isAdlerChargeType(chargeType.id);
 
     DEBUG_LOG(m_logger) << " fillCharges"
-                        << ", id=" << chargeType.id() << ", name= " << chargeType.name() << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano
+                        << ", id=" << chargeType.id << ", name= " << chargeType.name << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano
                         << ", impactRadius4Debug = " << impactRadius4Debug << ", isAdlerChargeType = " << isAdlerChargeType;
-    if (isAdlerChargeType || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::Artillery)) 
+    if (isAdlerChargeType || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::GearClass_Artillery)) 
       continue;
-    m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name()), chargeType.id());
+    m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name), chargeType.id);
   }
 
   
@@ -2630,8 +2630,8 @@ void ExplosionsEdit::fillGearClasses()
   const auto &gearClasses = m_pdmDtc->gearTypes();
   for (auto type : std::as_const(gearClasses))
   {
-    if (m_gearClassFilter.contains(type.gearClassId()) && m_pdmDtc->getAdlerWeaponSystemId(type.id()) <= 3)
-      m_ui->cbGearClass->addItem(m_pdmDtc->trGearTypeName(type.id()), type.gearClassId().underlying());
+    if (m_gearClassFilter.contains(type.gearClassId) && m_pdmDtc->getAdlerWeaponSystemId(type.id) <= 3)
+      m_ui->cbGearClass->addItem(m_pdmDtc->trGearTypeName(type.id), static_cast<int>(type.gearClassId));
   }
 }
 
@@ -2649,7 +2649,7 @@ bool ExplosionsEdit::isOnlyNameModifiable() const
 {
   
   
-  const bool ret = BaseClass::isOnlyNameModifiable() || !m_explosionClusterData.isObjectModifiable();
+  const bool ret = BaseClass::isOnlyNameModifiable() || !m_explosionClusterData.isObjectModifiable;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h
index f8f7f162b..664f1716c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h
@@ -4,7 +4,7 @@
 #pragma once
 
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
index 88b4ba587..94a9ec02d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
@@ -95,11 +95,11 @@ ExplosionsEditAdler::ExplosionsEditAdler(const QString &menuGroup, QWidget *pare
   m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry::EgRadial));
   m_geometrieButtonGroup->setExclusive(true);
 
-  m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
+  m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
   const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
   if (enableRocket)
-    m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
+    m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
 
   m_uiRequirements->addRequirement(
       {m_ui->lbxActors,
@@ -186,12 +186,12 @@ bool ExplosionsEditAdler::init(int aesItemId, bool copy, LtsSession::LtsSession
   if (aesItemId > 0)
   {
     const EffectCluster &ecData = m_dtc->effectCluster(aesItemId);
-    DEBUG_LOG(m_logger) << "chargeTypeId: " << ecData.chargeStruct().chargeTypeId();
+    DEBUG_LOG(m_logger) << "chargeTypeId: " << ecData.chargeStruct.chargeTypeId;
     m_effectClusterData = ecData;
     setEffectClusterData(ecData);
 
     setPbStateChangeName();
-    m_ui->gbEffectMarkingInTa->setChecked(m_aesItem.effectMarkingInTa()); // always true for explosion cluster
+    m_ui->gbEffectMarkingInTa->setChecked(m_aesItem.effectMarkingInTa); // always true for explosion cluster
   }
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::effectClusterChanged, this, &ExplosionsEditAdler::onEffectClusterChanged, Qt::UniqueConnection);
@@ -218,7 +218,7 @@ void ExplosionsEditAdler::showPreviewObject()
   if (!has2DMap(false)) // showMsgBoxIfNot2D
     return;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       if (m_previewPolygon.isEmpty())
@@ -258,7 +258,7 @@ bool ExplosionsEditAdler::isDataSufficiant()
 
   // target:
   bool bHasTargetArea = !m_coord.isNull();
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       bHasTargetArea &= m_ui->lblDimensionYDepth->text().toInt() > 0;
@@ -283,25 +283,25 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData)
   m_aesItem = ecData;
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START, ecData=" << ecData;
 
-  m_ui->lblZpNumber->setText(QString::fromStdString(ecData.name()));
+  m_ui->lblZpNumber->setText(QString::fromStdString(ecData.name));
 
   qint64 effectStart = 0;
 
-  if (ecData.effectStart().is_set())
+  if (ecData.effectStart.has_value())
   {
-    const QJsonObject propsObj(QJsonDocument::fromJson(QByteArray::fromStdString(ecData.properties())).object());
+    const QJsonObject propsObj(QJsonDocument::fromJson(QByteArray::fromStdString(ecData.properties)).object());
     const FiringType firingType = static_cast<FiringType>(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt());
 
-    effectStart = ecData.effectStart().get();
+    effectStart = ecData.effectStart.get();
 
     if (firingType == FiringType::FireWithIndicationTTF)
-      effectStart -= ecData.effectors().size() ? ecData.effectors().at(0).flightTime() : 0;
+      effectStart -= ecData.effectors.size() ? ecData.effectors.at(0).flightTime : 0;
   }
 
   m_ui->dteEffectStart->setMsecsSinceEpoch(effectStart);
 
   // Geometry/Area
-  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry());
+  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry);
   switch (geometryType)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint:
@@ -324,26 +324,26 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData)
       break;
   } // switch
 
-  if (ecData.effectDuration() == DEFAULT_EFFECT_DURATION)
+  if (ecData.effectDuration == DEFAULT_EFFECT_DURATION)
     m_ui->lblDuration->setText(QStringLiteral("---"));
   else
-    m_ui->lblDuration->setText(QString::number(ecData.effectDuration() / 1000)); // msecs -> secs
+    m_ui->lblDuration->setText(QString::number(ecData.effectDuration / 1000)); // msecs -> secs
 
   // 1st GearClass
-  ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct().chargeTypeId());
+  ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct.chargeTypeId);
   m_ui->lblGearClass->setText(ProjectDataManagement::toString(gc));
 
   // 2nd Party
-  if (ecData.partyId().is_set())
-    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ecData.partyId().get()).name()));
+  if (ecData.partyId.has_value())
+    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ecData.partyId.get()).name));
 
   // 3rd Originator
-  if (ecData.participantId().is_set())
-    m_ui->lblParticipantUnits->setText(QString::fromStdString(m_ppmDtc->participant(ecData.participantId().get()).name()));
+  if (ecData.participantId.has_value())
+    m_ui->lblParticipantUnits->setText(QString::fromStdString(m_ppmDtc->participant(ecData.participantId.get()).name));
 
-  m_ui->lblChargeType->setText(m_pdmDtc->adlerChargeTypeName(ecData.chargeStruct().chargeTypeId()));
-  m_ui->lblIgniterType->setText(m_pdmDtc->adlerIgniterTypeName(ecData.chargeStruct().igniterTypeId()));
-  m_ui->lblIgniterFunction->setText(m_pdmDtc->adlerIgniterFunctionName(ecData.chargeStruct().igniterFunctionId()));
+  m_ui->lblChargeType->setText(m_pdmDtc->adlerChargeTypeName(ecData.chargeStruct.chargeTypeId));
+  m_ui->lblIgniterType->setText(m_pdmDtc->adlerIgniterTypeName(ecData.chargeStruct.igniterTypeId));
+  m_ui->lblIgniterFunction->setText(m_pdmDtc->adlerIgniterFunctionName(ecData.chargeStruct.igniterFunctionId));
 
   int impactCount = 0;
 
@@ -355,55 +355,55 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData)
       delete item->widget();
     delete item;
   }
-  for (const auto &effectorData : ecData.effectors())
+  for (const auto &effectorData : ecData.effectors)
   {
-    setEffector(effectorData.participantId(), m_dtc->effector(effectorData.participantId()).effectorState());
-    impactCount += effectorData.chargeAmount();
+    setEffector(effectorData.participantId, m_dtc->effector(effectorData.participantId).effectorState);
+    impactCount += effectorData.chargeAmount;
   }
 
   m_ui->layoutEffectors->setColumnStretch(m_effectorNumber + 1 % m_maxColumns, 1);
   m_ui->lblCannons->setText(QString::number(impactCount));
-  m_ui->lblFirePurpose->setText(m_pdmDtc->trFirePurposeName(ecData.firePurposeId()));
+  m_ui->lblFirePurpose->setText(m_pdmDtc->trFirePurposeName(ecData.firePurposeId));
 
-  m_ui->lblZog->setText(QString::number(ecData.tla())); // tla == zog
+  m_ui->lblZog->setText(QString::number(ecData.tla)); // tla == zog
 
-  const AreaEffectSimulation::Area &areaRef = ecData.area();
-  const QPointF bottomLeft(areaRef.cornerBottomLeft().lon(), areaRef.cornerBottomLeft().lat());
-  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width(), areaRef.height(), areaRef.rotation());
+  const AreaEffectSimulation::Area &areaRef = ecData.area;
+  const QPointF bottomLeft(areaRef.cornerBottomLeft.lon, areaRef.cornerBottomLeft.lat);
+  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width, areaRef.height, areaRef.rotation);
   if (!bottomLeft.isNull())
   {
     m_ui->positionEdit->setCoordinate(centerpoint);
     m_coord = centerpoint;
     const Core::GeoPosition coordGeo(centerpoint.x(), centerpoint.y(), 0);
-    bool isSmoke = m_pdmDtc->isSmoke(ecData.chargeStruct().chargeTypeId(), ecData.chargeStruct().igniterTypeId(), ecData.chargeStruct().igniterFunctionId());
+    bool isSmoke = m_pdmDtc->isSmoke(ecData.chargeStruct.chargeTypeId, ecData.chargeStruct.igniterTypeId, ecData.chargeStruct.igniterFunctionId);
     m_esmActorCbx->fillActorComboBox(m_ui->cbActors, coordGeo, isSmoke, 0);
     m_esmActorCbx->fillActorComboBox(m_ui->cbActors_2, coordGeo, isSmoke, 0);
   }
 
-  if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
+  if (ecData.explosionGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
   {
-    m_ui->lblDimensionYDepth->setText(QString::number(static_cast<int>(std::round(areaRef.height() / 2))));
-    m_ui->lblWidthRadius->setText(QString::number(static_cast<int>(std::round(areaRef.width() / 2))));
+    m_ui->lblDimensionYDepth->setText(QString::number(static_cast<int>(std::round(areaRef.height / 2))));
+    m_ui->lblWidthRadius->setText(QString::number(static_cast<int>(std::round(areaRef.width / 2))));
     m_ui->lblAimingAxis->setText(QString::number(0));
   }
   else
   {
-    m_ui->lblDimensionYDepth->setText(QString::number(static_cast<int>(std::round(areaRef.height()))));
-    m_ui->lblWidthRadius->setText(QString::number(static_cast<int>(std::round(areaRef.width()))));
-    m_ui->lblAimingAxis->setText(QString::number(static_cast<int>(std::round(fmod((areaRef.rotation()) * 6400 / 360, 6400)))));
+    m_ui->lblDimensionYDepth->setText(QString::number(static_cast<int>(std::round(areaRef.height))));
+    m_ui->lblWidthRadius->setText(QString::number(static_cast<int>(std::round(areaRef.width))));
+    m_ui->lblAimingAxis->setText(QString::number(static_cast<int>(std::round(fmod((areaRef.rotation) * 6400 / 360, 6400)))));
   }
-  setEffectClusterDataFromJson(ecData.properties());
-  if (!ecData.esmParticipantIds().empty())
+  setEffectClusterDataFromJson(ecData.properties);
+  if (!ecData.esmParticipantIds.empty())
   {
-    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds().at(0)));
-    if (ecData.esmParticipantIds().size() > 1)
-      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds().at(1)));
+    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds.at(0)));
+    if (ecData.esmParticipantIds.size() > 1)
+      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds.at(1)));
   }
-  if (ecData.effectors().size())
-    setOWUWFromTrajectory(ecData.effectors().at(0).trajectoryRelative());
+  if (ecData.effectors.size())
+    setOWUWFromTrajectory(ecData.effectors.at(0).trajectoryRelative);
 
   // enable second Actor if possible
-  const int amountFireMarker = m_pdmDtc->getAmountFireMarkers(ecData.firePurposeId());
+  const int amountFireMarker = m_pdmDtc->getAmountFireMarkers(ecData.firePurposeId);
   m_ui->cbActors_2->setEnabled(amountFireMarker > 1);
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
@@ -414,7 +414,7 @@ void ExplosionsEditAdler::setEffector(int participantId, const AreaEffectSimulat
   const ParticipantManagement::Participant &part = m_ppmDtc->participant(participantId);
 
   auto *effectorWidget = new AesEffector(this);
-  effectorWidget->init(participantId, QString::fromStdString(part.tacticalIdentifier()), QString::fromStdString(part.name()), effectorState);
+  effectorWidget->init(participantId, QString::fromStdString(part.tacticalIdentifier), QString::fromStdString(part.name), effectorState);
   effectorWidget->setStateButtonVisible(false);
 
   const int row = m_effectorNumber / m_maxColumns;
@@ -430,7 +430,7 @@ void ExplosionsEditAdler::setEffector(int participantId, const AreaEffectSimulat
 QString ExplosionsEditAdler::dialogIdentifier() const
 {
   DEBUG_LOG(m_logger) << "dialogIdentifier";
-  return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id());
+  return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id);
 }
 
 void ExplosionsEditAdler::onAcknowledgeExternalAesItemReply(const Core::FunctionReplyObject &replyObject)
@@ -442,7 +442,7 @@ void ExplosionsEditAdler::onAcknowledgeExternalAesItemReply(const Core::Function
 void ExplosionsEditAdler::onEffectClusterChanged(const EffectCluster &ecData, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onExplosionClusterChanged";
-  if (ecData.id() != m_aesItem.id())
+  if (ecData.id != m_aesItem.id)
     return;
 
   BaseEdit::onAreaChanged(ecData, modType);
@@ -454,15 +454,15 @@ void ExplosionsEditAdler::onEffectClusterChanged(const EffectCluster &ecData, Da
   }
 
   m_effectClusterData = ecData;
-  m_currentGeometry = m_effectClusterData.explosionGeometry();
+  m_currentGeometry = m_effectClusterData.explosionGeometry;
 
   setEffectClusterData(ecData);
   setPbStateChangeName();
 
-  if (m_effectClusterData.effectDuration() == DEFAULT_EFFECT_DURATION)
+  if (m_effectClusterData.effectDuration == DEFAULT_EFFECT_DURATION)
     m_ui->lblDuration->setText(QStringLiteral("---"));
   else
-    m_ui->lblDuration->setText(QString::number(m_effectClusterData.effectDuration() / 1000)); // msec -> sec
+    m_ui->lblDuration->setText(QString::number(m_effectClusterData.effectDuration / 1000)); // msec -> sec
 
   enableUiElements();
   if (unchangeable())
@@ -556,10 +556,10 @@ void ExplosionsEditAdler::enableUiElements(bool enable)
   m_ui->rbAngleGroupLower->setEnabled(enable);
   m_ui->rbAngleGroupUpper->setEnabled(enable);
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsReceived)
+  if (m_aesItem.effectStateId == AesEffectState::EsReceived)
     m_ui->pbStateChange->setEnabled(true);
   else
-    m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire);
+    m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState != AreaEffectSimulation::AesEffectorState::EsReadyToFire);
 }
 
 /*!
@@ -573,17 +573,17 @@ bool ExplosionsEditAdler::apply()
   int esmParticipantId2 = m_ui->cbActors_2->currentData().toInt(); // participant ID
 
   EffectClusterModifyActorRequest request;
-  request.aesId(m_aesItem.id());
+  request.aesId = m_aesItem.id;
   DEBUG_LOG(m_logger) << "currentIndex: " << m_ui->cbActors->currentIndex() << ", currentText: " << m_ui->cbActors->currentText()
                       << ", participantId1: " << esmParticipantId1;
 
   if (esmParticipantId1 > 0 || esmParticipantId2 > 0)
   {
-    request.esmParticipantIds().reserve(2);
+    request.esmParticipantIds.reserve(2);
     if (esmParticipantId1 > 0)
-      request.esmParticipantIds().push_back(esmParticipantId1);
+      request.esmParticipantIds.push_back(esmParticipantId1);
     if (esmParticipantId2 > 0 && esmParticipantId1 != esmParticipantId2 && m_ui->cbActors_2->isEnabled())
-      request.esmParticipantIds().push_back(esmParticipantId2);
+      request.esmParticipantIds.push_back(esmParticipantId2);
   }
 
   m_requestHelper->addRequest([this, request]() { return m_ftc->effectClusterModifyActorRequest(request, this); });
@@ -593,28 +593,28 @@ bool ExplosionsEditAdler::apply()
 //
 void ExplosionsEditAdler::setPbStateChangeName()
 {
-  DEBUG_LOG(m_logger) << "onPbStateChangeName: AesEffectState: " << m_aesItem.effectStateId();
+  DEBUG_LOG(m_logger) << "onPbStateChangeName: AesEffectState: " << m_aesItem.effectStateId;
 
-  if ((m_aesItem.effectStateId() != AesEffectState::EsReceived && m_aesItem.effectStateId() != AesEffectState::EsCreated) || m_aesItem.id() <= 0)
+  if ((m_aesItem.effectStateId != AesEffectState::EsReceived && m_aesItem.effectStateId != AesEffectState::EsCreated) || m_aesItem.id <= 0)
     return;
 
   m_ui->pbStateChange->show();
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsReceived)
+  if (m_aesItem.effectStateId == AesEffectState::EsReceived)
     m_ui->pbStateChange->setText(tr("Acknowledge"));
   else
   {
     m_ui->pbStateChange->setText(tr("Ready to fire"));
-    m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire);
+    m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState != AreaEffectSimulation::AesEffectorState::EsReadyToFire);
   }
 }
 
 void ExplosionsEditAdler::onPbStateChangeClicked()
 {
-  if ((m_aesItem.effectStateId() != AesEffectState::EsReceived && m_aesItem.effectStateId() != AesEffectState::EsCreated) || m_aesItem.id() <= 0)
+  if ((m_aesItem.effectStateId != AesEffectState::EsReceived && m_aesItem.effectStateId != AesEffectState::EsCreated) || m_aesItem.id <= 0)
     return;
 
-  DEBUG_LOG(m_logger) << " onPbStateChangeClicked: AesEffectState = " << m_aesItem.effectStateId();
+  DEBUG_LOG(m_logger) << " onPbStateChangeClicked: AesEffectState = " << m_aesItem.effectStateId;
 
   m_ui->pbStateChange->setDisabled(true);
 
@@ -622,21 +622,21 @@ void ExplosionsEditAdler::onPbStateChangeClicked()
     apply();
 
   // Re-Enable PB, so we can call it another time, if it does not react...
-  QTimer::singleShot(2000, [this]() { m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire); });
+  QTimer::singleShot(2000, [this]() { m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState != AreaEffectSimulation::AesEffectorState::EsReadyToFire); });
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsReceived)
+  if (m_aesItem.effectStateId == AesEffectState::EsReceived)
   {
     AreaEffectSimulation::AcknowledgeExternalAesItemRequest request;
-    request.aesId(m_aesItem.id());
-    DEBUG_LOG(m_logger) << "Send acknowledgeExternalAesItemRequest with aesId: " << request.aesId();
+    request.aesId = m_aesItem.id;
+    DEBUG_LOG(m_logger) << "Send acknowledgeExternalAesItemRequest with aesId: " << request.aesId;
     m_requestHelper->addRequest([this, request]() { return m_ftc->acknowledgeExternalAesItemRequest(request, this); });
   }
   else
   {
     AreaEffectSimulation::SetAesItemEffectorStateRequest request;
-    request.aesId(m_aesItem.id());
-    request.newEffectorState(AesEffectorState::EsReadyToFire);
-    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId() << ", AesEffectorState: " << request.newEffectorState();
+    request.aesId = m_aesItem.id;
+    request.newEffectorState = AesEffectorState::EsReadyToFire;
+    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId << ", AesEffectorState: " << request.newEffectorState;
     m_requestHelper->addRequest([this, request]() { return m_ftc->setAesItemEffectorStateRequest(request, this); });
   }
 
@@ -645,7 +645,7 @@ void ExplosionsEditAdler::onPbStateChangeClicked()
 
 void ExplosionsEditAdler::onEffectorChanged(const AreaEffectSimulation::Effector &data, DataModification modType)
 {
-  if (data.aesItemId() != m_aesItem.id())
+  if (data.aesItemId != m_aesItem.id)
     return;
 
   for (int i = 0; i < m_ui->layoutEffectors->count(); ++i)
@@ -655,24 +655,24 @@ void ExplosionsEditAdler::onEffectorChanged(const AreaEffectSimulation::Effector
     {
       if (AesEffector *effectorWidget = qobject_cast<AesEffector *>(widget))
       {
-        if (effectorWidget->effectorId() != data.id())
+        if (effectorWidget->effectorId() != data.id)
           continue;
 
-        effectorWidget->setState(data.effectorState());
+        effectorWidget->setState(data.effectorState);
         return;
       }
     }
   }
 
   if (modType == DataModification::eAdded)
-    setEffector(data.participantId(), data.effectorState());
+    setEffector(data.participantId, data.effectorState);
 }
 
 bool ExplosionsEditAdler::isOnlyNameModifiable() const
 {
   // BaseClass::isOnlyNameModifiable() -> EsPaused || EsActivated
   // m_effectClusterData.isObjectModifiable -> since PreStart and s_calculationOffsetMSec
-  const bool ret = BaseClass::isOnlyNameModifiable() || !m_effectClusterData.isObjectModifiable();
+  const bool ret = BaseClass::isOnlyNameModifiable() || !m_effectClusterData.isObjectModifiable;
   return ret;
 }
 
@@ -694,9 +694,9 @@ void ExplosionsEditAdler::setOWUWFromTrajectory(const std::vector<Core::Relative
   if (vecGeometry.size() < 2)
     return;
 
-  const double dz = vecGeometry.at(1).offsetZ() - vecGeometry.at(0).offsetZ();
-  const QLineF line(vecGeometry.at(0).offsetX(), vecGeometry.at(0).offsetY(),
-                    vecGeometry.at(1).offsetX(), vecGeometry.at(1).offsetY());
+  const double dz = vecGeometry.at(1).offsetZ - vecGeometry.at(0).offsetZ;
+  const QLineF line(vecGeometry.at(0).offsetX, vecGeometry.at(0).offsetY,
+                    vecGeometry.at(1).offsetX, vecGeometry.at(1).offsetY);
 
   double angleArc = std::atan2(dz, line.length());
   double angleDegree = angleArc * (180.0 / M_PI);
@@ -753,7 +753,7 @@ void ExplosionsEditAdler::setEffectClusterDataFromJson(const std::string &proper
     m_ui->lblTargetSubType->setText(m_pdmDtc->trTargetSubTypeName(targetSubTypeId));
 
   const int angleGroup = propsObj[AdlerJson::JsonKeys::WINKELGRUPPE()].toInt();
-  if (angleGroup == ProjectDataManagement::L43_AngleGroup::Lower)
+  if (angleGroup == static_cast<int>(ProjectDataManagement::L43_AngleGroup::Lower))
     m_ui->rbAngleGroupLower->setChecked(true);
   else
     m_ui->rbAngleGroupUpper->setChecked(true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.h
index 2a48bbd75..cc4febda4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <AreaEffectSimulation/aes_ftc.h>
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <EffectShowManagement/esm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
index 302fb8896..063caa8a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
@@ -86,17 +86,17 @@ QPair<int, int> ExplosionsEditAdlerStandAlone::getMinMaxDistance(ProjectDataMana
   static QHash<int, QPair<int, int>> contraintsDistance;
   if (contraintsDistance.isEmpty())
   {
-    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {3500, 40000}); // Haubitze
-    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {800, 7800});      // Mörser
-    // contraints.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar),    {15000,  90000});  // Rakete
-    // contraints.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar),    {10000,  38400});  // Minenrakete
+    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {3500, 40000}); // Haubitze
+    contraintsDistance.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {800, 7800});      // Mörser
+    // contraints.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar),    {15000,  90000});  // Rakete
+    // contraints.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar),    {10000,  38400});  // Minenrakete
   }
 
   static QHash<int, QPair<int, int>> contraintsDistanceVulcano;
   if (contraintsDistanceVulcano.isEmpty())
   {
-    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {10000, 70000}); // Haubitze
-    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {10000, 70000});    // Rakete
+    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {10000, 70000}); // Haubitze
+    contraintsDistanceVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {10000, 70000});    // Rakete
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -132,15 +132,15 @@ QPair<int, int> ExplosionsEditAdlerStandAlone::getMinMaxFlightDurationSec(Projec
   static QHash<int, QPair<int, int>> contraintsFlightDuration;
   if (contraintsFlightDuration.isEmpty())
   {
-    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {6, 150}); // Haubitze
-    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {20, 60});    // Mörser
+    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {6, 150}); // Haubitze
+    contraintsFlightDuration.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {20, 60});    // Mörser
   }
 
   static QHash<int, QPair<int, int>> contraintsFlightDurationVulcano;
   if (contraintsFlightDurationVulcano.isEmpty())
   {
-    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {0, 999}); // Haubitze
-    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {0, 999});    // Rakete
+    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {0, 999}); // Haubitze
+    contraintsFlightDurationVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {0, 999});    // Rakete
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -176,15 +176,15 @@ QPair<int, int> ExplosionsEditAdlerStandAlone::getMinMaxPeakHeight(ProjectDataMa
   static QHash<int, QPair<int, int>> contraintsPeak;
   if (contraintsPeak.isEmpty())
   {
-    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {250, 15000}); // Haubitze
-    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::Mortar), {500, 3000});     // Mörser
+    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {250, 15000}); // Haubitze
+    contraintsPeak.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Mortar), {500, 3000});     // Mörser
   }
 
   static QHash<int, QPair<int, int>> contraintsPeakVulcano;
   if (contraintsPeakVulcano.isEmpty())
   {
-    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Artillery), {1000, 37500}); // Haubitze
-    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::Rocket), {1000, 37500});    // Rakete
+    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Artillery), {1000, 37500}); // Haubitze
+    contraintsPeakVulcano.insert(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket), {1000, 37500});    // Rakete
   }
   if (chargeTypeIdIsVulcano(chargeTypeId))
   {
@@ -212,8 +212,8 @@ int ExplosionsEditAdlerStandAlone::getMaxPeakHeight(ProjectDataManagement::GearC
 
 bool ExplosionsEditAdlerStandAlone::isPointSimilar(AreaEffectSimulation::AesExplosionGeometry geometry)
 {
-  return (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgAimPoint)
-         || (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint);
+  return (geometry == AreaEffectSimulation::AesExplosionGeometry::EgAimPoint)
+         || (geometry == AreaEffectSimulation::AesExplosionGeometry::EgPoint);
 }
 
 /*!
@@ -278,11 +278,11 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu
   m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry::EgRadial));
   m_geometrieButtonGroup->setExclusive(true);
 
-  m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
+  m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
   const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
   if (enableRocket)
-    m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
+    m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
   m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
   m_uiRequirements->addRequirement({m_ui->lblPosition_2, [this]() {
                                       // Im Fall (Zielgeometrie == Linear) ist positionEdit_2 enabled. Ansonsten disabled.
@@ -328,10 +328,10 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu
                                         cadence = m_pdmDtc->cadence(gearTypeIds.at(0));
                                       const int unitParticipantId = m_ui->cbParticipantUnits->currentData(Qt::UserRole).toInt();
                                       const auto &unitParticipant = m_ppmDtc->participant(unitParticipantId);
-                                      if (!unitParticipant.inferiorIds().size())
+                                      if (!unitParticipant.inferiorIds.size())
                                         return false;
                                       // ceiling
-                                      const int maxRoundEffector = std::ceil((double)m_ui->sbCannons->value() / unitParticipant.inferiorIds().size());
+                                      const int maxRoundEffector = std::ceil((double)m_ui->sbCannons->value() / unitParticipant.inferiorIds.size());
                                       DEBUG_LOG(m_logger) << "Checking cadence wiht duration: cadence[ms]: " << cadence
                                                           << " duration[ms]: " << m_ui->sbDurationSec->value() * 1000 << " maxRoundsForEffector: " << maxRoundEffector;
                                       // when using the effect duration, we need  enough time to spread the volleys inside the duration.
@@ -507,7 +507,7 @@ bool ExplosionsEditAdlerStandAlone::init(int aesItemId, bool copy, LtsSession::L
   m_ui->startBtn->setEnabled(false);
 
   // initial adjustment:
-  m_effectClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry::EgArea);
+  m_effectClusterData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgArea;
   onGeometrySelected(static_cast<int>(AreaEffectSimulation::AesExplosionGeometry::EgArea));
 
   // pay attention!!! firePurposeId vs purpose !!!
@@ -559,20 +559,20 @@ bool ExplosionsEditAdlerStandAlone::init(int aesItemId, bool copy, LtsSession::L
   if (aesItemId > 0)
   {
     const EffectCluster &exData = m_dtc->effectCluster(aesItemId);
-    if (!exData.annotationString().empty() &&
+    if (!exData.annotationString.empty() &&
         !copy) // do not copy annotationString while creating using a template (E01562-404: Fix for E01562-293)
     {
-      newAnnotation = QString::fromStdString(exData.annotationString());
+      newAnnotation = QString::fromStdString(exData.annotationString);
     }
 
-    m_ui->gbEffectMarkingInTa->setChecked(exData.effectMarkingInTa());
+    m_ui->gbEffectMarkingInTa->setChecked(exData.effectMarkingInTa);
     m_data = exData;
     if (copy)
     {
-      m_aesItem.id(0);
-      m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
-      m_effectClusterData.id(m_aesItem.id());
-      m_effectClusterData.effectStateId(m_aesItem.effectStateId());
+      m_aesItem.id = 0;
+      m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
+      m_effectClusterData.id = m_aesItem.id;
+      m_effectClusterData.effectStateId = m_aesItem.effectStateId;
     }
     setEffectClusterData(exData);
   }
@@ -610,7 +610,7 @@ bool ExplosionsEditAdlerStandAlone::init(int aesItemId, bool copy, LtsSession::L
   if (!newAnnotation.isEmpty())
     addAnnotationStr(newAnnotation);
 
-  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry.underlying());
+  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry);
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
   return true;
@@ -621,11 +621,11 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START, ecData=" << ecData;
 
-  m_ui->leZpNumber->setText(QString::fromStdString(ecData.name()));
-  m_ui->leElement->setText(QString::fromStdString(ecData.element()));
+  m_ui->leZpNumber->setText(QString::fromStdString(ecData.name));
+  m_ui->leElement->setText(QString::fromStdString(ecData.element));
 
   // Geometry/Area
-  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry());
+  const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast<AreaEffectSimulation::AesExplosionGeometry>(ecData.explosionGeometry);
   switch (geometryType)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint:
@@ -649,31 +649,31 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
   } // switch
   onGeometrySelected(static_cast<int>(geometryType)); // which in turn calls fillCharges();
 
-  m_ui->sbDurationSec->setValue(ecData.effectDuration() / 1000); // msecs -> secs
+  m_ui->sbDurationSec->setValue(ecData.effectDuration / 1000); // msecs -> secs
 
   // 1st GearClass
   {
     QSignalBlocker locked(m_ui->cbGearClass);
-    ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct().chargeTypeId());
-    m_ui->cbGearClass->setCurrentIndex(m_ui->cbGearClass->findData(static_cast<int>(gc.underlying())));
+    ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(ecData.chargeStruct.chargeTypeId);
+    m_ui->cbGearClass->setCurrentIndex(m_ui->cbGearClass->findData(static_cast<int>(gc)));
     onGearClassChanged(); // update depending comboBox
   }
 
   // 2nd Party
   {
     QSignalBlocker locked(m_ui->cbParty);
-    if (ecData.partyId().is_set())
+    if (ecData.partyId.has_value())
     {
-      m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(ecData.partyId().get()));
+      m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(ecData.partyId.get()));
       onPartyChanged(); // update depending comboBox
     }
   }
 
   // 3rd Originator
   {
-    if (ecData.participantId().is_set())
+    if (ecData.participantId.has_value())
     {
-      m_ui->cbParticipantUnits->setCurrentIndex(m_ui->cbParticipantUnits->findData(ecData.participantId().get()));
+      m_ui->cbParticipantUnits->setCurrentIndex(m_ui->cbParticipantUnits->findData(ecData.participantId.get()));
       onParticipantUnitChanged({});
     }
   }
@@ -682,21 +682,21 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
   QStringList tooltip;
   std::vector<double> flightTimes;
 
-  for (const auto &effectorData : ecData.effectors())
+  for (const auto &effectorData : ecData.effectors)
   {
-    const ParticipantManagement::Participant &part = m_ppmDtc->participant(effectorData.participantId());
-    tooltip << tr("%1: %2s\n").arg(QString::fromStdString(part.tacticalIdentifier())).arg(effectorData.flightTime() / 1000, 0, 'f', 2);
-    flightTimes.push_back(effectorData.flightTime());
+    const ParticipantManagement::Participant &part = m_ppmDtc->participant(effectorData.participantId);
+    tooltip << tr("%1: %2s\n").arg(QString::fromStdString(part.tacticalIdentifier)).arg(effectorData.flightTime / 1000, 0, 'f', 2);
+    flightTimes.push_back(effectorData.flightTime);
 
-    if (m_aesItem.id() > 0)
-      setEffector(part, m_dtc->effector(effectorData.participantId()).effectorState());
+    if (m_aesItem.id > 0)
+      setEffector(part, m_dtc->effector(effectorData.participantId).effectorState);
     if (impactCount == 0)
     {
-      m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(effectorData.chargeStruct().chargeTypeId()));
-      m_ui->cbIgniterType->setCurrentIndex(m_ui->cbIgniterType->findData(effectorData.chargeStruct().igniterTypeId()));
-      m_ui->cbIgniterFunction->setCurrentIndex(m_ui->cbIgniterFunction->findData(effectorData.chargeStruct().igniterFunctionId()));
+      m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(effectorData.chargeStruct.chargeTypeId));
+      m_ui->cbIgniterType->setCurrentIndex(m_ui->cbIgniterType->findData(effectorData.chargeStruct.igniterTypeId));
+      m_ui->cbIgniterFunction->setCurrentIndex(m_ui->cbIgniterFunction->findData(effectorData.chargeStruct.igniterFunctionId));
     }
-    impactCount += effectorData.chargeAmount();
+    impactCount += effectorData.chargeAmount;
   }
 
   auto pair = std::minmax_element(flightTimes.cbegin(), flightTimes.cend());
@@ -706,9 +706,9 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
 
   m_ui->layoutEffectors->setColumnStretch(m_effectorNumber + 1 % m_maxColumns, 1);
   m_ui->sbCannons->setValue(impactCount);
-  m_ui->cbFirePurpose->setCurrentIndex(m_ui->cbFirePurpose->findData(ecData.firePurposeId()));
+  m_ui->cbFirePurpose->setCurrentIndex(m_ui->cbFirePurpose->findData(ecData.firePurposeId));
   // with firingType
-  setEffectClusterDataFromJson(ecData.properties());
+  setEffectClusterDataFromJson(ecData.properties);
 
   const FiringType firingType = static_cast<FiringType>(m_ui->cbFiringType->currentData().toInt());
   if (firingType == FiringType::FireWithIndicationTTF)
@@ -718,39 +718,39 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
   }
   else
   {
-    m_ui->dteEffectStart->setMsecsSinceEpoch(ecData.effectStart().is_set() ? ecData.effectStart().get() : 0);
+    m_ui->dteEffectStart->setMsecsSinceEpoch(ecData.effectStart.has_value() ? ecData.effectStart.get() : 0);
     m_ui->lblEffectStart->setText(tr("Impact Time:"));
   }
 
-  m_ui->sbZog->setValue(ecData.tla()); // tla == zog
+  m_ui->sbZog->setValue(ecData.tla); // tla == zog
 
-  const AreaEffectSimulation::Area &areaRef = ecData.area();
-  const QPointF bottomLeft(areaRef.cornerBottomLeft().lon(), areaRef.cornerBottomLeft().lat());
-  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width(), areaRef.height(), areaRef.rotation());
+  const AreaEffectSimulation::Area &areaRef = ecData.area;
+  const QPointF bottomLeft(areaRef.cornerBottomLeft.lon, areaRef.cornerBottomLeft.lat);
+  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, areaRef.width, areaRef.height, areaRef.rotation);
   if (!bottomLeft.isNull())
   {
     m_ui->positionEdit->setCoordinate(centerpoint);
     setCoord(centerpoint);
   }
 
-  if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
+  if (ecData.explosionGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
   {
-    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height() / 2);
-    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width() / 2);
+    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height / 2);
+    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width / 2);
     m_ui->sbAimingAxis->setValue(0);
   }
   else
   {
-    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height());
-    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width());
-    m_ui->sbAimingAxis->setValue(fmod((90.0 + areaRef.rotation()) * 6400 / 360, 6400));
+    m_ui->sbDimensionY_Tiefe->setValue(areaRef.height);
+    m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width);
+    m_ui->sbAimingAxis->setValue(fmod((90.0 + areaRef.rotation) * 6400 / 360, 6400));
   }
 
-  if (!ecData.esmParticipantIds().empty())
+  if (!ecData.esmParticipantIds.empty())
   {
-    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds().at(0)));
-    if (ecData.esmParticipantIds().size() > 1)
-      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds().at(1)));
+    m_ui->cbActors->setCurrentIndex(m_ui->cbActors->findData(ecData.esmParticipantIds.at(0)));
+    if (ecData.esmParticipantIds.size() > 1)
+      m_ui->cbActors_2->setCurrentIndex(m_ui->cbActors_2->findData(ecData.esmParticipantIds.at(1)));
   }
 
   onEffectClusterChanged(ecData, DataModification::eAdded);
@@ -762,7 +762,7 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec
 void ExplosionsEditAdlerStandAlone::setEffector(const ParticipantManagement::Participant &part, const AreaEffectSimulation::AesEffectorState &effectorState)
 {
   auto *effectorWidget = new AesEffector(this);
-  effectorWidget->init(part.id(), QString::fromStdString(part.tacticalIdentifier()), QString::fromStdString(part.name()), effectorState);
+  effectorWidget->init(part.id, QString::fromStdString(part.tacticalIdentifier), QString::fromStdString(part.name), effectorState);
   effectorWidget->setStateButtonVisible(false);
 
   const int row = m_effectorNumber / m_maxColumns;
@@ -798,7 +798,7 @@ void ExplosionsEditAdlerStandAlone::onChargeTypeChanged()
   setMinMaxConstraints(phfd, gearClassType, chargeTypeId);
 
   // only for geometryType::Point:
-  if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint)
+  if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgPoint)
   {
     int igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
     int igniterFunctionId = m_ui->cbIgniterFunction->currentData().toInt();
@@ -838,7 +838,7 @@ void ExplosionsEditAdlerStandAlone::onLoadTypeChanged()
 {
   const int chargeTypeId = m_ui->cbChargeType->currentData().toInt();
   const int loadTypeId = m_ui->cbLoadType->currentData().toInt();
-  const auto numbersVec = m_pdmDtc->getChargeTypeLoadType(chargeTypeId, loadTypeId).numbers();
+  const auto numbersVec = m_pdmDtc->getChargeTypeLoadType(chargeTypeId, loadTypeId).numbers;
 
   m_ui->cbLoadNumber->clear();
   m_ui->cbLoadNumber->addItem(emptyEntryComboBox, -1);
@@ -914,7 +914,7 @@ void ExplosionsEditAdlerStandAlone::getPosition()
   m_previewPolygon.clear();
   m_previewCircleRadius = 0.0;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
     {
@@ -1055,7 +1055,7 @@ void ExplosionsEditAdlerStandAlone::onPolylineData(const QPolygonF &polyline)
   m_ui->sbDimensionX_BreiteRadius->setValue(distance);
 
   const Core::GeoPosition coordGeo2(utm2.geographic().x(), utm2.geographic().y(), 0);
-  const double height2 = getElevation(coordGeo2.lon(), coordGeo2.lat());
+  const double height2 = getElevation(coordGeo2.lon, coordGeo2.lat);
   m_ui->sbHeight2SBox->setValue(height2);
   DEBUG_LOG(m_logger) << "sbHeight2SBox setValue=" << height2;
 
@@ -1082,7 +1082,7 @@ void ExplosionsEditAdlerStandAlone::setCoord(const QPointF &coord)
   const Core::GeoPosition coordGeo(coord.x(), coord.y(), 0);
   m_coordGeo = coordGeo;
 
-  const double height = getElevation(coordGeo.lon(), coordGeo.lat());
+  const double height = getElevation(coordGeo.lon, coordGeo.lat);
   m_ui->sbHeight1SBox->setValue(height);
 
   updateActorComboBox(coordGeo);
@@ -1121,8 +1121,8 @@ void ExplosionsEditAdlerStandAlone::fillParticipantUnit()
   for (auto &superiorId : superiorIds)
   {
     const ParticipantManagement::Participant &part = m_ppmDtc->participant(superiorId);
-    unitList.push_back(std::tuple<QString, int, int>(QString::fromStdString(part.designator()) + QStringLiteral(" (%1)").arg(units.value(superiorId).count()),
-                                                     part.id(),
+    unitList.push_back(std::tuple<QString, int, int>(QString::fromStdString(part.designator) + QStringLiteral(" (%1)").arg(units.value(superiorId).count()),
+                                                     part.id,
                                                      units.value(superiorId).count()));
   }
   std::sort(unitList.begin(), unitList.end());
@@ -1305,7 +1305,7 @@ void ExplosionsEditAdlerStandAlone::doCalculationsAdlerStandAlone(bool executeEn
     return;
 
   // do not update while EsPause or similar:
-  if ((m_effectClusterData.effectStateId() == AesEffectState::EsPaused) || (m_effectClusterData.effectStateId() == AesEffectState::EsExpired))
+  if ((m_effectClusterData.effectStateId == AesEffectState::EsPaused) || (m_effectClusterData.effectStateId == AesEffectState::EsExpired))
     return;
 
   doCalculationsAdlerStandAloneExitGuard exitGuard(this, executeEnableUiElements);
@@ -1603,7 +1603,7 @@ void ExplosionsEditAdlerStandAlone::onPartitionTimeChanged(qint64 newPartitionTi
 QString ExplosionsEditAdlerStandAlone::dialogIdentifier() const
 {
   DEBUG_LOG(m_logger) << "dialogIdentifier";
-  return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id());
+  return m_aesItem.id <= 0 ? QStringLiteral("AddExplosionsArtillery") : QStringLiteral("EditExplosionsArtillery%1").arg(m_aesItem.id);
 }
 
 void ExplosionsEditAdlerStandAlone::onSetAesItemEffectorStateReply(const Core::FunctionReplyObject &replyObject)
@@ -1615,7 +1615,7 @@ void ExplosionsEditAdlerStandAlone::onSetAesItemEffectorStateReply(const Core::F
 void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &ecData, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onEffectClusterChanged ";
-  if (ecData.id() != m_aesItem.id())
+  if (ecData.id != m_aesItem.id)
     return;
 
   BaseEdit::onAreaChanged(ecData, modType);
@@ -1629,16 +1629,16 @@ void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &
   m_effectClusterData = ecData;
   m_aesItem = ecData;
 
-  if (m_effectClusterData.remainExplosionNumber() <= 2)
+  if (m_effectClusterData.remainExplosionNumber <= 2)
     m_ui->sbCannons->setMinimum(0);
 
-  if (m_aesItem.id()) // Only on edit/show not during create
-    m_ui->sbCannons->setValue(m_effectClusterData.remainExplosionNumber());
+  if (m_aesItem.id) // Only on edit/show not during create
+    m_ui->sbCannons->setValue(m_effectClusterData.remainExplosionNumber);
 
   // detect, if isObjectModifiable() changes to false:
   if (
       //      (m_explosionClusterData.isObjectModifiable()) &&
-      (!ecData.isObjectModifiable()))
+      (!ecData.isObjectModifiable))
   {
     INFO_LOG(m_logger) << " object becames not modifiable";
     enableUiFireButton(); // "Start" -> "Pause"...
@@ -1651,9 +1651,9 @@ void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &
     m_enableStartBtnTimer->start();
   }
 
-  m_currentGeometry = m_effectClusterData.explosionGeometry();
+  m_currentGeometry = m_effectClusterData.explosionGeometry;
 
-  // if (ecData.flightCurve().is_set())
+  // if (ecData.flightCurve().has_value())
   //{
   //   const FlightCurve &fc = ecData.flightCurve().get();
   //   m_ui->leCalcFlightDuration->setText(QString(QStringLiteral("%1 sec")).arg(fc.calculatedFlightDuration()/1000.0));
@@ -1668,7 +1668,7 @@ void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &
   if (!m_ui->sbDurationSec->isEnabled())
   {
     const bool hasChanges = hasUnsavedChanges();
-    m_ui->sbDurationSec->setValue(m_effectClusterData.effectDuration() / 1000); // msec -> sec
+    m_ui->sbDurationSec->setValue(m_effectClusterData.effectDuration / 1000); // msec -> sec
     if (!hasChanges)
       __unchange__();
   }
@@ -1676,12 +1676,12 @@ void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &
   m_uiRequirements->checkRequirements(this);
 
   doCalculationsAdlerStandAlone(true);
-  if (m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsCreated ||
-      m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsPrepared)
+  if (m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsCreated ||
+      m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared)
     enableUiElements(!unchangeable());
-  else if (m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
-           m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsFired ||
-           m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+  else if (m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired ||
+           m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsFired ||
+           m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
   {
     if (hasUnsavedChanges())
       __unchange__();
@@ -1747,8 +1747,8 @@ void ExplosionsEditAdlerStandAlone::retranslate()
   QString title = tr("ADLER Artillery");
 
   translate(m_ui, m_aesItem, title);
-  if (m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsCreated ||
-      m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsPrepared)
+  if (m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsCreated ||
+      m_aesItem.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared)
     enableUiElements(!unchangeable());
 
   if (!unchangeable())
@@ -1759,10 +1759,10 @@ void ExplosionsEditAdlerStandAlone::retranslate()
 void ExplosionsEditAdlerStandAlone::enableUiElements()
 {
   DEBUG_LOG(m_logger) << " enableUiElements()"
-                      << ", m_effectClusterData.id() = " << m_effectClusterData.id() << ", isModifiable() = " << isModifiable()
+                      << ", m_effectClusterData.id() = " << m_effectClusterData.id << ", isModifiable() = " << isModifiable()
                       << ", isOnlyNameModifiable() = " << isOnlyNameModifiable() << ", ena = " << (isModifiable() && !isOnlyNameModifiable());
 
-  if (m_effectClusterData.id() == 0) // while creation, not modification
+  if (m_effectClusterData.id == 0) // while creation, not modification
     enableUiElements(true);
   else
     enableUiElements(isModifiable() && !isOnlyNameModifiable());
@@ -1776,7 +1776,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
 {
   DEBUG_LOG(m_logger) << "************* enableUiElements enable=" << enable << ", isOnlyNameModifiable = " << isOnlyNameModifiable();
 
-  // //  onGeometrySelected(static_cast<int>(m_explosionClusterData.explosionGeometry().underlying()));
+  // //  onGeometrySelected(static_cast<int>(m_explosionClusterData.explosionGeometry()));
 
   m_ui->cbChargeType->setEnabled(enable);
   m_ui->cbIgniterType->setEnabled(enable && m_ui->cbIgniterType->count() > 1);
@@ -1838,7 +1838,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
   m_ui->cbTargetSubType->setEnabled(enable);
   m_ui->cbFiringType->setEnabled(enable);
 
-  const bool isRocket = (m_ui->cbGearClass->currentData().toInt() == ProjectDataManagement::GearClass::Rocket);
+  const bool isRocket = (m_ui->cbGearClass->currentData().toInt() == static_cast<int>(ProjectDataManagement::GearClass::GearClass_Rocket));
   m_ui->lblLoadType->setEnabled(!isRocket && enable);
   m_ui->lblLoadNumber->setEnabled(!isRocket && enable);
   m_ui->cbLoadType->setEnabled(!isRocket && enable);
@@ -1857,8 +1857,8 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
 
   // [GUEZE-2960] Explizite Kunden-Forderung:
   // ZpNumber nicht_ mehr modifizierbar, wenn Wirkfeld aktiv
-  m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated);
-  m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated);
+  m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId != AesEffectState::EsActivated);
+  m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId != AesEffectState::EsActivated);
 
   m_ui->pbClear->setEnabled(enable);
 
@@ -1868,12 +1868,12 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
 
   int numberTrajectoriesRef = 0;
   {
-    const int simToRestrict = m_aesItem.id(); // EffectCluster
+    const int simToRestrict = m_aesItem.id; // EffectCluster
     // avoid data copying:
     auto cb = [simToRestrict, &numberTrajectoriesRef](const AreaEffectSimulation::TrajectoryTimeAware &traj)
     {
       // [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
-      if ((traj.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::ChargeEffect) && (simToRestrict == traj.originatorId()))
+      if ((traj.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect) && (simToRestrict == traj.originatorId))
         ++numberTrajectoriesRef;
     };
     m_dtc->trajectoryTimeAwares(cb);
@@ -1881,7 +1881,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
 
   DEBUG_LOG(m_logger) << "************* enableUiElements numberTrajectoriesRef=" << numberTrajectoriesRef;
 
-  if ((numberTrajectoriesRef > 0) && !isPointSimilar(m_effectClusterData.explosionGeometry()))
+  if ((numberTrajectoriesRef > 0) && !isPointSimilar(m_effectClusterData.explosionGeometry))
   {
     // since first TrajectoryTimeAware:
     enableUiFireButton();
@@ -1889,7 +1889,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
   else
   {
     // until first TrajectoryTimeAware:
-    m_ui->startBtn->setEnabled(enable && m_aesItem.id() > 0); // tbc
+    m_ui->startBtn->setEnabled(enable && m_aesItem.id > 0); // tbc
   }
 
   setFireBtnState();
@@ -1909,7 +1909,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
   //    const bool useFlightDuration = m_ui->sBox_flightDuration->styleSheet().isEmpty();
 
   //    m_ui->cbFlightCurve->setEnabled(enable &&
-  //                                    (gearClassType != ProjectDataManagement::GearClass::Mortar) &&
+  //                                    (gearClassType != ProjectDataManagement::GearClass::GearClass_Mortar) &&
   //                                    useFlightDuration
   //                                    );
   //  }
@@ -1936,7 +1936,7 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton()
   // (not initial creation)
   //
 
-  bool enableBasics = (m_aesItem.id() > 0) // while creation, not modification
+  bool enableBasics = (m_aesItem.id > 0) // while creation, not modification
                       && isDataSufficiant();
 
   INFO_LOG(m_logger) << " enableBasics = " << enableBasics;
@@ -1944,20 +1944,20 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton()
   if (!enableBasics)
     return; // stay disabled
 
-  if (m_effectClusterData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || m_effectClusterData.remainExplosionNumber() == 0)
+  if (m_effectClusterData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired || m_effectClusterData.remainExplosionNumber == 0)
     return; // stay disabled
 
   int numberTrajectoriesRef = 0;
   {
-    const int simToRestrict = m_aesItem.id();
+    const int simToRestrict = m_aesItem.id;
     // avoid data copying:
     auto cb = [simToRestrict, &numberTrajectoriesRef](const AreaEffectSimulation::TrajectoryTimeAware &traj)
     {
       // iterateAll
       // be aware of: [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
-      if (traj.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::ChargeEffect)
+      if (traj.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect)
         return;
-      const int aesItemId = traj.originatorId();
+      const int aesItemId = traj.originatorId;
       if (simToRestrict == aesItemId)
         ++numberTrajectoriesRef;
     };
@@ -1970,11 +1970,11 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton()
   // a) during typical usage by operator
   // b) for re-openening dialog / restart svcAes
   int impactCount = 0;
-  for (const auto &effector : m_effectClusterData.effectors())
+  for (const auto &effector : m_effectClusterData.effectors)
   {
-    impactCount += effector.chargeAmount();
+    impactCount += effector.chargeAmount;
   }
-  if ((numberTrajectoriesRef <= 0) && (m_effectClusterData.effectDuration() == m_effectClusterData.originalEffectDuration()))
+  if ((numberTrajectoriesRef <= 0) && (m_effectClusterData.effectDuration == m_effectClusterData.originalEffectDuration))
   {
     INFO_LOG(m_logger) << " Firing has NOT started yet";
     return; // stay disabled
@@ -2001,7 +2001,7 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton()
     else
     {
       // re-openening dialog:
-      if (m_effectClusterData.effectStateId() == AesEffectState::EsPaused)
+      if (m_effectClusterData.effectStateId == AesEffectState::EsPaused)
         bPause = false;
     }
   }
@@ -2018,7 +2018,7 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton()
   {
     // Resume
     // but it does not makes sense, if there is no ammo left:
-    if ((impactCount > 1) && (impactCount >= m_effectClusterData.remainExplosionNumber()))
+    if ((impactCount > 1) && (impactCount >= m_effectClusterData.remainExplosionNumber))
     {
       m_ui->startBtn->setEnabled(true);
       m_ui->startBtn->setText(tr("Start"));
@@ -2039,7 +2039,7 @@ void ExplosionsEditAdlerStandAlone::showPreviewObject()
   if (!has2DMap(false)) // showMsgBoxIfNot2D
     return;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       if (m_previewPolygon.isEmpty())
@@ -2084,7 +2084,7 @@ bool ExplosionsEditAdlerStandAlone::isDataSufficiant()
 
   // target:
   bool bHasTargetArea = !m_coord.isNull();
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgArea:
       bHasTargetArea &= m_ui->sbDimensionX_BreiteRadius->value() > 0;
@@ -2117,34 +2117,34 @@ bool ExplosionsEditAdlerStandAlone::apply()
 
   EffectClusterModifyRequest request;
 
-  request.id(m_aesItem.id());
-  request.element(m_ui->leElement->text().toStdString());
-  request.name(m_ui->leZpNumber->text().toStdString());
-  request.firePurposeId(m_ui->cbFirePurpose->currentData().toInt());
+  request.id = m_aesItem.id;
+  request.element = m_ui->leElement->text().toStdString();
+  request.name = m_ui->leZpNumber->text().toStdString();
+  request.firePurposeId = m_ui->cbFirePurpose->currentData().toInt();
 
   if (m_ui->dteEffectStart->isChecked() && m_ui->dteEffectStart->isVisible())
   {
     // we use the effect start as usual
-    request.effectStart().set(m_ui->dteEffectStart->msecsSinceEpoch());
+    request.effectStart.set(m_ui->dteEffectStart->msecsSinceEpoch());
   }
   if (m_ui->sbDurationSec->isVisible())
-    request.effectDuration(m_ui->sbDurationSec->value() * 1000);
+    request.effectDuration = m_ui->sbDurationSec->value() * 1000;
 
   const bool bIsPoint = isPointSimilar(m_currentGeometry);
 
-  request.explosionGeometry(m_currentGeometry);
+  request.explosionGeometry = m_currentGeometry;
   Core::GeoPosition2D bottomLeftGeo;
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AesExplosionGeometry::EgRadial:
     {
       QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, m_ui->sbDimensionX_BreiteRadius->value() * 2, m_ui->sbDimensionY_Tiefe->value() * 2, 0.0));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value() * 2);
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value() * 2);
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value() * 2;
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value() * 2;
 
       break;
     }
@@ -2158,9 +2158,9 @@ bool ExplosionsEditAdlerStandAlone::apply()
                                                           (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value());
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value());
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value();
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value();
 
       break;
     }
@@ -2175,17 +2175,17 @@ bool ExplosionsEditAdlerStandAlone::apply()
                                                           (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400));
       bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
-      request.area().cornerBottomLeft(bottomLeftGeo);
-      request.area().height(m_ui->sbDimensionY_Tiefe->value());
-      request.area().width(m_ui->sbDimensionX_BreiteRadius->value());
+      request.area.cornerBottomLeft = bottomLeftGeo;
+      request.area.height = m_ui->sbDimensionY_Tiefe->value();
+      request.area.width = m_ui->sbDimensionX_BreiteRadius->value();
     }
   }
 
-  if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
-    request.area().rotation(0);
+  if (bIsPoint || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial)
+    request.area.rotation = 0;
   else
-    request.area().rotation((m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400);
-  request.tla(m_ui->sbZog->value()); // tla: aka zog / ZielOrtungsGenauigkeit
+    request.area.rotation = (m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400;
+  request.tla = m_ui->sbZog->value(); // tla: aka zog / ZielOrtungsGenauigkeit
 
   // DMF (Actors)
   int esmParticipantId1 = m_ui->cbActors->currentData().toInt();   // participant ID
@@ -2196,11 +2196,11 @@ bool ExplosionsEditAdlerStandAlone::apply()
 
   if (esmParticipantId1 > 0 || esmParticipantId2 > 0)
   {
-    request.esmParticipantIds().reserve(2);
+    request.esmParticipantIds.reserve(2);
     if (esmParticipantId1 > 0)
-      request.esmParticipantIds().push_back(esmParticipantId1);
+      request.esmParticipantIds.push_back(esmParticipantId1);
     if (esmParticipantId2 > 0 && esmParticipantId1 != esmParticipantId2 && m_ui->cbActors_2->isEnabled())
-      request.esmParticipantIds().push_back(esmParticipantId2);
+      request.esmParticipantIds.push_back(esmParticipantId2);
   }
 
   // mhpCount:
@@ -2213,19 +2213,19 @@ bool ExplosionsEditAdlerStandAlone::apply()
   {
     EffectorData effectorData;
 
-    if (m_data.effectors().size() == 1 && m_data.participantId().is_set() && unitParticipant.id() == m_data.participantId().get())
+    if (m_data.effectors.size() == 1 && m_data.participantId.has_value() && unitParticipant.id == m_data.participantId.get())
     {
       // Update
-      effectorData = m_data.effectors().front();
+      effectorData = m_data.effectors.front();
     }
 
-    effectorData.chargeAmount(1);
+    effectorData.chargeAmount = 1;
     // add GearClass ???
-    effectorData.chargeStruct().chargeTypeId(m_ui->cbChargeType->currentData().toInt());
-    effectorData.chargeStruct().igniterTypeId(m_ui->cbIgniterType->currentData().toInt());
-    effectorData.chargeStruct().igniterFunctionId(m_ui->cbIgniterFunction->currentData().toInt());
-    effectorData.participantId() = unitParticipant.inferiorIds().front(); // set the first inferior als start
-    request.effectors().push_back(effectorData);
+    effectorData.chargeStruct.chargeTypeId = m_ui->cbChargeType->currentData().toInt();
+    effectorData.chargeStruct.igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
+    effectorData.chargeStruct.igniterFunctionId = m_ui->cbIgniterFunction->currentData().toInt();
+    effectorData.participantId = unitParticipant.inferiorIds.front(); // set the first inferior als start
+    request.effectors.push_back(effectorData);
   }
   else
   {
@@ -2244,48 +2244,48 @@ bool ExplosionsEditAdlerStandAlone::apply()
       // if
 
       INFO_LOG(m_logger) << " OLD DATA " << m_data;
-      for (int inferiorParticipantId : unitParticipant.inferiorIds())
+      for (int inferiorParticipantId : unitParticipant.inferiorIds)
       {
         INFO_LOG(m_logger) << "Inferoir for " << unitParticipantId << " is: " << inferiorParticipantId;
         EffectorData effectoData;
-        if (m_data.effectors().size() == unitParticipant.inferiorIds().size() && m_data.participantId().is_set() && m_data.participantId().get() == unitParticipantId)
+        if (m_data.effectors.size() == unitParticipant.inferiorIds.size() && m_data.participantId.has_value() && m_data.participantId.get() == unitParticipantId)
         {
-          for (const auto &oldEffector : m_data.effectors())
+          for (const auto &oldEffector : m_data.effectors)
           {
-            if (oldEffector.participantId() == inferiorParticipantId)
+            if (oldEffector.participantId == inferiorParticipantId)
             {
               effectoData = oldEffector;
               // Reset chargeAmount as we override it later
-              effectoData.chargeAmount() = 0;
+              effectoData.chargeAmount = 0;
               INFO_LOG(m_logger) << " FOND OLD for " << inferiorParticipantId;
               break;
             }
           }
         }
 
-        INFO_LOG(m_logger) << effectoData.mhpPosition() << " pos from old?";
-        effectoData.participantId() = inferiorParticipantId;
-        effectoData.mhpPosition().z(m_ui->sbHeight1SBox->value());
+        INFO_LOG(m_logger) << effectoData.mhpPosition << " pos from old?";
+        effectoData.participantId = inferiorParticipantId;
+        effectoData.mhpPosition.z = m_ui->sbHeight1SBox->value();
         // add GearClass ???
-        effectoData.chargeStruct().chargeTypeId(m_ui->cbChargeType->currentData().toInt());
-        effectoData.chargeStruct().igniterTypeId(m_ui->cbIgniterType->currentData().toInt());
-        effectoData.chargeStruct().igniterFunctionId(m_ui->cbIgniterFunction->currentData().toInt());
-        request.effectors().push_back(effectoData);
+        effectoData.chargeStruct.chargeTypeId = m_ui->cbChargeType->currentData().toInt();
+        effectoData.chargeStruct.igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
+        effectoData.chargeStruct.igniterFunctionId = m_ui->cbIgniterFunction->currentData().toInt();
+        request.effectors.push_back(effectoData);
         // break if we have less round than iferior
-        if (request.effectors().size() == (u_int)m_ui->sbCannons->value())
+        if (request.effectors.size() == (u_int)m_ui->sbCannons->value())
           break;
       }
 
-      if (request.effectors().size() == 0)
+      if (request.effectors.size() == 0)
         return false;
       // now divide rounds into effectors
       u_int effectorPos = 0;
 
       for (int i = 0; i < m_ui->sbCannons->value(); i++)
       {
-        request.effectors().at(effectorPos).chargeAmount() = request.effectors().at(effectorPos).chargeAmount() + 1;
+        request.effectors.at(effectorPos).chargeAmount = request.effectors.at(effectorPos).chargeAmount + 1;
         effectorPos++;
-        if (effectorPos >= request.effectors().size())
+        if (effectorPos >= request.effectors.size())
         {
           effectorPos = 0;
         }
@@ -2294,23 +2294,23 @@ bool ExplosionsEditAdlerStandAlone::apply()
   }
 
   // partyId
-  request.partyId().set(m_ui->cbParty->currentData().toInt());
+  request.partyId.set(m_ui->cbParty->currentData().toInt());
   // participant id
-  request.participantId().set(unitParticipantId);
-  request.partyId().set(m_ui->cbParty->currentData().toInt());
-  request.effectMarkingInTa(m_ui->gbEffectMarkingInTa->isChecked());
-  request.effectSourceId(ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE);
+  request.participantId.set(unitParticipantId);
+  request.partyId.set(m_ui->cbParty->currentData().toInt());
+  request.effectMarkingInTa = m_ui->gbEffectMarkingInTa->isChecked();
+  request.effectSourceId = ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE;
 
   QJsonObject propertiesObj;
   mmiToJsonproperties(propertiesObj);
   const QString properties = QString::fromUtf8(QJsonDocument(propertiesObj).toJson());
   DEBUG_LOG(m_logger) << "properties: " << properties;
-  request.properties(properties.toStdString());
+  request.properties = properties.toStdString();
 
   // Rocket-Spezifika:
   const QVariant currentData = m_ui->cbGearClass->currentData();
   const ProjectDataManagement::GearClass currentGearClass = static_cast<ProjectDataManagement::GearClass>(currentData.toInt());
-  if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
+  if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
   {
     RocketUtility::addRocketPropertiesToRequest(request, m_ppmDtc);
   }
@@ -2334,7 +2334,7 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt)
 
   m_currentGeometry = newGeometry;
 
-  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry.underlying());
+  RocketUtility::enaDisaWirkmittel(m_ui->cbGearClass, m_currentGeometry);
 
   // cancel active Rubberbands:
   if (m_sitMapGuiIfc)
@@ -2352,7 +2352,7 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt)
   if (m_sitMapGuiIfc)
     m_sitMapGuiIfc->removePreviewObject();
 
-  switch (m_currentGeometry.underlying())
+  switch (m_currentGeometry)
   {
     case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: // What is AimPoint?
     case AreaEffectSimulation::AesExplosionGeometry::EgPoint:
@@ -2474,12 +2474,12 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt)
 void ExplosionsEditAdlerStandAlone::onStartBtnClicked()
 {
   DEBUG_LOG(m_logger) << " onFireClicked";
-  if (((m_aesItem.effectStateId() == AesEffectState::EsUnknown) || // initially the effectStateId is Unknown...
-       (m_aesItem.effectStateId() == AesEffectState::EsError) || (m_aesItem.effectStateId() == AesEffectState::EsExpired)
-       || (m_aesItem.effectStateId() == AesEffectState::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState::EsReceived)
+  if (((m_aesItem.effectStateId == AesEffectState::EsUnknown) || // initially the effectStateId is Unknown...
+       (m_aesItem.effectStateId == AesEffectState::EsError) || (m_aesItem.effectStateId == AesEffectState::EsExpired)
+       || (m_aesItem.effectStateId == AesEffectState::EsRemoved) || (m_aesItem.effectStateId == AesEffectState::EsReceived)
        //       || (m_aesItem.effectStateId() == AesEffectState::EsPaused)  // Maybe EsPaused will be supported in future
        )
-      || m_aesItem.id() <= 0)
+      || m_aesItem.id <= 0)
     return;
 
   if (!isDataSufficiant())
@@ -2495,19 +2495,19 @@ void ExplosionsEditAdlerStandAlone::onStartBtnClicked()
 
   m_ui->startBtn->setEnabled(false);
 
-  const bool bIsObjectModifiable = m_effectClusterData.isObjectModifiable();
+  const bool bIsObjectModifiable = m_effectClusterData.isObjectModifiable;
 
   //
 
-  if ((m_aesItem.effectStateId() == AesEffectState::EsCreated || m_aesItem.effectStateId() == AesEffectState::EsPrepared) && bIsObjectModifiable)
+  if ((m_aesItem.effectStateId == AesEffectState::EsCreated || m_aesItem.effectStateId == AesEffectState::EsPrepared) && bIsObjectModifiable)
   {
     ERROR_LOG(m_logger) << LOGFUNCTION << " onFireClicked  2 " << m_data;
 
-    if (!m_data.effectors().size())
+    if (!m_data.effectors.size())
       return;
 
     ERROR_LOG(m_logger) << LOGFUNCTION << " onFireClicked  3";
-    double estimatedFlightDurationMsec = m_data.effectors().front().flightTime();
+    double estimatedFlightDurationMsec = m_data.effectors.front().flightTime;
 
     m_ui->dteEffectStart->setMsecsSinceEpoch(m_session->partitionTime() + estimatedFlightDurationMsec + 15000);
 
@@ -2546,9 +2546,9 @@ void ExplosionsEditAdlerStandAlone::onStartBtnClicked()
     m_requestHelper->addRequest(
         [=]()
         {
-          return m_ftc->effectClusterPauseResumeRequest(EffectClusterPauseResumeRequest(m_aesItem.id(),
+          return m_ftc->effectClusterPauseResumeRequest(EffectClusterPauseResumeRequest(m_aesItem.id,
                                                                                         resumeExecution, // resumeExecution
-                                                                                        dds::core::optional<rti::core::int64>(),
+                                                                                        dds::core::optional<int64_t>(),
                                                                                         dds::core::optional<int32_t>(),
                                                                                         dds::core::optional<int32_t>()),
                                                         this);
@@ -2573,7 +2573,7 @@ void ExplosionsEditAdlerStandAlone::onGearClassChanged()
   fillParties();
   onPartyChanged();
 
-  ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::Mortar;
+  ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::GearClass_Mortar;
   QVariant lastVal = m_ui->cbGearClass->property(LAST_VALUE);
   if (!lastVal.isNull())
     lastGearClassType = static_cast<ProjectDataManagement::GearClass>(lastVal.toInt());
@@ -2587,7 +2587,7 @@ void ExplosionsEditAdlerStandAlone::onGearClassChanged()
     // Default is Upper
     m_ui->rbAngleGroupUpper->setChecked(true);
     // GUEZE-3520: Aufraeumen -> getm rid of AesFlightCurve
-    if (newGearClassType == ProjectDataManagement::GearClass::Mortar)
+    if (newGearClassType == ProjectDataManagement::GearClass::GearClass_Mortar)
     {
       DEBUG_LOG(m_logger) << " onGearClassChanged switch to Mortar";
       m_ui->rbAngleGroupLower->setCheckable(false);
@@ -2618,7 +2618,7 @@ void ExplosionsEditAdlerStandAlone::onGearClassChanged()
   }
 
   // update last value:
-  m_ui->cbGearClass->setProperty(LAST_VALUE, newGearClassType);
+  m_ui->cbGearClass->setProperty(LAST_VALUE, static_cast<int>(newGearClassType));
 
   doCalculationsAdlerStandAlone();
 }
@@ -2637,24 +2637,24 @@ void ExplosionsEditAdlerStandAlone::gatherParticipantUnits(const int &partyId, Q
 
   auto cb = [this, &partyId, &units, gearClassId](const ParticipantManagement::Participant &part)
   {
-    if (part.isDeleted() || part.partyId() != partyId)
+    if (part.isDeleted || part.partyId != partyId)
       return;
 
     const ParticipantManagement::ParticipantData &ppData = m_ppmDtc->convertParticipantToParticipantData(part);
-    const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId());
+    const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId);
     // do not use ADLER Verbund types
-    if (m_ppmDtc->isAdlerVerbund(ppType.id()))
+    if (m_ppmDtc->isAdlerVerbund(ppType.id))
       return;
-    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties())).object());
+    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties)).object());
     // superior ids in participant ids will be saved
     // participant ids with type units are ignored
     // participant ids with type GroundVehicule are considered
     // participant ids without properties "isArtillery=true" are ignored
-    if (typeProperties.isEmpty() || ppType.typeClass() == ParticipantManagement::TypeClass::Unit || //
+    if (typeProperties.isEmpty() || ppType.typeClass == ParticipantManagement::TypeClass::Unit || //
         !typeProperties[QStringLiteral("isArtillery")].toBool(false) || typeProperties[QStringLiteral("gearClassId")].toInt(-1) != gearClassId)
       return;
 
-    units[part.superiorId()] += part.id();
+    units[part.superiorId] += part.id;
   };
   m_ppmDtc->participants(cb);
 
@@ -2662,9 +2662,9 @@ void ExplosionsEditAdlerStandAlone::gatherParticipantUnits(const int &partyId, Q
   for (auto it = units.begin(); it != units.end();)
   {
     const ParticipantManagement::Participant &pp = m_ppmDtc->participant(it.key());
-    const ParticipantManagement::Type &typ = m_ppmDtc->type(pp.typeId());
-    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(typ.properties())).object());
-    if ((typ.typeClass() != ParticipantManagement::TypeClass::Unit && typ.typeClass() != ParticipantManagement::TypeClass::GroundVehicle)
+    const ParticipantManagement::Type &typ = m_ppmDtc->type(pp.typeId);
+    const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(typ.properties)).object());
+    if ((typ.typeClass != ParticipantManagement::TypeClass::Unit && typ.typeClass != ParticipantManagement::TypeClass::GroundVehicle)
         || !typeProperties[QStringLiteral("isArtillery")].toBool(false))
       it = units.erase(it++);
     else
@@ -2699,11 +2699,11 @@ bool ExplosionsEditAdlerStandAlone::isValidParty(qint32 partyId)
   return m_ppmDtc->participants(static_cast<std::function<bool(const ParticipantManagement::Participant &)>>(
       [this, partyId, gearClassId](const ParticipantManagement::Participant &participant)
       {
-        if (participant.partyId() != partyId || participant.isDeleted())
+        if (participant.partyId != partyId || participant.isDeleted)
           return false;
 
-        const ParticipantManagement::Type type = m_ppmDtc->type(participant.typeId());
-        const QJsonObject typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties())).object();
+        const ParticipantManagement::Type type = m_ppmDtc->type(participant.typeId);
+        const QJsonObject typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties)).object();
         const qint32 typeGearClass = typeProperties.value(QStringLiteral("gearClassId")).toInt(-1);
 
         return typeGearClass == gearClassId;
@@ -2717,12 +2717,12 @@ void ExplosionsEditAdlerStandAlone::setFireBtnState()
   m_ui->dteEffectStart->setEnabled(showEffectStart);
   m_ui->dteEffectStart->setVisible(showEffectStart);
   m_ui->lblEffectStart->setVisible(showEffectStart);
-  if (firingType == FiringType::FireWithIndicationTTF && m_aesItem.id() > 0)
+  if (firingType == FiringType::FireWithIndicationTTF && m_aesItem.id > 0)
     m_ui->lblEffectStart->setText(tr("Fire Time:"));
   else
     m_ui->lblEffectStart->setText(tr("Impact Time:"));
 
-  if (m_effectClusterData.effectorState() == AesEffectorState::EsReadyToFire)
+  if (m_effectClusterData.effectorState == AesEffectorState::EsReadyToFire)
     m_ui->fireBtn->setText(tr("Fire"));
   else
     m_ui->fireBtn->setText(tr("Ready to fire"));
@@ -2731,39 +2731,39 @@ void ExplosionsEditAdlerStandAlone::setFireBtnState()
   const bool effectorsReady = allEffectorReadyToFire();
   m_ui->fireBtn->setEnabled(enableFireBtn);
 
-  DEBUG_LOG(m_logger) << "FiringType: " << firingType << ", effectStateId: " << m_aesItem.effectStateId();
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired || m_aesItem.effectStateId() == AesEffectState::EsError
-      || m_aesItem.effectStateId() == AesEffectState::EsPrepared || m_aesItem.effectStateId() == AesEffectState::EsRemoved
-      || ((m_aesItem.effectStateId() == AesEffectState::EsFired || m_aesItem.effectStateId() == AesEffectState::EsActivated) && firingType != FiringType::FireOnCommand)
-      || m_aesItem.effectStateId() == AesEffectState::EsReceived || m_aesItem.id() <= 0)
+  DEBUG_LOG(m_logger) << "FiringType: " << firingType << ", effectStateId: " << m_aesItem.effectStateId;
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired || m_aesItem.effectStateId == AesEffectState::EsError
+      || m_aesItem.effectStateId == AesEffectState::EsPrepared || m_aesItem.effectStateId == AesEffectState::EsRemoved
+      || ((m_aesItem.effectStateId == AesEffectState::EsFired || m_aesItem.effectStateId == AesEffectState::EsActivated) && firingType != FiringType::FireOnCommand)
+      || m_aesItem.effectStateId == AesEffectState::EsReceived || m_aesItem.id <= 0)
     return;
 
-  if ((firingType == FiringType::FireOnCommand && m_effectClusterData.remainExplosionNumber() <= 0)
-      || (firingType == FiringType::FireOnCommand && m_effectClusterData.remainExplosionNumber() > 0 && !effectorsReady))
+  if ((firingType == FiringType::FireOnCommand && m_effectClusterData.remainExplosionNumber <= 0)
+      || (firingType == FiringType::FireOnCommand && m_effectClusterData.remainExplosionNumber > 0 && !effectorsReady))
     return;
 
   // keep the comment for now as we might reactivate this shorty! when the cadence will be used in FireOnCOmmand!
   // if ((effectorsReady && m_effectClusterData.effectorState() == AesEffectorState::EsNotReadyToFire) || (firingType == FiringType::FireOnCommand && !effectorsReady)
   //     || (effectorsReady && m_effectClusterData.effectorState() == AesEffectorState::EsReadyToFire && firingType == FiringType::FireOnCommand))
   enableFireBtn = true;
-  DEBUG_LOG(m_logger) << " enableFireBtn:" << enableFireBtn << " Effectors ready " << effectorsReady << " current Effector State: " << m_effectClusterData.effectorState()
+  DEBUG_LOG(m_logger) << " enableFireBtn:" << enableFireBtn << " Effectors ready " << effectorsReady << " current Effector State: " << m_effectClusterData.effectorState
                       << "  firetype: " << firingType;
   m_ui->fireBtn->setEnabled(enableFireBtn);
 }
 
 void ExplosionsEditAdlerStandAlone::onFireBtnClicked()
 {
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired || m_aesItem.effectStateId() == AesEffectState::EsError
-      || m_aesItem.effectStateId() == AesEffectState::EsRemoved || m_aesItem.effectStateId() == AesEffectState::EsReceived || m_aesItem.id() <= 0)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired || m_aesItem.effectStateId == AesEffectState::EsError
+      || m_aesItem.effectStateId == AesEffectState::EsRemoved || m_aesItem.effectStateId == AesEffectState::EsReceived || m_aesItem.id <= 0)
     return;
 
   // Fire
-  if (allEffectorReadyToFire() && m_effectClusterData.effectorState() == AesEffectorState::EsReadyToFire)
+  if (allEffectorReadyToFire() && m_effectClusterData.effectorState == AesEffectorState::EsReadyToFire)
   {
     AreaEffectSimulation::SetAesItemEffectorStateRequest request;
-    request.aesId(m_aesItem.id());
-    request.newEffectorState(AesEffectorState::EsReceivedOrder);
-    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId() << ", AesEffectorState: " << request.newEffectorState();
+    request.aesId = m_aesItem.id;
+    request.newEffectorState = AesEffectorState::EsReceivedOrder;
+    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId << ", AesEffectorState: " << request.newEffectorState;
 
     m_requestHelper->addRequest([this, request]() { return m_ftc->setAesItemEffectorStateRequest(request, this); });
 
@@ -2772,9 +2772,9 @@ void ExplosionsEditAdlerStandAlone::onFireBtnClicked()
   else // ready to fire
   {
     AreaEffectSimulation::SetAesItemEffectorStateRequest request;
-    request.aesId(m_aesItem.id());
-    request.newEffectorState(AesEffectorState::EsReadyToFire);
-    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId() << ", AesEffectorState: " << request.newEffectorState();
+    request.aesId = m_aesItem.id;
+    request.newEffectorState = AesEffectorState::EsReadyToFire;
+    DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << request.aesId << ", AesEffectorState: " << request.newEffectorState;
 
     m_requestHelper->addRequest([this, request]() { return m_ftc->setAesItemEffectorStateRequest(request, this); });
     m_ui->fireBtn->setEnabled(false);
@@ -2816,7 +2816,7 @@ void ExplosionsEditAdlerStandAlone::onWidthChanged(int width)
 
   m_ui->positionEdit_2->setCoordinate(utm2New.geographic());
   const Core::GeoPosition coordGeo(utm2New.geographic().x(), utm2New.geographic().y(), 0);
-  const double height = getElevation(coordGeo.lon(), coordGeo.lat());
+  const double height = getElevation(coordGeo.lon, coordGeo.lat);
   m_ui->sbHeight1SBox->setValue(height);
 }
 
@@ -2871,11 +2871,11 @@ void ExplosionsEditAdlerStandAlone::onLineP2Changed(const QPointF &point)
 bool ExplosionsEditAdlerStandAlone::allEffectorReadyToFire() const
 {
 
-  const auto &effectors = m_effectClusterData.effectors();
+  const auto &effectors = m_effectClusterData.effectors;
   size_t fireReadyCount = 0;
   for (const auto &e : effectors)
   {
-    if (m_dtc->effector(e.participantId()).effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire)
+    if (m_dtc->effector(e.participantId).effectorState != AreaEffectSimulation::AesEffectorState::EsReadyToFire)
       continue;
     fireReadyCount++;
   }
@@ -2911,15 +2911,15 @@ void ExplosionsEditAdlerStandAlone::fillCharges()
   for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
   {
     // Vulcano ist available for point geometry only:
-    const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
-    QString adlerChargeTypeName = m_pdmDtc->adlerChargeTypeName(chargeType.id());
+    const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id);
+    QString adlerChargeTypeName = m_pdmDtc->adlerChargeTypeName(chargeType.id);
 
     DEBUG_LOG(m_logger) << " fillCharges"
-                        << ", id=" << chargeType.id() << ", name= " << chargeType.name() << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano;
+                        << ", id=" << chargeType.id << ", name= " << chargeType.name << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano;
 
-    if (adlerChargeTypeName.isEmpty() || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::Artillery)) // [Jira E01562-21]
+    if (adlerChargeTypeName.isEmpty() || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::GearClass_Artillery)) // [Jira E01562-21]
       continue;
-    m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name()), chargeType.id());
+    m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name), chargeType.id);
   }
 
   // restore last:
@@ -2944,7 +2944,7 @@ void ExplosionsEditAdlerStandAlone::fillFiringTypCbox()
   m_ui->cbFiringType->addItem(emptyEntryComboBox, -1);
   for (const auto &ft : firetypes)
   {
-    m_ui->cbFiringType->addItem(AreaEffectSimulation::toString(ft), ft);
+    m_ui->cbFiringType->addItem(AreaEffectSimulation::toString(ft), static_cast<int>(ft));
   }
 }
 
@@ -2956,13 +2956,13 @@ void ExplosionsEditAdlerStandAlone::fillGearClasses()
 
   for (auto type : std::as_const(gearClasses))
   {
-    if (m_gearClassFilter.contains(type.gearClassId()))
+    if (m_gearClassFilter.contains(type.gearClassId))
     {
-      if (m_pdmDtc->getAdlerWeaponSystemId(type.id()) > 3)
+      if (m_pdmDtc->getAdlerWeaponSystemId(type.id) > 3)
         continue;
 
-      m_ui->cbGearClass->insertItem(index, m_pdmDtc->trGearTypeName(type.id()), type.gearClassId().underlying());
-      m_ui->cbGearClass->setItemData(index, m_pdmDtc->getAdlerWeaponSystemId(type.id()), ROLE_GEARTYPE_ID);
+      m_ui->cbGearClass->insertItem(index, m_pdmDtc->trGearTypeName(type.id), static_cast<int>(type.gearClassId));
+      m_ui->cbGearClass->setItemData(index, m_pdmDtc->getAdlerWeaponSystemId(type.id), ROLE_GEARTYPE_ID);
     }
   }
   m_ui->cbGearClass->model()->sort(0, Qt::AscendingOrder);
@@ -2970,7 +2970,7 @@ void ExplosionsEditAdlerStandAlone::fillGearClasses()
 
 void ExplosionsEditAdlerStandAlone::onEffectorChanged(const AreaEffectSimulation::Effector &data, DataModification modType)
 {
-  if (data.aesItemId() != m_aesItem.id())
+  if (data.aesItemId != m_aesItem.id)
     return;
 
   if (!unchangeable())
@@ -2983,10 +2983,10 @@ void ExplosionsEditAdlerStandAlone::onEffectorChanged(const AreaEffectSimulation
     {
       if (AesEffector *effectorWidget = qobject_cast<AesEffector *>(widget))
       {
-        if (effectorWidget->effectorId() != data.id())
+        if (effectorWidget->effectorId() != data.id)
           continue;
 
-        effectorWidget->setState(data.effectorState());
+        effectorWidget->setState(data.effectorState);
         return;
       }
     }
@@ -2994,8 +2994,8 @@ void ExplosionsEditAdlerStandAlone::onEffectorChanged(const AreaEffectSimulation
 
   if (modType == DataModification::eAdded)
   {
-    const ParticipantManagement::Participant &part = m_ppmDtc->participant(data.participantId());
-    setEffector(part, data.effectorState());
+    const ParticipantManagement::Participant &part = m_ppmDtc->participant(data.participantId);
+    setEffector(part, data.effectorState);
   }
 }
 
@@ -3003,7 +3003,7 @@ bool ExplosionsEditAdlerStandAlone::isOnlyNameModifiable() const
 {
   // BaseClass::isOnlyNameModifiable() -> EsPaused || EsActivated
   // m_effectClusterData.isObjectModifiable -> since PreStart and s_calculationOffsetMSec
-  const bool ret = BaseClass::isOnlyNameModifiable() || !m_effectClusterData.isObjectModifiable();
+  const bool ret = BaseClass::isOnlyNameModifiable() || !m_effectClusterData.isObjectModifiable;
   return ret;
 }
 
@@ -3055,9 +3055,9 @@ void ExplosionsEditAdlerStandAlone::mmiToJsonproperties(QJsonObject &data)
     data.remove(AdlerJson::JsonKeys::ABFEUERUNGSZEIT());
 
   if (m_ui->rbAngleGroupLower->isChecked())
-    data[AdlerJson::JsonKeys::WINKELGRUPPE()] = ProjectDataManagement::L43_AngleGroup::Lower;
+    data[AdlerJson::JsonKeys::WINKELGRUPPE()] = static_cast<int>(ProjectDataManagement::L43_AngleGroup::Lower);
   else
-    data[AdlerJson::JsonKeys::WINKELGRUPPE()] = ProjectDataManagement::L43_AngleGroup::Upper;
+    data[AdlerJson::JsonKeys::WINKELGRUPPE()] = static_cast<int>(ProjectDataManagement::L43_AngleGroup::Upper);
 
   if (m_ui->sbDurationSec->isVisible())
     data[AdlerJson::JsonKeys::DAUER()] = m_ui->sbDurationSec->value();
@@ -3085,7 +3085,7 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterDataFromJson(const std::stri
     m_ui->cbTargetSubType->setCurrentIndex(m_ui->cbTargetSubType->findData(targetSubType));
 
   const int angleGroup = propsObj[AdlerJson::JsonKeys::WINKELGRUPPE()].toInt();
-  if (angleGroup == ProjectDataManagement::L43_AngleGroup::Lower)
+  if (angleGroup == static_cast<int>(ProjectDataManagement::L43_AngleGroup::Lower))
     m_ui->rbAngleGroupLower->setChecked(true);
   else
     m_ui->rbAngleGroupUpper->setChecked(true);
@@ -3098,7 +3098,7 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterDataFromJson(const std::stri
   }
 
   m_ui->cbFiringType->setCurrentIndex(m_ui->cbFiringType->findData(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt()));
-  if (m_aesItem.id() == 0)
+  if (m_aesItem.id == 0)
   {
     const int duration = propsObj[AdlerJson::JsonKeys::DAUER()].toInt();
     m_ui->sbDurationSec->setValue(duration);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h
index 022c9907d..899a6c58b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h
@@ -6,7 +6,7 @@
 #include "LtsElevation/lts_elevation_manager.h"
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ElevationMap/elevation_map_manager.h>
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <EffectShowManagement/esm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_single_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_single_model.h
index 9f51712e2..c9bd4a0dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_single_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_single_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
index 2f187e3bf..534c1424a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
@@ -47,7 +47,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry geome
       const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
       const ProjectDataManagement::GearClass currentGearClass = static_cast<ProjectDataManagement::GearClass>(currentData.toInt());
 
-      if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
+      if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
       {
         QStandardItem *item = cboModel->item(indexCounter);
 
@@ -70,7 +70,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry geome
       const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
       const ProjectDataManagement::GearClass currentGearClass = static_cast<ProjectDataManagement::GearClass>(currentData.toInt());
 
-      if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
+      if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
       {
         QStandardItem *item = cboModel->item(indexCounter);
 
@@ -98,7 +98,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry geome
 
 void addRocketPropertiesToRequest(EffectClusterModifyRequest &request, const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
 {
-  switch (request.explosionGeometry().underlying())
+  switch (request.explosionGeometry)
   {
   case AesExplosionGeometry::EgAimPoint:
   case AesExplosionGeometry::EgPoint:
@@ -123,23 +123,23 @@ void addRocketPropertiesForLinearGeometry(EffectClusterModifyRequest &request, c
 
   wirkmittel.wirkzeit = 6;
 
-  const UtmCoordinate areaBottomLeftUtm = UtmCoordinate::fromGeographic(request.area().cornerBottomLeft().lon(), request.area().cornerBottomLeft().lat());
+  const UtmCoordinate areaBottomLeftUtm = UtmCoordinate::fromGeographic(request.area.cornerBottomLeft.lon, request.area.cornerBottomLeft.lat);
 
   QTransform transform;
   transform.translate(areaBottomLeftUtm.x, areaBottomLeftUtm.y);
-  transform.rotate(-request.area().rotation());
+  transform.rotate(-request.area.rotation);
 
-  const double yLocal = request.area().height() / 2;
+  const double yLocal = request.area.height / 2;
 
   int mhpSliceCounter = 1;
 
-  for (EffectorData &currentEffector : request.effectors())
+  for (EffectorData &currentEffector : request.effectors)
   {
-    wirkmittel.geschoss.anzahl = currentEffector.chargeAmount();
+    wirkmittel.geschoss.anzahl = currentEffector.chargeAmount;
     treffpunkt.anzahl = wirkmittel.geschoss.anzahl;
 
     // calculate local x
-    double xLocal = request.area().width() * (static_cast<double>(mhpSliceCounter++) / (request.effectors().size() + 1));
+    double xLocal = request.area.width * (static_cast<double>(mhpSliceCounter++) / (request.effectors.size() + 1));
 
     // transform local point to UTM
     const QPointF localPoint(xLocal, yLocal);
@@ -150,10 +150,10 @@ void addRocketPropertiesForLinearGeometry(EffectClusterModifyRequest &request, c
     const QPointF mhpGeo = currentUtm.geographic();
 
     // treffpunkt
-    currentEffector.mhpPosition().lon(mhpGeo.x());
-    currentEffector.mhpPosition().lat(mhpGeo.y());
-    treffpunkt.koordinate.koordinate.longitude = currentEffector.mhpPosition().lon() * LtsCoordTrans::rad2deg();
-    treffpunkt.koordinate.koordinate.latitude = currentEffector.mhpPosition().lat() * LtsCoordTrans::rad2deg();
+    currentEffector.mhpPosition.lon = mhpGeo.x();
+    currentEffector.mhpPosition.lat = mhpGeo.y();
+    treffpunkt.koordinate.koordinate.longitude = currentEffector.mhpPosition.lon * LtsCoordTrans::rad2deg();
+    treffpunkt.koordinate.koordinate.latitude = currentEffector.mhpPosition.lat * LtsCoordTrans::rad2deg();
 
     wirkmittel.treffpunkte.clear();
     wirkmittel.treffpunkte.append(treffpunkt);
@@ -161,32 +161,32 @@ void addRocketPropertiesForLinearGeometry(EffectClusterModifyRequest &request, c
     QJsonObject wirkmittelObj;
     AdlerJson::wirkmittelFeuerkommandoRaketeToJson(wirkmittelObj, wirkmittel);
 
-    currentEffector.properties(QJsonDocument(wirkmittelObj).toJson().toStdString());
+    currentEffector.properties = QJsonDocument(wirkmittelObj).toJson().toStdString();
 
     // trajectory
-    const ParticipantManagement::ParticipantPosition &participantPosition = ppmDtc->participantPosition(currentEffector.participantId());
-    const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos().lon(),
-                                             participantPosition.pos().lat(),
-                                             participantPosition.pos().z());
-    const LtsUtils::QPoint3D trajectoryEnd(currentEffector.mhpPosition().lon(),
-                                           currentEffector.mhpPosition().lat(),
-                                           currentEffector.mhpPosition().z()); // TODO
+    const ParticipantManagement::ParticipantPosition &participantPosition = ppmDtc->participantPosition(currentEffector.participantId);
+    const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos.lon,
+                                             participantPosition.pos.lat,
+                                             participantPosition.pos.z);
+    const LtsUtils::QPoint3D trajectoryEnd(currentEffector.mhpPosition.lon,
+                                           currentEffector.mhpPosition.lat,
+                                           currentEffector.mhpPosition.z); // TODO
     TrajectoryGeoPosition trajectoryWithoutTime;
 
     TrajectoryGenerator::getInstance()->generateTrajectoryBiedziak(trajectoryStart, trajectoryEnd, 45.0, trajectoryWithoutTime);
 
-    currentEffector.flightTime(60000.0);
-    const double flightTimeStep = currentEffector.flightTime() / static_cast<double>(trajectoryWithoutTime.size());
+    currentEffector.flightTime = 60000.0;
+    const double flightTimeStep = currentEffector.flightTime / static_cast<double>(trajectoryWithoutTime.size());
     double currentFlightTime = 0.0;
 
-    currentEffector.trajectoryRelative().clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
-    const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat());
+    currentEffector.trajectoryRelative.clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
+    const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos.lon, participantPosition.pos.lat);
     for (const Core::GeoPosition &pos : trajectoryWithoutTime)
     {
-      const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat());
+      const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon, pos.lat);
 
-      currentEffector.trajectoryRelative().emplace_back(utmCurrentPos.x - utmStartPos.x,
-                                                        utmCurrentPos.y - utmStartPos.y, pos.z(), currentFlightTime);
+      currentEffector.trajectoryRelative.emplace_back(utmCurrentPos.x - utmStartPos.x,
+                                                        utmCurrentPos.y - utmStartPos.y, pos.z, currentFlightTime);
 
       currentFlightTime += flightTimeStep;
     }
@@ -203,19 +203,19 @@ void addRocketPropertiesForPointGeometry(EffectClusterModifyRequest &request, co
   wirkmittel.wirkzeit = 6;
   treffpunkt.anzahl = 1;
 
-  const UtmCoordinate areaBottomLeftUtm = UtmCoordinate::fromGeographic(request.area().cornerBottomLeft().lon(), request.area().cornerBottomLeft().lat());
-  const QPointF areaCenterGeo = areaBottomLeftUtm.geographic(request.area().width() / 2, request.area().height() / 2);
+  const UtmCoordinate areaBottomLeftUtm = UtmCoordinate::fromGeographic(request.area.cornerBottomLeft.lon, request.area.cornerBottomLeft.lat);
+  const QPointF areaCenterGeo = areaBottomLeftUtm.geographic(request.area.width / 2, request.area.height / 2);
 
-  for (EffectorData &currentEffector : request.effectors())
+  for (EffectorData &currentEffector : request.effectors)
   {
-    wirkmittel.geschoss.anzahl = currentEffector.chargeAmount();
+    wirkmittel.geschoss.anzahl = currentEffector.chargeAmount;
     treffpunkt.anzahl = wirkmittel.geschoss.anzahl;
 
     // treffpunkt
-    currentEffector.mhpPosition().lon(areaCenterGeo.x());
-    currentEffector.mhpPosition().lat(areaCenterGeo.y());
-    treffpunkt.koordinate.koordinate.longitude = currentEffector.mhpPosition().lon() * LtsCoordTrans::rad2deg();
-    treffpunkt.koordinate.koordinate.latitude = currentEffector.mhpPosition().lat() * LtsCoordTrans::rad2deg();
+    currentEffector.mhpPosition.lon = areaCenterGeo.x();
+    currentEffector.mhpPosition.lat = areaCenterGeo.y();
+    treffpunkt.koordinate.koordinate.longitude = currentEffector.mhpPosition.lon * LtsCoordTrans::rad2deg();
+    treffpunkt.koordinate.koordinate.latitude = currentEffector.mhpPosition.lat * LtsCoordTrans::rad2deg();
 
     wirkmittel.treffpunkte.clear();
     wirkmittel.treffpunkte.append(treffpunkt);
@@ -223,32 +223,32 @@ void addRocketPropertiesForPointGeometry(EffectClusterModifyRequest &request, co
     QJsonObject wirkmittelObj;
     AdlerJson::wirkmittelFeuerkommandoRaketeToJson(wirkmittelObj, wirkmittel);
 
-    currentEffector.properties(QJsonDocument(wirkmittelObj).toJson().toStdString());
+    currentEffector.properties = QJsonDocument(wirkmittelObj).toJson().toStdString();
 
     // trajectory
-    const ParticipantManagement::ParticipantPosition &participantPosition = ppmDtc->participantPosition(currentEffector.participantId());
-    const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos().lon(),
-                                             participantPosition.pos().lat(),
-                                             participantPosition.pos().z());
-    const LtsUtils::QPoint3D trajectoryEnd(currentEffector.mhpPosition().lon(),
-                                           currentEffector.mhpPosition().lat(),
-                                           currentEffector.mhpPosition().z());
+    const ParticipantManagement::ParticipantPosition &participantPosition = ppmDtc->participantPosition(currentEffector.participantId);
+    const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos.lon,
+                                             participantPosition.pos.lat,
+                                             participantPosition.pos.z);
+    const LtsUtils::QPoint3D trajectoryEnd(currentEffector.mhpPosition.lon,
+                                           currentEffector.mhpPosition.lat,
+                                           currentEffector.mhpPosition.z);
     TrajectoryGeoPosition trajectoryWithoutTime;
 
     TrajectoryGenerator::getInstance()->generateTrajectoryBiedziak(trajectoryStart, trajectoryEnd, 45.0, trajectoryWithoutTime);
 
-    currentEffector.flightTime(60000.0);
-    const double flightTimeStep = currentEffector.flightTime() / static_cast<double>(trajectoryWithoutTime.size());
+    currentEffector.flightTime = 60000.0;
+    const double flightTimeStep = currentEffector.flightTime / static_cast<double>(trajectoryWithoutTime.size());
     double currentFlightTime = 0.0;
 
-    currentEffector.trajectoryRelative().clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
-    const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat());
+    currentEffector.trajectoryRelative.clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
+    const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos.lon, participantPosition.pos.lat);
     for (const Core::GeoPosition &pos : trajectoryWithoutTime)
     {
-      const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat());
+      const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon, pos.lat);
 
-      currentEffector.trajectoryRelative().emplace_back(utmCurrentPos.x - utmStartPos.x,
-                                                        utmCurrentPos.y - utmStartPos.y, pos.z(), currentFlightTime);
+      currentEffector.trajectoryRelative.emplace_back(utmCurrentPos.x - utmStartPos.x,
+                                                        utmCurrentPos.y - utmStartPos.y, pos.z, currentFlightTime);
 
       currentFlightTime += flightTimeStep;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CustomView/aes_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CustomView/aes_functional_area.cpp
index bb39b98c6..f5fb0e475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CustomView/aes_functional_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CustomView/aes_functional_area.cpp
@@ -66,13 +66,13 @@ bool CustomViewFunctionalArea::init(const QModelIndex &idx)
 bool CustomViewFunctionalArea::calculateIcon(const FunctionalArea &funcArea, const QColor &color)
 {
   Database::AesFunctionalArea funcOut;
-  funcOut.width = funcArea.area().width();
-  funcOut.length = funcArea.area().height();
-  funcOut.position = QPointF(funcArea.area().cornerBottomLeft().lon(),
-                             funcArea.area().cornerBottomLeft().lat());
+  funcOut.width = funcArea.area.width;
+  funcOut.length = funcArea.area.height;
+  funcOut.position = QPointF(funcArea.area.cornerBottomLeft.lon,
+                             funcArea.area.cornerBottomLeft.lat);
 
   QPolygonF poly = AreaEffectSimulation::Polygons::functionalArea(funcOut);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(funcArea.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(funcArea.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp
index 7fa6f4910..a7d303b34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp
@@ -163,7 +163,7 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
 
   const FunctionalAreaType type = m_functionalAreaTypes.value(m_ui->cbFunctionalAreaType->currentData().toInt());
   
-  if (type.supplyMode() == AesOperatingMode::OmWaitingTime)
+  if (type.supplyMode == AesOperatingMode::OmWaitingTime)
   {
     DEBUG_LOG(m_logger) << "SUPPLY-MODE";
     m_ui->sbDecontaminationMinutes->setEnabled(false);
@@ -209,24 +209,24 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
     m_ui->sbWidth->setEnabled(enable);
 
 
-    const bool deconAvailable = type.deconMode() != AesOperatingMode::OmNotAvailable;
-    const bool maintAvailable = type.maintMode() != AesOperatingMode::OmNotAvailable;
-    const bool medicAvailable = type.medicMode() != AesOperatingMode::OmNotAvailable;
+    const bool deconAvailable = type.deconMode != AesOperatingMode::OmNotAvailable;
+    const bool maintAvailable = type.maintMode != AesOperatingMode::OmNotAvailable;
+    const bool medicAvailable = type.medicMode != AesOperatingMode::OmNotAvailable;
 
     m_ui->cbDecontamination->setEnabled(enable && deconAvailable);
     m_ui->cbMaintenance->setEnabled(enable && maintAvailable);
     m_ui->cbMedical->setEnabled(enable && medicAvailable);
 
-    m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && deconAvailable);
-    m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && maintAvailable);
-    m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && medicAvailable);
+    m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && deconAvailable);
+    m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && maintAvailable);
+    m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == static_cast<int>(AesOperatingMode::OmWaitingTime)) && enable && medicAvailable);
     m_ui->sbSupplyMinutes->setEnabled(false);
     m_ui->sbSupplyMinutes->setValue(0);
     m_ui->cbSupply->setCurrentIndex(0);
     setVisableFaButtons();
   }
-  const bool isGenericFunctionalArea = type.id() == 0;
-  const bool symbolAvailable = type.pointSymbol().empty();
+  const bool isGenericFunctionalArea = type.id == 0;
+  const bool symbolAvailable = type.pointSymbol.empty();
   m_ui->pbClear->setEnabled(enable);
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
 
@@ -244,18 +244,18 @@ void FunctionalAreaEdit::enableUiElements(bool enable)
   m_ui->pbClearPointSymbol->setEnabled(isGenericFunctionalArea);
 
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
     DEBUG_LOG(m_logger) << "setUnchangeable()";
     setUnchangeable();
     disableButtons(true);
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->functionalArea(m_aesItem.id());
+    auto baseData = m_dtc->functionalArea(m_aesItem.id);
     DEBUG_LOG(m_logger) << "init: setData";
     setData(baseData, false);
     __unchange__();
@@ -279,7 +279,7 @@ bool FunctionalAreaEdit::init(int areaId, bool copy,
   m_ui->cbFunctionalAreaType->clear();
   m_functionalAreaTypes = m_dtc->functionalAreaTypes();
   for (const auto &type : std::as_const(m_functionalAreaTypes))
-    m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name()), type.id());
+    m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name), type.id);
 
   bool editable = LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FunctionalAreasEdit) ||
                   m_session->app() == LtsAppDescriptor::App::OC;
@@ -326,36 +326,36 @@ void FunctionalAreaEdit::setData(const FunctionalArea &area, bool copy)
   m_aesItem = area;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
 
-  m_ui->leIdentifier->setText(QString::fromStdString(area.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(area.effectStart().is_set() ? area.effectStart().get() : 0);
-  m_ui->sbDurationMinutes->setValue(area.effectDuration() / 1000 / 60); 
-  m_ui->sbWidth->setValue(area.area().width());
-  m_ui->sbHeight->setValue(area.area().height());
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(area.partyId().is_set() ? area.partyId().get() : 0));
+  m_ui->leIdentifier->setText(QString::fromStdString(area.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(area.effectStart.has_value() ? area.effectStart.get() : 0);
+  m_ui->sbDurationMinutes->setValue(area.effectDuration / 1000 / 60); 
+  m_ui->sbWidth->setValue(area.area.width);
+  m_ui->sbHeight->setValue(area.area.height);
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(area.partyId.has_value() ? area.partyId.get() : 0));
 
-  const QPointF bottomLeft(area.area().cornerBottomLeft().lon(), area.area().cornerBottomLeft().lat());
-  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area().width(), area.area().height(), 0.0);
+  const QPointF bottomLeft(area.area.cornerBottomLeft.lon, area.area.cornerBottomLeft.lat);
+  const QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area.width, area.area.height, 0.0);
   if (!bottomLeft.isNull())
     m_ui->positionEdit->setCoordinate(centerpoint);
 
-  m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(area.deconMode().underlying()));
-  m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(area.maintMode().underlying()));
-  m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(area.medicMode().underlying()));
+  m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(static_cast<int>(area.deconMode)));
+  m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(static_cast<int>(area.maintMode)));
+  m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(static_cast<int>(area.medicMode)));
 
-  m_ui->sbDecontaminationMinutes->setValue(area.deconTime() / (1000 * 60));
-  m_ui->sbMaintanenceMinutes->setValue(area.maintTime() / (1000 * 60));
-  m_ui->sbMedicalMinutes->setValue(area.medicTime() / (1000 * 60));
-  m_ui->sbSupplyMinutes->setValue(area.supplyTime() / (1000 * 60));
+  m_ui->sbDecontaminationMinutes->setValue(area.deconTime / (1000 * 60));
+  m_ui->sbMaintanenceMinutes->setValue(area.maintTime / (1000 * 60));
+  m_ui->sbMedicalMinutes->setValue(area.medicTime / (1000 * 60));
+  m_ui->sbSupplyMinutes->setValue(area.supplyTime / (1000 * 60));
 
-  m_ui->cbFunctionalAreaType->setCurrentIndex(m_ui->cbFunctionalAreaType->findData(area.functionalAreaTypeId()));
+  m_ui->cbFunctionalAreaType->setCurrentIndex(m_ui->cbFunctionalAreaType->findData(area.functionalAreaTypeId));
 
-  if (m_aesItem.participantId().is_set())
+  if (m_aesItem.participantId.has_value())
   {
-     int participantId = m_aesItem.participantId().get();
+     int participantId = m_aesItem.participantId.get();
      DEBUG_LOG(m_logger) << "ParticipantId = " << participantId;
      QVector<int> participants;
      participants.append(participantId);
@@ -363,13 +363,13 @@ void FunctionalAreaEdit::setData(const FunctionalArea &area, bool copy)
   }
 
   
-  if (area.pointSymbol().is_set())
+  if (area.pointSymbol.has_value())
   {
-    m_sidc = QString::fromStdString(area.pointSymbol().get());
+    m_sidc = QString::fromStdString(area.pointSymbol.get());
     onChangeSymbol(m_sidc);
   }
-  if ((m_aesItem.effectStateId() == AesEffectState::EsActivated)
-      || (m_aesItem.effectStateId() == AesEffectState::EsExpired))
+  if ((m_aesItem.effectStateId == AesEffectState::EsActivated)
+      || (m_aesItem.effectStateId == AesEffectState::EsExpired))
   {
     DEBUG_LOG(m_logger) << "setUnchangeable";
     disableButtons(true);
@@ -394,19 +394,19 @@ void FunctionalAreaEdit::fillCbx()
   QString byOperator = tr("by operator");
   QString bytimeout = tr("by wait time");
 
-  m_ui->cbDecontamination->addItem(unused, AesOperatingMode::OmNotUsed);
-  m_ui->cbDecontamination->addItem(byOperator, AesOperatingMode::OmObserver);
-  m_ui->cbDecontamination->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
+  m_ui->cbDecontamination->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
+  m_ui->cbDecontamination->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
+  m_ui->cbDecontamination->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
 
-  m_ui->cbMaintenance->addItem(unused, AesOperatingMode::OmNotUsed);
-  m_ui->cbMaintenance->addItem(byOperator, AesOperatingMode::OmObserver);
-  m_ui->cbMaintenance->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
+  m_ui->cbMaintenance->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
+  m_ui->cbMaintenance->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
+  m_ui->cbMaintenance->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
 
-  m_ui->cbMedical->addItem(unused, AesOperatingMode::OmNotUsed);
-  m_ui->cbMedical->addItem(byOperator, AesOperatingMode::OmObserver);
-  m_ui->cbMedical->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
+  m_ui->cbMedical->addItem(unused, static_cast<int>(AesOperatingMode::OmNotUsed));
+  m_ui->cbMedical->addItem(byOperator, static_cast<int>(AesOperatingMode::OmObserver));
+  m_ui->cbMedical->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
 
-  m_ui->cbSupply->addItem(bytimeout, AesOperatingMode::OmWaitingTime);
+  m_ui->cbSupply->addItem(bytimeout, static_cast<int>(AesOperatingMode::OmWaitingTime));
 
   
   if (curIdxDeconCbx >= 0)
@@ -450,47 +450,47 @@ void FunctionalAreaEdit::onRectData(const QPointF &centerPoint, double width, do
 
 void FunctionalAreaEdit::onCbxIdxDeconChanged()
 {
-  m_ui->sbDecontaminationMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt());
+  m_ui->sbDecontaminationMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbDecontamination->currentData().toInt());
 }
 
 void FunctionalAreaEdit::onCbxIdxMaintChanged()
 {
-  m_ui->sbMaintanenceMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt());
+  m_ui->sbMaintanenceMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMaintenance->currentData().toInt());
 }
 
 void FunctionalAreaEdit::onCbxIdxMedicChanged()
 {
-  m_ui->sbMedicalMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt());
+  m_ui->sbMedicalMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt());
 }
 
 void FunctionalAreaEdit::onCbxIdxSupplyChanged()
 {
-  m_ui->sbSupplyMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt());
+  m_ui->sbSupplyMinutes->setEnabled(static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbSupply->currentData().toInt());
 }
 
 void FunctionalAreaEdit::onCbxIdxFunctionalAreaTypeChanged()
 {
   const FunctionalAreaType type = m_functionalAreaTypes.value(m_ui->cbFunctionalAreaType->currentData().toInt());
   DEBUG_LOG(m_logger) << "onCbxIdxFunctionalAreaTypeChanged"
-                      << " type.id=" << type.id()
-                      << " name=" << type.name();
-  if (type.id() != 0)
+                      << " type.id=" << type.id
+                      << " name=" << type.name;
+  if (type.id != 0)
   {
-    if (type.id() == 7)
+    if (type.id == 7)
     {
-      m_ui->sbSupplyMinutes->setValue(type.supplyTime());
+      m_ui->sbSupplyMinutes->setValue(type.supplyTime);
       m_ui->cbSupply->setCurrentIndex(0);
     }
     else
     {
-      m_sidc = QString::fromStdString(type.pointSymbol());
+      m_sidc = QString::fromStdString(type.pointSymbol);
       onChangeSymbol(m_sidc);
-      m_ui->sbDecontaminationMinutes->setValue(type.deconTime());
-      m_ui->sbMaintanenceMinutes->setValue(type.maintTime());
-      m_ui->sbMedicalMinutes->setValue(type.medicTime());
-      m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(type.deconMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.deconMode().underlying()));
-      m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(type.maintMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.maintMode().underlying()));
-      m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(type.medicMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.medicMode().underlying()));
+      m_ui->sbDecontaminationMinutes->setValue(type.deconTime);
+      m_ui->sbMaintanenceMinutes->setValue(type.maintTime);
+      m_ui->sbMedicalMinutes->setValue(type.medicTime);
+      m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(static_cast<int>(type.deconMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.deconMode)));
+      m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(static_cast<int>(type.maintMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.maintMode)));
+      m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(static_cast<int>(type.medicMode == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.medicMode)));
     }
   }
   enableUiElements(true);
@@ -569,7 +569,7 @@ void FunctionalAreaEdit::onChangeSymbol(const QString &sidc)
     std::shared_ptr<ParticipantManagement::Interface::Dtc> ppmDtc;
     m_session->getDtc<ParticipantManagement::DataInterface>(ppmDtc);
     if (ppmDtc)
-      symDataToRender.fillColor = ppmDtc->party(partyId).color();
+      symDataToRender.fillColor = ppmDtc->party(partyId).color;
     else
       WARNING_LOG(m_logger) << "no ppmDtc";
   }
@@ -614,17 +614,17 @@ bool FunctionalAreaEdit::apply()
   int playerId         = 0;
   const auto pointSymbol = m_sidc.toStdString();
   AesOperatingMode deconMode = static_cast<AesOperatingMode>(m_ui->cbDecontamination->currentData().toInt());
-  int              deconTime = (AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0;
+  int              deconTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0;
   AesOperatingMode maintMode = static_cast<AesOperatingMode>(m_ui->cbMaintenance->currentData().toInt());
-  int              maintTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0;
+  int              maintTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0;
   AesOperatingMode medicMode = static_cast<AesOperatingMode>(m_ui->cbMedical->currentData().toInt());
-  int              medicTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
+  int              medicTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
   AesOperatingMode supplyMode = static_cast<AesOperatingMode>(m_ui->cbSupply->currentData().toInt());
   if ( functionalAreaType != 7 )
     supplyMode = AesOperatingMode::OmNotUsed;
-  int              supplyTime = (AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0;
+  int              supplyTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0;
   AesOperatingMode notfightMode = static_cast<AesOperatingMode>(m_ui->cbMedical->currentData().toInt());
-  int              notfightTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
+  int              notfightTime = (static_cast<int>(AesOperatingMode::OmWaitingTime) == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0;
   if ( functionalAreaType == 7 )
   {
     deconMode = AesOperatingMode::OmNotUsed;
@@ -652,12 +652,12 @@ bool FunctionalAreaEdit::apply()
   if (supplyMode == AesOperatingMode::OmWaitingTime)
   {
     partyId = 0;
-    playerId =  m_participant.id();
+    playerId =  m_participant.id;
   }
 
-  FunctionalAreaModifyRequest req(m_aesItem.id(),
+  FunctionalAreaModifyRequest req(m_aesItem.id,
                                   name,
-                                  LtsUtils::toOptional(effectStart),
+                                  LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                   duration,
                                   chargeType,
                                   area,
@@ -679,7 +679,7 @@ bool FunctionalAreaEdit::apply()
 
   m_requestHelper->addRequest([this, req, functionalAreaType]()
   {
-    DEBUG_LOG(m_logger) << "addRequest m_aesItem.id()=" << m_aesItem.id()
+    DEBUG_LOG(m_logger) << "addRequest m_aesItem.id()=" << m_aesItem.id
                          << " functionalAreaType=" << functionalAreaType
                          << " area=" << req;
     return m_ftc->functionalAreaModifyRequest(req, this);
@@ -774,7 +774,7 @@ void FunctionalAreaEdit::onParticipantClicked()
 {
   ParticipantManagement::ParticipantSelection *ps = new ParticipantManagement::ParticipantSelection(m_session, this);
   ps->init();
-  ps->setParticipantSelected(m_participant.partyId(), m_participant.id());
+  ps->setParticipantSelected(m_participant.partyId, m_participant.id);
 
   connect(ps, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, &FunctionalAreaEdit::onParticipant);
   ps->exec();
@@ -792,12 +792,12 @@ void FunctionalAreaEdit::onParticipant(const QVector<int> &participants)
 
 
   m_participant = m_ppmDtc->participant(participants[0]);
-  QString lblHierarchy = m_ppmDtc->hierarchyFromParticipant(m_participant.id());
-  QString lblParticipantType = ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId()).name());
+  QString lblHierarchy = m_ppmDtc->hierarchyFromParticipant(m_participant.id);
+  QString lblParticipantType = ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId).name);
   int functionalAreaType = m_ui->cbFunctionalAreaType->currentData().toInt();
-  DEBUG_LOG(m_logger) << "m_participant.id=" << m_participant.id()
-                       << " designator=" << m_participant.designator()
-                       << " tacticalIdentifier=" << m_participant.tacticalIdentifier()
+  DEBUG_LOG(m_logger) << "m_participant.id=" << m_participant.id
+                       << " designator=" << m_participant.designator
+                       << " tacticalIdentifier=" << m_participant.tacticalIdentifier
                        << " lblHierarchy=" << lblHierarchy
                        << " lblHierarchy.isVisable=" << m_ui->lblHierarchy->isVisible()
                        << " lblParticipantType=" << lblParticipantType
@@ -816,14 +816,14 @@ void FunctionalAreaEdit::onParticipant(const QVector<int> &participants)
                        << " property=" << propertyStrType.join(QStringLiteral("|"));
 
   m_ui->lblHierarchy->show();
-  m_ui->lblHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participant.id()));
+  m_ui->lblHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participant.id));
   m_ui->lblParticipantType->show();
-  m_ui->lblParticipantType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId()).name()));
+  m_ui->lblParticipantType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(m_participant.typeId).name));
   m_ui->lblEquipmentNumber->show();
 
-  dds::core::optional<int32_t> eqId = m_participant.equipmentNumber();
+  dds::core::optional<int32_t> eqId = m_participant.equipmentNumber;
 
-  if (eqId.is_set())
+  if (eqId.has_value())
   {
     QString id = QString::number(eqId.get());
     m_ui->lblEquipmentNumber->setText(id);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.h
index cb14fb6c6..5295937cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -38,7 +38,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddFunctionalArea") : QStringLiteral("EditFunctionalArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddFunctionalArea") : QStringLiteral("EditFunctionalArea%1").arg(m_aesItem.id);
   }
   bool init(int areaId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin.h
index 1a9e167f5..533f7ea67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_functional_area_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_list.h
index 1c922d2b2..51412dccc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
index e3412ebd9..27afb6873 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
@@ -37,8 +37,8 @@ QVariant FunctionalAreasModel::data(const QModelIndex &index, int role) const
   {
   case ColType:
   {
-    auto fat = m_aesDtc->functionalAreaType(functionalArea.functionalAreaTypeId());
-    return trFunctionalAreaTypeName(fat.name());
+    auto fat = m_aesDtc->functionalAreaType(functionalArea.functionalAreaTypeId);
+    return trFunctionalAreaTypeName(fat.name);
   }
   default:
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h
index fe5fc76d2..51e81d98c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/CustomView/aes_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/CustomView/aes_gas_pipe.cpp
index 03760310d..e053594e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/CustomView/aes_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/CustomView/aes_gas_pipe.cpp
@@ -44,21 +44,21 @@ bool CustomViewGasPipe::init(const QModelIndex &idx)
 
 bool CustomViewGasPipe::calculateIcon(const AreaEffectSimulation::GasPipe &line, const QColor &color)
 {
-  if (line.segments().size() == 0)
+  if (line.segments.size() == 0)
     return false;
 
   QVector<Database::AesGasPipeSegment> segments;
-  segments.reserve(line.segments().size());
+  segments.reserve(line.segments.size());
   int counter = 0;
-  for (const Core::GeoPosition2D &s : line.segments())
+  for (const Core::GeoPosition2D &s : line.segments)
   {
     Database::AesGasPipeSegment segment;
-    segment.position = QPointF(s.lon(), s.lat());
+    segment.position = QPointF(s.lon, s.lat);
     segments.append(segment);
     counter++;
   }
 
-  QPolygonF poly = AreaEffectSimulation::Polygons::gasPipe(segments, line.width());
+  QPolygonF poly = AreaEffectSimulation::Polygons::gasPipe(segments, line.width);
   Qt::BrushStyle bStyle = Qt::BrushStyle::NoBrush;
   const auto pix = Polygons::pixmapFromPolygon(poly, color, ICON_RESOLUTION, bStyle, true);
   m_ui->lblIcon->setPixmap(pix);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp
index c885599a4..bc68d43ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp
@@ -76,15 +76,15 @@ void GasPipeEdit::enableUiElements(bool enable)
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
   m_ui->cbParty->setEnabled(enable);
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->gasPipe(m_aesItem.id());
+    auto baseData = m_dtc->gasPipe(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -135,16 +135,16 @@ void GasPipeEdit::setData(const GasPipe &aesItem, bool copy)
   m_aesItem = aesItem;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name()));
-  m_ui->sbWidth->setValue(aesItem.width());
-  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0);
-  if ( aesItem.partyId().is_set())
-     m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(aesItem.partyId().get()));
+  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name));
+  m_ui->sbWidth->setValue(aesItem.width);
+  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart.has_value() ? aesItem.effectStart.get() : 0);
+  if ( aesItem.partyId.has_value())
+     m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(aesItem.partyId.get()));
 
-  setCoordinates(aesItem.segments());
+  setCoordinates(aesItem.segments);
 }
 
 void GasPipeEdit::getPolygon()
@@ -190,8 +190,8 @@ bool GasPipeEdit::apply()
   if (!checkSegementLengths(this))
     return false;
 
-  const GasPipeModifyRequest req(m_aesItem.id(),
-                                    LtsUtils::toOptional(effectStart),
+  const GasPipeModifyRequest req(m_aesItem.id,
+                                    LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                     LtsUtils::toOptional(partyId),
                                     name,
                                     getCoordinates(),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.h
index ff6813d60..58ffe322b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 
 class QDoubleSpinBox;
@@ -28,7 +28,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddGasPipe") : QStringLiteral("EditGasPipe%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddGasPipe") : QStringLiteral("EditGasPipe%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin.h
index c4836e663..8febc2c5f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_gas_pipe_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_list.h
index 22dc7b1e8..b6b2fccad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include "aes_gas_pipes_model.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipes_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipes_model.h
index a0c9d0f0f..e5305bcd5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipes_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipes_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/CustomView/aes_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/CustomView/aes_mine_area.cpp
index 7c61a1f63..7882ca0c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/CustomView/aes_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/CustomView/aes_mine_area.cpp
@@ -50,23 +50,23 @@ bool CustomViewMineArea::init(const QModelIndex &idx)
 
 bool CustomViewMineArea::calculateIcon(const MineArea &area, const QColor &color)
 {
-  if (area.segments().size() == 0)
+  if (area.segments.size() == 0)
     return false;
 
   QVector<Database::AesMineAreaSegment> segments;
-  segments.reserve(area.segments().size());
-  for (AreaEffectSimulation::MineSegment segmentIn : area.segments())
+  segments.reserve(area.segments.size());
+  for (AreaEffectSimulation::MineSegment segmentIn : area.segments)
   {
     Database::AesMineAreaSegment segmentOut;
-    segmentOut.startPosition = QPointF(segmentIn.positionStart().lon(),
-                                       segmentIn.positionStart().lat());
-    segmentOut.endPosition = QPointF(segmentIn.positionEnd().lon(),
-                                     segmentIn.positionEnd().lat());
+    segmentOut.startPosition = QPointF(segmentIn.positionStart.lon,
+                                       segmentIn.positionStart.lat);
+    segmentOut.endPosition = QPointF(segmentIn.positionEnd.lon,
+                                     segmentIn.positionEnd.lat);
     segments.append(segmentOut);
   }
 
-  QPolygonF poly = AreaEffectSimulation::Polygons::mineArea(segments, area.width(), area.density(), area.isCenterLine());
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId());
+  QPolygonF poly = AreaEffectSimulation::Polygons::mineArea(segments, area.width, area.density, area.isCenterLine);
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
index 27ae520fc..528373d6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
@@ -81,7 +81,7 @@ std::vector<LtsCoordWidget::LtsCoordWidget *> MineAreaEdit::coordWidgets() const
 void MineAreaEdit::retranslate()
 {
   translate(m_ui, m_aesItem, tr("Mine Area"));
-  bool isReactivatable = m_dtc->mineArea(m_aesItem.id()).isReactivatable();
+  bool isReactivatable = m_dtc->mineArea(m_aesItem.id).isReactivatable;
   m_ui->pbResetDusMines->setText(isReactivatable ? tr("Reset DUS Mines") : tr("Hide DUS Mines"));
   m_ui->pbResetDusMines->setToolTip(isReactivatable ? tr("Reset all DUS Mines matched to this Minearea") : tr("Hide all DUS Mines matched to this Minearea"));
 }
@@ -105,24 +105,24 @@ void MineAreaEdit::enableUiElements(bool enable)
   m_ui->sbWidth->setEnabled(enable);
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
 
-  const MineArea &ma = m_dtc->mineArea(m_aesItem.id());
-  if (m_aesItem.id() > 0 &&
-      (ma.isDus() || ma.isConcrete()) &&
+  const MineArea &ma = m_dtc->mineArea(m_aesItem.id);
+  if (m_aesItem.id > 0 &&
+      (ma.isDus || ma.isConcrete) &&
 
       LtsSessionData::hasOperatorRight(OperatorRights::MineAreasResetDusMines))
     m_ui->pbResetDusMines->setEnabled(isOnlyNameModifiable());
   else
     m_ui->pbResetDusMines->hide();
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->mineArea(m_aesItem.id());
+    auto baseData = m_dtc->mineArea(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -193,10 +193,10 @@ bool MineAreaEdit::init(int aesItemId, bool copy,
   m_ui->cbDurationHours->setCurrentIndex(m_ui->cbDurationHours->findData(96));
 
   if (strcmp(PROJECTBUILD, "guez") == 0)
-    m_ui->cbLayingProcedure->addItem(tr("Artillery"), AesMaLayingProcedureType::LptArtillery);
+    m_ui->cbLayingProcedure->addItem(tr("Artillery"), static_cast<int>(AesMaLayingProcedureType::LptArtillery));
 
-  m_ui->cbLayingProcedure->addItem(tr("Pioneer"), AesMaLayingProcedureType::LptPioneer);
-  m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(AesMaLayingProcedureType::LptPioneer));  
+  m_ui->cbLayingProcedure->addItem(tr("Pioneer"), static_cast<int>(AesMaLayingProcedureType::LptPioneer));
+  m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(static_cast<int>(AesMaLayingProcedureType::LptPioneer)));  
 
   m_ui->cbLayingMethod->addItem(tr("Open"), 0);
   m_ui->cbLayingMethod->addItem(tr("Covered"), 1);
@@ -245,30 +245,30 @@ void MineAreaEdit::setData(const MineArea &data, bool copy)
   m_aesItem = data;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromUtf8(data.name().c_str()));
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(data.chargeStruct().chargeTypeId()));
-  m_ui->sbDensity->setValue(data.density());
+  m_ui->leIdentifier->setText(QString::fromUtf8(data.name.c_str()));
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(data.chargeStruct.chargeTypeId));
+  m_ui->sbDensity->setValue(data.density);
 
-  double distance = qRound(1.0 / data.density());
+  double distance = qRound(1.0 / data.density);
   if (distance == 8.0)
     distance = 7.5;
   const int densityIndex = m_ui->cbxDensity->findData(distance);
   if (densityIndex != -1)
     m_ui->cbxDensity->setCurrentIndex(densityIndex);
   else
-    WARNING_LOG(m_logger) << "Got invalid density = " << data.density() << " / distance = " << distance;
+    WARNING_LOG(m_logger) << "Got invalid density = " << data.density << " / distance = " << distance;
 
   
-  const QJsonObject &propObj = QJsonDocument::fromJson(data.properties().c_str()).object();
+  const QJsonObject &propObj = QJsonDocument::fromJson(data.properties.c_str()).object();
   const int refAesItemId =  propObj.value(QStringLiteral("referencedAesItemId")).toInt(-1);
   int effectClusterChargeTypeId = 0;
   if (refAesItemId > 0)
   {
     const auto &effectCluster = m_aesDtc->effectCluster(refAesItemId);
-    effectClusterChargeTypeId = (effectCluster.id() > 0) ? effectCluster.chargeStruct().chargeTypeId() : 0 ;
+    effectClusterChargeTypeId = (effectCluster.id > 0) ? effectCluster.chargeStruct.chargeTypeId : 0 ;
   }
 
   const bool showDensity = (effectClusterChargeTypeId != s_DM72ChargeTypeId);
@@ -279,22 +279,22 @@ void MineAreaEdit::setData(const MineArea &data, bool copy)
 
 
   m_ui->sbWidth->setDecimals(0);
-  m_ui->sbWidth->setValue(qRound(data.width()));
-  m_ui->cbEffectMarkingInTa->setChecked(data.effectMarkingInTa());
+  m_ui->sbWidth->setValue(qRound(data.width));
+  m_ui->cbEffectMarkingInTa->setChecked(data.effectMarkingInTa);
   if (m_session->app() != LtsAppDescriptor::App::OC)
-    m_ui->cbMineAreaInputMode->setCurrentIndex(m_ui->cbMineAreaInputMode->findData(data.isCenterLine()));
+    m_ui->cbMineAreaInputMode->setCurrentIndex(m_ui->cbMineAreaInputMode->findData(data.isCenterLine));
 
   QVector<QPointF> coords;
   MineSegment seg;
-  coords.reserve(data.segments().size());
-  for (const MineSegment &ms : data.segments())
+  coords.reserve(data.segments.size());
+  for (const MineSegment &ms : data.segments)
   {
-    coords << QPointF(ms.positionStart().lon(), ms.positionStart().lat());
+    coords << QPointF(ms.positionStart.lon, ms.positionStart.lat);
     seg = ms;
   }
 
   if (coords.size() > 0) 
-    coords << QPointF(seg.positionEnd().lon(), seg.positionEnd().lat());
+    coords << QPointF(seg.positionEnd.lon, seg.positionEnd.lat);
 
   for (int i = 0; i < coords.size(); ++i)
   {
@@ -304,13 +304,13 @@ void MineAreaEdit::setData(const MineArea &data, bool copy)
     w->setCoordinate(coords[i]);
   }
 
-  m_ui->dteEffectStart->setMsecsSinceEpoch(data.effectStart().is_set() ? data.effectStart().get() : 0);
+  m_ui->dteEffectStart->setMsecsSinceEpoch(data.effectStart.has_value() ? data.effectStart.get() : 0);
 
-  double duration = data.effectDuration() / (1000 * 60 * 60); 
+  double duration = data.effectDuration / (1000 * 60 * 60); 
   m_ui->cbDurationHours->setCurrentText(QString::number(duration));
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(data.partyId().is_set() ? data.partyId().get() : 0));
-  m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(static_cast<int>(data.layingProcedureType().underlying())));
-  m_ui->cbLayingMethod->setCurrentIndex(m_ui->cbLayingMethod->findData(data.isLaidHidden() ? 1 : 0));
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(data.partyId.has_value() ? data.partyId.get() : 0));
+  m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(static_cast<int>(data.layingProcedureType)));
+  m_ui->cbLayingMethod->setCurrentIndex(m_ui->cbLayingMethod->findData(data.isLaidHidden ? 1 : 0));
 }
 
 
@@ -323,7 +323,7 @@ void MineAreaEdit::getPosition()
   double width = m_ui->sbWidth->value();
 
   int maxSegments = m_segments;
-  if (m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType::LptArtillery)
+  if (m_ui->cbLayingProcedure->currentData().toInt() == static_cast<int>(AesMaLayingProcedureType::LptArtillery))
     maxSegments = 1;
 
   
@@ -370,7 +370,7 @@ bool MineAreaEdit::onResetDusMines()
 {
   return m_requestHelper->startSingleRequest([this]()
   {
-    return m_ftc->mineResetRequest(MineResetRequest(m_aesItem.id(), dds::core::optional<int32_t>()), this);
+    return m_ftc->mineResetRequest(MineResetRequest(m_aesItem.id, dds::core::optional<int32_t>()), this);
   });
 }
 
@@ -402,10 +402,10 @@ bool MineAreaEdit::apply()
     return false;
 
   const double distance = 500.0;
-  const MineAreaModifyRequest req(m_aesItem.id(), name,
-                                  LtsUtils::toOptional(effectStart),
+  const MineAreaModifyRequest req(m_aesItem.id, name,
+                                  LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                   effectDuration,
-                                  m_aesItem.effectSourceId(),
+                                  m_aesItem.effectSourceId,
                                   density,
                                   width,
                                   {chargeTypeId,0,0},
@@ -417,7 +417,7 @@ bool MineAreaEdit::apply()
                                   m_ui->cbEffectMarkingInTa->isChecked(),
                                   m_ui->cbMineAreaInputMode->currentData().toBool(),
                                   distance,
-                                  LtsUtils::toOptional(0LL),
+                                  LtsUtils::toOptional(static_cast<int64_t>(0LL)),
                                   true 
                                  );
 
@@ -429,7 +429,7 @@ bool MineAreaEdit::apply()
 
 void MineAreaEdit::onLayingProcedureChanged()
 {
-  const bool islptArtillery = m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType::LptArtillery;
+  const bool islptArtillery = m_ui->cbLayingProcedure->currentData().toInt() == static_cast<int>(AesMaLayingProcedureType::LptArtillery);
   if (islptArtillery)
     m_pdmGuiIfc->setChargeTypePropertyFilter(m_ui->cbChargeType, QStringLiteral("canBeThrown"), true);
   else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.h
index 341175226..1ea6712ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 
@@ -28,7 +28,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddMineArea") : QStringLiteral("EditMineArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddMineArea") : QStringLiteral("EditMineArea%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin.h
index 7537348e0..e2f45b595 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_mine_area_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_list.h
index ccbfde715..a39811c1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.cpp
index 9f34d00f5..c953bb531 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.cpp
@@ -40,7 +40,7 @@ QVariant MineAreasModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ColWidth:
-    return QLocale().toString(mine.width(), 'f', 2);
+    return QLocale().toString(mine.width, 'f', 2);
   default:
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.h
index 9d02d2474..0d83c053d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_areas_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/CustomView/aes_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/CustomView/aes_mine_corridor.cpp
index b0926dc62..373b22d13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/CustomView/aes_mine_corridor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/CustomView/aes_mine_corridor.cpp
@@ -47,20 +47,20 @@ bool CustomViewMineCorridor::init(const QModelIndex &idx)
 bool CustomViewMineCorridor::calculateIcon(const MineCorridor &corridor, const QColor &color)
 {
   QVector<Database::AesMineCorridorSegment> segments;
-  segments.reserve(corridor.segments().size());
+  segments.reserve(corridor.segments.size());
   int counter = 0;
-  for (const Core::GeoPosition2D &segmentIn : corridor.segments())
+  for (const Core::GeoPosition2D &segmentIn : corridor.segments)
   {
     Database::AesMineCorridorSegment segmentOut;
-    segmentOut.position = QPointF(segmentIn.lon(), segmentIn.lat());
-    segmentOut.mineCorridorId = corridor.id();
+    segmentOut.position = QPointF(segmentIn.lon, segmentIn.lat);
+    segmentOut.mineCorridorId = corridor.id;
     segmentOut.elementNumber = counter;
     segments.append(segmentOut);
     ++counter;
   }
 
-  QPolygonF poly = AreaEffectSimulation::Polygons::mineCorridor(segments, corridor.width());
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(corridor.effectStateId());
+  QPolygonF poly = AreaEffectSimulation::Polygons::mineCorridor(segments, corridor.width);
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(corridor.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp
index bed0d569b..9598800e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp
@@ -76,15 +76,15 @@ void MineCorridorEdit::enableUiElements(bool enable)
   m_ui->pbClear->setEnabled(enable);
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->mineCorridor(m_aesItem.id());
+    auto baseData = m_dtc->mineCorridor(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -133,14 +133,14 @@ void MineCorridorEdit::setData(const MineCorridor &aesItem, bool copy)
   m_aesItem = aesItem;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name()));
-  m_ui->sbWidth->setValue(aesItem.width());
-  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0);
+  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name));
+  m_ui->sbWidth->setValue(aesItem.width);
+  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart.has_value() ? aesItem.effectStart.get() : 0);
 
-  setCoordinates(aesItem.segments());
+  setCoordinates(aesItem.segments);
 }
 
 void MineCorridorEdit::getPolygon()
@@ -184,16 +184,16 @@ bool MineCorridorEdit::apply()
   if (!checkSegementLengths(this))
     return false;
 
-  const MineCorridorModifyRequest req(m_aesItem.id(),
+  const MineCorridorModifyRequest req(m_aesItem.id,
                                       name,
                                       1 * 60 * 1000, 
-                                      m_aesItem.effectSourceId(),
+                                      m_aesItem.effectSourceId,
                                       width,
                                       getCoordinates(),
-                                      LtsUtils::toOptional(effectStart),
+                                      LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                       dds::core::optional<int32_t>(),
                                       dds::core::optional<int32_t>(),
-                                      dds::core::optional<rti::core::int64>());
+                                      dds::core::optional<int64_t>());
 
   return m_requestHelper->startSingleRequest([this, req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.h
index df3fc9701..3651c1168 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 
 class QDoubleSpinBox;
@@ -28,7 +28,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddMineCorridor") : QStringLiteral("EditMineCorridor%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddMineCorridor") : QStringLiteral("EditMineCorridor%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin.h
index e93746875..a13bee725 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_mine_corridor_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_list.h
index 74fa0f02b..73f4b92b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridors_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridors_model.h
index aabd0a144..840907c20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridors_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridors_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_booby_trap.cpp
index 91fda43d3..4b5c7dd5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_booby_trap.cpp
@@ -65,10 +65,10 @@ bool CustomViewBoobyTrap::init(const QModelIndex &idx)
 
 bool CustomViewBoobyTrap::calculateIcon(const BoobyTrap &bt, const QColor &color)
 {
-  QPointF impactPosition = QPointF(bt.impactPosition().lon(), bt.impactPosition().lat());
-  const QPolygonF poly = Polygons::circle(impactPosition, bt.triggerRadius());
+  QPointF impactPosition = QPointF(bt.impactPosition.lon, bt.impactPosition.lat);
+  const QPolygonF poly = Polygons::circle(impactPosition, bt.triggerRadius);
 
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bt.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(bt.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_off_route_mine.cpp
index b16e213ac..67e4084b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CustomView/aes_off_route_mine.cpp
@@ -66,16 +66,16 @@ bool CustomViewOffRouteMine::init(const QModelIndex &idx)
 bool CustomViewOffRouteMine::calculateIcon(const OffRouteMine &orm, const QColor &color)
 {
   Database::AesOffRouteMine ormOut;
-  ormOut.id = orm.id();
-  ormOut.chargeTypeId = orm.chargeStruct().chargeTypeId();
-  ormOut.effectStart = QDateTime::fromMSecsSinceEpoch(orm.effectStart().is_set() ? orm.effectStart().get() : 0);
-  ormOut.impactPosition = QPointF(orm.area().cornerBottomLeft().lon(), orm.area().cornerBottomLeft().lat());
-  if (orm.impactRadius().is_set())
-    ormOut.impactRadius = orm.impactRadius().get();
+  ormOut.id = orm.id;
+  ormOut.chargeTypeId = orm.chargeStruct.chargeTypeId;
+  ormOut.effectStart = QDateTime::fromMSecsSinceEpoch(orm.effectStart.has_value() ? orm.effectStart.get() : 0);
+  ormOut.impactPosition = QPointF(orm.area.cornerBottomLeft.lon, orm.area.cornerBottomLeft.lat);
+  if (orm.impactRadius.has_value())
+    ormOut.impactRadius = orm.impactRadius.get();
 
   const QPolygonF poly = AreaEffectSimulation::Polygons::offRouteMineArea(ormOut);
 
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(orm.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(orm.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
index 393215aa8..03fd4b8fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
@@ -4,7 +4,7 @@
 #include "aes_booby_trap_info.h"
 #include "ui_aes_booby_trap_info.h"
 
-#include <AreaEffectSimulation/Base/InfoView/aes_base_info.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/QDateTime>
@@ -33,9 +33,9 @@ bool BoobyTrapInfo::setData(const BoobyTrap *item)
 {
   m_ui->wBaseData->setData(item);
 
-  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius()));
-  m_ui->lblTriggerRadius->setText(QString::number(item->triggerRadius()));
-  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition().lon(), item->impactPosition().lat()));
+  m_ui->lblImpactRadius->setText(QString::number(item->impactRadius));
+  m_ui->lblTriggerRadius->setText(QString::number(item->triggerRadius));
+  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->impactPosition.lon, item->impactPosition.lat));
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
index 55e844615..db2535564 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
@@ -4,7 +4,7 @@
 #include "aes_off_route_mine_info.h"
 #include "ui_aes_off_route_mine_info.h"
 
-#include <AreaEffectSimulation/Base/InfoView/aes_base_info.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/QDateTime>
@@ -34,7 +34,7 @@ bool OffRouteMineInfo::setData(const OffRouteMine *item)
   m_ui->wBaseData->setData(item);
 
   
-  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->area().cornerBottomLeft().lon(), item->area().cornerBottomLeft().lat()));
+  m_ui->lblImpactPosition->setText(LtsCoordTrans::mgrsFromGeographic(item->area.cornerBottomLeft.lon, item->area.cornerBottomLeft.lat));
   return true;
 }
 void OffRouteMineInfo::init(LtsSession::LtsSession *session)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp
index ec53e64be..b7ed61563 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp
@@ -126,15 +126,15 @@ void BoobyTrapEdit::enableUiElements(bool enable)
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
 
   m_ui->pbClear->setEnabled(enable);
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->boobyTrap(m_aesItem.id());
+    auto baseData = m_dtc->boobyTrap(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -224,29 +224,29 @@ void BoobyTrapEdit::setData(const BoobyTrap &bt, bool copy)
   m_aesItem = bt;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(bt.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(bt.effectStart().is_set() ? bt.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(bt.chargeStruct().chargeTypeId()));
-  s_lastChargeTypeBoobyTrap = bt.chargeStruct().chargeTypeId();
-  m_ui->sbDurationHours->setValue(bt.effectDuration() / 1000 / 60/ 60); 
-  m_ui->sbTriggerRadius->setValue(bt.triggerRadius());
-  m_ui->sbImpactRadius->setValue(bt.impactRadius());
+  m_ui->leIdentifier->setText(QString::fromStdString(bt.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(bt.effectStart.has_value() ? bt.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(bt.chargeStruct.chargeTypeId));
+  s_lastChargeTypeBoobyTrap = bt.chargeStruct.chargeTypeId;
+  m_ui->sbDurationHours->setValue(bt.effectDuration / 1000 / 60/ 60); 
+  m_ui->sbTriggerRadius->setValue(bt.triggerRadius);
+  m_ui->sbImpactRadius->setValue(bt.impactRadius);
 
-  if (bt.rotationAngle().is_set())
+  if (bt.rotationAngle.has_value())
   {
     
-    m_ui->rotationAngleEdit->setValue(bt.rotationAngle().get(), LtsAngleEditBase::AngleUnitType::Deg);
+    m_ui->rotationAngleEdit->setValue(bt.rotationAngle.get(), LtsAngleEditBase::AngleUnitType::Deg);
   }
 
-  if (bt.centralAngle().is_set())
-    m_ui->sbCentralAngle->setValue(bt.centralAngle().get());
+  if (bt.centralAngle.has_value())
+    m_ui->sbCentralAngle->setValue(bt.centralAngle.get());
 
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(bt.partyId().is_set() ? bt.partyId().get() : 0));
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(bt.partyId.has_value() ? bt.partyId.get() : 0));
 
-  QPointF impactPosition(bt.impactPosition().lon(), bt.impactPosition().lat());
+  QPointF impactPosition(bt.impactPosition.lon, bt.impactPosition.lat);
   if (!impactPosition.isNull())
     m_ui->positionEdit->setCoordinate(impactPosition);
 }
@@ -424,7 +424,7 @@ bool BoobyTrapEdit::apply()
   QPointF p(m_ui->positionEdit->coordinate());
   const Core::GeoPosition2D pos(p.x(), p.y());
 
-  BoobyTrapModifyRequest req(m_aesItem.id(),
+  BoobyTrapModifyRequest req(m_aesItem.id,
                                          name,
                                          duration,
                                          chargeType,
@@ -433,7 +433,7 @@ bool BoobyTrapEdit::apply()
                                          triggerRadius,
                                          dds::core::optional<double>(),
                                          dds::core::optional<double>(),
-                                         LtsUtils::toOptional(effectStart),
+                                         LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                          LtsUtils::toOptional(partyId)
                                          );
 
@@ -443,9 +443,9 @@ bool BoobyTrapEdit::apply()
     double rotValue = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(),
                                                                      LtsAngleEditBase::AngleUnitType::Deg,
                                                                      m_ui->rotationAngleEdit->getAngleCurrentUnit());
-    req.rotationAngle().set(rotValue);
+    req.rotationAngle.set(rotValue);
 
-    req.centralAngle().set(m_ui->sbCentralAngle->value());
+    req.centralAngle.set(m_ui->sbCentralAngle->value());
   }
 
   m_requestHelper->addRequest([this,req]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.h
index bec6fbf80..4db1e6253 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <LtsWidgets/lts_angle_edit.h>
 
@@ -30,7 +30,7 @@ public:
 
   QString dialogIdentifier() const override
   {    
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddBoobyTrap") : QStringLiteral("EditBoobyTrap%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddBoobyTrap") : QStringLiteral("EditBoobyTrap%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_list.h
index 5d7fb1934..55049e101 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.cpp
index 34bf2bb00..c1f6c7a27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.cpp
@@ -37,20 +37,20 @@ QVariant BoobyTrapModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ColTriggerRadius:
-    return QLocale().toString(bt.triggerRadius(), 'f', 2);
+    return QLocale().toString(bt.triggerRadius, 'f', 2);
   case ColImpactRadius:
-    return QLocale().toString(bt.impactRadius(), 'f', 2);
+    return QLocale().toString(bt.impactRadius, 'f', 2);
   case ColRotationAngle:
   {
-    if (bt.rotationAngle().is_set())
-      return QLocale().toString(bt.rotationAngle().get(), 'f', 2);
+    if (bt.rotationAngle.has_value())
+      return QLocale().toString(bt.rotationAngle.get(), 'f', 2);
     else
       return {};
   }
   case ColCentralAngle:
   {
-    if (bt.centralAngle().is_set())
-      return QLocale().toString(bt.centralAngle().get(), 'f', 2);
+    if (bt.centralAngle.has_value())
+      return QLocale().toString(bt.centralAngle.get(), 'f', 2);
     else
       return {};
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
index 4f7e0bab1..5ac005716 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QtCore/QSet>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin.h
index fa25b721c..36cfbbe84 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_mine_single_virtual_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
index dc15b6978..35288b4b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
@@ -176,15 +176,15 @@ void OffRouteMineEdit::enableUiElements(bool enable)
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
 
   m_ui->pbClear->setEnabled(enable);
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->offRouteMine(m_aesItem.id());
+    auto baseData = m_dtc->offRouteMine(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -248,34 +248,34 @@ void OffRouteMineEdit::setData(const OffRouteMine &orm, bool copy)
   m_aesItem = orm;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  const Area &area = orm.area();
-  if (!qFuzzyCompare(area.cornerBottomLeft().lon(), 0) ||
-        !qFuzzyCompare(area.cornerBottomLeft().lat(), 0))
+  const Area &area = orm.area;
+  if (!qFuzzyCompare(area.cornerBottomLeft.lon, 0) ||
+        !qFuzzyCompare(area.cornerBottomLeft.lat, 0))
   {
-    QPointF bottomCenter = bottomLeftToBottomCenterToGeo(QPointF(orm.area().cornerBottomLeft().lon(), orm.area().cornerBottomLeft().lat()),
-                                                         area.width(), area.rotation());
+    QPointF bottomCenter = bottomLeftToBottomCenterToGeo(QPointF(orm.area.cornerBottomLeft.lon, orm.area.cornerBottomLeft.lat),
+                                                         area.width, area.rotation);
     m_ui->positionEdit->setCoordinate(bottomCenter);
   }
 
-  m_ui->leIdentifier->setText(QString::fromStdString(orm.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(orm.effectStart().is_set() ? orm.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(orm.chargeStruct().chargeTypeId()));
-  s_lastChargeTypeOffRouteMine = orm.chargeStruct().chargeTypeId();
-  m_ui->sbDurationHours->setValue(orm.effectDuration() / 1000 / 60/ 60); 
-  if (orm.impactRadius().is_set())
-    m_ui->sbImpactRadius->setValue(orm.impactRadius().get());
+  m_ui->leIdentifier->setText(QString::fromStdString(orm.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(orm.effectStart.has_value() ? orm.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(orm.chargeStruct.chargeTypeId));
+  s_lastChargeTypeOffRouteMine = orm.chargeStruct.chargeTypeId;
+  m_ui->sbDurationHours->setValue(orm.effectDuration / 1000 / 60/ 60); 
+  if (orm.impactRadius.has_value())
+    m_ui->sbImpactRadius->setValue(orm.impactRadius.get());
 
 
   
-  m_ui->rotationAngleEdit->setValue(area.rotation(), LtsAngleEditBase::AngleUnitType::Deg);
+  m_ui->rotationAngleEdit->setValue(area.rotation, LtsAngleEditBase::AngleUnitType::Deg);
 
-  m_ui->sbDimensionX->setValue(area.width());
-  m_ui->sbDimensionY->setValue(area.height());
+  m_ui->sbDimensionX->setValue(area.width);
+  m_ui->sbDimensionY->setValue(area.height);
 
-  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(orm.partyId().is_set() ? orm.partyId().get() : 0));
+  m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(orm.partyId.has_value() ? orm.partyId.get() : 0));
 
 }
 
@@ -406,9 +406,9 @@ bool OffRouteMineEdit::apply()
   int partyId          = m_ui->cbParty->currentData().toInt();
 
   Area area;
-  area.width()  = m_ui->sbDimensionX->value();
-  area.height() = m_ui->sbDimensionY->value();
-  area.rotation() = rotation;
+  area.width  = m_ui->sbDimensionX->value();
+  area.height = m_ui->sbDimensionY->value();
+  area.rotation = rotation;
 
 
   
@@ -419,20 +419,20 @@ bool OffRouteMineEdit::apply()
                                                                                m_ui->rotationAngleEdit->getAngleCurrentUnit());
 
   QPointF bottomLeftGeo = bottomCenterToBottomLeftGeo(m_ui->positionEdit->coordinate(), width, rotationDeg);
-  area.cornerBottomLeft() = Core::GeoPosition2D(bottomLeftGeo.x(), bottomLeftGeo.y());
+  area.cornerBottomLeft = Core::GeoPosition2D(bottomLeftGeo.x(), bottomLeftGeo.y());
 
-  OffRouteMineModifyRequest req(m_aesItem.id(),
+  OffRouteMineModifyRequest req(m_aesItem.id,
                                          name,
                                          duration,
                                          chargeType,
                                          area,
                                          dds::core::optional<double>(),
-                                         LtsUtils::toOptional(effectStart),
+                                         LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                          LtsUtils::toOptional(partyId)
                                          );
 
   if (chargeType == s_offRouteMine2)
-    req.impactRadius().set(m_ui->sbImpactRadius->value());
+    req.impactRadius.set(m_ui->sbImpactRadius->value());
 
   DEBUG_LOG(m_logger) << " req=" << req;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.h
index 11f8a425d..ec25f6a25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <LtsWidgets/lts_angle_edit.h>
 
@@ -30,7 +30,7 @@ public:
 
   QString dialogIdentifier() const override
   {    
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddOffRouteMine") : QStringLiteral("EditOffRouteMine%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddOffRouteMine") : QStringLiteral("EditOffRouteMine%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_list.h
index 063e11eed..c5d7f96d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.cpp
index eb423a2ae..7590ab194 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.cpp
@@ -38,8 +38,8 @@ QVariant OffRouteMineModel::data(const QModelIndex &index, int role) const
   {
   case ColImpactRadius:
   {
-    if (orm.impactRadius().is_set())
-      return QLocale().toString(orm.impactRadius().get(), 'f', 2);
+    if (orm.impactRadius.has_value())
+      return QLocale().toString(orm.impactRadius.get(), 'f', 2);
     else
       return {};
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
index 1030c8cda..e81c5a5df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QtCore/QSet>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/CustomView/aes_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/CustomView/aes_ncontamination.cpp
index 84e33fde7..3c8732f6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/CustomView/aes_ncontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/CustomView/aes_ncontamination.cpp
@@ -60,15 +60,15 @@ bool CustomViewNContamination::init(const QModelIndex &idx)
 bool CustomViewNContamination::calculateIcon(const NContamination &nContamination, const QColor &color)
 {
   Database::AesNContamination nContaOut;
-  nContaOut.borderLengthInner = nContamination.borderLengthInner();
-  nContaOut.borderLengthOuter = nContamination.borderLengthOuter();
-  nContaOut.impactPosition = QPointF(nContamination.impactPosition().lon(), nContamination.impactPosition().lat());
-  nContaOut.impactRadius = nContamination.impactRadius();
-  nContaOut.rotationAngle = nContamination.rotationAngle();
-  nContaOut.spanAngle = nContamination.spanAngle();
+  nContaOut.borderLengthInner = nContamination.borderLengthInner;
+  nContaOut.borderLengthOuter = nContamination.borderLengthOuter;
+  nContaOut.impactPosition = QPointF(nContamination.impactPosition.lon, nContamination.impactPosition.lat);
+  nContaOut.impactRadius = nContamination.impactRadius;
+  nContaOut.rotationAngle = nContamination.rotationAngle;
+  nContaOut.spanAngle = nContamination.spanAngle;
 
   QPolygonF poly = AreaEffectSimulation::Polygons::nContamination(nContaOut);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(nContamination.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(nContamination.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp
index 328748634..349ebce8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp
@@ -63,7 +63,7 @@ NContaminationEdit::NContaminationEdit(const QString &menuGroup, QWidget *parent
   s_stepDurationMinutes     =    10.0;
 
   m_ui->rotationAngleEdit->initAngleEditWidget(2); 
-  m_ui->cbWeather->setCurrentIndex(AesWeatherSource::AwsNone);
+  m_ui->cbWeather->setCurrentIndex(static_cast<int>(AesWeatherSource::AwsNone));
 
   m_ui->sbRadiusKm->setMinimum(s_minRadiusKm);
   m_ui->sbRadiusKm->setMaximum(s_maxRadiusKm);
@@ -105,9 +105,9 @@ NContaminationEdit::NContaminationEdit(const QString &menuGroup, QWidget *parent
   connect(m_ui->sbRange2Km, &QDoubleSpinBox::editingFinished, this, &NContaminationEdit::correctSpinBoxValue);
   connect(m_ui->sbYield,    &QDoubleSpinBox::editingFinished, this, &NContaminationEdit::correctSpinBoxValue);
 
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsNone), AesWeatherSource::AwsNone);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), AesWeatherSource::AwsStatic);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), AesWeatherSource::AwsDynamic);
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsNone), static_cast<int>(AesWeatherSource::AwsNone));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), static_cast<int>(AesWeatherSource::AwsStatic));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), static_cast<int>(AesWeatherSource::AwsDynamic));
 
   m_ui->lblChargeType->hide();
   m_ui->cbChargeType->hide();
@@ -133,13 +133,13 @@ void NContaminationEdit::onPresetChanged(int id)
     return;
 
   ProjectDataManagement::NuclearPreset ps = m_presets.value(id);
-  if (ps.id() != id)
+  if (ps.id != id)
     return;
 
-  m_ui->sbYield->setValue(ps.detonationValue());
-  m_ui->sbRadiusKm->setValue(ps.impactRadius() / 1000.0);
-  m_ui->sbRange1Km->setValue(ps.borderLengthInner() / 1000.0);
-  m_ui->sbRange2Km->setValue(ps.borderLengthOuter() / 1000.0);
+  m_ui->sbYield->setValue(ps.detonationValue);
+  m_ui->sbRadiusKm->setValue(ps.impactRadius / 1000.0);
+  m_ui->sbRange1Km->setValue(ps.borderLengthInner / 1000.0);
+  m_ui->sbRange2Km->setValue(ps.borderLengthOuter / 1000.0);
 }
 
 void NContaminationEdit::showPreviewObject()
@@ -202,7 +202,7 @@ double NContaminationEdit::spanAngle() const
   double radial2 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(1), LtsAngleEditBase::AngleUnitType::Deg,
                                                               m_ui->rotationAngleEdit->getAngleCurrentUnit()); 
 
-  if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
+  if (m_ui->cbWeather->currentData().toInt() != static_cast<int>(AreaEffectSimulation::AesWeatherSource::AwsNone))
     return radial1;
 
   double spanAngle = radial2 - radial1;
@@ -213,7 +213,7 @@ double NContaminationEdit::spanAngle() const
 
 double NContaminationEdit::rotatianAngle() const
 {
-  if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
+  if (m_ui->cbWeather->currentData().toInt() != static_cast<int>(AreaEffectSimulation::AesWeatherSource::AwsNone))
     return 0.0;
 
   double radial1 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(0), LtsAngleEditBase::AngleUnitType::Deg,
@@ -244,15 +244,15 @@ void NContaminationEdit::enableUiElements(bool enable)
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
   m_ui->cbWeather->setEnabled(enable);
 
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->nContamination(m_aesItem.id());
+    auto baseData = m_dtc->nContamination(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -283,7 +283,7 @@ bool NContaminationEdit::init(int aesItemId, bool copy,
   {
     m_presets = pdmDtc->nuclearPresets();
     for (const ProjectDataManagement::NuclearPreset &preset : std::as_const(m_presets))
-      m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id()), preset.id());
+      m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id), preset.id);
     connect(m_ui->cbStandardValues, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NContaminationEdit::onPresetChanged);
   }
   else
@@ -321,24 +321,24 @@ void NContaminationEdit::setData(const NContamination &contamination, bool copy)
 
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
 
-  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart().is_set() ? contamination.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct().chargeTypeId()));
-  m_ui->cbWeather->setCurrentIndex(m_ui->cbWeather->findData(contamination.weatherSource().underlying()));
+  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart.has_value() ? contamination.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct.chargeTypeId));
+  m_ui->cbWeather->setCurrentIndex(m_ui->cbWeather->findData(static_cast<int>(contamination.weatherSource)));
 
-  const QPointF pos(contamination.impactPosition().lon(), contamination.impactPosition().lat());
+  const QPointF pos(contamination.impactPosition.lon, contamination.impactPosition.lat);
   if (!pos.isNull())
     m_ui->positionEdit->setCoordinate(pos);
 
-  m_ui->sbYield->setValue(contamination.detonationValue());
-  m_ui->sbRange1Km->setValue(contamination.borderLengthInner() / 1000.0);
-  m_ui->sbRange2Km->setValue(contamination.borderLengthOuter() / 1000.0);
-  m_ui->sbRadiusKm->setValue(contamination.impactRadius() / 1000.0);
-  setRadials(contamination.rotationAngle(), contamination.spanAngle());
+  m_ui->sbYield->setValue(contamination.detonationValue);
+  m_ui->sbRange1Km->setValue(contamination.borderLengthInner / 1000.0);
+  m_ui->sbRange2Km->setValue(contamination.borderLengthOuter / 1000.0);
+  m_ui->sbRadiusKm->setValue(contamination.impactRadius / 1000.0);
+  setRadials(contamination.rotationAngle, contamination.spanAngle);
 }
 
 void NContaminationEdit::getPosition()
@@ -388,9 +388,9 @@ bool NContaminationEdit::apply()
   AesWeatherSource weatherSourceId = static_cast<AesWeatherSource>(m_ui->cbWeather->currentData().toInt());
   const QPointF p(m_ui->positionEdit->coordinate());
   const Core::GeoPosition2D pos(p.x(), p.y());
-  const NContaminationModifyRequest req(m_aesItem.id(),
+  const NContaminationModifyRequest req(m_aesItem.id,
                                         name,
-                                        LtsUtils::toOptional(effectStart),
+                                        LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                         duration,
                                         chargeType,
                                         pos,
@@ -403,7 +403,7 @@ bool NContaminationEdit::apply()
                                         weatherSourceId,
                                         LtsUtils::toOptional(partyId),
                                         LtsUtils::toOptional(playerId),
-                                        dds::core::optional<rti::core::int64>());
+                                        dds::core::optional<int64_t>());
 
   return m_requestHelper->startSingleRequest([this, req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.h
index 555718b7a..f13d8a668 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <LtsWidgets/lts_angle_edit.h>
 #include <ProjectDataManagement/pdm.hpp>
@@ -32,7 +32,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddNContamination") : QStringLiteral("EditContamination%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddNContamination") : QStringLiteral("EditContamination%1").arg(m_aesItem.id);
   }
   bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin.h
index ad9b6f57f..0fa974b45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_ncontamination_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_list.h
index 663dcf5f5..2039cee93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontaminations_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontaminations_model.h
index e8338aa7d..2c5226615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontaminations_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontaminations_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/CustomView/aes_technical_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/CustomView/aes_technical_area.cpp
index 77ca84a28..f14fada9b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/CustomView/aes_technical_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/CustomView/aes_technical_area.cpp
@@ -60,13 +60,13 @@ bool CustomViewTechnicalArea::init(const QModelIndex &idx)
 bool CustomViewTechnicalArea::calculateIcon(const AreaEffectSimulation::TechnicalArea &tecArea, const QColor &color)
 {
   Database::AesTechnicalArea tecOut;
-  tecOut.position = QPointF(tecArea.area().cornerBottomLeft().lon(),
-                            tecArea.area().cornerBottomLeft().lat());
-  tecOut.width = tecArea.area().width();
-  tecOut.length = tecArea.area().height();
+  tecOut.position = QPointF(tecArea.area.cornerBottomLeft.lon,
+                            tecArea.area.cornerBottomLeft.lat);
+  tecOut.width = tecArea.area.width;
+  tecOut.length = tecArea.area.height;
 
   QPolygonF poly = AreaEffectSimulation::Polygons::technicalArea(tecOut);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(tecArea.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(tecArea.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp
index 6b1e72da6..7556245e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp
@@ -81,15 +81,15 @@ void TechnicalAreaEdit::enableUiElements(bool enable)
   m_ui->sbWidth->setEnabled(enable);
   m_ui->pbClear->setEnabled(enable);
   m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
   {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
     __unchange__();
   }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
   {
     QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->technicalArea(m_aesItem.id());
+    auto baseData = m_dtc->technicalArea(m_aesItem.id);
     setData(baseData, false);
     __unchange__();
     if (name != m_ui->leIdentifier->text())
@@ -136,19 +136,19 @@ void TechnicalAreaEdit::setData(const TechnicalArea &area, bool copy)
   m_aesItem = area;
   if (copy)
   {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
   }
-  m_ui->leIdentifier->setText(QString::fromStdString(area.name()));
-  m_ui->sbWidth->setValue(area.area().width());
-  m_ui->sbHeight->setValue(area.area().height());
+  m_ui->leIdentifier->setText(QString::fromStdString(area.name));
+  m_ui->sbWidth->setValue(area.area.width);
+  m_ui->sbHeight->setValue(area.area.height);
 
-  QPointF bottomLeft(area.area().cornerBottomLeft().lon(), area.area().cornerBottomLeft().lat());
-  QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area().width(), area.area().height(), 0.0);
+  QPointF bottomLeft(area.area.cornerBottomLeft.lon, area.area.cornerBottomLeft.lat);
+  QPointF centerpoint = Polygons::bottomLeft2CenterPoint(bottomLeft, area.area.width, area.area.height, 0.0);
   if (!centerpoint.isNull())
     m_ui->positionEdit->setCoordinate(centerpoint);
 
-  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(area.type().underlying()));
+  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(static_cast<int>(area.type)));
 }
 
 inline void TechnicalAreaEdit::fillCbx()
@@ -161,9 +161,9 @@ inline void TechnicalAreaEdit::fillCbx()
 
 
   m_ui->cbType->clear();
-  m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatMout), AesTechnicalAreaType::TatMout);
+  m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatMout), static_cast<int>(AesTechnicalAreaType::TatMout));
   if ( enableSoundZones )
-    m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatSoundZone), AesTechnicalAreaType::TatSoundZone);
+    m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatSoundZone), static_cast<int>(AesTechnicalAreaType::TatSoundZone));
   
   
   
@@ -211,7 +211,7 @@ bool TechnicalAreaEdit::apply()
                                                       0.0));
   const Core::GeoPosition2D bottomLeftGeo(bottomLeft.x(), bottomLeft.y());
   const Area                area(bottomLeftGeo, m_ui->sbWidth->value(), m_ui->sbHeight->value(), 0.0);
-  const TechnicalAreaModifyRequest req(m_aesItem.id(),
+  const TechnicalAreaModifyRequest req(m_aesItem.id,
                                        name,
                                        area,
                                        type);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.h
index 3ffb0f5eb..a084e6a82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <QtGui/QPolygonF>
 
@@ -27,7 +27,7 @@ public:
 
   QString dialogIdentifier() const override
   {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddTechnicalArea")  : QStringLiteral("EditTechnicalArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddTechnicalArea")  : QStringLiteral("EditTechnicalArea%1").arg(m_aesItem.id);
   }
   bool init(int areaId, bool copy, LtsSession::LtsSession *session);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_gui_plugin.h
index bbd0f0e2a..3a4e199fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_technical_area_gui_plugin_interface.h"
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_list.h
index 4f4df7c98..1c4c8aac2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_list.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
index eb1ca4585..3dd0060ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
@@ -45,12 +45,12 @@ QVariant TechnicalAreasModel::data(const QModelIndex &idx, int role) const
   if (role == Qt::DisplayRole && idx.column() == BcChargeType)
   {
     const TechnicalArea &ta = m_vecData.at(idx.row());
-    return AreaEffectSimulation::toString(ta.type());
+    return AreaEffectSimulation::toString(ta.type);
   }
   if (role == Qt::DisplayRole && idx.column() == BcEffectState)
   {
     const TechnicalArea &ta = m_vecData.at(idx.row());
-    return AreaEffectSimulation::toString(ta.effectStateId());
+    return AreaEffectSimulation::toString(ta.effectStateId);
   }
   return AesGuiBaseModel::data(idx, role);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.h
index 7b74edf33..50bda06f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp
index 6602e639b..3507b6bcf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp
@@ -6,7 +6,7 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -29,11 +29,12 @@ Core::GeoPosition2D convert(const QPointF& coord)
 
 QPointF convert(const Core::GeoPosition2D& geoPos)
 {
-    return QPointF(geoPos.lon(), geoPos.lat());
+    return QPointF(geoPos.lon, geoPos.lat);
 }
 
 AsmEditTrainingAreaDialog::AsmEditTrainingAreaDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
+      m_logger(getLogger("AssetManangementEditDialog")),
       m_ui(new Ui::AsmEditTrainingAreaDialog), m_requestHelper(new LtsUtils::RequestHelper(this)), m_menuGroup()
 {
     m_ui->setupUi(this);
@@ -79,22 +80,22 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds* session, con
     if (trainingAreaId == 0)
     {
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << " New training area ";
-        ta.id() = 0;
-        ta.name() = QStringLiteral("newArea").toStdString();
-        ta.width() = 12800;
-        ta.height() = 12800;
+        ta.id = 0;
+        ta.name = QStringLiteral("newArea").toStdString();
+        ta.width = 12800;
+        ta.height = 12800;
         m_dialogTitle = tr("New Training Area");
     }
     else
     {
         ta = m_asmDtc->trainingArea(trainingAreaId);
-        if (ta.id() <= 0)
+        if (ta.id <= 0)
         {
             ERROR_LOG(m_logger) << Q_FUNC_INFO << " training area not valid id: " << trainingAreaId;
             return false;
         }
 
-        m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name()));
+        m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name));
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << " edit training area " << trainingAreaId;
     }
 
@@ -108,7 +109,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds* session, con
     {
         m_ui->pbPosition->setEnabled(false);
     }
-    m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name()));
+    m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name));
 
     connect(m_ui->pbClear, &QPushButton::clicked, m_ui->positionEdit, &LtsCoordWidget::LtsCoordWidget::clear);
 
@@ -170,9 +171,9 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF& centerPoint, double wi
     m_ui->positionEdit->setCoordinate(centerPoint.x(), centerPoint.y());
     m_ui->sbWidth->setValue(width);
     m_ui->sbHeight->setValue(height);
-    m_trainingArea.height() = height;
-    m_trainingArea.width() = width;
-    m_trainingArea.bottomLeft() = convert(btmLeft);
+    m_trainingArea.height = height;
+    m_trainingArea.width = width;
+    m_trainingArea.bottomLeft = convert(btmLeft);
 
     DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width
                         << " H: " << height;
@@ -205,9 +206,9 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF& centerPoint)
 
     m_ui->sbWidth->setValue(width);
     m_ui->sbHeight->setValue(height);
-    m_trainingArea.height() = height;
-    m_trainingArea.width() = width;
-    m_trainingArea.bottomLeft() = convert(btmLeft);
+    m_trainingArea.height = height;
+    m_trainingArea.width = width;
+    m_trainingArea.bottomLeft = convert(btmLeft);
 
     DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width
                         << " H: " << height;
@@ -218,9 +219,9 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF& centerPoint)
 void AsmEditTrainingAreaDialog::onEditClicked()
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START Editing..";
-    if (!m_sitMapGuiIfc || m_trainingArea.id() < 0)
+    if (!m_sitMapGuiIfc || m_trainingArea.id < 0)
     {
-        ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc  or trainingArea_id: " << m_trainingArea.id()
+        ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc  or trainingArea_id: " << m_trainingArea.id
                             << " invalid! ";
         return;
     }
@@ -255,9 +256,9 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta)
 {
 
     LtsCoordTrans::UtmCoordinate utmCoordinate =
-        LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat());
+        LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat);
 
-    QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0);
+    QPointF centerPoint = utmCoordinate.geographic((ta.width / 2.0), ta.height / 2.0);
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " coord: x: " << centerPoint.x() << " y: " << centerPoint.y();
 
     return centerPoint;
@@ -279,10 +280,10 @@ bool AsmEditTrainingAreaDialog::apply()
 
     TrainingArea req = m_trainingArea;
 
-    req.name() = m_ui->name_lineEdit->text().toStdString();
-    req.width() = m_ui->sbWidth->value();
-    req.height() = m_ui->sbHeight->value();
-    req.bottomLeft(convert(btmLeft));
+    req.name = m_ui->name_lineEdit->text().toStdString();
+    req.width = m_ui->sbWidth->value();
+    req.height = m_ui->sbHeight->value();
+    req.bottomLeft = convert(btmLeft);
 
     bool success =
         m_requestHelper->startSingleRequest([this, req]() { return m_asmFtc->trainingAreaModifyRequest(req, this); });
@@ -293,13 +294,13 @@ bool AsmEditTrainingAreaDialog::apply()
 
 void AsmEditTrainingAreaDialog::setData()
 {
-    if (m_trainingArea.id() > 0)
+    if (m_trainingArea.id > 0)
     {
-        m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name()));
+        m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name));
         QPointF coord = getCentPos(m_trainingArea);
         m_ui->positionEdit->setCoordinate(coord.x(), coord.y());
-        m_ui->sbWidth->setValue(m_trainingArea.width());
-        m_ui->sbHeight->setValue(m_trainingArea.height());
+        m_ui->sbWidth->setValue(m_trainingArea.width);
+        m_ui->sbHeight->setValue(m_trainingArea.height);
     }
 }
 
@@ -314,14 +315,14 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea& ta)
     AssetManagement::TrainingArea ddsTrainingArea = ta;
 
     LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(
-        ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
-    polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft().lon()), (ddsTrainingArea.bottomLeft().lat())));
+        ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
+    polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft.lon), (ddsTrainingArea.bottomLeft.lat)));
 
-    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width()));
+    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width));
 
-    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height()));
+    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height));
 
-    polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height()));
+    polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height));
 
     return polygonF;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp
index 2975f96ef..1c71174fc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp
@@ -19,8 +19,9 @@ namespace AssetManagement
 {
 
 AsmTrainingAreaDialog::AsmTrainingAreaDialog(const QString& menuGroup, QWidget* parent)
-    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::AsmTrainingAreaDialog),
-      m_session(nullptr), m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this))
+    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_logger(getLogger("AsmTrainingAreaDialog")),
+      m_ui(new Ui::AsmTrainingAreaDialog), m_session(nullptr), m_menuGroup(menuGroup),
+      m_requestHelper(new LtsUtils::RequestHelper(this))
 {
     m_ui->setupUi(this);
     setOnlineHelpFilename(QStringLiteral("Asset_Management-Training_Area"));
@@ -139,15 +140,15 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
         return;
 
     TrainingArea req = m_model->getRowData(indexList.front().row());
-    if (req.id() < 0)
+    if (req.id < 0)
     {
-        ERROR_LOG(m_logger) << Q_FUNC_INFO << " invalid id:bt" << req.id();
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " invalid id:bt" << req.id;
         return;
     }
-    if (!m_viewedTaIds.contains(req.id()))
+    if (!m_viewedTaIds.contains(req.id))
     {
         bool success = m_requestHelper->startSingleRequest(
-            [this, req]() { return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this); });
+            [this, req]() { return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id), this); });
 
         TRACE_LOG(m_logger) << Q_FUNC_INFO << " success = " << success;
     }
@@ -166,13 +167,13 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
     if (indexList.size() == 0)
         return;
     TrainingArea taItem = m_model->getRowData(indexList.front().row());
-    if (taItem.id() < 0)
+    if (taItem.id < 0)
     {
-        ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = " << taItem.id();
+        ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = " << taItem.id;
         return;
     }
 
-    const QString identifier = QStringLiteral("AsmEditTrainingArea_%1").arg(taItem.id());
+    const QString identifier = QStringLiteral("AsmEditTrainingArea_%1").arg(taItem.id);
     if (focusDialog(m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab))
     {
         return;
@@ -180,7 +181,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
 
     AsmEditTrainingAreaDialog* dialog = new AsmEditTrainingAreaDialog(this);
 
-    if (!dialog->init(m_session, taItem.id(), m_sitMapGuiIfc, m_menuGroup))
+    if (!dialog->init(m_session, taItem.id, m_sitMapGuiIfc, m_menuGroup))
     {
         delete dialog;
         return;
@@ -201,14 +202,14 @@ void AsmTrainingAreaDialog::onSelectionChanged()
         return;
 
     AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row());
-    DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: " << taItem.id();
-    if (taItem.id() < 0)
+    DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: " << taItem.id;
+    if (taItem.id < 0)
     {
-        ERROR_LOG(m_logger) << "onEditTrainingArea invalid id" << taItem.id();
+        ERROR_LOG(m_logger) << "onEditTrainingArea invalid id" << taItem.id;
         return;
     }
 
-    m_previewPolygon = getTrainingArea(taItem.id());
+    m_previewPolygon = getTrainingArea(taItem.id);
     showPreviewObject();
 }
 
@@ -229,7 +230,7 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(int trainingAreaId)
         return {};
     }
     const AssetManagement::TrainingArea& ddsTrainingArea = m_asmDtc->trainingArea(trainingAreaId);
-    if (ddsTrainingArea.id() != trainingAreaId)
+    if (ddsTrainingArea.id != trainingAreaId)
     {
         ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
         return {};
@@ -243,14 +244,14 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(const TrainingArea& ddsTraining
     QPolygonF polygonF;
 
     LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(
-        ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
-    polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft().lon()), (ddsTrainingArea.bottomLeft().lat())));
+        ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
+    polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft.lon), (ddsTrainingArea.bottomLeft.lat)));
 
-    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width()));
+    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width));
 
-    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height()));
+    polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height));
 
-    polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height()));
+    polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height));
 
     return polygonF;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp
index 1e95592ff..5ad5d8832 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp
@@ -8,7 +8,7 @@ AsmTrainingAreaDialogModel::AsmTrainingAreaDialogModel(QObject* parent)
           {tr("Id"), tr("Name"), tr("Botton Left x"), tr("Bottom Left y"), tr("Height"), tr("Width")},
 
           parent),
-      m_asmDtc(nullptr)
+      m_logger(getLogger("AsmTrainingAreaDialogModel")), m_asmDtc(nullptr)
 {
 }
 
@@ -45,17 +45,17 @@ QVariant AsmTrainingAreaDialogModel::data(const QModelIndex& index, int role) co
         switch (index.column())
         {
             case Id:
-                return asmTrainingArea.id();
+                return asmTrainingArea.id;
             case Name:
-                return QString::fromStdString(asmTrainingArea.name());
+                return QString::fromStdString(asmTrainingArea.name);
             case BottomLeft_x:
-                return asmTrainingArea.bottomLeft().lon();
+                return asmTrainingArea.bottomLeft.lon;
             case BottomLeft_y:
-                return asmTrainingArea.bottomLeft().lat();
+                return asmTrainingArea.bottomLeft.lat;
             case Height:
-                return asmTrainingArea.height();
+                return asmTrainingArea.height;
             case Width:
-                return asmTrainingArea.width();
+                return asmTrainingArea.width;
         }
     }
     return QVariant();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
index 5fa7c103d..3cc04fd0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
@@ -41,7 +41,7 @@ struct AvsSessionContext::Composite
     , audioPrioObserver(exerciseId_, operatorId, exerciseContextHandle.opmDtc(), exerciseContextHandle.exmDtc())
     , avaComm(NGL::Connections::hostName(NGL::Connections::eConnection::AVS_WORKSTATION), NGL::Connections::port(NGL::Connections::eConnection::AVS_WORKSTATION))
     , avaControl(&avaComm, exerciseContextHandle.streamNameMapping(), PluginSettings::instance()->avaTimeout())
-    , avaSession(&avaControl, exerciseId, QString::fromStdString(operator_.name()), langCode, operator_.audioChannelPriority(), audioPrioObserver.timezone(), guiStyle, PluginSettings::instance()->avaKeepAliveEnabled())
+    , avaSession(&avaControl, exerciseId, QString::fromStdString(operator_.name), langCode, operator_.audioChannelPriority, audioPrioObserver.timezone(), guiStyle, PluginSettings::instance()->avaKeepAliveEnabled())
     , avaState(&avaSession)
     , streamNameMappingToAva(&avaSession, exerciseContextHandle.streamNameMapping())
     , avsMenus(&avaSession, exerciseContextHandle.dtc().get(), exerciseContextHandle.ismDtc(), avaState.rtState())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp
index b5c6e63a6..25dd2c8c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp
@@ -80,12 +80,12 @@ OperatorSettingsObserver::OperatorSettingsObserver(int exerciseId, int operatorI
   Q_ASSERT(exmDtc);
   
   OperatorManagement::User   operator_ = m_opmDtc->user(operatorId);
-  if (operator_.id() == operatorId)
-    m_currentPrio = operator_.audioChannelPriority();
+  if (operator_.id == operatorId)
+    m_currentPrio = operator_.audioChannelPriority;
 
   ExerciseManagement::Exercise   exercise = m_exmDtc->exercise(exerciseId);
-  if (exercise.id() == exerciseId)
-    m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone()));
+  if (exercise.id == exerciseId)
+    m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone));
   
   connect(opmDtc, &OperatorManagement::Interface::Dtc::userChanged, this, &OperatorSettingsObserver::onOperatorChanged);
   connect(exmDtc, &ExerciseManagement::Interface::Dtc::exerciseChanged, this, &OperatorSettingsObserver::onExerciseChanged);
@@ -109,10 +109,10 @@ void OperatorSettingsObserver::onOperatorChanged(const OperatorManagement::User
 
   case DataModification::eModified:
   {
-    if (operator_.id() != m_operatorId)
+    if (operator_.id != m_operatorId)
       return;
     
-    AvaAudioPrio   prio = operator_.audioChannelPriority();
+    AvaAudioPrio   prio = operator_.audioChannelPriority;
     if (prio == m_currentPrio)
       return;
     
@@ -131,13 +131,13 @@ void OperatorSettingsObserver::onOperatorChanged(const OperatorManagement::User
 
 void OperatorSettingsObserver::onExerciseChanged(const ExerciseManagement::Exercise &exercise, DataModification modType)
 {
-  if (exercise.id() != m_exerciseId)
+  if (exercise.id != m_exerciseId)
     return;
 
   switch (modType)
   {
   case DataModification::eModified:
-    m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone()));
+    m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone));
     break;
 
   default:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
index c4553b4c8..c2a126e39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
@@ -51,7 +51,7 @@ void RtProfileObserver::onCnrConfigChanged(const CnrConfig &cnrConfig, DataModif
     return;
   if (!isInProfile(cnrConfig))
     return;
-  m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Cnr, cnrConfig.id(), cnrConfig.radioCircuit()});
+  m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Cnr, cnrConfig.id, cnrConfig.radioCircuit});
 }
 
 void RtProfileObserver::onTvcConfigChanged(const TvcConfig &tvcConfig, DataModification modType)
@@ -60,14 +60,14 @@ void RtProfileObserver::onTvcConfigChanged(const TvcConfig &tvcConfig, DataModif
     return;
   if (!isInProfile(tvcConfig))
     return;
-  m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Tvc, tvcConfig.id(), tvcConfig.radioCircuit()});
+  m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Tvc, tvcConfig.id, tvcConfig.radioCircuit});
 }
 
 void RtProfileObserver::onCnrTvcProfileChanged(const CnrTvcProfile &profile, DataModification modType)
 {
   Q_UNUSED(modType);
 
-  if (profile.exerciseId() != m_exerciseId || profile.operatorId() != m_operatorId)
+  if (profile.exerciseId != m_exerciseId || profile.operatorId != m_operatorId)
     return;
 
   switch (modType)
@@ -95,16 +95,16 @@ QVector<RtState::RadioCircuit> RtProfileObserver::defaultRtChannels() const
   const QMap<int, TvcConfig> tvccs = m_dtc->tvcConfigs();
 
   QVector<RtState::RadioCircuit>   rtChannels;
-  rtChannels.reserve(m_profile->data().size());
-  for (const auto &cnrTvcProfileData : m_profile->data())
+  rtChannels.reserve(m_profile->data.size());
+  for (const auto &cnrTvcProfileData : m_profile->data)
   {
     std::string   circuitName;
-    if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
-      circuitName = cnrcs.value(cnrTvcProfileData.radioCircuitId()).radioCircuit();
+    if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
+      circuitName = cnrcs.value(cnrTvcProfileData.radioCircuitId).radioCircuit;
     else
-      circuitName = tvccs.value(cnrTvcProfileData.radioCircuitId()).radioCircuit();
+      circuitName = tvccs.value(cnrTvcProfileData.radioCircuitId).radioCircuit;
 
-    rtChannels.push_back({cnrTvcProfileData.radioSystemId(), cnrTvcProfileData.radioCircuitId(), circuitName});
+    rtChannels.push_back({cnrTvcProfileData.radioSystemId, cnrTvcProfileData.radioCircuitId, circuitName});
   }
 
   return rtChannels;
@@ -115,7 +115,7 @@ boost::optional<CnrTvcProfile> RtProfileObserver::getProfile() const
   boost::optional<CnrTvcProfile>   foundProfile;
   std::function<bool(const CnrTvcProfile &profile)>   forUserInExercise = [this, &foundProfile] (const CnrTvcProfile &profile)
   {
-    if (profile.exerciseId() != m_exerciseId || profile.operatorId() != m_operatorId)
+    if (profile.exerciseId != m_exerciseId || profile.operatorId != m_operatorId)
       return false;
     foundProfile = profile;
     return true;
@@ -127,12 +127,12 @@ boost::optional<CnrTvcProfile> RtProfileObserver::getProfile() const
 
 bool RtProfileObserver::isInProfile(const CnrConfig &cnrConfig) const
 {
-  return isInProfile(RadioSystem::Cnr, cnrConfig.id());
+  return isInProfile(RadioSystem::Cnr, cnrConfig.id);
 }
 
 bool RtProfileObserver::isInProfile(const TvcConfig &tvcConfig) const
 {
-  return isInProfile(RadioSystem::Tvc, tvcConfig.id());
+  return isInProfile(RadioSystem::Tvc, tvcConfig.id);
 }
 
 bool RtProfileObserver::isInProfile(RadioSystem radioSystem, int32_t id) const
@@ -140,8 +140,8 @@ bool RtProfileObserver::isInProfile(RadioSystem radioSystem, int32_t id) const
   if (!m_profile)
     return false;
 
-  for (const auto &cnrTvcProfileData : m_profile->data())
-    if (cnrTvcProfileData.radioSystemId() == radioSystem && cnrTvcProfileData.radioCircuitId() == id)
+  for (const auto &cnrTvcProfileData : m_profile->data)
+    if (cnrTvcProfileData.radioSystemId == radioSystem && cnrTvcProfileData.radioCircuitId == id)
       return true;
 
   return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
index c3050ed76..2d80bf209 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
@@ -21,12 +21,11 @@ QDataStream& operator>>(QDataStream& ds, StreamData& sd)
 
 AvailStreamsModel::AvailStreamsModel(Interface::Dtc* avmDtc, int32_t exerciseId, QObject* parent)
     : NGLTreeModel(parent, new NGLTreeItem(QVariant()), {tr("Available")}), m_exerciseId(exerciseId), m_avmDtc(avmDtc),
-      m_cnrRoot(new NGLTreeItem(QVariant())), m_tvcRoot(new NGLTreeItem(QVariant())), m_changes(false)
+      m_cnrRoot(new NGLTreeItem(QVariant())), m_tvcRoot(new NGLTreeItem(QVariant())), m_changes(false),
+      m_logger(getLogger("AudioSettingsAvailStreamsModel"))
 {
     Q_ASSERT(avmDtc);
 
-    qRegisterMetaTypeStreamOperators<StreamData>();
-
     setMimeType(StreamData::mimeType());
 
     StreamData data;
@@ -168,7 +167,7 @@ void AvailStreamsModel::insertUpdateData(const T& config, DataModification modTy
     if (modType == DataModification::eModified)
     {
 
-        if (config.exerciseId().is_set() && config.exerciseId().get() != m_exerciseId)
+        if (config.exerciseId.has_value() && config.exerciseId.get() != m_exerciseId)
             action = DataModification::eRemoved;
     }
 
@@ -177,7 +176,7 @@ void AvailStreamsModel::insertUpdateData(const T& config, DataModification modTy
     switch (action)
     {
         case DataModification::eAdded:
-            if (config.exerciseId().is_set() && config.exerciseId().get() != m_exerciseId)
+            if (config.exerciseId.has_value() && config.exerciseId.get() != m_exerciseId)
                 break;
             Q_FALLTHROUGH();
         case DataModification::eModified: {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp
index 52a301ac1..b468a4fd8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp
@@ -17,7 +17,7 @@ namespace AudioVideoManagement
 {
 AudioSettingsDialog::AudioSettingsDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::AudioSettingsDialog),
-      m_requestHelper(new LtsUtils::RequestHelper(this))
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(getLogger("AudioSettingsDialog"))
 {
     m_ui->setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
@@ -111,9 +111,9 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
     switch (modType)
     {
         case DataModification::eRemoved: {
-            Q_ASSERT(m_operatorMap.contains(data.id()));
+            Q_ASSERT(m_operatorMap.contains(data.id));
 
-            if (m_ui->operatorComboBox->currentData().toInt() == data.id())
+            if (m_ui->operatorComboBox->currentData().toInt() == data.id)
             {
                 __unchange__();
                 m_modelAllocated->resetChangeState();
@@ -121,25 +121,25 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
                 m_filterAvailable->invalidate();
             }
 
-            m_operatorMap.remove(data.id());
-            m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id()));
+            m_operatorMap.remove(data.id);
+            m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id));
             break;
         }
 
         case DataModification::eAdded: {
-            Q_ASSERT(!m_operatorMap.contains(data.id()));
-            const QString operatorName = QString::fromStdString(data.name());
-            m_operatorMap.insert(data.id(), operatorName);
-            m_ui->operatorComboBox->addItem(operatorName, data.id());
+            Q_ASSERT(!m_operatorMap.contains(data.id));
+            const QString operatorName = QString::fromStdString(data.name);
+            m_operatorMap.insert(data.id, operatorName);
+            m_ui->operatorComboBox->addItem(operatorName, data.id);
             m_ui->operatorComboBox->model()->sort(0);
             break;
         }
 
         case DataModification::eModified: {
-            Q_ASSERT(m_operatorMap.contains(data.id()));
-            const QString operatorName = QString::fromStdString(data.name());
-            m_operatorMap.insert(data.id(), operatorName);
-            int i = m_ui->operatorComboBox->findData(data.id());
+            Q_ASSERT(m_operatorMap.contains(data.id));
+            const QString operatorName = QString::fromStdString(data.name);
+            m_operatorMap.insert(data.id, operatorName);
+            int i = m_ui->operatorComboBox->findData(data.id);
             Q_ASSERT(i != -1);
             m_ui->operatorComboBox->setItemText(i, operatorName);
             m_ui->operatorComboBox->model()->sort(0);
@@ -150,15 +150,15 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
 
 void AudioSettingsDialog::onCnrTvcProfileChanged(const CnrTvcProfile& data, DataModification modType)
 {
-    if (m_session->exerciseId() == data.exerciseId())
+    if (m_session->exerciseId() == data.exerciseId)
     {
         if (modType == DataModification::eRemoved)
         {
-            m_cnrTvcProfileMap.remove(data.id());
+            m_cnrTvcProfileMap.remove(data.id);
         }
         else
         {
-            m_cnrTvcProfileMap.insert(data.id(), data);
+            m_cnrTvcProfileMap.insert(data.id, data);
             fillOperatorList();
         }
     }
@@ -170,12 +170,12 @@ void AudioSettingsDialog::fillOperatorList()
 
     for (const auto& rc : std::as_const(m_cnrTvcProfileMap))
     {
-        if ((rc.exerciseId() != m_session->exerciseId()) ||
-            (rc.operatorId() != m_ui->operatorComboBox->currentData().toInt()))
+        if ((rc.exerciseId != m_session->exerciseId()) ||
+            (rc.operatorId != m_ui->operatorComboBox->currentData().toInt()))
             continue;
 
-        newStreamData.reserve(rc.data().size());
-        for (const CnrTvcProfileData& profileEntry : rc.data())
+        newStreamData.reserve(rc.data.size());
+        for (const CnrTvcProfileData& profileEntry : rc.data)
             newStreamData += toStreamData(profileEntry);
 
         break;
@@ -264,12 +264,12 @@ bool AudioSettingsDialog::applyRemove()
 
     for (const auto& profile : std::as_const(m_cnrTvcProfileMap))
     {
-        if (profile.operatorId() != m_operatorId)
+        if (profile.operatorId != m_operatorId)
             continue;
-        removeRequest.id(profile.id());
+        removeRequest.id = profile.id;
         break;
     }
-    if (removeRequest.id() <= 0)
+    if (removeRequest.id <= 0)
         return true;
 
     m_requestHelper->startSingleRequest(
@@ -285,23 +285,23 @@ bool AudioSettingsDialog::applyModify()
 
     for (const auto& profile : std::as_const(m_cnrTvcProfileMap))
     {
-        if (profile.operatorId() != m_operatorId)
+        if (profile.operatorId != m_operatorId)
             continue;
-        modifyRequest.id(profile.id());
+        modifyRequest.id = profile.id;
         break;
     }
 
-    modifyRequest.exerciseId(m_session->exerciseId());
-    modifyRequest.operatorId(m_operatorId);
+    modifyRequest.exerciseId = m_session->exerciseId();
+    modifyRequest.operatorId = m_operatorId;
 
     const QVector<StreamData> allocatedList = m_modelAllocated->getStreamDataVector();
-    modifyRequest.data().reserve(allocatedList.size());
+    modifyRequest.data.reserve(allocatedList.size());
     for (const StreamData& stream : allocatedList)
     {
         CnrTvcProfileData circuitData;
-        circuitData.radioSystemId(stream.bIsCnr ? RadioSystem::Cnr : RadioSystem::Tvc);
-        circuitData.radioCircuitId(stream.topicId);
-        modifyRequest.data().push_back(std::move(circuitData));
+        circuitData.radioSystemId = stream.bIsCnr ? RadioSystem::Cnr : RadioSystem::Tvc;
+        circuitData.radioCircuitId = stream.topicId;
+        modifyRequest.data.push_back(std::move(circuitData));
     }
 
     m_requestHelper->startSingleRequest(
@@ -383,18 +383,18 @@ void AudioSettingsDialog::onEntryRemoved(const StreamData& stream)
 
 StreamData AudioSettingsDialog::toStreamData(const CnrTvcProfileData& profileEntry) const
 {
-    int configId = profileEntry.radioCircuitId();
+    int configId = profileEntry.radioCircuitId;
     StreamData streamData;
     streamData.topicId = configId;
 
-    if (profileEntry.radioSystemId() == RadioSystem::Cnr)
+    if (profileEntry.radioSystemId == RadioSystem::Cnr)
     {
-        streamData.name = QString::fromStdString(m_avmDtc->cnrConfig(configId).radioCircuit());
+        streamData.name = QString::fromStdString(m_avmDtc->cnrConfig(configId).radioCircuit);
         streamData.bIsCnr = true;
     }
     else
     {
-        streamData.name = QString::fromStdString(m_avmDtc->tvcConfig(configId).radioCircuit());
+        streamData.name = QString::fromStdString(m_avmDtc->tvcConfig(configId).radioCircuit);
         streamData.bIsCnr = false;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
index e54189453..8ec6b4b2f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
@@ -10,7 +10,8 @@ namespace AudioVideoManagement
 {
 
 AllocatedStreamsModel::AllocatedStreamsModel(QObject* parent)
-    : NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), {tr("Allocated")})
+    : NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), {tr("Allocated")}),
+      m_logger(getLogger("AudioSettingsUsedStreamsModel"))
 {
     setMimeType(StreamData::mimeType());
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
index e2b92f707..18407f7c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
@@ -19,14 +19,14 @@ struct StreamData : boost::totally_ordered<StreamData>
   StreamData() = default;
 
   explicit StreamData(const TvcConfig &tvcConfig)
-    : name(QString::fromStdString(tvcConfig.radioCircuit()))
-    , topicId(tvcConfig.id())
+    : name(QString::fromStdString(tvcConfig.radioCircuit))
+    , topicId(tvcConfig.id)
     , bIsCnr(false)
   {}
 
   explicit StreamData(const CnrConfig &cnrConfig)
-    : name(QString::fromStdString(cnrConfig.radioCircuit()))
-    , topicId(cnrConfig.id())
+    : name(QString::fromStdString(cnrConfig.radioCircuit))
+    , topicId(cnrConfig.id)
     , bIsCnr(true)
   {}
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
index d333a3d43..aca2a8d52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
@@ -21,7 +21,8 @@ AvmSequenceModel::AvmSequenceModel(QObject *parent)
                                                    tr("Speed"),
                                                    tr("Volume"),
                                                    tr("Description")},
-                                                   parent)
+                                                   parent),
+  m_logger(getLogger("AvmSequenceModel"))
 {}
 
 void AvmSequenceModel::setTimezoneHoursOffset(int timezoneHoursOffset)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
index 155be9654..a5e793852 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
@@ -11,6 +11,7 @@
 #include <AudioVideoManagement/avs_dialog.h>
 #include <LtsSession/lts_session_data.h>
 #include <QtCore/QJsonArray>
+#include <QtWidgets/QTreeView>
 #include <TopicEditorBase/topic_previewer.h>
 #include <boost/optional.hpp>
 #include <cmath>
@@ -52,7 +53,8 @@ AvaTimePoint msecsToAvaTimePoint(qint64 msecs)
 
 TopicEditor::TopicEditor(LtsSession::LtsSession* session, const TopicEditorBase::TopicData& data, QWidget* parent)
     : TopicEditorBase::TopicEditor(parent), m_session(session), m_avmDataIfc(nullptr),
-      m_model(new AvmSequenceModel(this)), m_playbackMenu(nullptr), m_ui(new Ui::AVTopicEditor)
+      m_model(new AvmSequenceModel(this)), m_playbackMenu(nullptr), m_ui(new Ui::AVTopicEditor),
+      m_logger(getLogger("TopicEditor"))
 {
     Q_ASSERT(session);
 
@@ -79,7 +81,7 @@ TopicEditor::TopicEditor(LtsSession::LtsSession* session, const TopicEditorBase:
     m_proxyModel->setSourceModel(m_model);
     m_ui->tvSequences->setModel(m_proxyModel);
     connect(m_ui->tvSequences, &QTreeView::doubleClicked, m_ui->tvSequences->selectionModel(),
-            &QItemSelectionModel::select);
+            [this](const QModelIndex &idx) { m_ui->tvSequences->selectionModel()->select(idx, QItemSelectionModel::Toggle); });
 
     connect(m_ui->tvSequences->selectionModel(), &QItemSelectionModel::selectionChanged, this, &TopicEditor::onEnaDisa);
     connect(m_ui->pbDelete, &QToolButton::clicked, this, &TopicEditor::onDeleteSequences);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
index fe27bdb2d..fc55dc8f4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
@@ -14,14 +14,14 @@ namespace
 
 bool isMountingPointOfInterest(const InfrastructureManagement::StructureElement& se, bool isAudio)
 {
-    if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint)
+    if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint)
         return false;
 
-    if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera ||
-        se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera)
+    if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera ||
+        se.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera)
         return true;
 
-    if (isAudio && se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::AnnouncementUnit)
+    if (isAudio && se.mountingPointTypeId == InfrastructureManagement::MountingPointType::AnnouncementUnit)
         return true;
 
     return false;
@@ -47,13 +47,12 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
                                              const std::shared_ptr<InfrastructureManagement::Interface::Dtc>& ismDtc,
                                              LtsSession::LtsSession* session, StreamNameMapping* streamNameMapping,
                                              QObject* parent, bool isAudio)
-    : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), ,
-                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Available Streams")}),
-      m_isAudio(isAudio), m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_session(session), m_streamNameMapping(streamNameMapping)
+    : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), {tr("Available Streams")}), m_isAudio(isAudio),
+      m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_session(session), m_streamNameMapping(streamNameMapping),
+      m_logger(getLogger("AvailableStreamsModel"))
 {
     Q_ASSERT(ismDtc);
     Q_ASSERT(streamNameMapping);
-    qRegisterMetaTypeStreamOperators<StreamModelData>("StreamModelData");
     qRegisterMetaType<StreamModelData>("StreamModelData");
 
     setMimeType(s_MimeType);
@@ -175,7 +174,7 @@ void AvailableStreamsModel::initModel()
     const auto& buildings = m_ismDtc->mainStructureElements();
     for (const auto& building : buildings)
     {
-        for (const auto& mountingPoint : building.elements())
+        for (const auto& mountingPoint : building.elements)
         {
             if (!isMountingPointOfInterest(mountingPoint, m_isAudio))
                 continue;
@@ -183,7 +182,7 @@ void AvailableStreamsModel::initModel()
             bool isMounted = false;
             for (const auto& mountedAsset : mountedAssets)
             {
-                if (mountedAsset.structureElementId() == mountingPoint.id())
+                if (mountedAsset.structureElementId == mountingPoint.id)
                 {
                     isMounted = true;
                     break;
@@ -193,11 +192,11 @@ void AvailableStreamsModel::initModel()
             if (!isMounted)
                 continue;
             StreamModelData item;
-            item.name = m_streamNameMapping->displayName(mountingPoint.id());
-            item.mountingPointId = mountingPoint.id();
+            item.name = m_streamNameMapping->displayName(mountingPoint.id);
+            item.mountingPointId = mountingPoint.id;
             item.isGroup = false;
 
-            if (mountingPoint.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera)
+            if (mountingPoint.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera)
                 toAddIndoor.push_back(item);
             else
                 toAddOutdoor.push_back(item);
@@ -209,12 +208,12 @@ void AvailableStreamsModel::initModel()
         const auto& mvsStreams = m_avmDtc->videoTeams();
         for (const auto& videoTeam : mvsStreams)
         {
-            if (videoTeam.exerciseId() != m_session->exerciseId())
+            if (videoTeam.exerciseId != m_session->exerciseId())
                 continue;
             DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam;
             StreamModelData item;
-            item.name = QString::fromStdString(videoTeam.streamName().c_str());
-            item.mountingPointId = -1 * videoTeam.id();
+            item.name = QString::fromStdString(videoTeam.streamName.c_str());
+            item.mountingPointId = -1 * videoTeam.id;
             item.isGroup = false;
 
             toAddMvs.push_back(item);
@@ -248,22 +247,22 @@ StreamModelData StreamModelData::createFromServiceItem(const AvMenuEntry& entry,
                                                        const QMap<int, VideoTeam>& videoTeamList)
 {
     StreamModelData data;
-    data.id = entry.id();
-    data.parentId = entry.parentId();
-    data.isGroup = entry.isGroup();
-    if (entry.isGroup())
-        data.name = QString::fromStdString(entry.name().get());
+    data.id = entry.id;
+    data.parentId = entry.parentId;
+    data.isGroup = entry.isGroup;
+    if (entry.isGroup)
+        data.name = QString::fromStdString(entry.name.get());
     else
     {
-        if (entry.mountingPointId().is_set() && (entry.mountingPointId().get() > 0))
+        if (entry.mountingPointId.has_value() && (entry.mountingPointId.get() > 0))
         {
-            data.mountingPointId = entry.mountingPointId().get();
-            data.name = streamNameMapping->displayName(entry.mountingPointId().get());
+            data.mountingPointId = entry.mountingPointId.get();
+            data.name = streamNameMapping->displayName(entry.mountingPointId.get());
         }
         else
         {
-            data.mountingPointId = entry.mountingPointId().get();
-            data.name = QString::fromStdString(videoTeamList.value(entry.mountingPointId().get() * -1).streamName());
+            data.mountingPointId = entry.mountingPointId.get();
+            data.name = QString::fromStdString(videoTeamList.value(entry.mountingPointId.get() * -1).streamName);
         }
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp
index 7706a9ba4..91a562243 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp
@@ -15,7 +15,7 @@ namespace AudioVideoManagement
 
 ChooseMenu::ChooseMenu(Interface::Dtc* dtc, AvsMenus* avsMenus, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_dtc(dtc), m_avsMenus(avsMenus),
-      m_ui(new Ui::ChooseMenuStruct)
+      m_ui(new Ui::ChooseMenuStruct), m_logger(getLogger("ChooseMenu"))
 {
     Q_ASSERT(dtc);
     Q_ASSERT(avsMenus);
@@ -47,22 +47,22 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct& data, DataModification mo
     switch (modType)
     {
         case DataModification::eAdded: {
-            if (data.isAudio())
-                m_ui->cbAudio->addItem(QString::fromStdString(data.name()), data.id());
+            if (data.isAudio)
+                m_ui->cbAudio->addItem(QString::fromStdString(data.name), data.id);
             else
-                m_ui->cbVideo->addItem(QString::fromStdString(data.name()), data.id());
+                m_ui->cbVideo->addItem(QString::fromStdString(data.name), data.id);
             break;
         }
 
         case DataModification::eRemoved: {
-            if (data.isAudio())
+            if (data.isAudio)
             {
-                int index = m_ui->cbAudio->findData(data.id());
+                int index = m_ui->cbAudio->findData(data.id);
                 m_ui->cbAudio->removeItem(index);
             }
             else
             {
-                int index = m_ui->cbVideo->findData(data.id());
+                int index = m_ui->cbVideo->findData(data.id);
                 m_ui->cbVideo->removeItem(index);
             }
             break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp
index 15b573410..df5be2230 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_menu_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_avm_menu_edit.h"
 
@@ -13,6 +14,7 @@ MenuEdit::MenuEdit(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ftc(nullptr),
       m_ui(new Ui::MenuEdit), m_availStreamsModel(nullptr), m_usedStreamsModel(nullptr), m_isAudio(false),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -44,8 +46,8 @@ bool MenuEdit::init(LtsSession::LtsSession* session, const std::shared_ptr<Audio
     }
 
     m_ftc = ftc;
-    m_isAudio = ms.isAudio();
-    m_name = QString::fromStdString(ms.name());
+    m_isAudio = ms.isAudio;
+    m_name = QString::fromStdString(ms.name);
 
     m_availStreamsModel = new AvailableStreamsModel(dtc, ismDtc, session, streamNameMapping, this, m_isAudio);
     m_ui->availTreeView->setModel(m_availStreamsModel);
@@ -69,7 +71,7 @@ bool MenuEdit::init(LtsSession::LtsSession* session, const std::shared_ptr<Audio
     else
         setOnlineHelpFilename(QStringLiteral("Situation-Video_Menu"));
 
-    if (ms.id() <= 0)
+    if (ms.id <= 0)
         m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Apply, false);
 
     return true;
@@ -78,7 +80,7 @@ bool MenuEdit::init(LtsSession::LtsSession* session, const std::shared_ptr<Audio
 bool MenuEdit::apply()
 {
     MenuStruct ms = m_usedStreamsModel->getMenuStruct();
-    ms.isAudio(m_isAudio);
+    ms.isAudio = m_isAudio;
 
     bool ret = m_requestHelper->startSingleRequest([this, ms]() { return m_ftc->modifyMenuStructRequest(ms, this); });
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
index 0a824a25d..389eb4cf9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_menu_edit_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_menu_edit.h"
 #include "avm_new_menu_struct.h"
@@ -19,6 +20,7 @@ MenuEditView::MenuEditView(const QString& menuGroup, LtsSession::LtsSession* ses
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup), m_model(nullptr),
       m_isAudio(false), m_dtc(nullptr), m_ftc(nullptr), m_session(session),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::MenuEditView)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -102,8 +104,8 @@ void MenuEditView::onAddMenuStruct()
 
     connect(newDialog, &NewMenuStruct::newName, this, [this](const QString& name) {
         MenuStruct ms;
-        ms.name(name.toStdString());
-        ms.isAudio(m_isAudio);
+        ms.name = name.toStdString();
+        ms.isAudio = m_isAudio;
         MenuEdit* dialog = new MenuEdit(this);
         dialog->init(m_session, m_dtc, m_ftc, m_ismDtc, m_streamNameMapping, ms);
 
@@ -123,15 +125,15 @@ void MenuEditView::onEditMenuStruct()
         return;
 
     AudioVideoManagement::MenuStruct ms = m_model->getRowData(row);
-    ms.isAudio(m_isAudio);
+    ms.isAudio = m_isAudio;
 
     DEBUG_LOG(m_logger) << "---onEditMenuStruct () "
-                        << " id: " << ms.id() << " name: " << ms.name();
+                        << " id: " << ms.id << " name: " << ms.name;
 
     MenuEdit* dialog = new MenuEdit(this);
     dialog->init(m_session, m_dtc, m_ftc, m_ismDtc, m_streamNameMapping, ms);
 
-    addDialog(dialog, m_menuGroup, QLatin1String("avmMenuEdit") + QString::number(ms.id()),
+    addDialog(dialog, m_menuGroup, QLatin1String("avmMenuEdit") + QString::number(ms.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -141,7 +143,7 @@ void MenuEditView::onRemoveMenuStruct()
     if (!idx.isValid())
         return;
     const AudioVideoManagement::MenuStruct ms = m_model->getRowData(idx.row());
-    const Core::RemoveElementRequest req(ms.id());
+    const Core::RemoveElementRequest req(ms.id);
     m_requestHelper->startSingleRequest([req, this]() { return m_ftc->removeMenuStructRequest(req, this); });
 
     if (m_model->rowCount() == 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
index 67c2d5006..aa5d3b6c0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_menu_view_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <FileManagement/flm_translation.h>
 #include <QtCore/QJsonArray>
@@ -13,6 +14,7 @@ namespace AudioVideoManagement
 MenuViewModel::MenuViewModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<AudioVideoManagement::MenuStruct>({tr("Id"), tr("Name")}, parent),
       m_isAudio(false), m_dtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -38,9 +40,9 @@ QVariant MenuViewModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case 0:
-            return ms.id();
+            return ms.id;
         case 1:
-            return QString::fromStdString(ms.name());
+            return QString::fromStdString(ms.name);
         default:
             break;
     }
@@ -51,9 +53,9 @@ QVariant MenuViewModel::data(const QModelIndex& index, int role) const
 bool MenuViewModel::isFiltered(const MenuStruct& data, DataModification modType) const
 {
     Q_UNUSED(modType);
-    if (data.isAudio() != m_isAudio)
+    if (data.isAudio != m_isAudio)
         return true;
-    if (data.isDefault())
+    if (data.isDefault)
         return true;
     return false;
 }
@@ -70,22 +72,22 @@ QByteArray MenuViewModel::modelToJson(int row) const
     const AudioVideoManagement::MenuStruct& menuStruct = m_vecData.at(row);
 
     obj[QStringLiteral("id")] = 0;
-    obj[QStringLiteral("isAudio")] = menuStruct.isAudio();
-    obj[QStringLiteral("isDefault")] = menuStruct.isDefault();
-    obj[QStringLiteral("name")] = QString::fromStdString(menuStruct.name());
+    obj[QStringLiteral("isAudio")] = menuStruct.isAudio;
+    obj[QStringLiteral("isDefault")] = menuStruct.isDefault;
+    obj[QStringLiteral("name")] = QString::fromStdString(menuStruct.name);
 
     QJsonArray arrData;
-    for (const AudioVideoManagement::AvMenuEntry& avMenuEntry : menuStruct.menuEntries())
+    for (const AudioVideoManagement::AvMenuEntry& avMenuEntry : menuStruct.menuEntries)
     {
         QJsonObject innerData;
-        innerData[QStringLiteral("id")] = avMenuEntry.id();
-        innerData[QStringLiteral("isGroup")] = avMenuEntry.isGroup();
-        if (avMenuEntry.mountingPointId().is_set())
-            innerData[QStringLiteral("mountingPointId")] = avMenuEntry.mountingPointId().get();
-        if (avMenuEntry.name().is_set())
-            innerData[QStringLiteral("name")] = QString::fromStdString(avMenuEntry.name().get());
-        innerData[QStringLiteral("parentId")] = avMenuEntry.parentId();
-        innerData[QStringLiteral("rowId")] = avMenuEntry.rowId();
+        innerData[QStringLiteral("id")] = avMenuEntry.id;
+        innerData[QStringLiteral("isGroup")] = avMenuEntry.isGroup;
+        if (avMenuEntry.mountingPointId.has_value())
+            innerData[QStringLiteral("mountingPointId")] = avMenuEntry.mountingPointId.get();
+        if (avMenuEntry.name.has_value())
+            innerData[QStringLiteral("name")] = QString::fromStdString(avMenuEntry.name.get());
+        innerData[QStringLiteral("parentId")] = avMenuEntry.parentId;
+        innerData[QStringLiteral("rowId")] = avMenuEntry.rowId;
 
         arrData += innerData;
     }
@@ -101,31 +103,31 @@ QVector<AudioVideoManagement::MenuStruct> MenuViewModel::jsonToMenuStructs(const
     AudioVideoManagement::MenuStruct menuStruct;
     const QJsonDocument doc(QJsonDocument::fromJson(content));
     const QJsonObject obj(doc.object());
-    menuStruct.id(0);
-    menuStruct.isAudio(obj[QStringLiteral("isAudio")].toBool());
-    menuStruct.isDefault(obj[QStringLiteral("isDefault")].toBool());
-    menuStruct.name(obj[QStringLiteral("name")].toString().toStdString());
+    menuStruct.id = 0;
+    menuStruct.isAudio = obj[QStringLiteral("isAudio")].toBool();
+    menuStruct.isDefault = obj[QStringLiteral("isDefault")].toBool();
+    menuStruct.name = obj[QStringLiteral("name")].toString().toStdString();
 
     const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray());
-    menuStruct.menuEntries().resize(arrEntry.size());
+    menuStruct.menuEntries.resize(arrEntry.size());
     INFO_LOG(m_logger) << "arrEntry.size()=" << arrEntry.size();
     for (int j = 0; j < arrEntry.size(); ++j)
     {
         const QJsonObject objEntry(arrEntry.at(j).toObject());
         AudioVideoManagement::AvMenuEntry avMenuEntry;
 
-        avMenuEntry.id(-10000000 + objEntry[QStringLiteral("id")].toInt());
-        avMenuEntry.isGroup(objEntry[QStringLiteral("isGroup")].toBool());
-        avMenuEntry.mountingPointId(objEntry[QStringLiteral("mountingPointId")].toInt());
+        avMenuEntry.id = -10000000 + objEntry[QStringLiteral("id")].toInt();
+        avMenuEntry.isGroup = objEntry[QStringLiteral("isGroup")].toBool();
+        avMenuEntry.mountingPointId = objEntry[QStringLiteral("mountingPointId")].toInt();
         if (objEntry.contains(QStringLiteral("name")))
-            avMenuEntry.name().set(objEntry[QStringLiteral("name")].toString().toStdString());
+            avMenuEntry.name.set(objEntry[QStringLiteral("name")].toString().toStdString());
         if (objEntry[QStringLiteral("isGroup")].toBool())
-            avMenuEntry.parentId(0);
+            avMenuEntry.parentId = 0;
         else
-            avMenuEntry.parentId(-10000000 + objEntry[QStringLiteral("parentId")].toInt());
-        avMenuEntry.rowId(objEntry[QStringLiteral("rowId")].toInt());
+            avMenuEntry.parentId = -10000000 + objEntry[QStringLiteral("parentId")].toInt();
+        avMenuEntry.rowId = objEntry[QStringLiteral("rowId")].toInt();
 
-        menuStruct.menuEntries()[j] = avMenuEntry;
+        menuStruct.menuEntries[j] = avMenuEntry;
     }
 
     result.append(menuStruct);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp
index 13556f38e..4a08ae060 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_new_menu_struct.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_avm_new_menu_struct.h"
 
 
@@ -13,6 +14,7 @@ namespace AudioVideoManagement
 NewMenuStruct::NewMenuStruct(QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::NewMenuStruct)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Ok)->hide();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
index 314a0ef18..db92cbbd4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_playback_menu.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "TopicEditor/avm_sequence_model.h"
 
@@ -269,6 +270,7 @@ QueryTimeline::QueryTimeline(const AvaStream& stream, const AvaTimePoint& start,
 
 AvmPlaybackMenu::AvmPlaybackMenu(QWidget* parent)
     : QWidget(parent), m_ui(new Ui::Playback), m_requestHelper(new LtsUtils::RequestHelper(this))
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -563,7 +565,7 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession* session, AvaSession* avaSessi
     const QChar tz = LtsUtils::OperatorSettings::getInstance()
                          ->value(QStringLiteral("TimeSettings"), QStringLiteral("TimeZone"), QChar(QLatin1Char('Z')))
                          .toChar();
-    int idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz);
+    int idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz.unicode());
 
     if (idx >= 0)
         m_ui->cbTimeZone->setCurrentIndex(idx);
@@ -1173,41 +1175,41 @@ QString AvmPlaybackMenu::getInternalStreamName() const
 
 void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker& marker)
 {
-    if (marker.id() == 0)
+    if (marker.id == 0)
         return;
 
     QSignalBlocker blocker(m_ui->cbMarkerStreams);
     (void)blocker;
 
     const auto& rowData = marker;
-    DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
-                        << " note = " << QString::fromStdString(rowData.note());
+    DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name)
+                        << " note = " << QString::fromStdString(rowData.note);
 
     bool selectMarkerStream = false;
 
-    for (const MarkerManagement::MarkerDescription& desc : rowData.descriptions())
+    for (const MarkerManagement::MarkerDescription& desc : rowData.descriptions)
     {
-        if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
-            (desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true))
+        if ((desc.markerType == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
+            (desc.markerType == MarkerManagement::MarkerType::Audio && m_isAudio == true))
         {
             m_ui->cbMarkerStreams->clear();
             break;
         }
     }
 
-    for (const MarkerManagement::MarkerDescription& desc : rowData.descriptions())
+    for (const MarkerManagement::MarkerDescription& desc : rowData.descriptions)
     {
-        DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content())
-                            << " desc.markerType()=" << desc.markerType();
-        if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
-            (desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true))
+        DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content)
+                            << " desc.markerType()=" << desc.markerType;
+        if ((desc.markerType == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
+            (desc.markerType == MarkerManagement::MarkerType::Audio && m_isAudio == true))
         {
             AvaStream avaStream;
             avaStream.type = m_isAudio ? AvaStreamType::Audio : AvaStreamType::Video;
             avaStream.source = AvaStreamSource::Server;
 
             AvaStream selectedStream;
-            const QStringList streams(QString::fromStdString(desc.content()).split(QLatin1Char(',')));
+            const QStringList streams(QString::fromStdString(desc.content).split(QLatin1Char(',')));
 
             for (const QString& sr : streams)
             {
@@ -1239,7 +1241,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker& marker)
         }
     }
 
-    qint64 time = rowData.timeStamp() - rowData.timeStampOffset();
+    qint64 time = rowData.timeStamp - rowData.timeStampOffset;
 
     DEBUG_LOG(m_logger) << "marker time: " << time << " ("
                         << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz"))
@@ -1253,7 +1255,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker& marker)
     if (selectMarkerStream)
         onMarkerStreamSelected();
 
-    emit markerSelected(QString::fromStdString(rowData.note()));
+    emit markerSelected(QString::fromStdString(rowData.note));
 
     m_ui->tavIntervals->selectionModel()->clear();
 }
@@ -1288,8 +1290,8 @@ void AvmPlaybackMenu::onSetMarkerClicked()
 
     MarkerManagement::Marker mrk;
     MarkerManagement::MarkerDescription ma;
-    ma.markerType(m_isAudio ? MarkerManagement::MarkerType::Audio : MarkerManagement::MarkerType::Video);
-    auto& descriptions = mrk.descriptions();
+    ma.markerType = m_isAudio ? MarkerManagement::MarkerType::Audio : MarkerManagement::MarkerType::Video;
+    auto& descriptions = mrk.descriptions;
     QStringList streamList;
     streamList.reserve(m_selectedStreams->size());
     const QLatin1Char star = QLatin1Char('*');
@@ -1299,12 +1301,12 @@ void AvmPlaybackMenu::onSetMarkerClicked()
         streamList += stream.internalName;
         streamList.last().append(star);
     }
-    ma.content() = streamList.join(QStringLiteral(", ")).toStdString();
+    ma.content = streamList.join(QStringLiteral(", ")).toStdString();
     descriptions.resize(descriptions.size() + 1, ma);
-    mrk.note(note.toStdString());
-    mrk.timeStamp(m_timeControl->timeMSec());
-    mrk.timeStampOffset(0);
-    mrk.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    mrk.note = note.toStdString();
+    mrk.timeStamp = m_timeControl->timeMSec();
+    mrk.timeStampOffset = 0;
+    mrk.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     m_requestHelper->startSingleRequest([mrk, this]() { return m_mrkDataIfc->setMarker(mrk, this); });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
index 203a8e03a..9a5c633fd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
@@ -168,6 +168,7 @@ class AvmPlaybackMenu : public QWidget, protected MarkerManagement::Interface::F
     void applyAvsVolume();
 
     PlaybackAppHandle m_playbackApp;
+    NGL::INGLLogger& m_logger;
     bool m_isAudio = false;
     StreamNameMapping* m_streamNameMapping = nullptr;
     boost::optional<QString> m_presetStreamName;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.cpp
index e682c3f2b..c1787c942 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "avm_playback_menu_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace AudioVideoManagement
 {
@@ -11,6 +12,7 @@ AvmPlaybackMenuDialog::AvmPlaybackMenuDialog(bool isAudio, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_isAudio(isAudio)
   , m_ui(new Ui::AvmPlaybackMenuDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   if (m_isAudio)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
index 06dc8e2f1..2fd5566b6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
@@ -1,12 +1,14 @@
 
 
 #include "avm_used_streams_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_available_streams_model.h"
 
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <QMimeData>
 #include <QtCore/QSet>
+#include <QtCore/QIODevice>
 #include <nglwidgets/ngltreeitem.h>
 #include <utility>
 
@@ -20,6 +22,7 @@ UsedStreamsModel::UsedStreamsModel(const std::shared_ptr<Interface::Dtc> avmDtc,
     : NGLTreeModel(parent, nullptr, {tr("Streams")}), m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_dummyId(-10000000),
       m_menuStruct(ms), m_streamNameMapping(streamNameMapping)
 
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     Q_ASSERT(streamNameMapping);
     initModel();
@@ -225,21 +228,21 @@ static void getItems(const NGLTreeItem* item, int rowId, int parentId,
         StreamModelData s = item->data().value<StreamModelData>();
 
         AvMenuEntry me;
-        me.id(s.id ? s.id : newId++);
-        me.parentId(parentId);
-        me.isGroup(s.isGroup);
+        me.id = s.id ? s.id : newId++;
+        me.parentId = parentId;
+        me.isGroup = s.isGroup;
         if (s.isGroup)
-            me.name().set(s.name.toStdString());
+            me.name.set(s.name.toStdString());
         else
-            me.mountingPointId(s.mountingPointId);
-        me.rowId(rowId);
+            me.mountingPointId = s.mountingPointId;
+        me.rowId = rowId;
 
         contToAdd.push_back(me);
 
         if (s.isGroup)
         {
             for (int row = 0; row < item->childCount(); ++row)
-                getItems(item->child(row), row + 1, me.id(), contToAdd, newId);
+                getItems(item->child(row), row + 1, me.id, contToAdd, newId);
         }
     }
 }
@@ -247,12 +250,12 @@ static void getItems(const NGLTreeItem* item, int rowId, int parentId,
 MenuStruct UsedStreamsModel::getMenuStruct() const
 {
     MenuStruct ms;
-    ms.id(m_menuStruct.id());
-    ms.name(m_menuStruct.name());
+    ms.id = m_menuStruct.id;
+    ms.name = m_menuStruct.name;
 
     int newId = -10000000;
     for (int row = 0; row < m_rootItem->childCount(); ++row)
-        getItems(m_rootItem->child(row), row + 1, ms.id(), ms.menuEntries(), newId);
+        getItems(m_rootItem->child(row), row + 1, ms.id, ms.menuEntries, newId);
 
     return ms;
 }
@@ -264,22 +267,22 @@ void UsedStreamsModel::insertChildren(NGLTreeItem* parent, int parentId,
     QMap<int, int> rowIds;
     for (const AudioVideoManagement::AvMenuEntry& me : entries)
     {
-        if (me.parentId() != parentId)
+        if (me.parentId != parentId)
             continue;
 
         data.setValue(StreamModelData::createFromServiceItem(me, m_streamNameMapping, m_avmDtc->videoTeams()));
 
         NGLTreeItem* treeItem = new NGLTreeItem(data);
 
-        auto hierIt = rowIds.insert(me.rowId(), me.rowId());
+        auto hierIt = rowIds.insert(me.rowId, me.rowId);
         const int rowToInsert = std::distance(rowIds.begin(), hierIt);
 
         parent->insertChild(rowToInsert, treeItem);
 
-        if (me.isGroup())
+        if (me.isGroup)
         {
-            DEBUG_LOG(m_logger) << "insertChildren" << me.mountingPointId() << me.name();
-            insertChildren(treeItem, me.id(), entries);
+            DEBUG_LOG(m_logger) << "insertChildren" << me.mountingPointId << me.name;
+            insertChildren(treeItem, me.id, entries);
         }
     }
 }
@@ -472,7 +475,7 @@ bool UsedStreamsModel::initModel()
     data.setValue(ms);
     setRootItem(new NGLTreeItem(data));
 
-    insertChildren(m_rootItem, m_menuStruct.id(), m_menuStruct.menuEntries());
+    insertChildren(m_rootItem, m_menuStruct.id, m_menuStruct.menuEntries);
     connect(m_ismDtc.get(), &InfrastructureManagement::Interface::Dtc::mainStructureElementChanged, this,
             &UsedStreamsModel::onDataChanged);
     connect(m_avmDtc.get(), &AudioVideoManagement::Interface::Dtc::videoTeamChanged, this,
@@ -518,7 +521,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
 {
     beginResetModel();
     INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
-                       << " data.elements().size()=" << data.elements().size();
+                       << " data.elements().size()=" << data.elements.size();
 
     switch (modType)
     {
@@ -526,12 +529,12 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
             break;
         case DataModification::eModified:
         case DataModification::eAdded:
-            for (const InfrastructureManagement::StructureElement& se : data.elements())
+            for (const InfrastructureManagement::StructureElement& se : data.elements)
             {
-                INFO_LOG(m_logger) << "se.id()" << se.id() << " se.displayName()" << se.displayName()
+                INFO_LOG(m_logger) << "se.id()" << se.id << " se.displayName()" << se.displayName
                                    << " m_rootItem->childCount()" << m_rootItem->childCount();
-                const QString newName = QString::fromStdString(se.displayName());
-                updateStreamNames(se.id(), newName, m_rootItem);
+                const QString newName = QString::fromStdString(se.displayName);
+                updateStreamNames(se.id, newName, m_rootItem);
             }
     }
     endResetModel();
@@ -551,10 +554,10 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam& data, const DataModific
         case DataModification::eModified:
         case DataModification::eAdded:
 
-            INFO_LOG(m_logger) << "se.id()" << data.id() << " se.displayName()" << data.streamName()
+            INFO_LOG(m_logger) << "se.id()" << data.id << " se.displayName()" << data.streamName
                                << " m_rootItem->childCount()" << m_rootItem->childCount();
-            const QString newName = QString::fromStdString(data.streamName());
-            updateStreamNames(-1 * data.id(), newName, m_rootItem);
+            const QString newName = QString::fromStdString(data.streamName);
+            updateStreamNames(-1 * data.id, newName, m_rootItem);
     }
     endResetModel();
     emit modelDataChanged();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
index 29f94da4a..33d8f954b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
@@ -1,6 +1,7 @@
 
 
 #include "topic_replay.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AudioVideoManagement/ava_control.h>
 #include <AudioVideoManagement/ava_session.h>
@@ -43,6 +44,7 @@ class TopicReplay::ExportScript : public QObject
 };
 
 TopicReplay::TopicReplay(DataInterface* dataIfc, bool isAudio) : m_isAudio(isAudio), m_dataIfc(dataIfc)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
     Q_ASSERT(dataIfc);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
index 2f67144a2..5d1269106 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
@@ -22,8 +22,8 @@ QByteArray cnrConfigVectorToJson(const QVector<CnrConfig> &configVector, int32_t
 
   for (const CnrConfig &config : std::as_const(configVector))
   {
-    if((isGlobal && config.exerciseId().is_set())
-       || (!isGlobal && !config.exerciseId().is_set()))
+    if((isGlobal && config.exerciseId.has_value())
+       || (!isGlobal && !config.exerciseId.has_value()))
      continue;
 
     arr += cnrConfigToJson(config);
@@ -43,12 +43,12 @@ QJsonObject cnrConfigToJson(const CnrConfig &config)
 
   using namespace JsonKeys;
 
-  cnrObj.insert(CALL_SIGN(), QString::fromStdString(config.callSign()));
-  cnrObj.insert(CNR_CHANNEL_ID(), config.cnrChannelId());
-  cnrObj.insert(IS_GLOBAL(), !config.exerciseId().is_set());
-  cnrObj.insert(RADIO_CIRCUIT(), QString::fromStdString(config.radioCircuit()));
-  cnrObj.insert(IS_ACTIVE(), config.isActive());
-  cnrObj.insert(RECORDING(), config.recording());
+  cnrObj.insert(CALL_SIGN(), QString::fromStdString(config.callSign));
+  cnrObj.insert(CNR_CHANNEL_ID(), config.cnrChannelId);
+  cnrObj.insert(IS_GLOBAL(), !config.exerciseId.has_value());
+  cnrObj.insert(RADIO_CIRCUIT(), QString::fromStdString(config.radioCircuit));
+  cnrObj.insert(IS_ACTIVE(), config.isActive);
+  cnrObj.insert(RECORDING(), config.recording);
 
   return cnrObj;
 }
@@ -60,12 +60,12 @@ T jsonToCnr(const QJsonObject &cnrJson)
 
   using namespace JsonKeys ;
 
-  cnrConfigRequest.callSign(cnrJson.value(CALL_SIGN()).toString().toStdString());
-  cnrConfigRequest.cnrChannelId(cnrJson.value(CNR_CHANNEL_ID()).toInt());
-  cnrConfigRequest.id(0);
-  cnrConfigRequest.radioCircuit(cnrJson.value(RADIO_CIRCUIT()).toString().toStdString());
+  cnrConfigRequest.callSign = cnrJson.value(CALL_SIGN()).toString().toStdString();
+  cnrConfigRequest.cnrChannelId = cnrJson.value(CNR_CHANNEL_ID()).toInt();
+  cnrConfigRequest.id = 0;
+  cnrConfigRequest.radioCircuit = cnrJson.value(RADIO_CIRCUIT()).toString().toStdString();
 
-  cnrConfigRequest.recording(cnrJson.value(RECORDING()).toBool());
+  cnrConfigRequest.recording = cnrJson.value(RECORDING()).toBool();
 
   return cnrConfigRequest;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
index ec69a8532..4abf96d45 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_combat_net_radio_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_cnr_json_helper.h"
 #include "avm_combat_net_radio_dialog_model.h"
@@ -20,6 +21,7 @@ namespace AudioVideoManagement
 CombatNetRadioDialog::CombatNetRadioDialog(LtsSession::LtsSession* session, const QString& menuGroup, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(session),
       m_ui(new Ui::CombatNetRadioDialog), m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     setUnchangeable(true);
@@ -128,7 +130,7 @@ void CombatNetRadioDialog::onEditClicked()
     EditCombatNetRadioDialog* dialog = new EditCombatNetRadioDialog(config, m_session->exerciseId(), m_session,
                                                                     m_ppmDtc, m_avmDtc, m_avmFtc, m_exmDtc, this);
 
-    addDialog(dialog, m_menuGroup, QStringLiteral("EditCNRConfig%1").arg(config.id()),
+    addDialog(dialog, m_menuGroup, QStringLiteral("EditCNRConfig%1").arg(config.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -139,7 +141,7 @@ void CombatNetRadioDialog::onRemoveClicked()
     if (!currentIndex.isValid())
         return;
 
-    Core::RemoveElementRequest request(m_model->data(currentIndex, Qt::UserRole).value<CnrConfig>().id());
+    Core::RemoveElementRequest request(m_model->data(currentIndex, Qt::UserRole).value<CnrConfig>().id);
 
     m_requestHelper->startSingleRequest([this, request]() { return m_avmFtc->removeCnrConfigRequest(request, this); });
 }
@@ -157,7 +159,7 @@ void CombatNetRadioDialog::onSelectionChanged()
 
     CnrConfig config = m_model->data(currentIndex, Qt::UserRole).value<CnrConfig>();
     bool enabled =
-        rowSelected && (config.exerciseId().is_set() || m_session->partitionType() == IDL::PartitionType::Global);
+        rowSelected && (config.exerciseId.has_value() || m_session->partitionType() == IDL::PartitionType::Global);
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, enabled);
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, enabled);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
index ceb1fcc2b..75bce6a77 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_combat_net_radio_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_cnr_json_helper.h"
 
@@ -19,6 +20,7 @@ CombatNetRadioDialogModel::CombatNetRadioDialogModel(int32_t exerciseId, QObject
     : LtsAbstractTableModel<CnrConfig>(
           {tr("Channel Number"), tr("Radio Circuit"), tr("Code Word"), tr("Party"), tr("Unit"), tr("Global")}, parent),
       m_exerciseId(exerciseId)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -34,43 +36,43 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex& index, int role) con
         {
             case CHANNEL:
                 INFO_LOG(m_logger) << "CombatNetRadioDialogModel::data role =" << role << " row = " << index.row();
-                return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
+                return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId).name);
             case RADIO_CIRCUIT:
-                return QString::fromStdString(config.radioCircuit());
+                return QString::fromStdString(config.radioCircuit);
             case CALL_SIGN:
-                return QString::fromStdString(config.callSign());
+                return QString::fromStdString(config.callSign);
             case PARTY:
-                if (config.exerciseId().is_set() || config.partyId() > 0)
-                    return ParticipantManagement::trPartyName(m_parties.value(config.partyId()).name());
+                if (config.exerciseId.has_value() || config.partyId > 0)
+                    return ParticipantManagement::trPartyName(m_parties.value(config.partyId).name);
                 else
                     return QStringLiteral("-");
             case UNIT: {
-                if (!config.unitId().is_set())
+                if (!config.unitId.has_value())
                     return {};
-                const int unitId = config.unitId().get();
-                const auto unit = m_units.value(config.unitId().get());
-                if (unit.id() != unitId)
+                const int unitId = config.unitId.get();
+                const auto unit = m_units.value(config.unitId.get());
+                if (unit.id != unitId)
                     return {};
 
-                INFO_LOG(m_logger) << " config.unitId()=" << unitId << " Str=" << unit.name();
+                INFO_LOG(m_logger) << " config.unitId()=" << unitId << " Str=" << unit.name;
 
                 QString unitStr;
-                if (unit.designator().size() > 0)
-                    unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
-                unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
+                if (unit.designator.size() > 0)
+                    unitStr = QString::fromStdString(unit.designator) + QLatin1Char('/');
+                unitStr.append(QString::fromStdString(unit.tacticalIdentifier));
                 INFO_LOG(m_logger) << "unitStr = " << unitStr;
 
                 return unitStr;
             }
             case GLOBAL:
-                return config.exerciseId().is_set() ? tr("No") : tr("Yes");
+                return config.exerciseId.has_value() ? tr("No") : tr("Yes");
         }
     }
     else if (role == Qt::BackgroundRole)
     {
-        if (config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId)
+        if (config.exerciseId.has_value() && config.exerciseId.get() == m_exerciseId)
             return {};
-        if (!config.exerciseId().is_set() && m_exerciseId <= 0)
+        if (!config.exerciseId.has_value() && m_exerciseId <= 0)
             return {};
         return QColor(Qt::gray);
     }
@@ -105,7 +107,7 @@ bool CombatNetRadioDialogModel::onlyGlobals()
 {
     for (const CnrConfig& config : std::as_const(m_vecData))
     {
-        if (config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId)
+        if (config.exerciseId.has_value() && config.exerciseId.get() == m_exerciseId)
             return false;
     }
     return true;
@@ -136,7 +138,7 @@ bool CombatNetRadioDialogFilter::filterAcceptsRow(int sourceRow, const QModelInd
 {
     CnrConfig cnrConfig = m_sourceModel->getRowData(sourceRow);
 
-    if (cnrConfig.exerciseId().is_set() && cnrConfig.exerciseId().get() != m_exerciseId)
+    if (cnrConfig.exerciseId.has_value() && cnrConfig.exerciseId.get() != m_exerciseId)
         return false;
 
     return LtsColumnFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h
index f8e14c5fe..47cdf5560 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h
@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include <cstdint>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
index 2d1614f41..9446d7c8e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_edit_combat_net_radio_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_avm_edit_combat_net_radio_dialog.h"
 
@@ -25,9 +26,9 @@ namespace
 
 CnrConfig toConfig(const ModifyCnrConfigRequest& modifyRequest)
 {
-    return {modifyRequest.id(),           modifyRequest.cnrChannelId(), modifyRequest.exerciseId(),
-            modifyRequest.radioCircuit(), modifyRequest.partyId(),      modifyRequest.unitId(),
-            modifyRequest.recording(),    modifyRequest.callSign(),     false};
+    return {modifyRequest.id,           modifyRequest.cnrChannelId, modifyRequest.exerciseId,
+            modifyRequest.radioCircuit, modifyRequest.partyId,      modifyRequest.unitId,
+            modifyRequest.recording,    modifyRequest.callSign,     false};
 }
 
 const QString& NO_CHANNEL()
@@ -61,9 +62,9 @@ EditCombatNetRadioDialog::EditCombatNetRadioDialog(const CnrConfig& cnrConfig, i
                                                    const std::shared_ptr<Interface::Dtc>& avmDtc,
                                                    const std::shared_ptr<Interface::Ftc>& avmFtc,
                                                    ExerciseManagement::Interface::Dtc* exmDtc, QWidget* parent)
-    : EditCombatNetRadioDialog(cnrConfig.id(), exerciseId, session, ppmDtc, avmDtc, avmFtc, exmDtc, parent)
+    : EditCombatNetRadioDialog(cnrConfig.id, exerciseId, session, ppmDtc, avmDtc, avmFtc, exmDtc, parent)
 {
-    m_channelId = cnrConfig.cnrChannelId();
+    m_channelId = cnrConfig.cnrChannelId;
     m_isGlobal = session->partitionType() == IDL::PartitionType::Global;
     setUiValues(cnrConfig);
 
@@ -79,6 +80,7 @@ EditCombatNetRadioDialog::EditCombatNetRadioDialog(const boost::optional<int32_t
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
       m_ui(new Ui::EditCombatNetRadioDialog), m_id(id), m_exerciseId(exerciseId), m_ppmDtc(ppmDtc), m_avmDtc(avmDtc),
       m_avmFtc(avmFtc), m_exmDtc(exmDtc), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     Q_ASSERT(ppmDtc);
     Q_ASSERT(avmDtc);
@@ -109,19 +111,19 @@ void EditCombatNetRadioDialog::setUiValues(const CnrConfig& cnrConfig)
         setUiValuesForGlobal();
 
     m_ui->chkGlobal->setChecked(m_isGlobal);
-    initCbChannels(cnrConfig.cnrChannelId());
+    initCbChannels(cnrConfig.cnrChannelId);
     bool disableParty =
-        (m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()).frequencyBand() == FrequencyBand::REL) || m_isGlobal;
+        (m_avmDtc->cnrChannel(cnrConfig.cnrChannelId).frequencyBand == FrequencyBand::REL) || m_isGlobal;
     if (!disableParty)
     {
-        m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(cnrConfig.partyId()));
-        int unitId = cnrConfig.unitId().is_set() ? cnrConfig.unitId().get() : 0;
+        m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(cnrConfig.partyId));
+        int unitId = cnrConfig.unitId.has_value() ? cnrConfig.unitId.get() : 0;
         m_ui->cbUnit->setCurrentIndex(m_ui->cbUnit->findData(unitId));
     }
-    m_ui->leCallSign->setText(QString::fromStdString(cnrConfig.callSign()));
-    m_ui->chkRecording->setChecked(cnrConfig.recording());
-    m_ui->leRadioCircuit->setText(QString::fromStdString(cnrConfig.radioCircuit()));
-    onPartyIndexChanged(cnrConfig.partyId());
+    m_ui->leCallSign->setText(QString::fromStdString(cnrConfig.callSign));
+    m_ui->chkRecording->setChecked(cnrConfig.recording);
+    m_ui->leRadioCircuit->setText(QString::fromStdString(cnrConfig.radioCircuit));
+    onPartyIndexChanged(cnrConfig.partyId);
 }
 
 void EditCombatNetRadioDialog::setUiValuesForGlobal()
@@ -139,16 +141,16 @@ ModifyCnrConfigRequest EditCombatNetRadioDialog::createRequest()
 {
     ModifyCnrConfigRequest request;
 
-    request.id(m_id.get_value_or(0));
-    request.callSign(m_ui->leCallSign->text().toStdString());
-    request.cnrChannelId(m_ui->cbChannel->currentData().toInt());
-    request.radioCircuit(m_ui->leRadioCircuit->text().toStdString());
-    request.recording(m_ui->chkRecording->isChecked());
-    request.partyId(m_ui->cbParty->currentData().toInt());
+    request.id = m_id.get_value_or(0);
+    request.callSign = m_ui->leCallSign->text().toStdString();
+    request.cnrChannelId = m_ui->cbChannel->currentData().toInt();
+    request.radioCircuit = m_ui->leRadioCircuit->text().toStdString();
+    request.recording = m_ui->chkRecording->isChecked();
+    request.partyId = m_ui->cbParty->currentData().toInt();
     if (!m_isGlobal)
-        request.exerciseId(m_exerciseId);
+        request.exerciseId = m_exerciseId;
     if (m_ui->cbUnit->currentIndex() > 0)
-        request.unitId().set(m_ui->cbUnit->currentIndex());
+        request.unitId.set(m_ui->cbUnit->currentIndex());
     return request;
 }
 
@@ -158,8 +160,8 @@ bool EditCombatNetRadioDialog::apply()
 
     if (m_ui->cbUnit->currentIndex() > 0)
     {
-        request.unitId().set(m_ui->cbUnit->currentData().toInt());
-        INFO_LOG(m_logger) << "currentIndex=" << m_ui->cbUnit->currentIndex() << " unitId =" << request.unitId().get();
+        request.unitId.set(m_ui->cbUnit->currentData().toInt());
+        INFO_LOG(m_logger) << "currentIndex=" << m_ui->cbUnit->currentIndex() << " unitId =" << request.unitId.get();
     }
 
     return m_requestHelper->startSingleRequest(
@@ -176,7 +178,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession* session)
         ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
 
     for (const ParticipantManagement::Party& party : std::as_const(parties))
-        m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
+        m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name), party.id);
 
     connect(m_ui->cbParty, QOverload<int>::of(&LtsWidgets::LtsComboBox::currentIndexChanged), this,
             &EditCombatNetRadioDialog::onPartyIndexChanged);
@@ -231,44 +233,44 @@ void EditCombatNetRadioDialog::updateFreeChannelsAndTakenNames()
     QMap<int, QString> exerciseNameCache;
     const auto allCnrConfigs = m_avmDtc->cnrConfigs();
     const ExerciseManagement::Exercise ownExercise = m_exmDtc->exercise(m_exerciseId);
-    ExerciseManagement::ExerciseState ownState = m_exmDtc->exercise(m_exerciseId).state();
+    ExerciseManagement::ExerciseState ownState = m_exmDtc->exercise(m_exerciseId).state;
 
     for (const AudioVideoManagement::CnrConfig& cnrConfig : allCnrConfigs)
     {
-        if (m_id.is_initialized() && *m_id == cnrConfig.id())
+        if (m_id.is_initialized() && *m_id == cnrConfig.id)
             continue;
 
-        if (ownExercise.state() == ExerciseManagement::ExerciseState::Created && cnrConfig.exerciseId() != m_exerciseId)
+        if (ownExercise.state == ExerciseManagement::ExerciseState::Created && cnrConfig.exerciseId != m_exerciseId)
         {
-            if (ownExercise.linkedExerciseId() < 1 || cnrConfig.exerciseId() != ownExercise.linkedExerciseId())
+            if (ownExercise.linkedExerciseId < 1 || cnrConfig.exerciseId != ownExercise.linkedExerciseId)
                 continue;
 
-            if (!exerciseNameCache.contains(ownExercise.linkedExerciseId()))
+            if (!exerciseNameCache.contains(ownExercise.linkedExerciseId))
                 exerciseNameCache.insert(
-                    ownExercise.linkedExerciseId(),
-                    QString::fromStdString(m_exmDtc->exercise(ownExercise.linkedExerciseId()).name()));
+                    ownExercise.linkedExerciseId,
+                    QString::fromStdString(m_exmDtc->exercise(ownExercise.linkedExerciseId).name));
 
             channelsToDisable.insert(
-                cnrConfig.cnrChannelId(),
-                tr("(already taken in %1)").arg(exerciseNameCache.value(ownExercise.linkedExerciseId())));
+                cnrConfig.cnrChannelId,
+                tr("(already taken in %1)").arg(exerciseNameCache.value(ownExercise.linkedExerciseId)));
 
             continue;
         }
 
-        if (ownExercise.state() == ExerciseManagement::ExerciseState::Started ||
-            ownExercise.state() == ExerciseManagement::ExerciseState::Paused)
+        if (ownExercise.state == ExerciseManagement::ExerciseState::Started ||
+            ownExercise.state == ExerciseManagement::ExerciseState::Paused)
         {
-            if (cnrConfig.exerciseId().is_set())
+            if (cnrConfig.exerciseId.has_value())
             {
-                int cnrExerciseId = cnrConfig.exerciseId().get();
+                int cnrExerciseId = cnrConfig.exerciseId.get();
 
                 if (exercisesConsider.contains(cnrExerciseId) && cnrExerciseId != m_exerciseId)
                 {
                     if (!exerciseNameCache.contains(cnrExerciseId))
                         exerciseNameCache.insert(cnrExerciseId,
-                                                 QString::fromStdString(m_exmDtc->exercise(cnrExerciseId).name()));
+                                                 QString::fromStdString(m_exmDtc->exercise(cnrExerciseId).name));
 
-                    channelsToDisable.insert(cnrConfig.cnrChannelId(),
+                    channelsToDisable.insert(cnrConfig.cnrChannelId,
                                              tr("(already taken in %1)").arg(exerciseNameCache.value(cnrExerciseId)));
 
                     continue;
@@ -278,36 +280,36 @@ void EditCombatNetRadioDialog::updateFreeChannelsAndTakenNames()
 
         if (!m_isGlobal)
         {
-            if (cnrConfig.exerciseId().is_set() && !exercisesConsider.contains(cnrConfig.exerciseId().get()))
+            if (cnrConfig.exerciseId.has_value() && !exercisesConsider.contains(cnrConfig.exerciseId.get()))
                 continue;
 
-            if (!cnrConfig.exerciseId().is_set() && ownState != ExerciseManagement::ExerciseState::Created)
+            if (!cnrConfig.exerciseId.has_value() && ownState != ExerciseManagement::ExerciseState::Created)
             {
-                channelsToDisable.insert(cnrConfig.cnrChannelId(), tr("(already taken in global exercise)"));
+                channelsToDisable.insert(cnrConfig.cnrChannelId, tr("(already taken in global exercise)"));
 
                 continue;
             }
         }
 
-        if (m_isGlobal && cnrConfig.exerciseId().is_set() && exercisesConsider.contains(cnrConfig.exerciseId().get()))
+        if (m_isGlobal && cnrConfig.exerciseId.has_value() && exercisesConsider.contains(cnrConfig.exerciseId.get()))
         {
-            int exerciseId = cnrConfig.exerciseId().get();
+            int exerciseId = cnrConfig.exerciseId.get();
 
             if (!exerciseNameCache.contains(exerciseId))
-                exerciseNameCache.insert(exerciseId, QString::fromStdString(m_exmDtc->exercise(exerciseId).name()));
+                exerciseNameCache.insert(exerciseId, QString::fromStdString(m_exmDtc->exercise(exerciseId).name));
 
-            channelsToDisable.insert(cnrConfig.cnrChannelId(),
+            channelsToDisable.insert(cnrConfig.cnrChannelId,
                                      tr("(already taken in %1)").arg(exerciseNameCache.value(exerciseId)));
 
             continue;
         }
 
-        if (cnrConfig.exerciseId().is_set() && exercisesIgnore.contains(cnrConfig.exerciseId().get()))
+        if (cnrConfig.exerciseId.has_value() && exercisesIgnore.contains(cnrConfig.exerciseId.get()))
             continue;
 
-        m_takenNames.push_back(QString::fromStdString(cnrConfig.radioCircuit()));
+        m_takenNames.push_back(QString::fromStdString(cnrConfig.radioCircuit));
 
-        freeChannels.removeOne(cnrConfig.cnrChannelId());
+        freeChannels.removeOne(cnrConfig.cnrChannelId);
     }
 
     if (m_id.is_initialized())
@@ -326,8 +328,8 @@ void EditCombatNetRadioDialog::updateCbChannels(QVector<int>&& freeChannels, QMa
     const auto allChannels = m_avmDtc->cnrChannels();
 
     const auto byName = [&allChannels](int leftChannelId, int rightChannelId) {
-        return QLatin1String(allChannels[leftChannelId].name().c_str()) <
-               QLatin1String(allChannels[rightChannelId].name().c_str());
+        return QLatin1String(allChannels[leftChannelId].name.c_str()) <
+               QLatin1String(allChannels[rightChannelId].name.c_str());
     };
     std::sort(freeChannels.begin(), freeChannels.end(), byName);
 
@@ -360,7 +362,7 @@ void EditCombatNetRadioDialog::updateCbChannels(QVector<int>&& freeChannels, QMa
     m_ui->cbChannel->clear();
     for (const auto& channelId : freeChannels)
     {
-        QString channelName = QString::fromStdString(allChannels[channelId].name());
+        QString channelName = QString::fromStdString(allChannels[channelId].name);
 
         if (channelsToDisable.contains(channelId))
         {
@@ -407,23 +409,23 @@ QVector<int> EditCombatNetRadioDialog::exercisesToConsider() const
     QVector<int> toBeConsidered;
     toBeConsidered.reserve(allExercises.size());
 
-    if (!m_isGlobal && currentExercise.state() == ExerciseManagement::ExerciseState::Created)
+    if (!m_isGlobal && currentExercise.state == ExerciseManagement::ExerciseState::Created)
     {
-        toBeConsidered.append(currentExercise.id());
+        toBeConsidered.append(currentExercise.id);
 
-        if (currentExercise.linkedExerciseId() > 0)
-            toBeConsidered.append(currentExercise.linkedExerciseId());
+        if (currentExercise.linkedExerciseId > 0)
+            toBeConsidered.append(currentExercise.linkedExerciseId);
 
         return toBeConsidered;
     }
 
-    if (!m_isGlobal && !isActive(allExercises[m_exerciseId].state()))
+    if (!m_isGlobal && !isActive(allExercises[m_exerciseId].state))
         return {m_exerciseId};
 
     for (const auto& exercise : allExercises)
     {
-        if (isActive(exercise.state()))
-            toBeConsidered.append(exercise.id());
+        if (isActive(exercise.state))
+            toBeConsidered.append(exercise.id);
     }
 
     return toBeConsidered;
@@ -436,19 +438,19 @@ QVector<int> EditCombatNetRadioDialog::exercisesToIgnore() const
     auto canBeIgnored = [this](const ExerciseManagement::Exercise& ex) -> bool {
         if (m_isGlobal)
         {
-            return (ex.state() == ExerciseManagement::ExerciseState::Created ||
-                    ex.state() == ExerciseManagement::ExerciseState::Stopped ||
-                    ex.state() == ExerciseManagement::ExerciseState::Terminated || ex.isDeleted());
+            return (ex.state == ExerciseManagement::ExerciseState::Created ||
+                    ex.state == ExerciseManagement::ExerciseState::Stopped ||
+                    ex.state == ExerciseManagement::ExerciseState::Terminated || ex.isDeleted);
         }
-        return (ex.state() == ExerciseManagement::ExerciseState::Stopped ||
-                ex.state() == ExerciseManagement::ExerciseState::Terminated || ex.isDeleted());
+        return (ex.state == ExerciseManagement::ExerciseState::Stopped ||
+                ex.state == ExerciseManagement::ExerciseState::Terminated || ex.isDeleted);
     };
 
     QVector<int> exercisesToIgnore;
     for (const auto& ex : allExercises)
     {
         if (canBeIgnored(ex))
-            exercisesToIgnore += ex.id();
+            exercisesToIgnore += ex.id;
     }
     return exercisesToIgnore;
 }
@@ -473,17 +475,17 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
     for (const ParticipantManagement::Participant& unit : std::as_const(m_units))
     {
         QString unitStr;
-        if (unit.partyId() == partyId)
+        if (unit.partyId == partyId)
         {
-            if (unit.designator().size() > 0)
+            if (unit.designator.size() > 0)
             {
-                unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
+                unitStr = QString::fromStdString(unit.designator) + QLatin1Char('/');
                 INFO_LOG(m_logger) << "Designator != leer: unitStr = " << unitStr;
             }
-            unitStr += QString::fromStdString(unit.tacticalIdentifier());
-            INFO_LOG(m_logger) << "unitStr =" << unitStr << " id =" << unit.id();
+            unitStr += QString::fromStdString(unit.tacticalIdentifier);
+            INFO_LOG(m_logger) << "unitStr =" << unitStr << " id =" << unit.id;
 
-            m_ui->cbUnit->addItem(unitStr, unit.id());
+            m_ui->cbUnit->addItem(unitStr, unit.id);
         }
     }
 }
@@ -492,7 +494,7 @@ void EditCombatNetRadioDialog::onChannelChanged(int index)
 {
     int channelId = m_ui->cbChannel->itemData(index).toInt();
 
-    bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand() == FrequencyBand::REL) || m_isGlobal;
+    bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand == FrequencyBand::REL) || m_isGlobal;
     m_ui->cbUnit->setDisabled(disableParty);
     m_ui->lbUnit->setDisabled(disableParty);
     m_ui->cbParty->setDisabled(disableParty);
@@ -509,16 +511,16 @@ QByteArray EditCombatNetRadioDialog::cnrConfigRequestToJson()
     ModifyCnrConfigRequest req = createRequest();
 
     QJsonObject obj;
-    obj[QStringLiteral("id")] = req.id();
+    obj[QStringLiteral("id")] = req.id;
     obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio);
-    obj[QStringLiteral("callSign")] = QString::fromStdString(req.callSign());
-    obj[QStringLiteral("cnrChannelId")] = req.cnrChannelId();
-    obj[QStringLiteral("radioCircuit")] = QString::fromStdString(req.radioCircuit());
-    obj[QStringLiteral("recording")] = req.recording();
-    obj[QStringLiteral("partyId")] = req.partyId();
-    obj[QStringLiteral("isGlobal")] = !req.exerciseId().is_set();
-    if (req.unitId().is_set())
-        obj[QStringLiteral("unitId")] = req.unitId().get();
+    obj[QStringLiteral("callSign")] = QString::fromStdString(req.callSign);
+    obj[QStringLiteral("cnrChannelId")] = req.cnrChannelId;
+    obj[QStringLiteral("radioCircuit")] = QString::fromStdString(req.radioCircuit);
+    obj[QStringLiteral("recording")] = req.recording;
+    obj[QStringLiteral("partyId")] = req.partyId;
+    obj[QStringLiteral("isGlobal")] = !req.exerciseId.has_value();
+    if (req.unitId.has_value())
+        obj[QStringLiteral("unitId")] = req.unitId.get();
     QJsonDocument doc(obj);
     return doc.toJson(QJsonDocument::Compact);
 }
@@ -529,16 +531,16 @@ ModifyCnrConfigRequest EditCombatNetRadioDialog::jsonToModifyCnrConfig(const QBy
     const QJsonDocument doc(QJsonDocument::fromJson(content));
     const QJsonObject obj(doc.object());
 
-    result.id(obj[QStringLiteral("id")].toInt());
-    result.callSign(obj[QStringLiteral("callSign")].toString().toStdString());
-    result.cnrChannelId(obj[QStringLiteral("cnrChannelId")].toInt());
-    result.radioCircuit(obj[QStringLiteral("radioCircuit")].toString().toStdString());
-    result.recording(obj[QStringLiteral("recording")].toInt());
-    result.partyId(obj[QStringLiteral("partyId")].toInt());
+    result.id = obj[QStringLiteral("id")].toInt();
+    result.callSign = obj[QStringLiteral("callSign")].toString().toStdString();
+    result.cnrChannelId = obj[QStringLiteral("cnrChannelId")].toInt();
+    result.radioCircuit = obj[QStringLiteral("radioCircuit")].toString().toStdString();
+    result.recording = obj[QStringLiteral("recording")].toInt();
+    result.partyId = obj[QStringLiteral("partyId")].toInt();
     if (!obj.contains(QLatin1String("isGlobal")) || !obj[QLatin1String("isGlobal")].toBool())
-        result.exerciseId(m_exerciseId);
+        result.exerciseId = m_exerciseId;
     if (obj.contains(QStringLiteral("unitId")))
-        result.unitId(obj[QStringLiteral("unitId")].toInt());
+        result.unitId = obj[QStringLiteral("unitId")].toInt();
 
     return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
index cc9794d60..5ad58f3b4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
@@ -9,6 +9,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <QtCore/QString>
 #include <QtCore/QVector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp
index 7180fa1e6..28465b391 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_load_combat_net_radio_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_avm_load_combat_net_radio_dialog.h"
 
 #include "avm_cnr_json_helper.h"
@@ -15,6 +16,7 @@ LoadCombatNetRadioDialog::LoadCombatNetRadioDialog(const QByteArray &data,
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::LoadCombatNetRadioDialog)
   , m_model(new LoadCombatNetRadioDialogModel(data, session))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->dataView->setModel(m_model);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
index 1242d4648..1236c1c82 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_load_combat_net_radio_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_cnr_json_helper.h"
 
@@ -24,6 +25,7 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray& d
     : LtsAbstractTableModel<CnrConfig>(
           {tr("Include"), tr("Channel"), tr("Radio Circuit"), tr("Code Word"), tr("Conflict(s)")}, parent),
       m_exerciseId(session == nullptr ? 0 : session->exerciseId())
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
 
@@ -109,11 +111,11 @@ QVariant LoadCombatNetRadioDialogModel::data(const QModelIndex& index, int role)
             switch (index.column())
             {
                 case CHANNEL:
-                    return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
+                    return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId).name);
                 case RADIO_CIRCUIT:
-                    return QString::fromStdString(config.radioCircuit());
+                    return QString::fromStdString(config.radioCircuit);
                 case CALL_SIGN:
-                    return QString::fromStdString(config.callSign());
+                    return QString::fromStdString(config.callSign);
                 case CONFLICTS:
                     return conflictsText(m_conflicts.at(index.row()));
                 default:
@@ -169,44 +171,44 @@ LoadCombatNetRadioDialogModel::Conflicts LoadCombatNetRadioDialogModel::getConfl
         if (!(conflicts & RADIO_CIRCUIT_TAKEN_IN_OWN_CONFIG) && isRadioCircuitTakenInOwnConfig(config, it.value()))
         {
             conflicts |= RADIO_CIRCUIT_TAKEN_IN_OWN_CONFIG;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & RADIO_CIRCUIT_TAKEN_IN_ANOTHER_EXERCISE) &&
             isRadioCircuitTakenInAnotherExercise(config, it.value()))
         {
             conflicts |= RADIO_CIRCUIT_TAKEN_IN_ANOTHER_EXERCISE;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & CHANNEL_TAKEN_IN_ACTIVE_EXERCISE) && isChannelTakenInActiveExercise(config, it.value()))
         {
             conflicts |= CHANNEL_TAKEN_IN_ACTIVE_EXERCISE;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & CHANNEL_TAKEN_IN_LINKED_EXERCISE) && isChannelTakenInLinkedExercise(config, it.value()))
         {
             conflicts |= CHANNEL_TAKEN_IN_LINKED_EXERCISE;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & CHANNEL_TAKEN_IN_OWN_CONFIG) && isChannelTakenInOwnConfig(config, it.value()))
         {
             conflicts |= CHANNEL_TAKEN_IN_OWN_CONFIG;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & CHANNEL_TAKEN_IN_GLOBAL) && isChannelTakenInGlobal(config, it.value()))
         {
             conflicts |= CHANNEL_TAKEN_IN_GLOBAL;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
 
         if (!(conflicts & RADIO_CIRCUIT_TAKEN_IN_GLOBAL) && isRadioCircuitTakenInGlobal(config, it.value()))
         {
             conflicts |= RADIO_CIRCUIT_TAKEN_IN_GLOBAL;
-            addConflictedCnr(row, it.value().id());
+            addConflictedCnr(row, it.value().id);
         }
     }
 
@@ -253,7 +255,7 @@ bool LoadCombatNetRadioDialogModel::isActiveExercise(int32_t exerciseId) const
 
     using namespace ExerciseManagement;
 
-    ExerciseState exerciseState = m_exercises.value(exerciseId).state();
+    ExerciseState exerciseState = m_exercises.value(exerciseId).state;
 
     return exerciseState == ExerciseState::Started || exerciseState == ExerciseState::Paused;
 }
@@ -273,10 +275,10 @@ bool LoadCombatNetRadioDialogModel::isRadioCircuitTakenInOwnConfig(const CnrConf
                                                                    const CnrConfig& existingConfig) const
 {
     if (m_exerciseId == 0)
-        return !existingConfig.exerciseId().is_set() && existingConfig.radioCircuit() == loadConfig.radioCircuit();
+        return !existingConfig.exerciseId.has_value() && existingConfig.radioCircuit == loadConfig.radioCircuit;
 
-    if (!existingConfig.exerciseId().is_set() || existingConfig.exerciseId().get() != m_exerciseId ||
-        existingConfig.radioCircuit() != loadConfig.radioCircuit())
+    if (!existingConfig.exerciseId.has_value() || existingConfig.exerciseId.get() != m_exerciseId ||
+        existingConfig.radioCircuit != loadConfig.radioCircuit)
         return false;
 
     return true;
@@ -285,9 +287,9 @@ bool LoadCombatNetRadioDialogModel::isRadioCircuitTakenInOwnConfig(const CnrConf
 bool LoadCombatNetRadioDialogModel::isRadioCircuitTakenInAnotherExercise(const CnrConfig& loadConfig,
                                                                          const CnrConfig& existingConfig) const
 {
-    if (!isActiveExercise(m_exerciseId) || !existingConfig.exerciseId().is_set() ||
-        !isActiveExercise(existingConfig.exerciseId().get()) || existingConfig.exerciseId().get() == m_exerciseId ||
-        existingConfig.radioCircuit() != loadConfig.radioCircuit())
+    if (!isActiveExercise(m_exerciseId) || !existingConfig.exerciseId.has_value() ||
+        !isActiveExercise(existingConfig.exerciseId.get()) || existingConfig.exerciseId.get() == m_exerciseId ||
+        existingConfig.radioCircuit != loadConfig.radioCircuit)
         return false;
 
     return true;
@@ -296,10 +298,10 @@ bool LoadCombatNetRadioDialogModel::isRadioCircuitTakenInAnotherExercise(const C
 bool LoadCombatNetRadioDialogModel::isChannelTakenInActiveExercise(const CnrConfig& loadConfig,
                                                                    const CnrConfig& existingConfig) const
 {
-    int32_t exerciseId = existingConfig.exerciseId().is_set() ? existingConfig.exerciseId().get() : 0;
+    int32_t exerciseId = existingConfig.exerciseId.has_value() ? existingConfig.exerciseId.get() : 0;
 
     if (!isActiveExercise(m_exerciseId) || exerciseId == 0 || exerciseId == m_exerciseId ||
-        !isActiveExercise(exerciseId) || existingConfig.cnrChannelId() != loadConfig.cnrChannelId() ||
+        !isActiveExercise(exerciseId) || existingConfig.cnrChannelId != loadConfig.cnrChannelId ||
         !isActiveExercise(exerciseId))
         return false;
 
@@ -309,14 +311,14 @@ bool LoadCombatNetRadioDialogModel::isChannelTakenInActiveExercise(const CnrConf
 bool LoadCombatNetRadioDialogModel::isChannelTakenInLinkedExercise(const CnrConfig& loadConfig,
                                                                    const CnrConfig& existingConfig) const
 {
-    if (m_exerciseId == 0 || m_exercises.value(m_exerciseId).linkedExerciseId() == 0)
+    if (m_exerciseId == 0 || m_exercises.value(m_exerciseId).linkedExerciseId == 0)
         return false;
 
-    int32_t linkedExerciseId = m_exercises.value(m_exerciseId).linkedExerciseId();
+    int32_t linkedExerciseId = m_exercises.value(m_exerciseId).linkedExerciseId;
 
-    int32_t exerciseId = existingConfig.exerciseId().is_set() ? existingConfig.exerciseId().get() : 0;
+    int32_t exerciseId = existingConfig.exerciseId.has_value() ? existingConfig.exerciseId.get() : 0;
 
-    if (exerciseId != linkedExerciseId || existingConfig.cnrChannelId() != loadConfig.cnrChannelId())
+    if (exerciseId != linkedExerciseId || existingConfig.cnrChannelId != loadConfig.cnrChannelId)
         return false;
 
     return true;
@@ -325,16 +327,16 @@ bool LoadCombatNetRadioDialogModel::isChannelTakenInLinkedExercise(const CnrConf
 bool LoadCombatNetRadioDialogModel::isChannelTakenInOwnConfig(const CnrConfig& loadConfig,
                                                               const CnrConfig& existingConfig) const
 {
-    int32_t exerciseId = existingConfig.exerciseId().is_set() ? existingConfig.exerciseId().get() : 0;
+    int32_t exerciseId = existingConfig.exerciseId.has_value() ? existingConfig.exerciseId.get() : 0;
 
-    return existingConfig.cnrChannelId() == loadConfig.cnrChannelId() && exerciseId == m_exerciseId;
+    return existingConfig.cnrChannelId == loadConfig.cnrChannelId && exerciseId == m_exerciseId;
 }
 
 bool LoadCombatNetRadioDialogModel::isChannelTakenInGlobal(const CnrConfig& loadConfig,
                                                            const CnrConfig& existingConfig) const
 {
-    if (!isActiveExercise(m_exerciseId) || m_exerciseId == 0 || existingConfig.exerciseId().is_set() ||
-        existingConfig.cnrChannelId() != loadConfig.cnrChannelId())
+    if (!isActiveExercise(m_exerciseId) || m_exerciseId == 0 || existingConfig.exerciseId.has_value() ||
+        existingConfig.cnrChannelId != loadConfig.cnrChannelId)
         return false;
 
     return true;
@@ -343,8 +345,8 @@ bool LoadCombatNetRadioDialogModel::isChannelTakenInGlobal(const CnrConfig& load
 bool LoadCombatNetRadioDialogModel::isRadioCircuitTakenInGlobal(const CnrConfig& loadConfig,
                                                                 const CnrConfig& existingConfig) const
 {
-    if (!isActiveExercise(m_exerciseId) || m_exerciseId == 0 || existingConfig.exerciseId().is_set() ||
-        existingConfig.radioCircuit() != loadConfig.radioCircuit())
+    if (!isActiveExercise(m_exerciseId) || m_exerciseId == 0 || existingConfig.exerciseId.has_value() ||
+        existingConfig.radioCircuit != loadConfig.radioCircuit)
         return false;
 
     return true;
@@ -397,13 +399,13 @@ QVector<ModifyCnrConfigRequest> LoadCombatNetRadioDialogModel::modifyRequests()
         const CnrConfig& cnrConfig = m_vecData.at(row);
 
         modifyRequestsVec.append({0,
-                                  cnrConfig.cnrChannelId(),
+                                  cnrConfig.cnrChannelId,
                                   exerciseId,
-                                  cnrConfig.radioCircuit(),
-                                  cnrConfig.recording(),
+                                  cnrConfig.radioCircuit,
+                                  cnrConfig.recording,
                                   {},
                                   partyId,
-                                  cnrConfig.callSign()});
+                                  cnrConfig.callSign});
     }
 
     return modifyRequestsVec;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
index bcb17fdd2..61e3c2d2c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_edit_frequency_planning_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_edit_frequency_planning_frequency_data_model.h"
 #include "avm_load_frequency_planning_dialog.h"
@@ -16,6 +17,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <QtWidgets/QTreeView>
@@ -47,13 +49,14 @@ EditFrequencyPlanningDialog::EditFrequencyPlanningDialog(
       m_ppmDtc(ppmDtc), m_ismDtc(ismDtc), m_exmDtc(exmDtc), m_requestHelper(new LtsUtils::RequestHelper(this)),
       m_frequencyDataModel(
           new EditFrequencyPlanningFrequencyDataModel(planning, m_session->exerciseId(), avmDtc, ismDtc, ppmDtc, this)),
-      m_frequencyPlanningId(copy ? 0 : planning.id()), m_exerciseId(session->exerciseId()),
+      m_frequencyPlanningId(copy ? 0 : planning.id), m_exerciseId(session->exerciseId()),
       m_isEdit(EditFrequencyPlanningSetResourceDialog::DialogMode::Assign), m_activeFrequencyPlanningStatus(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
-    m_ui->leName->setText(QString::fromStdString(m_planning.name()));
-    m_ui->lbDate->setText(DTG::toStringMSec(m_planning.date()));
+    m_ui->leName->setText(QString::fromStdString(m_planning.name));
+    m_ui->lbDate->setText(DTG::toStringMSec(m_planning.date));
 
     m_uiRequirements->addRequirement({m_ui->label, [this]() { return !m_ui->leName->text().isEmpty(); }});
 
@@ -138,11 +141,11 @@ bool EditFrequencyPlanningDialog::apply()
     }
     ModifyFrequencyPlanningRequest request = m_frequencyDataModel->modifyFrequencyPlanningRequest();
 
-    request.date(m_session->partitionTime());
-    m_ui->lbDate->setText(DTG::toStringMSec(request.date()));
-    m_planning.date() = request.date();
-    request.id(m_frequencyPlanningId);
-    request.name(m_ui->leName->text().toStdString());
+    request.date = m_session->partitionTime();
+    m_ui->lbDate->setText(DTG::toStringMSec(request.date));
+    m_planning.date = request.date;
+    request.id = m_frequencyPlanningId;
+    request.name = m_ui->leName->text().toStdString();
 
     return m_requestHelper->startSingleRequest(
         [this, request]() { return m_avmFtc->modifyFrequencyPlanningRequest(request, this); });
@@ -157,18 +160,18 @@ void EditFrequencyPlanningDialog::onAddClicked()
         return;
 
     CnrConfig cnrConfigRow = m_frequencyDataModel->itemData(idx).cnrConfig;
-    int cnrConfigId = cnrConfigRow.id();
+    int cnrConfigId = cnrConfigRow.id;
     if (cnrConfigId <= 0)
         return;
 
     DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
-                        << " cnrConfigId: " << cnrConfigId << " radioCircuit: " << cnrConfigRow.radioCircuit()
+                        << " cnrConfigId: " << cnrConfigId << " radioCircuit: " << cnrConfigRow.radioCircuit
                         << " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
 
     FrequencyPlanningData fpd = m_frequencyDataModel->getfrequencyPlanningData(cnrConfigId);
-    if (!fpd.cnrConfigId())
+    if (!fpd.cnrConfigId)
     {
-        fpd.cnrConfigId(cnrConfigId);
+        fpd.cnrConfigId = cnrConfigId;
     }
 
     EditFrequencyPlanningResourceDialog* frequencyPlanningResourceDialog =
@@ -194,7 +197,7 @@ void EditFrequencyPlanningDialog::onRemoveClicked()
         return;
 
     CnrConfig cnrConfigRow = m_frequencyDataModel->itemData(idx).cnrConfig;
-    int cnrConfigId = cnrConfigRow.id();
+    int cnrConfigId = cnrConfigRow.id;
     if (cnrConfigId <= 0)
         return;
     unassignRadioCircuit(cnrConfigId);
@@ -209,17 +212,17 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
 
     auto itemData = m_frequencyDataModel->itemData(idx);
     CnrConfig cnrConfigRow = itemData.cnrConfig;
-    int cnrConfigId = cnrConfigRow.id();
+    int cnrConfigId = cnrConfigRow.id;
     if (cnrConfigId <= 0)
         return;
 
     FrequencyPlanningData fpd = m_frequencyDataModel->getfrequencyPlanningData(cnrConfigId);
 
-    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
 
-    if ((!cnrConfigRow.exerciseId().is_set() && m_planning.exerciseId().is_set()) || itemData.readOnly)
+    if ((!cnrConfigRow.exerciseId.has_value() && m_planning.exerciseId.has_value()) || itemData.readOnly)
     {
         m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Show"));
         m_isEdit = EditFrequencyPlanningSetResourceDialog::DialogMode::Show;
@@ -238,7 +241,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
     }
 
     DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
-                        << " cnrConfigId: " << cnrConfigId << " radioCircuitId: " << cnrConfigRow.radioCircuit();
+                        << " cnrConfigId: " << cnrConfigId << " radioCircuitId: " << cnrConfigRow.radioCircuit;
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove,
                                   !itemData.readOnly &&
@@ -250,7 +253,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
 void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData& fpd)
 {
     DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
-                        << "CnrConfigId: " << fpd.cnrConfigId();
+                        << "CnrConfigId: " << fpd.cnrConfigId;
 
     m_frequencyDataModel->setFrequencyPlanningData(fpd);
 
@@ -288,21 +291,21 @@ QVector<int> EditFrequencyPlanningDialog::otherActiveExercises() const
 {
     const auto allExercises_ = m_exmDtc->exercises();
 
-    Q_ASSERT(::isActive(allExercises_[m_exerciseId].state()));
+    Q_ASSERT(::isActive(allExercises_[m_exerciseId].state));
 
     auto allExercises = allExercises_.values();
     auto newEnd = std::remove_if(allExercises.begin(), allExercises.end(),
-                                 [](const ExerciseManagement::Exercise& ex) { return ex.isDeleted(); });
+                                 [](const ExerciseManagement::Exercise& ex) { return ex.isDeleted; });
     allExercises.erase(newEnd, allExercises.end());
 
     QVector<int> toBeConsidered;
     for (const auto& exercise : std::as_const(allExercises))
     {
-        if (exercise.id() == m_exerciseId)
+        if (exercise.id == m_exerciseId)
             continue;
 
-        if (::isActive(exercise.state()))
-            toBeConsidered.append(exercise.id());
+        if (::isActive(exercise.state))
+            toBeConsidered.append(exercise.id);
     }
     return toBeConsidered;
 }
@@ -315,8 +318,8 @@ QVector<int> EditFrequencyPlanningDialog::otherActivePlans() const
     const auto activePlans = m_avmDtc->activeFrequencyPlannings();
     for (const auto& activePlan : activePlans)
     {
-        if (exercises.contains(activePlan.exerciseId()))
-            result.append(activePlan.frequencyPlanningId());
+        if (exercises.contains(activePlan.exerciseId))
+            result.append(activePlan.frequencyPlanningId);
     }
     return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.h
index a7cb11ada..282eb6b69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
 #include <LtsWidgets/lts_dialog.h>
 
 #include <AudioVideoManagement/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
index 1a26b9f24..7193bb016 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
@@ -1,12 +1,14 @@
 
 
 #include "avm_edit_frequency_planning_frequency_data_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AudioVideoManagement/avm_translation.h>
 #include <FileManagement/flm_translation.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <LtsUtilsCore/json_object.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include <QtCore/QJsonArray>
@@ -23,7 +25,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
                                                                          DataModification dm)
 {
 
-    if (planning.id() != m_initPlan.id() && planning.exerciseId().is_set())
+    if (planning.id != m_initPlan.id && planning.exerciseId.has_value())
         return;
 
     if (dm == DataModification::eRemoved)
@@ -44,24 +46,24 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
         return;
     }
     QHash<int, FrequencyPlanningData> fpdMap;
-    for (const auto& elem : planning.data())
-        fpdMap.insert(elem.cnrConfigId(), elem);
+    for (const auto& elem : planning.data)
+        fpdMap.insert(elem.cnrConfigId, elem);
     for (NGLTreeItem* item : m_rootItem->constChildren())
     {
         if (!item->data().canConvert<ItemData>())
             continue;
 
         ItemData itemData = item->data().value<ItemData>();
-        if (itemData.cnrConfig.exerciseId().is_set() && itemData.cnrConfig.exerciseId().get() != m_exerciseId)
+        if (itemData.cnrConfig.exerciseId.has_value() && itemData.cnrConfig.exerciseId.get() != m_exerciseId)
             continue;
 
-        if (!itemData.cnrConfig.exerciseId().is_set() && 0 != m_exerciseId)
+        if (!itemData.cnrConfig.exerciseId.has_value() && 0 != m_exerciseId)
             continue;
 
-        if (fpdMap.contains(itemData.cnrConfig.id()))
+        if (fpdMap.contains(itemData.cnrConfig.id))
         {
 
-            const FrequencyPlanningData& fpd = fpdMap[itemData.cnrConfig.id()];
+            const FrequencyPlanningData& fpd = fpdMap[itemData.cnrConfig.id];
 
             if (item->childCount())
             {
@@ -73,7 +75,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
             delete itemData.radioCircuit;
             itemData.radioCircuit = nullptr;
 
-            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
             if (circuits.size() > 1)
             {
                 for (RadioCircuit* circuit : std::as_const(circuits))
@@ -88,8 +90,8 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
                 itemData.radioCircuit = circuits[0];
                 item->setData(QVariant::fromValue(itemData));
             }
-            m_frequencyPlanningData[fpd.cnrConfigId()] = fpd;
-            fpdMap.remove(itemData.cnrConfig.id());
+            m_frequencyPlanningData[fpd.cnrConfigId] = fpd;
+            fpdMap.remove(itemData.cnrConfig.id);
         }
         else
         {
@@ -103,7 +105,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
             delete itemData.radioCircuit;
             itemData.radioCircuit = nullptr;
             item->setData(QVariant::fromValue(itemData));
-            m_frequencyPlanningData.remove(itemData.cnrConfig.id());
+            m_frequencyPlanningData.remove(itemData.cnrConfig.id);
         }
     }
 
@@ -140,15 +142,16 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
                        tr("Global"),
                    }),
       m_exerciseId(exerciseId), m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_ppmDtc(ppmDtc), m_initPlan(initPlanning)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     Q_ASSERT(avmDtc);
     Q_ASSERT(ppmDtc);
     DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
 
-    int frequencySetId = initPlanning.frequencySetId();
-    std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
+    int frequencySetId = initPlanning.frequencySetId;
+    std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data;
     for (FrequencySetDataWithId fsd : fsdVec)
-        m_freqSetData.insert(fsd.id(), fsd);
+        m_freqSetData.insert(fsd.id, fsd);
 
     m_units = m_ppmDtc->units();
 
@@ -157,15 +160,15 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
     for (const CnrConfig& cnrConfig : cnrConfigs)
     {
 
-        if (cnrConfig.exerciseId().is_set() && cnrConfig.exerciseId().get() != m_exerciseId)
+        if (cnrConfig.exerciseId.has_value() && cnrConfig.exerciseId.get() != m_exerciseId)
             continue;
         dataVec.append(cnrConfig);
     }
     setCnrConfigs(dataVec);
     m_avmDtc->activeFrequencyPlannings([this](const ActiveFrequencyPlanning& afp) {
-        if (afp.exerciseId() <= 0)
+        if (afp.exerciseId <= 0)
         {
-            onFrequencyPlanningChanged(m_avmDtc->frequencyPlanning(afp.frequencyPlanningId()),
+            onFrequencyPlanningChanged(m_avmDtc->frequencyPlanning(afp.frequencyPlanningId),
                                        DataModification::eAdded);
         }
     });
@@ -182,13 +185,13 @@ void EditFrequencyPlanningFrequencyDataModel::setCnrConfigs(const QVector<CnrCon
     m_cnrConfigs.clear();
     for (const CnrConfig& c : dataVec)
     {
-        m_cnrConfigs.insert(c.id(), c);
+        m_cnrConfigs.insert(c.id, c);
         ItemData id(c);
-        if (m_frequencyPlanningData.contains(c.id()))
+        if (m_frequencyPlanningData.contains(c.id))
         {
-            FrequencyPlanningData fpd = m_frequencyPlanningData[c.id()];
-            id.readOnly = isReadOnly(fpd.properties());
-            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+            FrequencyPlanningData fpd = m_frequencyPlanningData[c.id];
+            id.readOnly = isReadOnly(fpd.properties);
+            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
             if (circuits.size() > 1)
             {
                 ConfigTreeItem* configItem = new ConfigTreeItem(QVariant::fromValue(id));
@@ -227,7 +230,7 @@ EditFrequencyPlanningFrequencyDataModel::itemData(const QModelIndex& index)
 
 QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index, int role) const
 {
-    if ((role != Qt::DisplayRole && role != Qt::ToolTipRole && role != Qt::UserRole && role != Qt::TextColorRole &&
+    if ((role != Qt::DisplayRole && role != Qt::ToolTipRole && role != Qt::UserRole && role != Qt::ForegroundRole &&
          role != Qt::BackgroundRole) ||
         !index.isValid())
         return NGLTreeModel::data(index, role);
@@ -265,11 +268,11 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
         {
 
             case RADIO_CIRCUIT_ID:
-                return setData.id();
+                return setData.id;
             case FUNCTION: {
                 if (!rc)
                     return QStringLiteral("-");
-                return QString::fromStdString(m_freqSetData[rc->frequencySetDataId()].function());
+                return QString::fromStdString(m_freqSetData[rc->frequencySetDataId()].function);
             }
             case DEVICE: {
 
@@ -278,7 +281,7 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
                 RadioCircuitVHF* rcVhf = dynamic_cast<RadioCircuitVHF*>(rc);
                 if (!rcVhf)
                     return QStringLiteral("-");
-                return toString(m_freqSetData[rc->frequencySetDataId()].frequencyBand().underlying());
+                return toString(m_freqSetData[rc->frequencySetDataId()].frequencyBand);
             }
             case FREQUENCY: {
                 QLocale locale(QLocale::German);
@@ -290,7 +293,7 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
                     if (rcVhf && isAkwMode(rcVhf->operatingMode))
                         return QStringLiteral("-");
                     return tr("%1 MHz").arg(
-                        locale.toString(m_freqSetData[rc->frequencySetDataId()].frequency() / 1000., 'f', 3));
+                        locale.toString(m_freqSetData[rc->frequencySetDataId()].frequency / 1000., 'f', 3));
                 }
                 else
                 {
@@ -310,67 +313,67 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].akwBundle().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].akwBundle.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].akwBundle().get();
+                return m_freqSetData[rc->frequencySetDataId()].akwBundle.get();
             }
             case FSB_BUNDLE: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].fsbBundle().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].fsbBundle.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].fsbBundle().get();
+                return m_freqSetData[rc->frequencySetDataId()].fsbBundle.get();
             }
             case AKW_RADIO_CIRCUIT: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit().get();
+                return m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit.get();
             }
             case COMSEC: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].comsec().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].comsec.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].comsec().get();
+                return m_freqSetData[rc->frequencySetDataId()].comsec.get();
             }
 
             case RADIO_CIRCUIT: {
                 if (!rc)
-                    return QString::fromStdString(setData.radioCircuit());
+                    return QString::fromStdString(setData.radioCircuit);
 
                 return id.name();
             }
             case PARTY: {
-                ParticipantManagement::Party party = m_ppmDtc->party(setData.partyId());
+                ParticipantManagement::Party party = m_ppmDtc->party(setData.partyId);
 
-                return ParticipantManagement::trPartyName(party.name());
+                return ParticipantManagement::trPartyName(party.name);
             }
             case UNIT: {
-                if (!setData.unitId().is_set())
+                if (!setData.unitId.has_value())
                     return {};
-                const int unitId = setData.unitId().get();
+                const int unitId = setData.unitId.get();
                 if (!m_units.contains(unitId))
                     return QStringLiteral("-");
                 const auto unit = m_units[unitId];
 
-                INFO_LOG(m_logger) << " config.unitId()=" << unitId << " Str=" << unit.name();
+                INFO_LOG(m_logger) << " config.unitId()=" << unitId << " Str=" << unit.name;
 
                 QString unitStr;
-                if (unit.designator().size() > 0)
-                    unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
-                unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
+                if (unit.designator.size() > 0)
+                    unitStr = QString::fromStdString(unit.designator) + QLatin1Char('/');
+                unitStr.append(QString::fromStdString(unit.tacticalIdentifier));
                 INFO_LOG(m_logger) << "unitStr = " << unitStr;
 
                 return unitStr;
@@ -382,7 +385,7 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
                 if (rc->radioStationId == 0)
                     return tr("Automatic");
                 else
-                    return QString::fromStdString(m_ismDtc->mainStructureElement(rc->radioStationId).name());
+                    return QString::fromStdString(m_ismDtc->mainStructureElement(rc->radioStationId).name);
             }
             case PILOTTON: {
                 if (!rc)
@@ -405,11 +408,11 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
                 return toString(rcVhf->operatingMode);
             }
             case CHANNEL: {
-                CnrChannel channel = m_avmDtc->cnrChannel(setData.cnrChannelId());
-                return QString::fromStdString(channel.name());
+                CnrChannel channel = m_avmDtc->cnrChannel(setData.cnrChannelId);
+                return QString::fromStdString(channel.name);
             }
             case GLOBAL: {
-                return setData.exerciseId().is_set() ? tr("No") : tr("Yes");
+                return setData.exerciseId.has_value() ? tr("No") : tr("Yes");
             }
             case PROPERTIES: {
                 if (!rc)
@@ -463,22 +466,22 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex& index,
     }
 
     if (role == Qt::UserRole)
-        return setData.id();
+        return setData.id;
 
-    if (role == Qt::TextColorRole)
+    if (role == Qt::ForegroundRole)
     {
 
         for (int id : m_multipleAssignedCnrIds)
         {
-            if (id == setData.id())
+            if (id == setData.id)
                 return QColor(Qt::red);
         }
     }
     if (role == Qt::BackgroundRole)
     {
-        if (setData.exerciseId().is_set() && setData.exerciseId().get() == m_exerciseId)
+        if (setData.exerciseId.has_value() && setData.exerciseId.get() == m_exerciseId)
             return NGLTreeModel::data(index, role);
-        if (!setData.exerciseId().is_set() && m_exerciseId <= 0)
+        if (!setData.exerciseId.has_value() && m_exerciseId <= 0)
             return NGLTreeModel::data(index, role);
         return QColor(Qt::gray);
     }
@@ -546,15 +549,15 @@ bool EditFrequencyPlanningFrequencyDataModel::unassignRadioCircuit(int32_t cnrCo
 
 void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
 {
-    if (m_initPlan.id() == id)
+    if (m_initPlan.id == id)
         return;
-    if (m_initPlan.id() <= 0)
+    if (m_initPlan.id <= 0)
     {
-        m_initPlan.id(id);
+        m_initPlan.id = id;
         return;
     }
     WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
-                          << m_initPlan.id() << " - " << id << ")";
+                          << m_initPlan.id << " - " << id << ")";
 }
 
 ModifyFrequencyPlanningRequest EditFrequencyPlanningFrequencyDataModel::modifyFrequencyPlanningRequest() const
@@ -565,21 +568,21 @@ ModifyFrequencyPlanningRequest EditFrequencyPlanningFrequencyDataModel::modifyFr
     for (const auto& keyValue : overKeyValue(m_frequencyPlanningData))
     {
         Q_ASSERT(keyValue.first > 0);
-        CnrConfig config = m_avmDtc->cnrConfig(keyValue.second.cnrConfigId());
-        if ((config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId) ||
-            (!config.exerciseId().is_set() && m_exerciseId == 0))
+        CnrConfig config = m_avmDtc->cnrConfig(keyValue.second.cnrConfigId);
+        if ((config.exerciseId.has_value() && config.exerciseId.get() == m_exerciseId) ||
+            (!config.exerciseId.has_value() && m_exerciseId == 0))
         {
             FrequencyPlanningData fpd = keyValue.second;
-            fpd.frequencyPlanningId() = m_initPlan.id();
+            fpd.frequencyPlanningId = m_initPlan.id;
             planningDataVec.push_back(fpd);
         }
     }
 
-    return {m_initPlan.id(),
-            m_initPlan.exerciseId().is_set() ? m_initPlan.exerciseId().get() : 0,
-            m_initPlan.name(),
-            m_initPlan.date(),
-            m_initPlan.frequencySetId(),
+    return {m_initPlan.id,
+            m_initPlan.exerciseId.has_value() ? m_initPlan.exerciseId.get() : 0,
+            m_initPlan.name,
+            m_initPlan.date,
+            m_initPlan.frequencySetId,
             planningDataVec};
 }
 
@@ -591,18 +594,18 @@ FrequencyPlanning EditFrequencyPlanningFrequencyDataModel::toFrequencyPlanning()
     for (const auto& keyValue : overKeyValue(m_frequencyPlanningData))
     {
         Q_ASSERT(keyValue.first > 0);
-        CnrConfig config = m_avmDtc->cnrConfig(keyValue.second.cnrConfigId());
-        if ((config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId) ||
-            (!config.exerciseId().is_set() && m_exerciseId == 0))
+        CnrConfig config = m_avmDtc->cnrConfig(keyValue.second.cnrConfigId);
+        if ((config.exerciseId.has_value() && config.exerciseId.get() == m_exerciseId) ||
+            (!config.exerciseId.has_value() && m_exerciseId == 0))
         {
             FrequencyPlanningData fpd = keyValue.second;
-            fpd.frequencyPlanningId() = m_initPlan.id();
+            fpd.frequencyPlanningId = m_initPlan.id;
             planningDataVec.push_back(fpd);
         }
     }
 
     FrequencyPlanning frequencyPlanning = m_initPlan;
-    frequencyPlanning.data(planningDataVec);
+    frequencyPlanning.data = planningDataVec;
 
     return frequencyPlanning;
 }
@@ -611,12 +614,12 @@ int EditFrequencyPlanningFrequencyDataModel::findCnrConfigByName(const QString&
 {
     int id = -1;
     std::function<bool(const CnrConfig&)> findByNameInExercise = [this, &name, &id](const CnrConfig& cnrConfig) {
-        if (cnrConfig.exerciseId().is_set() && cnrConfig.exerciseId() != m_initPlan.exerciseId())
+        if (cnrConfig.exerciseId.has_value() && cnrConfig.exerciseId != m_initPlan.exerciseId)
             return false;
-        if (QString::fromStdString(cnrConfig.radioCircuit()) != name)
+        if (QString::fromStdString(cnrConfig.radioCircuit) != name)
             return false;
 
-        id = cnrConfig.id();
+        id = cnrConfig.id;
         return true;
     };
 
@@ -628,7 +631,7 @@ QByteArray EditFrequencyPlanningFrequencyDataModel::uiToJson() const
 {
     QJsonObject obj;
     obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning);
-    obj[QStringLiteral("frequencySetId")] = m_initPlan.frequencySetId();
+    obj[QStringLiteral("frequencySetId")] = m_initPlan.frequencySetId;
 
     QJsonArray arr;
     for (const auto& keyValue : overKeyValue(m_frequencyPlanningData))
@@ -636,8 +639,8 @@ QByteArray EditFrequencyPlanningFrequencyDataModel::uiToJson() const
         QJsonObject inner;
         const FrequencyPlanningData& info = keyValue.second;
 
-        inner[QStringLiteral("cnrChannelId")] = m_avmDtc->cnrConfig(info.cnrConfigId()).cnrChannelId();
-        inner[QStringLiteral("properties")] = QString::fromStdString(info.properties());
+        inner[QStringLiteral("cnrChannelId")] = m_avmDtc->cnrConfig(info.cnrConfigId).cnrChannelId;
+        inner[QStringLiteral("properties")] = QString::fromStdString(info.properties);
 
         arr.append(inner);
     }
@@ -651,15 +654,15 @@ QByteArray EditFrequencyPlanningFrequencyDataModel::uiToJson() const
 
 void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const FrequencyPlanningData& fpd)
 {
-    ConfigTreeItem* item = searchCnrConfig(m_rootItem, fpd.cnrConfigId());
+    ConfigTreeItem* item = searchCnrConfig(m_rootItem, fpd.cnrConfigId);
     if (!item)
     {
-        if (!m_cnrConfigs.contains(fpd.cnrConfigId()))
+        if (!m_cnrConfigs.contains(fpd.cnrConfigId))
             return;
         beginResetModel();
-        ItemData data(m_cnrConfigs[fpd.cnrConfigId()]);
-        data.readOnly = isReadOnly(fpd.properties());
-        QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+        ItemData data(m_cnrConfigs[fpd.cnrConfigId]);
+        data.readOnly = isReadOnly(fpd.properties);
+        QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
         if (circuits.size() > 1)
         {
             ConfigTreeItem* configItem = new ConfigTreeItem(QVariant::fromValue(data));
@@ -677,12 +680,12 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
             ConfigTreeItem* configItem = new ConfigTreeItem(QVariant::fromValue(data));
             insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
         }
-        m_frequencyPlanningData[fpd.cnrConfigId()] = fpd;
+        m_frequencyPlanningData[fpd.cnrConfigId] = fpd;
         endResetModel();
         return;
     }
 
-    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
     ItemData data = item->data().value<ItemData>();
     item->removeAllChildren();
 
@@ -690,7 +693,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
     {
         data.radioCircuit = circuits[0];
         item->setData(QVariant::fromValue(data));
-        m_frequencyPlanningData.insert(fpd.cnrConfigId(), fpd);
+        m_frequencyPlanningData.insert(fpd.cnrConfigId, fpd);
     }
     if (circuits.size() <= 1)
         return;
@@ -701,7 +704,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
         ConfigTreeItem* childItem = new ConfigTreeItem(QVariant::fromValue(data));
         insertRow(item->childCount(), indexFromItem(item), childItem);
     }
-    m_frequencyPlanningData.insert(fpd.cnrConfigId(), fpd);
+    m_frequencyPlanningData.insert(fpd.cnrConfigId, fpd);
     endResetModel();
 }
 
@@ -714,12 +717,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
     {
         const FrequencyPlanningData& p = it.value();
 
-        QSet<int> fsdIdsOuter = frequencySetDataIds(p.properties());
+        QSet<int> fsdIdsOuter = frequencySetDataIds(p.properties);
 
         for (auto startSearchIt = ++it; startSearchIt != m_frequencyPlanningData.constEnd(); ++startSearchIt)
         {
             const FrequencyPlanningData& pI = startSearchIt.value();
-            QSet<int> fsdIdsInner = frequencySetDataIds(pI.properties());
+            QSet<int> fsdIdsInner = frequencySetDataIds(pI.properties);
             for (int inner : std::as_const(fsdIdsInner))
             {
                 for (int outer : std::as_const(fsdIdsOuter))
@@ -727,17 +730,17 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
                     if (inner != outer)
                     {
                         DEBUG_LOG(m_logger)
-                            << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId() << " (B): " << pI.cnrConfigId();
+                            << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId << " (B): " << pI.cnrConfigId;
                     }
                     else
                     {
                         DEBUG_LOG(m_logger)
-                            << "---ist gleich cnrConfigId(A): " << p.cnrConfigId() << " (B): " << pI.cnrConfigId();
-                        if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()))
-                            m_multipleAssignedCnrIds.append(p.cnrConfigId());
+                            << "---ist gleich cnrConfigId(A): " << p.cnrConfigId << " (B): " << pI.cnrConfigId;
+                        if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId))
+                            m_multipleAssignedCnrIds.append(p.cnrConfigId);
 
-                        if (!m_multipleAssignedCnrIds.contains(pI.cnrConfigId()))
-                            m_multipleAssignedCnrIds.append(pI.cnrConfigId());
+                        if (!m_multipleAssignedCnrIds.contains(pI.cnrConfigId))
+                            m_multipleAssignedCnrIds.append(pI.cnrConfigId);
                         bOk = false;
                     }
                 }
@@ -760,31 +763,31 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
 bool EditFrequencyPlanningFrequencyDataModel::onCnrConfigChanged(const AudioVideoManagement::CnrConfig& data,
                                                                  DataModification modType)
 {
-    ConfigTreeItem* item = searchCnrConfig(m_rootItem, data.id());
+    ConfigTreeItem* item = searchCnrConfig(m_rootItem, data.id);
 
     if (modType == DataModification::eRemoved)
     {
 
         if (!item)
             return true;
-        m_cnrConfigs.remove(data.id());
-        m_frequencyPlanningData.remove(data.id());
+        m_cnrConfigs.remove(data.id);
+        m_frequencyPlanningData.remove(data.id);
         return removeRow(item->row());
     }
 
     if (modType == DataModification::eAdded ||
-        (!item && data.exerciseId().is_set() && m_exerciseId == data.exerciseId().get()))
+        (!item && data.exerciseId.has_value() && m_exerciseId == data.exerciseId.get()))
     {
         Q_ASSERT(!item);
 
-        m_cnrConfigs.insert(data.id(), data);
+        m_cnrConfigs.insert(data.id, data);
         ConfigTreeItem* newItem = new ConfigTreeItem(QVariant::fromValue(ItemData(data)));
         m_rootItem->setModified(true);
         insertRow(0, indexFromItem(m_rootItem), newItem);
         return true;
     }
 
-    if (item && data.exerciseId().is_set() && m_exerciseId != data.exerciseId().get())
+    if (item && data.exerciseId.has_value() && m_exerciseId != data.exerciseId.get())
         return removeRow(item->row());
 
     if (item)
@@ -794,7 +797,7 @@ bool EditFrequencyPlanningFrequencyDataModel::onCnrConfigChanged(const AudioVide
         item->setData(QVariant::fromValue(id));
 
         if (id.radioCircuit)
-            id.radioCircuit->name = QString::fromStdString(data.radioCircuit());
+            id.radioCircuit->name = QString::fromStdString(data.radioCircuit);
 
         item->setModified(true);
         return true;
@@ -809,7 +812,7 @@ EditFrequencyPlanningFrequencyDataModel::searchCnrConfig(const NGLTreeItem* pare
     for (int r = 0; r < rowCount; ++r)
     {
         ConfigTreeItem* child = static_cast<ConfigTreeItem*>(parentItem->child(r));
-        if (child->data().value<ItemData>().cnrConfig.id() == cnrConfigId)
+        if (child->data().value<ItemData>().cnrConfig.id == cnrConfigId)
             return child;
         child = searchCnrConfig(child, cnrConfigId);
         if (child)
@@ -823,7 +826,7 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
     QSet<int> result;
     for (const auto& fpd : std::as_const(m_frequencyPlanningData))
     {
-        result += AudioVideoManagement::frequencySetDataIds(fpd.properties());
+        result += AudioVideoManagement::frequencySetDataIds(fpd.properties);
     }
 
     if (m_exerciseId == 0)
@@ -831,19 +834,19 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
         QMap<qint32, AudioVideoManagement::FrequencyPlanning> frequencyPlannings = m_avmDtc->frequencyPlannings();
         for (const auto& frequencyPlanning : std::as_const(frequencyPlannings))
         {
-            if (!frequencyPlanning.exerciseId().is_set())
+            if (!frequencyPlanning.exerciseId.has_value())
                 continue;
 
-            for (const auto& frequencyPlanningData : frequencyPlanning.data())
+            for (const auto& frequencyPlanningData : frequencyPlanning.data)
             {
-                result += AudioVideoManagement::frequencySetDataIds(frequencyPlanningData.properties());
+                result += AudioVideoManagement::frequencySetDataIds(frequencyPlanningData.properties);
             }
         }
     }
     return result;
 }
 
-FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent)
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
index b5b16e4a5..ca7fe83e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
 #include <nglwidgets/ngltreeitem.h>
 #include <AudioVideoManagement/logger.h>
 #include "avm_frequency_planning_helper.h"
@@ -129,7 +130,7 @@ public:
 
   bool unassignRadioCircuit(int32_t cnrConfigId);
 
-  int32_t getFrequencySetId() const { return m_initPlan.frequencySetId(); }
+  int32_t getFrequencySetId() const { return m_initPlan.frequencySetId; }
   QSet<int> getAllocatedFrequencyPlanningSetIds();
 
   ModifyFrequencyPlanningRequest modifyFrequencyPlanningRequest() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
index eba772a62..4f7aa3834 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_edit_frequency_planning_resource_data_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AudioVideoManagement/avm_translation.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
@@ -23,6 +24,7 @@ EditFrequencyPlanningResourceDataModel::EditFrequencyPlanningResourceDataModel(
           },
           parent),
       m_assignedFrequencySetDataIds(assignedFrequencySetDataIds), m_frequencyBand(frequencyBand)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -38,33 +40,33 @@ QVariant EditFrequencyPlanningResourceDataModel::data(const QModelIndex& index,
         switch (index.column())
         {
             case FREQ_SET_DATA_ID:
-                return setData.id();
+                return setData.id;
             case FUNCTION:
-                return QString::fromStdString(setData.function());
+                return QString::fromStdString(setData.function);
             case DEVICE:
-                return toString(setData.frequencyBand());
+                return toString(setData.frequencyBand);
             case FREQUENCY:
-                return tr("%1 MHz").arg(locale.toString(setData.frequency() / 1000., 'f', 3));
+                return tr("%1 MHz").arg(locale.toString(setData.frequency / 1000., 'f', 3));
             case AKW_BUNDLE:
-                if (setData.akwBundle().is_set())
-                    return setData.akwBundle().get();
+                if (setData.akwBundle.has_value())
+                    return setData.akwBundle.get();
                 return QStringLiteral("-");
             case FSB_BUNDLE:
-                if (setData.fsbBundle().is_set())
-                    return setData.fsbBundle().get();
+                if (setData.fsbBundle.has_value())
+                    return setData.fsbBundle.get();
                 return QStringLiteral("-");
             case AKW_RADIO_CIRCUIT:
-                if (setData.akwRadioCircuit())
-                    return setData.akwRadioCircuit().get();
+                if (setData.akwRadioCircuit)
+                    return setData.akwRadioCircuit.get();
                 return QStringLiteral("-");
             case COMSEC:
-                if (setData.comsec().is_set())
-                    return setData.comsec().get();
+                if (setData.comsec.has_value())
+                    return setData.comsec.get();
                 return QStringLiteral("-");
         }
     }
     else if (role == Qt::UserRole)
-        return setData.id();
+        return setData.id;
 
     return QVariant();
 }
@@ -73,18 +75,18 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
                                                         DataModification modType) const
 {
 
-    if (m_frequencyBand != FrequencyBand::REL && data.frequencyBand() != m_frequencyBand)
+    if (m_frequencyBand != FrequencyBand::REL && data.frequencyBand != m_frequencyBand)
         return true;
 
-    if (m_frequencyBand == FrequencyBand::REL && data.frequencyBand() != FrequencyBand::VHF)
+    if (m_frequencyBand == FrequencyBand::REL && data.frequencyBand != FrequencyBand::VHF)
         return true;
 
     Q_UNUSED(modType);
 
-    if (m_assignedFrequencySetDataIds.contains(data.id()))
+    if (m_assignedFrequencySetDataIds.contains(data.id))
     {
         DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
-                            << " frequencySetDataId: " << data.id() << " ist bereits enthalten";
+                            << " frequencySetDataId: " << data.id << " ist bereits enthalten";
         return true;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
index bc344af8f..cbe60cd17 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_edit_frequency_planning_frequency_data_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "avm_edit_frequency_planning_resource_dialog.h"
 #include "ui_avm_edit_frequency_planning_resource_dialog.h"
@@ -10,6 +11,7 @@
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <AudioVideoManagement/avm_ftc.h>
 #include <AudioVideoManagement/avm_translation.h>
@@ -42,6 +44,7 @@ EditFrequencyPlanningResourceDialog::EditFrequencyPlanningResourceDialog(int fre
   , m_ui(new Ui::EditFrequencyPlanningResourceDialog)
   , m_frequencySetId(frequencySetId)
   , m_dialogMode(dialogMode)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -63,18 +66,18 @@ bool EditFrequencyPlanningResourceDialog::init(LtsSession::LtsSession *session,
     return succ;
 
   m_units = m_ppmDtc->units();
-  m_config = m_avmDtc->cnrConfig(m_planningData.cnrConfigId());
+  m_config = m_avmDtc->cnrConfig(m_planningData.cnrConfigId);
 
   
   
 
   
-  m_radioCircuitName = QString::fromStdString(m_config.radioCircuit());
-  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId());
-  m_frequencyBand =   channel.frequencyBand();
+  m_radioCircuitName = QString::fromStdString(m_config.radioCircuit);
+  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId);
+  m_frequencyBand =   channel.frequencyBand;
 
-  QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(planningData.properties());
-  bool readOnly = isReadOnly(planningData.properties());
+  QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(planningData.properties);
+  bool readOnly = isReadOnly(planningData.properties);
   for (RadioCircuit *circuit : std::as_const(circuits))
   {
     addMemberWidget(circuit, readOnly);
@@ -104,7 +107,7 @@ void EditFrequencyPlanningResourceDialog::retranslate()
   
   if (m_dialogMode == EditFrequencyPlanningSetResourceDialog::DialogMode::Edit)
   {
-    translate(m_ui.get(), m_avmDtc->cnrConfig(m_planningData.cnrConfigId()), m_radioCircuitName, tr("Radio Circuit"));
+    translate(m_ui.get(), m_avmDtc->cnrConfig(m_planningData.cnrConfigId), m_radioCircuitName, tr("Radio Circuit"));
   }
   else 
   {
@@ -130,8 +133,8 @@ bool EditFrequencyPlanningResourceDialog::apply()
   doc.setObject(obj);
 
   FrequencyPlanningData fpd;
-  fpd.properties(doc.toJson().toStdString());
-  fpd.cnrConfigId() = m_config.id();
+  fpd.properties = doc.toJson().toStdString();
+  fpd.cnrConfigId = m_config.id;
 
   emit signalAssignRadioCircuit(fpd);
   return true;
@@ -178,10 +181,10 @@ void EditFrequencyPlanningResourceDialog::addMemberWidget(RadioCircuit *radioCir
 void EditFrequencyPlanningResourceDialog::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &config, DataModification modType)
 {
   Q_UNUSED(modType);
-  if (m_config.id() == config.id())
+  if (m_config.id == config.id)
   {
     setLbRadioCiruit(config);
-    m_radioCircuitName = QString::fromStdString(config.radioCircuit());
+    m_radioCircuitName = QString::fromStdString(config.radioCircuit);
     retranslate();
   }
 }
@@ -189,24 +192,24 @@ void EditFrequencyPlanningResourceDialog::onCnrConfigChanged(const AudioVideoMan
 void EditFrequencyPlanningResourceDialog::setLbRadioCiruit(const AudioVideoManagement::CnrConfig &config)
 {
   
-  ParticipantManagement::Party party = m_ppmDtc->party(config.partyId());
-  QString partyName = ParticipantManagement::trPartyName(party.name());
+  ParticipantManagement::Party party = m_ppmDtc->party(config.partyId);
+  QString partyName = ParticipantManagement::trPartyName(party.name);
 
   QString unitString;
-  if (config.unitId().is_set())
+  if (config.unitId.has_value())
   {
-    int unitId = config.unitId().get();
+    int unitId = config.unitId.get();
     auto unit  = m_units.value(unitId);
-    if (unit.id() == unitId)
+    if (unit.id == unitId)
     {
-      if (unit.designator().size() > 0)
-        unitString = QString::fromStdString(unit.designator()) + QLatin1Char('/');
-      unitString.append(QString::fromStdString(unit.tacticalIdentifier()));
+      if (unit.designator.size() > 0)
+        unitString = QString::fromStdString(unit.designator) + QLatin1Char('/');
+      unitString.append(QString::fromStdString(unit.tacticalIdentifier));
     }
   }
   m_ui->lblUnit->setText(unitString);
-  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId());
-  m_ui->lblChannel->setText(QString::fromStdString(channel.name()));
+  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId);
+  m_ui->lblChannel->setText(QString::fromStdString(channel.name));
   m_ui->lblFrequencyBand->setText(toString(m_frequencyBand));
   m_ui->lblRadioCircuit->setText(m_radioCircuitName);
   m_ui->lblParty->setText(partyName);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp
index c7010de3b..fd58e9a53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_edit_frequency_planning_frequency_data_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "avm_edit_frequency_planning_set_resource_dialog.h"
 #include "ui_avm_edit_frequency_planning_set_resource_dialog.h"
 #include "avm_edit_frequency_planning_resource_data_model.h"
@@ -32,26 +33,27 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog(
   , m_avmDtc(avmDtc)
   , m_frequencyResourceDataModel(nullptr)
   , m_config(m_avmDtc->cnrConfig(cnrConfigId))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   
-  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId());
+  CnrChannel channel = m_avmDtc->cnrChannel(m_config.cnrChannelId);
 
   
   
-  m_frequencyResourceDataModel = new EditFrequencyPlanningResourceDataModel(assignedFrequencySetDataIds, channel.frequencyBand(), this);
+  m_frequencyResourceDataModel = new EditFrequencyPlanningResourceDataModel(assignedFrequencySetDataIds, channel.frequencyBand, this);
 
-  std::vector<FrequencySetDataWithId> dataVec = m_avmDtc->frequencySet(m_frequencySetId).data();
+  std::vector<FrequencySetDataWithId> dataVec = m_avmDtc->frequencySet(m_frequencySetId).data;
 
   for (const auto &it : dataVec)
   {
     if((operatingMode == RcOperatingMode::AkwEncEccm ||
         operatingMode == RcOperatingMode::AkwEncNone)
-       && it.akwRadioCircuit() == 0) 
+       && it.akwRadioCircuit == 0) 
       continue;
     if((operatingMode != RcOperatingMode::AkwEncEccm &&
         operatingMode != RcOperatingMode::AkwEncNone)
-       && it.akwRadioCircuit() != 0)
+       && it.akwRadioCircuit != 0)
       continue;
     m_frequencyResourceDataModel->insertRow(it);
   }
@@ -81,7 +83,7 @@ void EditFrequencyPlanningSetResourceDialog::accept()
   if (!idx.isValid())
     return;
 
-  emit onSelectedFrequencySet(m_frequencyResourceDataModel->getRowData(idx.row()).id());
+  emit onSelectedFrequencySet(m_frequencyResourceDataModel->getRowData(idx.row()).id);
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
index 04195635c..72f7e316b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_frequency_planning_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_edit_frequency_planning_dialog.h"
 #include "avm_frequency_planning_dialog_model.h"
@@ -15,6 +16,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QTreeView>
@@ -28,6 +30,7 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession* session
       m_menuGroup(menuGroup), m_copy(false), m_session(session), m_model(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_activePlanning({-1, -1}), m_avmDtc(nullptr),
       m_avmFtc(nullptr), m_ppmDtc(nullptr), m_ismDtc(nullptr), m_flmGui(nullptr), m_activeFrequencyPlanningStatus(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -61,9 +64,9 @@ void FrequencyPlanningDialog::unsetActiveFrequencyPlanning()
 void FrequencyPlanningDialog::setActiveFrequencyPlanning(const ActiveFrequencyPlanning& activePlanning)
 {
     m_ui->lbActiveFrequencyPlanning->setText(
-        QString::fromStdString(m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId()).name()));
+        QString::fromStdString(m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId).name));
     m_activePlanning = activePlanning;
-    m_model->setActivePlanning(m_activePlanning.frequencyPlanningId());
+    m_model->setActivePlanning(m_activePlanning.frequencyPlanningId);
     onSelectionChanged();
 }
 
@@ -128,9 +131,9 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc>& avmDtc
     setStatus(tr("No active Radio Controller connected."), {}, time(0) * 1000, TransmissionReason::TR_Unknown, Qt::red);
     for (auto& elem : m_avmDtc->frequencyPlanningStatuss())
     {
-        if (!elem.isActive())
+        if (!elem.isActive)
             continue;
-        m_activeFrequencyPlanningStatus = elem.id();
+        m_activeFrequencyPlanningStatus = elem.id;
         onFrequencyPlanningStatusChanged(elem, DataModification::eAdded);
     }
     connect(m_avmDtc.get(), &Interface::Dtc::frequencyPlanningStatusChanged, this,
@@ -144,12 +147,12 @@ void FrequencyPlanningDialog::onFrequencyPlanningStatusChanged(
 {
     if (modType == DataModification::eModified)
     {
-        if (data.id() != m_activeFrequencyPlanningStatus)
+        if (data.id != m_activeFrequencyPlanningStatus)
             return;
     }
     else if (modType == DataModification::eRemoved)
     {
-        if (data.id() != m_activeFrequencyPlanningStatus)
+        if (data.id != m_activeFrequencyPlanningStatus)
             return;
 
         m_activeFrequencyPlanningStatus = 0;
@@ -159,28 +162,28 @@ void FrequencyPlanningDialog::onFrequencyPlanningStatusChanged(
     }
     else
     {
-        if (!data.isActive())
+        if (!data.isActive)
             return;
-        m_activeFrequencyPlanningStatus = data.id();
+        m_activeFrequencyPlanningStatus = data.id;
     }
 
-    if (data.activated().is_set())
+    if (data.activated.has_value())
     {
-        setStatus(tr("Activated"), QString::fromStdString(data.requester()), data.activated().get(), data.reason(),
+        setStatus(tr("Activated"), QString::fromStdString(data.requester), data.activated.get(), data.reason,
                   Qt::green);
         return;
     }
 
-    if (data.received().is_set())
+    if (data.received.has_value())
     {
-        setStatus(tr("In Progress"), QString::fromStdString(data.requester()), data.received().get(), data.reason(),
+        setStatus(tr("In Progress"), QString::fromStdString(data.requester), data.received.get(), data.reason,
                   Qt::yellow);
         return;
     }
 
-    if (data.sent().is_set())
+    if (data.sent.has_value())
     {
-        setStatus(tr("Sent"), QString::fromStdString(data.requester()), data.sent().get(),
+        setStatus(tr("Sent"), QString::fromStdString(data.requester), data.sent.get(),
                   TransmissionReason::TR_Unknown, Qt::yellow);
         return;
     }
@@ -255,11 +258,11 @@ void FrequencyPlanningDialog::onAddClicked()
         {
             FrequencyPlanning planning;
 
-            planning.id(0);
+            planning.id = 0;
             if (m_session->exerciseId() != 0)
-                planning.exerciseId(m_session->exerciseId());
-            planning.frequencySetId(frequencySets.first().id());
-            planning.date(m_session->partitionTime());
+                planning.exerciseId = m_session->exerciseId();
+            planning.frequencySetId = frequencySets.first().id;
+            planning.date = m_session->partitionTime();
             showEditDialog(planning);
         }
         else
@@ -278,7 +281,7 @@ void FrequencyPlanningDialog::onAddClicked()
         m_copy = true;
         qint64 dateOfCreation = m_session->partitionTime();
         FrequencyPlanning planning = m_model->data(selectedRows.constFirst(), Qt::UserRole).value<FrequencyPlanning>();
-        planning.date(dateOfCreation);
+        planning.date = dateOfCreation;
         showEditDialog(planning);
     }
 }
@@ -291,8 +294,8 @@ void FrequencyPlanningDialog::onEditClicked()
         return;
 
     const FrequencyPlanning& fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
-    DEBUG_LOG(m_logger) << "---onEditClicked()  FrequencyPlanningId: " << fp.id()
-                        << " FrequencySetDataId: " << fp.frequencySetId();
+    DEBUG_LOG(m_logger) << "---onEditClicked()  FrequencyPlanningId: " << fp.id
+                        << " FrequencySetDataId: " << fp.frequencySetId;
 
     m_copy = false;
     showEditDialog(m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>());
@@ -305,7 +308,7 @@ void FrequencyPlanningDialog::onRemoveClicked()
     if (!currentIndex.isValid())
         return;
 
-    int planningId = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id();
+    int planningId = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id;
 
     if (m_editDlgMap.contains(planningId))
     {
@@ -315,7 +318,7 @@ void FrequencyPlanningDialog::onRemoveClicked()
 
     Core::RemoveElementRequest req;
 
-    req.id(planningId);
+    req.id = planningId;
 
     m_requestHelper->startSingleRequest([this, req]() { return m_avmFtc->removeFrequencyPlanningRequest(req, this); });
 }
@@ -328,8 +331,8 @@ void FrequencyPlanningDialog::onSelectionChanged()
     if (hasSelection)
     {
         const QModelIndex currentIndex = selectedRows.constFirst();
-        selectedIsActive = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id() ==
-                           m_activePlanning.frequencyPlanningId();
+        selectedIsActive = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id ==
+                           m_activePlanning.frequencyPlanningId;
     }
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, hasSelection);
@@ -362,9 +365,9 @@ void FrequencyPlanningDialog::onActivateDeactivatePlanningClicked()
     if (!currentIndex.isValid())
         return;
 
-    int32_t planningId = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id();
+    int32_t planningId = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>().id;
 
-    bool isActive = planningId == m_activePlanning.frequencyPlanningId();
+    bool isActive = planningId == m_activePlanning.frequencyPlanningId;
     if (!isActive)
     {
         ModifyActiveFrequencyPlanningRequest request(m_session->exerciseId(), planningId);
@@ -383,7 +386,7 @@ void FrequencyPlanningDialog::onActivateDeactivatePlanningClicked()
 
 void FrequencyPlanningDialog::showEditDialog(const FrequencyPlanning& planning)
 {
-    QString widgetIdentifier(QStringLiteral("FrequencyPlanning%1").arg(QString::number(planning.id())));
+    QString widgetIdentifier(QStringLiteral("FrequencyPlanning%1").arg(QString::number(planning.id)));
     if (m_copy)
         widgetIdentifier.append(QStringLiteral("Copy"));
 
@@ -402,14 +405,14 @@ void FrequencyPlanningDialog::showEditDialog(const FrequencyPlanning& planning)
 
     if (!m_copy)
     {
-        m_editDlgMap.insert(planning.id(), dlg);
+        m_editDlgMap.insert(planning.id, dlg);
     }
 }
 
 void FrequencyPlanningDialog::onActiveFrequencyPlanningChanged(const ActiveFrequencyPlanning& data,
                                                                DataModification modType)
 {
-    if (data.exerciseId() != m_session->exerciseId())
+    if (data.exerciseId != m_session->exerciseId())
         return;
 
     if (modType == DataModification::eRemoved)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
index d67dc423c..8206e0d0b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
 #include <AudioVideoManagement/avm_ftc.h>
 #include <AudioVideoManagement/logger.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
index 975a7cb6e..8cd887562 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_frequency_planning_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <FileManagement/flm_translation.h>
 #include <QtCore/QJsonArray>
@@ -14,6 +15,7 @@ namespace AudioVideoManagement
 FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, QObject* parent)
     : LtsAbstractTableModel<FrequencyPlanning>({tr("Name"), tr("Date"), tr("Set"), tr("Active")}, parent),
       m_exerciseId(exerciseId)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
 }
@@ -29,15 +31,15 @@ QVariant FrequencyPlanningDialogModel::data(const QModelIndex& index, int role)
         switch (index.column())
         {
             case NAME:
-                return QString::fromStdString(planning.name());
+                return QString::fromStdString(planning.name);
             case DATE:
-                return QDateTime::fromMSecsSinceEpoch(planning.date());
+                return QDateTime::fromMSecsSinceEpoch(planning.date);
             case SET: {
-                const FrequencySet frequencySet = m_avmDtc->frequencySet(planning.frequencySetId());
-                return QString::fromStdString(frequencySet.name());
+                const FrequencySet frequencySet = m_avmDtc->frequencySet(planning.frequencySetId);
+                return QString::fromStdString(frequencySet.name);
             }
             case ACTIVE:
-                return planning.id() == m_activePlanningId ? tr("Active") : QStringLiteral("-");
+                return planning.id == m_activePlanningId ? tr("Active") : QStringLiteral("-");
         }
     }
     else if (role == Qt::UserRole)
@@ -56,7 +58,7 @@ bool FrequencyPlanningDialogModel::init(const std::shared_ptr<Interface::Dtc>& a
             &FrequencyPlanningDialogModel::onFrequencyPlanningChanged);
 
     m_avmDtc->frequencyPlannings([this](const FrequencyPlanning& p) {
-        if (p.exerciseId().is_set() && p.exerciseId().get() == m_exerciseId)
+        if (p.exerciseId.has_value() && p.exerciseId.get() == m_exerciseId)
             insertRow(p);
     });
 
@@ -68,15 +70,15 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
     if (!indexIsValid(index))
         return FrequencySet();
 
-    return m_frequencySets.value(m_vecData.at(index.row()).frequencySetId());
+    return m_frequencySets.value(m_vecData.at(index.row()).frequencySetId);
 }
 
 void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning& data, DataModification modType)
 {
     INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
-                       << " data.exerciseId()" << data.exerciseId() << " m_exerciseId=" << m_exerciseId;
-    if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId) ||
-        (!data.exerciseId().is_set() && m_exerciseId != 0))
+                       << " data.exerciseId()" << data.exerciseId << " m_exerciseId=" << m_exerciseId;
+    if ((data.exerciseId.has_value() && data.exerciseId.get() != m_exerciseId) ||
+        (!data.exerciseId.has_value() && m_exerciseId != 0))
         return;
 
     onDataChanged(data, modType);
@@ -94,21 +96,21 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
         QJsonObject inner;
         const FrequencyPlanning& planning = m_vecData.at(row);
 
-        inner[QStringLiteral("id")] = planning.id();
-        inner[QStringLiteral("name")] = QString::fromStdString(planning.name());
-        inner[QStringLiteral("dateOfCreation")] = planning.date();
-        if (planning.exerciseId().is_set())
+        inner[QStringLiteral("id")] = planning.id;
+        inner[QStringLiteral("name")] = QString::fromStdString(planning.name);
+        inner[QStringLiteral("dateOfCreation")] = static_cast<qint64>(planning.date);
+        if (planning.exerciseId.has_value())
         {
-            inner[QStringLiteral("exerciseId")] = planning.exerciseId().get();
+            inner[QStringLiteral("exerciseId")] = planning.exerciseId.get();
         }
-        inner[QStringLiteral("frequencySetId")] = planning.frequencySetId();
+        inner[QStringLiteral("frequencySetId")] = planning.frequencySetId;
 
         arrData = {};
-        for (const FrequencyPlanningData& planningData : planning.data())
+        for (const FrequencyPlanningData& planningData : planning.data)
         {
             QJsonObject innerData;
-            innerData[QStringLiteral("cnrConfigId")] = planningData.cnrConfigId();
-            innerData[QStringLiteral("properties")] = QString::fromStdString(planningData.properties());
+            innerData[QStringLiteral("cnrConfigId")] = planningData.cnrConfigId;
+            innerData[QStringLiteral("properties")] = QString::fromStdString(planningData.properties);
             arrData += innerData;
         }
         inner[QStringLiteral("data")] = arrData;
@@ -132,21 +134,21 @@ FrequencyPlanningDialogModel::jsonToFrequencyPlanningVector(const QByteArray& co
     {
         const QJsonObject obj(ele.toObject());
         ModifyFrequencyPlanningRequest frequencyPlanning;
-        frequencyPlanning.date(obj[QStringLiteral("dateOfCreation")].toDouble());
-        frequencyPlanning.exerciseId(m_exerciseId);
-        frequencyPlanning.frequencySetId(obj[QStringLiteral("frequencySetId")].toInt());
-        frequencyPlanning.id(0);
-        frequencyPlanning.name(obj[QStringLiteral("name")].toString().toStdString());
+        frequencyPlanning.date = obj[QStringLiteral("dateOfCreation")].toDouble();
+        frequencyPlanning.exerciseId = m_exerciseId;
+        frequencyPlanning.frequencySetId = obj[QStringLiteral("frequencySetId")].toInt();
+        frequencyPlanning.id = 0;
+        frequencyPlanning.name = obj[QStringLiteral("name")].toString().toStdString();
 
         const QJsonArray arrData = (obj.value(QStringLiteral("data")).toArray());
-        frequencyPlanning.data().reserve(arrData.size());
+        frequencyPlanning.data.reserve(arrData.size());
         for (const auto& eleData : arrData)
         {
             const QJsonObject objData(eleData.toObject());
             FrequencyPlanningData frequencyPlanningData;
-            frequencyPlanningData.cnrConfigId(objData[QStringLiteral("cnrConfigId")].toInt());
-            frequencyPlanningData.properties(objData[QStringLiteral("properties")].toString().toStdString());
-            frequencyPlanning.data().push_back(frequencyPlanningData);
+            frequencyPlanningData.cnrConfigId = objData[QStringLiteral("cnrConfigId")].toInt();
+            frequencyPlanningData.properties = objData[QStringLiteral("properties")].toString().toStdString();
+            frequencyPlanning.data.push_back(frequencyPlanningData);
         }
 
         result.push_back(std::move(frequencyPlanning));
@@ -170,7 +172,7 @@ bool FrequencyPlanningDialogProxyModel::lessThan(const QModelIndex& source_left,
     switch (source_left.column())
     {
         case FrequencyPlanningDialogModel::DATE:
-            return dataLeft.date() < dataRight.date();
+            return dataLeft.date < dataRight.date;
         case FrequencyPlanningDialogModel::NAME:
         case FrequencyPlanningDialogModel::SET:
         case FrequencyPlanningDialogModel::ACTIVE:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h
index fe3d37cc0..6da7b68d5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h
@@ -9,6 +9,8 @@
 #include <boost/optional.hpp>
 #include <memory>
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
+
 namespace AudioVideoManagement
 {
 
@@ -68,4 +70,3 @@ class FrequencyPlanningDialogProxyModel final : public LtsWidgets::LtsColumnFilt
 };
 
 } // namespace AudioVideoManagement
-Q_DECLARE_METATYPE(AudioVideoManagement::FrequencyPlanning)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
index e1ef4a067..65a1e8d83 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_frequency_planning_widget.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_edit_frequency_planning_set_resource_dialog.h"
 #include "avm_radio_specifica_hf_widget.h"
@@ -23,9 +24,9 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface
 {
     m_ui->setupUi(this);
 
-    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::VHF), FrequencyBand::VHF);
-    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::HF), FrequencyBand::HF);
-    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::UHF), FrequencyBand::UHF);
+    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::VHF), static_cast<int>(FrequencyBand::VHF));
+    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::HF), static_cast<int>(FrequencyBand::HF));
+    m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::UHF), static_cast<int>(FrequencyBand::UHF));
 
     connect(m_ui->leName, &QLineEdit::textChanged, this, &FrequencyPlanningWidget::onNameChanged);
     connect(m_ui->cbFrequencyBand, qOverload<int>(&QComboBox::currentIndexChanged), this,
@@ -38,17 +39,17 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit
                                    int frequencySetId, FrequencyBand ft)
 {
     m_frequencySetId = frequencySetId;
-    m_cnrConfigId = cnrConfigId.id();
-    m_hasParty = cnrConfigId.partyId() != 0;
+    m_cnrConfigId = cnrConfigId.id;
+    m_hasParty = cnrConfigId.partyId != 0;
 
     if (!session->getForeignGuiInterface<InfrastructureManagement::ForeignGuiComboboxInterface>(m_ismCbxIfc))
         return false;
 
-    m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(ft.underlying()));
+    m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(static_cast<int>(ft)));
     m_ui->cbFrequencyBand->setVisible(false);
     m_ui->lbxFrequencyBand->setVisible(false);
 
-    switch (ft.underlying())
+    switch (ft)
     {
 
         case FrequencyBand::HF: {
@@ -67,10 +68,10 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit
             ft = data ? data->freqBand : FrequencyBand::VHF;
             m_isRelay = true;
 
-            m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(ft.underlying()));
+            m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(static_cast<int>(ft)));
             m_ui->cbFrequencyBand->setVisible(true);
             m_ui->lbxFrequencyBand->setVisible(true);
-            switch (ft.underlying())
+            switch (ft)
             {
                 case FrequencyBand::HF:
                     createHFWidget(data);
@@ -88,7 +89,7 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit
         }
     }
 
-    m_ismCbxIfc->fillRadioStationsComboBox(m_ui->cbRadioStation, ft.underlying());
+    m_ismCbxIfc->fillRadioStationsComboBox(m_ui->cbRadioStation, static_cast<int>(ft));
     if (m_hasParty && !m_isRelay)
         m_ui->cbRadioStation->addItem(tr("Automatic"), 0);
     if (!data)
@@ -117,7 +118,7 @@ void FrequencyPlanningWidget::setRelaisRestrictions(bool restrict)
 {
     if (restrict)
     {
-        m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(FrequencyBand::VHF));
+        m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(static_cast<int>(FrequencyBand::VHF)));
         m_ui->cbFrequencyBand->setEnabled(false);
     }
     else
@@ -152,13 +153,13 @@ void FrequencyPlanningWidget::onFrequencyBandChanged()
 {
     switch (m_ui->cbFrequencyBand->currentData().toInt())
     {
-        case FrequencyBand::HF:
+        case static_cast<int>(FrequencyBand::HF):
             createHFWidget();
             break;
-        case FrequencyBand::UHF:
+        case static_cast<int>(FrequencyBand::UHF):
             createUHFWidget();
             break;
-        case FrequencyBand::VHF:
+        case static_cast<int>(FrequencyBand::VHF):
             createVHFWidget();
             break;
     }
@@ -222,9 +223,9 @@ void FrequencyPlanningWidget::onCnrConfigChanged(const AudioVideoManagement::Cnr
                                                  DataModification modType)
 {
     Q_UNUSED(modType);
-    if (m_cnrConfigId == config.id())
+    if (m_cnrConfigId == config.id)
     {
-        m_ui->leName->setText(QString::fromStdString(config.radioCircuit()));
+        m_ui->leName->setText(QString::fromStdString(config.radioCircuit));
     }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
index 361c66347..c848e2541 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_init_frequency_planning_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_avm_init_frequency_planning_dialog.h"
 
@@ -14,6 +15,7 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession*
                                                          const std::shared_ptr<Interface::Dtc>& avmDtc, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel), m_ui(new Ui::InitFrequencyPlanningDialog),
       m_dateOfCreation(session->partitionTime()), m_session(session)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
     m_ui->setupUi(this);
@@ -21,7 +23,7 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession*
     QMap<int32_t, FrequencySet> frequencySets = avmDtc->frequencySets();
 
     for (auto it = frequencySets.constBegin(); it != frequencySets.constEnd(); ++it)
-        m_ui->cbFrequencySets->addItem(QString::fromStdString(it.value().name()), QVariant::fromValue(it.key()));
+        m_ui->cbFrequencySets->addItem(QString::fromStdString(it.value().name), QVariant::fromValue(it.key()));
 
     m_ui->tbTime->setText(DTG::toStringMSec(m_dateOfCreation));
 
@@ -51,12 +53,12 @@ bool InitFrequencyPlanningDialog::apply()
 {
     FrequencyPlanning planning;
 
-    planning.id(0);
+    planning.id = 0;
     if (m_session->exerciseId() != 0)
-        planning.exerciseId(m_session->exerciseId());
-    planning.frequencySetId(m_ui->cbFrequencySets->currentData().toInt());
-    planning.name(m_ui->leName->text().toStdString());
-    planning.date(m_dateOfCreation);
+        planning.exerciseId = m_session->exerciseId();
+    planning.frequencySetId = m_ui->cbFrequencySets->currentData().toInt();
+    planning.name = m_ui->leName->text().toStdString();
+    planning.date = m_dateOfCreation;
 
     emit newInitFrequencyPlanning(planning);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h
index dfac31ffc..29f66867a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
 #include <AudioVideoManagement/avm_dtc.h>
 #include <AudioVideoManagement/logger.h>
 #include <LtsWidgets/lts_dialog.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
index 5a1b444fb..f91e11918 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_load_frequency_planning_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_avm_load_frequency_planning_dialog.h"
 
 #include "avm_load_frequency_planning_dialog_model.h"
@@ -13,6 +14,7 @@ LoadFrequencyPlanningDialog::LoadFrequencyPlanningDialog(const QByteArray &data,
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::LoadFrequencyPlanningDialog)
   , m_model(new LoadFrequencyPlanningDialogModel(initPlan, avmDtc, ismDtc, this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
index 26ac7a03a..d5df3bd45 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_load_frequency_planning_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AudioVideoManagement/avm_translation.h>
 #include <FileManagement/flm_translation.h>
@@ -23,10 +24,10 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
 {
     Q_UNUSED(dm)
 
-    if (initPlanning.exerciseId().is_set() && initPlanning.exerciseId().get() != m_exerciseId)
+    if (initPlanning.exerciseId.has_value() && initPlanning.exerciseId.get() != m_exerciseId)
         return;
 
-    if (m_exerciseId > 0 && initPlanning.exerciseId().is_set() && initPlanning.id() != m_initPlan.id())
+    if (m_exerciseId > 0 && initPlanning.exerciseId.has_value() && initPlanning.id != m_initPlan.id)
         return;
 
     beginResetModel();
@@ -39,7 +40,7 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
             continue;
         ItemData id = item->data().value<ItemData>();
 
-        if (m_exerciseId == 0 && !initPlanning.exerciseId().is_set())
+        if (m_exerciseId == 0 && !initPlanning.exerciseId.has_value())
         {
             id.clearRadioCircuit();
             item->setData(QVariant::fromValue(id));
@@ -50,10 +51,10 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
         if (m_exerciseId > 0)
         {
 
-            if (initPlanning.exerciseId().is_set())
+            if (initPlanning.exerciseId.has_value())
             {
 
-                if (id.cnrConfig.exerciseId().is_set())
+                if (id.cnrConfig.exerciseId.has_value())
                 {
                     id.clearRadioCircuit();
                     item->setData(QVariant::fromValue(id));
@@ -64,7 +65,7 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
             else
             {
 
-                if (!id.cnrConfig.exerciseId().is_set())
+                if (!id.cnrConfig.exerciseId.has_value())
                 {
                     id.clearRadioCircuit();
                     item->setData(QVariant::fromValue(id));
@@ -80,22 +81,22 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
     for (const auto& frequencyPlanning : std::as_const(frequencyPlannings))
     {
 
-        if ((initPlanning.exerciseId().is_set() && frequencyPlanning.exerciseId().is_set()) ||
-            (!initPlanning.exerciseId().is_set() && frequencyPlanning.exerciseId().is_set() &&
-             frequencyPlanning.exerciseId().get() != m_exerciseId))
+        if ((initPlanning.exerciseId.has_value() && frequencyPlanning.exerciseId.has_value()) ||
+            (!initPlanning.exerciseId.has_value() && frequencyPlanning.exerciseId.has_value() &&
+             frequencyPlanning.exerciseId.get() != m_exerciseId))
             continue;
 
-        for (const auto& frequencyPlanningData : frequencyPlanning.data())
+        for (const auto& frequencyPlanningData : frequencyPlanning.data)
         {
-            m_frequencyPlanningData.insert(frequencyPlanningData.cnrConfigId(), frequencyPlanningData);
+            m_frequencyPlanningData.insert(frequencyPlanningData.cnrConfigId, frequencyPlanningData);
             setFrequencyPlanningData(frequencyPlanningData);
         }
         break;
     }
 
-    for (const auto& frequencyPlanningData : initPlanning.data())
+    for (const auto& frequencyPlanningData : initPlanning.data)
     {
-        m_frequencyPlanningData.insert(frequencyPlanningData.cnrConfigId(), frequencyPlanningData);
+        m_frequencyPlanningData.insert(frequencyPlanningData.cnrConfigId, frequencyPlanningData);
         setFrequencyPlanningData(frequencyPlanningData);
     }
     endResetModel();
@@ -124,18 +125,19 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(
                        tr("Squelch"),
                    }),
       m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_initPlan(initPlan), m_parentPlan(initPlan),
-      m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
+      m_exerciseId(initPlan.exerciseId.has_value() ? initPlan.exerciseId.get() : 0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     Q_ASSERT(avmDtc);
     DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
 
-    m_initPlan.data().clear();
+    m_initPlan.data.clear();
 
-    int frequencySetId = m_initPlan.frequencySetId();
-    std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
+    int frequencySetId = m_initPlan.frequencySetId;
+    std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data;
     for (FrequencySetDataWithId fsd : fsdVec)
     {
-        m_freqSetData.insert(fsd.id(), fsd);
+        m_freqSetData.insert(fsd.id, fsd);
     }
     onFrequencyPlanningChanged(m_initPlan, DataModification::eAdded);
 
@@ -150,7 +152,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray& data)
     using namespace LtsUtils;
     const JsonObject obj = JsonObject::fromJson(data);
 
-    if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
+    if (m_initPlan.frequencySetId != obj.value<int>("frequencySetId"))
     {
         ERROR_LOG(m_logger) << "false frequency set!";
 
@@ -158,7 +160,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray& data)
     }
 
     beginResetModel();
-    m_initPlan.data().clear();
+    m_initPlan.data.clear();
     for (const JsonObject& association : obj.value<std::vector<JsonObject>>("planningInfos"))
     {
         FrequencyPlanningData info;
@@ -172,27 +174,27 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray& data)
                 ;
             CnrConfig invalidConfig;
 
-            invalidConfig.id(cnrConfigId);
-            invalidConfig.cnrChannelId(channelId);
+            invalidConfig.id = cnrConfigId;
+            invalidConfig.cnrChannelId = channelId;
 
             m_cnrConfigs.insert(cnrConfigId, invalidConfig);
         }
 
-        info.cnrConfigId(cnrConfigId);
-        info.properties(association.value<QString>("properties").toStdString());
+        info.cnrConfigId = cnrConfigId;
+        info.properties = association.value<QString>("properties").toStdString();
 
         m_frequencyPlanningData.insert(cnrConfigId, info);
 
-        m_initPlan.data().push_back(info);
+        m_initPlan.data.push_back(info);
 
         const CnrConfig cnrConfig = m_cnrConfigs.value(cnrConfigId);
 
         ItemData id(cnrConfig);
-        if (m_frequencyPlanningData.contains(cnrConfig.id()))
+        if (m_frequencyPlanningData.contains(cnrConfig.id))
         {
             FrequencyPlanningData fpd = info;
-            id.readOnly = isReadOnly(fpd.properties());
-            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+            id.readOnly = isReadOnly(fpd.properties);
+            QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
 
             if (circuits.size() > 1)
             {
@@ -241,7 +243,7 @@ LoadFrequencyPlanningDialogModel::ItemData LoadFrequencyPlanningDialogModel::ite
 
 QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int role) const
 {
-    if ((role != Qt::DisplayRole && role != Qt::ToolTipRole && role != Qt::UserRole && role != Qt::TextColorRole &&
+    if ((role != Qt::DisplayRole && role != Qt::ToolTipRole && role != Qt::UserRole && role != Qt::ForegroundRole &&
          role != Qt::BackgroundRole && role != Qt::CheckStateRole) ||
         !index.isValid())
         return NGLTreeModel::data(index, role);
@@ -283,7 +285,7 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
             case FUNCTION: {
                 if (!rc)
                     return QStringLiteral("-");
-                return QString::fromStdString(m_freqSetData[rc->frequencySetDataId()].function());
+                return QString::fromStdString(m_freqSetData[rc->frequencySetDataId()].function);
             }
             case DEVICE: {
 
@@ -292,7 +294,7 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
                 RadioCircuitVHF* rcVhf = dynamic_cast<RadioCircuitVHF*>(rc);
                 if (!rcVhf)
                     return QStringLiteral("-");
-                return toString(m_freqSetData[rc->frequencySetDataId()].frequencyBand().underlying());
+                return toString(m_freqSetData[rc->frequencySetDataId()].frequencyBand);
             }
             case FREQUENCY: {
                 QLocale locale(QLocale::German);
@@ -304,7 +306,7 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
                     if (rcVhf && isAkwMode(rcVhf->operatingMode))
                         return QStringLiteral("-");
                     return tr("%1 MHz").arg(
-                        locale.toString(m_freqSetData[rc->frequencySetDataId()].frequency() / 1000., 'f', 3));
+                        locale.toString(m_freqSetData[rc->frequencySetDataId()].frequency / 1000., 'f', 3));
                 }
                 else
                 {
@@ -324,45 +326,45 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].akwBundle().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].akwBundle.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].akwBundle().get();
+                return m_freqSetData[rc->frequencySetDataId()].akwBundle.get();
             }
             case FSB_BUNDLE: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].fsbBundle().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].fsbBundle.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].fsbBundle().get();
+                return m_freqSetData[rc->frequencySetDataId()].fsbBundle.get();
             }
             case AKW_RADIO_CIRCUIT: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit().get();
+                return m_freqSetData[rc->frequencySetDataId()].akwRadioCircuit.get();
             }
             case COMSEC: {
                 if (!rc)
                     return QStringLiteral("-");
                 if (rc->frequencySetDataId() <= 0)
                     return QStringLiteral("-");
-                if (!m_freqSetData[rc->frequencySetDataId()].comsec().is_set())
+                if (!m_freqSetData[rc->frequencySetDataId()].comsec.has_value())
                     return QStringLiteral("-");
 
-                return m_freqSetData[rc->frequencySetDataId()].comsec().get();
+                return m_freqSetData[rc->frequencySetDataId()].comsec.get();
             }
 
             case RADIO_CIRCUIT: {
                 if (!rc)
-                    return QString::fromStdString(setData.radioCircuit());
+                    return QString::fromStdString(setData.radioCircuit);
 
                 return id.name();
             }
@@ -373,7 +375,7 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
                 if (rc->radioStationId == 0)
                     return tr("Automatic");
                 else
-                    return QString::fromStdString(m_ismDtc->mainStructureElement(rc->radioStationId).name());
+                    return QString::fromStdString(m_ismDtc->mainStructureElement(rc->radioStationId).name);
             }
             case PILOTTON: {
                 if (!rc)
@@ -396,8 +398,8 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
                 return toString(rcVhf->operatingMode);
             }
             case CHANNEL: {
-                CnrChannel channel = m_avmDtc->cnrChannel(setData.cnrChannelId());
-                return QString::fromStdString(channel.name());
+                CnrChannel channel = m_avmDtc->cnrChannel(setData.cnrChannelId);
+                return QString::fromStdString(channel.name);
             }
             case PROPERTIES: {
                 if (!rc)
@@ -462,14 +464,14 @@ QVariant LoadFrequencyPlanningDialogModel::data(const QModelIndex& index, int ro
     }
 
     if (role == Qt::UserRole)
-        return setData.id();
+        return setData.id;
 
-    if (role == Qt::TextColorRole)
+    if (role == Qt::ForegroundRole)
     {
 
         for (int id : m_multipleAssignedCnrIds)
         {
-            if (id == setData.id())
+            if (id == setData.id)
                 return QColor(Qt::red);
         }
     }
@@ -533,12 +535,12 @@ int LoadFrequencyPlanningDialogModel::findCnrConfigByChannelId(int32_t channelId
     int id = -1;
     std::function<bool(const CnrConfig&)> findByChannelIdInExercise = [this, channelId,
                                                                        &id](const CnrConfig& cnrConfig) {
-        if (cnrConfig.exerciseId().is_set() && cnrConfig.exerciseId() != m_exerciseId)
+        if (cnrConfig.exerciseId.has_value() && cnrConfig.exerciseId != m_exerciseId)
             return false;
-        if (cnrConfig.cnrChannelId() != channelId)
+        if (cnrConfig.cnrChannelId != channelId)
             return false;
 
-        id = cnrConfig.id();
+        id = cnrConfig.id;
         return true;
     };
 
@@ -570,7 +572,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
         {
             ItemData itemData = treeItem->data().value<ItemData>();
 
-            if (!isCnrChannelInOwnConfig(itemData.cnrConfig.cnrChannelId()))
+            if (!isCnrChannelInOwnConfig(itemData.cnrConfig.cnrChannelId))
             {
                 m_conflicts.insert(row, CHANNEL_NOT_IN_CNR_CONFIG);
                 emit dataChanged(rowIndex, rowIndex, {Qt::BackgroundRole, Qt::DisplayRole});
@@ -627,9 +629,9 @@ bool LoadFrequencyPlanningDialogModel::isCnrChannelInOwnConfig(int32_t channelId
     for (auto it = m_existingCnrConfigs.constBegin(); it != m_existingCnrConfigs.constEnd(); ++it)
     {
         const CnrConfig cnrConfig = it.value();
-        const int32_t exerciseId = cnrConfig.exerciseId().is_set() ? cnrConfig.exerciseId().get() : 0;
+        const int32_t exerciseId = cnrConfig.exerciseId.has_value() ? cnrConfig.exerciseId.get() : 0;
 
-        if (exerciseId == m_exerciseId && cnrConfig.cnrChannelId() == channelId)
+        if (exerciseId == m_exerciseId && cnrConfig.cnrChannelId == channelId)
             return true;
     }
 
@@ -647,14 +649,14 @@ bool LoadFrequencyPlanningDialogModel::isFrequencySetDataTakenInOtherExercise(in
     {
         const FrequencyPlanning frequencyPlanning = it.value();
         const int32_t currentExerciseId =
-            frequencyPlanning.exerciseId().is_set() ? frequencyPlanning.exerciseId().get() : 0;
+            frequencyPlanning.exerciseId.has_value() ? frequencyPlanning.exerciseId.get() : 0;
 
         if (currentExerciseId == m_exerciseId)
             continue;
 
-        for (const FrequencyPlanningData& data : frequencyPlanning.data())
+        for (const FrequencyPlanningData& data : frequencyPlanning.data)
         {
-            QSet<int> frequencySetDataIds = AudioVideoManagement::frequencySetDataIds(data.properties());
+            QSet<int> frequencySetDataIds = AudioVideoManagement::frequencySetDataIds(data.properties);
 
             if (frequencySetDataIds.contains(frequencySetDataId))
                 return true;
@@ -666,12 +668,12 @@ bool LoadFrequencyPlanningDialogModel::isFrequencySetDataTakenInOtherExercise(in
 
 int32_t LoadFrequencyPlanningDialogModel::parentCnrConfigIdByFrequencySetDataId(int32_t frequencySetDataId) const
 {
-    for (const FrequencyPlanningData& currentPlanning : m_parentPlan.data())
+    for (const FrequencyPlanningData& currentPlanning : m_parentPlan.data)
     {
-        QSet<int> parentFrequencySetDataIds = AudioVideoManagement::frequencySetDataIds(currentPlanning.properties());
+        QSet<int> parentFrequencySetDataIds = AudioVideoManagement::frequencySetDataIds(currentPlanning.properties);
 
         if (parentFrequencySetDataIds.contains(frequencySetDataId))
-            return currentPlanning.cnrConfigId();
+            return currentPlanning.cnrConfigId;
     }
 
     return -1;
@@ -714,10 +716,10 @@ bool LoadFrequencyPlanningDialogModel::isSolvableConflict(LoadFrequencyPlanningD
 QSet<int> LoadFrequencyPlanningDialogModel::getOwnTakenFrequencySetIds() const
 {
     QSet<int> ownTakenFrequencySetIds;
-    ownTakenFrequencySetIds.reserve(m_parentPlan.data().size() * 2);
+    ownTakenFrequencySetIds.reserve(m_parentPlan.data.size() * 2);
 
-    for (const FrequencyPlanningData& data : m_parentPlan.data())
-        ownTakenFrequencySetIds += AudioVideoManagement::frequencySetDataIds(data.properties());
+    for (const FrequencyPlanningData& data : m_parentPlan.data)
+        ownTakenFrequencySetIds += AudioVideoManagement::frequencySetDataIds(data.properties);
 
     return ownTakenFrequencySetIds;
 }
@@ -733,10 +735,10 @@ void LoadFrequencyPlanningDialogModel::addUnassignmentForRow(int32_t unassignmen
 void LoadFrequencyPlanningDialogModel::setFrequencyPlanningData(const FrequencyPlanningData& fpd)
 {
     beginResetModel();
-    ConfigTreeItem* item = searchCnrConfig(m_rootItem, fpd.cnrConfigId());
+    ConfigTreeItem* item = searchCnrConfig(m_rootItem, fpd.cnrConfigId);
     if (!item)
         return;
-    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
+    QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties);
     ItemData data = item->data().value<ItemData>();
     item->removeAllChildren();
 
@@ -744,7 +746,7 @@ void LoadFrequencyPlanningDialogModel::setFrequencyPlanningData(const FrequencyP
     {
         data.radioCircuit = circuits[0];
         item->setData(QVariant::fromValue(data));
-        m_frequencyPlanningData.insert(fpd.cnrConfigId(), fpd);
+        m_frequencyPlanningData.insert(fpd.cnrConfigId, fpd);
     }
     if (circuits.size() <= 1)
         return;
@@ -755,7 +757,7 @@ void LoadFrequencyPlanningDialogModel::setFrequencyPlanningData(const FrequencyP
         ConfigTreeItem* childItem = new ConfigTreeItem(QVariant::fromValue(data));
         insertRow(item->childCount(), indexFromItem(item), childItem);
     }
-    m_frequencyPlanningData.insert(fpd.cnrConfigId(), fpd);
+    m_frequencyPlanningData.insert(fpd.cnrConfigId, fpd);
     endResetModel();
 }
 
@@ -819,7 +821,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
 
         ItemData itemData = item->data().value<ItemData>();
 
-        planningDataVec.append(m_frequencyPlanningData.value(itemData.cnrConfig.id()));
+        planningDataVec.append(m_frequencyPlanningData.value(itemData.cnrConfig.id));
     }
 
     return planningDataVec;
@@ -847,7 +849,7 @@ LoadFrequencyPlanningDialogModel::searchCnrConfig(const NGLTreeItem* parentItem,
     for (int r = 0; r < rowCount; ++r)
     {
         ConfigTreeItem* child = static_cast<ConfigTreeItem*>(parentItem->child(r));
-        if (child->data().value<ItemData>().cnrConfig.id() == cnrConfigId)
+        if (child->data().value<ItemData>().cnrConfig.id == cnrConfigId)
             return child;
         child = searchCnrConfig(child, cnrConfigId);
         if (child)
@@ -857,7 +859,7 @@ LoadFrequencyPlanningDialogModel::searchCnrConfig(const NGLTreeItem* parentItem,
 }
 
 DrawDelegate::DrawDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    : QStyledItemDelegate(parent)
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
index ce4835227..0060b3adc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <AudioVideoManagement/avm_qmetatypes.h>
 #include <nglwidgets/ngltreeitem.h>
 #include <AudioVideoManagement/logger.h>
 #include "avm_frequency_planning_helper.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
index 67050eebc..aef3609a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
@@ -25,7 +25,7 @@ RadioSpecificaHfWidget::RadioSpecificaHfWidget(QWidget *parent)
   
 
   
-  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF::CS_100_Hz),  ChannelSpacingHF::CS_100_Hz);
+  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF::CS_100_Hz), static_cast<int>(ChannelSpacingHF::CS_100_Hz));
 
 
   
@@ -57,7 +57,7 @@ bool RadioSpecificaHfWidget::setValues(RadioCircuit *rc)
   
 
   
-  int idx = m_ui->cobChannelSpacing->findData(static_cast<int>(spec->channelSpacing.underlying()));
+  int idx = m_ui->cobChannelSpacing->findData(static_cast<int>(spec->channelSpacing));
   m_ui->cobChannelSpacing->setCurrentIndex(idx);
   succ &= (idx >= 0);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
index 33af394c0..3b298c358 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
@@ -21,9 +21,9 @@ RadioSpecificaUhfWidget::RadioSpecificaUhfWidget(QWidget *parent)
 
   
   m_ui->rbMtAm->setProperty("myIcon", QStringLiteral(":/style/AM.svg"));
-  m_ui->rbMtAm->setProperty("enum", ModulationType::AM);
+  m_ui->rbMtAm->setProperty("enum", static_cast<int>(ModulationType::AM));
   m_ui->rbMtFm->setProperty("myIcon", QStringLiteral(":/style/FM.svg"));
-  m_ui->rbMtFm->setProperty("enum", ModulationType::FM);
+  m_ui->rbMtFm->setProperty("enum", static_cast<int>(ModulationType::FM));
 
   m_ui->rbMtAm->setChecked(true);
   connect(m_ui->bgModulationType, QOverload<QAbstractButton *, bool>::of(&QButtonGroup::buttonToggled), this, [this](QAbstractButton *btn, bool checked)
@@ -36,9 +36,9 @@ RadioSpecificaUhfWidget::RadioSpecificaUhfWidget(QWidget *parent)
 
 
   
-  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_25_00_kHz),  ChannelSpacing::CS_25_00_kHz);
-  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_12_50_kHz),  ChannelSpacing::CS_12_50_kHz);
-  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_8_33_kHz),   ChannelSpacing::CS_8_33_kHz);
+  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_25_00_kHz), static_cast<int>(ChannelSpacing::CS_25_00_kHz));
+  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_12_50_kHz), static_cast<int>(ChannelSpacing::CS_12_50_kHz));
+  m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_8_33_kHz), static_cast<int>(ChannelSpacing::CS_8_33_kHz));
 
   
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
@@ -86,7 +86,7 @@ bool RadioSpecificaUhfWidget::setValues(RadioCircuit* rc)
 
   bool succ = true;
   
-  switch(spec->modulationType.underlying())
+  switch(spec->modulationType)
   {
   case ModulationType::FM:
     m_ui->rbMtFm->setChecked(true);
@@ -100,7 +100,7 @@ bool RadioSpecificaUhfWidget::setValues(RadioCircuit* rc)
   }
 
   
-  int idx = m_ui->cobChannelSpacing->findData(static_cast<int>(spec->channelSpacing.underlying()));
+  int idx = m_ui->cobChannelSpacing->findData(static_cast<int>(spec->channelSpacing));
   m_ui->cobChannelSpacing->setCurrentIndex(idx);
   succ &= (idx >= 0);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
index 6add26f86..5883f6cbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
@@ -22,11 +22,11 @@ RadioSpecificaVhfWidget::RadioSpecificaVhfWidget(QSet<int> &assignedFrequencySet
   m_ui->setupUi(this);
 
   
-  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncNone),   RcOperatingMode::FixedFreqEncNone);
-  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKr),   RcOperatingMode::FixedFreqEncHwKr);
-  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKrKl), RcOperatingMode::FixedFreqEncHwKrKl);
-  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncNone),         RcOperatingMode::AkwEncNone);
-  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncEccm),         RcOperatingMode::AkwEncEccm);
+  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncNone), static_cast<int>(RcOperatingMode::FixedFreqEncNone));
+  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKr), static_cast<int>(RcOperatingMode::FixedFreqEncHwKr));
+  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKrKl), static_cast<int>(RcOperatingMode::FixedFreqEncHwKrKl));
+  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncNone), static_cast<int>(RcOperatingMode::AkwEncNone));
+  m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncEccm), static_cast<int>(RcOperatingMode::AkwEncEccm));
 
   
   m_ui->leFrequencySet->setEnabled(false);
@@ -62,12 +62,12 @@ bool RadioSpecificaVhfWidget::setFrequencySetData(int frequencySetDataId)
   m_frequencySetDataId = frequencySetDataId;
   m_ui->leFrequencySet->clear();
   bool found = false;
-  std::vector<FrequencySetDataWithId> dataVec = m_avmDtc->frequencySet(m_frequencySetId).data();
+  std::vector<FrequencySetDataWithId> dataVec = m_avmDtc->frequencySet(m_frequencySetId).data;
   for (const auto &it : dataVec)
   {
-    if(it.id() == m_frequencySetDataId)
+    if(it.id == m_frequencySetDataId)
     {
-      m_ui->leFrequencySet->setText(QString::fromStdString(it.function()));
+      m_ui->leFrequencySet->setText(QString::fromStdString(it.function));
       found = true;
       break;
     }
@@ -85,7 +85,7 @@ bool RadioSpecificaVhfWidget::setValues(RadioCircuit* rc)
   bool succ = true;
   
   m_operatingMode = spec->operatingMode;
-  int idx = m_ui->cobOperatingMode->findData(static_cast<int>(spec->operatingMode.underlying()));
+  int idx = m_ui->cobOperatingMode->findData(static_cast<int>(spec->operatingMode));
   m_ui->cobOperatingMode->setCurrentIndex(idx);
   succ &= (idx >= 0);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.cpp
index 17b5d2980..ec98be787 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.cpp
@@ -127,7 +127,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowFrequencyPlanningDialog(QWidget *par
 
    for(const FrequencyPlanning &planning : std::as_const(plannings))
    {
-     if(planning.exerciseId().is_set())
+     if(planning.exerciseId.has_value())
        continue;
 
     EditFrequencyPlanningDialog *dialog = new EditFrequencyPlanningDialog(m_session,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.h
index 7d33007f0..7b3bd227a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/avm_combat_net_radio_gui_plugin.h
@@ -5,6 +5,7 @@
 
 #include <AudioVideoManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
index fa1b8f91d..de4a00d97 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
@@ -23,7 +23,7 @@ ElokaDialog::ElokaDialog(LtsSession::LtsSession* session, AvaSession* avaSession
       m_elokaListCollector(m_avaSession->control()->comm(),
                            [this](QVector<AvaEloka>&& eloka) { onQueryElokaResponse(std::move(eloka)); }),
       m_streamNameMapping(streamNameMapping), m_avmDtc(avmDtc), m_avaSessionEstablished(false), m_usedCnr(),
-      m_usedTvc(), m_usedAnnouncement()
+      m_usedTvc(), m_usedAnnouncement(), m_logger(getLogger("ElokaDialog"))
 {
     Q_ASSERT(session);
     Q_ASSERT(avaSession);
@@ -172,14 +172,14 @@ void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka>&& eloka)
 
     for (const auto& cnrTvcProfile : cnrTvcProfiles)
     {
-        if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId)
+        if (cnrTvcProfile.exerciseId == exerciseId && cnrTvcProfile.operatorId == operatorId)
         {
-            for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
+            for (const auto& cnrTvcProfileData : cnrTvcProfile.data)
             {
-                if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
-                    userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
+                if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
+                    userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Cnr);
                 else
-                    userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);
+                    userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Tvc);
             }
 
             break;
@@ -212,12 +212,12 @@ bool ElokaDialog::isCnr(ElokaData& data, const QMultiMap<qint32, ElokaCircuitTyp
 
     for (const auto& cnr : cnrs)
     {
-        if ((QString::fromStdString(cnr.radioCircuit()) == data.internalName) &&
-            (userProfile.contains(cnr.id(), ElokaCircuitType::Cnr)))
+        if ((QString::fromStdString(cnr.radioCircuit) == data.internalName) &&
+            (userProfile.contains(cnr.id, ElokaCircuitType::Cnr)))
         {
             data.circuitType = ElokaCircuitType::Cnr;
-            data.party = cnr.partyId();
-            data.id = cnr.id();
+            data.party = cnr.partyId;
+            data.id = cnr.id;
             return true;
         }
     }
@@ -230,14 +230,14 @@ bool ElokaDialog::isTvc(ElokaData& data, const QMultiMap<qint32, ElokaCircuitTyp
 
     for (const auto& tvc : tvcs)
     {
-        if (tvc.exerciseId() != m_session->exerciseId())
+        if (tvc.exerciseId.value() != m_session->exerciseId())
             continue;
-        if ((QString::fromStdString(tvc.radioCircuit()) == data.internalName) &&
-            (userProfile.contains(tvc.id(), ElokaCircuitType::Tvc)))
+        if ((QString::fromStdString(tvc.radioCircuit) == data.internalName) &&
+            (userProfile.contains(tvc.id, ElokaCircuitType::Tvc)))
         {
             data.circuitType = ElokaCircuitType::Tvc;
             data.party = 0;
-            data.id = tvc.id();
+            data.id = tvc.id;
             return true;
         }
     }
@@ -250,17 +250,17 @@ bool ElokaDialog::isAnnouncement(ElokaData& data)
     QMap<qint32, Stream> streams = m_avmDtc->streams();
     for (const Stream& stream : std::as_const(streams))
     {
-        if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
-            announcements.insert(stream.id(), stream);
+        if ((stream.type == StreamType::AudioOut) || (stream.type == StreamType::AudioInOut))
+            announcements.insert(stream.id, stream);
     }
 
     for (const auto& announcement : announcements)
     {
-        if (QString::fromStdString(announcement.name()) == data.internalName)
+        if (QString::fromStdString(announcement.name) == data.internalName)
         {
             data.circuitType = ElokaCircuitType::Announcement;
             data.party = -1;
-            data.id = announcement.id();
+            data.id = announcement.id;
             data.exerciseId = m_session->exerciseId();
             data.displayName = m_streamNameMapping->displayName(data.internalName);
             return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp
index 2a882670a..0c08a7830 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp
@@ -92,7 +92,8 @@ ElokaEditDialog::ElokaEditDialog(LtsSession::LtsSession* session, AvaSession* av
                                  StreamNameMapping* streamNameMapping, const ElokaData& data, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::ElokaEditDialog),
       m_session(session), m_streamNameMapping(streamNameMapping), m_avaCtrl(avaSession->control()), m_avmDtc(avmDtc),
-      m_elokaData(data), m_cnrConfigMap(), m_tvcConfigMap(), m_announcementMap(), m_userProfile()
+      m_elokaData(data), m_cnrConfigMap(), m_tvcConfigMap(), m_announcementMap(), m_userProfile(),
+      m_logger(getLogger("ElokaEditDialog"))
 {
     Q_ASSERT(session);
     Q_ASSERT(avaSession);
@@ -160,8 +161,8 @@ bool ElokaEditDialog::init(const std::vector<qint32>& usedCnr, const std::vector
     const QMap<qint32, Stream> streams = m_avmDtc->streams();
     for (const Stream& stream : streams)
     {
-        if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
-            m_announcementMap.insert(stream.id(), stream);
+        if ((stream.type == StreamType::AudioOut) || (stream.type == StreamType::AudioInOut))
+            m_announcementMap.insert(stream.id, stream);
     }
 
     if (m_elokaData.internalName.isEmpty())
@@ -266,7 +267,7 @@ bool ElokaEditDialog::apply()
     data.startTime = m_session->partitionTime();
 
     if (userData.circuitType == ElokaCircuitType::Cnr)
-        data.party = m_cnrConfigMap.value(userData.id).partyId();
+        data.party = m_cnrConfigMap.value(userData.id).partyId;
 
     if (m_elokaData.internalName.isEmpty())
         m_avaCtrl->chooseEloka(data.internalName, data.action, data.mode);
@@ -310,8 +311,8 @@ void ElokaEditDialog::getActiveCnrs()
     const QMap<qint32, CnrConfig> cnrs = m_avmDtc->cnrConfigs();
     for (const CnrConfig& cnr : cnrs)
     {
-        if (cnr.isActive() == true)
-            m_cnrConfigMap.insert(cnr.id(), cnr);
+        if (cnr.isActive == true)
+            m_cnrConfigMap.insert(cnr.id, cnr);
     }
 }
 
@@ -322,11 +323,11 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig& data, DataModification
     {
         case DataModification::eAdded:
         case DataModification::eModified: {
-            m_cnrConfigMap.insert(data.id(), data);
+            m_cnrConfigMap.insert(data.id, data);
             break;
         }
         case DataModification::eRemoved: {
-            m_cnrConfigMap.remove(data.id());
+            m_cnrConfigMap.remove(data.id);
             break;
         }
     }
@@ -343,11 +344,11 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig& data, DataModification
     {
         case DataModification::eAdded:
         case DataModification::eModified: {
-            m_tvcConfigMap.insert(data.id(), data);
+            m_tvcConfigMap.insert(data.id, data);
             break;
         }
         case DataModification::eRemoved: {
-            m_tvcConfigMap.remove(data.id());
+            m_tvcConfigMap.remove(data.id);
             break;
         }
     }
@@ -360,18 +361,18 @@ void ElokaEditDialog::onStreamChanged(const Stream& data, DataModification modTy
 {
     DEBUG_LOG(m_logger) << "onStreamChanged";
 
-    if ((data.type() != StreamType::AudioOut) && (data.type() != StreamType::AudioInOut))
+    if ((data.type != StreamType::AudioOut) && (data.type != StreamType::AudioInOut))
         return;
 
     switch (modType)
     {
         case DataModification::eAdded:
         case DataModification::eModified: {
-            m_announcementMap.insert(data.id(), data);
+            m_announcementMap.insert(data.id, data);
             break;
         }
         case DataModification::eRemoved: {
-            m_announcementMap.remove(data.id());
+            m_announcementMap.remove(data.id);
             break;
         }
     }
@@ -385,8 +386,8 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile& data, DataModi
     Q_UNUSED(modType);
     DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
 
-    if (data.exerciseId() != m_session->exerciseId() ||
-        data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+    if (data.exerciseId != m_session->exerciseId() ||
+        data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
         return;
 
     getUserProfile();
@@ -407,13 +408,13 @@ void ElokaEditDialog::getUserProfile()
 
     for (const auto& cnrTvcProfile : cnrTvcProfiles)
     {
-        if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId)
+        if (cnrTvcProfile.exerciseId == exerciseId && cnrTvcProfile.operatorId == operatorId)
         {
-            for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
-                if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
-                    m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
+            for (const auto& cnrTvcProfileData : cnrTvcProfile.data)
+                if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
+                    m_userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Cnr);
                 else
-                    m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);
+                    m_userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Tvc);
 
             break;
         }
@@ -430,12 +431,12 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
         case ElokaCircuitType::Cnr: {
             for (const CnrConfig& cnr : std::as_const(m_cnrConfigMap))
             {
-                if (!m_userProfile.contains(cnr.id(), ElokaCircuitType::Cnr))
+                if (!m_userProfile.contains(cnr.id, ElokaCircuitType::Cnr))
                     continue;
 
-                QString internalName = QString::fromStdString(cnr.radioCircuit());
+                QString internalName = QString::fromStdString(cnr.radioCircuit);
                 QVariant userData =
-                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Cnr, cnr.id()});
+                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Cnr, cnr.id});
                 m_ui->cmbCircuit->addItem(internalName, userData);
             }
             break;
@@ -443,12 +444,12 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
         case ElokaCircuitType::Tvc: {
             for (const TvcConfig& tvc : std::as_const(m_tvcConfigMap))
             {
-                if (!m_userProfile.contains(tvc.id(), ElokaCircuitType::Tvc))
+                if (!m_userProfile.contains(tvc.id, ElokaCircuitType::Tvc))
                     continue;
 
-                QString internalName = QString::fromStdString(tvc.radioCircuit());
+                QString internalName = QString::fromStdString(tvc.radioCircuit);
                 QVariant userData =
-                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Tvc, tvc.id()});
+                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Tvc, tvc.id});
                 m_ui->cmbCircuit->addItem(internalName, userData);
             }
             break;
@@ -456,10 +457,10 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
         case ElokaCircuitType::Announcement: {
             for (const Stream& stream : std::as_const(m_announcementMap))
             {
-                QString internalName = QString::fromStdString(stream.name());
+                QString internalName = QString::fromStdString(stream.name);
                 QString displayName = m_streamNameMapping->displayName(internalName);
                 QVariant userData =
-                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Announcement, stream.id()});
+                    QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Announcement, stream.id});
                 m_ui->cmbCircuit->addItem(displayName, userData);
             }
             break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
index 99b89b71e..5506ef9f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
@@ -19,10 +19,11 @@ ElokaModel::ElokaModel(LtsSession::LtsSession *session, QObject *parent)
   tr("Endless Playback"),
   tr("Start Time")
 },
-parent)
+parent),
+  m_logger(getLogger("ElokaModel"))
 {
   Q_ASSERT(session);
-  
+
   session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
 }
 
@@ -42,7 +43,7 @@ QVariant ElokaModel::data(const QModelIndex &index,
       return QString::number(data.party);
 
     if (data.party >= 0)
-      return ParticipantManagement::trPartyName(m_ppmDtc->party(data.party).name());
+      return ParticipantManagement::trPartyName(m_ppmDtc->party(data.party).name);
     return QVariant(QLatin1Char('-'));
   }
   case RadioCircuit:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.h
index 00706cf83..e9291bb1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.h
@@ -9,7 +9,7 @@
 #include <AudioVideoManagement/avm_data_plugin_interface.h>
 #include <AudioVideoManagement/logger.h>
 #include <AudioVideoManagement/ava_types.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
index 5bdb6a8d9..bf9a5385d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
@@ -16,7 +16,8 @@ namespace AudioVideoManagement
 {
 
 MvsDialog::MvsDialog(const QString& menuGroup, LtsSession::LtsSession* session, QWidget* parent)
-    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(session),
+    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_logger(getLogger("MvsDialog")),
+      m_session(session),
       m_ui(new Ui::MvsDialog), m_menuGroup(menuGroup), m_model(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_avmDtc(nullptr), m_avmFtc(nullptr)
 {
@@ -105,7 +106,7 @@ void MvsDialog::onEditClicked()
         return;
 
     AudioVideoManagement::VideoTeam config = m_model->getRowData(currentIndex.row());
-    EditVideoTeamDialog* dialog = new EditVideoTeamDialog(config.id(), m_avmDtc, m_session->exerciseId(), config, this);
+    EditVideoTeamDialog* dialog = new EditVideoTeamDialog(config.id, m_avmDtc, m_session->exerciseId(), config, this);
 
     connect(dialog, &EditVideoTeamDialog::modifyRequest, this,
             [this](const AudioVideoManagement::VideoTeamModifyRequest& request) {
@@ -113,7 +114,7 @@ void MvsDialog::onEditClicked()
                     [this, request]() { return m_avmFtc->videoTeamModifyRequest(request, this); });
             });
 
-    addDialog(dialog, m_menuGroup, QStringLiteral("EditVideoTeam%1").arg(config.id()),
+    addDialog(dialog, m_menuGroup, QStringLiteral("EditVideoTeam%1").arg(config.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -126,12 +127,12 @@ void MvsDialog::onRemoveClicked()
 
     AudioVideoManagement::VideoTeamModifyRequest request;
     const VideoTeam team = m_model->getRowData(currentIndex.row());
-    request.id(team.id());
-    request.name(team.name());
-    request.ssrc(team.ssrc());
-    request.streamName(team.streamName());
-    request.vtPort(team.vtPort());
-    request.exerciseId(0);
+    request.id = team.id;
+    request.name = team.name;
+    request.ssrc = team.ssrc;
+    request.streamName = team.streamName;
+    request.vtPort = team.vtPort;
+    request.exerciseId = 0;
 
     m_requestHelper->startSingleRequest([this, request]() { return m_avmFtc->videoTeamModifyRequest(request, this); });
     m_model->removeRow(currentIndex.row());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp
index 458e3835c..bf5272a2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp
@@ -23,7 +23,7 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<Audio
   : EditVideoTeamDialog(id, avmDtc, exerciseId, parent)
 {
   m_videoTeam = team;
-  QString name = QString::fromStdString(m_videoTeam.name());
+  QString name = QString::fromStdString(m_videoTeam.name);
   if (!m_teamsToIndex.contains(name))
   {
     m_teamsToIndex.insert(name, m_ui->cbIdentifier->count());
@@ -33,11 +33,12 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<Audio
   m_ui->cbIdentifier->setCurrentIndex(m_teamsToIndex.value(name, 0));
   m_uiRequirements->addRequirement({m_ui->lblStreamName, [this]() { return (m_ui->leStreamName->text().size() > 0); }});
 
-  m_ui->leStreamName->setText(QString::fromStdString((m_videoTeam.streamName())));
+  m_ui->leStreamName->setText(QString::fromStdString((m_videoTeam.streamName)));
 }
 
 EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<AudioVideoManagement::Interface::Dtc> &avmDtc, int32_t exerciseId, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("EditVideoTeamDialog"))
   , m_ui(new Ui::EditVideoTeamDialog)
   , m_exerciseId(exerciseId)
   , m_id(id)
@@ -62,13 +63,13 @@ void EditVideoTeamDialog::retranslate()
 bool EditVideoTeamDialog::apply()
 {
   AudioVideoManagement::VideoTeamModifyRequest request;
-  m_id = m_videoTeam.id();
-  request.id(m_videoTeam.id());
-  request.name(m_videoTeam.name());
-  request.ssrc(m_videoTeam.ssrc());
-  request.vtPort(m_videoTeam.vtPort());
-  request.streamName() = m_ui->leStreamName->text().toStdString();
-  request.exerciseId(m_exerciseId);
+  m_id = m_videoTeam.id;
+  request.id = m_videoTeam.id;
+  request.name = m_videoTeam.name;
+  request.ssrc = m_videoTeam.ssrc;
+  request.vtPort = m_videoTeam.vtPort;
+  request.streamName = m_ui->leStreamName->text().toStdString();
+  request.exerciseId = m_exerciseId;
   emit modifyRequest(request);
   return true;
 }
@@ -76,7 +77,7 @@ bool EditVideoTeamDialog::apply()
 void EditVideoTeamDialog::init()
 {
   onCheckTakenTeams();
-  if (m_videoTeam.id() > 0)
+  if (m_videoTeam.id > 0)
     m_ui->cbIdentifier->setEnabled(false);
 
   connect(m_avmDtc.get(),  &AudioVideoManagement::Interface::Dtc::videoTeamChanged, this, &EditVideoTeamDialog::onCheckTakenTeams);
@@ -100,7 +101,7 @@ void EditVideoTeamDialog::onCheckTakenTeams()
 
   for (auto it = teams.constBegin(); it != teams.constEnd(); ++it)
   {
-    QString team = QString::fromStdString(it.value().name());
+    QString team = QString::fromStdString(it.value().name);
 
     if (m_avmDtc->isFreeVideoTeam(m_exerciseId, it.key()))
     {
@@ -108,7 +109,7 @@ void EditVideoTeamDialog::onCheckTakenTeams()
         index = m_ui->cbIdentifier->count();
 
       m_teamsToIndex.insert(team, m_ui->cbIdentifier->count());
-      m_ui->cbIdentifier->addItem(team, QVariant::fromValue(it.value().id()));
+      m_ui->cbIdentifier->addItem(team, QVariant::fromValue(it.value().id));
     }
     else
       m_takenTeams.insert(team, it.key());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
index 7980d3698..ac21803b4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
@@ -12,6 +12,7 @@ namespace AudioVideoManagement
 
 MvsModel::MvsModel(QObject* parent)
     : LtsAbstractTableModel<AudioVideoManagement::VideoTeam>({tr("Video Team Name"), tr("Stream Name")}, parent),
+      m_logger(getLogger("MvsModel")),
       m_exerciseId(-1)
 {
 }
@@ -26,9 +27,9 @@ QVariant MvsModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case CHANNEL:
-            return QString::fromStdString(m_videoTeams.value(config.id()).name());
+            return QString::fromStdString(m_videoTeams.value(config.id).name);
         case STREAM_NAME:
-            return QString::fromStdString(config.streamName());
+            return QString::fromStdString(config.streamName);
     }
 
     return QVariant();
@@ -45,7 +46,7 @@ bool MvsModel::init(int32_t exerciseId, const std::shared_ptr<AudioVideoManageme
             [this](const AudioVideoManagement::VideoTeam& data, DataModification modType) {
                 Q_UNUSED(modType);
 
-                if (data.exerciseId() == m_exerciseId)
+                if (data.exerciseId == m_exerciseId)
                     onDataChanged(data, DataModification::eAdded);
                 else
                     onDataChanged(data, DataModification::eRemoved);
@@ -55,7 +56,7 @@ bool MvsModel::init(int32_t exerciseId, const std::shared_ptr<AudioVideoManageme
     const QMap<int, AudioVideoManagement::VideoTeam> configMap = m_avmDtc->videoTeams();
     for (auto it = configMap.begin(); it != configMap.end(); ++it)
     {
-        if (it.value().exerciseId() == m_exerciseId)
+        if (it.value().exerciseId == m_exerciseId)
             configs.append(it.value());
     }
     setData(configs);
@@ -74,10 +75,10 @@ QByteArray MvsModel::modelToJson()
         DEBUG_LOG(m_logger) << "row =" << ": " << row;
         QJsonObject inner;
         const VideoTeam& config = m_vecData.at(row);
-        inner[QStringLiteral("id")] = config.id();
-        inner[QStringLiteral("exerciseId")] = config.exerciseId();
-        inner[QStringLiteral("name")] = QString::fromStdString(config.name());
-        inner[QStringLiteral("streamName")] = QString::fromStdString(config.streamName());
+        inner[QStringLiteral("id")] = config.id;
+        inner[QStringLiteral("exerciseId")] = config.exerciseId;
+        inner[QStringLiteral("name")] = QString::fromStdString(config.name);
+        inner[QStringLiteral("streamName")] = QString::fromStdString(config.streamName);
         arr += inner;
     }
 
@@ -105,14 +106,14 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
             continue;
 
         VideoTeamModifyRequest config;
-        config.id(id);
-        config.name(team.name());
-        config.ssrc(team.ssrc());
-        config.vtPort(team.vtPort());
-        config.exerciseId(m_exerciseId);
-        config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());
+        config.id = id;
+        config.name = team.name;
+        config.ssrc = team.ssrc;
+        config.vtPort = team.vtPort;
+        config.exerciseId = m_exerciseId;
+        config.streamName = obj[QStringLiteral("streamName")].toString().toStdString();
 
-        INFO_LOG(m_logger) << "insertRow: " << config.name() << " VideoTeamId=" << config.id();
+        INFO_LOG(m_logger) << "insertRow: " << config.name << " VideoTeamId=" << config.id;
         result.append(std::move(config));
     }
     return result;
@@ -122,7 +123,7 @@ bool MvsModel::isFiltered(const VideoTeam& data, DataModification modType) const
 {
 
     Q_UNUSED(modType)
-    if (data.exerciseId() != m_exerciseId)
+    if (data.exerciseId != m_exerciseId)
         return true;
     return false;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
index c7bb0052e..6e7938b74 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
@@ -14,7 +14,8 @@ namespace AudioVideoManagement
 {
 
 MvsVideoTeamDialog::MvsVideoTeamDialog(QWidget* parent)
-    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::MvsVideoTeamDialog),
+    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_logger(getLogger("MvsVideoTeamDialog")),
+      m_ui(new Ui::MvsVideoTeamDialog),
       m_session(nullptr), m_dtc(nullptr), m_ftc(nullptr), m_flmGui(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this))
 {
@@ -64,11 +65,11 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
 
     QMap<std::string, VideoTeam> teamMap;
     auto cbVt = [this, &row, &teamMap](const AudioVideoManagement::VideoTeam& vt) {
-        if (vt.exerciseId() != m_session->exerciseId())
+        if (vt.exerciseId != m_session->exerciseId())
             return;
 
-        m_teamToRow.insert(vt.programId() == 3 ? 2 : 1, vt.programId() == 3 ? 2 : 1);
-        teamMap.insert(vt.name(), vt);
+        m_teamToRow.insert(vt.programId == 3 ? 2 : 1, vt.programId == 3 ? 2 : 1);
+        teamMap.insert(vt.name, vt);
     };
     m_dtc->videoTeams(cbVt);
 
@@ -76,8 +77,8 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     QSet<int> teamId;
     for (auto rec : vts)
     {
-        if (teamMap.value(rec.streamName()).id() > 0)
-            teamId.insert(rec.teamId());
+        if (teamMap.value(rec.streamName).id > 0)
+            teamId.insert(rec.teamId);
     }
     for (auto team : teamId)
     {
@@ -86,14 +87,14 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     }
 
     auto cbMs = [this, &column](const InfrastructureManagement::MainStructureElement& mse) {
-        if (mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::RadioStation &&
-            !mse.isDeleted() && mse.id() > 0)
+        if (mse.structureElementTypeId == InfrastructureManagement::StructureElementType::RadioStation &&
+            !mse.isDeleted && mse.id > 0)
         {
-            m_stationToColumn.insert(mse.id(), column);
-            QLabel* lblStation = new QLabel(QString::fromStdString(mse.name()), this);
+            m_stationToColumn.insert(mse.id, column);
+            QLabel* lblStation = new QLabel(QString::fromStdString(mse.name), this);
             lblStation->setProperty("RadioStation", true);
             lblStation->setProperty("column", column);
-            lblStation->setProperty("name", QString::fromStdString(mse.name()));
+            lblStation->setProperty("name", QString::fromStdString(mse.name));
             m_ui->glMvs->addWidget(lblStation, 0, column++);
             lblStation->hide();
         }
@@ -101,17 +102,17 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     m_ismDtc->mainStructureElements(cbMs);
 
     auto cbRec = [this, teamMap](const AudioVideoManagement::VideoReceiver& rec) {
-        if (m_teamToRow.value(rec.teamId()) <= 0)
+        if (m_teamToRow.value(rec.teamId) <= 0)
             return;
-        if (!teamMap.contains(rec.streamName()))
+        if (!teamMap.contains(rec.streamName))
             return;
-        m_receiverMap.insert(rec.id(), rec);
-        if (m_stationToColumn.value(rec.mainStructureElementId()) > 0 && m_teamToRow.value(rec.teamId()) > 0)
+        m_receiverMap.insert(rec.id, rec);
+        if (m_stationToColumn.value(rec.mainStructureElementId) > 0 && m_teamToRow.value(rec.teamId) > 0)
         {
             ReceiverElement* btn = createReceiverElement(rec);
 
-            int row = m_teamToRow.value(rec.teamId());
-            int column = m_stationToColumn.value(rec.mainStructureElementId());
+            int row = m_teamToRow.value(rec.teamId);
+            int column = m_stationToColumn.value(rec.mainStructureElementId);
             if (!m_videoTeamButtonGroup.contains(row))
             {
                 QRadioButton* none = new QRadioButton(tr("None"), this);
@@ -121,10 +122,10 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
                 m_videoTeamButtonGroup.insert(row, new QButtonGroup(this));
                 m_videoTeamButtonGroup[row]->addButton(none, 0);
             }
-            m_videoTeamButtonGroup[row]->addButton(btn->radioButton(), rec.mainStructureElementId());
-            m_videoTeamButtonGroup[row]->setProperty("teamId", rec.teamId());
-            m_receiverIds.insert(QPair<int, int>(rec.mainStructureElementId(), rec.teamId()), rec.id());
-            bool isActive = rec.isActive();
+            m_videoTeamButtonGroup[row]->addButton(btn->radioButton(), rec.mainStructureElementId);
+            m_videoTeamButtonGroup[row]->setProperty("teamId", rec.teamId);
+            m_receiverIds.insert(QPair<int, int>(rec.mainStructureElementId, rec.teamId), rec.id);
+            bool isActive = rec.isActive;
             btn->setButtonChecked(isActive);
             btn->radioButton()->setChecked(isActive);
             m_ui->glMvs->addWidget(btn, row, column);
@@ -167,32 +168,32 @@ bool MvsVideoTeamDialog::apply()
 
         if (itBg.value()->checkedId() == 0)
         {
-            req.isActive(false);
-            req.id(0);
+            req.isActive = false;
+            req.id = 0;
             QMapIterator<qint32, AudioVideoManagement::VideoReceiver> i(m_receiverMap);
             while (i.hasNext())
             {
                 i.next();
-                if ((i.value().isActive()) && i.value().teamId() == teamId)
-                    req.id(i.value().id());
+                if ((i.value().isActive) && i.value().teamId == teamId)
+                    req.id = i.value().id;
             }
         }
         else
         {
-            req.isActive(true);
-            req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
+            req.isActive = true;
+            req.id = m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId));
         }
         DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key() << " mainStructureElementId=" << mainStructureElementId
-                            << " teamId=" << teamId << " id=" << req.id() << " isActive=" << req.isActive();
+                            << " teamId=" << teamId << " id=" << req.id << " isActive=" << req.isActive;
 
-        if ((m_receiverMap.value(req.id()).isActive() != req.isActive()) && req.id() > 0)
+        if ((m_receiverMap.value(req.id).isActive != req.isActive) && req.id > 0)
         {
 
             if (oldActiveId > 0)
             {
                 VideoReceiverModifyActiveRequest reqInactive;
-                reqInactive.id(oldActiveId);
-                reqInactive.isActive(false);
+                reqInactive.id = oldActiveId;
+                reqInactive.isActive = false;
                 m_requestHelper->addRequest(
                     [this, reqInactive]() { return m_ftc->videoReceiverModifyActiveRequest(reqInactive, this); });
             }
@@ -207,30 +208,30 @@ ReceiverElement* MvsVideoTeamDialog::createReceiverElement(const VideoReceiver&
 {
     ReceiverElement* re = new ReceiverElement(this);
     re->init(rec);
-    if (rec.isActive())
-        m_oldActiveTeamToRec.insert(rec.teamId(), rec.id());
-    m_elementList.insert(rec.teamId(), re);
+    if (rec.isActive)
+        m_oldActiveTeamToRec.insert(rec.teamId, rec.id);
+    m_elementList.insert(rec.teamId, re);
     return re;
 }
 
 void MvsVideoTeamDialog::updateReceiverButton(const AudioVideoManagement::VideoReceiver& rec, DataModification modType)
 {
     Q_UNUSED(modType);
-    m_receiverMap.insert(rec.id(), rec);
-    for (auto it = m_elementList.lowerBound(rec.teamId()); it != m_elementList.end(); ++it)
+    m_receiverMap.insert(rec.id, rec);
+    for (auto it = m_elementList.lowerBound(rec.teamId); it != m_elementList.end(); ++it)
     {
-        if (it.key() != rec.teamId())
+        if (it.key() != rec.teamId)
             break;
         auto* receiverElement = it.value();
-        if (receiverElement->property("recId").toInt() != rec.id())
+        if (receiverElement->property("recId").toInt() != rec.id)
             continue;
 
-        receiverElement->setButtonChecked(rec.isActive());
-        receiverElement->setSnr(rec.snr());
-        receiverElement->setDbm(rec.dbm());
-        receiverElement->setStreamName(QString::fromStdString(rec.streamName()));
-        receiverElement->setFrequency(rec.frequency());
-        receiverElement->setIsLocked(rec.isLocked());
+        receiverElement->setButtonChecked(rec.isActive);
+        receiverElement->setSnr(rec.snr);
+        receiverElement->setDbm(rec.dbm);
+        receiverElement->setStreamName(QString::fromStdString(rec.streamName));
+        receiverElement->setFrequency(rec.frequency);
+        receiverElement->setIsLocked(rec.isLocked);
     }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
index 361cebf8a..88b248010 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
@@ -36,12 +36,12 @@ QRadioButton *ReceiverElement::radioButton()
 
 bool ReceiverElement::init(const AudioVideoManagement::VideoReceiver &rec)
 {
-  setProperty("teamId", rec.teamId());
-  setProperty("recId", rec.id());
+  setProperty("teamId", rec.teamId);
+  setProperty("recId", rec.id);
 
-  setSnr(rec.snr());
-  setDbm(rec.dbm());
-  setButtonChecked(rec.isActive());
+  setSnr(rec.snr);
+  setDbm(rec.dbm);
+  setButtonChecked(rec.isActive);
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.cpp
index 6df6b808c..6c70b8856 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "avm_edit_training_voice_communication_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ui_avm_edit_training_voice_communication_dialog.h"
 #include <AudioVideoManagement/avm_dtc.h>
@@ -45,18 +46,18 @@ EditTrainingVoiceCommunicationDialog::EditTrainingVoiceCommunicationDialog(const
 
 EditTrainingVoiceCommunicationDialog::EditTrainingVoiceCommunicationDialog(const TvcConfig &config, const std::shared_ptr<Interface::Dtc> &avmDtc, const std::shared_ptr<Interface::Ftc> &avmFtc,
                                                                            ExerciseManagement::Interface::Dtc *exmDtc, int32_t exerciseId, QWidget *parent)
-  : EditTrainingVoiceCommunicationDialog(config.id(), avmDtc, avmFtc, exmDtc, exerciseId, parent)
+  : EditTrainingVoiceCommunicationDialog(config.id, avmDtc, avmFtc, exmDtc, exerciseId, parent)
 {
-  m_ui->leInfo->setText(QString::fromStdString(config.info()));
-  m_ui->chkRecording->setChecked(config.recording());
+  m_ui->leInfo->setText(QString::fromStdString(config.info));
+  m_ui->chkRecording->setChecked(config.recording);
 
   {
     QSignalBlocker   blockSignals(m_ui->chkIsGlobal);
-    m_ui->chkIsGlobal->setChecked(!config.exerciseId().is_set());
+    m_ui->chkIsGlobal->setChecked(!config.exerciseId.has_value());
   }
 
-  m_ui->leRadioCircuit->setText(QString::fromStdString(config.radioCircuit()));
-  initCbChannelsForEdit(config.tetraChannelId());
+  m_ui->leRadioCircuit->setText(QString::fromStdString(config.radioCircuit));
+  initCbChannelsForEdit(config.tetraChannelId);
 }
 
 EditTrainingVoiceCommunicationDialog::EditTrainingVoiceCommunicationDialog(int32_t id, const std::shared_ptr<Interface::Dtc> &avmDtc, const std::shared_ptr<Interface::Ftc> &avmFtc,
@@ -69,6 +70,7 @@ EditTrainingVoiceCommunicationDialog::EditTrainingVoiceCommunicationDialog(int32
   , m_avmFtc(avmFtc)
   , m_exmDtc(exmDtc)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   Q_ASSERT(id >= 0);
   Q_ASSERT(exmDtc);
@@ -99,16 +101,16 @@ bool EditTrainingVoiceCommunicationDialog::apply()
 {
   ModifyTvcConfigRequest request;
 
-  request.tetraChannelId(m_ui->cbChannel->currentData().toInt());
-  Q_ASSERT(request.tetraChannelId() > 0);
-  request.radioCircuit(m_ui->leRadioCircuit->text().toStdString());
-  request.recording(m_ui->chkRecording->isChecked());
-  request.info(m_ui->leInfo->text().toStdString());
-  request.id(m_id);
+  request.tetraChannelId = m_ui->cbChannel->currentData().toInt();
+  Q_ASSERT(request.tetraChannelId > 0);
+  request.radioCircuit = m_ui->leRadioCircuit->text().toStdString();
+  request.recording = m_ui->chkRecording->isChecked();
+  request.info = m_ui->leInfo->text().toStdString();
+  request.id = m_id;
 
   bool   isLocal = !m_ui->chkIsGlobal->isChecked();
   if (isLocal)
-    request.exerciseId(m_exerciseId);
+    request.exerciseId = m_exerciseId;
 
   return m_requestHelper->startSingleRequest([this, request] () { return m_avmFtc->modifyTvcConfigRequest(request, this); });
 }
@@ -142,18 +144,18 @@ void EditTrainingVoiceCommunicationDialog::updateFreeChannelsAndTakenNames()
   const auto     allTvcConfigs = m_avmDtc->tvcConfigs();
   for (const auto &tvcConfig : allTvcConfigs)
   {
-    if (m_id > 0 && m_id == tvcConfig.id())
+    if (m_id > 0 && m_id == tvcConfig.id)
       continue; 
 
     if (!isGlobal)
     {
-      if (tvcConfig.exerciseId().is_set() && !exercises.contains(tvcConfig.exerciseId().get()))
+      if (tvcConfig.exerciseId.has_value() && !exercises.contains(tvcConfig.exerciseId.get()))
         continue;
     }
-    if (tvcConfig.exerciseId().is_set() && exercisesIgnore.contains(tvcConfig.exerciseId().get()))
+    if (tvcConfig.exerciseId.has_value() && exercisesIgnore.contains(tvcConfig.exerciseId.get()))
       continue;
-    m_takenNames.push_back(QString::fromStdString(tvcConfig.radioCircuit()));
-    freeChannels.removeOne(tvcConfig.tetraChannelId());
+    m_takenNames.push_back(QString::fromStdString(tvcConfig.radioCircuit));
+    freeChannels.removeOne(tvcConfig.tetraChannelId);
   }
 
   updateCbChannels(std::move(freeChannels));
@@ -167,7 +169,7 @@ void EditTrainingVoiceCommunicationDialog::updateCbChannels(QVector<int> &&freeC
 
   const auto   allChannels = m_avmDtc->tvcChannels();
 
-  const auto byName = [&allChannels] (int leftChannelId, int rightChannelId) { return QLatin1String(allChannels[leftChannelId].name().c_str()) < QLatin1String(allChannels[rightChannelId].name().c_str()); };
+  const auto byName = [&allChannels] (int leftChannelId, int rightChannelId) { return QLatin1String(allChannels[leftChannelId].name.c_str()) < QLatin1String(allChannels[rightChannelId].name.c_str()); };
   std::sort(freeChannels.begin(), freeChannels.end(), byName);
 
   int currentlySelctedChannelId = m_ui->cbChannel->currentData().toInt(); 
@@ -179,7 +181,7 @@ void EditTrainingVoiceCommunicationDialog::updateCbChannels(QVector<int> &&freeC
   m_ui->cbChannel->clear();
   m_ui->cbChannel->addItem(NO_CHANNEL(), -1);
   for (const auto &channelId : freeChannels)
-    m_ui->cbChannel->addItem(QString::fromStdString(allChannels[channelId].name()), channelId);
+    m_ui->cbChannel->addItem(QString::fromStdString(allChannels[channelId].name), channelId);
   m_ui->cbChannel->setCurrentIndex(newlySelectedIndex);
 }
 
@@ -189,18 +191,18 @@ QVector<int> EditTrainingVoiceCommunicationDialog::exercisesToConsider() const
 {
   const auto   allExercises_ = m_exmDtc->exercises();
 
-  if (!isActive(allExercises_[m_exerciseId].state()))
+  if (!isActive(allExercises_[m_exerciseId].state))
     return {m_exerciseId};
 
   auto         allExercises = allExercises_.values();
-  auto         newEnd = std::remove_if(allExercises.begin(), allExercises.end(), [] (const ExerciseManagement::Exercise &ex) { return ex.isDeleted(); }); 
+  auto         newEnd = std::remove_if(allExercises.begin(), allExercises.end(), [] (const ExerciseManagement::Exercise &ex) { return ex.isDeleted; }); 
   allExercises.erase(newEnd, allExercises.end());
 
   QVector<int>   toBeConsidered;
   for (const auto &exercise : std::as_const(allExercises))
   {
-    if (::isActive(exercise.state()))
-      toBeConsidered.append(exercise.id());
+    if (::isActive(exercise.state))
+      toBeConsidered.append(exercise.id);
   }
   return toBeConsidered;
 }
@@ -211,16 +213,16 @@ QVector<int> EditTrainingVoiceCommunicationDialog::exercisesToIgnore() const
 
   auto canBeIgnored = [] (const ExerciseManagement::Exercise &ex) -> bool
   {
-    return (ex.state() == ExerciseManagement::ExerciseState::Stopped ||
-            ex.state() == ExerciseManagement::ExerciseState::Terminated ||
-            ex.isDeleted());
+    return (ex.state == ExerciseManagement::ExerciseState::Stopped ||
+            ex.state == ExerciseManagement::ExerciseState::Terminated ||
+            ex.isDeleted);
   };
 
   QVector<int> exercisesToIgnore;
   for (const auto &ex : allExercises)
   {
     if (canBeIgnored(ex))
-      exercisesToIgnore += ex.id();
+      exercisesToIgnore += ex.id;
   }
   return exercisesToIgnore;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
index 1d299f6bd..06ec40873 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_training_voice_communication_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "avm_edit_training_voice_communication_dialog.h"
 #include "avm_training_voice_communication_dialog_model.h"
@@ -21,6 +22,7 @@ TrainingVoiceCommunicationDialog::TrainingVoiceCommunicationDialog(const QString
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(session),
       m_ui(new Ui::TrainingVoiceCommunicationDialog), m_menuGroup(menuGroup),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_avmDtc(nullptr), m_avmFtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -125,7 +127,7 @@ void TrainingVoiceCommunicationDialog::onEditClicked()
 
     EditTrainingVoiceCommunicationDialog* dialog =
         new EditTrainingVoiceCommunicationDialog(config, m_avmDtc, m_avmFtc, m_exmDtc, m_session->exerciseId(), this);
-    addDialog(dialog, m_menuGroup, QStringLiteral("EditTVCConfig%1").arg(config.id()),
+    addDialog(dialog, m_menuGroup, QStringLiteral("EditTVCConfig%1").arg(config.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -136,7 +138,7 @@ void TrainingVoiceCommunicationDialog::onRemoveClicked()
     if (!currentIndex.isValid())
         return;
 
-    Core::RemoveElementRequest request(m_model->getRowData(currentIndex.row()).id());
+    Core::RemoveElementRequest request(m_model->getRowData(currentIndex.row()).id);
 
     m_requestHelper->startSingleRequest([this, request]() { return m_avmFtc->removeTvcConfigRequest(request, this); });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
index 6b90dd5a9..48ccb39d1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "avm_training_voice_communication_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <FileManagement/flm_translation.h>
 #include <QtCore/QJsonArray>
@@ -14,6 +15,7 @@ TrainingVoiceCommunicationDialogModel::TrainingVoiceCommunicationDialogModel(QOb
     : LtsAbstractTableModel<AudioVideoManagement::TvcConfig>(
           {tr("Channel Number"), tr("Radio Circuit"), tr("Recording"), tr("Info"), tr("Global")}, parent),
       m_exerciseId(-1)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -27,15 +29,15 @@ QVariant TrainingVoiceCommunicationDialogModel::data(const QModelIndex& index, i
     switch (index.column())
     {
         case CHANNEL:
-            return QString::fromStdString(m_tetraChannels.value(config.tetraChannelId()).name());
+            return QString::fromStdString(m_tetraChannels.value(config.tetraChannelId).name);
         case RADIO_CIRCUIT:
-            return QString::fromStdString(config.radioCircuit());
+            return QString::fromStdString(config.radioCircuit);
         case RECORDING:
-            return config.recording() ? tr("On") : tr("Off");
+            return config.recording ? tr("On") : tr("Off");
         case INFO:
-            return QString::fromStdString(config.info());
+            return QString::fromStdString(config.info);
         case GLOBAL:
-            return config.exerciseId().is_set() ? tr("No") : tr("Yes");
+            return config.exerciseId.has_value() ? tr("No") : tr("Yes");
     }
 
     return QVariant();
@@ -70,11 +72,11 @@ QByteArray TrainingVoiceCommunicationDialogFilter::modelToJson() const
         QJsonObject inner;
         const TvcConfig& config = m_sourceModel->getRowData(sourceRow);
 
-        inner[QLatin1String("isGlobal")] = !config.exerciseId().is_set();
-        inner[QLatin1String("info")] = QString::fromStdString(config.info());
-        inner[QLatin1String("radioCircuit")] = QString::fromStdString(config.radioCircuit());
-        inner[QLatin1String("recording")] = config.recording();
-        inner[QLatin1String("tetraChannelId")] = config.tetraChannelId();
+        inner[QLatin1String("isGlobal")] = !config.exerciseId.has_value();
+        inner[QLatin1String("info")] = QString::fromStdString(config.info);
+        inner[QLatin1String("radioCircuit")] = QString::fromStdString(config.radioCircuit);
+        inner[QLatin1String("recording")] = config.recording;
+        inner[QLatin1String("tetraChannelId")] = config.tetraChannelId;
         arr += inner;
     }
 
@@ -98,14 +100,14 @@ TrainingVoiceCommunicationDialogModel::jsonToTvcConfigVector(const QByteArray& c
         ModifyTvcConfigRequest config;
 
         if (!obj.contains(QLatin1String("isGlobal")) || !obj[QLatin1String("isGlobal")].toBool())
-            config.exerciseId(m_exerciseId);
-        config.id(0);
-        config.info(obj[QLatin1String("info")].toString().toStdString());
-        config.radioCircuit(obj[QLatin1String("radioCircuit")].toString().toStdString());
-        config.recording(obj[QLatin1String("recording")].toBool());
-        config.tetraChannelId(obj[QLatin1String("tetraChannelId")].toInt());
+            config.exerciseId = m_exerciseId;
+        config.id = 0;
+        config.info = obj[QLatin1String("info")].toString().toStdString();
+        config.radioCircuit = obj[QLatin1String("radioCircuit")].toString().toStdString();
+        config.recording = obj[QLatin1String("recording")].toBool();
+        config.tetraChannelId = obj[QLatin1String("tetraChannelId")].toInt();
 
-        INFO_LOG(m_logger) << "insertRow: " << config.radioCircuit() << " tvcChannelId=" << config.tetraChannelId();
+        INFO_LOG(m_logger) << "insertRow: " << config.radioCircuit << " tvcChannelId=" << config.tetraChannelId;
         result.push_back(std::move(config));
     }
     return result;
@@ -123,7 +125,7 @@ bool TrainingVoiceCommunicationDialogFilter::filterAcceptsRow(int sourceRow, con
 {
     TvcConfig tvcConfig = m_sourceModel->getRowData(sourceRow);
 
-    if (tvcConfig.exerciseId().is_set() && tvcConfig.exerciseId().get() != m_exerciseId)
+    if (tvcConfig.exerciseId.has_value() && tvcConfig.exerciseId.get() != m_exerciseId)
         return false;
 
     return LtsColumnFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/CMakeLists.txt
index 2434ab4e8..3d712e5cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/CMakeLists.txt
@@ -7,7 +7,14 @@
 
 
 ADD_SUBDIRECTORY(Common)
-ADD_SUBDIRECTORY(Gui)
+# The GUI plugins link BuildingViewerCommon, which is skipped when BgViewer is absent
+# (RETURN() in Common/CMakeLists.txt). Skip the Gui subdirectory in that case so the
+# plugins are not built against a non-existent common lib (and its generated export header).
+if(TARGET BuildingViewerCommon)
+  ADD_SUBDIRECTORY(Gui)
+else()
+  MESSAGE(STATUS "BuildingViewer Gui plugins skipped (BuildingViewerCommon not built)")
+endif()
 
 #
 # Gui Plugin Interface
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
index 1e645a2ba..484aa8e8b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
@@ -6,7 +6,7 @@
 #include "bdv_dds_controller.h"
 
 #include <Common/bdv_communication_interface_internal.h>
-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/lts_session.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
index 1ee1e8504..b47d79683 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bdv_dds_controller.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "bdv_communication_interface_internal.h"
 #include "bdv_controller.h"
@@ -13,7 +14,7 @@
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -551,7 +552,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
 {
     Q_UNUSED(modType)
 
-    switch (srp.state().underlying())
+    switch (srp.state())
     {
         case SituationReplay::SrpState::Stopped:
             m_connection->setSimuationPace(1.0);
@@ -600,7 +601,7 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage
 
     BuildingViewer::AssetTypes assetType;
     QString strAssetType;
-    switch (mp.type().underlying())
+    switch (mp.type())
     {
         case InfrastructureManagement::MountingPointType::AnnouncementUnit:
             assetType = BuildingViewer::AssetTypes::AnnouncementUnit;
@@ -1031,7 +1032,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
     int lineType = 2;
     m_pdmDtc->chargeType(hli.chargeTypeId());
 
-    lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0).underlying();
+    lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0);
 
     m_connection->playerHit(hli.id(), partSrc.id(), partDst.id(), originatorSrc, injuryDest, buildingIdSrc,
                             roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime());
@@ -1177,7 +1178,7 @@ void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::Bo
         return;
 
     ParticipantManagement::Participant participant;
-    if (trap.partyId().is_set())
+    if (trap.partyId().has_value())
         participant.partyId() = trap.partyId().get();
     participant.designator() = trap.name();
     participant.designator() = trap.name();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp
index c336c91bd..8654e155e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp
@@ -288,7 +288,7 @@ void BuildingEdit::onDestroyElement()
     std::vector<int32_t> structureElementIds;
     getStructureElementIds(m_model->privateData(selIndex), structureElementIds);
 
-    sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::CatastrophicKill, structureElementIds);
+    sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, structureElementIds);
 }
 
 void BuildingEdit::getStructureElementIds(NGLTreeItem* item, std::vector<int32_t>& structureElementIds)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
index a8be7bf9f..b91028f8b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bdv_edit_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Common/logger.h>
 #include <QtWidgets/QApplication>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
index d0532ede6..78eb31115 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
@@ -14,31 +14,31 @@ public:
 
   
   explicit TreeItem(const InfrastructureManagement::MainStructureElement &mse)
-    : m_displayName(toQString(mse.name()))
-    , m_structureElementId(mse.id())
-    , m_name(toQString(mse.name()) + QStringLiteral(" (ModelId: ") + QString::number(mse.modelId()) + QStringLiteral(")"))
+    : m_displayName(toQString(mse.name))
+    , m_structureElementId(mse.id)
+    , m_name(toQString(mse.name) + QStringLiteral(" (ModelId: ") + QString::number(mse.modelId) + QStringLiteral(")"))
   {}
 
   
   explicit TreeItem(const InfrastructureManagement::StructureElement &se)
-    : m_displayName(toQString(se.displayName()))
+    : m_displayName(toQString(se.displayName))
     , m_isFloor(true)
-    , m_structureElementId(se.id())
-    , m_mountingPointId(se.mountingPointId())
-    , m_name(toQString(se.name()))
+    , m_structureElementId(se.id)
+    , m_mountingPointId(se.mountingPointId)
+    , m_name(toQString(se.name))
   {}
 
   
   explicit TreeItem(const InfrastructureManagement::StructureElement &se
                     , double fortifyFactor
                     , qint32 damagePercent)
-    : m_displayName(toQString(se.displayName()))
+    : m_displayName(toQString(se.displayName))
     , m_fortifyFactor(fortifyFactor)
     , m_damagePercent(damagePercent)
     , m_isRoom(true)
-    , m_structureElementId(se.id())
-    , m_mountingPointId(se.mountingPointId())
-    , m_name(toQString(se.name()))
+    , m_structureElementId(se.id)
+    , m_mountingPointId(se.mountingPointId)
+    , m_name(toQString(se.name))
   {}
 
   int32_t structureElementId() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
index 67fce3071..68919ca61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
@@ -4,7 +4,7 @@
 #include "topic_editor.h"
 #include "ui_topic_editor.h"
 
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.h
index 3e0b85d86..e4da0f19d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <BuildingViewer/BuildingViewer/bdv_viewer_data_view.h>
+#include <Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h>
 #include <TopicEditorBase/topic_editor_base.h>
 #include <LtsSession/lts_session.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.cpp
index ab169a335..dae6986c8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bdv_replay_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
index 629eb8807..074d9cef5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
@@ -6,7 +6,7 @@
 #include "bdv_thread_video_exporter.h"
 #include "bdv_viewer_gui_plugin.h"
 
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsSession/lts_session.h>
 #include <QtCore/QDir>
 #include <QtCore/QJsonDocument>
@@ -15,7 +15,7 @@
 
 #ifdef EXPORT_BDV_TOPIC_AS_JSON
 #include <Common/BgViewer/viewerCtrl/viewwidgetstate.h>
-#include <Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_helper.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <QtCore/QFile>
 #else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.h
index 11ccdb13a..a8095ecde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_helper.h>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
index bce0e7755..0deb8a8b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
@@ -5,7 +5,7 @@
 #include "ui_bdv_viewer_data_view.h"
 #include "bdv_viewer_data_model.h"
 
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 
 #include <QtGui/QKeyEvent>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
index 19c84daab..2d9bb7773 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
@@ -25,9 +25,9 @@
 #include "bdv_topic_replay_interface.h"
 #include "bdv_viewer_gui_plugin_provider.h"
 
-#include <Common/bdv_helper.h>
-#include <Common/bdv_controller.h>
-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>
 
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.cpp
index 7f25ec01a..e6bb37312 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bdv_viewer_gui_plugin_provider.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.h
index 5bd3769a7..5768b4d71 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin_provider.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>
 #include <Common/logger.h>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_settings.cpp
index cfeeece98..abd9fc50d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_settings.cpp
@@ -3,7 +3,7 @@
 
 #include "ui_bdv_viewer_settings.h"
 #include "bdv_viewer_settings.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 
 #include <LtsUtilsSettings/settings.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
index 2d70f6e3e..75d9e818b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
@@ -2,7 +2,7 @@
 
 #include "ui_bdv_viewer_state.h"
 #include "bdv_viewer_state.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsSession/lts_session_manager.h>
 #include <PluginInterfaces/data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/CMakeLists.txt
index 6fad85778..3a0946fa7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/CMakeLists.txt
@@ -80,7 +80,10 @@ if(QT6_GUI_AVAILABLE)
     SmoMonitorsGuiPluginInterface
     LtsDataView
     GuiPluginInterface
-  
+    advancedSymbology
+    advancedSymbologyGui
+    svcPpmCommon
+
   )
 endif()
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
index 6a502d5e0..e744184da 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bld_config_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_bld_config_dialog.h"
 
@@ -15,6 +16,7 @@ namespace Buildings
 BldConfigDialog::BldConfigDialog(int bldEntityId, const QString& displayName, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_bldEntityId(bldEntityId),
       m_displayName(displayName), m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BldConfigDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -63,13 +65,13 @@ bool BldConfigDialog::init(LtsSession::LtsSession* session)
 void BldConfigDialog::fillCbx()
 {
     m_ui->cmbStatus->clear();
-    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange),
-                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange);
-    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady),
-                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
-    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill),
-                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
-    m_ui->cmbStatus->setCurrentIndex(m_ui->cmbStatus->findData(m_bldState.vulnerabilityState().underlying()));
+    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange),static_cast<int>(
+                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange));
+    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady),static_cast<int>(
+                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady));
+    m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill),static_cast<int>(
+                             ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill));
+    m_ui->cmbStatus->setCurrentIndex(m_ui->cmbStatus->findData(static_cast<int>(m_bldState.vulnerabilityState)));
 }
 
 bool BldConfigDialog::apply()
@@ -84,16 +86,16 @@ bool BldConfigDialog::apply()
 
     m_requestHelper->addRequest([this]() {
         Buildings::Building building;
-        building.buildingId(m_bldEntityId);
+        building.buildingId = m_bldEntityId;
 
         SetBuildingStatesRequest requestData;
-        requestData.buildings({building});
+        requestData.buildings = {building};
 
         ProjectDataManagement::VulnerabilityState state =
             static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cmbStatus->currentData().toInt());
-        requestData.vulnerabilityState(state);
+        requestData.vulnerabilityState = state;
 
-        requestData.resetContamination(m_ui->chbResetContamination->isChecked());
+        requestData.resetContamination = m_ui->chbResetContamination->isChecked();
 
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentIndex: " << m_ui->cmbStatus->currentIndex();
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state;
@@ -111,7 +113,7 @@ void Buildings::BldConfigDialog::slotCmbStatusCurrentIndexChanged(int index)
     Q_UNUSED(index)
     ProjectDataManagement::VulnerabilityState state =
         static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cmbStatus->currentData().toInt());
-    if (state == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    if (state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     {
         m_ui->chbResetContamination->setEnabled(true);
         m_ui->chbResetContamination->setChecked(false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog.cpp
index 2ec80b366..561421e83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "bld_history_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_bld_history_dialog.h"
 
 #include "bld_history_dialog_model.h"
@@ -14,6 +15,7 @@ BuildingHistoryDialog::BuildingHistoryDialog(const QString &bldName, QWidget *pa
   , m_model(new BuildingHistoryDialogModel(this))
   , m_proxyModel(new BuildingHistoryDialogProxyModel(this))
   , m_ui(new Ui::BuildingHistoryDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_proxyModel->setSourceModel(m_model);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.cpp
index 4fe3196f1..b270af210 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bld_history_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Buildings/bld_data_plugin_interface.h>
@@ -17,6 +18,7 @@ BuildingHistoryDialogModel::BuildingHistoryDialogModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<Buildings::HistoryStateItemEx>(
           {tr("Time"), tr("Charge Type"), tr("Originator"), tr("Damage [%]"), tr("Contamination")}, parent),
       m_mseId(-1)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -37,7 +39,7 @@ bool BuildingHistoryDialogModel::initModel(int mseId, LtsSession::LtsSession* se
     connect(dtc.get(), &Interface::Dtc::historyStateChanged, this, &BuildingHistoryDialogModel::onHistoryStateChanged);
 
     DEBUG_LOG(m_logger) << "m_mseId=" << m_mseId;
-    reinitModel(dtc->historyState(m_mseId).stateHistory());
+    reinitModel(dtc->historyState(m_mseId).stateHistory);
     return true;
 }
 
@@ -53,15 +55,15 @@ QVariant BuildingHistoryDialogModel::data(const QModelIndex& index, int role) co
     switch (index.column())
     {
         case Time:
-            return QDateTime::fromMSecsSinceEpoch(data.time());
+            return QDateTime::fromMSecsSinceEpoch(data.time);
         case Charge:
             return data.chargeTypeName;
         case Originator:
             return data.originatorName;
         case Damage:
-            return data.damagePercent();
+            return data.damagePercent;
         case Contamination:
-            return getContaminations(data.contaminationStates());
+            return getContaminations(data.contaminationStates);
     }
     return QVariant();
 }
@@ -69,7 +71,7 @@ QVariant BuildingHistoryDialogModel::data(const QModelIndex& index, int role) co
 void BuildingHistoryDialogModel::onHistoryStateChanged(const Buildings::HistoryState& data, DataModification modType)
 {
     DEBUG_LOG(m_logger) << "onHistoryStateChanged";
-    if (m_mseId != data.mseId())
+    if (m_mseId != data.mseId)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -79,7 +81,7 @@ void BuildingHistoryDialogModel::onHistoryStateChanged(const Buildings::HistoryS
         endResetModel();
         return;
     }
-    reinitModel(data.stateHistory());
+    reinitModel(data.stateHistory);
 }
 
 QString BuildingHistoryDialogModel::getChargeTypeName(int chargeTypeId, bool shortName) const
@@ -92,42 +94,42 @@ QString BuildingHistoryDialogModel::getChargeTypeName(int chargeTypeId, bool sho
 
 QString BuildingHistoryDialogModel::getOriginatorName(const HistoryStateItemEx& data) const
 {
-    QString originatorType(ProjectDataManagement::toString(data.originatorType()));
+    QString originatorType(ProjectDataManagement::toString(data.originatorType));
     QString originator;
-    switch (data.originatorType().underlying())
+    switch (data.originatorType)
     {
-        case ProjectDataManagement::StateChangeOriginator::Participant: {
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant: {
 
-            if (data.originatorParticipantId() > 0)
+            if (data.originatorParticipantId > 0)
             {
-                ParticipantManagement::Participant participant = m_ppmDtc->participant(data.originatorParticipantId());
-                if (participant.equipmentNumber().is_set())
-                    originator = QString::number(participant.equipmentNumber().get());
+                ParticipantManagement::Participant participant = m_ppmDtc->participant(data.originatorParticipantId);
+                if (participant.equipmentNumber.has_value())
+                    originator = QString::number(participant.equipmentNumber.get());
             }
             break;
         }
-        case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-        case ProjectDataManagement::StateChangeOriginator::FunctionalArea: {
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea: {
             AreaEffectSimulation::AesItem aesItem;
-            m_aesDtc->aesItemFromId(data.aesId(), aesItem);
-            if (aesItem.id() > 0)
-                originator = QString::fromStdString(aesItem.name());
+            m_aesDtc->aesItemFromId(data.aesId, aesItem);
+            if (aesItem.id > 0)
+                originator = QString::fromStdString(aesItem.name);
             break;
         }
-        case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
-        case ProjectDataManagement::StateChangeOriginator::DusMine:
-        case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-        case ProjectDataManagement::StateChangeOriginator::ObserverController:
-        case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-        case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-        case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-        case ProjectDataManagement::StateChangeOriginator::Initialization:
-        case ProjectDataManagement::StateChangeOriginator::Sanitation:
-        case ProjectDataManagement::StateChangeOriginator::Unknown:
-            return ProjectDataManagement::toString(data.originatorType());
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
+            return ProjectDataManagement::toString(data.originatorType);
     }
 
-    QString chargeTypeShortName = getChargeTypeName(data.chargeTypeId());
+    QString chargeTypeShortName = getChargeTypeName(data.chargeTypeId);
     if (!originator.isEmpty() && !chargeTypeShortName.isEmpty())
         originatorType += QStringLiteral("(%1 - %2)").arg(originator, chargeTypeShortName);
     else if (!originator.isEmpty())
@@ -145,9 +147,9 @@ QString BuildingHistoryDialogModel::getContaminations(
     for (const auto& cs : contaminationStates)
     {
         AreaEffectSimulation::AesItem item;
-        m_aesDtc->aesItemFromId(cs.aesId(), item);
+        m_aesDtc->aesItemFromId(cs.aesId, item);
         const ProjectDataManagement::GearClass& gc =
-            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
+            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct.chargeTypeId);
         DEBUG_LOG(m_logger) << "gc=" << gc;
         if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
             continue;
@@ -171,16 +173,16 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
 
     if (newData.size() == 0)
         return;
-    m_vecData.resize(newData.size() + newData[0].contaminationStates().size());
+    m_vecData.resize(newData.size() + newData[0].contaminationStates.size());
     contaminationOffest = 0;
 
     for (size_t stateHistoryIndex = 0; stateHistoryIndex < newData.size(); ++stateHistoryIndex)
     {
         DEBUG_LOG(m_logger) << "\n\nstateHistoryIndex=" << stateHistoryIndex;
 
-        if (((newData.at(stateHistoryIndex).contaminationStates().size() > 0 && stateHistoryIndex == 0) ||
-             (stateHistoryIndex > 0 && (newData.at(stateHistoryIndex).contaminationStates().size() >
-                                        newData.at(stateHistoryIndex - 1).contaminationStates().size()))) &&
+        if (((newData.at(stateHistoryIndex).contaminationStates.size() > 0 && stateHistoryIndex == 0) ||
+             (stateHistoryIndex > 0 && (newData.at(stateHistoryIndex).contaminationStates.size() >
+                                        newData.at(stateHistoryIndex - 1).contaminationStates.size()))) &&
             (stateHistoryIndex > 0))
             DEBUG_LOG(m_logger) << "1. State ist Kontamination";
         else
@@ -188,27 +190,27 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
             DEBUG_LOG(m_logger) << "State aus StateItem nehmen: stateHistoryIndex=" << stateHistoryIndex;
             auto& data = m_vecData[stateHistoryIndex];
             data = HistoryStateItemEx(newData.at(stateHistoryIndex));
-            data.chargeTypeName = getChargeTypeName(data.chargeTypeId());
+            data.chargeTypeName = getChargeTypeName(data.chargeTypeId);
             QString originatorName = getOriginatorName(data);
 
             data.originatorName = originatorName;
-            if (newData.at(stateHistoryIndex).contaminationStates().empty())
+            if (newData.at(stateHistoryIndex).contaminationStates.empty())
                 data.contamination.clear();
             else
                 data.contamination = QStringLiteral("C");
-            DEBUG_LOG(m_logger) << "indexModel=" << indexModel << " chargeTypeId=" << data.chargeTypeId()
-                                << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
+            DEBUG_LOG(m_logger) << "indexModel=" << indexModel << " chargeTypeId=" << data.chargeTypeId
+                                << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId)
                                 << " originatorName=" << getOriginatorName(data);
             indexModel++;
         }
 
         unsigned int contaminationIndex = 0;
 
-        for (const auto& contaminationState : newData.at(stateHistoryIndex).contaminationStates())
+        for (const auto& contaminationState : newData.at(stateHistoryIndex).contaminationStates)
         {
 
             AreaEffectSimulation::AesItem item;
-            m_aesDtc->aesItemFromId(contaminationState.aesId(), item);
+            m_aesDtc->aesItemFromId(contaminationState.aesId, item);
             DEBUG_LOG(m_logger) << "m_vecData.size=" << m_vecData.size() << " indexModel=" << indexModel
                                 << " newData.size()=" << newData.size()
                                 << " contaminationOffest=" << contaminationOffest;
@@ -217,8 +219,8 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
             {
                 DEBUG_LOG(m_logger) << "stateHistoryIndex=" << stateHistoryIndex << " contaminationIndex="
                                     << " newData.at(stateHistoryIndex-1).contaminationStates().size() ="
-                                    << newData.at(stateHistoryIndex - 1).contaminationStates().size();
-                if (contaminationIndex < newData.at(stateHistoryIndex - 1).contaminationStates().size())
+                                    << newData.at(stateHistoryIndex - 1).contaminationStates.size();
+                if (contaminationIndex < newData.at(stateHistoryIndex - 1).contaminationStates.size())
                 {
                     contaminationIndex++;
                     DEBUG_LOG(m_logger) << "continue";
@@ -231,16 +233,16 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
             auto& data = m_vecData[indexModel];
 
             data = HistoryStateItemEx(newData.at(stateHistoryIndex));
-            data.chargeTypeName = getChargeTypeName(item.chargeStruct().chargeTypeId());
-            QString originatorName = QString::fromStdString(item.name());
+            data.chargeTypeName = getChargeTypeName(item.chargeStruct.chargeTypeId);
+            QString originatorName = QString::fromStdString(item.name);
 
             data.originatorName = originatorName;
             data.contamination = QStringLiteral("C");
-            ::rti::core::int64 time = item.effectStart().get();
-            data.time(time);
-            DEBUG_LOG(m_logger) << " indexModel=" << indexModel << " AesId=" << contaminationState.aesId()
-                                << " chargeTypeId=" << data.chargeTypeId()
-                                << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
+            ::rti::core::int64 time = item.effectStart.get();
+            data.time = time;
+            DEBUG_LOG(m_logger) << " indexModel=" << indexModel << " AesId=" << contaminationState.aesId
+                                << " chargeTypeId=" << data.chargeTypeId
+                                << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId)
                                 << " originatorName=" << getOriginatorName(data);
 
             indexModel++;
@@ -267,7 +269,7 @@ bool BuildingHistoryDialogProxyModel::lessThan(const QModelIndex& source_left, c
     switch (source_left.column())
     {
         case BuildingHistoryDialogModel::Time:
-            return dataLeft.time() < dataRight.time();
+            return dataLeft.time < dataRight.time;
         case BuildingHistoryDialogModel::Charge:
         case BuildingHistoryDialogModel::Originator:
         case BuildingHistoryDialogModel::Damage:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.cpp
index 12b13bcf5..f197c7c6a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bld_hitline_info_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_bld_hitline_info_dialog.h"
 
@@ -23,6 +24,7 @@ namespace Buildings
 HitLineInfoDialog::HitLineInfoDialog(int hitLineId, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_hitLineId(hitLineId),
       m_ui(new Ui::HitLineInfoDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -67,11 +69,11 @@ bool HitLineInfoDialog::init(LtsSession::LtsSession* session)
     session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(m_sitMapGuiIfc);
 
     m_bldDtc->buildingHitLineInfos([this](const BuildingHitLineInfo& data) {
-        if (data.id() == m_hitLineId)
+        if (data.id == m_hitLineId)
         {
-            DEBUG_LOG(m_logger) << "Found Building HitLine Id: " << data.id();
+            DEBUG_LOG(m_logger) << "Found Building HitLine Id: " << data.id;
             m_hitLineInfo = data;
-            m_participantOriginator = m_ppmDtc->participant(data.originatorParticipantId());
+            m_participantOriginator = m_ppmDtc->participant(data.originatorParticipantId);
             showHitLineInfos();
         }
     });
@@ -85,55 +87,55 @@ void HitLineInfoDialog::showHitLineInfos()
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id:" << m_hitLineId;
 
-    if (m_hitLineInfo.buildingId() <= 0 || m_hitLineInfo.originatorParticipantId() <= 0)
+    if (m_hitLineInfo.buildingId <= 0 || m_hitLineInfo.originatorParticipantId <= 0)
         return;
 
     m_ui->lblHitLineId->setText(QString::number(m_hitLineId));
 
-    m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime()));
+    m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime));
 
-    m_ui->lblOriginatorEquipNr->setText(QString::number(m_participantOriginator.equipmentNumber().get()));
+    m_ui->lblOriginatorEquipNr->setText(QString::number(m_participantOriginator.equipmentNumber.get()));
 
     m_ui->lblOriginatorParty->setText(
-        ParticipantManagement::trPartyName(m_ppmDtc->party(m_hitLineInfo.originatorPartyId()).name()));
+        ParticipantManagement::trPartyName(m_ppmDtc->party(m_hitLineInfo.originatorPartyId).name));
 
-    m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator()));
+    m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator));
 
-    m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier()));
+    m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier));
 
     m_ui->lblOriginatorType->setText(
-        ParticipantManagement::trTypeName(m_ppmDtc->type(m_participantOriginator.typeId()).name()));
+        ParticipantManagement::trTypeName(m_ppmDtc->type(m_participantOriginator.typeId).name));
 
     QString mgrs =
-        LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos().lon(), m_hitLineInfo.originatorPos().lat());
-    if (qFuzzyIsNull(m_hitLineInfo.originatorPos().z()))
+        LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos.lon, m_hitLineInfo.originatorPos.lat);
+    if (qFuzzyIsNull(m_hitLineInfo.originatorPos.z))
         m_ui->lblOriginatorPos->setText(tr("Position: %1").arg(mgrs));
     else
-        m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos().z()));
+        m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos.z));
 
-    m_ui->lblBuildingId->setText(QString::number(m_hitLineInfo.buildingId()));
+    m_ui->lblBuildingId->setText(QString::number(m_hitLineInfo.buildingId));
     if (m_ismDtc)
-        m_ui->lblBuildingName->setText(m_ismDtc->getBuildingDisplayName(m_hitLineInfo.buildingId()));
+        m_ui->lblBuildingName->setText(m_ismDtc->getBuildingDisplayName(m_hitLineInfo.buildingId));
 
-    mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.buildingPos().lon(), m_hitLineInfo.buildingPos().lat());
-    if (qFuzzyIsNull(m_hitLineInfo.buildingPos().z()))
+    mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.buildingPos.lon, m_hitLineInfo.buildingPos.lat);
+    if (qFuzzyIsNull(m_hitLineInfo.buildingPos.z))
         m_ui->lblBuildingPos->setText(tr("Position: %1").arg(mgrs));
     else
-        m_ui->lblBuildingPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.buildingPos().z()));
+        m_ui->lblBuildingPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.buildingPos.z));
 
-    Buildings::BuildingState bldState = m_bldDtc->buildingState((m_hitLineInfo.buildingId()));
-    ProjectDataManagement::VulnerabilityState st = bldState.vulnerabilityState();
+    Buildings::BuildingState bldState = m_bldDtc->buildingState((m_hitLineInfo.buildingId));
+    ProjectDataManagement::VulnerabilityState st = bldState.vulnerabilityState;
     m_ui->lblBuildingStatus->setText(toString(st));
 
-    m_ui->lblBuildingDamagePercent->setText(QString::number(bldState.damagePercent()));
+    m_ui->lblBuildingDamagePercent->setText(QString::number(bldState.damagePercent));
 
-    m_ui->lblBuildingDamageOldPercent->setText(QString::number(bldState.damagePercentOld()));
+    m_ui->lblBuildingDamageOldPercent->setText(QString::number(bldState.damagePercentOld));
 
-    m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId()));
+    m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId));
 
-    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId()));
+    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId));
 
-    const QString contamination = getContaminations(m_hitLineInfo.contaminationStates());
+    const QString contamination = getContaminations(m_hitLineInfo.contaminationStates);
     m_ui->lbContamination->setHidden(contamination.isEmpty());
     m_ui->lblContamination->setHidden(contamination.isEmpty());
     m_ui->lblContamination->setText(contamination.isEmpty() ? QStringLiteral("-") : contamination);
@@ -148,9 +150,9 @@ HitLineInfoDialog::getContaminations(const std::vector<Buildings::ContaminationS
     for (const auto& cs : contaminationStates)
     {
         AreaEffectSimulation::AesItem item;
-        m_aesDtc->aesItemFromId(cs.aesId(), item);
+        m_aesDtc->aesItemFromId(cs.aesId, item);
         const ProjectDataManagement::GearClass& gc =
-            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
+            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct.chargeTypeId);
         if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
             continue;
         QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
@@ -164,13 +166,13 @@ HitLineInfoDialog::getContaminations(const std::vector<Buildings::ContaminationS
 void HitLineInfoDialog::onFindOriginatorOnMap()
 {
     if (m_sitMapGuiIfc)
-        m_sitMapGuiIfc->centerMapToParticipant(m_participantOriginator.id());
+        m_sitMapGuiIfc->centerMapToParticipant(m_participantOriginator.id);
 }
 
 void HitLineInfoDialog::onFindBuildingOnMap()
 {
     if (m_sitMapGuiIfc)
-        m_sitMapGuiIfc->centerMapToBuildingObject(m_hitLineInfo.buildingId());
+        m_sitMapGuiIfc->centerMapToBuildingObject(m_hitLineInfo.buildingId);
 }
 
 } // namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
index e78c6b7e2..5def7275d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "bld_info_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "bld_history_dialog.h"
 #include "egcu_info_dialog.h"
@@ -125,7 +126,7 @@ void BldInfoDialog::retranslate()
     preIcon.fill(Qt::transparent);
     preIcon.setDevicePixelRatio(dpr);
     m_ui->lblIcon->setPixmap(preIcon);
-    QImage img = m_ui->lblIcon->pixmap()->toImage();
+    QImage img = m_ui->lblIcon->pixmap().toImage();
     QPainter painter(&img);
     painter.setPen(QPen(Qt::black, 3, Qt::SolidLine, Qt::FlatCap, Qt::RoundJoin));
     painter.setBrush(Qt::transparent);
@@ -154,7 +155,7 @@ bool BldInfoDialog::init(LtsSession::LtsSession* session)
     m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
     m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc);
 
-    const bool isBridge = m_mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::Bridge;
+    const bool isBridge = m_mse.structureElementTypeId == InfrastructureManagement::StructureElementType::Bridge;
     const bool isResourceManagerApp = m_session->app() == LtsAppDescriptor::App::ResourceManager;
 
     DEBUG_LOG(m_logger) << LOGFUNCTION << " m_mse" << m_mse << ", isBridge=" << isBridge;
@@ -169,8 +170,8 @@ bool BldInfoDialog::init(LtsSession::LtsSession* session)
     showBuildingInfos();
 
     auto predicate = [](const InfrastructureManagement::InstrumentationAsset& a) {
-        return (!a.isDeleted() &&
-                (a.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit));
+        return (!a.isDeleted &&
+                (a.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit));
     };
     QMap<int, QVector<InfrastructureManagement::InstrumentationAsset>> assetsMapBuilding;
     m_ismDtc->waitForHistoricalDataInstrumentationAsset(500);
@@ -189,20 +190,20 @@ bool BldInfoDialog::init(LtsSession::LtsSession* session)
             InfrastructureManagement::MountingPointAsset mpa;
             for (const auto& mpax : std::as_const(mountingPointAssets))
             {
-                if (mpax.assetId() == instrumentationAsset.id())
+                if (mpax.assetId == instrumentationAsset.id)
                 {
                     mpa = mpax;
                     break;
                 }
             }
-            if (mpa.assetId() != instrumentationAsset.id())
+            if (mpa.assetId != instrumentationAsset.id)
                 continue;
 
-            std::string name = mpa.name().empty() ? instrumentationAsset.name() : mpa.name();
-            int assetId = mpa.assetId();
+            std::string name = mpa.name.empty() ? instrumentationAsset.name : mpa.name;
+            int assetId = mpa.assetId;
             QPushButton* w = new QPushButton(QString::fromStdString(name), this);
             w->setProperty("assetId", assetId);
-            w->setProperty("assetName", QString::fromStdString(instrumentationAsset.name()));
+            w->setProperty("assetName", QString::fromStdString(instrumentationAsset.name));
             l->addWidget(w);
             connect(w, &QPushButton::clicked, this, &BldInfoDialog::onEgcuInfoDialogRequested);
         }
@@ -374,7 +375,7 @@ QString BldInfoDialog::getFloorName(int floorSeId)
     InfrastructureManagement::StructureElement floorSe;
     if (!getRoom(floorSeId, floorSe))
         return QStringLiteral("<unknown floor>");
-    return QString::fromStdString(floorSe.displayName());
+    return QString::fromStdString(floorSe.displayName);
 }
 
 bool BldInfoDialog::getRoom(int roomSeId, InfrastructureManagement::StructureElement& roomSe)
@@ -414,7 +415,7 @@ int BldInfoDialog::findFloorIdByRoomId(int roomId) noexcept(false)
         return -1;
     }
 
-    const std::vector<int32_t> path = roomSe.path();
+    const std::vector<int32_t> path = roomSe.path;
 
     for (const int parentSeId : path)
     {
@@ -422,28 +423,28 @@ int BldInfoDialog::findFloorIdByRoomId(int roomId) noexcept(false)
         if (!getRoom(parentSeId, parentSe))
             continue;
 
-        if (parentSe.structureElementTypeId().underlying() != StructureElementType::Floor)
+        if (parentSe.structureElementTypeId != StructureElementType::Floor)
             continue;
 
-        m_floorNames.insert(parentSeId, QString::fromStdString(parentSe.displayName()));
+        m_floorNames.insert(parentSeId, QString::fromStdString(parentSe.displayName));
         m_roomToFloorCache.insert(roomId, parentSeId);
         return parentSeId;
     }
 
-    throw QStringLiteral("findFloorId: floor id for room %1 not found").arg(roomSe.id());
+    throw QStringLiteral("findFloorId: floor id for room %1 not found").arg(roomSe.id);
 }
 
 void BldInfoDialog::addParticipantPosition(const ParticipantManagement::ParticipantPosition& data, DataModification)
 {
-    if (data.buildingId() != m_mse.id())
+    if (data.buildingId != m_mse.id)
     {
 
         return;
     }
 
-    const int roomId = data.roomId();
-    const int participantId = data.participantId();
-    const int participantPartyId = data.partyId();
+    const int roomId = data.roomId;
+    const int participantId = data.participantId;
+    const int participantPartyId = data.partyId;
     int participantFloorId;
 
     participantFloorId = findFloorIdByRoomId(roomId);
@@ -541,7 +542,7 @@ void BldInfoDialog::updateFloorParticipantTable()
 
             floorPartyParticipantCountStrings +=
                 QStringLiteral("<font color='#%1'>%2</font>")
-                    .arg(QString::number((unsigned int)parties.value(party).color(), 16))
+                    .arg(QString::number((unsigned int)parties.value(party).color, 16))
                     .arg(count);
         }
 
@@ -556,7 +557,7 @@ void BldInfoDialog::updateFloorParticipantTable()
 
 void BldInfoDialog::showBuildingInfos(const Buildings::BuildingState& bldState)
 {
-    if (bldState.id() <= 0)
+    if (bldState.id <= 0)
     {
         m_ui->lblBldId->clear();
         m_ui->lblStructElementId->clear();
@@ -570,42 +571,42 @@ void BldInfoDialog::showBuildingInfos(const Buildings::BuildingState& bldState)
         return;
     }
 
-    m_ui->lblBldId->setText(QString::number(bldState.id()));
-    m_ui->lblStructElementId->setText(QString::number(bldState.structureElementId()));
-    m_ui->lblAssetId->setText(QString::number(bldState.assetId()));
+    m_ui->lblBldId->setText(QString::number(bldState.id));
+    m_ui->lblStructElementId->setText(QString::number(bldState.structureElementId));
+    m_ui->lblAssetId->setText(QString::number(bldState.assetId));
 
     m_ui->lblOrganisatorParticipantId->clear();
-    if (bldState.originatorParticipantId())
+    if (bldState.originatorParticipantId)
     {
         if (m_ppmDtc)
         {
-            ParticipantManagement::Participant player = m_ppmDtc->participant(bldState.originatorParticipantId());
-            if (player.equipmentNumber().is_set())
-                m_ui->lblOrganisatorParticipantId->setText(QString::number(player.equipmentNumber().get()));
+            ParticipantManagement::Participant player = m_ppmDtc->participant(bldState.originatorParticipantId);
+            if (player.equipmentNumber.has_value())
+                m_ui->lblOrganisatorParticipantId->setText(QString::number(player.equipmentNumber.get()));
         }
     }
-    else if (bldState.aesId())
+    else if (bldState.aesId)
     {
         if (m_aesDtc)
         {
             AreaEffectSimulation::AesItem aesItem;
-            m_aesDtc->aesItemFromId(bldState.aesId(), aesItem);
-            m_ui->lblOrganisatorParticipantId->setText(QString::fromStdString(aesItem.name()));
+            m_aesDtc->aesItemFromId(bldState.aesId, aesItem);
+            m_ui->lblOrganisatorParticipantId->setText(QString::fromStdString(aesItem.name));
         }
     }
     else
         m_ui->lblOrganisatorParticipantId->setText(tr("EXCON"));
 
-    m_ui->lblDamagePercent->setText(QString::number(bldState.damagePercent()));
-    m_ui->lblDamagePercentOld->setText(QString::number(bldState.damagePercentOld()));
+    m_ui->lblDamagePercent->setText(QString::number(bldState.damagePercent));
+    m_ui->lblDamagePercentOld->setText(QString::number(bldState.damagePercentOld));
 
     QStringList contaminationList;
-    for (const auto& cs : bldState.contaminationStates())
+    for (const auto& cs : bldState.contaminationStates)
     {
         AreaEffectSimulation::AesItem item;
-        m_aesDtc->aesItemFromId(cs.aesId(), item);
+        m_aesDtc->aesItemFromId(cs.aesId, item);
         const ProjectDataManagement::GearClass& gc =
-            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
+            m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct.chargeTypeId);
         if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
             continue;
         QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
@@ -617,12 +618,12 @@ void BldInfoDialog::showBuildingInfos(const Buildings::BuildingState& bldState)
     m_ui->lblContamination->setHidden(contaminationList.isEmpty());
     m_ui->lblContamination->setText(contaminationList.join(QStringLiteral("+")));
 
-    ProjectDataManagement::VulnerabilityState st = bldState.vulnerabilityState();
+    ProjectDataManagement::VulnerabilityState st = bldState.vulnerabilityState;
     m_ui->lblStatus->setText(toString(st));
 
     m_ui->twFloorParticipantCount->hideColumn(2);
     DEBUG_LOG(m_logger) << "fillOwnership";
-    fillOwnership(bldState.id());
+    fillOwnership(bldState.id);
     DEBUG_LOG(m_logger) << "Vor fillContaminationTable";
     fillContaminationTable(bldState);
     DEBUG_LOG(m_logger) << "Nach fillContaminationTable";
@@ -633,14 +634,14 @@ void BldInfoDialog::fillContaminationTable(const Buildings::BuildingState& bldSt
     clearColumn(2);
     bool showContaminationCol = false;
     DEBUG_LOG(m_logger) << "fillContaminationTable bldState.contaminationStates().size()="
-                        << bldState.contaminationStates().size();
-    for (const auto& cs : bldState.contaminationStates())
+                        << bldState.contaminationStates.size();
+    for (const auto& cs : bldState.contaminationStates)
     {
-        DEBUG_LOG(m_logger) << "cs.rooms().size()=" << cs.rooms().size();
+        DEBUG_LOG(m_logger) << "cs.rooms().size()=" << cs.rooms.size();
 
-        for (unsigned int i = 0; i < cs.rooms().size(); i++)
+        for (unsigned int i = 0; i < cs.rooms.size(); i++)
         {
-            int floorIdContamination = findFloorIdByRoomId(cs.rooms()[i]);
+            int floorIdContamination = findFloorIdByRoomId(cs.rooms[i]);
             DEBUG_LOG(m_logger) << "floorIdContamination=" << floorIdContamination;
             if (floorIdContamination == -1)
             {
@@ -680,7 +681,7 @@ void BldInfoDialog::fillContaminationTable(const Buildings::BuildingState& bldSt
 void BldInfoDialog::fillOwnership(int buildingId)
 {
     CentralEffectSimulation::BuildingOwnership ownership = m_cesDtc->buildingOwnership(buildingId);
-    if (ownership.buildingId() == buildingId)
+    if (ownership.buildingId == buildingId)
         fillOwnership(ownership);
 }
 
@@ -704,41 +705,41 @@ void BldInfoDialog::fillOwnership(const CentralEffectSimulation::BuildingOwnersh
     m_ui->twOwnership->setUpdatesEnabled(false);
 
     clearColumn(1);
-    m_ui->twOwnership->setRowCount(ownership.ownerships().size());
+    m_ui->twOwnership->setRowCount(ownership.ownerships.size());
     int row = m_ui->twOwnership->rowCount();
 
-    for (const auto& data : ownership.ownerships())
+    for (const auto& data : ownership.ownerships)
     {
         --row;
         int column = 0;
         QTableWidgetItem* pItem = nullptr;
 
-        for (const InfrastructureManagement::StructureElement& elem : m_mse.elements())
+        for (const InfrastructureManagement::StructureElement& elem : m_mse.elements)
         {
-            if (elem.id() == data.floorId())
+            if (elem.id == data.floorId)
             {
-                QString name = QString::fromStdString(elem.displayName());
+                QString name = QString::fromStdString(elem.displayName);
                 if (name.isEmpty())
-                    name = QString::fromStdString(elem.name());
+                    name = QString::fromStdString(elem.name);
                 pItem = new QTableWidgetItem(name);
                 break;
             }
         }
         if (!pItem)
-            pItem = new QTableWidgetItem(QString::number(data.floorId()));
-        m_rowToFloorId.insert(row, data.floorId());
-        m_floorIdToRow.insert(data.floorId(), row);
+            pItem = new QTableWidgetItem(QString::number(data.floorId));
+        m_rowToFloorId.insert(row, data.floorId);
+        m_floorIdToRow.insert(data.floorId, row);
 
         DEBUG_LOG(m_logger) << "m_rowToFloorId.insert"
-                            << " row=" << row << " column=" << column << " data.floorId()=" << data.floorId();
+                            << " row=" << row << " column=" << column << " data.floorId()=" << data.floorId;
         m_ui->twOwnership->setItem(row, column++, pItem);
 
         pItem = new QTableWidgetItem();
-        if (m_ppmDtc && data.partyId() > 0)
+        if (m_ppmDtc && data.partyId > 0)
         {
-            const auto& party = m_ppmDtc->party(data.partyId());
-            pItem->setData(Qt::BackgroundRole, QColor::fromRgb(QRgb(party.color())));
-            pItem->setData(Qt::DisplayRole, ParticipantManagement::trPartyName(party.name()));
+            const auto& party = m_ppmDtc->party(data.partyId);
+            pItem->setData(Qt::BackgroundRole, QColor::fromRgb(QRgb(party.color)));
+            pItem->setData(Qt::DisplayRole, ParticipantManagement::trPartyName(party.name));
         }
         m_ui->twOwnership->setItem(row, column++, pItem);
     }
@@ -750,8 +751,8 @@ void BldInfoDialog::onBuildingStateChanged(const Buildings::BuildingState& data,
 {
     if (modType == DataModification::eRemoved)
         return;
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.id();
-    if (data.id() != m_mseId)
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.id;
+    if (data.id != m_mseId)
         return;
 
     showBuildingInfos(data);
@@ -762,8 +763,8 @@ void BldInfoDialog::onBuildingOwnershipChanged(const CentralEffectSimulation::Bu
 {
     if (modType == DataModification::eRemoved)
         return;
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.buildingId();
-    if (data.buildingId() != m_mseId)
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.buildingId;
+    if (data.buildingId != m_mseId)
         return;
 
     fillOwnership(data);
@@ -774,8 +775,8 @@ void BldInfoDialog::onMainStructureElementChanged(const InfrastructureManagement
 {
     if (modType == DataModification::eRemoved)
         return;
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.id();
-    if (data.id() != m_mseId)
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << data.id;
+    if (data.id != m_mseId)
         return;
 
     m_mse = data;
@@ -787,23 +788,23 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
                                                 const DataModification& modType)
 {
     InfrastructureManagement::StructureElement se;
-    m_ismDtc->getStructureElementById(data.structureElementId(), se);
-    if (se.mainStructureElementId() != m_mseId)
+    m_ismDtc->getStructureElementById(data.structureElementId, se);
+    if (se.mainStructureElementId != m_mseId)
         return;
 
     if (modType == DataModification::eAdded)
     {
-        auto instrumentationAsset = m_ismDtc->instrumentationAsset(data.assetId());
-        if (instrumentationAsset.mountingPointTypeId() !=
+        auto instrumentationAsset = m_ismDtc->instrumentationAsset(data.assetId);
+        if (instrumentationAsset.mountingPointTypeId !=
             InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
             return;
-        QString name = QString::fromStdString(data.name());
+        QString name = QString::fromStdString(data.name);
         if (name.isNull())
-            name = QString::fromStdString(instrumentationAsset.hostname());
+            name = QString::fromStdString(instrumentationAsset.hostname);
 
         QVBoxLayout* l = qobject_cast<QVBoxLayout*>(m_ui->gbSegments->layout());
         QPushButton* w = new QPushButton(name, this);
-        w->setProperty("assetId", data.assetId());
+        w->setProperty("assetId", data.assetId);
         l->addWidget(w);
         connect(w, &QPushButton::clicked, this, &BldInfoDialog::onEgcuInfoDialogRequested);
         m_ui->gbSegments->setVisible(egcuVisibility());
@@ -815,7 +816,7 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
         const QList<QPushButton*>& list = m_ui->gbSegments->findChildren<QPushButton*>();
         for (QPushButton* pb : std::as_const(list))
         {
-            if (pb->property("assetId").toInt() == data.assetId())
+            if (pb->property("assetId").toInt() == data.assetId)
             {
 
                 if (m_ui->gbSegments->layout()->count() == 1)
@@ -833,9 +834,9 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
         const QList<QPushButton*>& list = m_ui->gbSegments->findChildren<QPushButton*>();
         for (QPushButton* pb : std::as_const(list))
         {
-            if (pb->property("assetId").toInt() == data.assetId())
-                pb->setText(data.name().empty() ? pb->property("assetName").toString()
-                                                : QString::fromStdString(data.name()));
+            if (pb->property("assetId").toInt() == data.assetId)
+                pb->setText(data.name.empty() ? pb->property("assetName").toString()
+                                                : QString::fromStdString(data.name));
         }
     }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
index f6b8e3466..e12bfd53b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
@@ -169,20 +169,20 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString)
   
   const auto cb = [this, searchString, &bldIdCont, &bridgeIdCont](const InfrastructureManagement::MainStructureElement & data) -> void
   {
-    if (data.isDeleted())
+    if (data.isDeleted)
       return;
 
-    const std::vector<InfrastructureManagement::StructureElement>& elements = data.elements();
+    const std::vector<InfrastructureManagement::StructureElement>& elements = data.elements;
     if (elements.empty())
       return;
 
     const InfrastructureManagement::StructureElement &firstElement = elements.front(); 
 
-    const InfrastructureManagement::StructureElementType type = static_cast<InfrastructureManagement::StructureElementType>(firstElement.structureElementTypeId());
+    const InfrastructureManagement::StructureElementType type = static_cast<InfrastructureManagement::StructureElementType>(firstElement.structureElementTypeId);
 
     if (type == InfrastructureManagement::StructureElementType::Building)
     {
-    if (!(m_ismDataIfc && m_ismDataIfc->isBuildingsInCurrentExercise(data.id())))
+    if (!(m_ismDataIfc && m_ismDataIfc->isBuildingsInCurrentExercise(data.id)))
       return;
     } else if (type != InfrastructureManagement::StructureElementType::Bridge) 
       return;
@@ -195,10 +195,10 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString)
     
     
     
-    if (m_ismDtc->mainFootprint(data.id()).elements().size() < 3)
+    if (m_ismDtc->mainFootprint(data.id).elements.size() < 3)
       return;
 
-    const QString &displayName = firstElement.displayName().empty() ? QString::fromStdString(firstElement.name()) : QString::fromStdString(firstElement.displayName());
+    const QString &displayName = firstElement.displayName.empty() ? QString::fromStdString(firstElement.name) : QString::fromStdString(firstElement.displayName);
 
 
 
@@ -209,10 +209,10 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString)
     {
       switch (type) {
       case InfrastructureManagement::StructureElementType::Building:
-      bldIdCont.append(data.id());
+      bldIdCont.append(data.id);
         break;
       case InfrastructureManagement::StructureElementType::Bridge:
-        bridgeIdCont.append(data.id());
+        bridgeIdCont.append(data.id);
         break;
       default:
         break;
@@ -342,7 +342,7 @@ void InterfaceImpl::showEffectGenerationUnitWindow(int mountingPointId)
     return;
 
   auto mpa = ismDtc->mountingPointAsset(mpaId);
-  int assetId = mpa.assetId();
+  int assetId = mpa.assetId;
 
   EgcuInfoDialog *dialog = new EgcuInfoDialog(assetId, menuGroup());
   DEBUG_LOG(m_logger) << " new EgcuInfoDialog: ";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog.cpp
index 176d34d8f..028c12f14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "bridge_history_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_bridge_history_dialog.h"
 
 #include "bridge_history_dialog_model.h"
@@ -14,6 +15,7 @@ BridgeHistoryDialog::BridgeHistoryDialog(const QString &bldName, QWidget *parent
   , m_model(new BridgeHistoryDialogModel(this))
   , m_proxyModel(new BridgeHistoryDialogProxyModel(this))
   , m_ui(new Ui::BridgeHistoryDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_proxyModel->setSourceModel(m_model);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.cpp
index e41dbee5c..38cfc5837 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "bridge_history_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Buildings/bld_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_to_string.h>
@@ -28,6 +29,7 @@ BridgeHistoryDialogModel::BridgeHistoryDialogModel(QObject *parent)
 },
 parent)
 , m_ddsId(-1)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 bool BridgeHistoryDialogModel::initModel(int dds_id,
@@ -56,17 +58,17 @@ QVariant BridgeHistoryDialogModel::data(const QModelIndex &index, int role) cons
   switch (index.column())
   {
   case Time:
-    return QDateTime::fromMSecsSinceEpoch(data.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(data.sampleTime);
   case State:
-    if(data.status() == 0) 
+    if(data.status == 0) 
     {
       return QString(toString(InfrastructureManagement::BridgeStatus::Intact));
     }
-    else if (data.status() == 1) 
+    else if (data.status == 1) 
     {
       return QString(toString(InfrastructureManagement::BridgeStatus::Broken));
     }
-    return data.status();
+    return data.status;
   }
   return QVariant();
 
@@ -93,7 +95,7 @@ void BridgeHistoryDialogModel::reinitModel(const QMap<int, Buildings::BridgeStat
   QVector<Buildings::BridgeStatus> relevantStates;
   for (auto& status : newData )
   {
-    if(status.buildingId() != m_ddsId)
+    if(status.buildingId != m_ddsId)
       continue;
     relevantStates.append(status);
   }
@@ -132,7 +134,7 @@ bool BridgeHistoryDialogProxyModel::lessThan(const QModelIndex &source_left, con
   switch (source_left.column())
   {
   case BridgeHistoryDialogModel::Time:
-    return dataLeft.sampleTime() < dataRight.sampleTime();
+    return dataLeft.sampleTime < dataRight.sampleTime;
   }
 
   return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
index ea5ca43f0..b2d4c216e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
@@ -86,7 +86,7 @@ BridgeInfoDialog::~BridgeInfoDialog()
 
 void BridgeInfoDialog::retranslate()
 {
-  if (m_mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::Bridge)
+  if (m_mse.structureElementTypeId == InfrastructureManagement::StructureElementType::Bridge)
     translate(m_ui, tr("Bridge: %1").arg( m_ismDtc->getBuildingDisplayName(m_mse)));
   else
     translate(m_ui, tr("Building: %1").arg( m_ismDtc->getBuildingDisplayName(m_mse)));
@@ -151,7 +151,7 @@ void BridgeInfoDialog::showBridgeInfos()
 {
   m_ui->lblBuildingName->setText(buildingDisplayName());
 
-  if (m_mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::Bridge)
+  if (m_mse.structureElementTypeId == InfrastructureManagement::StructureElementType::Bridge)
   {
     m_ui->lbStatus->show();
     m_ui->cbStatus->show();
@@ -209,14 +209,14 @@ void BridgeInfoDialog::bridgeStatusChanged()
   InfrastructureManagement::MainStructureElementModifyBridgeStatusRequest data;
 
   
-  data.id(m_mse.id());
+  data.id = m_mse.id;
   switch (m_ui->cbStatus->currentData().toInt())
   {
-  case InfrastructureManagement::BridgeStatus::Intact:
-    data.status(InfrastructureManagement::BridgeStatus::Intact);
+  case static_cast<int>(InfrastructureManagement::BridgeStatus::Intact):
+    data.status = InfrastructureManagement::BridgeStatus::Intact;
     break;
-  case InfrastructureManagement::BridgeStatus::Broken:
-    data.status(InfrastructureManagement::BridgeStatus::Broken);
+  case static_cast<int>(InfrastructureManagement::BridgeStatus::Broken):
+    data.status = InfrastructureManagement::BridgeStatus::Broken;
     break;
   default:
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
index e0e2e1d62..cabfb85b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
@@ -134,7 +134,7 @@ QString EgcuInfoDialog::structureElementName(int seId)
 {
   InfrastructureManagement::StructureElement se;
   m_ismDtc->getStructureElementById(seId, se);
-  return QString::fromStdString(se.displayName());
+  return QString::fromStdString(se.displayName);
 }
 
 void EgcuInfoDialog::showBuildingInfos()
@@ -148,13 +148,13 @@ void EgcuInfoDialog::onInstrumentationAssetChanged(
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
-  DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id:" << data.id();
+  DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id:" << data.id;
   
 
 
-  if (data.id() != m_instrumentationAsset.id())
+  if (data.id != m_instrumentationAsset.id)
     return;
-  DEBUG_LOG(m_logger) << "Insert instrumentation asset id=" << data.id();
+  DEBUG_LOG(m_logger) << "Insert instrumentation asset id=" << data.id;
   m_instrumentationAsset = data;
   showEgcuInfos();
 }
@@ -164,11 +164,11 @@ void EgcuInfoDialog::onMainStructureElementChanged(const InfrastructureManagemen
   if (modType == DataModification::eRemoved)
     return;
 
-  if (data.id() != m_structureElement.mainStructureElementId())
+  if (data.id != m_structureElement.mainStructureElementId)
     return;
-  for (const auto &se : data.elements())
+  for (const auto &se : data.elements)
   {
-    if (se.id() != m_structureElement.id())
+    if (se.id != m_structureElement.id)
       continue;
     m_structureElement = se;
     showEgcuInfos(se);
@@ -178,7 +178,7 @@ void EgcuInfoDialog::onMainStructureElementChanged(const InfrastructureManagemen
 void EgcuInfoDialog::onEffectOverrideChanged(int relayId, InfrastructureManagement::EffectOverride override)
 {
   DEBUG_LOG(m_logger) << "onEffectOverrideChanged"
-                       << " m_structureElement.id=" << m_structureElement.id()
+                       << " m_structureElement.id=" << m_structureElement.id
                        << " relayId=" << relayId
                        << " override=" << override;
   
@@ -192,9 +192,9 @@ void EgcuInfoDialog::onEffectOverrideChanged(int relayId, InfrastructureManageme
   
   
   InfrastructureManagement::StructureElementUpdateEffectOverrideRequest request;
-  request.structureElementId(m_structureElement.id());
-  request.effectId(relayId);
-  request.effectOverride(override);
+  request.structureElementId = m_structureElement.id;
+  request.effectId = relayId;
+  request.effectOverride = override;
   m_requestHelper->startSingleRequest([request, this]()
   {
     return m_ftc->structureElementUpdateEffectOverrideRequest(request, this);
@@ -203,35 +203,35 @@ void EgcuInfoDialog::onEffectOverrideChanged(int relayId, InfrastructureManageme
 
 void EgcuInfoDialog::onRelayInfoChanged(const AssetManagement::RelayInfo &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onRelayInfosChanged id:" << data.id();
+  DEBUG_LOG(m_logger) << "onRelayInfosChanged id:" << data.id;
   if (modType == DataModification::eRemoved)
   {
-    if (m_relayInfoWidgets.contains(data.id()))
+    if (m_relayInfoWidgets.contains(data.id))
     {
-      m_relayInfoWidgets[data.id()]->deleteLater();
-      m_relayInfoWidgets.remove(data.id());
+      m_relayInfoWidgets[data.id]->deleteLater();
+      m_relayInfoWidgets.remove(data.id);
     }
     return;
   }
-  if (m_relayInfoWidgets.contains(data.id()))
+  if (m_relayInfoWidgets.contains(data.id))
   {
-    m_relayInfoWidgets[data.id()]->setName(QString::fromStdString(data.name()));
-    DEBUG_LOG(m_logger) << "contains Name=" << QString::fromStdString(data.name());
+    m_relayInfoWidgets[data.id]->setName(QString::fromStdString(data.name));
+    DEBUG_LOG(m_logger) << "contains Name=" << QString::fromStdString(data.name);
   }
   else
   {
-    RelayInfoWidget *w = new RelayInfoWidget(data.id(), this);
-    m_relayInfoWidgets.insert(data.id(), w);
-    w->setName(QString::fromStdString(data.name()));
-    DEBUG_LOG(m_logger) << "Name=" << QString::fromStdString(data.name());
+    RelayInfoWidget *w = new RelayInfoWidget(data.id, this);
+    m_relayInfoWidgets.insert(data.id, w);
+    w->setName(QString::fromStdString(data.name));
+    DEBUG_LOG(m_logger) << "Name=" << QString::fromStdString(data.name);
     connect(w, &RelayInfoWidget::effectOverrideChanged, this, &EgcuInfoDialog::onEffectOverrideChanged);
-    w->setEffectOverrideEnabled(InfrastructureManagement::EffectOverride::PermanentOn, readAllowance(InfrastructureManagement::EffectOverride::PermanentOn, data.property()));
-    w->setEffectOverrideEnabled(InfrastructureManagement::EffectOverride::PermanentOff, readAllowance(InfrastructureManagement::EffectOverride::PermanentOff, data.property()));
-    w->setLedVisible(readShowStatus(data.property()));
+    w->setEffectOverrideEnabled(InfrastructureManagement::EffectOverride::PermanentOn, readAllowance(InfrastructureManagement::EffectOverride::PermanentOn, data.property));
+    w->setEffectOverrideEnabled(InfrastructureManagement::EffectOverride::PermanentOff, readAllowance(InfrastructureManagement::EffectOverride::PermanentOff, data.property));
+    w->setLedVisible(readShowStatus(data.property));
     m_relayLayout->addWidget(w);
   }
 
-  DEBUG_LOG(m_logger) << "data.name=" << data.name();
+  DEBUG_LOG(m_logger) << "data.name=" << data.name;
 } 
 
 bool EgcuInfoDialog::readAllowance(InfrastructureManagement::EffectOverride eo, const std::string &properties)
@@ -267,27 +267,27 @@ bool EgcuInfoDialog::readShowStatus(const std::string &properties)
 
 void EgcuInfoDialog::onRelayStateChanged(const Buildings::RelayState &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onRelayStateChanged id:" << data.id();
+  DEBUG_LOG(m_logger) << "onRelayStateChanged id:" << data.id;
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
 
-  if (data.id() != m_instrumentationAsset.id())
+  if (data.id != m_instrumentationAsset.id)
     return;
 
-  for (const Buildings::RelayStateItem &relayState : data.relayStates())
+  for (const Buildings::RelayStateItem &relayState : data.relayStates)
   {
-    if (!m_relayInfoWidgets.contains(relayState.id()))
+    if (!m_relayInfoWidgets.contains(relayState.id))
       continue;
-    m_relayInfoWidgets[relayState.id()]->setState(relayState.state(),
-                                                  data.stateTime(),
-                                                  data.offlineTime());
+    m_relayInfoWidgets[relayState.id]->setState(relayState.state,
+                                                  data.stateTime,
+                                                  data.offlineTime);
   }
 } 
 
 void EgcuInfoDialog::onMountPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, DataModification modType)
 {
-  if (m_assetId != data.assetId())
+  if (m_assetId != data.assetId)
     return;
 
   if (modType != DataModification::eAdded &&
@@ -297,9 +297,9 @@ void EgcuInfoDialog::onMountPointAssetChanged(const InfrastructureManagement::Mo
     return;
   }
 
-  m_instrumentationAsset = m_ismDtc->instrumentationAsset(data.assetId());
-  m_ismDtc->getStructureElementById(data.structureElementId(), m_structureElement);
-  m_ui->lblSegment->setText(QString::fromStdString(data.name()));
+  m_instrumentationAsset = m_ismDtc->instrumentationAsset(data.assetId);
+  m_ismDtc->getStructureElementById(data.structureElementId, m_structureElement);
+  m_ui->lblSegment->setText(QString::fromStdString(data.name));
   showEgcuInfos(m_structureElement);
   
   retranslate();
@@ -310,12 +310,12 @@ void EgcuInfoDialog::onMountPointAssetChanged(const InfrastructureManagement::Mo
 void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElement &se)
 {
   DEBUG_LOG(m_logger) << "EgcuInfoDialog::showEgcuInfos";
-  m_ui->lblAssetName->setText(QString::fromStdString(m_instrumentationAsset.name()));
-  m_ui->lblAssetId->setText(QString::number(m_instrumentationAsset.id()));
-  m_ui->lblHostName->setText(QString::fromStdString(m_instrumentationAsset.hostname()));
+  m_ui->lblAssetName->setText(QString::fromStdString(m_instrumentationAsset.name));
+  m_ui->lblAssetId->setText(QString::number(m_instrumentationAsset.id));
+  m_ui->lblHostName->setText(QString::fromStdString(m_instrumentationAsset.hostname));
   
 
-  if (se.id() == 0)
+  if (se.id == 0)
     return;
 
   m_ui->lblRoom->hide();
@@ -323,20 +323,20 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem
   m_ui->lblFloor->hide();
   m_ui->lbxFloor->hide();
 
-  switch (se.path().size()) {
+  switch (se.path.size()) {
   case 4:
-    m_ui->lblRoom->setText(structureElementName(se.path()[2]));
+    m_ui->lblRoom->setText(structureElementName(se.path[2]));
     m_ui->lblRoom->show();
     m_ui->lbxRoom->show();
     Q_FALLTHROUGH();
   case 3:
-    m_ui->lblFloor->setText(structureElementName(se.path()[1]));
+    m_ui->lblFloor->setText(structureElementName(se.path[1]));
     m_ui->lblFloor->show();
     m_ui->lbxFloor->show();
     Q_FALLTHROUGH();
   case 2:
   {
-    m_ui->lblBuildingName->setText(structureElementName(se.path()[0]));
+    m_ui->lblBuildingName->setText(structureElementName(se.path[0]));
     break;
   }
   default:
@@ -346,7 +346,7 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem
   
 
   QJsonParseError parserError;
-  QByteArray content = QByteArray::fromStdString(se.properties());
+  QByteArray content = QByteArray::fromStdString(se.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
 
   if (parserError.error != QJsonParseError::NoError)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h
index 78e235092..c4b0aaf29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h
@@ -59,7 +59,7 @@ public:
   void onStructureElementUpdateEffectOverrideReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
   QString buildingDisplayName() const override;
-  QString egcuName() const { return QString::fromStdString(m_instrumentationAsset.name()); }
+  QString egcuName() const { return QString::fromStdString(m_instrumentationAsset.name); }
 
 private:
   void retranslate() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
index a4ebc5155..bc8bf1cf0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
@@ -39,7 +39,7 @@ bool InfoDialogBase::init(LtsSession::LtsSession* session)
             [this](const InfrastructureManagement::MainStructureElement& mse, DataModification mod) {
                 if (mod != DataModification::eModified)
                     return;
-                QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromStdString(mse.properties())).object();
+                QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromStdString(mse.properties)).object();
                 if (!obj.contains(QStringLiteral("available_in_exercise")))
                 {
                     deleteLater();
@@ -93,7 +93,7 @@ void InfoDialogBase::onShowEgcuMonitor()
 {
     if (!m_smoGuiIfc)
         return;
-    int seId = m_ismDtc->mainStructureElement(m_mseId).structureElementId();
+    int seId = m_ismDtc->mainStructureElement(m_mseId).structureElementId;
     m_smoGuiIfc->showEgcuMonitor({seId}, true);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp
index dc3f724d5..a39d01d8f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp
@@ -1,6 +1,7 @@
 
 
 #include "relay_info.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_relay_info.h"
 
@@ -72,7 +73,7 @@ void RelayInfoWidget::setState(bool state, qint64 stateTime, qint64 offlineTime)
 
 void RelayInfoWidget::setEffectOverride(InfrastructureManagement::EffectOverride override)
 {
-    switch (override.underlying())
+    switch (override)
     {
         case InfrastructureManagement::EffectOverride::Automatic:
             m_ui->tbAuto->setChecked(true);
@@ -88,7 +89,7 @@ void RelayInfoWidget::setEffectOverride(InfrastructureManagement::EffectOverride
 
 void RelayInfoWidget::setEffectOverrideEnabled(InfrastructureManagement::EffectOverride override, bool enable)
 {
-    switch (override.underlying())
+    switch (override)
     {
         case InfrastructureManagement::EffectOverride::Automatic:
             m_ui->tbAuto->setEnabled(enable);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/ces_participant_move_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/ces_participant_move_gui_plugin.h
index d62b9ceec..49b15dc63 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/ces_participant_move_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/ces_participant_move_gui_plugin.h
@@ -7,6 +7,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/ces_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
index 2ca806c45..f93d26f78 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
@@ -10,6 +10,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -28,6 +29,7 @@ ParticipantMoveDialog::ParticipantMoveDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ftc(nullptr),
       m_sitMapGuiIfc(nullptr), m_ui(new Ui::WaypointsEdit), m_id(0), m_requestHelper(new LtsUtils::RequestHelper(this)),
       m_polyline(QPolygonF())
+  , m_logger(getLogger("ParticipantMoveDialog"))
 {
     m_ui->setupUi(this);
     m_ui->cbJump->hide();
@@ -44,7 +46,7 @@ ParticipantMoveDialog::~ParticipantMoveDialog()
 {
     m_sitMapGuiIfc = nullptr;
     delete m_ui;
-    emit closeDialog(m_participantData.id());
+    emit closeDialog(m_participantData.id);
 }
 
 void ParticipantMoveDialog::enableUiElements(bool enable)
@@ -80,10 +82,10 @@ bool ParticipantMoveDialog::init(LtsSession::LtsSessionDataDds* session,
 
     m_ui->dteStartTime->setMinimumTimeMSec(m_session->partitionTime());
     m_ui->dteStartTime->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
-    m_ui->lbIdentifier->setText(QString::fromStdString(data.tacticalIdentifier()));
-    QString partyStr = ParticipantManagement::trPartyName(ppmDtc->party(m_participantData.partyId()).name());
+    m_ui->lbIdentifier->setText(QString::fromStdString(data.tacticalIdentifier));
+    QString partyStr = ParticipantManagement::trPartyName(ppmDtc->party(m_participantData.partyId).name);
     m_ui->lbParty->setText(partyStr);
-    QString typeStr = ParticipantManagement::trTypeName(ppmDtc->type(m_participantData.typeId()).name());
+    QString typeStr = ParticipantManagement::trTypeName(ppmDtc->type(m_participantData.typeId).name);
     m_ui->lbType->setText(typeStr);
 
     enableUiElements(true);
@@ -113,25 +115,25 @@ bool ParticipantMoveDialog::init(LtsSession::LtsSessionDataDds* session,
 void ParticipantMoveDialog::onSimulatedMovementChanged(const CentralEffectSimulation::SimulatedMovement& data,
                                                        DataModification modType)
 {
-    if (modType == DataModification::eRemoved || m_participantData.id() != data.participantId())
+    if (modType == DataModification::eRemoved || m_participantData.id != data.participantId)
         return;
     INFO_LOG(m_logger) << "onSimulatedMovementChanged";
 
     clearContent();
 
-    m_id = data.id();
-    m_ui->lePrefix->setText(QString::fromStdString(data.name()));
-    m_ui->cbRepeat->setChecked(data.repeat());
-    m_ui->cbJump->setChecked(data.jumpToStart());
-    m_ui->dteStartTime->setMsecsSinceEpoch(data.startTime());
+    m_id = data.id;
+    m_ui->lePrefix->setText(QString::fromStdString(data.name));
+    m_ui->cbRepeat->setChecked(data.repeat);
+    m_ui->cbJump->setChecked(data.jumpToStart);
+    m_ui->dteStartTime->setMsecsSinceEpoch(data.startTime);
     m_polyline.clear();
 
-    for (const SimulatedMovementSegment& segment : data.segments())
+    for (const SimulatedMovementSegment& segment : data.segments)
     {
-        const Core::GeoPosition2D& pointDds = segment.position();
-        insertPos(pointDds.lon(), pointDds.lat(), QString::fromStdString(segment.name()), segment.delay(),
-                  segment.speed());
-        m_polyline.push_back(QPointF(pointDds.lon(), pointDds.lat()));
+        const Core::GeoPosition2D& pointDds = segment.position;
+        insertPos(pointDds.lon, pointDds.lat, QString::fromStdString(segment.name), segment.delay,
+                  segment.speed);
+        m_polyline.push_back(QPointF(pointDds.lon, pointDds.lat));
     }
 
     if (this->amIFocused())
@@ -168,7 +170,7 @@ void ParticipantMoveDialog::onSimulatedMovementModifyReply(const Core::FunctionR
 
 void ParticipantMoveDialog::retranslate()
 {
-    translate(m_ui, QString::fromStdString(m_participantData.tacticalIdentifier()), false, tr("Waypoints"));
+    translate(m_ui, QString::fromStdString(m_participantData.tacticalIdentifier), false, tr("Waypoints"));
     DEBUG_LOG(m_logger) << "retranslate";
 }
 
@@ -299,7 +301,7 @@ SimulatedMovement ParticipantMoveDialog::requestContent() const
 
     int32_t jumpToStart = true;
     rti::core::int64 startTime = m_ui->dteStartTime->msecsSinceEpoch();
-    int32_t participantId = m_participantData.id();
+    int32_t participantId = m_participantData.id;
     int32_t nextPoint = 0;
 
     int cntSegments = m_ui->tableWidget->rowCount();
@@ -309,21 +311,21 @@ SimulatedMovement ParticipantMoveDialog::requestContent() const
     {
         QWidget* widget = m_ui->tableWidget->cellWidget(i, Name);
         const QString nameSeg = static_cast<QLineEdit*>(widget)->text();
-        segments[i].name(nameSeg.toStdString());
+        segments[i].name = nameSeg.toStdString();
 
         widget = m_ui->tableWidget->cellWidget(i, IdleTime);
         const int idleTime = static_cast<QSpinBox*>(widget)->value() * s_timeMilliConversion;
-        segments[i].delay(idleTime);
+        segments[i].delay = idleTime;
 
         widget = m_ui->tableWidget->cellWidget(i, Speed);
         const double speed = static_cast<QSpinBox*>(widget)->value() / s_msConversion;
 
-        segments[i].speed(speed);
+        segments[i].speed = speed;
 
         widget = m_ui->tableWidget->cellWidget(i, Position);
         const QPointF point = static_cast<LtsCoordWidget::LtsCoordWidget*>(widget)->coordinate();
         const Core::GeoPosition2D pos(Core::GeoPosition2D(point.x(), point.y()));
-        segments[i].position(pos);
+        segments[i].position = pos;
     }
 
     return SimulatedMovement(m_id, name, startTime, participantId, segments, repeat, jumpToStart, nextPoint);
@@ -362,23 +364,23 @@ QByteArray ParticipantMoveDialog::simulatedMovementToJson() const
     QJsonObject obj;
     obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::CESParticipantMove);
 
-    obj[QStringLiteral("id")] = req.id();
-    obj[QStringLiteral("jumpToStart")] = req.jumpToStart();
-    obj[QStringLiteral("name")] = QString::fromStdString(req.name());
-    obj[QStringLiteral("nextPoint")] = req.nextPoint();
-    obj[QStringLiteral("participantId")] = req.participantId();
-    obj[QStringLiteral("repeat")] = req.repeat();
-    obj[QStringLiteral("startTime")] = req.startTime();
+    obj[QStringLiteral("id")] = req.id;
+    obj[QStringLiteral("jumpToStart")] = req.jumpToStart;
+    obj[QStringLiteral("name")] = QString::fromStdString(req.name);
+    obj[QStringLiteral("nextPoint")] = req.nextPoint;
+    obj[QStringLiteral("participantId")] = req.participantId;
+    obj[QStringLiteral("repeat")] = req.repeat;
+    obj[QStringLiteral("startTime")] = static_cast<double>(req.startTime);
 
     QJsonArray arr;
-    for (auto it = req.segments().begin(); it != req.segments().end(); ++it)
+    for (auto it = req.segments.begin(); it != req.segments.end(); ++it)
     {
         QJsonObject inner;
-        inner[QStringLiteral("delay")] = it->delay();
-        inner[QStringLiteral("name")] = QString::fromStdString(it->name());
-        inner[QStringLiteral("speed")] = it->speed();
-        inner[QStringLiteral("lat")] = it->position().lat();
-        inner[QStringLiteral("lon")] = it->position().lon();
+        inner[QStringLiteral("delay")] = it->delay;
+        inner[QStringLiteral("name")] = QString::fromStdString(it->name);
+        inner[QStringLiteral("speed")] = it->speed;
+        inner[QStringLiteral("lat")] = it->position.lat;
+        inner[QStringLiteral("lon")] = it->position.lon;
         arr += inner;
     }
     obj[QStringLiteral("segments")] = arr;
@@ -394,27 +396,27 @@ SimulatedMovement ParticipantMoveDialog::jsonToSimulatedMovement(const QByteArra
     const QJsonDocument doc(QJsonDocument::fromJson(content));
     const QJsonObject obj(doc.object());
 
-    result.id(obj[QStringLiteral("id")].toInt());
-    result.jumpToStart(obj[QStringLiteral("jumpToStart")].toInt());
-    result.name(obj[QStringLiteral("name")].toString().toStdString());
-    result.nextPoint(obj[QStringLiteral("nextPoint")].toInt());
-    result.participantId(m_participantData.id());
-    result.repeat(obj[QStringLiteral("repeat")].toInt());
-    result.startTime(obj[QStringLiteral("startTime")].toDouble());
+    result.id = obj[QStringLiteral("id")].toInt();
+    result.jumpToStart = obj[QStringLiteral("jumpToStart")].toInt();
+    result.name = obj[QStringLiteral("name")].toString().toStdString();
+    result.nextPoint = obj[QStringLiteral("nextPoint")].toInt();
+    result.participantId = m_participantData.id;
+    result.repeat = obj[QStringLiteral("repeat")].toInt();
+    result.startTime = obj[QStringLiteral("startTime")].toDouble();
 
     const QJsonArray arr(obj.value(QStringLiteral("segments")).toArray());
-    auto& segments = result.segments();
+    auto& segments = result.segments;
     segments.resize(arr.size());
     for (int i = 0; i < arr.size(); ++i)
     {
         CentralEffectSimulation::SimulatedMovementSegment& segment = segments[i];
         const QJsonObject objArr(arr.at(i).toObject());
-        segment.delay(objArr[QStringLiteral("delay")].toDouble());
-        segment.name(objArr[QStringLiteral("name")].toString().toStdString());
+        segment.delay = objArr[QStringLiteral("delay")].toDouble();
+        segment.name = objArr[QStringLiteral("name")].toString().toStdString();
 
-        segment.position().lat(objArr[QStringLiteral("lat")].toDouble());
-        segment.position().lon(objArr[QStringLiteral("lon")].toDouble());
-        segment.speed(objArr[QStringLiteral("speed")].toDouble());
+        segment.position.lat = objArr[QStringLiteral("lat")].toDouble();
+        segment.position.lon = objArr[QStringLiteral("lon")].toDouble();
+        segment.speed = objArr[QStringLiteral("speed")].toDouble();
     }
     return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
index e95f2305f..2ae679357 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
@@ -16,6 +16,7 @@
 
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <CentralEffectSimulation/ces_dtc.h>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
index 47e2c0998..d7c54c792 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
@@ -32,6 +32,7 @@ ParticipantsMoveDialog::ParticipantsMoveDialog(const QString& menuGroup, QWidget
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_participantModel(nullptr),
       m_ppmDtc(nullptr), m_ppmCbxIfc(nullptr), m_ftc(nullptr), m_ui(new Ui::ParticipantMoveDialog), m_session(nullptr),
       m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this)), m_sitMapGuiIfc(nullptr)
+  , m_logger(getLogger("ParticipantsMoveDialog"))
 {
     m_ui->setupUi(this);
     setUnchangeable();
@@ -121,10 +122,10 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession* session,
         return false;
 
     const ExerciseManagement::Exercise exc = exmDtc->exercise(m_session->exerciseId());
-    AssetManagement::TrainingArea ta = asmDtc->trainingArea(exc.trainingAreaId());
-    if (ta.id() != exc.trainingAreaId())
+    AssetManagement::TrainingArea ta = asmDtc->trainingArea(exc.trainingAreaId);
+    if (ta.id != exc.trainingAreaId)
     {
-        ERROR_LOG(m_logger) << " couldn't get Training Area with id: " << exc.trainingAreaId();
+        ERROR_LOG(m_logger) << " couldn't get Training Area with id: " << exc.trainingAreaId;
         return false;
     }
 
@@ -135,8 +136,8 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession* session,
     }
 
     const LtsCoordTrans::UtmCoordinate& bottomLeft =
-        LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat());
-    m_trainingAreaRect = QRectF(bottomLeft.geographic(0, ta.height()), bottomLeft.geographic(ta.width(), 0));
+        LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat);
+    m_trainingAreaRect = QRectF(bottomLeft.geographic(0, ta.height), bottomLeft.geographic(ta.width, 0));
 
     m_ppmDtc->enableUnitPosition();
     m_ppmDtc->waitForHistoricalDataUnitPosition(1000);
@@ -196,11 +197,11 @@ void ParticipantsMoveDialog::onSelectionChanged()
         return;
 
     const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
-    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, data.isSimulated());
+    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id;
+    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, data.isSimulated);
 
-    if (data.isSimulated() && m_participantDialogMap.contains(data.id()))
-        m_participantDialogMap.value(data.id())->showPreview(true);
+    if (data.isSimulated && m_participantDialogMap.contains(data.id))
+        m_participantDialogMap.value(data.id)->showPreview(true);
     else
     {
 
@@ -217,19 +218,19 @@ void ParticipantsMoveDialog::onSelectionChanged()
         bool isParticipantInUseOrAdler = participantInUse4ExplosionCluster(indexList.first());
 
         if (!isParticipantInUseOrAdler)
-            isParticipantInUseOrAdler = (m_ppmDtc->isAdlerType(data.typeId()) && !data.name().empty());
+            isParticipantInUseOrAdler = (m_ppmDtc->isAdlerType(data.typeId) && !data.name.empty());
 
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, isOne && !isParticipantInUseOrAdler);
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, isOne && !isParticipantInUseOrAdler);
     }
 
-    if (m_ppmDtc->type(data.typeId()).typeClass() != ParticipantManagement::TypeClass::Unit)
+    if (m_ppmDtc->type(data.typeId).typeClass != ParticipantManagement::TypeClass::Unit)
     {
 
-        if (!data.equipmentNumber().is_set() || data.equipmentNumber().get() <= 0)
+        if (!data.equipmentNumber.has_value() || data.equipmentNumber.get() <= 0)
         {
 
-            isOne &= !(m_ppmDtc->isAdlerType(data.typeId()) && !data.name().empty());
+            isOne &= !(m_ppmDtc->isAdlerType(data.typeId) && !data.name.empty());
             m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, isOne);
         }
         else
@@ -265,19 +266,19 @@ void ParticipantsMoveDialog::onDoubleClicked()
         return;
 
     const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
+    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id;
 
-    if (!m_participantDialogMap.contains(data.id()))
+    if (!m_participantDialogMap.contains(data.id))
     {
         ParticipantMoveDialog* dialog = new ParticipantMoveDialog(this);
-        m_participantDialogMap.insert(data.id(), dialog);
+        m_participantDialogMap.insert(data.id, dialog);
         connect(dialog, &ParticipantMoveDialog::closeDialog, this, &ParticipantsMoveDialog::closeDialogReceived);
 
         addDialog(LtsWidgets::initDialog(dialog, m_session, m_ppmDtc, m_cesDtc, data), m_menuGroup,
-                  QStringLiteral("cesNewSimulation%1").arg(data.id()), LtsWidgets::LayoutArea::eDialogTab);
+                  QStringLiteral("cesNewSimulation%1").arg(data.id), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-        focusDialog(m_menuGroup, QStringLiteral("cesNewSimulation%1").arg(data.id()),
+        focusDialog(m_menuGroup, QStringLiteral("cesNewSimulation%1").arg(data.id),
                     LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -317,12 +318,12 @@ void ParticipantsMoveDialog::onRemove()
         return;
 
     const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-    INFO_LOG(m_logger) << "onRemove ParticipantId: " << data.id();
+    INFO_LOG(m_logger) << "onRemove ParticipantId: " << data.id;
 
-    delete m_participantDialogMap.value(data.id());
-    m_participantDialogMap.remove(data.id());
+    delete m_participantDialogMap.value(data.id);
+    m_participantDialogMap.remove(data.id);
 
-    removeFtc(data.id());
+    removeFtc(data.id);
 }
 
 void ParticipantsMoveDialog::onSetSimulatedMGRSPosition()
@@ -348,23 +349,23 @@ bool ParticipantsMoveDialog::participantInUse4ExplosionCluster(const QModelIndex
     const ParticipantManagement::ParticipantData participantData(participantFromIndex(participantIndex));
     bool bret = false;
 
-    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId());
-    bool isUnitType = (participantType.typeClass() == ParticipantManagement::TypeClass::Unit) ||
-                      (participantType.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
+    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId);
+    bool isUnitType = (participantType.typeClass == ParticipantManagement::TypeClass::Unit) ||
+                      (participantType.typeClass == ParticipantManagement::TypeClass::SupportUnit);
 
     if (!isUnitType)
     {
-        const QModelIndex parentIndex = m_participantModel->indexFromParticipantId(participantData.superiorModId());
+        const QModelIndex parentIndex = m_participantModel->indexFromParticipantId(participantData.superiorModId);
         const ParticipantManagement::ParticipantData parentParticipantData(participantFromIndex(parentIndex));
 
-        const ParticipantManagement::Type& partentParticipantType = m_ppmDtc->type(parentParticipantData.typeId());
-        isUnitType = (partentParticipantType.typeClass() == ParticipantManagement::TypeClass::Unit) ||
-                     (partentParticipantType.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
-        bret = isUnitType && isParticipantInUseForExplosionCluster(parentParticipantData.id());
+        const ParticipantManagement::Type& partentParticipantType = m_ppmDtc->type(parentParticipantData.typeId);
+        isUnitType = (partentParticipantType.typeClass == ParticipantManagement::TypeClass::Unit) ||
+                     (partentParticipantType.typeClass == ParticipantManagement::TypeClass::SupportUnit);
+        bret = isUnitType && isParticipantInUseForExplosionCluster(parentParticipantData.id);
         ;
     }
     else
-        bret = isParticipantInUseForExplosionCluster(participantData.id());
+        bret = isParticipantInUseForExplosionCluster(participantData.id);
 
     return bret;
 }
@@ -409,17 +410,17 @@ void ParticipantsMoveDialog::onGetCoordinate(QPointF coordinate)
 
     const ParticipantManagement::ParticipantData participantData(participantFromIndex(indexList.first()));
 
-    INFO_LOG(m_logger) << Q_FUNC_INFO << "ParticipantId=" << participantData.id()
-                       << " EquipmentNr=" << participantData.equipmentNumber()
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "ParticipantId=" << participantData.id
+                       << " EquipmentNr=" << participantData.equipmentNumber
                        << " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y();
-    if (participantData.id() <= 0)
+    if (participantData.id <= 0)
         return;
 
-    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId());
-    const bool& isUnitType = (participantType.typeClass() == ParticipantManagement::TypeClass::Unit) ||
-                             (participantType.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
+    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId);
+    const bool& isUnitType = (participantType.typeClass == ParticipantManagement::TypeClass::Unit) ||
+                             (participantType.typeClass == ParticipantManagement::TypeClass::SupportUnit);
 
-    m_formationProps.setFormation(QString::fromStdString(participantType.properties()));
+    m_formationProps.setFormation(QString::fromStdString(participantType.properties));
     const bool& withFormation = (isUnitType && m_formationProps.isArtillery);
     if (withFormation || m_mgrsPosEditCoordinateActive)
         setFormationAndPositioningUi(participantData, coordinate, withFormation);
@@ -481,8 +482,8 @@ bool ParticipantsMoveDialog::isParticipantInUseForExplosionCluster(int id)
     const QMap<qint32, AreaEffectSimulation::ExplosionCluster>& ecMap = m_aesDtc->explosionClusters();
     for (const AreaEffectSimulation::ExplosionCluster& aes : std::as_const(ecMap))
     {
-        if (aes.participantId() == id && (aes.effectStateId() == AreaEffectSimulation::AesEffectState::EsPrepared ||
-                                          aes.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated))
+        if (aes.participantId == id && (aes.effectStateId == AreaEffectSimulation::AesEffectState::EsPrepared ||
+                                          aes.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated))
             return true;
     }
     return false;
@@ -500,11 +501,11 @@ void ParticipantsMoveDialog::setFormationAndPositioningUi(const ParticipantManag
     if (!unitWithFormation && !m_mgrsPosEditCoordinateActive)
         return;
 
-    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId());
-    const bool isUnitType = (participantType.typeClass() == ParticipantManagement::TypeClass::Unit) ||
-                            (participantType.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
+    const ParticipantManagement::Type& participantType = m_ppmDtc->type(participantData.typeId);
+    const bool isUnitType = (participantType.typeClass == ParticipantManagement::TypeClass::Unit) ||
+                            (participantType.typeClass == ParticipantManagement::TypeClass::SupportUnit);
 
-    m_formationProps.setFormation(QString::fromStdString(participantType.properties()));
+    m_formationProps.setFormation(QString::fromStdString(participantType.properties));
 
     if (m_formationProps.hasFormationData())
         return;
@@ -688,7 +689,7 @@ bool ParticipantsMoveDialog::getUnitPosition(int32_t participantId, Core::GeoPos
     FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition usp = settings.symbolSettings.unitSymbolPosition;
 
     ParticipantManagement::UnitPosition up = m_ppmDtc->unitPosition(participantId);
-    if (up.participantId() != participantId)
+    if (up.participantId != participantId)
     {
         ERROR_LOG(m_logger) << Q_FUNC_INFO << ", unitPosition failed for participantId=" << participantId;
         return false;
@@ -697,11 +698,11 @@ bool ParticipantsMoveDialog::getUnitPosition(int32_t participantId, Core::GeoPos
     switch (usp)
     {
         case FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition::Center:
-            unitPositionOut = up.positionCenter();
+            unitPositionOut = up.positionCenter;
             return true;
             break;
         case FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition::Leader:
-            unitPositionOut = up.positionLeader();
+            unitPositionOut = up.positionLeader;
             return true;
             break;
     }
@@ -713,7 +714,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(
     const ParticipantManagement::ParticipantData& participantData, const QPointF& coordinate)
 {
 
-    const int participantId = participantData.id();
+    const int participantId = participantData.id;
     if (participantId <= 0)
         return;
 
@@ -721,20 +722,20 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(
     bool bAll = m_ui->cbAll->isChecked();
     bool bAskOutdated = true;
     if (bAll)
-        req.participantId(-1);
+        req.participantId = -1;
     else
     {
-        const ParticipantManagement::TypeClass tc = m_ppmDtc->type(participantData.typeId()).typeClass();
+        const ParticipantManagement::TypeClass tc = m_ppmDtc->type(participantData.typeId).typeClass;
 
-        DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id()
-                            << " EquipmentNr=" << participantData.equipmentNumber()
+        DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id
+                            << " EquipmentNr=" << participantData.equipmentNumber
                             << " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y() << ", tc=" << tc;
-        if (participantData.id() <= 0)
+        if (participantData.id <= 0)
             return;
-        req.participantId(participantData.id());
+        req.participantId = participantData.id;
 
         bAskOutdated =
-            m_ppmDtc->type(participantData.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit;
+            m_ppmDtc->type(participantData.typeId).typeClass == ParticipantManagement::TypeClass::Unit;
     }
 
     bool bOnlyOutdated = false;
@@ -751,8 +752,8 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(
         bOnlyOutdated = (b == LtsWidgets::Button::No);
     }
 
-    req.onlyOutdatedParticipants(bOnlyOutdated);
-    req.position(Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0));
+    req.onlyOutdatedParticipants = bOnlyOutdated;
+    req.position = Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0);
 
     m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->setSimulatedPositionRequest(req, this); });
 }
@@ -761,7 +762,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(
     const ParticipantManagement::ParticipantData& participantData, const QPointF& coordinate)
 {
 
-    const int participantId = participantData.id();
+    const int participantId = participantData.id;
     if (participantId <= 0)
         return;
 
@@ -773,10 +774,10 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(
     }
 
     INFO_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
-                       << ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
+                       << ", unitPositionOut: lon=" << unitPositionOut.lon << " - lat=" << unitPositionOut.lat;
 
     LtsCoordTrans::UtmCoordinate curUnitPosUtm =
-        LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
+        LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon, unitPositionOut.lat);
     LtsCoordTrans::UtmCoordinate desiredUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(coordinate);
     QPointF offset = desiredUnitPosUtm.relativeTo(curUnitPosUtm);
 
@@ -787,9 +788,9 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(
     }
 
     ParticipantManagement::SetSimulatedPositionRelative req;
-    req.participantId(participantId);
-    req.positionOffsetX(offset.x());
-    req.positionOffsetY(offset.y());
+    req.participantId = participantId;
+    req.positionOffsetX = offset.x();
+    req.positionOffsetY = offset.y();
 
     DEBUG_LOG(m_logger) << "SetSimulatedPositionRelative = " << req;
 
@@ -802,7 +803,7 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(
     const QString& formationData)
 {
 
-    const int participantId = participantData.id();
+    const int participantId = participantData.id;
     if (participantId <= 0)
         return;
 
@@ -814,10 +815,10 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(
     }
 
     INFO_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
-                       << ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
+                       << ", unitPositionOut: lon=" << unitPositionOut.lon << " - lat=" << unitPositionOut.lat;
 
     LtsCoordTrans::UtmCoordinate curUnitPosUtm =
-        LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
+        LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon, unitPositionOut.lat);
     LtsCoordTrans::UtmCoordinate desiredUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(coordinate);
     const QPointF offset = desiredUnitPosUtm.relativeTo(curUnitPosUtm);
 
@@ -828,11 +829,11 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(
     }
 
     ParticipantManagement::SetSimulatedParticipantFormation req;
-    req.participantId(participantId);
-    req.position(Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0));
-    req.positionOffsetX(offset.x());
-    req.positionOffsetY(offset.y());
-    req.formation(formationData.toStdString());
+    req.participantId = participantId;
+    req.position = Core::GeoPosition(coordinate.x(), coordinate.y(), 0.0);
+    req.positionOffsetX = offset.x();
+    req.positionOffsetY = offset.y();
+    req.formation = formationData.toStdString();
 
     m_requestHelper->startSingleRequest(
         [req, this]() { return m_ppmFtc->setSimulatedParticipantFormationRequest(req, this); });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
index 2217eed48..e1353ac61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
@@ -15,6 +15,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/ces_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp
index 82af0cb8a..e8dd3a7c4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp
@@ -11,6 +11,7 @@ ParticipantMoveModel::ParticipantMoveModel(QObject* parent,
                                            const std::shared_ptr<ParticipantManagement::Interface::Dtc>& ppmDtc,
                                            const std::shared_ptr<AdvancedSymbology::ForeignDataInterface>& asbIfc)
     : ParticipantManagement::ParticipantEditModel(parent, ppmDtc, asbIfc)
+  , m_logger(getLogger("ParticipantMoveModel"))
 {
     m_titles += tr("Simulated");
 
@@ -38,9 +39,9 @@ void ParticipantMoveModel::onParticipantChanged(const ParticipantManagement::Par
                                                 DataModification modType)
 {
     Q_UNUSED(modType)
-    if (data.partyId() != m_partyId)
+    if (data.partyId != m_partyId)
         return;
-    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
+    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated;
     onReinitModel(partyId());
     emit newData();
 }
@@ -50,17 +51,17 @@ bool ParticipantMoveModel::isSelectableBySimulation(const QModelIndex& index, bo
     bool isSimulatable = true;
     const ParticipantManagement::ParticipantData data(getParticipantData(index));
 
-    if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
-        m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+    if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
+        m_dtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
         isSimulatable = false;
 
-    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated()
-                        << " equipmentNo:" << data.equipmentNumber() << " typeId=" << data.typeId()
-                        << " modId=" << data.modId() << " typeClass=" << m_dtc->type(data.typeId()).typeClass()
+    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id << " isSimulated:" << data.isSimulated
+                        << " equipmentNo:" << data.equipmentNumber << " typeId=" << data.typeId
+                        << " modId=" << data.modId << " typeClass=" << m_dtc->type(data.typeId).typeClass
                         << " isSimulatable=" << isSimulatable;
 
     if (bIsSimulated)
-        *bIsSimulated = data.isSimulated();
+        *bIsSimulated = data.isSimulated;
 
     return isSimulatable;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.cpp
index fb681577c..d0c84ed3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.cpp
@@ -7,7 +7,7 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <CentralEffectSimulation/ces_operator_rights.h>
 #include <CentralEffectSimulation/ces_data_plugin_interface.h>
-#include <CentralEffectSimulation/ParticipantUAS/mission_plan_edit.h>
+#include "mission_plan_edit.h"
 #include "mission_plan_dialog.h"
 
 #include <LtsSession/lts_session.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.h
index 5f5e3d33f..86b10a47e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/ces_participant_uas_gui_plugin.h
@@ -6,6 +6,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/ces_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp
index f9b69f854..5296a85f6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp
@@ -16,6 +16,7 @@ MissionPlanDialog::MissionPlanDialog(const QString& menuGroup, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ppmDtc(nullptr), m_ppmFtc(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_session(nullptr), m_menuGroup(menuGroup),
       m_ui(new Ui::MissionPlanDialog)
+  , m_logger(getLogger("MissionPlanDialog"))
 {
     m_ui->setupUi(this);
 
@@ -130,11 +131,11 @@ MissionPlanDialog::wayPointCurrentStatus(const ParticipantManagement::MissionPla
 {
     WayPointsStatus state = WayPointsStatus::Undefined;
 
-    if (mp.missionStart() > m_session->partitionTime())
+    if (mp.missionStart > m_session->partitionTime())
         return WayPointsStatus::Prepared;
-    else if (mp.itemsFulfilled() != static_cast<int32_t>(mp.items().size()))
+    else if (mp.itemsFulfilled != static_cast<int32_t>(mp.items.size()))
         return WayPointsStatus::Active;
-    else if (mp.itemsFulfilled() == static_cast<int32_t>(mp.items().size()))
+    else if (mp.itemsFulfilled == static_cast<int32_t>(mp.items.size()))
         return WayPointsStatus::Expired;
 
     WARNING_LOG(m_logger) << " -- Status Wegpunktkette Abgebrochen muss definiert werden";
@@ -145,13 +146,13 @@ MissionPlanDialog::wayPointCurrentStatus(const ParticipantManagement::MissionPla
 bool MissionPlanDialog::canBeLocked() const
 {
     auto missionPlan = currentMissionPlan();
-    if (missionPlan.id() <= 0)
+    if (missionPlan.id <= 0)
         return false;
 
     const auto wpStatus = wayPointCurrentStatus(missionPlan);
-    const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId());
+    const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId, m_session->exerciseId());
 
-    if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus == WayPointsStatus::Active)
+    if (uas.uasState == ProjectDataManagement::UasState::UasState_Manual || wpStatus == WayPointsStatus::Active)
         return true;
 
     return false;
@@ -160,15 +161,15 @@ bool MissionPlanDialog::canBeLocked() const
 bool MissionPlanDialog::canBeUnlocked() const
 {
     auto missionPlan = currentMissionPlan();
-    if (missionPlan.id() <= 0)
+    if (missionPlan.id <= 0)
         return false;
-    if (missionPlan.aborted())
+    if (missionPlan.aborted)
         return false;
 
     const auto wpStatus = wayPointCurrentStatus(missionPlan);
-    const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId());
+    const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId, m_session->exerciseId());
 
-    if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus != WayPointsStatus::Active)
+    if (uas.uasState == ProjectDataManagement::UasState::UasState_Manual || wpStatus != WayPointsStatus::Active)
         return true;
 
     return false;
@@ -181,10 +182,10 @@ MissionPlanEdit* MissionPlanDialog::currentMissionPlanEditor() const
         return nullptr;
 
     const ParticipantManagement::MissionPlan mp = m_missionPlanModel->getRowData(indexList.front().row());
-    if (mp.id() < 0)
+    if (mp.id < 0)
         return nullptr;
 
-    return m_participantUasEditMap.value(mp.participantId(), nullptr);
+    return m_participantUasEditMap.value(mp.participantId, nullptr);
 }
 
 ParticipantManagement::MissionPlan MissionPlanDialog::currentMissionPlan() const
@@ -257,12 +258,12 @@ void MissionPlanDialog::onAddMissionPlan()
     }
 
     const ParticipantManagement::MissionPlan mp = m_missionPlanModel->getRowData(indexList.front().row());
-    if (mp.id() <= 0)
+    if (mp.id <= 0)
     {
         return;
     }
 
-    addDialog(LtsWidgets::initDialog(new MissionPlanEdit(this), mp.id(), m_session, true), m_menuGroup,
+    addDialog(LtsWidgets::initDialog(new MissionPlanEdit(this), mp.id, m_session, true), m_menuGroup,
               newMissionPlanIdentifier, LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -277,9 +278,9 @@ void MissionPlanDialog::onRemoveMissionPlanClicked()
         return;
     const ParticipantManagement::MissionPlan mp = m_missionPlanModel->getRowData(indexList.front().row());
 
-    delete m_participantUasEditMap.value(mp.id());
-    m_participantUasEditMap.remove(mp.id());
-    removeMissionPlan(mp.id());
+    delete m_participantUasEditMap.value(mp.id);
+    m_participantUasEditMap.remove(mp.id);
+    removeMissionPlan(mp.id);
 }
 
 void MissionPlanDialog::onEditMissionPlan()
@@ -289,17 +290,17 @@ void MissionPlanDialog::onEditMissionPlan()
         return;
 
     const ParticipantManagement::MissionPlan mp = m_missionPlanModel->getRowData(indexList.front().row());
-    if (mp.id() <= 0)
+    if (mp.id <= 0)
         return;
 
-    const QString dialogIdentifier = QStringLiteral("Edit-MissionPlan_%1").arg(mp.id());
+    const QString dialogIdentifier = QStringLiteral("Edit-MissionPlan_%1").arg(mp.id);
 
-    if (!m_participantUasEditMap.contains(mp.participantId()))
+    if (!m_participantUasEditMap.contains(mp.participantId))
     {
         MissionPlanEdit* dialog = new MissionPlanEdit(this);
-        m_participantUasEditMap.insert(mp.participantId(), dialog);
+        m_participantUasEditMap.insert(mp.participantId, dialog);
         connect(dialog, &MissionPlanEdit::editUasDialogClosed, this, &MissionPlanDialog::onEditDialogClosed);
-        addDialog(LtsWidgets::initDialog(dialog, mp.id(), m_session), m_menuGroup, dialogIdentifier,
+        addDialog(LtsWidgets::initDialog(dialog, mp.id, m_session), m_menuGroup, dialogIdentifier,
                   LtsWidgets::LayoutArea::eDialogTab);
     }
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
index d4b182d47..9476a9f12 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
@@ -6,6 +6,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <LtsSession/lts_session.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <CentralEffectSimulation/ces_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
index 0c9a48722..673d38fda 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
@@ -9,6 +9,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -29,6 +30,7 @@ MissionPlanEdit::MissionPlanEdit(QWidget* parent)
       m_uiEnabled(false), m_sitMapGuiIfc(nullptr), m_ppmCbxGui(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_participantTimer(new QTimer(this)),
       m_ui(new Ui::MissionPlanEdit)
+  , m_logger(getLogger("MissionPlanEdit"))
 {
     m_ui->setupUi(this);
     m_ui->nameLineEdit->clear();
@@ -58,7 +60,7 @@ MissionPlanEdit::~MissionPlanEdit()
 {
     m_sitMapGuiIfc = nullptr;
     delete m_ui;
-    emit editUasDialogClosed(m_participantData.id());
+    emit editUasDialogClosed(m_participantData.id);
 }
 
 bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDds* session, bool asCopy)
@@ -97,14 +99,14 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
 
     m_missionPlan = m_ppmDtc->missionPlan(m_missionPlanId);
     auto cb = [this, asCopy](const ParticipantManagement::MissionPlan& mission) {
-        if ((((mission.participantId() == m_missionPlan.participantId()) && !asCopy) || mission.participantId() <= 0) &&
-            mission.missionStart() <= m_missionPlan.missionStart() && !mission.aborted())
+        if ((((mission.participantId == m_missionPlan.participantId) && !asCopy) || mission.participantId <= 0) &&
+            mission.missionStart <= m_missionPlan.missionStart && !mission.aborted)
             return;
 
-        if (static_cast<int>(mission.items().size()) == mission.itemsFulfilled() || mission.aborted())
+        if (static_cast<int>(mission.items.size()) == mission.itemsFulfilled || mission.aborted)
             return;
 
-        m_usedUasSet.insert(mission.participantId());
+        m_usedUasSet.insert(mission.participantId);
     };
     m_ppmDtc->missionPlans(cb);
 
@@ -116,11 +118,11 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
         setReady(false);
         const auto pId = m_ui->participantCBox->currentData().toInt();
         m_participant = m_ppmDtc->participant(pId);
-        const auto dpd = m_ppmDtc->dynamicParticipantData(m_participant.id());
-        DEBUG_LOG(m_logger) << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id()
-                            << ", dpd.participantId(): " << dpd.participantId();
+        const auto dpd = m_ppmDtc->dynamicParticipantData(m_participant.id);
+        DEBUG_LOG(m_logger) << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id
+                            << ", dpd.participantId(): " << dpd.participantId;
 
-        if (dpd.participantId() < 1)
+        if (dpd.participantId < 1)
         {
             ERROR_LOG(m_logger) << "no dynamic pdata yet for pId " << pId;
             setReady(false);
@@ -159,10 +161,10 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
 
     enaDisa();
 
-    if (m_participant.id() <= 0)
+    if (m_participant.id <= 0)
         setReady(false);
 
-    if (m_missionPlanId > 0 && m_session->partitionTime() > m_missionPlan.missionStart() && !asCopy)
+    if (m_missionPlanId > 0 && m_session->partitionTime() > m_missionPlan.missionStart && !asCopy)
     {
         enableUiElements(false);
         m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setEnabled(false);
@@ -183,7 +185,7 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
 
 void MissionPlanEdit::retranslate()
 {
-    translate(m_ui, ((m_missionPlanId <= 0) ? QString() : QString::fromStdString(m_missionPlan.name())),
+    translate(m_ui, ((m_missionPlanId <= 0) ? QString() : QString::fromStdString(m_missionPlan.name)),
               m_missionPlanId <= 0, tr("UAS-Waypoints"));
 }
 
@@ -198,14 +200,14 @@ void MissionPlanEdit::setReady(bool isReady)
 void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData& data,
                                                       DataModification modType)
 {
-    if (data.participantId() != m_participant.id() && data.participantId() != 0)
+    if (data.participantId != m_participant.id && data.participantId != 0)
     {
-        ERROR_LOG(m_logger) << "### " << data.participantId() << " != " << m_participant.id() << " (" << (int)modType
+        ERROR_LOG(m_logger) << "### " << data.participantId << " != " << m_participant.id << " (" << (int)modType
                             << ")";
         return;
     }
 
-    DEBUG_LOG(m_logger) << "### " << data.participantId() << " == " << m_participant.id() << " (" << (int)modType
+    DEBUG_LOG(m_logger) << "### " << data.participantId << " == " << m_participant.id << " (" << (int)modType
                         << ") !!!";
 
     if (modType == DataModification::eRemoved)
@@ -213,48 +215,48 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
         return;
     }
 
-    if (data.stateHistory().empty())
+    if (data.stateHistory.empty())
     {
         setReady(false);
         return;
     }
 
-    const auto& history = data.stateHistory();
+    const auto& history = data.stateHistory;
 
     auto lastState = m_ppmDtc->youngestStateInformation(history);
     decltype(lastState) youngestState;
-    youngestState.stateTime(0);
+    youngestState.stateTime = 0;
     for (const auto& si : history)
     {
         DEBUG_LOG(m_logger) << "StateInformation "
-                            << " time=" << si.stateTime() << " vulnerabilityBits=" << si.vulnerabilityBits()
-                            << " vulnerabilityKindId=" << si.vulnerabilityKindId();
-        if (youngestState.stateTime() < si.stateTime())
+                            << " time=" << si.stateTime << " vulnerabilityBits=" << si.vulnerabilityBits
+                            << " vulnerabilityKindId=" << si.vulnerabilityKindId;
+        if (youngestState.stateTime < si.stateTime)
             youngestState = si;
     }
 
-    setReady(youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+    setReady(youngestState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
 }
 
 void MissionPlanEdit::onMissionPlanChanged(const ParticipantManagement::MissionPlan& data,
                                            const DataModification modType)
 {
     Q_UNUSED(modType)
-    if (data.id() != m_missionPlanId)
+    if (data.id != m_missionPlanId)
     {
 
-        if (static_cast<int>(data.items().size()) != data.itemsFulfilled())
+        if (static_cast<int>(data.items.size()) != data.itemsFulfilled)
             return;
-        if (m_usedUasSet.contains(data.participantId()))
+        if (m_usedUasSet.contains(data.participantId))
         {
-            m_usedUasSet.remove(data.participantId());
+            m_usedUasSet.remove(data.participantId);
             fillParticipants();
         }
         return;
     }
 
     bool enabled;
-    if (m_session->partitionTime() > m_missionPlan.missionStart() && !m_missionPlan.aborted())
+    if (m_session->partitionTime() > m_missionPlan.missionStart && !m_missionPlan.aborted)
         enabled = false;
     else
         enabled = true;
@@ -264,7 +266,7 @@ void MissionPlanEdit::onMissionPlanChanged(const ParticipantManagement::MissionP
     m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setEnabled(enabled);
     m_buttonBox->getButton(LtsWidgets::DialogButton::Apply)->setEnabled(enabled);
 
-    if (static_cast<int>(data.items().size()) == data.itemsFulfilled() && m_usedUasSet.remove(data.participantId()))
+    if (static_cast<int>(data.items.size()) == data.itemsFulfilled && m_usedUasSet.remove(data.participantId))
         fillParticipants();
 }
 
@@ -314,21 +316,21 @@ bool MissionPlanEdit::apply()
     ParticipantManagement::UAS uasP =
         m_ppmDtc->getUasByParticipantId(m_ui->participantCBox->currentData().toInt(), m_session->exerciseId());
 
-    if (uasP.uasState() == ProjectDataManagement::UasState::Manual &&
-        uasP.participantId() != m_missionPlan.participantId())
+    if (uasP.uasState == ProjectDataManagement::UasState::UasState_Manual &&
+        uasP.participantId != m_missionPlan.participantId)
     {
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Waypoints can't be saved!: Uas switched to %1-Mode")
-                                                            .arg(ProjectDataManagement::toString(uasP.uasState())));
+                                                            .arg(ProjectDataManagement::toString(uasP.uasState)));
         return false;
     }
     ParticipantManagement::ModifyMissionPlanRequest req;
-    req.id(m_missionPlanId);
-    req.missionStart(m_ui->dteStartTime->msecsSinceEpoch());
-    req.participantId(m_ui->participantCBox->currentData().toInt());
-    req.jumpToStart(false);
-    req.repeat(false);
-    req.name(m_ui->nameLineEdit->text().toStdString());
-    req.items(itemsRequestContent());
+    req.id = m_missionPlanId;
+    req.missionStart = m_ui->dteStartTime->msecsSinceEpoch();
+    req.participantId = m_ui->participantCBox->currentData().toInt();
+    req.jumpToStart = false;
+    req.repeat = false;
+    req.name = m_ui->nameLineEdit->text().toStdString();
+    req.items = itemsRequestContent();
 
     return m_requestHelper->startSingleRequest([this, req]() { return m_ppmFtc->modifyMissionPlanRequest(req, this); });
 }
@@ -476,43 +478,43 @@ const std::vector<ParticipantManagement::MissionItem> MissionPlanEdit::itemsRequ
 
         {
             ParticipantManagement::MissionAction actionMoveTo;
-            actionMoveTo.actionType(ParticipantManagement::MissionActionType::MoveTo);
-            actionMoveTo.duration(0);
-            actionMoveTo.actionNumber(actionNumber++);
-            actionMoveTo.name(msaName.toStdString());
-            actionMoveTo.itemNumber(itemNumber);
-            actionMoveTo.planId(m_missionPlan.id());
+            actionMoveTo.actionType = ParticipantManagement::MissionActionType::MoveTo;
+            actionMoveTo.duration = 0;
+            actionMoveTo.actionNumber = actionNumber++;
+            actionMoveTo.name = msaName.toStdString();
+            actionMoveTo.itemNumber = itemNumber;
+            actionMoveTo.planId = m_missionPlan.id;
 
             QJsonObject jsoMoveTo;
             jsoMoveTo.insert(QStringLiteral("location_x"), point.x());
             jsoMoveTo.insert(QStringLiteral("location_y"), point.y());
             jsoMoveTo.insert(QStringLiteral("location_z"), altitude);
             const QString props = QString::fromUtf8(QJsonDocument(jsoMoveTo).toJson(QJsonDocument::Compact));
-            actionMoveTo.properties(props.toStdString());
-            msi.actions().push_back(actionMoveTo);
+            actionMoveTo.properties = props.toStdString();
+            msi.actions.push_back(actionMoveTo);
         }
 
         if (idleTime > 0)
         {
             ParticipantManagement::MissionAction actionLoiter;
-            actionLoiter.actionType(ParticipantManagement::MissionActionType::Loiter);
-            actionLoiter.duration(idleTime);
-            actionLoiter.actionNumber(actionNumber++);
-            actionLoiter.itemNumber(itemNumber);
-            actionLoiter.name(msaName.toStdString());
-            actionLoiter.planId(m_missionPlan.id());
-            msi.actions().push_back(actionLoiter);
+            actionLoiter.actionType = ParticipantManagement::MissionActionType::Loiter;
+            actionLoiter.duration = idleTime;
+            actionLoiter.actionNumber = actionNumber++;
+            actionLoiter.itemNumber = itemNumber;
+            actionLoiter.name = msaName.toStdString();
+            actionLoiter.planId = m_missionPlan.id;
+            msi.actions.push_back(actionLoiter);
         }
 
         if (chargeTypeId > 0)
         {
             ParticipantManagement::MissionAction actionAttack;
-            actionAttack.actionType(ParticipantManagement::MissionActionType::Attack);
-            actionAttack.duration(idleTime);
-            actionAttack.actionNumber(actionNumber++);
-            actionAttack.itemNumber(itemNumber);
-            actionAttack.name(msaName.toStdString());
-            actionAttack.planId(m_missionPlan.id());
+            actionAttack.actionType = ParticipantManagement::MissionActionType::Attack;
+            actionAttack.duration = idleTime;
+            actionAttack.actionNumber = actionNumber++;
+            actionAttack.itemNumber = itemNumber;
+            actionAttack.name = msaName.toStdString();
+            actionAttack.planId = m_missionPlan.id;
 
             QJsonObject jsoAttack;
             jsoAttack.insert(QStringLiteral("location_x"), point.x());
@@ -520,14 +522,14 @@ const std::vector<ParticipantManagement::MissionItem> MissionPlanEdit::itemsRequ
             jsoAttack.insert(QStringLiteral("location_z"), 0);
             jsoAttack.insert(QStringLiteral("chargeTypeId"), chargeTypeId);
             const QString props = QString::fromUtf8(QJsonDocument(jsoAttack).toJson(QJsonDocument::Compact));
-            actionAttack.properties(props.toStdString());
+            actionAttack.properties = props.toStdString();
 
-            msi.actions().push_back(actionAttack);
+            msi.actions.push_back(actionAttack);
         }
 
-        msi.itemNumber(itemNumber++);
-        msi.location(geoPos);
-        msi.name(msiName.toStdString());
+        msi.itemNumber = itemNumber++;
+        msi.location = geoPos;
+        msi.name = msiName.toStdString();
         missionItems.push_back(msi);
     }
 
@@ -542,13 +544,13 @@ void MissionPlanEdit::setUASCharges()
     for (const ProjectDataManagement::ChargeType& chargeType : std::as_const(chargesForGearClass))
     {
 
-        if (!m_pdmDtc->isUasDroppable(chargeType.id(), 0, 0))
+        if (!m_pdmDtc->isUasDroppable(chargeType.id, 0, 0))
             continue;
         DEBUG_LOG(m_logger) << " fillCharges"
-                            << ", id=" << chargeType.id() << ", name= " << chargeType.name();
+                            << ", id=" << chargeType.id << ", name= " << chargeType.name;
 
-        m_ui->chargesCBox->addItem(QString::fromStdString(chargeType.name()), chargeType.id());
-        m_uasCharges.insert(chargeType.id(), QString::fromStdString(chargeType.name()));
+        m_ui->chargesCBox->addItem(QString::fromStdString(chargeType.name), chargeType.id);
+        m_uasCharges.insert(chargeType.id, QString::fromStdString(chargeType.name));
     }
     m_ui->chargesCBox->setCurrentIndex(0);
 }
@@ -561,37 +563,37 @@ void MissionPlanEdit::setData(int mpId)
         return;
 
     m_missionPlan = m_ppmDtc->missionPlan(mpId);
-    m_participantData = m_ppmDtc->participant(m_missionPlan.participantId());
+    m_participantData = m_ppmDtc->participant(m_missionPlan.participantId);
     m_ui->dteStartTime->setMinimumTimeMSec(m_session->partitionTime());
     m_ui->dteStartTime->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
-    m_ui->dteStartTime->setMsecsSinceEpoch(m_missionPlan.missionStart());
-    m_ui->nameLineEdit->setText(QString::fromStdString(m_missionPlan.name()));
+    m_ui->dteStartTime->setMsecsSinceEpoch(m_missionPlan.missionStart);
+    m_ui->nameLineEdit->setText(QString::fromStdString(m_missionPlan.name));
 
-    if (m_participantData.partyId() > 0)
+    if (m_participantData.partyId > 0)
     {
-        const int partyIdx = m_ui->cbParty->findData(QVariant::fromValue(m_participantData.partyId()));
+        const int partyIdx = m_ui->cbParty->findData(QVariant::fromValue(m_participantData.partyId));
         m_ui->cbParty->setCurrentIndex(partyIdx);
 
-        const int ppIdx = m_ui->participantCBox->findData(QVariant::fromValue(m_missionPlan.participantId()));
+        const int ppIdx = m_ui->participantCBox->findData(QVariant::fromValue(m_missionPlan.participantId));
         m_ui->participantCBox->setCurrentIndex(ppIdx);
     }
 
-    for (const auto& item : std::as_const(m_missionPlan.items()))
+    for (const auto& item : std::as_const(m_missionPlan.items))
     {
-        const std::vector<ParticipantManagement::MissionAction>& msaVec = item.actions();
+        const std::vector<ParticipantManagement::MissionAction>& msaVec = item.actions;
         WayPointParam wpp;
-        wpp.identifier = QString::fromStdString(item.name());
-        wpp.lat = item.location().lat();
-        wpp.lon = item.location().lon();
-        wpp.z = item.location().z();
+        wpp.identifier = QString::fromStdString(item.name);
+        wpp.lat = item.location.lat;
+        wpp.lon = item.location.lon;
+        wpp.z = item.location.z;
         for (auto const& msa : msaVec)
         {
-            if (msa.actionType() == ParticipantManagement::MissionActionType::Loiter)
-                wpp.idleTime = msa.duration();
+            if (msa.actionType == ParticipantManagement::MissionActionType::Loiter)
+                wpp.idleTime = msa.duration;
 
-            if (msa.actionType() == ParticipantManagement::MissionActionType::Attack)
+            if (msa.actionType == ParticipantManagement::MissionActionType::Attack)
             {
-                const QJsonObject& obj = QJsonDocument::fromJson(QByteArray::fromStdString(msa.properties())).object();
+                const QJsonObject& obj = QJsonDocument::fromJson(QByteArray::fromStdString(msa.properties)).object();
                 wpp.chargeTypeId = obj.value(QLatin1String("chargeTypeId")).toInt();
             }
         }
@@ -618,17 +620,17 @@ void MissionPlanEdit::fillParticipants()
     m_ui->participantCBox->clear();
     for (const auto& participant : participants)
     {
-        QString uasString = QStringLiteral("%1 (%2)").arg(m_ppmDtc->hierarchyFromParticipant(participant.id()));
-        if (uasString.isEmpty() || m_usedUasSet.contains(participant.id()))
+        QString uasString = QStringLiteral("%1 (%2)").arg(m_ppmDtc->hierarchyFromParticipant(participant.id));
+        if (uasString.isEmpty() || m_usedUasSet.contains(participant.id))
             continue;
         const ParticipantManagement::UAS& uasP =
-            m_ppmDtc->getUasByParticipantId(participant.id(), m_session->exerciseId());
-        uasString = uasString.arg(ProjectDataManagement::toString(uasP.uasState()));
-        m_ui->participantCBox->addItem(uasString, participant.id());
+            m_ppmDtc->getUasByParticipantId(participant.id, m_session->exerciseId());
+        uasString = uasString.arg(ProjectDataManagement::toString(uasP.uasState));
+        m_ui->participantCBox->addItem(uasString, participant.id);
     }
-    if (m_missionPlan.id() > 0)
+    if (m_missionPlan.id > 0)
         m_ui->participantCBox->setCurrentIndex(
-            m_ui->participantCBox->findData(QVariant::fromValue(m_missionPlan.participantId())));
+            m_ui->participantCBox->findData(QVariant::fromValue(m_missionPlan.participantId)));
 
     if (m_ui->participantCBox->currentIndex() < 0)
         m_ui->participantCBox->setCurrentIndex(0);
@@ -637,13 +639,13 @@ void MissionPlanEdit::fillParticipants()
 void MissionPlanEdit::gatherUASParticipants(int partyId, QVector<ParticipantManagement::Participant>& participant)
 {
     auto cb = [this, &partyId, &participant](const ParticipantManagement::Participant& p) {
-        if (p.isDeleted() || p.partyId() != partyId)
+        if (p.isDeleted || p.partyId != partyId)
             return;
         const ParticipantManagement::ParticipantData& ppData = m_ppmDtc->convertParticipantToParticipantData(p);
-        const ParticipantManagement::Type&& ppType = m_ppmDtc->type(ppData.typeId());
+        const ParticipantManagement::Type&& ppType = m_ppmDtc->type(ppData.typeId);
         const QJsonObject typeProperties(
-            QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties())).object());
-        if (typeProperties.isEmpty() || ppType.typeClass() != ParticipantManagement::TypeClass::Aircraft ||
+            QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties)).object());
+        if (typeProperties.isEmpty() || ppType.typeClass != ParticipantManagement::TypeClass::Aircraft ||
             !typeProperties[QStringLiteral("isUAS")].toBool(false))
             return;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
index 53eb7b565..23238dceb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
@@ -15,6 +15,7 @@
 
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/ces_dtc.h>
 #include <LtsWidgets/lts_date_time_edit.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.cpp
index 60165e259..b7b7c8232 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.cpp
@@ -15,6 +15,7 @@ MissionPlanModel::MissionPlanModel(QObject* parent)
            tr("UAS State"), tr("Current Mission"), tr("Aborted")},
           parent),
       m_ppmDtc(nullptr)
+  , m_logger(getLogger("MissionPlanModel"))
 {
 }
 
@@ -28,34 +29,34 @@ QVariant MissionPlanModel::data(const QModelIndex& index, int role) const
     {
 
         case Columns::Name:
-            return QString::fromStdString(mp.name());
+            return QString::fromStdString(mp.name);
         case Columns::MissionStart:
-            return QDateTime::fromMSecsSinceEpoch(mp.missionStart());
+            return QDateTime::fromMSecsSinceEpoch(mp.missionStart);
         case Columns::Fulfilled:
-            return QDateTime::fromMSecsSinceEpoch(mp.fulfilled());
+            return QDateTime::fromMSecsSinceEpoch(mp.fulfilled);
         case Columns::ItemsCountAndFulfilled: {
             int actionsFulfilled = 0;
             int actionsCount = 0;
-            for (const auto& item : mp.items())
+            for (const auto& item : mp.items)
             {
-                actionsFulfilled += item.actionsFulfilled();
-                actionsCount += item.actions().size();
+                actionsFulfilled += item.actionsFulfilled;
+                actionsCount += item.actions.size();
             }
             return QStringLiteral("%1/%2").arg(actionsFulfilled).arg(actionsCount);
         }
         case Columns::Participant: {
-            const auto& participant = m_ppmDtc->participant(mp.participantId());
-            return QString::number(mp.participantId());
+            const auto& participant = m_ppmDtc->participant(mp.participantId);
+            return QString::number(mp.participantId);
         }
         case Columns::UasState: {
-            const auto& uas = m_ppmDtc->getUasByParticipantId(mp.participantId(), m_exerciseId);
-            return ProjectDataManagement::toString(uas.uasState());
+            const auto& uas = m_ppmDtc->getUasByParticipantId(mp.participantId, m_exerciseId);
+            return ProjectDataManagement::toString(uas.uasState);
         }
         case Columns::CurrentMission: {
             return currentJob2String(mp);
         }
         case Columns::Aborted: {
-            return mp.aborted();
+            return mp.aborted;
         }
         default:
             break;
@@ -90,20 +91,20 @@ bool MissionPlanModel::initModel(const std::shared_ptr<ParticipantManagement::In
 QString MissionPlanModel::currentJob2String(const ParticipantManagement::MissionPlan& missionPlan) const
 {
 
-    ParticipantManagement::MissionAction currAction = m_ppmDtc->currentMissionAction(missionPlan.id());
-    if (currAction.planId() == 0 || static_cast<int>(missionPlan.items().size()) == missionPlan.itemsFulfilled())
+    ParticipantManagement::MissionAction currAction = m_ppmDtc->currentMissionAction(missionPlan.id);
+    if (currAction.planId == 0 || static_cast<int>(missionPlan.items.size()) == missionPlan.itemsFulfilled)
         return tr(" Mission Complete ");
 
-    switch (currAction.actionType().underlying())
+    switch (currAction.actionType)
     {
         case ParticipantManagement::MissionActionType::MoveTo: {
-            return tr("Move to WP %1").arg(currAction.itemNumber() + 1);
+            return tr("Move to WP %1").arg(currAction.itemNumber + 1);
         }
         case ParticipantManagement::MissionActionType::Loiter: {
-            return tr("WP %1: Loiter %2 sec.").arg(currAction.itemNumber() + 1).arg(currAction.duration());
+            return tr("WP %1: Loiter %2 sec.").arg(currAction.itemNumber + 1).arg(currAction.duration);
         }
         case ParticipantManagement::MissionActionType::Attack: {
-            return tr("WP %1: Drop Charge").arg(currAction.itemNumber() + 1);
+            return tr("WP %1: Drop Charge").arg(currAction.itemNumber + 1);
         }
         default:
             return tr("Unknown");
@@ -113,9 +114,9 @@ QString MissionPlanModel::currentJob2String(const ParticipantManagement::Mission
 void MissionPlanModel::onMissionPlanChanged(const ParticipantManagement::MissionPlan& data,
                                             const DataModification modType)
 {
-    const int id = data.id();
+    const int id = data.id;
     int row = findRowForId(id);
-    DEBUG_LOG(m_logger) << "MISSION PLAN CHANGED id ( " << data.id() << " ) " << modType;
+    DEBUG_LOG(m_logger) << "MISSION PLAN CHANGED id ( " << data.id << " ) " << modType;
     switch (modType)
     {
         case DataModification::eModified: {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
index 13285e515..06d32a3e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
@@ -11,6 +11,7 @@
 #include <LtsSession/lts_session_data.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
index 47de5a6f8..d9e0ad4fe 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_assign_codification_data_table.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_codification_data_overview_model.h"
 
@@ -14,6 +15,7 @@ using namespace CodificationManagement;
 AssignCodificationDataTable::AssignCodificationDataTable(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_dtc(nullptr), m_ftc(nullptr),
       m_ppmDtc(nullptr), m_ui(new Ui::AssignCodificationDataTable), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AssignCodificationDataTable"))
 {
     m_ui->setupUi(this);
 
@@ -153,7 +155,7 @@ bool AssignCodificationDataTable::apply()
         CodificationManagement::CodificationData codDdsData = m_dtc->codificationData(tableId);
 
         bStartRequests = true;
-        codDdsData.partyId(partyId);
+        codDdsData.partyId = partyId;
         m_requestHelper->addRequest(
             [this, codDdsData]() { return m_ftc->codificationDataModifyRequest(codDdsData, this); });
     }
@@ -169,11 +171,11 @@ bool AssignCodificationDataTable::removeAllAssignments()
     bool bStartRequests = false;
     for (CodificationManagement::CodificationData codData : codMap)
     {
-        if (codData.partyId() < 0)
+        if (codData.partyId < 0)
             continue;
 
         bStartRequests = true;
-        codData.partyId(-1);
+        codData.partyId = -1;
         m_requestHelper->addRequest([this, codData]() { return m_ftc->codificationDataModifyRequest(codData, this); });
     }
     if (!bStartRequests)
@@ -185,5 +187,5 @@ bool AssignCodificationDataTable::removeAllAssignments()
 bool AssignCodificationDataTable::isTableAlreadyAssigned(int codTableId) const
 {
     const CodificationManagement::CodificationData& codData = m_dtc->codificationData(codTableId);
-    return codData.partyId() > 0;
+    return codData.partyId > 0;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.h
index cea27df0e..ca30233ba 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.h
@@ -9,6 +9,7 @@
 #include <LtsWidgets/lts_combo_box.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <CodificationManagement/cod_dtc.h>
 #include <CodificationManagement/cod_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
index 9ed9bad70..1624e1eaa 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_authentication_code_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtGui/QGuiApplication>
 #include <QPalette>
@@ -9,6 +10,7 @@ using namespace CodificationManagement;
 
 AuthenticationCodeModel::AuthenticationCodeModel(QObject* parent)
     : QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AuthenticationCodeModel"))
 {
     memset(m_matrix, 0, sizeof m_matrix);
     DEBUG_LOG(m_logger) << "ctor AuthenticationCodeModel";
@@ -63,7 +65,7 @@ bool AuthenticationCodeModel::setMatrixValuesCSV(const QString& csvData)
 {
     DEBUG_LOG(m_logger) << "setMatrixValuesCSV: " << csvData;
 
-    const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
+    const QList<QString> slRows = csvData.split(QLatin1Char('\n'));
     if (slRows.size() != rowCount())
     {
         ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
@@ -73,7 +75,7 @@ bool AuthenticationCodeModel::setMatrixValuesCSV(const QString& csvData)
 
     for (int row = 0; row < slRows.size(); ++row)
     {
-        const QVector<QStringRef> slColumns = slRows[row].split(QLatin1Char(';'));
+        const QList<QString> slColumns = slRows[row].split(QLatin1Char(';'));
         if (slColumns.size() != columnCount())
         {
             ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -212,13 +214,13 @@ Qt::ItemFlags AuthenticationCodeModel::flags(const QModelIndex& index) const
 void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
                                                         DataModification modType)
 {
-    const int id = data.id();
+    const int id = data.id;
 
     DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
-                        << " - AuthenticationCodeMatrix data: " << data.authenticationTableMatirx().c_str()
+                        << " - AuthenticationCodeMatrix data: " << data.authenticationTableMatirx.c_str()
                         << " - modType: " << (int)modType;
 
-    if (m_codificationDataId != data.id())
+    if (m_codificationDataId != data.id)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -232,9 +234,9 @@ void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManage
 
     if (modType == DataModification::eModified)
     {
-        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
+        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
 
-        QString qs = QString::fromStdString(data.authenticationTableMatirx());
+        QString qs = QString::fromStdString(data.authenticationTableMatirx);
         setMatrixValuesCSV(qs);
     }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.cpp
index 07da7d7ee..1997333d3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.cpp
@@ -3,6 +3,7 @@
 #include "cod_code_table_edit_delegate.h"
 
 #include <QtWidgets/QLineEdit>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 using namespace CodificationManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
index 77d2a7349..de7449df2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_codification_data_overview_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ParticipantManagement/ppm_translation.h>
 #include <QtGui/QColor>
@@ -19,6 +20,7 @@ CodificationDataOverviewModel::CodificationDataOverviewModel(QObject* parent)
            tr("Note")},
           parent),
       m_codDtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataOverviewModel"))
 {
 }
 
@@ -53,43 +55,43 @@ QVariant CodificationDataOverviewModel::data(const QModelIndex& index, int role)
         switch (index.column())
         {
             case Id:
-                return codificationData.id();
+                return codificationData.id;
             case Identifier:
-                return QString::fromUtf8(codificationData.identifier().c_str());
+                return QString::fromUtf8(codificationData.identifier.c_str());
             case ValidityTime:
-                return QDateTime::fromMSecsSinceEpoch(codificationData.validityTime());
+                return QDateTime::fromMSecsSinceEpoch(codificationData.validityTime);
             case PartyId:
-                if (codificationData.partyId() < 0)
+                if (codificationData.partyId < 0)
                     return QStringLiteral("---");
 
-                if (codificationData.partyId() == 2)
+                if (codificationData.partyId == 2)
                     return tr("OPFOR");
-                else if (codificationData.partyId() == 3)
+                else if (codificationData.partyId == 3)
                     return tr("BLUFOR");
-                return ParticipantManagement::trPartyName(m_ppmDtc->party(codificationData.partyId()).name());
+                return ParticipantManagement::trPartyName(m_ppmDtc->party(codificationData.partyId).name);
             case PartyIdHiddenColumn:
 
-                return codificationData.partyId();
+                return codificationData.partyId;
             case NumeralCodeTableColumnIndex:
-                return QString::fromUtf8(codificationData.numeralCodeTableColumnIndex().c_str());
+                return QString::fromUtf8(codificationData.numeralCodeTableColumnIndex.c_str());
             case NumeralCodeTableRowIndex:
-                return QString::fromUtf8(codificationData.numeralCodeTableRowIndex().c_str());
+                return QString::fromUtf8(codificationData.numeralCodeTableRowIndex.c_str());
             case AuthenticationTableColumnIndex:
-                return QString::fromUtf8(codificationData.authenticationTableColumnIndex().c_str());
+                return QString::fromUtf8(codificationData.authenticationTableColumnIndex.c_str());
             case AuthenticationTableRowIndex:
-                return QString::fromUtf8(codificationData.authenticationTableRowIndex().c_str());
+                return QString::fromUtf8(codificationData.authenticationTableRowIndex.c_str());
             case AuthenticationTableMatrix:
-                return QString::fromUtf8(codificationData.authenticationTableMatirx().c_str());
+                return QString::fromUtf8(codificationData.authenticationTableMatirx.c_str());
             case LogisticalTermTableColumnIndex:
-                return QString::fromUtf8(codificationData.logisticalTermTableColumnIndex().c_str());
+                return QString::fromUtf8(codificationData.logisticalTermTableColumnIndex.c_str());
             case LogisticalTermTableRowIndex:
-                return QString::fromUtf8(codificationData.logisticalTermTableRowIndex().c_str());
+                return QString::fromUtf8(codificationData.logisticalTermTableRowIndex.c_str());
             case LogisticalTermTableMatrix:
-                return QString::fromUtf8(codificationData.logisticalTermTableMatrix().c_str());
+                return QString::fromUtf8(codificationData.logisticalTermTableMatrix.c_str());
             case PhraseTable:
-                return QString::fromUtf8(codificationData.phraseTable().c_str());
+                return QString::fromUtf8(codificationData.phraseTable.c_str());
             case Note:
-                return QString::fromUtf8(codificationData.note().c_str());
+                return QString::fromUtf8(codificationData.note.c_str());
         }
     }
 
@@ -98,8 +100,8 @@ QVariant CodificationDataOverviewModel::data(const QModelIndex& index, int role)
         switch (index.column())
         {
             case PartyId:
-                if (codificationData.partyId() >= 0)
-                    return QColor::fromRgb(QRgb(m_ppmDtc->party(codificationData.partyId()).color()));
+                if (codificationData.partyId >= 0)
+                    return QColor::fromRgb(QRgb(m_ppmDtc->party(codificationData.partyId).color));
                 break;
             default:
                 break;
@@ -112,8 +114,8 @@ int CodificationDataOverviewModel::getCodTableId(int partyId) const
 {
     for (const CodificationManagement::CodificationData& codificationData : m_vecData)
     {
-        if (codificationData.partyId() == partyId)
-            return codificationData.id();
+        if (codificationData.partyId == partyId)
+            return codificationData.id;
     }
     return -1;
 }
@@ -134,7 +136,7 @@ bool CodificationDataOverviewProxyModel::lessThan(const QModelIndex& source_left
     switch (source_left.column())
     {
         case CodificationDataOverviewModel::ValidityTime:
-            return dataLeft.validityTime() < dataRight.validityTime();
+            return dataLeft.validityTime < dataRight.validityTime;
 
         case CodificationDataOverviewModel::Id:
         case CodificationDataOverviewModel::Identifier:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
index 0253bd8df..52055dea8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_codification_data_overview_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_codification_data_table_edit_view.h"
 #include "cod_codification_data_table_view.h"
@@ -16,6 +17,7 @@ CodificationDataOverviewView::CodificationDataOverviewView(const QString& menuGr
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup),
       m_session(session), m_model(nullptr), m_dtc(nullptr), m_ftc(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::CodificationDataOverviewView)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataOverviewView"))
 {
     m_ui->setupUi(this);
     m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -118,10 +120,10 @@ void CodificationDataOverviewView::onShowCodificationData()
     CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
 
     DEBUG_LOG(m_logger) << "--- onShowCodificationData() "
-                        << " id: " << codificationData.id();
+                        << " id: " << codificationData.id;
 
     CodificationDataTableView* dialog = new CodificationDataTableView;
-    dialog->init(m_dtc, m_ftc, m_session, codificationData.partyId(), codificationData.id());
+    dialog->init(m_dtc, m_ftc, m_session, codificationData.partyId, codificationData.id);
     dialog->setUnchangeable(true);
 
     addDialog(dialog, m_menuGroup, QLatin1String("codShowCodificationData"), LtsWidgets::LayoutArea::eDialogTab);
@@ -148,10 +150,10 @@ void CodificationDataOverviewView::onEditCodificationData()
     CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
 
     DEBUG_LOG(m_logger) << "--- onEditCodificationData() "
-                        << " id: " << codificationData.id();
+                        << " id: " << codificationData.id;
 
     CodificationDataTableEditView* dialog = new CodificationDataTableEditView(this);
-    dialog->init(m_dtc, m_ftc, m_session, codificationData.id());
+    dialog->init(m_dtc, m_ftc, m_session, codificationData.id);
 
     addDialog(dialog, m_menuGroup, QLatin1String("codSetCodificationData"), LtsWidgets::LayoutArea::eDialogTab);
 }
@@ -160,7 +162,7 @@ void CodificationDataOverviewView::onRemoveCodificationData()
 {
     const QModelIndex idx = m_ui->widget->currentIndex();
     CodificationManagement::CodificationData codificationData = m_model->getRowData(idx.row());
-    Core::RemoveElementRequest request(codificationData.id());
+    Core::RemoveElementRequest request(codificationData.id);
 
     m_requestHelper->startSingleRequest(
         [request, this]() { return m_ftc->codificationDataRemoveRequest(request, this); });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
index 32b6a6a06..13c0fb24b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_codification_data_table_edit_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_authentication_code_model.h"
 #include "cod_code_table_edit_delegate.h"
@@ -25,6 +26,7 @@ CodificationDataTableEditView::CodificationDataTableEditView(QWidget* parent)
       m_authenticationCodeModel(new AuthenticationCodeModel(this)),
       m_logisticalTermsModel(new LogisticalTermsModel(this)), m_phraseTableModel(new PhraseTableModel(this)),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataTableEditView"))
 {
     m_ui->setupUi(this);
     m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CodificationDataTableEditView::onPrint);
@@ -75,10 +77,10 @@ bool CodificationDataTableEditView::init(const std::shared_ptr<CodificationManag
     initLogisticalTermsModel();
     initPhraseTableModel();
 
-    m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note()));
+    m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note));
 
-    m_ui->leIdentifier->setText(QString::fromStdString(m_lastDdsCodificationData.identifier()));
-    m_ui->dteValidityTime->setMsecsSinceEpoch(m_lastDdsCodificationData.validityTime());
+    m_ui->leIdentifier->setText(QString::fromStdString(m_lastDdsCodificationData.identifier));
+    m_ui->dteValidityTime->setMsecsSinceEpoch(m_lastDdsCodificationData.validityTime);
     m_ui->dteValidityTime->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
 
     m_buttonBox->connectButton(LtsWidgets::DialogButton::Load, this,
@@ -174,19 +176,19 @@ void CodificationDataTableEditView::loadCodificationDataFromDatabase()
 {
     m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
     DEBUG_LOG(m_logger) << "Load from database: ---";
-    DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
-    DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
+    DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex;
+    DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex;
 
-    DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
+    DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx;
 
     DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: "
-                        << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
-    DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
-    DEBUG_LOG(m_logger) << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix();
+                        << m_lastDdsCodificationData.logisticalTermTableColumnIndex;
+    DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex;
+    DEBUG_LOG(m_logger) << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix;
 
-    DEBUG_LOG(m_logger) << "PhraseTable :" << m_lastDdsCodificationData.phraseTable();
+    DEBUG_LOG(m_logger) << "PhraseTable :" << m_lastDdsCodificationData.phraseTable;
 
-    DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
+    DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note;
 
     return;
 }
@@ -230,10 +232,10 @@ bool CodificationDataTableEditView::initNumeralModel()
 
     if (m_codificationDataId > 0)
     {
-        QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex());
+        QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex);
         m_numCodeModel->setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex());
+        qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex);
         m_numCodeModel->setRowSelectionValuesCSV(qs);
     }
     return true;
@@ -275,7 +277,7 @@ bool CodificationDataTableEditView::initAuthenticationModel()
 
     if (m_codificationDataId > 0)
         m_authenticationCodeModel->setMatrixValuesCSV(
-            QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx()));
+            QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx));
     return true;
 }
 
@@ -320,14 +322,14 @@ bool CodificationDataTableEditView::initLogisticalTermsModel()
 
     if (m_codificationDataId > 0)
     {
-        QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex());
+        QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex);
         m_logisticalTermsModel->setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex());
+        qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex);
         m_logisticalTermsModel->setRowSelectionValuesCSV(qs);
 
         m_logisticalTermsModel->setMatrixValuesCSV(
-            QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix()));
+            QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix));
     }
     return true;
 }
@@ -361,7 +363,7 @@ bool CodificationDataTableEditView::initPhraseTableModel()
     m_ui->tvPhraseTable->setMinimumHeight((rectMatrix.height() * 1.3 * 13));
 
     if (m_codificationDataId > 0)
-        m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable()));
+        m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable));
     return true;
 }
 
@@ -383,40 +385,40 @@ bool CodificationDataTableEditView::apply()
 
     CodificationManagement::CodificationData modifiedCodificationData(m_lastDdsCodificationData);
 
-    modifiedCodificationData.name(m_ui->leIdentifier->text().toStdString());
+    modifiedCodificationData.name = m_ui->leIdentifier->text().toStdString();
 
-    modifiedCodificationData.numeralCodeTableColumnIndex(m_numCodeModel->getHorizontalHeaderCSVString().toStdString());
-    modifiedCodificationData.numeralCodeTableRowIndex(m_numCodeModel->getVerticalHeaderCSVString().toStdString());
+    modifiedCodificationData.numeralCodeTableColumnIndex = m_numCodeModel->getHorizontalHeaderCSVString().toStdString();
+    modifiedCodificationData.numeralCodeTableRowIndex = m_numCodeModel->getVerticalHeaderCSVString().toStdString();
 
     DEBUG_LOG(m_logger) << "onOkayCodificationData() HH: " << m_numCodeModel->getHorizontalHeaderCSVString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() VH: " << m_numCodeModel->getVerticalHeaderCSVString();
 
-    modifiedCodificationData.authenticationTableMatirx(
-        m_authenticationCodeModel->getMatrixDataCSVString().toStdString());
+    modifiedCodificationData.authenticationTableMatirx =
+        m_authenticationCodeModel->getMatrixDataCSVString().toStdString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() authMatrix: "
                         << m_authenticationCodeModel->getMatrixDataCSVString();
 
-    modifiedCodificationData.logisticalTermTableColumnIndex(
-        m_logisticalTermsModel->getHorizontalHeaderCSVString().toStdString());
-    modifiedCodificationData.logisticalTermTableRowIndex(
-        m_logisticalTermsModel->getVerticalHeaderCSVString().toStdString());
-    modifiedCodificationData.logisticalTermTableMatrix(m_logisticalTermsModel->getMatrixDataCSVString().toStdString());
+    modifiedCodificationData.logisticalTermTableColumnIndex =
+        m_logisticalTermsModel->getHorizontalHeaderCSVString().toStdString();
+    modifiedCodificationData.logisticalTermTableRowIndex =
+        m_logisticalTermsModel->getVerticalHeaderCSVString().toStdString();
+    modifiedCodificationData.logisticalTermTableMatrix = m_logisticalTermsModel->getMatrixDataCSVString().toStdString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() HH: " << m_logisticalTermsModel->getHorizontalHeaderCSVString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() VH: " << m_logisticalTermsModel->getVerticalHeaderCSVString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() logTermsMatrix: "
                         << m_logisticalTermsModel->getMatrixDataCSVString();
 
-    modifiedCodificationData.phraseTable(m_phraseTableModel->getMatrixDataCSVString().toStdString());
+    modifiedCodificationData.phraseTable = m_phraseTableModel->getMatrixDataCSVString().toStdString();
     DEBUG_LOG(m_logger) << "onOkayCodificationData() phraseTable: " << m_phraseTableModel->getMatrixDataCSVString();
 
-    modifiedCodificationData.note(m_ui->pteNote->toPlainText().toStdString());
+    modifiedCodificationData.note = m_ui->pteNote->toPlainText().toStdString();
     DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onOkayCodificationData()";
 
-    modifiedCodificationData.identifier(m_ui->leIdentifier->text().toStdString());
-    modifiedCodificationData.validityTime(m_ui->dteValidityTime->msecsSinceEpoch());
+    modifiedCodificationData.identifier = m_ui->leIdentifier->text().toStdString();
+    modifiedCodificationData.validityTime = m_ui->dteValidityTime->msecsSinceEpoch();
 
     if (m_codificationDataId < 1)
-        modifiedCodificationData.partyId(-1);
+        modifiedCodificationData.partyId = -1;
 
     m_requestHelper->addRequest([this, modifiedCodificationData]() {
         return m_ftc->codificationDataModifyRequest(modifiedCodificationData, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.cpp
index 91e5fbb78..8ae1400bd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_codification_data_table_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_authentication_code_model.h"
 #include "cod_codification_data_report.h"
@@ -17,6 +18,7 @@ CodificationDataTableView::CodificationDataTableView(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::CodificationDataTableView),
       m_numCodeModel(new NumeralCodeModel(this)), m_authenticationCodeModel(new AuthenticationCodeModel(this)),
       m_logisticalTermsModel(new LogisticalTermsModel(this)), m_phraseTableModel(new PhraseTableModel(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataTableView"))
 {
     m_ui->setupUi(this);
     m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CodificationDataTableView::onPrint);
@@ -79,7 +81,7 @@ bool CodificationDataTableView::init(const std::shared_ptr<CodificationManagemen
     m_ui->lbDteValidityTime->hide();
     m_ui->dteValidityTime->hide();
 
-    m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note()));
+    m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note));
     m_ui->pteNote->setReadOnly(true);
 
     connect(m_dtc.get(), &CodificationManagement::Interface::Dtc::codificationDataChanged, this,
@@ -100,19 +102,19 @@ void CodificationDataTableView::loadCodificationDataFromDatabase()
 
     m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
     DEBUG_LOG(m_logger) << "Load from database: ";
-    DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
-    DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
+    DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex;
+    DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex;
 
     DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: "
-                        << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
-    DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
-    DEBUG_LOG(m_logger) << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix();
+                        << m_lastDdsCodificationData.logisticalTermTableColumnIndex;
+    DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex;
+    DEBUG_LOG(m_logger) << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix;
 
-    DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
+    DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx;
 
-    DEBUG_LOG(m_logger) << "PhraseTable: " << m_lastDdsCodificationData.phraseTable();
+    DEBUG_LOG(m_logger) << "PhraseTable: " << m_lastDdsCodificationData.phraseTable;
 
-    DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
+    DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note;
 
     return;
 }
@@ -161,10 +163,10 @@ bool CodificationDataTableView::initNumeralModel()
 
     if (m_codificationDataId > 0)
     {
-        QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex());
+        QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex);
         m_numCodeModel->setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex());
+        qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex);
         m_numCodeModel->setRowSelectionValuesCSV(qs);
     }
     return bOk;
@@ -207,7 +209,7 @@ bool CodificationDataTableView::initAuthenticationModel()
     if (m_codificationDataId > 0)
     {
         m_authenticationCodeModel->setMatrixValuesCSV(
-            QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx()));
+            QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx));
     }
     return bOk;
 }
@@ -248,14 +250,14 @@ bool CodificationDataTableView::initLogicalTermsModel()
 
     if (m_codificationDataId > 0)
     {
-        QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex());
+        QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex);
         m_logisticalTermsModel->setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex());
+        qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex);
         m_logisticalTermsModel->setRowSelectionValuesCSV(qs);
 
         m_logisticalTermsModel->setMatrixValuesCSV(
-            QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix()));
+            QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix));
     }
     return bOk;
 }
@@ -292,7 +294,7 @@ bool CodificationDataTableView::initPhraseTableModel()
     if (m_codificationDataId > 0)
     {
 
-        m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable()));
+        m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable));
     }
     return bOk;
 }
@@ -300,8 +302,8 @@ bool CodificationDataTableView::initPhraseTableModel()
 void CodificationDataTableView::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
                                                           DataModification modType)
 {
-    if (m_codificationDataId != data.id() || modType == DataModification::eRemoved)
+    if (m_codificationDataId != data.id || modType == DataModification::eRemoved)
         return;
 
-    m_ui->pteNote->setPlainText(QString::fromStdString(data.note()));
+    m_ui->pteNote->setPlainText(QString::fromStdString(data.note));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
index b1c96f7d1..26e9c1e00 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_csv_export.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_authentication_code_model.h"
 #include "cod_logistical_terms_model.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
index 85706d67c..7d267ad78 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_csv_import.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "cod_authentication_code_model.h"
 #include "cod_logistical_terms_model.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
index ba22ba018..42ff72c0b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_logistical_terms_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include <QtGui/QGuiApplication>
@@ -12,6 +13,7 @@ static const int s_matrixCount = 5;
 
 LogisticalTermsModel::LogisticalTermsModel(QWidget* parent)
     : QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LogisticalTermsModel"))
 {
     DEBUG_LOG(m_logger) << "ctor LogisticalTermsModel";
     m_matrix.resize(s_matrixCount);
@@ -66,7 +68,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString& csvData)
     m_ColumnSelectionValues.clear();
     m_ColumnSelectionValues.resize(s_matrixCount);
 
-    const QVector<QStringRef> slColumns = csvData.splitRef(QLatin1Char(';'));
+    const QList<QString> slColumns = csvData.split(QLatin1Char(';'));
 
     if (slColumns.size() != m_ColumnSelectionValues.size())
     {
@@ -78,7 +80,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString& csvData)
 
     for (int i = 0; i < m_ColumnSelectionValues.size(); ++i)
     {
-        const QStringRef& qs = slColumns.at(i);
+        const QString& qs = slColumns.at(i);
         if (qs.size() != 1)
         {
             ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
@@ -96,7 +98,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString& csvData)
     m_RowSelectionValues.clear();
     m_RowSelectionValues.resize(s_matrixCount);
 
-    const QVector<QStringRef> slRows = csvData.splitRef(QStringLiteral("\n"));
+    const QList<QString> slRows = csvData.split(QStringLiteral("\n"));
 
     if (slRows.size() != m_RowSelectionValues.size())
     {
@@ -109,7 +111,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString& csvData)
 
     for (int i = 0; i < m_RowSelectionValues.size(); ++i)
     {
-        const QStringRef& qs = slRows.at(i);
+        const QString& qs = slRows.at(i);
         if (qs.size() != 1)
         {
             ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
@@ -144,7 +146,7 @@ bool LogisticalTermsModel::setMatrixValuesCSV(const QString& csvData)
 
     for (int row = 0; row < slRows.size(); ++row)
     {
-        const QVector<QStringRef> slColumns = slRows[row].splitRef(QLatin1Char(';'));
+        const QList<QString> slColumns = slRows[row].split(QLatin1Char(';'));
         if (slColumns.size() != m_matrix.size())
         {
             ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -153,7 +155,7 @@ bool LogisticalTermsModel::setMatrixValuesCSV(const QString& csvData)
         }
 
         for (int column = 0; column < m_matrix.size(); ++column)
-            m_matrix[row][column] = slColumns.at(column).toString();
+            m_matrix[row][column] = slColumns.at(column);
     }
     return true;
 }
@@ -353,14 +355,14 @@ Qt::ItemFlags LogisticalTermsModel::flags(const QModelIndex& index) const
 void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
                                                      DataModification modType)
 {
-    const int id = data.id();
+    const int id = data.id;
 
     DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
-                        << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
-                        << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
+                        << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex.c_str()
+                        << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex.c_str()
                         << " - modType: " << modType;
 
-    if (m_codificationDataId != data.id())
+    if (m_codificationDataId != data.id)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -376,15 +378,15 @@ void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagemen
 
     if (modType == DataModification::eModified)
     {
-        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
+        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
 
-        QString qs = QString::fromStdString(data.logisticalTermTableColumnIndex());
+        QString qs = QString::fromStdString(data.logisticalTermTableColumnIndex);
         setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(data.logisticalTermTableRowIndex());
+        qs = QString::fromStdString(data.logisticalTermTableRowIndex);
         setRowSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(data.logisticalTermTableMatrix());
+        qs = QString::fromStdString(data.logisticalTermTableMatrix);
         setMatrixValuesCSV(qs);
     }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
index d67013c8b..49cc9b9c0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_numeral_code_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include <QtGui/QGuiApplication>
@@ -10,6 +11,7 @@ using namespace CodificationManagement;
 
 NumeralCodeModel::NumeralCodeModel(QWidget* parent)
     : QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NumeralCodeModel"))
 {
 }
 
@@ -57,7 +59,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
 {
     m_ColumnSelectionValues = QVector<QChar>(columnCount() - 1, QLatin1Char(' '));
 
-    const QVector<QStringRef> slColumns = csvData.splitRef(QLatin1Char(';'));
+    const QList<QString> slColumns = csvData.split(QLatin1Char(';'));
 
     if (slColumns.size() != columnCount() - 1)
     {
@@ -68,7 +70,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
 
     for (int i = 0; i < columnCount() - 1; ++i)
     {
-        const QStringRef& qs = slColumns.at(i);
+        const QString& qs = slColumns.at(i);
         if (qs.size() != 1)
         {
             ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
@@ -84,7 +86,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
 bool NumeralCodeModel::setRowSelectionValuesCSV(const QString& csvData)
 {
     m_RowSelectionValues = QVector<QChar>(rowCount() - 1, QLatin1Char(' '));
-    const QVector<QStringRef> slRows = csvData.splitRef(QStringLiteral("\n"));
+    const QList<QString> slRows = csvData.split(QStringLiteral("\n"));
 
     if (slRows.size() != rowCount() - 1)
     {
@@ -96,7 +98,7 @@ bool NumeralCodeModel::setRowSelectionValuesCSV(const QString& csvData)
 
     for (int i = 0; i < rowCount() - 1; ++i)
     {
-        const QStringRef& qs = slRows.at(i);
+        const QString& qs = slRows.at(i);
         if (qs.size() != 1)
         {
             ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
@@ -351,14 +353,14 @@ void NumeralCodeModel::initMatrix()
 void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
                                                  DataModification modType)
 {
-    const int id = data.id();
+    const int id = data.id;
 
     DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
-                        << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
-                        << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
+                        << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex.c_str()
+                        << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex.c_str()
                         << " - modType: " << (int)modType;
 
-    if (m_codificationDataId != data.id())
+    if (m_codificationDataId != data.id)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -372,12 +374,12 @@ void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::C
 
     if (modType == DataModification::eModified)
     {
-        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
+        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
 
-        QString qs = QString::fromStdString(data.numeralCodeTableColumnIndex());
+        QString qs = QString::fromStdString(data.numeralCodeTableColumnIndex);
         setColumnSelectionValuesCSV(qs);
 
-        qs = QString::fromStdString(data.numeralCodeTableRowIndex());
+        qs = QString::fromStdString(data.numeralCodeTableRowIndex);
         setRowSelectionValuesCSV(qs);
     }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
index 04b9c182a..164312c82 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "cod_phrase_table_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include <QtGui/QGuiApplication>
@@ -10,6 +11,7 @@ using namespace CodificationManagement;
 
 PhraseTableModel::PhraseTableModel(QWidget* parent)
     : QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PhraseTableModel"))
 {
     DEBUG_LOG(m_logger) << "ctor PhraseTableModel";
 }
@@ -66,7 +68,7 @@ bool PhraseTableModel::setMatrixValuesCSV(const QString& csvData)
 {
     DEBUG_LOG(m_logger) << "setMatrixValuesCSV() data: " << csvData;
 
-    const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
+    const QList<QString> slRows = csvData.split(QLatin1Char('\n'));
     if (slRows.count() != rowCount())
     {
         ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
@@ -76,7 +78,7 @@ bool PhraseTableModel::setMatrixValuesCSV(const QString& csvData)
 
     for (int row = 0; row < rowCount(); ++row)
     {
-        const QStringList slColumns = splitQuotedString(QLatin1Char(';'), slRows[row].toString());
+        const QStringList slColumns = splitQuotedString(QLatin1Char(';'), slRows[row]);
         if (slColumns.count() != columnCount())
         {
             ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -225,12 +227,12 @@ Qt::ItemFlags PhraseTableModel::flags(const QModelIndex& index) const
 void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
                                                  DataModification modType)
 {
-    const int id = data.id();
+    const int id = data.id;
 
     DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
-                        << " - PhraseTableModel data: " << data.phraseTable().c_str() << " - modType: " << (int)modType;
+                        << " - PhraseTableModel data: " << data.phraseTable.c_str() << " - modType: " << (int)modType;
 
-    if (m_codificationDataId != data.id())
+    if (m_codificationDataId != data.id)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -244,9 +246,9 @@ void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::C
 
     if (modType == DataModification::eModified)
     {
-        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
+        DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
 
-        QString qs = QString::fromStdString(data.phraseTable());
+        QString qs = QString::fromStdString(data.phraseTable);
         setMatrixValuesCSV(qs);
     }
 }
@@ -261,7 +263,7 @@ QStringList PhraseTableModel::splitQuotedString(const QChar& sep, const QString&
         int i = str.indexOf(QLatin1Char('\"'));
         QString part = str.left(i);
 
-        result += part.split(sep, QString::SkipEmptyParts);
+        result += part.split(sep, Qt::SkipEmptyParts);
 
         str.remove(0, i + 1);
 
@@ -270,7 +272,7 @@ QStringList PhraseTableModel::splitQuotedString(const QChar& sep, const QString&
         result += str.left(i);
         str.remove(0, i + 1);
     }
-    result += str.split(sep, QString::SkipEmptyParts);
+    result += str.split(sep, Qt::SkipEmptyParts);
 
     return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_building_model.cpp
index 9856d4041..0bef98cd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_building_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_building_model.cpp
@@ -49,7 +49,7 @@ bool BuildingModel::initModel(const std::shared_ptr<InfrastructureManagement::In
   }
 
   for (int currentBuildingId : buildingIds)
-    m_vecData.append(QString::fromStdString(ismDtc->mainStructureElement(currentBuildingId).name()));
+    m_vecData.append(QString::fromStdString(ismDtc->mainStructureElement(currentBuildingId).name));
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
index 706324926..2997296ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
@@ -6,6 +6,7 @@
 
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
@@ -62,19 +63,19 @@ QPolygonF getBuildingFootprint(int buildingId, const std::shared_ptr<Infrastruct
   QVector<QPointF> relPositions;
   const InfrastructureManagement::MainFootprint &mainFootprint = ismDtc->mainFootprint(buildingId);
 
-  relPositions.reserve(mainFootprint.elements().size());
+  relPositions.reserve(mainFootprint.elements.size());
 
-  for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements())
+  for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements)
   {
-    const Core::RelativePosition &relPos = element.relPosition();
+    const Core::RelativePosition &relPos = element.relPosition;
 
-    relPositions.append(QPointF(relPos.offsetX(), relPos.offsetY()));
+    relPositions.append(QPointF(relPos.offsetX, relPos.offsetY));
   }
 
   const InfrastructureManagement::MainStructureElement &mainStructureElement = ismDtc->mainStructureElement(buildingId);
-  const Core::GeoPosition &geoPosition = mainStructureElement.geoPosition();
-  const double angleRad = mainStructureElement.angle() * LtsCoordTrans::deg2rad();
-  const QPointF referencePointGeo(geoPosition.lon(), geoPosition.lat());
+  const Core::GeoPosition &geoPosition = mainStructureElement.geoPosition;
+  const double angleRad = mainStructureElement.angle * LtsCoordTrans::deg2rad();
+  const QPointF referencePointGeo(geoPosition.lon, geoPosition.lat);
   const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(referencePointGeo);
   const QPointF center;
 
@@ -237,19 +238,19 @@ ParticipantProtectionInfo getParticipantProtectionInfo(const QVector<int> &parti
   {
     const ParticipantManagement::ParticipantPosition &currentPosition = ppmDtc->participantPosition(currentParticipantId);
 
-    if (undergroundBuildingIds.contains(currentPosition.buildingId()))
+    if (undergroundBuildingIds.contains(currentPosition.buildingId))
     {
       participantProtectionInfo.participantsInUnderground.append(currentParticipantId);
       continue;
     }
 
-    if (directlyHitBuildingIds.contains(currentPosition.buildingId()))
+    if (directlyHitBuildingIds.contains(currentPosition.buildingId))
     {
       participantProtectionInfo.withoutProtection.append(currentParticipantId);
       continue;
     }
 
-    const QPointF geoPosition(currentPosition.pos().lon(), currentPosition.pos().lat());
+    const QPointF geoPosition(currentPosition.pos.lon, currentPosition.pos.lat);
 
     if (isPointInAnyPolygon(directlyHitBuildingFootprints, geoPosition))
     {
@@ -258,7 +259,7 @@ ParticipantProtectionInfo getParticipantProtectionInfo(const QVector<int> &parti
     }
 
     
-    if (currentPosition.roomId() != 0)
+    if (currentPosition.roomId != 0)
     {
       participantProtectionInfo.withProtection.append(currentParticipantId);
       continue;
@@ -446,8 +447,8 @@ QVector<int> getUndergroundBuildingIds(const QVector<int> &buildingIds, const st
   for (int currentBuildingId : buildingIds)
   {
     const InfrastructureManagement::MainStructureElement &building = ismDtc->mainStructureElement(currentBuildingId);
-    const QString description = QString::fromStdString(building.description());
-    const QString name = QString::fromStdString(building.name());
+    const QString description = QString::fromStdString(building.description);
+    const QString name = QString::fromStdString(building.name);
 
     if (!(description.contains(kanal, Qt::CaseInsensitive) ||
           description.contains(uBahn, Qt::CaseInsensitive) ||
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
index b0a05f9d5..682e5b1a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
@@ -327,21 +327,21 @@ void CreateSimulationDialog::fillCharges()
 
   using namespace ProjectDataManagement;
 
-  const QVector<GearClass> gearClasses = { GearClass::AirSupport,
-                                                     GearClass::Artillery,
-                                                     GearClass::Mortar };
+  const QVector<ProjectDataManagement::GearClass> gearClasses = { ProjectDataManagement::GearClass::GearClass_AirSupport,
+                                                     ProjectDataManagement::GearClass::GearClass_Artillery,
+                                                     ProjectDataManagement::GearClass::GearClass_Mortar };
 
-  for (GearClass currentGearClass : gearClasses)
+  for (ProjectDataManagement::GearClass currentGearClass : gearClasses)
   {
     const QVector<ChargeType> &chargeTypes = m_pdmDtc->chargesForGearClass(currentGearClass);
 
     for (const ChargeType &currentChargeType : chargeTypes)
     {
-      const QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(currentChargeType.properties().c_str(), currentChargeType.properties().size())));
+      const QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(currentChargeType.properties.c_str(), currentChargeType.properties.size())));
       const QJsonObject obj(doc.object());
       if (!obj.contains(QLatin1String("nasatId")))
         continue;
-      m_ui->cbChargeTypes->addItem(QString::fromStdString(currentChargeType.name()), currentChargeType.id());
+      m_ui->cbChargeTypes->addItem(QString::fromStdString(currentChargeType.name), currentChargeType.id);
     }
   }
 
@@ -353,7 +353,7 @@ double CreateSimulationDialog::getCurrentImpactRadius() const
 {
   const int chargeTypeId = m_ui->cbChargeTypes->currentData().toInt();
   const int igniterTypeId = m_ui->cbIgniterType->currentData().toInt();
-  double impactRadius = m_pdmDtc->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, 0).impactRadius();
+  double impactRadius = m_pdmDtc->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, 0).impactRadius;
 
   DEBUG_LOG(m_logger) << "got impact radius " << impactRadius << " for current charge type " << chargeTypeId << " and igniterTypeId  " << igniterTypeId;
 
@@ -364,7 +364,7 @@ double CreateSimulationDialog::getLethalRadius() const
 {
   const int currentChargeTypeId = m_ui->cbChargeTypes->currentData().toInt();
   const ProjectDataManagement::ChargeType &currentChargeType = m_pdmDtc->chargeType(currentChargeTypeId);
-  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(currentChargeType.properties())).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(currentChargeType.properties)).object();
   const QString keyImpactRadius = QStringLiteral("impactRadius");
   const QString keyCasEffects = QStringLiteral("casEffects");
   double lethalRadius = DBL_MAX;
@@ -392,7 +392,7 @@ double CreateSimulationDialog::getNonLethalRadius() const
 {
   const int currentChargeTypeId = m_ui->cbChargeTypes->currentData().toInt();
   const ProjectDataManagement::ChargeType &currentChargeType = m_pdmDtc->chargeType(currentChargeTypeId);
-  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(currentChargeType.properties())).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QByteArray::fromStdString(currentChargeType.properties)).object();
   const QString keyImpactRadius = QStringLiteral("impactRadius");
   const QString keyCasEffects = QStringLiteral("casEffects");
   double nonLethalRadius = 0.0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_gui_plugin.cpp
index 43979cccb..e187cfc2b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_gui_plugin.cpp
@@ -7,7 +7,7 @@
 
 #include "cds_create_simulation_dialog.h"
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <InfrastructureManagement/Data/ism_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <ProjectDataManagement/Data/pdm_data_plugin.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_participant_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_participant_model.cpp
index 046759eaa..c9e47ab96 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_participant_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_participant_model.cpp
@@ -4,6 +4,7 @@
 #include "cds_participant_model.h"
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace CollateralDamageSimulation
 {
@@ -34,21 +35,21 @@ QVariant ParticipantModel::data(const QModelIndex &index, int role) const
     {
     case PARTY:
     {
-      const int partyId = participant.partyId();
+      const int partyId = participant.partyId;
 
       if (!m_partyCache.contains(partyId))
         m_partyCache.insert(partyId, m_ppmDtc->party(partyId));
 
       const ParticipantManagement::Party &party = m_partyCache.value(partyId);
 
-      return QString::fromStdString(party.name());
+      return QString::fromStdString(party.name);
     }
     case EQUIPMENT_NUMBER:
-      return participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
+      return participant.equipmentNumber.has_value() ? participant.equipmentNumber.get() : 0;
     case DESIGNATOR:
-      return QString::fromStdString(participant.designator());
+      return QString::fromStdString(participant.designator);
     case TACTICAL_IDENTIFIER:
-      return QString::fromStdString(participant.tacticalIdentifier());
+      return QString::fromStdString(participant.tacticalIdentifier);
     default:
       return QVariant();
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
index 991d1d8f2..d03806587 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
@@ -5,6 +5,7 @@
 
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Lts/Services/FileManagement/flm_ftc.h>
 
 #include <QtCore/QDateTime>
@@ -98,7 +99,7 @@ void PdfCreator::addBuildings(const QVector<int> &buildingIds)
   {
     const InfrastructureManagement::MainStructureElement &currentBuilding = m_ismDtc->mainStructureElement(currentBuildingId);
 
-    KDReports::TextElement name(QString::fromStdString(currentBuilding.name()));
+    KDReports::TextElement name(QString::fromStdString(currentBuilding.name));
 
     table.cell(row, 0).addElement(name);
 
@@ -131,17 +132,17 @@ void PdfCreator::save(const QString &name, int folderId, int exerciseId)
 
   FileManagement::FileContentModifyRequest data;
 
-  data.name(name.toStdString());
-  data.isTemplate(false);
-  data.isHidden(false);
-  data.folderId(folderId);
-  data.fileStatus(FileManagement::FileStatus::Valid);
-  data.fileCategory(FileManagement::FileCategory::Exercise);
-  data.fileType(FileManagement::FileType::Pdf);
-  data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  data.lastModified(QDateTime::currentMSecsSinceEpoch());
-  data.content(LtsUtils::convert<std::vector<uint8_t>>(saveFile.readAll()));
-  data.exerciseId(exerciseId);
+  data.name = name.toStdString();
+  data.isTemplate = false;
+  data.isHidden = false;
+  data.folderId = folderId;
+  data.fileStatus = FileManagement::FileStatus::Valid;
+  data.fileCategory = FileManagement::FileCategory::Exercise;
+  data.fileType = FileManagement::FileType::Pdf;
+  data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  data.lastModified = QDateTime::currentMSecsSinceEpoch();
+  data.content = LtsUtils::convert<std::vector<uint8_t>>(saveFile.readAll());
+  data.exerciseId = exerciseId;
 
   bool isModifyRequestOk = m_flmFtc->fileContentModifyRequest(data, [this](const Core::FunctionReplyObject &reply)
   {
@@ -202,17 +203,17 @@ void PdfCreator::addParticipantTable(const QVector<int> &participantIds, const Q
     int column = 0;
     const ParticipantManagement::Participant &currentParticipant = m_ppmDtc->participant(currentParticipantId);
 
-    if (!partyNames.contains(currentParticipant.partyId()))
+    if (!partyNames.contains(currentParticipant.partyId))
     {
-      const ParticipantManagement::Party &party = m_ppmDtc->party(currentParticipant.partyId());
+      const ParticipantManagement::Party &party = m_ppmDtc->party(currentParticipant.partyId);
 
-      partyNames.insert(party.id(), QString::fromStdString(party.name()));
+      partyNames.insert(party.id, QString::fromStdString(party.name));
     }
 
-    KDReports::TextElement party(partyNames.value(currentParticipant.partyId()));
-    KDReports::TextElement equipmentNumber(QString::number(currentParticipant.equipmentNumber().is_set() ? currentParticipant.equipmentNumber().get() : 0));
-    KDReports::TextElement designation(QString::fromStdString(currentParticipant.designator()));
-    KDReports::TextElement tacticalIdentifier(QString::fromStdString(currentParticipant.tacticalIdentifier()));
+    KDReports::TextElement party(partyNames.value(currentParticipant.partyId));
+    KDReports::TextElement equipmentNumber(QString::number(currentParticipant.equipmentNumber.has_value() ? currentParticipant.equipmentNumber.get() : 0));
+    KDReports::TextElement designation(QString::fromStdString(currentParticipant.designator));
+    KDReports::TextElement tacticalIdentifier(QString::fromStdString(currentParticipant.tacticalIdentifier));
 
     table.cell(row, column++).addElement(party);
     table.cell(row, column++).addElement(equipmentNumber);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
index 834c34b1e..318719edf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
@@ -9,6 +9,7 @@
 
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Lts/Services/FileManagement/flm_ftc.h>
 
 #include <QtGui/QPolygonF>
@@ -115,17 +116,17 @@ void PlanCreator::save(const QString &name, int folderId, int exerciseId)
 
   FileManagement::FileContentModifyRequest data;
 
-  data.name(name.toStdString());
-  data.isTemplate(false);
-  data.isHidden(false);
-  data.folderId(folderId);
-  data.fileStatus(FileManagement::FileStatus::Valid);
-  data.fileCategory(FileManagement::FileCategory::Exercise);
-  data.fileType(FileManagement::FileType::TacticalPlan);
-  data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  data.lastModified(QDateTime::currentMSecsSinceEpoch());
-  data.content(LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray()));
-  data.exerciseId(exerciseId);
+  data.name = name.toStdString();
+  data.isTemplate = false;
+  data.isHidden = false;
+  data.folderId = folderId;
+  data.fileStatus = FileManagement::FileStatus::Valid;
+  data.fileCategory = FileManagement::FileCategory::Exercise;
+  data.fileType = FileManagement::FileType::TacticalPlan;
+  data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  data.lastModified = QDateTime::currentMSecsSinceEpoch();
+  data.content = LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray());
+  data.exerciseId = exerciseId;
 
   bool isModifyRequestOk = m_flmFtc->fileContentModifyRequest(data, [this](const Core::FunctionReplyObject &reply)
   {
@@ -233,23 +234,23 @@ void PlanCreator::addParticipant(int participantId, ProtectionState protectionSt
   const ParticipantManagement::Participant &participant = m_ppmDtc->participant(participantId);
   const ParticipantManagement::ParticipantPosition &position = m_ppmDtc->participantPosition(participantId);
 
-  if (!m_partyCache.contains(participant.partyId()))
-    m_partyCache.insert(participant.partyId(), m_ppmDtc->party(participant.partyId()));
+  if (!m_partyCache.contains(participant.partyId))
+    m_partyCache.insert(participant.partyId, m_ppmDtc->party(participant.partyId));
 
   QList<QPair<GeometryModel::Attribute, QVariant>>  symbolAttributes;
-  QPointF positionPoint(position.pos().lon(), position.pos().lat());
+  QPointF positionPoint(position.pos.lon, position.pos.lat);
   const QList<QPointF> positionList = {positionPoint};
 
   
   symbolAttributes.reserve(2);
 
-  QString sidc = QString::fromStdString(participant.symbol());
+  QString sidc = QString::fromStdString(participant.symbol);
 
   if (sidc.size() > 16)
     sidc.replace(16, 1, QString::number(static_cast<int>(protectionState)));
 
   symbolAttributes.append(QPair<GeometryModel::Attribute, QVariant>(GeometryModel::Attribute::SIDC, QVariant(sidc)));
-  symbolAttributes.append(QPair<GeometryModel::Attribute, QVariant>(GeometryModel::Attribute::ForceId, QVariant(participant.partyId())));
+  symbolAttributes.append(QPair<GeometryModel::Attribute, QVariant>(GeometryModel::Attribute::ForceId, QVariant(participant.partyId)));
 
   m_geometryModel->addPrimitive(GeometryModel::PrimitiveType::ParticipantSymbol, positionList, symbolAttributes);
 }
@@ -275,7 +276,7 @@ void PlanCreator::addProtectionArea(const QPolygonF &areaPolygon)
 
 SymbologyXML::SymbolTypes::t_affil PlanCreator::partyRoleToSymbolAffiliation(const ParticipantManagement::Role &partyRole) const
 {
-  switch (partyRole.underlying())
+  switch (partyRole)
   {
   case ParticipantManagement::Role::Unknown:
     return SymbologyXML::SymbolTypes::UNKNOWN;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
index 31f4fd070..49ca9c33f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
@@ -9,6 +9,7 @@
 #include <SymbologyXML/symbol_types.h>
 #include <ParticipantManagement/ppm_enums.hpp>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <SituationMap/GeometryModel/geometry_model.h>
 
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_simulation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_simulation_dialog.cpp
index 061af779d..06865019e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_simulation_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_simulation_dialog.cpp
@@ -6,6 +6,7 @@
 
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include "cds_building_model.h"
 #include "cds_participant_model.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
index 0dfc1201c..078742649 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
@@ -5,6 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <ComponentMonitor/cmo_dtc.h>
+#include <ComponentMonitor/cmo_ftc.h>
 
 #include <QtCore/QObject>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
index e0c216d50..effcb8719 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
@@ -51,7 +51,7 @@ void FtcMock::mock()
 
     exmFtc->enableGetExerciseImage();
     auto req = ExerciseManagement::GetExerciseImageRequest();
-    req.exerciseId(42);
+    req.exerciseId = 42;
     ExerciseManagement::GetExerciseImageReply rep;
     try
     {
@@ -96,7 +96,7 @@ void FtcMock::mock()
 
 
     exmFtc->enableExerciseImageModify();
-    auto req2 = ExerciseManagement::ExerciseImageModifyRequest(42, rep.imageData());
+    auto req2 = ExerciseManagement::ExerciseImageModifyRequest(42, rep.imageData);
     try
     {
       
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
index 3abe801e0..f5a221ea9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
@@ -21,28 +21,28 @@ struct SoundArea
 {
   SoundArea() = default;
   explicit SoundArea(const InfrastructureManagement::EffectArea &effectArea)
-    : id(effectArea.id())
-    , areaEgcuId(effectArea.areaEgcuId())
+    : id(effectArea.id)
+    , areaEgcuId(effectArea.areaEgcuId)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    , egcuIds(QVector<int>(effectArea.egcuIds().begin(), effectArea.egcuIds().end()))
+    , egcuIds(QVector<int>(effectArea.egcuIds.begin(), effectArea.egcuIds.end()))
 #else
-    , egcuIds(QVector<int>::fromStdVector(effectArea.egcuIds()))
+    , egcuIds(QVector<int>::fromStdVector(effectArea.egcuIds))
 #endif
-    , displayName(QString::fromStdString(effectArea.name()))
+    , displayName(QString::fromStdString(effectArea.name))
   {
   }
 
   bool addActiveSound(const SoundManagement::SoundState &soundState)
   {
-    if (activeSounds.contains(soundState.id()))
+    if (activeSounds.contains(soundState.id))
       return false;
 
-    activeSounds.insert(soundState.id(), soundState);
+    activeSounds.insert(soundState.id, soundState);
     return true;
   }
   bool removeActiveSound(const SoundManagement::SoundState &soundState)
   {
-    return removeActiveSound(soundState.id());
+    return removeActiveSound(soundState.id);
   }
   bool removeActiveSound(const int &id)
   {
@@ -52,21 +52,21 @@ struct SoundArea
   bool hasActiveSound(const SoundManagement::SoundCategory &category, const int &id) const
   {
     for (const auto &sound : std::as_const(activeSounds))
-      if ( (sound.category() == category) && (sound.soundId() == id) )
+      if ( (sound.category == category) && (sound.soundId == id) )
         return true;
     return false;
   }
   bool hasActiveSound(const int32_t &category, const int32_t &id) const
   {
     for (const auto &sound : std::as_const(activeSounds))
-      if ( (static_cast<int32_t>(sound.category().underlying()) == category) && (sound.soundId() == id) )
+      if ( (static_cast<int32_t>(sound.category) == category) && (sound.soundId == id) )
         return true;
     return false;
   }
   bool hasActiveSound(const SoundKey &key) const
   {
     for (const auto &sound : std::as_const(activeSounds))
-      if ( (static_cast<int32_t>(sound.category().underlying()) == key.first) && (sound.soundId() == key.second) )
+      if ( (static_cast<int32_t>(sound.category) == key.first) && (sound.soundId == key.second) )
         return true;
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp
index a6361aafa..fb002f09a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp
@@ -177,7 +177,7 @@ bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds* session)
         auto* reqHandler = new ControlSoundRequester;
 
         if (!m_somFtc->controlSoundRequest(
-                ControlSoundRequest(ss.egcuId(), ss.soundId(), ss.category(), 0, PlayControl::StopSound), reqHandler))
+                ControlSoundRequest(ss.egcuId, ss.soundId, ss.category, 0, PlayControl::StopSound), reqHandler))
         {
             new LtsWidgets::LtsMessageDialogNew(this, tr("Stopping sound failed with unknown error"));
             return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.h
index 150ee194c..e46ceb7e1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.h
@@ -6,6 +6,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <SoundManagement/som_dtc.h>
 #include <SoundManagement/som_ftc.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace NGL
 {
@@ -41,6 +42,8 @@ class ControlSoundRequester : public QObject, public SoundManagement::Interface:
 {
     Q_OBJECT
   public:
+    ControlSoundRequester() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+
     void onControlSoundReply(const Core::FunctionReplyObject& reply) override final
     {
         m_reply = reply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
index a74a3e6b0..cb364731c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
@@ -1,6 +1,7 @@
 
 
 #include "efm_sound_area_edit_model_playlist.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "../logger.h"
 #include "efm_sound_area_helper.h"
@@ -19,7 +20,7 @@ namespace EffectManagement
 QIcon SoundAreaEditPlaylistDelegate::s_iconInf = QIcon(QStringLiteral("icon:infinity.svg"));
 
 SoundAreaEditPlaylistDelegate::SoundAreaEditPlaylistDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    : QStyledItemDelegate(parent)
 {
 }
 
@@ -54,6 +55,7 @@ SoundAreaPlaylistModel::SoundAreaPlaylistModel(const QVector<int32_t>& egcuIds,
     : LtsAbstractTableModel<SoundState>({tr("Category"), tr("Sound"), tr("EGCU"), tr("Duration"), tr("Option")},
                                         parent),
       m_helper(helper), m_egcuIds(egcuIds)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -71,7 +73,7 @@ bool SoundAreaPlaylistModel::init(std::shared_ptr<SoundManagement::Interface::Dt
     const QMap<int32_t, SoundManagement::SoundState> soundStates = somDtc->soundStates();
     for (const auto& data : std::as_const(soundStates))
     {
-        if (!m_egcuIds.contains(data.egcuId()))
+        if (!m_egcuIds.contains(data.egcuId))
             continue;
 
         addActiveSound(SoundState(data));
@@ -97,8 +99,8 @@ int SoundAreaPlaylistModel::indexOf(const SoundState& data) const
     int idx = 0;
     for (const auto& item : std::as_const(m_vecData))
     {
-        if ((item.category() == data.category()) && (item.soundId() == data.soundId()) &&
-            (item.egcuId() == data.egcuId()))
+        if ((item.category == data.category) && (item.soundId == data.soundId) &&
+            (item.egcuId == data.egcuId))
             return idx;
         ++idx;
     }
@@ -107,9 +109,9 @@ int SoundAreaPlaylistModel::indexOf(const SoundState& data) const
 
 bool SoundAreaPlaylistModel::addActiveSound(SoundState data)
 {
-    data.duration(m_helper->soundDuration(data.category(), data.soundId()));
+    data.duration(m_helper->soundDuration(data.category, data.soundId));
     const int row = indexOf(data);
-    const QString name(m_helper->soundName(data.category(), data.soundId()));
+    const QString name(m_helper->soundName(data.category, data.soundId));
 
     if (row != -1)
     {
@@ -146,16 +148,16 @@ QVariant SoundAreaPlaylistModel::data(const QModelIndex& index, int role) const
             switch (index.column())
             {
                 case Column::Category:
-                    return m_helper->categoryName(soundState.category());
+                    return m_helper->categoryName(soundState.category);
 
                 case Column::Sound:
-                    return m_helper->soundName(soundState.category(), soundState.soundId());
+                    return m_helper->soundName(soundState.category, soundState.soundId);
 
                 case Column::Egcu:
-                    return m_helper->egcuName(soundState.egcuId());
+                    return m_helper->egcuName(soundState.egcuId);
 
                 case Column::Duration:
-                    return soundState.inLoop()
+                    return soundState.inLoop
                                ? QString()
                                : QTime(0, 0).addMSecs(soundState.duration()).toString(QStringLiteral("hh:mm:ss.zzz"));
 
@@ -164,15 +166,15 @@ QVariant SoundAreaPlaylistModel::data(const QModelIndex& index, int role) const
                     return soundState.status();
             }
 
-        case Qt::BackgroundColorRole:
+        case Qt::BackgroundRole:
             if ((index.column() != Column::Category) && (index.column() != Column::Sound))
                 return QVariant();
-            return m_helper->soundCategoryBackgroundColor(static_cast<int32_t>(soundState.category().underlying()));
+            return m_helper->soundCategoryBackgroundColor(static_cast<int32_t>(soundState.category));
 
-        case Qt::TextColorRole:
+        case Qt::ForegroundRole:
             if ((index.column() != Column::Category) && (index.column() != Column::Sound))
                 return QVariant();
-            return m_helper->soundCategoryTextColor(static_cast<int32_t>(soundState.category().underlying()));
+            return m_helper->soundCategoryTextColor(static_cast<int32_t>(soundState.category));
 
         case Qt::TextAlignmentRole:
             return index.column() == Column::Duration ? Qt::AlignCenter : Qt::AlignVCenter;
@@ -184,7 +186,7 @@ QVariant SoundAreaPlaylistModel::data(const QModelIndex& index, int role) const
 
 bool SoundAreaPlaylistModel::onDataChanged(const SoundState& data, DataModification modType)
 {
-    if (!m_egcuIds.contains(data.egcuId()))
+    if (!m_egcuIds.contains(data.egcuId))
         return false;
 
     int row;
@@ -204,7 +206,7 @@ bool SoundAreaPlaylistModel::onDataChanged(const SoundState& data, DataModificat
             idx = SoundAreaPlaylistModel::index(m_vecData.indexOf(data), 0);
             if (row == -1)
             {
-                ERROR_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId())
+                ERROR_LOG(m_logger) << "'" << m_helper->soundName(data.category, data.soundId)
                                     << "' is neither scheduled nor active";
                 return false;
             }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
index 0604603dc..d5a88740c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
@@ -31,7 +31,6 @@ class SoundAreaEditPlaylistDelegate : public QStyledItemDelegate
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
   private:
-    NGL::INGLLogger& m_logger;
     static QIcon s_iconInf;
 };
 
@@ -68,6 +67,7 @@ class SoundAreaPlaylistModel : public LtsWidgets::LtsAbstractTableModel<SoundSta
     std::shared_ptr<SoundAreaHelper> m_helper{nullptr};
     QVector<int32_t> m_egcuIds;
     QTimer* m_timer{nullptr};
+    NGL::INGLLogger& m_logger;
 };
 
 } // namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
index 93d1785db..6fc12551b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
@@ -1,6 +1,7 @@
 
 
 #include "efm_sound_area_edit_model_tree.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "../logger.h"
 #include "efm_sound_area.h"
@@ -105,7 +106,8 @@ SoundAreaTreeModel::SoundAreaTreeModel(const QVector<int>& egcuIds, std::shared_
                                        QWidget* parent)
     : QAbstractItemModel(parent), m_helper(helper),
       m_root(new SoundTreeItem({tr("Category"), tr("Sound"), tr("Loop"), tr("Volume")}, SoundKey(0, 0))),
-      m_egcuIds(egcuIds)
+      m_egcuIds(egcuIds),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -163,23 +165,23 @@ bool SoundAreaTreeModel::init(const std::shared_ptr<SoundManagement::Interface::
     {
         QString name{m_helper->categoryName(category)};
         QVector<QVariant> data{QVector<QVariant>{name, QVariant(), 0, 100}};
-        key.first = static_cast<int32_t>(category.underlying());
+        key.first = static_cast<int32_t>(category);
         key.second = 0;
         m_root->appendChild(new SoundTreeItem(data, key, m_root));
     }
 
     SoundManagement::Sounds sounds = somDtc->sounds();
-    for (const auto& sound : std::as_const(sounds.sounds()))
+    for (const auto& sound : std::as_const(sounds.sounds))
     {
         for (auto& category : m_root->children())
         {
-            if (category->soundKey().first == static_cast<int32_t>(sound.category().underlying()))
+            if (category->soundKey().first == static_cast<int32_t>(sound.category))
             {
-                QString displayName = m_helper->soundName(sound.category(), sound.soundId());
+                QString displayName = m_helper->soundName(sound.category, sound.soundId);
                 QVector<QVariant> data{
-                    QVector<QVariant>{category->data(0).toString(), displayName, sound.isRepeatable() ? 1 : 0, 100}};
-                key.first = static_cast<int32_t>(sound.category().underlying());
-                key.second = sound.soundId();
+                    QVector<QVariant>{category->data(0).toString(), displayName, sound.isRepeatable ? 1 : 0, 100}};
+                key.first = static_cast<int32_t>(sound.category);
+                key.second = sound.soundId;
                 category->appendChild(new SoundTreeItem(data, key, category));
                 break;
             }
@@ -236,8 +238,8 @@ QVariant SoundAreaTreeModel::data(const QModelIndex& index, int role) const
     if (!index.isValid())
         return QVariant();
 
-    if ((role != Qt::DisplayRole) && (role != Qt::ToolTipRole) && (role != Qt::BackgroundColorRole) &&
-        (role != Qt::TextColorRole) && (role != Qt::EditRole))
+    if ((role != Qt::DisplayRole) && (role != Qt::ToolTipRole) && (role != Qt::BackgroundRole) &&
+        (role != Qt::ForegroundRole) && (role != Qt::EditRole))
         return QVariant();
 
     SoundTreeItem* item = static_cast<SoundTreeItem*>(index.internalPointer());
@@ -295,7 +297,7 @@ QVariant SoundAreaTreeModel::data(const QModelIndex& index, int role) const
                 return m_helper->soundCategoryBackgroundColor(item->soundKey().first);
             return QVariant();
 
-        case Qt::TextColorRole:
+        case Qt::ForegroundRole:
             if ((index.column() == Column::Category) || (index.column() == Column::Sound))
                 return m_helper->soundCategoryTextColor(item->soundKey().first);
             return QVariant();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
index 2d6192c3c..48ce4cf25 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
@@ -165,6 +165,7 @@ class SoundAreaTreeModel : public QAbstractItemModel
 
     SoundTreeItem* m_root{nullptr};
     QVector<int32_t> m_egcuIds;
+    NGL::INGLLogger& m_logger;
 };
 
 } // namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
index e07cbb149..22e607f78 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
@@ -12,30 +12,30 @@ namespace EffectManagement
 {
 
 SoundAreaHelper::SoundAreaHelper(SoundAreaHelper* helper)
-    : m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    : m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(getLogger("Plugins.Gui.SoundArea.Helper"))
 {
     QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
     for (const auto& asset : std::as_const(assets))
-        if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
-            m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name()));
+        if (asset.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
+            m_egcuNames.insert(asset.id, QString::fromStdString(asset.name));
 
     SoundManagement::Sounds sounds = m_somDtc->sounds();
-    for (const auto& sound : std::as_const(sounds.sounds()))
-        m_soundDuration.insert(SoundKey(sound.category().underlying(), sound.soundId()), sound.duration());
+    for (const auto& sound : std::as_const(sounds.sounds))
+        m_soundDuration.insert(SoundKey(static_cast<int32_t>(sound.category), sound.soundId), sound.duration);
 }
 
 SoundAreaHelper::SoundAreaHelper(std::shared_ptr<InfrastructureManagement::Interface::Dtc>& ismDtc,
                                  std::shared_ptr<SoundManagement::Interface::Dtc>& somDtc)
-    : m_ismDtc(ismDtc), m_somDtc(somDtc)
+    : m_ismDtc(ismDtc), m_somDtc(somDtc), m_logger(getLogger("Plugins.Gui.SoundArea.Helper"))
 {
     QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
     for (const auto& asset : std::as_const(assets))
-        if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
-            m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name()));
+        if (asset.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
+            m_egcuNames.insert(asset.id, QString::fromStdString(asset.name));
 
     SoundManagement::Sounds sounds = m_somDtc->sounds();
-    for (const auto& sound : std::as_const(sounds.sounds()))
-        m_soundDuration.insert(SoundKey(sound.category().underlying(), sound.soundId()), sound.duration());
+    for (const auto& sound : std::as_const(sounds.sounds))
+        m_soundDuration.insert(SoundKey(static_cast<int32_t>(sound.category), sound.soundId), sound.duration);
 }
 
 QVector<SoundManagement::SoundCategory> SoundAreaHelper::soundCategories()
@@ -50,7 +50,7 @@ QVector<SoundManagement::SoundCategory> SoundAreaHelper::soundCategories()
 
 QString SoundAreaHelper::categoryName(SoundManagement::SoundCategory category)
 {
-    switch (category.underlying())
+    switch (category)
     {
         case SoundManagement::SoundCategory::Aircraft:
             return QStringLiteral("Aircraft");
@@ -82,7 +82,7 @@ QString SoundAreaHelper::categoryName(const int32_t& category)
 
 QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, const int& id)
 {
-    switch (category.underlying())
+    switch (category)
     {
         case SoundManagement::SoundCategory::Aircraft:
             switch (id)
@@ -231,7 +231,7 @@ QString SoundAreaHelper::soundName(const int& category, const int& id)
 
 int SoundAreaHelper::soundDuration(SoundManagement::SoundCategory category, const int& id) const
 {
-    return soundDuration(static_cast<int>(category.underlying()), id);
+    return soundDuration(static_cast<int>(category), id);
 }
 
 int SoundAreaHelper::soundDuration(const int& category, const int& id) const
@@ -247,7 +247,7 @@ QString SoundAreaHelper::egcuName(const int& id) const
 
 QColor SoundAreaHelper::soundCategoryTextColor(const int32_t& category)
 {
-    switch (category)
+    switch (static_cast<SoundManagement::SoundCategory>(category))
     {
         case SoundManagement::SoundCategory::Aircraft:
             return {Qt::white};
@@ -274,7 +274,7 @@ QColor SoundAreaHelper::soundCategoryTextColor(const int32_t& category)
 
 QColor SoundAreaHelper::soundCategoryBackgroundColor(const int32_t& category)
 {
-    switch (category)
+    switch (static_cast<SoundManagement::SoundCategory>(category))
     {
         case SoundManagement::SoundCategory::Aircraft:
             return QColor::fromRgb(25, 25, 112);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.cpp
index 27fd4bea3..2a51df74e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.cpp
@@ -18,7 +18,8 @@ namespace EffectManagement
 
 SoundAreaSelectDialog::SoundAreaSelectDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent), m_requestHelper(new LtsUtils::RequestHelper(this)),
-      m_model(new SoundAreaSelectModel(this)), m_ui(new Ui::SoundAreasDialog)
+      m_model(new SoundAreaSelectModel(this)), m_ui(new Ui::SoundAreasDialog),
+      m_logger(getLogger("Plugins.Gui.SoundArea.SelectDialog"))
 {
     m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
index d142e952b..4593abc19 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
@@ -13,7 +13,7 @@ namespace EffectManagement
 {
 
 SoundAreaSelectDelegate::SoundAreaSelectDelegate(QObject* parent)
-    : QItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    : QItemDelegate(parent)
 {
 }
 
@@ -38,6 +38,7 @@ void SoundAreaSelectDelegate::paint(QPainter* painter, const QStyleOptionViewIte
 SoundAreaSelectModel::SoundAreaSelectModel(QWidget* parent)
     : LtsWidgets::LtsAbstractTableModel<SoundArea>(
           {tr("ID"), tr("Name"), tr("Main EGCU"), tr("Sound Area EGCUs"), tr("Active Sounds"), tr("Stop")}, parent)
+  , m_logger(getLogger("Plugins.Gui.SoundArea.SelectModel"))
 {
 }
 
@@ -45,21 +46,21 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
 {
     for (auto& soundArea : m_vecData)
     {
-        if (soundArea.egcuIds.contains(data.egcuId()))
+        if (soundArea.egcuIds.contains(data.egcuId))
         {
-            QHash<int32_t, SoundManagement::SoundState>::iterator it = soundArea.activeSounds.find(data.id());
+            QHash<int32_t, SoundManagement::SoundState>::iterator it = soundArea.activeSounds.find(data.id);
             switch (modType)
             {
                 case DataModification::eAdded:
                     if (it != soundArea.activeSounds.end())
                     {
                         DEBUG_LOG(m_logger)
-                            << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is already active";
+                            << "'" << m_helper->soundName(data.category, data.soundId) << "' is already active";
                         return false;
                     }
                     else
                     {
-                        soundArea.activeSounds.insert(data.id(), data);
+                        soundArea.activeSounds.insert(data.id, data);
                         emit dataChanged(SoundAreaSelectModel::index(0, Column::ActiveSounds),
                                          SoundAreaSelectModel::index(m_vecData.size(), Column::ActiveSounds));
                         return true;
@@ -69,7 +70,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
                     if (it == soundArea.activeSounds.end())
                     {
                         DEBUG_LOG(m_logger)
-                            << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is not active";
+                            << "'" << m_helper->soundName(data.category, data.soundId) << "' is not active";
                         return false;
                     }
                     else
@@ -171,7 +172,7 @@ QVariant SoundAreaSelectModel::data(const QModelIndex& index, int role) const
                     if (soundArea.activeSounds.size() > 0)
                     {
                         SoundManagement::SoundState sound = soundArea.activeSounds.begin().value();
-                        return m_helper->soundName(sound.category(), sound.soundId());
+                        return m_helper->soundName(sound.category, sound.soundId);
                     }
                     return QString();
 
@@ -200,7 +201,7 @@ QVariant SoundAreaSelectModel::data(const QModelIndex& index, int role) const
 
                 case Column::ActiveSounds:
                     for (const auto& sound : soundArea.activeSounds)
-                        str += m_helper->soundName(sound.category(), sound.soundId()).toStdString() + "\n";
+                        str += m_helper->soundName(sound.category, sound.soundId).toStdString() + "\n";
                     if (str.size() > 1)
                         str = str.substr(0, str.length() - 1);
                     return QString::fromStdString(str);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
index 85eb88d21..83b3d7f50 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
@@ -14,7 +14,7 @@ const QIcon SwitchItemDelegate::s_iconOn = QIcon(QStringLiteral("icon:switch_on.
 const QIcon SwitchItemDelegate::s_iconOff = QIcon(QStringLiteral("icon:switch_off.svg"));
 
 SwitchItemDelegate::SwitchItemDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    : QStyledItemDelegate(parent), m_logger(getLogger("Plugins.Gui.SoundArea.SwitchItemDelegate"))
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
index fe867c368..7e8453abe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
@@ -161,11 +161,11 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
   Q_UNUSED(modType)
 
   
-  if (data.vehicleFeature() != m_vehicleType)
+  if (data.vehicleFeature != m_vehicleType)
   {
 
     
-    m_vehicleType = data.vehicleFeature();
+    m_vehicleType = data.vehicleFeature;
     
     m_session->baseLayout()->addMenuAction(m_effecShowAction);
 
@@ -221,15 +221,15 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
   if (m_vehicleType == EffectShowManagement::Feature_e::Smoke)
   {
     
-    if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready)
       currentSmokeLoad++;
-    if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready)
       currentSmokeLoad++;
-    if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready)
       currentSmokeLoad++;
-    if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready)
       currentSmokeLoad++;
-    if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready)
       currentSmokeLoad++;
 
     if (currentSmokeLoad != m_oldSmokeCount)
@@ -241,13 +241,13 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
   else if (m_vehicleType != EffectShowManagement::Feature_e::NotSpecified)
   {
     
-    if (m_oldCondition.ammunitionMagazine() != data.ammunitionMagazine())
+    if (m_oldCondition.ammunitionMagazine != data.ammunitionMagazine)
       onSendAmmunition();
   }
 
   m_lastStatesTime = m_session->partitionTime();
 
-  if (data.readiness() && !m_oldCondition.readiness() && !m_operationalStatusTimer->isActive())
+  if (data.readiness && !m_oldCondition.readiness && !m_operationalStatusTimer->isActive())
   {
     DEBUG_LOG(m_logger) << "Operating condition: operational. Starting timer.";
     m_operationalStatusTimer->start(10 * 60 * 1000);
@@ -262,10 +262,10 @@ void InterfaceImpl::onSendAmmunition(int currentSmokeCount)
   const OperatingConditionEntity &condition = m_dtc->operatingConditionEntity();
   SendAmmunitionRequest req;
   if (currentSmokeCount >= 0)
-    req.ammunitionMagazine(currentSmokeCount);
+    req.ammunitionMagazine = currentSmokeCount;
   else
-    req.ammunitionMagazine(condition.ammunitionMagazine());
-  req.ammunitionAvailable(condition.ammunitionAvailable());
+    req.ammunitionMagazine = condition.ammunitionMagazine;
+  req.ammunitionAvailable = condition.ammunitionAvailable;
   m_ftc->sendAmmunitionRequest(req, this);
 }
 
@@ -281,11 +281,11 @@ void InterfaceImpl::checkLastState()
 
 void InterfaceImpl::onOperationalStatusTimeout()
 {
-  DEBUG_LOG(m_logger) << "Sending operational status: " << (m_oldCondition.readiness() ? "operational." : "not operational.");
+  DEBUG_LOG(m_logger) << "Sending operational status: " << (m_oldCondition.readiness ? "operational." : "not operational.");
   SendReadinessRequest req;
-  req.readiness(m_oldCondition.readiness());
+  req.readiness = m_oldCondition.readiness;
   m_ftc->sendReadinessRequest(req, this);
-  if (!m_oldCondition.readiness())
+  if (!m_oldCondition.readiness)
   {
     DEBUG_LOG(m_logger) << "Operating condition: not operational. Stopping timer.";
     m_operationalStatusTimer->stop();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
index 9b7ceec78..2061d39a1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
@@ -1,6 +1,7 @@
 
 
 #include "esc_firing_explosion.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "esc_order_edit.h"
 #include "esc_safety_confirmation_widget.h"
@@ -15,6 +16,7 @@ FiringExplosion::FiringExplosion(QWidget* parent)
       m_ui(new Ui::FiringExplosion), m_requestHelper(new LtsUtils::RequestHelper(this)), m_idOrder(0),
       m_idEffectShow(0), m_shotsAvail(0), m_isClearance(true), m_firingClearanceCountDown(0),
       m_endOfFiringClearanceCountDown(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     m_ui->pbFire->setEnabled(false);
@@ -92,34 +94,34 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
     if (modType == DataModification::eRemoved)
         return;
 
-    m_idOrder = data.idOrder();
-    m_idEffectShow = data.idEffectShow();
+    m_idOrder = data.idOrder;
+    m_idEffectShow = data.idEffectShow;
 
-    m_ui->pbApply->setEnabled(!data.isActive());
+    m_ui->pbApply->setEnabled(!data.isActive);
 
     OperatingConditionEntity opcon = m_dtc->operatingConditionEntity();
-    bool fireUnitsActive = opcon.firingUnitReadyAftLh() || opcon.firingUnitReadyAftRh() ||
-                           opcon.firingUnitReadyFwdLh() || opcon.firingUnitReadyFwdRh();
+    bool fireUnitsActive = opcon.firingUnitReadyAftLh || opcon.firingUnitReadyAftRh ||
+                           opcon.firingUnitReadyFwdLh || opcon.firingUnitReadyFwdRh;
     bool pbActiv =
-        (data.fireEnabled() && data.safetyConfirmation() != EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed);
+        (data.fireEnabled && data.safetyConfirmation != EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed);
 
     if (!fireUnitsActive && m_safetyConfirmationWidget)
         m_safetyConfirmationWidget->setMessage(tr("Waiting for ready firing unit"));
     else
         m_safetyConfirmationWidget->setMessage(QString());
 
-    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Yes, data.carriedOutEnabled());
+    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Yes, data.carriedOutEnabled);
 
-    if (m_oldEntity.numberOfVolley() != data.numberOfVolley())
-        m_ui->sbNumberOfVolley->setValue(data.numberOfVolley());
-    if (m_oldEntity.numberOfShot() != data.numberOfShot())
-        m_ui->sbNumberOfShot->setValue(data.numberOfShot());
-    if (m_oldEntity.duration() != data.duration())
-        m_ui->sbDuration->setValue(data.duration() / 1000);
+    if (m_oldEntity.numberOfVolley != data.numberOfVolley)
+        m_ui->sbNumberOfVolley->setValue(data.numberOfVolley);
+    if (m_oldEntity.numberOfShot != data.numberOfShot)
+        m_ui->sbNumberOfShot->setValue(data.numberOfShot);
+    if (m_oldEntity.duration != data.duration)
+        m_ui->sbDuration->setValue(data.duration / 1000);
 
     if (m_idEffectShow > 0)
     {
-        QString textStr = QString::fromStdString(m_dtc->order(m_idEffectShow).info());
+        QString textStr = QString::fromStdString(m_dtc->order(m_idEffectShow).info);
         m_ui->leEffectShow->setText(textStr);
     }
     else
@@ -127,15 +129,15 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
 
     m_timer->stop();
 
-    m_firingClearanceCountDown = data.firingClearanceTime().is_set()
-                                     ? (1000 + data.firingClearanceTime().get() - m_session->partitionTime())
+    m_firingClearanceCountDown = data.firingClearanceTime.has_value()
+                                     ? (1000 + data.firingClearanceTime.get() - m_session->partitionTime())
                                      : 0;
-    m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime().is_set()
-                                          ? (1000 + data.endOfFiringClearanceTime().get() - m_session->partitionTime())
+    m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime.has_value()
+                                          ? (1000 + data.endOfFiringClearanceTime.get() - m_session->partitionTime())
                                           : 0;
 
     onFiringClearanceCountDown();
-    if (data.idOrder() == 0 || (!data.firingClearanceTime().is_set() && data.duration() == 0))
+    if (data.idOrder == 0 || (!data.firingClearanceTime.has_value() && data.duration == 0))
         m_isClearance = true;
     else
         m_isClearance = (m_firingClearanceCountDown <= 0 && m_endOfFiringClearanceCountDown > 0);
@@ -143,15 +145,15 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
     m_ui->pbFire->setEnabled(pbActiv && fireUnitsActive && m_isClearance);
 
     bool isInterruptEnabled =
-        !data.carriedOutEnabled() && !m_ui->pbFire->isEnabled() && data.isActive() && m_isClearance;
+        !data.carriedOutEnabled && !m_ui->pbFire->isEnabled() && data.isActive && m_isClearance;
     m_ui->pbInterrupt->setEnabled(isInterruptEnabled);
 
-    m_ui->leRemainingShots->setText(data.remainingShots() > 0 ? QString::number(data.remainingShots())
+    m_ui->leRemainingShots->setText(data.remainingShots > 0 ? QString::number(data.remainingShots)
                                                               : QString::number(0));
-    m_ui->leRemainingTime->setText(QString::number(data.remainingTime() / 1000));
-    m_ui->leRemainingVolley->setText(data.remainingVolleys() > 0 ? QString::number(data.remainingVolleys())
+    m_ui->leRemainingTime->setText(QString::number(data.remainingTime / 1000));
+    m_ui->leRemainingVolley->setText(data.remainingVolleys > 0 ? QString::number(data.remainingVolleys)
                                                                  : QString::number(0));
-    m_safetyConfirmation = data.safetyConfirmation();
+    m_safetyConfirmation = data.safetyConfirmation;
     onSafetyConfirmationDisplay();
 
     m_oldEntity = data;
@@ -162,7 +164,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
     Q_UNUSED(modType)
     if (m_safetyConfirmationWidget)
         m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data);
-    m_shotsAvail = data.ammunitionMagazine();
+    m_shotsAvail = data.ammunitionMagazine;
     m_ui->lblShotsAvail->setText(QString::number(m_shotsAvail));
 }
 
@@ -278,21 +280,21 @@ bool FiringExplosion::statusChangedForManuallyEffectShow(EffectShowStatus_e stat
         {
             const EffectShowClient::FiringExplosionEntity manEx = m_dtc->firingExplosionEntity();
 
-            request.numberOfVolley(manEx.remainingVolleys());
-            request.numberOfShot(manEx.remainingShots());
-            request.duration(manEx.remainingTime());
+            request.numberOfVolley = manEx.remainingVolleys;
+            request.numberOfShot = manEx.remainingShots;
+            request.duration = manEx.remainingTime;
         }
         else
         {
-            request.numberOfVolley(m_ui->sbNumberOfVolley->value());
-            request.numberOfShot(m_ui->sbNumberOfShot->value());
-            request.duration(m_ui->sbDuration->value() * 1000);
+            request.numberOfVolley = m_ui->sbNumberOfVolley->value();
+            request.numberOfShot = m_ui->sbNumberOfShot->value();
+            request.duration = m_ui->sbDuration->value() * 1000;
         }
-        request.pbFire(status == EffectShowStatus_e::Fire);
-        request.pbAbort(status == EffectShowStatus_e::Abort);
-        request.pbInterrupt(status == EffectShowStatus_e::Interrupt);
+        request.pbFire = status == EffectShowStatus_e::Fire;
+        request.pbAbort = status == EffectShowStatus_e::Abort;
+        request.pbInterrupt = status == EffectShowStatus_e::Interrupt;
 
-        request.pbCarriedOut(status == EffectShowStatus_e::CarriedOut || status == EffectShowStatus_e::Abort);
+        request.pbCarriedOut = status == EffectShowStatus_e::CarriedOut || status == EffectShowStatus_e::Abort;
 
         return m_ftc->manuallyExplosionRequest(request, this);
     });
@@ -308,7 +310,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
     return m_requestHelper->startSingleRequest([this, status]() {
         OrderModifyRequest orderModifyRequest;
 
-        orderModifyRequest.id(m_idEffectShow);
+        orderModifyRequest.id = m_idEffectShow;
         EffectShowManagement::OrderConfirmation_e oc;
         switch (status)
         {
@@ -326,8 +328,8 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
                                        "should not happen I guess...";
                 break;
         }
-        orderModifyRequest.orderConfirmation(oc);
-        orderModifyRequest.answerText(QString().toStdString());
+        orderModifyRequest.orderConfirmation = oc;
+        orderModifyRequest.answerText = QString().toStdString();
 
         return m_ftc->orderModifyRequest(orderModifyRequest, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
index 046bdca62..e1df80a68 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
@@ -1,6 +1,7 @@
 
 
 #include "esc_firing_smoke.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "esc_order_edit.h"
 #include "esc_safety_confirmation_widget.h"
@@ -18,6 +19,7 @@ FiringSmoke::FiringSmoke(QWidget* parent)
       m_safetyConfirmationWidget(nullptr), m_ui(new Ui::FiringSmoke),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_idOrder(0), m_firingClearanceCountDown(0),
       m_endOfFiringClearanceCountDown(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "FiringSmoke::FiringSmoke()";
 
@@ -66,7 +68,7 @@ bool FiringSmoke::init(const std::shared_ptr<EffectShowClient::Interface::Dtc>&
             &FiringSmoke::onMeteoDataChanged);
 
     const EffectShowClient::MeteoNearVehicle dat = m_dtc.get()->meteoNearVehicle();
-    if (dat.windDirection() > 0)
+    if (dat.windDirection > 0)
         onMeteoDataChanged(dat, DataModification());
     else
         onMeteoTimerTimeout();
@@ -92,15 +94,15 @@ void FiringSmoke::onFiringSmokeEntityChanged(const EffectShowClient::FiringSmoke
     if (modType == DataModification::eRemoved)
         return;
 
-    m_idOrder = data.idOrder();
+    m_idOrder = data.idOrder;
 
-    if (data.idEffectShow() > 0)
+    if (data.idEffectShow > 0)
     {
-        const EffectShowClient::Order& order = m_dtc->order(data.idOrder());
-        m_ui->leEffectShow->setText(QString::fromStdString(order.info()));
+        const EffectShowClient::Order& order = m_dtc->order(data.idOrder);
+        m_ui->leEffectShow->setText(QString::fromStdString(order.info));
         m_ui->lblLengthOfFogZone->setText(
-            tr("%1m x %2m").arg(QString::number(order.areaWidth()), QString::number(order.areaDepth())));
-        m_ui->lblDirectionOfFogZone->setText(QString::number(order.areaRotation()));
+            tr("%1m x %2m").arg(QString::number(order.areaWidth), QString::number(order.areaDepth)));
+        m_ui->lblDirectionOfFogZone->setText(QString::number(order.areaRotation));
     }
     else
     {
@@ -109,16 +111,16 @@ void FiringSmoke::onFiringSmokeEntityChanged(const EffectShowClient::FiringSmoke
         m_ui->lblDirectionOfFogZone->setText(QString::number(0));
     }
 
-    m_firingClearanceCountDown = data.firingClearanceTime().is_set()
-                                     ? (1000 + data.firingClearanceTime().get() - m_session->partitionTime())
+    m_firingClearanceCountDown = data.firingClearanceTime.has_value()
+                                     ? (1000 + data.firingClearanceTime.get() - m_session->partitionTime())
                                      : 0;
-    m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime().is_set()
-                                          ? (1000 + data.endOfFiringClearanceTime().get() - m_session->partitionTime())
+    m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime.has_value()
+                                          ? (1000 + data.endOfFiringClearanceTime.get() - m_session->partitionTime())
                                           : 0;
     m_timer->stop();
     onFiringClearanceCountDown();
 
-    m_safetyConfirmation = data.safetyConfirmation();
+    m_safetyConfirmation = data.safetyConfirmation;
     onSafetyConfirmationDisplay();
 
     m_oldEntity = data;
@@ -129,32 +131,32 @@ void FiringSmoke::onOperatingConditionEntityChanged(const OperatingConditionEnti
     Q_UNUSED(modType)
 
     QVector<QColor> onColor = {
-        data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+        data.smokeCartridge1 <= EffectShowClient::StatusSmokeCartridge_e::Ready
             ? QColor(0, 255, 0)
             : QColor(255, 255, 0),
-        data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+        data.smokeCartridge2 <= EffectShowClient::StatusSmokeCartridge_e::Ready
             ? QColor(0, 255, 0)
             : QColor(255, 255, 0),
-        data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+        data.smokeCartridge3 <= EffectShowClient::StatusSmokeCartridge_e::Ready
             ? QColor(0, 255, 0)
             : QColor(255, 255, 0),
-        data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+        data.smokeCartridge4 <= EffectShowClient::StatusSmokeCartridge_e::Ready
             ? QColor(0, 255, 0)
             : QColor(255, 255, 0),
-        data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+        data.smokeCartridge5 <= EffectShowClient::StatusSmokeCartridge_e::Ready
             ? QColor(0, 255, 0)
             : QColor(255, 255, 0)};
     QVector<bool> status = {
-        ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-         (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-        ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-         (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-        ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-         (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-        ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-         (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-        ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-         (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
+        ((data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+         (data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+        ((data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+         (data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+        ((data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+         (data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+        ((data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+         (data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+        ((data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+         (data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
 
     m_smokeState->setSmokeState(status, onColor);
     m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data);
@@ -166,7 +168,7 @@ void FiringSmoke::onMeteoDataChanged(const MeteoNearVehicle& data, DataModificat
     Q_UNUSED(modType)
     m_meteoTimer->start(),
         m_ui->lblWeather->setText(
-            tr("Speed [m/s]: %1 | Direction [°]: %2").arg(data.windSpeed()).arg(data.windDirection()));
+            tr("Speed [m/s]: %1 | Direction [°]: %2").arg(data.windSpeed).arg(data.windDirection));
 }
 
 void FiringSmoke::onMeteoTimerTimeout()
@@ -210,7 +212,7 @@ void FiringSmoke::onSafetyConfirmationDisplay()
 {
     if (!m_safetyConfirmationWidget)
         return;
-    m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation.underlying());
+    m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation);
 }
 
 void FiringSmoke::onFiringClearanceCountDown()
@@ -241,10 +243,10 @@ bool FiringSmoke::statusChangedForManuallyEffectShow(EffectShowStatus_e status)
 
     return m_requestHelper->startSingleRequest([this, status]() {
         EffectShowClient::ManuallySmokeRequest request;
-        request.directionOfFogZone(0);
-        request.lengthOfFogZone(0);
-        request.pbAbort(status == EffectShowStatus_e::Abort);
-        request.pbCarriedOut(status == EffectShowStatus_e::CarriedOut);
+        request.directionOfFogZone = 0;
+        request.lengthOfFogZone = 0;
+        request.pbAbort = status == EffectShowStatus_e::Abort;
+        request.pbCarriedOut = status == EffectShowStatus_e::CarriedOut;
         return m_ftc->manuallySmokeRequest(request, this);
     });
 }
@@ -259,7 +261,7 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
     return m_requestHelper->startSingleRequest([this, status]() {
         OrderModifyRequest orderModifyRequest;
 
-        orderModifyRequest.id(m_idOrder);
+        orderModifyRequest.id = m_idOrder;
         EffectShowManagement::OrderConfirmation_e oc;
         switch (status)
         {
@@ -274,8 +276,8 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
                                        "not happen I guess...";
                 break;
         }
-        orderModifyRequest.orderConfirmation(oc);
-        orderModifyRequest.answerText(QString().toStdString());
+        orderModifyRequest.orderConfirmation = oc;
+        orderModifyRequest.answerText = QString().toStdString();
 
         return m_ftc->orderModifyRequest(orderModifyRequest, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
index 8f0127824..a54b5319a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
@@ -1,6 +1,7 @@
 
 
 #include "esc_operating_condition.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "LtsWidgets/lts_message_dialog.h"
 #include "esc_safety_confirmation_widget.h"
@@ -19,6 +20,7 @@ OperatingCondition::OperatingCondition(QWidget* parent)
       m_lastState(EffectShowClient::OperatingConditionEntity()), m_meteoTimerTimeout(60 * 1000 * 15),
       m_meteoTimer(new QTimer(this)), m_smokeState(nullptr), m_safetyConfirmationWidget(nullptr),
       m_ui(new Ui::OperatingCondition), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     m_smokeState = new EffectShowClient::SmokeState(this);
@@ -83,7 +85,7 @@ bool OperatingCondition::init(const std::shared_ptr<EffectShowClient::Interface:
     onOperatingConditionEntityChanged(m_dtc->operatingConditionEntity(), DataModification::eAdded);
 
     const EffectShowClient::MeteoNearVehicle mdmv = m_dtc->meteoNearVehicle();
-    if (mdmv.temperature() > 0 && mdmv.windSpeed() > 0)
+    if (mdmv.temperature > 0 && mdmv.windSpeed > 0)
         onMeteoNearVehicleChanged(m_dtc->meteoNearVehicle(), DataModification::eAdded);
 
     connect(m_ui->pbConfirmReadiness, &QPushButton::clicked, this, &OperatingCondition::onSendConfirmReadiness);
@@ -103,15 +105,15 @@ int OperatingCondition::getSmokeCount()
 {
     const OperatingConditionEntity& data = m_dtc->operatingConditionEntity();
     int currentSmokeLoad = 0;
-    if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready)
         currentSmokeLoad++;
-    if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready)
         currentSmokeLoad++;
-    if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready)
         currentSmokeLoad++;
-    if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready)
         currentSmokeLoad++;
-    if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
+    if (data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready)
         currentSmokeLoad++;
 
     return currentSmokeLoad;
@@ -125,19 +127,19 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
 
     m_lastState = data;
 
-    if (data.vehicleFeature() ==
+    if (data.vehicleFeature ==
         EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24))
     {
         m_ui->ledAftLh->hide();
         m_ui->ledAftRh->hide();
     }
-    else if (data.vehicleFeature() ==
+    else if (data.vehicleFeature ==
              EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion48))
     {
         m_ui->ledAftLh->show();
         m_ui->ledAftRh->show();
     }
-    bool isExp = data.vehicleFeature() !=
+    bool isExp = data.vehicleFeature !=
                  EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke);
     m_ui->frame->setHidden(!isExp);
     m_ui->lblMagazine->setHidden(!isExp);
@@ -151,26 +153,26 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
         m_ui->pbConfirmReadiness->setEnabled(hasNoWarnings);
     }
 
-    setBatteryVoltage(data.batteryVoltage());
+    setBatteryVoltage(data.batteryVoltage);
 
-    if (data.vehicleFeature() !=
+    if (data.vehicleFeature !=
         EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
     {
-        if (data.vehicleFeature() ==
+        if (data.vehicleFeature ==
             EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::NotSpecified))
             return;
 
-        int max = data.vehicleFeature() ==
+        int max = data.vehicleFeature ==
                           EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24)
                       ? 24
                       : 48;
         m_ui->sbMagazine->setMaximum(max);
         m_ui->sbAvailable->setMaximum(255);
 
-        m_ui->ledFwdLh->setStatus(data.firingUnitReadyFwdLh());
-        m_ui->ledAftLh->setStatus(data.firingUnitReadyAftLh());
-        m_ui->ledFwdRh->setStatus(data.firingUnitReadyFwdRh());
-        m_ui->ledAftRh->setStatus(data.firingUnitReadyAftRh());
+        m_ui->ledFwdLh->setStatus(data.firingUnitReadyFwdLh);
+        m_ui->ledAftLh->setStatus(data.firingUnitReadyAftLh);
+        m_ui->ledFwdRh->setStatus(data.firingUnitReadyFwdRh);
+        m_ui->ledAftRh->setStatus(data.firingUnitReadyAftRh);
     }
     else
     {
@@ -178,56 +180,56 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
         m_ui->sbMagazine->setMaximum(5);
         m_ui->sbAvailable->setMaximum(12);
         QVector<QColor> onColor = {
-            data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+            data.smokeCartridge1 <= EffectShowClient::StatusSmokeCartridge_e::Ready
                 ? QColor(0, 255, 0)
                 : QColor(255, 255, 0),
-            data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+            data.smokeCartridge2 <= EffectShowClient::StatusSmokeCartridge_e::Ready
                 ? QColor(0, 255, 0)
                 : QColor(255, 255, 0),
-            data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+            data.smokeCartridge3 <= EffectShowClient::StatusSmokeCartridge_e::Ready
                 ? QColor(0, 255, 0)
                 : QColor(255, 255, 0),
-            data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+            data.smokeCartridge4 <= EffectShowClient::StatusSmokeCartridge_e::Ready
                 ? QColor(0, 255, 0)
                 : QColor(255, 255, 0),
-            data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
+            data.smokeCartridge5 <= EffectShowClient::StatusSmokeCartridge_e::Ready
                 ? QColor(0, 255, 0)
                 : QColor(255, 255, 0)};
         QVector<bool> status = {
-            ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-             (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-            ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-             (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-            ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-             (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-            ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-             (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
-            ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
-             (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
+            ((data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+             (data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+            ((data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+             (data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+            ((data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+             (data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+            ((data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+             (data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
+            ((data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
+             (data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
 
         m_smokeState->setSmokeState(status, onColor);
     }
 
-    m_ui->ltsLedWidget->setColor(data.readiness() ? QColor(0, 255, 0) : QColor(255, 0, 0));
+    m_ui->ltsLedWidget->setColor(data.readiness ? QColor(0, 255, 0) : QColor(255, 0, 0));
     m_ui->ltsLedWidget->setStatus(true);
-    if (m_ui->lblAva->text().toInt() != data.ammunitionAvailable())
-        m_ui->sbAvailable->setValue(data.ammunitionAvailable());
-    m_ui->lblAva->setText(QString::number(data.ammunitionAvailable()));
-    m_ui->lblMag->setText(QString::number(data.ammunitionMagazine()));
+    if (m_ui->lblAva->text().toInt() != data.ammunitionAvailable)
+        m_ui->sbAvailable->setValue(data.ammunitionAvailable);
+    m_ui->lblAva->setText(QString::number(data.ammunitionAvailable));
+    m_ui->lblMag->setText(QString::number(data.ammunitionMagazine));
 }
 
 void OperatingCondition::onFiringExplosionEntityChanged(const FiringExplosionEntity& data, DataModification modType)
 {
     Q_UNUSED(modType)
 
-    m_safetyConfirmation = data.safetyConfirmation();
+    m_safetyConfirmation = data.safetyConfirmation;
     onSafetyConfirmationDisplay();
 }
 
 void OperatingCondition::onFiringSmokeEntityChanged(const FiringSmokeEntity& data, DataModification modType)
 {
     Q_UNUSED(modType)
-    m_safetyConfirmation = data.safetyConfirmation();
+    m_safetyConfirmation = data.safetyConfirmation;
     onSafetyConfirmationDisplay();
 }
 
@@ -235,14 +237,14 @@ void OperatingCondition::onSafetyConfirmationDisplay()
 {
     if (!m_safetyConfirmationWidget)
         return;
-    m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation.underlying());
+    m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation);
 }
 
 bool OperatingCondition::onSendRevokeReadiness()
 {
     bool ret = m_requestHelper->startSingleRequest([this]() {
         EffectShowClient::SendReadinessRequest request;
-        request.readiness(false);
+        request.readiness = false;
         return m_ftc->sendReadinessRequest(request, this);
     });
 
@@ -253,7 +255,7 @@ bool OperatingCondition::onSendConfirmReadiness()
 {
     bool ret = m_requestHelper->startSingleRequest([this]() {
         EffectShowClient::SendReadinessRequest request;
-        request.readiness(true);
+        request.readiness = true;
         return m_ftc->sendReadinessRequest(request, this);
     });
 
@@ -267,11 +269,11 @@ void OperatingCondition::onMeteoNearVehicleChanged(const EffectShowClient::Meteo
         return;
 
     m_meteoTimer->start(m_meteoTimerTimeout);
-    m_ui->leTemperature->setText(QString::number(data.temperature(), 'f', 2));
-    m_ui->leHumidity->setText(QString::number(data.humidity(), 'f', 2));
-    m_ui->lePressure->setText(QString::number(data.pressure(), 'f', 2));
-    m_ui->leWindSpeed->setText(QString::number(data.windSpeed(), 'f', 2));
-    m_ui->leWindDirection->setText(QString::number(data.windDirection(), 'f', 2));
+    m_ui->leTemperature->setText(QString::number(data.temperature, 'f', 2));
+    m_ui->leHumidity->setText(QString::number(data.humidity, 'f', 2));
+    m_ui->lePressure->setText(QString::number(data.pressure, 'f', 2));
+    m_ui->leWindSpeed->setText(QString::number(data.windSpeed, 'f', 2));
+    m_ui->leWindDirection->setText(QString::number(data.windDirection, 'f', 2));
     m_ui->leLastUpdate->setText(DTG::toString(QDateTime::currentDateTime()));
 }
 
@@ -293,7 +295,7 @@ bool OperatingCondition::onSendAmmunition()
         new LtsWidgets::LtsMessageDialogNew(
             this, tr("The value for Magazine must not be higher than the value for Available."));
         QPalette* palette = new QPalette();
-        palette->setColor(QPalette::Background, Qt::red);
+        palette->setColor(QPalette::Window, Qt::red);
         m_ui->sbMagazine->setPalette(*palette);
         return false;
     }
@@ -303,13 +305,13 @@ bool OperatingCondition::onSendAmmunition()
     return m_requestHelper->startSingleRequest([this]() {
         EffectShowClient::SendAmmunitionRequest request;
         const OperatingConditionEntity& condition = m_dtc->operatingConditionEntity();
-        if (condition.vehicleFeature() ==
+        if (condition.vehicleFeature ==
             EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
-            request.ammunitionMagazine(getSmokeCount());
+            request.ammunitionMagazine = getSmokeCount();
         else
-            request.ammunitionMagazine(m_ui->sbMagazine->value());
+            request.ammunitionMagazine = m_ui->sbMagazine->value();
 
-        request.ammunitionAvailable(m_ui->sbAvailable->value());
+        request.ammunitionAvailable = m_ui->sbAvailable->value();
 
         return m_ftc->sendAmmunitionRequest(request, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
index 04374e096..2b233482b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
@@ -1,10 +1,11 @@
 
 
 #include "esc_order_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_esc_order_edit.h"
 
-// esm_translation.h - external dependency, removed for build
+#include <EffectShowManagement/esm_translation.h>
 
 namespace EffectShowClient
 {
@@ -13,6 +14,7 @@ OrderEdit::OrderEdit(const Order& order, bool fireReadinessAvailable, QWidget* p
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel), m_ftc(nullptr), m_ui(new Ui::OrderEdit),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_order(order),
       m_fireReadinessAvailable(fireReadinessAvailable)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -48,7 +50,7 @@ bool OrderEdit::init(const std::shared_ptr<EffectShowClient::Interface::Ftc>& ft
         showOrder();
     else
     {
-        m_ui->cbOrderConfirmation->addItem(m_orderList[order.underlying()]);
+        m_ui->cbOrderConfirmation->addItem(m_orderList[static_cast<int>(order)]);
         m_ui->cbOrderConfirmation->setEnabled(false);
         slotChangesMade();
         setUnchangeable(true);
@@ -83,11 +85,11 @@ bool OrderEdit::apply()
 
         int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
         EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(key);
-        orderModifyRequest.orderConfirmation(oc);
+        orderModifyRequest.orderConfirmation = oc;
 
-        orderModifyRequest.answerText(m_ui->cbxAnswer->currentText().toStdString());
+        orderModifyRequest.answerText = m_ui->cbxAnswer->currentText().toStdString();
 
-        orderModifyRequest.id(m_order.id());
+        orderModifyRequest.id = m_order.id;
 
         return m_ftc->orderModifyRequest(orderModifyRequest, this);
     });
@@ -95,7 +97,7 @@ bool OrderEdit::apply()
 
 void OrderEdit::retranslate()
 {
-    if (m_order.typeOfOrder() == 0)
+    if (m_order.typeOfOrder == 0)
         translate(m_ui, tr("Edit relocation order"));
     else
         translate(m_ui, tr("Edit Effectshow Order"));
@@ -107,8 +109,8 @@ bool OrderEdit::checkForAnswerUiRequirement() const
         return true;
 
     int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
-    return !(((key == EffectShowManagement::OrderConfirmation_e::Nonacceptance) ||
-              (key == EffectShowManagement::OrderConfirmation_e::Abort)) &&
+    return !(((key == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Nonacceptance)) ||
+              (key == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort))) &&
              m_ui->cbxAnswer->currentText().isEmpty());
 }
 
@@ -116,64 +118,64 @@ void OrderEdit::showOrder()
 {
     QStringList orderList;
 
-    switch (m_order.orderConfirmation().underlying())
+    switch (m_order.orderConfirmation)
     {
         case EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderAcceptance]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderAcceptance)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
 
-            if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
-                orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
+            if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
+                orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
 
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Nonacceptance];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Nonacceptance)];
             break;
         case EffectShowManagement::OrderConfirmation_e::OrderAcceptance:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
 
-            if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
-                orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
+            if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
+                orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
 
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::DriveOff:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
 
-            if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
-                orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
+            if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
+                orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
 
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::PositionReached:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)];
             if (m_fireReadinessAvailable)
-                orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+                orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
 
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::Execution:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::InterruptRelocation:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
-            if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
-                orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
+            if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
+                orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         case EffectShowManagement::OrderConfirmation_e::InterruptExecution:
 
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderCarriedOut]
-                      << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)]
+                      << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
         default:
-            orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
+            orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
             break;
     }
     m_ui->cbOrderConfirmation->addItems(orderList);
@@ -183,27 +185,27 @@ void OrderEdit::showOrder()
 void OrderEdit::createOrderList()
 {
     EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::OrderAcceptance;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::DriveOff;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::PositionReached;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::FiringReadiness;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::Execution;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::Abort;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::Nonacceptance;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
     oc = EffectShowManagement::OrderConfirmation_e::InterruptRelocation;
-    m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
+    m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
 }
 
 } // namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
index ead848486..ff7feb63d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
@@ -48,7 +48,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte
     LtsUtils::RequestHelper* m_requestHelper;
     Order m_order;
     bool m_fireReadinessAvailable;
-    EffectShowManagement::OrderConfirmation m_forcedState;
+    EffectShowManagement::OrderConfirmation_e m_forcedState;
     QHash<int, QString> m_orderList;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
index 44293a742..34fcb197c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
@@ -1,6 +1,7 @@
 
 
 #include "esc_order_list.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "esc_firing_explosion.h"
 #include "esc_firing_smoke.h"
@@ -21,6 +22,7 @@ OrderList::OrderList(const QString& menuGroup, LtsSession::LtsSession* session,
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup), m_model(nullptr),
       m_dtc(nullptr), m_ftc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::OrderList),
       m_isEffectShow(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -64,7 +66,7 @@ bool OrderList::init(bool isEffectShow, const std::shared_ptr<EffectShowClient::
     m_ftc = ftc;
     if (!m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(m_sitMapGuiIfc))
         return false;
-    EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature();
+    EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature;
     if (isEffectShow && feature == EffectShowManagement::Feature_e::NotSpecified)
         return false;
 
@@ -135,8 +137,8 @@ void OrderList::onSelectionChanged()
     const QModelIndex idx = m_ui->widget->currentIndex();
     int row = idx.row();
     const EffectShowClient::Order order = m_model->getRowData(row);
-    bool isReady = order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
-                   order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution;
+    bool isReady = order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
+                   order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution;
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, isReady);
 
@@ -155,15 +157,15 @@ void OrderList::onEditOrder()
     const EffectShowClient::Order order = m_model->getRowData(row);
 
     DEBUG_LOG(m_logger) << "--- onEditOrder() ";
-    if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
+    if (order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
         return;
     bool fireReadinessEnable = true;
     const auto orders = m_dtc->orders();
     for (const auto& ord : orders)
     {
-        if (ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
-            ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
-            ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution)
+        if (ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
+            ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
+            ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution)
         {
 
             fireReadinessEnable = false;
@@ -184,7 +186,7 @@ void OrderList::onShowOrder()
     if (row < 0)
         return;
 
-    EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature();
+    EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature;
     if (feature == EffectShowManagement::Feature_e::NotSpecified)
         return;
 
@@ -227,11 +229,11 @@ void OrderList::onCreateShowEscOrderPosition()
     const EffectShowClient::Order order = m_model->getRowData(row);
 
     bool is_smoke =
-        m_dtc.get()->operatingConditionEntity().vehicleFeature() == EffectShowManagement::Feature_e::Smoke &&
+        m_dtc.get()->operatingConditionEntity().vehicleFeature == EffectShowManagement::Feature_e::Smoke &&
         m_isEffectShow;
 
-    const QPointF& pos = QPointF(order.position().lon(), order.position().lat());
-    m_sitMapGuiIfc->escOrderPosition_create(pos, order.areaWidth(), order.areaDepth(), order.areaRotation(), is_smoke);
+    const QPointF& pos = QPointF(order.position.lon, order.position.lat);
+    m_sitMapGuiIfc->escOrderPosition_create(pos, order.areaWidth, order.areaDepth, order.areaRotation, is_smoke);
     m_sitMapGuiIfc->setCenterPoint(pos);
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp
index 64249b5b7..411aaad46 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp
@@ -2,7 +2,8 @@
 
 
 #include "esc_order_model.h"
-// esm_translation.h - external dependency, removed for build
+#include <NGLLogger/NGLLoggerBootstrap.h>
+#include <EffectShowManagement/esm_translation.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngltools/ngltools_dtg.h>
 #include <sstream>
@@ -29,6 +30,7 @@ OrderModel::OrderModel(QObject *parent)
   tr("Shots In Total")
 },
 parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 
@@ -46,7 +48,7 @@ bool OrderModel::initModel(const std::shared_ptr<EffectShowClient::Interface::Dt
   const QMap<qint32, EffectShowClient::Order> &orderMap = m_dtc->orders();
   for (const auto &order : orderMap)
   {
-    if (order.typeOfOrder() == m_isEffectShow) 
+    if (order.typeOfOrder == m_isEffectShow) 
       insertRow(order);
   }
 
@@ -68,41 +70,41 @@ QVariant OrderModel::data(const QModelIndex &index, int role) const
 {
   if (role != Qt::DisplayRole || !indexIsValid(index))
     return QVariant();
-  bool is_smoke = m_dtc.get()->operatingConditionEntity().vehicleFeature() == EffectShowManagement::Feature_e::Smoke;
+  bool is_smoke = m_dtc.get()->operatingConditionEntity().vehicleFeature == EffectShowManagement::Feature_e::Smoke;
 
 
   const EffectShowClient::Order &order = m_vecData.at(index.row());
   switch (index.column())
   {
   case Status:
-    return EffectShowManagement::toString(order.orderConfirmation());
+    return EffectShowManagement::toString(order.orderConfirmation);
   case Id:
-    return order.idOrder();
+    return order.idOrder;
   case StartTime:
-    return order.startTime().is_set() ? DTG::toStringMSec(order.startTime().get()) : tr("---");
+    return order.startTime.has_value() ? DTG::toStringMSec(order.startTime.get()) : tr("---");
   case Duration:
-    return LtsWidgets::readableDuration(order.duration() * 1000);
+    return LtsWidgets::readableDuration(order.duration * 1000);
   case Distance:
   {
     if (!m_dtcTabOC)
       return QVariant();
 
-    int distance = qRound(LtsCoordTrans::distance(m_ownPosition.position().lon(), m_ownPosition.position().lat(),
-                                                  order.position().lon(), order.position().lat()));
+    int distance = qRound(LtsCoordTrans::distance(m_ownPosition.position.lon, m_ownPosition.position.lat,
+                                                  order.position.lon, order.position.lat));
     return (distance / 10) * 10;
   }
   case Position:
   {
-    const Core::GeoPosition2D &pos = order.position();
-    return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+    const Core::GeoPosition2D &pos = order.position;
+    return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
   }
   case Area:
   {
-    return tr("%1m x %2m", "Ausdehung: 5m x 6m").arg(order.areaWidth()).arg(order.areaDepth());
+    return tr("%1m x %2m", "Ausdehung: 5m x 6m").arg(order.areaWidth).arg(order.areaDepth);
   }
   case Type:
   {
-    if (order.typeOfOrder() == 0)
+    if (order.typeOfOrder == 0)
       return tr("Relocation Position");
     else if (is_smoke)
       return tr("Smoke");
@@ -111,21 +113,21 @@ QVariant OrderModel::data(const QModelIndex &index, int role) const
   }
   case Rotation:
     if (is_smoke)
-      return order.areaRotation();
+      return order.areaRotation;
     else
       return QStringLiteral("--");
   case Volley:
     if (is_smoke)
       return QStringLiteral("--");
     else
-      return order.numOfVolley();
+      return order.numOfVolley;
   case Info:
-    return QString::fromStdString(order.info());
+    return QString::fromStdString(order.info);
   case ShotsInTotal:
     if (is_smoke)
       return QStringLiteral("--");
     else
-      return order.shotsPerVolley();
+      return order.shotsPerVolley;
 
   }
 
@@ -150,7 +152,7 @@ bool OrderModel::onDataChanged(const Order &data, DataModification modType)
 {
   if (modType == DataModification::eRemoved)
     return LtsAbstractTableModel::onDataChanged(data, modType);
-  else if (data.typeOfOrder() == m_isEffectShow)
+  else if (data.typeOfOrder == m_isEffectShow)
     return LtsAbstractTableModel::onDataChanged(data, modType);
   return false;
 }
@@ -188,13 +190,13 @@ bool OrderProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
   switch (source_left.column())
   {
   case OrderModel::StartTime:
-    if (dataLeft.startTime().is_set() && dataRight.startTime().is_set())
-      return dataLeft.startTime().get() < dataRight.startTime().get();
-    if (dataRight.startTime().is_set())
+    if (dataLeft.startTime.has_value() && dataRight.startTime.has_value())
+      return dataLeft.startTime.get() < dataRight.startTime.get();
+    if (dataRight.startTime.has_value())
       return true;
-    if (dataLeft.startTime().is_set())
+    if (dataLeft.startTime.has_value())
       return false;
-    return dataLeft.id() < dataRight.id();
+    return dataLeft.id < dataRight.id;
   case OrderModel::Status:
   case OrderModel::Id:
   case OrderModel::Duration:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
index 0a30bb238..a1799cf5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
@@ -37,21 +37,21 @@ bool SafetyConfirmationWidget::init(const std::shared_ptr<Interface::Ftc> &ftc)
 bool SafetyConfirmationWidget::onOperatingConditionEntityChanged(const OperatingConditionEntity &data)
 {
   QStringList warningText;
-  if (data.loadingBoardWall())
+  if (data.loadingBoardWall)
     warningText.append(tr("Loading Board Wall open"));
-  if (data.temperatureWarning())
+  if (data.temperatureWarning)
     warningText.append(tr("Temperature Warning"));
-  if (data.errorEquipment())
+  if (data.errorEquipment)
     warningText.append(tr("Error Equipment"));
-  if (data.errorFireUnit())
+  if (data.errorFireUnit)
     warningText.append(tr("Fire Unit Error"));
-  if (data.errorGeneral())
+  if (data.errorGeneral)
     warningText.append(tr("General Error"));
-  if (data.errorPanel())
+  if (data.errorPanel)
     warningText.append(tr("Panel Error"));
-  if (data.errorSmoke())
+  if (data.errorSmoke)
     warningText.append(tr("Smoke Unit Error"));
-  if (data.emergencyStop())
+  if (data.emergencyStop)
     warningText.append(tr("Emergency Stop!"));
 
   if (warningText.size() > 0)
@@ -97,14 +97,14 @@ bool SafetyConfirmationWidget::onRevokeClicked()
   {
     EffectShowClient::SendSafetyRevokeRequest request;
 
-    request.revoke(true);
+    request.revoke = true;
     return m_ftc->sendSafetyRevokeRequest(request, this);
   });
 }
 
 void SafetyConfirmationWidget::onSafetyConfirmationDisplay()
 {
-  switch (m_currentState.underlying())
+  switch (m_currentState)
   {
   case EffectShowClient::SafetyConfirmation_e::SafetyConfirmed:
     m_ui->ltsLedWidget->setColor(QColor(0, 255, 0));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/CMakeLists.txt
index 47cc42dc4..667c11cc1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/CMakeLists.txt
@@ -5,6 +5,15 @@
 # Created by Mike Wille, SLSE, 2016-05-05
 #
 
+# Build this target as separate translation units (NOT a unity build). It links the
+# ddsftc INTERFACE target, which propagates generic_ftc.cpp /
+# generic_ftc_threading.cpp as INTERFACE sources (legacy design: consumers compile
+# the generic FTC implementation themselves, one TU per file, hidden visibility).
+# A unity build concatenates those .cpp's into this target's single TU, and LTO
+# (USE_IPO) then reports "multiple definition of Threading::..." from the same
+# object. Separate TUs restore the legacy per-file structure (behavior-neutral).
+set(CMAKE_UNITY_BUILD FALSE)
+
 SET(esm_combobox_gui_SRCS
   esm_combobox_foreign_gui_interface_impl.cpp
   esm_combobox_foreign_gui_interface_impl.h
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp
index fd78c8576..977fd247b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp
@@ -76,12 +76,12 @@ QString ForeignGuiComboboxInterfaceImpl::getAssignedAesField (const int particip
 
   for (const auto &explosionCluster : m_aesDtc->explosionClusters())
   {
-    if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
+    if (explosionCluster.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
       continue;
-    for ( const auto &esmParticipant : explosionCluster.esmParticipantIds())
+    for ( const auto &esmParticipant : explosionCluster.esmParticipantIds)
     {
       if ( esmParticipant == participantId)
-        result.append(tr(" | Assigned: %1").arg(QString::fromStdString(explosionCluster.name())));
+        result.append(tr(" | Assigned: %1").arg(QString::fromStdString(explosionCluster.name)));
     }
   }
 
@@ -95,7 +95,7 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
   QVector<int> participants;
   QMap<double, int> sortedParticipants;
   QMap<int,EffectShowManagement::EffectShowVehicleStatus> effectShowVehicleStatuss;
-  if (qFuzzyCompare(m_coord.lon(), 0) && qFuzzyCompare(m_coord.lat(), 0))
+  if (qFuzzyCompare(m_coord.lon, 0) && qFuzzyCompare(m_coord.lat, 0))
   {
     
                 
@@ -104,17 +104,17 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
   for (const auto &state : m_dtc->effectShowVehicleStatuss())
   {
     
-    participants.append(state.esmParticipantId());
-    effectShowVehicleStatuss.insert(state.esmParticipantId(), state);
+    participants.append(state.esmParticipantId);
+    effectShowVehicleStatuss.insert(state.esmParticipantId, state);
   }
-  sortedParticipants = m_ppmDtc->sortByDistance(m_coord.lon(), m_coord.lat(),  participants);
+  sortedParticipants = m_ppmDtc->sortByDistance(m_coord.lon, m_coord.lat,  participants);
   
   for ( auto it = sortedParticipants.cbegin(); it!= sortedParticipants.cend(); ++it)
   {
     ParticipantManagement::Participant participant = m_ppmDtc->participant(it.value());
     EffectShowManagement::EffectShowVehicleStatus effectShowVehicleStatus = effectShowVehicleStatuss.value(it.value());
-    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId());
-    bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e::Smoke;
+    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId);
+    bool isSmokeVehicle = effectShowVehicleStatus.feature == Feature_e::Smoke;
     
                 
                 
@@ -135,12 +135,12 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
       continue;
     }
     
-    QString newString = QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator())).arg(QString::fromStdString(participant.tacticalIdentifier())).arg(equipmentNumber);
+    QString newString = QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator)).arg(QString::fromStdString(participant.tacticalIdentifier)).arg(equipmentNumber);
     newString.append(QStringLiteral(" "));
     if (!m_isSmoke)
-      newString.append(tr("Mag: %1 | Avail: %2").arg(effectShowVehicleStatus.ammunitionMagazine()).arg(effectShowVehicleStatus.ammunitionAvailable()));
+      newString.append(tr("Mag: %1 | Avail: %2").arg(effectShowVehicleStatus.ammunitionMagazine).arg(effectShowVehicleStatus.ammunitionAvailable));
     else
-      newString.append(tr("Avail: %1").arg(effectShowVehicleStatus.ammunitionAvailable()));
+      newString.append(tr("Avail: %1").arg(effectShowVehicleStatus.ammunitionAvailable));
     newString.append(tr(" | Dist: %1[m]").arg(QString::number(int(it.key()))));
     newString.append(getAssignedAesField(it.value()));
     
@@ -157,14 +157,14 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS
 
   enum eFeature
   {
-    NotSpecified        = Feature_e::NotSpecified, 
-    Smoke               = Feature_e::Smoke,
-    Explosion24         = Feature_e::Explosion24,
-    Explosion48         = Feature_e::Explosion48,
+    NotSpecified        = static_cast<int>(Feature_e::NotSpecified), 
+    Smoke               = static_cast<int>(Feature_e::Smoke),
+    Explosion24         = static_cast<int>(Feature_e::Explosion24),
+    Explosion48         = static_cast<int>(Feature_e::Explosion48),
     SmokeAndExplosion48 = Explosion48 + 1
   };
 
-  int feature = static_cast<int>(vehicleStatus.feature().underlying());
+  int feature = static_cast<int>(vehicleStatus.feature);
 
   switch (featureFilter)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h
index a9a4ea489..ce3d734d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h
@@ -9,6 +9,7 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
   #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
   #include <AreaEffectSimulation/aes_dtc.h>
 #endif
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
index e711c42e1..66df4830f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
@@ -17,6 +17,7 @@ EffectShowActorList::EffectShowActorList(QWidget *parent)
   , m_effectShowModel(nullptr)
   , m_session(nullptr)
   , m_ui(new Ui::EffectShowActorList)
+  , m_logger(getLogger("EffectShowActorList"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
index f2af23fdd..799229e67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
@@ -23,6 +23,7 @@ EffectShowActorProxyModel::EffectShowActorProxyModel(EffectShowActorModel *sourc
   : LtsWidgets::LtsColumnFilterProxyModel(parent)
   , m_effectShowModel(effectShowModel)
   , m_sourceModel(sourceModel)
+  , m_logger(getLogger("EffectShowActorModel"))
 {
   this->setSourceModel(sourceModel);
 }
@@ -32,8 +33,8 @@ bool EffectShowActorProxyModel::filterAcceptsRow(int source_row, const QModelInd
   if (!m_sourceModel || source_parent.isValid() || source_row < 0 || source_row >= m_sourceModel->m_vecData.size())
     return LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
-  auto equipmentNumber = m_sourceModel->m_vecData.at(source_row).equipmentNumber();
-  if (!equipmentNumber.is_set())
+  auto equipmentNumber = m_sourceModel->m_vecData.at(source_row).equipmentNumber;
+  if (!equipmentNumber.has_value())
     return false;
   if (!m_effectShowModel->isVehicleStatus(equipmentNumber.get()))
     return false;
@@ -46,14 +47,14 @@ bool EffectShowActorProxyModel::filterAcceptsRow(int source_row, const QModelInd
   if (cdf.contains(EffectShowActorModel::Status))
   {
     int statusFilter = cdf.value(EffectShowActorModel::Status).toInt();
-    if ((statusFilter == EffectShowActorModel::eStatus::Operational    && !vehicleStatus.operational()) ||
-        (statusFilter == EffectShowActorModel::eStatus::NotOperational && vehicleStatus.operational()))
+    if ((statusFilter == EffectShowActorModel::eStatus::Operational    && !vehicleStatus.operational) ||
+        (statusFilter == EffectShowActorModel::eStatus::NotOperational && vehicleStatus.operational))
       return false;
   } 
 
   if (cdf.contains(EffectShowActorModel::Columns::Feature))
   {
-    int feature = static_cast<int>(vehicleStatus.feature().underlying());
+    int feature = static_cast<int>(vehicleStatus.feature);
     switch(cdf.value(EffectShowActorModel::Columns::Feature).toInt())
     {
     case static_cast<int>(EffectShowActorModel::eFeature::SmokeAndExplosion48):
@@ -152,7 +153,7 @@ bool EffectShowActorModel::initModel(LtsSession::LtsSession *session)
 
   auto cb = [this](const ParticipantManagement::Participant & part)
   {
-    ParticipantManagement::TypeClass typeClass = m_dtc->type(part.typeId()).typeClass();
+    ParticipantManagement::TypeClass typeClass = m_dtc->type(part.typeId).typeClass;
     if (typeClass != ParticipantManagement::TypeClass::SupportEntity)
       return;
     insertRow(part);
@@ -173,56 +174,56 @@ QVariant EffectShowActorModel::data(const QModelIndex &index, int role) const
 
   const ParticipantManagement::Participant &participant = m_vecData.at(index.row());
   EffectShowManagement::EffectShowVehicleStatus vehicleStatus;
-  bool isVehicleStatus = m_effectShowModel->getVehicleStatus(participant.equipmentNumber().get(), vehicleStatus);
+  bool isVehicleStatus = m_effectShowModel->getVehicleStatus(participant.equipmentNumber.get(), vehicleStatus);
   QString eqNumber = QStringLiteral("-");
 
   switch (index.column())
   {
   case Name:
-    if (participant.equipmentNumber().is_set())
-      eqNumber = QString::number(participant.equipmentNumber().get());
-    return QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator())).arg(QString::fromStdString(participant.tacticalIdentifier())).arg(eqNumber);
+    if (participant.equipmentNumber.has_value())
+      eqNumber = QString::number(participant.equipmentNumber.get());
+    return QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator)).arg(QString::fromStdString(participant.tacticalIdentifier)).arg(eqNumber);
   case Status:
   {
     if (!isVehicleStatus)
       return QVariant();
-    return vehicleStatus.operational() ? tr("Operational") : tr("Not Operational");
+    return vehicleStatus.operational ? tr("Operational") : tr("Not Operational");
   }
   case BITE:
   {
     if (!isVehicleStatus)
       return QVariant();
-    return vehicleStatus.magazineFail() ? tr("Error") : tr("Ok");
+    return vehicleStatus.magazineFail ? tr("Error") : tr("Ok");
   }
   case Position:
   {
-    auto it = m_ppmPositions.find(participant.id());
+    auto it = m_ppmPositions.find(participant.id);
     if (it == m_ppmPositions.end())
       return QVariant();
     Core::GeoPosition2D pos = it.value();
-    return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+    return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
   }
   case EffectShow:
-    return m_effectShowModel->getTimeAndPositionOfNextEffectShow(participant.id());
+    return m_effectShowModel->getTimeAndPositionOfNextEffectShow(participant.id);
   case Relocation:
-    return m_effectShowModel->getTimeAndPositionOfNextActorRelocation(participant.id());
+    return m_effectShowModel->getTimeAndPositionOfNextActorRelocation(participant.id);
   case RestMagazine:
   {
     if (!isVehicleStatus)
       return QVariant();
-    return vehicleStatus.ammunitionMagazine();
+    return vehicleStatus.ammunitionMagazine;
   }
   case RestAmmunition:
   {
     if (!isVehicleStatus)
       return QVariant();
-    return vehicleStatus.ammunitionAvailable();
+    return vehicleStatus.ammunitionAvailable;
   }
   case Feature:
   {
     if (!isVehicleStatus)
       return QVariant();
-    switch (vehicleStatus.feature().underlying())
+    switch (vehicleStatus.feature)
     {
     case EffectShowManagement::Feature_e::Smoke:
       return tr("Smoke");
@@ -233,7 +234,7 @@ QVariant EffectShowActorModel::data(const QModelIndex &index, int role) const
     case EffectShowManagement::Feature_e::NotSpecified:
       return tr("Not specified");
     }
-    return tr("Unknown (%1)").arg(vehicleStatus.feature().underlying());
+    return tr("Unknown (%1)").arg(static_cast<int>(vehicleStatus.feature));
   }
   }
   return QVariant();
@@ -277,7 +278,7 @@ QVariant EffectShowActorModel::headerData(int section, Qt::Orientation orientati
 bool EffectShowActorModel::isFiltered(const ParticipantManagement::Participant &data, DataModification modType) const
 {
   Q_UNUSED(modType);
-  ParticipantManagement::TypeClass typeClass = m_dtc->type(data.typeId()).typeClass();
+  ParticipantManagement::TypeClass typeClass = m_dtc->type(data.typeId).typeClass;
   bool filtered = (typeClass != ParticipantManagement::TypeClass::SupportEntity);
   return  filtered;
 }
@@ -288,13 +289,13 @@ void EffectShowActorModel::onParticipantPositionChanged(const ParticipantManagem
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_ppmPositions[data.participantId()] = data.pos();
+    m_ppmPositions[data.participantId] = data.pos;
     break;
   case DataModification::eRemoved:
-    m_ppmPositions.remove(data.participantId());
+    m_ppmPositions.remove(data.participantId);
     break;
   }
-  const QModelIndex idx = findIndexForId(data.participantId(), Position);
+  const QModelIndex idx = findIndexForId(data.participantId, Position);
   if (idx.isValid())
     emit dataChanged(idx, idx, {Qt::DisplayRole});
 }
@@ -307,7 +308,7 @@ QVector<ParticipantManagement::Participant>::const_iterator EffectShowActorModel
   auto it = m_vecData.begin();
   while (it != m_vecData.end())
   {
-    if (id == it->id())
+    if (id == it->id)
       return it;
     ++it;
   }
@@ -319,17 +320,17 @@ EffectShowManagement::Feature_e EffectShowActorModel::getFeature(int rowId) cons
 {
   const ParticipantManagement::Participant &participant = m_vecData.at(rowId);
   EffectShowManagement::EffectShowVehicleStatus vehicleStatus;
-  if (!m_effectShowModel->getVehicleStatus(participant.equipmentNumber().get(), vehicleStatus))
+  if (!m_effectShowModel->getVehicleStatus(participant.equipmentNumber.get(), vehicleStatus))
     return EffectShowManagement::Feature_e();
-  return vehicleStatus.feature();
+  return vehicleStatus.feature;
 }
 
 bool EffectShowActorModel::isOperational(int rowId) const
 {
   const ParticipantManagement::Participant &participant = m_vecData.at(rowId);
   EffectShowManagement::EffectShowVehicleStatus vehicleStatus;
-  if (m_effectShowModel->getVehicleStatus(participant.equipmentNumber().get(), vehicleStatus))
-    return vehicleStatus.operational();
+  if (m_effectShowModel->getVehicleStatus(participant.equipmentNumber.get(), vehicleStatus))
+    return vehicleStatus.operational;
   return false;
 }
 
@@ -337,7 +338,7 @@ bool EffectShowActorModel::isMatchedByFilter(const int &equipmentNumber, const i
 {
   EffectShowVehicleStatus vehicleStatus;
   m_effectShowModel->getVehicleStatus(equipmentNumber, vehicleStatus);
-  int feature = static_cast<int>(vehicleStatus.feature().underlying());
+  int feature = static_cast<int>(vehicleStatus.feature);
 
   switch (featureFilter)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h
index 7c404c895..f28233019 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h
@@ -8,6 +8,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace EffectShowManagement
 {
@@ -36,10 +37,10 @@ class EffectShowActorModel final : public LtsWidgets::LtsAbstractTableModel<Part
     enum Columns { Name, Status, BITE, Feature, Position, EffectShow, Relocation, RestMagazine, RestAmmunition };
 
     enum eFeature {
-        NotSpecified = Feature_e::NotSpecified,
-        Smoke = Feature_e::Smoke,
-        Explosion24 = Feature_e::Explosion24,
-        Explosion48 = Feature_e::Explosion48,
+        NotSpecified = static_cast<int>(Feature_e::NotSpecified),
+        Smoke = static_cast<int>(Feature_e::Smoke),
+        Explosion24 = static_cast<int>(Feature_e::Explosion24),
+        Explosion48 = static_cast<int>(Feature_e::Explosion48),
         SmokeAndExplosion48 = Explosion48 + 1
     };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp
index 3a0e8aedd..607c69e52 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp
@@ -24,6 +24,7 @@ EffectShowActorRelocationEdit::EffectShowActorRelocationEdit(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_dtc(nullptr), m_ftc(nullptr),
       m_ppmDtc(nullptr), m_sitMapGuiIfc(nullptr), m_model(nullptr), m_session(nullptr),
       m_ui(new Ui::EffectShowActorRelocationEdit), m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("EffectShowActorRelocationEdit"))
 {
     m_ui->setupUi(this);
 }
@@ -58,9 +59,9 @@ void EffectShowActorRelocationEdit::onEffectShowActorFilterChanged(const int& id
         auto iParticipant = m_model->getEffectShowActorModel()->getIt(it.key());
         if (iParticipant == m_model->getEffectShowActorModel()->getItEnd())
             continue;
-        if (!iParticipant->equipmentNumber().is_set())
+        if (!iParticipant->equipmentNumber.has_value())
             continue;
-        if (!m_model->getEffectShowActorModel()->isMatchedByFilter(iParticipant->equipmentNumber().get(), filter))
+        if (!m_model->getEffectShowActorModel()->isMatchedByFilter(iParticipant->equipmentNumber.get(), filter))
             continue;
 
         m_ui->cbEffectShowActor->addItem(it.value(), it.key());
@@ -73,7 +74,7 @@ void EffectShowActorRelocationEdit::onEffectShowVehicleStatusChanged(const Effec
                                                                      const DataModification& modType)
 {
     Q_UNUSED(modType);
-    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(data.esmParticipantId());
+    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(data.esmParticipantId);
     m_effectShowActors = m_model->getParticipantList();
     const int filter = m_ui->cbEffectShowActorFilter->currentData().toInt();
     if (m_model->getEffectShowActorModel()->isMatchedByFilter(equipmentNumber, filter))
@@ -144,13 +145,13 @@ bool EffectShowActorRelocationEdit::init(LtsSession::LtsSession* session, Effect
     if (rowToCopy >= 0)
     {
         const EffectShowActorRelocation& copy = m_model->getEffetShowActorRelocationModel()->getRowData(rowToCopy);
-        if (copy.id() > 0)
+        if (copy.id > 0)
         {
-            m_ui->cwCoordinate->setCoordinate(copy.position().lon(), copy.position().lat());
-            m_ui->cbEffectShowActor->setCurrentIndex(m_ui->cbEffectShowActor->findData(copy.esmParticipantId()));
-            m_ui->leInfo->setText(QString::fromStdString(copy.info()));
-            if (copy.arrival_time().is_set())
-                m_ui->dteTime->setMsecsSinceEpoch(copy.arrival_time().get());
+            m_ui->cwCoordinate->setCoordinate(copy.position.lon, copy.position.lat);
+            m_ui->cbEffectShowActor->setCurrentIndex(m_ui->cbEffectShowActor->findData(copy.esmParticipantId));
+            m_ui->leInfo->setText(QString::fromStdString(copy.info));
+            if (copy.arrival_time.has_value())
+                m_ui->dteTime->setMsecsSinceEpoch(copy.arrival_time.get());
             slotChangesMade();
         }
     }
@@ -163,12 +164,12 @@ bool EffectShowActorRelocationEdit::apply()
 
     return m_requestHelper->startSingleRequest([this]() {
         EffectShowActorRelocation data;
-        data.id(0);
+        data.id = 0;
 
-        data.esmParticipantId(m_ui->cbEffectShowActor->currentData().toInt());
-        data.position(Core::GeoPosition2D(m_ui->cwCoordinate->coordinate().x(), m_ui->cwCoordinate->coordinate().y()));
-        data.arrival_time().set(m_ui->dteTime->msecsSinceEpoch());
-        data.info(m_ui->leInfo->text().toStdString());
+        data.esmParticipantId = m_ui->cbEffectShowActor->currentData().toInt();
+        data.position = Core::GeoPosition2D(m_ui->cwCoordinate->coordinate().x(), m_ui->cwCoordinate->coordinate().y());
+        data.arrival_time.set(m_ui->dteTime->msecsSinceEpoch());
+        data.info = m_ui->leInfo->text().toStdString();
 
         return m_ftc->effectShowActorRelocationModifyRequest(data, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
index 55ba6fdd2..1ad9a3814 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
@@ -16,6 +16,7 @@ EffectShowActorRelocationList::EffectShowActorRelocationList(const QString& menu
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup),
       m_effectShowModel(nullptr), m_ftc(nullptr), m_session(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EffectShowActorRelocationList)
+  , m_logger(getLogger("EffectShowActorRelocationList"))
 {
     m_ui->setupUi(this);
     m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -101,7 +102,7 @@ void EffectShowActorRelocationList::onRemoveEffectShowActorRelocation()
         m_effectShowModel->getEffetShowActorRelocationModel()->getRowData(row);
 
     m_requestHelper->startSingleRequest([esar, this]() {
-        const Core::RemoveElementRequest req(esar.id());
+        const Core::RemoveElementRequest req(esar.id);
         return m_ftc->effectShowActorRelocationRemoveRequest(req, this);
     });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.h
index c89d9280b..2a76b1250 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.h
@@ -11,6 +11,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp
index 9dfe1ea5a..06354c396 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp
@@ -3,7 +3,7 @@
 
 #include "esm_effect_show_actor_relocation_model.h"
 #include "esm_effect_show_model.h"
-// esm_translation.h - external dependency, removed for build
+#include <EffectShowManagement/esm_translation.h>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngltools/ngltools_dtg.h>
@@ -24,6 +24,7 @@ EffectShowActorRelocationModel::EffectShowActorRelocationModel(EffectShowModel *
 parent)
 , m_dtc(nullptr)
 , m_effectShowModel(effectShowModel)
+  , m_logger(getLogger("EffectShowActorRelocationModel"))
 {}
 
 
@@ -50,24 +51,24 @@ QVariant EffectShowActorRelocationModel::data(const QModelIndex &index, int role
   {
   case Name:
   {
-    int id = esar.esmParticipantId();
+    int id = esar.esmParticipantId;
     return (id != -1) ? m_effectShowModel->getParticipantName(id) : QLatin1String("---");
   }
   case Id:
-    return esar.id();
+    return esar.id;
   case ArrivalTime:
-    return QDateTime::fromMSecsSinceEpoch(esar.arrival_time().get());
+    return QDateTime::fromMSecsSinceEpoch(esar.arrival_time.get());
   case Position:
   {
-    Core::GeoPosition2D pos = esar.position();
-    return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+    Core::GeoPosition2D pos = esar.position;
+    return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
   }
   case Info:
-    return QString::fromStdString(esar.info());
+    return QString::fromStdString(esar.info);
   case Status:
-    return EffectShowManagement::toString(esar.orderConfirmation());
+    return EffectShowManagement::toString(esar.orderConfirmation);
   case Answer:
-    return QString::fromStdString(esar.answerText());
+    return QString::fromStdString(esar.answerText);
   }
   return QVariant();
 }
@@ -103,13 +104,13 @@ bool EffectShowActorRelocationProxyModel::lessThan(const QModelIndex &source_lef
   switch (source_left.column())
   {
   case EffectShowActorRelocationModel::ArrivalTime:
-    if (dataLeft.arrival_time().is_set() && dataRight.arrival_time().is_set())
-      return dataLeft.arrival_time().get() < dataRight.arrival_time().get();
-    if (dataRight.arrival_time().is_set())
+    if (dataLeft.arrival_time.has_value() && dataRight.arrival_time.has_value())
+      return dataLeft.arrival_time.get() < dataRight.arrival_time.get();
+    if (dataRight.arrival_time.has_value())
       return true;
-    if (dataLeft.arrival_time().is_set())
+    if (dataLeft.arrival_time.has_value())
       return false;
-    return dataLeft.id() < dataRight.id();
+    return dataLeft.id < dataRight.id;
 
   default:
     break;
@@ -135,10 +136,10 @@ bool EffectShowActorRelocationProxyModel::checkFilter(int source_row) const
   const auto effectShowSource = m_sourceModel->getRowData(source_row);
 
   
-  if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut &&
-      effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::PositionReached &&
-      effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Abort &&
-      effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Nonacceptance)
+  if (effectShowSource.orderConfirmation != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut &&
+      effectShowSource.orderConfirmation != EffectShowManagement::OrderConfirmation_e::PositionReached &&
+      effectShowSource.orderConfirmation != EffectShowManagement::OrderConfirmation_e::Abort &&
+      effectShowSource.orderConfirmation != EffectShowManagement::OrderConfirmation_e::Nonacceptance)
     return true;
 
   return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp
index 417928f26..12a71d995 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp
@@ -20,6 +20,7 @@ namespace EffectShowManagement
 EffectShowEdit::EffectShowEdit(const EffectShow& effectShow, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ftc(nullptr), m_model(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_effectShow(effectShow), m_ui(new Ui::EffectShowEdit)
+  , m_logger(getLogger("EffectShowEdit"))
 {
     m_ui->setupUi(this);
 }
@@ -52,17 +53,17 @@ bool EffectShowEdit::init(LtsSession::LtsSession* session, EffectShowModel* mode
     m_model = model;
 
     AreaEffectSimulation::AesItem aesItem;
-    bool foundItem = m_aesDtc->aesItemFromId(m_effectShow.idAreaEffectSimulation(), aesItem);
+    bool foundItem = m_aesDtc->aesItemFromId(m_effectShow.idAreaEffectSimulation, aesItem);
     DEBUG_LOG(m_logger) << ", found :" << foundItem
-                        << ", idAreaEffectSimulation :" << m_effectShow.idAreaEffectSimulation()
-                        << ", aesItem.id() :" << aesItem.id()
-                        << ", esmParticipantId: " << m_effectShow.esmParticipantId();
+                        << ", idAreaEffectSimulation :" << m_effectShow.idAreaEffectSimulation
+                        << ", aesItem.id() :" << aesItem.id
+                        << ", esmParticipantId: " << m_effectShow.esmParticipantId;
 
     if (!foundItem)
         return false;
 
-    m_isSmoke = m_pdmDtc->isSmoke(aesItem.chargeStruct().chargeTypeId(), aesItem.chargeStruct().igniterTypeId(),
-                                  aesItem.chargeStruct().igniterFunctionId());
+    m_isSmoke = m_pdmDtc->isSmoke(aesItem.chargeStruct.chargeTypeId, aesItem.chargeStruct.igniterTypeId,
+                                  aesItem.chargeStruct.igniterFunctionId);
 
     if (!m_isSmoke)
     {
@@ -103,11 +104,11 @@ bool EffectShowEdit::apply()
 {
 
     return m_requestHelper->startSingleRequest([this]() {
-        m_effectShow.esmParticipantId(m_ui->cbEffectShowActor->currentData().toInt());
+        m_effectShow.esmParticipantId = m_ui->cbEffectShowActor->currentData().toInt();
         if (!m_isSmoke)
         {
-            m_effectShow.numOfVolley(m_ui->sbVolley->value());
-            m_effectShow.shotsPerVolley(m_ui->sbShotsInTotal->value());
+            m_effectShow.numOfVolley = m_ui->sbVolley->value();
+            m_effectShow.shotsPerVolley = m_ui->sbShotsInTotal->value();
         }
         return m_ftc->effectShowModifyRequest(m_effectShow, this);
     });
@@ -115,16 +116,16 @@ bool EffectShowEdit::apply()
 
 void EffectShowEdit::showEffectShow()
 {
-    m_ui->leName->setText(QString::fromStdString(m_effectShow.nameAreaEffectSimulation()));
+    m_ui->leName->setText(QString::fromStdString(m_effectShow.nameAreaEffectSimulation));
 
     EffectShowVehicleStatus vehicleStatus;
-    const int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(m_effectShow.esmParticipantId());
+    const int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(m_effectShow.esmParticipantId);
     m_model->getVehicleStatus(equipmentNumber, vehicleStatus);
-    const int feature = m_ui->cbEffectShowActorFilter->findData(vehicleStatus.feature().underlying());
+    const int feature = m_ui->cbEffectShowActorFilter->findData(static_cast<int>(vehicleStatus.feature));
     switch (feature)
     {
-        case EffectShowManagement::Feature_e::Explosion24:
-        case EffectShowManagement::Feature_e::NotSpecified:
+        case static_cast<int>(EffectShowManagement::Feature_e::Explosion24):
+        case static_cast<int>(EffectShowManagement::Feature_e::NotSpecified):
             m_ui->cbEffectShowActorFilter->setCurrentIndex(feature);
             break;
         default:
@@ -132,8 +133,8 @@ void EffectShowEdit::showEffectShow()
             break;
     }
 
-    if (m_effectShow.esmParticipantId() > 0)
-        m_ui->cbEffectShowActor->setCurrentIndex(m_ui->cbEffectShowActor->findData(m_effectShow.esmParticipantId()));
+    if (m_effectShow.esmParticipantId > 0)
+        m_ui->cbEffectShowActor->setCurrentIndex(m_ui->cbEffectShowActor->findData(m_effectShow.esmParticipantId));
 
     if (m_isSmoke)
     {
@@ -146,11 +147,11 @@ void EffectShowEdit::showEffectShow()
     {
         m_ui->lblVolley->setText(tr("Volley:"));
         m_ui->lblShots->setText(tr("Shots in Total:"));
-        m_ui->sbVolley->setValue(m_effectShow.numOfVolley());
-        m_ui->sbShotsInTotal->setValue(m_effectShow.shotsPerVolley());
+        m_ui->sbVolley->setValue(m_effectShow.numOfVolley);
+        m_ui->sbShotsInTotal->setValue(m_effectShow.shotsPerVolley);
     }
-    m_ui->dteFire->setMsecsSinceEpoch(m_effectShow.startTime().is_set() ? m_effectShow.startTime().get() : 0);
-    m_ui->leRemainingAmmunition->setText(m_model->getParticipantAmmunition(m_effectShow.esmParticipantId()));
+    m_ui->dteFire->setMsecsSinceEpoch(m_effectShow.startTime.has_value() ? m_effectShow.startTime.get() : 0);
+    m_ui->leRemainingAmmunition->setText(m_model->getParticipantAmmunition(m_effectShow.esmParticipantId));
 
     connect(m_ui->cbEffectShowActor, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
             [this]() {
@@ -177,7 +178,7 @@ void EffectShowEdit::onEffectShowActorFilterChanged(const int& idx)
 {
     Q_UNUSED(idx);
 
-    const Core::GeoPosition coordGeo(m_effectShow.position().lon(), m_effectShow.position().lat(), 0);
+    const Core::GeoPosition coordGeo(m_effectShow.position.lon, m_effectShow.position.lat, 0);
     updateActorComboBox(coordGeo);
 }
 
@@ -185,7 +186,7 @@ void EffectShowEdit::onEffectShowVehicleStatusChanged(const EffectShowVehicleSta
                                                       const DataModification& modType)
 {
     Q_UNUSED(modType);
-    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(data.esmParticipantId());
+    int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(data.esmParticipantId);
     const int filter = m_ui->cbEffectShowActorFilter->currentData().toInt();
     if (m_model->getEffectShowActorModel()->isMatchedByFilter(equipmentNumber, filter))
         onEffectShowActorFilterChanged(-1);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
index 8a9dfb37e..4b214de76 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
@@ -12,6 +12,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <EffectShowManagement/esm_gui_combobox_plugin_interface.h>
 #include <ProjectDataManagement/pdm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_gui_plugin.h
index bcae945c4..454d3dcfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_gui_plugin.h
@@ -5,6 +5,7 @@
 
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <EffectShowManagement/esm_data_plugin_interface.h>
 #include <EffectShowManagement/esm_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
index 03ac7c7e4..e88ab483a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
@@ -20,6 +20,7 @@ EffectShowList::EffectShowList(const QString& menuGroup, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup), m_model(nullptr),
       m_ftc(nullptr), m_session(nullptr), m_ui(new Ui::EffectShowList),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("EffectShowList"))
 {
     m_ui->setupUi(this);
     m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -84,8 +85,8 @@ void EffectShowList::onSelectionChanged()
     {
         int row = m_ui->widget->currentIndex().row();
         EffectShowManagement::EffectShow effectShow = m_model->getRowData(row);
-        enaEdit = effectShow.orderConfirmation() != OrderConfirmation_e::OrderCarriedOut &&
-                  effectShow.orderConfirmation() != OrderConfirmation_e::Execution;
+        enaEdit = effectShow.orderConfirmation != OrderConfirmation_e::OrderCarriedOut &&
+                  effectShow.orderConfirmation != OrderConfirmation_e::Execution;
     }
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, enaEdit);
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, rowCount);
@@ -102,11 +103,11 @@ void EffectShowList::onEditEffectShow()
     EffectShowManagement::EffectShow effectShow = m_model->getRowData(row);
 
     DEBUG_LOG(m_logger) << "--- onEffectShow() "
-                        << " id: " << effectShow.id() << " position: " << effectShow.position();
+                        << " id: " << effectShow.id << " position: " << effectShow.position;
 
     EffectShowEdit* dialog = new EffectShowEdit(effectShow, this);
     dialog->init(m_session, m_model);
-    addDialog(dialog, m_menuGroup, QLatin1String("esmEffectShow") + QString::number(effectShow.id()),
+    addDialog(dialog, m_menuGroup, QLatin1String("esmEffectShow") + QString::number(effectShow.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -121,7 +122,7 @@ void EffectShowList::onRemoveEffectShow()
     EffectShowManagement::EffectShow es = m_model->getRowData(row);
 
     m_requestHelper->startSingleRequest([es, this]() {
-        const Core::RemoveElementRequest req(es.id());
+        const Core::RemoveElementRequest req(es.id);
         return m_ftc->effectShowRemoveRequest(req, this);
     });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp
index b78727f41..da530e8d7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp
@@ -8,7 +8,7 @@
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_translation.h>
 #include <EffectShowManagement/esm_data_plugin_interface.h>
-// esm_translation.h - external dependency, removed for build
+#include <EffectShowManagement/esm_translation.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsSession/lts_session.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -24,6 +24,7 @@ EffectShowModel::EffectShowModel(QObject* parent)
           parent),
       m_dtc(nullptr), m_effectShowActorProxyModel(nullptr), m_effectShowActorModel(nullptr),
       m_effectShowActorRelocationModel(nullptr)
+  , m_logger(getLogger("EffectShowModel"))
 {
 }
 
@@ -72,50 +73,50 @@ QVariant EffectShowModel::data(const QModelIndex& index, int role) const
 
     const EffectShowManagement::EffectShow& effectShow = m_vecData.at(index.row());
     AreaEffectSimulation::AesItem aesItem;
-    m_dtcAes->aesItemFromId(effectShow.idAreaEffectSimulation(), aesItem);
+    m_dtcAes->aesItemFromId(effectShow.idAreaEffectSimulation, aesItem);
 
     switch (index.column())
     {
         case Id:
-            return effectShow.id();
+            return effectShow.id;
         case Name_AES:
-            return QString::fromStdString(effectShow.nameAreaEffectSimulation());
+            return QString::fromStdString(effectShow.nameAreaEffectSimulation);
         case Duration:
-            return LtsWidgets::readableDuration(effectShow.duration());
+            return LtsWidgets::readableDuration(effectShow.duration);
             ;
         case StartTime:
-            return effectShow.startTime().is_set() ? DTG::toStringMSec(effectShow.startTime().get())
+            return effectShow.startTime.has_value() ? DTG::toStringMSec(effectShow.startTime.get())
                                                    : QStringLiteral("---");
         case Position: {
-            const Core::GeoPosition2D& pos = effectShow.position();
-            return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+            const Core::GeoPosition2D& pos = effectShow.position;
+            return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
         }
         case EffectShowActor: {
-            int id = effectShow.esmParticipantId();
+            int id = effectShow.esmParticipantId;
             return (id > 0) ? getParticipantName(id) : QStringLiteral("---");
         }
         case Volley: {
-            if (effectShow.typeOfAmmunition() == 5)
+            if (effectShow.typeOfAmmunition == 5)
                 return QStringLiteral("--");
             else
-                return effectShow.numOfVolley();
+                return effectShow.numOfVolley;
         }
         case ShotsInTotal: {
-            if (effectShow.typeOfAmmunition() == 5)
+            if (effectShow.typeOfAmmunition == 5)
                 return QStringLiteral("--");
             else
-                return effectShow.shotsPerVolley();
+                return effectShow.shotsPerVolley;
         }
         case Size:
-            return tr("%1 x %2").arg(QString::number(effectShow.areaWidth()), QString::number(effectShow.areaDepth()));
+            return tr("%1 x %2").arg(QString::number(effectShow.areaWidth), QString::number(effectShow.areaDepth));
         case Rotation:
-            return effectShow.areaRotation();
+            return effectShow.areaRotation;
         case Status:
-            return EffectShowManagement::toString(effectShow.orderConfirmation());
+            return EffectShowManagement::toString(effectShow.orderConfirmation);
         case Answer:
-            return QString::fromStdString(effectShow.answerText());
+            return QString::fromStdString(effectShow.answerText);
         case AesStatus:
-            return AreaEffectSimulation::toString(aesItem.effectStateId());
+            return AreaEffectSimulation::toString(aesItem.effectStateId);
     }
     return QVariant();
 }
@@ -129,8 +130,8 @@ QMap<int, QString> EffectShowModel::getParticipantList() const
     {
         const ParticipantManagement::Participant part = m_effectShowActorModel->getRowData(
             m_effectShowActorProxyModel->mapToSource(m_effectShowActorProxyModel->index(i, 0)).row());
-        if (hasVehicleReportedOperationalToday(part.equipmentNumber().get()))
-            ret.insert(part.id(), getParticipantName(part.id()));
+        if (hasVehicleReportedOperationalToday(part.equipmentNumber.get()))
+            ret.insert(part.id, getParticipantName(part.id));
     }
     return ret;
 }
@@ -145,14 +146,14 @@ QMap<int, QString> EffectShowModel::getParticipantList(bool is_smoke) const
         int realRow = m_effectShowActorProxyModel->mapToSource(m_effectShowActorProxyModel->index(i, 0)).row();
         const ParticipantManagement::Participant part = m_effectShowActorModel->getRowData(realRow);
 
-        if (!hasVehicleReportedOperationalToday(part.equipmentNumber().get()))
+        if (!hasVehicleReportedOperationalToday(part.equipmentNumber.get()))
             continue;
 
         EffectShowManagement::Feature_e feature = m_effectShowActorModel->getFeature(realRow);
         if (feature != EffectShowManagement::Feature_e::NotSpecified &&
             ((feature == EffectShowManagement::Feature_e::Smoke && is_smoke) ||
              (feature != EffectShowManagement::Feature_e::Smoke && !is_smoke)))
-            ret.insert(part.id(), getParticipantName(part.id()));
+            ret.insert(part.id, getParticipantName(part.id));
     }
     return ret;
 }
@@ -180,8 +181,8 @@ QVector<QPair<int, QString>> EffectShowModel::getParticipantListByDistance(bool
         const ParticipantManagement::ParticipantPosition& pos = m_dtcPpm->participantPosition(partId);
 
         LtsCoordTrans::UtmCoordinate pPos =
-            LtsCoordTrans::UtmCoordinate::fromGeographic(pos.pos().lon(), pos.pos().lat());
-        LtsCoordTrans::UtmCoordinate pOrigin = LtsCoordTrans::UtmCoordinate::fromGeographic(origin.lon(), origin.lat());
+            LtsCoordTrans::UtmCoordinate::fromGeographic(pos.pos.lon, pos.pos.lat);
+        LtsCoordTrans::UtmCoordinate pOrigin = LtsCoordTrans::UtmCoordinate::fromGeographic(origin.lon, origin.lat);
 
         double distance = LtsCoordTrans::distance(pPos, pOrigin);
 
@@ -190,18 +191,18 @@ QVector<QPair<int, QString>> EffectShowModel::getParticipantListByDistance(bool
         QString currentAssigendEffectShows;
         for (const auto& dat : m_vecData)
         {
-            if (dat.esmParticipantId() == partId)
+            if (dat.esmParticipantId == partId)
             {
                 if (!currentAssigendEffectShows.isEmpty())
                     currentAssigendEffectShows.append(QStringLiteral(", "));
-                currentAssigendEffectShows.append(QString::fromStdString(dat.nameAreaEffectSimulation()));
+                currentAssigendEffectShows.append(QString::fromStdString(dat.nameAreaEffectSimulation));
             }
         }
 
         QString newString = participantList.value(partId);
         newString.append(QStringLiteral(" "));
         newString.append(
-            tr("Mag: %1 | Avail: %2").arg(vehicleStatus.ammunitionMagazine()).arg(vehicleStatus.ammunitionAvailable()));
+            tr("Mag: %1 | Avail: %2").arg(vehicleStatus.ammunitionMagazine).arg(vehicleStatus.ammunitionAvailable));
         newString.append(tr(" | Dist: %1[m]").arg(QString::number(int(distance))));
         if (!currentAssigendEffectShows.isEmpty())
             newString.append(tr(" | Assigned: %1").arg(currentAssigendEffectShows));
@@ -225,11 +226,11 @@ QString EffectShowModel::getParticipantName(int id) const
     if (it == m_effectShowActorModel->getItEnd())
         return QString();
     QString eqNumber = QStringLiteral("-");
-    if (it->equipmentNumber().is_set())
-        eqNumber = QString::number(it->equipmentNumber().get());
+    if (it->equipmentNumber.has_value())
+        eqNumber = QString::number(it->equipmentNumber.get());
     return QStringLiteral("%1 - %2 (%3)")
-        .arg(QString::fromStdString(it->designator()))
-        .arg(QString::fromStdString(it->tacticalIdentifier()))
+        .arg(QString::fromStdString(it->designator))
+        .arg(QString::fromStdString(it->tacticalIdentifier))
         .arg(eqNumber);
 }
 
@@ -240,12 +241,12 @@ QString EffectShowModel::getParticipantAmmunition(int id) const
         return QString();
 
     EffectShowManagement::EffectShowVehicleStatus vehicleStatus;
-    if (!getVehicleStatus(it->equipmentNumber().get(), vehicleStatus))
+    if (!getVehicleStatus(it->equipmentNumber.get(), vehicleStatus))
         return QString();
 
-    QString res = QString::number(vehicleStatus.ammunitionMagazine());
+    QString res = QString::number(vehicleStatus.ammunitionMagazine);
     res.append(QLatin1String(" / "));
-    res.append(QString::number(vehicleStatus.ammunitionAvailable()));
+    res.append(QString::number(vehicleStatus.ammunitionAvailable));
     return res;
 }
 
@@ -271,29 +272,29 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
     EffectShowVehicleStatus vehicleStatus;
     getVehicleStatus(equipmentNum, vehicleStatus);
 
-    if (vehicleStatus.operational())
+    if (vehicleStatus.operational)
     {
-        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
-                            << vehicleStatus.esmParticipantId() << " is operational.";
+        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor << " with participantId "
+                            << vehicleStatus.esmParticipantId << " is operational.";
         return true;
     }
 
     if (!m_effectShowVehicleLastTimeOperational.contains(equipmentNum))
     {
-        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
-                            << vehicleStatus.esmParticipantId() << " has not reported operational at any time.";
+        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor << " with participantId "
+                            << vehicleStatus.esmParticipantId << " has not reported operational at any time.";
         return false;
     }
 
     bool bRet =
         QDateTime().addMSecs(m_effectShowVehicleLastTimeOperational[equipmentNum]).date() == QDate::currentDate();
     if (bRet)
-        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
-                            << vehicleStatus.esmParticipantId()
+        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor << " with participantId "
+                            << vehicleStatus.esmParticipantId
                             << " is not operational, but has reported operational today.";
     else
-        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
-                            << vehicleStatus.esmParticipantId()
+        DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor << " with participantId "
+                            << vehicleStatus.esmParticipantId
                             << " is not operational and has not reported operational today.";
     return bRet;
 }
@@ -309,20 +310,20 @@ QString EffectShowModel::getTimeAndPositionOfNextEffectShow(int idParticipant) c
     Core::GeoPosition2D position;
     while (it != m_vecData.end())
     {
-        if (it->orderConfirmation() != OrderConfirmation_e::OrderCarriedOut && it->esmParticipantId() == idParticipant)
+        if (it->orderConfirmation != OrderConfirmation_e::OrderCarriedOut && it->esmParticipantId == idParticipant)
         {
             ++numOrder;
-            qint64 start = it->startTime().is_set() ? it->startTime().get() : 0;
+            qint64 start = it->startTime.has_value() ? it->startTime.get() : 0;
 
             if (effectStart == 0)
             {
                 effectStart = start;
-                position = it->position();
+                position = it->position;
             }
             else if (start < effectStart)
             {
                 effectStart = start;
-                position = it->position();
+                position = it->position;
             }
         }
         ++it;
@@ -334,7 +335,7 @@ QString EffectShowModel::getTimeAndPositionOfNextEffectShow(int idParticipant) c
     res = (effectStart != 0) ? DTG::toStringMSec(effectStart) : tr("---");
 
     res += QLatin1String(", ");
-    res += LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    res += LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
 
     return res;
 }
@@ -351,15 +352,15 @@ QString EffectShowModel::getTimeAndPositionOfNextActorRelocation(int idParticipa
 
     while (it != m_effectShowActorRelocationModel->getItEnd())
     {
-        if (it->orderConfirmation() != OrderConfirmation_e::OrderCarriedOut &&
-            it->orderConfirmation() != OrderConfirmation_e::PositionReached &&
-            it->orderConfirmation() != OrderConfirmation_e::Abort &&
-            it->orderConfirmation() != OrderConfirmation_e::Nonacceptance && it->esmParticipantId() == idParticipant)
+        if (it->orderConfirmation != OrderConfirmation_e::OrderCarriedOut &&
+            it->orderConfirmation != OrderConfirmation_e::PositionReached &&
+            it->orderConfirmation != OrderConfirmation_e::Abort &&
+            it->orderConfirmation != OrderConfirmation_e::Nonacceptance && it->esmParticipantId == idParticipant)
         {
-            if (it->arrival_time().get() < arrivalTime)
+            if (it->arrival_time.get() < arrivalTime)
             {
-                arrivalTime = it->arrival_time().get();
-                position = it->position();
+                arrivalTime = it->arrival_time.get();
+                position = it->position;
                 found = true;
             }
         }
@@ -373,7 +374,7 @@ QString EffectShowModel::getTimeAndPositionOfNextActorRelocation(int idParticipa
     res = (arrivalTime != 0) ? DTG::toStringMSec(arrivalTime) : tr("---");
 
     res += QLatin1String(", ");
-    res += LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    res += LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
 
     return res;
 }
@@ -388,7 +389,7 @@ void EffectShowModel::updateAll()
 bool EffectShowModel::onEffectShowVehicleStatusChanged(const EffectShowManagement::EffectShowVehicleStatus& data,
                                                        DataModification modType)
 {
-    int equipmentNumber = m_dtcPpm->equipmentNumberByParticipantId(data.esmParticipantId());
+    int equipmentNumber = m_dtcPpm->equipmentNumberByParticipantId(data.esmParticipantId);
 
     switch (modType)
     {
@@ -396,8 +397,8 @@ bool EffectShowModel::onEffectShowVehicleStatusChanged(const EffectShowManagemen
         case DataModification::eModified:
             if (m_effectShowVehicleStatus.contains(equipmentNumber))
             {
-                if (m_effectShowVehicleStatus[equipmentNumber].operational() && !data.operational())
-                    m_effectShowVehicleLastTimeOperational[equipmentNumber] = data.sampleTime();
+                if (m_effectShowVehicleStatus[equipmentNumber].operational && !data.operational)
+                    m_effectShowVehicleLastTimeOperational[equipmentNumber] = data.sampleTime;
             }
             else
                 m_effectShowVehicleLastTimeOperational[equipmentNumber] = 0;
@@ -441,13 +442,13 @@ bool EffectShowProxyModel::lessThan(const QModelIndex& source_left, const QModel
     switch (source_left.column())
     {
         case EffectShowModel::StartTime:
-            if (dataLeft.startTime().is_set() && dataRight.startTime().is_set())
-                return dataLeft.startTime().get() < dataRight.startTime().get();
-            if (dataRight.startTime().is_set())
+            if (dataLeft.startTime.has_value() && dataRight.startTime.has_value())
+                return dataLeft.startTime.get() < dataRight.startTime.get();
+            if (dataRight.startTime.has_value())
                 return true;
-            if (dataLeft.startTime().is_set())
+            if (dataLeft.startTime.has_value())
                 return false;
-            return dataLeft.id() < dataRight.id();
+            return dataLeft.id < dataRight.id;
 
         case EffectShowModel::Name_AES:
         case EffectShowModel::Id:
@@ -479,7 +480,7 @@ bool EffectShowProxyModel::checkFilter(int source_row) const
 
     const auto effectShowSource = m_sourceModel->getRowData(source_row);
 
-    if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
+    if (effectShowSource.orderConfirmation != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
         return true;
 
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.h
index d38692a62..0996bb09b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.h
@@ -8,6 +8,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h
index 8764940ad..1015f559f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h
@@ -9,6 +9,7 @@
 #include <EffectShowManagement/esm_ftc.h>
 #endif
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_gui_combobox_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_gui_combobox_plugin_interface.h
index d25178769..03de215b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_gui_combobox_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_gui_combobox_plugin_interface.h
@@ -2,6 +2,7 @@
 
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
 
 #pragma once
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
index 334ddac01..1feff039f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_topic_editor_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Evaluations/evl_translation.h>
 #include <QtCore/QDateTime>
@@ -11,9 +12,9 @@ namespace Evaluations
 {
 
 TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject* parent)
-    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
-                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
-                                                                  tr("Situation"), tr("Video"), tr("Audio")})
+    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), {tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
+                                                         tr("Situation"), tr("Video"), tr("Audio")})
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -57,15 +58,15 @@ QVariant TopicEditorEvaluationModel::data(const QModelIndex& index, int role) co
             switch (index.column())
             {
                 case NAME:
-                    return QString::fromStdString(crt.name());
+                    return QString::fromStdString(crt.name);
                 case ID:
-                    return crt.id();
+                    return crt.id;
                 default:
                     break;
             }
         }
         else if (role == Qt::UserRole)
-            return crt.id();
+            return crt.id;
     }
     else if (item->data().canConvert<Evaluations::EvaluationElement>())
     {
@@ -77,23 +78,23 @@ QVariant TopicEditorEvaluationModel::data(const QModelIndex& index, int role) co
             switch (index.column())
             {
                 case ID:
-                    return elem.id();
+                    return elem.id;
                 case NAME:
-                    return QString::fromStdString(elem.note());
+                    return QString::fromStdString(elem.note);
                 case WEIGHT:
-                    return elem.rating();
+                    return elem.rating;
                 case SITUATION:
-                    return elem.situation() ? tr("Yes") : tr("No");
+                    return elem.situation ? tr("Yes") : tr("No");
                 case AUDIO:
-                    return elem.audio() ? tr("Yes") : tr("No");
+                    return elem.audio ? tr("Yes") : tr("No");
                 case VIDEO:
-                    return elem.video() ? tr("Yes") : tr("No");
+                    return elem.video ? tr("Yes") : tr("No");
                 case START_TIME:
-                    return QDateTime::fromMSecsSinceEpoch(elem.timestamp());
+                    return QDateTime::fromMSecsSinceEpoch(elem.timestamp);
             }
         }
         else if (role == Qt::UserRole)
-            return elem.id();
+            return elem.id;
     }
     return QVariant();
 }
@@ -132,7 +133,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
         int parentId = 0;
         EvaluationCriterium crit = iter.value();
 
-        if (crit.operatorId() != operatorId)
+        if (crit.operatorId != operatorId)
             continue;
 
         if (!parentItemIndexCache.contains(parentId))
@@ -157,7 +158,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
              iter2 != elemMap.constEnd(); ++iter2)
         {
             Evaluations::EvaluationElement elem = iter2.value();
-            if (elem.criteriumId() != criteriumId)
+            if (elem.criteriumId != criteriumId)
                 continue;
 
             parentId = criteriumId + 10000;
@@ -175,7 +176,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
                 QVariant data;
                 data.setValue(elem);
                 onInsertRow(rowPos, pIndex, data);
-                int elementId = elem.id();
+                int elementId = elem.id;
                 parentItemIndexCache.insert(elementId, index(rowPos, 0, pIndex));
                 DEBUG_LOG(m_logger) << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId
                                     << ")";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
index 0e5fe9b61..7391c4f7c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
@@ -1,6 +1,7 @@
 
 
 #include "topic_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_topic_editor.h"
 
@@ -19,6 +20,7 @@ namespace Evaluations
 
 EvaluationTopicEditor::EvaluationTopicEditor(LtsSession::LtsSession* session, QWidget* parent)
     : TopicEditorBase::TopicEditor(parent), m_session(session), m_ui(new Ui::EvaluationTopicEditor)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     init(m_ui->widget);
@@ -81,12 +83,12 @@ void EvaluationTopicEditor::updateInternalData()
     m_ui->cbxOperator->setCurrentIndex(m_ui->cbxOperator->findData(m_operatorId));
     m_model->initModel(m_evlDtc, m_operatorId);
 
-    m_evlElement.id(getTopicDataValue(QStringLiteral("elementId")).toDouble());
-    DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
-    m_evlElement.timestamp(getTopicDataValue(QStringLiteral("start")).toDouble());
-    m_evlElement.situation(getTopicDataValue(QStringLiteral("situation")).toBool());
-    m_evlElement.audio(getTopicDataValue(QStringLiteral("audio")).toBool());
-    m_evlElement.video(getTopicDataValue(QStringLiteral("video")).toBool());
+    m_evlElement.id = getTopicDataValue(QStringLiteral("elementId")).toDouble();
+    DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id;
+    m_evlElement.timestamp = getTopicDataValue(QStringLiteral("start")).toDouble();
+    m_evlElement.situation = getTopicDataValue(QStringLiteral("situation")).toBool();
+    m_evlElement.audio = getTopicDataValue(QStringLiteral("audio")).toBool();
+    m_evlElement.video = getTopicDataValue(QStringLiteral("video")).toBool();
 
     selectElement();
 }
@@ -100,8 +102,8 @@ void EvaluationTopicEditor::selectElement()
 {
     QModelIndex idx;
     QItemSelectionModel* selectionModel = m_ui->trvEvaluations->selectionModel();
-    if (m_evlElement.id() > 0)
-        idx = m_model->getIndex(m_evlElement.id());
+    if (m_evlElement.id > 0)
+        idx = m_model->getIndex(m_evlElement.id);
     if (idx.isValid())
         selectionModel->setCurrentIndex(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
     else
@@ -123,7 +125,7 @@ void EvaluationTopicEditor::initOperatorComboBox()
 
         auto it =
             std::find_if(evaluationCriteria.constBegin(), evaluationCriteria.constEnd(),
-                         [this, operatorId](const EvaluationCriterium& ec) { return ec.operatorId() == operatorId; });
+                         [this, operatorId](const EvaluationCriterium& ec) { return ec.operatorId == operatorId; });
         if (it == evaluationCriteria.constEnd())
             m_ui->cbxOperator->removeItem(index);
     }
@@ -133,27 +135,27 @@ void EvaluationTopicEditor::initOperatorComboBox()
 bool EvaluationTopicEditor::apply2()
 {
     setTopicDataProperty(QStringLiteral("operatorId"), m_operatorId);
-    setTopicDataProperty(QStringLiteral("elementId"), m_evlElement.id());
-    setTopicDataProperty(QStringLiteral("start"), m_evlElement.timestamp());
-    setTopicDataProperty(QStringLiteral("situation"), m_evlElement.situation());
-    setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio());
-    setTopicDataProperty(QStringLiteral("video"), m_evlElement.video());
+    setTopicDataProperty(QStringLiteral("elementId"), m_evlElement.id);
+    setTopicDataProperty(QStringLiteral("start"), static_cast<qint64>(m_evlElement.timestamp));
+    setTopicDataProperty(QStringLiteral("situation"), m_evlElement.situation);
+    setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio);
+    setTopicDataProperty(QStringLiteral("video"), m_evlElement.video);
 
-    DEBUG_LOG(m_logger) << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id();
-    DEBUG_LOG(m_logger) << "timestamp: " << m_evlElement.timestamp();
+    DEBUG_LOG(m_logger) << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id;
+    DEBUG_LOG(m_logger) << "timestamp: " << m_evlElement.timestamp;
 
-    if (m_evlElement.situation())
+    if (m_evlElement.situation)
     {
         TopicEditorBase::TopicData data;
         data.topicType = TopicEditorBase::TopicType::Situation;
-        setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
+        setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
         setTopicDataProperty(QStringLiteral("speed"), 1.0);
 
-        if (m_evlElement.situationContent())
+        if (m_evlElement.situationContent)
         {
             QJsonParseError error;
             QJsonDocument doc(QJsonDocument::fromJson(
-                QString::fromStdString(m_evlElement.situationContent().get()).toUtf8(), &error));
+                QString::fromStdString(m_evlElement.situationContent.get()).toUtf8(), &error));
 
             if (error.error == QJsonParseError::NoError)
             {
@@ -166,7 +168,7 @@ bool EvaluationTopicEditor::apply2()
                                                     tr("The selected marker has invalid filter and/or map settings."));
         }
 
-        data.duration = m_evlElement.duration();
+        data.duration = m_evlElement.duration;
         data.properties = m_topicData.properties;
 
         DEBUG_LOG(m_logger) << "topicData - properties: "
@@ -175,26 +177,26 @@ bool EvaluationTopicEditor::apply2()
         emit topicEditorRequested(data);
     }
 
-    if (m_evlElement.audio())
+    if (m_evlElement.audio)
     {
         TopicEditorBase::TopicData data;
         data.topicType = TopicEditorBase::TopicType::Audio;
-        setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
-        LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.audioContent().get());
+        setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
+        LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.audioContent.get());
         setTopicDataProperty(QStringLiteral("stream"), jsonObj.value<QString>("actualStream"));
-        data.duration = m_evlElement.duration();
+        data.duration = m_evlElement.duration;
         data.properties = m_topicData.properties;
         emit topicEditorRequested(data);
     }
 
-    if (m_evlElement.video())
+    if (m_evlElement.video)
     {
-        LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.videoContent().get());
+        LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(m_evlElement.videoContent.get());
         TopicEditorBase::TopicData data;
         data.topicType = TopicEditorBase::TopicType::Video;
-        setTopicDataProperty(QStringLiteral("end"), m_evlElement.timestamp() + m_evlElement.duration() * 1000);
+        setTopicDataProperty(QStringLiteral("end"), static_cast<qint64>(m_evlElement.timestamp + m_evlElement.duration * 1000));
         setTopicDataProperty(QStringLiteral("stream"), jsonObj.value<QString>("actualStream"));
-        data.duration = m_evlElement.duration();
+        data.duration = m_evlElement.duration;
         data.properties = m_topicData.properties;
         emit topicEditorRequested(data);
     }
@@ -220,9 +222,9 @@ void EvaluationTopicEditor::onSelectionChanged(const QItemSelection& selected, c
 
     QModelIndex index = m_ui->trvEvaluations->currentIndex();
     m_evlElement = m_model->getEvaluationElement(index);
-    DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
+    DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id;
 
-    m_topicData.description = QString::number(m_evlElement.id());
+    m_topicData.description = QString::number(m_evlElement.id);
     slotChangesMade();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
index a09b4c6c6..89481b794 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "evl_edit_dialog.h"
 #include "evl_element_dialog.h"
@@ -20,6 +21,7 @@ CriteriumDialog::CriteriumDialog(const QString& menuGroup, LtsSession::LtsSessio
       m_proxyModel(new CriteriumFilterModel(this)), m_session(session), m_ui(new Ui::CriteriumDialog),
       m_menuGroup(menuGroup), m_ownEvaluationElements(ownEvlElements),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "CriteriumDialog ctor";
     m_ui->setupUi(this);
@@ -51,7 +53,7 @@ void CriteriumDialog::enaDisa()
     int selected = m_ui->widget->selectedRows().size();
 
     const QModelIndex srcIdx = m_ui->widget->currentIndex();
-    int operatorId = m_model->getRowData(srcIdx.row()).operatorId();
+    int operatorId = m_model->getRowData(srcIdx.row()).operatorId;
 
     if (m_currentOperatorId == operatorId)
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, true && selected == 1);
@@ -92,7 +94,7 @@ void CriteriumDialog::slotEdit()
     DEBUG_LOG(m_logger) << "CriteriumDialog::slotEdit";
 
     const QModelIndex srcIdx = m_ui->widget->currentIndex();
-    editCriterium(m_model->getRowData(srcIdx.row()).id());
+    editCriterium(m_model->getRowData(srcIdx.row()).id);
 }
 
 void CriteriumDialog::slotRemove()
@@ -102,8 +104,8 @@ void CriteriumDialog::slotRemove()
     if (!selIndex.isValid())
         return;
 
-    Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
-    DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id();
+    Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id);
+    DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id;
     m_requestHelper->startSingleRequest([req, this]() { return m_ftc->evlCriteriumRemoveRequest(req, this); });
 
     if (m_requestHelper->failed())
@@ -116,7 +118,7 @@ void CriteriumDialog::slotEditElements()
     if (!selIndex.isValid())
         return;
 
-    int criteriumId = m_model->getRowData(selIndex.row()).id();
+    int criteriumId = m_model->getRowData(selIndex.row()).id;
     addDialog(LtsWidgets::initDialog(new ElementDialog(), criteriumId, m_exerciseId, m_menuGroup, m_dtc, m_ftc,
                                      m_exmDtc, m_avmDataIfc, m_fltParticipantIfc, m_fltAesIfc,
                                      m_fltBuildingComponentIfc, m_session),
@@ -165,8 +167,8 @@ bool CriteriumDialog::init(
     for (auto i = criteria.constBegin(); i != criteria.constEnd(); ++i)
     {
         const EvaluationCriterium& p = (*i);
-        DEBUG_LOG(m_logger) << "Criterium: id = " << p.id() << ", name = " << p.name().c_str()
-                            << ", desc = " << p.description().c_str();
+        DEBUG_LOG(m_logger) << "Criterium: id = " << p.id << ", name = " << p.name.c_str()
+                            << ", desc = " << p.description.c_str();
     }
 
     connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &CriteriumDialog::enaDisa,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
index bb342db97..8793e8397 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_evl_edit_dialog.h"
 
@@ -17,6 +18,7 @@ namespace Evaluations
 CriteriumEditDialog::CriteriumEditDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::CriteriumEditDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "CriteriumEditDialog ctor";
 
@@ -50,10 +52,10 @@ bool CriteriumEditDialog::init(int criteriumId, LtsSession::LtsSession* session,
     if (m_criteriumId > 0)
     {
         Evaluations::EvaluationCriterium eval = m_dtc->evaluationCriterium(m_criteriumId);
-        m_ui->leName->setText(QString::fromStdString(eval.name()));
-        m_ui->teDesc->setText(QString::fromStdString(eval.description()));
+        m_ui->leName->setText(QString::fromStdString(eval.name));
+        m_ui->teDesc->setText(QString::fromStdString(eval.description));
 
-        m_ui->cbxOperators->setCurrentIndex(m_ui->cbxOperators->findData(eval.operatorId()));
+        m_ui->cbxOperators->setCurrentIndex(m_ui->cbxOperators->findData(eval.operatorId));
     }
     else
     {
@@ -76,10 +78,10 @@ bool CriteriumEditDialog::apply()
 {
 
     EvlCriteriumModifyRequest req;
-    req.id(m_criteriumId);
-    req.name(m_ui->leName->text().toStdString());
-    req.description(m_ui->teDesc->toPlainText().toStdString());
-    req.operatorId(m_ui->cbxOperators->currentData().toInt());
+    req.id = m_criteriumId;
+    req.name = m_ui->leName->text().toStdString();
+    req.description = m_ui->teDesc->toPlainText().toStdString();
+    req.operatorId = m_ui->cbxOperators->currentData().toInt();
 
     return m_requestHelper->startSingleRequest([this, req]() { return m_ftc->evlCriteriumModifyRequest(req, this); });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
index 35d0667db..fe94a9f2c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_edit_element_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_evl_edit_element_dialog.h"
 
@@ -26,6 +27,7 @@ namespace Evaluations
 ElementEditDialog::ElementEditDialog(QWidget*)
     : LtsWidgets::LtsDialog(nullptr, LtsWidgets::ButtonCombination::OkCancel),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::ElementEditDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "ElementEditDialog ctor";
 
@@ -88,17 +90,17 @@ bool ElementEditDialog::init(
     if (m_elementId > 0)
     {
         Evaluations::EvaluationElement eval = m_dtc->evaluationElement(m_elementId);
-        m_ui->cbxRating->setCurrentIndex(m_ui->cbxRating->findData(eval.rating()));
-        m_ui->teDesc->setText(QString::fromStdString(eval.note()));
-        m_ui->lblStartTime->setText(DTG::toStringMSec(eval.timestamp()));
+        m_ui->cbxRating->setCurrentIndex(m_ui->cbxRating->findData(eval.rating));
+        m_ui->teDesc->setText(QString::fromStdString(eval.note));
+        m_ui->lblStartTime->setText(DTG::toStringMSec(eval.timestamp));
         ERROR_LOG(m_logger) << "set start time label to " << m_ui->lblStartTime->text();
-        m_startTime = eval.timestamp();
+        m_startTime = eval.timestamp;
 
-        m_ui->cbSituation->setChecked(eval.situation());
-        m_ui->cbVideo->setChecked(eval.video());
-        m_ui->cbAudio->setChecked(eval.audio());
+        m_ui->cbSituation->setChecked(eval.situation);
+        m_ui->cbVideo->setChecked(eval.video);
+        m_ui->cbAudio->setChecked(eval.audio);
 
-        m_ui->cbxPhase->setCurrentIndex(m_ui->cbxPhase->findData(eval.phaseId()));
+        m_ui->cbxPhase->setCurrentIndex(m_ui->cbxPhase->findData(eval.phaseId));
     }
 
     if (m_avmDataIfc && m_avmDataIfc->hasAvsSession())
@@ -139,13 +141,13 @@ bool ElementEditDialog::apply()
 {
 
     EvlElementModifyRequest req;
-    req.id(m_elementId);
-    req.criteriumId(m_criteriumId);
-    req.rating(m_ui->cbxRating->currentData().toInt());
-    req.note(m_ui->teDesc->toPlainText().toStdString());
-    req.timestamp(m_startTime);
-    req.duration((QDateTime::currentMSecsSinceEpoch() - m_startTime) / 1000);
-    req.phaseId(m_ui->cbxPhase->currentData().toInt());
+    req.id = m_elementId;
+    req.criteriumId = m_criteriumId;
+    req.rating = m_ui->cbxRating->currentData().toInt();
+    req.note = m_ui->teDesc->toPlainText().toStdString();
+    req.timestamp = m_startTime;
+    req.duration = (QDateTime::currentMSecsSinceEpoch() - m_startTime) / 1000;
+    req.phaseId = m_ui->cbxPhase->currentData().toInt();
 
     QJsonObject obj;
     if (m_ui->cbSituation->isChecked())
@@ -160,21 +162,21 @@ bool ElementEditDialog::apply()
 
         root[QStringLiteral("filters")] = getFilterSettings();
 
-        req.situationContent().set(QJsonDocument(root).toJson().constData());
+        req.situationContent.set(QJsonDocument(root).toJson().constData());
     }
 
     if (m_ui->cbVideo->isChecked() && m_ui->cbxVideoChannel->currentData().isValid())
     {
         obj[QStringLiteral("actualStream")] = QJsonValue(m_ui->cbxVideoChannel->currentData().toString());
         obj[QStringLiteral("allStreams")] = QJsonValue(QString(m_videoStreams.join(QStringLiteral(", "))));
-        req.videoContent().set(QJsonDocument(obj).toJson().constData());
+        req.videoContent.set(QJsonDocument(obj).toJson().constData());
     }
 
     if (m_ui->cbAudio->isChecked() && !m_ui->cbxRadioCircuit->currentText().isNull())
     {
         obj[QStringLiteral("actualStream")] = QJsonValue(m_ui->cbxRadioCircuit->currentText());
         obj[QStringLiteral("allStreams")] = QJsonValue(QString(m_audioStreams.join(QStringLiteral(", "))));
-        req.audioContent().set(QJsonDocument(obj).toJson().constData());
+        req.audioContent.set(QJsonDocument(obj).toJson().constData());
     }
 
     return m_requestHelper->startSingleRequest([this, req]() { return m_ftc->evlElementModifyRequest(req, this); });
@@ -188,8 +190,8 @@ void ElementEditDialog::fillPhasesComboBox()
     m_ui->cbxPhase->addItem(tr("<not set>"), 0);
 
     auto cb = [this](const ExerciseManagement::ExercisePhase& ph) {
-        if (ph.exerciseId() == m_exerciseId)
-            m_ui->cbxPhase->addItem(QString::fromStdString(ph.name()), ph.id());
+        if (ph.exerciseId == m_exerciseId)
+            m_ui->cbxPhase->addItem(QString::fromStdString(ph.name), ph.id);
     };
     m_exmDtc->exercisePhases(cb);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.cpp
index 46727eb55..6e3c71147 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_element_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "evl_edit_element_dialog.h"
 #include "evl_element_model.h"
@@ -14,6 +15,7 @@ namespace Evaluations
 ElementDialog::ElementDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(new ElementDialogModel(this)),
       m_ui(new Ui::ElementDialog), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "ElementDialog ctor";
     m_ui->setupUi(this);
@@ -51,7 +53,7 @@ void ElementDialog::slotEdit()
 {
     DEBUG_LOG(m_logger) << "ElementDialog::slotEdit";
 
-    addElementEditDialog(m_model->getRowData(m_ui->widget->currentIndex().row()).id());
+    addElementEditDialog(m_model->getRowData(m_ui->widget->currentIndex().row()).id);
 }
 
 void ElementDialog::addElementEditDialog(int elementId)
@@ -76,9 +78,9 @@ void ElementDialog::slotRemove()
         return;
 
     m_requestHelper->startSingleRequest([this]() {
-        DEBUG_LOG(m_logger) << "Removing element id = " << m_model->getRowData(m_ui->widget->currentIndex().row()).id();
+        DEBUG_LOG(m_logger) << "Removing element id = " << m_model->getRowData(m_ui->widget->currentIndex().row()).id;
         return m_ftc->evlElementRemoveRequest(
-            EvlElementRemoveRequest(m_model->getRowData(m_ui->widget->currentIndex().row()).id(), m_criteriumId), this);
+            EvlElementRemoveRequest(m_model->getRowData(m_ui->widget->currentIndex().row()).id, m_criteriumId), this);
     });
 
     if (m_requestHelper->failed())
@@ -126,7 +128,7 @@ bool ElementDialog::init(
 #endif
 
     auto cb = [this](const Evaluations::EvaluationElement& e) {
-        DEBUG_LOG(m_logger) << "Element: id = " << e.id() << ", medium = " << e.rating();
+        DEBUG_LOG(m_logger) << "Element: id = " << e.id << ", medium = " << e.rating;
     };
     m_dtc->evaluationElements(cb);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
index e2892b3d9..d2fab2ddd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_element_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <LtsUtilsCore/json_object.h>
@@ -15,6 +16,7 @@ ElementDialogModel::ElementDialogModel(QObject* parent)
           {tr("Id"), tr("Situation"), tr("Video"), tr("Audio"), tr("Start Time"), tr("Duration"), tr("Rating"),
            tr("Radio Circuit"), tr("Video Channel"), tr("Note"), tr("Phase")},
           parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -29,7 +31,7 @@ bool ElementDialogModel::initModel(const std::shared_ptr<Interface::Dtc>& dtc,
     connect(dtc.get(), &Interface::Dtc::evaluationElementChanged, this, &ElementDialogModel::onDataChanged);
 
     auto cb = [this, criteriumId](const EvaluationElement& e) {
-        if (e.criteriumId() == criteriumId)
+        if (e.criteriumId == criteriumId)
             insertRow(e);
     };
     dtc->evaluationElements(cb);
@@ -49,31 +51,31 @@ QVariant ElementDialogModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case Id:
-            return eval.id();
+            return eval.id;
         case Situation:
-            return eval.situation() ? tr("Yes") : tr("No");
+            return eval.situation ? tr("Yes") : tr("No");
         case Video:
-            return eval.video() ? tr("Yes") : tr("No");
+            return eval.video ? tr("Yes") : tr("No");
         case Audio:
-            return eval.audio() ? tr("Yes") : tr("No");
+            return eval.audio ? tr("Yes") : tr("No");
         case Timestamp:
-            return QDateTime::fromMSecsSinceEpoch(eval.timestamp());
+            return QDateTime::fromMSecsSinceEpoch(eval.timestamp);
         case Duration:
-            return eval.duration();
+            return eval.duration;
         case Rating:
-            return eval.rating();
+            return eval.rating;
         case RadioCircuit:
-            if (eval.audioContent().is_set())
+            if (eval.audioContent.has_value())
             {
-                LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(eval.audioContent().get());
+                LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(eval.audioContent.get());
                 return jsonObj.value<QString>("actualStream");
             }
             else
                 return QString();
         case VideoChannel:
-            if (eval.videoContent().is_set())
+            if (eval.videoContent.has_value())
             {
-                LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(eval.videoContent().get());
+                LtsUtils::JsonObject jsonObj = LtsUtils::JsonObject::fromJson(eval.videoContent.get());
                 QString streamName = jsonObj.value<QString>("actualStream");
                 QString displayName = m_avmDataIfc->streamNameMapping()->displayName(streamName);
                 return displayName;
@@ -81,9 +83,9 @@ QVariant ElementDialogModel::data(const QModelIndex& index, int role) const
             else
                 return QString();
         case Note:
-            return QString::fromStdString(eval.note());
+            return QString::fromStdString(eval.note);
         case Phase:
-            return QString::fromStdString(m_exmDtc->exercisePhase(eval.phaseId()).name());
+            return QString::fromStdString(m_exmDtc->exercisePhase(eval.phaseId).name);
     }
 
     return QVariant();
@@ -105,7 +107,7 @@ bool ElementDialogProxyModel::lessThan(const QModelIndex& source_left, const QMo
     switch (source_left.column())
     {
         case ElementDialogModel::Timestamp:
-            return dataLeft.timestamp() < dataRight.timestamp();
+            return dataLeft.timestamp < dataRight.timestamp;
         case ElementDialogModel::Id:
         case ElementDialogModel::Situation:
         case ElementDialogModel::Video:
@@ -138,7 +140,7 @@ bool ElementDialogProxyModel::filterAcceptsRow(int source_row, const QModelIndex
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
     const auto& data = m_sourceModel->m_vecData.at(source_row);
-    if (data.criteriumId() != m_criteriumId)
+    if (data.criteriumId != m_criteriumId)
         return false;
     return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.cpp
index 95faed291..e3bf3d314 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Evaluations/evl_translation.h>
 
@@ -10,6 +11,7 @@ namespace Evaluations
 CriteriumDialogModel::CriteriumDialogModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<EvaluationCriterium>({tr("Id"), tr("Name"), tr("Description"), tr("Operator")},
                                                              parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -34,13 +36,13 @@ QVariant CriteriumDialogModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case Id:
-            return eval.id();
+            return eval.id;
         case Name:
-            return QString::fromStdString(eval.name());
+            return QString::fromStdString(eval.name);
         case Description:
-            return QString::fromStdString(eval.description());
+            return QString::fromStdString(eval.description);
         case Operator:
-            return QString::fromStdString(m_opmDtc->user(eval.operatorId()).name());
+            return QString::fromStdString(m_opmDtc->user(eval.operatorId).name);
     }
 
     return QVariant();
@@ -68,7 +70,7 @@ bool CriteriumFilterModel::filterAcceptsRow(int source_row, const QModelIndex& s
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
     const auto& data = m_sourceModel->m_vecData.at(source_row);
-    if (data.operatorId() != m_operatorId)
+    if (data.operatorId != m_operatorId)
         return false;
     return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.cpp
index b50647134..0dccedccf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "san_nine_liner_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "san_nine_liner_dialog_model.h"
 #include "san_nine_liner_edit_dialog.h"
@@ -16,6 +17,7 @@ namespace Evaluations
 SanNineLinerDialog::SanNineLinerDialog(const QString& menuGroup, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::SanNineLinerDialog),
       m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     setOnlineHelpFilename(QStringLiteral("Situation-SanNineLiner"));
@@ -90,7 +92,7 @@ void SanNineLinerDialog::onRemoveSanNineLiner()
     const QModelIndex curIdx = m_ui->widget->currentIndex();
     if (!curIdx.isValid())
         return;
-    const int sanNineLinerId = m_model->getRowData(curIdx.row()).id();
+    const int sanNineLinerId = m_model->getRowData(curIdx.row()).id;
 
     Core::RemoveElementRequest req(sanNineLinerId);
     m_requestHelper->startSingleRequest([req, this]() { return m_ftc->sanNineLinerRemoveRequest(req, this); });
@@ -101,14 +103,14 @@ void SanNineLinerDialog::onEditSanNineLiner()
     const QModelIndex idx = m_ui->widget->currentIndex();
     const Evaluations::SanNineLiner san = m_model->getRowData(idx.row());
 
-    if (san.id() <= 0)
+    if (san.id <= 0)
         return;
-    DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id();
+    DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id;
 
     SanNineLinerEditDialog* dialog = new SanNineLinerEditDialog(this);
 
-    dialog->init(m_session, m_menuGroup, san.id());
-    const QString identifier = QStringLiteral("EditSanNineLiner%1").arg(san.id());
+    dialog->init(m_session, m_menuGroup, san.id);
+    const QString identifier = QStringLiteral("EditSanNineLiner%1").arg(san.id);
 
     addDialog(dialog, m_menuGroup, identifier);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp
index 69679d68d..f9eeec469 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "san_nine_liner_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Evaluations/evl_translation.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -13,6 +14,7 @@ namespace Evaluations
 SanNineLinerDialogModel::SanNineLinerDialogModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<Evaluations::SanNineLiner>(
           {tr("Id"), tr("Created"), tr("Position"), tr("Radio frequency / Call Sign / Suffix")}, parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -39,16 +41,16 @@ QVariant SanNineLinerDialogModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case SanNineLinerDialogModel::Columns::Id:
-            return san.id();
+            return san.id;
         case SanNineLinerDialogModel::Columns::Created:
-            return QDateTime::fromMSecsSinceEpoch(san.lastModified());
+            return QDateTime::fromMSecsSinceEpoch(san.lastModified);
         case SanNineLinerDialogModel::Columns::Position: {
-            if (std::isnan(san.line1_position().lat()) || std::isnan(san.line1_position().lon()))
+            if (std::isnan(san.line1_position.lat) || std::isnan(san.line1_position.lon))
                 return tr("---");
-            return LtsCoordTrans::mgrsFromGeographic(san.line1_position().lon(), san.line1_position().lat());
+            return LtsCoordTrans::mgrsFromGeographic(san.line1_position.lon, san.line1_position.lat);
         }
         case SanNineLinerDialogModel::Columns::RadioFrequencyCallSignSuffix:
-            return QString::fromStdString(san.line2_RadioFrequencyCallSignSuffix());
+            return QString::fromStdString(san.line2_RadioFrequencyCallSignSuffix);
         default:
             return QVariant();
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.h
index 5671c8b08..fc48593c3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.h
@@ -37,7 +37,6 @@ class SanNineLinerProxyModel final : public LtsWidgets::LtsColumnFilterProxyMode
     void setSourceModel(QAbstractItemModel* sourceModel) override;
 
   private:
-    NGL::INGLLogger& m_logger;
     SanNineLinerDialogModel* m_sourceModel{nullptr};
 };
 } // namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
index 9e3a6e4e7..c7be08821 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "san_nine_liner_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_san_nine_liner_edit_dialog.h"
 
@@ -24,6 +25,7 @@ namespace Evaluations
 SanNineLinerEditDialog::SanNineLinerEditDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::SanNineLinerEditDialog),
       m_validator(new QIntValidator(this)), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -82,16 +84,16 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds* session, const
 
     Evaluations::SanNineLiner data = m_dtc->sanNineLiner(sanNineLinerId);
 
-    if (data.id() > 0)
+    if (data.id > 0)
     {
-        m_ui->dtTime->setMsecsSinceEpoch(data.lastModified());
+        m_ui->dtTime->setMsecsSinceEpoch(data.lastModified);
         m_ui->leRadioFrequencyCallSignSuffix->setText(
-            QString::fromStdString(data.line2_RadioFrequencyCallSignSuffix()));
-        QPointF position(data.line1_position().lon(), data.line1_position().lat());
+            QString::fromStdString(data.line2_RadioFrequencyCallSignSuffix));
+        QPointF position(data.line1_position.lon, data.line1_position.lat);
         if (!position.isNull())
             m_ui->positionEdit->setCoordinate(position);
 
-        QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines(), data.id());
+        QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines, data.id);
 
         INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
 
@@ -165,13 +167,13 @@ bool SanNineLinerEditDialog::apply()
 {
 
     SanNineLinerModifyRequest request;
-    request.id(m_sanNineLinerId);
+    request.id = m_sanNineLinerId;
 
-    request.id(m_sanNineLinerId);
-    request.lastModified(m_ui->dtTime->msecsSinceEpoch());
+    request.id = m_sanNineLinerId;
+    request.lastModified = m_ui->dtTime->msecsSinceEpoch();
     const Core::GeoPosition2D pos(m_ui->positionEdit->coordinate().x(), m_ui->positionEdit->coordinate().y());
-    request.line1_position(pos);
-    request.line2_radioFrequencyCallSignSuffix(m_ui->leRadioFrequencyCallSignSuffix->text().toStdString());
+    request.line1_position = pos;
+    request.line2_radioFrequencyCallSignSuffix = m_ui->leRadioFrequencyCallSignSuffix->text().toStdString();
 
     m_vecCategoryLine.clear();
 
@@ -218,13 +220,13 @@ bool SanNineLinerEditDialog::apply()
     setCategoryLine(line, QStringLiteral("None"), m_ui->cbx9None);
 
     QJsonDocument doc = SanCategoryLine::toJson(m_vecCategoryLine);
-    request.lines(doc.toJson().toStdString());
+    request.lines = doc.toJson().toStdString();
 
     if (!m_requestHelper->startSingleRequest(
             [this, request]() { return m_ftc->sanNineLinerModifyRequest(request, this); }))
         return false;
 
-    if (request.id() <= 0)
+    if (request.id <= 0)
     {
         m_sanNineLinerId = m_requestHelper->getRepliedId();
         ERROR_LOG(m_logger) << "Created new san nine liner with id " << m_sanNineLinerId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
index 55d9f9c41..a117a393c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
@@ -2,6 +2,7 @@
 
 
 #include "evl_comments.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_evl_comments.h"
 #include "evl_comment_model.h"
 
@@ -19,6 +20,7 @@ EvlCommentsView::EvlCommentsView(const std::shared_ptr<Interface::Dtc> &evlDtc,
     m_ui(new Ui::EvlCommentsDialog),
     m_evlDtc(evlDtc),
     m_opmDtc(opmDtc)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -115,28 +117,28 @@ bool EvlCommentsView::insertComment(const Evaluations::EvaluationComment &c)
 {
   QString strSenderOperatorName, strReceiverOperatorName;
 
-  OperatorManagement::User sender = m_opmDtc->user(c.senderOperatorId());
-  strSenderOperatorName = QString::fromStdString(sender.name());
+  OperatorManagement::User sender = m_opmDtc->user(c.senderOperatorId);
+  strSenderOperatorName = QString::fromStdString(sender.name);
 
-  if (c.receiverOperatorId().is_set())
+  if (c.receiverOperatorId.has_value())
   {
     
     OperatorManagement::User loggedInOperator = m_opmDtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
 
-    if (c.receiverOperatorId().get() != loggedInOperator.id())
+    if (c.receiverOperatorId.get() != loggedInOperator.id)
       return false;
 
-    OperatorManagement::User receiver = m_opmDtc->user(c.receiverOperatorId().get());
-    strReceiverOperatorName = QString::fromStdString(receiver.name());
+    OperatorManagement::User receiver = m_opmDtc->user(c.receiverOperatorId.get());
+    strReceiverOperatorName = QString::fromStdString(receiver.name);
   }
 
   CommentTuple t;
-  t.m_commentId = c.id();
-  t.m_timestamp = QDateTime::fromMSecsSinceEpoch(c.ts());
+  t.m_commentId = c.id;
+  t.m_timestamp = QDateTime::fromMSecsSinceEpoch(c.ts);
   t.m_sender = strSenderOperatorName;
   t.m_receiver = strReceiverOperatorName;
-  t.m_text = QString::fromStdString(c.text());
-  t.m_hierarchy = QString::fromStdString(c.hierarchy());
+  t.m_text = QString::fromStdString(c.text);
+  t.m_hierarchy = QString::fromStdString(c.hierarchy);
 
   return m_model->insertRow(t);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
index 82cdc8de8..05b3823b8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_edit_schema.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "evl_new_comment_dialog.h"
 #include "ui_evl_edit_schema.h"
@@ -62,6 +63,7 @@ EditSchemaDialog::EditSchemaDialog(bool ocMode, bool runningOnTablet, LtsSession
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ocMode(ocMode),
       m_runningOnTablet(runningOnTablet), m_session(session), m_requestHelper(new LtsUtils::RequestHelper(this)),
       m_ui(new Ui::EditSchemaDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -202,9 +204,9 @@ void EditSchemaDialog::loadLatestSchema()
         {
             --itE;
 
-            if ((*itE).sendToTa())
+            if ((*itE).sendToTa)
             {
-                loadSchema((*itE).id());
+                loadSchema((*itE).id);
                 break;
             }
         }
@@ -213,22 +215,22 @@ void EditSchemaDialog::loadLatestSchema()
 
         for (const Evaluations::EvaluationComment& c : mapComments)
         {
-            if (c.schemaId() != m_loadedSchemaId)
+            if (c.schemaId != m_loadedSchemaId)
                 continue;
 
-            if (c.senderOperatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+            if (c.senderOperatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
                 continue;
 
-            ItemComment comment(QString::fromStdString(c.text()), c.senderOperatorId(),
-                                c.receiverOperatorId().is_set() ? c.receiverOperatorId().get() : 0, c.elementId(),
-                                QDateTime::fromMSecsSinceEpoch(c.ts()));
+            ItemComment comment(QString::fromStdString(c.text), c.senderOperatorId,
+                                c.receiverOperatorId.has_value() ? c.receiverOperatorId.get() : 0, c.elementId,
+                                QDateTime::fromMSecsSinceEpoch(c.ts));
             m_pModel->insertComment(comment);
         }
 
         updateCommentLabel();
     }
     else
-        loadSchema(m_mapSchemata.last().id());
+        loadSchema(m_mapSchemata.last().id);
 }
 
 void EditSchemaDialog::handleUnsentComments()
@@ -268,25 +270,25 @@ void EditSchemaDialog::onRequestSchema()
 
 void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema& data, DataModification modType)
 {
-    if (m_ocMode && !data.sendToTa())
+    if (m_ocMode && !data.sendToTa)
         return;
 
     QJsonParseError jError;
-    const QJsonDocument doc(QJsonDocument::fromJson(data.schemadata().c_str(), &jError));
+    const QJsonDocument doc(QJsonDocument::fromJson(data.schemadata.c_str(), &jError));
 
     if (jError.error != QJsonParseError::NoError)
     {
-        WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
+        WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id;
         return;
     }
 
-    if (m_loadedSchemaId == data.id())
+    if (m_loadedSchemaId == data.id)
         return;
 
     if (doc == m_pModel->toJsonDocument())
     {
 
-        m_loadedSchemaId = data.id();
+        m_loadedSchemaId = data.id;
         retranslate();
         return;
     }
@@ -301,7 +303,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema&
         {
             handleUnsentComments();
 
-            m_loadedSchemaId = data.id();
+            m_loadedSchemaId = data.id;
             m_pModel->fromQJsonDocument(doc);
             expandNodeChildren(m_ui->m_treeViewSchema, QModelIndex(), true);
             updateCommentLabel();
@@ -314,11 +316,11 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
     if (m_mapSchemata.size())
     {
         QJsonParseError jError;
-        const QJsonDocument doc(QJsonDocument::fromJson(m_mapSchemata[schemaId].schemadata().c_str(), &jError));
+        const QJsonDocument doc(QJsonDocument::fromJson(m_mapSchemata[schemaId].schemadata.c_str(), &jError));
 
         if (jError.error != QJsonParseError::NoError)
         {
-            WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id();
+            WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id;
             return;
         }
 
@@ -338,8 +340,8 @@ void EditSchemaDialog::DebugonLoadSchema()
 
     m_mapSchemata = m_evlDtc->evaluationSchemas();
     qint32 id = QInputDialog::getInt(this, QStringLiteral("Insert database id of desired schema"),
-                                     QStringLiteral("Database id"), m_mapSchemata.last().id(),
-                                     m_mapSchemata.first().id(), m_mapSchemata.last().id());
+                                     QStringLiteral("Database id"), m_mapSchemata.last().id,
+                                     m_mapSchemata.first().id, m_mapSchemata.last().id);
     loadSchema(id);
 }
 
@@ -454,11 +456,11 @@ void EditSchemaDialog::saveSchema(bool sendToTa)
     EvlSchemaModifyRequest req;
 
     bool schemaChanged = hasUnsavedChanges();
-    req.id(schemaChanged ? 0 : m_loadedSchemaId);
-    req.sendToTa(sendToTa);
+    req.id = schemaChanged ? 0 : m_loadedSchemaId;
+    req.sendToTa = sendToTa;
 
     QJsonDocument doc = m_pModel->toJsonDocument();
-    req.schemadata(doc.toJson().constData());
+    req.schemadata = doc.toJson().constData();
 
     m_requestHelper->addRequest([this, req, schemaChanged]() {
         bool success = m_evlFtc->evlSchemaModifyRequest(req, this);
@@ -535,34 +537,34 @@ void EditSchemaDialog::onSendComment()
 EvlCommentModifyRequest EditSchemaDialog::createEvlCommentModifyRequest(const ItemComment& c) const
 {
     EvlCommentModifyRequest req;
-    req.id(0);
-    req.ts(c.getTimeStamp().toMSecsSinceEpoch());
-    req.senderOperatorId(c.senderId());
+    req.id = 0;
+    req.ts = c.getTimeStamp().toMSecsSinceEpoch();
+    req.senderOperatorId = c.senderId();
 
     if (c.hasReceiverId())
-        req.receiverOperatorId(c.receiverId());
+        req.receiverOperatorId = c.receiverId();
 
-    req.text(c.getText().toStdString());
+    req.text = c.getText().toStdString();
 
-    req.hierarchy(c.getHierarchy().toStdString());
-    req.schemaId(m_loadedSchemaId);
-    req.elementId(c.elementId());
+    req.hierarchy = c.getHierarchy().toStdString();
+    req.schemaId = m_loadedSchemaId;
+    req.elementId = c.elementId();
     return req;
 }
 
 OcSituationClient::SendEvaluationRequest EditSchemaDialog::createSendEvaluationRequest(const ItemComment& c) const
 {
     OcSituationClient::SendEvaluationRequest req;
-    req.timeStamp(c.getTimeStamp().toMSecsSinceEpoch());
-    req.senderOperatorId(c.senderId());
+    req.timeStamp = c.getTimeStamp().toMSecsSinceEpoch();
+    req.senderOperatorId = c.senderId();
 
     if (c.hasReceiverId())
-        req.receiverOperatorId(c.receiverId());
+        req.receiverOperatorId = c.receiverId();
 
-    req.text(c.getText().toStdString());
+    req.text = c.getText().toStdString();
 
-    req.hierarchy(c.getHierarchy().toStdString());
-    req.schemaId(m_loadedSchemaId);
+    req.hierarchy = c.getHierarchy().toStdString();
+    req.schemaId = m_loadedSchemaId;
 
     return req;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.h
index aae983c42..f8596441b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.h
@@ -13,7 +13,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <OcSituationClient/osc_ftc.h>
-#include <FileManagement/flm_data_plugin.h>
+#include <Plugins/FileManagement/Data/flm_data_plugin.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
index e77155f2f..e4903da70 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
@@ -10,7 +10,7 @@ namespace Evaluations
 {
 TreeModelSchema::TreeModelSchema(QObject* parent, NGL::INGLLogger& logger) : TreeModelGeneral(parent, logger)
 {
-    qRegisterMetaTypeStreamOperators<Evaluations::ElementData>();
+    qRegisterMetaType<Evaluations::ElementData>();
 }
 
 void TreeModelSchema::resetModel()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.cpp
index 387e132a2..19e98aff3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "evl_new_comment_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_evl_new_comment_dialog.h"
 
@@ -18,7 +19,7 @@ EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagemen
     m_ui->m_ltsComboBox_ReceiverOperator->addItem(tr("All (Default)"), 0);
 
     auto cbUser = [this](const OperatorManagement::User& user) {
-        m_ui->m_ltsComboBox_ReceiverOperator->addItem(QString::fromStdString(user.name()), user.id());
+        m_ui->m_ltsComboBox_ReceiverOperator->addItem(QString::fromStdString(user.name), user.id);
     };
     opmDtc->users(cbUser);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/evl_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/evl_edit_gui_plugin.h
index c4bc4bb5b..5c03eb0bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/evl_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/evl_edit_gui_plugin.h
@@ -15,7 +15,7 @@
 #include <FilterManagement/flt_participant_plugin_interface.h>
 #include <FilterManagement/flt_aes_plugin_interface.h>
 #include <FilterManagement/flt_building_cmpnt_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <AudioVideoManagement/avm_data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
index 335cb04eb..feb63f596 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
@@ -6,7 +6,7 @@
 #include "exm_dialog_model.h"
 
 #include <ngltools/ngltools_dtg.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
@@ -77,7 +77,7 @@ bool CustomViewExercise::init(const QModelIndex &idx)
 
     
     QPalette p = m_ui->lbStatus->palette();
-    QColor newCol = rowData(idx, ExerciseManagement::ExerciseManagementDialogModel::Status, Qt::TextColorRole).value<QColor>();
+    QColor newCol = rowData(idx, ExerciseManagement::ExerciseManagementDialogModel::Status, Qt::ForegroundRole).value<QColor>();
     p.setColor(m_ui->lbStatus->backgroundRole(), newCol);
     p.setColor(m_ui->lbStatus->foregroundRole(), newCol);
     m_ui->lbStatus->setPalette(p);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
index 6a674a027..c7c44dcde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
@@ -164,7 +164,7 @@ void ExerciseChooser::slotExerciseSelected()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const Exercise ex = m_model->getRowData(idx.row());
 
-  if (ex.id() < 0)
+  if (ex.id < 0)
     return;
 
   setEnabled(false);
@@ -172,7 +172,7 @@ void ExerciseChooser::slotExerciseSelected()
   
 
   LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(true);
-  emit signalSelectExercise(ex.id());
+  emit signalSelectExercise(ex.id);
   m_close = true;
   close();
 }
@@ -183,7 +183,7 @@ void ExerciseChooser::onUserChanged(const OperatorManagement::User &user, DataMo
   if (!m_session || !m_proxyModel)
     return;
   const int opId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
-  if (user.id() != opId)
+  if (user.id != opId)
     return;
 
   if (mod == DataModification::eRemoved)
@@ -192,7 +192,7 @@ void ExerciseChooser::onUserChanged(const OperatorManagement::User &user, DataMo
     return;
   }
 
-  const bool hasAdminRights = std::any_of(user.effectiveAcls().begin(), user.effectiveAcls().end(),
+  const bool hasAdminRights = std::any_of(user.effectiveAcls.begin(), user.effectiveAcls.end(),
                                           [](int val) { return val == OperatorRights::Administrator; });
   if (m_session->app() == LtsAppDescriptor::App::OC ||
       (hasAdminRights && (m_session->app() == LtsAppDescriptor::App::Situation ||
@@ -200,7 +200,7 @@ void ExerciseChooser::onUserChanged(const OperatorManagement::User &user, DataMo
     m_proxyModel->setAdminExerciseVisible(true);
   else
     m_proxyModel->setAdminExerciseVisible(false);
-  m_proxyModel->setVisibleExerciseIds(LtsUtils::convert<QVector<int>>(user.exerciseIds()));
+  m_proxyModel->setVisibleExerciseIds(LtsUtils::convert<QVector<int>>(user.exerciseIds));
 }
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.cpp
index 711f0bfc2..70633d95c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "CustomViews/exm_exercise.h"
 #include "exm_dialog_model.h"
@@ -21,6 +22,7 @@ ExerciseManagementDialog::ExerciseManagementDialog(const QString& menuGroup, QWi
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr),
       m_ui(new Ui::ExerciseManagementDialog), m_session(nullptr), m_ftc(nullptr), m_menuGroup(menuGroup),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     setOnlineHelpFilename(QStringLiteral("Administrator-Exercises"));
@@ -105,7 +107,7 @@ void ExerciseManagementDialog::enaDisa()
     const int cntSelectedRows = selectedRows.size();
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, cntSelectedRows == 1);
     const QModelIndex curIdx = m_ui->widget->currentIndex();
-    const ExerciseManagement::ExerciseState state = m_model->getRowData(curIdx.row()).state();
+    const ExerciseManagement::ExerciseState state = m_model->getRowData(curIdx.row()).state;
     const bool isRemovable =
         (state == ExerciseManagement::ExerciseState::Unknown || state == ExerciseManagement::ExerciseState::Created ||
          state == ExerciseManagement::ExerciseState::Stopped || state == ExerciseManagement::ExerciseState::Terminated);
@@ -125,7 +127,7 @@ void ExerciseManagementDialog::onRemoveExercise()
     const QModelIndex curIdx = m_ui->widget->currentIndex();
     if (!curIdx.isValid())
         return;
-    const int exId = m_model->getRowData(curIdx.row()).id();
+    const int exId = m_model->getRowData(curIdx.row()).id;
     const int folderId = m_flmDtc->getExerciseFolderId(exId);
 
     if (folderId > 0)
@@ -146,14 +148,14 @@ void ExerciseManagementDialog::onEditExercise()
     const QModelIndex idx = m_ui->widget->currentIndex();
     const Exercise ex = m_model->getRowData(idx.row());
 
-    if (ex.id() <= 0)
+    if (ex.id <= 0)
         return;
-    DEBUG_LOG(m_logger) << "current EXId: " << ex.id();
+    DEBUG_LOG(m_logger) << "current EXId: " << ex.id;
 
     ExerciseManagementEditDialog* dialog = new ExerciseManagementEditDialog(this);
 
-    dialog->init(m_session, m_menuGroup, ex.id());
-    const QString identifier = QStringLiteral("EditExercise%1").arg(ex.id());
+    dialog->init(m_session, m_menuGroup, ex.id);
+    const QString identifier = QStringLiteral("EditExercise%1").arg(ex.id);
 
     addDialog(dialog, m_menuGroup, identifier);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
index f55933724..a3ec2aef2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ExerciseManagement/exm_translation.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
@@ -17,6 +18,7 @@ ExerciseManagementDialogModel::ExerciseManagementDialogModel(QObject* parent)
            tr("Description"), tr("Linked Exercise"), tr("Transferred"), tr("HLA"), tr("Image")},
           parent),
       m_exmDtc(nullptr), m_asmDtc(nullptr), m_pdmDtc(nullptr)
+      , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -39,15 +41,15 @@ bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseMana
                     return;
 
                 if (preloadExerciseImages)
-                    addImagePreload(ex.id());
+                    addImagePreload(ex.id);
             });
 
     if (addAdminExercise)
     {
 
         ExerciseManagement::Exercise adminExercise;
-        adminExercise.name(tr("Superordinate Config / Administration").toStdString());
-        adminExercise.id(0);
+        adminExercise.name = tr("Superordinate Config / Administration").toStdString();
+        adminExercise.id = 0;
 
         insertRow(adminExercise);
     }
@@ -56,7 +58,7 @@ bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseMana
         insertRow(ex);
 
         if (preloadExerciseImages)
-            addImagePreload(ex.id());
+            addImagePreload(ex.id);
     });
 
     INFO_LOG(m_logger) << "initModel - #exercises: " << m_vecData.size();
@@ -65,7 +67,7 @@ bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseMana
 
 int ExerciseManagementDialogModel::getId(const ExerciseManagement::Exercise& data) const
 {
-    return data.id();
+    return data.id;
 }
 
 void ExerciseManagementDialogModel::addImagePreload(int32_t exId)
@@ -101,17 +103,17 @@ GetExerciseImageRequester* ExerciseManagementDialogModel::createGetExerciseImage
 
         const GetExerciseImageReply& reply(r->reply());
 
-        if (reply.errorString().empty())
+        if (reply.errorString.empty())
         {
-            m_exerciseImages.insert(reply.id(), LtsUtils::toQByteArray(reply.imageData()));
+            m_exerciseImages.insert(reply.id, LtsUtils::toQByteArray(reply.imageData));
 
-            QModelIndex idx(findIndexForId(reply.id(), 0));
+            QModelIndex idx(findIndexForId(reply.id, 0));
             emit dataChanged(idx, idx, {Qt::DisplayRole});
         }
         else
         {
-            QString msg(QString::fromStdString(reply.errorString()));
-            for (const std::string& arg : std::as_const(reply.errorParams()))
+            QString msg(QString::fromStdString(reply.errorString));
+            for (const std::string& arg : std::as_const(reply.errorParams))
                 msg = msg.arg(QString::fromStdString(arg));
 
             ERROR_LOG(m_logger) << "image preload failed: " << msg;
@@ -130,7 +132,7 @@ void ExerciseManagementDialogModel::setImageSizeConstraints(const QSize& size)
 
 QVariant ExerciseManagementDialogModel::data(const QModelIndex& index, int role) const
 {
-    if ((role != Qt::DisplayRole && role != Qt::UserRole && role != Qt::TextColorRole) || !indexIsValid(index))
+    if ((role != Qt::DisplayRole && role != Qt::UserRole && role != Qt::ForegroundRole) || !indexIsValid(index))
         return QVariant();
 
     const ExerciseManagement::Exercise& ex = m_vecData.at(index.row());
@@ -140,59 +142,59 @@ QVariant ExerciseManagementDialogModel::data(const QModelIndex& index, int role)
         switch (index.column())
         {
             case ExerciseManagementDialogModel::Columns::Name:
-                return QString::fromStdString(ex.name());
+                return QString::fromStdString(ex.name);
             case ExerciseManagementDialogModel::Columns::TrainingArea: {
-                const AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(ex.trainingAreaId());
-                return QString::fromStdString(ta.name());
+                const AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(ex.trainingAreaId);
+                return QString::fromStdString(ta.name);
             }
             case ExerciseManagementDialogModel::Columns::Begin:
-                return QDateTime::fromMSecsSinceEpoch(ex.beginTime());
+                return QDateTime::fromMSecsSinceEpoch(ex.beginTime);
             case ExerciseManagementDialogModel::Columns::End:
-                return QDateTime::fromMSecsSinceEpoch(ex.endTime());
+                return QDateTime::fromMSecsSinceEpoch(ex.endTime);
             case ExerciseManagementDialogModel::Columns::Started:
-                return QDateTime::fromMSecsSinceEpoch(ex.startTime());
+                return QDateTime::fromMSecsSinceEpoch(ex.startTime);
             case ExerciseManagementDialogModel::Columns::Stopped:
-                return QDateTime::fromMSecsSinceEpoch(ex.stopTime());
+                return QDateTime::fromMSecsSinceEpoch(ex.stopTime);
             case ExerciseManagementDialogModel::Columns::Status:
-                return ExerciseManagement::toString(ex.state());
+                return ExerciseManagement::toString(ex.state);
             case ExerciseManagementDialogModel::Columns::RadioGroup:
-                if (ex.radioGroupId().is_set())
-                    return m_pdmDtc->trRadioGroupName(ex.radioGroupId().get());
+                if (ex.radioGroupId.has_value())
+                    return m_pdmDtc->trRadioGroupName(ex.radioGroupId.get());
                 return QStringLiteral(" - ");
             case ExerciseManagementDialogModel::Columns::ActivePhase:
-                return QString::fromStdString(m_exmDtc->exercisePhase(ex.activePhaseId()).name());
+                return QString::fromStdString(m_exmDtc->exercisePhase(ex.activePhaseId).name);
             case ExerciseManagementDialogModel::Columns::Created:
-                return QDateTime::fromMSecsSinceEpoch(ex.created());
+                return QDateTime::fromMSecsSinceEpoch(ex.created);
             case ExerciseManagementDialogModel::Columns::TimeZone:
-                return (ex.defaultTimeZone() == 0) ? QStringLiteral("-") : QString(QLatin1Char(ex.defaultTimeZone()));
+                return (ex.defaultTimeZone == 0) ? QStringLiteral("-") : QString(QLatin1Char(ex.defaultTimeZone));
             case ExerciseManagementDialogModel::Columns::Forces:
-                return QString::fromStdString(ex.forces());
+                return QString::fromStdString(ex.forces);
             case ExerciseManagementDialogModel::Columns::Description:
-                return QString::fromStdString(ex.description());
+                return QString::fromStdString(ex.description);
             case ExerciseManagementDialogModel::Columns::Image:
-                return m_exerciseImages.value(ex.id());
+                return m_exerciseImages.value(ex.id);
             case ExerciseManagementDialogModel::Columns::Id:
-                return ex.id();
+                return ex.id;
             case ExerciseManagementDialogModel::Columns::LinkedId: {
-                if (ex.linkedExerciseId() == 0)
+                if (ex.linkedExerciseId == 0)
                     return QVariant();
-                const int row = findRowForId(ex.linkedExerciseId());
+                const int row = findRowForId(ex.linkedExerciseId);
                 if (row < 0)
-                    return QStringLiteral("????? - %1").arg(ex.linkedExerciseId());
-                return QString(QString::fromStdString(m_vecData.at(row).name()) +
-                               QStringLiteral(" (%1)").arg(ex.linkedExerciseId()));
+                    return QStringLiteral("????? - %1").arg(ex.linkedExerciseId);
+                return QString(QString::fromStdString(m_vecData.at(row).name) +
+                               QStringLiteral(" (%1)").arg(ex.linkedExerciseId));
             }
             case ExerciseManagementDialogModel::Columns::Transferred:
-                return ex.transferred() ? tr("Yes") : tr("No");
+                return ex.transferred ? tr("Yes") : tr("No");
             case ExerciseManagementDialogModel::Columns::HasHlaInterface:
-                return ex.hasHlaInterface() ? tr("Yes") : tr("No");
+                return ex.hasHlaInterface ? tr("Yes") : tr("No");
         }
     }
     else if (role == Qt::UserRole)
     {
-        if (ex.id() == 0)
+        if (ex.id == 0)
             return 0;
-        switch (ex.state().underlying())
+        switch (ex.state)
         {
             case ExerciseState::Unknown:
                 return 6;
@@ -209,11 +211,11 @@ QVariant ExerciseManagementDialogModel::data(const QModelIndex& index, int role)
         }
         return 99;
     }
-    else if (role == Qt::TextColorRole)
+    else if (role == Qt::ForegroundRole)
     {
         if (index.column() == ExerciseManagementDialogModel::Columns::Status)
         {
-            switch (ex.state().underlying())
+            switch (ex.state)
             {
                 case ExerciseState::Unknown:
                     return QColor(Qt::black);
@@ -271,15 +273,15 @@ bool ExerciseManagementProxyModel::filterAcceptsRow(int source_row, const QModel
     if (!m_sourceModel || source_parent.isValid() || source_row < 0 || source_row >= m_sourceModel->m_vecData.size())
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
     const auto& ex = m_sourceModel->m_vecData.at(source_row);
-    if (ex.id() == 0)
+    if (ex.id == 0)
     {
         if (!m_bAdminVisible)
             return false;
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
     }
-    if (!m_exIds.contains(ex.id()) && !m_exIds.contains(-1))
+    if (!m_exIds.contains(ex.id) && !m_exIds.contains(-1))
         return false;
-    if (!m_visibleStates.contains(ex.state()) && !m_visibleStates.isEmpty())
+    if (!m_visibleStates.contains(ex.state) && !m_visibleStates.isEmpty())
         return false;
     return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.h
index 7c50e3fff..2dde21890 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.h
@@ -6,6 +6,7 @@
 #include <ExerciseManagement/exm_dtc.h>
 #include <ExerciseManagement/exm_ftc.h>
 #include <ExerciseManagement/logger.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ProjectDataManagement/pdm_dtc.h>
@@ -30,7 +31,7 @@ class GetExerciseImageRequester : public AbstractRequester,
 
   private:
     NGL::INGLLogger& m_logger;
-    GetExerciseImageRequester() = default;
+    GetExerciseImageRequester() : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
 
   public:
     static GetExerciseImageRequester* createGetExerciseImageRequester()
@@ -105,6 +106,7 @@ class ExerciseManagementDialogModel final : public LtsWidgets::LtsAbstractTableM
     std::shared_ptr<ExerciseManagement::Interface::Ftc> m_exmFtc;
     std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
     std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
+    NGL::INGLLogger& m_logger;
     QVector<int32_t> m_preloadImages;
     QMap<int32_t, QByteArray> m_exerciseImages;
     bool m_imagePreloadPending{false};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
index d9943cdba..c5cab5964 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
@@ -4,6 +4,7 @@
 #include "exm_edit_adler_visible_parties_model.h"
 #include <ParticipantManagement/ppm_translation.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
@@ -58,9 +59,9 @@ QVariant ExerciseEditAdlerVisiblePartiesModel::data(const QModelIndex &index, in
   switch (index.column())
   {
   case ColId:
-    return party.id();
+    return party.id;
   case ColName:
-    return ParticipantManagement::trPartyName(party.name());
+    return ParticipantManagement::trPartyName(party.name);
   }
   return {};
 }
@@ -78,7 +79,7 @@ void ExerciseEditAdlerVisiblePartiesModel::onPartiesChanged(const ParticipantMan
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         removeRow(i);
         return;
@@ -90,7 +91,7 @@ void ExerciseEditAdlerVisiblePartiesModel::onPartiesChanged(const ParticipantMan
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         m_vecData[i].second = data;
         const QModelIndex idx(index(i, ColName, QModelIndex()));
@@ -106,7 +107,7 @@ void ExerciseEditAdlerVisiblePartiesModel::onPartiesChanged(const ParticipantMan
 bool ExerciseEditAdlerVisiblePartiesModel::isFiltered(const QPair<bool, ParticipantManagement::Party> &data, DataModification modType) const
 {
   
-  if (data.second.id() <= 1 )
+  if (data.second.id <= 1 )
     return true;
 
   return LtsCheckableTableModel::isFiltered(data, modType);
@@ -114,30 +115,30 @@ bool ExerciseEditAdlerVisiblePartiesModel::isFiltered(const QPair<bool, Particip
 
 bool ExerciseEditAdlerVisiblePartiesModel::hasAdlerParty(const ParticipantManagement::Party &party) const
 {
-  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise();
+  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise;
   bool partyVisible = false;
   for (const auto &exerciseParties : visiblePartiesByExercise)
   {
-    if (exerciseParties.exerciseId() != m_exerciseId)
+    if (exerciseParties.exerciseId != m_exerciseId)
       continue;
-    if (!exerciseParties.visibleParties().is_set()) 
+    if (!exerciseParties.visibleParties.has_value()) 
       return false;
 
     
     
-    for (const auto &partyId : exerciseParties.visibleParties().get())
-      if (partyId == party.id())
+    for (const auto &partyId : exerciseParties.visibleParties.get())
+      if (partyId == party.id)
         partyVisible = true;
 
     if (!partyVisible)
       return false;
 
     
-    const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(exerciseParties.properties())).object());
+    const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(exerciseParties.properties)).object());
     const QJsonArray arr(properties.value(QStringLiteral("adlerAllowed")).toArray());
 
     for (const auto &partyId : arr)
-      if (partyId == party.id())
+      if (partyId == party.id)
         return true;
     return false;
   }
@@ -148,7 +149,7 @@ int ExerciseEditAdlerVisiblePartiesModel::findRowForPartyId(int id) const
 {
   for (int i = 0; i < m_vecData.size(); ++i)
   {
-    if (m_vecData.at(i).second.id() == id)
+    if (m_vecData.at(i).second.id == id)
       return i;
   }
   return -1;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
index ed0ac0444..cb0e8e33d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 
 #include <LtsSession/lts_session_data_dds.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
index 72fa86a5d..a0c807d3c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "exm_dialog_model.h"
 #include "exm_edit_party_dialog.h"
@@ -12,7 +13,7 @@
 #include <ExerciseManagement/exm_operator_rights.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -32,6 +33,7 @@ ExerciseManagementEditDialog::ExerciseManagementEditDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
       m_ui(new Ui::ExerciseManagementEditDialog), m_currentState(ExerciseState::Unknown), m_menuGroup(),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -108,7 +110,7 @@ bool ExerciseManagementEditDialog::init(LtsSession::LtsSessionDataDds* session,
         return false;
 
     ExerciseManagement::Exercise data = m_dtc->exercise(exerciseId);
-    m_currentState = data.state();
+    m_currentState = data.state;
     m_ui->dtBegin->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
     m_ui->dtEnd->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
 
@@ -120,18 +122,18 @@ bool ExerciseManagementEditDialog::init(LtsSession::LtsSessionDataDds* session,
     m_operatorModel = new ExerciseOperatorModel(m_session, m_exerciseId, this);
     connect(m_operatorModel, &ExerciseOperatorModel::dataChanged, this, &ExerciseManagementEditDialog::slotChangesMade);
 
-    if (data.id() > 0)
+    if (data.id > 0)
     {
-        m_ui->leName->setText(QString::fromStdString(data.name()));
-        m_ui->dtBegin->setTimezone(data.defaultTimeZone());
-        m_ui->dtBegin->setMsecsSinceEpoch(data.beginTime());
-        m_ui->dtEnd->setTimezone(data.defaultTimeZone());
-        m_ui->dtEnd->setMsecsSinceEpoch(data.endTime());
+        m_ui->leName->setText(QString::fromStdString(data.name));
+        m_ui->dtBegin->setTimezone(data.defaultTimeZone);
+        m_ui->dtBegin->setMsecsSinceEpoch(data.beginTime);
+        m_ui->dtEnd->setTimezone(data.defaultTimeZone);
+        m_ui->dtEnd->setMsecsSinceEpoch(data.endTime);
 
-        m_ui->pteDescription->setPlainText(QString::fromStdString(data.description()));
-        m_ui->pteForces->setPlainText(QString::fromStdString(data.forces()));
-        m_ui->cbTimeZone->setCurrentIndex(m_ui->cbTimeZone->findData(data.defaultTimeZone()));
-        m_ui->cbStartHlaInterface->setChecked(data.hasHlaInterface());
+        m_ui->pteDescription->setPlainText(QString::fromStdString(data.description));
+        m_ui->pteForces->setPlainText(QString::fromStdString(data.forces));
+        m_ui->cbTimeZone->setCurrentIndex(m_ui->cbTimeZone->findData(data.defaultTimeZone));
+        m_ui->cbStartHlaInterface->setChecked(data.hasHlaInterface);
     }
     else
     {
@@ -215,25 +217,25 @@ bool ExerciseManagementEditDialog::init(LtsSession::LtsSessionDataDds* session,
 
     connect(m_dtc.get(), &Interface::Dtc::exercisePhaseChanged, this,
             &ExerciseManagementEditDialog::onExercisePhaseChanged);
-    m_ui->cbActivePhase->setCurrentIndex(m_ui->cbActivePhase->findData(QVariant(data.activePhaseId())));
+    m_ui->cbActivePhase->setCurrentIndex(m_ui->cbActivePhase->findData(QVariant(data.activePhaseId)));
 
     connect(m_dtc.get(), &Interface::Dtc::exerciseChanged, this, &ExerciseManagementEditDialog::onExerciseChanged);
     m_initialRadioGroupId.clear();
-    if (data.radioGroupId().is_set())
+    if (data.radioGroupId.has_value())
     {
-        int curIdx = m_ui->cbRadioGroup->findData(QVariant(data.radioGroupId().get()));
+        int curIdx = m_ui->cbRadioGroup->findData(QVariant(data.radioGroupId.get()));
         if (curIdx < 0)
             curIdx = 0;
         else
-            m_initialRadioGroupId = data.radioGroupId().get();
+            m_initialRadioGroupId = data.radioGroupId.get();
         m_ui->cbRadioGroup->setCurrentIndex(curIdx);
     }
-    m_ui->cbVisibleInWarehouse->setChecked(data.sendToWMS());
-    m_ui->cbLinkedExercise->setCurrentIndex(m_ui->cbLinkedExercise->findData(data.linkedExerciseId()));
+    m_ui->cbVisibleInWarehouse->setChecked(data.sendToWMS);
+    m_ui->cbLinkedExercise->setCurrentIndex(m_ui->cbLinkedExercise->findData(data.linkedExerciseId));
 
-    if (data.trainingAreaId() > 0)
+    if (data.trainingAreaId > 0)
     {
-        int idx = m_ui->cbTrainingArea->findData(QVariant(data.trainingAreaId()));
+        int idx = m_ui->cbTrainingArea->findData(QVariant(data.trainingAreaId));
         m_ui->cbTrainingArea->setCurrentIndex(idx);
     }
 
@@ -287,14 +289,14 @@ void ExerciseManagementEditDialog::requestImage()
 
 void ExerciseManagementEditDialog::onGetExerciseImageReply(const GetExerciseImageReply& reply)
 {
-    if (reply.errorString().empty())
+    if (reply.errorString.empty())
     {
-        m_ui->imageEditor->setPixmap(LtsUtils::getPixmap(reply.imageData()));
+        m_ui->imageEditor->setPixmap(LtsUtils::getPixmap(reply.imageData));
         return;
     }
 
-    QString msg(QString::fromStdString(reply.errorString()));
-    for (const std::string& arg : std::as_const(reply.errorParams()))
+    QString msg(QString::fromStdString(reply.errorString));
+    for (const std::string& arg : std::as_const(reply.errorParams))
         msg = msg.arg(QString::fromStdString(arg));
 
     ERROR_LOG(m_logger) << "loading exercise image failed: " << msg;
@@ -319,10 +321,10 @@ bool ExerciseManagementEditDialog::hasVisibleParties(
 {
     for (const auto& pbe : vpbe)
     {
-        if (pbe.exerciseId() != m_exerciseId)
+        if (pbe.exerciseId != m_exerciseId)
             continue;
 
-        return pbe.visibleParties().is_set();
+        return pbe.visibleParties.has_value();
     }
     return false;
 }
@@ -336,7 +338,7 @@ void ExerciseManagementEditDialog::enaDisaOperatorsButtons()
         return;
     }
     const QPair<bool, OperatorManagement::User> row = m_operatorModel->getRowData(idx.row());
-    bool visibleParties = hasVisibleParties(row.second.visiblePartiesByExercise());
+    bool visibleParties = hasVisibleParties(row.second.visiblePartiesByExercise);
     bool isChecked = row.first;
 
     if (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::ExerciseOperatorEdit))
@@ -373,7 +375,7 @@ void ExerciseManagementEditDialog::onAddExercisePhase()
 
 void ExerciseManagementEditDialog::onRemoveExercisePhase()
 {
-    const int phId = m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id();
+    const int phId = m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id;
     const int folderId = m_flmDtc->getPhaseFolderId(m_exerciseId, phId);
 
     if (folderId > 0)
@@ -382,7 +384,7 @@ void ExerciseManagementEditDialog::onRemoveExercisePhase()
         m_requestHelper->startSingleRequest([req, this]() { return m_flmFtc->folderRemoveRequest(req, this); });
     }
 
-    Core::RemoveElementRequest req(m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id());
+    Core::RemoveElementRequest req(m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id);
     m_requestHelper->startSingleRequest([req, this]() {
         m_ftc->enableExercisePhaseRemove();
         return m_ftc->exercisePhaseRemoveRequest(req, this);
@@ -396,9 +398,9 @@ void ExerciseManagementEditDialog::onEditVisibleParties()
 
     const QModelIndex idx = m_ui->dvOperators->currentIndex();
     const QPair<bool, OperatorManagement::User> row = m_operatorModel->getRowData(idx.row());
-    const int operatorId = row.second.id();
+    const int operatorId = row.second.id;
     bool isChecked = row.first;
-    bool visibleParties = hasVisibleParties(row.second.visiblePartiesByExercise());
+    bool visibleParties = hasVisibleParties(row.second.visiblePartiesByExercise);
 
     if (operatorId <= 0 || isChecked == false || !visibleParties)
         return;
@@ -419,14 +421,14 @@ void ExerciseManagementEditDialog::onEditExercisePhase()
     const QModelIndex idx = m_ui->dvPhases->currentIndex();
     const ExercisePhase exPhase = m_phaseModel->getRowData(idx.row());
 
-    if (exPhase.id() <= 0)
+    if (exPhase.id <= 0)
         return;
-    DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
+    DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id;
 
     ExerciseManagementPhaseEditDialog* dialog = new ExerciseManagementPhaseEditDialog(this);
 
-    dialog->init(m_session, m_exerciseId, exPhase.id());
-    const QString identifier = QLatin1String("EditExercisePhase") + QString::number(exPhase.id());
+    dialog->init(m_session, m_exerciseId, exPhase.id);
+    const QString identifier = QLatin1String("EditExercisePhase") + QString::number(exPhase.id);
 
     addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
 }
@@ -464,8 +466,8 @@ void ExerciseManagementEditDialog::onImport()
             ExerciseModifyRequest req = jsonToExercise(content);
             DEBUG_LOG(m_logger) << "Importing: " << req;
 
-            m_ui->pteForces->setPlainText(QString::fromStdString(req.forces()));
-            m_ui->pteDescription->setPlainText(QString::fromStdString(req.description()));
+            m_ui->pteForces->setPlainText(QString::fromStdString(req.forces));
+            m_ui->pteDescription->setPlainText(QString::fromStdString(req.description));
         }
     }
     return;
@@ -522,14 +524,14 @@ void ExerciseManagementEditDialog::imageModifyError()
 void ExerciseManagementEditDialog::onExerciseChanged(const ExerciseManagement::Exercise& data, DataModification modType)
 {
     Q_UNUSED(modType)
-    if (data.id() == m_exerciseId)
+    if (data.id == m_exerciseId)
     {
         const bool wasModified = hasUnsavedChanges();
-        m_currentState = data.state();
+        m_currentState = data.state;
         enaDisa();
         fillStateCbx();
-        m_ui->cbVisibleInWarehouse->setChecked(data.sendToWMS());
-        m_ui->cbLinkedExercise->setCurrentIndex(m_ui->cbLinkedExercise->findData(data.linkedExerciseId()));
+        m_ui->cbVisibleInWarehouse->setChecked(data.sendToWMS);
+        m_ui->cbLinkedExercise->setCurrentIndex(m_ui->cbLinkedExercise->findData(data.linkedExerciseId));
         if (!wasModified)
             __unchange__();
     }
@@ -541,7 +543,7 @@ void ExerciseManagementEditDialog::onExercisePhaseChanged(const ExerciseManageme
                                                           DataModification modType)
 {
     Q_UNUSED(modType)
-    if (data.exerciseId() == m_exerciseId)
+    if (data.exerciseId == m_exerciseId)
         fillActivePhaseCbx();
 }
 
@@ -575,33 +577,33 @@ void ExerciseManagementEditDialog::fillStateCbx()
         ps->value(QStringLiteral("exm"), QStringLiteral("enableExerciseTerminatedToStopped")).toBool();
 
     m_ui->cbState->clear();
-    switch (m_currentState.underlying())
+    switch (m_currentState)
     {
         case ExerciseState::Created:
-            m_ui->cbState->addItem(tr("Created"), ExerciseState::Created);
-            m_ui->cbState->addItem(tr("Start"), ExerciseState::Started);
+            m_ui->cbState->addItem(tr("Created"), static_cast<int>(ExerciseState::Created));
+            m_ui->cbState->addItem(tr("Start"), static_cast<int>(ExerciseState::Started));
             break;
         case ExerciseState::Started:
-            m_ui->cbState->addItem(tr("Started"), ExerciseState::Started);
-            m_ui->cbState->addItem(tr("Pause"), ExerciseState::Paused);
-            m_ui->cbState->addItem(tr("Stop"), ExerciseState::Stopped);
+            m_ui->cbState->addItem(tr("Started"), static_cast<int>(ExerciseState::Started));
+            m_ui->cbState->addItem(tr("Pause"), static_cast<int>(ExerciseState::Paused));
+            m_ui->cbState->addItem(tr("Stop"), static_cast<int>(ExerciseState::Stopped));
             break;
         case ExerciseState::Paused:
-            m_ui->cbState->addItem(tr("Paused"), ExerciseState::Paused);
-            m_ui->cbState->addItem(tr("Resume"), ExerciseState::Started);
-            m_ui->cbState->addItem(tr("Stop"), ExerciseState::Stopped);
+            m_ui->cbState->addItem(tr("Paused"), static_cast<int>(ExerciseState::Paused));
+            m_ui->cbState->addItem(tr("Resume"), static_cast<int>(ExerciseState::Started));
+            m_ui->cbState->addItem(tr("Stop"), static_cast<int>(ExerciseState::Stopped));
             break;
         case ExerciseState::Stopped:
-            m_ui->cbState->addItem(tr("Stopped"), ExerciseState::Stopped);
-            m_ui->cbState->addItem(tr("Terminated"), ExerciseState::Terminated);
+            m_ui->cbState->addItem(tr("Stopped"), static_cast<int>(ExerciseState::Stopped));
+            m_ui->cbState->addItem(tr("Terminated"), static_cast<int>(ExerciseState::Terminated));
             break;
         case ExerciseState::Terminated:
-            m_ui->cbState->addItem(tr("Terminated"), ExerciseState::Terminated);
+            m_ui->cbState->addItem(tr("Terminated"), static_cast<int>(ExerciseState::Terminated));
             if (enableExerciseTerminatedToStopped)
-                m_ui->cbState->addItem(tr("Stopped"), ExerciseState::Stopped);
+                m_ui->cbState->addItem(tr("Stopped"), static_cast<int>(ExerciseState::Stopped));
             break;
         case ExerciseState::Unknown:
-            m_ui->cbState->addItem(tr("Unknown"), ExerciseState::Unknown);
+            m_ui->cbState->addItem(tr("Unknown"), static_cast<int>(ExerciseState::Unknown));
             break;
     }
 }
@@ -612,7 +614,7 @@ void ExerciseManagementEditDialog::fillTrainingAreaCbx()
     int curIdxTa = m_ui->cbTrainingArea->currentIndex();
     m_ui->cbTrainingArea->clear();
     auto cb = [this](const AssetManagement::TrainingArea& ta) {
-        m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name()), QVariant(ta.id()));
+        m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name), QVariant(ta.id));
     };
     m_asmDtc->trainingAreas(cb);
     m_ui->cbTrainingArea->model()->sort(0);
@@ -627,8 +629,8 @@ void ExerciseManagementEditDialog::fillActivePhaseCbx()
     int curIdxActPh = m_ui->cbActivePhase->currentIndex();
     m_ui->cbActivePhase->clear();
     auto cb = [this](const ExerciseManagement::ExercisePhase& phase) {
-        if (m_exerciseId == phase.exerciseId())
-            m_ui->cbActivePhase->addItem(QString::fromStdString(phase.name()), QVariant(phase.id()));
+        if (m_exerciseId == phase.exerciseId)
+            m_ui->cbActivePhase->addItem(QString::fromStdString(phase.name), QVariant(phase.id));
     };
     m_dtc->exercisePhases(cb);
     m_ui->cbActivePhase->setEnabled(m_ui->cbActivePhase->count() > 1);
@@ -649,15 +651,15 @@ void ExerciseManagementEditDialog::fillRadioGroupCbx()
     const QMap<qint32, ExerciseManagement::Exercise> mapEx = m_dtc->exercises();
     QMap<qint32, ProjectDataManagement::RadioGroup> mapRadioGrp = m_pdmDtc->radioGroups();
     for (auto it = mapEx.begin(); it != mapEx.end(); ++it)
-        if (it.value().id() != m_exerciseId)
-            if (it.value().radioGroupId().is_set())
-                mapRadioGrp.remove(it.value().radioGroupId().get());
+        if (it.value().id != m_exerciseId)
+            if (it.value().radioGroupId.has_value())
+                mapRadioGrp.remove(it.value().radioGroupId.get());
 
     for (auto it = mapRadioGrp.begin(); it != mapRadioGrp.end(); ++it)
     {
         const auto& radioGroup = it.value();
-        if (!radioGroup.base_group())
-            m_ui->cbRadioGroup->addItem(m_pdmDtc->trRadioGroupName(radioGroup.id()), radioGroup.id());
+        if (!radioGroup.base_group)
+            m_ui->cbRadioGroup->addItem(m_pdmDtc->trRadioGroupName(radioGroup.id), radioGroup.id);
     }
 
     m_ui->cbTrainingArea->model()->sort(0);
@@ -680,11 +682,11 @@ void ExerciseManagementEditDialog::fillLinkedExercisesCbx()
     int curId = m_ui->cbLinkedExercise->currentData().toInt();
     m_ui->cbLinkedExercise->clear();
     auto cb = [this](const Exercise& ex) {
-        if (ex.state() != ExerciseManagement::ExerciseState::Created && ex.linkedExerciseId() != m_exerciseId)
+        if (ex.state != ExerciseManagement::ExerciseState::Created && ex.linkedExerciseId != m_exerciseId)
             return;
-        if (ex.id() == m_exerciseId)
+        if (ex.id == m_exerciseId)
             return;
-        m_ui->cbLinkedExercise->addItem(QString::fromStdString(ex.name()), ex.id());
+        m_ui->cbLinkedExercise->addItem(QString::fromStdString(ex.name), ex.id);
     };
     m_dtc->exercises(cb);
     m_ui->cbLinkedExercise->addItem(tr("---"), 0);
@@ -729,7 +731,7 @@ bool ExerciseManagementEditDialog::apply()
     {
         ExerciseState state = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
         ExerciseManagement::Exercise data = m_dtc->exercise(m_exerciseId);
-        if (state == ExerciseState::Stopped && data.state() != ExerciseState::Stopped)
+        if (state == ExerciseState::Stopped && data.state != ExerciseState::Stopped)
         {
             if (LtsWidgets::LtsMessageDialog::showMessage(
                     this, QString(), tr("Are you sure you want to stop the exercise?"), LtsWidgets::Behaviour::Modal,
@@ -737,7 +739,7 @@ bool ExerciseManagementEditDialog::apply()
 
                 retVal = false;
         }
-        else if (state == ExerciseState::Terminated && data.state() != ExerciseState::Terminated)
+        else if (state == ExerciseState::Terminated && data.state != ExerciseState::Terminated)
         {
             if (LtsWidgets::LtsMessageDialog::showMessage(
                     this, QString(), tr("Are you sure you want to terminate the exercise?"),
@@ -751,34 +753,34 @@ bool ExerciseManagementEditDialog::apply()
         {
             ExerciseModifyRequest request;
 
-            request.id(m_exerciseId);
-            request.beginTime(m_ui->dtBegin->msecsSinceEpoch());
-            request.endTime(m_ui->dtEnd->msecsSinceEpoch());
-            request.name(m_ui->leName->text().toStdString());
-            request.sendToWMS(m_ui->cbVisibleInWarehouse->isChecked());
-            request.linkedExerciseId(m_ui->cbLinkedExercise->currentData().toInt());
-            request.trainingAreaId(m_ui->cbTrainingArea->currentData().toInt());
+            request.id = m_exerciseId;
+            request.beginTime = m_ui->dtBegin->msecsSinceEpoch();
+            request.endTime = m_ui->dtEnd->msecsSinceEpoch();
+            request.name = m_ui->leName->text().toStdString();
+            request.sendToWMS = m_ui->cbVisibleInWarehouse->isChecked();
+            request.linkedExerciseId = m_ui->cbLinkedExercise->currentData().toInt();
+            request.trainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
             int radioGroup = m_ui->cbRadioGroup->currentData().toInt();
             if (radioGroup != 0)
             {
                 m_initialRadioGroupId = radioGroup;
-                request.radioGroupId(radioGroup);
+                request.radioGroupId = radioGroup;
             }
 
-            request.symbolFillTypeId(0);
-            request.activePhaseId(m_ui->cbActivePhase->currentData().toInt());
-            request.defaultTimeZone(m_ui->cbTimeZone->currentData().toChar().toLatin1());
-            request.forces(m_ui->pteForces->toPlainText().toStdString());
-            request.description(m_ui->pteDescription->toPlainText().toStdString());
-            request.hasHlaInterface(m_ui->cbStartHlaInterface->isChecked());
-            request.newState(static_cast<ExerciseState>(m_ui->cbState->currentData().toInt()));
-            request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-            request.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
+            request.symbolFillTypeId = 0;
+            request.activePhaseId = m_ui->cbActivePhase->currentData().toInt();
+            request.defaultTimeZone = m_ui->cbTimeZone->currentData().toChar().toLatin1();
+            request.forces = m_ui->pteForces->toPlainText().toStdString();
+            request.description = m_ui->pteDescription->toPlainText().toStdString();
+            request.hasHlaInterface = m_ui->cbStartHlaInterface->isChecked();
+            request.newState = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
+            request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+            request.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
 
-            if (data.startTime() > 0)
-                request.startTime(data.startTime());
-            if (data.stopTime() > 0)
-                request.stopTime(data.stopTime());
+            if (data.startTime > 0)
+                request.startTime = data.startTime;
+            if (data.stopTime > 0)
+                request.stopTime = data.stopTime;
 
             if (!m_requestHelper->startSingleRequest([this, request]() {
                     m_ftc->enableExerciseModify();
@@ -801,21 +803,21 @@ bool ExerciseManagementEditDialog::apply()
     else
     {
         ExerciseCreateRequest request;
-        request.beginTime(m_ui->dtBegin->msecsSinceEpoch());
-        request.endTime(m_ui->dtEnd->msecsSinceEpoch());
-        request.name(m_ui->leName->text().toStdString());
-        request.sendToWMS(m_ui->cbVisibleInWarehouse->isChecked());
-        request.linkedExerciseId(m_ui->cbLinkedExercise->currentData().toInt());
-        request.trainingAreaId(m_ui->cbTrainingArea->currentData().toInt());
+        request.beginTime = m_ui->dtBegin->msecsSinceEpoch();
+        request.endTime = m_ui->dtEnd->msecsSinceEpoch();
+        request.name = m_ui->leName->text().toStdString();
+        request.sendToWMS = m_ui->cbVisibleInWarehouse->isChecked();
+        request.linkedExerciseId = m_ui->cbLinkedExercise->currentData().toInt();
+        request.trainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
         int radioGroup = m_ui->cbRadioGroup->currentData().toInt();
         if (radioGroup != 0)
-            request.radioGroupId(radioGroup);
+            request.radioGroupId = radioGroup;
 
-        request.symbolFillTypeId(0);
-        request.defaultTimeZone(m_ui->cbTimeZone->currentData().toChar().toLatin1());
-        request.forces(m_ui->pteForces->toPlainText().toStdString());
-        request.description(m_ui->pteDescription->toPlainText().toStdString());
-        request.hasHlaInterface(m_ui->cbStartHlaInterface->isChecked());
+        request.symbolFillTypeId = 0;
+        request.defaultTimeZone = m_ui->cbTimeZone->currentData().toChar().toLatin1();
+        request.forces = m_ui->pteForces->toPlainText().toStdString();
+        request.description = m_ui->pteDescription->toPlainText().toStdString();
+        request.hasHlaInterface = m_ui->cbStartHlaInterface->isChecked();
 
         if (!m_requestHelper->startSingleRequest([this, request]() {
                 m_ftc->enableExerciseCreate();
@@ -877,8 +879,8 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
     {
         const auto rowData = m_operatorModel->getRowData(row);
         bool found = false;
-        OperatorManagement::User user = m_opmDtc->user(rowData.second.id());
-        for (auto ex : user.exerciseIds())
+        OperatorManagement::User user = m_opmDtc->user(rowData.second.id);
+        for (auto ex : user.exerciseIds)
             if (ex == thisExerciseId)
                 found = true;
 
@@ -886,14 +888,14 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
             continue;
 
         if (rowData.first)
-            user.exerciseIds().resize(user.exerciseIds().size() + 1, thisExerciseId);
+            user.exerciseIds.resize(user.exerciseIds.size() + 1, thisExerciseId);
         else
-            removeElement(user.exerciseIds(), thisExerciseId);
+            removeElement(user.exerciseIds, thisExerciseId);
 
         OperatorManagement::OperatorCreateModifyRequest req;
-        req.id(user.id());
-        req.visibleExercises() = user.exerciseIds();
-        req.visiblePartiesByExercise() = user.visiblePartiesByExercise();
+        req.id = user.id;
+        req.visibleExercises = user.exerciseIds;
+        req.visiblePartiesByExercise = user.visiblePartiesByExercise;
 
         DEBUG_LOG(m_logger) << "Adding request: " << req;
         m_requestHelper->addRequest([this, req, opmFtc]() {
@@ -909,7 +911,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
 {
 
     QString folderName = m_flmDtc->getExerciseFolderName(newExId);
-    int folderId = createFolder(FileManagement::MainFolder::ExerciseDocuments, folderName);
+    int folderId = createFolder(static_cast<int>(FileManagement::MainFolder::ExerciseDocuments), folderName);
 
     if (folderId <= 0)
         return false;
@@ -943,7 +945,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
 
         if (folderPhaseDocsId > 0)
         {
-            int phId = m_dtc->exercise(newExId).activePhaseId();
+            int phId = m_dtc->exercise(newExId).activePhaseId;
             const QString& phaseName = m_flmDtc->getPhaseFolderName(phId);
             int folderPhaseId = createFolder(folderPhaseDocsId, phaseName);
             DEBUG_LOG(m_logger) << "Phase Folder created with id = " << folderPhaseId;
@@ -955,22 +957,22 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
     DEBUG_LOG(m_logger) << "Markers Folder created with id = " << subFolderId;
 
     FileManagement::PathCreateRequest req;
-    req.parentId(folderId);
-    req.path({"Planning", "TNE Lists"});
-    req.isEditable(false);
-    req.isHidden(false);
-    req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    req.parentId = folderId;
+    req.path = {"Planning", "TNE Lists"};
+    req.isEditable = false;
+    req.isHidden = false;
+    req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     bool success = m_flmFtc->pathCreateRequest(req);
     if (!success)
         ERROR_LOG(m_logger) << "Planning/TNE Lists could not be created";
 
-    req.path({"Tactical Plans", "BDA"});
+    req.path = {"Tactical Plans", "BDA"};
     success = m_flmFtc->pathCreateRequest(req);
     if (!success)
         ERROR_LOG(m_logger) << "Tactical Plans/BDA could not be created";
 
-    req.path({"Tactical Plans", "HQ Data"});
+    req.path = {"Tactical Plans", "HQ Data"};
     success = m_flmFtc->pathCreateRequest(req);
 
     if (!success)
@@ -987,15 +989,15 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
 int ExerciseManagementEditDialog::createFolder(int parentFolderId, const QString& folderName, bool isHidden)
 {
     FileManagement::Folder parentFolder = m_flmDtc->folder(parentFolderId);
-    const std::vector<int32_t>& parentPath = parentFolder.path();
+    const std::vector<int32_t>& parentPath = parentFolder.path;
 
     FileManagement::FolderModifyRequest req;
-    req.name(folderName.toStdString());
-    req.path(parentPath);
-    req.isEditable(false);
-    req.isHidden(isHidden);
-    req.parentId(parentFolderId);
-    req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    req.name = folderName.toStdString();
+    req.path = parentPath;
+    req.isEditable = false;
+    req.isHidden = isHidden;
+    req.parentId = parentFolderId;
+    req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     m_requestHelper->startSingleRequest([this, req]() { return m_flmFtc->folderModifyRequest(req, this); });
 
@@ -1007,18 +1009,18 @@ int ExerciseManagementEditDialog::createFolder(int parentFolderId, const QString
 bool ExerciseManagementEditDialog::createExerciseFolders(int parentFolderId, const QStringList& folderNames)
 {
     FileManagement::Folder parentFolder = m_flmDtc->folder(parentFolderId);
-    const std::vector<int32_t>& parentPath = parentFolder.path();
+    const std::vector<int32_t>& parentPath = parentFolder.path;
 
     FileManagement::FolderModifyRequest req;
-    req.path(parentPath);
-    req.isEditable(false);
-    req.isHidden(false);
-    req.parentId(parentFolderId);
-    req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    req.path = parentPath;
+    req.isEditable = false;
+    req.isHidden = false;
+    req.parentId = parentFolderId;
+    req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     for (const QString& folderName : folderNames)
     {
-        req.name(folderName.toStdString());
+        req.name = folderName.toStdString();
 
         m_requestHelper->addRequest([this, req]() { return m_flmFtc->folderModifyRequest(req, this); });
     }
@@ -1050,8 +1052,8 @@ ExerciseModifyRequest ExerciseManagementEditDialog::setRequestContent() const
 {
     ExerciseModifyRequest req;
 
-    req.forces(m_ui->pteForces->toPlainText().toStdString());
-    req.description(m_ui->pteDescription->toPlainText().toStdString());
+    req.forces = m_ui->pteForces->toPlainText().toStdString();
+    req.description = m_ui->pteDescription->toPlainText().toStdString();
 
     const ExerciseModifyRequest out = req;
     return out;
@@ -1066,23 +1068,23 @@ QByteArray ExerciseManagementEditDialog::exerciseToJson() const
 
     obj[JsonKeys::XMLTYPE()] = JsonKeys::XMLTYPEVALUE();
 
-    obj[JsonKeys::FORCES()] = QString::fromStdString(req.forces());
-    obj[JsonKeys::DESCRIPTION()] = QString::fromStdString(req.description());
+    obj[JsonKeys::FORCES()] = QString::fromStdString(req.forces);
+    obj[JsonKeys::DESCRIPTION()] = QString::fromStdString(req.description);
 
     QJsonArray phases;
     for (int row = 0; row < m_phaseModel->rowCount(); ++row)
     {
         QJsonObject phase;
-        phase.insert(JsonKeys::PID(), m_phaseModel->getRowData(row).id());
-        phase.insert(JsonKeys::PNAME(), QString::fromStdString(m_phaseModel->getRowData(row).name()));
-        phase.insert(JsonKeys::PISDELETED(), m_phaseModel->getRowData(row).isDeleted());
-        phase.insert(JsonKeys::PISUSED(), m_phaseModel->getRowData(row).isUsed());
-        long long beginTime = m_phaseModel->getRowData(row).beginTime() - startExercise;
-        long long endTime = m_phaseModel->getRowData(row).endTime() - startExercise;
+        phase.insert(JsonKeys::PID(), m_phaseModel->getRowData(row).id);
+        phase.insert(JsonKeys::PNAME(), QString::fromStdString(m_phaseModel->getRowData(row).name));
+        phase.insert(JsonKeys::PISDELETED(), m_phaseModel->getRowData(row).isDeleted);
+        phase.insert(JsonKeys::PISUSED(), m_phaseModel->getRowData(row).isUsed);
+        long long beginTime = m_phaseModel->getRowData(row).beginTime - startExercise;
+        long long endTime = m_phaseModel->getRowData(row).endTime - startExercise;
         phase.insert(JsonKeys::PBEGINTIME(), beginTime);
         phase.insert(JsonKeys::PENDTIME(), endTime);
-        phase.insert(JsonKeys::PDESCRIPTION(), QString::fromStdString(m_phaseModel->getRowData(row).description()));
-        phase.insert(JsonKeys::PEXERCISEID(), m_phaseModel->getRowData(row).exerciseId());
+        phase.insert(JsonKeys::PDESCRIPTION(), QString::fromStdString(m_phaseModel->getRowData(row).description));
+        phase.insert(JsonKeys::PEXERCISEID(), m_phaseModel->getRowData(row).exerciseId);
         phases.append(phase);
     }
     obj[JsonKeys::PHASES()] = phases;
@@ -1104,8 +1106,8 @@ ExerciseModifyRequest ExerciseManagementEditDialog::jsonToExercise(const QByteAr
     const QJsonDocument doc(QJsonDocument::fromJson(content));
     const QJsonObject obj(doc.object());
 
-    result.forces(obj[JsonKeys::FORCES()].toString().toStdString());
-    result.description(obj[JsonKeys::DESCRIPTION()].toString().toStdString());
+    result.forces = obj[JsonKeys::FORCES()].toString().toStdString();
+    result.description = obj[JsonKeys::DESCRIPTION()].toString().toStdString();
 
     QJsonArray phasesArray = obj[JsonKeys::PHASES()].toArray();
     QVector<ExerciseManagement::ExercisePhase> phases;
@@ -1114,15 +1116,15 @@ ExerciseModifyRequest ExerciseManagementEditDialog::jsonToExercise(const QByteAr
     {
         QJsonObject phaseObj = (*it).toObject();
         ExerciseManagement::ExercisePhase phase;
-        phase.id(phaseObj[JsonKeys::PID()].toInt());
-        phase.name(phaseObj[JsonKeys::PNAME()].toString().toStdString());
-        phase.isDeleted(phaseObj[JsonKeys::PISDELETED()].toBool());
-        phase.isUsed(phaseObj[JsonKeys::PISUSED()].toBool());
-        phase.description(phaseObj[JsonKeys::PDESCRIPTION()].toString().toStdString());
+        phase.id = phaseObj[JsonKeys::PID()].toInt();
+        phase.name = phaseObj[JsonKeys::PNAME()].toString().toStdString();
+        phase.isDeleted = phaseObj[JsonKeys::PISDELETED()].toBool();
+        phase.isUsed = phaseObj[JsonKeys::PISUSED()].toBool();
+        phase.description = phaseObj[JsonKeys::PDESCRIPTION()].toString().toStdString();
 
-        phase.beginTime(phaseObj[JsonKeys::PBEGINTIME()].toInt() + m_ui->dtBegin->msecsSinceEpoch());
-        phase.endTime(phaseObj[JsonKeys::PENDTIME()].toInt() + m_ui->dtBegin->msecsSinceEpoch());
-        phase.exerciseId(phaseObj[JsonKeys::PEXERCISEID()].toInt());
+        phase.beginTime = phaseObj[JsonKeys::PBEGINTIME()].toInt() + m_ui->dtBegin->msecsSinceEpoch();
+        phase.endTime = phaseObj[JsonKeys::PENDTIME()].toInt() + m_ui->dtBegin->msecsSinceEpoch();
+        phase.exerciseId = phaseObj[JsonKeys::PEXERCISEID()].toInt();
         phases.append(phase);
     }
     m_phaseModel->setData(phases);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.h
index 626886e8a..31bbb25e3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.h
@@ -11,7 +11,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <AssetManagement/asm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
index e43dc0ce7..9b295d10d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
@@ -267,7 +267,7 @@ void InterfaceImpl::slotSelectExercise(int partitionId)
 
     ExerciseManagement::Exercise exc = m_dtc->exercise(partitionId);
 
-    int excId = exc.id();
+    int excId = exc.id;
 
     if (excId == 0)
     {
@@ -325,16 +325,16 @@ void InterfaceImpl::checkNeedRecalcMgrsSquares(const ExerciseManagement::Exercis
 {
   if (!LtsCoordTrans::defaultMgrsSquares().isEmpty())
     return;
-  AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(exc.trainingAreaId());
+  AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(exc.trainingAreaId);
 
-  if (ta.id() != exc.trainingAreaId())
+  if (ta.id != exc.trainingAreaId)
   {
-    qWarning() << "Could not fetch Training Area with id " << exc.trainingAreaId();
+    qWarning() << "Could not fetch Training Area with id " << exc.trainingAreaId;
     abort();
   }
 
-  LtsCoordTrans::UtmCoordinate bottomLeft  = LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat());
-  LtsCoordTrans::getMgrsSquares(QRectF(bottomLeft.geographic(0, ta.height()), bottomLeft.geographic(ta.width(), 0)), true, true);
+  LtsCoordTrans::UtmCoordinate bottomLeft  = LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat);
+  LtsCoordTrans::getMgrsSquares(QRectF(bottomLeft.geographic(0, ta.height), bottomLeft.geographic(ta.width, 0)), true, true);
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
index 81604313f..282784810 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_edit_party_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_exm_edit_party_dialog.h"
 
@@ -8,7 +9,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
-#include <ExerciseManagement/exm_data_plugin.h>
+#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -23,6 +24,7 @@ ExerciseEditPartyDialog::ExerciseEditPartyDialog(const int operatorId, const int
       m_exerciseId(exerciseId), m_visiblePartiesChanged(false), m_adlerVisiblePartiesChanged(false),
       m_menuGroup(menuGroup), m_visiblePartiesModel(nullptr), m_adlerVisiblePartiesModel(nullptr), m_opmDtc(nullptr),
       m_opmFtc(nullptr), m_ui(new Ui::ExerciseEditPartyDialog), m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     setNoTopicLock();
     m_ui->setupUi(this);
@@ -145,13 +147,14 @@ bool ExerciseEditPartyDialog::apply()
         return true;
 
     OperatorManagement::OperatorUpdateVisiblePartiesByExerciseRequest req;
-    req.id(m_operatorId);
-    req.exerciseId(m_exerciseId);
+    req.id = m_operatorId;
+    req.exerciseId = m_exerciseId;
 
     if (!m_visiblePartiesChanged && !m_adlerVisiblePartiesChanged)
         return false;
 
-    QSet<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds().toList().toSet();
+    const QVector<int> &checkedPartyIds = m_visiblePartiesModel->getCheckedIds();
+    QSet<int> visiblePartyIds(checkedPartyIds.begin(), checkedPartyIds.end());
 
     visiblePartyIds.insert(0);
     visiblePartyIds.insert(1);
@@ -161,16 +164,16 @@ bool ExerciseEditPartyDialog::apply()
         DEBUG_LOG(m_logger) << "visible party: " << visible;
     for (const int hidden : hiddenPartyIds)
         DEBUG_LOG(m_logger) << "hidden party: " << hidden;
-    req.hiddenParties().set({});
-    req.visibleParties().set({});
-    std::copy(hiddenPartyIds.begin(), hiddenPartyIds.end(), std::back_inserter(req.hiddenParties().get()));
-    std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(req.visibleParties().get()));
+    req.hiddenParties.set({});
+    req.visibleParties.set({});
+    std::copy(hiddenPartyIds.begin(), hiddenPartyIds.end(), std::back_inserter(req.hiddenParties.get()));
+    std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(req.visibleParties.get()));
 
-    req.properties(adlerVisiblePartiesToJson().toStdString());
+    req.properties = adlerVisiblePartiesToJson().toStdString();
 
-    DEBUG_LOG(m_logger) << "----------------- opId: " << req.id() << ", exId:" << req.exerciseId()
+    DEBUG_LOG(m_logger) << "----------------- opId: " << req.id << ", exId:" << req.exerciseId
                         << ", req.hiddenParties.size:" << hiddenPartyIds.size()
-                        << "adlerVisibleParties: " << req.properties();
+                        << "adlerVisibleParties: " << req.properties;
 
     return operatorUpdateVisiblePartiesByExercise(req);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.cpp
index 96d913dd2..2dd477d4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.cpp
@@ -2,9 +2,10 @@
 
 
 #include "exm_edit_phase_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_exm_edit_phase_dialog.h"
 #include <ExerciseManagement/exm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <LtsSession/lts_session_data.h>
 
 namespace ExerciseManagement
@@ -13,6 +14,7 @@ ExerciseManagementPhaseEditDialog::ExerciseManagementPhaseEditDialog(QWidget *pa
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_ui(new Ui::ExerciseManagementPhaseEditDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -44,18 +46,18 @@ bool ExerciseManagementPhaseEditDialog::init(LtsSession::LtsSessionDataDds *sess
 
   ExerciseManagement::ExercisePhase data = m_dtc->exercisePhase(phaseId);
 
-  m_ui->leName->setText(QString::fromUtf8(data.name().c_str()));
-  m_ui->pteDescription->setPlainText(QString::fromStdString(data.description()));
-  m_ui->dtStart->setMsecsSinceEpoch(data.beginTime());
-  m_ui->dtEnd->setMsecsSinceEpoch(data.endTime());
+  m_ui->leName->setText(QString::fromUtf8(data.name.c_str()));
+  m_ui->pteDescription->setPlainText(QString::fromStdString(data.description));
+  m_ui->dtStart->setMsecsSinceEpoch(data.beginTime);
+  m_ui->dtEnd->setMsecsSinceEpoch(data.endTime);
   m_ui->dtStart->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
   m_ui->dtEnd->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
 
   
   if (m_exercisePhaseId <= 0)
   {
-    m_ui->dtStart->setMsecsSinceEpoch(m_dtc->exercise(exerciseId).beginTime());
-    m_ui->dtEnd->setMsecsSinceEpoch(m_dtc->exercise(exerciseId).endTime());
+    m_ui->dtStart->setMsecsSinceEpoch(m_dtc->exercise(exerciseId).beginTime);
+    m_ui->dtEnd->setMsecsSinceEpoch(m_dtc->exercise(exerciseId).endTime);
   }
 
   setOnlineHelpFilename(QStringLiteral("Situation-Exercise_Phases"));
@@ -83,12 +85,12 @@ bool ExerciseManagementPhaseEditDialog::apply()
       qint64      end   = m_ui->dtEnd->msecsSinceEpoch();
 
       ExercisePhaseModifyRequest req;
-      req.name(name);
-      req.description(description);
-      req.beginTime(start);
-      req.endTime(end);
-      req.exerciseId(m_exerciseId);
-      req.id(m_exercisePhaseId);
+      req.name = name;
+      req.description = description;
+      req.beginTime = start;
+      req.endTime = end;
+      req.exerciseId = m_exerciseId;
+      req.id = m_exercisePhaseId;
       m_ftc->enableExercisePhaseModify();
       return m_ftc->exercisePhaseModifyRequest(req, this);
     });
@@ -115,11 +117,11 @@ bool ExerciseManagementPhaseEditDialog::apply()
       int folderPhaseDocsId = m_flmDtc->findFolder(exeFolderId, folderName);
 
       FileManagement::FolderModifyRequest req;
-      req.name(m_flmDtc->getPhaseFolderName(phaseId).toStdString());
-      req.isEditable(false);
-      req.isHidden(false);
-      req.parentId(folderPhaseDocsId);
-      req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+      req.name = m_flmDtc->getPhaseFolderName(phaseId).toStdString();
+      req.isEditable = false;
+      req.isHidden = false;
+      req.parentId = folderPhaseDocsId;
+      req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
       m_requestHelper->startSingleRequest([this, req]()
       {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.cpp
index 32259c283..0deab1ec6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.cpp
@@ -4,6 +4,7 @@
 #include "exm_edit_visible_parties_model.h"
 #include <ParticipantManagement/ppm_translation.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ExerciseManagement
 {
@@ -54,9 +55,9 @@ QVariant ExerciseEditVisiblePartiesModel::data(const QModelIndex &index, int rol
   switch (index.column())
   {
   case ColId:
-    return party.id();
+    return party.id;
   case ColName:
-    return ParticipantManagement::trPartyName(party.name());
+    return ParticipantManagement::trPartyName(party.name);
   }
   return {};
 }
@@ -74,7 +75,7 @@ void ExerciseEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         removeRow(i);
         return;
@@ -86,7 +87,7 @@ void ExerciseEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         m_vecData[i].second = data;
         const QModelIndex idx(index(i, ColName, QModelIndex()));
@@ -102,7 +103,7 @@ void ExerciseEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
 bool ExerciseEditVisiblePartiesModel::isFiltered(const QPair<bool, ParticipantManagement::Party> &data, DataModification modType) const
 {
   
-  if (data.second.id() <= 1 )
+  if (data.second.id <= 1 )
     return true;
 
   return LtsCheckableTableModel::isFiltered(data, modType);
@@ -110,16 +111,16 @@ bool ExerciseEditVisiblePartiesModel::isFiltered(const QPair<bool, ParticipantMa
 
 bool ExerciseEditVisiblePartiesModel::hasParty(const ParticipantManagement::Party &party) const
 {
-  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise();
+  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise;
 
   for (const auto &exerciseParties : visiblePartiesByExercise)
   {
-    if (exerciseParties.exerciseId() != m_exerciseId)
+    if (exerciseParties.exerciseId != m_exerciseId)
       continue;
-    if (!exerciseParties.visibleParties().is_set()) 
+    if (!exerciseParties.visibleParties.has_value()) 
       return false;
-    for (const auto &partyId : exerciseParties.visibleParties().get())
-      if (partyId == party.id())
+    for (const auto &partyId : exerciseParties.visibleParties.get())
+      if (partyId == party.id)
         return true;
     return false;
   }
@@ -128,16 +129,16 @@ bool ExerciseEditVisiblePartiesModel::hasParty(const ParticipantManagement::Part
 
 bool ExerciseEditVisiblePartiesModel::isPartyHidden(const ParticipantManagement::Party &party) const
 {
-  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise();
+  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise;
 
   for (const auto &exerciseParties : visiblePartiesByExercise)
   {
-    if (exerciseParties.exerciseId() != m_exerciseId)
+    if (exerciseParties.exerciseId != m_exerciseId)
       continue;
-    if (!exerciseParties.hiddenParties().is_set()) 
+    if (!exerciseParties.hiddenParties.has_value()) 
       return false;
-    for (const auto &partyId : exerciseParties.hiddenParties().get())
-      if (partyId == party.id())
+    for (const auto &partyId : exerciseParties.hiddenParties.get())
+      if (partyId == party.id)
         return true;
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
index 806a69733..1ff16e475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 
 #include <LtsSession/lts_session_data_dds.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_exercise_purpose.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_exercise_purpose.cpp
index 057da12ae..f405eed12 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_exercise_purpose.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_exercise_purpose.cpp
@@ -2,6 +2,7 @@
 
 
 #include "exm_exercise_purpose.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_exm_exercise_purpose.h"
 
 #include <ExerciseManagement/exm_data_plugin_interface.h>
@@ -18,6 +19,7 @@ ExerciseManagementExercisePurpose::ExerciseManagementExercisePurpose(const QStri
   , m_exercise()
   , m_requestHelper(new LtsUtils::RequestHelper(this))
 
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -43,8 +45,8 @@ bool ExerciseManagementExercisePurpose::init(LtsSession::LtsSessionDataDds *sess
 
   m_exercise = m_dtc->exercise(m_session->exerciseId());
 
-  m_ui->pteForces->setPlainText(QString::fromStdString(m_exercise.forces()));
-  m_ui->pteDescription->setPlainText(QString::fromStdString(m_exercise.description()));
+  m_ui->pteForces->setPlainText(QString::fromStdString(m_exercise.forces));
+  m_ui->pteDescription->setPlainText(QString::fromStdString(m_exercise.description));
 
   return true;
 }
@@ -57,24 +59,24 @@ void ExerciseManagementExercisePurpose::retranslate()
 
 bool ExerciseManagementExercisePurpose::apply()
 {
-  if (m_exercise.id() > 0)
+  if (m_exercise.id > 0)
   {
     ExerciseModifyRequest request;
     
-    request.id(m_exercise.id());
-    request.beginTime(m_exercise.beginTime());
-    request.endTime(m_exercise.endTime());
-    request.name(m_exercise.name());
-    request.sendToWMS(m_exercise.sendToWMS());
-    request.linkedExerciseId(m_exercise.linkedExerciseId());
-    request.trainingAreaId(m_exercise.trainingAreaId());
-    request.radioGroupId(m_exercise.radioGroupId());
-    request.symbolFillTypeId(m_exercise.symbolFillTypeId());
-    request.activePhaseId(m_exercise.activePhaseId());
-    request.defaultTimeZone(m_exercise.defaultTimeZone());
-    request.forces(m_ui->pteForces->toPlainText().toStdString());
-    request.description(m_ui->pteDescription->toPlainText().toStdString());
-    request.newState(m_exercise.state());
+    request.id = m_exercise.id;
+    request.beginTime = m_exercise.beginTime;
+    request.endTime = m_exercise.endTime;
+    request.name = m_exercise.name;
+    request.sendToWMS = m_exercise.sendToWMS;
+    request.linkedExerciseId = m_exercise.linkedExerciseId;
+    request.trainingAreaId = m_exercise.trainingAreaId;
+    request.radioGroupId = m_exercise.radioGroupId;
+    request.symbolFillTypeId = m_exercise.symbolFillTypeId;
+    request.activePhaseId = m_exercise.activePhaseId;
+    request.defaultTimeZone = m_exercise.defaultTimeZone;
+    request.forces = m_ui->pteForces->toPlainText().toStdString();
+    request.description = m_ui->pteDescription->toPlainText().toStdString();
+    request.newState = m_exercise.state;
 
     if(!m_requestHelper->startSingleRequest(
          [this, request]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
index c0af475d7..52eef4b5f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_operator_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_exm_operator_edit.h"
 
@@ -13,6 +14,7 @@ ExerciseManagementOperatorEdit::ExerciseManagementOperatorEdit(const QString& me
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
       m_ui(new Ui::ExerciseManagementOperatorEdit), m_opmDtc(nullptr), m_session(nullptr), m_operatorModel(nullptr),
       m_menuGroup(menuGroup), m_exercise(), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -42,7 +44,7 @@ bool ExerciseManagementOperatorEdit::init(LtsSession::LtsSessionDataDds* session
         return false;
 
     m_exercise = dtc->exercise(m_session->exerciseId());
-    m_operatorModel = new ExerciseOperatorModel(m_session, m_exercise.id(), this);
+    m_operatorModel = new ExerciseOperatorModel(m_session, m_exercise.id, this);
     m_ui->dvOperators->setModel(m_operatorModel);
     m_ui->dvOperators->seamless();
     connect(m_operatorModel, &ExerciseOperatorModel::dataChanged, this,
@@ -78,9 +80,9 @@ void ExerciseManagementOperatorEdit::retranslate()
 
 bool ExerciseManagementOperatorEdit::apply()
 {
-    if (m_exercise.id() > 0)
+    if (m_exercise.id > 0)
     {
-        sendModifiedOperators(m_exercise.id());
+        sendModifiedOperators(m_exercise.id);
         return true;
     }
 
@@ -114,8 +116,8 @@ void ExerciseManagementOperatorEdit::sendModifiedOperators(int thisExerciseId)
     {
         const auto rowData = m_operatorModel->getRowData(row);
         bool found = false;
-        OperatorManagement::User user = m_opmDtc->user(rowData.second.id());
-        for (auto ex : user.exerciseIds())
+        OperatorManagement::User user = m_opmDtc->user(rowData.second.id);
+        for (auto ex : user.exerciseIds)
             if (ex == thisExerciseId)
                 found = true;
 
@@ -123,14 +125,14 @@ void ExerciseManagementOperatorEdit::sendModifiedOperators(int thisExerciseId)
             continue;
 
         if (rowData.first)
-            user.exerciseIds().resize(user.exerciseIds().size() + 1, thisExerciseId);
+            user.exerciseIds.resize(user.exerciseIds.size() + 1, thisExerciseId);
         else
-            removeElement(user.exerciseIds(), thisExerciseId);
+            removeElement(user.exerciseIds, thisExerciseId);
 
         OperatorManagement::OperatorCreateModifyRequest req;
-        req.id(user.id());
-        req.visibleExercises() = user.exerciseIds();
-        req.visiblePartiesByExercise() = user.visiblePartiesByExercise();
+        req.id = user.id;
+        req.visibleExercises = user.exerciseIds;
+        req.visiblePartiesByExercise = user.visiblePartiesByExercise;
 
         m_requestHelper->startSingleRequest(
             [this, req, opmFtc]() { return opmFtc->operatorCreateModifyRequest(req, this); });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.cpp
index 54afdab12..3f5153d99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.cpp
@@ -27,7 +27,7 @@ ExerciseOperatorModel::ExerciseOperatorModel(LtsSession::LtsSessionDataDds *sess
 
   auto cb = [this](const OperatorManagement::User &user)
   {
-    if (user.id() != s_OrganisatorId)
+    if (user.id != s_OrganisatorId)
       insertRow(qMakePair(hasMembership(user), user));
   };
   m_opmDtc->users(cb);
@@ -44,14 +44,14 @@ QVariant ExerciseOperatorModel::data(const QModelIndex &index, int role) const
     return LtsCheckableTableModel::data(index, role);
 
   const auto &entry = m_vecData.at(index.row()).second;
-  std::vector<OperatorManagement::PartiesByExercise> vpbe = entry.visiblePartiesByExercise();
+  std::vector<OperatorManagement::PartiesByExercise> vpbe = entry.visiblePartiesByExercise;
 
   switch (index.column())
   {
   case Name:
-    return QString::fromStdString(entry.name());
+    return QString::fromStdString(entry.name);
   case Description:
-    return QString::fromStdString(entry.description());
+    return QString::fromStdString(entry.description);
   case VisibleParties:
   {
     return hasVisibleParties(vpbe);
@@ -66,16 +66,16 @@ QString ExerciseOperatorModel::hasVisibleParties(const std::vector<OperatorManag
                                         : 0 ;
   for (const auto &pbe : vpbe)
   {
-    if (pbe.exerciseId() != exerciseId)
+    if (pbe.exerciseId != exerciseId)
       continue;
 
     std::vector<int32_t> hiddenParties = {};
-    if (pbe.hiddenParties().is_set()) 
-      hiddenParties = pbe.hiddenParties().get();
+    if (pbe.hiddenParties.has_value()) 
+      hiddenParties = pbe.hiddenParties.get();
 
-    if(pbe.visibleParties().is_set()) 
+    if(pbe.visibleParties.has_value()) 
     {
-      return visibleParties(pbe.visibleParties().get(),
+      return visibleParties(pbe.visibleParties.get(),
                             hiddenParties);
     }
   }
@@ -98,7 +98,7 @@ QString ExerciseOperatorModel::visibleParties(const std::vector<int32_t> &visibl
       isHidden = true;
     }
     if (!isHidden)
-      result.append(ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name()));
+      result.append(ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name));
   }
 
   return result.join(QStringLiteral(", "));
@@ -116,7 +116,7 @@ void ExerciseOperatorModel::onOperatorChanged(const OperatorManagement::User &da
   case DataModification::eRemoved:
   {
     for (int i = 0; i < m_vecData.size(); ++i)
-      if (m_vecData[i].second.id() == data.id())
+      if (m_vecData[i].second.id == data.id)
       {
         removeRow(i);
         break;
@@ -126,7 +126,7 @@ void ExerciseOperatorModel::onOperatorChanged(const OperatorManagement::User &da
   case DataModification::eModified:
   {
     for (int i = 0; i < m_vecData.size(); ++i)
-      if (m_vecData[i].second.id() == data.id())
+      if (m_vecData[i].second.id == data.id)
       {
         m_vecData[i].second = data;
         break;
@@ -138,7 +138,7 @@ void ExerciseOperatorModel::onOperatorChanged(const OperatorManagement::User &da
 
 bool ExerciseOperatorModel::hasMembership(const OperatorManagement::User &user) const
 {
-  for (const auto exerciseId : user.exerciseIds())
+  for (const auto exerciseId : user.exerciseIds)
     if (exerciseId == m_exerciseId)
       return true;
   return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.h
index 80cbaac47..dcb5790c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <LtsSession/lts_session_data_dds.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.cpp
index 87c138066..878c8542e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_phase_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "exm_edit_phase_dialog.h"
 #include "exm_phase_model.h"
@@ -16,6 +17,7 @@ ExerciseManagementPhaseEdit::ExerciseManagementPhaseEdit(const QString& menuGrou
       m_ui(new Ui::ExerciseManagementPhaseEdit), m_dtc(nullptr), m_ftc(nullptr), m_flmDtc(nullptr), m_flmFtc(nullptr),
       m_session(nullptr), m_phaseModel(nullptr), m_menuGroup(menuGroup), m_exercise(),
       m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -43,7 +45,7 @@ bool ExerciseManagementPhaseEdit::init(LtsSession::LtsSessionDataDds* session)
     m_exercise = m_dtc->exercise(m_session->exerciseId());
 
     m_phaseModel = new ExercisePhaseModel(this);
-    m_phaseModel->initModel(m_exercise.id(), m_dtc);
+    m_phaseModel->initModel(m_exercise.id, m_dtc);
 
     m_ui->dvPhases->setModel(m_phaseModel);
     m_ui->dvPhases->hideColumn(3);
@@ -75,7 +77,7 @@ void ExerciseManagementPhaseEdit::enaDisaPhaseButtons()
 void ExerciseManagementPhaseEdit::onAddExercisePhase()
 {
     ExerciseManagementPhaseEditDialog* dialog = new ExerciseManagementPhaseEditDialog(this);
-    dialog->init(m_session, m_exercise.id(), -1);
+    dialog->init(m_session, m_exercise.id, -1);
 
     addDialog(dialog, m_menuGroup, QLatin1String("NewExercisePhase"), LtsWidgets::LayoutArea::eDialogTab);
 }
@@ -85,22 +87,22 @@ void ExerciseManagementPhaseEdit::onEditExercisePhase()
     const QModelIndex idx = m_ui->dvPhases->currentIndex();
     const ExercisePhase exPhase = m_phaseModel->getRowData(idx.row());
 
-    if (exPhase.id() <= 0)
+    if (exPhase.id <= 0)
         return;
-    DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
+    DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id;
 
     ExerciseManagementPhaseEditDialog* dialog = new ExerciseManagementPhaseEditDialog(this);
 
-    dialog->init(m_session, m_exercise.id(), exPhase.id());
-    const QString identifier = QLatin1String("EditExercisePhase") + QString::number(exPhase.id());
+    dialog->init(m_session, m_exercise.id, exPhase.id);
+    const QString identifier = QLatin1String("EditExercisePhase") + QString::number(exPhase.id);
 
     addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
 }
 
 void ExerciseManagementPhaseEdit::onRemoveExercisePhase()
 {
-    const int phId = m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id();
-    int exeFolderId = m_flmDtc->getExerciseFolderId(m_exercise.id());
+    const int phId = m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id;
+    int exeFolderId = m_flmDtc->getExerciseFolderId(m_exercise.id);
     const int folderId = m_flmDtc->getPhaseFolderId(exeFolderId, phId);
 
     if (folderId > 0)
@@ -109,7 +111,7 @@ void ExerciseManagementPhaseEdit::onRemoveExercisePhase()
         m_requestHelper->startSingleRequest([req, this]() { return m_flmFtc->folderRemoveRequest(req, this); });
     }
 
-    Core::RemoveElementRequest req(m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id());
+    Core::RemoveElementRequest req(m_phaseModel->getRowData(m_ui->dvPhases->currentIndex().row()).id);
     m_requestHelper->startSingleRequest([req, this]() {
         m_ftc->enableExercisePhaseRemove();
         return m_ftc->exercisePhaseRemoveRequest(req, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.h
index d8b0b9f5b..897900f8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_edit.h
@@ -9,7 +9,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session_data_dds.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 namespace Ui {
 class ExerciseManagementPhaseEdit;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.cpp
index 03dff9967..113029673 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.cpp
@@ -1,6 +1,7 @@
 
 
 #include "exm_phase_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace ExerciseManagement
 {
@@ -9,6 +10,7 @@ ExercisePhaseModel::ExercisePhaseModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<ExerciseManagement::ExercisePhase>(
           {tr("Phase"), tr("Start"), tr("End"), tr("Description"), tr("Exercise-Id")}, parent),
       m_exmDtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -37,15 +39,15 @@ QVariant ExercisePhaseModel::data(const QModelIndex& index, int role) const
         switch (index.column())
         {
             case Name:
-                return QString::fromStdString(exPhase.name());
+                return QString::fromStdString(exPhase.name);
             case Start:
-                return QDateTime::fromMSecsSinceEpoch(exPhase.beginTime());
+                return QDateTime::fromMSecsSinceEpoch(exPhase.beginTime);
             case End:
-                return QDateTime::fromMSecsSinceEpoch(exPhase.endTime());
+                return QDateTime::fromMSecsSinceEpoch(exPhase.endTime);
             case Description:
-                return QString::fromStdString(exPhase.description());
+                return QString::fromStdString(exPhase.description);
             case ExerciseId:
-                return (exPhase.exerciseId());
+                return (exPhase.exerciseId);
         }
     }
 
@@ -68,9 +70,9 @@ bool ExercisePhaseProxyModel::lessThan(const QModelIndex& source_left, const QMo
     switch (source_left.column())
     {
         case ExercisePhaseModel::Start:
-            return dataLeft.beginTime() < dataRight.beginTime();
+            return dataLeft.beginTime < dataRight.beginTime;
         case ExercisePhaseModel::End:
-            return dataLeft.endTime() < dataRight.endTime();
+            return dataLeft.endTime < dataRight.endTime;
         case ExercisePhaseModel::Name:
         case ExercisePhaseModel::Description:
         case ExercisePhaseModel::ExerciseId:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.h
index 2c3571662..05f7aaad7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_phase_model.h
@@ -28,7 +28,7 @@ class ExercisePhaseModel final : public LtsWidgets::LtsAbstractTableModel<Exerci
 
     bool isFiltered(const ExercisePhase& data, DataModification modType) const override
     {
-        if (data.exerciseId() != m_exerciseId)
+        if (data.exerciseId != m_exerciseId)
             return true;
         return LtsWidgets::LtsAbstractTableModel<ExerciseManagement::ExercisePhase>::isFiltered(data, modType);
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp
index 3df9fc9cb..b328454a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp
@@ -2,6 +2,7 @@
 
 
 #include "exm_state_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_exm_state_edit.h"
 
 #include <ExerciseManagement/exm_data_plugin_interface.h>
@@ -20,6 +21,7 @@ ExerciseManagementStateEdit::ExerciseManagementStateEdit(const QString &menuGrou
   , m_exercise()
   , m_currentState(ExerciseState::Unknown)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -53,7 +55,7 @@ bool ExerciseManagementStateEdit::init(LtsSession::LtsSessionDataDds *session)
     return false;
 
   m_exercise = m_dtc->exercise(m_session->exerciseId());
-  m_currentState = m_exercise.state();
+  m_currentState = m_exercise.state;
 
   
   fillStateCbx();
@@ -69,7 +71,7 @@ bool ExerciseManagementStateEdit::init(LtsSession::LtsSessionDataDds *session)
 
   
   connect(m_dtc.get(), &Interface::Dtc::exercisePhaseChanged, this, &ExerciseManagementStateEdit::onExercisePhaseChanged);
-  m_ui->cbActivePhase->setCurrentIndex(m_ui->cbActivePhase->findData(QVariant(m_exercise.activePhaseId())));
+  m_ui->cbActivePhase->setCurrentIndex(m_ui->cbActivePhase->findData(QVariant(m_exercise.activePhaseId)));
 
   return true;
 }
@@ -83,32 +85,32 @@ void ExerciseManagementStateEdit::fillStateCbx()
 
   
   m_ui->cbState->clear();
-  switch (m_currentState.underlying())
+  switch (m_currentState)
   {
   case ExerciseState::Created:
-    m_ui->cbState->addItem(tr("Created"), ExerciseState::Created);
-    m_ui->cbState->addItem(tr("Start"), ExerciseState::Started);
+    m_ui->cbState->addItem(tr("Created"), static_cast<int>(ExerciseState::Created));
+    m_ui->cbState->addItem(tr("Start"), static_cast<int>(ExerciseState::Started));
     break;
   case ExerciseState::Started:
-    m_ui->cbState->addItem(tr("Started"), ExerciseState::Started);
-    m_ui->cbState->addItem(tr("Pause"), ExerciseState::Paused);
-    m_ui->cbState->addItem(tr("Stop"), ExerciseState::Stopped);
+    m_ui->cbState->addItem(tr("Started"), static_cast<int>(ExerciseState::Started));
+    m_ui->cbState->addItem(tr("Pause"), static_cast<int>(ExerciseState::Paused));
+    m_ui->cbState->addItem(tr("Stop"), static_cast<int>(ExerciseState::Stopped));
     break;
   case ExerciseState::Paused:
-    m_ui->cbState->addItem(tr("Paused"), ExerciseState::Paused);
-    m_ui->cbState->addItem(tr("Resume"), ExerciseState::Started);
-    m_ui->cbState->addItem(tr("Stop"), ExerciseState::Stopped);
+    m_ui->cbState->addItem(tr("Paused"), static_cast<int>(ExerciseState::Paused));
+    m_ui->cbState->addItem(tr("Resume"), static_cast<int>(ExerciseState::Started));
+    m_ui->cbState->addItem(tr("Stop"), static_cast<int>(ExerciseState::Stopped));
     break;
   case ExerciseState::Stopped:
-    m_ui->cbState->addItem(tr("Stopped"), ExerciseState::Stopped);
+    m_ui->cbState->addItem(tr("Stopped"), static_cast<int>(ExerciseState::Stopped));
     break;
   case ExerciseState::Terminated:
-    m_ui->cbState->addItem(tr("Terminated"), ExerciseState::Terminated);
+    m_ui->cbState->addItem(tr("Terminated"), static_cast<int>(ExerciseState::Terminated));
     if (enableExerciseTerminatedToStopped)
-      m_ui->cbState->addItem(tr("Stopped"), ExerciseState::Stopped);
+      m_ui->cbState->addItem(tr("Stopped"), static_cast<int>(ExerciseState::Stopped));
     break;
   case ExerciseState::Unknown:
-    m_ui->cbState->addItem(tr("Unknown"), ExerciseState::Unknown);
+    m_ui->cbState->addItem(tr("Unknown"), static_cast<int>(ExerciseState::Unknown));
     break;
   }
 }
@@ -121,8 +123,8 @@ void ExerciseManagementStateEdit::fillActivePhaseCbx()
 
   auto cb = [this](const ExerciseManagement::ExercisePhase &phase)
   {
-    if (m_exercise.id() == phase.exerciseId())
-      m_ui->cbActivePhase->addItem(QString::fromStdString(phase.name()), QVariant(phase.id()));
+    if (m_exercise.id == phase.exerciseId)
+      m_ui->cbActivePhase->addItem(QString::fromStdString(phase.name), QVariant(phase.id));
   };
   m_dtc->exercisePhases(cb);
   m_ui->cbActivePhase->setEnabled(m_ui->cbActivePhase->count() > 1);
@@ -134,7 +136,7 @@ void ExerciseManagementStateEdit::fillActivePhaseCbx()
 void ExerciseManagementStateEdit::onExercisePhaseChanged(const ExerciseManagement::ExercisePhase &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  if (data.exerciseId() == m_exercise.id())
+  if (data.exerciseId == m_exercise.id)
     fillActivePhaseCbx();
 }
 
@@ -146,7 +148,7 @@ void ExerciseManagementStateEdit::retranslate()
 bool ExerciseManagementStateEdit::apply()
 {
   ExerciseState exState = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
-  if (exState.underlying() == ExerciseState::Stopped &&
+  if (exState == ExerciseState::Stopped &&
       LtsWidgets::LtsMessageDialog::showMessage(this,
                                                 tr("Are you sure you want to stop the exercise?"),
                                                 tr("Stop Exercise"),
@@ -154,30 +156,30 @@ bool ExerciseManagementStateEdit::apply()
                                                 LtsWidgets::Button::Yes | LtsWidgets::Button::No)
       == LtsWidgets::Button::No)
   {
-    m_ui->cbState->setCurrentIndex(m_ui->cbState->findData(m_currentState.underlying()));
+    m_ui->cbState->setCurrentIndex(m_ui->cbState->findData(static_cast<int>(m_currentState)));
     return true;
   }
 
-  if (m_exercise.id() > 0)
+  if (m_exercise.id > 0)
   {
     ExerciseModifyRequest request;
     
-    request.id(m_exercise.id());
-    request.beginTime(m_exercise.beginTime());
-    request.endTime(m_exercise.endTime());
-    request.startTime(m_exercise.startTime());
-    request.stopTime(m_exercise.stopTime());
-    request.name(m_exercise.name());
-    request.sendToWMS(m_exercise.sendToWMS());
-    request.linkedExerciseId(m_exercise.linkedExerciseId());
-    request.trainingAreaId(m_exercise.trainingAreaId());
-    request.radioGroupId(m_exercise.radioGroupId());
-    request.symbolFillTypeId(m_exercise.symbolFillTypeId());
-    request.activePhaseId(m_ui->cbActivePhase->currentData().toInt());
-    request.defaultTimeZone(m_exercise.defaultTimeZone());
-    request.forces(m_exercise.forces());
-    request.description(m_exercise.description());
-    request.newState(static_cast<ExerciseState>(m_ui->cbState->currentData().toInt()));
+    request.id = m_exercise.id;
+    request.beginTime = m_exercise.beginTime;
+    request.endTime = m_exercise.endTime;
+    request.startTime = m_exercise.startTime;
+    request.stopTime = m_exercise.stopTime;
+    request.name = m_exercise.name;
+    request.sendToWMS = m_exercise.sendToWMS;
+    request.linkedExerciseId = m_exercise.linkedExerciseId;
+    request.trainingAreaId = m_exercise.trainingAreaId;
+    request.radioGroupId = m_exercise.radioGroupId;
+    request.symbolFillTypeId = m_exercise.symbolFillTypeId;
+    request.activePhaseId = m_ui->cbActivePhase->currentData().toInt();
+    request.defaultTimeZone = m_exercise.defaultTimeZone;
+    request.forces = m_exercise.forces;
+    request.description = m_exercise.description;
+    request.newState = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
 
     if(!m_requestHelper->startSingleRequest(
          [this, request]() {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseWatch/exm_watch_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseWatch/exm_watch_gui_plugin.cpp
index dea813ba4..731928ddf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseWatch/exm_watch_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseWatch/exm_watch_gui_plugin.cpp
@@ -64,7 +64,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 
 LtsWidgets::ExcState InterfaceImpl::convertState(ExerciseState state)
 {
-  int underlying = state.underlying() - 1;
+  int underlying = static_cast<int>(state) - 1;
   if (underlying >= 0)
   {
     int i_state = (1 << static_cast<int>(underlying));
@@ -81,7 +81,7 @@ void InterfaceImpl::clearInterfaces()
 
 QColor InterfaceImpl::exerciseStateColor(ExerciseManagement::ExerciseState state)
 {
-  switch(state.underlying())
+  switch(state)
   {
   case ExerciseState::Unknown: return Qt::black;
   case ExerciseState::Created: return Qt::cyan;
@@ -95,18 +95,18 @@ QColor InterfaceImpl::exerciseStateColor(ExerciseManagement::ExerciseState state
 
 void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this << ", exId=" << data.id();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this << ", exId=" << data.id;
   if (m_isDeleted)
     return;
 
-  if (data.id() != m_session->exerciseId())
+  if (data.id != m_session->exerciseId())
     return;
 
   switch (modType)
   {
     case DataModification::eRemoved:
     {
-      DEBUG_LOG(m_logger) << LOGFUNCTION  << " eRemoved" << ", this=" << this << ", exId=" << data.id();
+      DEBUG_LOG(m_logger) << LOGFUNCTION  << " eRemoved" << ", this=" << this << ", exId=" << data.id;
       m_previouslyRemoved = true;
       WARNING_LOG(m_logger) << "Partition has been removed from the DDS bus! Session: " << m_session->toString();
       if (m_session->baseLayout())
@@ -118,7 +118,7 @@ void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data
     {
       WARNING_LOG(m_logger) << LOGFUNCTION  << ", Partition added to DDS bus! Session: " << m_session->toString();
 
-      DEBUG_LOG(m_logger) << LOGFUNCTION << " eAdded, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " eAdded, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id;
       if (m_previouslyRemoved)
       {
         m_previouslyRemoved = false;
@@ -130,12 +130,12 @@ void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data
 
     case DataModification::eModified:
     {
-      DEBUG_LOG(m_logger) << LOGFUNCTION << " eModified, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " eModified, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id;
       slotSetExerciseData();
       break;
     }
   }
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this << ", exId=" << data.id();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this << ", exId=" << data.id;
 }
 
 
@@ -145,8 +145,8 @@ void InterfaceImpl::slotExercisePhaseChanged(const ExerciseManagement::ExerciseP
   if (m_isDeleted)
     return;
 
-  if (data.exerciseId() != m_session->exerciseId() ||
-      data.id() != m_session->exerciseData()->phId)
+  if (data.exerciseId != m_session->exerciseId() ||
+      data.id != m_session->exerciseData()->phId)
     return;
 
   slotExerciseChanged(m_dtc->exercise(m_session->exerciseId()), DataModification::eModified);
@@ -193,25 +193,25 @@ void InterfaceImpl::slotSetExerciseData()
 
   const ExerciseManagement::Exercise &ex = m_dtc->exercise(m_session->exerciseId());
 
-  if (ex.id() != m_session->exerciseId())
+  if (ex.id != m_session->exerciseId())
     FATAL_LOG(m_logger) << LOGFUNCTION  << ", requested exId and return exId do not match!!!";
   
 
-  const ExerciseManagement::ExercisePhase &ph = m_dtc->exercisePhase(ex.activePhaseId());
+  const ExerciseManagement::ExercisePhase &ph = m_dtc->exercisePhase(ex.activePhaseId);
 
-  exData.exName        = QString::fromStdString(ex.name());
-  exData.exDescription = QString::fromStdString(ex.description());
-  exData.exStateString = ExerciseManagement::toString(ex.state());
-  exData.exState       = convertState(ex.state());
-  exData.exStateCol    = exerciseStateColor(ex.state());
+  exData.exName        = QString::fromStdString(ex.name);
+  exData.exDescription = QString::fromStdString(ex.description);
+  exData.exStateString = ExerciseManagement::toString(ex.state);
+  exData.exState       = convertState(ex.state);
+  exData.exStateCol    = exerciseStateColor(ex.state);
   exData.partitionType = partitionTypeString();
 
-  exData.phId          = ph.id();
-  exData.phName        = QString::fromStdString(ph.name());
-  exData.phDescription = QString::fromStdString(ph.description());
+  exData.phId          = ph.id;
+  exData.phName        = QString::fromStdString(ph.name);
+  exData.phDescription = QString::fromStdString(ph.description);
 
   m_session->setExerciseData(exData);
-  DTG::setTimezone(ex.defaultTimeZone(), false);
+  DTG::setTimezone(ex.defaultTimeZone, false);
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Data/flm_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Data/flm_data_plugin.h
index a6764c3cd..8f04a673c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Data/flm_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Data/flm_data_plugin.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
-#include <FileManagement/flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp
index 48eb8fd77..94ca5fd33 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp
@@ -1,6 +1,6 @@
 #include "flm_hq_report_converter.h"
 
-#include <FileManagement/flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_ftc.h>
 #include <FileManagement/flm_ftc_types.h>
 
@@ -133,7 +133,7 @@ void FlmHqReportConverter::onGetFileContentDataReply(const FileManagement::GetFi
 {
   m_pendingRequests--;
 
-  const int id = static_cast<int>(reply.id());
+  const int id = static_cast<int>(reply.id);
   int planId = -1;
 
   for (auto it = m_hqToPlanIds.constBegin(); it != m_hqToPlanIds.constEnd(); ++it)
@@ -148,23 +148,23 @@ void FlmHqReportConverter::onGetFileContentDataReply(const FileManagement::GetFi
   DEBUG_LOG(m_logger) << "Reply File with ID: " << id << " from plan with ID: " << planId;
   INFO_LOG(m_logger) << "Got reply with id " << id;
 
-  QByteArray fileContent = QByteArray::fromRawData(reinterpret_cast<const char *>(reply.content().data()), reply.content().size());
+  QByteArray fileContent = QByteArray::fromRawData(reinterpret_cast<const char *>(reply.content.data()), reply.content.size());
 
   DEBUG_LOG(m_logger) << "fileContent: " << fileContent;
 
-  FileManagement::FileContent flc = m_flmDtc->fileContent(reply.id());
+  FileManagement::FileContent flc = m_flmDtc->fileContent(reply.id);
 
-  DEBUG_LOG(m_logger) << "FlmHqReportConverter::onGetFileContentDataReply FILECONTENTNAME: " << flc.name();
+  DEBUG_LOG(m_logger) << "FlmHqReportConverter::onGetFileContentDataReply FILECONTENTNAME: " << flc.name;
 
   HqReportData data = m_parser.parse(fileContent);
   data.contentFileId = id;
-  data.name = QString::fromStdString(flc.name());
+  data.name = QString::fromStdString(flc.name);
 
-  data.partyColor = QColor::fromRgb(m_ppmDtc->party(m_partyId).color());
+  data.partyColor = QColor::fromRgb(m_ppmDtc->party(m_partyId).color);
 
   m_convertedHqToPlanIds[planId].append(std::move(data));
 
-  DEBUG_LOG(m_logger) << "Content size: " << reply.content().size();
+  DEBUG_LOG(m_logger) << "Content size: " << reply.content.size();
 
   checkIfAllFinished();
 }
@@ -195,23 +195,23 @@ void FlmHqReportConverter::onRequestsFinished()
     QList<HqReportData> reportDatas = it.value();
     const FileManagement::FileContent flc = m_flmDtc->fileContent(planId);
     FileManagement::GetFileContentDataRequest req;
-    req.fileContentId(planId);
+    req.fileContentId = planId;
 
     m_flmFtc->getFileContentDataRequest(req,
                                         [this, planId, reportDatas = std::move(reportDatas), flc = std::move(flc)](const FileManagement::GetFileContentDataReply &reply)
                                         {
                                           const auto &fetchedFlc = reply;
-                                          if (fetchedFlc.content().size() > 0)
+                                          if (fetchedFlc.content.size() > 0)
                                           {
                                             QByteArray existingContent
-                                                = QByteArray::fromRawData(reinterpret_cast<const char *>(fetchedFlc.content().data()), fetchedFlc.content().size());
+                                                = QByteArray::fromRawData(reinterpret_cast<const char *>(fetchedFlc.content.data()), fetchedFlc.content.size());
 
                                             if (!m_geometryModel->fromByteArray(existingContent))
                                               WARNING_LOG(m_logger) << "Could not load existing geometry content for planId" << planId;
                                           }
 
                                           QJsonArray jsonNameArray;
-                                          QJsonDocument existingDocs = QJsonDocument::fromJson(QByteArray::fromRawData(flc.properties().data(), flc.properties().size()));
+                                          QJsonDocument existingDocs = QJsonDocument::fromJson(QByteArray::fromRawData(flc.properties.data(), flc.properties.size()));
 
                                           if (existingDocs.isArray())
                                             jsonNameArray = existingDocs.array();
@@ -241,21 +241,21 @@ void FlmHqReportConverter::onRequestsFinished()
 
                                           FileManagement::FileContentModifyRequest data;
 
-                                          DEBUG_LOG(m_logger) << "FILE CONTENT: " << flc.name() << " " << flc.folderId();
+                                          DEBUG_LOG(m_logger) << "FILE CONTENT: " << flc.name << " " << flc.folderId;
 
-                                          data.id(flc.id());
-                                          data.name(flc.name());
-                                          data.isTemplate(false);
-                                          data.isHidden(false);
-                                          data.folderId(flc.folderId());
-                                          data.fileStatus(FileManagement::FileStatus::Valid);
-                                          data.fileCategory(FileManagement::FileCategory::Exercise);
-                                          data.fileType(FileManagement::FileType::TacticalPlan);
-                                          data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-                                          data.lastModified(QDateTime::currentMSecsSinceEpoch());
-                                          data.content(LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray()));
-                                          data.exerciseId(m_session->exerciseId());
-                                          data.properties(combinedNames.toStdString());
+                                          data.id = flc.id;
+                                          data.name = flc.name;
+                                          data.isTemplate = false;
+                                          data.isHidden = false;
+                                          data.folderId = flc.folderId;
+                                          data.fileStatus = FileManagement::FileStatus::Valid;
+                                          data.fileCategory = FileManagement::FileCategory::Exercise;
+                                          data.fileType = FileManagement::FileType::TacticalPlan;
+                                          data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+                                          data.lastModified = QDateTime::currentMSecsSinceEpoch();
+                                          data.content = LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray());
+                                          data.exerciseId = m_session->exerciseId();
+                                          data.properties = combinedNames.toStdString();
                                           m_flmFtc->fileContentModifyRequest(data, this);
                                           m_geometryModel->clearModel();
                                         });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
index 306c1c58c..50faf6ee6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
@@ -301,17 +301,17 @@ void HQReportEdit::onCreateNewPlanClicked()
 
   FileManagement::FileContentModifyRequest data;
 
-  data.name(planName.toStdString());
-  data.isTemplate(false);
-  data.isHidden(false);
-  data.folderId(planModel->folderId());
-  data.fileStatus(FileManagement::FileStatus::Valid);
-  data.fileCategory(FileManagement::FileCategory::Exercise);
-  data.fileType(FileManagement::FileType::TacticalPlan);
-  data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  data.lastModified(QDateTime::currentMSecsSinceEpoch());
-  data.content(LtsUtils::convert<std::vector<uint8_t>>(geometryModel->toByteArray()));
-  data.exerciseId(m_session->exerciseId());
+  data.name = planName.toStdString();
+  data.isTemplate = false;
+  data.isHidden = false;
+  data.folderId = planModel->folderId();
+  data.fileStatus = FileManagement::FileStatus::Valid;
+  data.fileCategory = FileManagement::FileCategory::Exercise;
+  data.fileType = FileManagement::FileType::TacticalPlan;
+  data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  data.lastModified = QDateTime::currentMSecsSinceEpoch();
+  data.content = LtsUtils::convert<std::vector<uint8_t>>(geometryModel->toByteArray());
+  data.exerciseId = m_session->exerciseId();
 
   m_flmFtc->fileContentModifyRequest(data,
                                      [this](const Core::FunctionReplyObject &reply)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.cpp
index 3f5ea4def..c8f6f373b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.cpp
@@ -2,6 +2,7 @@
 
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QtCore/QIODevice>
 #include <LtsSession/lts_session.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 namespace FileManagement
@@ -329,17 +330,17 @@ void FlmHQReportModel::deleteHQReportData(const HQData &data)
 
 void FlmHQReportModel::onFileContentChanged(const FileContent &content, DataModification modType)
 {
-  if (content.folderId() != m_contentFolderId || content.fileType() != m_fileType)
+  if (content.folderId != m_contentFolderId || content.fileType != m_fileType)
     return;
 
   HQData data;
-  data.id = content.id();
-  data.name = QString::fromStdString(content.name());
-  data.properties = content.properties();
+  data.id = content.id;
+  data.name = QString::fromStdString(content.name);
+  data.properties = content.properties;
 
   DEBUG_LOG(m_logger) << "FlmHQReportModel::onFileContentChanged " << "properties " << data.properties << " " << " Name: " << data.name;
 
-  if (content.fileStatus() == FileStatus::Deleted)
+  if (content.fileStatus == FileStatus::Deleted)
   {
     if (modType == DataModification::eModified || modType == DataModification::eAdded)
       deleteHQReportData(data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.cpp
index 0bd7c8559..bec1851ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.cpp
@@ -1,5 +1,6 @@
 #include "flm_hq_report_symbol_concrete_creators.h"
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ParticipantManagement/ppm_ftc_types.h>
 namespace FileManagement {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
index 0cdf65349..27e95a88d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
@@ -1,16 +1,17 @@
 
 
 #include "topic_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ui_topic_editor.h"
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsWidgets/lts_text_edit_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <PresentationManagement/Script/Common/topic_designer.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h>
 #include <QtWidgets/QInputDialog>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -25,6 +26,7 @@ FileTopicEditor::FileTopicEditor(LtsSession::LtsSession* session, FileContentPre
     : TopicEditorBase::TopicEditor(parent), m_session(session),
       m_getContent(new FileManagement::GetFileContent(ftc, this)), m_previewPlaybackWidget(previewWidget),
       m_ui(new Ui::FileTopicEditor)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 
     m_ui->setupUi(this);
@@ -87,7 +89,7 @@ void FileTopicEditor::updatePreview()
     {
         DEBUG_LOG(m_logger) << "file id = " << m_fileId;
         m_fileContent = m_dtc->fileContent(m_fileId);
-        m_fileName = QString::fromStdString(m_fileContent.name());
+        m_fileName = QString::fromStdString(m_fileContent.name);
         m_ui->leFileName->setText(m_fileName);
         DEBUG_LOG(m_logger) << "file name = " << m_fileName;
 
@@ -397,10 +399,10 @@ void FileTopicEditor::onEnterText()
     m_textEditDialog->enableBackgroundColor(true);
     QString html;
 
-    if (m_userText.isEmpty() && m_fileContent.id() != 0)
+    if (m_userText.isEmpty() && m_fileContent.id != 0)
     {
         std::vector<uint8_t> content;
-        m_getContent->getContent(m_fileContent.id(), content);
+        m_getContent->getContent(m_fileContent.id, content);
         html = QString::fromUtf8(LtsUtils::toQByteArray(content));
     }
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
index 1236d6da8..9f020115a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
@@ -4,8 +4,8 @@
 
 #include <Lts/Services/FileManagement/logger.h>
 #include <LtsSession/lts_session.h>
-#include <FileManagement/Explorer/flm_preview_playback.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <QtCore/QPointer>
 #include <TopicEditorBase/topic_editor_base.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
index ca81a5eaa..7bbc3be33 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "flm_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "flm_dialog_model_file.h"
 #include "flm_dialog_model_folder.h"
@@ -21,7 +22,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <FileManagement/flm_combobox_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <QtWidgets/QFileDialog>
@@ -35,6 +36,7 @@ namespace FileManagement
 
 FileManagementDialogWidget::FileManagementDialogWidget(QWidget* parent)
     : QWidget(parent), m_ui(new Ui::FileManagementDialogWidget), m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
     if (LtsSessionData::LtsSessionData::getInstance()->isTablet())
@@ -141,11 +143,11 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession* session, FileDialo
     DEBUG_LOG(m_logger) << "Start init model file content";
 
     auto predicate = [this](const FileManagement::FileContent& fc, const QString& xmlType) {
-        if (!m_isAdminMode && fc.isHidden())
+        if (!m_isAdminMode && fc.isHidden)
             return false;
 
-        return (!fc.isDeleted() && fc.fileStatus() == FileManagement::FileStatus::Valid &&
-                (xmlType.isEmpty() || fc.properties().find(xmlType.toStdString()) != std::string::npos));
+        return (!fc.isDeleted && fc.fileStatus == FileManagement::FileStatus::Valid &&
+                (xmlType.isEmpty() || fc.properties.find(xmlType.toStdString()) != std::string::npos));
     };
     m_modelFile->initModel(m_session, xmlType, predicate);
 
@@ -373,9 +375,9 @@ void FileManagementDialogWidget::enaDisa()
 
     if (idxFolder.isValid())
     {
-        m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id();
+        m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id;
 
-        const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
+        const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
 
         enableAddFolder = true;
 
@@ -390,7 +392,7 @@ void FileManagementDialogWidget::enaDisa()
 
         m_actionCopyFolder->setEnabled(true && userHasRightsToEditFolder);
         m_actionCutFolder->setEnabled(enableRemoveFolder && userHasRightsToEditFolder);
-        if (m_copyFolder.id() > 0)
+        if (m_copyFolder.id > 0)
             m_actionPasteFolder->setEnabled(true && userHasRightsToEditFolder);
 
         enableImportFile = true;
@@ -417,12 +419,12 @@ void FileManagementDialogWidget::enaDisa()
     {
         FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
         enableEditFile = true;
-        if (data.isTemplate() || data.isUsedBy())
+        if (data.isTemplate || data.isUsedBy)
             enableDeleteFile = false;
         else
             enableDeleteFile = true;
 
-        if (data.fileStatus() == FileManagement::FileStatus::Deleted)
+        if (data.fileStatus == FileManagement::FileStatus::Deleted)
         {
             enableDeleteFile = false;
             enableRestoreFile = true;
@@ -437,21 +439,21 @@ void FileManagementDialogWidget::enaDisa()
                 data.fileType() != FileManagement::FileType::TacticalPlan)
 #endif
                 enablePreviewFile = true;
-            isOffice = (data.fileType() == FileManagement::FileType::OpenOfficeDocument ||
-                        data.fileType() == FileManagement::FileType::OpenOfficeSpreadsheet ||
-                        data.fileType() == FileManagement::FileType::OpenOfficePresentation ||
-                        data.fileType() == FileManagement::FileType::MSOfficeDocument ||
-                        data.fileType() == FileManagement::FileType::MSOfficeDocument97 ||
-                        data.fileType() == FileManagement::FileType::MSOfficeSpreadsheet ||
-                        data.fileType() == FileManagement::FileType::MSOfficeSpreadsheet97 ||
-                        data.fileType() == FileManagement::FileType::MSOfficePresentation ||
-                        data.fileType() == FileManagement::FileType::MSOfficePresentation97);
+            isOffice = (data.fileType == FileManagement::FileType::OpenOfficeDocument ||
+                        data.fileType == FileManagement::FileType::OpenOfficeSpreadsheet ||
+                        data.fileType == FileManagement::FileType::OpenOfficePresentation ||
+                        data.fileType == FileManagement::FileType::MSOfficeDocument ||
+                        data.fileType == FileManagement::FileType::MSOfficeDocument97 ||
+                        data.fileType == FileManagement::FileType::MSOfficeSpreadsheet ||
+                        data.fileType == FileManagement::FileType::MSOfficeSpreadsheet97 ||
+                        data.fileType == FileManagement::FileType::MSOfficePresentation ||
+                        data.fileType == FileManagement::FileType::MSOfficePresentation97);
             enableRestoreFile = false;
-            if (data.isTemplate())
+            if (data.isTemplate)
                 enableNewFileFromTemplate = true;
         }
         m_selectedFileContent = data;
-        m_fileName = QString::fromStdString(data.name());
+        m_fileName = QString::fromStdString(data.name);
         m_ui->leFile->setText(m_fileName);
 
         enableExportFile = true;
@@ -462,7 +464,7 @@ void FileManagementDialogWidget::enaDisa()
         }
         else
         {
-            if (data.isTemplate() || data.isUsedBy())
+            if (data.isTemplate || data.isUsedBy)
                 enableRemoveFile = false;
             else
                 enableRemoveFile = true;
@@ -499,7 +501,7 @@ void FileManagementDialogWidget::enaDisa()
 
     m_actionCopyFile->setEnabled(enableEditFile && userHasRightsToEditFiles);
     m_actionCutFile->setEnabled(enableDeleteFile && userHasRightsToEditFiles);
-    if (m_copyFile.id() > 0)
+    if (m_copyFile.id > 0)
         m_actionPasteFile->setEnabled(true && userHasRightsToEditFiles);
 
     emit enableButtons();
@@ -515,19 +517,19 @@ bool FileManagementDialogWidget::isFolderRemovable(const QModelIndex& idx) const
     if (!m_modelFolder->isRowRemovable(m_modelFolder->privateData(idx)))
         return false;
 
-    if (m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
-            FileManagement::MainFolder::GlobalDocuments ||
-        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
-            FileManagement::MainFolder::ExerciseDocuments ||
-        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
-            FileManagement::MainFolder::UserDocuments)
+    if (m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
+            static_cast<int>(FileManagement::MainFolder::GlobalDocuments) ||
+        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
+            static_cast<int>(FileManagement::MainFolder::ExerciseDocuments) ||
+        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
+            static_cast<int>(FileManagement::MainFolder::UserDocuments))
         return false;
 
     int opId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     bool userhasAdminRights =
         LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FileManagementFileAdmin);
     if (!userhasAdminRights && opId != 99 &&
-        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().operatorId() != opId)
+        m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().operatorId != opId)
         return false;
 
     const auto children = m_modelFolder->privateData(idx)->children();
@@ -593,28 +595,28 @@ void FileManagementDialogWidget::onPasteFile()
 {
     DEBUG_LOG(m_logger) << "onPasteFile";
 
-    if (m_selectedFolderId > 0 && m_copyFile.id() > 0)
+    if (m_selectedFolderId > 0 && m_copyFile.id > 0)
     {
-        m_copyFile.id(0);
-        if (m_selectedFolderId == m_copyFile.folderId() && m_copyFile.name() == m_selectedFileContent.name())
+        m_copyFile.id = 0;
+        if (m_selectedFolderId == m_copyFile.folderId && m_copyFile.name == m_selectedFileContent.name)
         {
-            QString newName = QString::fromStdString(m_copyFile.name()) + tr(" (Copy)");
-            m_copyFile.name(newName.toStdString());
+            QString newName = QString::fromStdString(m_copyFile.name) + tr(" (Copy)");
+            m_copyFile.name = newName.toStdString();
         }
-        m_copyFile.folderId(m_selectedFolderId);
+        m_copyFile.folderId = m_selectedFolderId;
 
         int exId = 0;
         int phId = 0;
-        m_copyFile.exerciseId();
-        m_copyFile.phaseId();
+        m_copyFile.exerciseId;
+        m_copyFile.phaseId;
 
-        const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
+        const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
 
-        if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
-            m_copyFile.fileCategory(FileManagement::FileCategory::User);
-        else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
+        if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
+            m_copyFile.fileCategory = FileManagement::FileCategory::User;
+        else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
         {
-            m_copyFile.fileCategory(FileManagement::FileCategory::Exercise);
+            m_copyFile.fileCategory = FileManagement::FileCategory::Exercise;
 
             if (fldPath.size() >= 2)
             {
@@ -633,12 +635,12 @@ void FileManagementDialogWidget::onPasteFile()
             }
 
             if (exId > 0)
-                m_copyFile.exerciseId(exId);
+                m_copyFile.exerciseId = exId;
             if (phId > 0)
-                m_copyFile.phaseId(phId);
+                m_copyFile.phaseId = phId;
         }
         else
-            m_copyFile.fileCategory(FileManagement::FileCategory::Global);
+            m_copyFile.fileCategory = FileManagement::FileCategory::Global;
 
         FileContentEditDialog* dialog = new FileContentEditDialog(this);
         QString folderName = m_modelFolder->getFolderName(m_dtc->folder(m_selectedFolderId));
@@ -691,7 +693,7 @@ void FileManagementDialogWidget::removeCurrentRowFolder()
     QModelIndex selIndex = selectedIndexViewFolder();
     NGLTreeItem* item = m_modelFolder->privateData(selIndex);
     FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
-    bool isRootFolder = (fld.id() == 0);
+    bool isRootFolder = (fld.id == 0);
 
     DEBUG_LOG(m_logger) << "isRootFolder = " << isRootFolder;
 
@@ -724,7 +726,7 @@ void FileManagementDialogWidget::onCopyFolder()
     QModelIndex selIndex = selectedIndexViewFolder();
     NGLTreeItem* item = m_modelFolder->privateData(selIndex);
     m_copyFolder = item->data().value<FileManagement::Folder>();
-    m_copyFolder.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    m_copyFolder.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     enaDisa();
 }
@@ -735,7 +737,7 @@ void FileManagementDialogWidget::onCopyFile()
 
     m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
-    m_getContent->getContent(m_copyFile.id(), m_content);
+    m_getContent->getContent(m_copyFile.id, m_content);
 
     enaDisa();
 }
@@ -759,7 +761,7 @@ void FileManagementDialogWidget::onCutFile()
 
     m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
-    m_getContent->getContent(m_copyFile.id(), m_content);
+    m_getContent->getContent(m_copyFile.id, m_content);
 
     onDeleteFile();
 
@@ -813,7 +815,7 @@ void FileManagementDialogWidget::onRemoveFile()
     DEBUG_LOG(m_logger) << "onRemoveFile";
 
     FileManagement::FileContent data = m_modelFile->getRowData(selIndex.row());
-    Core::RemoveElementRequest req(data.id());
+    Core::RemoveElementRequest req(data.id);
     m_requestHelper->startSingleRequest([req, this]() { return m_ftc->fileContentRemoveRequest(req, this); });
 
     if (m_requestHelper->failed())
@@ -833,17 +835,17 @@ void FileManagementDialogWidget::onDeleteFile()
     m_requestHelper->startSingleRequest([this]() {
         FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
-        if (data.fileStatus() == FileManagement::FileStatus::Deleted)
+        if (data.fileStatus == FileManagement::FileStatus::Deleted)
             return int64_t(0);
 
-        DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
+        DEBUG_LOG(m_logger) << "Deleting file id = " << data.id;
 
         FileManagement::FileContentChangeStatusRequest req;
-        req.id(data.id());
+        req.id = data.id;
 
-        req.fileStatus(FileManagement::FileStatus::Deleted);
-        req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-        req.lastModified(QDateTime::currentMSecsSinceEpoch());
+        req.fileStatus = FileManagement::FileStatus::Deleted;
+        req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+        req.lastModified = QDateTime::currentMSecsSinceEpoch();
 
         return m_ftc->fileContentChangeStatusRequest(FileContentChangeStatusRequest(req), this);
     });
@@ -862,7 +864,7 @@ void FileManagementDialogWidget::reInitModelFile(bool restoreSelected)
         QModelIndex selIndex = m_ui->widgetFiles->currentIndex();
         if (selIndex.isValid())
         {
-            selectedFileId = m_modelFile->getRowData(selIndex.row()).id();
+            selectedFileId = m_modelFile->getRowData(selIndex.row()).id;
             ERROR_LOG(m_logger) << "Selected file id = " << selectedFileId;
         }
     }
@@ -897,17 +899,17 @@ void FileManagementDialogWidget::onRestoreFile()
     m_requestHelper->startSingleRequest([this]() {
         FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
-        if (data.fileStatus() == FileManagement::FileStatus::Valid)
+        if (data.fileStatus == FileManagement::FileStatus::Valid)
             return int64_t(0);
 
-        DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
+        DEBUG_LOG(m_logger) << "Deleting file id = " << data.id;
 
         FileManagement::FileContentChangeStatusRequest req;
-        req.id(data.id());
+        req.id = data.id;
 
-        req.fileStatus(FileManagement::FileStatus::Valid);
-        req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-        req.lastModified(QDateTime::currentMSecsSinceEpoch());
+        req.fileStatus = FileManagement::FileStatus::Valid;
+        req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+        req.lastModified = QDateTime::currentMSecsSinceEpoch();
 
         return m_ftc->fileContentChangeStatusRequest(FileContentChangeStatusRequest(req), this);
     });
@@ -930,12 +932,12 @@ void FileManagementDialogWidget::onEditFile()
         return;
 
     FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
-    DEBUG_LOG(m_logger) << "onEditFileContent Id = " << data.id();
+    DEBUG_LOG(m_logger) << "onEditFileContent Id = " << data.id;
 
-    m_getContent->getContent(data.id(), m_content);
+    m_getContent->getContent(data.id, m_content);
 
     FileContentEditDialog* dialog = new FileContentEditDialog(this);
-    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
+    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
 
     if (!dialog->init(m_session, selIndex, m_isAdminMode, folderName, data, m_content))
     {
@@ -993,10 +995,10 @@ void FileManagementDialogWidget::onImportFile()
     QByteArray fileContent = file.readAll();
 
     FileManagement::FileContent data = FileContent();
-    data.folderId(m_selectedFolderId);
-    data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    data.name(fileInfo.baseName().toStdString());
-    data.fileStatus(FileManagement::FileStatus::Valid);
+    data.folderId = m_selectedFolderId;
+    data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    data.name = fileInfo.baseName().toStdString();
+    data.fileStatus = FileManagement::FileStatus::Valid;
 
     int exId = 0;
     int phId = 0;
@@ -1007,12 +1009,12 @@ void FileManagementDialogWidget::onImportFile()
             phId = m_session->exerciseData()->phId;
     }
 
-    const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
-    if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
-        data.fileCategory(FileManagement::FileCategory::User);
-    else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
+    const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
+    if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
+        data.fileCategory = FileManagement::FileCategory::User;
+    else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
     {
-        data.fileCategory(FileManagement::FileCategory::Exercise);
+        data.fileCategory = FileManagement::FileCategory::Exercise;
         if (fldPath.size() >= 2)
         {
             exId = m_dtc->getExerciseId(fldPath.at(1));
@@ -1022,7 +1024,7 @@ void FileManagementDialogWidget::onImportFile()
     }
     else
     {
-        data.fileCategory(FileManagement::FileCategory::Global);
+        data.fileCategory = FileManagement::FileCategory::Global;
         exId = 0;
         phId = 0;
     }
@@ -1030,14 +1032,14 @@ void FileManagementDialogWidget::onImportFile()
     DEBUG_LOG(m_logger) << "Exercise id = " << exId << ", phase Id = " << phId;
 
     if (exId > 0)
-        data.exerciseId(exId);
+        data.exerciseId = exId;
     if (phId > 0)
-        data.phaseId(phId);
+        data.phaseId = phId;
 
-    data.fileType(getFileType(fileExt));
+    data.fileType = getFileType(fileExt);
 
     FileContentEditDialog* dialog = new FileContentEditDialog(this);
-    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
+    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
 
     if (!dialog->init(m_session, QModelIndex(), m_isAdminMode, folderName, data,
                       LtsUtils::convert<std::vector<uint8_t>>(fileContent)))
@@ -1085,10 +1087,10 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
     QByteArray fileContent = file.readAll();
 
     FileManagement::FileContent data;
-    data.folderId(m_selectedFolderId);
-    data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    data.name(tr("<please fill in file name>").toStdString());
-    data.fileStatus(FileManagement::FileStatus::Valid);
+    data.folderId = m_selectedFolderId;
+    data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    data.name = tr("<please fill in file name>").toStdString();
+    data.fileStatus = FileManagement::FileStatus::Valid;
 
     int exId = 0;
     int phId = 0;
@@ -1099,12 +1101,12 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
             phId = m_session->exerciseData()->phId;
     }
 
-    const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
-    if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
-        data.fileCategory(FileManagement::FileCategory::User);
-    else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
+    const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
+    if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
+        data.fileCategory = FileManagement::FileCategory::User;
+    else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
     {
-        data.fileCategory(FileManagement::FileCategory::Exercise);
+        data.fileCategory = FileManagement::FileCategory::Exercise;
         if (fldPath.size() >= 2)
         {
             exId = m_dtc->getExerciseId(fldPath.at(1));
@@ -1114,20 +1116,20 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
     }
     else
     {
-        data.fileCategory(FileManagement::FileCategory::Global);
+        data.fileCategory = FileManagement::FileCategory::Global;
         exId = 0;
         phId = 0;
     }
 
     if (exId > 0)
-        data.exerciseId(exId);
+        data.exerciseId = exId;
     if (phId > 0)
-        data.phaseId(phId);
+        data.phaseId = phId;
 
-    data.fileType(getFileType(fileInfo.suffix()));
+    data.fileType = getFileType(fileInfo.suffix());
 
     FileContentEditDialog* dialog = new FileContentEditDialog(this);
-    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
+    QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
 
     if (!dialog->init(m_session, QModelIndex(), m_isAdminMode, folderName, data,
                       LtsUtils::convert<std::vector<uint8_t>>(fileContent)))
@@ -1179,9 +1181,9 @@ void FileManagementDialogWidget::onNewFileFromTemplate()
 {
 
     onCopyFile();
-    m_copyFile.isTemplate(false);
-    m_copyFile.isUsedBy(false);
-    m_copyFile.name(tr("<please fill in file name>").toStdString());
+    m_copyFile.isTemplate = false;
+    m_copyFile.isUsedBy = false;
+    m_copyFile.name = tr("<please fill in file name>").toStdString();
     onPasteFile();
 }
 
@@ -1267,7 +1269,7 @@ void FileManagementDialogWidget::fileContextMenuRequested(const QPoint& position
 
 void FileManagementDialogWidget::onFolderChanged(const FileManagement::Folder& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << "onFolderChanged: folder name = " << data.name();
+    DEBUG_LOG(m_logger) << "onFolderChanged: folder name = " << data.name;
 
     Q_UNUSED(data);
     Q_UNUSED(modType);
@@ -1287,10 +1289,10 @@ FileManagement::FileType FileManagementDialogWidget::getFileType(const QString&
         ext = "jpg";
     std::function<bool(const FileManagement::FileTypeInfo& fti)> cb = [&type,
                                                                        &ext](const FileManagement::FileTypeInfo& fti) {
-        if (fti.extension() == ext)
+        if (fti.extension == ext)
         {
 
-            type = static_cast<FileType>(fti.id());
+            type = static_cast<FileType>(fti.id);
             return true;
         }
         return false;
@@ -1312,9 +1314,9 @@ void FileManagementDialogWidget::onPreviewFile()
 
     FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
-    FileManagement::FileType ft = data.fileType();
+    FileManagement::FileType ft = data.fileType;
 
-    switch (ft.underlying())
+    switch (ft)
     {
         case FileManagement::FileType::Jpg:
         case FileManagement::FileType::Png:
@@ -1362,7 +1364,7 @@ void FileManagementDialogWidget::onPreviewFile()
 
 QString FileManagementDialogWidget::getFileTypeStr(FileManagement::FileType fileType)
 {
-    switch (fileType.underlying())
+    switch (fileType)
     {
         case FileManagement::FileType::Png:
             return (QStringLiteral(".png"));
@@ -1424,15 +1426,15 @@ void FileManagementDialogWidget::onExportFile()
         return;
     }
 
-    m_getContent->getContent(m_selectedFileContent.id(), m_content);
+    m_getContent->getContent(m_selectedFileContent.id, m_content);
     DEBUG_LOG(m_logger) << "onExportFile(): Save File to '" << folderName << "/" << m_fileName << "'"
-                        << " fileType = " << m_selectedFileContent.fileType()
-                        << " getFileTypeStr = " << getFileTypeStr(m_selectedFileContent.fileType())
-                        << " exportFileName = " << m_selectedFileContent.exportFileName()
+                        << " fileType = " << m_selectedFileContent.fileType
+                        << " getFileTypeStr = " << getFileTypeStr(m_selectedFileContent.fileType)
+                        << " exportFileName = " << m_selectedFileContent.exportFileName
                         << " m_content.size = " << m_content.size();
 
     QString completeFileName = m_fileName;
-    completeFileName.append(getFileTypeStr(m_selectedFileContent.fileType()));
+    completeFileName.append(getFileTypeStr(m_selectedFileContent.fileType));
 
     QFile file;
     QDir::setCurrent(folderName);
@@ -1473,7 +1475,7 @@ void FileManagementDialogWidget::onSelectFile()
 
     m_selectedFileContent = m_modelFile->getRowData(selIndex.row());
 
-    DEBUG_LOG(m_logger) << "Selected file content id = " << m_selectedFileContent.id();
+    DEBUG_LOG(m_logger) << "Selected file content id = " << m_selectedFileContent.id;
     emit accepted();
 }
 
@@ -1491,7 +1493,7 @@ void FileManagementDialogWidget::onChooseFileName()
 void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent& data, DataModification modType)
 {
     bool condition = showFile(data, m_xmlType);
-    DEBUG_LOG(m_logger) << "onFileChanged file name = " << data.name() << ", condition = " << condition
+    DEBUG_LOG(m_logger) << "onFileChanged file name = " << data.name << ", condition = " << condition
                         << ", modType = " << modType;
 
     bool reInit = false;
@@ -1517,7 +1519,7 @@ void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent
             if (condition)
             {
 
-                if (data.id() == m_modelFile->getRowData(row).id())
+                if (data.id == m_modelFile->getRowData(row).id)
                     m_modelFile->setRowData(row, data);
                 else
                     reInit = true;
@@ -1533,71 +1535,71 @@ void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent
 
 bool FileManagementDialogWidget::showFile(const FileManagement::FileContent& fc, const QString& xmlType)
 {
-    if (fc.isDeleted())
+    if (fc.isDeleted)
     {
-        DEBUG_LOG(m_logger) << "is deleted: " << fc.name().c_str();
+        DEBUG_LOG(m_logger) << "is deleted: " << fc.name.c_str();
         return false;
     }
 
-    if (fc.folderId() != m_selectedFolderId)
+    if (fc.folderId != m_selectedFolderId)
     {
-        DEBUG_LOG(m_logger) << "Folder id does not match: " << fc.name().c_str();
+        DEBUG_LOG(m_logger) << "Folder id does not match: " << fc.name.c_str();
         return false;
     }
 
-    if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType()))
+    if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType))
     {
-        DEBUG_LOG(m_logger) << "file type does not match: " << fc.name().c_str();
+        DEBUG_LOG(m_logger) << "file type does not match: " << fc.name.c_str();
         return false;
     }
 
     if (m_dialogMode != FileDialogMode::Admin)
     {
-        if (fc.fileStatus() != FileManagement::FileStatus::Valid)
+        if (fc.fileStatus != FileManagement::FileStatus::Valid)
         {
-            DEBUG_LOG(m_logger) << "file status is not valid: " << fc.name().c_str();
+            DEBUG_LOG(m_logger) << "file status is not valid: " << fc.name.c_str();
             return false;
         }
 
         const QModelIndex selIndex = selectedIndexViewFolder();
         const NGLTreeItem* item = m_modelFolder->privateData(selIndex);
         const FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
-        const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(fld.path());
+        const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(fld.path);
 
-        if (fldPath.contains(FileManagement::MainFolder::UserDocuments))
+        if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::UserDocuments)))
         {
             const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
             DEBUG_LOG(m_logger) << "Filtering files on OperatorId = " << operatorId;
-            if (fc.operatorId() != operatorId)
+            if (fc.operatorId != operatorId)
             {
-                DEBUG_LOG(m_logger) << "operator id does not match: " << fc.name().c_str();
+                DEBUG_LOG(m_logger) << "operator id does not match: " << fc.name.c_str();
                 return false;
             }
             DEBUG_LOG(m_logger) << "Filtering files on User Category";
-            if (fc.fileCategory() != FileManagement::FileCategory::User)
+            if (fc.fileCategory != FileManagement::FileCategory::User)
             {
-                DEBUG_LOG(m_logger) << "User category does not match: " << fc.name().c_str();
+                DEBUG_LOG(m_logger) << "User category does not match: " << fc.name.c_str();
             }
 
             if (m_session->exerciseId() > 0)
             {
-                if (fc.exerciseId().is_set() && fc.exerciseId().get() != m_session->exerciseId())
+                if (fc.exerciseId.has_value() && fc.exerciseId.get() != m_session->exerciseId())
                 {
-                    DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str()
-                                        << " is: " << fc.exerciseId() << " should be " << m_session->exerciseId();
+                    DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name.c_str()
+                                        << " is: " << fc.exerciseId << " should be " << m_session->exerciseId();
                     return false;
                 }
             }
         }
 
-        if (fldPath.contains(FileManagement::MainFolder::ExerciseDocuments))
+        if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
         {
 
             DEBUG_LOG(m_logger) << "Filtering files on Exercise Category";
-            if (fc.fileCategory() != FileManagement::FileCategory::Exercise)
+            if (fc.fileCategory != FileManagement::FileCategory::Exercise)
             {
-                DEBUG_LOG(m_logger) << "exercise category does not match: " << fc.name().c_str();
+                DEBUG_LOG(m_logger) << "exercise category does not match: " << fc.name.c_str();
                 return false;
             }
             if (m_session->exerciseId() > 0)
@@ -1605,18 +1607,18 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent& fc,
 
                 DEBUG_LOG(m_logger) << "Filtering files on Exercise Category and exerciseId = "
                                     << m_session->exerciseId();
-                if (fc.exerciseId().is_set() && fc.exerciseId().get() != m_session->exerciseId())
+                if (fc.exerciseId.has_value() && fc.exerciseId.get() != m_session->exerciseId())
                 {
-                    DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str()
-                                        << " is: " << fc.exerciseId() << " should be " << m_session->exerciseId();
+                    DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name.c_str()
+                                        << " is: " << fc.exerciseId << " should be " << m_session->exerciseId();
                     return false;
                 }
             }
         }
 
-        if (fc.fileType() == FileType::Xml && !xmlType.isEmpty() && fc.properties().size() > 0)
+        if (fc.fileType == FileType::Xml && !xmlType.isEmpty() && fc.properties.size() > 0)
         {
-            const QString& prop = QString::fromStdString(fc.properties());
+            const QString& prop = QString::fromStdString(fc.properties);
             if (!prop.contains(xmlType, Qt::CaseSensitive))
             {
                 DEBUG_LOG(m_logger) << "XmlType not found " << xmlType;
@@ -1643,6 +1645,7 @@ void FileManagementDialogWidget::selectFolder()
 FileManagementDialogTab::FileManagementDialogTab(const QString& menuGroup, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly),
       m_editItemWidget(new FileManagementDialogWidget(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 
     if (menuGroup == tr("Document Library"))
@@ -1744,6 +1747,7 @@ FileManagementDialog::FileManagementDialog(QWidget* parent)
     : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal),
       m_editItemWidget(new FileManagementDialogWidget(this)), m_buttonBox(new LtsWidgets::LtsDialogButtonBox(this)),
       m_dialogMode(FileDialogMode::OpenFile)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "Ctor FileManagementDialog";
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.h
index 569cc4bba..4b8676103 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.h
@@ -3,12 +3,14 @@
 
 #pragma once
 
+#include <FileManagement/flm_qmetatypes.h>
 #include <FileManagement/flm_dtc.h>
 #include <Lts/Services/FileManagement/flm_ftc.h>
 #include <Lts/Services/FileManagement/logger.h>
 #include <OperatorManagement/opm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
@@ -211,7 +213,7 @@ public:
             const QString &xmlType = QString());
 
   FileManagement::FileContent getSelectedFile() const { return m_editItemWidget->m_selectedFileContent; }
-  int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id(); }
+  int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id; }
   int getSelectedFolderId() const { return m_editItemWidget->m_selectedFolderId; }
   QString getFileName() const { return m_editItemWidget->m_fileName; }
 
@@ -244,7 +246,7 @@ public:
             const int &folderId = 0,
             const QString &buttonName = QString());
 
-  int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id(); }
+  int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id; }
   int getSelectedFolder() const { return m_editItemWidget->m_selectedFolderId; }
   QString getFileName() const { return m_editItemWidget->m_fileName; }
   FileContent getSelectedFile() const { return m_editItemWidget->m_selectedFileContent; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
index aa2ab8448..14e4a2643 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
@@ -1,11 +1,12 @@
 
 
 #include "flm_dialog_model_file.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <FileManagement/flm_translation.h>
 #include <LtsSession/lts_session_data.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <QtCore/QDateTime>
 #include <QtGui/QGuiApplication>
@@ -21,6 +22,7 @@ DialogModelFile::DialogModelFile(QObject* parent)
            tr("Operator"), tr("Used"), tr("Uses"), tr("Last modified"), tr("Properties"), tr("Folder Id"),
            tr("File Id")},
           parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -58,7 +60,7 @@ QVariant DialogModelFile::data(const QModelIndex& index, int role) const
     switch (role)
     {
         case Qt::BackgroundRole: {
-            if (fl.fileStatus() == FileManagement::FileStatus::Deleted)
+            if (fl.fileStatus == FileManagement::FileStatus::Deleted)
                 return QGuiApplication::palette().color(QPalette::Disabled, QPalette::AlternateBase);
             return QGuiApplication::palette().color(QPalette::Active, QPalette::Base);
         }
@@ -66,41 +68,41 @@ QVariant DialogModelFile::data(const QModelIndex& index, int role) const
             switch (index.column())
             {
                 case NAME:
-                    return QString::fromStdString(fl.name());
+                    return QString::fromStdString(fl.name);
                 case ISTEMPLATE:
-                    return fl.isTemplate() ? tr("Yes") : tr("No");
+                    return fl.isTemplate ? tr("Yes") : tr("No");
                 case FOLDER:
-                    return fl.folderId();
+                    return fl.folderId;
                 case FILEID:
-                    return fl.id();
+                    return fl.id;
                 case FILETYPE:
-                    return FileManagement::toString(fl.fileType());
+                    return FileManagement::toString(fl.fileType);
                 case FILECATEGORY:
-                    return FileManagement::toString(fl.fileCategory());
+                    return FileManagement::toString(fl.fileCategory);
                 case FILESTATUS:
-                    return FileManagement::toString(fl.fileStatus());
+                    return FileManagement::toString(fl.fileStatus);
                 case OPERATOR:
-                    return QString::fromStdString(m_opmDtc->user(fl.operatorId()).name());
+                    return QString::fromStdString(m_opmDtc->user(fl.operatorId).name);
                 case EXERCISE:
-                    return fl.exerciseId().is_set()
-                               ? QString::fromStdString(m_exmDtc->exercise(fl.exerciseId().get()).name())
+                    return fl.exerciseId.has_value()
+                               ? QString::fromStdString(m_exmDtc->exercise(fl.exerciseId.get()).name)
                                : QVariant();
                 case PHASE:
-                    return fl.phaseId().is_set()
-                               ? QString::fromStdString(m_exmDtc->exercisePhase(fl.phaseId().get()).name())
+                    return fl.phaseId.has_value()
+                               ? QString::fromStdString(m_exmDtc->exercisePhase(fl.phaseId.get()).name)
                                : QVariant();
                 case USEDBY:
-                    return fl.isUsedBy() ? tr("Yes") : tr("No");
+                    return fl.isUsedBy ? tr("Yes") : tr("No");
                 case USES:
-                    return fl.usedBy();
+                    return fl.usedBy;
                 case LASTMODIFIED:
-                    return QDateTime::fromMSecsSinceEpoch(fl.lastModified());
+                    return QDateTime::fromMSecsSinceEpoch(fl.lastModified);
                 case PROPERTIES:
-                    return QString::fromStdString(fl.properties());
+                    return QString::fromStdString(fl.properties);
             }
         }
         case Qt::DecorationRole: {
-            if (index.column() == NAME && fl.isHidden())
+            if (index.column() == NAME && fl.isHidden)
                 return QIcon(QLatin1String(":/style/lock.svg"));
             break;
         }
@@ -115,7 +117,7 @@ FileManagement::FileContent DialogModelFile::findFileFromName(const QString& fil
     for (int row = 0; row < rowCount(); ++row)
     {
         const FileManagement::FileContent& fl = m_vecData.at(row);
-        if (QString::fromStdString(fl.name()) == fileName)
+        if (QString::fromStdString(fl.name) == fileName)
             return fl;
     }
     return FileManagement::FileContent();
@@ -137,7 +139,7 @@ bool DialogFileProxyModel::lessThan(const QModelIndex& source_left, const QModel
     switch (source_left.column())
     {
         case LASTMODIFIED:
-            return dataLeft.lastModified() < dataRight.lastModified();
+            return dataLeft.lastModified < dataRight.lastModified;
         case NAME:
         case FILETYPE:
         case FILECATEGORY:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
index cd66c6f2c..8bc5446b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
@@ -2,16 +2,18 @@
 
 
 #include "flm_dialog_model_folder.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ParticipantManagement/ppm.hpp"
+#include "ParticipantManagement/ppm_dtc.h"
 
-#include <LtsUtils/pgarray.h>
+#include <LtsUtilsCore/pgarray.h>
 #include <ngltools/ngltools_dtg.h>
 #include <nglwidgets/ngltreeitem.h>
 
 #include <FileManagement/flm_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_combobox_gui_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
@@ -35,6 +37,7 @@ DialogModelFolder::DialogModelFolder(QObject *parent,
   , m_exmDtc(nullptr)
   , m_opmDtc(nullptr)
   , m_ppmDtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 
 }
@@ -87,26 +90,26 @@ QVariant DialogModelFolder::data(const QModelIndex &index, int role) const
       case NAME:
         return getFolderName(folderData);
       case ID:
-        return folderData.id();
+        return folderData.id;
       case PATH:
-        return LtsUtils::IntArray(folderData.path()).toPgString();
+        return LtsUtils::IntArray(folderData.path).toPgString();
       case EDITABLE:
-        return folderData.isEditable() ? tr("Yes") : tr("No");
+        return folderData.isEditable ? tr("Yes") : tr("No");
       case PARENT:
-        return folderData.parentId();
+        return folderData.parentId;
       case OPERATOR:
-        return QString::fromStdString(m_opmDtc->user(folderData.operatorId()).name());
+        return QString::fromStdString(m_opmDtc->user(folderData.operatorId).name);
       case MODIFIED:
-        return QDateTime::fromMSecsSinceEpoch(folderData.lastModified());
+        return QDateTime::fromMSecsSinceEpoch(folderData.lastModified);
       default:
         break;
       }
     }
     case Qt::UserRole:
-      return folderData.id();
+      return folderData.id;
     case Qt::DecorationRole:
     {
-      if (folderData.isHidden())
+      if (folderData.isHidden)
         return item->icon();
       break;
     }
@@ -126,24 +129,24 @@ FileManagement::Folder DialogModelFolder::getFolder(const QModelIndex &idx) cons
 
 QString DialogModelFolder::getFolderName(const FileManagement::Folder &folderData) const
 {
-  QString folderName = QString::fromStdString(folderData.name());
+  QString folderName = QString::fromStdString(folderData.name);
   if (folderName.startsWith(QStringLiteral("$")))
   {
     folderName.remove(0, 1);
     if (folderName.startsWith(QStringLiteral("EX_")))
     {
       int exId = folderName.remove(0, 3).toInt();
-      return QString::fromStdString(m_exmDtc->exercise(exId).name());
+      return QString::fromStdString(m_exmDtc->exercise(exId).name);
     }
     if (folderName.startsWith(QStringLiteral("PH_")))
     {
       int phId = folderName.remove(0, 3).toInt();
-      return QString::fromStdString(m_exmDtc->exercisePhase(phId).name());
+      return QString::fromStdString(m_exmDtc->exercisePhase(phId).name);
     }
     if (folderName.startsWith(QStringLiteral("PY_")))
     {
       int partyId = folderName.remove(0, 3).toInt();
-      return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
+      return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
     }
     return FileManagement::trFolderName(folderName.toStdString());
   }
@@ -173,7 +176,7 @@ bool DialogModelFolder::isRowRemovable(const NGLTreeItem *parentItem) const
   if (!parentItem)
     return false;
   FileManagement::Folder folderData = parentItem->data().value<FileManagement::Folder>();
-  return folderData.isEditable();
+  return folderData.isEditable;
 }
 
 
@@ -189,21 +192,21 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
 
   auto cbFolders = [this, exerciseId, &tmap, &idsToExclude, isAdminMode] (const FileManagement::Folder &data)
   {
-    if (data.isDeleted() ||
-        (!isAdminMode && data.isHidden()))
+    if (data.isDeleted ||
+        (!isAdminMode && data.isHidden))
       return;
 
-    QString folderName = QString::fromStdString(data.name());
+    QString folderName = QString::fromStdString(data.name);
     if (folderName.startsWith(QStringLiteral("$EX_")))
     {
       int exId = folderName.remove(0, 4).toInt();
-      if ((exerciseId > 0 && exId != exerciseId) || exId != m_exmDtc->exercise(exId).id())
+      if ((exerciseId > 0 && exId != exerciseId) || exId != m_exmDtc->exercise(exId).id)
       {
-        DEBUG_LOG(m_logger) << "Excluded exercise id " << exId << ", folder id " << data.id();
-        idsToExclude.append(data.id());
+        DEBUG_LOG(m_logger) << "Excluded exercise id " << exId << ", folder id " << data.id;
+        idsToExclude.append(data.id);
       }
     }
-    tmap.insert(data.id(), data);
+    tmap.insert(data.id, data);
   };
   m_flmDtc->folders(cbFolders);
 
@@ -216,10 +219,10 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
     int parentId = 0;
     FileManagement::Folder fld = iter.value();
 
-    if (fld.path().size() > 1)
+    if (fld.path.size() > 1)
     {
-      parentId = fld.path().at(fld.path().size() - 2);
-      int idPos2 = fld.path().at(1);
+      parentId = fld.path.at(fld.path.size() - 2);
+      int idPos2 = fld.path.at(1);
       if (idsToExclude.contains(idPos2))
         continue;
     }
@@ -230,7 +233,7 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
     if (!parentItemIndexCache.contains(parentId))
     {
       WARNING_LOG(m_logger) << "Invalid folder structure, parent may be hidden: " << parentId;
-      WARNING_LOG(m_logger) << "Folder " << fld.name() << ", hidden: " << fld.isHidden();
+      WARNING_LOG(m_logger) << "Folder " << fld.name << ", hidden: " << fld.isHidden;
     }
     else
     {
@@ -254,7 +257,7 @@ bool DialogModelFolder::onInsertRow(int &row, const QModelIndex &parent, const F
   QVariant data;
   data.setValue(folderData);
   QIcon icon;
-  if (folderData.isHidden())
+  if (folderData.isHidden)
     icon = QIcon(QLatin1String(":/style/lock.svg"));
   NGLTreeItem *item = new NGLTreeItem(data, icon);
   item->setModified(true);
@@ -274,7 +277,7 @@ bool DialogModelFolder::onUpdateRow(const QModelIndex &index, const FileManageme
   emit internalDataChanged();
 
   QIcon icon;
-  if (folderData.isHidden())
+  if (folderData.isHidden)
     icon = QIcon(QLatin1String(":/style/lock.svg"));
   return setItemData(index, data, icon);
 }
@@ -290,7 +293,7 @@ bool DialogModelFolder::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
   {
     NGLTreeItem *item = privateData(idx);
     FileManagement::Folder data = item->data().value<FileManagement::Folder>();
-    data.isDeleted(true);
+    data.isDeleted = true;
   }
   removeRow(idx.row(), idx.parent());
   emit internalDataChanged();
@@ -340,11 +343,11 @@ bool DialogModelProxyFolder::lessThan(const QModelIndex &source_left, const QMod
   const FileManagement::Folder left = itemLeft->data().value<FileManagement::Folder>();
   const FileManagement::Folder right = itemRight->data().value<FileManagement::Folder>();
 
-  if (left.id() == FileManagement::MainFolder::GlobalDocuments   || right.id() == FileManagement::MainFolder::GlobalDocuments ||
-      left.id() == FileManagement::MainFolder::UserDocuments     || right.id() == FileManagement::MainFolder::UserDocuments   ||
-      left.id() == FileManagement::MainFolder::ExerciseDocuments || right.id() == FileManagement::MainFolder::ExerciseDocuments)
+  if (left.id == static_cast<int>(FileManagement::MainFolder::GlobalDocuments)   || right.id == static_cast<int>(FileManagement::MainFolder::GlobalDocuments) ||
+      left.id == static_cast<int>(FileManagement::MainFolder::UserDocuments)     || right.id == static_cast<int>(FileManagement::MainFolder::UserDocuments)   ||
+      left.id == static_cast<int>(FileManagement::MainFolder::ExerciseDocuments) || right.id == static_cast<int>(FileManagement::MainFolder::ExerciseDocuments))
   {
-    return left.id() < right.id();
+    return left.id < right.id;
   }
 
 
@@ -353,7 +356,7 @@ bool DialogModelProxyFolder::lessThan(const QModelIndex &source_left, const QMod
 
 
 
-  return left.id() < right.id();
+  return left.id < right.id;
 }
 
 
@@ -383,12 +386,12 @@ bool DialogModelProxyFolder::filterAcceptsRow(int source_row, const QModelIndex
     return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
   const Folder data = child->data().value<Folder>();
-  if (data.operatorId() != m_operatorId)
+  if (data.operatorId != m_operatorId)
   {
     
-    for (int p : data.path())
+    for (int p : data.path)
     {
-      if (p == FileManagement::MainFolder::UserDocuments)
+      if (p == static_cast<int>(FileManagement::MainFolder::UserDocuments))
         return false;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
index 95f941225..cce832bf1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
@@ -94,5 +94,5 @@ protected:
 } 
 
 
-Q_DECLARE_METATYPE(FileManagement::Folder)
+#include <FileManagement/flm_qmetatypes.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
index 556dfa9b1..49afb9460 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
@@ -2,11 +2,12 @@
 
 
 #include "flm_edit_file_content.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "flm_preview_file_dialog.h"
 #include "ui_flm_edit_file_content.h"
 #include "flm_set_properties_dialog.h"
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_combobox_gui_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
@@ -27,6 +28,7 @@ FileContentEditDialog::FileContentEditDialog(QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::FileContentEditDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   
@@ -118,7 +120,7 @@ bool FileContentEditDialog::init(LtsSession::LtsSession *session,
           this, &FileContentEditDialog::onPropertiesClicked);
   connect(m_ui->checkUsed, &QCheckBox::stateChanged, this, &FileContentEditDialog::onCheckUsedStateChanged);
 
-  if (m_editData.id() > 0) 
+  if (m_editData.id > 0) 
   {
     m_ui->ltsDialogButtonBox->setText(LtsWidgets::DialogButton::Add, tr("Ok"));
     m_ui->ltsDialogButtonBox->connectButton(LtsWidgets::DialogButton::Add, this, &FileContentEditDialog::onEditItem);
@@ -152,35 +154,35 @@ void FileContentEditDialog::getMetaData()
   m_ui->cbPhases->setCurrentIndex(0);
   m_ui->cbPhases->setEnabled(false);
 
-  m_ui->leName->setText(QString::fromStdString(m_editData.name()));
-  m_ui->cbFileType->setCurrentIndex(m_ui->cbFileType->findData(QVariant(m_editData.fileType().underlying())));
-  m_ui->cbFileCategory->setCurrentIndex(m_ui->cbFileCategory->findData(m_editData.fileCategory().underlying()));
-  m_ui->cbFileStatus->setCurrentIndex(m_ui->cbFileStatus->findData(QVariant(m_editData.fileStatus().underlying())));
+  m_ui->leName->setText(QString::fromStdString(m_editData.name));
+  m_ui->cbFileType->setCurrentIndex(m_ui->cbFileType->findData(QVariant(static_cast<int>(m_editData.fileType))));
+  m_ui->cbFileCategory->setCurrentIndex(m_ui->cbFileCategory->findData(static_cast<int>(m_editData.fileCategory)));
+  m_ui->cbFileStatus->setCurrentIndex(m_ui->cbFileStatus->findData(QVariant(static_cast<int>(m_editData.fileStatus))));
 
   m_ui->leFolder->setText(m_folderName);
 
-  m_ui->checkTemplate->setChecked(m_editData.isTemplate());
-  m_ui->checkHidden->setChecked(m_editData.isHidden());
-  m_ui->checkUsed->setChecked(m_editData.isUsedBy());
-  m_ui->lblUses->setText(QStringLiteral("[") + QString::number(m_editData.usedBy()) + QStringLiteral("]"));
+  m_ui->checkTemplate->setChecked(m_editData.isTemplate);
+  m_ui->checkHidden->setChecked(m_editData.isHidden);
+  m_ui->checkUsed->setChecked(m_editData.isUsedBy);
+  m_ui->lblUses->setText(QStringLiteral("[") + QString::number(m_editData.usedBy) + QStringLiteral("]"));
 
-  m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(m_editData.operatorId()).name()));
-  m_ui->leProperties->setText(QString::fromStdString(m_editData.properties()));
-  if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
-      m_editData.fileCategory() == FileManagement::FileCategory::User)
+  m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(m_editData.operatorId).name));
+  m_ui->leProperties->setText(QString::fromStdString(m_editData.properties));
+  if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
+      m_editData.fileCategory == FileManagement::FileCategory::User)
   {
-    if (m_editData.exerciseId().is_set())
+    if (m_editData.exerciseId.has_value())
     {
-      m_ui->cbExercises->setCurrentIndex(m_ui->cbExercises->findData(m_editData.exerciseId().get()));
-      if (m_editData.phaseId().is_set())
-        m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId().get()));
+      m_ui->cbExercises->setCurrentIndex(m_ui->cbExercises->findData(m_editData.exerciseId.get()));
+      if (m_editData.phaseId.has_value())
+        m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId.get()));
       else
         m_ui->cbPhases->setEnabled(true);
     }
     else
       m_ui->cbExercises->setEnabled(true);
   }
-  m_ui->leLastModified->setText(DTG::toStringMSec(m_editData.lastModified()));
+  m_ui->leLastModified->setText(DTG::toStringMSec(m_editData.lastModified));
 }
 
 
@@ -188,31 +190,31 @@ void FileContentEditDialog::setMetaData()
 {
   DEBUG_LOG(m_logger) << "setMetaData";
 
-  m_editData.name(m_ui->leName->text().toStdString());
-  m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
-  m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
-  m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
-  m_editData.isTemplate(m_ui->checkTemplate->isChecked());
-  m_editData.isHidden(m_ui->checkHidden->isChecked());
-  m_editData.isUsedBy(m_ui->checkUsed->isChecked());
-  if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise)
+  m_editData.name = m_ui->leName->text().toStdString();
+  m_editData.fileType = static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt());
+  m_editData.fileCategory = static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt());
+  m_editData.fileStatus = static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt());
+  m_editData.isTemplate = m_ui->checkTemplate->isChecked();
+  m_editData.isHidden = m_ui->checkHidden->isChecked();
+  m_editData.isUsedBy = m_ui->checkUsed->isChecked();
+  if (m_editData.fileCategory == FileManagement::FileCategory::Exercise)
   {
     if (m_ui->cbExercises->currentData().toInt() > 0)
     {
-      m_editData.exerciseId(m_ui->cbExercises->currentData().toInt());
+      m_editData.exerciseId = m_ui->cbExercises->currentData().toInt();
       if (m_ui->cbPhases->currentData().toInt() > 0)
-        m_editData.phaseId(m_ui->cbPhases->currentData().toInt());
+        m_editData.phaseId = m_ui->cbPhases->currentData().toInt();
     }
   }
   else
   {
-    m_editData.exerciseId();
-    m_editData.phaseId();
+    m_editData.exerciseId;
+    m_editData.phaseId;
   }
-  m_editData.properties(m_ui->leProperties->text().toStdString());
-  m_editData.lastModified(QDateTime::currentMSecsSinceEpoch());
+  m_editData.properties = m_ui->leProperties->text().toStdString();
+  m_editData.lastModified = QDateTime::currentMSecsSinceEpoch();
   
-  m_editData.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+  m_editData.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   
 }
 
@@ -224,36 +226,36 @@ void FileContentEditDialog::onAddItem()
   setMetaData();
 
   FileContentModifyRequest data;
-  data.name(m_editData.name());
-  data.fileType(m_editData.fileType());
-  data.fileCategory(m_editData.fileCategory());
-  data.fileStatus(m_editData.fileStatus());
-  data.properties(m_editData.properties());
-  data.isTemplate(m_editData.isTemplate());
-  data.isHidden(m_editData.isHidden());
-  data.isUsedBy(m_editData.isUsedBy());
-  data.usedBy(m_editData.usedBy());
-  data.folderId(m_editData.folderId());
-  if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
-      m_editData.fileCategory() == FileManagement::FileCategory::User)
+  data.name = m_editData.name;
+  data.fileType = m_editData.fileType;
+  data.fileCategory = m_editData.fileCategory;
+  data.fileStatus = m_editData.fileStatus;
+  data.properties = m_editData.properties;
+  data.isTemplate = m_editData.isTemplate;
+  data.isHidden = m_editData.isHidden;
+  data.isUsedBy = m_editData.isUsedBy;
+  data.usedBy = m_editData.usedBy;
+  data.folderId = m_editData.folderId;
+  if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
+      m_editData.fileCategory == FileManagement::FileCategory::User)
   {
-    if (m_editData.exerciseId().is_set())
+    if (m_editData.exerciseId.has_value())
     {
-      data.exerciseId(m_editData.exerciseId().get());
-      if (m_editData.phaseId().is_set())
-        data.phaseId(m_editData.phaseId().get());
+      data.exerciseId = m_editData.exerciseId.get();
+      if (m_editData.phaseId.has_value())
+        data.phaseId = m_editData.phaseId.get();
     }
   }
   else
   {
-    m_editData.exerciseId();
-    m_editData.phaseId();
+    m_editData.exerciseId;
+    m_editData.phaseId;
   }
   DEBUG_LOG(m_logger) << "onAddItem: Content size = " << m_content.size();
-  data.content(m_content);
+  data.content = m_content;
 
-  data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  data.lastModified(QDateTime::currentMSecsSinceEpoch());
+  data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  data.lastModified = QDateTime::currentMSecsSinceEpoch();
 
   if (!m_requestHelper->startSingleRequest([data, this]() {return m_ftc->fileContentModifyRequest(data, this);}))
   return;
@@ -271,39 +273,39 @@ void FileContentEditDialog::onEditItem()
   setMetaData();
 
   FileContentModifyRequest data;
-  data.id(m_editData.id());
-  data.name(m_editData.name());
-  data.fileType(m_editData.fileType());
-  data.fileCategory(m_editData.fileCategory());
-  data.fileStatus(m_editData.fileStatus());
-  data.properties(m_editData.properties());
-  data.isTemplate(m_editData.isTemplate());
-  data.isHidden(m_editData.isHidden());
-  data.isUsedBy(m_editData.isUsedBy());
-  data.usedBy(m_editData.usedBy());
-  data.folderId(m_editData.folderId());
-  if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
-      m_editData.fileCategory() == FileManagement::FileCategory::User)
+  data.id = m_editData.id;
+  data.name = m_editData.name;
+  data.fileType = m_editData.fileType;
+  data.fileCategory = m_editData.fileCategory;
+  data.fileStatus = m_editData.fileStatus;
+  data.properties = m_editData.properties;
+  data.isTemplate = m_editData.isTemplate;
+  data.isHidden = m_editData.isHidden;
+  data.isUsedBy = m_editData.isUsedBy;
+  data.usedBy = m_editData.usedBy;
+  data.folderId = m_editData.folderId;
+  if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
+      m_editData.fileCategory == FileManagement::FileCategory::User)
   {
-    if (m_editData.exerciseId().is_set())
+    if (m_editData.exerciseId.has_value())
     {
-      data.exerciseId(m_editData.exerciseId().get());
-      if (m_editData.phaseId().is_set())
-        data.phaseId(m_editData.phaseId().get());
+      data.exerciseId = m_editData.exerciseId.get();
+      if (m_editData.phaseId.has_value())
+        data.phaseId = m_editData.phaseId.get();
     }
   }
   else
   {
-    m_editData.exerciseId();
-    m_editData.phaseId();
+    m_editData.exerciseId;
+    m_editData.phaseId;
   }
-  data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  data.lastModified(QDateTime::currentMSecsSinceEpoch());
+  data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  data.lastModified = QDateTime::currentMSecsSinceEpoch();
 
   DEBUG_LOG(m_logger) << "onEditItem: Content size = " << m_content.size();
-  data.content(m_content);
+  data.content = m_content;
 
-  DEBUG_LOG(m_logger) << "Modify FileContent id = " << data.id();
+  DEBUG_LOG(m_logger) << "Modify FileContent id = " << data.id;
 
   if (!m_requestHelper->startSingleRequest([ = ]()
 {
@@ -320,7 +322,7 @@ void FileContentEditDialog::onComboFileTypeChanged(int crt)
 {
   DEBUG_LOG(m_logger) << "onComboFileTypeChanged crt = " << crt;
   m_ui->cbFileType->setCurrentIndex(crt);
-  m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
+  m_editData.fileType = static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt());
 }
 
 
@@ -328,7 +330,7 @@ void FileContentEditDialog::onComboFileStatusChanged(int crt)
 {
   DEBUG_LOG(m_logger) << "onComboFileStatusChanged crt = " << crt;
   m_ui->cbFileStatus->setCurrentIndex(crt);
-  m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
+  m_editData.fileStatus = static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt());
 }
 
 
@@ -336,7 +338,7 @@ void FileContentEditDialog::onComboFileCategoryChanged(int crt)
 {
   DEBUG_LOG(m_logger) << "onComboFileCategoryChanged crt = " << crt;
   m_ui->cbFileCategory->setCurrentIndex(crt);
-  m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
+  m_editData.fileCategory = static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt());
 
 
 
@@ -350,13 +352,13 @@ void FileContentEditDialog::onComboExerciseChanged(int crt)
   m_ui->cbExercises->setCurrentIndex(crt);
   if (m_ui->cbExercises->currentData().toInt() > 0)
   {
-    m_editData.exerciseId(m_ui->cbExercises->currentData().toInt());
+    m_editData.exerciseId = m_ui->cbExercises->currentData().toInt();
     m_ui->cbPhases->setEnabled(true);
   }
   else
   {
-    m_editData.exerciseId().reset();
-    m_editData.phaseId().reset();
+    m_editData.exerciseId.reset();
+    m_editData.phaseId.reset();
     m_ui->cbPhases->setEnabled(false);
   }
   fillPhasesComboBox();
@@ -368,9 +370,9 @@ void FileContentEditDialog::onComboPhaseChanged(int crt)
   DEBUG_LOG(m_logger) << "onComboPhaseChanged crt = " << crt;
   m_ui->cbPhases->setCurrentIndex(crt);
   if (m_ui->cbPhases->currentData().toInt() > 0)
-    m_editData.phaseId(m_ui->cbPhases->currentData().toInt());
+    m_editData.phaseId = m_ui->cbPhases->currentData().toInt();
   else
-    m_editData.phaseId().reset();
+    m_editData.phaseId.reset();
 }
 
 
@@ -382,7 +384,7 @@ void FileContentEditDialog::fillExercisesComboBox()
   m_ui->cbExercises->addItem(tr("<not set>"), 0);
   auto cbEx = [this] (const ExerciseManagement::Exercise &ex)
   {
-    m_ui->cbExercises->addItem(QString::fromStdString(ex.name()), ex.id());
+    m_ui->cbExercises->addItem(QString::fromStdString(ex.name), ex.id);
   };
   m_exmDtc->exercises(cbEx);
 }
@@ -394,21 +396,21 @@ void FileContentEditDialog::fillPhasesComboBox()
   QSignalBlocker blocker(m_ui->cbPhases);
   m_ui->cbPhases->clear();
   m_ui->cbPhases->addItem(tr("<not set>"), 0);
-  if (m_editData.exerciseId().is_set())
+  if (m_editData.exerciseId.has_value())
   {
-    const int exId = m_editData.exerciseId().get();
+    const int exId = m_editData.exerciseId.get();
     DEBUG_LOG(m_logger) << "ExId = " << exId;
     if (exId > 0)
     {
       auto cbPhases = [this, exId] (const ExerciseManagement::ExercisePhase &ph)
       {
-        if (ph.exerciseId() == exId)
-          m_ui->cbPhases->addItem(QString::fromStdString(ph.name()), ph.id());
+        if (ph.exerciseId == exId)
+          m_ui->cbPhases->addItem(QString::fromStdString(ph.name), ph.id);
       };
       m_exmDtc->exercisePhases(cbPhases);
     }
-    if (m_editData.phaseId().is_set())
-      m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId().get()));
+    if (m_editData.phaseId.has_value())
+      m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId.get()));
   }
 }
 
@@ -427,10 +429,10 @@ void FileContentEditDialog::onCheckUsedStateChanged(int newState)
 {
   DEBUG_LOG(m_logger) << "onCheckUsedClicked: newState = " << newState;
   if (newState == Qt::Checked)  
-    m_editData.usedBy(1);
+    m_editData.usedBy = 1;
   else
-    m_editData.usedBy(0);
-  m_ui->lblUses->setText(QLatin1Char('[') + QString::number(m_editData.usedBy()) + QLatin1Char(']'));
+    m_editData.usedBy = 0;
+  m_ui->lblUses->setText(QLatin1Char('[') + QString::number(m_editData.usedBy) + QLatin1Char(']'));
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.cpp
index d4217dbc1..83e64f2b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_edit_folder.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_flm_edit_folder.h"
 #include <LtsSession/lts_session_data.h>
 
@@ -14,6 +15,7 @@ FolderEditDialog::FolderEditDialog(QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::FolderEditDialog)
   , m_workingIndex(QModelIndex())
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -67,16 +69,16 @@ bool FolderEditDialog::init(const QModelIndex &workingIndex, const int &folderId
   setWindowTitle(tr("Create New Folder"));
   if (m_folderId > 0) 
   {
-    m_ui->leName->setText(QString::fromStdString(m_editData.name()));
+    m_ui->leName->setText(QString::fromStdString(m_editData.name));
     m_ui->ltsDialogButtonBox->setText(LtsWidgets::DialogButton::Add, tr("Rename"));
     setWindowTitle(tr("Edit Folder"));
   }
-  else if (data.id() > 0)   
-    m_ui->leName->setText(QString::fromStdString(m_editData.name()));
+  else if (data.id > 0)   
+    m_ui->leName->setText(QString::fromStdString(m_editData.name));
   m_ui->ltsDialogButtonBox->connectButton(LtsWidgets::DialogButton::Add, this, &FolderEditDialog::onAddEditFolder);
 
   m_ui->cbHidden->setVisible(isAdminMode);
-  m_ui->cbHidden->setChecked(m_editData.isHidden());
+  m_ui->cbHidden->setChecked(m_editData.isHidden);
 
 #ifdef TABLET_MODE
   m_ui->leName->setFocusPolicy(Qt::ClickFocus);
@@ -94,7 +96,7 @@ void FolderEditDialog::onAddEditFolder()
   if (apply())
   {
     close();
-    DEBUG_LOG(m_logger) << "Added / Edited folder " << m_editData.name();
+    DEBUG_LOG(m_logger) << "Added / Edited folder " << m_editData.name;
   }
 }
 
@@ -108,13 +110,13 @@ bool FolderEditDialog::apply()
     m_requestHelper->addRequest([this]()
     {
       FolderModifyRequest req;
-      req.id(m_folderId);
-      req.name(m_ui->leName->text().toStdString());
-      req.path(m_dtc->folder(m_folderId).path());
-      req.isEditable(true);
-      req.isHidden(m_ui->cbHidden->isChecked());
-      req.parentId(m_dtc->folder(m_folderId).parentId());
-      req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+      req.id = m_folderId;
+      req.name = m_ui->leName->text().toStdString();
+      req.path = m_dtc->folder(m_folderId).path;
+      req.isEditable = true;
+      req.isHidden = m_ui->cbHidden->isChecked();
+      req.parentId = m_dtc->folder(m_folderId).parentId;
+      req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
       return m_ftc->folderModifyRequest(req, this);
     });
 
@@ -125,18 +127,18 @@ bool FolderEditDialog::apply()
     DEBUG_LOG(m_logger) << "Create new folder";
 
     FolderModifyRequest req;
-    req.name(m_ui->leName->text().toStdString());
-    req.isEditable(true);
-    req.isHidden(m_ui->cbHidden->isChecked());
-    req.parentId(m_parentFolderId);
+    req.name = m_ui->leName->text().toStdString();
+    req.isEditable = true;
+    req.isHidden = m_ui->cbHidden->isChecked();
+    req.parentId = m_parentFolderId;
     std::vector<int> parentPath;
     if (m_parentFolderId > 0)
     {
       FileManagement::Folder fld = m_dtc->folder(m_parentFolderId);
-      parentPath = fld.path();
+      parentPath = fld.path;
     }
-    req.path(parentPath);
-    req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    req.path = parentPath;
+    req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
     m_requestHelper->addRequest([req, this]()
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
index 4a060edc2..be1359ceb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_explorer_gui_plugin.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "flm_dialog.h"
 #include "flm_preview_playback.h"
 #include "flm_get_content_async.h"
@@ -12,7 +13,7 @@
 #include <LtsWidgets/lts_events.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -53,6 +54,7 @@ const QString InterfaceImpl::s_flmHQReportScheme = QStringLiteral("flmHQReport")
 InterfaceImpl::InterfaceImpl(LtsSession::LtsSession *session)
   : GuiPluginBase::Interface(session, getLogger("Plugins.Gui.Flm.Explorer"))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   qApp->installEventFilter(this);
 }
@@ -288,7 +290,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
   delete dialog;
 
   INFO_LOG(m_logger) << "FileToSave: Folder id = " << folderId
-                     << ", File id = " << fileToModify.id()
+                     << ", File id = " << fileToModify.id
                      << ", File name = " << fileName;
 
   if (folderId < 1 || fileName.isEmpty())
@@ -297,7 +299,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
     return 0;
   }
 
-  if (fileToModify.id() > 0) 
+  if (fileToModify.id > 0) 
   {
     bool doNotOverwrite = (LtsWidgets::Button::No == LtsWidgets::LtsMessageDialog::showMessage( m_session->baseLayout()
                                                                                          , tr("Do you want to overwrite the existing file?")
@@ -313,55 +315,55 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
 
   FileManagement::FileContentModifyRequest request;
 
-  request.id(fileToModify.id());
-  request.name(fileName.toStdString());
-  request.isTemplate(fileToModify.isTemplate());
-  request.folderId(folderId);
-  const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtc->folder(folderId).path());
+  request.id = fileToModify.id;
+  request.name = fileName.toStdString();
+  request.isTemplate = fileToModify.isTemplate;
+  request.folderId = folderId;
+  const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtc->folder(folderId).path);
 
-  if (fileToModify.id() > 0)
-    request.fileCategory(fileToModify.fileCategory());
+  if (fileToModify.id > 0)
+    request.fileCategory = fileToModify.fileCategory;
   else
   {
-    if (fldPath.contains(FileManagement::MainFolder::UserDocuments))
-      request.fileCategory(FileManagement::FileCategory::User);
-    else if (fldPath.contains(FileManagement::MainFolder::ExerciseDocuments))
-      request.fileCategory(FileManagement::FileCategory::Exercise);
+    if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::UserDocuments)))
+      request.fileCategory = FileManagement::FileCategory::User;
+    else if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
+      request.fileCategory = FileManagement::FileCategory::Exercise;
     else
-      request.fileCategory(FileManagement::FileCategory::Global);
+      request.fileCategory = FileManagement::FileCategory::Global;
   }
-  request.fileType(targetFileType);
-  request.fileStatus(FileManagement::FileStatus::Valid);
-  request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
-  request.isUsedBy(false);
-  request.usedBy(0);
-  request.lastModified(QDateTime::currentMSecsSinceEpoch());
+  request.fileType = targetFileType;
+  request.fileStatus = FileManagement::FileStatus::Valid;
+  request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
+  request.isUsedBy = false;
+  request.usedBy = 0;
+  request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
   
-  if (exerciseId > 0 && request.fileCategory() == FileManagement::FileCategory::Exercise)
+  if (exerciseId > 0 && request.fileCategory == FileManagement::FileCategory::Exercise)
   {
-    request.exerciseId(exerciseId);
-    if (fileToModify.phaseId().is_set())
-      request.phaseId(fileToModify.phaseId().get());
+    request.exerciseId = exerciseId;
+    if (fileToModify.phaseId.has_value())
+      request.phaseId = fileToModify.phaseId.get();
     else
     {
       
       int phId = (fldPath.size() > 3) ? m_dtc->getExerciseId(fldPath.at(3)) : 0;
       if (phId > 0)
-        request.phaseId(phId);
+        request.phaseId = phId;
     }
   }
   else
   {
-    request.exerciseId();
-    request.phaseId();
+    request.exerciseId;
+    request.phaseId;
   }
 
   if (!properties.isEmpty())
-    request.properties(properties.toStdString());
+    request.properties = properties.toStdString();
   else
-    request.properties(fileToModify.properties());
+    request.properties = fileToModify.properties;
 
   
   if (targetFileType == FileManagement::FileType::Xml && !content.isEmpty())
@@ -371,10 +373,10 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
     {
       QJsonObject obj;
 
-      if (fileToModify.properties().size() != 0)
+      if (fileToModify.properties.size() != 0)
       {
-        const QByteArray &attributesJson = QByteArray::fromRawData(fileToModify.properties().c_str(),
-                                                                   fileToModify.properties().size());
+        const QByteArray &attributesJson = QByteArray::fromRawData(fileToModify.properties.c_str(),
+                                                                   fileToModify.properties.size());
         QJsonParseError parseError;
         QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
 
@@ -383,7 +385,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
       }
       obj[QStringLiteral("XmlType")] = xmlTypeValue;
 
-      request.properties(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
+      request.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString();
     }
   }
 
@@ -409,7 +411,7 @@ int InterfaceImpl::getFileId(FileManagement::FileType fileType, const QString &f
 
 QString InterfaceImpl::getFileName(int fileId) const
 {
-  return QString::fromStdString(m_dtc->fileContent(fileId).name());
+  return QString::fromStdString(m_dtc->fileContent(fileId).name);
 }
 
 
@@ -417,31 +419,31 @@ bool InterfaceImpl::saveContent(int fileId, const QByteArray &content, const QSt
 {
   FileManagement::FileContent fileToModify = m_dtc->fileContent(fileId);
 
-  if (fileToModify.id() <= 0)
+  if (fileToModify.id <= 0)
     return false;
 
   FileManagement::FileContentModifyRequest request;
 
-  request.id(fileId);
-  request.name(fileToModify.name());
-  request.isTemplate(fileToModify.isTemplate());
-  request.folderId(fileToModify.folderId());
-  request.fileCategory(fileToModify.fileCategory());
-  request.fileType(fileToModify.fileType());
-  request.fileStatus(fileToModify.fileStatus());
-  request.isUsedBy(fileToModify.isUsedBy());
-  request.usedBy(fileToModify.usedBy());
-  request.exerciseId(fileToModify.exerciseId());
-  request.phaseId(fileToModify.phaseId());
+  request.id = fileId;
+  request.name = fileToModify.name;
+  request.isTemplate = fileToModify.isTemplate;
+  request.folderId = fileToModify.folderId;
+  request.fileCategory = fileToModify.fileCategory;
+  request.fileType = fileToModify.fileType;
+  request.fileStatus = fileToModify.fileStatus;
+  request.isUsedBy = fileToModify.isUsedBy;
+  request.usedBy = fileToModify.usedBy;
+  request.exerciseId = fileToModify.exerciseId;
+  request.phaseId = fileToModify.phaseId;
 
-  request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  request.lastModified(QDateTime::currentMSecsSinceEpoch());
+  request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
-  request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
+  request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
   if (!properties.isEmpty())
-    request.properties(properties.toStdString());
+    request.properties = properties.toStdString();
   else
-    request.properties(fileToModify.properties());
+    request.properties = fileToModify.properties;
 
   if (!m_requestHelper->startSingleRequest([this, request]()
   {
@@ -457,21 +459,21 @@ int InterfaceImpl::newFileContent(FileContent fc, const QByteArray &content)
 {
   FileManagement::FileContentModifyRequest request;
 
-  request.name(fc.name());
-  request.isTemplate(fc.isTemplate());
-  request.folderId(fc.folderId());
-  request.fileCategory(fc.fileCategory());
-  request.fileType(fc.fileType());
-  request.fileStatus(fc.fileStatus());
-  request.isUsedBy(fc.isUsedBy());
-  request.usedBy(fc.usedBy());
-  request.exerciseId(fc.exerciseId());
-  request.phaseId(fc.phaseId());
-  request.properties(fc.properties());
-  request.operatorId(fc.operatorId());
-  request.lastModified(QDateTime::currentMSecsSinceEpoch());
+  request.name = fc.name;
+  request.isTemplate = fc.isTemplate;
+  request.folderId = fc.folderId;
+  request.fileCategory = fc.fileCategory;
+  request.fileType = fc.fileType;
+  request.fileStatus = fc.fileStatus;
+  request.isUsedBy = fc.isUsedBy;
+  request.usedBy = fc.usedBy;
+  request.exerciseId = fc.exerciseId;
+  request.phaseId = fc.phaseId;
+  request.properties = fc.properties;
+  request.operatorId = fc.operatorId;
+  request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
-  request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
+  request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
 
   if (!m_requestHelper->startSingleRequest([this, request]()
   {
@@ -487,10 +489,10 @@ bool InterfaceImpl::deleteFileContent(int fileId)
 {
   FileManagement::FileContent fc = m_dtc->fileContent(fileId);
 
-  if (fc.id() <= 0)
+  if (fc.id <= 0)
     return false;
 
-  if (fc.fileStatus() == FileManagement::FileStatus::Deleted)
+  if (fc.fileStatus == FileManagement::FileStatus::Deleted)
   {
     WARNING_LOG(m_logger) << "File content already deleted for id = " << fileId;
     return true;  
@@ -498,10 +500,10 @@ bool InterfaceImpl::deleteFileContent(int fileId)
 
   FileManagement::FileContentChangeStatusRequest request;
 
-  request.id(fileId);
-  request.fileStatus(FileManagement::FileStatus::Deleted);
-  request.lastModified(QDateTime::currentMSecsSinceEpoch());
-  request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+  request.id = fileId;
+  request.fileStatus = FileManagement::FileStatus::Deleted;
+  request.lastModified = QDateTime::currentMSecsSinceEpoch();
+  request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
   if (!m_requestHelper->startSingleRequest([this, request]()
   {
@@ -556,11 +558,11 @@ int InterfaceImpl::loadFileContent(QWidget *parent,
   auto cbRet = [&content](const Core::FunctionReply & baseReply)
   {
     const auto &replyObject = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
-    content = LtsUtils::toQByteArray(replyObject.content());
+    content = LtsUtils::toQByteArray(replyObject.content);
   };
 
   FileManagement::GetFileContentDataRequest req;
-  req.fileContentId(fileId);
+  req.fileContentId = fileId;
   auto cb = [req, this]()
   {
     return m_ftc->getFileContentDataRequest(req, this);
@@ -622,11 +624,11 @@ bool InterfaceImpl::loadContent(int fileId, QByteArray &content, bool bQuiet)
   auto cbRet = [&content](const Core::FunctionReply &baseReply)
   {
     const auto &replyObject = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
-    content = LtsUtils::toQByteArray(replyObject.content());
+    content = LtsUtils::toQByteArray(replyObject.content);
   };
 
   FileManagement::GetFileContentDataRequest req;
-  req.fileContentId(fileId);
+  req.fileContentId = fileId;
   auto cb = [req, this]()
   {
     return m_ftc->getFileContentDataRequest(req, this);
@@ -783,7 +785,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
   if (fileId > 0)
     fc = m_dtc->fileContent(fileId);
   else
-    fc.fileType(FileManagement::FileType::Text); 
+    fc.fileType = FileManagement::FileType::Text; 
 
   if (!m_previewWidget)
   {
@@ -830,7 +832,7 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
   
   DEBUG_LOG(m_logger) << "Trying to export file with id " << fileId << " to " << strPathToFile;
     FileManagement::FileContent fc = m_dtc->fileContent(fileId);
-  GetFileContentAsync *getFileContent = new GetFileContentAsync(fc.id(), m_ftc);
+  GetFileContentAsync *getFileContent = new GetFileContentAsync(fc.id, m_ftc);
 
   connect(getFileContent, &GetFileContentAsync::signalDone,
           getFileContent, [pExportNotifier, getFileContent, fc, strPathToFile]()
@@ -838,9 +840,9 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
     qWarning() << Q_FUNC_INFO << "file content arrived!";
 
     const std::vector<uint8_t> &content = getFileContent->content();
-    QString strFileName(QString::number(fc.id()));
+    QString strFileName(QString::number(fc.id));
 
-    switch (fc.fileType().underlying())
+    switch (fc.fileType)
     {
     case FileManagement::FileType::Png:
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.h
index a5f46dcba..97f8aa014 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.h
@@ -6,7 +6,7 @@
 #include <Lts/Services/FileManagement/logger.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <OperatorManagement/opm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
@@ -148,6 +148,7 @@ private:
     std::shared_ptr<FileManagement::Interface::Dtc> m_dtc;
     std::shared_ptr<FileManagement::Interface::Ftc> m_ftc;
     FileManagement::FileContentPreviewPlaybackWidget *m_previewWidget{nullptr};
+    NGL::INGLLogger &m_logger;
   };
   TopicReplay::Interface *createInterface(TopicEditorBase::TopicType) override { return new TopicReplayInterface(m_dtc, m_ftc); }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.cpp
index 4e7f073a0..f41cd196f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_get_content.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 
 namespace FileManagement
@@ -12,6 +13,7 @@ GetFileContent::GetFileContent(const std::shared_ptr<FileManagement::Interface::
   : QObject(parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ftc(ftc)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -28,14 +30,14 @@ bool GetFileContent::getContent(int fileContentId, std::vector<uint8_t> &content
   auto handleContent = [this, &content](const Core::FunctionReply & baseReply)
   {
     const GetFileContentDataReply &reply = static_cast<const GetFileContentDataReply &>(baseReply);
-    content = reply.content();
+    content = reply.content;
     DEBUG_LOG(m_logger) << "Content size: " << content.size();
   };
 
   auto sendReq = [this, fileContentId]()
   {
     GetFileContentDataRequest req;
-    req.fileContentId(fileContentId);
+    req.fileContentId = fileContentId;
     return m_ftc->getFileContentDataRequest(req, this);
   };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.cpp
index 6c9e5c8e8..dddf6df8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.cpp
@@ -10,20 +10,20 @@ GetFileContentAsync::GetFileContentAsync(int fileContentId, const std::shared_pt
   : QObject()
 {
   GetFileContentDataRequest req;
-  req.fileContentId(fileContentId);
+  req.fileContentId = fileContentId;
   flmFtc->getFileContentDataRequest(req, this);
 }
 
 
 void GetFileContentAsync::onGetFileContentDataReply(const GetFileContentDataReply &reply)
 {
-  if (!reply.errorString().empty())
+  if (!reply.errorString.empty())
   {
     emit signalFailed();
     return;
   }
 
-  m_content = reply.content();
+  m_content = reply.content;
   emit signalDone();
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
index a20bb2c02..3d22a8cde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_office_integration.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session.h>
 #include <LtsUtilsSettings/settings.h>
 #include <nglsettings/nglsettings_settings.h>
@@ -99,9 +100,9 @@ bool OfficeIntegration::callLibreOffice()
   QStringList arguments;
   arguments << QStringLiteral("-jar") << QStringLiteral("/opt/libreOfficeAddin/RheinmetallLibreOfficeLauncher.jar")
             << QStringLiteral("--jdbcConnectionString") << connString
-            << QStringLiteral("--operatorId") << QString::number(m_selectedFileContent.operatorId())
-            << QStringLiteral("--documentId") << QString::number(m_selectedFileContent.id())
-            << QStringLiteral("--fileCategoryId") << QString::number(m_selectedFileContent.fileCategory().underlying())
+            << QStringLiteral("--operatorId") << QString::number(m_selectedFileContent.operatorId)
+            << QStringLiteral("--documentId") << QString::number(m_selectedFileContent.id)
+            << QStringLiteral("--fileCategoryId") << QString::number(static_cast<int>(m_selectedFileContent.fileCategory))
             << QStringLiteral("--libreOfficeHost") << QStringLiteral("localhost")
             << QStringLiteral("--libreOfficePort") << QStringLiteral("8100");
 
@@ -140,26 +141,26 @@ QString OfficeIntegration::getParas() const
   paras += QStringLiteral(",");
 
   paras += QStringLiteral("operatorId:");
-  paras += QString::number(m_selectedFileContent.operatorId());
+  paras += QString::number(m_selectedFileContent.operatorId);
   paras += QStringLiteral(",");
 
   paras += QStringLiteral("documentId:");
-  paras += QString::number(m_selectedFileContent.id());
+  paras += QString::number(m_selectedFileContent.id);
   paras += QStringLiteral(",");
 
   paras += QStringLiteral("fileCategoryId:");
-  paras += QString::number(m_selectedFileContent.fileCategory().underlying());
+  paras += QString::number(static_cast<int>(m_selectedFileContent.fileCategory));
 
-  if (m_selectedFileContent.exerciseId().is_set())
+  if (m_selectedFileContent.exerciseId.has_value())
   {
     paras += QStringLiteral(",");
     paras += QStringLiteral("exerciseId:");
-    paras += QString::number(m_selectedFileContent.exerciseId().get());
-    if (m_selectedFileContent.phaseId().is_set())
+    paras += QString::number(m_selectedFileContent.exerciseId.get());
+    if (m_selectedFileContent.phaseId.has_value())
     {
       paras += QStringLiteral(",");
       paras += QStringLiteral("phaseId:");
-      paras += QString::number(m_selectedFileContent.phaseId().get());
+      paras += QString::number(m_selectedFileContent.phaseId.get());
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
index 23b61f6f7..9dec620d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
@@ -2,9 +2,10 @@
 
 
 #include "flm_preview_file_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_flm_preview_file_dialog.h"
 
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsPrinting/printing.h>
 #include <nglsettings/nglsettings_settings.h>
@@ -24,6 +25,7 @@ FileContentPreviewDialog::FileContentPreviewDialog(LtsSession::LtsSession *sessi
   , m_session(session)
   , m_getContent(new FileManagement::GetFileContent(ftc, this))
   , m_content(QByteArray())
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->line->setVisible(false);
@@ -47,18 +49,18 @@ bool FileContentPreviewDialog::init(const FileContent &data)
   connect(m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Print), &QPushButton::clicked, this, &FileContentPreviewDialog::onPrint);
 
   m_data = data;
-  if (m_data.id() > 0) 
+  if (m_data.id > 0) 
   {
     std::vector<uint8_t> content;
-    m_getContent->getContent(m_data.id(), content);
+    m_getContent->getContent(m_data.id, content);
     m_content = LtsUtils::toQByteArray(content);
   }
 
-  m_ui->lblTitle->setText(tr("Preview File Content: %1").arg(QString::fromStdString(data.name())));
+  m_ui->lblTitle->setText(tr("Preview File Content: %1").arg(QString::fromStdString(data.name)));
 
   DEBUG_LOG(m_logger) << "Content size: " << m_content.size();
 
-  switch (data.fileType().underlying())
+  switch (data.fileType)
   {
   case FileManagement::FileType::Png:
   case FileManagement::FileType::Jpg:
@@ -131,10 +133,10 @@ void FileContentPreviewDialog::onPrint()
     auto s = Settings::settings();
 
     QVector<QImage> images = m_ui->pdfWidget->getPrintableImages(150 );
-    LtsPrinting::printPDFImages(this, QString::fromStdString(m_data.name()), s->printPath(), images);
+    LtsPrinting::printPDFImages(this, QString::fromStdString(m_data.name), s->printPath(), images);
   }
   else
-    LtsPrinting::printWidget(m_session, this, m_ui->stackedWidget->currentWidget(), QString::fromStdString(m_data.name()));
+    LtsPrinting::printWidget(m_session, this, m_ui->stackedWidget->currentWidget(), QString::fromStdString(m_data.name));
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp
index 88a95625f..e276b4a3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp
@@ -2,9 +2,10 @@
 
 
 #include "flm_preview_playback.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_flm_preview_playback.h"
 
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <nglwidgets/nglpdfwidget.h>
@@ -71,10 +72,10 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
   m_userText = userText;
 
   DEBUG_LOG(m_logger) << "FileContentPreviewPlaybackWidget::init - (fileId, pageNo, zoomFactor, rotation) = ("
-                      << m_data.id() << "," << m_pageNo << "," << m_zoomFactor << ", " << m_rotation << ")";
+                      << m_data.id << "," << m_pageNo << "," << m_zoomFactor << ", " << m_rotation << ")";
 
-  if (m_userText.isEmpty() && m_data.id() > 0)
-    m_getContent->getContent(m_data.id(), m_content);
+  if (m_userText.isEmpty() && m_data.id > 0)
+    m_getContent->getContent(m_data.id, m_content);
 
   DEBUG_LOG(m_logger) << "Content size: " << m_content.size() << ", " << m_pageNo;
 
@@ -85,7 +86,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
   m_ui->teText->setVisible(false);
   m_pdfWidget->setVisible(false);
 
-  switch (data.fileType().underlying())
+  switch (data.fileType)
   {
   case FileManagement::FileType::Png:
   case FileManagement::FileType::Jpg:
@@ -96,7 +97,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
   }
   case FileManagement::FileType::Text:
   {
-    if (!m_userText.isEmpty() && m_data.id() == 0)
+    if (!m_userText.isEmpty() && m_data.id == 0)
     {
       m_ui->teText->setHtml(m_userText);
       m_ui->teText->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -141,7 +142,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
   case FileManagement::FileType::Unknown:
   default:
   {
-    if (!m_userText.isEmpty() && m_data.id() == 0)
+    if (!m_userText.isEmpty() && m_data.id == 0)
     {
       m_ui->teText->setHtml(m_userText);
       m_ui->teText->setVisible(true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.cpp
index 356145437..e096c0b73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_set_properties_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_flm_set_properties_dialog.h"
 
 #include <QtWidgets/QLineEdit>
@@ -17,6 +18,7 @@ SetPropertiesDialog::SetPropertiesDialog(QLineEdit *lineEdit, QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent)
   , m_ui(new Ui::SetPropertiesDialog)
   , m_lineEdit(lineEdit)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   DEBUG_LOG(m_logger) << "Ctor SetPropertiesDialog";
   m_ui->setupUi(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox.cpp
index 68f46c380..1bf6a523a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox.cpp
@@ -12,39 +12,39 @@ bool FlmComboBox::fill(LtsWidgets::LtsComboBox *cbx, FlmComboBoxType type)
   {
   case FlmComboBoxType::CbFileCategory:
   {
-    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Global), FileManagement::FileCategory::Global);
-    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Exercise), FileManagement::FileCategory::Exercise);
-    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::User), FileManagement::FileCategory::User);
+    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Global), static_cast<int>(FileManagement::FileCategory::Global));
+    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Exercise), static_cast<int>(FileManagement::FileCategory::Exercise));
+    cbx->addItem(FileManagement::toString(FileManagement::FileCategory::User), static_cast<int>(FileManagement::FileCategory::User));
     break;
   }
   case FlmComboBoxType::CbFileStatus:
   {
-    cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Valid), FileManagement::FileStatus::Valid);
-    cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Deleted), FileManagement::FileStatus::Deleted);
+    cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Valid), static_cast<int>(FileManagement::FileStatus::Valid));
+    cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Deleted), static_cast<int>(FileManagement::FileStatus::Deleted));
     break;
   }
   case FlmComboBoxType::CbFileType:
   {
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Unknown), FileManagement::FileType::Unknown);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Text), FileManagement::FileType::Text);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Xml), FileManagement::FileType::Xml);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Pdf), FileManagement::FileType::Pdf);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Jpg), FileManagement::FileType::Jpg);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::Png), FileManagement::FileType::Png);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::TacticalPlan), FileManagement::FileType::TacticalPlan);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorFavourite), FileManagement::FileType::OperatorFavourite);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorDefinedSymbol), FileManagement::FileType::OperatorDefinedSymbol);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeDocument), FileManagement::FileType::OpenOfficeDocument);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeSpreadsheet), FileManagement::FileType::OpenOfficeSpreadsheet);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficePresentation), FileManagement::FileType::OpenOfficePresentation);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument), FileManagement::FileType::MSOfficeDocument);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument97), FileManagement::FileType::MSOfficeDocument97);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet), FileManagement::FileType::MSOfficeSpreadsheet);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet97), FileManagement::FileType::MSOfficeSpreadsheet97);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation), FileManagement::FileType::MSOfficePresentation);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation97), FileManagement::FileType::MSOfficePresentation97);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::EvaluationSchema), FileManagement::FileType::EvaluationSchema);
-    cbx->addItem(FileManagement::toString(FileManagement::FileType::AdlerJson), FileManagement::FileType::AdlerJson);
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Unknown), static_cast<int>(FileManagement::FileType::Unknown));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Text), static_cast<int>(FileManagement::FileType::Text));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Xml), static_cast<int>(FileManagement::FileType::Xml));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Pdf), static_cast<int>(FileManagement::FileType::Pdf));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Jpg), static_cast<int>(FileManagement::FileType::Jpg));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::Png), static_cast<int>(FileManagement::FileType::Png));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::TacticalPlan), static_cast<int>(FileManagement::FileType::TacticalPlan));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorFavourite), static_cast<int>(FileManagement::FileType::OperatorFavourite));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorDefinedSymbol), static_cast<int>(FileManagement::FileType::OperatorDefinedSymbol));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeDocument), static_cast<int>(FileManagement::FileType::OpenOfficeDocument));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeSpreadsheet), static_cast<int>(FileManagement::FileType::OpenOfficeSpreadsheet));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficePresentation), static_cast<int>(FileManagement::FileType::OpenOfficePresentation));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument), static_cast<int>(FileManagement::FileType::MSOfficeDocument));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument97), static_cast<int>(FileManagement::FileType::MSOfficeDocument97));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet), static_cast<int>(FileManagement::FileType::MSOfficeSpreadsheet));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet97), static_cast<int>(FileManagement::FileType::MSOfficeSpreadsheet97));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation), static_cast<int>(FileManagement::FileType::MSOfficePresentation));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation97), static_cast<int>(FileManagement::FileType::MSOfficePresentation97));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::EvaluationSchema), static_cast<int>(FileManagement::FileType::EvaluationSchema));
+    cbx->addItem(FileManagement::toString(FileManagement::FileType::AdlerJson), static_cast<int>(FileManagement::FileType::AdlerJson));
     break;
   }
   case FlmComboBoxType::CbUnknown:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
index 3ee06ca06..48d4feabc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
@@ -11,7 +11,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FileManagement/flm_combobox_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 #include <QtWidgets/QComboBox>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
index 0d685fc71..5203967c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
@@ -35,6 +35,7 @@ static inline std::vector<AreaEffectSimulation::AesType> aesTypes()
 AesDisplayFilterImpl::AesDisplayFilterImpl()
   : AesDisplayFilter()
   , m_visiblePartiesCheck(nullptr)
+  , m_logger(getLogger("AesDisplayFilterImpl"))
 {
   resetAesDisplayFilter();
 }
@@ -65,12 +66,12 @@ AesDisplayFilterImpl::~AesDisplayFilterImpl()
 
 bool AesDisplayFilterImpl::setFilterFromData(const AesFilter &filterData)
 {
-  if (m_ddsFilterContent.id() == 0)
+  if (m_ddsFilterContent.id == 0)
     m_ddsFilterContent = filterData;
   else
-    m_ddsFilterContent.setContent(filterData.content());
+    m_ddsFilterContent.content = filterData.content;
 
-  const QByteArray content(m_ddsFilterContent.content().toUtf8());
+  const QByteArray content(QByteArray::fromRawData(m_ddsFilterContent.content.c_str(), m_ddsFilterContent.content.size()));
 
   if (content.isEmpty())
     return true;
@@ -134,7 +135,7 @@ AesFilter AesDisplayFilterImpl::filterToData() const
 {
   AesFilter ret(m_ddsFilterContent);
   const QJsonDocument doc(filterToJson());
-  ret.setContent(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
+  ret.content = doc.toJson(QJsonDocument::Compact).toStdString();
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
index 9a1c94af9..cc3337261 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
@@ -17,6 +17,7 @@ namespace FilterManagement
 BuildingComponentSettingsImpl::BuildingComponentSettingsImpl(const QString &workspaceId)
   : BuildingComponentSettings()
   , m_workspaceId(workspaceId)
+  , m_logger(getLogger("BuildingComponentSettingsImpl"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   resetBuildingComponentSettings();
@@ -40,7 +41,7 @@ bool BuildingComponentSettingsImpl::setBldCmpSettingsFromData(const BuildingComp
 
   m_ddsFilterContent = filterData;
 
-  const QByteArray content(QByteArray::fromRawData(m_ddsFilterContent.content().c_str(), m_ddsFilterContent.content().size()));
+  const QByteArray content(QByteArray::fromRawData(m_ddsFilterContent.content.c_str(), m_ddsFilterContent.content.size()));
 
   if (content.isEmpty())
     return true;
@@ -108,7 +109,7 @@ BuildingComponentFilter BuildingComponentSettingsImpl::bldCmpSettingsToData() co
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   BuildingComponentFilter ret(m_ddsFilterContent);
   const QJsonDocument doc(bldCmpSettingsToJson());
-  ret.content(doc.toJson(QJsonDocument::Compact).constData());
+  ret.content = doc.toJson(QJsonDocument::Compact).toStdString();
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
index 2d585a455..63a15a6ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
@@ -20,6 +20,7 @@ SymbolAppearanceSettingsImpl::SymbolAppearanceSettingsImpl(const std::shared_ptr
   : m_colExpandDirtyTimer(new QTimer(this))
   , m_dtcPpm(dtcPpm)
   , m_workspaceId(workspaceId)
+  , m_logger(getLogger("SymbolAppearanceSettings"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   if (m_dtcPpm)
@@ -30,7 +31,7 @@ SymbolAppearanceSettingsImpl::SymbolAppearanceSettingsImpl(const std::shared_ptr
     m_colExpandDirtyTimer->setInterval(10);
     connect(m_colExpandDirtyTimer, &QTimer::timeout,
             this, &SymbolAppearanceSettingsImpl::onRebuildCollapsExpandFilter);
-    m_dtcPpm->participants([this](const ParticipantManagement::Participant &p) {onParticipantChanged(p, ParticipantManagement::DataModification::eAdded);});
+    m_dtcPpm->participants([this](const ParticipantManagement::Participant &p) {onParticipantChanged(p, DataModification::eAdded);});
   }
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
@@ -65,7 +66,7 @@ bool SymbolAppearanceSettingsImpl::setSettingsFromData(const SymbolAppearance &d
   
   m_filteredParticipantsColExp.clear(); 
 
-  const QByteArray content(QByteArray::fromRawData(m_ddsSettings.content().toUtf8().constData(), m_ddsSettings.content().size()));
+  const QByteArray content(QByteArray::fromRawData(m_ddsSettings.content.c_str(), m_ddsSettings.content.size()));
 
   if (content.isEmpty())
     return true;
@@ -221,7 +222,7 @@ SymbolAppearance SymbolAppearanceSettingsImpl::settingsToData() const
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   SymbolAppearance ret(m_ddsSettings);
   const QJsonDocument doc(settingsToJson());
-  ret.setContent(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
+  ret.content = doc.toJson(QJsonDocument::Compact).toStdString();
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return ret;
 }
@@ -350,12 +351,12 @@ void SymbolAppearanceSettingsImpl::parseSymbolTeamAppearance(Settings &settings,
   settings.symbolSettings.symbolPartyAppearance.insert(id, sta);
 }
 
-void SymbolAppearanceSettingsImpl::onParticipantChanged(const ParticipantManagement::Participant &data, ParticipantManagement::DataModification mod)
+void SymbolAppearanceSettingsImpl::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification mod)
 {
   switch (mod)
   {
-  case ParticipantManagement::DataModification::eAdded:
-  case ParticipantManagement::DataModification::eModified:
+  case DataModification::eAdded:
+  case DataModification::eModified:
   {
     auto it = m_participantId2SuperiorId.find(data.id);
     if (it != m_participantId2SuperiorId.end())
@@ -383,7 +384,7 @@ void SymbolAppearanceSettingsImpl::onParticipantChanged(const ParticipantManagem
     }
     break;
   }
-  case ParticipantManagement::DataModification::eRemoved:
+  case DataModification::eRemoved:
   {
     auto it = m_participantId2SuperiorId.constFind(data.id);
     if (it != m_participantId2SuperiorId.constEnd())
@@ -412,7 +413,7 @@ void SymbolAppearanceSettingsImpl::onRebuildCollapsExpandFilter()
       filteredParticipantsColExp += participantId;
   }
 
-  NGL_LOG_DEBUG("Rebuilding collapse/expand filter");
+  DEBUG_LOG(m_logger) << "Rebuilding collapse/expand filter";
   {
     QStringList sl;
     sl.reserve(20);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
index b149eef0f..f008b9d9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
@@ -7,6 +7,8 @@
 #include <FilterManagement/flt_symbol_appearance_settings.h>
 #include <FilterManagement/flt_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Interface::Dtc type (legacy include)
 #include <AreaEffectSimulation/aes.hpp>
 #include <FilterManagement/logger.h>
 #include <QtCore/QObject>
@@ -58,7 +60,7 @@ private:
                                                    UnitSymbolPosition def);
   static void parseSymbolTeamAppearance(Settings &settings, const QJsonObject &obj);
 private Q_SLOTS:
-  void onParticipantChanged(const ParticipantManagement::Participant &data, ParticipantManagement::DataModification mod);
+  void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification mod);
   void onRebuildCollapsExpandFilter();
 private:
   bool isInCollapsedTree(int participantId, QSet<int> &visitedIds) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
index b5d85bfa6..23115d3f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "flt_aes_filter_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <FilterManagement/flt_symbol_appearance_settings.h>
@@ -23,6 +24,7 @@ AesFilterDialog::AesFilterDialog(QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
   , m_unknowChangesNotifiyTimer(new QTimer(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_widget, &AesFilterWidget::changesMade, this, &AesFilterDialog::slotChangesMade);
   QGridLayout *gl = new QGridLayout(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.cpp
index c1ab03810..860323f52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.cpp
@@ -48,6 +48,7 @@ AesFilterWidget::AesFilterWidget(QWidget *parent)
   : QWidget(parent)
   , m_doUpdateViaCallback(true)
   , m_ui(new Ui::AesFilterWidget)
+  , m_logger(getLogger("AesFilterDialog"))
 {
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
index 8d81ca096..0f25b9087 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
@@ -9,8 +9,8 @@
 #include <LtsProjectionWorkstation/lts_projection_workstation.h>
 #include <LtsUtilsSettings/settings.h>
 #include <FilterManagement/flt_operator_rights.h>
-#include <FilterManagement/Aes/Common/symbol_appearance_settings_impl.h>
-#include <FilterManagement/Aes/Common/aes_display_filter_impl.h>
+#include <FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h>
+#include <Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
 #include <QtCore/QDebug>
@@ -102,13 +102,13 @@ std::shared_ptr<AesDisplayFilter> InterfaceImpl::aesFilterForOperator(int operat
   {
     FilterManagement::AesFilter filterData;
     
-    filterData.operatorId(operatorId);
-    filterData.ctx(context.toStdString());
+    filterData.operatorId = operatorId;
+    filterData.ctx = context.toStdString();
 
     std::function<bool(const FilterManagement::AesFilter &)> func = [&filterData](const FilterManagement::AesFilter &f)
     {
-      if (f.operatorId() == filterData.operatorId() &&
-          f.ctx() == filterData.ctx())
+      if (f.operatorId == filterData.operatorId &&
+          f.ctx == filterData.ctx)
       {
         filterData = f;
         return true;
@@ -142,7 +142,7 @@ std::shared_ptr<AesDisplayFilter> InterfaceImpl::aesFilterForOperator(int operat
 
 void InterfaceImpl::onAesFilterChanged(const FilterManagement::AesFilter &data, DataModification mod)
 {
-  auto it = m_aesFilterMap.find(FilterKey{data.operatorId(), data.ctx()});
+  auto it = m_aesFilterMap.find(FilterKey{data.operatorId, data.ctx});
   if (it != m_aesFilterMap.end())
   {
     std::shared_ptr<AesDisplayFilterImpl> ret = it->second.lock();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
index fee4b0f30..34fcf7d1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "flt_building_component_filter_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <FilterManagement/flt_building_cmpnt_settings.h>
@@ -21,6 +22,7 @@ BuildingComponentFilterDialog::BuildingComponentFilterDialog(QWidget *parent)
   , m_widget(new BuildingComponentSettingsWidget(this))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   connect(m_widget, &BuildingComponentSettingsWidget::changesMade, this, &BuildingComponentFilterDialog::slotChangesMade);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
index 04cbf5403..c19f2da17 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
@@ -45,6 +45,7 @@ BuildingComponentSettingsWidget::BuildingComponentSettingsWidget(QWidget *parent
   , m_bIgnoreUiSignals(false)
   , m_ui(new Ui::BuildingComponentSettingsWidget)
   , m_doUpdateViaCallback(true)
+  , m_logger(getLogger("BuildingComponentSettingsWidget"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
@@ -131,16 +132,16 @@ bool BuildingComponentSettingsWidget::init(const std::shared_ptr<BuildingCompone
     for (const InfrastructureManagement::MainStructureElement &mse : mses)
     {
       
-      if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building)
+      if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
         continue;
 
-      for (const InfrastructureManagement::StructureElement &currentElement : mse.elements())
+      for (const InfrastructureManagement::StructureElement &currentElement : mse.elements)
       {
-        if (currentElement.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor)
+        if (currentElement.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor)
           continue;
 
-        
-        int floorInt = QString::fromStdString(currentElement.name()).split(QStringLiteral("_")).value(1, QStringLiteral("-10")).toInt();
+
+        int floorInt = QString::fromStdString(currentElement.name).split(QStringLiteral("_")).value(1, QStringLiteral("-10")).toInt();
         floorIds += floorInt;
       } 
     } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.cpp
index 00defbcee..3faddad9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.cpp
@@ -2,8 +2,9 @@
 
 
 #include "flt_building_components_gui_plugin.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "flt_building_component_filter_dialog.h"
-#include <FilterManagement/Aes/Common/building_cmpnt_settings_impl.h>
+#include <Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h>
 
 
 #include <LtsSession/lts_session.h>
@@ -22,6 +23,7 @@ std::shared_ptr<GuiPluginBase::Interface> GuiPlugin::createGuiInterface(LtsSessi
 
 InterfaceImpl::InterfaceImpl(LtsSession::LtsSession *session)
   : GuiPluginBase::Interface(session, getLogger("Plugins.Gui.Interface"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 
@@ -89,7 +91,7 @@ void InterfaceImpl::onBuildingComponentFilterChanged(const FilterManagement::Bui
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
-  auto it = m_buildingComponentFilterMap.find(FilterKey{data.operatorId(), data.ctx()});
+  auto it = m_buildingComponentFilterMap.find(FilterKey{data.operatorId, data.ctx});
   if (it != m_buildingComponentFilterMap.end())
   {
     std::shared_ptr<BuildingComponentSettingsImpl> ret = it->second.lock();
@@ -126,13 +128,13 @@ std::shared_ptr<BuildingComponentSettings> InterfaceImpl::buildingComponentSetti
   {
     FilterManagement::BuildingComponentFilter filterData;
     
-    filterData.operatorId(operatorId);
-    filterData.ctx(context.toStdString());
+    filterData.operatorId = operatorId;
+    filterData.ctx = context.toStdString();
 
     std::function<bool(const FilterManagement::BuildingComponentFilter &)> func = [&filterData](const FilterManagement::BuildingComponentFilter &f)
     {
-      if (f.operatorId() == filterData.operatorId() &&
-          f.ctx() == filterData.ctx())
+      if (f.operatorId == filterData.operatorId &&
+          f.ctx == filterData.ctx)
       {
         filterData = f;
         return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.cpp
index 9c4fafe17..283d6bc32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.cpp
@@ -14,7 +14,7 @@
 
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <FilterManagement/Aes/Common/symbol_appearance_settings_impl.h>
+#include <FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h>
 
 
 namespace FilterManagement
@@ -25,6 +25,7 @@ FilterChangeDialog::FilterChangeDialog(QWidget *parent)
   , m_session(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::FilterChangeDialog)
+  , m_logger(getLogger("FilterChangeDialog"))
 {
   m_ui->setupUi(this);
   connect(m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Ok), &QPushButton::clicked, this, &FilterChangeDialog::apply);
@@ -212,8 +213,8 @@ void FilterChangeDialog::onOperatorChanged()
   auto cb = [this, operatorId]() -> bool
   {
     FilterManagement::TriggerFilterData req;
-    req.operatorId(operatorId);
-    req.requestTime(m_session->partitionTime());
+    req.operatorId = operatorId;
+    req.requestTime = m_session->partitionTime();
     INFO_LOG(m_logger) << Q_FUNC_INFO << "TriggerFilterData: " << req;
     return m_fltFtc->triggerFilterDataUpdateRequest(req, this);
   };
@@ -248,7 +249,7 @@ void FilterChangeDialog::onScreenChanged()
     if (it.key().first != screenId)
       continue;
 
-    screenTypeId = it.value().screenTypeId();
+    screenTypeId = it.value().screenTypeId;
 
     containers.insert(it.key().second);
   }
@@ -310,14 +311,14 @@ void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModific
 
   if ((modType != DataModification::eAdded) && (modType != DataModification::eModified))
     return;
-  if (data.operatorId() <= 0)
+  if (data.operatorId <= 0)
     return;
 
   const int requestedOperatorId = m_ui->cbxOperator->currentData().toInt();
   if (requestedOperatorId <= 0)
     return;
 
-  if (data.operatorId() != requestedOperatorId)
+  if (data.operatorId != requestedOperatorId)
     return;
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, we got new FilterData for 'our' operator: " << data;
@@ -327,8 +328,8 @@ void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModific
   
   
 
-  const int screenId = data.screenId();
-  const int screenContainerId = data.screenContainerId();
+  const int screenId = data.screenId;
+  const int screenContainerId = data.screenContainerId;
   DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " insert " << " QPair<> "
                       << "(screenId, "  << screenId
@@ -364,7 +365,7 @@ bool FilterChangeDialog::apply()
       m_ui->cbTypeFilter->isChecked() ||
       m_ui->cbCollapseExpand->isChecked())
   {
-    if (fData.symbolAppearanceContent().size() <= 0)
+    if (fData.symbolAppearanceContent.size() <= 0)
     {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (SymbolAppearance) is empty";
       return false;
@@ -380,7 +381,7 @@ bool FilterChangeDialog::apply()
     SymbolAppearanceSettings::Settings s;
     {
       SymbolAppearance symbolAppearanceDDS;
-      symbolAppearanceDDS.setContent(fData.symbolAppearanceContent());
+      symbolAppearanceDDS.content = fData.symbolAppearanceContent;
 
       
       FilterManagement::SymbolAppearanceSettingsImpl impl(nullptr);
@@ -402,7 +403,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const SymbolAppearance &symbolAppearance = m_symbolAppearanceSettings->settingsToData();
-      INFO_LOG(m_logger) << "symbolAppearance content " << symbolAppearance.setContent();
+      INFO_LOG(m_logger) << "symbolAppearance content " << symbolAppearance.content;
       return m_fltFtc->symbolAppearanceUpdateRequest(symbolAppearance, this);
     };
     m_requestHelper->addRequest(cb);
@@ -413,7 +414,7 @@ bool FilterChangeDialog::apply()
   
   if (m_ui->cbAesFilter->isChecked())
   {
-    if (fData.aesFilterContent().size() <= 0)
+    if (fData.aesFilterContent.size() <= 0)
     {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (AesFilter) is empty";
       return false;
@@ -423,7 +424,7 @@ bool FilterChangeDialog::apply()
     AesFilter aesFilter = m_aesDisplayFilter->filterToData();
 
     
-    aesFilter.setContent(fData.aesFilterContent());
+    aesFilter.content = fData.aesFilterContent;
 
     
     m_aesDisplayFilter->setFilterFromData(aesFilter);
@@ -431,7 +432,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const AesFilter &aesFilter = m_aesDisplayFilter->filterToData();
-      INFO_LOG(m_logger) << "AesFilter content " << aesFilter.setContent();
+      INFO_LOG(m_logger) << "AesFilter content " << aesFilter.content;
       return m_fltFtc->aesFilterUpdateRequest(aesFilter, this);
     };
     m_requestHelper->addRequest(cb);
@@ -442,7 +443,7 @@ bool FilterChangeDialog::apply()
   
   if (m_ui->cbBuildingComponentFilter->isChecked() && m_ui->cbBuildingComponentFilter->isVisible())
   {
-    if (fData.buildingComponentsFilterContent().size() <= 0)
+    if (fData.buildingComponentsFilterContent.size() <= 0)
     {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (BuildingComponentFilter) is empty";
       return false;
@@ -452,7 +453,7 @@ bool FilterChangeDialog::apply()
     BuildingComponentFilter buildingComponentFilter = m_buildingComponentSettings->bldCmpSettingsToData();
 
     
-    buildingComponentFilter.setContent(fData.buildingComponentsFilterContent());
+    buildingComponentFilter.content = fData.buildingComponentsFilterContent;
 
     
     m_buildingComponentSettings->setBldCmpSettingsFromData(buildingComponentFilter);
@@ -460,7 +461,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const BuildingComponentFilter &filterData = m_buildingComponentSettings->bldCmpSettingsToData();
-      INFO_LOG(m_logger) << "BuildingComponentFilter content " << filterData.setContent();
+      INFO_LOG(m_logger) << "BuildingComponentFilter content " << filterData.content;
       return m_fltFtc->buildingComponentFilterUpdateRequest(filterData, this);
     };
     m_requestHelper->addRequest(cb);
@@ -472,7 +473,7 @@ bool FilterChangeDialog::apply()
   
   if (m_ui->cbOperatorMapSettings->isChecked())
   {
-    if (fData.operatorMapSettingsContent().size() <= 0)
+    if (fData.operatorMapSettingsContent.size() <= 0)
     {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (OperatorMapSettings) is empty";
       return false;
@@ -484,7 +485,7 @@ bool FilterChangeDialog::apply()
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " no SituationMap::ForeignGuiInterface";
       return false;
     }
-    sitMapIfc->setOperatorMapSettingsJson(QByteArray::fromRawData(fData.operatorMapSettingsContent().c_str(), fData.operatorMapSettingsContent().size()));
+    sitMapIfc->setOperatorMapSettingsJson(QByteArray::fromRawData(fData.operatorMapSettingsContent.c_str(), fData.operatorMapSettingsContent.size()));
   }
 
   bool ret = true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.h
index 03f17e2ae..1669e2578 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/flt_filter_change.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <fltfilterchange_export.h>
+#include <Lts/Plugins/FilterManagement/Gui/FilterChange/fltfilterchange_export.h>
 
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
index 02bbbac99..bf0327cb6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
@@ -19,6 +19,7 @@ CollapseExpandParticipantDialog::CollapseExpandParticipantDialog(QWidget *parent
   , m_widget(new CollapseExpandParticipantWidget)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
+  , m_logger(getLogger("CollapseExpandParticipantDialog"))
 {
   QGridLayout *gl = new QGridLayout(this);
   gl->setContentsMargins(0, 0, 0, 0);
@@ -119,7 +120,7 @@ void CollapseExpandParticipantDialog::onDataChanged(const SymbolAppearance &data
 {
   DEBUG_LOG(m_logger) << "onDataChanged ... "  << data;
   if (modType != DataModification::eRemoved &&
-      data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+      data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   {
     auto symbolAppearanceSettings = m_fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(),
                                                                           m_session->workspaceId());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.h
index 7f3f06771..70606ce34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.h
@@ -6,6 +6,7 @@
 #include "flt_collapse_expand_participants_widget.h"
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsSession/lts_session.h>
@@ -13,6 +14,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <FilterManagement/logger.h>
+#include <FilterManagement/flt_data_plugin_interface.h>
 #include <FilterManagement/flt_participant_plugin_interface.h>
 #include <FilterManagement/flt_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
index b9853c30a..8181d028d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
@@ -24,6 +24,7 @@ CollapseExpandParticipantWidget::CollapseExpandParticipantWidget(QWidget *parent
   : QWidget(parent)
   , m_model(nullptr)
   , m_ui(new Ui::CollapseExpandParticipantWidget)
+  , m_logger(getLogger("CollapseExpandParticipantWidget"))
 {
   m_ui->setupUi(this);
 
@@ -197,7 +198,7 @@ void CollapseExpandParticipantWidget::collapseExpand(const QModelIndex &idx)
 {
   auto *item = static_cast<ParticipantManagement::ParticipantEditModel::CheckedTreeItem *>(m_model->privateData(idx));
   const auto &data = item->participant;
-  if (m_currentSymbolAppearance.colExpand.collapsedParticipantIds.contains(data.id()))
+  if (m_currentSymbolAppearance.colExpand.collapsedParticipantIds.contains(data.id))
     m_ui->tvParticipants->collapse(idx);
   else
     m_ui->tvParticipants->expand(idx);
@@ -211,8 +212,8 @@ QSet<int> CollapseExpandParticipantWidget::collapsedParticipants(const QModelInd
   if (!m_ui->tvParticipants->isExpanded(idx))
   {
     ParticipantManagement::ParticipantEditModel::CheckedTreeItem *item = m_model->privateData(idx);
-    if (item && item->participant.id() != 0)
-      collapsedParticipantIds += item->participant.id();
+    if (item && item->participant.id != 0)
+      collapsedParticipantIds += item->participant.id;
   }
   for (int row = 0; row < m_model->rowCount(idx); ++row)
     collapsedParticipantIds += collapsedParticipants(m_model->index(row, 0, idx));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.cpp
index a359982c6..91c351398 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.cpp
@@ -6,7 +6,7 @@
 #include "flt_symbol_appearance_dialog.h"
 #include "flt_type_filter_dialog.h"
 
-#include <FilterManagement/Aes/Common/symbol_appearance_settings_impl.h>
+#include <FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h>
 #include <LtsProjectionWorkstation/lts_projection_workstation.h>
 
 #include <LtsSession/lts_session.h>
@@ -23,6 +23,7 @@ std::shared_ptr<GuiPluginBase::Interface> GuiPlugin::createGuiInterface(LtsSessi
 
 InterfaceImpl::InterfaceImpl(LtsSession::LtsSession *session)
   : GuiPluginBase::Interface(session, getLogger("Plugins.Gui.Interface"))
+  , m_logger(getLogger("ParticipantInterfaceImpl"))
 {}
 
 
@@ -124,7 +125,7 @@ void InterfaceImpl::onSymbolAppearanceChanged(const FilterManagement::SymbolAppe
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
-  auto it = m_symbolAppearanceMap.find(FilterKey{data.operatorId(), data.ctx()});
+  auto it = m_symbolAppearanceMap.find(FilterKey{data.operatorId, data.ctx});
   if (it != m_symbolAppearanceMap.end())
   {
     std::shared_ptr<SymbolAppearanceSettingsImpl> ret = it->second.lock();
@@ -162,13 +163,13 @@ std::shared_ptr<SymbolAppearanceSettings> InterfaceImpl::symbolAppearanceForOper
   {
     FilterManagement::SymbolAppearance filterData;
     
-    filterData.operatorId(operatorId);
-    filterData.ctx(context.toStdString());
+    filterData.operatorId = operatorId;
+    filterData.ctx = context.toStdString();
 
     std::function<bool(const FilterManagement::SymbolAppearance &)> func = [&filterData](const FilterManagement::SymbolAppearance &f)
     {
-      if (f.operatorId() == filterData.operatorId() &&
-          f.ctx() == filterData.ctx())
+      if (f.operatorId == filterData.operatorId &&
+          f.ctx == filterData.ctx)
       {
         filterData = f;
         return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
index f74d61fe0..d9904e42d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
@@ -22,6 +22,7 @@ SymbolAppearanceDialog::SymbolAppearanceDialog(QWidget *parent, bool isOc)
   , m_widget(new SymbolAppearanceWidget(this, isOc))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
+  , m_logger(getLogger("SymbolAppearanceDialog"))
 {
   QGridLayout *gl = new QGridLayout(this);
   gl->setContentsMargins(0, 0, 0, 0);
@@ -147,7 +148,7 @@ void SymbolAppearanceDialog::onLoadButtonClicked()
 void SymbolAppearanceDialog::onDataChanged(const FilterManagement::SymbolAppearance &data, DataModification modType)
 {
   if (modType != DataModification::eRemoved &&
-      data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+      data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   {
     auto symbolAppearanceSettings = m_fltParticipantGuiIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
     m_widget->onDataChanged(symbolAppearanceSettings);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
index 8cdad0407..812923375 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
@@ -54,6 +54,7 @@ SymbolAppearanceWidget::SymbolAppearanceWidget(QWidget *parent, bool isOC)
   , m_ui(new Ui::SymbolAppearanceWidget)
   , m_updateTimer(new QTimer(this))
   , m_doUpdateViaCallback(true)
+  , m_logger(getLogger("SymbolAppearanceWidget"))
 {
   m_ui->setupUi(this);
   initUiElements();
@@ -421,8 +422,8 @@ void SymbolAppearanceWidget::buildPartyTable(const QMap<int, ParticipantManageme
   int row = 1;
   for (const ParticipantManagement::Party &party : parties)
   {
-    const int partyId = party.id();
-    QLabel *lblParty = new QLabel(ParticipantManagement::trPartyName(party.name()), this);
+    const int partyId = party.id;
+    QLabel *lblParty = new QLabel(ParticipantManagement::trPartyName(party.name), this);
     int col = 0;
     glParty->addWidget(lblParty, row, col++, 1, 1, Qt::AlignHCenter | Qt::AlignVCenter);
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
index aecd0c0b1..b9d2f5ce4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
@@ -19,6 +19,7 @@ TypeFilterDialog::TypeFilterDialog(QWidget *parent)
   , m_session(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_widget(new TypeFilterWidget(this))
+  , m_logger(getLogger("TypeFilterDialog"))
 {
   QGridLayout *gl = new QGridLayout(this);
   gl->setContentsMargins(0, 0, 0, 0);
@@ -146,7 +147,7 @@ void TypeFilterDialog::onLoadButtonClicked()
 void TypeFilterDialog::onDataChanged(const FilterManagement::SymbolAppearance &data, DataModification modType)
 {
   if (modType != DataModification::eRemoved &&
-      data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+      data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   {
     auto symbolAppearanceSettings = m_fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(),
                                                                           m_session->workspaceId());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
index 23595f218..45d539a3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
@@ -24,6 +24,7 @@ TypeFilterWidget::TypeFilterWidget(QWidget *parent)
   , m_partyId(0)
   , m_gridLayout(new QGridLayout)
   , m_ui(new Ui::TypeFilterWidget)
+  , m_logger(getLogger("TypeFilterWidget"))
 {
   m_ui->setupUi(this);
   initStateElements();
@@ -70,7 +71,7 @@ void TypeFilterWidget::initStateElements()
   QVBoxLayout *vBox = new QVBoxLayout;
 
   
-  for (int enumIt = 0; enumIt <= ProjectDataManagement::VulnerabilityState::TemporarySeverance; ++enumIt)
+  for (int enumIt = 0; enumIt <= static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance); ++enumIt)
   {
     QCheckBox *chb = new QCheckBox(m_ui->gBStates);
 
@@ -134,25 +135,25 @@ void TypeFilterWidget::createTypeClass(ParticipantManagement::TypeClass typeClas
 
   QMap<std::string, ParticipantManagement::Type> typeMapOrder;
   for (const ParticipantManagement::Type &type : typeMap)
-    typeMapOrder.insert(type.name(), type);
+    typeMapOrder.insert(type.name, type);
 
   for (const ParticipantManagement::Type &type : std::as_const(typeMapOrder))
   {
     
-    if (type.isDeleted())
+    if (type.isDeleted)
       continue;
 
     
-    if (!m_ppmDtc->isTypeInUse(type.id()))
+    if (!m_ppmDtc->isTypeInUse(type.id))
       continue;
 
-    if (type.typeClass() == typeClass)
+    if (type.typeClass == typeClass)
     {
       QCheckBox *cb = new QCheckBox(gb);
-      cb->setText(ParticipantManagement::trTypeName(type.name()));
-      cb->setProperty("typeId", type.id());
+      cb->setText(ParticipantManagement::trTypeName(type.name));
+      cb->setProperty("typeId", type.id);
       cb->setProperty("typeClassId", static_cast<int>(typeClass));
-      if (!m_hiddenTypeFilter.contains(type.id()))
+      if (!m_hiddenTypeFilter.contains(type.id))
         cb->setChecked(true);
       connect(cb, &QCheckBox::clicked, this, &TypeFilterWidget::onTypeFilterChanged);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
index d00092d74..8c9205a0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
@@ -6,6 +6,7 @@
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <AreaEffectSimulation/aes.hpp>
 #include <AreaEffectSimulation/aes_enums.hpp>
+#include <FilterManagement/flt.hpp>   // FilterManagement::AesFilter (DTC data type) for setFilterFromData/filterToData
 #include <functional>
 #include <QtCore/QSet>
 
@@ -13,9 +14,6 @@ namespace FilterManagement
 {
 class SymbolAppearance;
 
-// Use AesFilter from AreaEffectSimulation namespace
-using AreaEffectSimulation::AesFilter;
-
 class AesDisplayFilter
 {
 protected:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_interface.h
index edefd85a3..00e7e4589 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_interface.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
+#include <FilterManagement/flt_dtc.h>
 #include <FilterManagement/flt_ftc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp
index dd3b4f505..bc19a29fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp
@@ -18,6 +18,7 @@ namespace GuezIedManagement {
 
 InfoDialog::InfoDialog(int iedEntityId, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("IedInfoDialog"))
   , m_iedEntityId(iedEntityId)
   , m_session(nullptr)
   , m_dtc(nullptr)
@@ -68,84 +69,84 @@ bool InfoDialog::init(LtsSession::LtsSession *session,
 
 void InfoDialog::retranslate()
 {
-  translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber()), false, tr("IED"));
+  translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber), false, tr("IED"));
 }
 
 void InfoDialog::showIedInfos()
 {
   Ied ied = m_dtc->ied(m_iedEntityId);
 
-  m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber()));
-  m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId()).name()));
-  m_ui->lblDesignator->setText(QString::fromStdString(ied.name()));
+  m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber));
+  m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId).name));
+  m_ui->lblDesignator->setText(QString::fromStdString(ied.name));
 
   setPosition(m_dtc->iedPosition(m_iedEntityId));
 
-  m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce()));
-  m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger());
-  m_ui->lblTriggerButton->setEnabled(ied.switchTrigger());
-  m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger());
-  m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger());
+  m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce));
+  m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger);
+  m_ui->lblTriggerButton->setEnabled(ied.switchTrigger);
+  m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger);
+  m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger);
 
-  if (ied.pyrotechnics())
+  if (ied.pyrotechnics)
     m_ui->lblPyrotechnics->setText(tr("Active"));
   else
     m_ui->lblPyrotechnics->setText(tr("Inactive"));
 
-  m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState()));
+  m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState));
 
   m_ui->tbwBit->setRowCount(0);
-  if (ied.electronicsError().underlying() != IedError::NoError)
+  if (ied.electronicsError != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Electronics"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics1Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics1Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 1"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics2Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics2Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 2"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics3Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics3Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 3"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error));
     addTbwBitEntry(device, error);
   }
 
-  if ((ied.electronicsError().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics1Error().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics2Error().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics3Error().underlying() == IedError::NoError))
+  if ((ied.electronicsError == IedError::NoError) &&
+      (ied.pyrotechnics1Error == IedError::NoError) &&
+      (ied.pyrotechnics2Error == IedError::NoError) &&
+      (ied.pyrotechnics3Error == IedError::NoError))
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("no Errors"));
     addTbwBitEntry(device, nullptr);
   }
 
-  const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId()).color()));
-  const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId()).role());
-  updateIcon(color, role, ied.tacticalState(), QString::fromStdString(ied.symbol()));
+  const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId).color));
+  const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId).role);
+  updateIcon(color, role, ied.tacticalState, QString::fromStdString(ied.symbol));
 }
 
 void InfoDialog::setPosition(const IedPosition &pos)
 {
-  if (std::isnan(pos.position().lon()) || std::isnan(pos.position().lat()))
+  if (std::isnan(pos.position.lon) || std::isnan(pos.position.lat))
     m_ui->lblPosition->setText(tr("Invalid Position"));
   else
-    m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position().lon(), pos.position().lat()));
+    m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position.lon, pos.position.lat));
 }
 
 
 AdvancedSymbology::Injury guezIedStateToInjury(const GuezIedManagement::IedTacticalState &iedState)
 {
-  switch (iedState.underlying())
+  switch (iedState)
   {
   case GuezIedManagement::IedTacticalState::Active:
     return AdvancedSymbology::Injury::NoInjury;          
@@ -170,7 +171,7 @@ void updateIedPyro(const GuezIedManagement::IedTacticalState &iedStateIn,
   if (injuryInOut != AdvancedSymbology::Injury::TotalKill)
     return;
 
-  switch (iedStateIn.underlying())
+  switch (iedStateIn)
   {
   case GuezIedManagement::IedTacticalState::Unknown:
   case GuezIedManagement::IedTacticalState::NotActive:
@@ -231,7 +232,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
 {
   Q_UNUSED(modType);
 
-  if (data.id() != m_iedEntityId)
+  if (data.id != m_iedEntityId)
     return;
 
   showIedInfos();
@@ -239,7 +240,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
 
 void InfoDialog::onIedPositionChanged(const IedPosition &data, DataModification modType)
 {
-  if (data.id() != m_iedEntityId || modType == DataModification::eRemoved)
+  if (data.id != m_iedEntityId || modType == DataModification::eRemoved)
     return;
 
   setPosition(data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
index eb2959fe3..9532a0aad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
@@ -30,6 +30,7 @@ PairingEditDialog::PairingEditDialog(LtsSession::LtsSession *session, QWidget *p
   , m_ppmGuiCbxIfc(nullptr)
   , m_participantModel(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("GuezIedManangementPairingEditDialog"))
 {
   m_ui->setupUi(this);
   m_uiRequirements->addRequirement({m_ui->lblPairingState,  [this]() { return applyPairingStateCheck(); }});
@@ -102,13 +103,13 @@ void PairingEditDialog::onIedSelected(int idx)
 
   Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
   setUnchangeable(true);
-  m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(ied.pairingState().underlying())));
+  m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(static_cast<int>(ied.pairingState))));
 
   m_ui->treeViewParticipants->clearSelection();
-  if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
+  if (ied.pairingState == IedPairingState::PairedToParticipant)
   {
-    m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId().get()).partyId()));
-    m_participantModel->selectItemByParticipantId(ied.pairedParticipantId().get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
+    m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId.get()).partyId));
+    m_participantModel->selectItemByParticipantId(ied.pairedParticipantId.get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
   }
   setUnchangeable(false);
   enDisableUiElements();
@@ -135,10 +136,10 @@ void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
   if (checkSelectedParticipantType())
   {
     Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
-    if (ied.pairingState() == IedPairingState::PairedToParticipant)
+    if (ied.pairingState == IedPairingState::PairedToParticipant)
     {
       
-      if (m_participantModel->getParticipantData(idx).id() != ied.pairedParticipantId().get())
+      if (m_participantModel->getParticipantData(idx).id != ied.pairedParticipantId.get())
         slotChangesMade();
     }
     else
@@ -159,10 +160,10 @@ bool PairingEditDialog::apply()
   {
     PairIedRequest request;
 
-    request.id(m_ui->cbxIed->currentData().toInt());
-    request.pairingState(static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()));
-    if (request.pairingState().underlying() == IedPairingState::PairedToParticipant)
-      request.pairedParticipantId(dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id()));
+    request.id = m_ui->cbxIed->currentData().toInt();
+    request.pairingState = static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt());
+    if (request.pairingState == IedPairingState::PairedToParticipant)
+      request.pairedParticipantId = dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id);
 
     return m_requestHelper->startSingleRequest([=]()
     {
@@ -177,7 +178,7 @@ bool PairingEditDialog::applyPairingStateCheck()
   Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
 
   
-  if (ied.pairingState() == IedPairingState::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying())
+  if (ied.pairingState == IedPairingState::NotPaired && static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == ied.pairingState)
       return false;
 
   return true;
@@ -186,15 +187,15 @@ bool PairingEditDialog::applyPairingStateCheck()
 bool PairingEditDialog::applyParticipantSelectionCheck()
 {
   
-  if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::PairedToParticipant)
+  if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::PairedToParticipant)
   {
     Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
-    if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
+    if (ied.pairingState == IedPairingState::PairedToParticipant)
     {
       if (checkSelectedParticipantType())
       {
         
-        if (ied.pairedParticipantId() == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id())
+        if (ied.pairedParticipantId == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id)
           return false;
         
         return true;
@@ -208,9 +209,9 @@ bool PairingEditDialog::applyParticipantSelectionCheck()
 
 bool PairingEditDialog::checkSelectedParticipantType()
 {
-  ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId());
-  return ((type.typeClass().underlying() != ParticipantManagement::TypeClass::SupportUnit) &&
-          (type.typeClass().underlying() != ParticipantManagement::TypeClass::Unit));
+  ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId);
+  return ((type.typeClass != ParticipantManagement::TypeClass::SupportUnit) &&
+          (type.typeClass != ParticipantManagement::TypeClass::Unit));
 }
 
 void PairingEditDialog::fillIedCbx()
@@ -220,7 +221,7 @@ void PairingEditDialog::fillIedCbx()
   m_ui->cbxIed->clear();
   const QMap <qint32, GuezIedManagement::Ied> mapIed = m_dtc->ieds();
   for (auto it = mapIed.begin(); it != mapIed.end(); ++it)
-    m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber()), QVariant(it.value().id()));
+    m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber), QVariant(it.value().id));
 
   if (curIdxIed >= 0)
     m_ui->cbxIed->setCurrentIndex(curIdxIed);
@@ -231,8 +232,8 @@ void PairingEditDialog::fillIedCbx()
 void PairingEditDialog::fillPairingState()
 {
   m_ui->cbxPairingState->clear();
-  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired).underlying()), IedPairingState::NotPaired);
-  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant).underlying()), IedPairingState::PairedToParticipant);
+  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired)), static_cast<int>(IedPairingState::NotPaired));
+  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant)), static_cast<int>(IedPairingState::PairedToParticipant));
 }
 
 void PairingEditDialog::fillPartyCbx()
@@ -254,7 +255,7 @@ void PairingEditDialog::enDisableUiElements()
   m_ui->cbxIed->setEnabled(m_ui->cbxIed->count() > 1);
   m_ui->cbxPairingState->setEnabled(m_ui->cbxIed->count() > 0 && m_participantModel->rowCount() > 0);
 
-  if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::NotPaired)
+  if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::NotPaired)
   {
     m_ui->cbxParty->setEnabled(false);
     m_ui->treeViewParticipants->setEnabled(false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.h
index 832bf31fb..0e14d26b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.h
@@ -7,6 +7,7 @@
 #include <GuezIedManagement/gim_ftc.h>
 #include <GuezIedManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_dialog.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h
index 8bf2e671c..ce5a3b336 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h
@@ -4,10 +4,8 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
-#ifdef BUILD_WITH_EXTERNAL_DDS
 #include <GuezIedManagement/gim_dtc.h>
 #include <GuezIedManagement/gim_ftc.h>
-#endif
 
 namespace GuezIedManagement
 {
@@ -18,10 +16,8 @@ class DataInterface : public DataPluginBase::Interface
 public:
   using DataPluginBase::Interface::Interface;
 
-#ifdef BUILD_WITH_EXTERNAL_DDS
   virtual std::shared_ptr<GuezIedManagement::Interface::Dtc> getDtc() = 0;
   virtual std::shared_ptr<GuezIedManagement::Interface::Ftc> getFtc() = 0;
-#endif
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/assign_gna_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/assign_gna_dialog.cpp
index 0f577e770..ba531ec2a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/assign_gna_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/assign_gna_dialog.cpp
@@ -5,7 +5,7 @@
 #include "ui_assign_gna_dialog.h"
 
 #include <LtsWidgets/lts_dialog.h>
-#include <GuezNasat/Common/gna_nasat_aircraft_part_model.h>
+#include <GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h>
 
 namespace GuezNasat
 {
@@ -17,6 +17,7 @@ AssignGuezNasatPartDialog::AssignGuezNasatPartDialog(int exerciseId, QWidget *pa
   , m_exerciseId(exerciseId)
   , m_ui(new Ui::AssignGuezNasatPartDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("Dialog"))
 {
   m_ui->setupUi(this);
 }
@@ -48,7 +49,7 @@ bool AssignGuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface:
 
   setOnlineHelpFilename(QStringLiteral("Administrator-Airplanes"));
 
-  if (nap.id() <= 0)
+  if (nap.id <= 0)
     slotChangesMade();
 
   return true;
@@ -60,11 +61,11 @@ void AssignGuezNasatPartDialog::initCmbNasats()
   const auto names(m_nasatAircraftParticipantModel->getNasatNames());
   for (auto it = names.begin(); it != names.end(); ++it)
   {
-    if (!m_nasatAircraftParticipantModel->getAssociatedNasatIds().contains(it.key()) || m_nap.nasatAircraftId() == it.key())
+    if (!m_nasatAircraftParticipantModel->getAssociatedNasatIds().contains(it.key()) || m_nap.nasatAircraftId == it.key())
       m_ui->cmbNasats->addItem(it.value(), it.key());
   }
 
-  int newIdx = m_ui->cmbNasats->findData(m_nap.nasatAircraftId());
+  int newIdx = m_ui->cmbNasats->findData(m_nap.nasatAircraftId);
   if (newIdx >= 0)
     m_ui->cmbNasats->setCurrentIndex(newIdx);
   m_ui->cmbNasats->model()->sort(0);
@@ -77,11 +78,11 @@ void AssignGuezNasatPartDialog::initCmbParticipants()
   const auto decorations(m_nasatAircraftParticipantModel->getParticipantDecorations());
   for (auto it = hierarchies.begin(); it != hierarchies.end(); ++it)
   {
-    if (!m_nasatAircraftParticipantModel->getAssociatedParticipantIds().contains(it.key()) || m_nap.participantId() == it.key())
+    if (!m_nasatAircraftParticipantModel->getAssociatedParticipantIds().contains(it.key()) || m_nap.participantId == it.key())
       m_ui->cmbParticipants->addItem(QIcon(decorations.value(it.key())), it.value(), it.key());
   }
 
-  int newIdx = m_ui->cmbParticipants->findData(m_nap.participantId());
+  int newIdx = m_ui->cmbParticipants->findData(m_nap.participantId);
   if (newIdx >= 0)
     m_ui->cmbParticipants->setCurrentIndex(newIdx);
   m_ui->cmbParticipants->model()->sort(0);
@@ -89,7 +90,7 @@ void AssignGuezNasatPartDialog::initCmbParticipants()
 
 void AssignGuezNasatPartDialog::retranslate()
 {
-  translate(m_ui, m_nap.id() <= 0 ? tr("Add Assign Aircraft") : tr("Edit Assign Aircraft"));
+  translate(m_ui, m_nap.id <= 0 ? tr("Add Assign Aircraft") : tr("Edit Assign Aircraft"));
 }
 
 bool AssignGuezNasatPartDialog::apply()
@@ -98,7 +99,7 @@ bool AssignGuezNasatPartDialog::apply()
   int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
   int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
 
-  const NasatAircraftParticipant req(m_nap.id(), nasatAircraftId, m_exerciseId, participantId);
+  const NasatAircraftParticipant req(m_nap.id, nasatAircraftId, m_exerciseId, participantId);
 
   return m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.cpp
index d68eb9988..e9ed916ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.cpp
@@ -20,6 +20,7 @@ GuezNasatPartDialog::GuezNasatPartDialog(const QString &menuGroup, LtsSession::L
   , m_ui(new Ui::GuezNasatPartDialog)
   , m_menuGroup(menuGroup)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("Dialog"))
 {
   m_ui->setupUi(this);
 
@@ -133,7 +134,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
   INFO_LOG(m_logger) << "onRemoveNewAircraft";
 
   NasatAircraftParticipant req;
-  req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
+  req.id = m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.h
index 5a6bce671..7113435d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_part_dialog.h
@@ -7,9 +7,10 @@
 #include <GuezNasat/gna_dtc.h>
 #include <GuezNasat/gna_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <GuezNasat/logger.h>
-#include <GuezNasat/Common/gna_nasat_aircraft_part_model.h>
+#include <GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt
index 8e82d7100..5903f1d85 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt
@@ -30,7 +30,8 @@ NGL_TARGET_LINK_LIBRARIES(GnaCommon
   PUBLIC
     LtsWidgets
     LtsSession
+    PpmGuiComboboxPluginInterface
+    svcGnaCommon
+    svcExmCommon
+    svcPpmCommon
 )
-
-# Optional: External dependencies (not available in migration context)
-# target_link_libraries(GnaCommon PUBLIC PpmGuiComboboxPluginInterface svcGnaCommon svcExmCommon svcPpmCommon)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp
index 8e3246af1..bf6676ccb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp
@@ -57,13 +57,13 @@ QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Id:
-    return nasatAircraft.id();
+    return nasatAircraft.id;
   case NasatId:
-    return nasatAircraft.nasatId();
+    return nasatAircraft.nasatId;
   case SimulationActive:
-    return nasatAircraft.simulationActive() ? tr("Yes") : tr("No");
+    return nasatAircraft.simulationActive ? tr("Yes") : tr("No");
   case Name:
-    return nasatAircraft.name();
+    return QString::fromStdString(nasatAircraft.name);
   }
 
   return QVariant();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.h
index b0b4678a6..84f0d70e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.h
@@ -5,7 +5,6 @@
 
 #include "gnacommon_export.h"
 #include <GuezNasat/gna_dtc.h>
-#include <GuezNasat/gna_nasat_aircraft.h>
 #include <GuezNasat/logger.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp
index 83a2fa611..78d45c80b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp
@@ -68,7 +68,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
   }
 
   {
-    auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
+    auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, DataModification::eAdded); };
     m_ppm_dtc->participants(cb);
   }
 
@@ -87,35 +87,35 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
   if (role == Qt::DecorationRole)
   {
     if (index.column() == Participant)
-      return m_participantDecorations.value(nasatAircraftParticipant.participantId());
+      return m_participantDecorations.value(nasatAircraftParticipant.participantId);
     return QVariant();
   }
 
   if (index.column() == Id)
   {
-    INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id();
-    return nasatAircraftParticipant.id();
+    INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id;
+    return nasatAircraftParticipant.id;
   }
 
   switch (index.column())
   {
   case NasatAircreaftId:
-    return nasatAircraftParticipant.nasatAircraftId();
+    return nasatAircraftParticipant.nasatAircraftId;
   case Nasat:
-    if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId()))
-      return m_nasatNames[nasatAircraftParticipant.nasatAircraftId()];
+    if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId))
+      return m_nasatNames[nasatAircraftParticipant.nasatAircraftId];
     return tr("No Participant");
   case ExerciseId:
-    return nasatAircraftParticipant.exerciseId();
+    return nasatAircraftParticipant.exerciseId;
   case ExerciseName:
-    if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId()))
-      return m_exerciseNames[nasatAircraftParticipant.exerciseId()];
+    if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId))
+      return m_exerciseNames[nasatAircraftParticipant.exerciseId];
     return tr("No exercise name available");
   case ParticipantId:
-    return nasatAircraftParticipant.participantId();
+    return nasatAircraftParticipant.participantId;
   case Participant:
-    if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId()))
-      return m_participantHierarchies[nasatAircraftParticipant.participantId()];
+    if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId))
+      return m_participantHierarchies[nasatAircraftParticipant.participantId];
     return tr("No participant name available");
   }
 
@@ -127,7 +127,7 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedNasatIds() const
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const NasatAircraftParticipant &data : m_vecData)
-    ret += data.nasatAircraftId();
+    ret += data.nasatAircraftId;
   return ret;
 }
 
@@ -136,14 +136,14 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedParticipantIds() const
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const NasatAircraftParticipant &data : m_vecData)
-    ret += data.participantId();
+    ret += data.participantId;
   return ret;
 }
 
 void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data,
                                                                       const DataModification modType)
 {
-  if (data.exerciseId() != m_session->exerciseId())
+  if (data.exerciseId != m_session->exerciseId())
     return;
 
   LtsWidgets::LtsAbstractTableModel<GuezNasat::NasatAircraftParticipant>::onDataChanged(data, modType);
@@ -164,40 +164,40 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
     break;
   case DataModification::eModified:
   case DataModification::eAdded:
-    m_exerciseNames.insert(data.id, data.name);
+    m_exerciseNames.insert(data.id, QString::fromStdString(data.name));
     break;
   }
 }
 
 void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
-                                                         const ParticipantManagement::DataModification modType)
+                                                         const DataModification modType)
 {
-  INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
+  INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
 
   // isDeleted() existiert im STUB nicht - entfernen
   switch (modType)
   {
-  case ParticipantManagement::DataModification::eRemoved:
-    m_participantHierarchies.remove(data.id());
+  case DataModification::eRemoved:
+    m_participantHierarchies.remove(data.id);
     break;
-  case ParticipantManagement::DataModification::eModified:
-  case ParticipantManagement::DataModification::eAdded:
+  case DataModification::eModified:
+  case DataModification::eAdded:
   {
     DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
                         << " TypeId=" << data.typeId
-                        << " " << data.internalName;
+                        << " " << QString::fromStdString(data.name);
 
     // TypeClass lookup暂时跳过 - types() nicht verfügbar im STUB
     ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Aircraft; // Default für Testing
     if (typeClass != ParticipantManagement::TypeClass::Aircraft)
       return;
-    const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id());
-    m_participantHierarchies.insert(data.id(), hierarchy);
+    const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id);
+    m_participantHierarchies.insert(data.id, hierarchy);
     if (m_ppmGuiCbxIfc)
     {
       const auto party = m_ppm_dtc->party(data.partyId);
-      const QRgb col = QRgb(party.color());
-      m_participantDecorations.insert(data.id(), m_ppmGuiCbxIfc->pixmapFromParty(col));
+      const QRgb col = QRgb(party.color);
+      m_participantDecorations.insert(data.id, m_ppmGuiCbxIfc->pixmapFromParty(col));
     }
     break;
   }
@@ -208,15 +208,15 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
 void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
                                                            const DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
+  DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
   switch (modType)
   {
   case DataModification::eRemoved:
-    m_nasatNames.remove(data.id());
+    m_nasatNames.remove(data.id);
     break;
   case DataModification::eModified:
   case DataModification::eAdded:
-    m_nasatNames.insert(data.id(), data.name());
+    m_nasatNames.insert(data.id, QString::fromStdString(data.name));
     break;
   }
   emit signalNasatNamesChanged();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h
index 4cb117d6b..ecfeda31f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h
@@ -5,12 +5,11 @@
 
 #include "gnacommon_export.h"
 #include <GuezNasat/gna_dtc.h>
-#include <GuezNasat/gna_nasat_aircraft.h>
 
 #include <ExerciseManagement/exm_dtc.h>
-#include <ExerciseManagement/exm_exercise.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 
 #include <GuezNasat/logger.h>
@@ -67,7 +66,7 @@ private slots:
   void onExerciseChanged(const ExerciseManagement::Exercise  &data,
                          const DataModification modType);
   void onParticipantChanged(const ParticipantManagement::Participant  &data,
-                            const ParticipantManagement::DataModification modType);
+                            const DataModification modType);
   void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
                               const DataModification modType);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_dialog.cpp
index eba943ccd..8659f1535 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_dialog.cpp
@@ -3,7 +3,7 @@
 
 #include "gna_dialog.h"
 #include "ui_gna_dialog.h"
-#include <GuezNasat/Common/gna_nasat_aircraft_model.h>
+#include <GuezNasat/Gui/Common/gna_nasat_aircraft_model.h>
 
 #include "new_gna_dialog.h"
 
@@ -18,6 +18,7 @@ GuezNasatDialog::GuezNasatDialog(const QString &menuGroup, QWidget *parent)
   , m_ui(new Ui::GuezNasatDialog)
   , m_menuGroup(menuGroup)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("Dialog"))
 {
   m_ui->setupUi(this);
 
@@ -119,7 +120,7 @@ void GuezNasatDialog::onRemoveAircraft()
 
   INFO_LOG(m_logger) << "onRemoveNewAircraft";
   NasatAircraft req;
-  req.id(m_nasatAircraftModel->getRowData(curIdx.row()).id());
+  req.id = m_nasatAircraftModel->getRowData(curIdx.row()).id;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/new_gna_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/new_gna_dialog.cpp
index f31b211ea..d1a846198 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/new_gna_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/new_gna_dialog.cpp
@@ -14,6 +14,7 @@ NewGuezNasatDialog::NewGuezNasatDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_ui(new Ui::NewGuezNasatDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("Dialog"))
 {
   m_ui->setupUi(this);
 }
@@ -27,10 +28,10 @@ bool NewGuezNasatDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc> &
                               const NasatAircraft &aircraft)
 {
   m_ftc = ftc;
-  m_id = aircraft.id();
+  m_id = aircraft.id;
 
-  m_ui->svNasatId->setValue(aircraft.nasatId());
-  m_ui->leName->setText(QString::fromStdString(aircraft.name()));
+  m_ui->svNasatId->setValue(aircraft.nasatId);
+  m_ui->leName->setText(QString::fromStdString(aircraft.name));
 
   m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Apply, false);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
index ca7bfce1e..5ccea9f8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
@@ -4,7 +4,7 @@
 #include "ism_foreign_data_plugin.h"
 
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsUtilsCore/json_object.h>
@@ -32,16 +32,6 @@
 namespace InfrastructureManagement
 {
 
-// Helper function to convert InfrastructureManagement::Interface::MainSchedule to ParticipantManagement::MainSchedule
-static ParticipantManagement::MainSchedule convertMainSchedule(const Interface::MainSchedule& ismSchedule)
-{
-  ParticipantManagement::MainSchedule ppmSchedule;
-  ppmSchedule.id = ismSchedule.id();
-  // Note: Other fields (name, description, startTime, endTime, isActive) have no direct mapping
-  // from InfrastructureManagement::MainSchedule, so they remain at default values
-  return ppmSchedule;
-}
-
 ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<Interface::Dtc> &dtc, int exerciseId)
   : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_dtc(dtc)
@@ -121,10 +111,10 @@ MountingPoint ForeignInterfaceImpl::mountingPoint(int32_t mountingPointId) const
   return m_mountingPoints.value(mountingPointId);
 }
 
-ParticipantManagement::MainSchedule ForeignInterfaceImpl::mainSchedule(int32_t scheduleId)
+MainSchedule ForeignInterfaceImpl::mainSchedule(int32_t scheduleId)
 {
   enableIsmForeignInterface();
-  return convertMainSchedule(m_dtc->mainSchedule(scheduleId));
+  return m_dtc->mainSchedule(scheduleId);
 }
 
 void ForeignInterfaceImpl::setScheduleId(int32_t scheduleId)
@@ -135,7 +125,7 @@ void ForeignInterfaceImpl::setScheduleId(int32_t scheduleId)
   enableIsmForeignInterface();
 
   m_scheduleId = scheduleId;
-  onMainScheduleChanged(m_dtc->mainSchedule(scheduleId), InfrastructureManagement::Interface::DataModification::eModified);
+  onMainScheduleChanged(m_dtc->mainSchedule(scheduleId), DataModification::eModified);
   emit scheduleIdChanged(m_scheduleId);
 }
 
@@ -163,27 +153,27 @@ bool ForeignInterfaceImpl::isBuildingsInCurrentExercise(int buildingId) const
   return m_bldgsInExcersise.contains(buildingId);
 }
 
-void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, InfrastructureManagement::Interface::DataModification modType)
+void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  const int mseId = data.id();
+  const int mseId = data.id;
 
   switch (modType)
   {
-  case InfrastructureManagement::Interface::DataModification::eRemoved:
+  case DataModification::eRemoved:
   {
     QMutexLocker locker(&m_mutex);
 
-    const auto &structureElements = data.elements();
+    const auto &structureElements = data.elements;
     for (const StructureElement &currentStructEle : structureElements)
     {
-      if (currentStructEle.mountingPointTypeId() == MountingPointType::Undefined)
+      if (currentStructEle.mountingPointTypeId == MountingPointType::Unknown)
         continue;
-      m_mountingPoints.remove(currentStructEle.id());
+      m_mountingPoints.remove(currentStructEle.id);
     }
     break;
   }
-  case InfrastructureManagement::Interface::DataModification::eAdded:
-  case InfrastructureManagement::Interface::DataModification::eModified:
+  case DataModification::eAdded:
+  case DataModification::eModified:
   {
     QVector<int> exeIds;
 
@@ -192,14 +182,14 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureMan
     {
       QJsonParseError parserError;
       
-      const auto &structureElements = data.elements();
+      const auto &structureElements = data.elements;
       if (!structureElements.empty())
       {
-        const QByteArray &content = QByteArray::fromStdString(structureElements[0].properties());
+        const QByteArray &content = QByteArray::fromStdString(structureElements[0].properties);
 
         const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
         if (parserError.error != QJsonParseError::NoError)
-          WARNING_LOG(m_logger) << "Invalid properties for MSE " << data.id() << ", " << data.name();
+          WARNING_LOG(m_logger) << "Invalid properties for MSE " << data.id << ", " << data.name;
         else
         {
           const QJsonArray exercises(QJsonObject(doc.object()).value(QStringLiteral("available_in_exercise")).toArray());
@@ -239,7 +229,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureMan
       {
         
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_bldgsInExcersise updated."
-                            << " (mseId=" << mseId << " name=" << data.name();
+                            << " (mseId=" << mseId << " name=" << data.name;
         emit buildingsInCurrentExerciseChanged();
       }
     }
@@ -251,52 +241,52 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureMan
     
     if (m_exerciseId == 0 || (m_exerciseId > 0  && exeIds.contains(m_exerciseId)))
     {
-      const auto &structureElements = data.elements();
+      const auto &structureElements = data.elements;
       for (const StructureElement &currentStructEle : structureElements)
       {
-        if (currentStructEle.mountingPointTypeId() == MountingPointType::Undefined)
+        if (currentStructEle.mountingPointTypeId == MountingPointType::Unknown)
           continue;
 
         StructureElement seFloor;
-        const std::vector<int32_t> &curPath = currentStructEle.path();
+        const std::vector<int32_t> &curPath = currentStructEle.path;
         if (curPath.size() == 4)
         {
-          
-          
-          if (!m_dtc->getStructureElementById(curPath[1], seFloor)) 
+
+
+          if (!m_dtc->getStructureElementById(curPath[1], seFloor))
             WARNING_LOG(m_logger) << " getStructureElementById failed for " << curPath[1];
 
         }
 
-        const int floorId = QString::fromStdString(seFloor.name()).split(QStringLiteral("_")).value(1, QStringLiteral("-10")).toInt();
+        const int floorId = QString::fromStdString(seFloor.name).split(QStringLiteral("_")).value(1, QStringLiteral("-10")).toInt();
 
         {
           QMutexLocker locker(&m_mutex);
 
           
-          const auto it = m_mountingPoints.find(currentStructEle.id());
+          const auto it = m_mountingPoints.find(currentStructEle.id);
           if (it != m_mountingPoints.end())
           {
             MountingPoint &mountingPointRef = *it;
 
-            if (mountingPointRef.data().id() == currentStructEle.id())
+            if (mountingPointRef.data().id == currentStructEle.id)
               continue;
 
             mountingPointRef.updateData(currentStructEle, floorId);
-            emit mountingPointChanged(mountingPointRef, ParticipantManagement::DataModification::eModified);
+            emit mountingPointChanged(mountingPointRef, DataModification::eModified);
           } else {
-            DEBUG_LOG(m_logger) << "New Mounting point with id " << currentStructEle.id()
-                                << " and type " << static_cast<int>(currentStructEle.mountingPointTypeId())
-                                << " subid: " << currentStructEle.mountingPointId() << this;
+            DEBUG_LOG(m_logger) << "New Mounting point with id " << currentStructEle.id
+                                << " and type " << static_cast<int>(currentStructEle.mountingPointTypeId)
+                                << " subid: " << currentStructEle.mountingPointId << this;
 
             MountingPoint newMountingPoint(currentStructEle, floorId);
-            const int assetId = m_mountingPointAssetMap.value(newMountingPoint.data().id(), -1);
+            const int assetId = m_mountingPointAssetMap.value(newMountingPoint.data().id, -1);
             newMountingPoint.setAssociatedAssetId(assetId);
-            
 
-            m_mountingPoints.insert(newMountingPoint.data().id(), newMountingPoint);
-            emit mountingPointChanged(newMountingPoint, ParticipantManagement::DataModification::eAdded);
-          } 
+
+            m_mountingPoints.insert(newMountingPoint.data().id, newMountingPoint);
+            emit mountingPointChanged(newMountingPoint, DataModification::eAdded);
+          }
         }
 
       }
@@ -306,11 +296,11 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const InfrastructureMan
   } 
 }
 
-void ForeignInterfaceImpl::onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, InfrastructureManagement::Interface::DataModification modType)
+void ForeignInterfaceImpl::onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, DataModification modType)
 {
-  const int32_t structureElementId = data.structureElementId();
+  const int32_t structureElementId = data.structureElementId;
 
-  DEBUG_LOG(m_logger) << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
+  DEBUG_LOG(m_logger) << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId;
 
   
 
@@ -321,10 +311,10 @@ void ForeignInterfaceImpl::onMountingPointAssetChanged(const InfrastructureManag
 
   MountingPoint &mpRef = m_mountingPoints[structureElementId]; 
 
-  if (modType == InfrastructureManagement::Interface::DataModification::eRemoved)
+  if (modType == DataModification::eRemoved)
   {
     m_mountingPointAssetMap.remove(structureElementId);
-    if (mpRef.data().id() > 0)
+    if (mpRef.data().id > 0)
     {
       mpRef.setAssociatedAssetId(-1);
       mpRef.setHasAssociatedAssetDefect(false);
@@ -332,43 +322,43 @@ void ForeignInterfaceImpl::onMountingPointAssetChanged(const InfrastructureManag
   }
   else
   {
-    m_mountingPointAssetMap.insert(structureElementId, data.assetId());
-    if (mpRef.data().id() > 0)
+    m_mountingPointAssetMap.insert(structureElementId, data.assetId);
+    if (mpRef.data().id > 0)
     {
-      mpRef.setAssociatedAssetId(data.assetId());
-      mpRef.setHasAssociatedAssetDefect(m_dtc->instrumentationAsset(data.assetId()).assetStateId() == Interface::InstrumentationAssetState::Defect);
+      mpRef.setAssociatedAssetId(data.assetId);
+      mpRef.setHasAssociatedAssetDefect(m_dtc->instrumentationAsset(data.assetId).assetStateId == InstrumentationAssetState::Defect);
     }
   }
 
-  if (mpRef.data().id() > 0)
-    emit mountingPointChanged(mpRef, ParticipantManagement::DataModification::eModified);
+  if (mpRef.data().id > 0)
+    emit mountingPointChanged(mpRef, DataModification::eModified);
 }
 
-void ForeignInterfaceImpl::onMainScheduleChanged(const InfrastructureManagement::Interface::MainSchedule &data, InfrastructureManagement::Interface::DataModification modType)
+void ForeignInterfaceImpl::onMainScheduleChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType)
 {
-  if (m_scheduleId != data.id())
+  if (m_scheduleId != data.id)
     return;
 
   Q_UNUSED(modType);
 
-  QHash<int, Interface::MountingPointPlan> mppMap;
-  for (const auto &elem : data.elements())
-    mppMap[elem.structureElementId()] = elem;
+  QHash<int, MountingPointPlan> mppMap;
+  for (const auto &elem : data.elements)
+    mppMap[elem.structureElementId] = elem;
 
 
   for (MountingPoint &mp : m_mountingPoints)
   {
-    const Interface::MountingPointPlan   &mpp = mppMap[mp.data().id()];
-    const MountingPointState  &mps = mpp.mountingPointState();
+    const MountingPointPlan   &mpp = mppMap[mp.data().id];
+    const MountingPointState  &mps = mpp.mountingPointState;
 
-    
-    if(mpp.structureElementId() != mp.data().id())
+
+    if(mpp.structureElementId != mp.data().id)
     {
       
       if (mp.aimState() == MountingPointState::Idle)
         continue;
       mp.setAimState(MountingPointState::Idle);
-      emit mountingPointChanged(mp, ParticipantManagement::DataModification::eModified);
+      emit mountingPointChanged(mp, DataModification::eModified);
       continue;
     }
     
@@ -376,7 +366,7 @@ void ForeignInterfaceImpl::onMainScheduleChanged(const InfrastructureManagement:
       continue;
 
     mp.setAimState(mps);
-    emit mountingPointChanged(mp, ParticipantManagement::DataModification::eModified);
+    emit mountingPointChanged(mp, DataModification::eModified);
   }
 }
 
@@ -403,7 +393,7 @@ void ForeignInterfaceImpl::init()
 #ifdef PROCESS_MSE_SEQUENTIELL
   m_dtc->mainStructureElements([this](const InfrastructureManagement::MainStructureElement &data)
   {
-    onMainStructureElementChanged(data, InfrastructureManagement::Interface::DataModification::eAdded);
+    onMainStructureElementChanged(data, DataModification::eAdded);
   });
 #else
 
@@ -424,20 +414,20 @@ void ForeignInterfaceImpl::init()
 
   
   QtConcurrent::blockingMap(mseMap, [this](const InfrastructureManagement::MainStructureElement &data) {
-    onMainStructureElementChanged(data, InfrastructureManagement::Interface::DataModification::eAdded);
+    onMainStructureElementChanged(data, DataModification::eAdded);
   });
 #endif 
 
   m_dtc->mountingPointAssets([this](const InfrastructureManagement::MountingPointAsset &data)
   {
-    onMountingPointAssetChanged(data, InfrastructureManagement::Interface::DataModification::eAdded);
+    onMountingPointAssetChanged(data, DataModification::eAdded);
   });
 
   // mainSchedules() returns QMap, iterate and notify for each schedule
   const auto& schedulesMap = m_dtc->mainSchedules();
   for (auto it = schedulesMap.begin(); it != schedulesMap.end(); ++it)
   {
-    onMainScheduleChanged(it.value(), InfrastructureManagement::Interface::DataModification::eAdded);
+    onMainScheduleChanged(it.value(), DataModification::eAdded);
   }
 
   int firstBldg = -1;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
index 61f3ae8ba..7a32b2708 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
@@ -34,7 +34,7 @@ public:
 
   
   
-  ParticipantManagement::MainSchedule mainSchedule(int32_t scheduleId) override final;
+  MainSchedule mainSchedule(int32_t scheduleId) override final;
   void setScheduleId(int32_t scheduleId) override final;
   int32_t scheduleId() const override final;
   
@@ -49,9 +49,9 @@ public:
 
 
 private Q_SLOTS:
-  void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, InfrastructureManagement::Interface::DataModification modType);
-  void onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, InfrastructureManagement::Interface::DataModification modType);
-  void onMainScheduleChanged(const InfrastructureManagement::Interface::MainSchedule &data, InfrastructureManagement::Interface::DataModification modType);
+  void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType);
+  void onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, DataModification modType);
+  void onMainScheduleChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType);
 
 private: 
   NGL::INGLLogger &m_logger;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
index 2b755da10..fab0344d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
@@ -9,6 +9,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <LtsWidgets/lts_overlay_loading.h>
 #include "ism_set_recording_dialog_requester.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -23,10 +24,10 @@ namespace
 static inline InfrastructureManagement::StructureElement findMountingPoint(const InfrastructureManagement::MainStructureElement &building,
                                                                            const InfrastructureManagement::SimpleRecordingData &guiMountingPoint)
 {
-  Q_ASSERT(guiMountingPoint.mainStructureElementId == building.id());
-  for (const auto &currentStructureElement : building.elements())
+  Q_ASSERT(guiMountingPoint.mainStructureElementId == building.id);
+  for (const auto &currentStructureElement : building.elements)
   {
-    if (currentStructureElement.id() == guiMountingPoint.id)
+    if (currentStructureElement.id == guiMountingPoint.id)
       return currentStructureElement;
   }
 
@@ -41,6 +42,7 @@ namespace InfrastructureManagement
 
 SetRecordingDialog::SetRecordingDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_ui(new Ui::SetRecordingDialog)
   , m_ismDtc(nullptr)
   , m_ismFtc(nullptr)
@@ -162,14 +164,14 @@ bool SetRecordingDialog::apply()
     const MainStructureElement   &building = mse;
     StructureElement  modifiedMountingPoint = findMountingPoint(building, affectedMountingPoint);
 
-    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(modifiedMountingPoint.properties()));
+    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(modifiedMountingPoint.properties));
     QJsonObject propsObj;
     if (propsDoc.isObject()) 
       propsObj = propsDoc.object();
 
     propsObj.insert(QLatin1String("record"), affectedMountingPoint.shallHaveRecordingOn);
     
-    modifiedMountingPoint.properties(QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString());
+    modifiedMountingPoint.properties = QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString();
     modifiedElements[buildingId].push_back(modifiedMountingPoint);  
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
index 0553ded11..284825041 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_set_recording_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism_translation.h>
@@ -13,9 +14,10 @@
 namespace InfrastructureManagement
 {
 
-SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { tr("Name") })
+SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent)
+  : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name") })
 , m_dtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -78,10 +80,10 @@ void SetRecordingDialogModel::initData()
   QMap<qint32, qint32> mapMse2groupId;
   for (auto it = mainStructEles.constBegin(); it != mainStructEles.constEnd(); ++it)
   {
-    mapMse2groupId.insert(it.value().id(), it.value().groupId());
-    for (const StructureElement &currentElement : it.value().elements())
+    mapMse2groupId.insert(it.value().id, it.value().groupId);
+    for (const StructureElement &currentElement : it.value().elements)
     {
-      allStructureElements.insert(currentElement.id(), currentElement);
+      allStructureElements.insert(currentElement.id, currentElement);
     }
   }
 
@@ -92,16 +94,16 @@ void SetRecordingDialogModel::initData()
   {
     NGLTreeItem *item = nullptr;
 
-    if (it.value().structureElementTypeId() == StructureElementType::MountingPoint)
+    if (it.value().structureElementTypeId == StructureElementType::MountingPoint)
     {
-      if (it.value().mountingPointTypeId() != MountingPointType::IndoorCamera &&
-          it.value().mountingPointTypeId() != MountingPointType::OutdoorCamera)
+      if (it.value().mountingPointTypeId != MountingPointType::IndoorCamera &&
+          it.value().mountingPointTypeId != MountingPointType::OutdoorCamera)
         continue;
 
       item = new NGLTreeItem(QVariant::fromValue(toSimpleRecordingData(it.value())));
     }
     else
-      item = new NGLTreeItem(QString::fromStdString(it.value().displayName()));
+      item = new NGLTreeItem(QString::fromStdString(it.value().displayName));
 
 
     structEleIdToItem.insert(it.key(), item);
@@ -130,16 +132,16 @@ void SetRecordingDialogModel::initData()
   for (auto it = structEleIdToItem.begin(); it != structEleIdToItem.end(); ++it)
   {
     StructureElement structureElement = allStructureElements.value(it.key());
-    int32_t pathSize = structureElement.path().size();
+    int32_t pathSize = structureElement.path.size();
 
     NGLTreeItem *parent = mapGroup.value(defaultSectionId); 
     if (pathSize > 1)
     {
-      parent = structEleIdToItem.value(structureElement.path().at(pathSize - 2));
+      parent = structEleIdToItem.value(structureElement.path.at(pathSize - 2));
     }
     else
     {
-      const int sectionId = mapMse2groupId.value(structureElement.mainStructureElementId(), -1);
+      const int sectionId = mapMse2groupId.value(structureElement.mainStructureElementId, -1);
       if(sectionId != -1)
       {
         parent = mapGroup.value(sectionId);
@@ -248,22 +250,22 @@ SimpleRecordingData SetRecordingDialogModel::toSimpleRecordingData(const Structu
   SimpleRecordingData result;
 
   QJsonParseError parseError;
-  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(mountingPoint.properties()), &parseError);
+  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(mountingPoint.properties), &parseError);
   if (parseError.error != QJsonParseError::NoError)
     result.hasRecordingOn = false;
   else
     result.hasRecordingOn = doc.object().value(QLatin1String("record")).toBool();
 
-  result.mainStructureElementId = mountingPoint.mainStructureElementId();
+  result.mainStructureElementId = mountingPoint.mainStructureElementId;
 
-  if (mountingPoint.displayName().size())
-    result.name = QString::fromStdString(mountingPoint.displayName());
-  else if (mountingPoint.name().size())
-    result.name = QString::fromStdString(mountingPoint.name());
+  if (mountingPoint.displayName.size())
+    result.name = QString::fromStdString(mountingPoint.displayName);
+  else if (mountingPoint.name.size())
+    result.name = QString::fromStdString(mountingPoint.name);
   else
-    result.name = QStringLiteral("MP_%1").arg(mountingPoint.id());
+    result.name = QStringLiteral("MP_%1").arg(mountingPoint.id);
 
-  result.id = mountingPoint.id();
+  result.id = mountingPoint.id;
   result.shallHaveRecordingOn = result.hasRecordingOn;
 
   return result;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
index 938fb1fb3..c754f83e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
@@ -10,6 +10,7 @@
 
 #include <LtsSession/lts_session.h>
 #include <LtsPrinting/printing.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtWidgets/QTreeView>
 
 #include <QtCore/QJsonDocument>
@@ -21,6 +22,7 @@ namespace InfrastructureManagement
 
 ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_session(session)
   , m_ui(new Ui::ExerciseAssignmentDialog)
   , m_ismDtc(nullptr)
@@ -76,7 +78,7 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
   const QMap<qint32, ExerciseManagement::Exercise> exercises = m_exmDtc->exercises();
   m_ui->cbExercises->addItem(QStringLiteral("-"), 0);
   for (const auto &exercise : exercises)
-    m_ui->cbExercises->addItem(QString::fromStdString(exercise.name()), exercise.id());
+    m_ui->cbExercises->addItem(QString::fromStdString(exercise.name), exercise.id);
 
   m_ui->pbAssigned->setEnabled(false);
 
@@ -118,14 +120,14 @@ void ExerciseAssignmentDialog::onAssignedClicked()
       MainStructureElement &req = request;
       req = m_model->getRowData(index.row());
 
-      QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromStdString(request.properties())).object();
+      QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromStdString(request.properties)).object();
 
       
       QJsonArray array;
       if (m_ui->cbExercises->currentIndex() != 0)
         array.push_back(m_ui->cbExercises->currentData().toInt());
       obj.insert(QStringLiteral("available_in_exercise"), array);
-      request.properties(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
+      request.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString();
 
       return m_ismFtc->mainStructureElementModifyRequest(request, this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
index ee7ef4be0..e2b52a704 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_exercise_assignment_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QDateTime>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -16,6 +17,7 @@ ExerciseAssignmentDialogModel::ExerciseAssignmentDialogModel(QObject *parent)
       tr("Assigned Exercise")
       },
       parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_dtc(nullptr)
   , m_exmDtc(nullptr)
 {
@@ -35,19 +37,19 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
   switch (index.column())
   {
   case NAME:
-    return m_dtc->getBuildingDisplayName(currentMainStructureElement.id());
+    return m_dtc->getBuildingDisplayName(currentMainStructureElement.id);
   case ASSIGNED_EXERCISES:
   {
-    if (!currentMainStructureElement.properties().size())
+    if (!currentMainStructureElement.properties.size())
       return QChar(QLatin1Char('-'));
 
     QJsonParseError parseError;
-    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(currentMainStructureElement.properties()), &parseError);
+    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(currentMainStructureElement.properties), &parseError);
 
     if (parseError.error != QJsonParseError::NoError)
     {
       INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
-                         << currentMainStructureElement.id()
+                         << currentMainStructureElement.id
                          << ". Reason: "
                          << parseError.errorString()
                          << "; JSON: "
@@ -68,7 +70,7 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
     if (exercise.size())
     {
       int exId = exercise.toInt();
-      return QString::fromStdString(m_exmDtc->exercise(exId).name());
+      return QString::fromStdString(m_exmDtc->exercise(exId).name);
     }
     return QChar(QLatin1Char('-'));
   }
@@ -110,7 +112,7 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
 bool ExerciseAssignmentDialogModel::isFiltered(const InfrastructureManagement::MainStructureElement &data, DataModification modType) const
 {
   Q_UNUSED(modType);
-  return (data.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building &&
-      data.structureElementTypeId() != InfrastructureManagement::StructureElementType::Announcement);
+  return (data.structureElementTypeId != InfrastructureManagement::StructureElementType::Building &&
+      data.structureElementTypeId != InfrastructureManagement::StructureElementType::Announcement);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.cpp
index 964783acf..684339482 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.cpp
@@ -19,14 +19,14 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
   {
     auto cb = [cbx,filter](const InfrastructureManagement::MainStructureElement &mse)
     {
-      if (mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::RadioStation && !mse.isDeleted() && mse.id() > 0 )
+      if (mse.structureElementTypeId == InfrastructureManagement::StructureElementType::RadioStation && !mse.isDeleted && mse.id > 0 )
       {
         const RadioStation &rs = RadioStation::fromMSE(mse);
         if (((filter >= 0) && rs.radios.contains(static_cast<FrequencyBand>(filter))) ||
             (filter < 0))
         {
-          cbx->addItem(QString::fromStdString(mse.name()), mse.id());
-          cbx->setItemData(cbx->findData(mse.id()), rs.radioStationId, Qt::UserRole + 1);
+          cbx->addItem(QString::fromStdString(mse.name), mse.id);
+          cbx->setItemData(cbx->findData(mse.id), rs.radioStationId, Qt::UserRole + 1);
         }
       }
     };
@@ -37,10 +37,10 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
   {
     auto cb = [cbx](const InfrastructureManagement::MainStructureElement &mse)
     {
-      if ((mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::ApproachingPoint) && !mse.isDeleted() && (mse.id() > 0))
+      if ((mse.structureElementTypeId == InfrastructureManagement::StructureElementType::ApproachingPoint) && !mse.isDeleted && (mse.id > 0))
       {
-        cbx->addItem(QString::fromStdString(mse.name()), mse.id());
-        cbx->setItemData(cbx->findData(mse.id()), mse.angle(), Qt::UserRole + 1);
+        cbx->addItem(QString::fromStdString(mse.name), mse.id);
+        cbx->setItemData(cbx->findData(mse.id), mse.angle, Qt::UserRole + 1);
       }
     };
     dtc->mainStructureElements(cb);
@@ -48,14 +48,14 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
   }
   case IsmComboBoxType::CbScheduleStatus:
   {
-    cbx->addItem(toString(ScheduleStatus::Active), ScheduleStatus::Active);
-    cbx->addItem(toString(ScheduleStatus::Inactive), ScheduleStatus::Inactive);
+    cbx->addItem(toString(ScheduleStatus::Active), static_cast<int>(ScheduleStatus::Active));
+    cbx->addItem(toString(ScheduleStatus::Inactive), static_cast<int>(ScheduleStatus::Inactive));
     break;
   }
   case IsmComboBoxType::CbBridgeStatus:
   {
-    cbx->addItem(toString(BridgeStatus::Intact), BridgeStatus::Intact);
-    cbx->addItem(toString(BridgeStatus::Broken), BridgeStatus::Broken);
+    cbx->addItem(toString(BridgeStatus::Intact), static_cast<int>(BridgeStatus::Intact));
+    cbx->addItem(toString(BridgeStatus::Broken), static_cast<int>(BridgeStatus::Broken));
   }
   case IsmComboBoxType::CbUnknown:
   default:
@@ -68,10 +68,10 @@ bool IsmComboBox::fill(LtsWidgets::LtsComboBox *cbx, IsmComboBoxType type, LtsSe
 RadioStation RadioStation::fromMSE(const MainStructureElement &mse)
 {
   RadioStation rs;
-  rs.mse_id = mse.id();
-  rs.name = QString::fromStdString(mse.name());
+  rs.mse_id = mse.id;
+  rs.name = QString::fromStdString(mse.name);
 
-  LtsUtils::JsonObject jo = LtsUtils::JsonObject::fromJson(mse.properties());
+  LtsUtils::JsonObject jo = LtsUtils::JsonObject::fromJson(mse.properties);
   LtsUtils::JsonArray radios = jo.valueOr<LtsUtils::JsonArray>("radios", {});
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
index 1ef509267..fb94663c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
@@ -9,12 +9,14 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsPrinting/printing.h>
 #include <QtWidgets/QTreeView>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
 
 ApproachingPointsDialog::ApproachingPointsDialog(const QString &menuGroup, LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_session(session)
   , m_ui(new Ui::ApproachingPointsDialog)
   , m_model(nullptr)
@@ -91,7 +93,7 @@ void ApproachingPointsDialog::onItemDoubleClicked()
     return;
   }
 
-  addDialog(dialog, m_menuGroup, QStringLiteral("EditApproachingPoint%1").arg(approachingPoint.id()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(dialog, m_menuGroup, QStringLiteral("EditApproachingPoint%1").arg(approachingPoint.id), LtsWidgets::LayoutArea::eDialogTab);
 }
 
 void ApproachingPointsDialog::onPrint()
@@ -106,7 +108,7 @@ void ApproachingPointsDialog::onAddApproachingPoint()
   EditApproachingPointDialog *dialog = new EditApproachingPointDialog(this);
 
   MainStructureElement approachingPoint = m_model->getRowData(currentIndex.row());
-  approachingPoint.id(0);
+  approachingPoint.id = 0;
   if (!dialog->init(m_ftc, m_sitMapIfc, approachingPoint))
   {
     delete dialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
index ce6e533f0..6086d6daf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
@@ -9,6 +9,7 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonDocument>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
@@ -22,6 +23,7 @@ ApproachingPointsDialogModel::ApproachingPointsDialogModel(QObject *parent)
                                                             tr("Special Type"),
                                                             tr("Properties")},
                                                             parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -35,21 +37,21 @@ QVariant ApproachingPointsDialogModel::data(const QModelIndex &index, int role)
   switch (index.column())
   {
   case Id:
-    return currentPoint.id();
+    return currentPoint.id;
   case Name:
-    return QString::fromStdString(currentPoint.name());
+    return QString::fromStdString(currentPoint.name);
   case Description:
   {
-    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(currentPoint.description()));
+    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(currentPoint.description));
     const QString jsonKey = QLatin1String("description");
     if (!doc.isObject())
       return QVariant();
     return doc.object().value(jsonKey).toString();
   }
   case Position:
-    return LtsCoordTrans::mgrsFromGeographic(currentPoint.geoPosition().lon(), currentPoint.geoPosition().lat());
+    return LtsCoordTrans::mgrsFromGeographic(currentPoint.geoPosition.lon, currentPoint.geoPosition.lat);
   case Orientation:
-    return calculateCardinalDirection(currentPoint.angle());
+    return calculateCardinalDirection(currentPoint.angle);
   }
 
   return QVariant();
@@ -101,7 +103,7 @@ QString ApproachingPointsDialogModel::calculateCardinalDirection(double degree,
 bool ApproachingPointsDialogModel::isFiltered(const InfrastructureManagement::MainStructureElement &data, DataModification modType) const
 {
   Q_UNUSED(modType);
-  return (data.structureElementTypeId() != InfrastructureManagement::StructureElementType::ApproachingPoint);
+  return (data.structureElementTypeId != InfrastructureManagement::StructureElementType::ApproachingPoint);
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
index 3151f4b8b..608928f43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
@@ -10,6 +10,7 @@
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QJsonDocument>
 
 namespace InfrastructureManagement
@@ -17,6 +18,7 @@ namespace InfrastructureManagement
 
 EditApproachingPointDialog::EditApproachingPointDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_ui(new Ui::EditApproachingPointDialog)
   , m_ftc(nullptr)
   , m_sitMapGuiIfc(nullptr)
@@ -65,33 +67,33 @@ bool EditApproachingPointDialog::apply()
   {
     MainStructureElementModifyRequest request;
 
-    request.id(m_approachingPoint.id());
-    request.name(m_ui->leName->text().toStdString());
-    request.angle(m_ui->cbDepartureDirection->currentData().toDouble());
+    request.id = m_approachingPoint.id;
+    request.name = m_ui->leName->text().toStdString();
+    request.angle = m_ui->cbDepartureDirection->currentData().toDouble();
 
-    request.properties("{}");
-    request.structureElementId(m_approachingPoint.structureElementId());
-    request.structureElementTypeId(InfrastructureManagement::StructureElementType::ApproachingPoint);
+    request.properties = "{}";
+    request.structureElementId = m_approachingPoint.structureElementId;
+    request.structureElementTypeId = InfrastructureManagement::StructureElementType::ApproachingPoint;
 
     QJsonObject objDescription;
     objDescription.insert(QLatin1String("description"), m_ui->leDescription->text());
-    request.description(QJsonDocument(objDescription).toJson(QJsonDocument::Compact).toStdString());
+    request.description = QJsonDocument(objDescription).toJson(QJsonDocument::Compact).toStdString();
 
     const Core::GeoPosition pos(m_ui->positionEdit->coordinate().x(),m_ui->positionEdit->coordinate().y(), 0);
-    request.geoPosition(pos);
+    request.geoPosition = pos;
 
     
-    if (m_approachingPoint.id() == 0)
+    if (m_approachingPoint.id == 0)
     {
       StructureElement seData;
-      seData.name(request.name());
-      seData.displayName(request.name());
-      seData.structureElementTypeId(InfrastructureManagement::StructureElementType::ApproachingPoint);
-      seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
-      seData.properties("{}");
+      seData.name = request.name;
+      seData.displayName = request.name;
+      seData.structureElementTypeId = InfrastructureManagement::StructureElementType::ApproachingPoint;
+      seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
+      seData.properties = "{}";
 
-      request.elements().resize(1, seData);
-      request.childParentRelations().resize(1, -1);
+      request.elements.resize(1, seData);
+      request.childParentRelations.resize(1, -1);
     }
 
     return m_ftc->mainStructureElementModifyRequest(request, this);
@@ -114,15 +116,15 @@ void EditApproachingPointDialog::setData(const MainStructureElement &approaching
 {
   m_approachingPoint = approachingPoint;
 
-  m_ui->leName->setText(QString::fromStdString(m_approachingPoint.name()));
-  QJsonObject objDescription = QJsonDocument::fromJson(QByteArray::fromStdString(m_approachingPoint.description())).object();
+  m_ui->leName->setText(QString::fromStdString(m_approachingPoint.name));
+  QJsonObject objDescription = QJsonDocument::fromJson(QByteArray::fromStdString(m_approachingPoint.description)).object();
   QString strDescription = objDescription.value(QLatin1String("description")).toString();
   m_ui->leDescription->setText(strDescription);
-  QPointF pos(m_approachingPoint.geoPosition().lon(), m_approachingPoint.geoPosition().lat());
+  QPointF pos(m_approachingPoint.geoPosition.lon, m_approachingPoint.geoPosition.lat);
   if (!pos.isNull())
     m_ui->positionEdit->setCoordinate(pos);
 
-  m_ui->cbDepartureDirection->setCurrentIndex( (int) ((approachingPoint.angle() / 45) + 0.5) % 8);
+  m_ui->cbDepartureDirection->setCurrentIndex( (int) ((approachingPoint.angle / 45) + 0.5) % 8);
 }
 
 void EditApproachingPointDialog::getPosition()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
index 23348ea3c..dc6f27b21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
@@ -20,23 +20,26 @@
 #include <QtGui/QAction>
 #include <QtCore/QTimer>
 #include <vector>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
 
 static QHash<int, QString> &INSTRUMENTATION_ASSET_STATES()
 {
-  static QHash<int, QString> s_ret
+  static QHash<int, QString> s_ret;
+  if (s_ret.isEmpty())
   {
-    {InstrumentationAssetState::Unmounted, QLatin1String("Unmounted")},
-    {InstrumentationAssetState::Mounted, QLatin1String("Mounted")},
-    {InstrumentationAssetState::Defect, QLatin1String("Defect")}
-  };
+    s_ret.insert(static_cast<int>(InstrumentationAssetState::Unmounted), QLatin1String("Unmounted"));
+    s_ret.insert(static_cast<int>(InstrumentationAssetState::Mounted), QLatin1String("Mounted"));
+    s_ret.insert(static_cast<int>(InstrumentationAssetState::Defect), QLatin1String("Defect"));
+  }
   return s_ret;
 }
 
 AssetListDialog::AssetListDialog(const QString &menuGroup, LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_session(session)
   , m_model(nullptr)
   , m_menuGroup(menuGroup)
@@ -82,15 +85,15 @@ bool AssetListDialog::apply()
     if (!rowContainsAlteredData(m_model->alteredRows().at(i)))
       continue;
     asset = m_model->getRowData(i);
-    InstrumentationAssetModifyRequest request(asset.id(),
-                                              asset.name(),
-                                              asset.mountingPointTypeId(),
-                                              asset.barcode(),
-                                              asset.hostname(),
-                                              asset.properties(),
-                                              asset.assetStateId(),
-                                              asset.lastUpdated(),
-                                              asset.availableInExercise());
+    InstrumentationAssetModifyRequest request(asset.id,
+                                              asset.name,
+                                              asset.mountingPointTypeId,
+                                              asset.barcode,
+                                              asset.hostname,
+                                              asset.properties,
+                                              asset.assetStateId,
+                                              asset.lastUpdated,
+                                              asset.availableInExercise);
     m_requestHelper->addRequest([request, this]()
     {
       return m_ftc->instrumentationAssetModifyRequest(request, this);
@@ -144,7 +147,7 @@ QVector<QString> AssetListDialog::getExportString(const AssetFilterDialog::Expor
     for (int i = 0; i < m_model->rowCount(); ++i)
     {
       const InstrumentationAsset &ia = m_model->getRowData(i);
-      if (toString(ia.mountingPointTypeId()) == type)
+      if (toString(ia.mountingPointTypeId) == type)
         vecOut << exportData(ia);
     }
     break;
@@ -159,18 +162,18 @@ QVector<QString> AssetListDialog::getExportString(const AssetFilterDialog::Expor
 
 QString AssetListDialog::exportData(const InstrumentationAsset &ia, const QString &separator)
 {
-  const QByteArray &properties = QByteArray::fromRawData(ia.properties().c_str(), ia.properties().size());
+  const QByteArray &properties = QByteArray::fromRawData(ia.properties.c_str(), ia.properties.size());
   const QJsonDocument doc(QJsonDocument::fromJson(properties));
   const QJsonObject obj(doc.object());
 
-  const QString &name = QString::fromStdString(ia.name());
+  const QString &name = QString::fromStdString(ia.name);
   const int nameSep = name.lastIndexOf(QLatin1Char('_'));
-  const QString &dmc = QString::fromStdString(ia.barcode());
+  const QString &dmc = QString::fromStdString(ia.barcode);
   const QString &tkz = name.mid(0, nameSep);
   const QString &snr = nameSep >= 0 ? name.mid(nameSep + 1) : QString();
   const QString &mac = obj.value(QStringLiteral("mac")).toString();
-  const QString &status = INSTRUMENTATION_ASSET_STATES().value(ia.assetStateId().underlying());
-  const QString &bz = ia.isUsed() ? QStringLiteral("Mounted") : QStringLiteral("Unmounted");
+  const QString &status = INSTRUMENTATION_ASSET_STATES().value(static_cast<int>(ia.assetStateId));
+  const QString &bz = ia.isUsed ? QStringLiteral("Mounted") : QStringLiteral("Unmounted");
   const QString &oc = QString::number(obj.value(QStringLiteral("opticalCode")).toInt());
   const QString &ls = obj.value(QStringLiteral("hasSpeaker")).toBool() ? QStringLiteral("1") : QStringLiteral("0");
   const QString &mf = obj.value(QStringLiteral("hasMicrophone")).toBool() ? QStringLiteral("1") : QStringLiteral("0");
@@ -178,16 +181,16 @@ QString AssetListDialog::exportData(const InstrumentationAsset &ia, const QStrin
   const QString &user = obj.value(QStringLiteral("username")).toString();
   const QString &pass = obj.value(QStringLiteral("password")).toString();
   const QString &props = QString::fromUtf8(properties);
-  const QString &lastMod = QDateTime::fromMSecsSinceEpoch(ia.lastUpdated()).toString();
+  const QString &lastMod = QDateTime::fromMSecsSinceEpoch(ia.lastUpdated).toString();
 
   return QStringList({dmc, tkz, snr, mac, status, bz, oc, ls, mf, vapix, user, pass, props, lastMod}).join(separator);
 }
 
-static std::string unquote(const QStringRef &in)
+static std::string unquote(const QString &in)
 {
   if (!in.startsWith(QLatin1Char('"')) && !in.endsWith(QLatin1Char('"')))
-    return in.toString().toStdString();
-  QString out = in.mid(1, in.length() - 2).toString();
+    return in.toStdString();
+  QString out = in.mid(1, in.length() - 2);
   out.replace(QStringLiteral("\"\""), QStringLiteral("\""));
   return out.toStdString();
 }
@@ -200,37 +203,33 @@ static inline void setJson(QJsonObject &obj, const QString &key, bool bVal)
   else
     obj[key] = bVal;
 }
-static inline void setJson(QJsonObject &obj, const QString &key, const QStringRef &val)
+static inline void setJson(QJsonObject &obj, const QString &key, const QString &val)
 {
   if (val.isEmpty())
     obj.remove(key);
   else
-    obj[key] = val.toString();
-}
-static inline void setJson(QJsonObject &obj, const QString &key, const QString &val)
-{
-  setJson(obj, key, QStringRef(&val));
+    obj[key] = val;
 }
 
-InstrumentationAsset AssetListDialog::importData(const QVector<QStringRef> &segments, bool *bOk) const
+InstrumentationAsset AssetListDialog::importData(const QVector<QString> &segments, bool *bOk) const
 {
   if (bOk)
     *bOk = true;
   const int len = segments.size();
 
-  const QStringRef &dmc = segments.at(0);
-  const QStringRef &tkz = segments.at(1);
-  const QStringRef &snr = segments.at(2);
-  const QStringRef &mac = segments.at(3);
-  const QStringRef &status = segments.at(4);
-  
-  const QStringRef &oc = segments.at(6);
-  const QStringRef &ls = segments.at(7);
-  const QStringRef &mf = segments.at(8);
-  const QStringRef &vapix = segments.at(9);
-  const QStringRef &user = len > 10 ? segments.at(10) : QStringRef();
-  const QStringRef &pass = len > 11 ? segments.at(11) : QStringRef();
-  const QStringRef &props = len > 12 ? segments.at(12) : QStringRef();
+  const QString &dmc = segments.at(0);
+  const QString &tkz = segments.at(1);
+  const QString &snr = segments.at(2);
+  const QString &mac = segments.at(3);
+  const QString &status = segments.at(4);
+
+  const QString &oc = segments.at(6);
+  const QString &ls = segments.at(7);
+  const QString &mf = segments.at(8);
+  const QString &vapix = segments.at(9);
+  const QString &user = len > 10 ? segments.at(10) : QString();
+  const QString &pass = len > 11 ? segments.at(11) : QString();
+  const QString &props = len > 12 ? segments.at(12) : QString();
   
 
   const QJsonDocument doc(QJsonDocument::fromJson(props.toUtf8()));
@@ -246,26 +245,26 @@ InstrumentationAsset AssetListDialog::importData(const QVector<QStringRef> &segm
   const std::string snrStd = unquote(snr);
   const std::string tkzStd = unquote(tkz);
   InstrumentationAsset asset;
-  asset.barcode() = unquote(dmc);
-  asset.name() = snrStd.empty() ? tkzStd : std::string(tkzStd + '_' + snrStd);
-  asset.assetStateId(static_cast<InstrumentationAssetState>(INSTRUMENTATION_ASSET_STATES().key(status.toString())));
-  asset.properties() = QJsonDocument(obj).toJson(QJsonDocument::Compact).constData();
-  
+  asset.barcode = unquote(dmc);
+  asset.name = snrStd.empty() ? tkzStd : std::string(tkzStd + '_' + snrStd);
+  asset.assetStateId = static_cast<InstrumentationAssetState>(INSTRUMENTATION_ASSET_STATES().key(status));
+  asset.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).constData();
+
   if (dmc.startsWith(QLatin1String("GSM")))
-    asset.mountingPointTypeId(MountingPointType::BuildingSensorModule);
+    asset.mountingPointTypeId = MountingPointType::BuildingSensorModule;
   else if (dmc.startsWith(QLatin1String("KAA")))
-    asset.mountingPointTypeId(MountingPointType::OutdoorCamera);
+    asset.mountingPointTypeId = MountingPointType::OutdoorCamera;
   else if (dmc.startsWith(QLatin1String("KAI")))
-    asset.mountingPointTypeId(MountingPointType::IndoorCamera);
+    asset.mountingPointTypeId = MountingPointType::IndoorCamera;
   else if (dmc.startsWith(QLatin1String("OPS")))
-    asset.mountingPointTypeId(MountingPointType::IndoorIPS);
+    asset.mountingPointTypeId = MountingPointType::IndoorIPS;
   else if (dmc.startsWith(QLatin1String("WD_")))
-    asset.mountingPointTypeId(MountingPointType::EffectGenerationControlUnit);
+    asset.mountingPointTypeId = MountingPointType::EffectGenerationControlUnit;
   else
   {
     if (bOk)
       *bOk = false;
-    WARNING_LOG(m_logger) << "Could not determine mounting point type from barcode: " << dmc.toString();
+    WARNING_LOG(m_logger) << "Could not determine mounting point type from barcode: " << dmc;
   }
 
   return asset;
@@ -280,15 +279,15 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
   for (int i = 0; i < rowCount; ++i)
   {
     InstrumentationAsset iaModelSide = m_model->getRowData(i);
-    if ((iaModelSide.name() == ia.name()) &&
-        (iaModelSide.mountingPointTypeId() == ia.mountingPointTypeId()))
+    if ((iaModelSide.name == ia.name) &&
+        (iaModelSide.mountingPointTypeId == ia.mountingPointTypeId))
     {
-      ia.id(iaModelSide.id());
+      ia.id = iaModelSide.id;
       QHash<int, bool> alteredCells;
       QHash<int, QString> alteredValues;
 
       
-      if (ia.name() != iaModelSide.name())
+      if (ia.name != iaModelSide.name)
       {
         alteredCells.insert(AssetListDialogModel::NAME, true);
         alteredValues.insert(AssetListDialogModel::NAME, m_model->data(m_model->index(i, AssetListDialogModel::NAME), Qt::DisplayRole).toString());
@@ -296,11 +295,11 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
       else
       {
         alteredCells.insert(AssetListDialogModel::NAME, false);
-        alteredValues.insert(AssetListDialogModel::NAME, QString::fromStdString(ia.name()));
+        alteredValues.insert(AssetListDialogModel::NAME, QString::fromStdString(ia.name));
       }
 
       
-      if (ia.mountingPointTypeId() != iaModelSide.mountingPointTypeId())
+      if (ia.mountingPointTypeId != iaModelSide.mountingPointTypeId)
       {
         alteredCells.insert(AssetListDialogModel::TYPE, true);
         alteredValues.insert(AssetListDialogModel::TYPE, m_model->data(m_model->index(i, AssetListDialogModel::TYPE), Qt::DisplayRole).toString());
@@ -308,11 +307,11 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
       else
       {
         alteredCells.insert(AssetListDialogModel::TYPE, false);
-        alteredValues.insert(AssetListDialogModel::TYPE, QString::fromStdString(ia.name()));
+        alteredValues.insert(AssetListDialogModel::TYPE, QString::fromStdString(ia.name));
       }
 
       
-      if (ia.barcode() != iaModelSide.barcode())
+      if (ia.barcode != iaModelSide.barcode)
       {
         alteredCells.insert(AssetListDialogModel::BARCODE, true);
         alteredValues.insert(AssetListDialogModel::BARCODE, m_model->data(m_model->index(i, AssetListDialogModel::BARCODE), Qt::DisplayRole).toString());
@@ -320,11 +319,11 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
       else
       {
         alteredCells.insert(AssetListDialogModel::BARCODE, false);
-        alteredValues.insert(AssetListDialogModel::BARCODE, QString::fromStdString(ia.name()));
+        alteredValues.insert(AssetListDialogModel::BARCODE, QString::fromStdString(ia.name));
       }
 
       
-      if (ia.hostname() != iaModelSide.hostname())
+      if (ia.hostname != iaModelSide.hostname)
       {
         alteredCells.insert(AssetListDialogModel::HOSTNAME, true);
         alteredValues.insert(AssetListDialogModel::HOSTNAME, m_model->data(m_model->index(i, AssetListDialogModel::HOSTNAME), Qt::DisplayRole).toString());
@@ -332,11 +331,11 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
       else
       {
         alteredCells.insert(AssetListDialogModel::HOSTNAME, false);
-        alteredValues.insert(AssetListDialogModel::HOSTNAME, QString::fromStdString(ia.name()));
+        alteredValues.insert(AssetListDialogModel::HOSTNAME, QString::fromStdString(ia.name));
       }
 
       
-      if (ia.properties() != iaModelSide.properties())
+      if (ia.properties != iaModelSide.properties)
       {
         alteredCells.insert(AssetListDialogModel::PROPERTIES, true);
         alteredValues.insert(AssetListDialogModel::PROPERTIES, m_model->data(m_model->index(i, AssetListDialogModel::PROPERTIES), Qt::DisplayRole).toString());
@@ -344,15 +343,15 @@ bool AssetListDialog::updateInstrumentationAsset(const InstrumentationAsset &ass
       else
       {
         alteredCells.insert(AssetListDialogModel::PROPERTIES, false);
-        alteredValues.insert(AssetListDialogModel::PROPERTIES, QString::fromStdString(ia.name()));
+        alteredValues.insert(AssetListDialogModel::PROPERTIES, QString::fromStdString(ia.name));
       }
 
       m_model->setAlteredCells(i, alteredCells);
 
 
       m_model->setPreviousValues(i, alteredValues);
-      ia.assetStateId(iaModelSide.assetStateId());
-      ia.lastUpdated(iaModelSide == ia ? iaModelSide.lastUpdated() : QDateTime::currentMSecsSinceEpoch());
+      ia.assetStateId = iaModelSide.assetStateId;
+      ia.lastUpdated = iaModelSide == ia ? iaModelSide.lastUpdated : QDateTime::currentMSecsSinceEpoch();
       m_model->setRowData(i, ia);
       return true;
     }
@@ -379,7 +378,7 @@ void AssetListDialog::onSelectionChanged(const QItemSelection &selected, const Q
     {
       InstrumentationAsset asset = m_model->assetByIndex(m_ui->assetListView->currentIndex());
       StructureElement se;
-      if(m_dtc->getStructureElementInMntPointAssetByAssetId(asset.id(), se) && enabled)
+      if(m_dtc->getStructureElementInMntPointAssetByAssetId(asset.id, se) && enabled)
       {
         m_buttonBox->getButton(LtsWidgets::DialogButton::Load)->setEnabled(true);
       }
@@ -607,7 +606,7 @@ void AssetListDialog::onImportClicked()
   while (!in.atEnd())
   {
     const QString line = in.readLine();
-    QVector<QStringRef> segments = line.splitRef(QLatin1Char(';'));
+    QVector<QString> segments = line.split(QLatin1Char(';'));
     if (segments.size() < 10)
     {
       WARNING_LOG(m_logger) << "Skipping line '" << line << "' - to few data";
@@ -673,15 +672,15 @@ void AssetListDialog::onUnmountButtonClicked()
     for(QModelIndex index: indexList)
     {
       InstrumentationAsset asset = m_model->assetByIndex(index);
-      if(asset.id() > 0 )
+      if(asset.id > 0 )
       {
         StructureElement se;
-        if(m_dtc->getStructureElementInMntPointAssetByAssetId(asset.id(), se) == false)
+        if(m_dtc->getStructureElementInMntPointAssetByAssetId(asset.id, se) == false)
         {
-          WARNING_LOG(m_logger)<<" asset not mounted. name: "<<asset.name()<< " id: "<<asset.id();
+          WARNING_LOG(m_logger)<<" asset not mounted. name: "<<asset.name<< " id: "<<asset.id;
           continue;
         }
-        InstrumentationAssetUnmountRequest req(asset.id());
+        InstrumentationAssetUnmountRequest req(asset.id);
         m_requestHelper->addRequest([req, this]()
         {
           return m_ftc->instrumentationAssetUnmountRequest(req, this);
@@ -776,7 +775,7 @@ void AssetListDialog::onReachabilityUpdateAction()
     bool bhasHostnameForTriggerUpdate = m_model->getReachable(ia, icon, str);
     if (bhasHostnameForTriggerUpdate)
     {
-      m_hostsForUpdate.insert(QString::fromStdString(ia.hostname()));
+      m_hostsForUpdate.insert(QString::fromStdString(ia.hostname));
       DEBUG_LOG(m_logger) << Q_FUNC_INFO << " trigger update for " << ia;
     }
   } 
@@ -804,7 +803,7 @@ void AssetListDialog::onHostsForUpdateNotifyTimeout()
       hostnameStd.push_back(item.toStdString());
 
   ComponentMonitor::TriggerUpdate request;
-  request.hostnames(hostnameStd);
+  request.hostnames = hostnameStd;
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " TriggerUpdate - request = " << request;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
index 1c488707a..3f9c4cb76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
@@ -82,7 +82,7 @@ NGL::INGLLogger &m_logger;
 
   QVector<QString> getExportString(const AssetFilterDialog::Export &exp, const QString &type = QString()) const;
   static QString exportData(const InstrumentationAsset &ia, const QString &separator = QLatin1String(";"));
-  InstrumentationAsset importData(const QVector<QStringRef> &segments, bool *bOk) const;
+  InstrumentationAsset importData(const QVector<QString> &segments, bool *bOk) const;
   bool updateInstrumentationAsset(const InstrumentationAsset &asset) const;
   void enaDisaBtnBoxBtns(const bool b);
   static bool rowContainsAlteredData(const QHash<int, bool> &data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
index fca72304f..44c01cc89 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
@@ -12,6 +12,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QTimer>
 #include <QtCore/QDebug>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
@@ -39,6 +40,7 @@ parent)
 , m_alteredCells()
 , m_alteredValues()
 , m_updateFilterTimer(new QTimer(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_intactStr = tr("Intact");
   updateFilterStates();
@@ -86,21 +88,21 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ID:
-      return currentAsset.id();
+      return currentAsset.id;
     case NAME:
-      return QString::fromStdString(currentAsset.name());
+      return QString::fromStdString(currentAsset.name);
     case TYPE:
-      return toString(currentAsset.mountingPointTypeId());
+      return toString(currentAsset.mountingPointTypeId);
     case BARCODE:
-      return QString::fromStdString(currentAsset.barcode());
+      return QString::fromStdString(currentAsset.barcode);
     case HOSTNAME:
-      return QString::fromStdString(currentAsset.hostname());
+      return QString::fromStdString(currentAsset.hostname);
     case MOUNTINGPOINT:
     {
       StructureElement se;
-      if (m_dtc->getStructureElementInMntPointAssetByAssetId(currentAsset.id(), se) && se.id() > 0 )
+      if (m_dtc->getStructureElementInMntPointAssetByAssetId(currentAsset.id, se) && se.id > 0 )
       {
-        return QString::fromStdString(se.displayName());
+        return QString::fromStdString(se.displayName);
       }
       else
       {
@@ -108,17 +110,17 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const
       }
     }
     case PROPERTIES:
-      return QString::fromStdString(currentAsset.properties());
+      return QString::fromStdString(currentAsset.properties);
     case STATE:
     {
-      const InstrumentationAssetState &currAssetState = currentAsset.assetStateId().underlying();
+      const InstrumentationAssetState &currAssetState = currentAsset.assetStateId;
       if(currAssetState == InstrumentationAssetState::Unmounted || currAssetState == InstrumentationAssetState::Mounted)
       {
         return m_intactStr;
       }
       else
       {
-        return toString(currentAsset.assetStateId());
+        return toString(currentAsset.assetStateId);
       }
       
     }
@@ -130,7 +132,7 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const
       return str;
     }
     case LAST_UPDATED:
-      return QDateTime::fromMSecsSinceEpoch(currentAsset.lastUpdated());
+      return QDateTime::fromMSecsSinceEpoch(currentAsset.lastUpdated);
     }
   }
 
@@ -140,7 +142,7 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const
     {
       if (triggerUpdateRequestUseful(currentAsset))
       {
-        return QDateTime::fromSecsSinceEpoch(m_reachabilityLastCheck[currentAsset.id()]);
+        return QDateTime::fromSecsSinceEpoch(m_reachabilityLastCheck[currentAsset.id]);
       }
     }
 
@@ -172,15 +174,15 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case TYPE:
-      return currentAsset.mountingPointTypeId().underlying();
+      return static_cast<int>(currentAsset.mountingPointTypeId);
     case STATE:
-      if(currentAsset.assetStateId().underlying() == InstrumentationAssetState::Mounted ||
-         currentAsset.assetStateId().underlying() == InstrumentationAssetState::Unmounted)
+      if(currentAsset.assetStateId == InstrumentationAssetState::Mounted ||
+         currentAsset.assetStateId == InstrumentationAssetState::Unmounted)
       {
         return m_intactStr;
       }
       else
-        return currentAsset.assetStateId().underlying();
+        return static_cast<int>(currentAsset.assetStateId);
     case REACHABILITY:
     {
       QIcon icon;
@@ -212,17 +214,17 @@ bool AssetListDialogModel::getReachable(const InstrumentationAsset &currentAsset
 {
   bool bEnableTriggerUpdate = false;
 
-  const bool bIsRelevant = isMptRelevant(currentAsset.mountingPointTypeId().underlying());
+  const bool bIsRelevant = isMptRelevant(currentAsset.mountingPointTypeId);
   if (bIsRelevant)
   {
-    const bool bIsMounted = currentAsset.assetStateId().underlying() == InfrastructureManagement::InstrumentationAssetState::Mounted;
+    const bool bIsMounted = currentAsset.assetStateId == InfrastructureManagement::InstrumentationAssetState::Mounted;
     if (bIsMounted)
     {
       if (m_cmoDtc)
       {
-        const ComponentMonitor::ComponentStatus &cs = m_cmoDtc->componentStatus(currentAsset.id());
-        const ComponentMonitor::ComponentState state = cs.state();
-        switch (state.underlying()) {
+        const ComponentMonitor::ComponentStatus &cs = m_cmoDtc->componentStatus(currentAsset.id);
+        const ComponentMonitor::ComponentState state = cs.state;
+        switch (state) {
         case ComponentMonitor::ComponentState::Undefined:
           iconOut = m_reachabilityOrange;
           stringOut = tr("Undefined");
@@ -288,12 +290,12 @@ void AssetListDialogModel::onComponentStatusChanged(const ComponentMonitor::Comp
   
   Q_UNUSED(modType);
 
-  const int row = findRowForId(data.id()); 
+  const int row = findRowForId(data.id); 
   if (row < 0)
     return;
 
   
-  m_reachabilityLastCheck[data.id()] = data.last_check();
+  m_reachabilityLastCheck[data.id] = data.last_check;
 
   const auto idx(index(row, REACHABILITY));
   emit dataChanged(idx, idx, {Qt::DisplayRole, Qt::BackgroundRole, Qt::DecorationRole, Qt::ToolTipRole});
@@ -329,8 +331,8 @@ bool AssetListDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
   auto cb = [this](const InfrastructureManagement::InstrumentationAsset & data)
   {
     
-    if(data.mountingPointTypeId() == MountingPointType::MeteoDataUnit ||
-       data.mountingPointTypeId() == MountingPointType::BuildingControlUnit 
+    if(data.mountingPointTypeId == MountingPointType::MeteoDataUnit ||
+       data.mountingPointTypeId == MountingPointType::BuildingControlUnit 
 )
     {
       return;
@@ -420,7 +422,7 @@ void AssetListDialogModel::updateFilterStates()
     }
     else
     {
-      cfd.data = es;
+      cfd.data = static_cast<int>(es);
       cfd.text = toString(es);
     }
     cfc.data.push_back(cfd);
@@ -435,7 +437,7 @@ void AssetListDialogModel::updateFilterTypes()
   LtsWidgets::ComboboxFilterData cfd;
   QSet<InfrastructureManagement::MountingPointType> types;
   for (const auto &r : std::as_const(m_vecData))
-    types.insert(r.mountingPointTypeId());
+    types.insert(r.mountingPointTypeId);
 
   for (const auto es : std::as_const(types))
   {
@@ -445,7 +447,7 @@ void AssetListDialogModel::updateFilterTypes()
     {
       continue;
     }
-    cfd.data = es.underlying();
+    cfd.data = static_cast<int>(es);
     cfd.text = toString(es);
     cfc.data.push_back(cfd);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp
index b28dec13c..a937becde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp
@@ -6,6 +6,7 @@
 #include "ui_ism_edit_asset_dialog.h"
 #include "ism_set_properties_dialog.h"
 #include <InfrastructureManagement/ism_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
@@ -13,6 +14,7 @@ namespace InfrastructureManagement
 
 EditAssetDialog::EditAssetDialog(QWidget *parent, const std::shared_ptr<Interface::Ftc> &ftc, const std::vector<InstrumentationAsset> &assets)
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_ui(new Ui::EditAssetDialog)
   , m_ftc(ftc)
   , m_asset(assets)
@@ -22,7 +24,7 @@ EditAssetDialog::EditAssetDialog(QWidget *parent, const std::shared_ptr<Interfac
 
   for(auto const &asset: assets)
   {
-    m_ui->listWidget->addItem(QString::fromStdString(asset.name()));
+    m_ui->listWidget->addItem(QString::fromStdString(asset.name));
   }
   connect(m_ui->toIntactBtn, &QPushButton::clicked, this, &EditAssetDialog::slotSetAssetToIntact);
   connect(m_ui->toDefectBtn, &QPushButton::clicked, this, &EditAssetDialog::slotSetAssetToDefect);
@@ -76,23 +78,23 @@ bool EditAssetDialog::apply(const InstrumentationAssetState newState)
 
     for(const auto &asset : std::as_const(m_asset))
     {
-      if (asset.id() == -1)
+      if (asset.id == -1)
       {
         continue;
       }
-      if (asset.assetStateId() == newState)
-      {
-        continue;
-      }
-      
-      if (((asset.assetStateId() == InstrumentationAssetState::Mounted) || (asset.assetStateId() == InstrumentationAssetState::Unmounted)) &&
-          (newState == InstrumentationAssetState::Unmounted)) 
+      if (asset.assetStateId == newState)
       {
         continue;
       }
 
-      req.id(asset.id());
-      req.instrumentationAssetStateId(newState);
+      if (((asset.assetStateId == InstrumentationAssetState::Mounted) || (asset.assetStateId == InstrumentationAssetState::Unmounted)) &&
+          (newState == InstrumentationAssetState::Unmounted))
+      {
+        continue;
+      }
+
+      req.id = asset.id;
+      req.instrumentationAssetStateId = newState;
       m_requestHelper->addRequest([req, this]()
       {
         return m_ftc->instrumentationAssetSetStateRequest(req, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_filter_asset_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_filter_asset_dialog.cpp
index ac2e62be4..bc10747a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_filter_asset_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_filter_asset_dialog.cpp
@@ -6,6 +6,7 @@
 #include "ui_ism_filter_asset_dialog.h"
 #include <InfrastructureManagement/ism_translation.h>
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace InfrastructureManagement
 {
@@ -15,6 +16,7 @@ AssetFilterDialog::AssetFilterDialog(AssetListDialogModel *model, QWidget *paren
   : LtsWidgets::LtsFramelessDialog(parent)
   , m_model(model)
   , m_ui(new Ui::AssetFilterDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   setAttribute(Qt::WA_DeleteOnClose, true);
   m_ui->setupUi(this);
@@ -54,11 +56,11 @@ void AssetFilterDialog::fillAssetComboBoxes()
   QSet<InfrastructureManagement::MountingPointType> types;
   types.reserve(20);
   for (int i = 0; i < m_model->rowCount(); ++i)
-    types += m_model->getRowData(i).mountingPointTypeId();
+    types += m_model->getRowData(i).mountingPointTypeId;
 
   m_ui->cmbType->addItem(QLatin1String("---"));
   for (const auto &type : std::as_const(types))
-    m_ui->cmbType->addItem(InfrastructureManagement::toString(type), type.underlying());
+    m_ui->cmbType->addItem(InfrastructureManagement::toString(type), static_cast<int>(type));
   m_ui->cmbType->setCurrentIndex(0);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.cpp
index 26e2a01a9..2f5a2ff24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.cpp
@@ -9,11 +9,13 @@
 #include <QtWidgets/QHBoxLayout>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 using namespace InfrastructureManagement;
 
 SetPropertiesDialog::SetPropertiesDialog(QLineEdit *lineEdit, QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_ui(new Ui::SetPropertiesDialog)
   , m_lineEdit(lineEdit)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
index 983807168..393e9e328 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
@@ -5,6 +5,7 @@
 #include "ui_ism_schedule.h"
 #include "ism_plan_dialog_model.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <ngltools/ngltools_dtg.h>
 #include <QtCore/QDateTime>
 
@@ -14,6 +15,7 @@ namespace InfrastructureManagement
 CustomViewSchedule::CustomViewSchedule(QWidget *parent)
   : AbstractDisplayWidget(parent)
   , m_ui(new Ui::CustomViewSchedule)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 }
@@ -58,7 +60,7 @@ bool CustomViewSchedule::init(const QModelIndex &idx)
     m_ui->lblStatus->setText(rowData(idx, InfrastructureManagement::PlanDialogModel::STATUS).toString());
 
     QPalette p = m_ui->lblStatus->palette();
-    QColor newCol = rowData(idx, PlanDialogModel::STATUS, Qt::TextColorRole).value<QColor>();
+    QColor newCol = rowData(idx, PlanDialogModel::STATUS, Qt::ForegroundRole).value<QColor>();
     p.setColor(m_ui->lblStatus->backgroundRole(), newCol);
     p.setColor(m_ui->lblStatus->foregroundRole(), newCol);
     m_ui->lblStatus->setPalette(p);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
index 3238591b5..b0d664520 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
@@ -18,6 +18,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 using namespace LtsUtils;
 using namespace LtsWidgets;
@@ -27,6 +28,7 @@ namespace InfrastructureManagement
 {
 ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *session, QWidget *parent) noexcept(false)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_session(session)
   , m_ui(new Ui::ExerciseAssignmentDialog)
   , m_model(nullptr)
@@ -59,17 +61,17 @@ ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *sessi
   
   exmDtc->exercises([this](const ExerciseManagement::Exercise &data)
   {
-    if (data.isDeleted())
+    if (data.isDeleted)
       return;
 
-    switch(data.state().underlying())
+    switch(data.state)
     {
     case ExerciseManagement::ExerciseState::Created:
     case ExerciseManagement::ExerciseState::Started:
     case ExerciseManagement::ExerciseState::Paused:
     case ExerciseManagement::ExerciseState::Stopped:
     {
-      m_exercises.insert(data.id(), data);
+      m_exercises.insert(data.id, data);
       break;
     }
     default:
@@ -78,7 +80,7 @@ ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *sessi
   });
 
   for (const auto &exercise : std::as_const(m_exercises))
-    m_ui->cbExercises->addItem(QString::fromStdString(exercise.name()), exercise.id());
+    m_ui->cbExercises->addItem(QString::fromStdString(exercise.name), exercise.id);
 
 
   if (m_ui->cbExercises->count() == 0)
@@ -173,20 +175,20 @@ void ExerciseAssignmentDialog::retranslate()
 
 void ExerciseAssignmentDialog::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &mse, DataModification modType)
 {
-  auto seti = mse.structureElementTypeId();
+  auto seti = mse.structureElementTypeId;
   if (seti != StructureElementType::Building &&
       seti != StructureElementType::Announcement)
     return;
 
   
-  QString displayName(m_dtc->getBuildingDisplayName(mse.id()));
+  QString displayName(m_dtc->getBuildingDisplayName(mse.id));
   if (displayName.isEmpty())
-    displayName = QString::fromStdString(mse.name());
+    displayName = QString::fromStdString(mse.name);
 
   int exerciseId;
   try
   {
-    exerciseId = JsonObject::fromJson(mse.properties()).value<JsonArray>(QStringLiteral("available_in_exercise")).at<int>(0); 
+    exerciseId = JsonObject::fromJson(mse.properties).value<JsonArray>(QStringLiteral("available_in_exercise")).at<int>(0);
   }
   catch(...)
   {
@@ -196,11 +198,11 @@ void ExerciseAssignmentDialog::onMainStructureElementChanged(const Infrastructur
     exerciseId = 0;
 
   if (modType == DataModification::eModified)
-    m_model->updateMse(mse.id(), mse.groupId(), displayName, exerciseId);
+    m_model->updateMse(mse.id, mse.groupId, displayName, exerciseId);
   else if (modType == DataModification::eAdded)
-    m_model->addMse(mse.id(), mse.groupId(), displayName, exerciseId);
+    m_model->addMse(mse.id, mse.groupId, displayName, exerciseId);
   else
-    m_model->removeMse(mse.id());
+    m_model->removeMse(mse.id);
 }
 
 bool ExerciseAssignmentDialog::apply()
@@ -237,7 +239,7 @@ bool ExerciseAssignmentDialog::apply()
     QJsonObject root;
     try
     {
-      root = JsonObject::fromJson(mse.properties()).object();
+      root = JsonObject::fromJson(mse.properties).object();
     }
     catch (...)
     {
@@ -253,7 +255,7 @@ bool ExerciseAssignmentDialog::apply()
     else
       root.remove(QStringLiteral("available_in_exercise"));
 
-    mse.properties(QString::fromUtf8(QJsonDocument(root).toJson()).toStdString());
+    mse.properties = QString::fromUtf8(QJsonDocument(root).toJson()).toStdString();
 
     collector->addRequest(ri, request);
   }
@@ -302,18 +304,18 @@ bool ExerciseAssignmentDialog::apply()
 
 void ExerciseAssignmentDialog::setRecording(MainStructureElement &mse, bool state)
 {
-  for(auto &el : mse.elements())
+  for(auto &el : mse.elements)
   {
-    if(el.mountingPointTypeId() != MountingPointType::IndoorCamera &&
-       el.mountingPointTypeId() != MountingPointType::OutdoorCamera)
+    if(el.mountingPointTypeId != MountingPointType::IndoorCamera &&
+       el.mountingPointTypeId != MountingPointType::OutdoorCamera)
       continue;
 
-    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(el.properties()));
+    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(el.properties));
     QJsonObject propsObj;
     if (propsDoc.isObject()) 
       propsObj = propsDoc.object();
     propsObj.insert(QLatin1String("record"), state);
-    el.properties(QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString());
+    el.properties = QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString();
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
index 62b787fb3..e11d7b7c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
@@ -7,8 +7,9 @@
 #include <QtGui/QFont>
 #include <QtGui/QGuiApplication>
 #include <InfrastructureManagement/ism_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #ifdef LTS_DEBUG
-#include <QtCore/QTimer> 
+#include <QtCore/QTimer>
 #endif
 
 
@@ -18,9 +19,10 @@ ExerciseAssignmentDialogModel::ExerciseAssignmentDialogModel(const QMap<qint32,
   : QAbstractItemModel(parent)
   , m_rootItem(new TreeItem(0, 0, tr("InvisibleRootItem"), -1))
   , m_exercises(exercises)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
-  for (int it = BuildingGroup::UnknownGroup;
-       it <= BuildingGroup::Salchau; 
+  for (int it = static_cast<int>(BuildingGroup::UnknownGroup);
+       it <= static_cast<int>(BuildingGroup::Salchau);
        ++it)
   {
     m_rootItem->appendChild(new TreeItem(0, it, toString(static_cast<BuildingGroup>(it)), -1, m_rootItem));
@@ -120,7 +122,7 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
         return {};
       if (exerciseId == 0)
         return QStringLiteral("-");
-      return QString::fromStdString(m_exercises.value(exerciseId).name());
+      return QString::fromStdString(m_exercises.value(exerciseId).name);
     }
   }
 
@@ -244,13 +246,14 @@ QVector<RequestInfos> ExerciseAssignmentDialogModel::getRequestInfos(bool all) c
 
 
 
-TreeItem::TreeItem(int mseId, int sectionId, const QString &displayName, int exerciseId, TreeItem *parentItem) : m_mseId(mseId)
+TreeItem::TreeItem(int mseId, int sectionId, const QString &displayName, int exerciseId, TreeItem *parentItem)
+  : m_mseId(mseId)
   , m_sectionId(sectionId)
   , m_displayName(displayName)
   , m_exerciseId(exerciseId)
   , m_originalExerciseId(exerciseId)
-  , m_parentItem(parentItem),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_parentItem(parentItem)
+{
 
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
index 39749c80c..54b016f7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <InfrastructureManagement/logger.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QSortFilterProxyModel>
 #include <LtsUtilsCore/json_object.h>
@@ -23,6 +24,7 @@ class ExerciseAssignmentDialogModelFilterProxy : public QSortFilterProxyModel
 public:
   ExerciseAssignmentDialogModelFilterProxy(QObject *parent)
     : QSortFilterProxyModel(parent)
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
     , m_exerciseId(0)
   {
     setRecursiveFilteringEnabled(true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
index 6998bbc06..521208f34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_mounting_point_info_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ui_ism_mounting_point_info_dialog.h"
 
@@ -28,6 +29,7 @@ MountingPointInfoDialog::MountingPointInfoDialog(int32_t mountingPointId, int32_
   , m_dtc(nullptr)
   , m_ismIfc(nullptr)
   , m_avmIfc(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->gbxAsset->hide();
@@ -44,14 +46,14 @@ void MountingPointInfoDialog::retranslate()
   
   StructureElement se;
   m_dtc->getStructureElementById(m_mountingPointId, se);
-  QString seName = QString::fromStdString(se.displayName()).trimmed();
+  QString seName = QString::fromStdString(se.displayName).trimmed();
   QString lbName;
   
   
   if(seName.isEmpty())
   {
-    MainStructureElement mse=  m_dtc->mainStructureElement(se.mainStructureElementId());
-    lbName = QString::fromStdString(mse.name()) + QStringLiteral(" - ") + QString::fromStdString(se.name());
+    MainStructureElement mse=  m_dtc->mainStructureElement(se.mainStructureElementId);
+    lbName = QString::fromStdString(mse.name) + QStringLiteral(" - ") + QString::fromStdString(se.name);
   }
   else
   {
@@ -93,22 +95,22 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
        ))
     return false;
 
-  m_ui->lblNameEntry->setText(QString::fromStdString(mountingPointData.name()));
-  m_ui->lblTypeEntry->setText(toString(mountingPointData.mountingPointTypeId()));
+  m_ui->lblNameEntry->setText(QString::fromStdString(mountingPointData.name));
+  m_ui->lblTypeEntry->setText(toString(mountingPointData.mountingPointTypeId));
 
-  if (mountingPointData.mountingPointTypeId() != MountingPointType::OutdoorCamera &&
-      mountingPointData.mountingPointTypeId() != MountingPointType::MeteoDataUnit &&
-      mountingPointData.mountingPointTypeId() != MountingPointType::VirtualIPS)
+  if (mountingPointData.mountingPointTypeId != MountingPointType::OutdoorCamera &&
+      mountingPointData.mountingPointTypeId != MountingPointType::MeteoDataUnit &&
+      mountingPointData.mountingPointTypeId != MountingPointType::VirtualIPS)
   {
     
     QMap<StructureElementType, QString> names;
-    for (int parentId = mountingPointData.path().size() - 1; parentId >= 0; --parentId)
+    for (int parentId = mountingPointData.path.size() - 1; parentId >= 0; --parentId)
     {
       StructureElement parent;
-      m_dtc->getStructureElementById(mountingPointData.path().at(parentId), parent);
-      names[parent.structureElementTypeId()] = QString::fromStdString(parent.displayName().size() > 0 ? parent.displayName() : parent.name());
+      m_dtc->getStructureElementById(mountingPointData.path.at(parentId), parent);
+      names[parent.structureElementTypeId] = QString::fromStdString(parent.displayName.size() > 0 ? parent.displayName : parent.name);
 
-      if (StructureElementType::Building == parent.structureElementTypeId().underlying())
+      if (StructureElementType::Building == parent.structureElementTypeId)
         break;
     }
 
@@ -145,13 +147,13 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
     m_ui->lblRoomEntry->hide();
     m_ui->lblRoom->hide();
 
-    MainStructureElement mainStructure = m_dtc->mainStructureElement(mountingPointData.mainStructureElementId());
-    m_ui->lblPositionEntry->setText(LtsCoordTrans::mgrsFromGeographic(mainStructure.geoPosition().lon(),
-                                                                      mainStructure.geoPosition().lat()));
+    MainStructureElement mainStructure = m_dtc->mainStructureElement(mountingPointData.mainStructureElementId);
+    m_ui->lblPositionEntry->setText(LtsCoordTrans::mgrsFromGeographic(mainStructure.geoPosition.lon,
+                                                                      mainStructure.geoPosition.lat));
   }
 
-  if (mountingPointData.mountingPointTypeId() == MountingPointType::OutdoorCamera ||
-      mountingPointData.mountingPointTypeId() == MountingPointType::IndoorCamera)
+  if (mountingPointData.mountingPointTypeId == MountingPointType::OutdoorCamera ||
+      mountingPointData.mountingPointTypeId == MountingPointType::IndoorCamera)
   {
     connect(m_ui->pbShowStream, &QToolButton::clicked, this, &MountingPointInfoDialog::onShowStream);
     m_ui->pbShowStream->setVisible(m_avmIfc->hasAvsSession() && m_avmIfc->avaSession()->isEstablished());
@@ -169,14 +171,14 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
   QMap<qint32, MountingPointAsset> mpAssets = m_dtc->mountingPointAssets();
   for (auto it = mpAssets.begin(); it != mpAssets.end(); ++it)
   {
-    if (it.value().structureElementId() == m_mountingPointId)
+    if (it.value().structureElementId == m_mountingPointId)
     {
-      showAsset(m_dtc->instrumentationAsset(it.value().assetId()));
+      showAsset(m_dtc->instrumentationAsset(it.value().assetId));
       break;
     }
   }
 
-  switch (mountingPointData.mountingPointTypeId().underlying())
+  switch (mountingPointData.mountingPointTypeId)
   {
   case InfrastructureManagement::MountingPointType::BuildingSensorModule:
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Building_Sensor_Module"));
@@ -216,7 +218,7 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
     break;
   case InfrastructureManagement::MountingPointType::Unknown:
   default:
-    WARNING_LOG(m_logger) << "Unknown MountingPointType found for assetId " << m_assetId << ": " << toString(mountingPointData.mountingPointTypeId());
+    WARNING_LOG(m_logger) << "Unknown MountingPointType found for assetId " << m_assetId << ": " << toString(mountingPointData.mountingPointTypeId);
     break;
   } 
 
@@ -227,7 +229,7 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
 
 void MountingPointInfoDialog::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType)
 {
-  if (data.id() != m_assetId)
+  if (data.id != m_assetId)
     return;
 
   if (modType == DataModification::eRemoved)
@@ -238,18 +240,18 @@ void MountingPointInfoDialog::onInstrumentationAssetChanged(const Infrastructure
 
 void MountingPointInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, DataModification modType)
 {
-  if (data.structureElementId() != m_mountingPointId)
+  if (data.structureElementId != m_mountingPointId)
     return;
 
   if (modType == DataModification::eRemoved)
     removeAsset();
   else
-    showAsset(m_dtc->instrumentationAsset(data.assetId()));
+    showAsset(m_dtc->instrumentationAsset(data.assetId));
 }
 
 void MountingPointInfoDialog::onMainScheduleChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType)
 {
-  if (data.id() != m_scheduleId ||
+  if (data.id != m_scheduleId ||
       modType != DataModification::eModified)
     return;
 
@@ -283,14 +285,14 @@ void MountingPointInfoDialog::showAsset(const InfrastructureManagement::Instrume
   removeAsset();
   DEBUG_LOG(m_logger) << "Showing new asset";
 
-  m_assetId = asset.id();
+  m_assetId = asset.id;
 
-  addAssetProperty(tr("Name"), QString::fromStdString(asset.name()));
-  addAssetProperty(tr("State"), toString(asset.assetStateId()));
-  addAssetProperty(tr("Hostname"), QString::fromStdString(asset.hostname()));
-  addAssetProperty(tr("Barcode"), QString::fromStdString(asset.barcode()));
+  addAssetProperty(tr("Name"), QString::fromStdString(asset.name));
+  addAssetProperty(tr("State"), toString(asset.assetStateId));
+  addAssetProperty(tr("Hostname"), QString::fromStdString(asset.hostname));
+  addAssetProperty(tr("Barcode"), QString::fromStdString(asset.barcode));
 
-  const QJsonObject dynamicProps(QJsonDocument::fromJson(QByteArray::fromStdString(asset.properties())).object());
+  const QJsonObject dynamicProps(QJsonDocument::fromJson(QByteArray::fromStdString(asset.properties)).object());
 
   for (auto it = dynamicProps.begin(); it != dynamicProps.end(); ++it)
   {
@@ -342,9 +344,9 @@ void MountingPointInfoDialog::addAssetProperty(const QString &propName, const QS
 
 void MountingPointInfoDialog::setIsIncluded(const MainSchedule &schedule)
 {
-  for (const MountingPointPlan &currentPlan : schedule.elements())
+  for (const MountingPointPlan &currentPlan : schedule.elements)
   {
-    if (currentPlan.structureElementId() == m_mountingPointId)
+    if (currentPlan.structureElementId == m_mountingPointId)
     {
       m_ui->lblIncludedEntry->setText(tr("Yes"));
       return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
index bd30875a5..4f35dc4b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_mounting_point_list_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_ism_mounting_point_list_dialog.h"
 #include "ism_mounting_point_list_dialog_model.h"
 #include "ism_mounting_point_list_dialog_checkbox_proxy_model.h"
@@ -69,6 +70,7 @@ MountingPointListDialog::MountingPointListDialog(const QString &menuGroup, QWidg
   , m_ddsSelector(nullptr)
   , m_scheduleId(-1)
   , m_ui(new Ui::MountingPointListDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
@@ -357,7 +359,7 @@ void MountingPointListDialog::getMountingPointPlanData(const QModelIndex &index,
 
     if (mppMap.contains(data.id))
     {
-      if (data.aimState != mppMap[data.id].mountingPointState())
+      if (data.aimState != mppMap[data.id].mountingPointState)
         modify.push_back(MountingPointPlan(data.id, data.aimState));
     }
     else if (data.aimState != MountingPointState::Idle)
@@ -465,8 +467,8 @@ bool MountingPointListDialog::apply()
   MainSchedule mainSchedule = m_dataIfc->mainSchedule(m_dataIfc->scheduleId());
 
   QHash<int,MountingPointPlan> mppMap;
-  for(const auto &elem : mainSchedule.elements())
-    mppMap[elem.structureElementId()] = elem;
+  for(const auto &elem : mainSchedule.elements)
+    mppMap[elem.structureElementId] = elem;
 
   getMountingPointPlanData(root, modify, mppMap);
 
@@ -485,19 +487,19 @@ void MountingPointListDialog::onPrint()
   MainSchedule ms = m_dtc->mainSchedule(m_dataIfc->scheduleId());
   QString header;
   header += QStringLiteral("<p>");
-  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name()));
+  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name));
   header += QStringLiteral("<br/>");
-  header += tr("Status: %1").arg(toString(ms.statusId()));
+  header += tr("Status: %1").arg(toString(ms.statusId));
   header += QStringLiteral("<br/>");
-  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated()));
+  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated));
   header += QStringLiteral("<br/>");
-  if (ms.timeStart().is_set())
-    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart().get()));
+  if (ms.timeStart.has_value())
+    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart.get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (ms.timeEnd().is_set())
-    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd().get()));
+  if (ms.timeEnd.has_value())
+    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd.get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
   header += QStringLiteral("<br/>");
@@ -688,7 +690,7 @@ void MountingPointListDialog::onUnmountButtonClicked()
         });
 
         if (!ret)
-          WARNING_LOG(m_logger)<<" couldn't unmount asset on MountingPoinAsset id: "<<req.id();
+          WARNING_LOG(m_logger)<<" couldn't unmount asset on MountingPoinAsset id: "<<req.id;
         else
           m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load,false);
       }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
index c37ef5bdf..7c0db182f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
@@ -29,13 +29,13 @@ void CheckboxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
 
     switch (value.toInt())
     {
-      case MountingPointState::Equipped:
+      case static_cast<int>(MountingPointState::Equipped):
         x = QPixmap(QStringLiteral(":/style/checkbox-true.svg"));
         break;
-      case MountingPointState::Idle:
+      case static_cast<int>(MountingPointState::Idle):
         x = QPixmap(QStringLiteral(":/style/checkbox-empty.svg"));
         break;
-      case MountingPointState::Empty:
+      case static_cast<int>(MountingPointState::Empty):
         x = QPixmap(QStringLiteral(":/style/checkbox-false.svg"));
         break;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.cpp
index 319138194..2583d6615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.cpp
@@ -1,6 +1,6 @@
 #include "ism_mounting_point_list_dialog_list_sort_model.h"
 
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
index c376df39e..32c15f48b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
@@ -6,7 +6,8 @@
 #include "ism_mounting_point_list_dialog_list_sort_model.h"
 
 #include <InfrastructureManagement/ism_translation.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QTimer>
 
@@ -23,6 +24,7 @@ namespace InfrastructureManagement
 
 MountingPointListDialogModel::MountingPointListDialogModel(QObject *parent)
   : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name"), tr("Type"), tr("Asset"), tr("Aim State") })
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_visRoot(new NGLTreeItem(tr("Mounting Points")))
   , m_dtc(nullptr)
   , m_scheduleId(-1)
@@ -85,17 +87,17 @@ QVariant MountingPointListDialogModel::data(const QModelIndex &index, int role)
       && indexColumn == TYPE)
   {
     const SimpleMountingPointData itemData = item->data().value<SimpleMountingPointData>();
-    if (itemData.mpType.underlying() == MountingPointType::Unknown)
+    if (itemData.mpType == MountingPointType::Unknown)
     {
       ERROR_LOG(m_logger) << "unknown!!!";
-      return QVariant(); 
+      return QVariant();
     }
 
-    ERROR_LOG(m_logger) << "mpType = " << itemData.mpType.underlying();
+    ERROR_LOG(m_logger) << "mpType = " << static_cast<int>(itemData.mpType);
     if(itemData.mpType == MountingPointType::OutdoorIPS)
-      return MountingPointType::IndoorIPS;
+      return static_cast<int>(MountingPointType::IndoorIPS);
 
-    return itemData.mpType.underlying();
+    return static_cast<int>(itemData.mpType);
   }
 
   if (role == Qt::CheckStateRole && index.column() == NAME)
@@ -105,7 +107,7 @@ QVariant MountingPointListDialogModel::data(const QModelIndex &index, int role)
     return item->data().value<SimpleMountingPointData>().id;
 
   if (role == (Qt::UserRole + 1) && item->data().canConvert<SimpleMountingPointData>())
-    return item->data().value<SimpleMountingPointData>().aimState.underlying();
+    return static_cast<int>(item->data().value<SimpleMountingPointData>().aimState);
 
   return {};
 }
@@ -176,42 +178,42 @@ void MountingPointListDialogModel::initData()
   for (const MainStructureElement &mse : mainStructEles)
   {
     
-    if (mse.structureElementTypeId() != StructureElementType::Building)
+    if (mse.structureElementTypeId != StructureElementType::Building)
       continue;
 
-    
-    
+
+
     QModelIndex groupIndex;
-    const StructureElement bse= setBuildingGroup(mse.groupId());
-    
-    if (mse.groupId() != BuildingGroup::OutdoorCameras)
+    const StructureElement bse= setBuildingGroup(mse.groupId);
+
+    if (mse.groupId != static_cast<int>(BuildingGroup::OutdoorCameras))
     {
-      if (m_availableBuildingGroups.contains(bse.id()) == false)
+      if (m_availableBuildingGroups.contains(bse.id) == false)
       {
         SimpleBuildingGroupData buildingGroup;
-        buildingGroup.name = QString::fromStdString(bse.displayName());
+        buildingGroup.name = QString::fromStdString(bse.displayName);
         NGLTreeItem *groupItem = new NGLTreeItem(QVariant::fromValue(buildingGroup));
         QModelIndex groupParentIndex;
         groupParentIndex = indexFromItem(m_visRoot);
         insertRow(rowCount(groupParentIndex), groupParentIndex, groupItem);
         groupIndex = index(groupItem->row(), 0, groupParentIndex);
-        m_mountingPointIndexes.insert(bse.id(), groupIndex);
-        m_availableBuildingGroups.insert(bse.id());
+        m_mountingPointIndexes.insert(bse.id, groupIndex);
+        m_availableBuildingGroups.insert(bse.id);
       }
       else
       {
-        groupIndex = m_mountingPointIndexes.value(bse.id(), indexFromItem(m_visRoot));
+        groupIndex = m_mountingPointIndexes.value(bse.id, indexFromItem(m_visRoot));
       }
     }
 
 
-    for (const StructureElement &currentElement : mse.elements())
+    for (const StructureElement &currentElement : mse.elements)
     {
       NGLTreeItem *item;
 
-      if (currentElement.structureElementTypeId() == StructureElementType::MountingPoint)
+      if (currentElement.structureElementTypeId == StructureElementType::MountingPoint)
       {
-        const MountingPoint &mountingPoint = m_dataInterface->mountingPoint(currentElement.id());
+        const MountingPoint &mountingPoint = m_dataInterface->mountingPoint(currentElement.id);
 
         if (!mountingPoint.isValid())
           continue;
@@ -225,7 +227,7 @@ void MountingPointListDialogModel::initData()
           continue;
 
         SimpleMountingPointData mpData;
-        mpData.seType            = currentElement.structureElementTypeId();
+        mpData.seType            = currentElement.structureElementTypeId;
         mpData.id                = mountingPoint.id();
         mpData.name              = mountingPoint.name();
         mpData.aimState          = mountingPoint.aimState();
@@ -239,7 +241,7 @@ void MountingPointListDialogModel::initData()
         mpData.assetBarcode = QStringLiteral("-");
         if(assetId != -1)
         {
-          mpData.assetBarcode =  QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode());
+          mpData.assetBarcode =  QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode);
         }
 
         item = new NGLTreeItem(QVariant::fromValue(mpData));
@@ -247,17 +249,17 @@ void MountingPointListDialogModel::initData()
       else
       {
         SimpleStructureElementData ssed;
-        ssed.mseId = mse.id();
-        if (currentElement.structureElementTypeId() == StructureElementType::Floor)
-          ssed.floor = QString::fromStdString(currentElement.name()).split(QLatin1Literal("_")).value(1, QLatin1String("-10")).toInt();
+        ssed.mseId = mse.id;
+        if (currentElement.structureElementTypeId == StructureElementType::Floor)
+          ssed.floor = QString::fromStdString(currentElement.name).split(QStringLiteral("_")).value(1, QLatin1String("-10")).toInt();
         else
           ssed.floor = -20;
-        ssed.name = currentElement.displayName().empty() ? QString::fromStdString(currentElement.name()) : QString::fromStdString(currentElement.displayName());
+        ssed.name = currentElement.displayName.empty() ? QString::fromStdString(currentElement.name) : QString::fromStdString(currentElement.displayName);
         item = new NGLTreeItem(QVariant::fromValue(ssed));
         m_availableFloors << ssed.floor;
       }
 
-      const auto &path = currentElement.path();
+      const auto &path = currentElement.path;
 
       QModelIndex parentIndex;
       if (path.size() > 1)
@@ -265,9 +267,9 @@ void MountingPointListDialogModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_visRoot)); 
         if (!parentIndex.isValid())
         {
-          ERROR_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
-          for (const StructureElement &se : mse.elements())
-            ERROR_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+          ERROR_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id << " mseid: " << mse.id;
+          for (const StructureElement &se : mse.elements)
+            ERROR_LOG(m_logger) << "   se: " << se.id << ", " << se.displayName << ", " << se.name;
         }
       }
       else
@@ -284,7 +286,7 @@ void MountingPointListDialogModel::initData()
       }
       insertRow(rowCount(parentIndex), parentIndex, item);
 
-      m_mountingPointIndexes.insert(currentElement.id(), index(item->row(), 0, parentIndex));
+      m_mountingPointIndexes.insert(currentElement.id, index(item->row(), 0, parentIndex));
     }
   }
 
@@ -306,15 +308,15 @@ StructureElement MountingPointListDialogModel::setBuildingGroup(int groupId)
 {
   StructureElement se{};
   InfrastructureManagement::BuildingGroup buildingGroup = static_cast<InfrastructureManagement::BuildingGroup>(groupId);
-  if(buildingGroup == 0)
+  if (static_cast<int>(buildingGroup) == 0)
   {
     buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup;
   }
 
-  se.id() = maxIntValue -  static_cast<int>(buildingGroup);
-  se.name() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.displayName() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.structureElementTypeId() = InfrastructureManagement::StructureElementType::Section;
+  se.id = maxIntValue -  static_cast<int>(buildingGroup);
+  se.name = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.displayName = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.structureElementTypeId = InfrastructureManagement::StructureElementType::Section;
   return se;
 }
 
@@ -394,7 +396,7 @@ void MountingPointListDialogModel::setMntPointFilterTypes(QSet<MountingPointType
   {
     if (es == MountingPointType::OutdoorIPS)
       continue;
-    cfd.data = es.underlying();
+    cfd.data = static_cast<int>(es);
     cfd.text = toString(es);
     cfc.data.push_back(cfd);
 
@@ -428,7 +430,7 @@ void MountingPointListDialogModel::onMountingPointChanged(const MountingPoint &m
 
   if(assetId != -1)
   {
-    mpData.assetBarcode =  QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode());
+    mpData.assetBarcode =  QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode);
   }
   item->setData(QVariant::fromValue(mpData));
   m_dataChangedTimer->start();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
index 05928d613..79afb57f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
@@ -3,15 +3,16 @@
 
 #include "ism_dds_selector.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <QtWidgets/QApplication>
 
 using namespace InfrastructureManagement;
 
 DdsSelector::DdsSelector(const std::shared_ptr<Interface::Dtc> &dtc, const std::shared_ptr<Interface::Ftc> &ftc, const std::shared_ptr<ForeignDataInterface> &ismDataIfc, LtsUtils::RequestHelper *requestHelper)
-  : MountingPointSelector(dtc, ftc, ismDataIfc, requestHelper, getLogger(QStringLiteral("DdsSelector")))
+  : MountingPointSelector(dtc, ftc, ismDataIfc, requestHelper, NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -75,15 +76,15 @@ void DdsSelector::addMountingPoints(const QVector<int32_t> &mountingPointIds, co
 
     MountingPointState aimState = override ? mps : mountingPoint.getNextMountingPointState(mountingPoint.aimState());
 
-    auto it = std::find_if(mainSchedule.elements().cbegin(), mainSchedule.elements().cend(), [currentMountingPointId](const MountingPointPlan &mpp){ return (mpp.structureElementId() == currentMountingPointId); });
+    auto it = std::find_if(mainSchedule.elements.cbegin(), mainSchedule.elements.cend(), [currentMountingPointId](const MountingPointPlan &mpp){ return (mpp.structureElementId == currentMountingPointId); });
 
-    if (it != mainSchedule.elements().cend())
+    if (it != mainSchedule.elements.cend())
     {
-      if ((*it).mountingPointState() == aimState)
+      if ((*it).mountingPointState == aimState)
         continue;
 
       MountingPointPlan mpp = (*it);
-      mpp.mountingPointState() = aimState;
+      mpp.mountingPointState = aimState;
       modifyVec.push_back(mpp);
     }
     else if (aimState != MountingPointState::Idle)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
index d3490846c..e78d50b48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
@@ -6,6 +6,7 @@
 #include "ism_overview_conflicts_model.h"
 
 #include <InfrastructureManagement/ism_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsPrinting/printing.h>
 #include <QtWidgets/QMenu>
 #include <QtGui/QAction>
@@ -19,6 +20,7 @@ ConflictsDialog::ConflictsDialog(const QString &menuGroup, QWidget *parent)
   , m_ui(new Ui::ConflictsDialog)
   , m_sourceModel(nullptr)
   , m_menuGroup(menuGroup)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("Ressourcen-Conflicts"));
@@ -37,8 +39,8 @@ ConflictsDialog::~ConflictsDialog()
 
 void ConflictsDialog::retranslate()
 {
-  QString plan1 = QString::fromStdString(m_dtc->mainSchedule(m_scheduleId).name());
-  QString plan2 = QString::fromStdString(m_dtc->mainSchedule(m_anotherScheduleId).name());
+  QString plan1 = QString::fromStdString(m_dtc->mainSchedule(m_scheduleId).name);
+  QString plan2 = QString::fromStdString(m_dtc->mainSchedule(m_anotherScheduleId).name);
   translate(m_ui, tr("Conflicts: %1 - %2").arg(plan1, plan2));
 }
 
@@ -116,7 +118,7 @@ void ConflictsDialog::updateModel()
 void ConflictsDialog::dataChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType)
 {
   Q_UNUSED(modType);
-  if (data.id() == m_scheduleId)
+  if (data.id == m_scheduleId)
     m_sourceModel->initModel(m_scheduleId, m_anotherScheduleId, m_dtc);
 }
 
@@ -137,31 +139,31 @@ void ConflictsDialog::onPrint()
   header += QStringLiteral("<p>");
   header += QStringLiteral("<b>") + tr("Overview Conflicts") + QStringLiteral("</b>");
   header += QStringLiteral("<hr/>");
-  header += tr("Current Instrumentation Plan: %1").arg(QString::fromStdString(plan1.name()));
+  header += tr("Current Instrumentation Plan: %1").arg(QString::fromStdString(plan1.name));
 
   header += QStringLiteral(" - ");
-  if (plan1.timeStart().is_set())
-    header += tr("START: %1").arg(DTG::toStringMSec(plan1.timeStart().get()));
+  if (plan1.timeStart.has_value())
+    header += tr("START: %1").arg(DTG::toStringMSec(plan1.timeStart.get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (plan1.timeEnd().is_set())
-    header += tr("END: %1").arg(DTG::toStringMSec(plan1.timeEnd().get()));
+  if (plan1.timeEnd.has_value())
+    header += tr("END: %1").arg(DTG::toStringMSec(plan1.timeEnd.get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
 
   header += QStringLiteral("<br/>");
 
-  header += tr("Compared Instrumentation Plan: %1").arg(QString::fromStdString(plan2.name()));
+  header += tr("Compared Instrumentation Plan: %1").arg(QString::fromStdString(plan2.name));
 
   header += QStringLiteral(" - ");
-  if (plan2.timeStart().is_set())
-    header += tr("START: %1").arg(DTG::toStringMSec(plan2.timeStart().get()));
+  if (plan2.timeStart.has_value())
+    header += tr("START: %1").arg(DTG::toStringMSec(plan2.timeStart.get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (plan2.timeEnd().is_set())
-    header += tr("END: %1").arg(DTG::toStringMSec(plan2.timeEnd().get()));
+  if (plan2.timeEnd.has_value())
+    header += tr("END: %1").arg(DTG::toStringMSec(plan2.timeEnd.get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
index bbdce0eb5..03bd58d0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
@@ -3,6 +3,7 @@
 
 #include "ism_overview_conflicts_model.h"
 #include <InfrastructureManagement/ism_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QDebug>
 #include <QElapsedTimer>
@@ -21,6 +22,7 @@ namespace InfrastructureManagement
 
 ConflictsDialogModel::ConflictsDialogModel(QObject *parent)
   : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name"), tr("Type"), tr("Aim State"), tr("Conflict State") })
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_dtc(nullptr)
   , m_scheduleId(-1)
   , m_anotherScheduleId(-1)
@@ -99,8 +101,8 @@ QVariant ConflictsDialogModel::headerData(int section, Qt::Orientation orientati
 {
   if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
   {
-    QString plan1 = QString::fromStdString(m_dtc->mainSchedule(m_scheduleId).name());
-    QString plan2 = QString::fromStdString(m_dtc->mainSchedule(m_anotherScheduleId).name());
+    QString plan1 = QString::fromStdString(m_dtc->mainSchedule(m_scheduleId).name);
+    QString plan2 = QString::fromStdString(m_dtc->mainSchedule(m_anotherScheduleId).name);
 
     Columns col = static_cast<Columns>(section);
     switch (col)
@@ -160,10 +162,10 @@ StructureElement ConflictsDialogModel::setBuildingGroup(int groupId)
   StructureElement se;
   BuildingGroup buildingGroup = static_cast<BuildingGroup>(groupId);
 
-  se.id() = maxIntValue -  static_cast<int>(buildingGroup);
-  se.name() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.displayName() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.structureElementTypeId() = StructureElementType::Section;
+  se.id = maxIntValue -  static_cast<int>(buildingGroup);
+  se.name = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.displayName = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.structureElementTypeId = StructureElementType::Section;
   return se;
 }
 
@@ -193,27 +195,27 @@ void ConflictsDialogModel::initData()
 #endif 
   
   InfrastructureManagement::MainSchedule currentSchedule = m_dtc->mainSchedule(m_scheduleId);
-  for (const InfrastructureManagement::MountingPointPlan &currentPlan : currentSchedule.elements())
+  for (const InfrastructureManagement::MountingPointPlan &currentPlan : currentSchedule.elements)
   {
     StructureElement se;
-    if (!m_dtc->getStructureElementById(currentPlan.structureElementId(), se))
+    if (!m_dtc->getStructureElementById(currentPlan.structureElementId, se))
       continue;
 
-    if (m_visibleTypes.contains(se.mountingPointTypeId()))
-      currentMountingPoints.insert(currentPlan.structureElementId(), currentPlan);
+    if (m_visibleTypes.contains(se.mountingPointTypeId))
+      currentMountingPoints.insert(currentPlan.structureElementId, currentPlan);
   }
 
   
   InfrastructureManagement::MainSchedule compareSchedule = m_dtc->mainSchedule(m_anotherScheduleId);
-  for (const InfrastructureManagement::MountingPointPlan &comparePlan : compareSchedule.elements())
+  for (const InfrastructureManagement::MountingPointPlan &comparePlan : compareSchedule.elements)
   {
-    if (!currentMountingPoints.contains(comparePlan.structureElementId()))
+    if (!currentMountingPoints.contains(comparePlan.structureElementId))
       continue;
 
     StructureElement structEl;
-    if (!m_dtc->getStructureElementById(comparePlan.structureElementId(), structEl))
+    if (!m_dtc->getStructureElementById(comparePlan.structureElementId, structEl))
       continue;
-    if (!m_visibleTypes.contains(structEl.mountingPointTypeId()))
+    if (!m_visibleTypes.contains(structEl.mountingPointTypeId))
       continue;
 
     
@@ -227,25 +229,25 @@ void ConflictsDialogModel::initData()
     
     
     
-    const MountingPointPlan &mp1 = currentMountingPoints[comparePlan.structureElementId()];
-    if ((mp1.mountingPointState() == MountingPointState::Equipped && comparePlan.mountingPointState() == MountingPointState::Empty) ||
-        (mp1.mountingPointState() == MountingPointState::Empty    && comparePlan.mountingPointState() == MountingPointState::Equipped))
+    const MountingPointPlan &mp1 = currentMountingPoints[comparePlan.structureElementId];
+    if ((mp1.mountingPointState == MountingPointState::Equipped && comparePlan.mountingPointState == MountingPointState::Empty) ||
+        (mp1.mountingPointState == MountingPointState::Empty    && comparePlan.mountingPointState == MountingPointState::Equipped))
     {
-      compareMountingPoints.insert(comparePlan.structureElementId(), comparePlan);
+      compareMountingPoints.insert(comparePlan.structureElementId, comparePlan);
       StructureElement se;
       
-      if (!m_dtc->getStructureElementById(comparePlan.structureElementId(), se))
+      if (!m_dtc->getStructureElementById(comparePlan.structureElementId, se))
         continue;
 
-      const std::vector<int> &path = se.path();
+      const std::vector<int> &path = se.path;
       for(const auto &seId : path)
         conflictedStructElIds.insert(seId);
 
-      if(conflictedMainStructElements.contains(se.mainStructureElementId()))
+      if(conflictedMainStructElements.contains(se.mainStructureElementId))
         continue;
 
-      const MainStructureElement &mse = m_dtc->mainStructureElement(se.mainStructureElementId());
-      conflictedMainStructElements.insert(mse.id(), mse);
+      const MainStructureElement &mse = m_dtc->mainStructureElement(se.mainStructureElementId);
+      conflictedMainStructElements.insert(mse.id, mse);
     }
   }
 
@@ -255,64 +257,64 @@ void ConflictsDialogModel::initData()
   for (const MainStructureElement &mse : conflictedMainStructElements)
   {
     
-    if (mse.structureElementTypeId() != StructureElementType::Building)
+    if (mse.structureElementTypeId != StructureElementType::Building)
       continue;
 
     
     
     QModelIndex groupIndex;
-    const StructureElement bse = setBuildingGroup(mse.groupId());
-    if(!m_availableBuildingGroups.contains(bse.id()))
+    const StructureElement bse = setBuildingGroup(mse.groupId);
+    if(!m_availableBuildingGroups.contains(bse.id))
     {
       ConflictStructureElementData buildingGroup;
-      buildingGroup.name = QString::fromStdString(bse.displayName());
+      buildingGroup.name = QString::fromStdString(bse.displayName);
       NGLTreeItem *groupItem = new NGLTreeItem(QVariant::fromValue(buildingGroup));
       QModelIndex groupParentIndex;
       groupParentIndex = indexFromItem(m_rootItem);
 
       insertRow(rowCount(groupParentIndex), groupParentIndex, groupItem);
       groupIndex = index(groupItem->row(), 0, groupParentIndex);
-      m_mountingPointIndexes.insert(bse.id(), groupIndex);
+      m_mountingPointIndexes.insert(bse.id, groupIndex);
 
-      m_availableBuildingGroups.insert(bse.id());
+      m_availableBuildingGroups.insert(bse.id);
     }
     else
     {
-      groupIndex = m_mountingPointIndexes.value(bse.id(), indexFromItem(m_rootItem));
+      groupIndex = m_mountingPointIndexes.value(bse.id, indexFromItem(m_rootItem));
     }
 
-    for (const StructureElement &currentElement : mse.elements())
+    for (const StructureElement &currentElement : mse.elements)
     {
       NGLTreeItem *item = nullptr;
-      if (!conflictedStructElIds.contains(currentElement.id()))
+      if (!conflictedStructElIds.contains(currentElement.id))
         continue;
 
-      if (currentElement.structureElementTypeId() == StructureElementType::MountingPoint)
+      if (currentElement.structureElementTypeId == StructureElementType::MountingPoint)
       {
-        if (!currentMountingPoints.contains(currentElement.id()))
+        if (!currentMountingPoints.contains(currentElement.id))
           continue;
 
-        const MountingPointPlan &mountingPoint = currentMountingPoints[currentElement.id()];
+        const MountingPointPlan &mountingPoint = currentMountingPoints[currentElement.id];
 
         
-        if (mountingPoint.mountingPointState() == MountingPointState::Idle)
+        if (mountingPoint.mountingPointState == MountingPointState::Idle)
           continue;
 
-        auto compareMountingPointState = compareMountingPoints.value(currentElement.id()).mountingPointState();
+        auto compareMountingPointState = compareMountingPoints.value(currentElement.id).mountingPointState;
 
-        if (mountingPoint.mountingPointState() == compareMountingPointState)
+        if (mountingPoint.mountingPointState == compareMountingPointState)
         {
-          DEBUG_LOG(m_logger) << "No conflict for mounting point id = " << currentElement.id() << " - " << currentElement.name();
+          DEBUG_LOG(m_logger) << "No conflict for mounting point id = " << currentElement.id << " - " << currentElement.name;
           continue;
         }
 
         ConflictMountingPointData mpData;
-        mpData.seType         = currentElement.structureElementTypeId();
-        mpData.id             = currentElement.id();
-        mpData.name           = currentElement.displayName().empty() ? QString::fromStdString(currentElement.name()) : QString::fromStdString(currentElement.displayName());
-        mpData.aimState       = mountingPoint.mountingPointState();
+        mpData.seType         = currentElement.structureElementTypeId;
+        mpData.id             = currentElement.id;
+        mpData.name           = currentElement.displayName.empty() ? QString::fromStdString(currentElement.name) : QString::fromStdString(currentElement.displayName);
+        mpData.aimState       = mountingPoint.mountingPointState;
         mpData.conflictState  = compareMountingPointState;
-        mpData.mpType         = currentElement.mountingPointTypeId();
+        mpData.mpType         = currentElement.mountingPointTypeId;
 
         DEBUG_LOG(m_logger) << "## MP Id   = " << mpData.id;
         DEBUG_LOG(m_logger) << "## MP Name   = " << mpData.name;
@@ -325,12 +327,12 @@ void ConflictsDialogModel::initData()
       else
       {
         ConflictStructureElementData ssed;
-        ssed.name = currentElement.displayName().empty() ? QString::fromStdString(currentElement.name()) : QString::fromStdString(currentElement.displayName());
+        ssed.name = currentElement.displayName.empty() ? QString::fromStdString(currentElement.name) : QString::fromStdString(currentElement.displayName);
 
         item = new NGLTreeItem(QVariant::fromValue(ssed));
       }
 
-      const auto &path = currentElement.path();
+      const auto &path = currentElement.path;
 
       QModelIndex parentIndex;
       if (path.size() > 1)
@@ -338,21 +340,21 @@ void ConflictsDialogModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_rootItem)); 
         if (!parentIndex.isValid())
         {
-          DEBUG_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
-          for (const StructureElement &se : mse.elements())
-            DEBUG_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+          DEBUG_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id << " mseid: " << mse.id;
+          for (const StructureElement &se : mse.elements)
+            DEBUG_LOG(m_logger) << "   se: " << se.id << ", " << se.displayName << ", " << se.name;
         }
       }
       else
       {
         
         parentIndex = groupIndex.isValid() ? groupIndex : indexFromItem(m_rootItem);
-        DEBUG_LOG(m_logger) << "Insert row under root: " << currentElement.displayName();
+        DEBUG_LOG(m_logger) << "Insert row under root: " << currentElement.displayName;
       }
 
       insertRow(rowCount(parentIndex), parentIndex, item);
 
-      m_mountingPointIndexes.insert(currentElement.id(), index(item->row(), 0, parentIndex));
+      m_mountingPointIndexes.insert(currentElement.id, index(item->row(), 0, parentIndex));
     }
 
   } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
index 2530d718e..9683cf620 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_overview_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ism_overview_conflicts_dialog.h"
 #include "ui_ism_overview_dialog.h"
 #include "ism_overview_dialog_model.h"
@@ -25,6 +26,7 @@ OverviewDialog::OverviewDialog(const QString &menuGroup, LtsSession::LtsSession
   , m_session(session)
   , m_ui(new Ui::OverviewDialog)
   , m_menuGroup(menuGroup)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
@@ -104,7 +106,7 @@ void OverviewDialog::setCbBasePlan()
   m_ui->cbBasePlan->addItem(tr("Actual Mountings"), 0);
   m_ui->cbBasePlan->insertSeparator(1);
   for (auto ms : m_dtc->mainSchedules())
-    m_ui->cbBasePlan->addItem(QString::fromStdString(ms.name()), ms.id());
+    m_ui->cbBasePlan->addItem(QString::fromStdString(ms.name), ms.id);
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
@@ -116,8 +118,8 @@ void OverviewDialog::setCbComparePlan()
   m_ui->cbComparePlan->addItem(tr("All active(*) plans"),0);
   m_ui->cbComparePlan->insertSeparator(1);
   for (auto ms : m_dtc->mainSchedules())
-    m_ui->cbComparePlan->addItem((ms.statusId() == ScheduleStatus::Active ? QLatin1Literal("* ") : QLatin1Literal("  ")) +
-                                 QString::fromStdString(ms.name()), ms.id());
+    m_ui->cbComparePlan->addItem((ms.statusId == ScheduleStatus::Active ? QStringLiteral("* ") : QStringLiteral("  ")) +
+                                 QString::fromStdString(ms.name), ms.id);
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
@@ -127,19 +129,19 @@ void OverviewDialog::onPrint()
 
   QString header;
   header += QStringLiteral("<p>");
-  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name()));
+  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name));
   header += QStringLiteral("<br/>");
-  header += tr("Status: %1").arg(toString(ms.statusId()));
+  header += tr("Status: %1").arg(toString(ms.statusId));
   header += QStringLiteral("<br/>");
-  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated()));
+  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated));
   header += QStringLiteral("<br/>");
-  if (ms.timeStart().is_set())
-    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart().get()));
+  if (ms.timeStart.has_value())
+    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart.get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (ms.timeEnd().is_set())
-    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd().get()));
+  if (ms.timeEnd.has_value())
+    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd.get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
   header += QStringLiteral("<br/>");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.h
index fb1730ed4..e3711bf2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.h
@@ -5,7 +5,7 @@
 
 #include <LtsWidgets/lts_dialog.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <InfrastructureManagement/logger.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp
index 50a189198..4bc046e91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_overview_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism_translation.h>
@@ -30,6 +31,7 @@ OverviewDialogModel::OverviewDialogModel(QObject *parent)
   , m_loadedScheduleId(-1)
   , m_comparedScheduleId(0)
   , m_dtc(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
@@ -186,10 +188,10 @@ MountingPointType OverviewDialogModel::getMountingPointTypeId(int structureEleme
 
   StructureElement se;
   if (!m_dtc->getStructureElementById(structureElementId, se))
-    return MountingPointType::get_default();
+    return MountingPointType::Unknown;
 
   
-  const MountingPointType mpType = (se.mountingPointTypeId() == MountingPointType::OutdoorIPS) ? MountingPointType::IndoorIPS : se.mountingPointTypeId();
+  const MountingPointType mpType = (se.mountingPointTypeId == MountingPointType::OutdoorIPS) ? MountingPointType::IndoorIPS : se.mountingPointTypeId;
   m_availableMountingPointTypes.insert(structureElementId, mpType);
   return mpType;
 }
@@ -198,7 +200,7 @@ bool OverviewDialogModel::hasMountedAsset(int seId)
 {
   for (const InfrastructureManagement::MountingPointAsset &asset : std::as_const(m_mountingPointAssets))
   {
-    if (asset.structureElementId() == seId)
+    if (asset.structureElementId == seId)
       return true;
   }
   return false;
@@ -219,46 +221,46 @@ QHash<int, MountingPointPlan> OverviewDialogModel::mergePlans(const QHash<int, M
   const auto msConst = m_dtc->mainSchedules();
   for (const auto &schedule : msConst)
   {
-    if (cmpPlanId == 0 && schedule.statusId() != ScheduleStatus::Active)
+    if (cmpPlanId == 0 && schedule.statusId != ScheduleStatus::Active)
       continue;
-    if (cmpPlanId != 0 && cmpPlanId != schedule.id())
+    if (cmpPlanId != 0 && cmpPlanId != schedule.id)
       continue;
 
-    for (const MountingPointPlan &currentMpp : schedule.elements())
+    for (const MountingPointPlan &currentMpp : schedule.elements)
     {
-      if (m_conflictedStructureElementIds.contains(currentMpp.structureElementId()))
+      if (m_conflictedStructureElementIds.contains(currentMpp.structureElementId))
         continue;
 
-      const MountingPointType mpType = getMountingPointTypeId(currentMpp.structureElementId());
+      const MountingPointType mpType = getMountingPointTypeId(currentMpp.structureElementId);
 
       if (!m_refMap.contains(mpType))
         continue;
 
-      if (currPlan.contains(currentMpp.structureElementId()))
+      if (currPlan.contains(currentMpp.structureElementId))
       {
-        const MountingPointPlan &basePlanMpp = currPlan[currentMpp.structureElementId()];
+        const MountingPointPlan &basePlanMpp = currPlan[currentMpp.structureElementId];
 
         
         
-        if ((basePlanMpp.mountingPointState() == MountingPointState::Equipped && currentMpp.mountingPointState() == MountingPointState::Empty) ||
-            (basePlanMpp.mountingPointState() == MountingPointState::Empty    && currentMpp.mountingPointState() == MountingPointState::Equipped))
+        if ((basePlanMpp.mountingPointState == MountingPointState::Equipped && currentMpp.mountingPointState == MountingPointState::Empty) ||
+            (basePlanMpp.mountingPointState == MountingPointState::Empty    && currentMpp.mountingPointState == MountingPointState::Equipped))
         {
-          DEBUG_LOG(m_logger)<<" conflicted name: "<<currentMpp.structureElementId();
-          mergedPlan[currentMpp.structureElementId()].mountingPointState(MountingPointState::Idle);
-          m_conflictedStructureElementIds.insert(basePlanMpp.structureElementId());
+          DEBUG_LOG(m_logger)<<" conflicted name: "<<currentMpp.structureElementId;
+          mergedPlan[currentMpp.structureElementId].mountingPointState = MountingPointState::Idle;
+          m_conflictedStructureElementIds.insert(basePlanMpp.structureElementId);
         }
         else
         {
-          switch(basePlanMpp.mountingPointState().underlying())
+          switch(basePlanMpp.mountingPointState)
           {
           case MountingPointState::Empty:
-            mergedPlan[currentMpp.structureElementId()].mountingPointState(MountingPointState::Empty);
+            mergedPlan[currentMpp.structureElementId].mountingPointState = MountingPointState::Empty;
             break;
           case MountingPointState::Equipped:
-            mergedPlan[currentMpp.structureElementId()].mountingPointState(MountingPointState::Equipped);
+            mergedPlan[currentMpp.structureElementId].mountingPointState = MountingPointState::Equipped;
             break;
           case MountingPointState::Idle:
-            mergedPlan[currentMpp.structureElementId()].mountingPointState(currentMpp.mountingPointState());
+            mergedPlan[currentMpp.structureElementId].mountingPointState = currentMpp.mountingPointState;
             break;
           default:
             break;
@@ -267,7 +269,7 @@ QHash<int, MountingPointPlan> OverviewDialogModel::mergePlans(const QHash<int, M
       }
       else
       {
-        mergedPlan[currentMpp.structureElementId()] = currentMpp;
+        mergedPlan[currentMpp.structureElementId] = currentMpp;
       }
     }
   }
@@ -299,20 +301,20 @@ void OverviewDialogModel::setNewData()
   for (const InstrumentationAsset &asset : iaConst )
   {
     
-    const MountingPointType mpType = (asset.mountingPointTypeId() == MountingPointType::OutdoorIPS) ? MountingPointType::IndoorIPS : asset.mountingPointTypeId();
+    const MountingPointType mpType = (asset.mountingPointTypeId == MountingPointType::OutdoorIPS) ? MountingPointType::IndoorIPS : asset.mountingPointTypeId;
     if (!m_refMap.contains(mpType))
       continue;
 
     ++m_vecData[m_refMap[mpType]].assetCount;
 
     
-    if (asset.assetStateId() == InstrumentationAssetState::Defect)
+    if (asset.assetStateId == InstrumentationAssetState::Defect)
       ++m_vecData[m_refMap[mpType]].assetsDefect;
 
-    if (asset.assetStateId() == InstrumentationAssetState::Unmounted)
+    if (asset.assetStateId == InstrumentationAssetState::Unmounted)
       ++m_vecData[m_refMap[mpType]].assetsFree;
 
-    if (asset.assetStateId() == InstrumentationAssetState::Mounted)
+    if (asset.assetStateId == InstrumentationAssetState::Mounted)
     {
       ++m_vecData[m_refMap[mpType]].assetsMounted;
       if (m_basePlanId == 0)
@@ -333,16 +335,16 @@ void OverviewDialogModel::setNewData()
   {
     MainSchedule baseSchedule = m_dtc->mainSchedules().value(m_basePlanId);
 
-    for (const MountingPointPlan &mpp : baseSchedule.elements())
+    for (const MountingPointPlan &mpp : baseSchedule.elements)
     {
-      const MountingPointType mpType = getMountingPointTypeId(mpp.structureElementId());
+      const MountingPointType mpType = getMountingPointTypeId(mpp.structureElementId);
 
       if (!m_refMap.contains(mpType))
         continue;
 
-      baseMountingPointPlans.insert(mpp.structureElementId(), mpp);
+      baseMountingPointPlans.insert(mpp.structureElementId, mpp);
 
-      if (mpp.mountingPointState() == MountingPointState::Equipped)
+      if (mpp.mountingPointState == MountingPointState::Equipped)
         ++m_vecData[m_refMap[mpType]].basePlanDemand;
     }
   }
@@ -351,9 +353,9 @@ void OverviewDialogModel::setNewData()
     
     const auto msesConst = m_dtc->mainStructureElements();
     for(const auto &mse : msesConst)
-      for (const auto &se : mse.elements())
-        if (hasMountedAsset(se.id()))
-          baseMountingPointPlans.insert(se.id(), MountingPointPlan(se.id(), MountingPointState::Equipped));
+      for (const auto &se : mse.elements)
+        if (hasMountedAsset(se.id))
+          baseMountingPointPlans.insert(se.id, MountingPointPlan(se.id, MountingPointState::Equipped));
   }
 
 
@@ -376,33 +378,33 @@ void OverviewDialogModel::setNewData()
   
   for(const auto &bla: totalMPPs)
   {
-    MountingPointPlan compareMpp = comparedMountingPointPlans.value(bla.structureElementId(), MountingPointPlan(bla.structureElementId(), MountingPointState::Idle));
-    MountingPointPlan baseMpp = baseMountingPointPlans.value(bla.structureElementId(), MountingPointPlan(bla.structureElementId(), MountingPointState::Idle));
+    MountingPointPlan compareMpp = comparedMountingPointPlans.value(bla.structureElementId, MountingPointPlan(bla.structureElementId, MountingPointState::Idle));
+    MountingPointPlan baseMpp = baseMountingPointPlans.value(bla.structureElementId, MountingPointPlan(bla.structureElementId, MountingPointState::Idle));
 
-    const MountingPointType mpType = getMountingPointTypeId(bla.structureElementId());
+    const MountingPointType mpType = getMountingPointTypeId(bla.structureElementId);
     if (!m_refMap.contains(mpType))
       continue;
 
 
-    switch(baseMpp.mountingPointState().underlying())
+    switch(baseMpp.mountingPointState)
     {
     case MountingPointState::Empty:
-      if (compareMpp.mountingPointState() == MountingPointState::Equipped)
+      if (compareMpp.mountingPointState == MountingPointState::Equipped)
         ++m_vecData[m_refMap[mpType]].totalDemand;
       break;
     case MountingPointState::Equipped:
-      if (compareMpp.mountingPointState() != MountingPointState::Equipped)
+      if (compareMpp.mountingPointState != MountingPointState::Equipped)
         --m_vecData[m_refMap[mpType]].totalDemand;
       break;
     case MountingPointState::Idle:
-      if (compareMpp.mountingPointState() == MountingPointState::Equipped)
+      if (compareMpp.mountingPointState == MountingPointState::Equipped)
         ++m_vecData[m_refMap[mpType]].totalDemand;
       break;
     default:
       break;
     }
 
-    switch(compareMpp.mountingPointState().underlying())
+    switch(compareMpp.mountingPointState)
     {
     case MountingPointState::Equipped:
         ++m_vecData[m_refMap[mpType]].comparePlanDemand;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
index 471e97238..45da78ecc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
@@ -15,6 +15,7 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QHeaderView>
 #include <qscrollbar.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 using namespace InfrastructureManagement;
 
@@ -26,6 +27,7 @@ OverviewMountingPointListDialog::OverviewMountingPointListDialog(const QString &
   , m_actionMenu(new QMenu(this))
   , m_printMountingAction(new QAction(tr("To Mount"), this))
   , m_printUnmountingAction(new QAction(tr("To Unmount"), this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
@@ -226,7 +228,7 @@ void OverviewMountingPointListDialog::retranslate()
   if (m_dtc)
   {
     MainSchedule ms = m_dtc->mainSchedule(m_scheduleId);
-    const QString msName = QString::fromStdString(ms.name());
+    const QString msName = QString::fromStdString(ms.name);
     translate(m_ui, tr("Completeness Check '%1'").arg(msName));
   }
   else
@@ -242,7 +244,7 @@ void OverviewMountingPointListDialog::addMountingPointTypeFilter(MountingPointTy
 
   m_mountedPointSortProxyModel->addToTypeFilter(mpt, isInitChecked);
   m_unmountedPointSortProxyModel->addToTypeFilter(mpt, isInitChecked);
-  lwi->setData(Qt::UserRole, mpt.underlying());
+  lwi->setData(Qt::UserRole, static_cast<int>(mpt));
   const QString text = toString(mpt);
   lwi->setText(text);
   lwi->setSelected(isInitChecked);
@@ -266,17 +268,17 @@ void OverviewMountingPointListDialog::onPrint(QAction *action)
   MainSchedule ms = m_dtc->mainSchedule(m_dataIfc->scheduleId());
   QString header;
   header += QStringLiteral("<p>");
-  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name()));
+  header += tr("Instrumentation Plan: %1").arg(QString::fromStdString(ms.name));
   header += QStringLiteral("<br/>");
-  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated()));
+  header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated));
   header += QStringLiteral("<br/>");
-  if (ms.timeStart().is_set())
-    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart().get()));
+  if (ms.timeStart.has_value())
+    header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart.get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (ms.timeEnd().is_set())
-    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd().get()));
+  if (ms.timeEnd.has_value())
+    header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd.get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
   header += QStringLiteral("<br/>");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
index 37a0fe315..7756950de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
@@ -6,7 +6,8 @@
 
 #include <InfrastructureManagement/ism_translation.h>
 
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QTimer>
@@ -24,6 +25,7 @@ namespace InfrastructureManagement
 static const int maxIntValue = std::numeric_limits<int>::max();
 ViewMountingPointListModel::ViewMountingPointListModel(QObject *parent)
   : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name"), tr("Type"), tr("Aim State") })
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_visRoot(new NGLTreeItem(tr("Mounting Points")))
   , m_dtc(nullptr)
   , m_dataChangedTimer(new QTimer(this))
@@ -96,7 +98,7 @@ QVariant ViewMountingPointListModel::data(const QModelIndex &index, int role) co
   else if (role == Qt::UserRole && item->data().canConvert<OverviewSimpleMountingPointData>())
     return item->data().value<OverviewSimpleMountingPointData>().id;
   else if (role == (Qt::UserRole + 1) && item->data().canConvert<OverviewSimpleMountingPointData>())
-    return item->data().value<OverviewSimpleMountingPointData>().aimState.underlying();
+    return static_cast<int>(item->data().value<OverviewSimpleMountingPointData>().aimState);
 
   return QVariant();
 }
@@ -152,15 +154,15 @@ inline StructureElement setBuildingGroup(int groupId)
 {
   StructureElement se;
   InfrastructureManagement::BuildingGroup buildingGroup = static_cast<InfrastructureManagement::BuildingGroup>(groupId);
-  if(buildingGroup == 0)
+  if(static_cast<int>(buildingGroup) == 0)
   {
     buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup;
   }
 
-  se.id() = maxIntValue -  static_cast<int>(buildingGroup);
-  se.name() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.displayName() = InfrastructureManagement::toString(buildingGroup).toStdString();
-  se.structureElementTypeId() = InfrastructureManagement::StructureElementType::Section;
+  se.id = maxIntValue -  static_cast<int>(buildingGroup);
+  se.name = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.displayName = InfrastructureManagement::toString(buildingGroup).toStdString();
+  se.structureElementTypeId = InfrastructureManagement::StructureElementType::Section;
   return se;
 }
 
@@ -168,7 +170,7 @@ inline StructureElement setBuildingGroup(int groupId)
 inline int getFakeBuildingGroupId(int seId)
 {
   InfrastructureManagement::BuildingGroup buildingGroup = static_cast<InfrastructureManagement::BuildingGroup>(seId);
-  if(buildingGroup == 0)
+  if(static_cast<int>(buildingGroup) == 0)
   {
     buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup;
   }
@@ -206,8 +208,8 @@ void ViewMountingPointListModel::initData()
   {
     
     const InfrastructureManagement::MainSchedule &currentSchedule = m_dtc->mainSchedule(m_scheduleId);
-    for (const MountingPointPlan &mpp : std::as_const(currentSchedule.elements()))
-      mountingPointPlanCont.insert(mpp.structureElementId(), mpp);
+    for (const MountingPointPlan &mpp : std::as_const(currentSchedule.elements))
+      mountingPointPlanCont.insert(mpp.structureElementId, mpp);
   }
 
 
@@ -225,39 +227,39 @@ void ViewMountingPointListModel::initData()
   for (const MainStructureElement &mse : mainStructEles)
   {
     
-    if (mse.structureElementTypeId() != StructureElementType::Building)
+    if (mse.structureElementTypeId != StructureElementType::Building)
       continue;
 
 
     
     
     QModelIndex groupIndex;
-    const StructureElement bse= setBuildingGroup(mse.groupId());
-    if (m_availableBuildingGroups.contains(bse.id()) == false)
+    const StructureElement bse= setBuildingGroup(mse.groupId);
+    if (m_availableBuildingGroups.contains(bse.id) == false)
     {
       OverviewSimpleBuildingGroupData buildingGroup;
-      buildingGroup.name = QString::fromStdString(bse.displayName());
-      buildingGroup.id   = bse.id();
+      buildingGroup.name = QString::fromStdString(bse.displayName);
+      buildingGroup.id   = bse.id;
       NGLTreeItem *groupItem = new NGLTreeItem(QVariant::fromValue(buildingGroup));
       QModelIndex groupParentIndex;
       groupParentIndex = indexFromItem(m_visRoot);
       insertRow(rowCount(groupParentIndex), groupParentIndex, groupItem);
       groupIndex = index(groupItem->row(), 0, groupParentIndex);
-      m_mountingPointIndexes.insert(bse.id(), groupIndex);
-      m_availableBuildingGroups.insert(bse.id());
+      m_mountingPointIndexes.insert(bse.id, groupIndex);
+      m_availableBuildingGroups.insert(bse.id);
     }
     else
     {
-      groupIndex = m_mountingPointIndexes.value(bse.id(), indexFromItem(m_visRoot));
+      groupIndex = m_mountingPointIndexes.value(bse.id, indexFromItem(m_visRoot));
     }
 
-    for (const StructureElement &currentElement : mse.elements())
+    for (const StructureElement &currentElement : mse.elements)
     {
       NGLTreeItem *item = nullptr;
 
-      if (currentElement.structureElementTypeId() == StructureElementType::MountingPoint)
+      if (currentElement.structureElementTypeId == StructureElementType::MountingPoint)
       {
-        MountingPoint mountingPoint = m_dataInterface->mountingPoint(currentElement.id());
+        MountingPoint mountingPoint = m_dataInterface->mountingPoint(currentElement.id);
 
         if (!mountingPoint.isValid())
           continue;
@@ -269,7 +271,7 @@ void ViewMountingPointListModel::initData()
           continue;
 
         OverviewSimpleMountingPointData mpData;
-        mpData.seType            = currentElement.structureElementTypeId();
+        mpData.seType            = currentElement.structureElementTypeId;
         mpData.id                = mountingPoint.id();
         mpData.name              = mountingPoint.name();
         mpData.mpType            = mountingPoint.type();
@@ -284,7 +286,7 @@ void ViewMountingPointListModel::initData()
           if (mountingPointPlanCont.contains(mpId_StructEleId))
           {
             const MountingPointPlan &mpp = mountingPointPlanCont.value(mpId_StructEleId);
-            mpData.aimState = mpp.mountingPointState();
+            mpData.aimState = mpp.mountingPointState;
           } else {
             mpData.aimState = MountingPointState::Idle;
           }
@@ -295,15 +297,15 @@ void ViewMountingPointListModel::initData()
       else
       {
         OverviewSimpleStructureElementData ssed;
-        if (currentElement.structureElementTypeId() == StructureElementType::Floor)
-          ssed.floor = QString::fromStdString(currentElement.name()).split(QLatin1Literal("_")).value(1, QLatin1String("-10")).toInt();
+        if (currentElement.structureElementTypeId == StructureElementType::Floor)
+          ssed.floor = QString::fromStdString(currentElement.name).split(QStringLiteral("_")).value(1, QLatin1String("-10")).toInt();
         else
           ssed.floor = -20;
-        ssed.name = currentElement.displayName().empty() ? QString::fromStdString(currentElement.name()) : QString::fromStdString(currentElement.displayName());
+        ssed.name = currentElement.displayName.empty() ? QString::fromStdString(currentElement.name) : QString::fromStdString(currentElement.displayName);
         item = new NGLTreeItem(QVariant::fromValue(ssed));
       }
 
-      const auto &path = currentElement.path();
+      const auto &path = currentElement.path;
 
       QModelIndex parentIndex;
       if (path.size() > 1)
@@ -311,9 +313,9 @@ void ViewMountingPointListModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_visRoot)); 
         if (!parentIndex.isValid())
         {
-          ERROR_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
-          for (const StructureElement &se : mse.elements())
-            ERROR_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+          ERROR_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id << " mseid: " << mse.id;
+          for (const StructureElement &se : mse.elements)
+            ERROR_LOG(m_logger) << "   se: " << se.id << ", " << se.displayName << ", " << se.name;
         }
       }
       else
@@ -330,7 +332,7 @@ void ViewMountingPointListModel::initData()
 
       insertRow(rowCount(parentIndex), parentIndex, item);
 
-      m_mountingPointIndexes.insert(currentElement.id(), index(item->row(), 0, parentIndex));
+      m_mountingPointIndexes.insert(currentElement.id, index(item->row(), 0, parentIndex));
     }
   }
 
@@ -338,8 +340,8 @@ void ViewMountingPointListModel::initData()
 
 #ifdef BENCHMARK
   const InfrastructureManagement::MainSchedule &currentSchedule = m_dtc->mainSchedule(m_scheduleId);
-  qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << currentSchedule.id();
-  qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << currentSchedule.name().c_str();
+  qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << currentSchedule.id;
+  qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << currentSchedule.name.c_str();
 
 
   qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << m_scheduleId << " took " << elapsedTimer1.elapsed() << " [ms]";
@@ -353,7 +355,7 @@ bool ViewMountingPointListModel::mountingPointHasAssetMounted(int32_t mountingPo
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   for (const MountingPointAsset &mpa : mountingPointAssetMap)
   {
-    if (mpa.structureElementId() == mountingPointId)
+    if (mpa.structureElementId == mountingPointId)
       return true;
   }
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
index 033d763e2..cd0151a3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "new_plan_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_new_plan_dialog.h"
 #include <LtsSession/lts_session.h>
 #include <QtCore/QDateTime>
@@ -41,7 +42,7 @@ NewPlanDialog::~NewPlanDialog()
 void NewPlanDialog::init(const std::shared_ptr<ForeignGuiComboboxInterface> &ismCbx)
 {
   ismCbx->fillScheduleStatusComboBox(m_ui->cbStatus);
-  m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(ScheduleStatus::Inactive));
+  m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(static_cast<int>(ScheduleStatus::Inactive)));
 }
 
 bool NewPlanDialog::getData(QString &name, qint64 &begin, qint64 &end, int &status)
@@ -52,7 +53,7 @@ bool NewPlanDialog::getData(QString &name, qint64 &begin, qint64 &end, int &stat
   name = m_ui->lePlanName->text();
   begin = m_ui->dteBegin->msecsSinceEpoch();
   end = m_ui->dteEnd->msecsSinceEpoch();
-  status = static_cast<ScheduleStatus>(m_ui->cbStatus->currentData().toInt());
+  status = m_ui->cbStatus->currentData().toInt();
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
index 37affaed6..d4f8e074c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
@@ -4,7 +4,7 @@
 
 #include <InfrastructureManagement/logger.h>
 #include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 #include <QtWidgets/QDialog>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
index 0931df807..5c441dfc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
@@ -7,6 +7,7 @@
 #include "ism_plan_dialog_model.h"
 #include "CustomViews/ism_schedule.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session.h>
 #include <ConnectDialog/connect_dialog_nt.h>
@@ -111,7 +112,7 @@ void PlanChooser::slotPlanSelected()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const MainSchedule ms = m_model->getRowData(idx.row());
 
-  int id = ms.id();
+  int id = ms.id;
 
   if (id <= 0)
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
index 56010ea9a..86c84ff8b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
@@ -89,12 +89,12 @@ void ScheduleDifferencesListDialog::onPrint()
   header += QStringLiteral("<br/>");
   header += tr("Created: %1").arg(DTG::toStringMSec(ms.timeCreated()));
   header += QStringLiteral("<br/>");
-  if (ms.timeStart().is_set())
+  if (ms.timeStart().has_value())
     header += tr("START: %1").arg(DTG::toStringMSec(ms.timeStart().get()));
   else
     header += tr("START: %1").arg(tr("[N/A]"));
   header += QStringLiteral(" - ");
-  if (ms.timeEnd().is_set())
+  if (ms.timeEnd().has_value())
     header += tr("END: %1").arg(DTG::toStringMSec(ms.timeEnd().get()));
   else
     header += tr("END: %1").arg(tr("[N/A]"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
index bb0179d47..7cd49cb39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
@@ -272,7 +272,7 @@ void PlanTimeLineDialog::onItemsSelected(const QVector<int> &itemIds)
     if (m_scheduleId != seId && seId != -1)
     {
       MainSchedule mse = m_dtc->mainSchedule(seId);
-      if (mse.timeStart().is_set())
+      if (mse.timeStart().has_value())
         m_ui->timeline->setCurrentTime(mse.timeStart().get());
       m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, true);
       m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
index 174245e27..b38981523 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
@@ -14,7 +14,7 @@
 #include <InfrastructureManagement/logger.h>
 
 #include <LtsTimeline/item_delegate.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
 #include <QtCore/QDateTime>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
index 27a8be076..50cd9bc6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
@@ -80,19 +80,19 @@ bool PlanTimelineModel::setModel()
 
     if (scheduleId == m_scheduleId)
     {
-      if (!mse.timeStart().is_set() || !mse.timeEnd().is_set())
+      if (!mse.timeStart().has_value() || !mse.timeEnd().has_value())
       {
         LtsWidgets::LtsMessageDialog::showMessage(m_tlv, tr("Invalid Begin/End time for Instrumentation Plan with Id = %1").arg(m_scheduleId));
         return true;
       }
-      if (mse.timeStart().is_set())
+      if (mse.timeStart().has_value())
         m_startTime = mse.timeStart().get();
-      if (mse.timeEnd().is_set())
+      if (mse.timeEnd().has_value())
         m_endTime   = mse.timeEnd().get();
       m_duration = m_endTime - m_startTime;
     }
     QColor color = (mse.id() == m_scheduleId) ? QColor(2,47,102) : getColor(mse.id());
-    if (mse.timeStart().is_set() && mse.timeEnd().is_set())
+    if (mse.timeStart().has_value() && mse.timeEnd().has_value())
     {
       try
       {
@@ -193,7 +193,7 @@ void PlanTimelineModel::onScheduleIdChanged(int32_t scheduleId)
 QColor PlanTimelineModel::getColor(int planId)
 {
   MainSchedule ms = m_dtc->mainSchedule(planId);
-  switch (ms.statusId().underlying())
+  switch (ms.statusId())
   {
   case ScheduleStatus::Active:
     return QColor(Qt::darkGreen);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.h
index 7cff7f12b..5b0a0eb58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.h
@@ -7,7 +7,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <InfrastructureManagement/logger.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <Timeline/tln_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
index 7ed62a6cb..4082805cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
@@ -9,6 +9,7 @@
 #include <InfrastructureManagement/ism_operator_rights.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsSession/lts_session_data.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 #include <QtCore/QTextStream>
@@ -17,6 +18,7 @@ using namespace InfrastructureManagement;
 
 BuildingMountPointDialog::BuildingMountPointDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_ui(new Ui::BuildingMountPointDialog)
   , m_model(new BuildingMountPointModel(this))
   , m_proxyModel(new BuildingMountPointSortModel(this))
@@ -148,7 +150,7 @@ bool BuildingMountPointDialog::exportData(const std::vector<StructureElement> &s
   QHash<int, QString> names;
   names.reserve(structureElements.size());
   for (const StructureElement &se : structureElements)
-    names.insert(se.id(), QString::fromStdString(se.name()));
+    names.insert(se.id, QString::fromStdString(se.name));
 
   static const QStringList headerNames = { QStringLiteral("Data Matrix Code"),
                                            QStringLiteral("Anbringungspunkt Id"),
@@ -163,7 +165,7 @@ bool BuildingMountPointDialog::exportData(const std::vector<StructureElement> &s
   const QString header = headerNames.join(QLatin1Char(';'));
   out << header << "\n";
 
-  QString bldgName = m_model->getMainStructureElementName(structureElements.at(0).mainStructureElementId());
+  QString bldgName = m_model->getMainStructureElementName(structureElements.at(0).mainStructureElementId);
   if (bldgName.startsWith(QLatin1String("bldg_")))
     bldgName = bldgName.mid(QLatin1String("bldg_").size());
   bldgName = bldgName.left(11);
@@ -173,21 +175,21 @@ bool BuildingMountPointDialog::exportData(const std::vector<StructureElement> &s
   sl.reserve(8);
   for (const StructureElement &se : structureElements)
   {    
-    if (se.structureElementTypeId() != StructureElementType::MountingPoint)
+    if (se.structureElementTypeId != StructureElementType::MountingPoint)
       continue;
 
     sl.clear();
-    const QString mountingPointType = (se.mountingPointTypeId() == MountingPointType::Unknown) ? QString() : toString(se.mountingPointTypeId());
+    const QString mountingPointType = (se.mountingPointTypeId == MountingPointType::Unknown) ? QString() : toString(se.mountingPointTypeId);
+
+
+    sl << QString::fromStdString(se.barcode);
+
+    sl << QString::number(se.mountingPointId);
 
-    
-    sl << QString::fromStdString(se.barcode());
-    
-    sl << QString::number(se.mountingPointId());
-    
     sl << bldgName;
-    
+
     name.clear();
-    for (const int pathId : se.path())
+    for (const int pathId : se.path)
     {
       static const QString room = QStringLiteral("SW_room_");
       static const QString floor = QStringLiteral("floor_");
@@ -201,9 +203,9 @@ bool BuildingMountPointDialog::exportData(const std::vector<StructureElement> &s
     const QString strName = name.join(QLatin1Char('/'));
     sl << strName;
     
-    sl << QString::number(se.relPosition().offsetX());
-    sl << QString::number(se.relPosition().offsetY());
-    sl << QString::number(se.relPosition().offsetZ());
+    sl << QString::number(se.relPosition.offsetX);
+    sl << QString::number(se.relPosition.offsetY);
+    sl << QString::number(se.relPosition.offsetZ);
     
     sl << mountingPointType;
     
@@ -228,7 +230,7 @@ void BuildingMountPointDialog::onExportClicked()
     const QModelIndex &idx = m_proxyModel->mapToSource(indexList.first());
     const auto structureElements = m_model->getChildren(idx, false);
 
-    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(idx).name());
+    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(idx).name);
     const QString fileName = QFileDialog::getSaveFileName(this, tr("Export"),
                                                           bldgName + QStringLiteral("_structure") + QStringLiteral(".csv"),
                                                           tr("CSV-Files (*.csv)"));
@@ -263,7 +265,7 @@ void BuildingMountPointDialog::onExportClicked()
   {
     const QModelIndex &idx = m_proxyModel->mapToSource(idxItem);
     const auto structureElements = m_model->getChildren(idx, false);
-    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(idx).name());
+    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(idx).name);
     if (bldgName.isEmpty())
     {
       ERROR_LOG(m_logger) << " bldgName is empty";
@@ -300,7 +302,7 @@ void BuildingMountPointDialog::onExportAllClicked()
     if (structureElements.empty())
       continue;
 
-    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(sourceIdx).name());
+    const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(sourceIdx).name);
     const QString fileName = dirName + QLatin1Char('/') + bldgName + QStringLiteral(".csv");
     if (!exportData(structureElements, fileName))
       return;
@@ -353,7 +355,7 @@ void BuildingMountPointDialog::onImportClicked()
   QString line;
   while (in.readLineInto(&line))
   {
-    const QVector<QStringRef> values = line.splitRef(QLatin1Char(';'));
+    const QStringList values = line.split(QLatin1Char(';'));
 
     if (colMountingPointId >= values.size() ||
         colBarcode >= values.size())
@@ -361,7 +363,7 @@ void BuildingMountPointDialog::onImportClicked()
       WARNING_LOG(m_logger) << "skipping line - to few data: '" << line << "'";
       continue;
     }
-    QString newBarCode = values.at(colBarcode).toString();
+    QString newBarCode = values.at(colBarcode);
     if (newBarCode.size() > 1 && newBarCode.startsWith(QLatin1Char('"')) && newBarCode.endsWith(QLatin1Char('"')))
       newBarCode = newBarCode.mid(1, newBarCode.size() - 2);
 
@@ -405,18 +407,18 @@ bool BuildingMountPointDialog::apply()
   MainStructureElement mainStructureElement = m_model->getMainStructureElement(m_importedModelIndex);
   MainStructureElementModifyRequest request;
 
-  request.name(mainStructureElement.name());
-  request.description(mainStructureElement.description());
-  request.geoPosition(mainStructureElement.geoPosition());
-  request.angle(mainStructureElement.angle());
-  request.externalWlsId(mainStructureElement.externalWlsId());
-  request.elements(mainStructureElement.elements());
-  request.structureElementId(mainStructureElement.structureElementId());
-  request.structureElementTypeId(mainStructureElement.structureElementTypeId());
-  request.id(mainStructureElement.id());
-  request.properties(mainStructureElement.properties());
-  request.modelId(mainStructureElement.modelId());
-  request.groupId(mainStructureElement.groupId());
+  request.name = mainStructureElement.name;
+  request.description = mainStructureElement.description;
+  request.geoPosition = mainStructureElement.geoPosition;
+  request.angle = mainStructureElement.angle;
+  request.externalWlsId = mainStructureElement.externalWlsId;
+  request.elements = mainStructureElement.elements;
+  request.structureElementId = mainStructureElement.structureElementId;
+  request.structureElementTypeId = mainStructureElement.structureElementTypeId;
+  request.id = mainStructureElement.id;
+  request.properties = mainStructureElement.properties;
+  request.modelId = mainStructureElement.modelId;
+  request.groupId = mainStructureElement.groupId;
 
   m_requestHelper->startSingleRequest([this, request]() {
     return m_ftc->mainStructureElementModifyRequest(request, this);
@@ -507,7 +509,7 @@ void BuildingMountPointDialog::onShowMntPointInfo(const QModelIndex &index)
     return;
   }
 
-  m_ismGuiIfc->showMountingPointInfoWindows(QVector<int>() << structureElements.at(0).id());
+  m_ismGuiIfc->showMountingPointInfoWindows(QVector<int>() << structureElements.at(0).id);
   m_ui->tvBuildings->selectionModel()->clear();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
index 6ed16146c..3443c463f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_building_mount_point_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <QtCore/QDataStream>
 #include <QtCore/QVector>
@@ -28,6 +29,7 @@ BuildingMountPointModel::BuildingMountPointModel(QObject *parent)
                  tr("Barcode (new)"),
                  tr("Mounted Asset"),
                  tr("Properties")})
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -49,7 +51,7 @@ Qt::ItemFlags BuildingMountPointModel::flags(const QModelIndex &index) const
       {
         ret.setFlag(Qt::ItemIsSelectable, false);
       }
-      else if(sitem->data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
+      else if(sitem->data.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
       {
         ret.setFlag(Qt::ItemIsSelectable, true);
       }
@@ -78,10 +80,10 @@ QVariant BuildingMountPointModel::data(const QModelIndex &index, int role) const
   {
     if (role == Qt::BackgroundRole)
     {
-      if (item->data.id() < 0)
+      if (item->data.id < 0)
         return QColor(Qt::red);
 
-      if (item->newBarcode != QString::fromStdString(item->data.barcode()))
+      if (item->newBarcode != QString::fromStdString(item->data.barcode))
         return QColor(Qt::darkYellow);
       return NGLTreeModel::data(index, role);
     }
@@ -91,29 +93,29 @@ QVariant BuildingMountPointModel::data(const QModelIndex &index, int role) const
     case ColName:
       return item->displayName();
     case ColId:
-      return item->data.id();
+      return item->data.id;
     case ColInternalName:
-      return QString::fromStdString(item->data.name());
+      return QString::fromStdString(item->data.name);
     case ColRelPosX:
-      return QString::number(item->data.relPosition().offsetX());
+      return QString::number(item->data.relPosition.offsetX);
     case ColRelPosY:
-      return QString::number(item->data.relPosition().offsetY());
+      return QString::number(item->data.relPosition.offsetY);
     case ColRelPosZ:
-      return QString::number(item->data.relPosition().offsetZ());
+      return QString::number(item->data.relPosition.offsetZ);
     case ColMountingPointTypeId:
-      if (item->data.mountingPointTypeId() != MountingPointType::Unknown)
-        return toString(item->data.mountingPointTypeId());
+      if (item->data.mountingPointTypeId != MountingPointType::Unknown)
+        return toString(item->data.mountingPointTypeId);
       return QString();
     case ColMountingPointId:
-      return item->data.mountingPointId();
+      return item->data.mountingPointId;
     case ColMountedAsset:
     {
-      if(item->data.mountingPointTypeId() != MountingPointType::Unknown)
+      if(item->data.mountingPointTypeId != MountingPointType::Unknown)
       {
-        const int assetId = m_dtc->getMountedAssetId(item->data.id());
+        const int assetId = m_dtc->getMountedAssetId(item->data.id);
         if(assetId != -1)
         {
-          return QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode());
+          return QString::fromStdString(m_dtc->instrumentationAsset(assetId).barcode);
         }
         else
         {
@@ -123,13 +125,13 @@ QVariant BuildingMountPointModel::data(const QModelIndex &index, int role) const
       return QString();
     }
     case ColType:
-      return toString(item->data.structureElementTypeId());
+      return toString(item->data.structureElementTypeId);
     case ColBarcode:
-      return QString::fromStdString(item->data.barcode());
+      return QString::fromStdString(item->data.barcode);
     case ColBarcodeNew:
       return item->newBarcode;
     case ColProperties:
-      return QString::fromStdString(item->data.properties());
+      return QString::fromStdString(item->data.properties);
     }
   }
   return NGLTreeModel::data(index, role);
@@ -142,7 +144,7 @@ bool BuildingMountPointModel::initModel(const std::shared_ptr<Interface::Dtc> &d
           this, &BuildingMountPointModel::onMainStructureElementChanged);
   auto cb = [this](const MainStructureElement & mse)
   {
-    if (mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
+    if (mse.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
       addBuilding(mse);
   };
   resetModel();
@@ -158,8 +160,8 @@ void BuildingMountPointModel::onMountingPointAssetChanged(const InfrastructureMa
   Q_UNUSED(modType)
 
   InfrastructureManagement::StructureElement newSe;
-  m_dtc->getStructureElementById(mpa.structureElementId(), newSe);
-  StructureElementTreeItem *seItem = findItemByStructureElementId(newSe.id(), m_rootItem);
+  m_dtc->getStructureElementById(mpa.structureElementId, newSe);
+  StructureElementTreeItem *seItem = findItemByStructureElementId(newSe.id, m_rootItem);
   if(seItem == nullptr)
   {
     return;
@@ -180,7 +182,7 @@ StructureElementTreeItem* BuildingMountPointModel::findItemByStructureElementId(
   }
 
   StructureElementTreeItem *item = static_cast<StructureElementTreeItem*>(parent);
-  if(item && item->data.structureElementTypeId() == InfrastructureManagement::StructureElementType::MountingPoint)
+  if(item && item->data.structureElementTypeId == InfrastructureManagement::StructureElementType::MountingPoint)
   {
     return item;
   }
@@ -188,7 +190,7 @@ StructureElementTreeItem* BuildingMountPointModel::findItemByStructureElementId(
   for(int i=0; i<rows; ++i)
   {
     StructureElementTreeItem *seItem = findItemByStructureElementId(id, parent->child(i));
-    if(seItem && seItem->data.id() == id)
+    if(seItem && seItem->data.id == id)
     {
       
       return seItem;
@@ -201,22 +203,22 @@ StructureElement BuildingMountPointModel::setBuildingGroup(int groupId)
 {
   StructureElement se;
   InfrastructureManagement::BuildingGroup buildingGroup = static_cast<InfrastructureManagement::BuildingGroup>(groupId);
-  if(buildingGroup == 0)
+  if(static_cast<int>(buildingGroup) == 0)
   {
     buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup;
   }
 
-  se.id() = maxIntValue - static_cast<int>(buildingGroup);
-  se.name() = toString(buildingGroup).toStdString();
-  se.displayName() = toString(buildingGroup).toStdString();
-  se.structureElementTypeId() = InfrastructureManagement::StructureElementType::Section;
+  se.id = maxIntValue - static_cast<int>(buildingGroup);
+  se.name = toString(buildingGroup).toStdString();
+  se.displayName = toString(buildingGroup).toStdString();
+  se.structureElementTypeId = InfrastructureManagement::StructureElementType::Section;
   return se;
 }
 
 int BuildingMountPointModel::getSectionId(int groupId)
 {
   InfrastructureManagement::BuildingGroup buildingGroup = static_cast<InfrastructureManagement::BuildingGroup>(groupId);
-  if(buildingGroup == 0)
+  if(static_cast<int>(buildingGroup) == 0)
   {
     buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup;
   }
@@ -231,7 +233,7 @@ StructureElementTreeItem *BuildingMountPointModel::getStructureTreeItemById(int
   for(int i =0; i<parent->childCount(); ++i)
   {
     StructureElementTreeItem *item = static_cast<StructureElementTreeItem*>(parent->child(i));
-    if (item != nullptr && item->data.id() == id)
+    if (item != nullptr && item->data.id == id)
     {
       return item;
     }
@@ -247,7 +249,7 @@ StructureElementTreeItem *BuildingMountPointModel::getStructureTreeItemByMSEId(i
   for(int i =0; i<parent->childCount(); ++i)
   {
     StructureElementTreeItem *item = static_cast<StructureElementTreeItem*>(parent->child(i));
-    if (item != nullptr && item->data.mainStructureElementId() == id)
+    if (item != nullptr && item->data.mainStructureElementId == id)
     {
       return item;
     }
@@ -275,10 +277,10 @@ void BuildingMountPointModel::onMainStructureElementChanged(const Infrastructure
 
 void BuildingMountPointModel::addBuilding(const MainStructureElement &mse)
 {
-  if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building)
+  if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
     return;
 
-  m_mainStructureElements[mse.id()] = mse;
+  m_mainStructureElements[mse.id] = mse;
   QHash<int, StructureElement> structureElements;
   QHash<int, QVector<int>> parentId2id;
   int gParentId =0;
@@ -286,38 +288,38 @@ void BuildingMountPointModel::addBuilding(const MainStructureElement &mse)
 
   
   
-  const StructureElement gse = setBuildingGroup(mse.groupId());
-  if (m_availableBuildingGroups.contains(gse.id()) == false)
+  const StructureElement gse = setBuildingGroup(mse.groupId);
+  if (m_availableBuildingGroups.contains(gse.id) == false)
   {
-    m_availableBuildingGroups.insert(gse.id());
-    structureElements[gse.id()] = gse;
-    parentId2id[0].push_back(gse.id());
+    m_availableBuildingGroups.insert(gse.id);
+    structureElements[gse.id] = gse;
+    parentId2id[0].push_back(gse.id);
   }
   else
   {
-    gParentId = gse.id();
+    gParentId = gse.id;
   }
 
-  for (const StructureElement &se : mse.elements())
+  for (const StructureElement &se : mse.elements)
   {
-    if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingControlUnit)
+    if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingControlUnit)
       continue;
 
-    int parentId = getParent(se.path());
+    int parentId = getParent(se.path);
     if(parentId == 0)
     {
-      parentId = gse.id();
+      parentId = gse.id;
     }
 
-    structureElements[se.id()] = se;
-    parentId2id[parentId].push_back(se.id());
+    structureElements[se.id] = se;
+    parentId2id[parentId].push_back(se.id);
   }
 
   
   if(gParentId != 0)
   {
     StructureElementTreeItem *item = getStructureTreeItemById(gParentId,m_rootItem);
-    if (item != nullptr && item->data.id() == gParentId)
+    if (item != nullptr && item->data.id == gParentId)
     {
       gParentIndex = indexFromItem(item);
     }
@@ -327,15 +329,15 @@ void BuildingMountPointModel::addBuilding(const MainStructureElement &mse)
 
 void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
 {
-  auto it = m_mainStructureElements.find(mse.id());
+  auto it = m_mainStructureElements.find(mse.id);
   if (it == m_mainStructureElements.end())
   {
     return addBuilding(mse);
   }
   
 
-  const StructureElement gse = setBuildingGroup(mse.groupId());
-  int gParentId = gse.id();
+  const StructureElement gse = setBuildingGroup(mse.groupId);
+  int gParentId = gse.id;
   StructureElementTreeItem *building = nullptr;
 
   
@@ -345,7 +347,7 @@ void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
   StructureElementTreeItem *gItem = getStructureTreeItemById(gParentId, m_rootItem); 
   if (gItem != nullptr)
   {
-    StructureElementTreeItem *bItem = getStructureTreeItemByMSEId(mse.id(), gItem);
+    StructureElementTreeItem *bItem = getStructureTreeItemByMSEId(mse.id, gItem);
     if (bItem != nullptr)
     {
       building = bItem;
@@ -356,7 +358,7 @@ void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
   if (!building)
   {
     
-    WARNING_LOG(m_logger)<<">>> not found section: "<<gse.id()<<" not exist. new one will be added ";
+    WARNING_LOG(m_logger)<<">>> not found section: "<<gse.id<<" not exist. new one will be added ";
     findAndRemoveBuilding(mse);
     return addBuilding(mse);
   }
@@ -368,17 +370,17 @@ void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
   int buildingSeId = 0;
   QHash<int, StructureElement> structureElements;
   QHash<int, QVector<int>> parentId2id;
-  for (const StructureElement &se : mse.elements())
+  for (const StructureElement &se : mse.elements)
   {
-    if (se.structureElementTypeId() == StructureElementType::Building)
-      buildingSeId = se.id();
-    int parentId = getParent(se.path());
+    if (se.structureElementTypeId == StructureElementType::Building)
+      buildingSeId = se.id;
+    int parentId = getParent(se.path);
     if(parentId == 0) 
     {
       parentId = gParentId;
     }
-    structureElements[se.id()] = se;
-    parentId2id[parentId].push_back(se.id());
+    structureElements[se.id] = se;
+    parentId2id[parentId].push_back(se.id);
   }
 
   if (!buildingSeId)
@@ -416,7 +418,7 @@ void BuildingMountPointModel::updateChildren(int parentId,
     bool bFound = false;
     for (int j = 0; j < childIds.size(); ++j)
     {
-      if (childIds.at(j) == child->data.id())
+      if (childIds.at(j) == child->data.id)
       {
         bFound = true;
         childIds.remove(j);
@@ -433,7 +435,7 @@ void BuildingMountPointModel::updateChildren(int parentId,
     }
 
     
-    StructureElement newSe = structureElements.value(child->data.id());
+    StructureElement newSe = structureElements.value(child->data.id);
     if (child->data != newSe)
     {
       std::swap(child->data, newSe);
@@ -442,7 +444,7 @@ void BuildingMountPointModel::updateChildren(int parentId,
     }
 
     
-    updateChildren(child->data.id(), child, parentId2id, structureElements);
+    updateChildren(child->data.id, child, parentId2id, structureElements);
   }
 
   
@@ -456,9 +458,9 @@ void BuildingMountPointModel::updateChildren(int parentId,
 
 void BuildingMountPointModel::removeBuildingByGroupId(const MainStructureElement &mse)
 {
-  m_mainStructureElements.remove(mse.id());
+  m_mainStructureElements.remove(mse.id);
 
-  int section = getSectionId(mse.groupId());
+  int section = getSectionId(mse.groupId);
   bool bfound = false;
   StructureElementTreeItem *gItem = getStructureTreeItemById(section, m_rootItem);
   if (gItem != nullptr)
@@ -466,7 +468,7 @@ void BuildingMountPointModel::removeBuildingByGroupId(const MainStructureElement
     for (int i = 0; i < gItem->childCount(); ++i)
     {
       StructureElementTreeItem *item = static_cast<StructureElementTreeItem*>(gItem->child(i));
-      if (item->data.mainStructureElementId() == mse.id())
+      if (item->data.mainStructureElementId == mse.id)
       {
         const QModelIndex parentIdx = indexFromItem(gItem);
         beginRemoveRows(parentIdx, i, i);
@@ -480,7 +482,7 @@ void BuildingMountPointModel::removeBuildingByGroupId(const MainStructureElement
 
   if (bfound == false)
   {
-    ERROR_LOG(m_logger)<<"No mse with Id: ( "<<mse.id()<<" ) | groupId: "<<mse.groupId()<<" | sectionId: "<<section<<" found!";
+    ERROR_LOG(m_logger)<<"No mse with Id: ( "<<mse.id<<" ) | groupId: "<<mse.groupId<<" | sectionId: "<<section<<" found!";
   }
 
 }
@@ -498,7 +500,7 @@ void BuildingMountPointModel::findAndRemoveBuilding(const MainStructureElement &
       for (int gcIndex = 0; gcIndex < groupItem->childCount(); ++gcIndex)
       {
         StructureElementTreeItem *item = static_cast<StructureElementTreeItem*>(groupItem->child(gcIndex));
-        if (item->data.mainStructureElementId() == mse.id())
+        if (item->data.mainStructureElementId == mse.id)
         {
           const QModelIndex parentIdx = indexFromItem(groupItem);
           beginRemoveRows(parentIdx, gcIndex, gcIndex);
@@ -543,7 +545,7 @@ void BuildingMountPointModel::insertChildren(int parentId,
 
 
     const QModelIndex childIdx = index(insertPos, 0, parentIdx);
-    insertChildren(data.id(), childIdx, parentId2id, structureElements);
+    insertChildren(data.id, childIdx, parentId2id, structureElements);
   }
 }
 
@@ -569,7 +571,7 @@ std::vector<StructureElement> BuildingMountPointModel::getChildren(NGLTreeItem *
   StructureElement structureElement = sitem->data;
 
   if (bUseNewBarcode)
-    structureElement.barcode(sitem->newBarcode.toStdString());
+    structureElement.barcode = sitem->newBarcode.toStdString();
 
   ret.push_back(std::move(structureElement));
 
@@ -586,22 +588,22 @@ MainStructureElement BuildingMountPointModel::getMainStructureElement(const QMod
     return ret;
   const StructureElementTreeItem *sitem = static_cast<StructureElementTreeItem*>(item);
 
-  auto it = m_mainStructureElements.find(sitem->data.mainStructureElementId());
+  auto it = m_mainStructureElements.find(sitem->data.mainStructureElementId);
   if (it == m_mainStructureElements.end())
     return ret;
 
   ret = it.value();
 
-  MainStructureElement mseFromDtc = m_dtc->mainStructureElement(ret.id());
+  MainStructureElement mseFromDtc = m_dtc->mainStructureElement(ret.id);
 
   auto children = getChildren(item, true);
   auto comp = [](const StructureElement &a, const StructureElement &b)
   {
-    const int idA = std::abs(a.id());
-    const int idB = std::abs(b.id());
+    const int idA = std::abs(a.id);
+    const int idB = std::abs(b.id);
     if (idA != idB)
       return idA < idB;
-    return QString::fromStdString(a.name()) < QString::fromStdString(b.name());
+    return QString::fromStdString(a.name) < QString::fromStdString(b.name);
   };
   std::sort(children.begin(), children.end(), comp);
 
@@ -610,45 +612,45 @@ MainStructureElement BuildingMountPointModel::getMainStructureElement(const QMod
   QSet<int> setIds;
   for (const StructureElement &se : std::as_const(children))
   {
-    setIds.insert(se.id());
-    auto &ref = maxIds[se.mountingPointTypeId()];
-    ref = std::max(ref, se.mountingPointId());
-    if (se.id() <= 0)
+    setIds.insert(se.id);
+    auto &ref = maxIds[se.mountingPointTypeId];
+    ref = std::max(ref, se.mountingPointId);
+    if (se.id <= 0)
       hasNewMountingPoints = true;
   }
   if (hasNewMountingPoints)
   {
     for (StructureElement &se : children)
     {
-      if (se.id() > 0 || se.mountingPointId() > 0)
+      if (se.id > 0 || se.mountingPointId > 0)
         continue;
-      auto &ref = maxIds[se.mountingPointTypeId()];
-      se.mountingPointId(++ref);
+      auto &ref = maxIds[se.mountingPointTypeId];
+      se.mountingPointId = ++ref;
     }
   }
 
-  for (const auto& obj : mseFromDtc.elements())
+  for (const auto& obj : mseFromDtc.elements)
   {
-    if(setIds.contains(obj.id()))
+    if(setIds.contains(obj.id))
       continue;
 
 
-    if(obj.mountingPointTypeId() == MountingPointType::BuildingControlUnit)
+    if(obj.mountingPointTypeId == MountingPointType::BuildingControlUnit)
     {
       children.insert(children.begin() + 1 , obj);
-      setIds.insert(obj.id());
+      setIds.insert(obj.id);
     }
   }
 
 
-  ret.elements(children);
+  ret.elements = children;
 
   return ret;
 }
 
 QString BuildingMountPointModel::getMainStructureElementName(qint32 mainStructureElementId) const
 {
-  return QString::fromStdString(m_mainStructureElements.value(mainStructureElementId).name());
+  return QString::fromStdString(m_mainStructureElements.value(mainStructureElementId).name);
 }
 
 
@@ -667,29 +669,29 @@ void BuildingMountPointModel::updateBarcodes(NGLTreeItem *item,
     return;
 
   StructureElementTreeItem *sitem = static_cast<StructureElementTreeItem*>(item);
-  if (sitem->data.mountingPointTypeId() != MountingPointType::Unknown)
+  if (sitem->data.mountingPointTypeId != MountingPointType::Unknown)
   {
-    auto it = barcodes.find(sitem->data.mountingPointId());
+    auto it = barcodes.find(sitem->data.mountingPointId);
     if (it != barcodes.end())
     {
       sitem->newBarcode = it.value();
       barcodes.erase(it);
-      auto itNewBc = additionalBarcodes.find(sitem->data.mountingPointId());
+      auto itNewBc = additionalBarcodes.find(sitem->data.mountingPointId);
       if (itNewBc != additionalBarcodes.end())
       {
-        const QString name = QString::fromStdString(sitem->data.name());
+        const QString name = QString::fromStdString(sitem->data.name);
         const QString displayName = sitem->displayName();
         const QVector<QString> newBarcodes = itNewBc.value();
         StructureElement newSe(sitem->data);
-        newSe.mountingPointId(0);
+        newSe.mountingPointId = 0;
         const int itemRow = item->row();
         for (int i = 0; i < newBarcodes.size(); ++i)
         {
           const int rowToInsert = itemRow + i + 1;
-          newSe.barcode() = std::string();
-          newSe.id(-sitem->data.id());
-          newSe.name(QString(name + QLatin1Char('_') + QString::number(i + 1)).toStdString());
-          newSe.displayName(QString(displayName + QLatin1Char('_') + QString::number(i + 1)).toStdString());
+          newSe.barcode = std::string();
+          newSe.id = -sitem->data.id;
+          newSe.name = QString(name + QLatin1Char('_') + QString::number(i + 1)).toStdString();
+          newSe.displayName = QString(displayName + QLatin1Char('_') + QString::number(i + 1)).toStdString();
           StructureElementTreeItem *childItem = static_cast<StructureElementTreeItem*>(createItem(QVariant(), QIcon()));
           childItem->newBarcode = newBarcodes.at(i);
           childItem->data = newSe;
@@ -700,14 +702,14 @@ void BuildingMountPointModel::updateBarcodes(NGLTreeItem *item,
     }
     else
     {
-      if (sitem->data.id() > 0)
+      if (sitem->data.id > 0)
         sitem->newBarcode.clear();
     }
   }
   else
   {
-    barcodes.remove(sitem->data.mountingPointId());
-    additionalBarcodes.remove(sitem->data.mountingPointId());
+    barcodes.remove(sitem->data.mountingPointId);
+    additionalBarcodes.remove(sitem->data.mountingPointId);
   }
 
   for (int i = 0; i < item->childCount(); ++i)
@@ -720,7 +722,7 @@ void BuildingMountPointModel::resetNewItems(const QModelIndex &idx)
   if (!sitem)
     return;
 
-  if (sitem->data.id() < 0 && sitem->parent())
+  if (sitem->data.id < 0 && sitem->parent())
   {
     beginRemoveRows(idx.parent(), idx.row(), idx.row());
     sitem->parent()->removeChild(sitem);
@@ -743,7 +745,7 @@ void BuildingMountPointModel::resetNewBarcodes(NGLTreeItem *parent)
     return;
 
   StructureElementTreeItem *sitem = static_cast<StructureElementTreeItem*>(parent);
-  sitem->newBarcode = QString::fromStdString(sitem->data.barcode());
+  sitem->newBarcode = QString::fromStdString(sitem->data.barcode);
 
   for (int i = 0; i < parent->childCount(); ++i)
     resetNewBarcodes(parent->child(i));
@@ -770,8 +772,8 @@ bool BuildingMountPointSortModel::lessThan(const QModelIndex &source_left, const
 
   if (itemLeft->displayName() != itemRight->displayName())
     return itemLeft->displayName() < itemRight->displayName();
-  const int idLeft = qAbs(itemLeft->data.id());
-  const int idRight = qAbs(itemLeft->data.id());
+  const int idLeft = qAbs(itemLeft->data.id);
+  const int idRight = qAbs(itemLeft->data.id);
   return idLeft < idRight;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
index eb4616883..aba6ed2fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
@@ -19,11 +19,10 @@ struct StructureElementTreeItem : public NGLTreeItem
   QString displayName() const
   {
     if (m_dispName.isNull())
-      m_dispName = QString::fromStdString(data.displayName());
+      m_dispName = QString::fromStdString(data.displayName);
     return m_dispName;
   }
 private:
-NGL::INGLLogger &m_logger;
   mutable QString m_dispName;
 };
 
@@ -103,6 +102,7 @@ private:
   QHash<int, QModelIndex> m_buildingsIndexes;
   const int maxIntValue = std::numeric_limits<int>::max();
   QMap<int, MainStructureElement> m_mainStructureElements;
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<Interface::Dtc> m_dtc{nullptr};
   QSet<int> m_availableBuildingGroups;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
index 6c11a4e97..0a3aee354 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
@@ -137,7 +137,7 @@ void PlanDialog::setScheduleId(const int scheduleId)
 
   
   MainSchedule ms = ismIfc->mainSchedule(m_scheduleId);
-  QString msName = QString::fromStdString(ms.name());
+  QString msName = QString::fromStdString(ms.name);
 
   if (m_session && m_session->baseLayout())
     m_session->baseLayout()->setCustomText(tr("Instrumentation Plan: '%1'").arg(msName));
@@ -155,7 +155,7 @@ void PlanDialog::onPrint()
 void PlanDialog::onMainScheduleChanged(const MainSchedule &data, DataModification modType)
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-  m_scheduleId = data.id();
+  m_scheduleId = data.id;
   enaDisa();
   Q_UNUSED(modType);
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -177,13 +177,13 @@ void PlanDialog::onLoad()
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
 
-  if (item.id() == m_scheduleId)
+  if (item.id == m_scheduleId)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("This instrumentation plan is already loaded"));
     return;
   }
 
-  m_scheduleId = item.id();
+  m_scheduleId = item.id;
   setScheduleId(m_scheduleId);
   m_ismGuiIfc->setPlanId(m_scheduleId);
   enaDisa();
@@ -200,7 +200,7 @@ void PlanDialog::onRemove()
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
 
-  if (item.id() == m_scheduleId)
+  if (item.id == m_scheduleId)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Cannot remove current instrumentation plan"));
     return;
@@ -210,24 +210,24 @@ void PlanDialog::onRemove()
   InstrumentationAssetModifyRequest req;
   InstrumentationAsset asset;
 
-  for (const auto &element : std::as_const(item.elements()))
+  for (const auto &element : std::as_const(item.elements))
   {
     QMap<qint32, MountingPointAsset> mntPntAssets = m_dtc->mountingPointAssets();
     for (const auto &mntPntAsset : std::as_const(mntPntAssets))
     {
-      if (mntPntAsset.structureElementId() == element.structureElementId())
+      if (mntPntAsset.structureElementId == element.structureElementId)
       {
-        asset = m_dtc->instrumentationAsset(mntPntAsset.assetId());
+        asset = m_dtc->instrumentationAsset(mntPntAsset.assetId);
         req = InstrumentationAssetModifyRequest(
           1,
-          asset.name(),
-          asset.mountingPointTypeId(),
-          asset.barcode(),
-          asset.hostname(),
-          asset.properties(),
+          asset.name,
+          asset.mountingPointTypeId,
+          asset.barcode,
+          asset.hostname,
+          asset.properties,
           InstrumentationAssetState::Unmounted, 
-          asset.lastUpdated(),
-          asset.availableInExercise()
+          asset.lastUpdated,
+          asset.availableInExercise
         );
 
 
@@ -239,7 +239,7 @@ void PlanDialog::onRemove()
     m_requestHelper->startRequests();
 
   
-  Core::RemoveElementRequest rmReq{item.id()};
+  Core::RemoveElementRequest rmReq{item.id};
   m_requestHelper->startSingleRequest([rmReq, this]()
   {
     return m_ftc->mainScheduleRemoveRequest(rmReq, this);
@@ -264,11 +264,11 @@ void PlanDialog::enaDisa()
     return;
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
-  bool isComplete = m_dtc->checkSchedule(item.id());
+  bool isComplete = m_dtc->checkSchedule(item.id);
 
 
-  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, !(item.id() == m_scheduleId || item.statusId() == ScheduleStatus::Active) );
-  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load,   !(item.id() == m_scheduleId) );
+  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, !(item.id == m_scheduleId || item.statusId == ScheduleStatus::Active) );
+  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load,   !(item.id == m_scheduleId) );
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit,   (indexList.size() == 1) );
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show,   (indexList.size() == 1) );
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save,   (indexList.size() == 1 && !isComplete) );
@@ -283,19 +283,19 @@ void PlanDialog::onEdit()
     return;
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
-  if (item.id() < 0 )
+  if (item.id < 0 )
     return;
 
-  DEBUG_LOG(m_logger) << "onEdit schedule with id = " << item.id();
+  DEBUG_LOG(m_logger) << "onEdit schedule with id = " << item.id;
 
   PlanEditDialog *dialog = new PlanEditDialog(this);
-  if (!dialog->init(m_session, item.id(), m_dtc, m_ftc, m_ismGuiCbx))
+  if (!dialog->init(m_session, item.id, m_dtc, m_ftc, m_ismGuiCbx))
   {
     delete dialog;
     return;
   }
 
-  addDialog(dialog, m_menuGroup, QStringLiteral("EditSchedule%1").arg(item.id()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(dialog, m_menuGroup, QStringLiteral("EditSchedule%1").arg(item.id), LtsWidgets::LayoutArea::eDialogTab);
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
@@ -319,10 +319,10 @@ void PlanDialog::onCheck()
     return;
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
-  if (item.id() < 0 )
+  if (item.id < 0 )
     return;
 
-  DEBUG_LOG(m_logger) << "show Differences schedule with id = " << item.id();
+  DEBUG_LOG(m_logger) << "show Differences schedule with id = " << item.id;
 
   
   
@@ -333,14 +333,14 @@ void PlanDialog::onCheck()
   
 
   OverviewMountingPointListDialog *dialog = new OverviewMountingPointListDialog(m_menuGroup, this);
-  const int32_t scheduleId = item.id();
+  const int32_t scheduleId = item.id;
   if (!dialog->init(m_session, m_dtc, m_ftc, m_dataIfc, scheduleId))
   {
     delete dialog;
     return;
   }
 
-  addDialog(dialog, m_menuGroup, QStringLiteral("ShowDifferences%1").arg(item.id()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(dialog, m_menuGroup, QStringLiteral("ShowDifferences%1").arg(item.id), LtsWidgets::LayoutArea::eDialogTab);
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
@@ -353,13 +353,13 @@ void PlanDialog::onCopy()
     return;
 
   MainSchedule item{m_model->getRowData(indexList.front().row())};
-  if (item.id() < 0 )
+  if (item.id < 0 )
     return;
 
-  DEBUG_LOG(m_logger) << "onCopy schedule with id = " << item.id();
+  DEBUG_LOG(m_logger) << "onCopy schedule with id = " << item.id;
 
   MainScheduleCopyRequest req;
-  req.id(item.id());
+  req.id = item.id;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.h
index f073bcb54..7ea7567c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.h
@@ -9,7 +9,7 @@
 #include <InfrastructureManagement/ism_ftc.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 #include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.cpp
index 0c06d4e0e..d4878a4f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.cpp
@@ -3,6 +3,7 @@
 
 #include <InfrastructureManagement/ism_translation.h>
 #include <ngltools/ngltools_dtg.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "ism_plan_dialog_model.h"
 
@@ -17,6 +18,7 @@ PlanDialogModel::PlanDialogModel(QObject *parent)
                                                     tr("End"),
                                                     tr("Complete")},
                                                     parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
   , m_dtc(nullptr)
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
@@ -56,20 +58,20 @@ QVariant PlanDialogModel::data(const QModelIndex &index, int role) const
     static const QIcon red(QLatin1String("icon:red_light.svg"));
     if (index.column() == PlanDialogModel::Columns::COMPLETE)
     {
-      
-      bool isComplete = m_dtc->checkSchedule(ms.id());
+
+      bool isComplete = m_dtc->checkSchedule(ms.id);
       return (isComplete ? green : red);
     }
   }
-  else if (role == Qt::TextColorRole)
+  else if (role == Qt::ForegroundRole)
   {
     if (index.column() == PlanDialogModel::Columns::STATUS)
     {
-      switch (ms.statusId().underlying())
+      switch (static_cast<int>(ms.statusId))
       {
-      case ScheduleStatus::Active:
+      case static_cast<int>(ScheduleStatus::Active):
         return QColor(Qt::darkGreen);
-      case ScheduleStatus::Inactive:
+      case static_cast<int>(ScheduleStatus::Inactive):
         return QColor(Qt::red);
       }
     }
@@ -79,21 +81,21 @@ QVariant PlanDialogModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ID:
-      return ms.id();
+      return ms.id;
     case NAME:
-      return QString::fromStdString(ms.name());
+      return QString::fromStdString(ms.name);
     case STATUS:
-      return toString(ms.statusId());
+      return toString(ms.statusId);
     case CREATED:
-      return DTG::toStringMSec(ms.timeCreated());
+      return DTG::toStringMSec(ms.timeCreated);
     case START:
-      return (ms.timeStart().is_set() ? DTG::toStringMSec(ms.timeStart().get()) : QVariant()) ;
+      return (ms.timeStart.has_value() ? DTG::toStringMSec(ms.timeStart.value()) : QVariant()) ;
     case END:
-      return (ms.timeEnd().is_set() ? DTG::toStringMSec(ms.timeEnd().get()) : QVariant());
+      return (ms.timeEnd.has_value() ? DTG::toStringMSec(ms.timeEnd.value()) : QVariant());
     case COMPLETE:
     {
-      
-      bool isComplete = m_dtc->checkSchedule(ms.id());
+
+      bool isComplete = m_dtc->checkSchedule(ms.id);
       return (isComplete ? tr("Yes") : tr("No"));
     }
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp
index 779aa4b58..c3a131e83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ism_plan_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_ism_plan_edit_dialog.h"
 #include "ism_plan_dialog_model.h"
 
@@ -19,6 +20,7 @@ PlanEditDialog::PlanEditDialog(QWidget *parent)
   , m_dtc(nullptr)
   , m_ftc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -56,20 +58,20 @@ bool PlanEditDialog::init(LtsSession::LtsSession *session,
   {
     MainSchedule data = dtc->mainSchedule(m_scheduleId);
 
-    m_currentState = data.statusId();
-    m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(data.statusId().underlying()));
+    m_currentState = data.statusId;
+    m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(static_cast<int>(data.statusId)));
 
-    m_ui->leName->setText(QString::fromStdString(data.name()));
-    if (data.timeStart().is_set())
-      m_ui->dteBegin->setMsecsSinceEpoch(data.timeStart().get());
-    if (data.timeEnd().is_set())
-      m_ui->dteEnd->setMsecsSinceEpoch(data.timeEnd().get());
+    m_ui->leName->setText(QString::fromStdString(data.name));
+    if (data.timeStart.has_value())
+      m_ui->dteBegin->setMsecsSinceEpoch(data.timeStart.get());
+    if (data.timeEnd.has_value())
+      m_ui->dteEnd->setMsecsSinceEpoch(data.timeEnd.get());
 
   }
   else 
   {
     m_currentState = ScheduleStatus::Active;
-    m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(ScheduleStatus::Inactive));
+    m_ui->cbStatus->setCurrentIndex(m_ui->cbStatus->findData(static_cast<int>(ScheduleStatus::Inactive)));
     m_ui->cbStatus->setEnabled(true);
   }
 
@@ -93,7 +95,7 @@ bool PlanEditDialog::apply()
 
   for(auto schedule : m_dtc->mainSchedules())
   {
-    if(schedule.name() == m_ui->leName->text().toStdString())
+    if(schedule.name == m_ui->leName->text().toStdString())
     {
       if(m_scheduleId <= 0)
       {
@@ -103,7 +105,7 @@ bool PlanEditDialog::apply()
       }
       else
       {
-        if(m_scheduleId != schedule.id() && schedule.name() == m_ui->leName->text().toStdString())
+        if(m_scheduleId != schedule.id && schedule.name == m_ui->leName->text().toStdString())
         {
 
           QString msg = tr("The name is already in use.");
@@ -116,13 +118,13 @@ bool PlanEditDialog::apply()
 
 
   MainScheduleModifyRequest data;
-  data.name((m_ui->leName->text().toStdString()));
+  data.name = (m_ui->leName->text().toStdString());
 
   ScheduleStatus newStatus = static_cast<ScheduleStatus>(m_ui->cbStatus->currentData().toInt());
 
   if (newStatus != m_currentState)
   {
-    switch (newStatus.underlying())
+    switch (newStatus)
     {
     case ScheduleStatus::Active:
       
@@ -140,27 +142,27 @@ bool PlanEditDialog::apply()
   if (m_scheduleId > 0) 
   {
     MainSchedule ms = m_dtc->mainSchedule(m_scheduleId);
-    data.id(ms.id());
-    data.exerciseId(ms.exerciseId()); 
-    data.description(ms.description()); 
-    data.timeCreated(ms.timeCreated());
+    data.id = ms.id;
+    data.exerciseId = ms.exerciseId; 
+    data.description = ms.description; 
+    data.timeCreated = ms.timeCreated;
   }
   else 
   {
-    data.id(0);
-    data.timeCreated(QDateTime::currentMSecsSinceEpoch());
+    data.id = 0;
+    data.timeCreated = QDateTime::currentMSecsSinceEpoch();
   }
 
   if (!m_ui->dteBegin->isEmpty() && m_ui->dteBegin->isValidDate())
-    data.timeStart(m_ui->dteBegin->msecsSinceEpoch());
+    data.timeStart = m_ui->dteBegin->msecsSinceEpoch();
   else
-    data.timeStart();
+    data.timeStart;
   if (!m_ui->dteEnd->isEmpty() && m_ui->dteEnd->isValidDate())
-    data.timeEnd(m_ui->dteEnd->msecsSinceEpoch());
+    data.timeEnd = m_ui->dteEnd->msecsSinceEpoch();
   else
-    data.timeEnd();
+    data.timeEnd;
 
-  data.statusId(static_cast<ScheduleStatus>(m_ui->cbStatus->currentData().toInt()));
+  data.statusId = static_cast<ScheduleStatus>(m_ui->cbStatus->currentData().toInt());
 
   m_requestHelper->addRequest([data,this](){
     return m_ftc->mainScheduleModifyRequest(data, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.h
index d6d8abb1a..2ad3f2449 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.h
@@ -8,7 +8,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
 #include <InfrastructureManagement/logger.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp
index ec9fa13c2..8ef184447 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp
@@ -575,15 +575,15 @@ void InterfaceImpl::slotNewPlan()
   }
 
   MainScheduleModifyRequest req;
-  req.name(name.toStdString());
+  req.name = name.toStdString();
   
   
-  req.id(0);
-  req.statusId(static_cast<ScheduleStatus>(status));
-  req.timeCreated(QDateTime::currentDateTime().toMSecsSinceEpoch());
+  req.id = 0;
+  req.statusId = static_cast<ScheduleStatus>(status);
+  req.timeCreated = QDateTime::currentDateTime().toMSecsSinceEpoch();
   if(tbegin > 0)
-    req.timeStart(tbegin);
-  req.timeEnd(tend);
+    req.timeStart = tbegin;
+  req.timeEnd = tend;
   if (m_requestHelper->startSingleRequest([req, ismFtc, this]()
   {
                                           return ismFtc->mainScheduleModifyRequest(req, this);
@@ -663,7 +663,7 @@ void InterfaceImpl::setPlanId(const int planId)
 
   
   MainSchedule ms = ismIfc->mainSchedule(m_planId);
-  QString msName = QString::fromStdString(ms.name());
+  QString msName = QString::fromStdString(ms.name);
   connect(m_session, &LtsSession::LtsSession::signalDoneInitializingSession,
           this, [this, msName] ()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.h
index 117194e65..3e090f40f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.h
@@ -7,7 +7,7 @@
 
 
 #include <AudioVideoManagement/avm_data_plugin_interface.h>
-#include <InfrastructureManagement/ism_data_plugin.h>
+#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
index b77534dc3..c41761092 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
@@ -6,7 +6,7 @@
  * that extend MountingPoint functionality.
  */
 
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism.hpp>
 #include <InfrastructureManagement/ism_enums.hpp>
 #include <QtGui/QImage>
@@ -121,11 +121,13 @@ void MountingPoint::init() {
 }
 
 QString MountingPoint::name() const {
-    return QString::fromStdString(m_data.name());
+    // Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
+    return QString::fromStdString(m_data.name);
 }
 
 QString MountingPoint::fileName() const {
-    return QString::fromStdString(m_data.name());
+    // Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
+    return QString::fromStdString(m_data.name);
 }
 
 QImage MountingPoint::toImage(int32_t edgeLength) const {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h
new file mode 100644
index 000000000..63b285377
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h
@@ -0,0 +1,143 @@
+/**
+  * @RDE_HEADER@
+  * The MountingPoint class wraps all information from InfrastructureManagement which defines a mounting point
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Hannes Baeuerle, SLSE, 2017-01-16
+  */
+
+#pragma once
+
+#include <Plugins/InfrastructureManagement/Shared/ismshared_export.h>
+#include <InfrastructureManagement/ism.hpp>
+#include <InfrastructureManagement/ism_enums.hpp>
+#include <QtGui/QImage>
+#include <QtCore/QMap>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+
+
+namespace dds
+{
+namespace core
+{
+static inline uint qHash(const InfrastructureManagement::MountingPointType &mpt)
+{
+  return ::qHash(static_cast<int>(mpt));
+}
+} // namespace core
+} // namespace dds
+
+namespace InfrastructureManagement
+{
+
+class ISMSHARED_EXPORT MountingPoint
+{
+public:
+  explicit MountingPoint();
+  explicit MountingPoint(const StructureElement &data, int floorId);
+  static void init();
+
+  const StructureElement &data() const { return m_data; }
+  void updateData(const StructureElement &data, int floorId) { m_data = data; m_floor = floorId; }
+  int32_t id() const { return m_data.id; }
+  int32_t associatedAssetId() const { return m_associatedAssetId; }
+  bool hasAssociatedAsset() const { return m_associatedAssetId > 0; }
+  bool hasAssociatedAssetDefect() const { return m_hasAssociatedAssetDefect; }
+
+  /*! \name aimState depends on the (loaded) plan/schedule!!! */
+  //@{
+
+  //! \brief aimState of currently loaded schedule!!!
+  //! \return aimState
+  MountingPointState aimState() const             { return m_aimState; }
+  void setAimState(const MountingPointState &mps) { m_aimState = mps;}
+
+  //@}
+
+  bool isValid() const { return m_isValid; }
+  Core::GeoPosition geoPosition() const { return m_data.geoPosition; }
+  Core::RelativePosition relPosition() const { return m_data.relPosition; }
+  MountingPointType type() const { return m_data.mountingPointTypeId; }
+  int32_t buildingId() const { return m_data.mainStructureElementId; }
+  QString name() const;
+  QString fileName() const;
+  QByteArray properties() const { return m_data.properties.c_str(); }
+
+  QImage toImage(int32_t edgeLength = 100) const;
+  bool writeFile(int32_t edgeLength = 25) const;
+  int floor() const { return m_floor; }
+  void setFloor(int floor) { m_floor = floor; }
+
+  void setAssociatedAssetId(int32_t id);
+  void setHasAssociatedAssetDefect(bool hasAssociatedAssetDefect);
+  MountingPointState getNextMountingPointState(const MountingPointState currState);
+
+private: // methods
+
+private: // attributes
+  StructureElement       m_data;
+  int32_t                m_associatedAssetId;
+  MountingPointState     m_aimState{};
+  bool                   m_hasAssociatedAssetDefect;
+  bool                   m_isValid;
+  int                    m_floor;
+
+public:
+
+  enum class MpColor
+  {
+    GRAY,
+    BLUE,
+    RED,
+    GREEN,
+    ORANGE
+  };
+  static QString mpColorToString(MpColor mpColor);
+  static QString mpColorToPostfix(MpColor mpColor);
+
+  struct NameImagePair
+  {
+    NameImagePair(const QString &name = QString(),
+                    const QImage &img = QImage())
+      : m_name(name), m_img(img)
+    {}
+    QString m_name; // like announcement_BLUE
+    QImage  m_img;
+  };
+  struct MpNameImageData
+  {
+    NameImagePair nipGray;
+    NameImagePair nipBlue;
+    NameImagePair nipRed;
+    NameImagePair nipGreen;
+    NameImagePair nipOrange;
+  };
+
+  //
+  // Some methods regarding ImageTable:
+  //
+  static QMap<MountingPointType, MpNameImageData> &getImageTable();         // contains images in good quality (100*100px)
+
+  static bool getImageAttributePlanActivity(const MountingPoint& mp,
+                                            QImage &imgOut, QString &attribNameOut);
+  static bool getImageAttributePlanDefinition(const MountingPoint& mp,
+                                              QImage &imgOut, QString &attribNameOut);
+
+  static bool getImageAttribute(const MountingPoint& mp, MpColor mpColor,
+                                QImage &img, QString &attribName);
+
+private:
+  static QMap<MountingPointType, MpNameImageData> &getImageTableInternal();
+  static void insertHelper(MountingPointType type,
+                           const QString &name,
+                           const QString &colorCodeGray,
+                           const QString &colorCodeGreen,
+                           const QString &colorCodeRed,
+                           const QString &colorCodeOrange,
+                           const QString &defName = QString());
+
+}; // class MountingPoint
+
+} // namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
index 41c3203e0..c4da98d50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
@@ -5,7 +5,7 @@
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
 #include <InfrastructureManagement/ism.hpp>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <InfrastructureManagement/ism_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
@@ -31,8 +31,6 @@ namespace InfrastructureManagement
 {
 class ForeignDataInterface;
 
-// Forward declaration for MainSchedule from ParticipantManagement
-using ParticipantManagement::MainSchedule;
 
 
 class ISMDATAPLUGININTERFACE_EXPORT DataInterface : public DataPluginBase::Interface
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CMakeLists.txt
index 12c80bbfc..8bbc1eb70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CMakeLists.txt
@@ -22,18 +22,12 @@ IF(BUILD_RTI)
 SET(mrk_common_gui_SRCS
   mrk_dialog_model.cpp
   mrk_dialog_model.h
+  mrk_apply_filter.cpp
+  mrk_apply_filter.h
   CustomViews/mrk_marker.cpp
   CustomViews/mrk_marker.h
 )
 
-# FilterManagement-Plugins temporär ausgeschlossen für BUILD_RTI=OFF
-# if(BUILD_RTI)
-#   list(APPEND mrk_common_gui_SRCS
-#     mrk_apply_filter.cpp
-#     mrk_apply_filter.h
-#   )
-# endif()
-
 NGL_WRAP_UI(mrk_common_gui_SRCS
   CustomViews/mrk_marker.ui
 )
@@ -50,11 +44,10 @@ if(QT6_GUI_AVAILABLE)
       LtsSession
       LtsSessionData
       LtsUtilsGuiDds
-      # OpmDataPluginInterface  # External dependency
+      svcOpmCommon  # OperatorManagement::Interface::Dtc (legacy: OpmDataPluginInterface)
       ngltools
-      # svcMrkCommon  # External dependency
     PUBLIC
-      # MrkDataPluginInterface  # External dependency - check if available
+      svcMrkCommon  # MarkerManagement::Interface::Dtc (legacy: MrkDataPluginInterface)
       ${Qt6_Widgets}
       LtsWidgets
       LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
index 0f699efdc..3ca81f86a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
@@ -20,6 +20,7 @@ MarkerManagementApplyFilter::MarkerManagementApplyFilter(LtsSession::LtsSession
   , m_fltParticipantIfc(fltParticipantIfc)
   , m_fltAesIfc(fltAesIfc)
   , m_fltBuildingComponentIfc(fltBuildingComponenIfc)
+  , m_logger(getLogger("MarkerManagementApplyFilter"))
 {
   std::shared_ptr<SituationMap::ForeignGuiInterface> spSitMapGuiIfc;
   m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(spSitMapGuiIfc);
@@ -112,7 +113,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     if (innerObj.isEmpty())
       ERROR_LOG(m_logger) << "inner content AesFilterJson is empty";
     else
-      aesFilter.content(QJsonDocument(innerObj).toJson().constData());
+      aesFilter.content = QJsonDocument(innerObj).toJson().constData();
   }
 
   
@@ -125,7 +126,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     if (innerObj.isEmpty())
       ERROR_LOG(m_logger) << "inner content SymbolAppearanceJson is empty";
     else
-      symbolAppearance.content(QJsonDocument(innerObj).toJson().constData());
+      symbolAppearance.content = QJsonDocument(innerObj).toJson().constData();
   }
 
   
@@ -138,7 +139,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     if (innerObj.isEmpty())
       ERROR_LOG(m_logger) << "inner content BuildingComponentSettingsJson is empty";
     else
-      buildingComponentFilter.content(QJsonDocument(innerObj).toJson().constData());
+      buildingComponentFilter.content = QJsonDocument(innerObj).toJson().constData();
   }
 
 
@@ -164,10 +165,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     
     
 
-    aesFilter.id(0);
-    aesFilter.operatorId(operatorId);
-    aesFilter.sampleTime(0);
-    aesFilter.ctx(wsId_context.toStdString());
+    aesFilter.id = 0;
+    aesFilter.operatorId = operatorId;
+    aesFilter.sampleTime = 0;
+    aesFilter.ctx = wsId_context.toStdString();
 
     std::shared_ptr<FilterManagement::AesDisplayFilter> aesDisplayFilter
         = fltIfcPtr->aesFilterForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
@@ -176,10 +177,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
 
     
     
-    symbolAppearance.id(0);
-    symbolAppearance.operatorId(operatorId);
-    symbolAppearance.sampleTime(0);
-    symbolAppearance.ctx(wsId_context.toStdString());
+    symbolAppearance.id = 0;
+    symbolAppearance.operatorId = operatorId;
+    symbolAppearance.sampleTime = 0;
+    symbolAppearance.ctx = wsId_context.toStdString();
 
     std::shared_ptr<FilterManagement::SymbolAppearanceSettings> appearanceSettings
         = fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
@@ -195,10 +196,10 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
   {
     
     
-    buildingComponentFilter.id(0);
-    buildingComponentFilter.operatorId(operatorId);
-    buildingComponentFilter.sampleTime(0);
-    buildingComponentFilter.ctx(wsId_context.toStdString());
+    buildingComponentFilter.id = 0;
+    buildingComponentFilter.operatorId = operatorId;
+    buildingComponentFilter.sampleTime = 0;
+    buildingComponentFilter.ctx = wsId_context.toStdString();
 
     std::shared_ptr<FilterManagement::BuildingComponentSettings> buildingComponentSettings
         = fltBldgCmpntIfc->buildingComponentSettingsForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), wsId_context);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
index af4713bd9..0e023c7e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
@@ -9,11 +9,11 @@
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include <OperatorManagement/opm_dtc.h>
 #include <MarkerManagement/mrk_dtc.h>
+#include <MarkerManagement/mrk_translation.h>
 #endif
 
 #include <ngltools/ngltools_dtg.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <LtsProjectionWorkstation/lts_projection_workstation.h>
 #include <QtCore/QBuffer>
 #include <QtCore/QSet>
 #include <QtCore/QTimer>
@@ -33,7 +33,7 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
                                               tr("File Id"),
                                               tr("Image")},
                                               parent)
-  , m_logger(LtsProjectionWorkstation::getLogger("MarkerManagementDialogModel"))
+  , m_logger(getLogger("MarkerManagementDialogModel"))
 {}
 
 
@@ -54,7 +54,7 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
   {
     auto cbUser = [this](const OperatorManagement::User &user)
     {
-      m_operatorNames.insert(user.id(), QString::fromStdString(user.name()));
+      m_operatorNames.insert(user.id, QString::fromStdString(user.name));
     };
     connect(opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged, this, cbUser);
     opmDtc->users(cbUser);
@@ -149,13 +149,13 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
   if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
   {
     if (index.column() == ColOperator)
-      return marker.operatorId();
+      return marker.operatorId;
     return QVariant();
   }
 
   if (role == Qt::ToolTipRole) 
   {
-    const int fileContentId = marker.fileContentId();
+    const int fileContentId = marker.fileContentId;
     if (fileContentId > 0)
     {
       auto it = m_previews.find(fileContentId);
@@ -175,31 +175,31 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
     switch (index.column())
     {
       case ColNote:
-        return QString::fromStdString(marker.note());
+        return QString::fromStdString(marker.note);
       case ColOperator:
-        if (marker.operatorId() <= 0)
+        if (marker.operatorId <= 0)
           return tr("Global");
-        return m_operatorNames.value(marker.operatorId());
+        return m_operatorNames.value(marker.operatorId);
       case ColType:
       {
         QStringList slTypes;
-        slTypes.reserve(marker.descriptions().size());
-        for (const MarkerManagement::MarkerDescription &desc : marker.descriptions())
-          slTypes.append(MarkerManagement::toString(desc.markerType()));
+        slTypes.reserve(marker.descriptions.size());
+        for (const MarkerManagement::MarkerDescription &desc : marker.descriptions)
+          slTypes.append(MarkerManagement::toString(desc.markerType));
 
         return slTypes.join(QStringLiteral(", "));
       }
       case ColStreams:
       {
         QString ret;
-        for (const MarkerManagement::MarkerDescription &desc : marker.descriptions())
+        for (const MarkerManagement::MarkerDescription &desc : marker.descriptions)
         {
-          if (desc.markerType() != MarkerManagement::MarkerType::Audio &&
-              desc.markerType() != MarkerManagement::MarkerType::Video)
+          if (desc.markerType != MarkerManagement::MarkerType::Audio &&
+              desc.markerType != MarkerManagement::MarkerType::Video)
             continue;
           if (!ret.isEmpty())
             ret += QLatin1Char(',');
-          ret += QString::fromStdString(desc.content());
+          ret += QString::fromStdString(desc.content);
         }
         return ret;
       }
@@ -209,16 +209,16 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
           
           
           
-          return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() + (m_timezoneHoursOffset * 3600 * 1000)).toString(QStringLiteral("dd.MM.yy HH:mm:ss"));
+          return QDateTime::fromMSecsSinceEpoch(marker.timeStamp + (m_timezoneHoursOffset * 3600 * 1000)).toString(QStringLiteral("dd.MM.yy HH:mm:ss"));
         }
         else
-          return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() - marker.timeStampOffset());
+          return QDateTime::fromMSecsSinceEpoch(marker.timeStamp - marker.timeStampOffset);
       case ColOffset:
-        return QVariant::fromValue<qlonglong>(marker.timeStampOffset() / 1000);
+        return QVariant::fromValue<qlonglong>(marker.timeStampOffset / 1000);
       case ColFileId:
-        return marker.fileContentId();
+        return QVariant::fromValue<qlonglong>(marker.fileContentId);
       case ColImage:
-        return m_previews.value(marker.fileContentId());
+        return m_previews.value(marker.fileContentId);
     }
   }
   return QVariant();
@@ -228,7 +228,7 @@ void MarkerManagementDialogModel::updateOperatorNames()
 {
   QSet<int> operatorIds;
   for (const auto &op : std::as_const(m_vecData))
-    operatorIds.insert(op.operatorId());
+    operatorIds.insert(op.operatorId);
 
   LtsWidgets::ComboboxFilterContent cfc;
   LtsWidgets::ComboboxFilterData cfd;
@@ -270,8 +270,8 @@ bool MarkerSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIn
 
   if (!m_showOtherUsersMarkers)
   {
-    bool bAccepted = marker.operatorId() == 0 ||
-                     marker.operatorId() == m_operatorId;
+    bool bAccepted = marker.operatorId == 0 ||
+                     marker.operatorId == m_operatorId;
     if (!bAccepted)
       return false;
   }
@@ -288,7 +288,7 @@ bool MarkerSortFilterProxyModel::lessThan(const QModelIndex &source_left, const
   switch (source_left.column())
   {
   case MarkerManagementDialogModel::ColTime:
-    return left.timeStamp() < right.timeStamp();
+    return left.timeStamp < right.timeStamp;
   default:
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h
index 4af3eb728..c48291288 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h
@@ -6,7 +6,6 @@
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
 #include <MarkerManagement/mrk_dtc.h>
-#include <MarkerManagement/mrk_marker.h>
 #include <MarkerManagement/logger.h>
 #include <mrkcommon_export.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
index f48133d7d..f2fbfe7e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
@@ -2,11 +2,12 @@
 
 
 #include "topic_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_topic_editor.h"
 
 #include <LtsScriptTimeline/track_entry.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <MarkerManagement/MarkerEdit/snapshot_dialog_model.h>
+#include <Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.h>
 #include <MarkerManagement/mrk.hpp>
 #include <TopicEditorBase/topic_previewer.h>
 
@@ -24,6 +25,7 @@ SnapshotTopicEditor::SnapshotTopicEditor(SnapshotDialogModel *snapshotModel, QSo
   , m_proxyModel(proxyModel)
   , m_snapshotId(0)
   , m_ui(new Ui::SnapshotTopicEditor)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   init(m_ui->widget);
@@ -76,9 +78,9 @@ void SnapshotTopicEditor::updateInternalData()
     {
       m_ui->snapshotsDataView->selectRow(m_proxyModel->mapFromSource(idx));
       const MarkerManagement::Snapshot snapshot = m_snapshotModel->getRowData(idx.row());
-      DEBUG_LOG(m_logger) << "SnapShot Selected "  << snapshot.id() ;
-      m_snapshotId = snapshot.id();
-      m_ui->lblName->setText(QString::fromStdString(snapshot.name()));
+      DEBUG_LOG(m_logger) << "SnapShot Selected "  << snapshot.id ;
+      m_snapshotId = snapshot.id;
+      m_ui->lblName->setText(QString::fromStdString(snapshot.name));
     }
     else 
     {
@@ -110,12 +112,12 @@ void SnapshotTopicEditor::onSnapshotSelected()
 {
   const QModelIndex idx =m_ui->snapshotsDataView->currentIndex();
   const MarkerManagement::Snapshot snapshot = m_snapshotModel->getRowData(idx.row());
-  if (snapshot.id() <= 0)
+  if (snapshot.id <= 0)
     return;
 
-  m_snapshotId = snapshot.id();
+  m_snapshotId = snapshot.id;
   DEBUG_LOG(m_logger) << "new snapshot id = " << m_snapshotId;
-  m_ui->lblName->setText(QString::fromStdString(snapshot.name()));
+  m_ui->lblName->setText(QString::fromStdString(snapshot.name));
   slotChangesMade();
 }
 
@@ -131,22 +133,22 @@ bool SnapshotTopicEditor::apply2()
   }
 
   const MarkerManagement::Snapshot snapshot = m_snapshotModel->getRowData(m_ui->snapshotsDataView->currentIndex().row());
-  if (snapshot.id() <= 0)
+  if (snapshot.id <= 0)
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("Invalid or no snapshot selected"));
     return false;
   }
 
-  setTopicDataProperty(QStringLiteral("snapshotName"), QString::fromStdString(snapshot.name()));
+  setTopicDataProperty(QStringLiteral("snapshotName"), QString::fromStdString(snapshot.name));
   setTopicDataProperty(QStringLiteral("snapshotId"), m_snapshotId);
-  setTopicDataProperty(QStringLiteral("planOverlay"), QString::fromStdString(snapshot.planOverlay()));
-  setTopicDataProperty(QStringLiteral("snapshotFilter"), QString::fromStdString(snapshot.filter()));
-  setTopicDataProperty(QStringLiteral("timeStamp"), double(snapshot.timeStamp())); 
-  setTopicDataProperty(QStringLiteral("mapSettings"), QString::fromStdString(snapshot.mapSettings()));
-  setTopicDataProperty(QStringLiteral("fileContentId"), snapshot.fileContentId());
-  setDescription(m_ui->widget->description().isEmpty() ? QString::fromStdString(snapshot.name()) : m_ui->widget->description());
+  setTopicDataProperty(QStringLiteral("planOverlay"), QString::fromStdString(snapshot.planOverlay));
+  setTopicDataProperty(QStringLiteral("snapshotFilter"), QString::fromStdString(snapshot.filter));
+  setTopicDataProperty(QStringLiteral("timeStamp"), double(snapshot.timeStamp)); 
+  setTopicDataProperty(QStringLiteral("mapSettings"), QString::fromStdString(snapshot.mapSettings));
+  setTopicDataProperty(QStringLiteral("fileContentId"), static_cast<qint64>(snapshot.fileContentId));
+  setDescription(m_ui->widget->description().isEmpty() ? QString::fromStdString(snapshot.name) : m_ui->widget->description());
   if (topicPreviewWidget()->description().isEmpty())
-    topicPreviewWidget()->setDescription(QString::fromStdString(snapshot.name()));
+    topicPreviewWidget()->setDescription(QString::fromStdString(snapshot.name));
   m_ui->widget->previewer()->setTopicData(m_topicData);
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
index 5d2b8da6e..4ebdb19c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
@@ -2,6 +2,7 @@
 
 
 #include "mrk_create_snapshot.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_mrk_create_snapshot.h"
 
 #include <LtsSession/lts_session_data.h>
@@ -14,7 +15,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 
 #include <QtCore/QDateTime>
 #include <QtGui/QImage>
@@ -29,6 +30,7 @@ SnapshotCreateDialog::SnapshotCreateDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent,  LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::SnapshotCreateDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -64,7 +66,7 @@ bool SnapshotCreateDialog::init(const std::shared_ptr<MarkerManagement::Interfac
     return false;
 
   m_editData = data;
-  m_fileId = data.fileContentId();
+  m_fileId = data.fileContentId;
 
   m_mrkFtc = mrk_ftc;
   m_flmDtc = flm_dtc;
@@ -81,11 +83,11 @@ bool SnapshotCreateDialog::init(const std::shared_ptr<MarkerManagement::Interfac
   m_ui->cbSavePreview->setEnabled(false);
   m_ui->cbSavePreview->setChecked(true);
 
-  if (m_editData.id() > 0) 
+  if (m_editData.id > 0) 
   {
-    m_ui->leName->setText(QString::fromStdString(m_editData.name()));
-    m_ui->leDesc->setText(QString::fromStdString(m_editData.description()));
-    m_fileId = m_editData.fileContentId();
+    m_ui->leName->setText(QString::fromStdString(m_editData.name));
+    m_ui->leDesc->setText(QString::fromStdString(m_editData.description));
+    m_fileId = m_editData.fileContentId;
     if (m_fileId > 0) 
       m_ui->cbSavePreview->setChecked(false);
   }
@@ -103,30 +105,30 @@ void SnapshotCreateDialog::sendSnapshotRequest()
   const QByteArray &movementTracks = spSitMapGuiIfc->movementTrackManagerSettingsJson();
 
   Snapshot req;
-  req.id(m_editData.id());
-  req.name(m_ui->leName->text().toStdString());
-  req.description(m_ui->leDesc->toPlainText().toStdString());
+  req.id = m_editData.id;
+  req.name = m_ui->leName->text().toStdString();
+  req.description = m_ui->leDesc->toPlainText().toStdString();
 
-  if (m_editData.id() > 0) 
+  if (m_editData.id > 0) 
   {
-    req.mapSettings(m_editData.mapSettings());
-    req.movementTracks(m_editData.movementTracks());
-    req.filter(m_editData.filter());
-    req.planOverlay(m_editData.planOverlay());
+    req.mapSettings = m_editData.mapSettings;
+    req.movementTracks = m_editData.movementTracks;
+    req.filter = m_editData.filter;
+    req.planOverlay = m_editData.planOverlay;
   }
   else 
   {
-    req.mapSettings(mapSettings.constData());
-    req.movementTracks(movementTracks.constData());
-    req.filter(getFilterParams().constData());
-    req.planOverlay(std::string());
+    req.mapSettings = mapSettings.constData();
+    req.movementTracks = movementTracks.constData();
+    req.filter = getFilterParams().constData();
+    req.planOverlay = std::string();
   }
 
-  req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  req.timeStamp(partitionTime);
-  req.fileContentId(m_fileId);
+  req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  req.timeStamp = partitionTime;
+  req.fileContentId = m_fileId;
 
-  DEBUG_LOG(m_logger) << "Edit/Create snapshot id = " << m_editData.id();
+  DEBUG_LOG(m_logger) << "Edit/Create snapshot id = " << m_editData.id;
   DEBUG_LOG(m_logger) << "File id = " << m_fileId;
 
   if (m_requestHelper->startSingleRequest([req, this]()
@@ -134,7 +136,7 @@ void SnapshotCreateDialog::sendSnapshotRequest()
     return m_mrkFtc->snapshotModifyRequest(req, this);
   }))
   {
-    m_editData.id(m_requestHelper->getRepliedId());
+    m_editData.id = m_requestHelper->getRepliedId();
     DEBUG_LOG(m_logger) << "Saved snapshot with id = " << m_requestHelper->getRepliedId();
     __unchange__();
     closeRequest();
@@ -229,22 +231,22 @@ void SnapshotCreateDialog::saveSnapshotPreviewInLibrary()
     const int folderId = snapshotFolderId > 0 ? snapshotFolderId : initialFolderId;
 
     FileManagement::FileContentModifyRequest request;
-    request.id(m_editData.fileContentId());
-    request.name(title.toStdString());
-    request.isTemplate(false);
-    request.folderId(folderId);
-    request.fileCategory(FileManagement::FileCategory::Exercise);
-    request.fileStatus(FileManagement::FileStatus::Valid);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    request.id = m_editData.fileContentId;
+    request.name = title.toStdString();
+    request.isTemplate = false;
+    request.folderId = folderId;
+    request.fileCategory = FileManagement::FileCategory::Exercise;
+    request.fileStatus = FileManagement::FileStatus::Valid;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     bool bIsPng;
-    request.content() = LtsUtils::fromImage(image, &bIsPng);
-    request.fileType(bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg);
-    request.isUsedBy(true);
-    request.usedBy(1);
-    request.lastModified(QDateTime::currentMSecsSinceEpoch());
+    request.content = LtsUtils::fromImage(image, &bIsPng);
+    request.fileType = bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg;
+    request.isUsedBy = true;
+    request.usedBy = 1;
+    request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
     if (m_session->exerciseId() > 0)
-      request.exerciseId(m_session->exerciseId());
+      request.exerciseId = m_session->exerciseId();
 
     if (m_requestHelper->startSingleRequest([this, request]()
     {
@@ -256,10 +258,10 @@ void SnapshotCreateDialog::saveSnapshotPreviewInLibrary()
 
       sendSnapshotRequest();
 
-      if (m_editData.fileContentId() != m_fileId)
+      if (m_editData.fileContentId != m_fileId)
       {
         DEBUG_LOG(m_logger) << "One more request needed!";
-        m_editData.fileContentId(m_fileId);
+        m_editData.fileContentId = m_fileId;
       }
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
index 57bb828ef..9d9d428dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "mrk_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_mrk_dialog.h"
 #include "mrk_edit_dialog.h"
 
@@ -28,6 +29,7 @@ MarkerManagementDialog::MarkerManagementDialog(const QString &menuGroup, LtsSess
   , m_flmFtc(nullptr)
   , m_avmInterface(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -117,16 +119,16 @@ void MarkerManagementDialog::onEditMarker()
   if (!idx.isValid())
     return;
   const MarkerManagement::Marker marker = m_model->getRowData(idx.row());
-  if (marker.id() <= 0)
+  if (marker.id <= 0)
     return;
 
-  DEBUG_LOG(m_logger) << "current MarkerId: " << marker.id();
+  DEBUG_LOG(m_logger) << "current MarkerId: " << marker.id;
 
   AudioVideoManagement::StreamNameMapping *streamNameMapping = nullptr;
   if (m_avmInterface)
     streamNameMapping = m_avmInterface->streamNameMapping();
-  MarkerEditDialog *dialog = new MarkerEditDialog(marker.id(), m_dtc, m_ftc, streamNameMapping);
-  addDialog(dialog, m_menuGroup, QStringLiteral("EditMarker%1").arg(marker.id()));
+  MarkerEditDialog *dialog = new MarkerEditDialog(marker.id, m_dtc, m_ftc, streamNameMapping);
+  addDialog(dialog, m_menuGroup, QStringLiteral("EditMarker%1").arg(marker.id));
 }
 
 void MarkerManagementDialog::onRemoveMarker()
@@ -135,16 +137,16 @@ void MarkerManagementDialog::onRemoveMarker()
   if (!idx.isValid())
     return;
   const MarkerManagement::Marker marker = m_model->getRowData(idx.row());
-  if (marker.id() <= 0)
+  if (marker.id <= 0)
     return;
-  Core::RemoveElementRequest req(marker.id());
+  Core::RemoveElementRequest req(marker.id);
   m_requestHelper->addRequest([req, this]()
   {
     return m_ftc->markerRemoveRequest(req, this);
   });
-  if (marker.fileContentId() > 0)
+  if (marker.fileContentId > 0)
   {
-    Core::RemoveElementRequest req1(marker.fileContentId());
+    Core::RemoveElementRequest req1(marker.fileContentId);
     m_requestHelper->addRequest([req1, this]()
     {
       return m_flmFtc->fileContentRemoveRequest(req1, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.h
index 99913c9f3..09951e45b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.h
@@ -7,7 +7,7 @@
 #include <MarkerManagement/mrk_dtc.h>
 #include <MarkerManagement/logger.h>
 #include <AudioVideoManagement/avm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <Lts/Services/FileManagement/flm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
index 61085943a..702a6295f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "mrk_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_mrk_edit_dialog.h"
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <QtCore/QDateTime>
@@ -24,6 +25,7 @@ MarkerEditDialog::MarkerEditDialog(int markerId,
   , m_streamNameMapping(streamNameMapping)
   , m_ui(new Ui::MarkerEditDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -40,9 +42,9 @@ MarkerEditDialog::MarkerEditDialog(int markerId,
 
   if (m_markerId > 0)
   {
-    m_ui->teNote->setText(QString::fromStdString(data.note()));
-    m_ui->spOffset->setValue(data.timeStampOffset()/1000);
-    m_ui->lblTimeStamp->setText(QDateTime::fromMSecsSinceEpoch(data.timeStamp()).toString(Qt::TextDate));
+    m_ui->teNote->setText(QString::fromStdString(data.note));
+    m_ui->spOffset->setValue(data.timeStampOffset/1000);
+    m_ui->lblTimeStamp->setText(QDateTime::fromMSecsSinceEpoch(data.timeStamp).toString(Qt::TextDate));
     createDescriptions(data);
   }
 
@@ -56,8 +58,8 @@ MarkerEditDialog::MarkerEditDialog(int markerId,
     m_ui->pteDebugMap->show();
     m_ui->pteDebugFilter->show();
 
-    m_ui->pteDebugMap->setPlainText(QString::fromStdString(data.mapSettings()));
-    m_ui->pteDebugFilter->setPlainText(QString::fromStdString(data.filter()));
+    m_ui->pteDebugMap->setPlainText(QString::fromStdString(data.mapSettings));
+    m_ui->pteDebugFilter->setPlainText(QString::fromStdString(data.filter));
   }
   setNoTopicLock(); 
 }
@@ -79,20 +81,20 @@ void MarkerEditDialog::createDescriptions(const MarkerManagement::Marker &marker
 {
   QIcon icon;
 
-  for (const auto &desc : marker.descriptions())
+  for (const auto &desc : marker.descriptions)
   {
-    if (desc.markerType() == MarkerManagement::MarkerType::Situation)
+    if (desc.markerType == MarkerManagement::MarkerType::Situation)
       icon = QIcon(QLatin1String("icon:set_marker_situation.svg"));
-    if (desc.markerType() == MarkerManagement::MarkerType::Audio)
+    if (desc.markerType == MarkerManagement::MarkerType::Audio)
       icon = QIcon(QLatin1String("icon:set_markers_audio.svg"));
-    if (desc.markerType() == MarkerManagement::MarkerType::Video)
+    if (desc.markerType == MarkerManagement::MarkerType::Video)
       icon = QIcon(QLatin1String("icon:set_marker_video.svg"));
 
     QString   description;
-    if (desc.markerType() == MarkerManagement::MarkerType::Video)
-      description = toDisplayNames(QString::fromStdString(desc.content()));
+    if (desc.markerType == MarkerManagement::MarkerType::Video)
+      description = toDisplayNames(QString::fromStdString(desc.content));
     else
-      description = QString::fromStdString(desc.content());
+      description = QString::fromStdString(desc.content);
 
     m_ui->lwDescriptions->addItem(new QListWidgetItem(icon, description));
   }
@@ -132,15 +134,15 @@ QString MarkerEditDialog::toDisplayNames(const QString &videoStreams)
 bool MarkerEditDialog::apply()
 {
   MarkerManagement::Marker request = m_dtc->marker(m_markerId);
-  if (request.note() == m_ui->teNote->toPlainText().toStdString() &&
-      request.timeStampOffset() == m_ui->spOffset->value())
+  if (request.note == m_ui->teNote->toPlainText().toStdString() &&
+      request.timeStampOffset == m_ui->spOffset->value())
     return false; 
 
-  request.note(m_ui->teNote->toPlainText().toStdString());
-  request.timeStampOffset(m_ui->spOffset->value() * 1000);  
+  request.note = m_ui->teNote->toPlainText().toStdString();
+  request.timeStampOffset = m_ui->spOffset->value() * 1000;  
 
   
-  int fileId = request.fileContentId();
+  int fileId = request.fileContentId;
   if (fileId > 0)
   {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
index 370e21585..fddcc1f7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
@@ -17,7 +17,7 @@
 #include <MarkerManagement/Gui/Common/mrk_dialog_model.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <LtsAppManager/lts_app_manager.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 #include <QtCore/QJsonDocument>
 #include <QJsonParseError>
@@ -355,7 +355,7 @@ void InterfaceImpl::startSnapshot()
       int tries = t->property("tries").toInt();
       Core::ReplayPartition replay = m_coreDtc->replayPartition(m_replayPartitionId);
 
-      if (replay.id() == m_replayPartitionId)
+      if (replay.id == m_replayPartitionId)
       {
         t->stop();
 
@@ -409,7 +409,7 @@ void InterfaceImpl::onReplayPartitionChanged(const Core::ReplayPartition &data,
     return;
   if (m_replayPartitionId < 0)
     return;
-  if (data.id() == m_replayPartitionId)
+  if (data.id == m_replayPartitionId)
   {
     m_replayPartitionId = -1;
     startSnapshotApp(data);
@@ -435,10 +435,10 @@ TopicEditorBase::TopicEditor *InterfaceImpl::createTopicEditor(const TopicEditor
 
 bool InterfaceImpl::applyFilter(const Snapshot &snapshot, NGL::INGLLogger &logger)
 {
-  const QByteArray filterContent(QByteArray::fromRawData(snapshot.filter().c_str(), snapshot.filter().size()));
+  const QByteArray filterContent(QByteArray::fromRawData(snapshot.filter.c_str(), snapshot.filter.size()));
   if (filterContent.isEmpty())
   {
-    WARNING_LOG(logger) << "filterContent is empty, snapshot.id(): " << snapshot.id();
+    WARNING_LOG(logger) << "filterContent is empty, snapshot.id(): " << snapshot.id;
     return false;
   }
 
@@ -489,7 +489,7 @@ bool InterfaceImpl::snapshotAdjustSitMap(const Snapshot &snapshot, bool bApplyFi
   
   if (sitMapGuiIfc != nullptr)
   {
-    const QByteArray ba(QByteArray::fromRawData(snapshot.mapSettings().c_str(), snapshot.mapSettings().size()));
+    const QByteArray ba(QByteArray::fromRawData(snapshot.mapSettings.c_str(), snapshot.mapSettings.size()));
 
     originalMapSettings = sitMapGuiIfc->operatorMapSettingsJson(); 
     
@@ -500,7 +500,7 @@ bool InterfaceImpl::snapshotAdjustSitMap(const Snapshot &snapshot, bool bApplyFi
     {
       sitMapGuiIfc->planOverlayRemove(snapShotOverlayId);
     }
-    const QByteArray &planOverlay = QByteArray(snapshot.planOverlay().c_str(), snapshot.planOverlay().size());
+    const QByteArray &planOverlay = QByteArray(snapshot.planOverlay.c_str(), snapshot.planOverlay.size());
     if (!planOverlay.isEmpty())
     {
       const bool bIsMapReady = sitMapGuiIfc->isMapReady();
@@ -646,17 +646,17 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
     m_snapshot = m_mrkDtc->snapshot(attributes[QStringLiteral("snapshotId")].toInt(0 ));
 
   
-  if (m_snapshot.id() <= 0 || m_snapshot.timeStamp() < 1)
+  if (m_snapshot.id <= 0 || m_snapshot.timeStamp < 1)
   {
-    WARNING_LOG(m_logger) << "cannot fetch live snapshot data (maybe snapshot with id '"<<attributes[QStringLiteral("snapshotId")].toInt(0 )<<"' was deleted), using saved data - timestamp: " << m_snapshot.timeStamp();
+    WARNING_LOG(m_logger) << "cannot fetch live snapshot data (maybe snapshot with id '"<<attributes[QStringLiteral("snapshotId")].toInt(0 )<<"' was deleted), using saved data - timestamp: " << m_snapshot.timeStamp;
 
-    m_snapshot.planOverlay(attributes[QStringLiteral("planOverlay")].toString().toUtf8().data());
-    m_snapshot.filter(attributes[QStringLiteral("snapshotFilter")].toString().toUtf8().data());
-    m_snapshot.timeStamp(qRound64(attributes[QStringLiteral("timeStamp")].toDouble()));
-    m_snapshot.mapSettings(attributes[QStringLiteral("mapSettings")].toString().toUtf8().data());
+    m_snapshot.planOverlay = attributes[QStringLiteral("planOverlay")].toString().toUtf8().data();
+    m_snapshot.filter = attributes[QStringLiteral("snapshotFilter")].toString().toUtf8().data();
+    m_snapshot.timeStamp = qRound64(attributes[QStringLiteral("timeStamp")].toDouble());
+    m_snapshot.mapSettings = attributes[QStringLiteral("mapSettings")].toString().toUtf8().data();
   }
 
-  if (m_snapshot.timeStamp() < 1)
+  if (m_snapshot.timeStamp < 1)
   {
     WARNING_LOG(m_logger) << "invalid snapshot timestamp for playback: " << QString::fromUtf8(QJsonDocument(attributes).toJson());
     return false;
@@ -682,7 +682,7 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
 
 bool TopicReplayInterface::playbackStart(int )
 {
-  return m_srpIfc->startReplay(m_snapshot.timeStamp(), m_snapshot.timeStamp(), 0 );
+  return m_srpIfc->startReplay(m_snapshot.timeStamp, m_snapshot.timeStamp, 0 );
 }
 
 bool TopicReplayInterface::playbackPause()
@@ -732,10 +732,10 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
 
       MarkerManagement::Marker req;
 
-      auto &descriptions = req.descriptions();
+      auto &descriptions = req.descriptions;
 
       MarkerManagement::MarkerDescription ma;
-      ma.markerType() = MarkerManagement::MarkerType::Situation;
+      ma.markerType = MarkerManagement::MarkerType::Situation;
       descriptions.push_back(ma);
 
       
@@ -743,16 +743,16 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
         return false;
 
       const QByteArray mapSettings = m_sitMapGuiIfc->operatorMapSettingsJson();
-      req.mapSettings(mapSettings.constData());
+      req.mapSettings = mapSettings.constData();
       
       
 
       if (ev->getDescription().size() > 0)
-        req.note(ev->getDescription().toStdString());
-      req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-      req.timeStamp(QDateTime::currentMSecsSinceEpoch());
-      req.timeStampOffset(10000);
-      req.fileContentId(0);
+        req.note = ev->getDescription().toStdString();
+      req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+      req.timeStamp = QDateTime::currentMSecsSinceEpoch();
+      req.timeStampOffset = 10000;
+      req.fileContentId = 0;
 
       if (!m_requestHelper)
         m_requestHelper = new LtsUtils::RequestHelper(this);
@@ -762,7 +762,7 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
         return m_ftc->markerModifyRequest(req, this);
       }))
       {
-        req.id(m_requestHelper->getRepliedId());
+        req.id = m_requestHelper->getRepliedId();
         DEBUG_LOG(m_logger) << "Saved Marker with id = " << m_requestHelper->getRepliedId();
       }
 
@@ -831,19 +831,19 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
       const QByteArray &movementTracks = m_sitMapGuiIfc->movementTrackManagerSettingsJson();
 
       MarkerManagement::Snapshot req;
-      req.id(0);
-      req.name(ev->getDescription().toStdString());
-      req.description(ev->getDescription().toStdString());
+      req.id = 0;
+      req.name = ev->getDescription().toStdString();
+      req.description = ev->getDescription().toStdString();
 
-      req.mapSettings(mapSettings.constData());
-      req.movementTracks(movementTracks.constData());
+      req.mapSettings = mapSettings.constData();
+      req.movementTracks = movementTracks.constData();
       
       
-      req.planOverlay(std::string());
+      req.planOverlay = std::string();
 
-      req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-      req.timeStamp(partitionTime);
-      req.fileContentId(0);
+      req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+      req.timeStamp = partitionTime;
+      req.fileContentId = 0;
 
       if (!m_requestHelper)
         m_requestHelper = new LtsUtils::RequestHelper(this);
@@ -853,7 +853,7 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
         return m_ftc->snapshotModifyRequest(req, this);
       }))
       {
-        req.id(m_requestHelper->getRepliedId());
+        req.id = m_requestHelper->getRepliedId();
         DEBUG_LOG(m_logger) << "Saved Snapshot with id = " << m_requestHelper->getRepliedId();
       }
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
index 6eec45c4d..4c7ae4197 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
@@ -1,10 +1,11 @@
 #include "mrk_set_markers.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_mrk_set_markers.h"
 
 #include <nglsettings/nglsettings_settings.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/await.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <ngltools/ngltools_dtg.h>
@@ -61,8 +62,7 @@ bool containsStream(QComboBox *cb, const QString &internalStreamName)
 
 namespace MarkerManagement
 {
-FinishedSignal::FinishedSignal() : QObject(),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+FinishedSignal::FinishedSignal() : QObject() {}
 
 
 SetMarkers::SetMarkers(LtsSession::LtsSession *session, QWidget *parent)
@@ -70,6 +70,7 @@ SetMarkers::SetMarkers(LtsSession::LtsSession *session, QWidget *parent)
   , m_session(session)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::SetMarkers)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->dteMarkerTime->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
@@ -119,7 +120,7 @@ bool SetMarkers::init(const std::shared_ptr<MarkerManagement::Interface::Dtc> &m
     return false;
 
   m_editData = data;
-  m_fileId = data.fileContentId();
+  m_fileId = data.fileContentId;
 
   m_dtc = mrk_dtc;
   m_ftc = mrk_ftc;
@@ -268,14 +269,14 @@ QByteArray SetMarkers::getFilterParams() const
 void SetMarkers::sendMarkerRequest() noexcept(false)
 {
   Marker req;
-  auto &descriptions = req.descriptions();
+  auto &descriptions = req.descriptions;
   MarkerManagement::MarkerDescription ma;
   const QLatin1Char   selectionIndicator = QLatin1Char('*');
 
   
   if (m_ui->cbSit->isChecked())
   {
-    ma.markerType() = MarkerManagement::MarkerType::Situation;
+    ma.markerType = MarkerManagement::MarkerType::Situation;
     descriptions.push_back(ma);
 
     
@@ -284,14 +285,14 @@ void SetMarkers::sendMarkerRequest() noexcept(false)
       return;
 
     const QByteArray mapSettings = spSitMapGuiIfc->operatorMapSettingsJson();
-    req.mapSettings(mapSettings.constData());
-    req.filter(getFilterParams().constData());
+    req.mapSettings = mapSettings.constData();
+    req.filter = getFilterParams().constData();
   }
 
   
   if (m_ui->cbAudio->isChecked())
   {
-    ma.markerType() = MarkerManagement::MarkerType::Audio;
+    ma.markerType = MarkerManagement::MarkerType::Audio;
 
     QStringList slStreamlist;
     slStreamlist.reserve(m_ui->cbxAudioStreams->count());
@@ -304,14 +305,14 @@ void SetMarkers::sendMarkerRequest() noexcept(false)
       if (allAudioStreamsSelected || m_ui->cbxAudioStreams->currentIndex() == i) 
         slStreamlist.last().append(selectionIndicator);
     }
-    ma.content() = slStreamlist.join(QStringLiteral(", ")).toStdString();
+    ma.content = slStreamlist.join(QStringLiteral(", ")).toStdString();
     descriptions.push_back(ma);
   }
 
   
   if (m_ui->cbVideo->isChecked())
   {
-    ma.markerType() = MarkerManagement::MarkerType::Video;
+    ma.markerType = MarkerManagement::MarkerType::Video;
 
     QStringList slStreamlist;
     slStreamlist.reserve(m_ui->cbxVideoStreams->count());
@@ -324,21 +325,21 @@ void SetMarkers::sendMarkerRequest() noexcept(false)
       if (allVideoStreamsSelected || m_ui->cbxVideoStreams->currentIndex() == i) 
         slStreamlist.last().append(selectionIndicator);
     }
-    ma.content() = slStreamlist.join(QStringLiteral(", ")).toStdString();
+    ma.content = slStreamlist.join(QStringLiteral(", ")).toStdString();
     descriptions.push_back(ma);
   }
 
-  req.note(m_ui->teNote->toPlainText().toStdString());
-  req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  req.timeStamp(m_ui->dteMarkerTime->msecsSinceEpoch());
-  req.timeStampOffset(m_ui->cbxOffset->currentText().toInt() * 1000);
-  req.fileContentId(m_fileId);
+  req.note = m_ui->teNote->toPlainText().toStdString();
+  req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  req.timeStamp = m_ui->dteMarkerTime->msecsSinceEpoch();
+  req.timeStampOffset = m_ui->cbxOffset->currentText().toInt() * 1000;
+  req.fileContentId = m_fileId;
 
   DEBUG_LOG(m_logger) << "Start Marker request with file content Id = " << m_fileId;
 
   auto id = m_ftc->markerModifyRequest(req); 
 
-  m_editData.id(id);
+  m_editData.id = id;
 
   DEBUG_LOG(m_logger) << "Saved marker with id = " << m_requestHelper->getRepliedId();
 }
@@ -396,22 +397,22 @@ void SetMarkers::saveMarkerInLibrary() noexcept(false)
   }
 
   FileManagement::FileContentModifyRequest request;
-  request.id(m_fileId);
-  request.name(title.toStdString());
-  request.isTemplate(false);
-  request.folderId(folderId);
-  request.fileCategory(FileManagement::FileCategory::Exercise);
-  request.fileStatus(FileManagement::FileStatus::Valid);
-  request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+  request.id = m_fileId;
+  request.name = title.toStdString();
+  request.isTemplate = false;
+  request.folderId = folderId;
+  request.fileCategory = FileManagement::FileCategory::Exercise;
+  request.fileStatus = FileManagement::FileStatus::Valid;
+  request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   bool bIsPng;
-  request.content() = LtsUtils::fromImage(img, &bIsPng);
-  request.fileType(bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg);
-  request.isUsedBy(true);
-  request.usedBy(1);
-  request.lastModified(QDateTime::currentMSecsSinceEpoch());
+  request.content = LtsUtils::fromImage(img, &bIsPng);
+  request.fileType = bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg;
+  request.isUsedBy = true;
+  request.usedBy = 1;
+  request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
   if (m_session->exerciseId() > 0)
-    request.exerciseId(m_session->exerciseId());
+    request.exerciseId = m_session->exerciseId();
 
   try
   {
@@ -427,10 +428,10 @@ void SetMarkers::saveMarkerInLibrary() noexcept(false)
 
   sendMarkerRequest(); 
 
-  if (m_editData.fileContentId() != m_fileId)
+  if (m_editData.fileContentId != m_fileId)
   {
     DEBUG_LOG(m_logger) << "One more request needed!";
-    m_editData.fileContentId(m_fileId);
+    m_editData.fileContentId = m_fileId;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
index 69195225c..77f70e90f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
@@ -3,20 +3,21 @@
 
 
 #include "snapshot_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_snapshot_dialog.h"
 
 #include "snapshot_dialog_model.h"
 #include "mrk_create_snapshot.h"
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsSession/lts_session_data.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPrinting/printing.h>
 
 #include <PlanEditor/PlanEditorPlugin/plan_editor_gui_plugin_interface.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 
 
 #include <PlanOverlays/plan_overlays_plugin_interface.h>
@@ -50,6 +51,7 @@ SnapshotDialog::SnapshotDialog(const QString &menuGroup, LtsSession::LtsSession
   , m_planEditorHasUpdatedThePlan(false)
   , m_planEditorApp(nullptr)
   , m_fileId(-1)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
@@ -109,7 +111,7 @@ void SnapshotDialog::onShow()
   const QModelIndex &idx = m_ui->widget->currentIndex();
   const MarkerManagement::Snapshot &snapshot = m_model->getRowData(idx.row());
 
-  if (snapshot.id() <= 0)
+  if (snapshot.id <= 0)
     return;
 
   m_currentSnapshot = snapshot; 
@@ -120,10 +122,10 @@ void SnapshotDialog::onShow()
 
 void SnapshotDialog::onRefreshCurrent(const Snapshot &snapshot)
 {
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << snapshot.id();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << snapshot.id;
 
   
-  if (snapshot.id() != m_currentSnapshot.id())
+  if (snapshot.id != m_currentSnapshot.id)
     return;
 
   m_currentSnapshot = snapshot;
@@ -133,7 +135,7 @@ void SnapshotDialog::onRefreshCurrent(const Snapshot &snapshot)
 
 void SnapshotDialog::showSnapshot()
 {
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << m_currentSnapshot.id();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << m_currentSnapshot.id;
   showSnapshotInternal(m_currentSnapshot, true); 
 
   enaDisa();
@@ -142,11 +144,11 @@ void SnapshotDialog::showSnapshot()
 
 bool SnapshotDialog::applyFilter(const Snapshot &snapshot)
 {
-  const QByteArray filterContent(QByteArray::fromRawData(snapshot.filter().c_str(), snapshot.filter().size()));
+  const QByteArray filterContent(QByteArray::fromRawData(snapshot.filter.c_str(), snapshot.filter.size()));
 
   if (filterContent.isEmpty())
   {
-    ERROR_LOG(m_logger) << "filterContent is empty, snapshot.id()="<< snapshot.id();
+    ERROR_LOG(m_logger) << "filterContent is empty, snapshot.id()="<< snapshot.id;
     return false;
   }
 
@@ -161,7 +163,7 @@ bool SnapshotDialog::applyFilter(const Snapshot &snapshot)
 
   
   
-  if (m_planEditorApp && (m_currentSnapshot.id() == snapshot.id()))
+  if (m_planEditorApp && (m_currentSnapshot.id == snapshot.id))
   {
     const int partitionId = m_session->partitionId();
     auto pe_session = m_planEditorApp->getSession(IDL::PartitionType::Replay, partitionId);
@@ -209,12 +211,12 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
                      << ", applyFilter=" << bApplyFilter;
 
   SituationReplay::ChangeReplayStateRequest req;
-  req.id(0);
-  req.replayPartitionId(partitionId);
-  req.state(SituationReplay::SrpState::Started);
-  req.beginTime(snapshot.timeStamp());
-  req.endTime(snapshot.timeStamp()); 
-  req.pace(0);
+  req.id = 0;
+  req.replayPartitionId = partitionId;
+  req.state = SituationReplay::SrpState::Started;
+  req.beginTime = snapshot.timeStamp;
+  req.endTime = snapshot.timeStamp; 
+  req.pace = 0;
 
   if (!m_requestHelper->startSingleRequest([req, this]() { return m_srpFtc->changeReplayStateRequest(req, this); }))
   {
@@ -245,10 +247,10 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
 
     
     {
-      const QByteArray ba(QByteArray::fromRawData(snapshot.mapSettings().c_str(), snapshot.mapSettings().size()));
+      const QByteArray ba(QByteArray::fromRawData(snapshot.mapSettings.c_str(), snapshot.mapSettings.size()));
       spSitMapGuiIfc->setOperatorMapSettingsJson(ba);
 
-      const QByteArray planOverlay(snapshot.planOverlay().c_str(), snapshot.planOverlay().size());
+      const QByteArray planOverlay(snapshot.planOverlay.c_str(), snapshot.planOverlay.size());
       if (!planOverlay.isEmpty())
       {
         
@@ -260,7 +262,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
           {
             if (!spSitMapGuiIfc->planOverlaySetContent(snapShotOverlayId, tr("Snapshot-PlanOverlay"), planOverlay, true))
             {
-              ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error add planOverlay to snapshot, SnapshotId: " << snapshot.id()
+              ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error add planOverlay to snapshot, SnapshotId: " << snapshot.id
                                   << " planOverlay.size()=" << planOverlay.size()
                                   << " planOverlay=" << planOverlay;
               success = false;
@@ -296,7 +298,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
             
             
 
-            const int snapshotId = snapshot.id();
+            const int snapshotId = snapshot.id;
             auto onMapIsReadyFn = [this, spSitMapGuiIfc, planOverlay, snapshotId]() {
               INFO_LOG(m_logger) << Q_FUNC_INFO  << " try again: do planOverlaySetContent...";
               if (!spSitMapGuiIfc->planOverlaySetContent(snapShotOverlayId, tr("Snapshot-PlanOverlay"), planOverlay, true))
@@ -317,16 +319,16 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
 
     
     {
-      const QByteArray ba(QByteArray::fromRawData(snapshot.movementTracks().c_str(), snapshot.movementTracks().size()));
+      const QByteArray ba(QByteArray::fromRawData(snapshot.movementTracks.c_str(), snapshot.movementTracks.size()));
       if (!spSitMapGuiIfc->setMovementTrackManagerSettingsJSon(ba))
       {
-        ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error setMovementTrackManagerSettingsJSon, SnapshotId: " << snapshot.id();
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error setMovementTrackManagerSettingsJSon, SnapshotId: " << snapshot.id;
         success = false;
       }
     }
   }
 
-  QString name = tr("Snapshot '%1'").arg(QString::fromStdString(m_currentSnapshot.name()));
+  QString name = tr("Snapshot '%1'").arg(QString::fromStdString(m_currentSnapshot.name));
   m_session->baseLayout()->setCustomText(name);
   spSitMapGuiIfc->showExerciseTimeString(true);
   return success;
@@ -342,10 +344,10 @@ void SnapshotDialog::onEditPlan()
 
   
   
-  if (snapshot.id() != m_currentSnapshot.id())
+  if (snapshot.id != m_currentSnapshot.id)
     onShow();
 
-  if (m_currentSnapshot.id() <= 0)
+  if (m_currentSnapshot.id <= 0)
     return;
 
   
@@ -403,7 +405,7 @@ void SnapshotDialog::onPlaneditorFinished()
 
   if (m_planEditorHasUpdatedThePlan)
   {
-    const QString &title = QString::fromStdString(m_currentSnapshot.name());
+    const QString &title = QString::fromStdString(m_currentSnapshot.name);
     saveSnapshotPreviewInLibrary(title);
   }
 
@@ -446,16 +448,16 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
   
 
 
-  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << m_currentSnapshot.id()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << m_currentSnapshot.id
                        << ", PlanEditor - partitionId = " << partitionId;
 
   SituationReplay::ChangeReplayStateRequest req;
-  req.id(0);
-  req.replayPartitionId(partitionId);
-  req.state(SituationReplay::SrpState::Started);
-  req.beginTime(m_currentSnapshot.timeStamp());
-  req.endTime(m_currentSnapshot.timeStamp());
-  req.pace(0);
+  req.id = 0;
+  req.replayPartitionId = partitionId;
+  req.state = SituationReplay::SrpState::Started;
+  req.beginTime = m_currentSnapshot.timeStamp;
+  req.endTime = m_currentSnapshot.timeStamp;
+  req.pace = 0;
 
   if (!m_requestHelper->startSingleRequest([req, this]() { return m_srpFtc->changeReplayStateRequest(req, this); }))
   {
@@ -468,7 +470,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
 #define PlanEditorForSnapshot3D
 #ifdef PlanEditorForSnapshot3D
   {
-  const QByteArray ba(QByteArray::fromRawData(m_currentSnapshot.mapSettings().c_str(), m_currentSnapshot.mapSettings().size()));
+  const QByteArray ba(QByteArray::fromRawData(m_currentSnapshot.mapSettings.c_str(), m_currentSnapshot.mapSettings.size()));
 
     QJsonParseError parserError;
     const QJsonDocument jDoc(QJsonDocument::fromJson(ba, &parserError));
@@ -498,7 +500,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
 
   applyFilter(m_currentSnapshot);
 
-  planEditorIfc->setPlanToEdit( QByteArray::fromStdString(m_currentSnapshot.planOverlay()) );  
+  planEditorIfc->setPlanToEdit( QByteArray::fromStdString(m_currentSnapshot.planOverlay) );  
 
   planEditorIfc->addSaveSnapshotAction(QIcon(), tr("Save Plan to Snapshot"), [this](const QByteArray & planXMLContent) -> bool
   {
@@ -534,9 +536,9 @@ void SnapshotDialog::prepareIndex(const QModelIndex &idx)
 {
   const MarkerManagement::Snapshot &snapshot = m_model->getRowData(idx.row());
 
-  DEBUG_LOG(m_logger) << "Prepare index for snapshot with id = " << snapshot.id();
+  DEBUG_LOG(m_logger) << "Prepare index for snapshot with id = " << snapshot.id;
 
-  const int fileId = snapshot.fileContentId();
+  const int fileId = snapshot.fileContentId;
   if (fileId > 0) 
   {
     DEBUG_LOG(m_logger) << "Loading file content with id = " << fileId;
@@ -544,10 +546,10 @@ void SnapshotDialog::prepareIndex(const QModelIndex &idx)
     QByteArray content;
     if (m_flmGui->loadContent(fileId, content) && content.size() > 0)
     {
-      QString timeStr = DTG::toStringMSec(snapshot.timeStamp());
+      QString timeStr = DTG::toStringMSec(snapshot.timeStamp);
 
-      QString name = QString::fromStdString(snapshot.name());
-      m_descriptions.append( QString::fromStdString(snapshot.description()));
+      QString name = QString::fromStdString(snapshot.name);
+      m_descriptions.append( QString::fromStdString(snapshot.description));
       m_imageTitles.append( name + QStringLiteral(" (")+ timeStr + QStringLiteral(")"));
       m_images.append(QImage::fromData(content));
 
@@ -561,7 +563,7 @@ void SnapshotDialog::prepareIndex(const QModelIndex &idx)
     }
   }
   else
-    WARNING_LOG(m_logger) << "Not found: file id = 0 for snapshot id = " << snapshot.id();
+    WARNING_LOG(m_logger) << "Not found: file id = 0 for snapshot id = " << snapshot.id;
 }
 
 
@@ -588,7 +590,7 @@ bool SnapshotDialog::saveSnapshotPlan(const QByteArray &planXMLContent)
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " save snapshot";
 
   
-  m_currentSnapshot.planOverlay(planXMLContent.constData());
+  m_currentSnapshot.planOverlay = planXMLContent.constData();
 
   bool ok = m_requestHelper->startSingleRequest([this]()
   {
@@ -707,7 +709,7 @@ void SnapshotDialog::enaDisa()
   {
     const QModelIndex &idx = m_ui->widget->currentIndex();
     const MarkerManagement::Snapshot &userSelSnapshot = m_model->getRowData(idx.row());
-    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (m_currentSnapshot.id() > 0) && (userSelSnapshot.id() == m_currentSnapshot.id()));
+    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (m_currentSnapshot.id > 0) && (userSelSnapshot.id == m_currentSnapshot.id));
   }
 
 
@@ -722,8 +724,8 @@ void SnapshotDialog::enaDisa()
   const MarkerManagement::Snapshot &snapshot = m_model->getRowData(idx.row());
 
   QJsonParseError error;
-  QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(snapshot.mapSettings().c_str(),
-                                                                    snapshot.mapSettings().size()), &error));
+  QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(snapshot.mapSettings.c_str(),
+                                                                    snapshot.mapSettings.size()), &error));
 
   if (error.error == QJsonParseError::NoError)
   {
@@ -751,7 +753,7 @@ void SnapshotDialog::enaDisa()
   
   bool bSelectedSnapshotActuallyInEditor = true;
   if (m_planEditorApp)
-    bSelectedSnapshotActuallyInEditor = snapshot.id() == m_currentSnapshot.id();
+    bSelectedSnapshotActuallyInEditor = snapshot.id == m_currentSnapshot.id;
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, (cntSelectedRows == 1) && mapReady && bSelectedSnapshotActuallyInEditor);
 
   
@@ -766,7 +768,7 @@ void SnapshotDialog::enaDisa()
   if (selectedSnapIds.isEmpty())
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, false);
   else
-    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, !selectedSnapIds.contains(m_currentSnapshot.id()));
+    m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, !selectedSnapIds.contains(m_currentSnapshot.id));
 }
 
 
@@ -775,16 +777,16 @@ void SnapshotDialog::onEditMetaData()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const MarkerManagement::Snapshot snapshot = m_model->getRowData(idx.row());
 
-  if (snapshot.id() <= 0)
+  if (snapshot.id <= 0)
     return;
 
-  INFO_LOG(m_logger) << "current SnapshotId: " << snapshot.id();
+  INFO_LOG(m_logger) << "current SnapshotId: " << snapshot.id;
 
-  if (snapshot.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+  if (snapshot.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   { 
     addDialog(LtsWidgets::initDialog(new SnapshotCreateDialog(this),
                                      m_mrkFtc, m_flmDtc, m_flmFtc, m_sitMapGuiIfc, m_fltParticipantIfc, m_fltAesIfc, m_fltBuildingComponentIfc, m_session, snapshot),
-              m_menuGroup, QStringLiteral("EditSnapshot%1").arg(snapshot.id()));
+              m_menuGroup, QStringLiteral("EditSnapshot%1").arg(snapshot.id));
   }
   else
   { 
@@ -802,10 +804,10 @@ void SnapshotDialog::onEditMetaData()
       
     {
       Snapshot req(snapshot);
-      req.id(0);
-      req.name((tr("Copy - %1").arg(QString::fromStdString(snapshot.name()))).toStdString());
-      req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-      req.fileContentId(0); 
+      req.id = 0;
+      req.name = tr("Copy - %1").arg(QString::fromStdString(snapshot.name)).toStdString();
+      req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+      req.fileContentId = 0; 
       m_requestHelper->startSingleRequest([req, this]()
       {
         return m_mrkFtc->snapshotModifyRequest(req, this);
@@ -832,9 +834,9 @@ QVector<int> SnapshotDialog::selectedSnapshotIds() const
     if (!idx.isValid())
       continue;
     const MarkerManagement::Snapshot snapshot = m_model->getRowData(idx.row());
-    if (snapshot.id() <= 0)
+    if (snapshot.id <= 0)
       continue;
-    selectedSnapshotIds.push_back(snapshot.id());
+    selectedSnapshotIds.push_back(snapshot.id);
   } 
   return selectedSnapshotIds;
 }
@@ -848,16 +850,16 @@ void SnapshotDialog::onRemoveSnapshots()
     if (!idx.isValid())
       continue;
     const MarkerManagement::Snapshot &snapshot = m_model->getRowData(idx.row());
-    if (snapshot.id() <= 0)
+    if (snapshot.id <= 0)
       continue;
-    Core::RemoveElementRequest req(snapshot.id());
+    Core::RemoveElementRequest req(snapshot.id);
     m_requestHelper->addRequest([req, this]()
     {
       return m_mrkFtc->snapshotRemoveRequest(req, this);
     });
-    if (snapshot.fileContentId() > 0)
+    if (snapshot.fileContentId > 0)
     {
-      Core::RemoveElementRequest req1(snapshot.fileContentId());
+      Core::RemoveElementRequest req1(snapshot.fileContentId);
       m_requestHelper->addRequest([req1, this]()
       {
         return m_flmFtc->fileContentRemoveRequest(req1, this);
@@ -883,20 +885,20 @@ void SnapshotDialog::saveSnapshotFilter()
   
   const QByteArray mapSettings = spSitMapGuiIfc->operatorMapSettingsJson();
   Snapshot req(m_currentSnapshot);
-  req.mapSettings(mapSettings.data());
-  req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+  req.mapSettings = mapSettings.data();
+  req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
-  DEBUG_LOG(m_logger) << "File content id (of preview image) = " << m_currentSnapshot.fileContentId();
-  req.fileContentId(m_fileId);
+  DEBUG_LOG(m_logger) << "File content id (of preview image) = " << m_currentSnapshot.fileContentId;
+  req.fileContentId = m_fileId;
 
   
   MarkerManagementApplyFilter appFilter(m_session, m_fltParticipantIfc, m_fltAesIfc, m_fltBuildingComponentIfc);
   const QByteArray &filterParams = appFilter.getFilterParams();
-  req.filter(filterParams.constData());
+  req.filter = filterParams.constData();
 
   
   const QByteArray &movementTracks = spSitMapGuiIfc->movementTrackManagerSettingsJson();
-  req.movementTracks(movementTracks.constData());
+  req.movementTracks = movementTracks.constData();
 
   
   
@@ -918,8 +920,8 @@ void SnapshotDialog::onSaveSettings()
   
 
   const MarkerManagement::Snapshot &snapshot = m_currentSnapshot;
-  const QString title = QString::fromStdString(snapshot.name());
-  m_fileId = snapshot.fileContentId();
+  const QString title = QString::fromStdString(snapshot.name);
+  m_fileId = snapshot.fileContentId;
 
   saveSnapshotPreviewInLibrary(title);
 }
@@ -972,22 +974,22 @@ void SnapshotDialog::saveSnapshotPreviewInLibrary(const QString &snapshotTitle)
     const int folderId = snapshotFolderId > 0 ? snapshotFolderId : initialFolderId;
 
     FileManagement::FileContentModifyRequest request;
-    request.id(m_currentSnapshot.fileContentId());
-    request.name(title.toStdString());
-    request.isTemplate(false);
-    request.folderId(folderId);
-    request.fileCategory(FileManagement::FileCategory::Exercise);
-    request.fileStatus(FileManagement::FileStatus::Valid);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    request.id = m_currentSnapshot.fileContentId;
+    request.name = title.toStdString();
+    request.isTemplate = false;
+    request.folderId = folderId;
+    request.fileCategory = FileManagement::FileCategory::Exercise;
+    request.fileStatus = FileManagement::FileStatus::Valid;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     bool bIsPng;
-    request.content() = LtsUtils::fromImage(image, &bIsPng);
-    request.fileType(bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg);
-    request.isUsedBy(true);
-    request.usedBy(1);
-    request.lastModified(QDateTime::currentMSecsSinceEpoch());
+    request.content = LtsUtils::fromImage(image, &bIsPng);
+    request.fileType = bIsPng ? FileManagement::FileType::Png : FileManagement::FileType::Jpg;
+    request.isUsedBy = true;
+    request.usedBy = 1;
+    request.lastModified = QDateTime::currentMSecsSinceEpoch();
 
     if (m_session->exerciseId() > 0)
-      request.exerciseId(m_session->exerciseId());
+      request.exerciseId = m_session->exerciseId();
 
     if (m_requestHelper->startSingleRequest([this, request]()
     {
@@ -999,10 +1001,10 @@ void SnapshotDialog::saveSnapshotPreviewInLibrary(const QString &snapshotTitle)
 
       saveSnapshotFilter();
 
-      if (m_currentSnapshot.fileContentId() != m_fileId)
+      if (m_currentSnapshot.fileContentId != m_fileId)
       {
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << " One more request needed!";  
-        m_currentSnapshot.fileContentId(m_fileId);
+        m_currentSnapshot.fileContentId = m_fileId;
       }
     } else {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " Saved file in library with id = " << m_fileId << " failed";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
index e2b82d274..f201b656a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
@@ -3,9 +3,10 @@
 
 
 #include "snapshot_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <ngltools/ngltools_dtg.h>
 #include <QtCore/QSet>
 #include <QtCore/QJsonDocument>
@@ -28,6 +29,7 @@ SnapshotDialogModel::SnapshotDialogModel(QObject *parent)
                                                 tr("File Id"),
                                                 tr("Image")},
                                                 parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 bool SnapshotDialogModel::initModel(const std::shared_ptr<MarkerManagement::Interface::Dtc> &dtc,
@@ -40,7 +42,7 @@ bool SnapshotDialogModel::initModel(const std::shared_ptr<MarkerManagement::Inte
 
   auto cbUser = [this](const OperatorManagement::User &user)
   {
-    m_operatorNames[user.id()] = QString::fromStdString(user.name());
+    m_operatorNames[user.id] = QString::fromStdString(user.name);
   };
   connect(opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged, this, cbUser);
   opmDtc->users(cbUser);
@@ -79,13 +81,13 @@ QVariant SnapshotDialogModel::data(const QModelIndex &index, int role) const
   if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
   {
     if (index.column() == ColOperator)
-      return snapshot.operatorId();
+      return snapshot.operatorId;
     return QVariant();
   }
 
   if (role == Qt::ToolTipRole) 
   {
-    const int fileContentId = snapshot.fileContentId();
+    const int fileContentId = snapshot.fileContentId;
     if (fileContentId > 0)
     {
       auto it = m_previews.find(fileContentId);
@@ -104,17 +106,17 @@ QVariant SnapshotDialogModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ColName:
-      return QString::fromStdString(snapshot.name());
+      return QString::fromStdString(snapshot.name);
     case ColDescription:
-      return QString::fromStdString(snapshot.description());
+      return QString::fromStdString(snapshot.description);
     case ColTime:
-      return QDateTime::fromMSecsSinceEpoch(snapshot.timeStamp());
+      return QDateTime::fromMSecsSinceEpoch(snapshot.timeStamp);
     case ColOperator:
-      return m_operatorNames.value(snapshot.operatorId());
+      return m_operatorNames.value(snapshot.operatorId);
     case ColFileId:
-      return snapshot.fileContentId();
+      return static_cast<qint64>(snapshot.fileContentId);
     case ColImage:
-      return m_previews.value(snapshot.fileContentId());
+      return m_previews.value(snapshot.fileContentId);
     }
   }
 
@@ -137,7 +139,7 @@ void SnapshotDialogModel::onFileContentChanged(const FileManagement::FileContent
   
   if (modType == DataModification::eModified)
   {
-    const int fileContentId = fileContent.id();
+    const int fileContentId = fileContent.id;
     
     if (m_previews.contains(fileContentId))
       m_previews.remove(fileContentId);
@@ -148,7 +150,7 @@ void SnapshotDialogModel::updateOperatorNames()
 {
   QSet<int> operatorIds;
   for (const auto &op : std::as_const(m_vecData))
-    operatorIds.insert(op.operatorId());
+    operatorIds.insert(op.operatorId);
 
   LtsWidgets::ComboboxFilterContent cfc;
   LtsWidgets::ComboboxFilterData cfd;
@@ -243,7 +245,7 @@ bool SnapshotDialogFilterProxyModel::lessThan(const QModelIndex &source_left, co
   switch (source_left.column())
   {
   case SnapshotDialogModel::ColTime:
-    return left.timeStamp() < right.timeStamp();
+    return left.timeStamp < right.timeStamp;
   default:
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/CMakeLists.txt
index 5239593d8..6d6180c62 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/CMakeLists.txt
@@ -33,6 +33,11 @@ NGL_WRAP_UI(msg_messaging_gui_SRCS
 )
 
 NGL_ADD_LIBRARY(WS MsgMessageingGuiPlugin MODULE ${msg_messaging_gui_SRCS})
+# msg_new_message_dialog.cpp includes LtsWidgets/ui_requirement.h (a handwritten header,
+# not a UI file). Qt6's strict AUTOUIC auto-scan then demands a requirement.ui that does
+# not exist and fails the autogen step. The real .ui files are wrapped explicitly above
+# via NGL_WRAP_UI (qt6_wrap_ui), so disable the auto-scan (same approach as LtsWidgets).
+set_target_properties(MsgMessageingGuiPlugin PROPERTIES AUTOUIC OFF)
 if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(MsgMessageingGuiPlugin
     LtsPrinting
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
index e789eea5d..42c769555 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
@@ -17,6 +17,7 @@ namespace Messaging
 
 MessagingView::MessagingView(const QString &menuGroup, LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("MessagingDialog"))
   , m_menuGroup(menuGroup)
   , m_model(nullptr)
   , m_box(MessagingModel::Box::InBox)
@@ -127,7 +128,7 @@ void MessagingView::onShowMessage()
   ShowMessageDialog *dialog = new ShowMessageDialog(m_session, this);
   dialog->init(m_dtc, m_ftc, m_opmCbxDtc, m_box, operatorMessage, m_menuGroup);
 
-  addDialog(dialog, m_menuGroup, QStringLiteral("msgShowMessage%1").arg(operatorMessage.id()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(dialog, m_menuGroup, QStringLiteral("msgShowMessage%1").arg(operatorMessage.id), LtsWidgets::LayoutArea::eDialogTab);
 
 } 
 
@@ -145,7 +146,7 @@ void MessagingView::onRemoveMessage()
 {
   m_requestHelper->startSingleRequest([this]()
   {
-    return m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(m_model->getRowData(m_ui->widget->currentIndex().row()).id(), false, false, true), this);
+    return m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(m_model->getRowData(m_ui->widget->currentIndex().row()).id, false, false, true), this);
   });
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
index ad38f49c7..8d2b252ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
@@ -123,15 +123,15 @@ void InterfaceImpl::initializeMessaging()
 void InterfaceImpl::slotOperatorMessageChanged(const Messaging::OperatorMessage &msg, const DataModification &mod)
 {
   
-  if (!isMyMessage(msg.recipientId(), msg.recipientType()))
+  if (!isMyMessage(msg.recipientId, msg.recipientType))
     return;
 
-  if (!msg.isRead() && mod == DataModification::eAdded)
+  if (!msg.isRead && mod == DataModification::eAdded)
   {
 
-    if (!m_unreadMessages.contains(msg.id()))
+    if (!m_unreadMessages.contains(msg.id))
     {
-      m_unreadMessages.append(msg.id());
+      m_unreadMessages.append(msg.id);
 
       const QString openMessageLink(QStringLiteral("OpenMessages"));
       int msgCount = m_unreadMessages.count();
@@ -145,8 +145,8 @@ void InterfaceImpl::slotOperatorMessageChanged(const Messaging::OperatorMessage
     }
   }
 
-  if ((msg.isRead() && (mod == DataModification::eModified)) || mod == DataModification::eRemoved)
-    m_unreadMessages.removeAll(msg.id()); 
+  if ((msg.isRead && (mod == DataModification::eModified)) || mod == DataModification::eRemoved)
+    m_unreadMessages.removeAll(msg.id); 
 
   updateUnreadCount();
 }
@@ -159,9 +159,9 @@ void InterfaceImpl::slotSpecificsEquipmentChanged(const TrainingAreaBaseOC::Spec
   if (m_session->app() == LtsAppDescriptor::App::OC)
   {
     int oldParticipantId = m_ownParticipantId;
-    m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
+    m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber);
     if (m_ownParticipantId <= 0)
-      WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
+      WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber << " is not present in current set of PPM-participants.";
 
     if (oldParticipantId != m_ownParticipantId)
       evaluateMessages();
@@ -270,9 +270,9 @@ void InterfaceImpl::evaluateMessages()
   m_unreadMessages.clear();
   auto cb = [this](const Messaging::OperatorMessage & msg)
   {
-    if (this->isMyMessage(msg.recipientId(), msg.recipientType())
-        && !msg.isRead())
-      m_unreadMessages.append(msg.id());
+    if (this->isMyMessage(msg.recipientId, msg.recipientType)
+        && !msg.isRead)
+      m_unreadMessages.append(msg.id);
   };
   m_dtc->operatorMessages(cb);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.cpp
index 99c2bfb69..1b4f3e70a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.cpp
@@ -23,6 +23,7 @@ MessagingModel::MessagingModel(QObject *parent)
   tr("Subject")
 },
 parent)
+, m_logger(getLogger("MessagingModel"))
 , m_dtc(nullptr)
 , m_box(MessagingModel::Box::InBox)
 , m_operatorId(0)
@@ -71,18 +72,18 @@ QVariant MessagingModel::data(const QModelIndex &index, int role) const
     bool setBold = false;
     if (m_box == Box::InBox)
     {
-      if (!operatorMessage.isRead())
+      if (!operatorMessage.isRead)
         setBold = true;
     }
     else
     {
       if (m_app == LtsAppDescriptor::App::OC)
       {
-        const int opMsgId = operatorMessage.id();
+        const int opMsgId = operatorMessage.id;
         std::function<bool(const Messaging::OperatorMessage&)> cb = [&setBold, opMsgId] (const Messaging::OperatorMessage &message) -> bool
         {
-          if (message.correspondingOutboxMessageId() == opMsgId &&
-              !message.isSend())
+          if (message.correspondingOutboxMessageId == opMsgId &&
+              !message.isSend)
           {
             setBold = true;
             return true;  
@@ -105,19 +106,19 @@ QVariant MessagingModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case MessagingModel::OperatorId:
-      return operatorMessage.id();
+      return operatorMessage.id;
     case MessagingModel::TimeStamp:
-      return QDateTime::fromMSecsSinceEpoch(operatorMessage.timeStamp());
+      return QDateTime::fromMSecsSinceEpoch(operatorMessage.timeStamp);
     case MessagingModel::SenderText:
-      return QString::fromStdString(operatorMessage.senderText());
+      return QString::fromStdString(operatorMessage.senderText);
     case MessagingModel::SenderType:
-      return Messaging::toString(operatorMessage.senderType());
+      return Messaging::toString(operatorMessage.senderType);
     case MessagingModel::RecipientText:
-      return QString::fromStdString(operatorMessage.recipientText());
+      return QString::fromStdString(operatorMessage.recipientText);
     case MessagingModel::RecipientType:
-      return Messaging::toString(operatorMessage.recipientType());
+      return Messaging::toString(operatorMessage.recipientType);
     case MessagingModel::Subject:
-      return QString::fromStdString(operatorMessage.subject());
+      return QString::fromStdString(operatorMessage.subject);
     }
   }
   return QVariant();
@@ -131,12 +132,12 @@ bool MessagingModel::isFiltered(const OperatorMessage &msg, DataModification mod
   switch (m_box)
   {
   case Box::InBox:
-    if (((msg.recipientType() == Messaging::AddressType::Operator) && (m_operatorId != msg.recipientId())) ||
-        ((msg.recipientType() == Messaging::AddressType::ObserverController) && (m_ownParticipantId != msg.recipientId())))
+    if (((msg.recipientType == Messaging::AddressType::Operator) && (m_operatorId != msg.recipientId)) ||
+        ((msg.recipientType == Messaging::AddressType::ObserverController) && (m_ownParticipantId != msg.recipientId)))
       return true;
     break;
   case Box::OutBox:
-    return (m_operatorId != msg.senderId() || msg.correspondingOutboxMessageId() > 0);
+    return (m_operatorId != msg.senderId || msg.correspondingOutboxMessageId > 0);
   }
   return false;
 }
@@ -149,9 +150,9 @@ void MessagingModel::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Speci
   if (m_app == LtsAppDescriptor::App::OC)
   {
     int oldParticipantId = m_ownParticipantId;
-    m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
+    m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber);
     if (m_ownParticipantId <= 0)
-      WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
+      WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber << " is not present in current set of PPM-participants.";
 
     if (oldParticipantId != m_ownParticipantId)
       reInitModel();
@@ -188,7 +189,7 @@ bool MessagingProxyModel::lessThan(const QModelIndex &source_left, const QModelI
   switch (source_left.column())
   {
   case MessagingModel::TimeStamp:
-    return dataLeft.timeStamp() < dataRight.timeStamp();
+    return dataLeft.timeStamp < dataRight.timeStamp;
   case MessagingModel::OperatorId:
   case MessagingModel::SenderText:
   case MessagingModel::SenderType:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp
index bdf91a0f6..e2b44a39a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 #include "ui_msg_new_message_dialog.h"
 #include <LtsSession/lts_session_data.h>
-#include <LtsWidgets/requirement_widget.h>
+#include <LtsWidgets/ui_requirement.h>
 
 namespace Messaging
 {
@@ -92,6 +92,7 @@ NewMessageDialog::NewMessageDialog(LtsSession::LtsSession *session, QWidget *par
   , m_recipientModel(new RecipientModel(this))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(session)
+  , m_logger(getLogger("NewMessageDialog"))
 {
   INFO_LOG(m_logger) << "NewMessageDialog::Konstruktor";
   m_ui->setupUi(this);
@@ -120,7 +121,7 @@ NewMessageDialog::NewMessageDialog(LtsSession::LtsSession *session, QWidget *par
 
   m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(MAX_CHARS));
   QFontMetricsF fm(m_ui->lblCharsLeft->font());
-  m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
+  m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
 
   
   connect(m_ui->addrListView, &QListView::clicked,
@@ -174,24 +175,24 @@ bool NewMessageDialog::init(const std::shared_ptr<Messaging::Interface::Dtc> &dt
 
 bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
 {
-  m_ui->leSubject->setText(tr("Re: %1").arg(QString::fromStdString(msg.subject())));
-  if (msg.senderType() == Messaging::AddressType::ObserverController)
+  m_ui->leSubject->setText(tr("Re: %1").arg(QString::fromStdString(msg.subject)));
+  if (msg.senderType == Messaging::AddressType::ObserverController)
     m_ui->cbxAddrType->setChecked(true);
   fillAddressBox();
 
-  if (msg.senderType() == Messaging::AddressType::ObserverController)
+  if (msg.senderType == Messaging::AddressType::ObserverController)
   {
-    int idx = m_ui->cmbOperators->findData(0-msg.senderId());
-    INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId()
+    int idx = m_ui->cmbOperators->findData(0-msg.senderId);
+    INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId
                        << " idx = " << idx;
     m_ui->cmbOperators->setCurrentIndex(idx);
   }
   else
   {
-    if (msg.correspondingOutboxMessageId() <= 0)
+    if (msg.correspondingOutboxMessageId <= 0)
       return false;
-    const Messaging::OperatorMessage &senderMsg = m_dtc->operatorMessage(msg.correspondingOutboxMessageId());
-    int idx = m_ui->cmbOperators->findData(senderMsg.senderId());
+    const Messaging::OperatorMessage &senderMsg = m_dtc->operatorMessage(msg.correspondingOutboxMessageId);
+    int idx = m_ui->cmbOperators->findData(senderMsg.senderId);
     m_ui->cmbOperators->setCurrentIndex(idx);
   }
   addAddr();
@@ -199,15 +200,15 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
   const QString msgStr =
       QLatin1String("\n\n\n")
       + QLatin1String("-----------------------------------\n")
-      + tr("from: %1").arg(QString::fromStdString(msg.senderText()))
+      + tr("from: %1").arg(QString::fromStdString(msg.senderText))
       + QLatin1Char('\n')
-      + tr("sent: %1").arg(QDateTime::fromMSecsSinceEpoch(msg.timeStamp()).toString())
+      + tr("sent: %1").arg(QDateTime::fromMSecsSinceEpoch(msg.timeStamp).toString())
       + QLatin1Char('\n')
-      + tr("to: %1").arg(QString::fromStdString(msg.recipientText()))
+      + tr("to: %1").arg(QString::fromStdString(msg.recipientText))
       + QLatin1Char('\n')
-      + tr("subject: %1").arg(QString::fromStdString(msg.subject()))
+      + tr("subject: %1").arg(QString::fromStdString(msg.subject))
       + QLatin1String("\n\n")
-      + QString::fromStdString(msg.message());
+      + QString::fromStdString(msg.message);
 
   m_ui->teMessage->setText(msgStr);
   emit m_ui->teMessage->textChanged();
@@ -239,17 +240,17 @@ bool NewMessageDialog::apply()
     CreateOperatorMessageRequest comr;
     
     DEBUG_LOG(m_logger) << "request for Operators";
-    comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    comr.subject(subject.toStdString());
-    comr.senderType(Messaging::AddressType::Operator);
-    comr.message(message.toStdString());
-    comr.recipientType() = Messaging::AddressType::Operator;
-    comr.recipientIds().reserve(recvOperators.size());
+    comr.senderId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    comr.subject = subject.toStdString();
+    comr.senderType = Messaging::AddressType::Operator;
+    comr.message = message.toStdString();
+    comr.recipientType = Messaging::AddressType::Operator;
+    comr.recipientIds.reserve(recvOperators.size());
     
-    comr.exerciseId(m_session->exerciseId());
+    comr.exerciseId = m_session->exerciseId();
     for (const RecipientModel::Recipient &r : recvOperators)
     {
-      comr.recipientIds().push_back(r.recipientId);
+      comr.recipientIds.push_back(r.recipientId);
       DEBUG_LOG(m_logger) << "recipientId =" << r.recipientId;
     }
     m_requestHelper->addRequest([comr, this]()
@@ -265,16 +266,16 @@ bool NewMessageDialog::apply()
     CreateOperatorMessageRequest comrOC;
     
     DEBUG_LOG(m_logger) << "request for OCs";
-    comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    comrOC.subject(subject.toStdString());
-    comrOC.senderType(Messaging::AddressType::Operator);
-    comrOC.message(message.toStdString());
-    comrOC.recipientType() = Messaging::AddressType::ObserverController;
-    comrOC.recipientIds().reserve(recvOperators.size());
-    comrOC.exerciseId(m_session->exerciseId());
+    comrOC.senderId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    comrOC.subject = subject.toStdString();
+    comrOC.senderType = Messaging::AddressType::Operator;
+    comrOC.message = message.toStdString();
+    comrOC.recipientType = Messaging::AddressType::ObserverController;
+    comrOC.recipientIds.reserve(recvOperators.size());
+    comrOC.exerciseId = m_session->exerciseId();
     for (const RecipientModel::Recipient &r : recvOCs)
     {
-      comrOC.recipientIds().push_back(r.recipientId);
+      comrOC.recipientIds.push_back(r.recipientId);
       DEBUG_LOG(m_logger) << "recipientId OC =" << r.recipientId;
     }
     m_requestHelper->addRequest([comrOC, this]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
index af8621f78..fccbd39df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
@@ -26,6 +26,7 @@ ShowMessageDialog::ShowMessageDialog(LtsSession::LtsSession *session, QWidget *p
   , m_opmCbxDtc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(session)
+  , m_logger(getLogger("MessagingDialog"))
 {
   m_ui->setupUi(this);
   setUnchangeable(); 
@@ -43,7 +44,7 @@ ShowMessageDialog::~ShowMessageDialog()
 
 void ShowMessageDialog::retranslate()
 {
-  translate(m_ui, QString::fromStdString(m_operatorMessage.subject()), false , tr("Message"));
+  translate(m_ui, QString::fromStdString(m_operatorMessage.subject), false , tr("Message"));
 }
 
 bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
@@ -64,23 +65,23 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   m_ui->time->clear();
   m_ui->msgContent->clear();
 
-  m_ui->from->setText(QString::fromStdString(operatorMessage.senderText()));
-  m_ui->to->setText(QString::fromStdString(operatorMessage.recipientText()));
-  m_ui->subject->setText(QString::fromStdString(operatorMessage.subject()));
+  m_ui->from->setText(QString::fromStdString(operatorMessage.senderText));
+  m_ui->to->setText(QString::fromStdString(operatorMessage.recipientText));
+  m_ui->subject->setText(QString::fromStdString(operatorMessage.subject));
 
   QDateTime qDateTime;
-  qDateTime.setMSecsSinceEpoch(operatorMessage.timeStamp());
+  qDateTime.setMSecsSinceEpoch(operatorMessage.timeStamp);
   QString time = qDateTime.toUTC().toString();
   INFO_LOG(m_logger) << "    time =  " << time;
 
   m_ui->time->setText(time);
-  m_ui->msgContent->append(QString::fromStdString(operatorMessage.message()));
+  m_ui->msgContent->append(QString::fromStdString(operatorMessage.message));
   QTextCursor cursor = m_ui->msgContent->textCursor();
   cursor.setPosition(0);
   m_ui->msgContent->setTextCursor(cursor);
 
-  m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Add, ((operatorMessage.recipientId() > 0) && (operatorMessage.correspondingOutboxMessageId() > 0))
-                                || (operatorMessage.recipientId() == Messaging::AddressType::ObserverController)); 
+  m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Add, ((operatorMessage.recipientId > 0) && (operatorMessage.correspondingOutboxMessageId > 0))
+                                || (operatorMessage.recipientId == static_cast<int>(Messaging::AddressType::ObserverController))); 
   m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Answer"));
   if (box == MessagingModel::Box::InBox)
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
@@ -99,7 +100,7 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 void ShowMessageDialog::showEvent(QShowEvent *e)
 {
   LtsDialog::showEvent(e);
-  if (m_operatorMessage.recipientId() > 0) 
+  if (m_operatorMessage.recipientId > 0) 
     QTimer::singleShot(200, this, &ShowMessageDialog::slotMarkMessageAsRead);
 } 
 
@@ -108,16 +109,16 @@ void ShowMessageDialog::showEvent(QShowEvent *e)
 void ShowMessageDialog::slotMarkMessageAsRead()
 {
   
-  if (!m_operatorMessage.isRead())
+  if (!m_operatorMessage.isRead)
   {
     bool isRead = true;
-    bool isSend = m_operatorMessage.isSend();
+    bool isSend = m_operatorMessage.isSend;
     bool isDeleted = false;
 
     m_requestHelper->setCustomWaitMessage(tr("Marking message as read"));
     m_requestHelper->startSingleRequest([&]()
     {
-      return m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(m_operatorMessage.id(), isRead, isSend, isDeleted), this);
+      return m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(m_operatorMessage.id, isRead, isSend, isDeleted), this);
     });
   }
 } 
@@ -146,8 +147,8 @@ void ShowMessageDialog::onModifyOperatorMessageReply(const Core::FunctionReplyOb
 {
   
 
-  if (!replyObject.error()) 
-    m_operatorMessage.isRead(true);
+  if (!replyObject.error())
+    m_operatorMessage.isRead = true;
 
   m_requestHelper->requestReply(replyObject);
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
index b140fe871..dd10b100e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
@@ -15,6 +15,7 @@ namespace MeteoDataManagement
 
 MeteoDataView::MeteoDataView(const QString &menuGroup, LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("MeteoDataManagementDialog"))
   , m_menuGroup(menuGroup)
   , m_model(nullptr)
   , m_dtc(nullptr)
@@ -80,7 +81,7 @@ void MeteoDataView::onSelectionChanged()
 
   MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
 
-  if(meteoData.isStaticMeteoData())
+  if(meteoData.isStaticMeteoData)
   {
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, true);
   }
@@ -102,17 +103,17 @@ void MeteoDataView::onEditStaticMeteoData()
   MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
 
   DEBUG_LOG(m_logger) << "--- onEditStaticMeteoData() "
-                      << " id: " << meteoData.id()
-                      << " mduId: " << meteoData.weatherStationId()
-                      << " isStaticData: " << meteoData.isStaticMeteoData()
-                      << " WindDirection: " << meteoData.windDirection()
-                      << " WindSpeed: " << meteoData.windSpeed()
-                      << " Temp: " << meteoData.temperature()
-                      << " Pressure: " << meteoData.pressure()
-                      << " Humidity: " << meteoData.humidity()
+                      << " id: " << meteoData.id
+                      << " mduId: " << meteoData.weatherStationId
+                      << " isStaticData: " << meteoData.isStaticMeteoData
+                      << " WindDirection: " << meteoData.windDirection
+                      << " WindSpeed: " << meteoData.windSpeed
+                      << " Temp: " << meteoData.temperature
+                      << " Pressure: " << meteoData.pressure
+                      << " Humidity: " << meteoData.humidity
                      ;
 
-  if(meteoData.isStaticMeteoData())
+  if(meteoData.isStaticMeteoData)
   {
     StaticMeteoDataEdit *dialog = new StaticMeteoDataEdit(this);
     dialog->init(m_dtc, m_ftc, m_session);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
index 656b40417..1c3155bd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
@@ -19,6 +19,7 @@ MeteoDataModel::MeteoDataModel(QObject *parent)
                                                                                tr("Pressure [hPa]"),
                                                                                tr("Humidity [%]")},
                                                                                parent)
+  , m_logger(getLogger("MeteoDataModel"))
   , m_dtc(nullptr)
 {}
 
@@ -45,13 +46,13 @@ QVariant MeteoDataModel::data(const QModelIndex &index, int role) const
 
   if (role == Qt::BackgroundRole )
   {
-    if (meteoData.isStaticMeteoData())
+    if (meteoData.isStaticMeteoData)
       return QVariant();
     if (index.column() == WindDirection || index.column() == WindSpeed)
-      return meteoData.windOk() ? QVariant() : QColor(Qt::red);
+      return meteoData.windOk ? QVariant() : QColor(Qt::red);
 
     if (index.column() == Temperature || index.column() == Pressure || index.column() == Humidity)
-      return meteoData.climateOk() ? QVariant() : QColor(Qt::red);
+      return meteoData.climateOk ? QVariant() : QColor(Qt::red);
 
     return QVariant();
   }
@@ -59,21 +60,21 @@ QVariant MeteoDataModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Id:
-    return meteoData.weatherStationId();
+    return meteoData.weatherStationId;
   case Note:
-    if (meteoData.isStaticMeteoData())
-      return QCoreApplication::translate("dds", meteoData.note().c_str());
-    return QString::fromStdString(meteoData.note());
+    if (meteoData.isStaticMeteoData)
+      return QCoreApplication::translate("dds", meteoData.note.c_str());
+    return QString::fromStdString(meteoData.note);
   case WindDirection:
-    return qRound((meteoData.windDirection() * 100.0)) / 100.0;
+    return qRound((meteoData.windDirection * 100.0)) / 100.0;
   case WindSpeed:
-    return qRound(meteoData.windSpeed());
+    return qRound(meteoData.windSpeed);
   case Temperature:
-    return meteoData.temperature();
+    return meteoData.temperature;
   case Pressure:
-    return meteoData.pressure();
+    return meteoData.pressure;
   case Humidity:
-    return meteoData.humidity();
+    return meteoData.humidity;
   }
   return QVariant();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.cpp
index 788c68ae8..53b50c1d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.cpp
@@ -13,12 +13,13 @@ namespace MeteoDataManagement
 
 StaticMeteoDataEdit::StaticMeteoDataEdit(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("MeteoDataManagementEdit"))
   , m_dtc(nullptr)
   , m_ftc(nullptr)
   , m_session(nullptr)
   , m_ui(new Ui::StaticMeteoDataEdit)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
-  , m_meteoDataId(0) 
+  , m_meteoDataId(0)
 {
   m_ui->setupUi(this);
 
@@ -72,13 +73,13 @@ bool StaticMeteoDataEdit::apply()
   return m_requestHelper->startSingleRequest([this]()
   {
     StaticMeteoDataModifyRequest requestData;
-    requestData.id(m_meteoDataId);
-    requestData.windDirection(m_ui->sbWindDirection->value());
-    requestData.windSpeed(m_ui->sbWindSpeed->value());
-    requestData.temperature(m_ui->sbTemperature->value());
-    requestData.pressure(m_ui->sbPressure->value());
-    requestData.humidity(m_ui->sbHumidity->value());
-    requestData.timeStamp(m_session->partitionTime());
+    requestData.id = m_meteoDataId;
+    requestData.windDirection = m_ui->sbWindDirection->value();
+    requestData.windSpeed = m_ui->sbWindSpeed->value();
+    requestData.temperature = m_ui->sbTemperature->value();
+    requestData.pressure = m_ui->sbPressure->value();
+    requestData.humidity = m_ui->sbHumidity->value();
+    requestData.timeStamp = m_session->partitionTime();
 
     return m_ftc->staticMeteoDataModifyRequest(requestData, this);
   });
@@ -91,15 +92,15 @@ void StaticMeteoDataEdit::loadStaticMeteoDataFromDatabase()
 
   for (const MeteoDataManagement::MeteoData &meteoData : meteoDatas)
   {
-    if (meteoData.isStaticMeteoData())
+    if (meteoData.isStaticMeteoData)
     {
-      m_meteoDataId = meteoData.id();
+      m_meteoDataId = meteoData.id;
 
-      m_ui->sbWindDirection->setValue(meteoData.windDirection());
-      m_ui->sbWindSpeed->setValue(meteoData.windSpeed());
-      m_ui->sbTemperature->setValue(meteoData.temperature());
-      m_ui->sbPressure->setValue(meteoData.pressure());
-      m_ui->sbHumidity->setValue(meteoData.humidity());
+      m_ui->sbWindDirection->setValue(meteoData.windDirection);
+      m_ui->sbWindSpeed->setValue(meteoData.windSpeed);
+      m_ui->sbTemperature->setValue(meteoData.temperature);
+      m_ui->sbPressure->setValue(meteoData.pressure);
+      m_ui->sbHumidity->setValue(meteoData.humidity);
 
       break;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
index 894ba2cab..3ce38d72d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
@@ -130,16 +130,16 @@ void NmeBatteryInfoDialog::updateDialog()
 
   if(m_currentBatteryStateForId.contains(0))
   {
-    m_ui->lblCaptionBatteryOne->setText(QStringLiteral("Battery 1 (") + QString::fromStdString(m_currentBatteryStateForId.value(0).serialNumber()) + QStringLiteral(")"));
+    m_ui->lblCaptionBatteryOne->setText(QStringLiteral("Battery 1 (") + QString::fromStdString(m_currentBatteryStateForId.value(0).serialNumber) + QStringLiteral(")"));
 
-    m_ui->lblBat1Current->setText(QString::number(m_currentBatteryStateForId.value(0).current()) + QStringLiteral("mA"));
-    m_ui->lblBat1Freq->setText(QString::number(m_currentBatteryStateForId.value(0).frequency()));
-    m_ui->lblBat1Generic->setText(QString::number(m_currentBatteryStateForId.value(0).generic()));
-    m_ui->lblBat1Voltage->setText(QString::number(m_currentBatteryStateForId.value(0).voltage()) + QStringLiteral(" mV"));
-    m_ui->lblBat1Level->setText(QString::number(m_currentBatteryStateForId.value(0).batteryPercent()) + QStringLiteral("%"));
-    m_ui->lblBat1Temp->setText(QString::number(m_currentBatteryStateForId.value(0).temperature()));
+    m_ui->lblBat1Current->setText(QString::number(m_currentBatteryStateForId.value(0).current) + QStringLiteral("mA"));
+    m_ui->lblBat1Freq->setText(QString::number(m_currentBatteryStateForId.value(0).frequency));
+    m_ui->lblBat1Generic->setText(QString::number(m_currentBatteryStateForId.value(0).generic));
+    m_ui->lblBat1Voltage->setText(QString::number(m_currentBatteryStateForId.value(0).voltage) + QStringLiteral(" mV"));
+    m_ui->lblBat1Level->setText(QString::number(m_currentBatteryStateForId.value(0).batteryPercent) + QStringLiteral("%"));
+    m_ui->lblBat1Temp->setText(QString::number(m_currentBatteryStateForId.value(0).temperature));
 
-    if(m_currentBatteryStateForId.value(0).batteryPercent() / 20 == 0)
+    if(m_currentBatteryStateForId.value(0).batteryPercent / 20 == 0)
     {
       m_ui->lblBat1Level->setStyleSheet(QStringLiteral("QLabel {  color : red; }"));
     }
@@ -147,16 +147,16 @@ void NmeBatteryInfoDialog::updateDialog()
 
   if(m_currentBatteryStateForId.contains(1))
   {
-    m_ui->lblCaptionBatteryTwo->setText(QStringLiteral("Battery 2 (") + QString::fromStdString(m_currentBatteryStateForId.value(1).serialNumber()) + QStringLiteral(")"));
+    m_ui->lblCaptionBatteryTwo->setText(QStringLiteral("Battery 2 (") + QString::fromStdString(m_currentBatteryStateForId.value(1).serialNumber) + QStringLiteral(")"));
 
-    m_ui->lblBat2Current->setText(QString::number(m_currentBatteryStateForId.value(1).current()) + QStringLiteral("mA"));
-    m_ui->lblBat2Freq->setText(QString::number(m_currentBatteryStateForId.value(1).frequency()));
-    m_ui->lblBat2Generic->setText(QString::number(m_currentBatteryStateForId.value(1).generic()));
-    m_ui->lblBat2Voltage->setText(QString::number(m_currentBatteryStateForId.value(1).voltage()) + QStringLiteral(" mV"));
-    m_ui->lblBat2Level->setText(QString::number(m_currentBatteryStateForId.value(1).batteryPercent()) + QStringLiteral("%"));
-    m_ui->lblBat2Temp->setText(QString::number(m_currentBatteryStateForId.value(1).temperature()));
+    m_ui->lblBat2Current->setText(QString::number(m_currentBatteryStateForId.value(1).current) + QStringLiteral("mA"));
+    m_ui->lblBat2Freq->setText(QString::number(m_currentBatteryStateForId.value(1).frequency));
+    m_ui->lblBat2Generic->setText(QString::number(m_currentBatteryStateForId.value(1).generic));
+    m_ui->lblBat2Voltage->setText(QString::number(m_currentBatteryStateForId.value(1).voltage) + QStringLiteral(" mV"));
+    m_ui->lblBat2Level->setText(QString::number(m_currentBatteryStateForId.value(1).batteryPercent) + QStringLiteral("%"));
+    m_ui->lblBat2Temp->setText(QString::number(m_currentBatteryStateForId.value(1).temperature));
 
-    if(m_currentBatteryStateForId.value(1).batteryPercent() / 20 == 0)
+    if(m_currentBatteryStateForId.value(1).batteryPercent / 20 == 0)
     {
       m_ui->lblBat2Level->setStyleSheet(QStringLiteral("QLabel {  color : red; }"));
     }
@@ -164,7 +164,7 @@ void NmeBatteryInfoDialog::updateDialog()
 }
 void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &data, DataModification modType)
 {
-  if(data.equipmentNumber() != 1)
+  if(data.equipmentNumber != 1)
     return;
 
   switch (modType)
@@ -172,13 +172,13 @@ void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &da
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_currentBatteryWarnForId.insert(data.batteryPort(),data);
+    m_currentBatteryWarnForId.insert(data.batteryPort,data);
     updateDialog();
     break;
   }
   case DataModification::eRemoved:
   {
-    m_currentBatteryWarnForId.remove(data.batteryPort());
+    m_currentBatteryWarnForId.remove(data.batteryPort);
     updateDialog();
   }
   }
@@ -186,28 +186,28 @@ void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &da
 
 void NmeBatteryInfoDialog::fillStates(const TrainingAreaBase::BatteryInfo &dataArr, DataModification modType)
 {
-  if(dataArr.equipmentNumber() != 1)
+  if(dataArr.equipmentNumber != 1)
     return;
 
-  auto data = dataArr.batteryStates().at(0);
+  auto data = dataArr.batteryStates.at(0);
 
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_currentBatteryStateForId.insert(data.batteryPort(),data);
+    m_currentBatteryStateForId.insert(data.batteryPort,data);
     updateDialog();
-    if(data.batteryPort() == 0)
+    if(data.batteryPort == 0)
       m_oudatedFirstBatteryTimer->start(30000);
-    else if(data.batteryPort() == 1)
+    else if(data.batteryPort == 1)
       m_oudatedSecondBatteryTimer->start(30000);
     break;
   }
   case DataModification::eRemoved:
   {
     if(!m_currentBatteryStateForId.isEmpty())
-      m_currentBatteryStateForId.remove(data.batteryPort());
+      m_currentBatteryStateForId.remove(data.batteryPort);
     updateDialog();
   }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
index 3bf8328ec..160be938b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
@@ -3,6 +3,7 @@
 
 
 #include "nme_battery_info_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "nme_notification_gui_plugin.h"
 #include "nme_shutdown_dialog.h"
 
@@ -122,9 +123,9 @@ void InterfaceImpl::clearInterfaces()
 
 void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataArr, DataModification modType)
 {
-  if(dataArr.equipmentNumber() != 1)
+  if(dataArr.equipmentNumber != 1)
     return;
-  auto data = dataArr.batteryStates().at(0);
+  auto data = dataArr.batteryStates.at(0);
 
   switch (modType)
   {
@@ -138,20 +139,20 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
       if (m_session->baseLayout() != nullptr)
         m_session->baseLayout()->showMessage(tr("The radio master is connected"), tr("Connection was successfully reestablished"), LtsWidgets::LtsNotificationBox::MessageType::Success);
     }
-    if((data.batteryPercent() / 20) < m_currentBatteryStateForId.value(data.batteryPort()).batteryPercent() / 20 && data.batteryPercent() / 20 < 2)
+    if((data.batteryPercent / 20) < m_currentBatteryStateForId.value(data.batteryPort).batteryPercent / 20 && data.batteryPercent / 20 < 2)
     {
       QMessageBox batteryWarnBox;
       batteryWarnBox.setWindowTitle(tr("Battery Warning"));
-      batteryWarnBox.setText(tr("The battery (%1) has only %2 \% left").arg(QString::fromStdString(data.serialNumber())).arg(data.batteryPercent())); 
+      batteryWarnBox.setText(tr("The battery (%1) has only %2 \% left").arg(QString::fromStdString(data.serialNumber)).arg(data.batteryPercent));
       batteryWarnBox.exec();
     }
-    m_currentBatteryStateForId.insert(data.batteryPort(), data);
+    m_currentBatteryStateForId.insert(data.batteryPort, data);
 
     updateBatteryLevel();
 
-    if(data.batteryPort() == 0)
+    if(data.batteryPort == 0)
       m_oudatedFirstBatteryTimer->start(30000);
-    else if(data.batteryPort() == 1)
+    else if(data.batteryPort == 1)
       m_oudatedSecondBatteryTimer->start(30000);
 
     break;
@@ -159,7 +160,7 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
 
   case DataModification::eRemoved:
   {
-    m_currentBatteryStateForId.remove(data.batteryPort());
+    m_currentBatteryStateForId.remove(data.batteryPort);
     updateBatteryLevel();
     break;
   }
@@ -169,7 +170,7 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
 
 void InterfaceImpl::onShutdownStateChanged(const TrainingAreaBase::ServiceControl &data, DataModification modType)
 {
-  if(data.equipmentNumber() != 1)
+  if(data.equipmentNumber != 1)
     return;
 
   switch (modType)
@@ -178,7 +179,7 @@ void InterfaceImpl::onShutdownStateChanged(const TrainingAreaBase::ServiceContro
   case DataModification::eModified:
   {
 
-    if(data.serviceControlState().underlying() == TrainingAreaBase::ServiceControlEnum::STOP)
+    if(data.serviceControlState == TrainingAreaBase::ServiceControlEnum::STOP)
     {
       m_hasConnection = false;
       if (m_session->baseLayout() != nullptr)
@@ -208,8 +209,8 @@ void InterfaceImpl::onOutdatedFirstBatteryTimerTimeout()
     return;
   }
 
-  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99, m_currentBatteryStateForId.value(1).batteryPercent() / 20)));
-  setToolTip(99, m_currentBatteryStateForId.value(1).batteryPercent() / 20);
+  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99, m_currentBatteryStateForId.value(1).batteryPercent / 20)));
+  setToolTip(99, m_currentBatteryStateForId.value(1).batteryPercent / 20);
   m_currentBatteryStateForId.remove(0);
 
 }
@@ -227,8 +228,8 @@ void InterfaceImpl::onOutdatedSecondBatteryTimerTimeout()
     return;
   }
   
-  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(m_currentBatteryStateForId.value(0).batteryPercent() / 20, 99)));
-  setToolTip(m_currentBatteryStateForId.value(0).batteryPercent() / 20, 99);
+  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(m_currentBatteryStateForId.value(0).batteryPercent / 20, 99)));
+  setToolTip(m_currentBatteryStateForId.value(0).batteryPercent / 20, 99);
   m_currentBatteryStateForId.remove(1);
 }
 
@@ -363,8 +364,8 @@ void InterfaceImpl::updateBatteryLevel()
     m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage()));
     return;
   }
-  int firstBatteryState = m_currentBatteryStateForId.value(0).batteryPercent() / 20;
-  int secondBatteryState = m_currentBatteryStateForId.value(1).batteryPercent() / 20;
+  int firstBatteryState = m_currentBatteryStateForId.value(0).batteryPercent / 20;
+  int secondBatteryState = m_currentBatteryStateForId.value(1).batteryPercent / 20;
 
   if(m_currentBatteryStateForId.values().length() == 2)
   {
@@ -373,12 +374,12 @@ void InterfaceImpl::updateBatteryLevel()
   }
   else if(m_currentBatteryStateForId.values().length() == 1)
   {
-    if(m_currentBatteryStateForId.first().batteryPort() == 0)
+    if(m_currentBatteryStateForId.first().batteryPort == 0)
     {
       m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(firstBatteryState, 99)));
       setToolTip(firstBatteryState, 99);
     }
-    else if(m_currentBatteryStateForId.first().batteryPort() == 1)
+    else if(m_currentBatteryStateForId.first().batteryPort == 1)
     {
       m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99,secondBatteryState)));
       setToolTip(99,secondBatteryState);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
index 7276389e7..01fd4c40e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
@@ -62,9 +62,9 @@ void NmeShutdownDialog::onShutdownClicked()
     return;
   TrainingAreaBase::SetDevicePowerRequest request;
 
-  request.equipmentNumber(1);
-  request.powerType(TrainingAreaBase::PowerMethod::PowerOff); 
-  request.subdeviceId(0); 
+  request.equipmentNumber = 1;
+  request.powerType = TrainingAreaBase::PowerMethod::PowerOff;
+  request.subdeviceId = 0;
 
   auto cb = [request, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
index b918f8514..78600fe75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
@@ -26,6 +26,7 @@ NotificationManagementDialog::NotificationManagementDialog(LtsSession::LtsSessio
     , m_session(session)
     , m_menuGroup(menuGroup)
     , m_requestHelper(new LtsUtils::RequestHelper(this))
+    , m_logger(getLogger("NotificationManagementDialog"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::ExtendedSelection);
@@ -85,23 +86,23 @@ void NotificationManagementDialog::onAcknowledgeNotification()
   int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   int workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
 
-  for (const auto &addr : noti.recipientIds())
+  for (const auto &addr : noti.recipientIds)
   {
-    if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId)
-        || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId))
+    if ((addr.addressType == AddressType::Operator && addr.addressId == operatorId)
+        || (addr.addressType == AddressType::Workstation && addr.addressId == workstationId))
     {
-      request.addressId(addr.id());
+      request.addressId = addr.id;
       break;
     }
   }
-  request.operatorId(operatorId);
-  request.workstationId(workstationId);
+  request.operatorId = operatorId;
+  request.workstationId = workstationId;
 
   bool onlyNotYetAcknowledged = true;
-  request.notificationIds(selectedNotificationIds(onlyNotYetAcknowledged));
-  if (request.notificationIds().empty())
+  request.notificationIds = selectedNotificationIds(onlyNotYetAcknowledged);
+  if (request.notificationIds.empty())
     return;
-  request.processed(true);
+  request.processed = true;
 
   m_requestHelper->setCustomWaitMessage(tr("Marking notification as read"));
   m_requestHelper->startSingleRequest(
@@ -123,11 +124,11 @@ std::vector<int32_t> NotificationManagementDialog::selectedNotificationIds(bool
 
     
     
-    if (onlyNotYetAcknowledged && noti.processed())
+    if (onlyNotYetAcknowledged && noti.processed)
       continue;
 
-    
-    notificationIds.emplace_back(noti.id());
+
+    notificationIds.emplace_back(noti.id);
   }
 
   return notificationIds;
@@ -143,20 +144,20 @@ void NotificationManagementDialog::onRemoveNotification()
   const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   const int workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
 
-  for (const auto &addr : noti.recipientIds())
+  for (const auto &addr : noti.recipientIds)
   {
-    if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId)
-        || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId))
+    if ((addr.addressType == AddressType::Operator && addr.addressId == operatorId)
+        || (addr.addressType == AddressType::Workstation && addr.addressId == workstationId))
     {
-      request.addressId(addr.id());
+      request.addressId = addr.id;
       break;
     }
   }
-  request.operatorId(operatorId);
-  request.workstationId(workstationId);
+  request.operatorId = operatorId;
+  request.workstationId = workstationId;
 
   bool acknowledge = false;
-  request.notificationIds(selectedNotificationIds(acknowledge));
+  request.notificationIds = selectedNotificationIds(acknowledge);
 
   m_requestHelper->setCustomWaitMessage(tr("Delete message"));
   m_requestHelper->startSingleRequest(
@@ -184,15 +185,15 @@ void NotificationManagementDialog::onShowNotificationContent()
   const QModelIndex curIdx = m_ui->widget->currentIndex();
   const NomNotification &noti = m_model->getRowData(curIdx.row());
 
-  QString content = QCoreApplication::translate("Notification", noti.content().c_str());
+  QString content = QCoreApplication::translate("Notification", noti.content.c_str());
 
-  NomNotification notiDDS = m_dtc->nomNotification(noti.id());
+  NomNotification notiDDS = m_dtc->nomNotification(noti.id);
   DEBUG_LOG(m_logger) << "onShowNotificationContent"
-                       << ", content=" << noti.content()
-                       << ", contentArgs().size()=" << noti.contentArgs().size()
-                       << ", notiDDS.contentArgs().size()=" << notiDDS.contentArgs().size();
+                       << ", content=" << noti.content
+                       << ", contentArgs().size()=" << noti.contentArgs.size()
+                       << ", notiDDS.contentArgs().size()=" << notiDDS.contentArgs.size();
 
-  for (const std::string& arg : notiDDS.contentArgs()) {
+  for (const std::string& arg : notiDDS.contentArgs) {
     
     content = content.arg(QString::fromStdString(arg));
     DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
@@ -223,11 +224,11 @@ void NotificationManagementDialog::onShowNotificationContent()
   QFont font;
   font.setBold(true);
 
-  QLabel *lblTitle = new QLabel(QCoreApplication::translate("Notification", noti.title().c_str()), contentPopup);
+  QLabel *lblTitle = new QLabel(QCoreApplication::translate("Notification", noti.title.c_str()), contentPopup);
   lblTitle->setFont(font);
   QLabel *lblFrom = new QLabel(tr("From: "));
   lblFrom->setFont(font);
-  QLabel *lblSender = new QLabel(QString::fromStdString(noti.sender().name()));
+  QLabel *lblSender = new QLabel(QString::fromStdString(noti.sender.name));
 
   QFrame *line = new QFrame(this);
   line->setFrameShape(QFrame::HLine);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
index 0eb01fcbc..11f3a2cdf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
@@ -30,6 +30,7 @@ NotificationManagementDialogModel::NotificationManagementDialogModel(QObject *pa
         parent)
     , m_dtc(nullptr)
     , m_ftc(nullptr)
+    , m_logger(getLogger("NotificationManagementDialogModel"))
 {
 }
 
@@ -56,11 +57,11 @@ bool NotificationManagementDialogModel::initModel(const LtsSession::LtsSessionDa
   return true;
 }
 
-int NotificationManagementDialogModel::getId(const NotificationManagement::NomNotification &data) const { return data.id(); }
+int NotificationManagementDialogModel::getId(const NotificationManagement::NomNotification &data) const { return data.id; }
 
 QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int role) const
 {
-  if ((role != Qt::DisplayRole && role != Qt::UserRole && role != Qt::TextColorRole && role != Qt::FontRole) || !indexIsValid(index))
+  if ((role != Qt::DisplayRole && role != Qt::UserRole && role != Qt::ForegroundRole && role != Qt::FontRole) || !indexIsValid(index))
     return QVariant();
 
   const NotificationManagement::NomNotification &noti = m_vecData.at(index.row());
@@ -68,15 +69,15 @@ QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int r
   if (role == Qt::FontRole)
   {
     bool setBold = false;
-    for (const auto &addr : noti.recipientIds())
+    for (const auto &addr : noti.recipientIds)
     {
-      if (addr.addressType() == AddressType::Operator && addr.addressId() != m_operatorId)
+      if (addr.addressType == AddressType::Operator && addr.addressId != m_operatorId)
         continue;
 
-      if (addr.addressType() == AddressType::Workstation && addr.addressId() != m_workstationId)
+      if (addr.addressType == AddressType::Workstation && addr.addressId != m_workstationId)
         continue;
 
-      if (!noti.processed())
+      if (!noti.processed)
         setBold = true;
       break;
     }
@@ -93,15 +94,15 @@ QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int r
     switch (index.column())
     {
     case NotificationManagementDialogModel::Columns::Id:
-      return noti.id();
+      return noti.id;
     case NotificationManagementDialogModel::Columns::Title:
-      return QCoreApplication::translate("Notification", noti.title().c_str());
+      return QCoreApplication::translate("Notification", noti.title.c_str());
     case NotificationManagementDialogModel::Columns::Content:
     {
-      QString text = QCoreApplication::translate("Notification", noti.content().c_str());
+      QString text = QCoreApplication::translate("Notification", noti.content.c_str());
+
+      for (const std::string& arg : noti.contentArgs) {
 
-      for (const std::string& arg : noti.contentArgs()) {
-        
         text = text.arg(QString::fromStdString(arg));
       }
 
@@ -109,22 +110,22 @@ QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int r
     }
 
     case NotificationManagementDialogModel::Columns::Timestamp:
-      return QDateTime::fromMSecsSinceEpoch(noti.timeStamp());
+      return QDateTime::fromMSecsSinceEpoch(noti.timeStamp);
     case NotificationManagementDialogModel::Columns::Priority:
-      return NotificationManagement::toString(noti.priority().underlying());
+      return NotificationManagement::toString(noti.priority);
     case NotificationManagementDialogModel::Columns::ProcessedBy:
-      return getNameByAddressId(noti.processed(), noti.recipientIds());
+      return getNameByAddressId(noti.processed, noti.recipientIds);
     case NotificationManagementDialogModel::Columns::ProcessTime:
-      return QDateTime::fromMSecsSinceEpoch(noti.processTime());
+      return QDateTime::fromMSecsSinceEpoch(noti.processTime);
     case NotificationManagementDialogModel::Columns::Sender:
-      return QString::fromStdString(noti.sender().name());
+      return QString::fromStdString(noti.sender.name);
     }
   }
-  else if (role == Qt::TextColorRole)
+  else if (role == Qt::ForegroundRole)
   {
     if (index.column() == NotificationManagementDialogModel::Columns::Priority)
     {
-      switch (noti.priority().underlying())
+      switch (noti.priority)
       {
         case NotificationManagement::Priority::Low:
           return QColor(Qt::black);
@@ -145,18 +146,18 @@ bool NotificationManagementDialogModel::isFiltered(const NotificationManagement:
   if (modType == DataModification::eRemoved)
     return false;
 
-  if (data.exerciseId() != m_exerciseId && data.exerciseId() != 0)
+  if (data.exerciseId != m_exerciseId && data.exerciseId != 0)
     return true;
 
-  
+
   bool isFiltered = true;
-  for (const auto &addr : data.recipientIds())
+  for (const auto &addr : data.recipientIds)
   {
-    if (addr.addressType() == AddressType::Workstation)
-      if (addr.addressId() != m_workstationId)
+    if (addr.addressType == AddressType::Workstation)
+      if (addr.addressId != m_workstationId)
         continue;
-    if (addr.addressType() == AddressType::Operator)
-      if (addr.addressId() != m_operatorId)
+    if (addr.addressType == AddressType::Operator)
+      if (addr.addressId != m_operatorId)
         continue;
 
     isFiltered = false;
@@ -168,13 +169,13 @@ bool NotificationManagementDialogModel::isFiltered(const NotificationManagement:
 
 int NotificationManagementDialogModel::isDeleted(const NomNotification &data) const
 {
-  for (const auto &addr : data.recipientIds())
+  for (const auto &addr : data.recipientIds)
   {
-    if (addr.addressType() == AddressType::Operator)
+    if (addr.addressType == AddressType::Operator)
     {
-      if (addr.addressId() != m_operatorId)
+      if (addr.addressId != m_operatorId)
         continue;
-      if (addr.isDeleted())
+      if (addr.isDeleted)
         return true;
     }
   }
@@ -185,16 +186,16 @@ QString NotificationManagementDialogModel::getNameByAddressId(int addressId, con
 {
   for (const auto &addr : recipients)
   {
-    if (addr.id() == addressId)
+    if (addr.id == addressId)
     {
-      if (addr.addressType() == AddressType::Operator)
+      if (addr.addressType == AddressType::Operator)
       {
         DEBUG_LOG(m_logger) << "addressId=" << addressId
-                             << ", addr.addressId()).name()=" << QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
-        return QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
+                             << ", addr.addressId()).name()=" << QString::fromStdString(m_dtcOpm->user(addr.addressId).name);
+        return QString::fromStdString(m_dtcOpm->user(addr.addressId).name);
       }
-      if (addr.addressType() == AddressType::Workstation)
-        return QString::fromStdString(m_dtcAsm->asset(addr.addressId()).name());
+      if (addr.addressType == AddressType::Workstation)
+        return QString::fromStdString(m_dtcAsm->asset(addr.addressId).name);
     }
   }
 
@@ -218,7 +219,7 @@ bool NotificationDialogProxyModel::lessThan(const QModelIndex &source_left, cons
   switch (source_left.column())
   {
     case NotificationManagementDialogModel::Timestamp:
-      return dataLeft.timeStamp() < dataRight.timeStamp();
+      return dataLeft.timeStamp < dataRight.timeStamp;
 
     case NotificationManagementDialogModel::Content:
     case NotificationManagementDialogModel::isRead:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
index 7f22f4174..d20174dec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
@@ -37,13 +37,13 @@ InterfaceImpl::~InterfaceImpl() {}
 int InterfaceImpl::isDeleted(const NomNotification &data) const
 {
   int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
-  for (const auto &addr : data.recipientIds())
+  for (const auto &addr : data.recipientIds)
   {
-    if (addr.addressType() == AddressType::Operator)
+    if (addr.addressType == AddressType::Operator)
     {
-      if (addr.addressId() != operatorId)
+      if (addr.addressId != operatorId)
         continue;
-      if (addr.isDeleted())
+      if (addr.isDeleted)
         return true;
     }
   }
@@ -87,7 +87,7 @@ bool InterfaceImpl::eventFilter(QObject *watched, QEvent *event)
     if(ev->url().host().toLower() == QStringLiteral("notificationack") && id > 0)
     {
       DEBUG_LOG(m_logger) << "ack";
-      ack(m_nomNotifications.value(m_nomNotifications.value(id).id())); 
+      ack(m_nomNotifications.value(m_nomNotifications.value(id).id));
     }
 
     DEBUG_LOG(m_logger) << "ev->url().host()=" << ev->url().host();
@@ -106,20 +106,20 @@ bool InterfaceImpl::eventFilter(QObject *watched, QEvent *event)
 
 void InterfaceImpl::onNotificationChanged(const NotificationManagement::NomNotification &noti, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onNotificationChanged title=" <<  noti.title()
-                       << ", content =" << noti.content()
-                       << ", args.size=" << noti.contentArgs().size()
+  DEBUG_LOG(m_logger) << "onNotificationChanged title=" <<  noti.title
+                       << ", content =" << noti.content
+                       << ", args.size=" << noti.contentArgs.size()
                        << ", modType=" << modType;
-  if (noti.exerciseId() != m_session->exerciseId())
+  if (noti.exerciseId != m_session->exerciseId())
     return;
 
-  if (!isMyMessage(noti.recipientIds()))
+  if (!isMyMessage(noti.recipientIds))
     return;
-  const QString notiIdent = QCoreApplication::translate("Notification", noti.title().c_str()) + QString::number(noti.id());
+  const QString notiIdent = QCoreApplication::translate("Notification", noti.title.c_str()) + QString::number(noti.id);
 
   if (isDeleted(noti))
   {
-    m_unreadMessages.remove(noti.id());
+    m_unreadMessages.remove(noti.id);
     updateUnreadCount();
     if (m_session->baseLayout()->messageIdentifierExists(notiIdent))
     {
@@ -130,37 +130,37 @@ void InterfaceImpl::onNotificationChanged(const NotificationManagement::NomNotif
 
   NomNotification localNoti = noti;
 
-  QString content = QCoreApplication::translate("Notification", localNoti.content().c_str());
+  QString content = QCoreApplication::translate("Notification", localNoti.content.c_str());
 
-  for (const std::string& arg : noti.contentArgs())
+  for (const std::string& arg : noti.contentArgs)
   {
-    
+
     content = content.arg(QString::fromStdString(arg));
     DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
                          << ", arg=" << arg
                          << ", content=" << content;
   }
 
-  localNoti.content(content.toStdString());
+  localNoti.content = content.toStdString();
 
-  m_nomNotifications.insert(noti.id(), localNoti);
+  m_nomNotifications.insert(noti.id, localNoti);
 
   
-  if (noti.processed() <= 0 && (modType == DataModification::eAdded || modType == DataModification::eModified))
+  if (noti.processed <= 0 && (modType == DataModification::eAdded || modType == DataModification::eModified))
   {
 
-    if (m_unreadMessages.contains(noti.id()) && noti.priority() < Priority::Normal)
+    if (m_unreadMessages.contains(noti.id) && noti.priority < Priority::Normal)
     {
-      m_unreadMessages.remove(noti.id());
+      m_unreadMessages.remove(noti.id);
     }
 
-    if (!m_unreadMessages.contains(noti.id()))
+    if (!m_unreadMessages.contains(noti.id))
     {
-      m_unreadMessages.insert(noti.id());
+      m_unreadMessages.insert(noti.id);
 
-      QString content = QString::fromStdString(localNoti.content());
+      QString content = QString::fromStdString(localNoti.content);
 
-      for (const std::string& arg : noti.contentArgs()) {
+      for (const std::string& arg : noti.contentArgs) {
         content = content.arg(QString::fromStdString(arg));
       }
 
@@ -175,20 +175,20 @@ void InterfaceImpl::onNotificationChanged(const NotificationManagement::NomNotif
         content = content.replace(QStringLiteral("[%1](%2)").arg(it.value(), it.key()), QStringLiteral("<a href='%1'>%2</a>").arg(it.key(), it.value()));
       }
       const QString openMessageLink(QStringLiteral("OpenMessages"));
-      const LtsWidgets::LtsNotificationBox::MessageType messageType = static_cast<LtsWidgets::LtsNotificationBox::MessageType>(noti.messageType().underlying());
-      
-      if (noti.priority() == Priority::High)
+      const LtsWidgets::LtsNotificationBox::MessageType messageType = static_cast<LtsWidgets::LtsNotificationBox::MessageType>(static_cast<int>(noti.messageType));
+
+      if (noti.priority == Priority::High)
       {
         m_session->baseLayout()->showMessage(
-            QCoreApplication::translate("Notification", noti.title().c_str()),
+            QCoreApplication::translate("Notification", noti.title.c_str()),
             content,
             messageType,
             [this, linkMap, noti](const QString &link)
             {
               Q_UNUSED(link)
-              
-              
-              if (!noti.processed())
+
+
+              if (!noti.processed)
               {
                 DEBUG_LOG(m_logger) << "ack";
                 ack(noti); 
@@ -198,18 +198,18 @@ void InterfaceImpl::onNotificationChanged(const NotificationManagement::NomNotif
             notiIdent);
         m_session->baseLayout()->installEventFilter(this);
       }
-      else if (noti.priority() == Priority::Highest)
+      else if (noti.priority == Priority::Highest)
       {
-        
+
         for (const auto &link : linkMap.keys())
         {
           auto *event = new LtsWidgets::LtsLinkEvent(QUrl(link), m_session->baseLayout());
           event->setAccepted(false);
           DEBUG_LOG(m_logger) << "Post event" << event << " " << event->url().toString();
-          QApplication::postEvent(qApp, event); 
+          QApplication::postEvent(qApp, event);
         }
-        
-        if (!noti.processed())
+
+        if (!noti.processed)
         {
           DEBUG_LOG(m_logger) << "ack";
           ack(noti); 
@@ -218,9 +218,9 @@ void InterfaceImpl::onNotificationChanged(const NotificationManagement::NomNotif
     }
   }
 
-  if ((noti.processed() && (modType == DataModification::eModified)) || modType == DataModification::eRemoved)
+  if ((noti.processed && (modType == DataModification::eModified)) || modType == DataModification::eRemoved)
   {
-    m_unreadMessages.remove(noti.id()); 
+    m_unreadMessages.remove(noti.id);
     
     if (m_session->baseLayout()->messageIdentifierExists(notiIdent))
     {
@@ -340,20 +340,20 @@ void InterfaceImpl::ack(const NotificationManagement::NomNotification &notificat
   int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
   int workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
-  for (const auto &addr : notification.recipientIds())
+  for (const auto &addr : notification.recipientIds)
   {
-    if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId)
-        || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId))
+    if ((addr.addressType == AddressType::Operator && addr.addressId == operatorId)
+        || (addr.addressType == AddressType::Workstation && addr.addressId == workstationId))
     {
-      request.addressId(addr.id());
+      request.addressId = addr.id;
       break;
     }
   }
-  request.operatorId(operatorId);
-  request.workstationId(workstationId);
+  request.operatorId = operatorId;
+  request.workstationId = workstationId;
 
-  request.notificationIds({notification.id()});
-  request.processed(!notification.processed());
+  request.notificationIds = {notification.id};
+  request.processed = !notification.processed;
   DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
   m_ftc->readReceiptRequest(request, this);
 }
@@ -369,11 +369,11 @@ bool InterfaceImpl::isMyMessage(const std::vector<Address> &recipents)
   while (it != recipents.end())
   {
 
-    if (it->addressType() == AddressType::Operator && it->addressId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
+    if (it->addressType == AddressType::Operator && it->addressId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
     {
       return true;
     }
-    else if (it->addressType() == AddressType::Workstation && it->addressId() == LtsSessionData::LtsSessionData::getInstance()->getWorkstationId())
+    else if (it->addressType == AddressType::Workstation && it->addressId == LtsSessionData::LtsSessionData::getInstance()->getWorkstationId())
     {
       return true;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
index f518797f8..f6cf38fd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
@@ -2,6 +2,7 @@
 
 
 #include "obd_base_downloader.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ui_obd_base_downloader.h"
 #include "obd_base_downloader_pdf_selector.h"
@@ -32,6 +33,7 @@ BaseDownloader::BaseDownloader(const QString &menuGroup, LtsSession::LtsSession
   , m_exmDtc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::BaseDownloader)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->leStatus->setText(tr("Not Connected"));
@@ -121,15 +123,15 @@ bool BaseDownloader::init()
 
 void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObject)
 {
-  DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
-  switch (replyObject.replyState().underlying())
+  DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep << " \n" << replyObject.progress;
+  switch (replyObject.replyState)
   {
   case Core::FtReplyState::InProgress:
   {
     
     m_ftcTimer->start();
-    m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", replyObject.currentStep().c_str())));
-    m_messageDlg->setProgress(replyObject.progress());
+    m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", replyObject.currentStep.c_str())));
+    m_messageDlg->setProgress(replyObject.progress);
     break;
   }
   case Core::FtReplyState::Completed:
@@ -147,7 +149,7 @@ void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObje
   case Core::FtReplyState::Error:
   {
     m_ftcTimer->stop();
-    m_messageDlg->setText(tr("Error Downloading Base Data for Exercise %1 <br> Error: %2").arg(m_exerciseId).arg(QString::fromStdString(replyObject.errorString())));
+    m_messageDlg->setText(tr("Error Downloading Base Data for Exercise %1 <br> Error: %2").arg(m_exerciseId).arg(QString::fromStdString(replyObject.errorString)));
     m_messageDlg->setCloseable(true);
     m_ui->pbDownload->setEnabled(true);
     m_ui->pbPdfDownload->setEnabled(true);
@@ -158,14 +160,14 @@ void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObje
 
 void BaseDownloader::onStartPdfDownloadReply(const PdfDownloadReply &reply)
 {
-  m_messageDlg->setText(QString::fromStdString(reply.currentStep()) + QStringLiteral(" ") + QString::number(reply.replyState().underlying()));
-  switch (reply.replyState().underlying())
+  m_messageDlg->setText(QString::fromStdString(reply.currentStep) + QStringLiteral(" ") + QString::number(static_cast<int>(reply.replyState)));
+  switch (reply.replyState)
   {
   case Core::FtReplyState::InProgress:
     
     m_ftcTimer->start();
-    m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", reply.currentStep().c_str())));
-    m_messageDlg->setProgress(reply.progress());
+    m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", reply.currentStep.c_str())));
+    m_messageDlg->setProgress(reply.progress);
     break;
   case Core::FtReplyState::Completed:
   {
@@ -199,7 +201,7 @@ void BaseDownloader::startBaseDownload()
   if (ret != LtsWidgets::Button::Ok)
     return;
 
-  m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id();
+  m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id;
 
 
   const StartBaseDownloadRequest req(m_exerciseId,
@@ -347,9 +349,9 @@ void BaseDownloader::onFtcTimerTimeout()
 
 void BaseDownloader::onPdfDownloadClicked()
 {
-  m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id();
+  m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id;
 
-  if (m_exmDtc->exercise(m_exerciseId).id() != m_exerciseId)
+  if (m_exmDtc->exercise(m_exerciseId).id != m_exerciseId)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this,
                                               tr("Make sure to download exercise with ID %1 first.").arg(m_exerciseId),
@@ -375,7 +377,7 @@ void BaseDownloader::onPdfDownloadClicked()
 
     if (m_ftc->startPdfDownloadRequest({pdfSel->checkedPdfIds(),
                                         m_ui->leServer->text().toStdString(),
-                                        m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id()
+                                        m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id
                                        },
                                        this))
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h
index 69549365b..9f2765418 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h
@@ -17,7 +17,7 @@
 
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <AssetManagement/asm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <QtNetwork/QAbstractSocket>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.cpp
index 78f63f549..6f968d92a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.cpp
@@ -2,6 +2,7 @@
 
 
 #include "obd_base_downloader_message.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_obd_base_downloader_message.h"
 
 #include <LtsWidgets/lts_frameless_dialog.h>
@@ -12,6 +13,7 @@ namespace OcBaseDownload
 BaseDownloaderMessage::BaseDownloaderMessage(QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::BaseDownloaderMessage)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   connect(m_ui->pbClose, &QPushButton::clicked, this, &BaseDownloaderMessage::close);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.cpp
index c92a50cd0..e95fe88da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.cpp
@@ -2,6 +2,7 @@
 
 
 #include "obd_base_downloader_pdf_selector.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_obd_base_downloader_pdf_selector.h"
 
 #include <LtsWidgets/lts_frameless_dialog.h>
@@ -14,6 +15,7 @@ const char *BaseDownloaderPdfSelector::ID = "id";
 BaseDownloaderPdfSelector::BaseDownloaderPdfSelector(QWidget *parent)
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::BaseDownloaderPdfSelector)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -38,7 +40,7 @@ void BaseDownloaderPdfSelector::keyPressEvent(QKeyEvent *e)
 
 void BaseDownloaderPdfSelector::onGetPdfListReply(const PdfListReply &reply)
 {
-  for (const OcBaseDownload::PdfInfo &currentDocument : reply.documents())
+  for (const OcBaseDownload::PdfInfo &currentDocument : reply.documents)
     addFile(currentDocument);
 
   m_ui->lblTotal->setText(tr("Total: %1").arg(m_chks.size()));
@@ -61,8 +63,8 @@ void BaseDownloaderPdfSelector::addFile(const OcBaseDownload::PdfInfo &document)
 {
   QCheckBox *chk = new QCheckBox(this);
 
-  chk->setText(QString::fromStdString(document.name()));
-  chk->setProperty(ID, QVariant(document.id()));
+  chk->setText(QString::fromStdString(document.name));
+  chk->setProperty(ID, QVariant(document.id));
 
   m_chks.append(chk);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
index 13446cf11..3f0a8052b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
@@ -3,6 +3,7 @@
 
 
 #include "obd_ex_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ngltools/ngltools_dtg.h>
 #include <QtCore/QJsonObject>
@@ -19,6 +20,7 @@ ExModel::ExModel(QObject *parent)
                                                                     tr("Description"),
                                                                     QStringLiteral("Id")},
                                                                     parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 void ExModel::addExercise(const QJsonObject &exercise)
@@ -26,18 +28,18 @@ void ExModel::addExercise(const QJsonObject &exercise)
   
 
   ExerciseManagement::Exercise ex;
-  ex.name(exercise.value(QLatin1String("name")).toString().toStdString());
-  ex.beginTime(exercise.value(QLatin1String("beginTime")).toDouble());
-  ex.endTime(exercise.value(QLatin1String("endTime")).toDouble());
-  ex.defaultTimeZone(exercise.value(QLatin1String("timeZone")).toString().toStdString().c_str()[0]);
-  ex.startTime(exercise.value(QLatin1String("startTime")).toDouble());
-  ex.stopTime(exercise.value(QLatin1String("stopTime")).toDouble());
-  ex.state(static_cast<ExerciseManagement::ExerciseState>(exercise.value(QLatin1String("status")).toInt()));
-  ex.description(exercise.value(QLatin1String("description")).toString().toStdString());
-  ex.id(exercise.value(QLatin1String("id")).toInt());
-  ex.trainingAreaId(exercise.value(QLatin1String("trainingAreaId")).toInt());
+  ex.name = exercise.value(QLatin1String("name")).toString().toStdString();
+  ex.beginTime = exercise.value(QLatin1String("beginTime")).toDouble();
+  ex.endTime = exercise.value(QLatin1String("endTime")).toDouble();
+  ex.defaultTimeZone = exercise.value(QLatin1String("timeZone")).toString().toStdString().c_str()[0];
+  ex.startTime = exercise.value(QLatin1String("startTime")).toDouble();
+  ex.stopTime = exercise.value(QLatin1String("stopTime")).toDouble();
+  ex.state = static_cast<ExerciseManagement::ExerciseState>(exercise.value(QLatin1String("status")).toInt());
+  ex.description = exercise.value(QLatin1String("description")).toString().toStdString();
+  ex.id = exercise.value(QLatin1String("id")).toInt();
+  ex.trainingAreaId = exercise.value(QLatin1String("trainingAreaId")).toInt();
   
-  if (ex.id() > 0 && (ex.state() == ExerciseManagement::ExerciseState::Started || ex.state() == ExerciseManagement::ExerciseState::Paused  ) )
+  if (ex.id > 0 && (ex.state == ExerciseManagement::ExerciseState::Started || ex.state == ExerciseManagement::ExerciseState::Paused  ) )
     insertRow(ex);
 
 }
@@ -52,15 +54,15 @@ QVariant ExModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ExModel::Columns::Name:
-    return QString::fromStdString(ex.name());
+    return QString::fromStdString(ex.name);
   case ExModel::Columns::Begin:
-    return QDateTime::fromMSecsSinceEpoch(ex.beginTime());
+    return QDateTime::fromMSecsSinceEpoch(ex.beginTime);
   case ExModel::Columns::End:
-    return QDateTime::fromMSecsSinceEpoch(ex.endTime());
+    return QDateTime::fromMSecsSinceEpoch(ex.endTime);
   case ExModel::Columns::Description:
-    return QString::fromStdString(ex.description());
+    return QString::fromStdString(ex.description);
   case ExModel::Columns::Id:
-    return ex.id();
+    return ex.id;
   }
 
   return QVariant();
@@ -84,9 +86,9 @@ bool ExProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &s
   switch (source_left.column())
   {
   case ExModel::Begin:
-    return dataLeft.beginTime() < dataRight.beginTime();
+    return dataLeft.beginTime < dataRight.beginTime;
   case ExModel::End:
-    return dataLeft.endTime() < dataRight.endTime();
+    return dataLeft.endTime < dataRight.endTime;
 
   case ExModel::Name:
   case ExModel::Description:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h
index 1c22f7ded..f964f962f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h
@@ -12,7 +12,7 @@
 namespace OcBaseDownload
 {
 
-class ExModel final : public LtsWidgets::LtsAbstractTableModel<Exercise>
+class ExModel final : public LtsWidgets::LtsAbstractTableModel<ExerciseManagement::Exercise>
 {
   Q_OBJECT
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
index 4aeae8eab..cfe588fb9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
@@ -24,6 +24,7 @@ DemandSituation::DemandSituation(LtsSession::LtsSession *session, QWidget *paren
   , m_model(nullptr)
   , m_proxyModel(nullptr)
   , m_ui(new Ui::DemandSituation)
+  , m_logger(getLogger("DemandSituationDialog"))
 {
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("OC-Demand_Situation"));
@@ -128,7 +129,7 @@ void DemandSituation::onSendDemandSituationReply(const Core::FunctionReplyObject
     m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("Party"), m_ui->cbParty->currentData().toInt());
     const auto selIndexes = m_ui->dvParticipants->selectedRows();
     if (!selIndexes.isEmpty())
-      m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), m_model->getParticipantData(selIndexes.first()).id());
+      m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), m_model->getParticipantData(selIndexes.first()).id);
     else
       m_opSettings->setValue(m_ocDemandGroupString, QStringLiteral("ParticipantId"), 0);
 
@@ -153,12 +154,12 @@ void DemandSituation::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     ParticipantManagement::ParticipantData part = m_model->getParticipantData(selIndexes.first());
-    if (part.equipmentNumber().is_set())
+    if (part.equipmentNumber.has_value())
     {
       
       onClearCoordinate();
 
-      m_selectedEqNr = part.equipmentNumber().get();
+      m_selectedEqNr = part.equipmentNumber.get();
     }
     else
       m_selectedEqNr = 0;
@@ -233,15 +234,15 @@ bool DemandSituation::apply()
   bool stopDemand = false;
   if (m_ui->dtePos->coordinate().isNull() && m_selectedEqNr == 0)
   {
-    req.radius() = 0;
+    req.radius = 0;
     const Core::GeoPosition2D pos(std::nan(""),std::nan(""));
-    req.position() = pos;
+    req.position = pos;
     stopDemand = true;
   }
   else if (m_ui->dtePos->coordinate().x() > 0)
   {
     const Core::GeoPosition2D pos(m_ui->dtePos->coordinate().x(), m_ui->dtePos->coordinate().y() );
-    req.position().set(pos);
+    req.position.set(pos);
   }
 
 
@@ -268,7 +269,7 @@ void DemandSituation::repaintSitmapCircle()
   const auto selIndexes = m_ui->dvParticipants->selectedRows();
   if (!selIndexes.isEmpty())
   {
-    m_sitMapGuiIfc->ocSituationRange_create(m_model->getParticipantData(selIndexes.first()).id(), range);
+    m_sitMapGuiIfc->ocSituationRange_create(m_model->getParticipantData(selIndexes.first()).id, range);
   }
   else if (!m_ui->dtePos->coordinate().isNull())
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
index 9a6f3b018..4e56fe85a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
@@ -107,9 +107,9 @@ bool DemandSituationFilter::apply()
     const double posLat = m_opSettings->value(ocDemandGroup, QStringLiteral("PosLat"), -1).toDouble();
     const ParticipantManagement::Participant participant = m_ppmDtc->participant(ppId);
     int equipNumber = 0;
-    if(participant.equipmentNumber().is_set())
+    if(participant.equipmentNumber.has_value())
     {
-      equipNumber= participant.equipmentNumber().get();
+      equipNumber= participant.equipmentNumber.get();
     }
 
     std::vector<int> partyList;
@@ -131,7 +131,7 @@ bool DemandSituationFilter::apply()
     if (posLon > 0)
     {
       const Core::GeoPosition2D pos(posLon, posLat );
-      req.position().set(pos);
+      req.position.set(pos);
     }
 
     ret =  m_requestHelper->startSingleRequest([req, this]()
@@ -156,12 +156,12 @@ void DemandSituationFilter::buildPartyTable(const QMap<int, ParticipantManagemen
 
   for (const ParticipantManagement::Party &party : parties)
   {
-    if(party.id() == 0)
+    if(party.id == 0)
       continue;
 
-    QCheckBox *cbParty = new QCheckBox(ParticipantManagement::trPartyName(party.name()), this);
-    cbParty->setObjectName(QStringLiteral("party_%1").arg(party.id()));
-    cbParty->setChecked(m_partyList.contains(QString::number(party.id())));
+    QCheckBox *cbParty = new QCheckBox(ParticipantManagement::trPartyName(party.name), this);
+    cbParty->setObjectName(QStringLiteral("party_%1").arg(party.id));
+    cbParty->setChecked(m_partyList.contains(QString::number(party.id)));
     connect(cbParty, &QCheckBox::stateChanged, this, &DemandSituationFilter::onPartyBoxChecked);
     m_ui->glParty->addWidget(cbParty);
     
@@ -176,9 +176,9 @@ void DemandSituationFilter::buildTypeClassTable(const std::set<ParticipantManage
 {
   for (const ParticipantManagement::TypeClass &typeClass : typeClassList)
   {
-    QCheckBox *cb  = new QCheckBox(ParticipantManagement::toString(typeClass.underlying()), this);
-    cb->setObjectName(QStringLiteral("typeClass_%1").arg(typeClass.underlying()));
-    cb->setChecked(m_typeClassList.contains(QString::number(typeClass.underlying())));
+    QCheckBox *cb  = new QCheckBox(ParticipantManagement::toString(typeClass), this);
+    cb->setObjectName(QStringLiteral("typeClass_%1").arg(static_cast<int>(typeClass)));
+    cb->setChecked(m_typeClassList.contains(QString::number(static_cast<int>(typeClass))));
     connect(cb, &QCheckBox::stateChanged, this, &DemandSituationFilter::onTypeClassCBoxChecked);
     m_ui->glTypeClass->addWidget(cb);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
index e7b96afde..cc107ba95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
@@ -23,6 +23,7 @@ FolderContentEditDialog::FolderContentEditDialog(QWidget *parent)
   , m_session(nullptr)
   , m_obdFtc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("OscFolderContentEditDialog"))
 {
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("OSC-Edit_Folder_Content"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.cpp
index a40adb532..bbe9c0efe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.cpp
@@ -25,6 +25,7 @@ EquipPlayer::EquipPlayer(LtsSession::LtsSession *session, QWidget *parent)
   , m_ppmDtc(nullptr)
   , m_ppmCbxGui(nullptr)
   , m_ui(new Ui::EquipPlayer)
+  , m_logger(getLogger("EquipPlayerDialog"))
 {
   m_ui->setupUi(this);
 
@@ -104,12 +105,12 @@ void EquipPlayer::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     part = m_model->getParticipantData(selIndexes.first());
-    ParticipantManagement::Type tp =  m_ppmDtc->type(part.typeId());
-    ParticipantManagement::EquipmentType eq=  m_ppmDtc->equipmentType(tp.equipmentTypeId());
-    m_ui->lblMinEq->setText(QString::number(eq.minEquipNo()));
-    m_ui->lblMaxEq->setText(QString::number(eq.maxEquipNo()));
+    ParticipantManagement::Type tp =  m_ppmDtc->type(part.typeId);
+    ParticipantManagement::EquipmentType eq=  m_ppmDtc->equipmentType(tp.equipmentTypeId);
+    m_ui->lblMinEq->setText(QString::number(eq.minEquipNo));
+    m_ui->lblMaxEq->setText(QString::number(eq.maxEquipNo));
 
-    tc = tp.typeClass();
+    tc = tp.typeClass;
 
     if ( (tc == ParticipantManagement::TypeClass::Human)
          || (tc == ParticipantManagement::TypeClass::GroundVehicle)
@@ -121,8 +122,8 @@ void EquipPlayer::onSlotSelectionChanged()
     else
       m_isValid = false;
 
-    if (part.id())
-      m_selectedParticipantId = part.id();
+    if (part.id)
+      m_selectedParticipantId = part.id;
     else
       m_selectedParticipantId = -1;
   }
@@ -134,8 +135,8 @@ void EquipPlayer::onSlotSelectionChanged()
 
   slotChangesMade();
 
-  if (m_selectedParticipantId > 0 && part.equipmentNumber().is_set())
-    m_ui->leParticipant->setText(QString::number(part.equipmentNumber().get()));
+  if (m_selectedParticipantId > 0 && part.equipmentNumber.has_value())
+    m_ui->leParticipant->setText(QString::number(part.equipmentNumber.get()));
   else
     m_ui->leParticipant->setText(QString::number(0));
 
@@ -162,8 +163,8 @@ bool EquipPlayer::apply()
   if (m_ui->leParticipant->text().toInt() < 0)
     return false;
   SendEquipmentRegistrationRequest req;
-  req.equipmentNumber(m_ui->leParticipant->text().toInt());
-  req.participantId(m_selectedParticipantId);
+  req.equipmentNumber = m_ui->leParticipant->text().toInt();
+  req.participantId = m_selectedParticipantId;
 
   bool ret = m_requestHelper->startSingleRequest([req, this]()
   {
@@ -172,21 +173,21 @@ bool EquipPlayer::apply()
 
   
   {
-    if (m_ppmDtc->participant(m_selectedParticipantId).equipmentNumber().is_set())
+    if (m_ppmDtc->participant(m_selectedParticipantId).equipmentNumber.has_value())
     {
       ParticipantManagement::RegisterParticipantRequest req3;
-      req3.participantId(m_selectedParticipantId);
-      req3.equipmentNumber(0);
-      req3.assignState(ParticipantManagement::ParticipantAssignState::NotAssigned);
+      req3.participantId = m_selectedParticipantId;
+      req3.equipmentNumber = 0;
+      req3.assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
       m_requestHelper->startSingleRequest([req3, this]()
       {
         return m_ppmFtc->registerParticipantRequest(req3, this);
       });
     }
     ParticipantManagement::RegisterParticipantRequest req2;
-    req2.participantId(m_selectedParticipantId);
-    req2.equipmentNumber(req.equipmentNumber());
-    req2.assignState(ParticipantManagement::ParticipantAssignState::HandoutExcon);
+    req2.participantId = m_selectedParticipantId;
+    req2.equipmentNumber = req.equipmentNumber;
+    req2.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
     m_requestHelper->startSingleRequest([req2, this]()
     {
       return m_ppmFtc->registerParticipantRequest(req2, this);
@@ -220,9 +221,9 @@ bool EquipPlayer::checkEqNr()
 
   for (const auto &part : data)
   {
-    if (!part.equipmentNumber().is_set())
+    if (!part.equipmentNumber.has_value())
       continue;
-    if (part.equipmentNumber().is_set() && part.equipmentNumber().get() == equipNr)
+    if (part.equipmentNumber.has_value() && part.equipmentNumber.get() == equipNr)
     {
       m_ui->lblError->setText(tr("Equipment Number already exists!"));
       return false;;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.cpp
index 60d09e28f..fc42056d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.cpp
@@ -22,6 +22,7 @@ FaultMessage::FaultMessage(LtsSession::LtsSession *session, QWidget *parent)
   , m_tabocDtc(nullptr)
   , m_ppmCbxGui(nullptr)
   , m_ui(new Ui::FaultMessage)
+  , m_logger(getLogger("FaultMessageDialog"))
 {
   m_ui->setupUi(this);
   m_ui->lblCountMax->setText(QString::number(m_maxChars));
@@ -100,8 +101,8 @@ void FaultMessage::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     ParticipantManagement::ParticipantData part = m_model->getParticipantData(selIndexes.first());
-    if (part.equipmentNumber().is_set())
-      m_selectedEqNr = part.equipmentNumber().get();
+    if (part.equipmentNumber.has_value())
+      m_selectedEqNr = part.equipmentNumber.get();
     else
       m_selectedEqNr = -1;
   }
@@ -185,10 +186,10 @@ bool FaultMessage::apply()
   if (m_ui->leParticipant->text().toInt() <= 0)
     return false;
   SendEquipmentErrorRegistrationRequest req;
-  req.device(m_ui->leDevice->text().toStdString());
-  req.faultEquipmentNumber(m_ui->leParticipant->text().toStdString());
-  req.text(m_ui->teComment->toPlainText().toStdString());
-  req.ocEquipmentNumber(m_ownEquipmentId);
+  req.device = m_ui->leDevice->text().toStdString();
+  req.faultEquipmentNumber = m_ui->leParticipant->text().toStdString();
+  req.text = m_ui->teComment->toPlainText().toStdString();
+  req.ocEquipmentNumber = m_ownEquipmentId;
 
   return m_requestHelper->startSingleRequest([req, this]()
   {
@@ -201,9 +202,9 @@ void FaultMessage::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specifi
   if (DataModification::eRemoved == modType)
     return;
 
-  m_ownEquipmentId = data.equipmentNumber();
+  m_ownEquipmentId = data.equipmentNumber;
   if (m_ownEquipmentId <= 0)
-    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
+    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber << " is not present ";
 
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
index 2390cd83c..e73b2fdf9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
@@ -246,9 +246,9 @@ void InterfaceImpl::onTimerTick()
                                  partyIds,
                                  typesClass);
 
-  if (pos.lat() > 0)
+  if (pos.lat > 0)
   {
-    req.position().set(pos);
+    req.position.set(pos);
   }
 
   m_requestHelper->startSingleRequest([req, this]()
@@ -268,7 +268,7 @@ void InterfaceImpl::onNoDataTimerTick()
 
 void InterfaceImpl::onParticipantDynamic(const ParticipantManagement::DynamicParticipantData &data)
 {
-  if (m_dtcPpm->participant(data.participantId()).equipmentNumber() == m_dtcTab->specificsEquipment(1).equipmentNumber())
+  if (m_dtcPpm->participant(data.participantId).equipmentNumber == m_dtcTab->specificsEquipment(1).equipmentNumber)
     return;
   onParticipantData();
 }
@@ -276,7 +276,7 @@ void InterfaceImpl::onParticipantDynamic(const ParticipantManagement::DynamicPar
 
 void InterfaceImpl::onParticipantPosition(const ParticipantManagement::ParticipantPosition &data)
 {
-  if (m_dtcPpm->participant(data.participantId()).equipmentNumber() == m_dtcTab->specificsEquipment(1).equipmentNumber())
+  if (m_dtcPpm->participant(data.participantId).equipmentNumber == m_dtcTab->specificsEquipment(1).equipmentNumber)
     return;
   onParticipantData();
 }
@@ -285,7 +285,7 @@ void InterfaceImpl::onCentralAesOverloadChanged(const TrainingAreaBaseOC::Centra
 {
   Q_UNUSED(modType)
 
-  m_hasCentralAesOverload = data.hasOverload();
+  m_hasCentralAesOverload = data.hasOverload;
 
   setShortcutDemandSituationIconData();
 
@@ -296,7 +296,7 @@ void InterfaceImpl::onParticipantsOverloadChanged(const TrainingAreaBaseOC::Part
 {
   Q_UNUSED(modType)
 
-  m_hasParticipantOverload = data.hasOverload();
+  m_hasParticipantOverload = data.hasOverload;
 
   setShortcutDemandSituationIconData();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp
index 01f005620..f2f7e7ba6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp
@@ -20,10 +20,11 @@ OcParticipantInfo::OcParticipantInfo(int participantId, LtsSession::LtsSession *
   , m_roomId(0)
   , m_session(session)
   , m_ui(new Ui::OcParticipantInfo)
+  , m_logger(getLogger("OcOcParticipantInfo"))
 {
   m_ui->setupUi(this);
-  m_participant.id(participantId);
-  m_participant.partyId(-1);
+  m_participant.id = participantId;
+  m_participant.partyId = -1;
   m_symbolWatcher =  new AdvancedSymbology::SymbolResultWatcherLabel(m_ui->lblIcon);
 
   
@@ -107,7 +108,7 @@ void OcParticipantInfo::updateIcon(const QColor &color, const QString &sidc)
 
 bool OcParticipantInfo::setUiValues()
 {
-  if (!m_ppmDtc || m_participant.id() < 0)
+  if (!m_ppmDtc || m_participant.id < 0)
     return false;
 
   
@@ -115,29 +116,29 @@ bool OcParticipantInfo::setUiValues()
   m_ui->tbNbc->setVisible(false); 
 
   
-  const ParticipantManagement::Participant participantData = m_ppmDtc->participant(m_participant.id());
-  m_typeClass = m_ppmDtc->type(participantData.typeId()).typeClass();
+  const ParticipantManagement::Participant participantData = m_ppmDtc->participant(m_participant.id);
+  m_typeClass = m_ppmDtc->type(participantData.typeId).typeClass;
 
   bool bUpdateDynamicParticipantData = true;
-  switch (m_typeClass.underlying())
+  switch (static_cast<int>(m_typeClass))
   {
-  case ParticipantManagement::TypeClass::Human:
-  case ParticipantManagement::TypeClass::GroundVehicle:
-  case ParticipantManagement::TypeClass::VehicleWithGear:
-  case ParticipantManagement::TypeClass::WeaponSystem:
-  case ParticipantManagement::TypeClass::Aircraft:
-  case ParticipantManagement::TypeClass::SupportEntity:
+  case static_cast<int>(ParticipantManagement::TypeClass::Human):
+  case static_cast<int>(ParticipantManagement::TypeClass::GroundVehicle):
+  case static_cast<int>(ParticipantManagement::TypeClass::VehicleWithGear):
+  case static_cast<int>(ParticipantManagement::TypeClass::WeaponSystem):
+  case static_cast<int>(ParticipantManagement::TypeClass::Aircraft):
+  case static_cast<int>(ParticipantManagement::TypeClass::SupportEntity):
   {
     onParticipantChanged(participantData);
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
             this, &OcParticipantInfo::onParticipantChanged);
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged,
             this, &OcParticipantInfo::onPositionChanged);
-    onPositionChanged(m_ppmDtc->participantPosition(participantData.id()));
+    onPositionChanged(m_ppmDtc->participantPosition(participantData.id));
 
     if (m_sitMapGuiIfc)
     {
-      const int32_t participantId = participantData.id();
+      const int32_t participantId = participantData.id;
 
       m_ui->pbFindOnMap->setVisible(true);
 
@@ -158,26 +159,26 @@ bool OcParticipantInfo::setUiValues()
     }
     break;
   }
-  case ParticipantManagement::TypeClass::Unit:
-  case ParticipantManagement::TypeClass::SupportUnit:
-  case ParticipantManagement::TypeClass::Vessel:
-  case ParticipantManagement::TypeClass::Unknown:
+  case static_cast<int>(ParticipantManagement::TypeClass::Unit):
+  case static_cast<int>(ParticipantManagement::TypeClass::SupportUnit):
+  case static_cast<int>(ParticipantManagement::TypeClass::Vessel):
+  case static_cast<int>(ParticipantManagement::TypeClass::Unknown):
     return false;
   }
 
   if (bUpdateDynamicParticipantData)
   {
-    const auto dpd = m_ppmDtc->dynamicParticipantData(participantData.id());
-    if (dpd.participantId() || participantData.id())
+    const auto dpd = m_ppmDtc->dynamicParticipantData(participantData.id);
+    if (dpd.participantId || participantData.id)
     {
       onDynamicParticipantDataChanged(dpd);
     }
     else
     {
-      const ParticipantManagement::Party party = m_ppmDtc->party(m_participant.partyId());
-      const QColor color = QColor::fromRgb(QRgb(party.color()));
+      const ParticipantManagement::Party party = m_ppmDtc->party(m_participant.partyId);
+      const QColor color = QColor::fromRgb(QRgb(party.color));
 
-      updateIcon(color, QString::fromStdString(m_participant.symbol()));
+      updateIcon(color, QString::fromStdString(m_participant.symbol));
     }
   }
 
@@ -219,22 +220,22 @@ void OcParticipantInfo::setKindVisible(bool vis)
 
 void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data)
 {
-  if (data.participantId() != m_participant.id() && data.participantId() != 0)
+  if (data.participantId != m_participant.id && data.participantId != 0)
     return;
 
   
-  if (data.stateHistory().size() > 0)
+  if (data.stateHistory.size() > 0)
   {
     const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == ParticipantManagement::TypeClass::Human ?
-          ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-          ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+          ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+          ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
-    const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory());
-    m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
+    const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory);
+    m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState, vc));
 
     
-    setKindVisible(lastState.vulnerabilityKindId() > 0);
-    m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId(), vc));
+    setKindVisible(lastState.vulnerabilityKindId > 0);
+    m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId, vc));
   }
   else
   {
@@ -242,35 +243,35 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
     m_ui->lblKind->setText(QStringLiteral("-"));
   }
 
-  setRed(m_ui->lblEquipNr, data.manipulation().size());
+  setRed(m_ui->lblEquipNr, data.manipulation.size());
 
   
   
 
   
-  if (!data.specialSensorDataState() || m_typeClass == ParticipantManagement::TypeClass::Aircraft)
+  if (!data.specialSensorDataState || m_typeClass == ParticipantManagement::TypeClass::Aircraft)
   {
     m_ui->lblSpecialSensorState->hide();
     m_ui->lbSpecialSensorState->hide();
   }
   else
   {
-    showSpecialSensorData(data.specialSensorDataState());
+    showSpecialSensorData(data.specialSensorDataState);
     m_ui->lbSpecialSensorState->show();
     m_ui->lblSpecialSensorState->show();
   }
 
   
-  if (data.gear().size() == 0)
+  if (data.gear.size() == 0)
   {
     m_gearList.clear();
     m_ui->twGear->clearContents();
     m_ui->twGear->hide();
     m_ui->pbGearRanges->hide();
   }
-  else if (data.gear() != m_gearList)
+  else if (data.gear != m_gearList)
   {
-    m_gearList = data.gear();
+    m_gearList = data.gear;
     std::vector<ParticipantManagement::GearInformation> tmpGearList = m_gearList;
 
     m_ui->twGear->show();
@@ -287,20 +288,20 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
     for (const ParticipantManagement::GearInformation &gearInfo : m_gearList)
     {
       QTableWidgetItem *item = nullptr;
-      if (gearInfo.chargeTypeId() <= 0) 
+      if (gearInfo.chargeTypeId <= 0)
       {
         rowCount--;
         continue;
       }
 
-      const int gearTypeId = gearInfo.gearTypeId();
+      const int gearTypeId = gearInfo.gearTypeId;
       if ((gearTypeId & unknownTasId) == unknownTasId)
         item = new QTableWidgetItem(tr("Unknown gear id %1").arg(gearTypeId & ~unknownTasId));
       else if (gearTypeId == 0)
       {
         
         
-        switch (gearInfo.gearId())
+        switch (gearInfo.gearId)
         {
         case 1:
           item = new QTableWidgetItem(tr("Tank", "Gear Type"));
@@ -317,9 +318,9 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
         item = new QTableWidgetItem(m_pdmDtc->trGearTypeName(gearTypeId));
       m_ui->twGear->setItem(row, 0, item);
 
-      if (gearInfo.chargeTypeId() != 0 && gearInfo.chargeTypeId() != -1) 
+      if (gearInfo.chargeTypeId != 0 && gearInfo.chargeTypeId != -1)
       {
-        int chargeTypeId = gearInfo.chargeTypeId();
+        int chargeTypeId = gearInfo.chargeTypeId;
         if ((chargeTypeId & unknownTasId) == unknownTasId)
           item = new QTableWidgetItem(tr("Unknown charge id %1").arg(chargeTypeId & ~unknownTasId));
         else if (chargeTypeId == 0)
@@ -332,7 +333,7 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
         m_ui->twGear->setItem(row, 1, item);
         
         
-        item = new QTableWidgetItem((gearInfo.remain() < 0) ? tr("N/A", "Blank Ammunition") : QString::number(gearInfo.remain()));
+        item = new QTableWidgetItem((gearInfo.remain < 0) ? tr("N/A", "Blank Ammunition") : QString::number(gearInfo.remain));
         m_ui->twGear->setItem(row, 2, item);
       }
       row++;
@@ -342,7 +343,7 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
 
   } 
 
-  m_ui->tbNbc->setVisible(data.hasNbcProtectionConfigured() && data.hasNbcProtectionActive());
+  m_ui->tbNbc->setVisible(data.hasNbcProtectionConfigured && data.hasNbcProtectionActive);
 
   updateIcon(m_participant);
 }
@@ -353,73 +354,73 @@ void OcParticipantInfo::showSpecialSensorData(int specialSensorData)
   QString strSpecialSensorData;
   switch (specialSensorDataState)
   {
-  case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting);
     break;
-  case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test);
     break;
-  case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir);
     break;
-  case ParticipantManagement::SpecialSensorStatus::AVLB_Mounted:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::AVLB_Mounted):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounted);
     break;
-  case ParticipantManagement::SpecialSensorStatus::AVLB_Deployed:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::AVLB_Deployed):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deployed);
     break;
-  case ParticipantManagement::SpecialSensorStatus::AVLB_Mounting:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::AVLB_Mounting):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounting);
     break;
-  case ParticipantManagement::SpecialSensorStatus::AVLB_Deploying:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::AVLB_Deploying):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deploying);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineLayer_Operational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineLayer_Operational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Operational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineLayer_Laying:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineLayer_Laying):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Laying);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply);
     break;
-  case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying);
     break;
-  case ParticipantManagement::SpecialSensorStatus::ADLER_Operational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::ADLER_Operational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_Operational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational);
     break;
-  case ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational:
+  case static_cast<int>(ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational):
     strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational);
     break;
 
@@ -495,39 +496,39 @@ void OcParticipantInfo::showSpecialSensorData(int specialSensorData)
 
 void OcParticipantInfo::onPositionChanged(const ParticipantManagement::ParticipantPosition &position)
 {
-  if (position.participantId() != m_participant.id() && position.participantId() != 0)
+  if (position.participantId != m_participant.id && position.participantId != 0)
     return;
 
-  onUpdatePosition(position.participantId(), position.pos(), position.sampleTime());
+  onUpdatePosition(position.participantId, position.pos, position.sampleTime);
 
-  if (m_ismDtc && m_roomId != position.roomId())
+  if (m_ismDtc && m_roomId != position.roomId)
   {
-    if (position.roomId() > 0)
+    if (position.roomId > 0)
     {
-      const auto mse = m_ismDtc->mainStructureElement(position.buildingId());
+      const auto mse = m_ismDtc->mainStructureElement(position.buildingId);
       QString roomName;
-      for (const auto &room : mse.elements())
+      for (const auto &room : mse.elements)
       {
-        if (room.id() == position.roomId())
+        if (room.id == position.roomId)
         {
-          roomName = QString::fromStdString(room.displayName());
+          roomName = QString::fromStdString(room.displayName);
           break;
         }
       }
       QString buildingName = m_ismDtc->getBuildingDisplayName(mse);
 
-      m_roomId = position.roomId();
+      m_roomId = position.roomId;
       m_ui->lblBuilding->setText(buildingName);
       m_ui->lblRoom->setText(roomName);
     }
     setBuildingPosVisible(m_roomId > 0);
   }
 
-  if (position.mountedOn().is_set())
+  if (position.mountedOn.has_value())
   {
-    const auto mountedOnParticipant = m_ppmDtc->participant(position.mountedOn().get());
-    if (mountedOnParticipant.equipmentNumber().is_set())
-      m_ui->pbMountedOn->setText(QString::number(mountedOnParticipant.equipmentNumber().get()));
+    const auto mountedOnParticipant = m_ppmDtc->participant(position.mountedOn.get());
+    if (mountedOnParticipant.equipmentNumber.has_value())
+      m_ui->pbMountedOn->setText(QString::number(mountedOnParticipant.equipmentNumber.get()));
     else
       m_ui->pbMountedOn->setText(QString::number(0));
     m_ui->pbMountedOn->show();
@@ -535,9 +536,9 @@ void OcParticipantInfo::onPositionChanged(const ParticipantManagement::Participa
   else
     m_ui->pbMountedOn->hide();
 
-  if (position.mountedParticipants().is_set())
+  if (position.mountedParticipants.has_value())
   {
-    m_ui->pbMountedParticipants->setText(QString::number(position.mountedParticipants().get().size()));
+    m_ui->pbMountedParticipants->setText(QString::number(position.mountedParticipants.get().size()));
     m_ui->pbMountedParticipants->show();
   }
   else
@@ -548,16 +549,16 @@ void OcParticipantInfo::onPositionChanged(const ParticipantManagement::Participa
 void OcParticipantInfo::onUpdatePosition(int participantId, const Core::GeoPosition &position, qint64 sampleTime)
 {
   m_lastPositionMSec = sampleTime;
-  if ((position.lat() == 0 && position.lon() == 0) || participantId == 0 || std::isnan(position.lon()) || std::isnan(position.lat()))
+  if ((position.lat == 0 && position.lon == 0) || participantId == 0 || std::isnan(position.lon) || std::isnan(position.lat))
   {
     m_ui->lblPosition->setText(tr("Invalid Position"));
   }
   else
   {
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
 
-    if (!qFuzzyIsNull(position.z()))
-      mgrs += QStringLiteral(" | ") + QString::number(position.z(), 'f', 2);
+    if (!qFuzzyIsNull(position.z))
+      mgrs += QStringLiteral(" | ") + QString::number(position.z, 'f', 2);
 
     m_ui->lblPosition->setText(mgrs);
   }
@@ -565,45 +566,45 @@ void OcParticipantInfo::onUpdatePosition(int participantId, const Core::GeoPosit
 
 void OcParticipantInfo::onParticipantChanged(const ParticipantManagement::Participant &participant)
 {
-  if (participant.id() != m_participant.id())
+  if (participant.id != m_participant.id)
     return;
 
-  if (m_participant.typeId() != participant.typeId())
-    m_ui->lblType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(participant.typeId()).name()));
-  if (m_participant.partyId() != participant.partyId())
-    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(participant.partyId()).name()));
-  m_ui->lblDesignator->setText(QString::fromStdString(participant.designator()));
-  m_ui->lblTactitcalIdentifier->setText(QString::fromStdString(participant.tacticalIdentifier()));
+  if (m_participant.typeId != participant.typeId)
+    m_ui->lblType->setText(ParticipantManagement::trTypeName(m_ppmDtc->type(participant.typeId).name));
+  if (m_participant.partyId != participant.partyId)
+    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(participant.partyId).name));
+  m_ui->lblDesignator->setText(QString::fromStdString(participant.designator));
+  m_ui->lblTactitcalIdentifier->setText(QString::fromStdString(participant.tacticalIdentifier));
 
-  if (participant.equipmentNumber().is_set())
-    m_ui->lblEquipNr->setText(QString::number(participant.equipmentNumber().get()));
-  else if (participant.isSimulated())
+  if (participant.equipmentNumber.has_value())
+    m_ui->lblEquipNr->setText(QString::number(participant.equipmentNumber.get()));
+  else if (participant.isSimulated)
     m_ui->lblEquipNr->setText(tr("simulated"));
   else
     m_ui->lblEquipNr->setText(QLatin1String("-"));
 
 #ifdef LTS_DEBUG
-  m_ui->lblEquipNr->setToolTip(QString::number(participant.id()));
+  m_ui->lblEquipNr->setToolTip(QString::number(participant.id));
 #endif
 
 
   m_participant = participant;
 
   
-  m_ui->lblInfoText->setText(QString::fromStdString(participant.info()));
-  m_ui->lblInfoText->setVisible(participant.info().size() > 0);
-  m_ui->lblInfo->setVisible(participant.info().size() > 0);
-  m_ui->lblInfo->setText(QString::number(participant.info().size()));
+  m_ui->lblInfoText->setText(QString::fromStdString(participant.info));
+  m_ui->lblInfoText->setVisible(participant.info.size() > 0);
+  m_ui->lblInfo->setVisible(participant.info.size() > 0);
+  m_ui->lblInfo->setText(QString::number(participant.info.size()));
 
-  onDynamicParticipantDataChanged(m_ppmDtc->dynamicParticipantData(participant.id()));
+  onDynamicParticipantDataChanged(m_ppmDtc->dynamicParticipantData(participant.id));
 }
 
 void OcParticipantInfo::onTypeChanged(const ParticipantManagement::Type &type, DataModification modType)
 {
   Q_UNUSED(modType)
-  if (m_participant.typeId() != type.id())
+  if (m_participant.typeId != type.id)
     return;
-  m_ui->lblType->setText(ParticipantManagement::trTypeName(type.name()));
+  m_ui->lblType->setText(ParticipantManagement::trTypeName(type.name));
 }
 
 void OcParticipantInfo::onPartitionTimeChanged(qint64 newPartitionTime)
@@ -615,13 +616,13 @@ void OcParticipantInfo::onPartitionTimeChanged(qint64 newPartitionTime)
 void OcParticipantInfo::onFindOnMap()
 {
   if (m_sitMapGuiIfc)
-    m_sitMapGuiIfc->centerMapToParticipant(m_participant.id());
+    m_sitMapGuiIfc->centerMapToParticipant(m_participant.id);
 }
 
 void OcParticipantInfo::onMovementTrack()
 {
   if (m_sitMapGuiIfc)
-    m_sitMapGuiIfc->enableMovementTrack(m_participant.id(), m_ui->pbMovementTrack->isChecked());
+    m_sitMapGuiIfc->enableMovementTrack(m_participant.id, m_ui->pbMovementTrack->isChecked());
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.cpp
index ffca15a45..2070f36f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.cpp
@@ -14,6 +14,7 @@ CloseAesList::CloseAesList(LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_model(new AesListModel(session, this))
   , m_ui(new Ui::CloseAesList)
+  , m_logger(getLogger("CloseAesList"))
 {
   m_ui->setupUi(this);
   m_ui->aesList->setModel(m_model);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.cpp
index e5defce9f..16b93f782 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.cpp
@@ -19,6 +19,7 @@ AesListModel::AesListModel(LtsSession::LtsSession *session, QObject *parent)
 }
       , parent)
   , m_session(session)
+  , m_logger(getLogger("AesListModel"))
 {
 
   m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc);
@@ -51,24 +52,24 @@ QVariant AesListModel::data(const QModelIndex &index, int role) const
   
 
   const AreaEffectSimulation::AesItemView &view = m_aesDtc.get()->aesItemView(m_vecData.at(index.row()));
-  if (view.id() == 0)
+  if (view.id == 0)
     return QVariant();
 
   AreaEffectSimulation::AesItem aesItem;
-  m_aesDtc->aesItemFromId(view.aesItemId(), aesItem);
-  if (aesItem.id() < 0)
+  m_aesDtc->aesItemFromId(view.aesItemId, aesItem);
+  if (aesItem.id < 0)
     return QVariant();
 
   switch (index.column())
   {
   case Columns::Id:
-    return aesItem.id();
+    return aesItem.id;
   case Columns::Name:
-    return QString::fromStdString(aesItem.name());
+    return QString::fromStdString(aesItem.name);
   case Columns::AesType:
-    return m_pdmDtc->trChargeTypeShortName(aesItem.chargeStruct().chargeTypeId(), true);
+    return m_pdmDtc->trChargeTypeShortName(aesItem.chargeStruct.chargeTypeId, true);
   case Columns::Party:
-    return aesItem.partyId().is_set() ? ParticipantManagement::trPartyName(m_ppmDtc->party(aesItem.partyId().get()).name()) : QObject::tr("---");
+    return aesItem.partyId.has_value() ? ParticipantManagement::trPartyName(m_ppmDtc->party(aesItem.partyId.get()).name) : QObject::tr("---");
   default:
     return QVariant();
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
index b42d4bce2..0c721f63d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
@@ -20,6 +20,7 @@ SelfTest::SelfTest(LtsSession::LtsSession *session, QWidget *parent)
   , m_tabocDtc(nullptr)
   , m_escDtc(nullptr)
   , m_ui(new Ui::SelfTest)
+  , m_logger(getLogger("SelfTestDialog"))
 {
   m_ui->setupUi(this);
 
@@ -140,12 +141,12 @@ void SelfTest::onSfmStatusChanged(const TrainingAreaBaseOC::TechnicalStateSfm &d
 {
 
   Q_UNUSED(modType)
-  m_ui->leRadio->setText(data.radioAvailable() ? tr("Available") : tr("Not Available"));
-  m_ui->leLicense->setText(data.licensed() ? tr("Yes") : tr("No"));
-  m_ui->leSfm->setText(data.sfmConnected() ? tr("Connected") : tr("Not Connected"));
-  m_ui->leSfmMani->setText(data.manipulationSfm() ? tr("Yes") : tr("No"));
-  m_ui->leEquipmentMani->setText(data.manipulationEquipment() ? tr("Yes") : tr("No"));
-  m_ui->lblErrorCodes->setText(data.errorCode() > 0 ? getTechStatError(data.errorCode()) : QLatin1String(""));
+  m_ui->leRadio->setText(data.radioAvailable ? tr("Available") : tr("Not Available"));
+  m_ui->leLicense->setText(data.licensed ? tr("Yes") : tr("No"));
+  m_ui->leSfm->setText(data.sfmConnected ? tr("Connected") : tr("Not Connected"));
+  m_ui->leSfmMani->setText(data.manipulationSfm ? tr("Yes") : tr("No"));
+  m_ui->leEquipmentMani->setText(data.manipulationEquipment ? tr("Yes") : tr("No"));
+  m_ui->lblErrorCodes->setText(data.errorCode > 0 ? getTechStatError(data.errorCode) : QLatin1String(""));
   onStatusHDD();
 
 }
@@ -155,18 +156,18 @@ void SelfTest::onEscOperationConditionChanged(const EffectShowClient::OperatingC
   Q_UNUSED(modType)
 
   QString feature = tr("Effect Show Connected: ");
-  switch (data.vehicleFeature().underlying())
+  switch (static_cast<int>(data.vehicleFeature))
   {
-  case EffectShowManagement::Feature_e::Smoke:
+  case static_cast<int>(EffectShowManagement::Feature_e::Smoke):
     feature += tr("Smoke");
     break;
-  case EffectShowManagement::Feature_e::Explosion24:
+  case static_cast<int>(EffectShowManagement::Feature_e::Explosion24):
     feature += tr("Explosion (24)");
     break;
-  case EffectShowManagement::Feature_e::Explosion48:
+  case static_cast<int>(EffectShowManagement::Feature_e::Explosion48):
     feature += tr("Explosion (48)");
     break;
-  case EffectShowManagement::Feature_e::NotSpecified:
+  case static_cast<int>(EffectShowManagement::Feature_e::NotSpecified):
     feature.clear();
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
index 1aed31671..6ecaaff4d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
@@ -9,6 +9,7 @@
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <QtCore/QDebug>
+#include <QAudioOutput>
 
 namespace OcSituationClient
 {
@@ -68,8 +69,8 @@ Settings::Settings(LtsSession::LtsSession *session, QWidget *parent)
   loadOperatorSettings();
 
   
-  m_mediaplayer->setMedia(QUrl(QLatin1String("qrc:/beep.wav")));
-  m_mediaplayer->setVolume(100);
+  m_mediaplayer->setSource(QUrl(QLatin1String("qrc:/beep.wav")));
+  m_mediaplayer->audioOutput()->setVolume(1.0f);
 
   setOnlineHelpFilename(QStringLiteral("OC-Settings"));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.h
index 208be28fe..790c6b433 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.h
@@ -51,7 +51,7 @@ private Q_SLOTS:
   void onResetRange();
   void onSoundCheck();
 private:
-NGL::INGLLogger &m_logger;
+  //NGL::INGLLogger &m_logger;
   void loadOperatorSettings();
   void retranslate() override;
   bool apply() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
index 314b56888..ecbb5ecfd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
@@ -15,9 +15,6 @@
 
 #include <LtsUtilsSettings/settings.h>
 
-#include <QNetworkSession>
-#include <QNetworkConfigurationManager>
-#include <QNetworkConfiguration>
 #include <QtCore/QTimer>
 #include <QtGui/QPolygonF>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -153,9 +150,9 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
     if (playSound)
     {
        DEBUG_LOG(m_logger) << "Got new ENterLeave event and play sound";
-       if (data.cAreaType()) 
+       if (data.cAreaType) 
        {
-         if(data.aesEntered())
+         if(data.aesEntered)
          {
            m_enterSound.play();
          }
@@ -163,11 +160,11 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
          {
            m_leaveSound.play();
          }
-        DEBUG_LOG(m_logger) << "enter leave direvly " << data.aesEntered();
+        DEBUG_LOG(m_logger) << "enter leave direvly " << data.aesEntered;
         }
         else 
         {
-          if (data.aesEntered())
+          if (data.aesEntered)
           {
             m_nearInSound.play();
           }
@@ -175,11 +172,11 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
           {
             m_nearOutSound.play();
           }
-        DEBUG_LOG(m_logger) << "enter leave near " << data.aesEntered();
+        DEBUG_LOG(m_logger) << "enter leave near " << data.aesEntered;
         }
     }
 
-    if (data.aesEntered() && LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("VisualWarning"), false).toBool() ) 
+    if (data.aesEntered && LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("VisualWarning"), false).toBool() ) 
     {
       bool bWidgetExists = m_session->widgetExists(menuGroup(), m_closeAreaIdentifier, LtsWidgets::LayoutArea::eDialogTab);
       if (!bWidgetExists)
@@ -205,7 +202,7 @@ void InterfaceImpl::onCheckAllEffectAreas()
     circle << QPointF(cos(angle) * radius, sin(angle) * radius);
   }
 
-  LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.position().lon(), pos.position().lat());
+  LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.position.lon, pos.position.lat);
   int zone = posUtm.zone;
   circle << circle.value(0);
   circle.translate(posUtm.x, posUtm.y);
@@ -222,34 +219,34 @@ void InterfaceImpl::onCheckAllEffectAreas()
 
   for(const AreaEffectSimulation::AesItemView &view: std::as_const(views))
   {
-    if (view.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions
-        || view.aesTypeId() == AreaEffectSimulation::AesType::AtMineAreaSingleMines
-        || view.aesTypeId() == AreaEffectSimulation::AesType::AtTechnicalArea )
+    if (view.aesTypeId == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions
+        || view.aesTypeId == AreaEffectSimulation::AesType::AtMineAreaSingleMines
+        || view.aesTypeId == AreaEffectSimulation::AesType::AtTechnicalArea )
       continue;
-    bool contains = m_closeAes.contains(view.id());
+    bool contains = m_closeAes.contains(view.id);
 
-    if (m_closeAes.contains(view.id()) && view.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated)
+    if (m_closeAes.contains(view.id) && view.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated)
     {
       DEBUG_LOG(m_logger) << "outdatet " ;
 
-      m_closeAes.remove(view.id());
-      elAes.aesEntered(false);
+      m_closeAes.remove(view.id);
+      elAes.aesEntered = false;
     }
-    else if (view.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+    else if (view.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
     {
       
-      QPolygonF poly(view.form().size());
+      QPolygonF poly(view.form.size());
       int i=0;
-      for(const auto &point : view.form())
+      for(const auto &point : view.form)
       {
-        poly[i++] = QPointF(point.lon(), point.lat());
+        poly[i++] = QPointF(point.lon, point.lat);
       }
 #if QT_VERSION < QT_VERSION_CHECK(5,10,0)
       bool inters = poly.intersected(circleLonLat).size() > 0;
 #else
       bool inters = poly.intersects(circleLonLat);
 #endif
-      DEBUG_LOG(m_logger) << "active " << view.id() << " intersect=" << inters << " inside map=" << contains ;
+      DEBUG_LOG(m_logger) << "active " << view.id << " intersect=" << inters << " inside map=" << contains ;
 
       if (inters && contains)
       {
@@ -261,16 +258,16 @@ void InterfaceImpl::onCheckAllEffectAreas()
         
         DEBUG_LOG(m_logger) << "is new inside" ;
 
-        m_closeAes.insert(view.id());
-        elAes.aesEntered(true);
+        m_closeAes.insert(view.id);
+        elAes.aesEntered = true;
       }
       else if (!inters && contains)
       {
         
         DEBUG_LOG(m_logger) << "now outside" ;
 
-        m_closeAes.remove(view.id());
-        elAes.aesEntered(false);
+        m_closeAes.remove(view.id);
+        elAes.aesEntered = false;
       }
       else
       {
@@ -280,12 +277,12 @@ void InterfaceImpl::onCheckAllEffectAreas()
     }
     else
     {
-      DEBUG_LOG(m_logger) << "missed " << view.id() << " ";
+      DEBUG_LOG(m_logger) << "missed " << view.id << " ";
       continue;
     }
 
-    elAes.aesId(view.aesItemId());
-    elAes.chargeTypeId(view.chargeStruct().chargeTypeId());
+    elAes.aesId = view.aesItemId;
+    elAes.chargeTypeId = view.chargeStruct.chargeTypeId;
     
 
     onEnterLeaveAesChanged(elAes,DataModification::eModified);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
index 083b8454d..7a2b2b6ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "online_help_viewer_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_online_help_viewer_dialog.h"
 
 #include <ngltranslator/ngltranslator.h>
@@ -19,6 +20,7 @@ OnlineHelpViewerDialog::OnlineHelpViewerDialog(bool isMain)
                           isMain ? LtsWidgets::ButtonCombination::SeamlessDialog : LtsWidgets::ButtonCombination::CloseOnly,
                           !isMain )
   , m_ui(new Ui::OnlineHelpViewerDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("OnlineHelpViewerDialog"))
 {
   m_ui->setupUi(this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
index e94e3d6b6..c86d6f221 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
@@ -12,6 +12,7 @@
 #include <QtGui/QBrush>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp
index 9dffdac06..25010c402 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp
@@ -100,8 +100,7 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
 }
 
 DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
-  .getNGLLogger("OnlineReportDetailedChartModel")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, QSet<int32_t>());
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage, QSet<int32_t>());
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage, QSet<int32_t>());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp
index 8c6d4bcac..394404427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp
@@ -73,8 +73,7 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
 }
 
 SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
-  .getNGLLogger("OnlineReportSimpleChartModel")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
   {
     if (!m_config.participantIds.contains(data.participantId()))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp
index 218bef554..0e74c662f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp
@@ -26,7 +26,7 @@ CreateReportDialog::CreateReportDialog(const QString &menuGroup, QWidget *parent
   , m_ppmGuiCbxIfc(nullptr)
   , m_participantModel(nullptr)
   , m_typeModel(nullptr)
-  .getNGLLogger("CreateReportDialog"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -161,7 +161,7 @@ bool CreateReportDialog::apply()
     ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(index);
 
     if (data.id() != 0 &&
-        data.equipmentNumber().is_set() &&
+        data.equipmentNumber().has_value() &&
         typeIds.contains(data.typeId()))
       participantIds.insert(data.id());
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_online_reports_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_online_reports_gui_plugin.h
index a93b5740c..7a074fb42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_online_reports_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_online_reports_gui_plugin.h
@@ -7,6 +7,7 @@
 #include <OnlineReports/ore_gui_plugin_interface.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp
index 931f66735..fa89185da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp
@@ -29,7 +29,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
   : LtsWidgets::LtsDialog(parent)
   , m_ui(new Ui::ReportDialog)
   , m_name(config.name)
-  .getNGLLogger("OnlineReportDialog"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp
index 5522819a5..d70f80afd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp
@@ -13,7 +13,7 @@ TypeModel::TypeModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc
                                                                    tr("Name")},
                                                                    parent)
   , m_ppmDtc(ppmDtc)
-  .getNGLLogger("OnlineReportTypeModel"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   init();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_change_password.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_change_password.cpp
index ed8649747..ea3d53b5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_change_password.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_change_password.cpp
@@ -83,11 +83,11 @@ void OperatorChangePassword::onOkay()
   }
 
   OperatorManagement::OperatorChangePasswordRequest req;
-  req.id(m_operatorId);
-  
-  req.oldPassword(m_ui->leOldPassword->text().toStdString());
-  req.password(m_ui->leNewPassword->text().toStdString());
-  req.forceSet(m_ui->leOldPassword->isHidden());
+  req.id = m_operatorId;
+
+  req.oldPassword = m_ui->leOldPassword->text().toStdString();
+  req.password = m_ui->leNewPassword->text().toStdString();
+  req.forceSet = m_ui->leOldPassword->isHidden();
   m_requestHelper->addRequest([this,req]()
   {
     return m_ftc->operatorChangePasswordRequest(req, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
index b301da9a9..b1c77416e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
@@ -10,7 +10,7 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
 
 #include <QtGui/QIcon>
 
@@ -34,6 +34,7 @@ OperatorManagementDialogModel::OperatorManagementDialogModel(QObject *parent, in
                                                                 tr("Exercises"),
                                                                 tr("Preset Role")},
                                                                 parent)
+  , m_logger(getLogger("OpeartorManagementDialogModel"))
   , m_dtc(nullptr)
   , m_ppmDtc(nullptr)
 #ifdef BUILD_RTI
@@ -92,8 +93,8 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
   {
     auto cb = [this](const Group &group)
     {
-      if (group.type() == GroupType::PresetGroup)
-        m_roles[group.id()] = QString::fromStdString(group.name());
+      if (group.type == GroupType::PresetGroup)
+        m_roles[group.id] = QString::fromStdString(group.name);
     };
     dtc->groups(cb);
   }
@@ -104,9 +105,9 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
 void OperatorManagementDialogModel::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
   if (modType == DataModification::eRemoved)
-    m_parties.remove(data.id());
+    m_parties.remove(data.id);
   else
-    m_parties[data.id()] = ParticipantManagement::trPartyName(data.name());
+    m_parties[data.id] = ParticipantManagement::trPartyName(data.name);
   for (int row = 0; row < m_vecData.size(); ++row)
   {
     const QModelIndex idx(index(row, VisibleParties));
@@ -118,9 +119,9 @@ void OperatorManagementDialogModel::onPartyChanged(const ParticipantManagement::
 void OperatorManagementDialogModel::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
 {
   if (modType == DataModification::eRemoved)
-    m_exercises.remove(data.id());
+    m_exercises.remove(data.id);
   else
-    m_exercises[data.id()] = QString::fromStdString(data.name());
+    m_exercises[data.id] = QString::fromStdString(data.name);
   for (int row = 0; row < m_vecData.size(); ++row)
   {
     const QModelIndex idx(index(row, Exercises));
@@ -143,33 +144,33 @@ QVariant OperatorManagementDialogModel::data(const QModelIndex &index, int role)
   if (role == Qt::DisplayRole)
   {
     const UserType &op = m_vecData.at(index.row());
-    std::vector<OperatorManagement::PartiesByExercise> pbe = op.visiblePartiesByExercise();
+    std::vector<OperatorManagement::PartiesByExercise> pbe = op.visiblePartiesByExercise;
     switch (index.column())
     {
     case Name:
-      return QString::fromStdString(op.name());
+      return QString::fromStdString(op.name);
     case Description:
-      return QString::fromStdString(op.description());
+      return QString::fromStdString(op.description);
     case VisibleParties:
       return hasVisibleParties(pbe);
     case RolePreset:
-      return rolePreset(op.rolePresetId());
+      return rolePreset(op.rolePresetId);
     case Id:
-      return QString::number(op.id());
+      return QString::number(op.id);
     case EffectiveAcls:
-      return effectiveAcls(op.effectiveAcls());
+      return effectiveAcls(op.effectiveAcls);
     case PrimaryGroupId:
-      return QString::number(op.primaryGroupId());
+      return QString::number(op.primaryGroupId);
     case ProjectionPriority:
-      return priority(op.projectionPriority());
+      return priority(op.projectionPriority);
     case AudioChannelPriority:
-      return priority(op.audioChannelPriority());
+      return priority(op.audioChannelPriority);
     case Image:
-      return LtsUtils::getPixmap(op.image());
+      return LtsUtils::getPixmap(op.image);
     case Workstation:
-      return workstation(op.workstationId(), op.workstationIp());
+      return workstation(op.workstationId, op.workstationIp);
     case Exercises:
-      return exercises(op.exerciseIds());
+      return exercises(op.exerciseIds);
     }
   }
   return QVariant();
@@ -191,12 +192,12 @@ QString OperatorManagementDialogModel::workstation(int wsId, int wsIp) const
 
 }
 
-QString OperatorManagementDialogModel::rolePreset(const dds::core::optional<int32_t> &rolePresetId) const
+QString OperatorManagementDialogModel::rolePreset(const omg::types::optional<int32_t> &rolePresetId) const
 {
-  if (!rolePresetId.is_set())
+  if (!rolePresetId.has_value())
     return tr("---");
 
-  int32_t id = rolePresetId.get();
+  int32_t id = rolePresetId.value();
 
   if (id <= 0)
     return tr("---");
@@ -212,17 +213,17 @@ QString OperatorManagementDialogModel::hasVisibleParties(const std::vector<Opera
 
   for (const auto &pbe : vpbe)
   {
-    if (pbe.exerciseId() != exerciseId)
+    if (pbe.exerciseId != exerciseId)
       continue;
 
     std::vector<int32_t> hiddenParties = {};
-    if (pbe.hiddenParties().is_set()) 
-      hiddenParties = pbe.hiddenParties().get();
+    if (pbe.hiddenParties.has_value())
+      hiddenParties = pbe.hiddenParties.value();
 
-    if(!pbe.visibleParties().is_set()) 
+    if(!pbe.visibleParties.has_value())
       return {};
 
-    for (const auto &partyId : pbe.visibleParties().get())
+    for (const auto &partyId : pbe.visibleParties.value())
     {
       bool isHidden = false;
       for (const int &hiddenId : hiddenParties)
@@ -284,7 +285,7 @@ bool OperatorManagementDialogModel::isFiltered(const UserType &data, DataModific
 
   if (m_exerciseId == 0)
     return false; 
-  for (auto exId : data.exerciseIds())
+  for (auto exId : data.exerciseIds)
     if (exId == m_exerciseId)
       return false; 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.h
index 4644be978..0918aee32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.h
@@ -6,7 +6,7 @@
 #ifdef BUILD_RTI
 
 #include <OperatorManagement/opm_dtc.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <OperatorManagement/logger.h>
 #include <LtsSession/lts_session.h>
@@ -57,7 +57,7 @@ NGL::INGLLogger &m_logger;
   QString effectiveAcls(std::vector<int32_t> acls) const;
   QString priority(int16_t prio) const;
   QString exercises(const std::vector<int32_t> &exercises) const;
-  QString rolePreset(const dds::core::optional<int32_t> &rolePresetId) const;
+  QString rolePreset(const omg::types::optional<int32_t> &rolePresetId) const;
   QString workstation(int wsId, int wsIp) const;
 
 private Q_SLOTS:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
index aaa1c2ef3..f129acbbb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
@@ -171,7 +171,7 @@ LoginWindow::LoginWindow(QWidget *parent, bool isAAR)
   m_ui->pbEn_GB->hide();
   m_ui->pbEn_US->hide();
   const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("SystemLanguages")).toString();
-  const QVector<QStringRef> slLang = languages.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
+  const QVector<QString> slLang = languages.split(QLatin1Char(','), Qt::SkipEmptyParts);
 
   if (slLang.isEmpty())
   {
@@ -181,7 +181,7 @@ LoginWindow::LoginWindow(QWidget *parent, bool isAAR)
   {
     if (slLang.size() > 1)
     {
-      for (QStringRef lang : slLang)
+      for (QString lang : slLang)
       {
         lang = lang.trimmed();
         
@@ -202,7 +202,7 @@ LoginWindow::LoginWindow(QWidget *parent, bool isAAR)
     }
     else
     {
-      QString lang =  slLang.at(0).toString().trimmed();
+      QString lang =  slLang.at(0).trimmed();
       
       if (lang.toLatin1() == "de_DE")
         m_ui->pbDe_DE->click();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
index 17fdbeaa7..9be818215 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
@@ -14,7 +14,7 @@
 #include <LtsWidgets/lts_splash.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_wait_dialog.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtilsSettings/settings.h>
 #include <ConnectDialog/connect_dialog_nt.h>
@@ -33,8 +33,8 @@
 
 #include <OperatorManagement/logger.h>
 #include <OperatorManagement/opm_operator_rights.h>
-#include <OperatorManagement/opm_data_plugin.h>
-#include <AssetManagement/asm_data_plugin.h>
+#include <OperatorManagement/opm_data_plugin_interface.h>
+#include <AssetManagement/asm_data_plugin_interface.h>
 
 #include <QtWidgets/QApplication>
 #include <QtCore/QProcess>
@@ -172,11 +172,11 @@ AssetManagement::Asset InterfaceImpl::findWorkstation(const QString &wsName)
 
   auto it = std::find_if(assets.constBegin(), assets.constEnd(), [wsName](const AssetManagement::Asset &as)
   {
-    return ((as.assetTypeId() == AssetManagement::AssetType::Workstation ||
-         as.assetTypeId() == AssetManagement::AssetType::ProjectionWorkstation ||
-             as.assetTypeId() == AssetManagement::AssetType::MobileAfterActionVehicle)
+    return ((as.assetTypeId == AssetManagement::AssetType::Workstation ||
+         as.assetTypeId == AssetManagement::AssetType::ProjectionWorkstation ||
+             as.assetTypeId == AssetManagement::AssetType::MobileAfterActionVehicle)
 #if !defined(QUICK_DEBUG) || !defined(LTS_DEBUG)
-            && QString::fromStdString(as.name()).toUpper() == wsName.toUpper()
+            && QString::fromStdString(as.name).toUpper() == wsName.toUpper()
 #endif
             );
   });
@@ -220,8 +220,8 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
 
 
   
-  const OperatorManagement::User op = m_dtc->user(operatorId); 
-  if (op.id() != operatorId) 
+  const OperatorManagement::User op = m_dtc->user(operatorId);
+  if (op.id != operatorId)
   {
     LtsWidgets::LtsMessageDialog::showMessage(m_mainBackground, tr("Operator does not exist anymore."), tr("Login failed")); 
     m_loginOperatorName->show();
@@ -231,14 +231,14 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
 
 
   
-  if (op.workstationId() > 0 && op.workstationIp() != LtsSession::LtsSession::workstationIp()) 
+  if (op.workstationId > 0 && op.workstationIp != LtsSession::LtsSession::workstationIp())
   {
-    DEBUG_LOG(m_logger) << "WsID :" << op.workstationId()
-                        << "ip: " << QString::number(op.workstationIp(), 16)
+    DEBUG_LOG(m_logger) << "WsID :" << op.workstationId
+                        << "ip: " << QString::number(op.workstationIp, 16)
                         << ", own: " << QString::number(LtsSession::LtsSession::workstationIp(), 16);
-    const auto ws = m_asmDtc->asset(op.workstationId());
+    const auto ws = m_asmDtc->asset(op.workstationId);
     LtsWidgets::LtsMessageDialog::showMessage(m_mainBackground,
-                                              tr("Operator already logged in on workstation %1.").arg(QString::fromStdString(ws.name())),
+                                              tr("Operator already logged in on workstation %1.").arg(QString::fromStdString(ws.name)),
                                               tr("Login failed")); 
     m_loginOperatorName->show();
     m_loginOperatorName->raise();
@@ -254,8 +254,8 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
   try
   {
     AssetManagement::Asset asset(findWorkstation(wsName));
-    m_workstationId = asset.id();
-    certificate = asset.certificate();
+    m_workstationId = asset.id;
+    certificate = asset.certificate;
 
     DEBUG_LOG(m_logger) << "ws id: " << m_workstationId;
     
@@ -348,14 +348,14 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
   
 
   OperatorManagement::OperatorLoginRequest req;
-  req.id(op.id());
-  req.password(password.toUtf8().data());
-  req.workstationId(m_workstationId);
-  req.workstationIp(LtsSession::LtsSession::workstationIp());
+  req.id = op.id;
+  req.password = password.toUtf8().data();
+  req.workstationId = m_workstationId;
+  req.workstationIp = LtsSession::LtsSession::workstationIp();
 #if defined(QUICK_DEBUG) && defined(LTS_DEBUG)
   force = true;
 #endif
-  req.force(force);
+  req.force = force;
 
   try
   {    
@@ -392,19 +392,19 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
   
   LtsSessionData::LtsSessionData *sessionData = LtsSessionData::LtsSessionData::getInstance();
   sessionData->setWorkstationId(m_workstationId);
-  sessionData->setOperatorId(op.id());
-  sessionData->setOperatorName(QString::fromStdString(op.name()));
-  sessionData->setOperatorRights(convert<QSet<int>>(op.effectiveAcls()));
+  sessionData->setOperatorId(op.id);
+  sessionData->setOperatorName(QString::fromStdString(op.name));
+  sessionData->setOperatorRights(convert<QSet<int>>(op.effectiveAcls));
   sessionData->setShowTerminalWindow(sessionData->hasOperatorRight(OperatorRights::TerminalWindowOpen));
-  sessionData->setProfilePicture(LtsUtils::getPixmap(op.image()));
+  sessionData->setProfilePicture(LtsUtils::getPixmap(op.image));
 
   QVector<LtsSessionData::PartiesByExercise> qVec;
-  for (const auto &pbe : op.visiblePartiesByExercise())
+  for (const auto &pbe : op.visiblePartiesByExercise)
   {
     LtsSessionData::PartiesByExercise value;
-    value.exerciseId = pbe.exerciseId();
-    if (pbe.visibleParties().is_set())
-      value.visibleParties = QVector<int>(pbe.visibleParties().get().begin(), pbe.visibleParties().get().end());
+    value.exerciseId = pbe.exerciseId;
+    if (pbe.visibleParties.has_value())
+      value.visibleParties = QVector<int>(pbe.visibleParties.value().begin(), pbe.visibleParties.value().end());
     qVec.push_back(value);
   }
   sessionData->setVisibleParties(qVec);
@@ -442,16 +442,16 @@ void InterfaceImpl::slotLogin(int operatorId, const QString &password, bool forc
   {
     if (!m_requestHelper->startSingleRequest([this]()
     {
-      return m_ftc->operatorGetSetSettingsRequest(OperatorGetSetSettingsRequest(m_operatorId, dds::core::optional<std::vector<uint8_t> >()), this);
+      return m_ftc->operatorGetSetSettingsRequest(OperatorGetSetSettingsRequest(m_operatorId, omg::types::optional<std::vector<uint8_t> >()), this);
     }, [this](const Core::FunctionReply &baseReply)
     {
       const OperatorGetSetSettingsReply &reply = static_cast<const OperatorGetSetSettingsReply &>(baseReply);
 
-      if (reply.settings().is_set())
+      if (reply.settings.has_value())
       {
-        DEBUG_LOG(m_logger) << "Operator settings loaded, size=" << reply.settings().get().size();
+        DEBUG_LOG(m_logger) << "Operator settings loaded, size=" << reply.settings.value().size();
         LtsUtils::OperatorSettings* opSettings = LtsUtils::OperatorSettings::getInstance();
-        opSettings->init(LtsUtils::toQByteArray(reply.settings().get()));
+        opSettings->init(LtsUtils::toQByteArray(reply.settings.value()));
 
         if (m_logger.isDebugEnabled())
           opSettings->dump();
@@ -576,7 +576,7 @@ bool LastStateLoader::go(LastStateLoaderApp &xapp)
 
   case IDL::PartitionType::Exercise:
     {
-      if (m_exmDtc->exercise(exerciseId).id() != exerciseId)
+      if (m_exmDtc->exercise(exerciseId).id != exerciseId)
       {
         m_errorList.append(tr("App %1 was started inside exercise %2 that does not exist anymore.")
                          .arg(m_session->appToString(xapp.m_appId))
@@ -801,20 +801,20 @@ void InterfaceImpl::onOperatorChanged(const User &data, DataModification modType
   
   LtsSessionData::LtsSessionData *sessionData = LtsSessionData::LtsSessionData::getInstance();
 
-  if (sessionData->getOperatorId() != data.id())
+  if (sessionData->getOperatorId() != data.id)
     return;
 
   if (modType == DataModification::eRemoved)
-    return; 
+    return;
 
-  sessionData->setOperatorRights(convert<QSet<int>>(data.effectiveAcls()));
+  sessionData->setOperatorRights(convert<QSet<int>>(data.effectiveAcls));
   QVector<LtsSessionData::PartiesByExercise> qVec;
-  for (const auto &pbe : data.visiblePartiesByExercise())
+  for (const auto &pbe : data.visiblePartiesByExercise)
   {
     LtsSessionData::PartiesByExercise value;
-    value.exerciseId = pbe.exerciseId();
-    if(pbe.visibleParties().is_set())
-      value.visibleParties = QVector<int>(pbe.visibleParties().get().begin(), pbe.visibleParties().get().end());
+    value.exerciseId = pbe.exerciseId;
+    if(pbe.visibleParties.has_value())
+      value.visibleParties = QVector<int>(pbe.visibleParties.value().begin(), pbe.visibleParties.value().end());
     qVec.push_back(value);
   }
   sessionData->setVisibleParties(qVec);
@@ -829,16 +829,16 @@ int InterfaceImpl::getOperatorId(const QString &operatorName)
   for (auto operatorIt = operatorMap.constBegin(); operatorIt != operatorMap.constEnd(); ++operatorIt)
   {
     const OperatorManagement::User &op = (*operatorIt);
-    QString realOperatorName = QString::fromStdString(op.name()); 
+    QString realOperatorName = QString::fromStdString(op.name);
 
-    if (operatorName.compare(realOperatorName, Qt::CaseInsensitive) == 0) 
+    if (operatorName.compare(realOperatorName, Qt::CaseInsensitive) == 0)
     {
-      
-      
-      m_loginPassword->setOperatorData(op.id(), realOperatorName);
-      m_loginPassword->setProfilePicture(LtsUtils::getPixmap(op.image()));
 
-      return op.id(); 
+
+      m_loginPassword->setOperatorData(op.id, realOperatorName);
+      m_loginPassword->setProfilePicture(LtsUtils::getPixmap(op.image));
+
+      return op.id;
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
index 76a6e31ee..3d95f1155 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
@@ -15,6 +15,7 @@ namespace OperatorManagement
 RemoteShutdownDialog::RemoteShutdownDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_ui(new Ui::RemoteShutdownDialog)
+  , m_logger(getLogger("ShutdownDialog"))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_trvWorkstations(nullptr)
   , m_trvModel(nullptr)
@@ -53,10 +54,10 @@ bool RemoteShutdownDialog::init(const std::shared_ptr<AssetManagement::Interface
 
   asmDtc->assets([this, &asmDtc, &wsMap](const AssetManagement::Asset & data)
   {
-    if (data.assetTypeId() == AssetManagement::AssetType::Workstation && m_thisWsId != data.id())
+    if (data.assetTypeId == AssetManagement::AssetType::Workstation && m_thisWsId != data.id)
     {
-      wsMap.insert(QString::fromStdString(asmDtc->location(data.locationId()).description()),
-                   WorkstationModel::WorkstationInfo(data.id(), QString::fromStdString(data.name()), data.subLocation()));
+      wsMap.insert(QString::fromStdString(asmDtc->location(data.locationId).description),
+                   WorkstationModel::WorkstationInfo(data.id, QString::fromStdString(data.name), data.subLocation));
     }
   });
 
@@ -180,10 +181,10 @@ void RemoteShutdownDialog::onConfirmActionClicked()
     m_requestHelper->startSingleRequest([this, &shutdownAction, &idVector]()
     {
       AssetManagement::WorkstationLogout logout;
-      logout.shutdownAction(shutdownAction);
-      logout.ids(idVector);
-      logout.sampleTime(QDateTime::currentMSecsSinceEpoch());
-      logout.originatorId(m_thisWsId);
+      logout.shutdownAction = shutdownAction;
+      logout.ids = idVector;
+      logout.sampleTime = QDateTime::currentMSecsSinceEpoch();
+      logout.originatorId = m_thisWsId;
 
       return m_asmFtc->workstationLogoutRequest(logout, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
index e9de8f56d..feec1b745 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
@@ -6,7 +6,7 @@
 #include <QtCore/QObject>
 #include <LtsWidgets/lts_dialog.h>
 #include <OperatorManagement/logger.h>
-#include <AssetManagement/asm_data_plugin.h>
+#include <AssetManagement/asm_data_plugin_interface.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 class QTreeView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.cpp
index 7d76b42df..893aa67ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "acl_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_acl_dialog.h"
 
 
@@ -13,6 +14,7 @@ AclDialog::AclDialog(QWidget *parent)
   , m_ui(new Ui::AclDialog)
   , m_dtc(nullptr)
   , m_ftc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.cpp
index 58595e6df..0f3a5f839 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.cpp
@@ -3,6 +3,7 @@
 
 
 #include "acl_dialog_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ngltools/ngltools_dtg.h>
 
@@ -17,6 +18,7 @@ AclDialogModel::AclDialogModel(QObject *parent)
                                                                                        parent)
   , m_dtc(nullptr)
   , m_ftc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 AclDialogModel::~AclDialogModel()
@@ -44,9 +46,9 @@ QVariant AclDialogModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case 0:
-    return QString::fromStdString(acl.name());
+    return QString::fromStdString(acl.name);
   case 1:
-    return QString::fromStdString(acl.description());
+    return QString::fromStdString(acl.description);
   default:
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
index ee8968eae..78502954f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "group_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_group_edit_dialog.h"
 
 #include "group_edit_member_of_model.h"
@@ -21,6 +22,7 @@ GroupEditDialog::GroupEditDialog(QWidget *parent)
     , m_ftc(nullptr)
     , m_model(nullptr)
     , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 }
@@ -35,35 +37,35 @@ void GroupEditDialog::init(const Group &group,
   m_ftc = ftc;
   m_operatorId = operatorId;
 
-  m_ui->leName->setText(QString::fromStdString(group.name()));
-  m_ui->leDescription->setText(QString::fromStdString(group.description()));
+  m_ui->leName->setText(QString::fromStdString(group.name));
+  m_ui->leDescription->setText(QString::fromStdString(group.description));
 
   m_ui->cbRoles->addItem(tr("---"), 0);
   auto cbGroup = [this](const Group &group)
   {
-    if (group.type() == GroupType::PresetGroup)
-      m_ui->cbRoles->addItem(OperatorManagement::trGroupName(group.name()), group.id());
+    if (group.type == GroupType::PresetGroup)
+      m_ui->cbRoles->addItem(OperatorManagement::trGroupName(group.name), group.id);
   };
   dtc->groups(cbGroup);
 
   User user(m_dtc->user(m_operatorId));
-  int rolePresetId = user.rolePresetId().is_set() ? user.rolePresetId().get() : m_rolePresetId;
+  int rolePresetId = user.rolePresetId.has_value() ? user.rolePresetId.get() : m_rolePresetId;
   m_ui->cbRoles->setCurrentIndex(m_ui->cbRoles->findData(rolePresetId));
 
-  if (m_group.type() == GroupType::OperatorGroup)
+  if (m_group.type == GroupType::OperatorGroup)
   {
     m_ui->leName->setEnabled(false);
     m_ui->leDescription->setEnabled(false);
   }
 
-  if (m_group.type() == GroupType::PresetGroup && m_group.id() != 0)
+  if (m_group.type == GroupType::PresetGroup && m_group.id != 0)
     m_ui->leName->setEnabled(false);
 
   connect(m_ui->pbLoadPreset, &QPushButton::clicked, this, &GroupEditDialog::onPbPresetClicked);
 
   
   m_model = new MembershipModel(this, m_dtc);
-  m_model->init(group.isMemberOf());
+  m_model->init(group.isMemberOf);
   connect(m_model, &MembershipModel::dataChanged, this, &GroupEditDialog::slotChangesMade);
   m_ui->dvMemberOf->setModel(m_model);
 
@@ -73,9 +75,9 @@ void GroupEditDialog::init(const Group &group,
   connect(m_ui->dvMemberOf, &LtsDataView::LtsDataView::customContextMenuRequested, this, &GroupEditDialog::onContextMenuRequested);
 #endif
 
-  if (m_group.type() == GroupType::PresetGroup) 
+  if (m_group.type == GroupType::PresetGroup) 
     setOnlineHelpFilename(QStringLiteral("Administrator-Presets"));
-  else if (m_group.type() == GroupType::OperatorGroup) 
+  else if (m_group.type == GroupType::OperatorGroup) 
     setOnlineHelpFilename(QStringLiteral("Administrator-Operators"));
 }
 
@@ -103,10 +105,10 @@ GroupEditDialog::~GroupEditDialog() { delete m_ui; }
 
 void GroupEditDialog::retranslate()
 {
-  if (m_group.type() == GroupType::PresetGroup)
-    translate(m_ui, OperatorManagement::trGroupName(m_group.name()), m_group.id() < 1, tr("Preset"));
-  else if (m_group.type() == GroupType::OperatorGroup)
-    translate(m_ui, OperatorManagement::trGroupName(m_group.name()), m_group.id() < 1, tr("Privileges"));
+  if (m_group.type == GroupType::PresetGroup)
+    translate(m_ui, OperatorManagement::trGroupName(m_group.name), m_group.id < 1, tr("Preset"));
+  else if (m_group.type == GroupType::OperatorGroup)
+    translate(m_ui, OperatorManagement::trGroupName(m_group.name), m_group.id < 1, tr("Privileges"));
 }
 
 
@@ -122,18 +124,18 @@ bool GroupEditDialog::apply()
 
   std::sort(memberOf.begin(), memberOf.end());
 
-  std::vector<int> oldGroups = m_group.isMemberOf();
+  std::vector<int> oldGroups = m_group.isMemberOf;
   std::sort(oldGroups.begin(), oldGroups.end());
 
   const User &user(m_dtc->user(m_operatorId));
-  const int rolePresetId = user.rolePresetId().is_set() ? user.rolePresetId().get() : 0;
+  const int rolePresetId = user.rolePresetId.has_value() ? user.rolePresetId.get() : 0;
 
   if (oldGroups == memberOf && m_ui->cbRoles->currentData().toInt() == rolePresetId)
     return true;
 
-  if (m_group.id() == 0)
+  if (m_group.id == 0)
   {
-    if (m_group.type() == GroupType::OperatorGroup)
+    if (m_group.type == GroupType::OperatorGroup)
     {
       emit newGroups(memberOf, m_ui->cbRoles->currentData().toInt());
       return true;
@@ -148,19 +150,19 @@ bool GroupEditDialog::apply()
   }
   else
   {
-    if (m_group.description() != m_ui->leDescription->text().toStdString())
+    if (m_group.description != m_ui->leDescription->text().toStdString())
     {
       m_requestHelper->addRequest(
           [this]()
           {
             const std::string name = m_ui->leName->text().toStdString();
             const std::string description = m_ui->leDescription->text().toStdString();
-            GroupChangeNameRequest req(m_group.id(), name, description);
+            GroupChangeNameRequest req(m_group.id, name, description);
             return m_ftc->groupChangeNameRequest(req, this);
           });
     }
     const int rolePresetId = m_operatorId ? m_ui->cbRoles->currentData().toInt() : 0;
-    GroupChangeMembersRequest req(m_group.id(), memberOf, LtsUtils::toOptional(rolePresetId), LtsUtils::toOptional(m_operatorId));
+    GroupChangeMembersRequest req(m_group.id, memberOf, LtsUtils::toOptional(rolePresetId), LtsUtils::toOptional(m_operatorId));
 
     m_requestHelper->addRequest([this, req]() { return m_ftc->groupChangeMembershipsRequest(req, this); });
   }
@@ -170,7 +172,7 @@ bool GroupEditDialog::apply()
 void GroupEditDialog::onPbPresetClicked()
 {
   int contextGroupId = m_ui->cbRoles->currentData().toInt();
-  m_model->setCheckStateForGroups(m_dtc->group(contextGroupId).isMemberOf());
+  m_model->setCheckStateForGroups(m_dtc->group(contextGroupId).isMemberOf);
 }
 
 void GroupEditDialog::onContextMenuRequested(const QPoint &position)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
index 705b2eb66..3c22ac83b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
@@ -14,15 +14,15 @@ namespace OperatorManagement
 
 QDataStream &operator<<(QDataStream &ds, const Group &gp)
 {
-  ds << gp.id()
-     << QString::fromStdString(gp.name())
-     << QString::fromStdString(gp.description())
-     << LtsUtils::convert<QVector<int32_t>>(gp.aclAllow())
-     << LtsUtils::convert<QVector<int32_t>>(gp.aclDeny())
-     << gp.type().underlying()
-     << gp.isDeleted()
-     << gp.isHidden()
-     << LtsUtils::convert<QVector<int32_t>>(gp.isMemberOf());
+  ds << gp.id
+     << QString::fromStdString(gp.name)
+     << QString::fromStdString(gp.description)
+     << LtsUtils::convert<QVector<int32_t>>(gp.aclAllow)
+     << LtsUtils::convert<QVector<int32_t>>(gp.aclDeny)
+     << gp.type
+     << gp.isDeleted
+     << gp.isHidden
+     << LtsUtils::convert<QVector<int32_t>>(gp.isMemberOf);
 
   return ds;
 }
@@ -45,15 +45,15 @@ QDataStream &operator>>(QDataStream &ds, Group &gp)
      >> isMemberOf
      >> isOperatorGroup;
 
-  gp.id(id);
-  gp.name(name.toStdString());
-  gp.description(description.toStdString());
-  LtsUtils::convert(aclAllow, gp.aclAllow());
-  LtsUtils::convert(aclDeny, gp.aclDeny());
-  gp.type(static_cast<GroupType>(type));
-  gp.isDeleted(isDeleted);
-  gp.isHidden(isHidden);
-  LtsUtils::convert(isMemberOf, gp.isMemberOf());
+  gp.id = id;
+  gp.name = name.toStdString();
+  gp.description = description.toStdString();
+  LtsUtils::convert(aclAllow, gp.aclAllow);
+  LtsUtils::convert(aclDeny, gp.aclDeny);
+  gp.type = static_cast<GroupType>(type);
+  gp.isDeleted = isDeleted;
+  gp.isHidden = isHidden;
+  LtsUtils::convert(isMemberOf, gp.isMemberOf);
 
   return ds;
 }
@@ -76,7 +76,7 @@ MembershipModel::MembershipModel(QObject *parent,
   , m_dtc(dtc)
   , m_bRowsAreCheckable(true)
 {
-  qRegisterMetaTypeStreamOperators<Group>();
+  qRegisterMetaType<Group>();
 
   QSet<int> disabledFunctionality;
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
@@ -215,9 +215,9 @@ MembershipModel::MembershipModel(QObject *parent,
   
   auto cbGroup = [this, disabledFunctionality](const Group &group)
   {
-    if (group.type() == GroupType::StandardGroup)
+    if (group.type == GroupType::StandardGroup)
     {
-      if (disabledFunctionality.contains(group.id()) || group.isHidden())
+      if (disabledFunctionality.contains(group.id) || group.isHidden)
         return;
       CheckedTreeItem *item = static_cast<CheckedTreeItem *>(createItem(QVariant::fromValue(group), QIcon()));
       getRootItem()->appendChild(item);
@@ -229,10 +229,10 @@ MembershipModel::MembershipModel(QObject *parent,
   const auto children = getRootItem()->children();
   for (NGLTreeItem *opGroupItem : children)
   {
-    const std::vector<int32_t> isMemberOf = opGroupItem->data().value<Group>().isMemberOf();
+    const std::vector<int32_t> isMemberOf = opGroupItem->data().value<Group>().isMemberOf;
     auto cbGroup2 = [this, &isMemberOf, opGroupItem] (const Group &group)
     {
-      if (group.type() == GroupType::AclGroup && contains(isMemberOf, group.id()))
+      if (group.type == GroupType::AclGroup && contains(isMemberOf, group.id))
         opGroupItem->appendChild(createItem(QVariant::fromValue(group), QIcon()));
     };
     dtc->groups(cbGroup2);
@@ -261,7 +261,7 @@ QVariant MembershipModel::data(const QModelIndex &index, int role) const
   if (role == Qt::CheckStateRole)
   {
     Group group = getGroupData(index);
-    if (!m_bRowsAreCheckable || index.column() != 0 || group.type() != GroupType::StandardGroup)
+    if (!m_bRowsAreCheckable || index.column() != 0 || group.type != GroupType::StandardGroup)
       return NGLTreeModel::data(index, role);
 
     return item->bIsChecked ? Qt::Checked : Qt::Unchecked;
@@ -273,13 +273,13 @@ QVariant MembershipModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ColName:
-      return QCoreApplication::translate("OperatorRights", grp.name().c_str());
+      return QCoreApplication::translate("OperatorRights", grp.name.c_str());
     case ColDescription:
-      return QCoreApplication::translate("OperatorRights", grp.description().c_str());
+      return QCoreApplication::translate("OperatorRights", grp.description.c_str());
     case ColIsAclGroup:
-      return grp.type().underlying();
+      return static_cast<int>(grp.type);
     case ColIsHidden:
-      return grp.isHidden() ? tr("Yes") : tr("No");
+      return grp.isHidden ? tr("Yes") : tr("No");
     }
   }
   return NGLTreeModel::data(index, role);
@@ -287,7 +287,7 @@ QVariant MembershipModel::data(const QModelIndex &index, int role) const
 
 void MembershipModel::init(int groupId)
 {
-  init(m_dtc->group(groupId).isMemberOf());
+  init(m_dtc->group(groupId).isMemberOf);
 }
 
 void MembershipModel::init(const std::vector<int> &groupIds)
@@ -314,7 +314,7 @@ Qt::ItemFlags MembershipModel::flags(const QModelIndex &index) const
 {
   Group group = getGroupData(index);
   auto ret = NGLTreeModel::flags(index);
-  if (m_bRowsAreCheckable && index.column() == 0 && group.type() == GroupType::StandardGroup)
+  if (m_bRowsAreCheckable && index.column() == 0 && group.type == GroupType::StandardGroup)
     ret |= Qt::ItemIsUserCheckable;
 
 
@@ -403,7 +403,7 @@ void MembershipModel::setChecked(CheckedTreeItem *parentItem, const std::vector<
 
 int MembershipModel::groupIdFromItem(NGLTreeItem *item) const
 {
-  return item->data().value<Group>().id();
+  return item->data().value<Group>().id;
 }
 
 NGLTreeItem *MembershipModel::createItem(const QVariant &data, const QIcon &icon) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.h
index 4fc8e795a..c7b20c1da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 
 #include <nglwidgets/ngltreemodel.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
index 870c740e2..e2b19dae5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
@@ -3,6 +3,7 @@
 
 
 #include "group_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ngltools/ngltools_dtg.h>
 #include <OperatorManagement/opm_translation.h>
@@ -20,6 +21,7 @@ GroupModel::GroupModel(QObject *parent)
                                                                           parent)
   , m_dtc(nullptr)
   , m_hideHidden(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 GroupModel::~GroupModel()
@@ -34,7 +36,7 @@ bool GroupModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
   connect(m_dtc.get(), &OperatorManagement::Interface::Dtc::groupChanged,
           this, &GroupModel::onDataChanged);
   m_dtc->groups([this](const OperatorManagement::Group &group) {
-    if (group.type() == GroupType::PresetGroup)
+    if (group.type == GroupType::PresetGroup)
       insertRow(group);
   });
   return true;
@@ -53,9 +55,9 @@ QVariant GroupModel::data(const QModelIndex &index, int role) const
 
   if (role == Qt::DecorationRole && index.column() == 0)
   {
-    if (group.type() == GroupType::OperatorGroup)
+    if (group.type == GroupType::OperatorGroup)
       return QIcon(QLatin1String("icon:list-add-user.svg"));
-    if (group.type() == GroupType::AclGroup)
+    if (group.type == GroupType::AclGroup)
       return QIcon(QLatin1String("icon:define_teams.svg"));
     return QIcon(QLatin1String("icon:display_oc_evaluations.svg"));
   }
@@ -65,11 +67,11 @@ QVariant GroupModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case Name:
-      return OperatorManagement::trGroupName(group.name());
+      return OperatorManagement::trGroupName(group.name);
     case Info:
-      return OperatorManagement::trGroupDescription(group.description());
+      return OperatorManagement::trGroupDescription(group.description);
     case Id:
-      return group.id();
+      return group.id;
       
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.h
index 75eaf968a..8a645e2fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.h
@@ -35,7 +35,7 @@ protected:
 NGL::INGLLogger &m_logger;
   bool isFiltered(const Group &data, DataModification modType) const override
   {
-    if (m_hideHidden && data.isHidden())
+    if (m_hideHidden && data.isHidden)
       return true;
     return LtsWidgets::LtsAbstractTableModel<OperatorManagement::Group>::isFiltered(data, modType);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
index 5d4f33abd..2f0d6bca0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "operator_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_operator_dialog.h"
 
 #include "operator_edit_dialog.h"
@@ -23,6 +24,7 @@ OperatorDialog::OperatorDialog(const QString &menuGroup, QWidget *parent)
   , m_ui(new Ui::OperatorDialog)
   , m_ftc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -99,7 +101,7 @@ void OperatorDialog::enaDisa()
 void OperatorDialog::onRemoveOperator()
 {
   QModelIndex idx = m_ui->widget->currentIndex();
-  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id());
+  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id);
   m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->operatorRemoveRequest(req, this);
@@ -118,12 +120,12 @@ void OperatorDialog::onEditOperator()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const OperatorManagement::User op = m_model->getRowData(idx.row());
 
-  if (op.id() <= 0)
+  if (op.id <= 0)
     return;
-  DEBUG_LOG(m_logger) << "current Operator Id: " << op.id();
+  DEBUG_LOG(m_logger) << "current Operator Id: " << op.id;
 
-  OperatorEditDialog *dialog = new OperatorEditDialog(op.id(), m_session, m_menuGroup, this);
-  const QString identifier = QLatin1String("EditOperator") + QString::number(op.id());
+  OperatorEditDialog *dialog = new OperatorEditDialog(op.id, m_session, m_menuGroup, this);
+  const QString identifier = QLatin1String("EditOperator") + QString::number(op.id);
 
   addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
 }
@@ -139,7 +141,7 @@ void OperatorDialog::onTvItemClicked(const QModelIndex &idx)
     return;
 
   auto user = m_model->getRowData(idx.row());
-  if (user.id() == 99) 
+  if (user.id == 99) 
     m_buttonBox->getButton(LtsWidgets::DialogButton::Remove)->setEnabled(false);
   else
     m_buttonBox->getButton(LtsWidgets::DialogButton::Remove)->setEnabled(true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
index 68e032a46..0e6f367ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "operator_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_operator_edit_dialog.h"
 
 #include <OperatorManagement/Gui/Common/operator_change_password.h>
@@ -9,12 +10,12 @@
 
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsSession/lts_session.h>
 
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
-#include <ExerciseManagement/exm_data_plugin.h>
+#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
 
 #include <QtWidgets/QListWidget>
 #include <QtGui/QImage>
@@ -45,6 +46,7 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
   , m_ftc(nullptr)
   , m_ui(new Ui::OperatorEditDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_effectiveACls.clear();
@@ -57,7 +59,7 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
 
   OperatorManagement::User op = m_dtc->user(m_operatorId);
 
-  m_effectiveACls = op.effectiveAcls();
+  m_effectiveACls = op.effectiveAcls;
 
   if (m_operatorId < 1)
   {
@@ -73,8 +75,8 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
     m_ui->pbDisplay->setVisible(false);
   }
 
-  m_ui->leOperator->setText(QString::fromStdString(op.name()));
-  m_ui->leInfo->setText(QString::fromStdString(op.description()));
+  m_ui->leOperator->setText(QString::fromStdString(op.name));
+  m_ui->leInfo->setText(QString::fromStdString(op.description));
 
   std::shared_ptr<ParticipantManagement::Interface::Dtc> ppmDtc;
   if (m_session->getDtc<ParticipantManagement::DataInterface>(ppmDtc))
@@ -143,8 +145,8 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
   m_ui->cbProjectionPriority->addItems(priorities.split(QLatin1Char(',')));
   m_ui->cbAudioChannelPriority->addItems(priorities.split(QLatin1Char(',')));
 
-  m_ui->cbProjectionPriority->setCurrentIndex(clamp(op.projectionPriority() - 1, 0, 4));
-  m_ui->cbAudioChannelPriority->setCurrentIndex(clamp(op.audioChannelPriority() - 1, 0, 4));
+  m_ui->cbProjectionPriority->setCurrentIndex(clamp(op.projectionPriority - 1, 0, 4));
+  m_ui->cbAudioChannelPriority->setCurrentIndex(clamp(op.audioChannelPriority - 1, 0, 4));
 
   connect<void(QComboBox::*)(int)>(m_ui->cbProjectionPriority, &QComboBox::currentIndexChanged,
                                    this, [this] () { m_projectionPriorityChanged   = true; });
@@ -164,13 +166,13 @@ bool OperatorEditDialog::operatorCreateModify(const OperatorCreateModifyRequest
   
   
   
-  if (req.operatorRights().is_set() && req.operatorRights().get().size() == 0)
+  if (req.operatorRights.has_value() && req.operatorRights.get().size() == 0)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("An operator must have at least one right"));
     return false;
   }
 
-  DEBUG_LOG(m_logger) << "req.name: " << req.name();
+  DEBUG_LOG(m_logger) << "req.name: " << req.name;
   return m_requestHelper->startSingleRequest([this, req]()
   {
     return m_ftc->operatorCreateModifyRequest(req, this);
@@ -193,7 +195,7 @@ void OperatorEditDialog::onNewGroups(const std::vector<int> &groupIds, const int
 void OperatorEditDialog::getProfilePicture()
 {
   OperatorManagement::User op = m_dtc->user(m_operatorId);
-  m_ui->profileButton->setPixmap(LtsUtils::getPixmap(op.image()));
+  m_ui->profileButton->setPixmap(LtsUtils::getPixmap(op.image));
 }
 
 void OperatorEditDialog::slotProfileButtonClicked()
@@ -260,18 +262,18 @@ void OperatorEditDialog::showACLs()
   if (m_operatorId < 1)
   {
     Group grp;
-    grp.id(0);
-    grp.name(m_ui->leOperator->text().toStdString());
-    grp.description(m_ui->leInfo->text().toStdString());
-    grp.type(GroupType::OperatorGroup);
-    grp.isMemberOf(m_groups);
+    grp.id = 0;
+    grp.name = m_ui->leOperator->text().toStdString();
+    grp.description = m_ui->leInfo->text().toStdString();
+    grp.type = GroupType::OperatorGroup;
+    grp.isMemberOf = m_groups;
     connect(dlg, &GroupEditDialog::newGroups, this, &OperatorEditDialog::onNewGroups);
     dlg->init(grp, m_dtc, m_ftc);
     dlg->setRolePresetId(m_presetGroupId);
   }
   else
   {
-    auto grpInit = m_dtc->group(m_dtc->user(m_operatorId).primaryGroupId());
+    auto grpInit = m_dtc->group(m_dtc->user(m_operatorId).primaryGroupId);
     dlg->init(grpInit, m_dtc, m_ftc, m_operatorId);
   }
 
@@ -289,7 +291,7 @@ void OperatorEditDialog::showExercises()
 
   QLabel *lblTitle = new QLabel(tr("Exercises"),exercisesPopup);
 
-  std::vector<int> exercises = m_dtc->user(m_operatorId).exerciseIds();
+  std::vector<int> exercises = m_dtc->user(m_operatorId).exerciseIds;
 
   std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
   m_session->getDtc<ExerciseManagement::DataInterface>(exmDtc);
@@ -297,7 +299,7 @@ void OperatorEditDialog::showExercises()
   for (int exercise : exercises)
   {
     QListWidgetItem *item = new QListWidgetItem(wid);
-    item->setData(Qt::DisplayRole, exmDtc ? QString::fromStdString(exmDtc->exercise(exercise).name()) : tr("Exercise Id: <%1> (name unknown)").arg(exercise));
+    item->setData(Qt::DisplayRole, exmDtc ? QString::fromStdString(exmDtc->exercise(exercise).name) : tr("Exercise Id: <%1> (name unknown)").arg(exercise));
     item->setData(Qt::UserRole, exercise);
     wid->addItem(item);
   }
@@ -339,24 +341,24 @@ bool OperatorEditDialog::apply()
     
     bool bNeedUpdate = false;
     OperatorCreateModifyRequest req;
-    req.id(m_operatorId);
+    req.id = m_operatorId;
 
     if (m_pictureChanged)
     {
       bNeedUpdate = true;
-      req.image(LtsUtils::fromPixmap(m_ui->profileButton->pixmap()));
+      req.image = LtsUtils::fromPixmap(m_ui->profileButton->pixmap());
     }
 
-    if (name != op.name())
+    if (name != op.name)
     {
       bNeedUpdate = true;
-      req.name(name);
+      req.name = name;
     }
 
-    if (description != op.description())
+    if (description != op.description)
     {
       bNeedUpdate = true;
-      req.description(description);
+      req.description = description;
     }
 
     if (m_visiblePartiesChanged)
@@ -366,23 +368,23 @@ bool OperatorEditDialog::apply()
       std::vector<OperatorManagement::PartiesByExercise> vpbe;
       PartiesByExercise pbe;
       DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
-      pbe.exerciseId(0);
-      pbe.visibleParties().set({});
-      std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
+      pbe.exerciseId = 0;
+      pbe.visibleParties.set({});
+      std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties.get()));
       vpbe.push_back(pbe);
-      req.visiblePartiesByExercise() = vpbe;
+      req.visiblePartiesByExercise = vpbe;
     }
 
     if (m_projectionPriorityChanged)
     {
       bNeedUpdate = true;
-      req.projectionPriority(m_ui->cbProjectionPriority->currentIndex() + 1);
+      req.projectionPriority = m_ui->cbProjectionPriority->currentIndex() + 1;
     }
 
     if (m_audioChannelPriorityChanged)
     {
       bNeedUpdate = true;
-      req.audioChannelPriority(m_ui->cbAudioChannelPriority->currentIndex() + 1);
+      req.audioChannelPriority = m_ui->cbAudioChannelPriority->currentIndex() + 1;
     }
 
     return bNeedUpdate && operatorCreateModify(req);
@@ -390,27 +392,27 @@ bool OperatorEditDialog::apply()
   else 
   {
     OperatorCreateModifyRequest req;
-    req.name(name);
-    req.description(description);
-    req.password(password);
-    req.projectionPriority(dds::core::optional<int16_t>(m_ui->cbProjectionPriority->currentIndex() + 1));
-    req.audioChannelPriority(m_ui->cbAudioChannelPriority->currentIndex() + 1);
+    req.name = name;
+    req.description = description;
+    req.password = password;
+    req.projectionPriority = dds::core::optional<int16_t>(m_ui->cbProjectionPriority->currentIndex() + 1);
+    req.audioChannelPriority = m_ui->cbAudioChannelPriority->currentIndex() + 1;
     if (m_pictureChanged)
-      req.image(LtsUtils::fromPixmap(m_ui->profileButton->pixmap()));
+      req.image = LtsUtils::fromPixmap(m_ui->profileButton->pixmap());
     if (m_visiblePartiesChanged)
     {
       const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
       std::vector<OperatorManagement::PartiesByExercise> vpbe;
       PartiesByExercise pbe;
       DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
-      pbe.exerciseId(0);
-      pbe.visibleParties().set({});
-      std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
+      pbe.exerciseId = 0;
+      pbe.visibleParties.set({});
+      std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties.get()));
       vpbe.push_back(pbe);
-      req.visiblePartiesByExercise() = vpbe;
+      req.visiblePartiesByExercise = vpbe;
     }
-    req.operatorRights(m_groups);
-    req.rolePresetId(m_presetGroupId);
+    req.operatorRights = m_groups;
+    req.rolePresetId = m_presetGroupId;
 
     return operatorCreateModify(req);
   }
@@ -440,8 +442,8 @@ void OperatorEditDialog::createFolders()
 {
   
   OperatorManagement::User op = m_dtc->user(m_operatorId);
-  QString folderName = QString::fromStdString(op.name());
-  int userId = op.id();
+  QString folderName = QString::fromStdString(op.name);
+  int userId = op.id;
 
   
   int folderId = m_flmDtc->findFolder(0,folderName);
@@ -452,7 +454,7 @@ void OperatorEditDialog::createFolders()
   }
 
   
-  folderId = createFolder(FileManagement::MainFolder::UserDocuments, folderName, userId);
+  folderId = createFolder(static_cast<int>(FileManagement::MainFolder::UserDocuments), folderName, userId);
 
   if (folderId <= 0)
   {
@@ -484,15 +486,15 @@ void OperatorEditDialog::createFolders()
 int OperatorEditDialog::createFolder(int parentFolderId, const QString &folderName, int userId, bool isHidden)
 {
   FileManagement::Folder parentFolder = m_flmDtc->folder(parentFolderId);
-  const std::vector<int32_t> &parentPath = parentFolder.path();
+  const std::vector<int32_t> &parentPath = parentFolder.path;
 
   FileManagement::FolderModifyRequest req;
-  req.name(folderName.toStdString());
-  req.path(parentPath);
-  req.isEditable(true);
-  req.isHidden(isHidden);
-  req.parentId(parentFolderId);
-  req.operatorId(userId);
+  req.name = folderName.toStdString();
+  req.path = parentPath;
+  req.isEditable = true;
+  req.isHidden = isHidden;
+  req.parentId = parentFolderId;
+  req.operatorId = userId;
 
   m_requestHelper->startSingleRequest([this, req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.h
index 19dcba5d2..d85f42048 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.h
@@ -7,7 +7,7 @@
 #include <OperatorManagement/opm_dtc.h>
 #include <OperatorManagement/logger.h>
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.cpp
index 1c5b53216..7a89e9d52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.cpp
@@ -42,9 +42,9 @@ QVariant OperatorEditVisiblePartiesModel::data(const QModelIndex &index, int rol
   switch (index.column())
   {
   case ColId:
-    return party.id();
+    return party.id;
   case ColName:
-    return ParticipantManagement::trPartyName(party.name());
+    return ParticipantManagement::trPartyName(party.name);
   }
   return QVariant();
 }
@@ -62,7 +62,7 @@ void OperatorEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         removeRow(i);
         break;
@@ -74,7 +74,7 @@ void OperatorEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
   {
     for (int i = 0; i < m_vecData.size(); ++i)
     {
-      if (m_vecData.at(i).second.id() == data.id())
+      if (m_vecData.at(i).second.id == data.id)
       {
         m_vecData[i].second = data;
         const QModelIndex idx(index(i, ColName, QModelIndex()));
@@ -89,17 +89,17 @@ void OperatorEditVisiblePartiesModel::onPartiesChanged(const ParticipantManageme
 
 bool OperatorEditVisiblePartiesModel::hasParty(const ParticipantManagement::Party &party) const
 {
-  const auto visiblePartiesByExercise = m_dtc->user(m_operatorId).visiblePartiesByExercise();
+  const auto visiblePartiesByExercise = m_dtc->user(m_operatorId).visiblePartiesByExercise;
 
   for (const auto &exerciseParties : visiblePartiesByExercise)
   {
-    if (exerciseParties.exerciseId() != 0)
+    if (exerciseParties.exerciseId != 0)
       continue;
     
-    if (!exerciseParties.visibleParties().is_set()) 
+    if (!exerciseParties.visibleParties.has_value()) 
       return false; 
-    for (const auto &partyId : exerciseParties.visibleParties().get())
-      if (partyId == party.id())
+    for (const auto &partyId : exerciseParties.visibleParties.get())
+      if (partyId == party.id)
         return true;
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
index 15705ab64..8e5b5ef1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 
 #include <LtsWidgets/lts_checkable_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp
index b2974011c..2afcd7309 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "preset_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_preset_dialog.h"
 
 #include "group_edit_dialog.h"
@@ -18,6 +19,7 @@ PresetDialog::PresetDialog(const QString &menuGroup, QWidget *parent)
   , m_dtc(nullptr)
   , m_ftc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -76,7 +78,7 @@ void PresetDialog::enaDisa()
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, cntSelectedRows == 1 );
 
   bool deletable = cntSelectedRows > 0 &&
-      (m_model->getRowData(selectedRows.at(0).row()).type() == GroupType::PresetGroup);
+      (m_model->getRowData(selectedRows.at(0).row()).type == GroupType::PresetGroup);
 
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, deletable );
 }
@@ -84,7 +86,7 @@ void PresetDialog::enaDisa()
 void PresetDialog::onRemoveGroup()
 {
   QModelIndex idx = m_ui->widget->currentIndex();
-  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id());
+  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id);
   m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->groupRemoveRequest(req, this);
@@ -95,7 +97,7 @@ void PresetDialog::onAddGroup()
 {
   GroupEditDialog *dialog = new GroupEditDialog(this);
   Group grp;
-  grp.type(GroupType::PresetGroup);
+  grp.type = GroupType::PresetGroup;
   dialog->init(grp, m_dtc, m_ftc);
 
   addDialog(dialog, m_menuGroup, QLatin1String("NewPreset"), LtsWidgets::LayoutArea::eDialogTab);
@@ -106,12 +108,12 @@ void PresetDialog::onEditGroup()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const OperatorManagement::Group group = m_model->getRowData(idx.row());
 
-  if (group.id() <= 0)
+  if (group.id <= 0)
     return;
 
   GroupEditDialog *dialog = new GroupEditDialog(this);
   dialog->init(group, m_dtc, m_ftc);
-  const QString identifier = QLatin1String("editPreset") + QString::number(group.id());
+  const QString identifier = QLatin1String("editPreset") + QString::number(group.id);
 
   addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
index 9a6144e7c..67e71b9c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
@@ -3,6 +3,7 @@
 
 
 #include "operator_overview_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_operator_overview_dialog.h"
 
 #include "operator_overview_dialog.h"
@@ -22,6 +23,7 @@ OperatorOverviewDialog::OperatorOverviewDialog(const QString &windowTitle, QWidg
   , m_ui(new Ui::OperatorOverviewDialog)
   , m_ftc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &OperatorOverviewDialog::onPrint);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
index a61357f8d..486a2795b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
@@ -2,6 +2,7 @@
 
 
 #include "opm_settings_group.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonDocument>
 #include <QJsonParseError>
@@ -16,6 +17,7 @@ SettingsGroup::SettingsGroup(const QString &group, const QString &id, SubSetHand
   , m_id(id)
   , m_subSetHandler(handler)
   , m_opSettings(opSettings)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_logger.setNoSpace(false);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
index 1d47ea08c..5c39c3ba5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "operator_settings_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_operator_settings_dialog.h"
 
 #include "operator_settings_create_new_dialog.h"
@@ -9,7 +10,7 @@
 #include <OperatorManagement/Gui/Common/operator_change_password.h>
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <LtsUtils/dds_vector_to_pixmap.h>
+#include <LtsUtilsCore/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
@@ -27,6 +28,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QPen>
 #include <QtCore/QTimer>
+#include <QtCore/QRandomGenerator>
 #include <QtCore/QUuid>
 
 
@@ -125,7 +127,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
     m_ui->cbTimeZone->addItem(QString(QChar(tz)), tz);
 
   const QChar tz = m_opSettings->value(groupTimeSettings, QStringLiteral("TimeZone"), QChar()).toChar();
-  idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz);
+  idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz.unicode());
   if (idx >= 0)
     m_ui->cbTimeZone->setCurrentIndex(idx);
   else
@@ -190,7 +192,7 @@ bool OperatorSettingsDialog::init(const QMap<QString, SettingsGroup *> *workspac
     return false;
 
   OperatorManagement::User op = m_dtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  m_ui->ltsProfileButton->setPixmap(LtsUtils::getPixmap(op.image()));
+  m_ui->ltsProfileButton->setPixmap(LtsUtils::getPixmap(op.image));
 
   this->enaDisaOpsettings(enaDisaOpsettings);
   this->enaDisaFilterPresets(enaDisaFilterPresets);
@@ -221,7 +223,7 @@ void OperatorSettingsDialog::keyPressEvent(QKeyEvent *event)
   if (event->key() == '#')
     m_keyCache.clear();
   else
-    m_keyCache += event->key();
+    m_keyCache += QChar(event->key());
 
   QDateTime dt(QDateTime::currentDateTime());
   QDate d = dt.date();
@@ -602,8 +604,8 @@ void OperatorSettingsDialog::onChangeProfilePicture()
   m_operatorPixmap = pixmap;
 
   OperatorCreateModifyRequest req;
-  req.id(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  req.image(LtsUtils::fromPixmap(m_operatorPixmap));
+  req.id = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  req.image = LtsUtils::fromPixmap(m_operatorPixmap);
 
   m_requestHelper->addRequest([this, req]()
   {
@@ -649,6 +651,7 @@ void OperatorSettingsDialog::onMineAreaInputModeChanged()
 
 TetraBoard::TetraBoard(QWidget *parent)
   : QDialog(parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   
   setFocusPolicy(Qt::StrongFocus);
@@ -989,7 +992,7 @@ void TetraBoard::drawSquare(QPainter &painter, int x, int y, TetraShape shape)
 
 void TetraPiece::setRandomShape()
 {
-  setShape(TetraShape(qrand() % 7 + 1));
+  setShape(TetraShape(QRandomGenerator::global()->bounded(7) + 1));
 }
 
 void TetraPiece::setShape(TetraShape shape)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
index de824084e..828c7d889 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
@@ -884,7 +884,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
           = m_fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
       FilterManagement::SymbolAppearance appearance = appearanceSettings->settingsToData();
 
-      subset.data = QString::fromStdString(appearance.content());
+      subset.data = QString::fromStdString(appearance.content);
       return true;
     }
     break;
@@ -895,7 +895,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
           = m_fltAesIfc->aesFilterForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
       FilterManagement::AesFilter aesFilter = displayFilter->filterToData();
 
-      subset.data = QJsonValue(QString::fromStdString(aesFilter.content()));
+      subset.data = QJsonValue(QString::fromStdString(aesFilter.content));
       return true;
     }
     break;
@@ -906,7 +906,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
           = m_fltBuildingComponentIfc->buildingComponentSettingsForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
       FilterManagement::BuildingComponentFilter filter = settings->bldCmpSettingsToData();
 
-      subset.data = QJsonValue(QString::fromStdString(filter.content()));
+      subset.data = QJsonValue(QString::fromStdString(filter.content));
       return true;
     }
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OpmComboBox/opm_combobox_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OpmComboBox/opm_combobox_gui_plugin.cpp
index d9403501a..b6d858ad4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OpmComboBox/opm_combobox_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OpmComboBox/opm_combobox_gui_plugin.cpp
@@ -43,9 +43,9 @@ bool InterfaceImpl::fillOperatorComboBox(LtsWidgets::LtsComboBox *cbx, CbxOperat
   {
     auto cbUser = [cbx](const User &user)
     {
-      if (user.isDeleted() || user.id() <= 0)
+      if (user.isDeleted || user.id <= 0)
         return;
-      cbx->addItem(QString::fromStdString(user.name()), user.id());
+      cbx->addItem(QString::fromStdString(user.name), user.id);
     };
     m_dtc->users(cbUser);
   }
@@ -54,15 +54,15 @@ bool InterfaceImpl::fillOperatorComboBox(LtsWidgets::LtsComboBox *cbx, CbxOperat
   {
     auto cbPlayer = [this, cbx] (const ParticipantManagement::Participant &oc)
     {
-      if (oc.isDeleted() || !oc.equipmentNumber().is_set())
+      if (oc.isDeleted || !oc.equipmentNumber.has_value())
         return;
-      ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(oc.typeId()).typeClass();
+      ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(oc.typeId).typeClass;
       if ((typeClass != ParticipantManagement::TypeClass::SupportEntity) ||
-          (oc.id() <= 0))
+          (oc.id <= 0))
         return;
-      int participantId = oc.id();
+      int participantId = oc.id;
       QString hierarchy = m_ppmDtc->hierarchyFromParticipant(participantId);
-      cbx->addItem(hierarchy + QStringLiteral(" - ") + QString::fromStdString(oc.tacticalIdentifier()) + QStringLiteral(" - ")+ QString::number(oc.equipmentNumber().get()), 0 - oc.id());
+      cbx->addItem(hierarchy + QStringLiteral(" - ") + QString::fromStdString(oc.tacticalIdentifier) + QStringLiteral(" - ")+ QString::number(oc.equipmentNumber.value()), 0 - oc.id);
     };
     m_ppmDtc->participants(cbPlayer);
   }
@@ -79,12 +79,12 @@ bool InterfaceImpl::fillActiveAppOperatorComboBox(LtsWidgets::LtsComboBox *cbx,
   {
     DEBUG_LOG(m_logger) << "activeApp = " << activeApp
                         << ", appId = " << appId;
-    if ((activeApp.operatorId() <= 0) ||
+    if ((activeApp.operatorId <= 0) ||
 
 
-        (activeApp.exerciseId() != exerciseId))
+        (activeApp.exerciseId != exerciseId))
       return;
-    operatorIds += activeApp.operatorId();
+    operatorIds += activeApp.operatorId;
   };
   m_dtc->activeApps(cbActiveApp);
 
@@ -92,7 +92,7 @@ bool InterfaceImpl::fillActiveAppOperatorComboBox(LtsWidgets::LtsComboBox *cbx,
   {
     const User &user = m_dtc->user(opId);
     DEBUG_LOG(m_logger) << "activeApp = addItem: " << user;
-    cbx->addItem(QString::fromStdString(user.name()), user.id());
+    cbx->addItem(QString::fromStdString(user.name), user.id);
   }
 
   cbx->model()->sort(0);
@@ -114,12 +114,12 @@ bool InterfaceImpl::fillActiveAppScreenComboBox(LtsWidgets::LtsComboBox *cbx, in
   auto cbActiveApp = [this, cbx, appId, operatorId, exerciseId](const ActiveApp &activeApp)
   {
     DEBUG_LOG(m_logger) << " activeApp = " << activeApp;
-    if ((activeApp.operatorId() == operatorId) &&
+    if ((activeApp.operatorId == operatorId) &&
 
-        (activeApp.exerciseId() == exerciseId))
+        (activeApp.exerciseId == exerciseId))
     {
-      const int screenId = activeApp.screenId();
-      const QString &activeAppAsString = LtsSession::LtsSession::appToString(static_cast<LtsAppDescriptor::App>(activeApp.appId()));
+      const int screenId = activeApp.screenId;
+      const QString &activeAppAsString = LtsSession::LtsSession::appToString(static_cast<LtsAppDescriptor::App>(activeApp.appId));
       cbx->addItem(tr("Screen '%1' ('%2')").arg(screenId).arg(activeAppAsString),
                    screenId);
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/CMakeLists.txt
index 7d64fe632..c50b0d000 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/CMakeLists.txt
@@ -71,20 +71,20 @@ if(QT6_GUI_AVAILABLE)
       LtsSession
       ${Qt6_Widgets}
       NGLLogger
+      AsbDataPluginInterface
+      ExmDataPluginInterface
+      advancedSymbologyGui
       LtsUtilsSettings
     PUBLIC
       Qt6::Core
       ${Qt6_Gui}
       nglwidgets
+      svcPpmCommon
       LtsDataView
       LtsUtilsGuiDds
   )
 endif()
 
-# Optional: External dependencies (not available in migration context)
-# target_link_libraries(PpmCommon PRIVATE AsbDataPluginInterface ExmDataPluginInterface advancedSymbologyGui)
-# target_link_libraries(PpmCommon PUBLIC svcPpmCommon)
-
 NGL_TARGET_INCLUDE_DIRECTORIES(PpmCommon
   PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../../..
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.cpp
index ec51001aa..6381bd2ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.cpp
@@ -47,7 +47,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
   }
 
   for (const auto &typeClassId : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId.underlying());
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId);
 
   slotTypeClassChanged();
 
@@ -111,7 +111,7 @@ void DistypeEditor::slotTypeClassChanged()
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (type.typeClass().underlying() != currentTypeClass)
+    if (type.typeClass() != currentTypeClass)
       continue;
 
     mUi->m_ltsComboBox_type->addItem(LtsUtils::str2QString(type.name()), type.id());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
index 80360ecc5..327a2bff0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <Common/participant_dis_type_edit.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
index e1be4442e..c1aa751b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
@@ -38,19 +38,19 @@ DISTypeEdit::DISTypeEdit(QWidget *parent,
 
   auto cbTypes = [this] (const ParticipantManagement::Type &type)
   {
-    m_mapTypes[type.id()] = type;
-    const ParticipantManagement::TypeClass &typeClassId = type.typeClass();
+    m_mapTypes[type.id] = type;
+    const ParticipantManagement::TypeClass &typeClassId = type.typeClass;
 
     if (typeClassId == ParticipantManagement::TypeClass::SupportUnit || typeClassId == ParticipantManagement::TypeClass::SupportEntity)
       return;
 
     
-    for (const auto &disId : type.disEntities())
+    for (const auto &disId : type.disEntities)
     {
       if (m_usedDisTypes.contains(disId))
         continue;
 
-      m_DisEntitiesByType[type.id()] << disId;
+      m_DisEntitiesByType[type.id] << disId;
 
 
 
@@ -122,9 +122,9 @@ bool DISTypeEdit::apply()
   for(int32_t typeId : std::as_const(m_setTouchedTypes))
   {
     Type &touchedType = m_mapTypes[typeId];
-    touchedType.disEntities().clear();
+    touchedType.disEntities.clear();
     for (int64_t disId : std::as_const(m_DisEntitiesByType[typeId]))
-      touchedType.disEntities().push_back(disId);
+      touchedType.disEntities.push_back(disId);
 
     m_requestHelper->addRequest([this, touchedType]()
     {
@@ -211,7 +211,7 @@ void DISTypeEdit::slotAddDistype()
   {
     const ParticipantManagement::Type& type = m_mapTypes[oldTypeId];
 
-    LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this, tr("Specified DIS type is already mapped to:\nType id: %1\nName: \"%2\"\nType class: \"%3\".\nDo you want to change this mapping?").arg(QString::number(type.id()), QString::fromStdString(type.name()), ParticipantManagement::toString(type.typeClass())), tr("DIS type already in use"),
+    LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this, tr("Specified DIS type is already mapped to:\nType id: %1\nName: \"%2\"\nType class: \"%3\".\nDo you want to change this mapping?").arg(QString::number(type.id), QString::fromStdString(type.name), ParticipantManagement::toString(type.typeClass)), tr("DIS type already in use"),
                                                                           LtsWidgets::Behaviour::Modal, LtsWidgets::Button::Yes | LtsWidgets::Button::No);
 
     if (button == LtsWidgets::Button::No)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
index 01d5aa8e1..c3fc6bbc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
@@ -4,6 +4,7 @@
 
 #include <ppmcommon_export.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <Services/ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.cpp
index b695786d0..9ef7c36ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.cpp
@@ -37,7 +37,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    const ParticipantManagement::TypeClass typeClassId = type.typeClass();
+    const ParticipantManagement::TypeClass typeClassId = type.typeClass;
 
     if (typeClassId == ParticipantManagement::TypeClass::SupportUnit || typeClassId == ParticipantManagement::TypeClass::SupportEntity)
       continue;
@@ -46,7 +46,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
   }
 
   for (const auto &typeClassId : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId.underlying());
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), static_cast<int>(typeClassId));
 
   slotTypeClassChanged();
 
@@ -110,10 +110,10 @@ void DistypeEditor::slotTypeClassChanged()
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (type.typeClass().underlying() != currentTypeClass)
+    if (static_cast<int>(type.typeClass) != currentTypeClass)
       continue;
 
-    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
+    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
   }
 
   slotTypeChanged();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
index a88878f98..73bd05e7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <Common/participant_dis_type_edit.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
index d5e9c0fe6..67a39e28b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
@@ -36,9 +36,9 @@ bool ParticipantEditItemWidget::init(const QModelIndex &workingIndex,
 {
   m_isOrgChart = isOrgChart;
   m_editData = data;
-  m_currentAssignState = data.assignState();
+  m_currentAssignState = data.assignState;
   m_partyId = partyId;
-  m_bEditMode = m_editData.typeId() > 0;
+  m_bEditMode = m_editData.typeId > 0;
   m_workingIndex = workingIndex;
   m_alreadyAddedEquipmentNumbers = usedEquipmentNumbers;
 
@@ -63,8 +63,8 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
     if (allowedType == Type())
       return;
 
-    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedType.typeClass().underlying()));
-    m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id()));
+    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedType.typeClass)));
+    m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id));
 
     return;
   }
@@ -77,27 +77,27 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
     const QVector<Type> allowedTypes = firingUnitValidator->artilleryParticipantTypes();
 
     m_ui->cbTypeClass->setDisabled(true);
-    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedTypes.at(0).typeClass().underlying()));
+    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedTypes.at(0).typeClass)));
 
     m_ui->cbType->clear();
 
     std::function<bool(Type)> funcIsSameGearType = [=](const Type &t)
     {
       if (m_isAdler)
-        return m_dtc->isAdlerType(t.id()) && (firingUnitValidator->getGearClassType(t.id()) == unitGearClassType);
-      return firingUnitValidator->getGearClassType(t.id()) == unitGearClassType;
+        return m_dtc->isAdlerType(t.id) && (static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType);
+      return static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType;
     };
     QVector<Type>::ConstIterator typeIterator = std::find_if(allowedTypes.begin(), allowedTypes.end(), funcIsSameGearType);
 
     if(typeIterator != allowedTypes.end())
     {
       m_ui->cbType->setDisabled(true);
-      m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name()), typeIterator->id());
+      m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name), typeIterator->id);
     }
     else
     {
       for (const Type &currentType : allowedTypes)
-        m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name()), currentType.id());
+        m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name), currentType.id);
       m_ui->cbType->model()->sort(0);
     }
 
@@ -151,44 +151,44 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
 
 void ParticipantEditItemWidget::setData()
 {
-  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
-  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
-  m_ui->leInfo->setText(QString::fromStdString(m_editData.info()));
-  m_ui->leSign->setText(QString::fromStdString(m_editData.identification()));
-  m_ui->cbExternal->setChecked(m_editData.externalId() > 0);
-  m_ui->leVerein->setText(QString::fromStdString(m_editData.name()));
+  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
+  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
+  m_ui->leInfo->setText(QString::fromStdString(m_editData.info));
+  m_ui->leSign->setText(QString::fromStdString(m_editData.identification));
+  m_ui->cbExternal->setChecked(m_editData.externalId > 0);
+  m_ui->leVerein->setText(QString::fromStdString(m_editData.name));
 
-  Type type = m_dtc->type(m_editData.typeId());
-  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(type.typeClass().underlying()));
-  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id()));
+  Type type = m_dtc->type(m_editData.typeId);
+  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(type.typeClass)));
+  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id));
 
   
   setAssignmentButton();
 
-  if (isUnitType(m_editData.typeId()))
+  if (isUnitType(m_editData.typeId))
   {
     m_ui->cbTypeClass->setEnabled(false);
     m_ui->sbEquipNr->setEnabled(false);
     m_ui->tbAssignment->setEnabled(false); 
 
-    bool showVerein = m_dtc->isAdlerType(m_editData.typeId());
+    bool showVerein = m_dtc->isAdlerType(m_editData.typeId);
     m_ui->lblVerein->setVisible(showVerein);
     m_ui->leVerein->setVisible(showVerein);
   }
   else
   {
-    const bool isEquipped = m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() > 0;
+    const bool isEquipped = m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() > 0;
     m_ui->cbTypeClass->setEnabled(!isEquipped);
     m_ui->cbType->setEnabled(!isEquipped);
-    m_ui->sbEquipNr->setEnabled(m_editData.typeId() > 0);
+    m_ui->sbEquipNr->setEnabled(m_editData.typeId > 0);
   }
 
-  if (m_editData.equipmentNumber().is_set())
-    m_ui->sbEquipNr->setValue(m_editData.equipmentNumber().get());
-  onChangeSymbol(QString::fromStdString(m_editData.symbol()));
+  if (m_editData.equipmentNumber.has_value())
+    m_ui->sbEquipNr->setValue(m_editData.equipmentNumber.get());
+  onChangeSymbol(QString::fromStdString(m_editData.symbol));
 
   
-  if (m_editData.externalId() > 0)
+  if (m_editData.externalId > 0)
   {
     m_ui->leTactIdent->setEnabled(false); 
     m_ui->sbEquipNr->setEnabled(false); 
@@ -200,8 +200,8 @@ void ParticipantEditItemWidget::setData()
 
 void ParticipantEditItemWidget::setDesignatorData()
 {
-  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
-  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
+  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
+  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
 }
 
 void ParticipantEditItemWidget::onAddItem()
@@ -210,8 +210,8 @@ void ParticipantEditItemWidget::onAddItem()
   if (!collectParticipantData(newParticipantData))
     return;
 
-  if (newParticipantData.equipmentNumber().is_set())
-    m_alreadyAddedEquipmentNumbers.append(newParticipantData.equipmentNumber().get());
+  if (newParticipantData.equipmentNumber.has_value())
+    m_alreadyAddedEquipmentNumbers.append(newParticipantData.equipmentNumber.get());
 
   DEBUG_LOG(m_logger) << "add item: " << newParticipantData;
   if (m_workingIndex.isValid() || m_isOrgChart)
@@ -226,7 +226,7 @@ bool ParticipantEditItemWidget::onEditItem()
   if (!collectParticipantData(newParticipantData))
     return false;
   m_editData = newParticipantData;
-  m_currentAssignState = newParticipantData.assignState();
+  m_currentAssignState = newParticipantData.assignState;
 
   DEBUG_LOG(m_logger) << "edit item: " << m_editData;
   if (m_workingIndex.isValid() || m_isOrgChart)
@@ -239,17 +239,17 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
 {
   const int newEquipmentNumber = m_ui->sbEquipNr->value();
 
-  data.designator(m_ui->leDesignator->text().toStdString());
-  data.tacticalIdentifier(m_ui->leTactIdent->text().toStdString());
-  data.symbol(m_sidc.toStdString());
-  data.typeId(m_ui->cbType->currentData().toInt());
-  data.partyId(m_partyId);
-  data.identification(m_ui->leSign->text().toStdString());
-  data.info(m_ui->leInfo->text().toStdString());
-  data.assignState(m_currentAssignState);
+  data.designator = m_ui->leDesignator->text().toStdString();
+  data.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
+  data.symbol = m_sidc.toStdString();
+  data.typeId = m_ui->cbType->currentData().toInt();
+  data.partyId = m_partyId;
+  data.identification = m_ui->leSign->text().toStdString();
+  data.info = m_ui->leInfo->text().toStdString();
+  data.assignState = m_currentAssignState;
 
   
-  data.name(m_ui->leVerein->text().toStdString());
+  data.name = m_ui->leVerein->text().toStdString();
 
   if (newEquipmentNumber > 0)
   {
@@ -258,7 +258,7 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
       m_ui->lbMinMaxEquipNr->setText(QStringLiteral("<span style=\"color:#aa0000;\">%1</span>").arg(m_ui->lbMinMaxEquipNr->text()));
       return false;
     }
-    if (m_editData.equipmentNumber() != newEquipmentNumber)
+    if (m_editData.equipmentNumber != newEquipmentNumber)
     {
       int exerciseId = 0;
       if (!m_dtc->isEquipmentExerciseMappingEnabled())
@@ -284,21 +284,21 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
         }
       }
     }
-    data.equipmentNumber(newEquipmentNumber);
-    data.externalId(m_ui->cbExternal->isChecked() ? newEquipmentNumber : 0);
+    data.equipmentNumber = newEquipmentNumber;
+    data.externalId = m_ui->cbExternal->isChecked() ? newEquipmentNumber : 0;
     m_ui->sbEquipNr->setValue(newEquipmentNumber + 1);
   }
   else
   {
-    data.equipmentNumber().reset();
-    data.externalId(0);
+    data.equipmentNumber.reset();
+    data.externalId = 0;
   }
   return true;
 }
 
 void ParticipantEditItemWidget::onTbAssignmentClicked()
 {
-  switch (m_currentAssignState.underlying())
+  switch (m_currentAssignState)
   {
   case ParticipantManagement::ParticipantAssignState::AssignedWms:
     m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
@@ -314,8 +314,8 @@ void ParticipantEditItemWidget::onTbAssignmentClicked()
     m_ui->sbEquipNr->setValue(0);
     break;
   case ParticipantManagement::ParticipantAssignState::NotAssigned:
-    if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::ExconWmsOverruled ||
-        m_editData.assignState() == ParticipantManagement::ParticipantAssignState::HandoutWms)
+    if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::ExconWmsOverruled ||
+        m_editData.assignState == ParticipantManagement::ParticipantAssignState::HandoutWms)
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::ExconWmsOverruled;
     else
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
@@ -333,16 +333,16 @@ void ParticipantEditItemWidget::onEqNoChanged()
     return;
   }
 
-  if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::AssignedWms)
+  if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::AssignedWms)
   {
-    if (m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() == m_ui->sbEquipNr->value())
+    if (m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() == m_ui->sbEquipNr->value())
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::AssignedWms;
     else
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
   }
-  else if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::HandoutWms)
+  else if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::HandoutWms)
   {
-    if (m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() == m_ui->sbEquipNr->value())
+    if (m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() == m_ui->sbEquipNr->value())
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutWms;
     else
       m_currentAssignState = ParticipantManagement::ParticipantAssignState::ExconWmsOverruled;
@@ -352,12 +352,12 @@ void ParticipantEditItemWidget::onEqNoChanged()
 
 void ParticipantEditItemWidget::setAssignmentButton()
 {
-  switch (m_currentAssignState.underlying())
+  switch (m_currentAssignState)
   {
   case ParticipantManagement::ParticipantAssignState::AssignedWms:
   case ParticipantManagement::ParticipantAssignState::HandoutWms:
   {
-    if (m_editData.assignState().underlying() == ParticipantManagement::ParticipantAssignState::AssignedWms)
+    if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::AssignedWms)
       m_ui->tbAssignment->setText(tr("WH(A)"));
     else
       m_ui->tbAssignment->setText(tr("WH(H)"));
@@ -383,7 +383,7 @@ void ParticipantEditItemWidget::setAssignmentButton()
   }
 
   
-  if (m_editData.externalId() > 0 && m_ui->cbExternal->isChecked())
+  if (m_editData.externalId > 0 && m_ui->cbExternal->isChecked())
   {
     m_ui->tbAssignment->setEnabled(false);
     m_ui->sbEquipNr->setEnabled(false);
@@ -440,7 +440,7 @@ bool ParticipantEditItem::init(const QModelIndex &workingIndex,
   layout->addWidget(m_buttonBox);
   setLayout(layout);
 
-  if (data.typeId() > 0)
+  if (data.typeId > 0)
   {
     m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, m_editItemWidget, &ParticipantEditItemWidget::onEditItem);
     m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setText(tr("Apply"));
@@ -494,7 +494,7 @@ bool ParticipantEditItemTab::init(const std::shared_ptr<Interface::Dtc> &dtc,
                                   const ParticipantData &data,
                                   bool isOrgChart)
 {
-  if (!m_editItemWidget->init(QModelIndex(), data.partyId(), dtc, ppmGuiCbxIfc, asb, data, isOrgChart))
+  if (!m_editItemWidget->init(QModelIndex(), data.partyId, dtc, ppmGuiCbxIfc, asb, data, isOrgChart))
     return false;
 
   QVBoxLayout *layout = new QVBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.h
index c551a0237..2890781b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.h
@@ -55,8 +55,8 @@ protected Q_SLOTS:
   void onEqNoChanged();
 
 protected:
-  int editTypeId() const override { return m_editData.typeId(); }
-  int currentPartyId() const override { return m_editData.partyId() > 1 ? m_editData.partyId() : m_partyId; }
+  int editTypeId() const override { return m_editData.typeId; }
+  int currentPartyId() const override { return m_editData.partyId > 1 ? m_editData.partyId : m_partyId; }
 private:
   ParticipantManagement::ParticipantAssignState getAssignmentState() const;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
index 6a4615a37..cc7798c8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
@@ -2,6 +2,7 @@
 
 
 #include "participant_edit_item.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_participant_edit_item_widget_base.h"
 #include <ParticipantManagement/ppm_translation.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
@@ -18,7 +19,7 @@ namespace ParticipantManagement
 
 
 
-static int s_lastTypeClassUsed = ParticipantManagement::TypeClass::Human;
+static int s_lastTypeClassUsed = static_cast<int>(ParticipantManagement::TypeClass::Human);
 static int s_lastTypeUsed = -1;
 
 ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService,
@@ -56,7 +57,7 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
   const bool hasHlaInterface = (LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("Exercises"),
                                                                             QStringLiteral("HasHlaInterface"))
                                 && exmDtc
-                                && exmDtc->exercise(m_session->exerciseId()).hasHlaInterface());
+                                && exmDtc->exercise(m_session->exerciseId()).hasHlaInterface);
   if (!hasHlaInterface)
   {
     m_ui->cbExternal->hide();
@@ -169,22 +170,22 @@ void ParticipantEditItemWidgetBase::onFillTypeCb()
 void ParticipantEditItemWidgetBase::onChangeMinMax()
 {
   const ParticipantManagement::Type type = m_dtc->type(m_ui->cbType->currentData().toInt());
-  const ParticipantManagement::EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId());
-  m_ui->lbMinMaxEquipNr->setText(QString::number(getUnsignedShortValue(eqType.minEquipNo())) + QLatin1Char(':') + QString::number(getUnsignedShortValue(eqType.maxEquipNo())));
-  m_ui->sbEquipNr->setMaximum(getUnsignedShortValue(eqType.maxEquipNo()));
-  m_typeMinimum = eqType.minEquipNo();
-  bool isNoUnit = type.typeClass() != TypeClass::SupportUnit && type.typeClass() != TypeClass::Unit;
+  const ParticipantManagement::EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId);
+  m_ui->lbMinMaxEquipNr->setText(QString::number(getUnsignedShortValue(eqType.minEquipNo)) + QLatin1Char(':') + QString::number(getUnsignedShortValue(eqType.maxEquipNo)));
+  m_ui->sbEquipNr->setMaximum(getUnsignedShortValue(eqType.maxEquipNo));
+  m_typeMinimum = eqType.minEquipNo;
+  bool isNoUnit = type.typeClass != TypeClass::SupportUnit && type.typeClass != TypeClass::Unit;
   if (!isNoUnit)
     m_ui->sbEquipNr->setValue(0);
   m_ui->sbEquipNr->setEnabled(isNoUnit);
   m_ui->tbAssignment->setEnabled(isNoUnit);
 
   
-  bool showVerein = m_dtc->isAdlerType(type.id());
+  bool showVerein = m_dtc->isAdlerType(type.id);
   m_ui->lblVerein->setVisible(showVerein);
   m_ui->leVerein->setVisible(showVerein);
 
-  onChangeSymbol(QString::fromStdString(type.symbol()));
+  onChangeSymbol(QString::fromStdString(type.symbol));
 }
 
 void ParticipantEditItemWidgetBase::onSymbolSelection()
@@ -230,8 +231,8 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
 
   if (currentPartyId())
   {
-    symDataToRender.role      = AdvancedSymbology::roleToRole<>((m_dtc->party(currentPartyId()).role()));
-    symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(currentPartyId()).color()));
+    symDataToRender.role      = AdvancedSymbology::roleToRole<>(m_dtc->party(currentPartyId()).role);
+    symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(currentPartyId()).color));
     symDataToRender.fillColorReplace = true;
   } else {
     
@@ -269,7 +270,7 @@ ParticipantManagement::TypeClass ParticipantEditItemWidgetBase::typeClassIdFromT
     return it.value();
   auto cbTypes = [this](const ParticipantManagement::Type &type)
   {
-    m_type2TypeClass[type.id()] = type.typeClass();
+    m_type2TypeClass[type.id] = type.typeClass;
   };
   m_dtc->types(cbTypes);
   return m_type2TypeClass.value(typeId);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
index 1f39e9f5c..5513d64a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <Services/ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsSession/lts_session.h>
 #include <QtWidgets/QWidget>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
index 6fc343272..ab4532152 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
@@ -2,8 +2,10 @@
 
 
 #include "participant_edit_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <ParticipantManagement/ppm_translation.h>
+#include <ParticipantManagement/logger.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <Symbology/symbol_data_to_render_role.h>
 #include <nglwidgets/ngltreeitem.h>
@@ -24,7 +26,7 @@ namespace core
 {
 static inline uint qHash(const ParticipantManagement::TypeClass &tc)
 {
-  return ::qHash(tc.underlying());
+  return ::qHash(tc);
 }
 }
 }
@@ -40,23 +42,23 @@ static QVariant participantToQVariant(const ParticipantData &pd)
 {
   QByteArray ba;
   QDataStream ds(&ba, QIODevice::WriteOnly);
-  ds << pd.id()
-     << pd.partyId()
-     << pd.hierarchyNumber()
-     << (pd.equipmentNumber().is_set() ? pd.equipmentNumber().get() : -1)
-     << pd.typeId()
-     << pd.externalId()
-     << QString::fromStdString(pd.symbol())
-     << QString::fromStdString(pd.name())
-     << QString::fromStdString(pd.identification())
-     << QString::fromStdString(pd.designator())
-     << QString::fromStdString(pd.tacticalIdentifier())
-     << QString::fromStdString(pd.info())
-     << pd.assignState().underlying()
-     << pd.isSimulated()
-     << pd.isDeleted()
-     << pd.modId()
-     << pd.superiorModId();
+  ds << pd.id
+     << pd.partyId
+     << pd.hierarchyNumber
+     << (pd.equipmentNumber.has_value() ? pd.equipmentNumber.get() : -1)
+     << pd.typeId
+     << static_cast<qint64>(pd.externalId)
+     << QString::fromStdString(pd.symbol)
+     << QString::fromStdString(pd.name)
+     << QString::fromStdString(pd.identification)
+     << QString::fromStdString(pd.designator)
+     << QString::fromStdString(pd.tacticalIdentifier)
+     << QString::fromStdString(pd.info)
+     << pd.assignState
+     << pd.isSimulated
+     << pd.isDeleted
+     << pd.modId
+     << pd.superiorModId;
 
   return ba;
 }
@@ -88,24 +90,24 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
      >> modId
      >> superiorModId;
 
-  pd.id(id);
-  pd.partyId(partyId);
-  pd.hierarchyNumber(hierarchyNumber);
+  pd.id = id;
+  pd.partyId = partyId;
+  pd.hierarchyNumber = hierarchyNumber;
   if (equipmentNumber >= 0)
-    pd.equipmentNumber(equipmentNumber);
-  pd.typeId(typeId);
-  pd.externalId(externalId);
-  pd.symbol(symbol.toStdString());
-  pd.name(name.toStdString());
-  pd.identification(identification.toStdString());
-  pd.designator(designator.toStdString());
-  pd.tacticalIdentifier(tacticalIdentifier.toStdString());
-  pd.info(info.toStdString());
-  pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
-  pd.isSimulated(isSimulated);
-  pd.isDeleted(isDeleted);
-  pd.modId(modId);
-  pd.superiorModId(superiorModId);
+    pd.equipmentNumber = equipmentNumber;
+  pd.typeId = typeId;
+  pd.externalId = externalId;
+  pd.symbol = symbol.toStdString();
+  pd.name = name.toStdString();
+  pd.identification = identification.toStdString();
+  pd.designator = designator.toStdString();
+  pd.tacticalIdentifier = tacticalIdentifier.toStdString();
+  pd.info = info.toStdString();
+  pd.assignState = static_cast<ParticipantManagement::ParticipantAssignState>(assignState);
+  pd.isSimulated = isSimulated;
+  pd.isDeleted = isDeleted;
+  pd.modId = modId;
+  pd.superiorModId = superiorModId;
 
   return pd;
 }
@@ -124,7 +126,7 @@ bool compareStrings(const std::string &s1, const std::string &s2,
 {
   const int iRet = strcmp(s1.c_str(), s2.c_str());
   if (iRet == 0)
-    return p1->participant.hierarchyNumber() < p2->participant.hierarchyNumber();
+    return p1->participant.hierarchyNumber < p2->participant.hierarchyNumber;
   return iRet < 0;
 }
 
@@ -156,6 +158,7 @@ ParticipantEditModel::ParticipantEditModel(QObject *parent,
   , m_bUnitsSelectable(true)
   , m_missingSuperiorIdTimer(new QTimer(this))
   , m_firingUnitValidator(new FiringUnitValidator(ppmDtc, this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(this, &ParticipantEditModel::signalDataDropped,
           this, &ParticipantEditModel::internalDataChanged);
@@ -179,7 +182,7 @@ Qt::ItemFlags ParticipantEditModel::flags(const QModelIndex &index) const
     ret |= Qt::ItemIsUserCheckable;
 
   
-  if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId()))
+  if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId))
     ret &= ~Qt::ItemIsSelectable;
   
   if (index.column() != 0 || !index.parent().isValid())
@@ -205,7 +208,7 @@ QVariant ParticipantEditModel::headerData(int section, Qt::Orientation orientati
       for (const int typeId : m_usedTypeIds)
       {
         cfd.data = typeId;
-        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name());
+        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name);
         cfc.data.push_back(cfd);
       }
     }
@@ -213,7 +216,7 @@ QVariant ParticipantEditModel::headerData(int section, Qt::Orientation orientati
     {
       for (const auto &typeClassId : m_usedTypeClassIds)
       {
-        cfd.data = typeClassId.underlying();
+        cfd.data = static_cast<int>(typeClassId);
         cfd.text = ParticipantManagement::toString(typeClassId);
         cfc.data.push_back(cfd);
       }
@@ -267,38 +270,38 @@ QVariant ParticipantEditModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ColDesignator:
-      return QString::fromStdString(participantData.designator());
+      return QString::fromStdString(participantData.designator);
 
     case ColIdentifier:
-      return QString::fromStdString(participantData.tacticalIdentifier());
+      return QString::fromStdString(participantData.tacticalIdentifier);
 
     case ColTypeClass:
-      return typeClassStringFromTypeId(participantData.typeId());
+      return typeClassStringFromTypeId(participantData.typeId);
 
     case ColType:
-      return ParticipantManagement::trTypeName(m_types.value(participantData.typeId()).name());
+      return ParticipantManagement::trTypeName(m_types.value(participantData.typeId).name);
 
     case ColEquipmentNumber:
-      if (!participantData.equipmentNumber().is_set())
+      if (!participantData.equipmentNumber.has_value())
       {
-        if (participantData.assignState() == ParticipantAssignState::HandoutExcon)
+        if (participantData.assignState == ParticipantAssignState::HandoutExcon)
           return 0;
         return QVariant();
       }
-      if (participantData.assignState() == ParticipantAssignState::ExconWmsOverruled)
-        return tr("%1 (+)").arg(participantData.equipmentNumber().get());
-      if (participantData.externalId() > 0)
-        return tr("%1 (external)").arg(participantData.equipmentNumber().get());
-      return participantData.equipmentNumber().get();
+      if (participantData.assignState == ParticipantAssignState::ExconWmsOverruled)
+        return tr("%1 (+)").arg(participantData.equipmentNumber.get());
+      if (participantData.externalId > 0)
+        return tr("%1 (external)").arg(participantData.equipmentNumber.get());
+      return participantData.equipmentNumber.get();
 
     case ColParticipantId:
-      return participantData.id();
+      return participantData.id;
 
     case ColInfo:
-      return QString::fromStdString(participantData.info());
+      return QString::fromStdString(participantData.info);
 
     case ColSign:
-      return QString::fromStdString(participantData.identification());
+      return QString::fromStdString(participantData.identification);
 
     default:
       Q_UNREACHABLE();
@@ -312,9 +315,9 @@ QVariant ParticipantEditModel::data(const QModelIndex &index, int role) const
 
   case LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole:
     if (index.column() == ColTypeClass)
-      return typeClassIdFromTypeId(participantData.typeId()).underlying();
+      return static_cast<int>(typeClassIdFromTypeId(participantData.typeId));
     if (index.column() == ColType)
-      return participantData.typeId();
+      return participantData.typeId;
     return QVariant();
 
   default:
@@ -357,7 +360,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
     return false;
 
   const CheckedTreeItem *parentItem = privateData(parent);
-  if (!isUnitType(parentItem->participant.typeId()))
+  if (!isUnitType(parentItem->participant.typeId))
     return false;
 
   DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
@@ -375,7 +378,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
   const ParticipantData pdSource = static_cast<CheckedTreeItem *>(tiSources.first())->participant;
   qDeleteAll(tiSources);
 
-  TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
+  TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId);
   bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
   bool isOwnTypeClassSupport = m_partyId == 1;
 
@@ -383,9 +386,9 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
     return false;
 
   
-  if (pdSource.partyId() == parentItem->participant.partyId())
+  if (pdSource.partyId == parentItem->participant.partyId)
   {
-    const int idSource = pdSource.id();
+    const int idSource = pdSource.id;
     
     if (idSource != 0 && isParentOf(parentItem, idSource))
     {
@@ -399,11 +402,11 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
     FiringUnitValidator::FiringUnitRestrictions restrictions = m_firingUnitValidator->getRestrictions(this, parent);
 
     
-    if (m_dtc->isAdlerVerbund(pdSource.typeId()))
+    if (m_dtc->isAdlerVerbund(pdSource.typeId))
     {
-      const Type &type = m_dtc->type(pdSource.typeId());
+      const Type &type = m_dtc->type(pdSource.typeId);
 
-      if (type.typeClass() != TypeClass::Unit)
+      if (type.typeClass != TypeClass::Unit)
         return false;
     }
 
@@ -414,16 +417,16 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
 
       if (restrictions.testFlag(FiringUnitValidator::ONLY_SAME_GEAR_CLASS_ARTILLERY_ALLOWED))
       {
-        if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem->participant.typeId(), pdSource.typeId()))
+        if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem->participant.typeId, pdSource.typeId))
           return false;
 
-        if (m_firingUnitValidator->isArtilleryUnit(parentItem->participant.typeId()) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId()))
+        if (m_firingUnitValidator->isArtilleryUnit(parentItem->participant.typeId) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId))
           return false;
       }
 
       if (restrictions.testFlag(FiringUnitValidator::NO_ARTILLERY_PARTICIPANTS_ALLOWED))
       {
-        if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId()))
+        if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId))
           return false;
       }
 
@@ -431,17 +434,17 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
       {
         const Type allowedType = m_firingUnitValidator->getAllowedType(this, parent);
 
-        if (pdSource.typeId() != allowedType.id())
+        if (pdSource.typeId != allowedType.id)
           return false;
 
-        if (m_dtc->isAdlerVerbund(pdSource.typeId()))
+        if (m_dtc->isAdlerVerbund(pdSource.typeId))
           return false;
       }
     }
   }
 
   
-  if (m_dtc->isAdlerVerbund(pdSource.typeId()) && parentItem->participant.partyId() != pdSource.partyId())
+  if (m_dtc->isAdlerVerbund(pdSource.typeId) && parentItem->participant.partyId != pdSource.partyId)
     return false;
 
   return true;
@@ -463,7 +466,7 @@ bool ParticipantEditModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
   {
     CheckedTreeItem *child = static_cast<CheckedTreeItem *>(cti->child(r));
     
-    child->participant.hierarchyNumber(r + 1);
+    child->participant.hierarchyNumber = r + 1;
   }
 
   return true;
@@ -480,8 +483,8 @@ bool ParticipantEditModel::onReinitModel(int partyId, const QSet<int> &checkedPa
   m_partyId = partyId;
 
   const ParticipantManagement::Party &party = m_dtc->party(m_partyId);
-  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role());
-  m_partyColor = QColor::fromRgb(QRgb(party.color()));
+  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role);
+  m_partyColor = QColor::fromRgb(QRgb(party.color));
 
   ParticipantIconModelBase::resetModel();
 
@@ -513,7 +516,7 @@ bool ParticipantEditModel::isRowRemovable(const CheckedTreeItem *parentItem) con
   if (!parentItem)
     return false;
   const ParticipantManagement::ParticipantData &participantData = parentItem->participant;
-  if (participantData.equipmentNumber().is_set() && participantData.equipmentNumber().get() > 0)
+  if (participantData.equipmentNumber.has_value() && participantData.equipmentNumber.get() > 0)
     return false;
 
   for (int i = 0; i < parentItem->childCount(); i++)
@@ -559,7 +562,7 @@ void ParticipantEditModel::processMissingSuperiorId()
     if (!tmap.contains(id))
       continue;
     const ParticipantManagement::Participant &p = m_dtc->participant(id);
-    if (p.id() != id)
+    if (p.id != id)
       continue;
     onParticipantChanged(p, DataModification::eModified);
 
@@ -570,7 +573,7 @@ void ParticipantEditModel::processMissingSuperiorId()
     for (int childId : std::as_const(childIds))
     {
       const ParticipantManagement::Participant &p = m_dtc->participant(childId);
-      if (p.id() != childId)
+      if (p.id != childId)
         continue;
       onParticipantChanged(p, DataModification::eModified);
     }
@@ -588,7 +591,7 @@ void ParticipantEditModel::selectItemByParticipantId(int participantId, const st
     const ParticipantManagement::ParticipantData &data = privateData(idx)->participant;
     if (hasChildren(idx))
       selectItemByParticipantId(participantId, selectItem, idx);
-    if (data.id() == participantId)
+    if (data.id == participantId)
       return selectItem(idx);
   }
   return;
@@ -605,7 +608,7 @@ QModelIndexList ParticipantEditModel::getIndexesByParticipantIds(const std::vect
     if (hasChildren(idx))
       indexes += getIndexesByParticipantIds(participantIds, idx);
 
-    auto it = std::find(participantIds.begin(), participantIds.end(), data.id());
+    auto it = std::find(participantIds.begin(), participantIds.end(), data.id);
     if (it != participantIds.end())
       indexes.append(idx);
   } 
@@ -696,7 +699,7 @@ QString ParticipantEditModel::getHierarchyFromIndex(const QModelIndex &index) co
   if (!index.isValid())
     return QString();
   const ParticipantManagement::ParticipantData &participantData = privateData(index)->participant;
-  return m_dtc->hierarchyFromParticipant(participantData.id());
+  return m_dtc->hierarchyFromParticipant(participantData.id);
 }
 
 
@@ -707,16 +710,16 @@ void ParticipantEditModel::gatherParticipants(QHash<int, ParticipantData> &tmap,
 {
   auto cb = [this, &tmap, &parentId2id](const Participant & part)
   {
-    if (part.isDeleted())
+    if (part.isDeleted)
       return;
 
-    if (part.partyId() != m_partyId)
+    if (part.partyId != m_partyId)
       return;
 
     
-    parentId2id[part.superiorId()] += part.id();
+    parentId2id[part.superiorId] += part.id;
 
-    tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
+    tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
   };
   m_dtc->participants(cb);
 }
@@ -730,16 +733,16 @@ std::vector<ParticipantData> ParticipantEditModel::getChildrenOf(NGLTreeItem *it
   std::vector<ParticipantData> ret;
   const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
   ParticipantManagement::ParticipantData participantData = cti->participant;
-  participantData.superiorModId(parentId);
-  participantData.hierarchyNumber(hierarchyNumber);
-  participantData.partyId(m_partyId); 
-  if (participantData.modId() == 0)
-    participantData.modId(++highestModId);
+  participantData.superiorModId = parentId;
+  participantData.hierarchyNumber = hierarchyNumber;
+  participantData.partyId = m_partyId; 
+  if (participantData.modId == 0)
+    participantData.modId = ++highestModId;
 
   
   for (int i = 0; i < item->childCount(); i++)
   {
-    const auto c = getChildrenOf(item->child(i), participantData.modId(), i + 1, bOnlyModifed, highestModId);
+    const auto c = getChildrenOf(item->child(i), participantData.modId, i + 1, bOnlyModifed, highestModId);
     ret.insert(ret.end(), c.begin(), c.end());
   }
 
@@ -760,28 +763,28 @@ bool ParticipantEditModel::updateChildrenOf(int parentId,
   {
     ParticipantEditModel::CheckedTreeItem *childItem = static_cast<ParticipantEditModel::CheckedTreeItem *>(parent->child(i));
     ParticipantData &pdItem = childItem->participant;
-    m_usedTypeIds += pdItem.typeId();
-    m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId());
-    if (pdItem.id() == 0)
+    m_usedTypeIds += pdItem.typeId;
+    m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId);
+    if (pdItem.id == 0)
     {
       const QSet<int> &childIds = parentId2id.value(parentId);
       for (int childId : childIds)
       {
         const auto &childData = tmap.value(childId);
-        if (childData.hierarchyNumber() - 1 == i)
+        if (childData.hierarchyNumber - 1 == i)
         {
-          pdItem.id(childData.id());
+          pdItem.id = childData.id;
           childItem->setModified(false);
           break;
         }
       }
     }
-    if (!pdItem.id())
+    if (!pdItem.id)
     {
       bRet = false;
       continue;
     }
-    if (!updateChildrenOf(pdItem.id(), childItem, parentId2id, tmap))
+    if (!updateChildrenOf(pdItem.id, childItem, parentId2id, tmap))
       bRet = false;
   }
   return bRet;
@@ -806,13 +809,13 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
       continue;
     }
     const ParticipantData &data = it.value();
-    m_usedTypeIds += data.typeId();
-    m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId());
+    m_usedTypeIds += data.typeId;
+    m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId);
 
     int insertPos = 0;
-    if (data.hierarchyNumber() > 0)
+    if (data.hierarchyNumber > 0)
     {
-      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
+      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
       insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
     }
     else
@@ -825,20 +828,20 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = data;
-    childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
+    childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id), cs);
 
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
                         << ") to parent " << parent << " at pos " << insertPos;
-    if ( data.id() == 0 && data.hierarchyNumber() == 0)
+    if ( data.id == 0 && data.hierarchyNumber == 0)
     {
       WARNING_LOG(m_logger) << "avoid endless loop in recursion";
       return;
     }
     insertRow(insertPos, parentIdx, childItem);
-    tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);  
+    tryRenderSymbol(QString::fromStdString(data.symbol), childItem);  
 
     const QModelIndex childIdx = index(insertPos, 0, parentIdx);
-    insertChildrenOf(data.id(), childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
+    insertChildrenOf(data.id, childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
   }
 }
 
@@ -849,7 +852,7 @@ bool ParticipantEditModel::isParentOf(const NGLTreeItem *item, int participantId
     return false;
 
   const CheckedTreeItem *cti = static_cast<const CheckedTreeItem *>(item);
-  if (cti->participant.id() == participantId)
+  if (cti->participant.id == participantId)
     return true;
   return isParentOf(item->parent(), participantId);
 }
@@ -921,7 +924,7 @@ void ParticipantEditModel::setCheckState(CheckedTreeItem *parentItem, const QSet
 
 QModelIndex ParticipantEditModel::indexFromParticipantId(int participantId, const CheckedTreeItem *cti) const
 {
-  if (cti->participant.id() == participantId)
+  if (cti->participant.id == participantId)
     return indexFromItem(cti);
   for (int row = 0; row < cti->childCount(); ++row)
   {
@@ -935,13 +938,13 @@ QModelIndex ParticipantEditModel::indexFromParticipantId(int participantId, cons
 int ParticipantEditModel::participantIdFromItem(NGLTreeItem *item) const
 {
   const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
-  return cti->participant.id();
+  return cti->participant.id;
 }
 
 int ParticipantEditModel::equipmentNumberFromItem(NGLTreeItem *item) const
 {
   const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
-  return cti->participant.equipmentNumber().is_set() ? cti->participant.equipmentNumber().get() : 0;
+  return cti->participant.equipmentNumber.has_value() ? cti->participant.equipmentNumber.get() : 0;
 }
 
 ParticipantEditModel::CheckedTreeItem *ParticipantEditModel::searchParticipant(const NGLTreeItem *parentItem, int participantId) const
@@ -950,7 +953,7 @@ ParticipantEditModel::CheckedTreeItem *ParticipantEditModel::searchParticipant(c
   for (int r = 0; r < rowCount; ++r)
   {
     CheckedTreeItem *child = static_cast<CheckedTreeItem *>(parentItem->child(r));
-    if (child->participant.id() == participantId)
+    if (child->participant.id == participantId)
       return child;
     child = searchParticipant(child, participantId);
     if (child)
@@ -965,10 +968,10 @@ NGLTreeItem *ParticipantEditModel::createItem(const QVariant &data, const QIcon
   CheckedTreeItem *cti = new CheckedTreeItem(data, icon);
   cti->participant = qVariantToParticipant(data);
 
-  if (cti->participant.symbol().size() != 0)
+  if (cti->participant.symbol.size() != 0)
   {
     auto *that = const_cast<ParticipantEditModel *>(this);
-    that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol()), cti);
+    that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol), cti);
   }
 
   return cti;
@@ -990,17 +993,17 @@ int ParticipantEditModel::insertParticipant(const QModelIndex &parent, Participa
   const int row = rowCount(parentCol0);
   if (bNewParticipant)
   {
-    participantData.id(0); 
-    participantData.modId(0); 
+    participantData.id = 0; 
+    participantData.modId = 0; 
   }
-  participantData.partyId(m_partyId);
-  participantData.hierarchyNumber(row + 1);
+  participantData.partyId = m_partyId;
+  participantData.hierarchyNumber = row + 1;
 
   CheckedTreeItem *item = static_cast<CheckedTreeItem *>(createItem(participantToQVariant(participantData), QIcon()));
   item->setModified(true);
   if (!insertRow(row, parentCol0, item))
     return -1;
-  tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
+  tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
   emit internalDataChanged();
   return row;
 }
@@ -1020,8 +1023,8 @@ bool ParticipantEditModel::onUpdateRow(const QModelIndex &index, const Participa
   if (participantData == oldData)
     return true;
 
-  if (oldData.symbol() != participantData.symbol())
-    tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
+  if (oldData.symbol != participantData.symbol)
+    tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
 
   emit internalDataChanged();
   item->participant = participantData;
@@ -1036,10 +1039,10 @@ bool ParticipantEditModel::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
   {
     CheckedTreeItem *item = privateData(idx);
     ParticipantManagement::ParticipantData data = item->participant;
-    data.isDeleted(true);
-    data.assignState() = ParticipantAssignState::NotAssigned;
-    data.equipmentNumber().reset();
-    if (data.modId() != 0) 
+    data.isDeleted = true;
+    data.assignState = ParticipantAssignState::NotAssigned;
+    data.equipmentNumber.reset();
+    if (data.modId != 0) 
       m_dataToDelete.push_back(std::move(data));
   }
   removeRow(idx.row(), idx.parent());
@@ -1049,12 +1052,12 @@ bool ParticipantEditModel::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
 
 void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  if (data.partyId() != m_partyId)
+  if (data.partyId != m_partyId)
     return;
 
   Q_UNUSED(modType);
 
-  CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id());
+  CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id);
   if (cti)
   {
     cti->participant = m_dtc->convertParticipantToParticipantData(data);
@@ -1062,16 +1065,16 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
     return;
   }
 
-  CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId());
+  CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId);
   if (ctiParent)
   {
     int insertPos = 0;
-    if (data.hierarchyNumber() > 0)
+    if (data.hierarchyNumber > 0)
     {
       for (int i = 0; i < ctiParent->childCount(); ++i)
       {
         CheckedTreeItem *child = static_cast<CheckedTreeItem *>(ctiParent->child(i));
-        if (child->participant.hierarchyNumber() > data.hierarchyNumber())
+        if (child->participant.hierarchyNumber > data.hierarchyNumber)
         {
           insertPos = i;
           break;
@@ -1086,17 +1089,17 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = m_dtc->convertParticipantToParticipantData(data);
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
                         << ") to parent " << ctiParent << " at pos " << insertPos;
     insertRow(insertPos, indexFromItem(ctiParent), childItem);
-    tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);  
+    tryRenderSymbol(QString::fromStdString(data.symbol), childItem);  
     return;
   }
   else
   {
     
     
-    m_missingSuperiorId.insert(data.superiorId());
+    m_missingSuperiorId.insert(data.superiorId);
     m_missingSuperiorIdTimer->start();
   }
 
@@ -1139,31 +1142,31 @@ bool ParticipantTreeFilterProxyModel::lessThan(const QModelIndex &source_left, c
   switch (source_left.column())
   {
   case ParticipantEditModel::ColDesignator:
-    return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
+    return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
   case ParticipantEditModel::ColIdentifier:
-    return compareStrings(left->participant.tacticalIdentifier(),
-                          right->participant.tacticalIdentifier(),
+    return compareStrings(left->participant.tacticalIdentifier,
+                          right->participant.tacticalIdentifier,
                           left, right);
   case ParticipantEditModel::ColTypeClass:
   case ParticipantEditModel::ColType:
     break;  
   case ParticipantEditModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
-      return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
+      return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
+    if (!left->participant.equipmentNumber.has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber.has_value())
       return false;
-    return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
+    return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
   case ParticipantEditModel::ColParticipantId:
-    return left->participant.id() < right->participant.id();
+    return left->participant.id < right->participant.id;
   case ParticipantEditModel::ColInfo:
-    return compareStrings(left->participant.info(),
-                          right->participant.info(),
+    return compareStrings(left->participant.info,
+                          right->participant.info,
                           left, right);
   case ParticipantEditModel::ColSign:
-    return compareStrings(left->participant.identification(),
-                          right->participant.identification(),
+    return compareStrings(left->participant.identification,
+                          right->participant.identification,
                           left, right);
   }
   return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
@@ -1182,7 +1185,7 @@ bool ParticipantTreeFilterProxyModel::filterAcceptsRow(int source_row, const QMo
     return false;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  if (!m_allowedTypes.contains(childItem->participant.typeId()))
+  if (!m_allowedTypes.contains(childItem->participant.typeId))
     return false;
 #else
   
@@ -1334,32 +1337,32 @@ bool ParticipantTableFilterProxyModel::lessThan(const QModelIndex &sourceLeft, c
   switch (sourceLeft.column())
   {
   case ParticipantEditModel::ColDesignator:
-    return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
+    return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
 
   case ParticipantEditModel::ColIdentifier:
-    return compareStrings(left->participant.tacticalIdentifier(), right->participant.tacticalIdentifier(), left, right);
+    return compareStrings(left->participant.tacticalIdentifier, right->participant.tacticalIdentifier, left, right);
 
   case ParticipantEditModel::ColTypeClass:
   case ParticipantEditModel::ColType:
     return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
 
   case ParticipantEditModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
-      return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
+      return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
+    if (!left->participant.equipmentNumber.has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber.has_value())
       return false;
-    return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
+    return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
 
   case ParticipantEditModel::ColParticipantId:
-    return left->participant.id() < right->participant.id();
+    return left->participant.id < right->participant.id;
 
   case ParticipantEditModel::ColInfo:
-    return compareStrings(left->participant.info(), right->participant.info(), left, right);
+    return compareStrings(left->participant.info, right->participant.info, left, right);
 
   case ParticipantEditModel::ColSign:
-    return compareStrings(left->participant.identification(), right->participant.identification(), left, right);
+    return compareStrings(left->participant.identification, right->participant.identification, left, right);
 
   default:
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
index e6e4330ce..2e07c234c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
@@ -177,7 +177,6 @@ public:
   int partyId() const { return m_sourceModel ? m_sourceModel->partyId() : -1; }
 
 protected:
-  NGL::INGLLogger &m_logger;
   bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
@@ -283,4 +282,4 @@ private:
 
 } 
 
-Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData)
+// Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData) omitted: Qt6 raises "specialization after instantiation / redefinition". ParticipantData is stored as a tree-item member and converted via participantToQVariant() (not QVariant-by-value), so the metatype is unneeded (legacy Qt5 tolerated the duplicate declaration).
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
index 3a554da01..15f449cca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
@@ -26,7 +26,7 @@ QVector<Type> FiringUnitValidator::artilleryParticipantTypes() const
 
   std::function<void(const Type &)> getArtilleryType = [this, &artilleryParticipantTypes](const Type &type)
   {
-    if (!m_artilleryParticipantTypeIds.contains(type.id()))
+    if (!m_artilleryParticipantTypeIds.contains(type.id))
       return;
 
     artilleryParticipantTypes.append(type);
@@ -53,7 +53,7 @@ int FiringUnitValidator::getTypeId(const ParticipantEditModel *model, const QMod
 
   const ParticipantData data = model->getParticipantData(index);
 
-  return data.typeId();
+  return data.typeId;
 }
 
 int FiringUnitValidator::getTypeId(const ParticipantTemplateEditModel *model, const QModelIndex &index) const
@@ -63,7 +63,7 @@ int FiringUnitValidator::getTypeId(const ParticipantTemplateEditModel *model, co
 
   const TemplateData data = model->getTemplateData(index);
 
-  return data.typeId();
+  return data.typeId;
 }
 
 void FiringUnitValidator::fetchArtilleryTypes()
@@ -76,10 +76,10 @@ void FiringUnitValidator::fetchArtilleryTypes()
     if (!isArtilleryType(type))
       return;
 
-    if (type.typeClass() == ParticipantManagement::TypeClass::Unit)
-      m_firingUnitTypeIds.insert(type.id());
+    if (type.typeClass == ParticipantManagement::TypeClass::Unit)
+      m_firingUnitTypeIds.insert(type.id);
     else
-      m_artilleryParticipantTypeIds.insert(type.id());
+      m_artilleryParticipantTypeIds.insert(type.id);
   };
 
   m_ppmDtc->types(getArtilleryTypes);
@@ -87,7 +87,7 @@ void FiringUnitValidator::fetchArtilleryTypes()
 
 bool FiringUnitValidator::isArtilleryType(int typeId) const { return m_ppmDtc->isArtilleryType(typeId) && !m_ppmDtc->isAdlerVerbund(typeId); }
 
-bool FiringUnitValidator::isArtilleryType(const Type &type) const { return isArtilleryType(type.id()); }
+bool FiringUnitValidator::isArtilleryType(const Type &type) const { return isArtilleryType(type.id); }
 
 bool FiringUnitValidator::isArtilleryUnit(int typeId) const
 {
@@ -96,7 +96,7 @@ bool FiringUnitValidator::isArtilleryUnit(int typeId) const
 
   const ParticipantManagement::Type &type = m_ppmDtc->type(typeId);
 
-  return type.typeClass() == ParticipantManagement::TypeClass::Unit;
+  return type.typeClass == ParticipantManagement::TypeClass::Unit;
 }
 
 bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
@@ -106,7 +106,7 @@ bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
 
   const ParticipantManagement::Type &type = m_ppmDtc->type(typeId);
 
-  return type.typeClass() == ParticipantManagement::TypeClass::WeaponSystem;
+  return type.typeClass == ParticipantManagement::TypeClass::WeaponSystem;
 }
 
 bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) const
@@ -124,9 +124,9 @@ bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) con
 ProjectDataManagement::GearClass FiringUnitValidator::getGearClassType(int typeId) const
 {
   const Type type = m_ppmDtc->type(typeId);
-  const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties()));
+  const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties));
   const QJsonObject propertiesObject = properties.object();
-  const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown);
+  const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Unknown));
 
   return static_cast<ProjectDataManagement::GearClass>(gearClassId);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
index 5a6777d13..b7761422e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <ppmcommon_export.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include "participant_edit_model.h"
 #include "participant_template_edit_model.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
index 050c32875..3386b098d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
@@ -2,6 +2,7 @@
 
 
 #include "participant_icon_model_base.h"
+#include <ParticipantManagement/ppm_translation.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <nglwidgets/ngltreeitem.h>
 #include <QtCore/QHash>
@@ -40,17 +41,17 @@ void ParticipantIconModelBase::onTypeChanged(const ParticipantManagement::Type &
 {
   if (modType == DataModification::eRemoved)
   {
-    m_types.remove(data.id());
+    m_types.remove(data.id);
     return;
   }
 
-  m_types[data.id()] = data;
+  m_types[data.id] = data;
 }
 
 
 ParticipantManagement::TypeClass ParticipantIconModelBase::typeClassIdFromTypeId(int typeId) const
 {
-  return m_types.value(typeId).typeClass();
+  return m_types.value(typeId).typeClass;
 }
 
 QString ParticipantIconModelBase::typeClassStringFromTypeId(int typeId) const
@@ -58,7 +59,7 @@ QString ParticipantIconModelBase::typeClassStringFromTypeId(int typeId) const
   auto it = m_types.find(typeId);
   if (it == m_types.end())
     return QString();
-  return ParticipantManagement::toString(it.value().typeClass());
+  return ParticipantManagement::toString(it.value().typeClass);
 }
 
 bool ParticipantIconModelBase::isUnitType(int typeId) const
@@ -108,7 +109,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
         SymbolResultData symResData;
         symResData.result = symRes;
         symResData.treeItems.push_back(item);
-        m_symbolResultMapping.insertMulti(symResPtr, symResData);
+        m_symbolResultMapping.insert(symResPtr, symResData);
         QPointer<AdvancedSymbology::SymbolResult> qPointer(symResPtr);
 
         
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
index 22d63727c..1fc010b6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
@@ -5,6 +5,7 @@
 
 #include <ppmcommon_export.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <nglwidgets/ngltreemodel.h>
 
 #include <QtGui/QColor>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.cpp
index ed09a3238..ef6991bb1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.cpp
@@ -32,11 +32,11 @@ bool ParticipantSearchModal::init(const std::shared_ptr<ParticipantManagement::I
 
   auto cb = [this](const Participant &data)
   {
-    if (!data.equipmentNumber().is_set())
+    if (!data.equipmentNumber.has_value())
       return;
-    const int newEqId = data.equipmentNumber().get();
-    m_partId2EqId[data.id()] = newEqId;
-    m_eqId2PartId[newEqId] = data.id();
+    const int newEqId = data.equipmentNumber.get();
+    m_partId2EqId[data.id] = newEqId;
+    m_eqId2PartId[newEqId] = data.id;
   };
   dtc->participants(cb);
   connect(dtc.get(), &Interface::Dtc::participantChanged,
@@ -63,27 +63,27 @@ void ParticipantSearchModal::onOkay()
 
 void ParticipantSearchModal::onParticipantChanged(const ParticipantManagement::Participant &data, ::DataModification modType)
 {
-  const int newEqId = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
+  const int newEqId = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const int oldEqId = m_partId2EqId.value(data.id());
+    const int oldEqId = m_partId2EqId.value(data.id);
     if (oldEqId == newEqId)
       return;
     if (oldEqId != 0)
       m_eqId2PartId.remove(oldEqId);
     if (newEqId == 0)
       return;
-    m_partId2EqId[data.id()] = newEqId;
-    m_eqId2PartId[newEqId] = data.id();
+    m_partId2EqId[data.id] = newEqId;
+    m_eqId2PartId[newEqId] = data.id;
     break;
   }
   case DataModification::eRemoved:
   {
-    const int oldEqId = m_partId2EqId.value(data.id());
-    m_partId2EqId.remove(data.id());
+    const int oldEqId = m_partId2EqId.value(data.id);
+    m_partId2EqId.remove(data.id);
     if (oldEqId != 0)
       m_eqId2PartId.remove(oldEqId);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
index 8ace0f29a..fff3f6408 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
@@ -36,7 +36,7 @@ bool ParticipantTemplateEditItemWidget::init(const QModelIndex &workingIndex,
 {
   m_workingIndex = workingIndex;
   m_editData = data;
-  m_bEditMode = m_editData.typeId() > 0;
+  m_bEditMode = m_editData.typeId > 0;
 
   return ParticipantEditItemWidgetBase::init(dtc, ppmGuiCbxIfc, asb, addItem);
 }
@@ -59,8 +59,8 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
     if (allowedType == Type())
       return;
 
-    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedType.typeClass().underlying()));
-    m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id()));
+    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedType.typeClass)));
+    m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id));
 
     return;
   }
@@ -73,7 +73,7 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
     const QVector<Type> allowedTypes = firingUnitValidator->artilleryParticipantTypes();
 
     m_ui->cbTypeClass->setDisabled(true);
-    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedTypes.at(0).typeClass().underlying()));
+    m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedTypes.at(0).typeClass)));
 
     QSignalBlocker typeSignalBlocker(m_ui->cbType);
 
@@ -83,20 +83,20 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
     std::function<bool(Type)> funcIsSameGearType = [=](const Type &t)
     {
       if (m_isAdler)
-        return m_dtc->isAdlerType(t.id()) && (firingUnitValidator->getGearClassType(t.id()) == unitGearClassType);
-      return firingUnitValidator->getGearClassType(t.id()) == unitGearClassType;
+        return m_dtc->isAdlerType(t.id) && (static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType);
+      return static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType;
     };
     QVector<Type>::ConstIterator typeIterator = std::find_if(allowedTypes.begin(), allowedTypes.end(), funcIsSameGearType);
 
     if(typeIterator != allowedTypes.end())
     {
       m_ui->cbType->setDisabled(true);
-      m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name()), typeIterator->id());
+      m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name), typeIterator->id);
     }
     else
     {
       for (const Type &currentType : allowedTypes)
-        m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name()), currentType.id());
+        m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name), currentType.id);
       m_ui->cbType->model()->sort(0);
     }
 
@@ -149,15 +149,15 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
 
 void ParticipantTemplateEditItemWidget::setData()
 {
-  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
-  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
+  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
+  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
 
-  Type type = m_dtc->type(m_editData.typeId());
-  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(type.typeClass().underlying()));
-  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id()));
+  Type type = m_dtc->type(m_editData.typeId);
+  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(type.typeClass)));
+  m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id));
 
   
-  m_ui->sbEquipNr->setValue(m_editData.equipmentNumber());
+  m_ui->sbEquipNr->setValue(m_editData.equipmentNumber);
 
   
   m_ui->cbExternal->hide();
@@ -165,27 +165,27 @@ void ParticipantTemplateEditItemWidget::setData()
   m_ui->lblExternal->hide();
 
   
-  onChangeSymbol(QString::fromStdString(m_editData.symbol()));
+  onChangeSymbol(QString::fromStdString(m_editData.symbol));
 }
 
 void ParticipantTemplateEditItemWidget::setDesignatorData()
 {
-  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
-  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
+  m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
+  m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
 }
 
 void ParticipantTemplateEditItemWidget::onAddItem()
 {
   ParticipantManagement::TemplateData newTemplateParticipant;
-  newTemplateParticipant.designator() = m_ui->leDesignator->text().toStdString();
-  newTemplateParticipant.tacticalIdentifier() = m_ui->leTactIdent->text().toStdString();
-  newTemplateParticipant.symbol(m_sidc.toStdString());
-  newTemplateParticipant.typeId(m_ui->cbType->currentData().toInt());
+  newTemplateParticipant.designator = m_ui->leDesignator->text().toStdString();
+  newTemplateParticipant.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
+  newTemplateParticipant.symbol = m_sidc.toStdString();
+  newTemplateParticipant.typeId = m_ui->cbType->currentData().toInt();
 
   const int equipNo = m_ui->sbEquipNr->value();
   if (!checkEquipNo(equipNo))
     return;
-  newTemplateParticipant.equipmentNumber(equipNo);
+  newTemplateParticipant.equipmentNumber = equipNo;
 
   DEBUG_LOG(m_logger) << "adding item: " << newTemplateParticipant;
   emit addItem(m_workingIndex, newTemplateParticipant);
@@ -196,16 +196,16 @@ void ParticipantTemplateEditItemWidget::onAddItem()
 
 bool ParticipantTemplateEditItemWidget::onEditItem()
 {
-  m_editData.designator() = m_ui->leDesignator->text().toStdString();
-  m_editData.tacticalIdentifier() = m_ui->leTactIdent->text().toStdString();
-  m_editData.symbol(m_sidc.toStdString());
-  m_editData.typeId(m_ui->cbType->currentData().toInt());
+  m_editData.designator = m_ui->leDesignator->text().toStdString();
+  m_editData.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
+  m_editData.symbol = m_sidc.toStdString();
+  m_editData.typeId = m_ui->cbType->currentData().toInt();
 
   
   const int equipNo = m_ui->sbEquipNr->value();
   if (!checkEquipNo(equipNo))
     return false;
-  m_editData.equipmentNumber(equipNo);
+  m_editData.equipmentNumber = equipNo;
 
   DEBUG_LOG(m_logger) << "edit item: " << m_editData;
   emit updateItem(m_workingIndex, m_editData);
@@ -223,7 +223,7 @@ bool ParticipantTemplateEditItemWidget::checkEquipNo(int equipNo)
       m_ui->lbMinMaxEquipNr->setText(QStringLiteral("<span style=\"color:#aa0000;\">%1</span>").arg(equipNo));
       return false;
     }
-    if (m_editData.equipmentNumber() != equipNo)
+    if (m_editData.equipmentNumber != equipNo)
     {
       
       if (m_usedEquipmentNumbers.contains(equipNo))
@@ -280,7 +280,7 @@ bool ParticipantTemplateEditItem::init(const QModelIndex &workingIndex,
   layout->addWidget(m_buttonBox);
   setLayout(layout);
 
-  if (data.typeId() > 0)
+  if (data.typeId > 0)
   {
     m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, m_editItemWidget, &ParticipantTemplateEditItemWidget::onEditItem);
     m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setText(tr("Apply"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
index 139b001a3..b780bf0df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
@@ -39,7 +39,7 @@ public:
   bool onEditItem() override;
 
 protected:
-  int editTypeId() const override { return m_editData.typeId(); }
+  int editTypeId() const override { return m_editData.typeId; }
   int currentPartyId() const override { return 0; }
 
   bool checkEquipNo(int equipNo);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
index b4830a2d8..67d1612bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
@@ -4,6 +4,7 @@
 #include "participant_template_edit_model.h"
 #include <utility>
 #include <ParticipantManagement/ppm_translation.h>
+#include <ParticipantManagement/logger.h>
 #include "participant_firing_unit_validator.h"
 #include <nglwidgets/ngltreeitem.h>
 #include <QtCore/QSet>
@@ -12,18 +13,18 @@ namespace ParticipantManagement
 {
 QDataStream &operator<<(QDataStream &ds, const TemplateData &td)
 {
-  ds << td.templateId()
-     << td.hierarchyNumber()
-     << td.equipmentNumber()
-     << td.typeId()
-     << QString::fromStdString(td.symbol())
-     << QString::fromStdString(td.name())
-     << QString::fromStdString(td.designator())
-     << QString::fromStdString(td.tacticalIdentifier())
-     << QString::fromStdString(td.info())
-     << td.modId()
-     << td.superiorModId()
-     << td.isDeleted();
+  ds << td.templateId
+     << td.hierarchyNumber
+     << td.equipmentNumber
+     << td.typeId
+     << QString::fromStdString(td.symbol)
+     << QString::fromStdString(td.name)
+     << QString::fromStdString(td.designator)
+     << QString::fromStdString(td.tacticalIdentifier)
+     << QString::fromStdString(td.info)
+     << td.modId
+     << td.superiorModId
+     << td.isDeleted;
 
   return ds;
 }
@@ -46,17 +47,17 @@ QDataStream &operator>>(QDataStream &ds, TemplateData &td)
       >> superiorModId
       >> isDeleted;
 
-  td.templateId(templateId);
-  td.equipmentNumber(equipmentNumber);
-  td.typeId(typeId);
-  td.symbol(symbol.toStdString());
-  td.name(name.toStdString());
-  td.designator(designator.toStdString());
-  td.tacticalIdentifier(tacticalIdentifier.toStdString());
-  td.info(info.toStdString());
-  td.modId(modId);
-  td.superiorModId(superiorModId);
-  td.isDeleted(isDeleted);
+  td.templateId = templateId;
+  td.equipmentNumber = equipmentNumber;
+  td.typeId = typeId;
+  td.symbol = symbol.toStdString();
+  td.name = name.toStdString();
+  td.designator = designator.toStdString();
+  td.tacticalIdentifier = tacticalIdentifier.toStdString();
+  td.info = info.toStdString();
+  td.modId = modId;
+  td.superiorModId = superiorModId;
+  td.isDeleted = isDeleted;
 
   return ds;
 }
@@ -78,7 +79,7 @@ ParticipantTemplateEditModel::ParticipantTemplateEditModel(QObject *parent,
 {
   connect(this, &ParticipantTemplateEditModel::signalDataDropped,
           this, &ParticipantTemplateEditModel::internalDataChanged);
-  qRegisterMetaTypeStreamOperators<ParticipantManagement::TemplateData>();
+  qRegisterMetaType<ParticipantManagement::TemplateData>();
   setMimeType(QStringLiteral("ParticipantTemplateEditModel_%1").arg(qlonglong(this)));
 
   init();
@@ -97,19 +98,19 @@ QVariant ParticipantTemplateEditModel::data(const QModelIndex &index, int role)
     switch (index.column())
     {
     case ColDesignator:
-      return QString::fromStdString(templateData.designator());
+      return QString::fromStdString(templateData.designator);
     case ColIdentifier:
-      return QString::fromStdString(templateData.tacticalIdentifier());
+      return QString::fromStdString(templateData.tacticalIdentifier);
     case ColTypeClass:
-      return typeClassStringFromTypeId(templateData.typeId());
+      return typeClassStringFromTypeId(templateData.typeId);
     case ColType:
-      return ParticipantManagement::trTypeName(m_types.value(templateData.typeId()).name());
+      return ParticipantManagement::trTypeName(m_types.value(templateData.typeId).name);
     case ColEquipmentNumber:
-      if (templateData.equipmentNumber() != 0)
-        return templateData.equipmentNumber();
+      if (templateData.equipmentNumber != 0)
+        return templateData.equipmentNumber;
       return QVariant();
     case ColTemplateId:
-      return templateData.templateId();
+      return templateData.templateId;
     }
   }
   return NGLTreeModel::data(index, role);
@@ -143,15 +144,15 @@ std::vector<TemplateData> ParticipantTemplateEditModel::getChildrenOf(NGLTreeIte
 
   std::vector<TemplateData> ret;
   ParticipantManagement::TemplateData templateData = item->data().value<ParticipantManagement::TemplateData>();
-  templateData.superiorModId(parentId);
-  templateData.hierarchyNumber(hierarchyNumber);
-  if (templateData.modId() == 0)
-    templateData.modId(++highestModId);
+  templateData.superiorModId = parentId;
+  templateData.hierarchyNumber = hierarchyNumber;
+  if (templateData.modId == 0)
+    templateData.modId = ++highestModId;
 
   
   for (int i = 0; i < item->childCount(); i++)
   {
-    const auto c = getChildrenOf(item->child(i), templateData.modId(), i + 1, bOnlyModified, highestModId);
+    const auto c = getChildrenOf(item->child(i), templateData.modId, i + 1, bOnlyModified, highestModId);
     ret.insert(ret.end(), c.begin(), c.end());
   }
 
@@ -165,8 +166,8 @@ std::vector<TemplateData> ParticipantTemplateEditModel::getChildrenOf(NGLTreeIte
 
 bool ParticipantTemplateEditModel::onInsertRow(const QModelIndex &parent, ParticipantManagement::TemplateData templateData)
 {
-  templateData.templateId(0); 
-  templateData.modId(0); 
+  templateData.templateId = 0; 
+  templateData.modId = 0; 
 
   QVariant data;
   data.setValue(templateData);
@@ -186,7 +187,7 @@ bool ParticipantTemplateEditModel::onUpdateRow(const QModelIndex &index, const P
   data.setValue(templateData);
   NGLTreeItem *item = privateData(index);
   item->setIcon(QIcon());
-  tryRenderSymbol(QString::fromStdString(templateData.symbol()), item);
+  tryRenderSymbol(QString::fromStdString(templateData.symbol), item);
 
   emit internalDataChanged();
   return setItemData(index, data, item->icon());
@@ -201,9 +202,9 @@ bool ParticipantTemplateEditModel::onDeleteRow(const QModelIndex &idx, bool isFi
   {
     NGLTreeItem *item = privateData(idx);
     ParticipantManagement::TemplateData data = item->data().value<ParticipantManagement::TemplateData>();
-    if (data.modId() != 0) 
+    if (data.modId != 0) 
     {
-      data.isDeleted(true);
+      data.isDeleted = true;
       m_dataToDelete.append(data);
     }
   }
@@ -238,7 +239,7 @@ std::vector<ParticipantManagement::TemplateData> ParticipantTemplateEditModel::t
   {
     
     for (auto &templ : templateDatas)
-      templ.templateId(0);
+      templ.templateId = 0;
   }
   else
   {
@@ -268,8 +269,8 @@ QSet<int> ParticipantTemplateEditModel::usedEquipmentNumbers(NGLTreeItem *item)
 {
   QSet<int> ret;
   const TemplateData data = item->data().value<ParticipantManagement::TemplateData>();
-  if (data.equipmentNumber() != 0)
-    ret += data.equipmentNumber();
+  if (data.equipmentNumber != 0)
+    ret += data.equipmentNumber;
 
   for (int i = 0; i < item->childCount(); ++i)
     ret += usedEquipmentNumbers(item->child(i));
@@ -308,7 +309,7 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
     return false;
 
   const TemplateData &parentItem = getTemplateData(parent);
-  if (!isUnitType(parentItem.typeId()))
+  if (!isUnitType(parentItem.typeId))
     return false;
 
   DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
@@ -337,16 +338,16 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
 
       if (restrictions.testFlag(FiringUnitValidator::ONLY_SAME_GEAR_CLASS_ARTILLERY_ALLOWED))
       {
-        if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem.typeId(), pdSource.typeId()))
+        if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem.typeId, pdSource.typeId))
           return false;
 
-        if (m_firingUnitValidator->isArtilleryUnit(parentItem.typeId()) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId()))
+        if (m_firingUnitValidator->isArtilleryUnit(parentItem.typeId) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId))
           return false;
       }
 
       if (restrictions.testFlag(FiringUnitValidator::NO_ARTILLERY_PARTICIPANTS_ALLOWED))
       {
-        if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId()))
+        if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId))
           return false;
       }
 
@@ -354,10 +355,10 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
       {
         const Type allowedType = m_firingUnitValidator->getAllowedType(this, parent);
 
-        if (pdSource.typeId() != allowedType.id())
+        if (pdSource.typeId != allowedType.id)
           return false;
 
-        if (m_dtc->isAdlerVerbund(pdSource.typeId()))
+        if (m_dtc->isAdlerVerbund(pdSource.typeId))
           return false;
       }
     }
@@ -383,20 +384,20 @@ bool ParticipantTemplateEditModel::onInsertTemplate(int rootId,
   for (const ParticipantManagement::TemplateParticipant &tmpl : std::as_const(templateMap))
   {
     
-    if (!tmpl.templateId())
+    if (!tmpl.templateId)
       continue;
     
-    parentId2id[tmpl.superiorTemplateId()] += tmpl.templateId();
+    parentId2id[tmpl.superiorTemplateId] += tmpl.templateId;
 
     auto data = m_dtc->convertFromParticipantTemplateToTemplateData(tmpl);
     if (asCopy)
     {
-      data.templateId(0);
-      data.modId(0);
+      data.templateId = 0;
+      data.modId = 0;
     }
-    if (usedEquipNo.contains(data.equipmentNumber()))
-      data.equipmentNumber(0);
-    tmap.insert(tmpl.templateId(), data);
+    if (usedEquipNo.contains(data.equipmentNumber))
+      data.equipmentNumber = 0;
+    tmap.insert(tmpl.templateId, data);
   }
 
   NGLTreeItem *root = parentIndex.isValid() ? privateData(parentIndex) : m_rootItem;
@@ -430,16 +431,16 @@ void ParticipantTemplateEditModel::insertChildrenOf(int parentId,
     const int templateId = it.key();  
     const TemplateData &data = it.value();
 
-    if (data.hierarchyNumber() <= 0)
+    if (data.hierarchyNumber <= 0)
     {
-      WARNING_LOG(m_logger) << "Invalid / no hierarchy number set for participant " << data.templateId() << " - ignoring";
+      WARNING_LOG(m_logger) << "Invalid / no hierarchy number set for participant " << data.templateId << " - ignoring";
       continue;
     }
-    auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
+    auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
     const int insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
 
     NGLTreeItem *childItem = createItem(QVariant::fromValue(data), QIcon());
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.templateId() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.templateId << ", " << data.hierarchyNumber
                         << ") to parent " << parent << " at pos " << insertPos;
     insertRow(insertPos, parentIdx, childItem);
     const QModelIndex childIdx = index(insertPos, 0, parentIdx);
@@ -452,11 +453,11 @@ NGLTreeItem *ParticipantTemplateEditModel::createItem(const QVariant &data, cons
 {
   auto ret = NGLTreeModel::createItem(data, icon);
   const TemplateData templateData = data.value<TemplateData>();
-  if (templateData.symbol().size() != 0)
+  if (templateData.symbol.size() != 0)
   {
     ParticipantTemplateEditModel *that = const_cast<ParticipantTemplateEditModel*>(this);
     
-    that->tryRenderSymbol(QString::fromStdString(templateData.symbol()), ret);
+    that->tryRenderSymbol(QString::fromStdString(templateData.symbol), ret);
   }
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
index ecead00e6..f80708a35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
@@ -40,7 +40,7 @@ bool ParticipantTimePointModel::onReinitModel(int partyId, const QSet<int> &chec
     return true;
 
   m_partyId = partyId;
-  m_partyColor = QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color()));
+  m_partyColor = QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color));
 
   m_checkedParticipantsTimepointModel = checkedParticipants;
   m_csTimePointModel = cs;
@@ -52,8 +52,8 @@ bool ParticipantTimePointModel::onReinitModel(int partyId, const QSet<int> &chec
 void ParticipantTimePointModel::startRequest()
 {
   ParticipantManagement::GetParticipantsRequest req;
-  req.partyId(partyId());
-  req.timeStamp(m_currentTimePoint);
+  req.partyId = partyId();
+  req.timeStamp = m_currentTimePoint;
 
   m_requestHelper.startSingleRequest([this, req]() { return m_ppmFtc->getParticipantsRequest(req, this); });
 }
@@ -66,21 +66,21 @@ void ParticipantTimePointModel::onGetParticipantsReply(const GetParticipantsRepl
 
   QHash<int, ParticipantData> tmap;
   QHash<int, QSet<int>> parentId2id;
-  tmap.reserve(reply.participants().size());
-  parentId2id.reserve(reply.participants().size());
+  tmap.reserve(reply.participants.size());
+  parentId2id.reserve(reply.participants.size());
 
-  for (const auto &part : reply.participants())
+  for (const auto &part : reply.participants)
   {
-    if (part.isDeleted())
+    if (part.isDeleted)
       continue;
 
-    if (part.partyId() != m_partyId)
+    if (part.partyId != m_partyId)
       continue;
 
     
-    parentId2id[part.superiorId()] += part.id();
+    parentId2id[part.superiorId] += part.id;
 
-    tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
+    tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
   };
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
index e418123bb..94797c572 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
@@ -53,14 +53,14 @@ bool ParticipantTreeEditHandler::isContainer() const
   const QModelIndex idx = selectedIndexView();
   if (!idx.isValid())
     return false;
-  const int typeId = m_model->privateData(idx)->participant.typeId();
+  const int typeId = m_model->privateData(idx)->participant.typeId;
   if (typeId <= 0)
     return false;
 
   if (m_asSupportService)
-    return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
+    return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::SupportUnit;
 
-  return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
+  return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::Unit;
 }
 
 QVector<int> ParticipantTreeEditHandler::usedEquipmentNumbers() const
@@ -128,8 +128,8 @@ void ParticipantTreeEditHandler::partyHasChanged(int newPartyId, bool keepExpand
 bool ParticipantTreeEditHandler::onApplyChanges()
 {
   ModifyParticipantDataRequest req;
-  req.data(m_model->participantData());
-  if (req.data().size() == 0)
+  req.data = m_model->participantData();
+  if (req.data.size() == 0)
     return true;
 
   if (!m_requestHelper)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.h
index 7df479846..043025cd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.h
@@ -9,6 +9,7 @@
 #include <ppmcommon_export.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
index 235bcc1f6..89fc4d8c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
@@ -12,7 +12,7 @@ namespace ParticipantManagement
 
 static ProjectDataManagement::VulnerabilityClass vulnerabilityClassFromTypeClass(TypeClass tc)
 {
-  switch (tc.underlying())
+  switch (tc)
   {
   case TypeClass::Human:
     return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries;
@@ -54,7 +54,7 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
   const bool hasVulnerabilityStateTemporarySeverance = ps->value(QStringLiteral("ppm"),
                                                                  QStringLiteral("hasVulnerabilityStateTemporarySeverance")).toBool();
 
-  switch (tc.underlying())
+  switch (tc)
   {
   case TypeClass::Human:
   {
@@ -128,7 +128,7 @@ QVector<ProjectDataManagement::OcCode> ocCodeForTypeClass(TypeClass tc)
   const bool hasOcCodeOptimalTreatment = ps->value(QStringLiteral("ppm"),
                                                    QStringLiteral("hasOcCodeOptimalTreatment")).toBool();
 
-  switch (tc.underlying())
+  switch (tc)
   {
   case TypeClass::Human:
   {
@@ -165,12 +165,12 @@ void insertVulnerabilityStates(QComboBox *cbx, TypeClass tc)
   VulnerabilityClass cls = vulnerabilityClassFromTypeClass(tc);
   const auto vec = vulnerabilityStatesForTypeClass(tc);
   for (const auto vs : vec)
-    cbx->addItem(toString(vs, cls), vs.underlying());
+    cbx->addItem(toString(vs, cls), static_cast<int>(vs));
 
   
   const auto ocVec = ocCodeForTypeClass(tc);
   for (const auto vs : ocVec)
-    cbx->addItem(toString(vs), vs.underlying()+100);
+    cbx->addItem(toString(vs), static_cast<int>(vs)+100);
 }
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.h
index 07a80e554..d9eee7554 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.h
@@ -10,6 +10,7 @@
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 class Ui_MSDLExport;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
index 15f9be69f..48e450d1b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
@@ -13,6 +13,7 @@
 
 #include <memory>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp
index 59a046a69..0307a93b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp
@@ -49,7 +49,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
   }
 
   for (const auto &typeclass : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass.underlying());
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
 
   slotClassTypeChanged();
 
@@ -72,7 +72,7 @@ void MappingDialog::slotClassTypeChanged()
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (type.typeClass().underlying() != currentClass)
+    if (type.typeClass() != currentClass)
       continue;
 
     if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.h
index 84e6d1fa4..fbf1a5eed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
 
 class Ui_MSDLMappingDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_gui_plugin.h
index 5c8251c54..f484dacc5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_gui_plugin.h
@@ -5,6 +5,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
index 7c75885d0..d5f8a5ea6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
@@ -23,6 +23,7 @@ ParticipantShow::ParticipantShow(LtsSession::LtsSession *session,
   , m_session(session)
   , m_model(nullptr)
   , m_ui(new Ui::ParticipantShow)
+  , m_logger(getLogger("ParticipantShow"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_edit_gui_plugin.h
index 0b335191c..f27be5b91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_edit_gui_plugin.h
@@ -5,6 +5,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.cpp
index 008eef29f..115d6fb70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.cpp
@@ -12,6 +12,7 @@ PartyModel::PartyModel(QObject *parent)
   : LtsWidgets::LtsAbstractTableModel<PartyData>({tr("Id"),
                                                   tr("Name")}, parent)
   , m_dtc(nullptr)
+  , m_logger(getLogger("PartyModel"))
 {}
 
 bool PartyModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.h
index 74a9e1367..30f5345e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm_translation.h>
 
@@ -18,8 +19,8 @@ struct PartyData
   QString name;
   PartyData() = default;
   explicit PartyData(const ParticipantManagement::Party &p)
-    : id(p.id())
-    , name(ParticipantManagement::trPartyName(p.name()))
+    : id(p.id)
+    , name(ParticipantManagement::trPartyName(p.name))
   {}
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
index 9745e106a..adaab1afc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
@@ -22,6 +22,7 @@ PartyView::PartyView(const QString &menuGroup, LtsSession::LtsSession *session,
   , m_ftc(nullptr)
   , m_session(session)
   , m_ui(new Ui::PartyView)
+  , m_logger(getLogger("PartyView"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.cpp
index cd4fc918f..e9d5b5c5f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.cpp
@@ -13,6 +13,7 @@ ParticipantPlanningModel::ParticipantPlanningModel(QObject *parent,
                                                    const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                                                    const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc)
   : ParticipantManagement::ParticipantEditModel(parent, ppmDtc, asbIfc)
+  , m_logger(getLogger("ParticipantPlanningModel"))
 {
   m_titles += tr("Hierarchy");
 
@@ -25,7 +26,7 @@ QVariant ParticipantPlanningModel::data(const QModelIndex &index, int role) cons
   const ParticipantManagement::ParticipantData &participantData = item->participant;
 
   if (role == Qt::DisplayRole && index.column() == columnCount() - 1)
-    return m_dtc->hierarchyFromParticipant(participantData.id());
+    return m_dtc->hierarchyFromParticipant(participantData.id);
 
   return ParticipantManagement::ParticipantEditModel::data(index, role);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
index f31031508..b61825259 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
@@ -41,6 +41,7 @@ ParticipantEdit::ParticipantEdit(LtsSession::LtsSession *session, bool asSupport
     , m_pbTreeViewDummy(new QPushButton(m_pbTreeView->text()))
     , m_pbTableViewDummy(new QPushButton(m_pbTableView->text()))
     , m_ui(new Ui::ParticipantEdit)
+  , m_logger(getLogger("ParticipantEdit"))
 {
   m_ui->setupUi(this);
 
@@ -318,7 +319,7 @@ void ParticipantEdit::onEnaDisa()
   bool enableRemove = false;
   if (m_pTreehandler->isSelectedIndexValid())
   {
-    if (m_dtc->isAdlerVerbund(m_pTreehandler->getSelectedData().typeId()))
+    if (m_dtc->isAdlerVerbund(m_pTreehandler->getSelectedData().typeId))
     {
       DEBUG_LOG(m_logger) << "Can't Edit Adler SAA Participants";
       enableEdit = true;
@@ -349,8 +350,8 @@ void ParticipantEdit::onAddItem()
   ParticipantEditItem *newItemDlg = new ParticipantEditItem(m_asSupportService, m_session, this);
   ParticipantManagement::ParticipantData dataAll = m_pTreehandler->getSelectedData();
   ParticipantData data = ParticipantData();
-  data.designator(dataAll.designator());
-  data.tacticalIdentifier(dataAll.tacticalIdentifier());
+  data.designator = dataAll.designator;
+  data.tacticalIdentifier = dataAll.tacticalIdentifier;
   const bool addItem = true;
   newItemDlg->setAttribute(Qt::WA_DeleteOnClose);
 
@@ -377,7 +378,7 @@ void ParticipantEdit::onAddItem()
   {
 
     newItemDlg->setIsAdler(m_firingUnitValidator->isAdler(m_model, workingIndex));
-    const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, workingIndex);
+    const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, workingIndex));
 
     newItemDlg->setFiringUnitRestrictions(m_model, false, m_firingUnitValidator->getRestrictions(m_model, workingIndex), m_firingUnitValidator, unitGearClassType);
 
@@ -403,7 +404,7 @@ void ParticipantEdit::onEditItem()
     return;
 
   ParticipantManagement::ParticipantData data = m_pTreehandler->getSelectedData();
-  if (data.isSimulated())
+  if (data.isSimulated)
     showIsSimulated();
 
   m_newItemDlg = new ParticipantEditItem(m_asSupportService, m_session, this);
@@ -429,7 +430,7 @@ void ParticipantEdit::onEditItem()
 
   if (m_firingUnitValidator)
   {
-    const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, workingIndex);
+    const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, workingIndex));
     m_newItemDlg->setFiringUnitRestrictions(m_model, true, m_firingUnitValidator->getRestrictions(m_model, workingIndex), m_firingUnitValidator, unitGearClassType);
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.cpp
index 6d75ded83..4d12c27d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.cpp
@@ -30,7 +30,7 @@ ParticipantOrgaModel::ParticipantOrgaModel(PartyOrganisationType orgType,
 {
   connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::participantOrganisationChanged,
           this, &ParticipantOrgaModel::onParticipantOrganisationChanged);
-  m_dtc->participantOrganisations([this](const ParticipantOrganisation &org) { m_participantOrganization[org.participantId()] = org;});
+  m_dtc->participantOrganisations([this](const ParticipantOrganisation &org) { m_participantOrganization[org.participantId] = org;});
 }
 
 QVariant ParticipantOrgaModel::data(const QModelIndex &index, int role) const
@@ -45,10 +45,10 @@ QVariant ParticipantOrgaModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ColDescription:
-      return QVariant(QString::fromStdString(participantData.designator()) + QLatin1Char('/') +
-                      QString::fromStdString(participantData.tacticalIdentifier()));
+      return QVariant(QString::fromStdString(participantData.designator) + QLatin1Char('/') +
+                      QString::fromStdString(participantData.tacticalIdentifier));
     case ColParticipantId:
-      return participantData.id();
+      return participantData.id;
     }
 
   }
@@ -104,17 +104,17 @@ QMimeData *ParticipantOrgaModel::mimeData(const QModelIndexList &indexes) const
   }
 
   const ParticipantData data = privateData(idx)->data().value<ParticipantManagement::ParticipantData>();
-  if (data.id() == 0)
+  if (data.id == 0)
     return nullptr;
   if (m_orgType == PartyOrganisationType::Detached)
   {
     
-    auto it = m_participantOrganization.find(data.id());
-    if (it != m_participantOrganization.end() && it.value().currentPartyId() != 0)
+    auto it = m_participantOrganization.find(data.id);
+    if (it != m_participantOrganization.end() && it.value().currentPartyId != 0)
       return nullptr;
   }
 
-  const QByteArray encodedData(QByteArray::number(data.id()));
+  const QByteArray encodedData(QByteArray::number(data.id));
   QMimeData *mimeData = new QMimeData;
   switch (m_orgType)
   {
@@ -159,7 +159,7 @@ bool ParticipantOrgaModel::canDropMimeData(const QMimeData *data, Qt::DropAction
     {
       auto it = m_participantOrganization.find(participantId);
       if (it != m_participantOrganization.end() &&
-          it.value().originPartyId() == m_partyId)
+          it.value().originPartyId == m_partyId)
         return false;
     }
   }
@@ -209,8 +209,8 @@ bool ParticipantOrgaModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
     return false;
   }
   
-  movedParticipants[0].superiorId(0);
-  movedParticipants[0].hierarchyNumber(1);
+  movedParticipants[0].superiorId = 0;
+  movedParticipants[0].hierarchyNumber = 1;
   int rootParticipantId = 0;
   NGLTreeItem *rootItem = m_rootItem;
   QModelIndex rootModelIndex;
@@ -224,15 +224,15 @@ bool ParticipantOrgaModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
     if (!item->data().canConvert<ParticipantManagement::ParticipantData>())
       return false;
     const ParticipantManagement::ParticipantData participantData = item->data().value<ParticipantManagement::ParticipantData>();
-    if (participantData.id() == 0)
+    if (participantData.id == 0)
       return false;
 
-    rootParticipantId = participantData.id();
+    rootParticipantId = participantData.id;
     rootItem = item;
     rootModelIndex = parent;
 
-    movedParticipants[0].superiorId(rootParticipantId);
-    movedParticipants[0].hierarchyNumber(-1);
+    movedParticipants[0].superiorId = rootParticipantId;
+    movedParticipants[0].hierarchyNumber = -1;
   }
 
   DEBUG_LOG(m_logger) << "Drop: #movedParticipants: " << movedParticipants.size();
@@ -244,20 +244,20 @@ bool ParticipantOrgaModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
 
   for (const Participant &part : std::as_const(movedParticipants))
   {
-    if (part.isDeleted())
+    if (part.isDeleted)
       continue;
 
     
-    parentId2id[part.superiorId()] += part.id();
+    parentId2id[part.superiorId] += part.id;
 
-    tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
+    tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
   }
 
   
   insertChildrenOf(rootParticipantId, rootItem, rootModelIndex, parentId2id, tmap);
 
   
-  emit participantDataChanged(movedParticipants.at(0).id());
+  emit participantDataChanged(movedParticipants.at(0).id);
 
   return true;
 }
@@ -274,7 +274,7 @@ bool ParticipantOrgaModel::isParticipantType(int source_row, const QModelIndex &
   if (!childItem->data().canConvert<ParticipantManagement::ParticipantData>())
     return false;
   const ParticipantManagement::ParticipantData participantData = childItem->data().value<ParticipantManagement::ParticipantData>();
-  return !isUnitType(participantData.typeId());
+  return !isUnitType(participantData.typeId);
 }
 
 QVector<Participant> ParticipantOrgaModel::inferiorParticipants(int partId) const
@@ -283,9 +283,9 @@ QVector<Participant> ParticipantOrgaModel::inferiorParticipants(int partId) cons
 
   const Participant participant = m_dtc->participant(partId);
 
-  retVector.reserve(participant.inferiorIds().size() + retVector.size() + 1);
+  retVector.reserve(participant.inferiorIds.size() + retVector.size() + 1);
   retVector.append(participant);
-  for (int inferiorId : participant.inferiorIds())
+  for (int inferiorId : participant.inferiorIds)
     retVector.append(inferiorParticipants(inferiorId));
 
   return retVector;
@@ -298,14 +298,14 @@ QVector<ParticipantData> ParticipantOrgaModel::getChildrenOf(NGLTreeItem *parent
     return ret;
 
   ParticipantManagement::ParticipantData participantData = parentItem->data().value<ParticipantManagement::ParticipantData>();
-  participantData.superiorModId(parentId);
-  participantData.hierarchyNumber(hierarchyNumber);
-  if (participantData.modId() == 0)
-    participantData.modId(++highestModId);
+  participantData.superiorModId = parentId;
+  participantData.hierarchyNumber = hierarchyNumber;
+  if (participantData.modId == 0)
+    participantData.modId = ++highestModId;
   ret += participantData;
 
   for (int i = 0; i < parentItem->childCount(); i++)
-    ret.append(getChildrenOf(parentItem->child(i), participantData.modId(), i + 1, highestModId));
+    ret.append(getChildrenOf(parentItem->child(i), participantData.modId, i + 1, highestModId));
 
   return ret;
 }
@@ -321,7 +321,7 @@ QVector<ParticipantData> ParticipantOrgaModel::participantData(int partyId) cons
     ret += getChildrenOf(rootKnot, 0, 1, modId);
   }
   for (int i = 0; i < ret.size(); ++i)
-    ret[i].partyId(partyId);
+    ret[i].partyId = partyId;
 
   return ret;
 }
@@ -335,9 +335,9 @@ QVector<int> ParticipantOrgaModel::rootParticipantIds() const
     const NGLTreeItem *rootKnot = m_rootItem->child(i);
     const ParticipantManagement::ParticipantData participantData = rootKnot->data().value<ParticipantManagement::ParticipantData>();
     
-    if (participantData.id() == 0)
+    if (participantData.id == 0)
       continue;
-    ret += participantData.id();
+    ret += participantData.id;
   }
   return ret;
 }
@@ -347,8 +347,8 @@ void ParticipantOrgaModel::onReinitModel(int partyId)
 {
   m_partyId = partyId;
   const ParticipantManagement::Party &party = m_dtc->party(m_partyId);
-  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role());
-  m_partyColor = QColor::fromRgb(QRgb(party.color()));
+  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role);
+  m_partyColor = QColor::fromRgb(QRgb(party.color));
   m_symbolResultMapping.clear();
 
   NGLTreeModel::resetModel();
@@ -357,19 +357,19 @@ void ParticipantOrgaModel::onReinitModel(int partyId)
   QHash<int, QSet<int>> parentId2id;
   auto cb = [this, &tmap, &parentId2id](const Participant & part)
   {
-    if (part.isDeleted())
+    if (part.isDeleted)
       return;
-    if (m_orgType != PartyOrganisationType::Detached && part.partyId() != m_partyId)
+    if (m_orgType != PartyOrganisationType::Detached && part.partyId != m_partyId)
       return;
-    if (m_orgType == PartyOrganisationType::Detached && part.partyId() == m_partyId)
+    if (m_orgType == PartyOrganisationType::Detached && part.partyId == m_partyId)
       return;
-    if (part.superiorId() == 0 && !isRootParticipantRelevant(part, m_partyId))
+    if (part.superiorId == 0 && !isRootParticipantRelevant(part, m_partyId))
       return;
 
     
-    parentId2id[part.superiorId()] += part.id();
+    parentId2id[part.superiorId] += part.id;
 
-    tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
+    tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
   };
   m_dtc->participants(cb);
 
@@ -383,10 +383,10 @@ void ParticipantOrgaModel::onParticipantOrganisationChanged(const ParticipantOrg
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_participantOrganization[data.participantId()] = data;
+    m_participantOrganization[data.participantId] = data;
     break;
   case DataModification::eRemoved:
-    m_participantOrganization.remove(data.participantId());
+    m_participantOrganization.remove(data.participantId);
     break;
   }
 }
@@ -410,9 +410,9 @@ void ParticipantOrgaModel::insertChildrenOf(int parentId,
     const ParticipantData &data = it.value();
 
     int insertPos = 0;
-    if (data.hierarchyNumber() > 0)
+    if (data.hierarchyNumber > 0)
     {
-      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
+      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
       insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
     }
     else
@@ -424,11 +424,11 @@ void ParticipantOrgaModel::insertChildrenOf(int parentId,
     }
 
     NGLTreeItem *childItem = createItem(QVariant::fromValue(data), QIcon());
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
                         << ") to parent " << parent << " at pos " << insertPos;
     insertRow(insertPos, parentIdx, childItem);
     const QModelIndex childIdx = index(insertPos, 0, parentIdx);
-    insertChildrenOf(data.id(), childItem, childIdx, parentId2id, tmap);
+    insertChildrenOf(data.id, childItem, childIdx, parentId2id, tmap);
   }
 }
 
@@ -452,20 +452,20 @@ QString ParticipantOrgaModel::headerFromOrganisationType(PartyOrganisationType o
 bool ParticipantOrgaModel::isRootParticipantRelevant(const Participant &participant, int partyId) const
 {
   
-  const int participantId = participant.id();
-  const int participantPartyId = participant.partyId();
+  const int participantId = participant.id;
+  const int participantPartyId = participant.partyId;
   const ParticipantOrganisation org = m_participantOrganization.value(participantId);
 
   switch (m_orgType)
   {
   case PartyOrganisationType::Party:
-    return participantPartyId == partyId && org.participantId() == 0;  
+    return participantPartyId == partyId && org.participantId == 0;  
   case PartyOrganisationType::Attached:
-    return participantPartyId == partyId && org.participantId() == participantId && org.isAttached();
+    return participantPartyId == partyId && org.participantId == participantId && org.isAttached;
   case PartyOrganisationType::Detached:
-    return org.participantId() == participantId && org.originPartyId() == partyId;
+    return org.participantId == participantId && org.originPartyId == partyId;
   case PartyOrganisationType::Cooperate:
-    return participantPartyId == partyId && org.participantId() == participantId && org.isCooperate();
+    return participantPartyId == partyId && org.participantId == participantId && org.isCooperate;
   }
   return false;
 }
@@ -474,11 +474,11 @@ NGLTreeItem *ParticipantOrgaModel::createItem(const QVariant &data, const QIcon
 {
   auto ret = NGLTreeModel::createItem(data, icon);
   const ParticipantData participantData = data.value<ParticipantData>();
-  if (participantData.symbol().size() != 0)
+  if (participantData.symbol.size() != 0)
   {
     ParticipantOrgaModel *that = const_cast<ParticipantOrgaModel*>(this);
     
-    that->tryRenderSymbol(QString::fromStdString(participantData.symbol()), ret);
+    that->tryRenderSymbol(QString::fromStdString(participantData.symbol), ret);
   }
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
index bc0bfd264..9cac687b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
@@ -6,6 +6,7 @@
 #include <ParticipantManagement/Gui/Common/participant_icon_model_base.h>
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QSet>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
index fd5970904..364243c53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
@@ -2,6 +2,7 @@
 
 
 #include "participant_organisation.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_participant_organisation.h"
 
 #include "participant_unit_namer.h"
@@ -38,6 +39,7 @@ ParticipantOrganisationDialog::ParticipantOrganisationDialog(LtsSession::LtsSess
   , m_session(session)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ParticipantOrganisation)
+  , m_logger(getLogger("ParticipantOrganisation"))
 {
   m_ui->setupUi(this);
   m_ui->splitter->setStretchFactor(0, 1);
@@ -232,16 +234,16 @@ void ParticipantOrganisationDialog::onPoolParticipantsChanged(const QVector<Part
     return;
 
   ModifyParticipantDataRequest req;
-  req.data(LtsUtils::convert<std::vector<ParticipantData>>(participants));
+  req.data = LtsUtils::convert<std::vector<ParticipantData>>(participants);
   
   if (originatorMimeType == ParticipantPartyAttached)
   {
     ParticipantOrganisation orga;
-    orga.participantId(participants.first().id());
-    orga.currentPartyId(0); 
-    orga.isAttached(false);
-    orga.isCooperate(false);
-    req.participantOrganisation(orga);
+    orga.participantId = participants.first().id;
+    orga.currentPartyId = 0; 
+    orga.isAttached = false;
+    orga.isCooperate = false;
+    req.participantOrganisation = orga;
   }
 
   saveParticipantData(req);
@@ -264,14 +266,14 @@ void ParticipantOrganisationDialog::onPartyParticipantsChanged(int addedParticip
     
     
     ParticipantOrganisation orga;
-    orga.participantId(addedParticipantId);
-    orga.originPartyId(curPartyId);
-    orga.currentPartyId(curPartyId);  
-    req.participantOrganisation(orga);
+    orga.participantId = addedParticipantId;
+    orga.originPartyId = curPartyId;
+    orga.currentPartyId = curPartyId;  
+    req.participantOrganisation = orga;
   }
 
   const QVector<ParticipantData> participantData = m_partyModel->participantData(curPartyId);
-  req.data(LtsUtils::convert<std::vector<ParticipantData>>(participantData));
+  req.data = LtsUtils::convert<std::vector<ParticipantData>>(participantData);
 
   saveParticipantData(req);
 }
@@ -284,14 +286,14 @@ void ParticipantOrganisationDialog::onAttachedParticipantsChanged(int addedParti
   
   ModifyParticipantDataRequest req;
   ParticipantOrganisation orga;
-  orga.participantId(addedParticipantId);
-  orga.currentPartyId(curPartyId); 
-  orga.isAttached(true);
-  orga.isCooperate(false);
-  req.participantOrganisation(orga);
+  orga.participantId = addedParticipantId;
+  orga.currentPartyId = curPartyId; 
+  orga.isAttached = true;
+  orga.isCooperate = false;
+  req.participantOrganisation = orga;
 
   const QVector<ParticipantData> attachedtData = m_attachedModel->participantData(curPartyId);  
-  req.data(LtsUtils::convert<std::vector<ParticipantData>>(attachedtData));
+  req.data = LtsUtils::convert<std::vector<ParticipantData>>(attachedtData);
 
   saveParticipantData(req);
 }
@@ -304,14 +306,14 @@ void ParticipantOrganisationDialog::onDetachedParticipantsChanged(int addedParti
   
   ModifyParticipantDataRequest req;
   ParticipantOrganisation orga;
-  orga.participantId(addedParticipantId);
-  orga.originPartyId(curPartyId);
-  orga.currentPartyId(0); 
-  req.participantOrganisation(orga);
+  orga.participantId = addedParticipantId;
+  orga.originPartyId = curPartyId;
+  orga.currentPartyId = 0; 
+  req.participantOrganisation = orga;
 
   const QVector<ParticipantData> participantData = m_partyModel->participantData(curPartyId);
   const QVector<ParticipantData> detachedtData = m_detachedModel->participantData(0);  
-  req.data(LtsUtils::convert<std::vector<ParticipantData>>(participantData + detachedtData));
+  req.data = LtsUtils::convert<std::vector<ParticipantData>>(participantData + detachedtData);
 
   saveParticipantData(req);
 }
@@ -323,14 +325,14 @@ void ParticipantOrganisationDialog::onCooperateParticipantsChanged(int addedPart
   
   ModifyParticipantDataRequest req;
   ParticipantOrganisation orga;
-  orga.participantId(addedParticipantId);
-  orga.currentPartyId(curPartyId); 
-  orga.isAttached(false);
-  orga.isCooperate(true);
-  req.participantOrganisation(orga);
+  orga.participantId = addedParticipantId;
+  orga.currentPartyId = curPartyId; 
+  orga.isAttached = false;
+  orga.isCooperate = true;
+  req.participantOrganisation = orga;
 
   const QVector<ParticipantData> attachedtData = m_cooperateModel->participantData(curPartyId);  
-  req.data(LtsUtils::convert<std::vector<ParticipantData>>(attachedtData));
+  req.data = LtsUtils::convert<std::vector<ParticipantData>>(attachedtData);
 
   saveParticipantData(req);
 }
@@ -342,7 +344,7 @@ void ParticipantOrganisationDialog::onStartTemplateUnitNamer(int templateId)
 {
   const TemplateParticipant tempPart = m_dtc->templateParticipant(templateId);
   
-  ParticipantUnitNamer *namer = new ParticipantUnitNamer(QString::fromStdString(tempPart.designator()), QString::fromStdString(tempPart.tacticalIdentifier()), this);
+  ParticipantUnitNamer *namer = new ParticipantUnitNamer(QString::fromStdString(tempPart.designator), QString::fromStdString(tempPart.tacticalIdentifier), this);
   connect(namer, &ParticipantUnitNamer::newUnitNames, this, [this, templateId](const QString & designator, const QString & tactIdentifer)
   {
     m_poolModel->addNewTemplateToPool(templateId, designator, tactIdentifer);
@@ -421,8 +423,8 @@ void ParticipantOrganisationDialog::showContextMenu(const QPoint &position)
 
 
 
-DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent)
+{
 }
 
 void DeleteDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
index fee7a6524..794f5331e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
@@ -28,6 +28,7 @@ ParticipantPoolModel::ParticipantPoolModel(QObject *parent,
   , AdvancedSymbology::TableModelSymbolRenderer<ParticipantPoolModel>(ColDesignatorIdentifier)
   , m_asSupportService(asSupportService)
   , m_dtc(dtc)
+  , m_logger(getLogger("ParticipantPoolModel"))
 {
   
   std::shared_ptr<AdvancedSymbology::ForeignDataInterface> asb;
@@ -42,8 +43,8 @@ ParticipantPoolModel::ParticipantPoolModel(QObject *parent,
   m_dtc->participantOrganisations([this](const ParticipantOrganisation &org) { onParticipantOrganisationChanged(org, DataModification::eAdded); });
 
   const ParticipantManagement::Party &party = m_dtc->party(poolPartyId());
-  setDefaultRoleAndColor(AdvancedSymbology::roleToRole<>(party.role()),
-                         QColor::fromRgb(QRgb(party.color())));
+  setDefaultRoleAndColor(AdvancedSymbology::roleToRole<>(party.role),
+                         QColor::fromRgb(QRgb(party.color)));
 }
 
 bool ParticipantPoolModel::canRemoveRow(int row) const
@@ -61,11 +62,11 @@ bool ParticipantPoolModel::removeRow(int row)
     return false;
   QVector<ParticipantData> datasToDelete;
   ParticipantManagement::ParticipantData dataToDelete = getRowData(row);
-  removeRenderedSymbol(dataToDelete.id());
+  removeRenderedSymbol(dataToDelete.id);
 
-  if (dataToDelete.id() != 0) 
+  if (dataToDelete.id != 0) 
   {
-    dataToDelete.isDeleted(true);
+    dataToDelete.isDeleted = true;
     datasToDelete.append(dataToDelete);
   }
 
@@ -83,21 +84,21 @@ QVariant ParticipantPoolModel::data(const QModelIndex &index, int role) const
 
   const ParticipantManagement::ParticipantData &participantData = m_vecData.at(index.row());
   if (role == Qt::DecorationRole)
-    return decorationData(index, participantData.id());
+    return decorationData(index, participantData.id);
 
   switch (index.column())
   {
   case ColRemove:
     break;
   case ColDesignatorIdentifier:
-    return QString(QString::fromStdString(participantData.designator()) + QLatin1Char('/') +
-                   QString::fromStdString(participantData.tacticalIdentifier()));
+    return QString(QString::fromStdString(participantData.designator) + QLatin1Char('/') +
+                   QString::fromStdString(participantData.tacticalIdentifier));
   case ColTypeClass:
-    return ParticipantManagement::toString(m_dtc->type(participantData.typeId()).typeClass());
+    return ParticipantManagement::toString(m_dtc->type(participantData.typeId).typeClass);
   case ColType:
-    return ParticipantManagement::trTypeName(m_dtc->type(participantData.typeId()).name());
+    return ParticipantManagement::trTypeName(m_dtc->type(participantData.typeId).name);
   case ColParticipantId:
-    return participantData.id();
+    return participantData.id;
   }
 
   return QVariant();
@@ -124,12 +125,12 @@ QMimeData *ParticipantPoolModel::mimeData(const QModelIndexList &indexes) const
     return nullptr;
 
   const ParticipantData &data = m_vecData.at(idx.row());
-  if (data.id() == 0)
+  if (data.id == 0)
     return nullptr;
 
-  const QByteArray encodedData(QByteArray::number(data.id()));
+  const QByteArray encodedData(QByteArray::number(data.id));
   QMimeData *mimeData = new QMimeData;
-  const QString mimeType = m_participantOrganization.contains(data.id()) ? ParticipantPoolDetached : ParticipantPoolRoot;
+  const QString mimeType = m_participantOrganization.contains(data.id) ? ParticipantPoolDetached : ParticipantPoolRoot;
   mimeData->setData(mimeType, encodedData);
   return mimeData;
 }
@@ -199,9 +200,9 @@ bool ParticipantPoolModel::onReinitModel()
 
   for (const ParticipantManagement::Participant &part : participantMap)
   {
-    if (part.superiorId() > 0 || part.partyId() != poolPartyId() || part.isDeleted())
+    if (part.superiorId > 0 || part.partyId != poolPartyId() || part.isDeleted)
       continue;
-    if (!isValidTypeClass(part.typeId()))
+    if (!isValidTypeClass(part.typeId))
       continue;
     insertRow(part);
   }
@@ -216,10 +217,10 @@ bool ParticipantPoolModel::addNewTemplateToPool(int id, const QString &designato
 
   
   TemplateParticipant &root = templateDatas[0];
-  root.superiorTemplateId(0);
-  root.hierarchyNumber(1);
-  root.designator(designator.toStdString());
-  root.tacticalIdentifier(tactIdentifier.toStdString());
+  root.superiorTemplateId = 0;
+  root.hierarchyNumber = 1;
+  root.designator = designator.toStdString();
+  root.tacticalIdentifier = tactIdentifier.toStdString();
 
 
   QVector<ParticipantManagement::ParticipantData> newPool;
@@ -236,10 +237,10 @@ bool ParticipantPoolModel::addNewTemplateToPool(int id, const QString &designato
 
 void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, DataModification modType)
 {
-  if (!isValidTypeClass(data.typeId()))
+  if (!isValidTypeClass(data.typeId))
     return;
 
-  if (data.isDeleted())
+  if (data.isDeleted)
     modType = DataModification::eRemoved;
 
   switch (modType)
@@ -248,17 +249,17 @@ void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, Dat
     for (int i = 0; i < m_vecData.size(); ++i)
     {
       const ParticipantData &part = m_vecData.at(i);
-      if (part.id() == data.id())
+      if (part.id == data.id)
       {
-        DEBUG_LOG(m_logger) << "Modifed participant " << data.id() << ", old party: " << part.partyId() << ", new: " << data.partyId();
+        DEBUG_LOG(m_logger) << "Modifed participant " << data.id << ", old party: " << part.partyId << ", new: " << data.partyId;
         
-        if (data.partyId() != poolPartyId())
+        if (data.partyId != poolPartyId())
         {
           
           
           
           
-          const int participantId = data.id();
+          const int participantId = data.id;
           QTimer::singleShot(100, this, [this, participantId]() { tryRemoveParticipantFromModel(participantId); });
         }
         else
@@ -271,16 +272,16 @@ void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, Dat
     
     Q_FALLTHROUGH();
   case DataModification::eAdded:
-    if (data.superiorId() != 0 && !m_participantOrganization.contains(data.id()))
+    if (data.superiorId != 0 && !m_participantOrganization.contains(data.id))
       return;
-    if (data.partyId() != poolPartyId())
+    if (data.partyId != poolPartyId())
       return;
     insertRow(data);
     break;
   case DataModification::eRemoved:
-    if (data.partyId() != poolPartyId())
+    if (data.partyId != poolPartyId())
       return;
-    tryRemoveParticipantFromModel(data.id());
+    tryRemoveParticipantFromModel(data.id);
     break;
   }
 }
@@ -291,10 +292,10 @@ void ParticipantPoolModel::onParticipantOrganisationChanged(const ParticipantOrg
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_participantOrganization[data.participantId()] = data;
+    m_participantOrganization[data.participantId] = data;
     break;
   case DataModification::eRemoved:
-    m_participantOrganization.remove(data.participantId());
+    m_participantOrganization.remove(data.participantId);
     break;
   }
 }
@@ -304,18 +305,18 @@ bool ParticipantPoolModel::moveFromPartyToPool(int rootParticipantId, const QStr
   ERROR_LOG(m_logger) << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
   
   const Participant part = m_dtc->participant(rootParticipantId);
-  const QVector<Participant> newParticipants = getSuperiorParticipants(part.id());
+  const QVector<Participant> newParticipants = getSuperiorParticipants(part.id);
   QVector<ParticipantData> dataToSend;
   dataToSend.reserve(newParticipants.size());
   for (const Participant &part : newParticipants)
   {
     ParticipantData data = m_dtc->convertParticipantToParticipantData(part);
-    data.partyId(poolPartyId());
-    if (data.id() == rootParticipantId)
+    data.partyId = poolPartyId();
+    if (data.id == rootParticipantId)
     {
       
-      data.superiorModId(0);
-      data.hierarchyNumber(1);
+      data.superiorModId = 0;
+      data.hierarchyNumber = 1;
     }
     dataToSend.append(data);
   }
@@ -333,7 +334,7 @@ QVector<Participant> ParticipantPoolModel::getSuperiorParticipants(int participa
   Participant part = m_dtc->participant(participantId);
   QVector<Participant> retParticipants;
   retParticipants.append(part);
-  for (auto const &inferierPart : part.inferiorIds())
+  for (auto const &inferierPart : part.inferiorIds)
     retParticipants.append(getSuperiorParticipants(inferierPart));
   return retParticipants;
 }
@@ -341,39 +342,39 @@ QVector<Participant> ParticipantPoolModel::getSuperiorParticipants(int participa
 bool ParticipantPoolModel::convertFromParticipantTemplateToParticipantData(const TemplateParticipant &inputParticipant, ParticipantData &outPutData)
 {
   
-  outPutData.assignState(ParticipantManagement::ParticipantAssignState::NotAssigned);
+  outPutData.assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
   
-  outPutData.id(0);
+  outPutData.id = 0;
 
-  outPutData.partyId(poolPartyId());
+  outPutData.partyId = poolPartyId();
 
   
-  if (inputParticipant.equipmentNumber() != 0)
+  if (inputParticipant.equipmentNumber != 0)
   {
-    outPutData.equipmentNumber(inputParticipant.equipmentNumber());
-    outPutData.assignState(ParticipantAssignState::HandoutExcon);
+    outPutData.equipmentNumber = inputParticipant.equipmentNumber;
+    outPutData.assignState = ParticipantAssignState::HandoutExcon;
   }
-  outPutData.hierarchyNumber(inputParticipant.hierarchyNumber());
+  outPutData.hierarchyNumber = inputParticipant.hierarchyNumber;
 
-  outPutData.info() = inputParticipant.info();
-  outPutData.name() = inputParticipant.name();
-  outPutData.designator() = inputParticipant.designator();
-  outPutData.tacticalIdentifier(inputParticipant.tacticalIdentifier());
-  outPutData.symbol(inputParticipant.symbol());
+  outPutData.info = inputParticipant.info;
+  outPutData.name = inputParticipant.name;
+  outPutData.designator = inputParticipant.designator;
+  outPutData.tacticalIdentifier = inputParticipant.tacticalIdentifier;
+  outPutData.symbol = inputParticipant.symbol;
 
-  outPutData.typeId(inputParticipant.typeId());
-  outPutData.isSimulated(false);
+  outPutData.typeId = inputParticipant.typeId;
+  outPutData.isSimulated = false;
   
-  outPutData.modId(inputParticipant.templateId());
-  outPutData.superiorModId(inputParticipant.superiorTemplateId());
-  outPutData.hierarchyNumber(inputParticipant.hierarchyNumber());
+  outPutData.modId = inputParticipant.templateId;
+  outPutData.superiorModId = inputParticipant.superiorTemplateId;
+  outPutData.hierarchyNumber = inputParticipant.hierarchyNumber;
   return true;
 }
 
 bool ParticipantPoolModel::isValidTypeClass(int typeId) const
 {
-  const TypeClass tc = m_dtc->type(typeId).typeClass();
-  switch (tc.underlying())
+  const TypeClass tc = m_dtc->type(typeId).typeClass;
+  switch (tc)
   {
   case TypeClass::Unit:
     return !m_asSupportService;
@@ -387,7 +388,7 @@ bool ParticipantPoolModel::isValidTypeClass(int typeId) const
 
 void ParticipantPoolModel::insertRow(const Participant &participant)
 {
-  tryRenderSymbol(QString::fromStdString(participant.symbol()), participant.id());
+  tryRenderSymbol(QString::fromStdString(participant.symbol), participant.id);
 
   LtsWidgets::LtsAbstractTableModel<ParticipantManagement::ParticipantData>::insertRow(
         m_dtc->convertParticipantToParticipantData(participant));
@@ -398,7 +399,7 @@ void ParticipantPoolModel::tryRemoveParticipantFromModel(int participantId)
   for (int i = 0; i < m_vecData.size(); ++i)
   {
     const ParticipantData &part = m_vecData.at(i);
-    if (part.id() == participantId)
+    if (part.id == participantId)
     {
       DEBUG_LOG(m_logger) << "Removing participant " << participantId;
       
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.cpp
index 54fbe69f1..42f3b58e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.cpp
@@ -14,6 +14,7 @@ ParticipantUnitNamer::ParticipantUnitNamer(const QString &designator, const QStr
   : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
   , m_ui(new Ui::ParticipantUnitNamer)
   , m_validator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[^,;\"'´`]*")), this))
+  , m_logger(getLogger("ParticipantTemplateChooser"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
index 6fb019c91..4bd3efbd5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
@@ -28,6 +28,7 @@ TacticalOrganisation::TacticalOrganisation(LtsSession::LtsSession *session, QWid
   , m_tvContextMenu(nullptr)
   , m_newItemDlg(nullptr)
   , m_ui(new Ui::TacticalOrganisation)
+  , m_logger(getLogger("TacticalOrganisation"))
 {
   m_ui->setupUi(this);
   connect(m_addEquipmentNumberAction, &QAction::triggered,
@@ -116,14 +117,14 @@ void TacticalOrganisation::retranslate()
 bool TacticalOrganisation::apply()
 {
   ModifyParticipantDataRequest req;
-  std::vector<ParticipantData> &dataToSend = req.data();
+  std::vector<ParticipantData> &dataToSend = req.data;
   for (const ParticipantEditModel *model : std::as_const(m_participantModels))
   {
     const auto c = model->participantData();
     dataToSend.insert(dataToSend.end(), c.begin(), c.end());
   }
 
-  if (req.data().size() == 0)
+  if (req.data.size() == 0)
     return true;
 
   return m_requestHelper->startSingleRequest([this, req]()
@@ -196,11 +197,11 @@ void TacticalOrganisation::onParticipantSelected(int participantId)
     return;
 
   Participant participant = m_dtc->participant(participantId);
-  if (participant.id() != participantId)
+  if (participant.id != participantId)
     return;
 
   ParticipantTreeFilterProxyModel *newModel = static_cast<ParticipantTreeFilterProxyModel *>(m_tvContextMenu->model());
-  ParticipantEditModel *oldPem = editModelForParty(participant.partyId());
+  ParticipantEditModel *oldPem = editModelForParty(participant.partyId);
   ParticipantEditModel *newPem = editModelForParty(newModel->partyId());
 
   QModelIndex oldIdx = oldPem->indexFromParticipantId(participantId);
@@ -348,18 +349,18 @@ void TacticalOrganisation::initLockedState()
 {
   Core::TryLockEntityRequest lockRequest;
 
-  lockRequest.id(0);
-  lockRequest.entityTypeName(QString(QStringLiteral("PpmTacticalOrganisation")).toStdString());
-  lockRequest.entityId(m_entityId);
-  lockRequest.exerciseId(m_session->exerciseId());
-  lockRequest.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  lockRequest.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
+  lockRequest.id = 0;
+  lockRequest.entityTypeName = QString(QStringLiteral("PpmTacticalOrganisation")).toStdString();
+  lockRequest.entityId = m_entityId;
+  lockRequest.exerciseId = m_session->exerciseId();
+  lockRequest.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  lockRequest.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
 
   Core::TryLockEntityReply lockReply = m_coreFtc->tryLockEntityRequest(lockRequest);
 
-  if (lockReply.alreadyLocked().is_set() && QString::fromStdString(lockReply.alreadyLocked().get().operatorName()) != LtsSessionData::LtsSessionData::getInstance()->getOperatorName())
+  if (lockReply.alreadyLocked.has_value() && QString::fromStdString(lockReply.alreadyLocked.get().operatorName) != LtsSessionData::LtsSessionData::getInstance()->getOperatorName())
   {
-    m_topicLockedBy = QString::fromStdString(lockReply.alreadyLocked().get().operatorName());
+    m_topicLockedBy = QString::fromStdString(lockReply.alreadyLocked.get().operatorName);
 
     setUnchangeable(true);
     retranslate();
@@ -367,7 +368,7 @@ void TacticalOrganisation::initLockedState()
     return;
   }
 
-  m_unlockId = lockReply.id();
+  m_unlockId = lockReply.id;
 }
 
 void TacticalOrganisation::tableColumnOrganiserSetting()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.h
index d25567044..a828efbc9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.h
@@ -6,6 +6,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
index 52d74ed95..ad7b6e51c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
@@ -24,6 +24,7 @@ ParticipantBiteDialog::ParticipantBiteDialog(int ddsId, QWidget *parent)
   , m_ui(new Ui::ParticipantBiteDialog)
   , m_ccsMap()
   , m_bctMap()
+  , m_logger(getLogger("ParticipantBiteDialog"))
 {
   m_ui->setupUi(this);
   setUnchangeable();
@@ -62,8 +63,8 @@ bool ParticipantBiteDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   if (detailData.isEmpty())
   {
     Participant participant = m_dtc->participant(m_ddsId);
-    if (participant.equipmentNumber().is_set())
-      m_eqipNr = participant.equipmentNumber().get();
+    if (participant.equipmentNumber.has_value())
+      m_eqipNr = participant.equipmentNumber.get();
 
     
     connect(m_dtc.get(), &Interface::Dtc::biteChanged, this, &ParticipantBiteDialog::onBiteChanged);
@@ -85,21 +86,21 @@ bool ParticipantBiteDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
     const QJsonArray biteErrors(detailData[QStringLiteral("BiteErrors")].toArray());
 
     Bite bite;
-    bite.batteryState(detailData[QStringLiteral("BatteryState")].toInt());
-    bite.biteState(detailData[QStringLiteral("BiteState")].toInt());
-    bite.configState(detailData[QStringLiteral("ConfigState")].toInt());
+    bite.batteryState = detailData[QStringLiteral("BatteryState")].toInt();
+    bite.biteState = detailData[QStringLiteral("BiteState")].toInt();
+    bite.configState = detailData[QStringLiteral("ConfigState")].toInt();
 
     BiteError biteError;
-    bite.biteErrors().reserve(biteErrors.size());
+    bite.biteErrors.reserve(biteErrors.size());
     for (const QJsonValue &biteErrorValue : biteErrors)
     {
       const QJsonObject biteErrorObject(biteErrorValue.toObject());
-      biteError.errorNumber(biteErrorObject[QStringLiteral("ErrorNo")].toInt());
-      biteError.canDeviceNumber(biteErrorObject[QStringLiteral("CanDeviceNumber")].toInt());
-      biteError.subdeviceNumber(biteErrorObject[QStringLiteral("SubdeviceNumber")].toInt());
-      biteError.uniqueId(biteErrorObject[QStringLiteral("UniqueId")].toInt());
+      biteError.errorNumber = biteErrorObject[QStringLiteral("ErrorNo")].toInt();
+      biteError.canDeviceNumber = biteErrorObject[QStringLiteral("CanDeviceNumber")].toInt();
+      biteError.subdeviceNumber = biteErrorObject[QStringLiteral("SubdeviceNumber")].toInt();
+      biteError.uniqueId = biteErrorObject[QStringLiteral("UniqueId")].toInt();
 
-      bite.biteErrors().push_back(biteError);
+      bite.biteErrors.push_back(biteError);
     }
     onBiteChanged(bite);
   }
@@ -116,9 +117,9 @@ int ParticipantBiteDialog::checkArguments(bool available, bool statusOk, qint64
   QString name;
   for (const ProjectDataManagement::CanComponentString &ccs : std::as_const(m_ccsMap))
   {
-    if (ccs.bitMask() == bitValue)
+    if (ccs.pdm_bitMask == bitValue)
     {
-      name = m_pdmDtc->trCanComponentStringName(ccs.id());
+      name = m_pdmDtc->trCanComponentStringName(ccs.id);
       break;
     }
   }
@@ -172,10 +173,10 @@ void ParticipantBiteDialog::addLabel(const QString &text, int row, int column, L
 
 void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
 {
-  if (bite.equipmentNumber() != m_eqipNr && !m_fromDetailData)
+  if (bite.equipmentNumber != m_eqipNr && !m_fromDetailData)
     return;
 
-  m_ui->lblLastChange->setText(DTG::toStringMSec(bite.sampleTime()));
+  m_ui->lblLastChange->setText(DTG::toStringMSec(bite.sampleTime));
   delete m_ui->scrollAreaWidgetContents->layout();
   m_layout = new QGridLayout(m_ui->scrollAreaWidgetContents);
 
@@ -187,30 +188,30 @@ void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
   for (int it = 0 ; it < 32; it++)
   {
     quint32 bitValue = 1U << it;
-    row = checkArguments(((bite.biteState() & bitValue) == bitValue),
-                         ((bite.configState() & bitValue) == bitValue), bitValue, row);
+    row = checkArguments(((bite.biteState & bitValue) == bitValue),
+                         ((bite.configState & bitValue) == bitValue), bitValue, row);
   }
 
-  row = checkArgument(bite.configError() != 0, tr("Configcheck error", "BITE CAN"), row);
+  row = checkArgument(bite.configError != 0, tr("Configcheck error", "BITE CAN"), row);
   if (row > 0)
     m_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed), row++, 0);
-  row = checkArgument(bite.batteryState() != 0, tr("Battery Warning", "BITE CAN"), row);
+  row = checkArgument(bite.batteryState != 0, tr("Battery Warning", "BITE CAN"), row);
   m_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed), row++, 0);
 
-  for (const auto &bitEr : bite.biteErrors())
+  for (const auto &bitEr : bite.biteErrors)
   {
     QLabel *labl = nullptr;
-    if (bitEr.subdeviceNumber() != 0)
+    if (bitEr.subdeviceNumber != 0)
       labl = new QLabel(tr("Error: %1 \nComponent: %2 \nSubdev: %3 \nUId: %4 ")
                         .arg(getErrorString(bitEr),
-                             getCanDeviceName(bitEr.canDeviceNumber()),
-                             getSubDeviceName(bitEr.subdeviceNumber()))
-                        .arg(QString::number( bitEr.uniqueId(), 16 ).toUpper()));
+                             getCanDeviceName(bitEr.canDeviceNumber),
+                             getSubDeviceName(bitEr.subdeviceNumber))
+                        .arg(QString::number( bitEr.uniqueId, 16 ).toUpper()));
                        
-    else if (bitEr.canDeviceNumber() != 0)
+    else if (bitEr.canDeviceNumber != 0)
       labl = new QLabel(tr("Error: %1 \nComponent: %2")
                         .arg(getErrorString(bitEr),
-                             getCanDeviceName(bitEr.canDeviceNumber())));
+                             getCanDeviceName(bitEr.canDeviceNumber)));
 
     if (labl)
     {
@@ -224,23 +225,23 @@ void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
 
 QString ParticipantBiteDialog::getErrorString(const ParticipantManagement::BiteError &error) const
 {
-  const bool subDevice = (error.subdeviceNumber() != 0);
+  const bool subDevice = (error.subdeviceNumber != 0);
   for (const ProjectDataManagement::BiteComponentText &bct : m_bctMap)
   {
-    if (((subDevice && bct.subDeviceId() == error.subdeviceNumber()) ||
-         (bct.canDeviceId() == error.canDeviceNumber())) &&
-         (bct.errorNumber() == error.errorNumber()))
-      return m_pdmDtc->trBiteComponentTextName(bct.id());
+    if (((subDevice && bct.subDeviceId == error.subdeviceNumber) ||
+         (bct.canDeviceId == error.canDeviceNumber)) &&
+         (bct.errorNumber == error.errorNumber))
+      return m_pdmDtc->trBiteComponentTextName(bct.id);
   }
-  return tr("Unknown (%1)").arg(error.errorNumber());
+  return tr("Unknown (%1)").arg(error.errorNumber);
 }
 
 QString ParticipantBiteDialog::getCanDeviceName(int id) const
 {
   for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
   {
-    if (ccs.canDeviceId() == id)
-      return m_pdmDtc->trCanComponentStringName(ccs.id());
+    if (ccs.canDeviceId == id)
+      return m_pdmDtc->trCanComponentStringName(ccs.id);
   }
   return tr("Unknown (%1)").arg(id);
 }
@@ -249,8 +250,8 @@ QString ParticipantBiteDialog::getSubDeviceName(int id) const
 {
   for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
   {
-    if (ccs.subDeviceId() == id)
-      return m_pdmDtc->trCanComponentStringName(ccs.id());
+    if (ccs.subDeviceId == id)
+      return m_pdmDtc->trCanComponentStringName(ccs.id);
   }
   return tr("Unknown (%1)").arg(id);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
index 39cd0e59b..fc45dda41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
@@ -10,6 +10,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp
index 8e0c21908..0f56d7563 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp
@@ -33,6 +33,7 @@ ParticipantConfigDialog::ParticipantConfigDialog(int ddsId, DialogType type, QWi
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ParticipantConfigDialog)
   , m_isTarget(false)
+  , m_logger(getLogger("ParticipantConfigDialog"))
 {
   m_ui->setupUi(this);
   connect(m_ui->cbStatus, &LtsWidgets::LtsComboBox::currentTextChanged, this, &ParticipantConfigDialog::onStateAreaChanged);
@@ -85,7 +86,7 @@ ParticipantConfigDialog::ParticipantConfigDialog(int ddsId, DialogType type, QWi
   m_buttonBox->getButton(LtsWidgets::DialogButton::Apply)->setText(tr("Send"));
   m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
   QFontMetricsF fm(m_ui->lblCharsLeft->font());
-  m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
+  m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
 
   const bool bEnableProtectionLevel = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantStatus"),
                                                                                    QStringLiteral("ProtectionLevel"));
@@ -203,11 +204,11 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
   if (m_ddsId > 0)
   {
     const Participant participant = m_dtc->participant(m_ddsId);
-    if (participant.equipmentNumber().is_set())
-      m_eqId = participant.equipmentNumber().get();
+    if (participant.equipmentNumber.has_value())
+      m_eqId = participant.equipmentNumber.get();
     if (!m_eqId && (m_dialogType == Config || m_dialogType == Message))
       return false;
-    m_typeClass = m_dtc->type(participant.typeId()).typeClass();
+    m_typeClass = m_dtc->type(participant.typeId).typeClass;
   }
   else
   {
@@ -238,7 +239,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
     m_maxChars = 16;
     m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
     QFontMetricsF fm(m_ui->lblCharsLeft->font());
-    m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
+    m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
   }
 
   if (m_dialogType == MessageMulti)
@@ -246,7 +247,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
     m_maxChars = 16;
     m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
     QFontMetricsF fm(m_ui->lblCharsLeft->font());
-    m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
+    m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
   }
 
   m_modeChanged = false;
@@ -278,12 +279,12 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
   
   {
     const Participant participant = m_dtc->participant(m_ddsId);
-    if (participant.equipmentNumber().is_set())
+    if (participant.equipmentNumber.has_value())
     {
-      const Type type = m_dtc->type(participant.typeId());
-      const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId());
-      if (eqType.wmsTypeClass() == WmsTypeClass::TargetHuman ||
-          eqType.wmsTypeClass() == WmsTypeClass::TargetVehicle)
+      const Type type = m_dtc->type(participant.typeId);
+      const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId);
+      if (eqType.wmsTypeClass == WmsTypeClass::TargetHuman ||
+          eqType.wmsTypeClass == WmsTypeClass::TargetVehicle)
       {
         NOTICE_LOG(m_logger) << "isTarget = true";
         m_ui->gbMode->setHidden(true);
@@ -292,7 +293,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
       }
     }
     
-    if (m_dtc->isTypeUas(participant.typeId()) && m_ddsId > 0)
+    if (m_dtc->isTypeUas(participant.typeId) && m_ddsId > 0)
     {
       m_ui->cbResetManipulation->hide();
       m_ui->cbResetGearCharge->hide();
@@ -348,7 +349,7 @@ void ParticipantConfigDialog::onSelectionChanged()
   {
     DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
     ParticipantManagement::ParticipantData data = m_model->getParticipantData(index);
-    TypeClass tc = m_dtc->type(data.typeId()).typeClass();
+    TypeClass tc = m_dtc->type(data.typeId).typeClass;
     if (tc != TypeClass::Human  && tc != TypeClass::Unit)
     {
       
@@ -381,8 +382,8 @@ void ParticipantConfigDialog::fillCbx()
   m_ui->cbStatus->addItem(tr("No Change"), -1);
   if ( m_isTarget)
   {
-    m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
-    m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
+    m_ui->cbStatus->addItem(tr("CombatReady"), static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady));
+    m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill));
   }
   else
     insertVulnerabilityStates(m_ui->cbStatus, m_typeClass);
@@ -424,7 +425,7 @@ void ParticipantConfigDialog::fillVitalityCbx()
     return;
 
   bool setEnabled = false;
-  if (m_dialogType == Config && m_dtc->type(m_dtc->participant(m_ddsId).typeId()).typeClass() == TypeClass::Human)
+  if (m_dialogType == Config && m_dtc->type(m_dtc->participant(m_ddsId).typeId).typeClass == TypeClass::Human)
     setEnabled = true;
   switch (m_ui->cbStatus->currentData().toInt())
   {
@@ -433,25 +434,25 @@ void ParticipantConfigDialog::fillVitalityCbx()
     m_ui->cbVitality->setEnabled(false);
     break;
   }
-  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
+  case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage):
   {
     for (int i = 90 ; i >= 70; i -= 10)
       m_ui->cbVitality->addItem(QString::number(i), i);
     break;
   }
-  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
+  case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage):
   {
     for (int i = 60 ; i >= 40; i -= 10)
       m_ui->cbVitality->addItem(QString::number(i), i);
     break;
   }
-  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
+  case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage):
   {
     for (int i = 30 ; i >= 10; i -= 10)
       m_ui->cbVitality->addItem(QString::number(i), i);
     break;
   }
-  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
+  case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady):
   {
     m_ui->cbVitality->removeItem(0);
     m_ui->cbVitality->addItem(QString::number(100), 100);
@@ -501,29 +502,29 @@ void ParticipantConfigDialog::fillCbxWithActualValue()
   int partId = m_dtc->participantIdByEquipmentNumber(m_eqId);
 
   ParticipantManagement::ParticipantMode mode = m_dtc->participantMode(partId);
-  m_ui->cbHelmet->setCurrentIndex(m_ui->cbHelmet->findData(mode.modeHelmet().underlying()));
-  m_ui->cbLanguage->setCurrentIndex(m_ui->cbLanguage->findData(mode.language().underlying()));
-  m_ui->cbPersonalProtection->setCurrentIndex(m_ui->cbPersonalProtection->findData(mode.modePersonalProtection().underlying()));
-  m_ui->cbProtectionLevel->setCurrentIndex(m_ui->cbProtectionLevel->findData(mode.protectionLevel().underlying()));
-  m_ui->cbGrenadeSearchMode->setCurrentIndex(m_ui->cbGrenadeSearchMode->findData(mode.handgrenadeSearchMode().underlying()));
-  m_ui->cbInternationalMode->setCurrentIndex(m_ui->cbInternationalMode->findData(mode.internationalMode().underlying()));
-  m_ui->cbABCProtectionMode->setCurrentIndex(m_ui->cbABCProtectionMode->findData(mode.abcProtectionMode().underlying()));
-  m_ui->cbVest->setCurrentIndex(m_ui->cbVest->findData(mode.modeVest().underlying()));
+  m_ui->cbHelmet->setCurrentIndex(m_ui->cbHelmet->findData(static_cast<int>(mode.modeHelmet)));
+  m_ui->cbLanguage->setCurrentIndex(m_ui->cbLanguage->findData(static_cast<int>(mode.language)));
+  m_ui->cbPersonalProtection->setCurrentIndex(m_ui->cbPersonalProtection->findData(static_cast<int>(mode.modePersonalProtection)));
+  m_ui->cbProtectionLevel->setCurrentIndex(m_ui->cbProtectionLevel->findData(static_cast<int>(mode.protectionLevel)));
+  m_ui->cbGrenadeSearchMode->setCurrentIndex(m_ui->cbGrenadeSearchMode->findData(static_cast<int>(mode.handgrenadeSearchMode)));
+  m_ui->cbInternationalMode->setCurrentIndex(m_ui->cbInternationalMode->findData(static_cast<int>(mode.internationalMode)));
+  m_ui->cbABCProtectionMode->setCurrentIndex(m_ui->cbABCProtectionMode->findData(static_cast<int>(mode.abcProtectionMode)));
+  m_ui->cbVest->setCurrentIndex(m_ui->cbVest->findData(static_cast<int>(mode.modeVest)));
   m_modeChanged = false;
 
   m_ui->cbStatus->setCurrentIndex(0);
   m_ui->cbVitality->setCurrentIndex(0);
 
-  std::vector< ParticipantManagement::StateInformation> stateHistory = m_dtc->dynamicParticipantData(partId).stateHistory();
+  std::vector< ParticipantManagement::StateInformation> stateHistory = m_dtc->dynamicParticipantData(partId).stateHistory;
   if (stateHistory.size() > 0)
   {
     auto stateInfo = m_dtc->youngestStateInformation(stateHistory);
 
-    int statusIndex = m_ui->cbStatus->findData(stateInfo.vulnerabilityState().underlying());
+    int statusIndex = m_ui->cbStatus->findData(static_cast<int>(stateInfo.vulnerabilityState));
     if(statusIndex != -1)
       m_ui->cbStatus->setCurrentIndex(statusIndex);
 
-    int vitalityIndex = m_ui->cbVitality->findData(stateInfo.vitality());
+    int vitalityIndex = m_ui->cbVitality->findData(stateInfo.vitality);
     if(vitalityIndex != -1)
       m_ui->cbVitality->setCurrentIndex(vitalityIndex);
 
@@ -578,8 +579,8 @@ bool ParticipantConfigDialog::apply()
       {
         OcCommandRequest req;
         
-        req.action(m_ui->cbStatus->currentData().toInt() - 100);
-        req.participantIds(participantIds);
+        req.action = m_ui->cbStatus->currentData().toInt() - 100;
+        req.participantIds = participantIds;
 
         m_ftc->ocCommandRequest(req);
       }
@@ -592,12 +593,12 @@ bool ParticipantConfigDialog::apply()
             m_ui->cbResetManipulation->isChecked())  
         {
           InitParticipantRequest req;
-          req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-          req.restockCharges(m_ui->cbResetGearCharge->isChecked());
-          req.resetManipulation(m_ui->cbResetManipulation->isChecked());
-          req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
-          req.restockSanitationMaterial(m_ui->cbResetMedSupplies->isChecked());
-          req.participantIds(participantIds);
+          req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+          req.restockCharges = m_ui->cbResetGearCharge->isChecked();
+          req.resetManipulation = m_ui->cbResetManipulation->isChecked();
+          req.resetVulnerabilityState = state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
+          req.restockSanitationMaterial = m_ui->cbResetMedSupplies->isChecked();
+          req.participantIds = participantIds;
           m_requestHelper->addRequest([req, this]()
           {
             return m_ftc->initParticipantRequest(req, this);
@@ -609,12 +610,12 @@ bool ParticipantConfigDialog::apply()
           if (m_ui->cbStatus->currentData().toInt() != -1 || m_ui->cbVitality->currentData().toInt() != 0)
           {
             ModifyStateRequest req;
-            req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-            req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state);
-            req.participantIds(participantIds);
-            req.vitality(m_ui->cbVitality->currentData().toInt());
-            if(req.vitality() > 0) 
-              req.vulnerabilityKind(2048);
+            req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+            req.vulnerabilityState = state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state;
+            req.participantIds = participantIds;
+            req.vitality = m_ui->cbVitality->currentData().toInt();
+            if(req.vitality > 0) 
+              req.vulnerabilityKind = 2048;
             m_requestHelper->addRequest([req, this]()
             {
               return m_ftc->modifyStateRequest(req, this);
@@ -639,7 +640,7 @@ bool ParticipantConfigDialog::apply()
       }
       else
       {
-        grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::NoChange;
+        grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange;
       }
 
       ProjectDataManagement::InternationalMode internationalMode = static_cast<ProjectDataManagement::InternationalMode>(m_ui->cbInternationalMode->currentData().toInt());
@@ -667,11 +668,11 @@ bool ParticipantConfigDialog::apply()
         if(participantId != 0)
         {
           auto data = m_dtc->participant(participantId);
-          TypeClass tc = m_dtc->type(data.typeId()).typeClass();
+          TypeClass tc = m_dtc->type(data.typeId).typeClass;
           if (tc != TypeClass::Human)
             continue;
         }
-        req.participantId(participantId);
+        req.participantId = participantId;
         m_requestHelper->addRequest([req, this]()
         {
           return m_ftc->setParticipantModeRequest(req, this);
@@ -686,8 +687,8 @@ bool ParticipantConfigDialog::apply()
   case MessageMulti:
   {
     SendMessageRequest req;
-    req.message(m_ui->teMail->toPlainText().toStdString());
-    req.participantIds(participantIds);
+    req.message = m_ui->teMail->toPlainText().toStdString();
+    req.participantIds = participantIds;
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->sendMessageRequest(req, this);
@@ -793,8 +794,8 @@ QVector<int> ParticipantConfigDialog::getParticipantIds(const QModelIndex &paren
   QVector<int> ret;
 
   const ParticipantManagement::ParticipantData dataParent(m_model->getParticipantData(parent));
-  if (dataParent.equipmentNumber().is_set())
-    ret.append(dataParent.id());
+  if (dataParent.equipmentNumber.has_value())
+    ret.append(dataParent.id);
 
   
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.h
index c003c0252..cc9b567df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.h
@@ -19,6 +19,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
index ae25ffc9a..3a73a4c63 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
@@ -23,7 +23,7 @@ namespace core
 {
 static inline uint qHash(const ParticipantManagement::TypeClass &tc)
 {
-  return ::qHash(tc.underlying());
+  return ::qHash(tc);
 }
 }
 }
@@ -39,23 +39,23 @@ static QVariant participantToQVariant(const ParticipantData &pd)
 {
   QByteArray ba;
   QDataStream ds(&ba, QIODevice::WriteOnly);
-  ds << pd.id()
-     << pd.partyId()
-     << pd.hierarchyNumber()
-     << (pd.equipmentNumber().is_set() ? pd.equipmentNumber().get() : -1)
-     << pd.typeId()
-     << pd.externalId()
-     << QString::fromStdString(pd.symbol())
-     << QString::fromStdString(pd.name())
-     << QString::fromStdString(pd.identification())
-     << QString::fromStdString(pd.designator())
-     << QString::fromStdString(pd.tacticalIdentifier())
-     << QString::fromStdString(pd.info())
-     << pd.assignState().underlying()
-     << pd.isSimulated()
-     << pd.isDeleted()
-     << pd.modId()
-     << pd.superiorModId();
+  ds << pd.id
+     << pd.partyId
+     << pd.hierarchyNumber
+     << (pd.equipmentNumber.has_value() ? pd.equipmentNumber.get() : -1)
+     << pd.typeId
+     << static_cast<long long>(pd.externalId)
+     << QString::fromStdString(pd.symbol)
+     << QString::fromStdString(pd.name)
+     << QString::fromStdString(pd.identification)
+     << QString::fromStdString(pd.designator)
+     << QString::fromStdString(pd.tacticalIdentifier)
+     << QString::fromStdString(pd.info)
+     << pd.assignState
+     << pd.isSimulated
+     << pd.isDeleted
+     << pd.modId
+     << pd.superiorModId;
 
   return ba;
 }
@@ -87,24 +87,24 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
       >> modId
       >> superiorModId;
 
-  pd.id(id);
-  pd.partyId(partyId);
-  pd.hierarchyNumber(hierarchyNumber);
+  pd.id = id;
+  pd.partyId = partyId;
+  pd.hierarchyNumber = hierarchyNumber;
   if (equipmentNumber >= 0)
-    pd.equipmentNumber(equipmentNumber);
-  pd.typeId(typeId);
-  pd.externalId(externalId);
-  pd.symbol(symbol.toStdString());
-  pd.name(name.toStdString());
-  pd.identification(identification.toStdString());
-  pd.designator(designator.toStdString());
-  pd.tacticalIdentifier(tacticalIdentifier.toStdString());
-  pd.info(info.toStdString());
-  pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
-  pd.isSimulated(isSimulated);
-  pd.isDeleted(isDeleted);
-  pd.modId(modId);
-  pd.superiorModId(superiorModId);
+    pd.equipmentNumber = equipmentNumber;
+  pd.typeId = typeId;
+  pd.externalId = externalId;
+  pd.symbol = symbol.toStdString();
+  pd.name = name.toStdString();
+  pd.identification = identification.toStdString();
+  pd.designator = designator.toStdString();
+  pd.tacticalIdentifier = tacticalIdentifier.toStdString();
+  pd.info = info.toStdString();
+  pd.assignState = static_cast<ParticipantManagement::ParticipantAssignState>(assignState);
+  pd.isSimulated = isSimulated;
+  pd.isDeleted = isDeleted;
+  pd.modId = modId;
+  pd.superiorModId = superiorModId;
 
   return pd;
 }
@@ -123,7 +123,7 @@ bool compareStrings(const std::string &s1, const std::string &s2,
 {
   const int iRet = strcmp(s1.c_str(), s2.c_str());
   if (iRet == 0)
-    return p1->participant.hierarchyNumber() < p2->participant.hierarchyNumber();
+    return p1->participant.hierarchyNumber < p2->participant.hierarchyNumber;
   return iRet < 0;
 }
 
@@ -151,6 +151,7 @@ ParticipantConfigModel::ParticipantConfigModel(QObject *parent,
       parent,
       getLogger("ParticipantConfigModel")
       )
+  , m_logger(getLogger("ParticipantConfigModel"))
   , m_partyId(-1)
   , m_bRowsAreCheckable(false)
   , m_bUnitsSelectable(true)
@@ -178,7 +179,7 @@ Qt::ItemFlags ParticipantConfigModel::flags(const QModelIndex &index) const
     ret |= Qt::ItemIsUserCheckable;
 
   
-  if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId()))
+  if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId))
     ret &= ~Qt::ItemIsSelectable;
   
   if (index.column() != 0 || !index.parent().isValid())
@@ -204,7 +205,7 @@ QVariant ParticipantConfigModel::headerData(int section, Qt::Orientation orienta
       for (const int typeId : m_usedTypeIds)
       {
         cfd.data = typeId;
-        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name());
+        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name);
         cfc.data.push_back(cfd);
       }
     }
@@ -212,7 +213,7 @@ QVariant ParticipantConfigModel::headerData(int section, Qt::Orientation orienta
     {
       for (const auto &typeClassId : m_usedTypeClassIds)
       {
-        cfd.data = typeClassId.underlying();
+        cfd.data = static_cast<int>(typeClassId);
         cfd.text = ParticipantManagement::toString(typeClassId);
         cfc.data.push_back(cfd);
       }
@@ -266,47 +267,47 @@ QVariant ParticipantConfigModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case ColDesignator:
-      return QString::fromStdString(participantData.designator());
+      return QString::fromStdString(participantData.designator);
 
     case ColIdentifier:
-      return QString::fromStdString(participantData.tacticalIdentifier());
+      return QString::fromStdString(participantData.tacticalIdentifier);
 
     case ColTypeClass:
-      return typeClassStringFromTypeId(participantData.typeId());
+      return typeClassStringFromTypeId(participantData.typeId);
 
     case ColType:
-      return ParticipantManagement::trTypeName(m_types.value(participantData.typeId()).name());
+      return ParticipantManagement::trTypeName(m_types.value(participantData.typeId).name);
 
     case ColEquipmentNumber:
-      if (!participantData.equipmentNumber().is_set())
+      if (!participantData.equipmentNumber.has_value())
       {
-        if (participantData.assignState() == ParticipantAssignState::HandoutExcon)
+        if (participantData.assignState == ParticipantAssignState::HandoutExcon)
           return 0;
         return QVariant();
       }
-      if (participantData.assignState() == ParticipantAssignState::ExconWmsOverruled)
-        return tr("%1 (+)").arg(participantData.equipmentNumber().get());
-      if (participantData.externalId() > 0)
-        return tr("%1 (external)").arg(participantData.equipmentNumber().get());
-      return participantData.equipmentNumber().get();
+      if (participantData.assignState == ParticipantAssignState::ExconWmsOverruled)
+        return tr("%1 (+)").arg(participantData.equipmentNumber.get());
+      if (participantData.externalId > 0)
+        return tr("%1 (external)").arg(participantData.equipmentNumber.get());
+      return participantData.equipmentNumber.get();
 
     case ColInfo:
-      return QString::fromStdString(participantData.info());
+      return QString::fromStdString(participantData.info);
 
     case ColSign:
-      return QString::fromStdString(participantData.identification());
+      return QString::fromStdString(participantData.identification);
 
       
     case ColProtection:
-      if (participantData.equipmentNumber().is_set() && m_dtc->type(participantData.typeId()).typeClass() == TypeClass::Human)
+      if (participantData.equipmentNumber.has_value() && m_dtc->type(participantData.typeId).typeClass == TypeClass::Human)
       {
-        return buildProtectionString(m_dtc->participantMode(participantData.id()));
+        return buildProtectionString(m_dtc->participantMode(participantData.id));
       }
       else return QVariant();
     case ColInternationalMode:
-      if (participantData.equipmentNumber().is_set() && m_dtc->type(participantData.typeId()).typeClass() == TypeClass::Human)
+      if (participantData.equipmentNumber.has_value() && m_dtc->type(participantData.typeId).typeClass == TypeClass::Human)
       {
-        return buildInternationalModeString(m_dtc->participantMode(participantData.id()).internationalMode());
+        return buildInternationalModeString(m_dtc->participantMode(participantData.id).internationalMode);
       }
       else
         return QVariant();
@@ -322,9 +323,9 @@ QVariant ParticipantConfigModel::data(const QModelIndex &index, int role) const
 
   case LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole:
     if (index.column() == ColTypeClass)
-      return typeClassIdFromTypeId(participantData.typeId()).underlying();
+      return static_cast<int>(typeClassIdFromTypeId(participantData.typeId));
     if (index.column() == ColType)
-      return participantData.typeId();
+      return participantData.typeId;
     return QVariant();
 
   default:
@@ -367,7 +368,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
     return false;
 
   const CheckedTreeItem *parentItem = privateData(parent);
-  if (!isUnitType(parentItem->participant.typeId()))
+  if (!isUnitType(parentItem->participant.typeId))
     return false;
 
   DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
@@ -385,7 +386,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
   const ParticipantData pdSource = static_cast<CheckedTreeItem *>(tiSources.first())->participant;
   qDeleteAll(tiSources);
 
-  TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
+  TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId);
   bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
   bool isOwnTypeClassSupport = m_partyId == 1;
 
@@ -393,9 +394,9 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
     return false;
 
   
-  if (pdSource.partyId() == parentItem->participant.partyId())
+  if (pdSource.partyId == parentItem->participant.partyId)
   {
-    const int idSource = pdSource.id();
+    const int idSource = pdSource.id;
     
     if (idSource != 0 && isParentOf(parentItem, idSource))
     {
@@ -425,7 +426,7 @@ bool ParticipantConfigModel::dropMimeData(const QMimeData *data, Qt::DropAction
   {
     CheckedTreeItem *child = static_cast<CheckedTreeItem *>(cti->child(r));
     
-    child->participant.hierarchyNumber(r + 1);
+    child->participant.hierarchyNumber = r + 1;
   }
 
   return true;
@@ -442,8 +443,8 @@ bool ParticipantConfigModel::onReinitModel(int partyId, const QSet<int> &checked
   m_partyId = partyId;
 
   const ParticipantManagement::Party &party = m_dtc->party(m_partyId);
-  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role());
-  m_partyColor = QColor::fromRgb(QRgb(party.color()));
+  m_partyRole  = AdvancedSymbology::roleToRole<>(party.role);
+  m_partyColor = QColor::fromRgb(QRgb(party.color));
 
   ParticipantIconModelBase::resetModel();
 
@@ -475,7 +476,7 @@ bool ParticipantConfigModel::isRowRemovable(const CheckedTreeItem *parentItem) c
   if (!parentItem)
     return false;
   const ParticipantManagement::ParticipantData &participantData = parentItem->participant;
-  if (participantData.equipmentNumber().is_set() && participantData.equipmentNumber().get() > 0)
+  if (participantData.equipmentNumber.has_value() && participantData.equipmentNumber.get() > 0)
     return false;
 
   for (int i = 0; i < parentItem->childCount(); i++)
@@ -521,7 +522,7 @@ void ParticipantConfigModel::processMissingSuperiorId()
     if (!tmap.contains(id))
       continue;
     const ParticipantManagement::Participant &participant = m_dtc->participant(id);
-    if (participant.id() != id)
+    if (participant.id != id)
       continue;
     onParticipantChanged(participant, DataModification::eModified);
 
@@ -532,7 +533,7 @@ void ParticipantConfigModel::processMissingSuperiorId()
     for (int childId : std::as_const(childIds))
     {
       const ParticipantManagement::Participant &p = m_dtc->participant(childId);
-      if (p.id() != childId)
+      if (p.id != childId)
         continue;
       onParticipantChanged(p, DataModification::eModified);
     }
@@ -550,7 +551,7 @@ void ParticipantConfigModel::selectItemByParticipantId(int participantId, const
     const ParticipantManagement::ParticipantData &data = privateData(idx)->participant;
     if (hasChildren(idx))
       selectItemByParticipantId(participantId, selectItem, idx);
-    if (data.id() == participantId)
+    if (data.id == participantId)
       return selectItem(idx);
   }
   return;
@@ -567,7 +568,7 @@ QModelIndexList ParticipantConfigModel::getIndexesByParticipantIds(const std::ve
     if (hasChildren(idx))
       indexes += getIndexesByParticipantIds(participantIds, idx);
 
-    auto it = std::find(participantIds.begin(), participantIds.end(), data.id());
+    auto it = std::find(participantIds.begin(), participantIds.end(), data.id);
     if (it != participantIds.end())
       indexes.append(idx);
   } 
@@ -653,7 +654,7 @@ QString ParticipantConfigModel::getHierarchyFromIndex(const QModelIndex &index)
   if (!index.isValid())
     return QString();
   const ParticipantManagement::ParticipantData &participantData = privateData(index)->participant;
-  return m_dtc->hierarchyFromParticipant(participantData.id());
+  return m_dtc->hierarchyFromParticipant(participantData.id);
 }
 
 
@@ -664,16 +665,16 @@ void ParticipantConfigModel::gatherParticipants(QHash<int, ParticipantData> &tma
 {
   auto cb = [this, &tmap, &parentId2id](const Participant & part)
   {
-    if (part.isDeleted())
+    if (part.isDeleted)
       return;
 
-    if (part.partyId() != m_partyId)
+    if (part.partyId != m_partyId)
       return;
 
     
-    parentId2id[part.superiorId()] += part.id();
+    parentId2id[part.superiorId] += part.id;
 
-    tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
+    tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
   };
   m_dtc->participants(cb);
 }
@@ -687,16 +688,16 @@ std::vector<ParticipantData> ParticipantConfigModel::getChildrenOf(NGLTreeItem *
   std::vector<ParticipantData> ret;
   const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
   ParticipantManagement::ParticipantData participantData = cti->participant;
-  participantData.superiorModId(parentId);
-  participantData.hierarchyNumber(hierarchyNumber);
-  participantData.partyId(m_partyId); 
-  if (participantData.modId() == 0)
-    participantData.modId(++highestModId);
+  participantData.superiorModId = parentId;
+  participantData.hierarchyNumber = hierarchyNumber;
+  participantData.partyId = m_partyId; 
+  if (participantData.modId == 0)
+    participantData.modId = ++highestModId;
 
   
   for (int i = 0; i < item->childCount(); i++)
   {
-    const auto c = getChildrenOf(item->child(i), participantData.modId(), i + 1, bOnlyModifed, highestModId);
+    const auto c = getChildrenOf(item->child(i), participantData.modId, i + 1, bOnlyModifed, highestModId);
     ret.insert(ret.end(), c.begin(), c.end());
   }
 
@@ -717,28 +718,28 @@ bool ParticipantConfigModel::updateChildrenOf(int parentId,
   {
     ParticipantConfigModel::CheckedTreeItem *childItem = static_cast<ParticipantConfigModel::CheckedTreeItem *>(parent->child(i));
     ParticipantData &pdItem = childItem->participant;
-    m_usedTypeIds += pdItem.typeId();
-    m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId());
-    if (pdItem.id() == 0)
+    m_usedTypeIds += pdItem.typeId;
+    m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId);
+    if (pdItem.id == 0)
     {
       const QSet<int> &childIds = parentId2id.value(parentId);
       for (int childId : childIds)
       {
         const auto &childData = tmap.value(childId);
-        if (childData.hierarchyNumber() - 1 == i)
+        if (childData.hierarchyNumber - 1 == i)
         {
-          pdItem.id(childData.id());
+          pdItem.id = childData.id;
           childItem->setModified(false);
           break;
         }
       }
     }
-    if (!pdItem.id())
+    if (!pdItem.id)
     {
       bRet = false;
       continue;
     }
-    if (!updateChildrenOf(pdItem.id(), childItem, parentId2id, tmap))
+    if (!updateChildrenOf(pdItem.id, childItem, parentId2id, tmap))
       bRet = false;
   }
   return bRet;
@@ -763,13 +764,13 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
       continue;
     }
     const ParticipantData &data = it.value();
-    m_usedTypeIds += data.typeId();
-    m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId());
+    m_usedTypeIds += data.typeId;
+    m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId);
 
     int insertPos = 0;
-    if (data.hierarchyNumber() > 0)
+    if (data.hierarchyNumber > 0)
     {
-      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
+      auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
       insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
     }
     else
@@ -782,15 +783,15 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = data;
-    childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
+    childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id), cs);
 
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
                         << ") to parent " << parent << " at pos " << insertPos;
     insertRow(insertPos, parentIdx, childItem);
-    tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);  
+    tryRenderSymbol(QString::fromStdString(data.symbol), childItem);  
 
     const QModelIndex childIdx = index(insertPos, 0, parentIdx);
-    insertChildrenOf(data.id(), childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
+    insertChildrenOf(data.id, childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
   }
 }
 
@@ -801,7 +802,7 @@ bool ParticipantConfigModel::isParentOf(const NGLTreeItem *item, int participant
     return false;
 
   const CheckedTreeItem *cti = static_cast<const CheckedTreeItem *>(item);
-  if (cti->participant.id() == participantId)
+  if (cti->participant.id == participantId)
     return true;
   return isParentOf(item->parent(), participantId);
 }
@@ -856,7 +857,7 @@ void ParticipantConfigModel::setCheckState(CheckedTreeItem *parentItem, const QS
 
 QModelIndex ParticipantConfigModel::indexFromParticipantId(int participantId, const CheckedTreeItem *cti) const
 {
-  if (cti->participant.id() == participantId)
+  if (cti->participant.id == participantId)
     return indexFromItem(cti);
   for (int row = 0; row < cti->childCount(); ++row)
   {
@@ -870,7 +871,7 @@ QModelIndex ParticipantConfigModel::indexFromParticipantId(int participantId, co
 int ParticipantConfigModel::participantIdFromItem(NGLTreeItem *item) const
 {
   const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
-  return cti->participant.id();
+  return cti->participant.id;
 }
 
 ParticipantConfigModel::CheckedTreeItem *ParticipantConfigModel::searchParticipant(const NGLTreeItem *parentItem, int participantId) const
@@ -879,7 +880,7 @@ ParticipantConfigModel::CheckedTreeItem *ParticipantConfigModel::searchParticipa
   for (int r = 0; r < rowCount; ++r)
   {
     CheckedTreeItem *child = static_cast<CheckedTreeItem *>(parentItem->child(r));
-    if (child->participant.id() == participantId)
+    if (child->participant.id == participantId)
       return child;
     child = searchParticipant(child, participantId);
     if (child)
@@ -894,10 +895,10 @@ NGLTreeItem *ParticipantConfigModel::createItem(const QVariant &data, const QIco
   CheckedTreeItem *cti = new CheckedTreeItem(data, icon);
   cti->participant = qVariantToParticipant(data);
 
-  if (cti->participant.symbol().size() != 0)
+  if (cti->participant.symbol.size() != 0)
   {
     auto *that = const_cast<ParticipantConfigModel *>(this);
-    that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol()), cti);
+    that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol), cti);
   }
 
   return cti;
@@ -913,21 +914,21 @@ QVariant ParticipantConfigModel::getItemData(const NGLTreeItem *item) const
 QString ParticipantConfigModel::buildProtectionString(const ParticipantMode &mode) const
 {
   QString protLevel;
-  switch(mode.protectionLevel().underlying())
+  switch(mode.protectionLevel)
   {
-  case ProjectDataManagement::ProtectionLevel::IdzEs:
+  case ProjectDataManagement::ProtectionLevel::ProtectionLevel_IdzEs:
     protLevel = tr("IdzEs");
     break;
-  case ProjectDataManagement::ProtectionLevel::IdzBs:
+  case ProjectDataManagement::ProtectionLevel::ProtectionLevel_IdzBs:
     protLevel = tr("IdzBs");
     break;
-  case ProjectDataManagement::ProtectionLevel::Ksk:
+  case ProjectDataManagement::ProtectionLevel::ProtectionLevel_Ksk:
     protLevel = tr("Ksk");
     break;
-  case ProjectDataManagement::ProtectionLevel::SoldierWithBodyArmor:
+  case ProjectDataManagement::ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor:
     protLevel = tr("SoldierWithBodyArmor");
     break;
-  case ProjectDataManagement::ProtectionLevel::SoldierActor:
+  case ProjectDataManagement::ProtectionLevel::ProtectionLevel_SoldierActor:
     protLevel = tr("SoldierActor");
     break;
   default:
@@ -936,18 +937,18 @@ QString ParticipantConfigModel::buildProtectionString(const ParticipantMode &mod
   }
 
   return tr("%1 / %2 / %3")
-      .arg(buildWphModeString(mode.modeHelmet()))
-      .arg(buildWphModeString(mode.modeVest()))
+      .arg(buildWphModeString(mode.modeHelmet))
+      .arg(buildWphModeString(mode.modeVest))
       .arg(protLevel);
 }
 
 QString ParticipantConfigModel::buildWphModeString(const ProjectDataManagement::WphMode &wphMode) const
 {
-  switch(wphMode.underlying())
+  switch(wphMode)
   {
-  case ProjectDataManagement::WphMode::Without:
+  case ProjectDataManagement::WphMode::WphMode_Without:
     return tr("Without");
-  case ProjectDataManagement::WphMode::With:
+  case ProjectDataManagement::WphMode::WphMode_With:
     return tr("With");
   default:
     return tr("No Change");
@@ -957,7 +958,7 @@ QString ParticipantConfigModel::buildWphModeString(const ProjectDataManagement::
 
 QString ParticipantConfigModel::buildInternationalModeString(const ProjectDataManagement::InternationalMode &inMode) const
 {
-  switch(inMode.underlying())
+  switch(inMode)
   {
   case ProjectDataManagement::InternationalMode::InternationalMode_On:
     return tr("On");
@@ -978,17 +979,17 @@ int ParticipantConfigModel::insertParticipant(const QModelIndex &parent, Partici
   const int row = rowCount(parentCol0);
   if (bNewParticipant)
   {
-    participantData.id(0); 
-    participantData.modId(0); 
+    participantData.id = 0; 
+    participantData.modId = 0; 
   }
-  participantData.partyId(m_partyId);
-  participantData.hierarchyNumber(row + 1);
+  participantData.partyId = m_partyId;
+  participantData.hierarchyNumber = row + 1;
 
   CheckedTreeItem *item = static_cast<CheckedTreeItem *>(createItem(participantToQVariant(participantData), QIcon()));
   item->setModified(true);
   if (!insertRow(row, parentCol0, item))
     return -1;
-  tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
+  tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
   emit internalDataChanged();
   return row;
 }
@@ -1008,8 +1009,8 @@ bool ParticipantConfigModel::onUpdateRow(const QModelIndex &index, const Partici
   if (participantData == oldData)
     return true;
 
-  if (oldData.symbol() != participantData.symbol())
-    tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
+  if (oldData.symbol != participantData.symbol)
+    tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
 
   emit internalDataChanged();
   item->participant = participantData;
@@ -1024,10 +1025,10 @@ bool ParticipantConfigModel::onDeleteRow(const QModelIndex &idx, bool isFirstIte
   {
     CheckedTreeItem *item = privateData(idx);
     ParticipantManagement::ParticipantData data = item->participant;
-    data.isDeleted(true);
-    data.assignState() = ParticipantAssignState::NotAssigned;
-    data.equipmentNumber().reset();
-    if (data.modId() != 0) 
+    data.isDeleted = true;
+    data.assignState = ParticipantAssignState::NotAssigned;
+    data.equipmentNumber.reset();
+    if (data.modId != 0) 
       m_dataToDelete.push_back(std::move(data));
   }
   removeRow(idx.row(), idx.parent());
@@ -1037,12 +1038,12 @@ bool ParticipantConfigModel::onDeleteRow(const QModelIndex &idx, bool isFirstIte
 
 void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  if (data.partyId() != m_partyId)
+  if (data.partyId != m_partyId)
     return;
 
   Q_UNUSED(modType);
 
-  CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id());
+  CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id);
   if (cti)
   {
     cti->participant = m_dtc->convertParticipantToParticipantData(data);
@@ -1050,16 +1051,16 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
     return;
   }
 
-  CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId());
+  CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId);
   if (ctiParent)
   {
     int insertPos = 0;
-    if (data.hierarchyNumber() > 0)
+    if (data.hierarchyNumber > 0)
     {
       for (int i = 0; i < ctiParent->childCount(); ++i)
       {
         CheckedTreeItem *child = static_cast<CheckedTreeItem *>(ctiParent->child(i));
-        if (child->participant.hierarchyNumber() > data.hierarchyNumber())
+        if (child->participant.hierarchyNumber > data.hierarchyNumber)
         {
           insertPos = i;
           break;
@@ -1074,17 +1075,17 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = m_dtc->convertParticipantToParticipantData(data);
-    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
+    DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
                         << ") to parent " << ctiParent << " at pos " << insertPos;
     insertRow(insertPos, indexFromItem(ctiParent), childItem);
-    tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);  
+    tryRenderSymbol(QString::fromStdString(data.symbol), childItem);  
     return;
   }
   else
   {
     
     
-    m_missingSuperiorId.insert(data.superiorId());
+    m_missingSuperiorId.insert(data.superiorId);
     m_missingSuperiorIdTimer->start();
   }
 
@@ -1127,30 +1128,30 @@ bool ParticipantTreeFilterProxyConfigModel::lessThan(const QModelIndex &source_l
   switch (source_left.column())
   {
   case ParticipantConfigModel::ColDesignator:
-    return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
+    return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
   case ParticipantConfigModel::ColIdentifier:
-    return compareStrings(left->participant.tacticalIdentifier(),
-                          right->participant.tacticalIdentifier(),
+    return compareStrings(left->participant.tacticalIdentifier,
+                          right->participant.tacticalIdentifier,
                           left, right);
   case ParticipantConfigModel::ColTypeClass:
   case ParticipantConfigModel::ColType:
     break;  
   case ParticipantConfigModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
-      return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
+      return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
+    if (!left->participant.equipmentNumber.has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber.has_value())
       return false;
-    return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
+    return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
 
   case ParticipantConfigModel::ColInfo:
-    return compareStrings(left->participant.info(),
-                          right->participant.info(),
+    return compareStrings(left->participant.info,
+                          right->participant.info,
                           left, right);
   case ParticipantConfigModel::ColSign:
-    return compareStrings(left->participant.identification(),
-                          right->participant.identification(),
+    return compareStrings(left->participant.identification,
+                          right->participant.identification,
                           left, right);
   }
   return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
@@ -1169,7 +1170,7 @@ bool ParticipantTreeFilterProxyConfigModel::filterAcceptsRow(int source_row, con
     return false;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  if (!m_allowedTypes.contains(childItem->participant.typeId()))
+  if (!m_allowedTypes.contains(childItem->participant.typeId))
     return false;
 #else
   
@@ -1321,29 +1322,29 @@ bool ParticipantTableFilterProxyConfigModel::lessThan(const QModelIndex &sourceL
   switch (sourceLeft.column())
   {
   case ParticipantConfigModel::ColDesignator:
-    return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
+    return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
 
   case ParticipantConfigModel::ColIdentifier:
-    return compareStrings(left->participant.tacticalIdentifier(), right->participant.tacticalIdentifier(), left, right);
+    return compareStrings(left->participant.tacticalIdentifier, right->participant.tacticalIdentifier, left, right);
 
   case ParticipantConfigModel::ColTypeClass:
   case ParticipantConfigModel::ColType:
     return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
 
   case ParticipantConfigModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
-      return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
+      return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
+    if (!left->participant.equipmentNumber.has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber.has_value())
       return false;
-    return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
+    return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
 
   case ParticipantConfigModel::ColInfo:
-    return compareStrings(left->participant.info(), right->participant.info(), left, right);
+    return compareStrings(left->participant.info, right->participant.info, left, right);
 
   case ParticipantConfigModel::ColSign:
-    return compareStrings(left->participant.identification(), right->participant.identification(), left, right);
+    return compareStrings(left->participant.identification, right->participant.identification, left, right);
 
   default:
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
index 3590bd729..ffef7075e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
@@ -21,6 +21,7 @@ ParticipantFollowDialog::ParticipantFollowDialog(QWidget *parent)
   , m_ui(new Ui::ParticipantFollowDialog)
   , m_followParticipantId(-1)
   , m_followEquipmentNo(-1)
+  , m_logger(getLogger("ParticipantFollowDialog"))
 {
   m_ui->setupUi(this);
   m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
@@ -185,7 +186,7 @@ void ParticipantFollowDialog::updateObjectIndicator()
   enadisa();
 }
 
-void ParticipantFollowDialog::enterEvent(QEvent *e)
+void ParticipantFollowDialog::enterEvent(QEnterEvent *e)
 {
   BaseClass::enterEvent(e);
   updateObjectIndicator();
@@ -211,11 +212,11 @@ int ParticipantFollowDialog::onSelectionChanged()
 
   ParticipantManagement::ParticipantData data;
   data = m_model->getParticipantData(index);
-  if (!data.equipmentNumber().is_set())
+  if (!data.equipmentNumber.has_value())
     return -1;
 
   enadisa();
-  return data.equipmentNumber().get();
+  return data.equipmentNumber.get();
 }
 
 void ParticipantFollowDialog::onDoubleClicked()
@@ -224,7 +225,7 @@ void ParticipantFollowDialog::onDoubleClicked()
 
   ParticipantManagement::ParticipantData data;
   data = m_model->getParticipantData(index);
-  m_followParticipantId = data.id();
+  m_followParticipantId = data.id;
   m_followEquipmentNo = getEquipmentNumber(m_followParticipantId);
   enadisa();
   DEBUG_LOG(m_logger) << "onDoubleClicked follow Participant Id =" << m_followParticipantId
@@ -271,8 +272,8 @@ void ParticipantFollowDialog::fillMapFromDtc()
   m_participantMap.clear();
   auto cb = [this](const Participant & data)
   {
-    if (data.equipmentNumber().is_set())
-      m_participantMap.insert(data.equipmentNumber().get(), data.id());
+    if (data.equipmentNumber.has_value())
+      m_participantMap.insert(data.equipmentNumber.get(), data.id);
   };
   m_dtc->participants(cb);
 }
@@ -331,8 +332,8 @@ void ParticipantFollowDialog::fillParticipantMapFromTree(const QModelIndex &pare
     fillParticipantMapFromTree(m_model->index(row, 0, parent));
 
   const ParticipantManagement::ParticipantData data(m_model->getParticipantData(parent));
-  if (data.equipmentNumber().is_set())
-    m_participantMap.insert(data.equipmentNumber().get(), data.id());
+  if (data.equipmentNumber.has_value())
+    m_participantMap.insert(data.equipmentNumber.get(), data.id);
 }
 
 int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.h
index a9bfa8280..9fd58c085 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.h
@@ -20,6 +20,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 
 
@@ -54,7 +55,7 @@ Q_SIGNALS:
 private slots:
   void slotLookup();
   void updateObjectIndicator();
-  void enterEvent(QEvent *e) override;
+  void enterEvent(QEnterEvent *e) override;
   void leaveEvent(QEvent *e) override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.cpp
index 1efebbd7b..e18bd60fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.cpp
@@ -21,6 +21,7 @@ ParticipantGearRestock::ParticipantGearRestock(int gearId, int gearTypeId, const
   , m_participant(participant)
   , m_dialogMode(dialogMode)
   , m_ui(new Ui::ParticipantGearRestock)
+  , m_logger(getLogger("ParticipantGearRestock"))
 {
   m_ui->setupUi(this);
   
@@ -36,10 +37,10 @@ ParticipantGearRestock::~ParticipantGearRestock()
 void ParticipantGearRestock::retranslate()
 {
   QString eqNoString;
-  if (m_participant.equipmentNumber().is_set())
-    eqNoString = QString::number(m_participant.equipmentNumber().get());
+  if (m_participant.equipmentNumber.has_value())
+    eqNoString = QString::number(m_participant.equipmentNumber.get());
   else
-    eqNoString = tr("[Participant Id: %1]").arg(m_participant.id());
+    eqNoString = tr("[Participant Id: %1]").arg(m_participant.id);
 
   if (m_dialogMode == DM_Restock)
     translate(m_ui, tr("Set %1's Restock Defaults of Participant %2").arg(m_pdmDtc->trGearTypeName(m_gearTypeId), eqNoString));
@@ -101,10 +102,10 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
 
   for (const ProjectDataManagement::GearTypeChargeType &gearType2ChargeType : m_pdmDtc->gearTypeChargeTypes())
   {
-    if (gearType2ChargeType.gearTypeId() != m_gearTypeId)
+    if (gearType2ChargeType.gearTypeId != m_gearTypeId)
       continue;
 
-    int chargeTypeId = gearType2ChargeType.chargeTypeId();
+    int chargeTypeId = gearType2ChargeType.chargeTypeId;
     int maxCharge = m_pdmDtc->maxCharge(m_gearTypeId, chargeTypeId);
 
     DEBUG_LOG(m_logger) << "maxCharge = " << maxCharge;
@@ -136,17 +137,17 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
 bool ParticipantGearRestock::apply()
 {
   SelectiveReammunitionRequest req;
-  req.id(m_participant.id());
-  req.gearId(m_gearId);
+  req.id = m_participant.id;
+  req.gearId = m_gearId;
   for (ParticipantGearRestockCharge* pgrc : m_ui->scrollArea->findChildren<ParticipantGearRestockCharge*>())
   {
     Reammunition ra;
-    ra.chargeTypeId(pgrc->chargeTypeId());
-    ra.tracerRatio(0);
-    ra.newStock((m_dialogMode == DM_Restock || m_ui->cbRestockNow->isChecked()) ? pgrc->value() : 0xfffe);
-    ra.newDefaultStock(m_dialogMode == DM_SetRestockDefaults ? pgrc->value() : 0xfffe);
+    ra.chargeTypeId = pgrc->chargeTypeId();
+    ra.tracerRatio = 0;
+    ra.newStock = (m_dialogMode == DM_Restock || m_ui->cbRestockNow->isChecked()) ? pgrc->value() : 0xfffe;
+    ra.newDefaultStock = m_dialogMode == DM_SetRestockDefaults ? pgrc->value() : 0xfffe;
 
-    req.reammunition().push_back(ra);
+    req.reammunition.push_back(ra);
   }
 
   return m_requestHelper->startSingleRequest([req, this]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
index c0f14a03f..e4547105e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
@@ -14,6 +14,7 @@ ParticipantHistoryDialog::ParticipantHistoryDialog(QWidget *parent)
   , m_proxyModel(new ParticipantHistorySortModel(this))
   , m_dtc(nullptr)
   , m_ui(new Ui::ParticipantHistoryDialog)
+  , m_logger(getLogger("ParticipantHistoryDialog"))
 {
   m_proxyModel->setSourceModel(m_model);
   m_ui->setupUi(this);
@@ -40,8 +41,8 @@ ParticipantHistoryDialog::~ParticipantHistoryDialog()
 
 void ParticipantHistoryDialog::retranslate()
 {
-  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_ddsId).equipmentNumber();
-  const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
+  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_ddsId).equipmentNumber;
+  const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
 
   translate(m_ui, id, false, tr("Participant History"));
 }
@@ -62,7 +63,7 @@ bool ParticipantHistoryDialog::init(int ddsId,
   if (m_model->initModel(m_ddsId, m_dtc, pdmDtc, aesDtc))
   {
     m_ui->tvHistory->syncSearchHeaderAndTableContentColumnSize();
-    bool isHuman = m_dtc->type(m_dtc->participant(m_ddsId).typeId()).typeClass() == ParticipantManagement::TypeClass::Human;
+    bool isHuman = m_dtc->type(m_dtc->participant(m_ddsId).typeId).typeClass == ParticipantManagement::TypeClass::Human;
     const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
                                                                         QStringLiteral("HasPvSan"));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.h
index a90122760..9c7c0e344 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.h
@@ -9,6 +9,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include "participant_history_dialog_model.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp
index b07d4cf72..613197bca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp
@@ -30,6 +30,7 @@ ParticipantHistoryDialogModel::ParticipantHistoryDialogModel(QObject *parent)
   , m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries)
   , m_dtc(nullptr)
   , m_pdmDtc(nullptr)
+  , m_logger(getLogger("ParticipantHistoryDialogModel"))
 {}
 
 bool ParticipantHistoryDialogModel::initModel(int dds_id,
@@ -46,13 +47,13 @@ bool ParticipantHistoryDialogModel::initModel(int dds_id,
           this, &ParticipantHistoryDialogModel::onDynamicParticipantDataChanged);
 
   const auto &part = m_dtc->participant(m_ddsId);
-  const auto typeClass = dtc->type(part.typeId()).typeClass();
+  const auto typeClass = dtc->type(part.typeId).typeClass;
 
   m_vulnerabilityClass = (typeClass == TypeClass::Human) ?
-        ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-        ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
-  reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory());
+  reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory);
   return true;
 }
 
@@ -62,19 +63,19 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
   switch (index.column())
   {
   case Time:
-    return QDateTime::fromMSecsSinceEpoch(data.stateTime());
+    return QDateTime::fromMSecsSinceEpoch(data.stateTime);
   case VulnerabilityState:
   {
-    if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation)
+    if(data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation)
       return {};
 
-    if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady)
+    if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady)
       return {};
 
-    std::bitset<sizeof(data.vulnerabilityBits()) * 8> bits(data.vulnerabilityBits());
-    bits.set(data.vulnerabilityState().underlying());
+    std::bitset<sizeof(data.vulnerabilityBits) * 8> bits(data.vulnerabilityBits);
+    bits.set(static_cast<int>(data.vulnerabilityState));
     
-    for (int i = ProjectDataManagement::VulnerabilityState::HeavyDamage; i >= 0; --i)
+    for (int i = static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage); i >= 0; --i)
     {
       if (!bits.test(i))
         continue;
@@ -83,15 +84,15 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
       break;
     }
     
-    if (bits.test(ProjectDataManagement::VulnerabilityState::CatastrophicKill))
+    if (bits.test(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)))
     {
-      for (int j = 0; j < ProjectDataManagement::VulnerabilityState::CatastrophicKill; ++j)
+      for (int j = 0; j < static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); ++j)
         bits.reset(j);
-      bits.reset(ProjectDataManagement::VulnerabilityState::TemporarySeverance);
+      bits.reset(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
     }
 
     QStringList sl;
-    for (int i = 0; i <= ProjectDataManagement::VulnerabilityState::CContamination; ++i)
+    for (int i = 0; i <= static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination); ++i)
     {
       if (!bits.test(i))
         continue;
@@ -103,36 +104,36 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
   }
   case Originator:
   {
-    QString originatorType(ProjectDataManagement::toString(data.originatorType()));
+    QString originatorType(ProjectDataManagement::toString(data.originatorType));
     QString originator;
-    switch (data.originatorType().underlying())
+    switch (data.originatorType)
     {
-    case ProjectDataManagement::StateChangeOriginator::DusMine:
-    case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
-      originator = QString::number(data.originatorId() < 0 ? 0 - data.originatorId() : data.originatorId());
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
+      originator = QString::number(data.originatorId < 0 ? 0 - data.originatorId : data.originatorId);
       break;
-    case ProjectDataManagement::StateChangeOriginator::Participant:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
     {
-      if (data.originatorId() < 0) 
+      if (data.originatorId < 0) 
       {
-        originator = QString::number(-data.originatorId());
+        originator = QString::number(-data.originatorId);
       }
       else
       {
-        const Participant participant = m_dtc->participant(data.originatorId());
-        if (participant.equipmentNumber().is_set())
-          originator = QString::number(participant.equipmentNumber().get());
+        const Participant participant = m_dtc->participant(data.originatorId);
+        if (participant.equipmentNumber.has_value())
+          originator = QString::number(participant.equipmentNumber.get());
       }
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::Party:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party:
     {
-      const Party party = m_dtc->party(data.originatorId());
-      originator = QString::fromStdString(party.name());
+      const Party party = m_dtc->party(data.originatorId);
+      originator = QString::fromStdString(party.name);
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-    case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
     {
       if (m_aesDtc)
       {
@@ -140,10 +141,10 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
         
         
         
-        originator = m_aesDtc->aesItemNameFromEntityId(data.originatorId());
+        originator = m_aesDtc->aesItemNameFromEntityId(data.originatorId);
 
       }
-      if (data.originatorId() == 0 && data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::FunctionalArea)
+      if (data.originatorId == 0 && data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea)
       {
         
         originatorType = tr("Autoreset");
@@ -151,45 +152,45 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
       }
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::Sanitation:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
     {
-      const Participant participant = m_dtc->participant(data.originatorId());
-      if (participant.equipmentNumber().is_set())
-        originator = QString::number(participant.equipmentNumber().get());
-      else if (data.originatorId() < 0)
-        originator = QString::number(-data.originatorId());
-      else if (data.originatorId() == 0)
+      const Participant participant = m_dtc->participant(data.originatorId);
+      if (participant.equipmentNumber.has_value())
+        originator = QString::number(participant.equipmentNumber.get());
+      else if (data.originatorId < 0)
+        originator = QString::number(-data.originatorId);
+      else if (data.originatorId == 0)
         originator = tr("Exercise Control");
       QStringList san;
-      san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification>(data.originatorChargeTypeId())));
-      san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken());
+      san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification>(data.originatorChargeTypeId)));
+      san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken);
       return san;
     }
-    case ProjectDataManagement::StateChangeOriginator::ObserverController:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
     {
       QString oc;
-      if (data.originatorChargeTypeId() == 1  )
+      if (data.originatorChargeTypeId == 1  )
       {
         oc = tr ("9-Liner created");
       }
-      else if (data.originatorChargeTypeId() == 2)
+      else if (data.originatorChargeTypeId == 2)
       {
         oc = tr("Qualif. Transport initiated");
       }
       else
-        oc = ProjectDataManagement::toString(data.originatorType());
+        oc = ProjectDataManagement::toString(data.originatorType);
 
-      if (data.originatorChargeTypeId() == 8)
+      if (data.originatorChargeTypeId == 8)
         oc.append(tr( " - Wound increase paused")); 
-      else if (data.originatorChargeTypeId() == 35)
+      else if (data.originatorChargeTypeId == 35)
         oc.append(tr( " - Wound increase continued")); 
       return oc;
     }
 #ifdef GUEZ_MODE
-    case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
     {
       QString mo = tr("Injury increased - "); 
-      switch(data.sanitationResult().underlying())
+      switch(data.sanitationResult)
       {
       case SanitationResult::Unhandled:
         mo.append(tr("No Care"));
@@ -204,20 +205,20 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
         mo.append(tr("Optimal Care"));
         break;
       default:
-        mo.append(ProjectDataManagement::toString(data.originatorType()));
+        mo.append(ProjectDataManagement::toString(data.originatorType));
       }
       return mo;
     }
 #endif
-        case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-        case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-    case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-    case ProjectDataManagement::StateChangeOriginator::Initialization:
-    case ProjectDataManagement::StateChangeOriginator::Unknown:
-      return ProjectDataManagement::toString(data.originatorType());
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+        case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
+      return ProjectDataManagement::toString(data.originatorType);
     }
 
-    QString chargeType = m_pdmDtc->trChargeTypeShortName(data.originatorChargeTypeId());
+    QString chargeType = m_pdmDtc->trChargeTypeShortName(data.originatorChargeTypeId);
     if (!originator.isEmpty() && !chargeType.isEmpty())
       originatorType += QStringLiteral("(%1 - %2)").arg(originator, chargeType);
     else if (!originator.isEmpty())
@@ -227,21 +228,21 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
     return originatorType;
   }
   case Vulnerability:
-    if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation)
+    if(data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation)
       return {};
     
-    if (data.vulnerabilityKindId() == 459286 && !((data.vulnerabilityBits() >> 7) & 1)) 
+    if (data.vulnerabilityKindId == 459286 && !((data.vulnerabilityBits >> 7) & 1)) 
       return QLatin1String("-");
-    return m_pdmDtc->trVulnerabilityKindName(data.vulnerabilityKindId(), m_vulnerabilityClass);
+    return m_pdmDtc->trVulnerabilityKindName(data.vulnerabilityKindId, m_vulnerabilityClass);
   case VulnerabilityBits:
-    return QString::number(data.vulnerabilityBits(), 16).toUpper().prepend(QStringLiteral("0x"));
+    return QString::number(data.vulnerabilityBits, 16).toUpper().prepend(QStringLiteral("0x"));
   case Vitality:
 
 
 
 
-    if (data.vitality() <= 100)
-      return QString::number(data.vitality());
+    if (data.vitality <= 100)
+      return QString::number(data.vitality);
     return QStringLiteral("--");
   }
   return {};
@@ -281,7 +282,7 @@ QVariant ParticipantHistoryDialogModel::data(const QModelIndex &index, int role)
 
 void ParticipantHistoryDialogModel::onDynamicParticipantDataChanged(const DynamicParticipantData &data, DataModification modType)
 {
-  if (m_ddsId != data.participantId())
+  if (m_ddsId != data.participantId)
     return;
 
   if (modType == DataModification::eRemoved)
@@ -290,7 +291,7 @@ void ParticipantHistoryDialogModel::onDynamicParticipantDataChanged(const Dynami
     return;
   }
 
-  reinitModel(data.stateHistory());
+  reinitModel(data.stateHistory);
 }
 
 void ParticipantHistoryDialogModel::reinitModel(const std::vector<ParticipantManagement::StateInformation> &newData)
@@ -321,20 +322,20 @@ bool ParticipantHistorySortModel::lessThan(const QModelIndex &source_left, const
   const StateInformation &siRight = m_sourceModel->m_vecData.at(source_right.row());
   if (source_left.column() == ParticipantHistoryDialogModel::Time)
   {
-    if (siLeft.stateTime() != siRight.stateTime())
-      return siLeft.stateTime() < siRight.stateTime();
+    if (siLeft.stateTime != siRight.stateTime)
+      return siLeft.stateTime < siRight.stateTime;
     
-    if ( siRight.vulnerabilityState().underlying() == 8)
+    if ( static_cast<int>(siRight.vulnerabilityState) == 8)
       return true;
-    if ( siLeft.vulnerabilityState().underlying() == 8)
+    if ( static_cast<int>(siLeft.vulnerabilityState) == 8)
       return false;
-    return siLeft.vulnerabilityState() < siRight.vulnerabilityState();
+    return siLeft.vulnerabilityState < siRight.vulnerabilityState;
   }
   if (source_left.column() == ParticipantHistoryDialogModel::Vulnerability)
   {
-    if (siLeft.vulnerabilityState() != siRight.vulnerabilityState())
-      return siLeft.vulnerabilityState() < siRight.vulnerabilityState();
-    return siLeft.stateTime() < siRight.stateTime();
+    if (siLeft.vulnerabilityState != siRight.vulnerabilityState)
+      return siLeft.vulnerabilityState < siRight.vulnerabilityState;
+    return siLeft.stateTime < siRight.stateTime;
   }
   return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.h
index 60022b343..154959b91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.h
@@ -6,6 +6,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp
index 2df9bae52..7d621ba06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp
@@ -22,6 +22,7 @@ HitLineInfoDialog::HitLineInfoDialog(int hitLineId, QWidget *parent)
   , m_pdmDtc(nullptr)
   , m_sitMapGuiIfc(nullptr)
   , m_ui(new Ui::HitLineInfoDialog)
+  , m_logger(getLogger("ParticipantHitLineInfoDialog"))
 {
   m_ui->setupUi(this);
 
@@ -67,14 +68,14 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
   
   m_dtc->hitLineInfos([this](const ParticipantManagement::HitLineInfo & data)
   {
-    if (data.id() == m_hitLineId)
+    if (data.id == m_hitLineId)
     {
-      DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id();
+      DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id;
       m_hitLineInfo = data;
 
       
-      m_participantOriginator = m_dtc->participant(data.originatorParticipantId());
-      m_participantInjury     = m_dtc->participant(data.injuryParticipantId());
+      m_participantOriginator = m_dtc->participant(data.originatorParticipantId);
+      m_participantInjury     = m_dtc->participant(data.injuryParticipantId);
 
       showHitLineInfos();
     }
@@ -90,66 +91,66 @@ void HitLineInfoDialog::showHitLineInfos()
 {
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id:" << m_hitLineId;
 
-  if (m_participantOriginator.id() <= 0 || m_participantInjury.id() <= 0)
+  if (m_participantOriginator.id <= 0 || m_participantInjury.id <= 0)
     return;
 
   m_ui->lblHitLineId->setText(QString::number(m_hitLineId));
 
   
-  m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime()));
+  m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime));
 
   
-  Participant participant = m_dtc->participant(m_participantOriginator.id());
-  m_ui->lblOriginatorEquipNr->setText(QString::number(participant.equipmentNumber().get()));
+  Participant participant = m_dtc->participant(m_participantOriginator.id);
+  m_ui->lblOriginatorEquipNr->setText(QString::number(participant.equipmentNumber.get()));
   
-  m_ui->lblOriginatorParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_hitLineInfo.originatorPartyId()).name()));
+  m_ui->lblOriginatorParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_hitLineInfo.originatorPartyId).name));
   
-  m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator()));
+  m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator));
   
-  m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier()));
+  m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier));
   
-  m_ui->lblOriginatorType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantOriginator.typeId()).name()));
+  m_ui->lblOriginatorType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantOriginator.typeId).name));
   
-  QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos().lon(), m_hitLineInfo.originatorPos().lat());
-  if (qFuzzyIsNull(m_hitLineInfo.originatorPos().z()))
+  QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos.lon, m_hitLineInfo.originatorPos.lat);
+  if (qFuzzyIsNull(m_hitLineInfo.originatorPos.z))
     m_ui->lblOriginatorPos->setText(tr("Position: %1").arg(mgrs));
   else
-    m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos().z()));
+    m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos.z));
 
   
-  participant = m_dtc->participant(m_participantInjury.id());
-  m_ui->lblInjuryEquipNr->setText(QString::number(participant.equipmentNumber().get()));
+  participant = m_dtc->participant(m_participantInjury.id);
+  m_ui->lblInjuryEquipNr->setText(QString::number(participant.equipmentNumber.get()));
   
-  m_ui->lblInjuryParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_participantInjury.partyId()).name()));
+  m_ui->lblInjuryParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_participantInjury.partyId).name));
   
-  m_ui->lblInjuryDesignator->setText(QString::fromStdString(m_participantInjury.designator()));
+  m_ui->lblInjuryDesignator->setText(QString::fromStdString(m_participantInjury.designator));
   
-  m_ui->lblInjuryTactIdentifier->setText(QString::fromStdString(m_participantInjury.tacticalIdentifier()));
+  m_ui->lblInjuryTactIdentifier->setText(QString::fromStdString(m_participantInjury.tacticalIdentifier));
   
-  m_ui->lblInjuryType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantInjury.typeId()).name()));
+  m_ui->lblInjuryType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantInjury.typeId).name));
   
-  mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.injuryPos().lon(), m_hitLineInfo.injuryPos().lat());
-  if (qFuzzyIsNull(m_hitLineInfo.injuryPos().z()))
+  mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.injuryPos.lon, m_hitLineInfo.injuryPos.lat);
+  if (qFuzzyIsNull(m_hitLineInfo.injuryPos.z))
     m_ui->lblInjuryPos->setText(tr("Position: %1").arg(mgrs));
   else
-    m_ui->lblInjuryPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.injuryPos().z()));
+    m_ui->lblInjuryPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.injuryPos.z));
   
-  m_typeClass = m_dtc->type(m_participantInjury.typeId()).typeClass();
+  m_typeClass = m_dtc->type(m_participantInjury.typeId).typeClass;
 
-  ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id());
+  ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id);
 
   const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ?
-                                                       ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-                                                       ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+                                                       ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+                                                       ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
-  const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory());
-  m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
+  const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory);
+  m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState, vc));
 
   
-  m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId()));
+  m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId));
 
-  m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId()));
-  m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_hitLineInfo.chargeTypeId()));
+  m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId));
+  m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_hitLineInfo.chargeTypeId));
 
   m_isInitialized = true;
 } 
@@ -157,13 +158,13 @@ void HitLineInfoDialog::showHitLineInfos()
 
 void HitLineInfoDialog::onFindOriginatorOnMap()
 {
-  findOnMap(m_participantOriginator.id());
+  findOnMap(m_participantOriginator.id);
 } 
 
 
 void HitLineInfoDialog::onFindInjuryOnMap()
 {
-  findOnMap(m_participantInjury.id());
+  findOnMap(m_participantInjury.id);
 } 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.h
index 13fd9a526..ca5e14818 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.h
@@ -9,6 +9,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 #include <ProjectDataManagement/pdm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
index 9d3068022..f90daabb9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
@@ -74,8 +74,8 @@ ParticipantInfoDialog::ParticipantInfoDialog(int participantId, const QString &m
   m_oldSpacerSize.first =  m_ui->vsBottom->maximumSize().width();
   m_oldSpacerSize.second = m_ui->vsBottom->maximumSize().height();
 
-  m_participant.id(participantId);
-  m_participant.partyId(-1);
+  m_participant.id = participantId;
+  m_participant.partyId = -1;
   m_ui->pbUnlockUas->setIcon(QIcon(QStringLiteral("icon:drone_remote_connection.svg")));
   setUnchangeable();
 
@@ -125,7 +125,7 @@ ParticipantInfoDialog::~ParticipantInfoDialog()
 {
   if (m_ui->pbGearRanges->isChecked())
     if (m_sitMapGuiIfc)
-      m_sitMapGuiIfc->enableGearRanges(m_participant.id(), false);
+      m_sitMapGuiIfc->enableGearRanges(m_participant.id, false);
 
   if (m_symbolAppearanceSettings)
     m_symbolAppearanceSettings->removeChangedCallback(this);
@@ -137,9 +137,9 @@ void ParticipantInfoDialog::retranslate()
 {
   QString id;
 
-  dds::core::optional<int32_t> eqId = m_participant.equipmentNumber();
+  dds::core::optional<int32_t> eqId = m_participant.equipmentNumber;
 
-  if (eqId.is_set())
+  if (eqId.has_value())
     id = QString::number(eqId.get());
 
   translate(m_ui, id, false, tr("Participant"));
@@ -181,13 +181,13 @@ bool ParticipantInfoDialog::init(LtsSession::LtsSession *session,
     Q_UNUSED(column);
     int gearId = m_ui->twGear->item(row, 0)->data(Qt::UserRole).toInt();
     int gTypeId = 0;
-    auto gears = m_dtc->dynamicParticipantData(m_participant.id()).gear();
+    auto gears = m_dtc->dynamicParticipantData(m_participant.id).gear;
     if (gears.size() < 1)
       return;
     for(auto gear : gears)
     {
-     if (gear.gearId() == gearId)
-       gTypeId = gear.gearTypeId();
+     if (gear.gearId == gearId)
+       gTypeId = gear.gearTypeId;
     }
     if(m_pdmDtc->canRestock(gTypeId))
     {
@@ -209,7 +209,7 @@ bool ParticipantInfoDialog::setUiValues()
 
   DEBUG_LOG(m_logger) << "------------------setUiValues-----------------";
 
-  if (!m_dtc || !m_ftc || m_participant.id() < 0)
+  if (!m_dtc || !m_ftc || m_participant.id < 0)
     return false;
 
   //  m_showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
@@ -227,24 +227,24 @@ bool ParticipantInfoDialog::setUiValues()
   m_ui->tbNbc->setVisible(false); //show only if visible
 
   // m_participant.id() was given within ctor
-  const Participant participantData = m_dtc->participant(m_participant.id());
-  const Type type = m_dtc->type(participantData.typeId());
-  m_typeClass = type.typeClass();
+  const Participant participantData = m_dtc->participant(m_participant.id);
+  const Type type = m_dtc->type(participantData.typeId);
+  m_typeClass = type.typeClass;
 
 
   // uas stuff
-  const bool isUas = m_dtc->isTypeUas(participantData.typeId());
+  const bool isUas = m_dtc->isTypeUas(participantData.typeId);
   DEBUG_LOG(m_logger) << "------------------UAS-----------------"
                        << " isTypeUas" << isUas
-                       << " participantId=" <<participantData.id()
-                       << " typeId=" << participantData.typeId();
+                       << " participantId=" <<participantData.id
+                       << " typeId=" << participantData.typeId;
 
   if (isUas)
   {
     connect(m_dtc.get(), &Interface::Dtc::uASChanged, this, &ParticipantInfoDialog::onUasChanged, Qt::UniqueConnection);
     m_dtc->waitForHistoricalDataUAS(3000);
-    const UAS uas = m_dtc->getUasByParticipantId(participantData.id(), m_session->exerciseId());
-    m_uasId = uas.id();
+    const UAS uas = m_dtc->getUasByParticipantId(participantData.id, m_session->exerciseId());
+    m_uasId = uas.id;
 
     if (!m_ftc->isModifyUasStateEnabled())
     {
@@ -282,7 +282,7 @@ bool ParticipantInfoDialog::setUiValues()
     m_ui->lbKind->setText(tr("Kind:")); // translates "Verwundung" for Humans.
 
   bool bUpdateDynamicParticipantData = true;
-  switch (m_typeClass.underlying())
+  switch (m_typeClass)
   {
   case TypeClass::Human:
   {
@@ -303,12 +303,12 @@ bool ParticipantInfoDialog::setUiValues()
             this, &ParticipantInfoDialog::onParticipantChanged, Qt::UniqueConnection);
     connect(m_dtc.get(), &Interface::Dtc::participantPositionChanged,
             this, &ParticipantInfoDialog::onPositionChanged, Qt::UniqueConnection);
-    onPositionChanged(m_dtc->participantPosition(m_participant.id()));
+    onPositionChanged(m_dtc->participantPosition(m_participant.id));
     onPartitionTimeChanged(m_session->partitionTime());
 
     if (m_sitMapGuiIfc)
     {
-      const int32_t participantId = m_participant.id();
+      const int32_t participantId = m_participant.id;
 
       m_ui->pbMovementTrack->setChecked(m_sitMapGuiIfc->isMovementTrackEnabled(participantId));
       // set MovementTrackCallback:
@@ -353,7 +353,7 @@ bool ParticipantInfoDialog::setUiValues()
             this, &ParticipantInfoDialog::onParticipantChanged, Qt::UniqueConnection);
     connect(m_dtc.get(), &Interface::Dtc::unitPositionChanged,
             this, &ParticipantInfoDialog::onUnitPositionChanged, Qt::UniqueConnection);
-    onUnitPositionChanged(m_dtc->unitPosition(m_participant.id()));
+    onUnitPositionChanged(m_dtc->unitPosition(m_participant.id));
     break;
   }
   case TypeClass::Vessel:
@@ -364,15 +364,15 @@ bool ParticipantInfoDialog::setUiValues()
 
   if (bUpdateDynamicParticipantData)
   {
-    const auto dpd = m_dtc->dynamicParticipantData(m_participant.id());
-    if (dpd.participantId() || m_participant.id())
+    const auto dpd = m_dtc->dynamicParticipantData(m_participant.id);
+    if (dpd.participantId || m_participant.id)
       onDynamicParticipantDataChanged(dpd);
     else
     {
-      const Party party = m_dtc->party(m_participant.partyId());
-      const QColor color = QColor::fromRgb(QRgb(party.color()));
+      const Party party = m_dtc->party(m_participant.partyId);
+      const QColor color = QColor::fromRgb(QRgb(party.color));
 
-      updateIcon(color, QString::fromStdString(m_participant.symbol()));
+      updateIcon(color, QString::fromStdString(m_participant.symbol));
     }
   }
 
@@ -414,7 +414,7 @@ bool ParticipantInfoDialog::setUiValues()
     m_ui->pbSetSanitation->hide();
   }
 
-  if (!m_participant.equipmentNumber().is_set())
+  if (!m_participant.equipmentNumber.has_value())
   {
     setEquipNrVisible(false);
     setBiteVisible(false);
@@ -427,9 +427,9 @@ bool ParticipantInfoDialog::setUiValues()
   }
   else
   {
-    const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId());
-    m_isTarget = (eqType.wmsTypeClass() == WmsTypeClass::TargetHuman ||
-                  eqType.wmsTypeClass() == WmsTypeClass::TargetVehicle);
+    const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId);
+    m_isTarget = (eqType.wmsTypeClass == WmsTypeClass::TargetHuman ||
+                  eqType.wmsTypeClass == WmsTypeClass::TargetVehicle);
 
     //    m_isTarget = 1;
     //    initTargetConfigL400(/*m_isTarget*/ true);
@@ -440,7 +440,7 @@ bool ParticipantInfoDialog::setUiValues()
 
   }
 
-  switch (m_typeClass.underlying())
+  switch (m_typeClass)
   {
   case TypeClass::SupportEntity:
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Support_Entity"));
@@ -493,7 +493,7 @@ bool ParticipantInfoDialog::loadGuiElementPLugin(const LtsPluginManager::PluginI
 
   if (guiElement->pluginName() == QStringLiteral("KeyValueGuiElement_XY"))
   {
-    if (!guiElement->init(m_session, m_participant.id()))
+    if (!guiElement->init(m_session, m_participant.id))
       return false;
 
     m_ui->gridLayout_2->addWidget(guiElement->createGuiElement(this));
@@ -509,7 +509,7 @@ bool ParticipantInfoDialog::loadGuiElementPLugin(const LtsPluginManager::PluginI
 
 void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicParticipantData &data, DataModification modType)
 {
-  if (data.participantId() != m_participant.id() && data.participantId() != 0)
+  if (data.participantId != m_participant.id && data.participantId != 0)
     return;
 
   // Do not continue on modType == DataModification::eRemove
@@ -525,13 +525,13 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     m_ui->lblIcon->setEnabled(true);
 
   //Current State
-  qWarning() << "stateHistory count" << data.stateHistory().size();
+  qWarning() << "stateHistory count" << data.stateHistory.size();
   bool contaminationListIsEmpty = true;
-  if (!data.stateHistory().empty())
+  if (!data.stateHistory.empty())
   {
     const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ?
-          ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-          ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+          ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+          ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
 //#define FAKE_HISTORY
 #ifdef FAKE_HISTORY
@@ -550,31 +550,31 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       }
     }
 #else
-    const auto &history = data.stateHistory();
+    const auto &history = data.stateHistory;
 #endif
 
     //LasState is the last "real" state, that has a VBG <=8 (Castastrophic)
     //It's not the last state received, as there can be other state changes like Sanitation, or NearMiss
     StateInformation lastState = m_dtc->youngestStateInformation(history/*, true*/ /* debug */);;
     StateInformation youngestState;
-    youngestState.stateTime(0);
+    youngestState.stateTime = 0;
     for (const StateInformation &si : history)
     {
       DEBUG_LOG(m_logger) << "StateInformation "
-                           << " time=" << si.stateTime()
-                           << " vulnerabilityBits=" << si.vulnerabilityBits()
-                           << " vulnerabilityKindId=" << si.vulnerabilityKindId();
-      if ( youngestState.stateTime() < si.stateTime())
+                           << " time=" << si.stateTime
+                           << " vulnerabilityBits=" << si.vulnerabilityBits
+                           << " vulnerabilityKindId=" << si.vulnerabilityKindId;
+      if ( youngestState.stateTime < si.stateTime)
         youngestState = si;
     }
 
 
     //    const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
     //                                                                        QStringLiteral("HasPvSan"));
-    m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
+    m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState, vc));
     //vitality
-    DEBUG_LOG(m_logger)<<" >>> last state: "<<lastState.vitality() << "last kind: " <<lastState.vulnerabilityKindId();
-    m_ui->lblVitality->setText(QString::number(lastState.vitality()) + QStringLiteral("%"));
+    DEBUG_LOG(m_logger)<<" >>> last state: "<<lastState.vitality << "last kind: " <<lastState.vulnerabilityKindId;
+    m_ui->lblVitality->setText(QString::number(lastState.vitality) + QStringLiteral("%"));
 
     // Set Contamination
     const int NCONTAMINATION = 0x4000;
@@ -582,12 +582,12 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     const int CCONTAMINATION = 0x10000;
     QStringList contaminationList;
     DEBUG_LOG(m_logger) << "Set Contamination"
-                         << " time=" << youngestState.stateTime()
-                         << " vulnerabilityKindId=" << youngestState.vulnerabilityKindId()
-                         << " vulnerabilityBits=" << youngestState.vulnerabilityBits()
-                         << " vulnerabilityBits hex=0x" << std::hex << youngestState.vulnerabilityBits();
+                         << " time=" << youngestState.stateTime
+                         << " vulnerabilityKindId=" << youngestState.vulnerabilityKindId
+                         << " vulnerabilityBits=" << youngestState.vulnerabilityBits
+                         << " vulnerabilityBits hex=0x" << std::hex << youngestState.vulnerabilityBits;
 
-    if ( youngestState.vulnerabilityBits() & NCONTAMINATION)
+    if ( youngestState.vulnerabilityBits & NCONTAMINATION)
     {
       DEBUG_LOG(m_logger) << "append N";
 
@@ -598,7 +598,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       contaminationList.append( shortName);
       contaminationListIsEmpty = false;
     }
-    if ( youngestState.vulnerabilityBits() & BCONTAMINATION)
+    if ( youngestState.vulnerabilityBits & BCONTAMINATION)
     {
       DEBUG_LOG(m_logger) << "append B";
 
@@ -609,7 +609,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       contaminationList.append( shortName);
       contaminationListIsEmpty = false;
     }
-    if ( youngestState.vulnerabilityBits() & CCONTAMINATION)
+    if ( youngestState.vulnerabilityBits & CCONTAMINATION)
     {
       DEBUG_LOG(m_logger) << "append C";
 
@@ -624,13 +624,13 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     m_ui->lblContamination->setText(contaminationList.join(QStringLiteral("+")));
     // VBA
     //AG 40 HACK!
-    if (lastState.vulnerabilityKindId() == 459286 && !((lastState.vulnerabilityBits() >> 7) & 1)) // VBG7 NOT set in history bits, but kind id still implying that VBG7 is still active
+    if (lastState.vulnerabilityKindId == 459286 && !((lastState.vulnerabilityBits >> 7) & 1)) // VBG7 NOT set in history bits, but kind id still implying that VBG7 is still active
       m_ui->lblKind->setText(QLatin1String("-"));
     else
-      m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId(), vc));
-    if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass::SoldierInjuries )
+      m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId, vc));
+    if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries )
     {
-      if (lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ) //Maybe there is some side effect to this like 
+      if (lastState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ) //Maybe there is some side effect to this like 
     //if (data.stateHistory().size() == 1 && lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)       
       {
         QPalette pal = QApplication::palette(m_ui->lbKind);
@@ -639,7 +639,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       }
       else
       {
-        setSanitationLabelColor(/*m_dtc->proceduresDone(data.stateHistory())*/data.stateHistory().at(data.stateHistory().size()-1).sanitationResult());
+        setSanitationLabelColor(/*m_dtc->proceduresDone(data.stateHistory())*/data.stateHistory.at(data.stateHistory.size()-1).sanitationResult);
       }
     }
   }
@@ -655,11 +655,11 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   m_ui->lbContamination->setHidden(contaminationListIsEmpty);
   m_ui->lblContamination->setHidden(contaminationListIsEmpty);
 
-  DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< data.manipulation().size();
-  setBackgroundColor(m_ui->lblEquipNr, Qt::red, data.manipulation().size());
+  DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< data.manipulation.size();
+  setBackgroundColor(m_ui->lblEquipNr, Qt::red, data.manipulation.size());
 
   // Special Sensor State
-  if (!data.specialSensorDataState())
+  if (!data.specialSensorDataState)
   {
     m_ui->stackSpecialSensor->hide();
     m_ui->lbSpecialSensorState->hide();
@@ -677,15 +677,15 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       */
 
       m_ui->stackSpecialSensor->setCurrentWidget(m_ui->stackPageAircraft);
-      m_ui->ledRadarJammer->setStatus(data.specialSensorDataState() & 0x02);
-      m_ui->ledIrJammer->setStatus(data.specialSensorDataState() & 0x04);
-      m_ui->ledRadarDetector->setStatus(data.specialSensorDataState() & 0x08);
-      m_ui->ledLaserSensor->setStatus(data.specialSensorDataState() & 0x10);
+      m_ui->ledRadarJammer->setStatus(data.specialSensorDataState & 0x02);
+      m_ui->ledIrJammer->setStatus(data.specialSensorDataState & 0x04);
+      m_ui->ledRadarDetector->setStatus(data.specialSensorDataState & 0x08);
+      m_ui->ledLaserSensor->setStatus(data.specialSensorDataState & 0x10);
     }
     else
     {
       m_ui->stackSpecialSensor->setCurrentWidget(m_ui->stackPageCommon);
-      showSpecialSensorData(data.specialSensorDataState());
+      showSpecialSensorData(data.specialSensorDataState);
     }
     m_ui->lbSpecialSensorState->show();
     m_ui->stackSpecialSensor->show();
@@ -710,7 +710,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
 #endif
 */
   //Gear  
-  if (data.gear().size() == 0 )
+  if (data.gear.size() == 0 )
   {
     m_gearList.clear();
     m_ui->twGear->clearContents();
@@ -720,9 +720,9 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     if (m_ltdGearComponent)
       m_ltdGearComponent->clear();
   }
-  else if (data.gear() != m_gearList)
+  else if (data.gear != m_gearList)
   {
-    m_gearList = data.gear();
+    m_gearList = data.gear;
     std::vector<GearInformation> tmpGearList = m_gearList;
     std::sort(tmpGearList.begin(), tmpGearList.end(), &compareGear); //sort
 
@@ -741,20 +741,20 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     for (const GearInformation &gearInfo : tmpGearList)
     {
       QTableWidgetItem *item = nullptr;
-      if (gearInfo.chargeTypeId() == 0) //chargTypeId 0 is near miss code
+      if (gearInfo.chargeTypeId == 0) //chargTypeId 0 is near miss code
       {
         rowCount--;
         continue;
       }
 
-      const int gearTypeId = gearInfo.gearTypeId();
+      const int gearTypeId = gearInfo.gearTypeId;
       if ((gearTypeId & unknownTasId) == unknownTasId)
         item = new QTableWidgetItem(tr("Unknown gear id %1").arg(gearTypeId & ~unknownTasId));
       else if (gearTypeId == 0)
       {
         // Hack for old systems which neither send gearTasCode/gearType nor gearSerialNumber/gearId
         // 1 = Wanne, 2 = Turm
-        switch (gearInfo.gearId())
+        switch (gearInfo.gearId)
         {
         case 1:
           item = new QTableWidgetItem(tr("Tank", "Gear Type"));
@@ -771,8 +771,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
         item = new QTableWidgetItem(m_pdmDtc->trGearTypeName(gearTypeId));
 
 
-      item->setData(Qt::UserRole, gearInfo.gearId());
-      if(m_pdmDtc->canRestock(gearInfo.gearTypeId()))
+      item->setData(Qt::UserRole, gearInfo.gearId);
+      if(m_pdmDtc->canRestock(gearInfo.gearTypeId))
       {
         item->setIcon(QIcon(QLatin1String("icon:service.svg")));
       }
@@ -783,7 +783,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
         QTableWidgetItem *oldItem = m_ui->twGear->item(rowStart, 0); //Item above
         if (oldItem == nullptr)// not set due to rowSpan...
           break;
-        if (oldItem->data(Qt::UserRole).toInt() != gearInfo.gearId() || // Different gearId
+        if (oldItem->data(Qt::UserRole).toInt() != gearInfo.gearId || // Different gearId
             oldItem->text() != item->text()) // Different Text (if gearId not set...)
           break;
         --rowStart;
@@ -796,9 +796,9 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
       else
         m_ui->twGear->setItem(row, 0, item);
 
-      if (gearInfo.chargeTypeId() != 0 && gearInfo.chargeTypeId() != -1) // hat Charge (and ignore only chargecounts)
+      if (gearInfo.chargeTypeId != 0 && gearInfo.chargeTypeId != -1) // hat Charge (and ignore only chargecounts)
       {
-        int chargeTypeId = gearInfo.chargeTypeId();
+        int chargeTypeId = gearInfo.chargeTypeId;
         if ((chargeTypeId & unknownTasId) == unknownTasId)
           item = new QTableWidgetItem(tr("Unknown charge id %1").arg(chargeTypeId & ~unknownTasId));
         else if (chargeTypeId == 0)
@@ -816,7 +816,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
         //UAE wepaons don't send needed telegrams.. so let's hack again..
         // in order to avoid the faulty SALTs let's hope they never send remaining ammunition below 100...
 #ifdef GUEZ_MODE
-        item = new QTableWidgetItem((gearInfo.remain() < 0) ? tr("N/A", "Blank Ammunition") : QString::number(gearInfo.remain()));
+        item = new QTableWidgetItem((gearInfo.remain < 0) ? tr("N/A", "Blank Ammunition") : QString::number(gearInfo.remain));
 #else
         if ( PROJECTBUILD == "ahtc")
         {
@@ -833,8 +833,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
         m_ui->twGear->setItem(row, 2, item);
       }
 
-      if (gearInfo.gearTypeId() == ParticipantInfoLtdGearComponent::LTD_ID && m_ltdGearComponent)
-        m_ltdGearComponent->addGear(gearInfo.gearId(), row);
+      if (gearInfo.gearTypeId == ParticipantInfoLtdGearComponent::LTD_ID && m_ltdGearComponent)
+        m_ltdGearComponent->addGear(gearInfo.gearId, row);
       row++;
     }
     m_ui->twGear->setRowCount(rowCount);
@@ -852,28 +852,28 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   }
   DEBUG_LOG(m_logger) << "### m_sanMatStock: " << m_sanMatStock.size();
 
-  DEBUG_LOG(m_logger) << "### data.sanitationMaterialStock(): " << data.sanitationMaterialStock().size();
-  DEBUG_LOG(m_logger) << "### data.participantId(): " << data.participantId();
-  DEBUG_LOG(m_logger) << "### data.sampleTime(): " << data.sampleTime();
+  DEBUG_LOG(m_logger) << "### data.sanitationMaterialStock(): " << data.sanitationMaterialStock.size();
+  DEBUG_LOG(m_logger) << "### data.participantId(): " << data.participantId;
+  DEBUG_LOG(m_logger) << "### data.sampleTime(): " << data.sampleTime;
 
   //sanMat
-  if (data.sanitationMaterialStock().size() == 0)
+  if (data.sanitationMaterialStock.size() == 0)
   {
     m_sanMatStock.clear();
     m_ui->twSanMat->clearContents();
     m_ui->gbSanitation->hide();
   }
-  else if (data.sanitationMaterialStock() != m_sanMatStock)
+  else if (data.sanitationMaterialStock != m_sanMatStock)
   {
-    DEBUG_LOG(m_logger) << "### data.qualification(): " << data.qualification();
-    DEBUG_LOG(m_logger) << "### data.sanitationUniqueId(): " << data.sanitationUniqueId();
+    DEBUG_LOG(m_logger) << "### data.qualification(): " << data.qualification;
+    DEBUG_LOG(m_logger) << "### data.sanitationUniqueId(): " << data.sanitationUniqueId;
 
     m_ui->gbSanitation->show();
-    m_ui->lblSanAssignState->setText(ParticipantManagement::toString(data.qualification().underlying()));
-    m_ui->lblSanUniqueID->setText(QString::number(data.sanitationUniqueId(),16));
-    m_ui->lblSanOriginatorEquipNo->setText(QString::number(data.sanitationOriginatorEquipNo()));
+    m_ui->lblSanAssignState->setText(ParticipantManagement::toString(data.qualification));
+    m_ui->lblSanUniqueID->setText(QString::number(data.sanitationUniqueId,16));
+    m_ui->lblSanOriginatorEquipNo->setText(QString::number(data.sanitationOriginatorEquipNo));
 
-    m_sanMatStock = data.sanitationMaterialStock();
+    m_sanMatStock = data.sanitationMaterialStock;
     std::vector<SanitationMaterial> tmpSanMatStock = m_sanMatStock;
 
     std::sort(tmpSanMatStock.begin(), tmpSanMatStock.end(), &compareSanMat); //sort
@@ -887,9 +887,9 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
 
     for (const SanitationMaterial &sanMat : tmpSanMatStock)
     {
-      QTableWidgetItem *item = new QTableWidgetItem(QString::number(sanMat.materialCount()));
+      QTableWidgetItem *item = new QTableWidgetItem(QString::number(sanMat.materialCount));
       m_ui->twSanMat->setItem(row, 0, item);
-      item = new QTableWidgetItem(ProjectDataManagement::trSanitationMaterialName(m_pdmDtc->sanitationMaterial(sanMat.materialId()).name()));
+      item = new QTableWidgetItem(ProjectDataManagement::trSanitationMaterialName(m_pdmDtc->sanitationMaterial(sanMat.materialId).name));
       m_ui->twSanMat->setItem(row, 1, item);
       row++;
     }
@@ -898,9 +898,9 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     m_ui->twSanMat->horizontalHeader()->resizeSection(1, 42);
   }
 
-  m_ui->tbNbc->setVisible(data.hasNbcProtectionConfigured() && data.hasNbcProtectionActive());
+  m_ui->tbNbc->setVisible(data.hasNbcProtectionConfigured && data.hasNbcProtectionActive);
 
-  if(data.sanitationMaterialStock().size() > 0 || (data.gear().size() > 0 && showForArtillery))
+  if(data.sanitationMaterialStock.size() > 0 || (data.gear.size() > 0 && showForArtillery))
     setBottomSpacerVisibility(true);
   else
     setBottomSpacerVisibility(false);
@@ -908,7 +908,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   updateIcon(m_participant);
 
   if (m_ltdGearComponent)
-    m_ltdGearComponent->updateData(data.designations());
+    m_ltdGearComponent->updateData(data.designations);
 }
 
 void ParticipantInfoDialog::showSpecialSensorData(int specialSensorData)
@@ -917,73 +917,73 @@ void ParticipantInfoDialog::showSpecialSensorData(int specialSensorData)
   QString strSpecialSensorData;
   switch (specialSensorDataState)
   {
-  case SpecialSensorStatus::ChemicalDetectionFunction_NotOperational:
+  case static_cast<int>(SpecialSensorStatus::ChemicalDetectionFunction_NotOperational):
     strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_NotOperational);
     break;
-  case SpecialSensorStatus::ChemicalDetectionFunction_Detecting:
+  case static_cast<int>(SpecialSensorStatus::ChemicalDetectionFunction_Detecting):
     strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_Detecting);
     break;
-  case SpecialSensorStatus::NBCDetectionAccessory_NotOperational:
+  case static_cast<int>(SpecialSensorStatus::NBCDetectionAccessory_NotOperational):
     strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_NotOperational);
     break;
-  case SpecialSensorStatus::NBCDetectionAccessory_Test:
+  case static_cast<int>(SpecialSensorStatus::NBCDetectionAccessory_Test):
     strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_Test);
     break;
-  case SpecialSensorStatus::NBCDetectionAccessory_DetectingAir:
+  case static_cast<int>(SpecialSensorStatus::NBCDetectionAccessory_DetectingAir):
     strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_DetectingAir);
     break;
-  case SpecialSensorStatus::AVLB_Mounted:
+  case static_cast<int>(SpecialSensorStatus::AVLB_Mounted):
     strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounted);
     break;
-  case SpecialSensorStatus::AVLB_Deployed:
+  case static_cast<int>(SpecialSensorStatus::AVLB_Deployed):
     strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deployed);
     break;
-  case SpecialSensorStatus::AVLB_Mounting:
+  case static_cast<int>(SpecialSensorStatus::AVLB_Mounting):
     strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounting);
     break;
-  case SpecialSensorStatus::AVLB_Deploying:
+  case static_cast<int>(SpecialSensorStatus::AVLB_Deploying):
     strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deploying);
     break;
-  case SpecialSensorStatus::MineLayer_Operational:
+  case static_cast<int>(SpecialSensorStatus::MineLayer_Operational):
     strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Operational);
     break;
-  case SpecialSensorStatus::MineLayer_Laying:
+  case static_cast<int>(SpecialSensorStatus::MineLayer_Laying):
     strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Laying);
     break;
-  case SpecialSensorStatus::MineClearingFunction_March:
+  case static_cast<int>(SpecialSensorStatus::MineClearingFunction_March):
     strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_March);
     break;
-  case SpecialSensorStatus::MineClearingFunction_ReadyToClear:
+  case static_cast<int>(SpecialSensorStatus::MineClearingFunction_ReadyToClear):
     strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_ReadyToClear);
     break;
-  case SpecialSensorStatus::MineClearingFunction_Clearing:
+  case static_cast<int>(SpecialSensorStatus::MineClearingFunction_Clearing):
     strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_Clearing);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_NotOperational:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_NotOperational):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_NotOperational);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_ParameterInput:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_ParameterInput):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ParameterInput);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_Deploying:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_Deploying):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Deploying);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_Resupply:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_Resupply):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Resupply);
     break;
-  case SpecialSensorStatus::MineTrowingFunction_FinishDeploying:
+  case static_cast<int>(SpecialSensorStatus::MineTrowingFunction_FinishDeploying):
     strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_FinishDeploying);
     break;
-  case SpecialSensorStatus::ADLER_Operational:
+  case static_cast<int>(SpecialSensorStatus::ADLER_Operational):
     strSpecialSensorData = toString(SpecialSensorStatus::ADLER_Operational);
     break;
-  case SpecialSensorStatus::ADLER_ConditionallyOperational:
+  case static_cast<int>(SpecialSensorStatus::ADLER_ConditionallyOperational):
     strSpecialSensorData = toString(SpecialSensorStatus::ADLER_ConditionallyOperational);
     break;
-  case SpecialSensorStatus::ADLER_NotOperational:
+  case static_cast<int>(SpecialSensorStatus::ADLER_NotOperational):
     strSpecialSensorData = toString(SpecialSensorStatus::ADLER_NotOperational);
     break;
 
@@ -1060,32 +1060,32 @@ void ParticipantInfoDialog::showSpecialSensorData(int specialSensorData)
 void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &position)
 {
   bool isOpsBuildingSource = false;
-  if (position.participantId() != m_participant.id() && position.participantId() != 0)
+  if (position.participantId != m_participant.id && position.participantId != 0)
     return;
 
-  if ( position.reportingSource() == Core::PositionReportingSource::OpsBuilding )
+  if ( position.reportingSource == Core::PositionReportingSource::OpsBuilding )
     isOpsBuildingSource = true;
 
 
   DEBUG_LOG(m_logger) << "reportingSource = OpsBuilding true" ;
   setBackgroundColor(m_ui->lblPositionData, Qt::lightGray, isOpsBuildingSource );
 
-  onUpdatePosition(position.participantId(), position.pos(), position.sampleTime());
+  onUpdatePosition(position.participantId, position.pos, position.sampleTime);
 
-  if (m_ismDtc && m_roomId != position.roomId())
+  if (m_ismDtc && m_roomId != position.roomId)
   {
-    if (position.roomId() > 0)
+    if (position.roomId > 0)
     {
-      const auto mse = m_ismDtc->mainStructureElement(position.buildingId());
+      const auto mse = m_ismDtc->mainStructureElement(position.buildingId);
       QString roomName;
-      for (const auto &room : mse.elements())
+      for (const auto &room : mse.elements)
       {
-        if (room.id() == position.roomId())
+        if (room.id == position.roomId)
         {
           // In the case of external OPS transmitters, the building name was output twice
-          if ( room.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room )
+          if ( room.structureElementTypeId != InfrastructureManagement::StructureElementType::Room )
             continue;
-          roomName = QString::fromStdString(room.displayName());
+          roomName = QString::fromStdString(room.displayName);
           break;
         }
       }
@@ -1093,16 +1093,16 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio
 
       m_ui->lblInBuildingInfo->setText(buildingName + QLatin1Char(' ') + roomName);
     }
-    m_ui->lblInBuildingInfo->setVisible(position.roomId() > 0);
-    m_roomId = position.roomId();
+    m_ui->lblInBuildingInfo->setVisible(position.roomId > 0);
+    m_roomId = position.roomId;
   }
 
-  if (position.mountedOn().is_set())
+  if (position.mountedOn.has_value())
   {
-    const auto mountedOnParticipant = m_dtc->participant(position.mountedOn().get());
+    const auto mountedOnParticipant = m_dtc->participant(position.mountedOn.get());
 
-    if (mountedOnParticipant.equipmentNumber().is_set())
-      m_ui->pbMounted->setText(QString::number(mountedOnParticipant.equipmentNumber().get()));
+    if (mountedOnParticipant.equipmentNumber.has_value())
+      m_ui->pbMounted->setText(QString::number(mountedOnParticipant.equipmentNumber.get()));
     else
       m_ui->pbMounted->setText(QString(QLatin1Char('0')));
     m_ui->pbMounted->show();
@@ -1111,31 +1111,31 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio
     connect(m_ui->pbMounted, &QToolButton::clicked, this, &ParticipantInfoDialog::onParticipantMountedOn);
   }
 
-  if (position.mountedParticipants().is_set())
+  if (position.mountedParticipants.has_value())
   {
-    m_ui->pbMounted->setText(QString::number(position.mountedParticipants().get().size()));
+    m_ui->pbMounted->setText(QString::number(position.mountedParticipants.get().size()));
     m_ui->pbMounted->show();
     disconnect(m_ui->pbMounted, nullptr, nullptr, nullptr);
     connect(m_ui->pbMounted, &QToolButton::clicked, this, &ParticipantInfoDialog::onMountedParticipants);
   }
 
   // hide button when both are not set
-  if (!position.mountedOn().is_set() && !position.mountedParticipants().is_set())
+  if (!position.mountedOn.has_value() && !position.mountedParticipants.has_value())
     m_ui->pbMounted->hide();
 
 }
 
 void ParticipantInfoDialog::onUnitPositionChanged(const UnitPosition &position)
 {
-  if (position.participantId() != m_participant.id() && position.participantId() != 0)
+  if (position.participantId != m_participant.id && position.participantId != 0)
     return;
 
   const bool bCenter = m_symbolAppearanceSettings &&
       (m_symbolAppearanceSettings->settings().symbolSettings.unitSymbolPosition == FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition::Center);
 
-  onUpdatePosition(position.participantId(),
-                   bCenter ? position.positionCenter() : position.positionLeader(),
-                   bCenter ? position.sampleTimeCenter() : position.sampleTimeLeader());
+  onUpdatePosition(position.participantId,
+                   bCenter ? position.positionCenter : position.positionLeader,
+                   bCenter ? position.sampleTimeCenter : position.sampleTimeLeader);
 
   m_ui->lblInBuildingInfo->hide();
   m_ui->pbMounted->hide();
@@ -1145,7 +1145,7 @@ void ParticipantInfoDialog::onUpdatePosition(int participantId, const Core::GeoP
 {
 
   m_lastPositionMSec = sampleTime;
-  if (participantId == 0 || std::isnan(position.lon()) || std::isnan(position.lat()))
+  if (participantId == 0 || std::isnan(position.lon) || std::isnan(position.lat))
   {
     m_ui->lblPositionData->setText(tr("Invalid Position"));
     m_ui->pbMovementTrack->hide();
@@ -1153,10 +1153,10 @@ void ParticipantInfoDialog::onUpdatePosition(int participantId, const Core::GeoP
   }
   else
   {
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
 
-    if (!qFuzzyIsNull(position.z()))
-      mgrs += QStringLiteral(" | ") + QString::number(position.z(), 'f', 2);
+    if (!qFuzzyIsNull(position.z))
+      mgrs += QStringLiteral(" | ") + QString::number(position.z, 'f', 2);
 
     m_ui->lblPositionData->setText(mgrs);
     m_ui->pbMovementTrack->show();
@@ -1168,7 +1168,7 @@ void ParticipantInfoDialog::onUpdatePosition(int participantId, const Core::GeoP
 
 void ParticipantInfoDialog::onParticipantChanged(const Participant &participant, DataModification modType)
 {
-  if (participant.id() != m_participant.id())
+  if (participant.id != m_participant.id)
     return;
 
   // Do not continue on modType == DataModification::eRemove
@@ -1176,10 +1176,10 @@ void ParticipantInfoDialog::onParticipantChanged(const Participant &participant,
   if (modType == DataModification::eRemoved)
     return;
 
-  if (m_participant.typeId() != participant.typeId())
+  if (m_participant.typeId != participant.typeId)
   {
-    m_ui->lblType->setText(ParticipantManagement::trTypeName(m_dtc->type(participant.typeId()).name()));
-    TypeClass typeClass   = m_dtc->type(participant.typeId()).typeClass();
+    m_ui->lblType->setText(ParticipantManagement::trTypeName(m_dtc->type(participant.typeId).name));
+    TypeClass typeClass   = m_dtc->type(participant.typeId).typeClass;
     // If TypeClass changes, close window. Shouldn't ever happen, but for initialization.
     if (m_typeClass != TypeClass::Unknown && m_typeClass != typeClass)
     {
@@ -1187,43 +1187,43 @@ void ParticipantInfoDialog::onParticipantChanged(const Participant &participant,
     }
     m_typeClass = typeClass;
   }
-  if (m_participant.partyId() != participant.partyId())
-    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_dtc->party(participant.partyId()).name()));
+  if (m_participant.partyId != participant.partyId)
+    m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_dtc->party(participant.partyId).name));
 
   m_participant = participant;
 
-  m_ui->lblHierarchy->setText(m_dtc->hierarchyFromParticipant(m_participant.id()));
-  m_ui->lblDesignator->setText(QString::fromStdString(m_participant.designator()));
-  m_ui->lblTactitcalIdentifier->setText(QString::fromStdString(m_participant.tacticalIdentifier()));
+  m_ui->lblHierarchy->setText(m_dtc->hierarchyFromParticipant(m_participant.id));
+  m_ui->lblDesignator->setText(QString::fromStdString(m_participant.designator));
+  m_ui->lblTactitcalIdentifier->setText(QString::fromStdString(m_participant.tacticalIdentifier));
 
-  if (participant.equipmentNumber().is_set())
-    m_ui->lblEquipNr->setText(QString::number(m_participant.equipmentNumber().get()));
+  if (participant.equipmentNumber.has_value())
+    m_ui->lblEquipNr->setText(QString::number(m_participant.equipmentNumber.get()));
   else
     m_ui->lblEquipNr->setText(QLatin1String("-"));
 
 #ifdef LTS_DEBUG
-  m_ui->lblEquipNr->setToolTip(QString::number(m_participant.id()));
+  m_ui->lblEquipNr->setToolTip(QString::number(m_participant.id));
 #endif
 
   //hide Info if not exists
-  m_ui->lblInfoText->setText(QString::fromStdString(m_participant.info()));
-  m_ui->lblInfoText->setVisible(m_participant.info().size() > 0);
-  m_ui->lblInfo->setVisible(m_participant.info().size() > 0);
+  m_ui->lblInfoText->setText(QString::fromStdString(m_participant.info));
+  m_ui->lblInfoText->setVisible(m_participant.info.size() > 0);
+  m_ui->lblInfo->setVisible(m_participant.info.size() > 0);
 
-  onDynamicParticipantDataChanged(m_dtc->dynamicParticipantData(m_participant.id()));
+  onDynamicParticipantDataChanged(m_dtc->dynamicParticipantData(m_participant.id));
 }
 
 
 void ParticipantInfoDialog::onTypeChanged(const Type &type, DataModification)
 {
-  if (m_participant.typeId() != type.id())
+  if (m_participant.typeId != type.id)
     return;
-  m_ui->lblType->setText(ParticipantManagement::trTypeName(type.name()));
+  m_ui->lblType->setText(ParticipantManagement::trTypeName(type.name));
 }
 
 void ParticipantInfoDialog::updateCurrentIcon()
 {
-  if (m_participant.id() == 0)
+  if (m_participant.id == 0)
     return;
   updateIcon(m_participant);
 }
@@ -1250,7 +1250,7 @@ void ParticipantInfoDialog::setSanitationLabelColor(SanitationResult proceduresD
 {
   QPalette pal = QApplication::palette(m_ui->lbKind);
   QString toolTip;
-  switch (proceduresDone.underlying())
+  switch (proceduresDone)
   {
   case SanitationResult::NoEffect:
     return;
@@ -1273,7 +1273,7 @@ void ParticipantInfoDialog::setSanitationLabelColor(SanitationResult proceduresD
   case SanitationResult::deprecatedNA:
     break;
   }
-  DEBUG_LOG(m_logger) << "Set Color to: " << proceduresDone.underlying();
+  DEBUG_LOG(m_logger) << "Set Color to: " << proceduresDone;
   m_ui->lblKind->setPalette(pal);
   m_ui->lblKind->setAutoFillBackground(true);
   m_ui->lblKind->setToolTip(toolTip);
@@ -1346,7 +1346,7 @@ void ParticipantInfoDialog::onSymbolAppearanceSettingsChanged(FilterManagement::
   if (m_typeClass != TypeClass::Unit &&
       m_typeClass != TypeClass::SupportUnit)
     return;
-  onUnitPositionChanged(m_dtc->unitPosition(m_participant.id()));
+  onUnitPositionChanged(m_dtc->unitPosition(m_participant.id));
 }
 
 void ParticipantInfoDialog::setBackgroundColor(QWidget *w,  Qt::GlobalColor  color, bool bSetColor)
@@ -1371,27 +1371,27 @@ void ParticipantInfoDialog::setBackgroundColor(QWidget *w,  Qt::GlobalColor  col
 
 void ParticipantInfoDialog::onOpenSetStatusDialog()
 {
-  ParticipantConfigDialog *diag = new ParticipantConfigDialog(m_participant.id(), ParticipantConfigDialog::DialogType::Config, this);
+  ParticipantConfigDialog *diag = new ParticipantConfigDialog(m_participant.id, ParticipantConfigDialog::DialogType::Config, this);
   if (diag->init(m_session, m_dtc, m_ftc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantConfig") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantConfig") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
 
 void ParticipantInfoDialog::onOpenSetInjuryDialog()
 {
-  ParticipantSetInjuryDialog *diag = new ParticipantSetInjuryDialog(m_participant.id(), this);
+  ParticipantSetInjuryDialog *diag = new ParticipantSetInjuryDialog(m_participant.id, this);
   if (diag->init(m_session, m_dtc, m_ftc, m_pdmDtc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantSetInjury") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantSetInjury") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
 
 void ParticipantInfoDialog::onOpenSetSanitationDialog()
 {
-  ParticipantSetSanitationDialog *diag = new ParticipantSetSanitationDialog(m_participant.id(), this);
+  ParticipantSetSanitationDialog *diag = new ParticipantSetSanitationDialog(m_participant.id, this);
   if (diag->init(m_session, m_dtc, m_ftc, m_pdmDtc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantSetSanitationDialog") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantSetSanitationDialog") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
@@ -1412,8 +1412,8 @@ void ParticipantInfoDialog::onOpenHistory()
 
 
   ParticipantHistoryDialog *diag = new ParticipantHistoryDialog(this);
-  if (diag->init(m_participant.id(), m_dtc, m_pdmDtc, m_aesDtc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantHistory") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+  if (diag->init(m_participant.id, m_dtc, m_pdmDtc, m_aesDtc))
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantHistory") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
@@ -1421,18 +1421,18 @@ void ParticipantInfoDialog::onOpenHistory()
 void ParticipantInfoDialog::onOpenBite()
 {
   const bool bWithSelfTest = QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
-  ParticipantBiteDialog *diag = new ParticipantBiteDialog(m_participant.id(), this);
+  ParticipantBiteDialog *diag = new ParticipantBiteDialog(m_participant.id, this);
   if (diag->init(m_dtc, m_ftc, m_pdmDtc, bWithSelfTest))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantBit") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eInfoTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantBit") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eInfoTab);
   else
     delete diag;
 }
 
 void ParticipantInfoDialog::onOpenMessage()
 {
-  ParticipantConfigDialog *diag = new ParticipantConfigDialog(m_participant.id(), ParticipantConfigDialog::DialogType::Message, this);
+  ParticipantConfigDialog *diag = new ParticipantConfigDialog(m_participant.id, ParticipantConfigDialog::DialogType::Message, this);
   if (diag->init(m_session, m_dtc, m_ftc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantMessage") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantMessage") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 
@@ -1441,26 +1441,26 @@ void ParticipantInfoDialog::onOpenMessage()
 void ParticipantInfoDialog::onFindOnMap()
 {
   if (m_sitMapGuiIfc)
-    m_sitMapGuiIfc->centerMapToParticipant(m_participant.id());
+    m_sitMapGuiIfc->centerMapToParticipant(m_participant.id);
 }
 
 void ParticipantInfoDialog::onMovementTrack()
 {
   if (m_sitMapGuiIfc)
-    m_sitMapGuiIfc->enableMovementTrack(m_participant.id(), m_ui->pbMovementTrack->isChecked());
+    m_sitMapGuiIfc->enableMovementTrack(m_participant.id, m_ui->pbMovementTrack->isChecked());
 }
 
 void ParticipantInfoDialog::onParticipantMountedOn()
 {
   if (m_ppmGuiIfc)
-    m_ppmGuiIfc->showParticipantInfoWindow(m_dtc->participant(m_dtc->participantPosition(m_participant.id()).mountedOn().get()).id());
+    m_ppmGuiIfc->showParticipantInfoWindow(m_dtc->participant(m_dtc->participantPosition(m_participant.id).mountedOn.get()).id);
 }
 
 void ParticipantInfoDialog::onMountedParticipants()
 {
-  ParticipantsMountedTableDialog *diag = new ParticipantsMountedTableDialog(m_participant.id(), this);
+  ParticipantsMountedTableDialog *diag = new ParticipantsMountedTableDialog(m_participant.id, this);
   if (diag->init(m_dtc, m_ppmGuiIfc))
-    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantsMounted") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+    addDialog(diag, m_menuGroup, QStringLiteral("ParticipantsMounted") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
@@ -1491,7 +1491,7 @@ void ParticipantInfoDialog::onPartitionTimeChanged(qint64 newPartitionTime)
 void ParticipantInfoDialog::onGearRanges()
 {
   if (m_sitMapGuiIfc)
-    m_sitMapGuiIfc->enableGearRanges(m_participant.id(), m_ui->pbGearRanges->isChecked());
+    m_sitMapGuiIfc->enableGearRanges(m_participant.id, m_ui->pbGearRanges->isChecked());
 }
 
 ///////////////////////////////////////////////
@@ -1514,13 +1514,13 @@ bool ParticipantInfoDialog::initTargetConfig(bool bShow)
 
     // Combobox Mode:
     m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::Deactivated),
-                                TargetManagement::Mode::Deactivated);
+                                static_cast<int>(TargetManagement::Mode::Deactivated));
     m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootBack),
-                                TargetManagement::Mode::ShootBack);
+                                static_cast<int>(TargetManagement::Mode::ShootBack));
     m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootFirst),
-                                TargetManagement::Mode::ShootFirst);
+                                static_cast<int>(TargetManagement::Mode::ShootFirst));
     m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::NoWeapon),
-                                TargetManagement::Mode::NoWeapon);
+                                static_cast<int>(TargetManagement::Mode::NoWeapon));
 
     connect(m_ui->btTarget, &QToolButton::clicked, this, &ParticipantInfoDialog::onTargetConfig);
     connect(m_ui->cbTargetMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
@@ -1569,9 +1569,9 @@ void ParticipantInfoDialog::onTargetConfig()
 
   TargetManagement::ConfigureTargetRequest request;
 
-  request.id(0);
-  request.participantId(m_participant.id());
-  request.tgtCommand(TargetManagement::TgtCommand::RequestTechnicalState);
+  request.id = 0;
+  request.participantId = m_participant.id;
+  request.tgtCommand = TargetManagement::TgtCommand::RequestTechnicalState;
 
   auto cb = [request, this]()
   {
@@ -1584,17 +1584,17 @@ void ParticipantInfoDialog::onTargetConfigChanged(const TargetManagement::Target
 {
   if (modType == DataModification::eRemoved)
     return;
-  INFO_LOG(m_logger) << "onTargetConfigChanged participantId = " << m_participant.id()
-                     << " data.participantId = " << data.participantId();
-  if (data.participantId() != m_participant.id())
+  INFO_LOG(m_logger) << "onTargetConfigChanged participantId = " << m_participant.id
+                     << " data.participantId = " << data.participantId;
+  if (data.participantId != m_participant.id)
     return;
 
   m_ui->lbTargetMode->setVisible(true);
   m_ui->lbTargetWeapon->setVisible(true);
   m_ui->cbTargetMode->setVisible(true);
   m_ui->cbTargetWeapon->setVisible(true);
-  m_ui->cbTargetMode->setCurrentIndex(m_ui->cbTargetMode->findData(data.mode().underlying()));
-  m_ui->cbTargetWeapon->setCurrentIndex(m_ui->cbTargetWeapon->findData(data.weapon()));
+  m_ui->cbTargetMode->setCurrentIndex(m_ui->cbTargetMode->findData(static_cast<int>(data.mode)));
+  m_ui->cbTargetWeapon->setCurrentIndex(m_ui->cbTargetWeapon->findData(data.weapon));
 } // end of onTargetConfigChanged
 
 void ParticipantInfoDialog::onTargetModeChangeed()
@@ -1604,13 +1604,13 @@ void ParticipantInfoDialog::onTargetModeChangeed()
   INFO_LOG(m_logger) << "onTargetModeChangeed";
   TargetManagement::ConfigureTargetRequest request;
 
-  request.id(0);
-  request.participantId(m_participant.id());
-  request.tgtCommand(TargetManagement::TgtCommand::SetMode);
+  request.id = 0;
+  request.participantId = m_participant.id;
+  request.tgtCommand = TargetManagement::TgtCommand::SetMode;
   int modeInt = m_ui->cbTargetMode->currentData().toInt();
   TargetManagement::Mode mode = static_cast <TargetManagement::Mode>(modeInt);
   INFO_LOG(m_logger) << "onTargetModeChangeed=" <<  mode;
-  request.mode(mode);
+  request.mode = mode;
 
   auto cb = [request, this]()
   {
@@ -1625,11 +1625,11 @@ void ParticipantInfoDialog::onTargetWeaponChanged()
     return;
   TargetManagement::ConfigureTargetRequest request;
 
-  request.id(0);
-  request.participantId(m_participant.id());
-  request.tgtCommand(TargetManagement::TgtCommand::SetWeapon);
-  request.weapon(m_ui->cbTargetWeapon->currentData().toInt());
-  INFO_LOG(m_logger) << "onTargetWeaponChangeed = " <<  request.weapon();
+  request.id = 0;
+  request.participantId = m_participant.id;
+  request.tgtCommand = TargetManagement::TgtCommand::SetWeapon;
+  request.weapon = m_ui->cbTargetWeapon->currentData().toInt();
+  INFO_LOG(m_logger) << "onTargetWeaponChangeed = " <<  request.weapon;
 
   auto cb = [request, this]()
   {
@@ -1642,8 +1642,8 @@ void ParticipantInfoDialog::onOpenTargetConfigurationL400()
 {
   // ParticipantTargetConfigurationDialog -> L400
   ParticipantTargetConfigurationDialog* diag = new ParticipantTargetConfigurationDialog(this);
-  if (diag->init(m_participant.id(), m_dtc, m_ftc, m_sitMapGuiIfc))
-    addDialog(diag, m_menuGroup, QStringLiteral("TargetConfigurationL400") + QString::number(m_participant.id()), LtsWidgets::LayoutArea::eDialogTab);
+  if (diag->init(m_participant.id, m_dtc, m_ftc, m_sitMapGuiIfc))
+    addDialog(diag, m_menuGroup, QStringLiteral("TargetConfigurationL400") + QString::number(m_participant.id), LtsWidgets::LayoutArea::eDialogTab);
   else
     delete diag;
 }
@@ -1657,15 +1657,15 @@ void ParticipantInfoDialog::onContextMenuRequested(const QPoint &position)
 
   GearInformation &gear = m_gearList[pointedItem->row()];
 
-  DEBUG_LOG(m_logger) << "gear type selected = " << gear.gearTypeId();
-  DEBUG_LOG(m_logger) << "gear Id = " << gear.gearId();
+  DEBUG_LOG(m_logger) << "gear type selected = " << gear.gearTypeId;
+  DEBUG_LOG(m_logger) << "gear Id = " << gear.gearId;
 
   QList<QAction*> actions;
 
-  if (m_pdmDtc->canRestock(gear.gearTypeId()))
+  if (m_pdmDtc->canRestock(gear.gearTypeId))
   {
     QAction *restockNowAction = new QAction(tr("Restock Defaults"), this);
-    connect(restockNowAction, &QAction::triggered, this, [=](){ onRestockNow(gear.gearId(), gear.gearTypeId()); });
+    connect(restockNowAction, &QAction::triggered, this, [=](){ onRestockNow(gear.gearId, gear.gearTypeId); });
     actions << restockNowAction;
   }
 
@@ -1705,24 +1705,24 @@ void ParticipantInfoDialog::onRestockDefaults(int gearId, int gearTypeId)
 void ParticipantInfoDialog::onUasChanged(const UAS &uas)
 {
   // check if changed uas is this uas, on this participant, in this exercise
-  if (uas.id() != m_uasId || uas.exerciseId() != m_session->exerciseId() || uas.participantId() != m_participant.id())
+  if (uas.id != m_uasId || uas.exerciseId != m_session->exerciseId() || uas.participantId != m_participant.id)
   {
     return;
   }
 
   // set text & text color for uas operating mode
-  const QString operatingMode(ProjectDataManagement::toString(uas.uasState()));
+  const QString operatingMode(ProjectDataManagement::toString(uas.uasState));
   static const QString textHtml { QStringLiteral("<font color='%1'>%2</font>") };
 
-  switch (uas.uasState().underlying())
+  switch (uas.uasState)
   {
-    case ProjectDataManagement::UasState::Auto:
+    case ProjectDataManagement::UasState::UasState_Auto:
     {
       m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("green")).arg(operatingMode));
       break;
     }
 
-    case ProjectDataManagement::UasState::Manual:
+    case ProjectDataManagement::UasState::UasState_Manual:
     {
       m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("orange")).arg(operatingMode));
       break;
@@ -1738,24 +1738,24 @@ void ParticipantInfoDialog::onUasChanged(const UAS &uas)
 
 void ParticipantInfoDialog::onUnlockUAS()
 {
-  UAS uas = m_dtc->getUasByParticipantId(m_participant.id(), m_session->exerciseId());
-  m_uasId = uas.id();
-  DEBUG_LOG(m_logger)<<" -- onUnlockUAS uasId: "<< uas.id() <<" /// participantId: "<<uas.participantId()<<" /// equipmentNumber: "<<m_participant.equipmentNumber();
+  UAS uas = m_dtc->getUasByParticipantId(m_participant.id, m_session->exerciseId());
+  m_uasId = uas.id;
+  DEBUG_LOG(m_logger)<<" -- onUnlockUAS uasId: "<< uas.id <<" /// participantId: "<<uas.participantId<<" /// equipmentNumber: "<<m_participant.equipmentNumber;
 
-  if (uas.id() <= 0 )
+  if (uas.id <= 0 )
   {
-    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid uasId: "<<uas.id()<<" !!!";
+    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid uasId: "<<uas.id<<" !!!";
     return;
   }
-  if (!m_participant.equipmentNumber().is_set())
+  if (!m_participant.equipmentNumber.has_value())
   {
-    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id()<<" !!!";
+    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id<<" !!!";
     return;
   }
   ModifyUasStateRequest req;
-  req.uasId(uas.id());
-  req.uasState(ProjectDataManagement::UasState::Auto);
-  req.equipmentNumber(m_participant.equipmentNumber().get());
+  req.uasId = uas.id;
+  req.uasState = ProjectDataManagement::UasState::UasState_Auto;
+  req.equipmentNumber = m_participant.equipmentNumber.get();
   auto cb = [req, this]()
   {
     return m_ftc->modifyUasStateRequest(req, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
index b3dd00382..cb10f1bd6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
@@ -479,43 +479,43 @@ void InterfaceImpl::onNewFollowEquipment(const int equipmentNumber, const int pa
 
 void InterfaceImpl::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onParticipantPositionChanged id=" << data.participantId()
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged id=" << data.participantId
                       << " m_followParticipantId=" <<  m_followParticipantId ;
   if (m_followParticipantId == 0)
     return;
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId;
     
   }
   else
   {
-    if (data.participantId() == m_followParticipantId)
+    if (data.participantId == m_followParticipantId)
     {
-      DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId();
+      DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId;
       DEBUG_LOG(m_logger) << "onParticipantPositionChanged()"
-                          << " participantId; " << data.participantId()
-                          << " participantTypeId: " << data.participantTypeId()
-                          << " partyId: " << data.partyId();
+                          << " participantId; " << data.participantId
+                          << " participantTypeId: " << data.participantTypeId
+                          << " partyId: " << data.partyId;
       if (m_sitMapGuiIfc)
-        m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos().lon(), data.pos().lat()));
+        m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos.lon, data.pos.lat));
     }
   }
 } 
 
 void InterfaceImpl::onUnitPositionChanged(const ParticipantManagement::UnitPosition &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onUnitPositionChanged id=" << data.participantId()
+  DEBUG_LOG(m_logger) << "onUnitPositionChanged id=" << data.participantId
                       << " m_followParticipantId=" <<  m_followParticipantId ;
   if (m_followParticipantId == 0)
     return;
   if (modType == DataModification::eRemoved)
     return;
-  if (data.participantId() == m_followParticipantId)
+  if (data.participantId == m_followParticipantId)
   {
-    DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId()
+    DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId
                         << ", onUnitPositionChanged()"
-                        << " participantId; " << data.participantId();
+                        << " participantId; " << data.participantId;
     if (m_sitMapGuiIfc)
     {
       const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
@@ -525,9 +525,9 @@ void InterfaceImpl::onUnitPositionChanged(const ParticipantManagement::UnitPosit
       const bool bCenter = m_symbolAppearanceSettings &&
           (m_symbolAppearanceSettings->settings().symbolSettings.unitSymbolPosition == FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition::Center);
       if (bCenter)
-        m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionCenter().lon(), data.positionCenter().lat()));
+        m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionCenter.lon, data.positionCenter.lat));
       else
-        m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionLeader().lon(), data.positionLeader().lat()));
+        m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionLeader.lon, data.positionLeader.lat));
     }
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_helper.h
index 43ee2e449..d968d91bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_helper.h
@@ -3,6 +3,7 @@
 
 #pragma once
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ParticipantManagement
@@ -11,15 +12,15 @@ namespace ParticipantManagement
 inline bool compareGear(const GearInformation &a,
   const GearInformation &b)
 {
-  if (a.gearId() != b.gearId())
-    return a.gearId() < b.gearId();
-  return a.chargeTypeId() < b.chargeTypeId();
+  if (a.gearId != b.gearId)
+    return a.gearId < b.gearId;
+  return a.chargeTypeId < b.chargeTypeId;
 }
 
 inline bool compareSanMat(const SanitationMaterial &a,
   const SanitationMaterial &b)
 {
-  return a.materialId() < b.materialId();
+  return a.materialId < b.materialId;
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
index 5828528ac..eadace912 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
@@ -2,9 +2,11 @@
 
 
 #include "participant_info_ltd_gear_component.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtWidgets/QTableWidget>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <LtsWidgets/lts_led_widget.h>
 
@@ -26,7 +28,7 @@ void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignat
 
   for (const LaserDesignation &laserDesignation : newData)
   {
-    if (m_rowPerGearId.contains(laserDesignation.gearId()))
+    if (m_rowPerGearId.contains(laserDesignation.gearId))
       updateRow(laserDesignation);
   }
 
@@ -61,11 +63,11 @@ void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDes
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << ": " << laserDesignation;
 
-  if (!m_rowPerGearId.contains(laserDesignation.gearId()) || !m_rowPerGearId.value(laserDesignation.gearId()).isValid())
+  if (!m_rowPerGearId.contains(laserDesignation.gearId) || !m_rowPerGearId.value(laserDesignation.gearId).isValid())
     return;
 
-  m_rowPerGearId.value(laserDesignation.gearId()).chargeType->setText(QString::number(laserDesignation.code()));
-  m_rowPerGearId.value(laserDesignation.gearId()).remain->setStatus(laserDesignation.outputPower());
+  m_rowPerGearId.value(laserDesignation.gearId).chargeType->setText(QString::number(laserDesignation.code));
+  m_rowPerGearId.value(laserDesignation.gearId).remain->setStatus(laserDesignation.outputPower);
 }
 
 void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<LaserDesignation> &newData)
@@ -77,7 +79,7 @@ void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<Laser
 
   for (auto it = m_rowPerGearId.constBegin(); it != m_rowPerGearId.constEnd(); ++it)
   {
-    auto findIt = std::find_if(newData.begin(), newData.end(), [it](const LaserDesignation &laserDesignation) { return laserDesignation.gearId() == it.key(); });
+    auto findIt = std::find_if(newData.begin(), newData.end(), [it](const LaserDesignation &laserDesignation) { return laserDesignation.gearId == it.key(); });
 
     if (findIt == newData.end())
       updateRow({it.key(), {}, 0, .0});
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
index e1aea0257..764cd1f16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
@@ -21,6 +21,7 @@ ParticipantInfoTableDialog::ParticipantInfoTableDialog(const QString &menuGroup,
   , m_infoTableModel(nullptr)
   , m_sortFilterProxyModel(nullptr)
   , m_visibleColumns()
+  , m_logger(getLogger("ParticipantInfoTableDialog"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.h
index e3353c20d..d3aff877e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.h
@@ -13,6 +13,7 @@
 
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
index a5b35e5ed..1442e316a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
@@ -28,6 +28,7 @@ ParticipantInfoTableModel::ParticipantInfoTableModel(QObject *parent)
   , m_partitionTime(0)
   , m_timeoutCheckTimer(new QTimer(this))
   , m_bWithPositionandBiteResult(true)
+  , m_logger(getLogger("ParticipantInfoTableModel"))
 {
   m_timeoutCheckTimer->setSingleShot(false);
   connect(m_timeoutCheckTimer, &QTimer::timeout,
@@ -83,7 +84,7 @@ void ParticipantInfoTableModel::initializeDataView()
   m_vecData.clear();
   auto cb = [this](const Participant &p)
   {
-    if (!p.equipmentNumber().is_set() || p.equipmentNumber().get() == 0)
+    if (!p.equipmentNumber.has_value() || p.equipmentNumber.get() == 0)
       return;
     m_vecData += setInfoData(p);
   };
@@ -131,7 +132,7 @@ QVariant ParticipantInfoTableModel::data(const QModelIndex &index, int role) con
       static const QIcon yellow(QLatin1String("icon:yellow_light.svg"));
       static const QIcon red(QLatin1String("icon:red_light.svg"));
 
-      switch (data.vulnerabilityState.underlying())
+      switch (data.vulnerabilityState)
       {
       case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
         return green;
@@ -194,7 +195,7 @@ void ParticipantInfoTableModel::updateDataView(const QSet<int> &participantIds)
   std::function<bool(const ParticipantManagement::Participant &)> cb =
       [this, &participantIdsToAdd](const ParticipantManagement::Participant &part)
   {
-    auto it = participantIdsToAdd.find(part.id());
+    auto it = participantIdsToAdd.find(part.id);
     if (it != participantIdsToAdd.end())
     {
       participantIdsToAdd.erase(it);
@@ -212,7 +213,7 @@ void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement
 {
   DEBUG_LOG(m_logger) << "**** participantDataChanged";
 
-  const int row = findRowForId(data.participantId());
+  const int row = findRowForId(data.participantId);
   if (row < 0)
     return;
 
@@ -222,11 +223,11 @@ void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement
   case DataModification::eModified:
   {
     ParticipantInfo info = getRowData(row);
-    if (info.participantId != data.participantId())
+    if (info.participantId != data.participantId)
       fillParticipantContent(info, data);
 
-    info.vulnerabilityState = m_ppmDtc->youngestStateInformation(data.stateHistory()).vulnerabilityState();
-    info.isManipulated = data.manipulation().size();
+    info.vulnerabilityState = m_ppmDtc->youngestStateInformation(data.stateHistory).vulnerabilityState;
+    info.isManipulated = data.manipulation.size();
     setRowData(row, info);
     break;
   }
@@ -240,7 +241,7 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
 {
   ParticipantInfo data;
 
-  const int participantId = part.id();
+  const int participantId = part.id;
   fillParticipantContent(data, part);
 
   if (m_bWithPositionandBiteResult)
@@ -249,19 +250,19 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
     std::function<bool(const ParticipantManagement::Bite &)> cbBite =
         [&participantBite, participantId](const ParticipantManagement::Bite &bite)
     {
-      if (participantId != bite.participantId())
+      if (participantId != bite.participantId)
         return false;
       participantBite = bite;
       return true;
     };
     m_ppmDtc->bites(cbBite);
     data.biteResult = biteStringFromBite(participantBite);
-    data.biteSampleTime = participantBite.sampleTime();
+    data.biteSampleTime = participantBite.sampleTime;
 
     std::function<bool(const ParticipantManagement::ParticipantPosition &data)> cbPos =
         [this, &data, participantId](const ParticipantManagement::ParticipantPosition &pos)
     {
-      if (participantId != pos.participantId())
+      if (participantId != pos.participantId)
         return false;
       updatePosition(data, pos);
       return true;
@@ -270,10 +271,10 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
   }
 
   const auto dynPart = m_ppmDtc->dynamicParticipantData(participantId);
-  data.vulnerabilityState = m_ppmDtc->youngestStateInformation(dynPart.stateHistory()).vulnerabilityState();
-  data.isManipulated  = dynPart.manipulation().size() != 0;
-  data.designator = QString::fromStdString(part.designator());
-  data.tacticalIdentifier = QString::fromStdString(part.tacticalIdentifier());
+  data.vulnerabilityState = m_ppmDtc->youngestStateInformation(dynPart.stateHistory).vulnerabilityState;
+  data.isManipulated  = dynPart.manipulation.size() != 0;
+  data.designator = QString::fromStdString(part.designator);
+  data.tacticalIdentifier = QString::fromStdString(part.tacticalIdentifier);
 
   return data;
 }
@@ -285,7 +286,7 @@ void ParticipantInfoTableModel::onPositionChanged(const ParticipantManagement::P
       (modType != DataModification::eModified))
     return;
 
-  const int row = findRowForId(position.participantId());
+  const int row = findRowForId(position.participantId);
   if (row < 0)
     return;
   ParticipantInfo &info = m_vecData[row];
@@ -300,11 +301,11 @@ void ParticipantInfoTableModel::onBiteChanged(const ParticipantManagement::Bite
       (modType != DataModification::eModified))
     return;
 
-  const int row = findRowForId(bite.participantId());
+  const int row = findRowForId(bite.participantId);
   if (row < 0)
     return;
   ParticipantInfo &info = m_vecData[row];
-  info.biteSampleTime = bite.sampleTime();
+  info.biteSampleTime = bite.sampleTime;
   info.biteResult = biteStringFromBite(bite);
 
   emit dataChanged(index(row, BiteResult), index(row, BiteResult), {Qt::BackgroundRole, Qt::DisplayRole});
@@ -321,7 +322,7 @@ void ParticipantInfoTableModel::onPartyChanged(const ParticipantManagement::Part
   if (modType == DataModification::eRemoved)
     return;
   if (m_ppmGuiCbxIfc)
-    m_partyIcons[party.id()] = m_ppmGuiCbxIfc->pixmapFromParty(QColor::fromRgb(QRgb(party.color())));
+    m_partyIcons[party.id] = m_ppmGuiCbxIfc->pixmapFromParty(QColor::fromRgb(QRgb(party.color)));
 }
 
 void ParticipantInfoTableModel::onTimeoutCheck()
@@ -343,32 +344,32 @@ void ParticipantInfoTableModel::onTimeoutCheck()
 void ParticipantInfoTableModel::fillParticipantContent(ParticipantInfo &info,
                                                        const ParticipantManagement::DynamicParticipantData &data) const
 {
-  fillParticipantContent(info, m_ppmDtc->participant(data.participantId()));
+  fillParticipantContent(info, m_ppmDtc->participant(data.participantId));
 }
 
 void ParticipantInfoTableModel::fillParticipantContent(ParticipantInfo &info,
                                                        const ParticipantManagement::Participant &part) const
 
 {
-  info.participantId = part.id();
-  info.equipmentNumber = part.equipmentNumber().is_set() ? part.equipmentNumber().get() : 0;
-  info.partyId = part.partyId();
-  info.typeClass = m_ppmDtc->type(part.typeId()).typeClass();
+  info.participantId = part.id;
+  info.equipmentNumber = part.equipmentNumber.has_value() ? part.equipmentNumber.get() : 0;
+  info.partyId = part.partyId;
+  info.typeClass = m_ppmDtc->type(part.typeId).typeClass;
 }
 
 void ParticipantInfoTableModel::updatePosition(ParticipantInfo &info,
                                                const ParticipantManagement::ParticipantPosition &position) const
 {
-  if (!std::isnan(position.pos().lon()) && !std::isnan(position.pos().lat()))
+  if (!std::isnan(position.pos.lon) && !std::isnan(position.pos.lat))
   {
-    info.positionString = LtsCoordTrans::mgrsFromGeographic(position.pos().lon(),
-                                                            position.pos().lat());
-    if (!qFuzzyIsNull(position.pos().z()))
-      info.positionString.append(QStringLiteral(" ") + QString::number(position.pos().z(), 'f', 2));
+    info.positionString = LtsCoordTrans::mgrsFromGeographic(position.pos.lon,
+                                                            position.pos.lat);
+    if (!qFuzzyIsNull(position.pos.z))
+      info.positionString.append(QStringLiteral(" ") + QString::number(position.pos.z, 'f', 2));
   }
   else
     info.positionString = tr("Invalid position");
-  info.positionSampleTime = position.sampleTime();
+  info.positionSampleTime = position.sampleTime;
   info.isOutdated = isOutdated(info.positionSampleTime);
 }
 
@@ -379,12 +380,12 @@ bool ParticipantInfoTableModel::isOutdated(qint64 sampleTime) const
 
 QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagement::Bite &bite) const
 {
-  if (!(bite.sampleTime() > 0))
+  if (!(bite.sampleTime > 0))
     return tr("--");
 
-  bool bitStat    = bite.biteState() != bite.configState();
-  bool batW       = bite.batteryState() > 0;
-  bool confError  = bite.configError();
+  bool bitStat    = bite.biteState != bite.configState;
+  bool batW       = bite.batteryState > 0;
+  bool confError  = bite.configError;
   if (!bitStat && !batW && !confError )
     return tr("Ok");
 
@@ -401,8 +402,8 @@ QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagemen
 QString ParticipantInfoTableModel::vulnerabilityStateString(const ParticipantInfo &data)
 {
   const ProjectDataManagement::VulnerabilityClass vc = data.typeClass == ParticipantManagement::TypeClass::Human ?
-        ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-        ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
   return ProjectDataManagement::toString(data.vulnerabilityState, vc);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
index 9db8f9615..3e47162ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
@@ -19,6 +19,7 @@ ParticipantSearchDialog::ParticipantSearchDialog(QWidget *parent)
   , m_dtc(nullptr)
   , m_ppmCbxIfc(nullptr)
   , m_ui(new Ui::ParticipantSearchDialog)
+  , m_logger(getLogger("ParticipantSearchDialog"))
 {
   m_ui->setupUi(this);
   m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
@@ -172,7 +173,7 @@ void ParticipantSearchDialog::updateObjectIndicator()
     m_sitMapGuiIfc->removeObjectIndicator();
 }
 
-void ParticipantSearchDialog::enterEvent(QEvent *e)
+void ParticipantSearchDialog::enterEvent(QEnterEvent *e)
 {
   BaseClass::enterEvent(e);
   updateObjectIndicator();
@@ -198,10 +199,10 @@ int ParticipantSearchDialog::onSelectionChanged()
 
   ParticipantManagement::ParticipantData data;
   data = m_model->getParticipantData(index);
-  if (!data.equipmentNumber().is_set())
+  if (!data.equipmentNumber.has_value())
     return -1;
 
-  return data.equipmentNumber().get();
+  return data.equipmentNumber.get();
 }
 
 void ParticipantSearchDialog::onDoubleClicked()
@@ -212,9 +213,9 @@ void ParticipantSearchDialog::onDoubleClicked()
   data = m_model->getParticipantData(index);
 
   if (m_ppmGuiIfc)
-    m_ppmGuiIfc->showParticipantInfoWindow(data.id());
+    m_ppmGuiIfc->showParticipantInfoWindow(data.id);
   if (m_ocParticipantInfoIfc)
-    m_ocParticipantInfoIfc->showOcParticipantInfoWindow(data.id());
+    m_ocParticipantInfoIfc->showOcParticipantInfoWindow(data.id);
 }
 
 void ParticipantSearchDialog::clearSelections()
@@ -257,8 +258,8 @@ void ParticipantSearchDialog::fillMapFromDtc()
   m_participantMap.clear();
   auto cb = [this](const Participant & data)
   {
-    if (data.equipmentNumber().is_set())
-      m_participantMap.insert(data.equipmentNumber().get(), data.id());
+    if (data.equipmentNumber.has_value())
+      m_participantMap.insert(data.equipmentNumber.get(), data.id);
   };
   m_dtc->participants(cb);
 }
@@ -317,8 +318,8 @@ void ParticipantSearchDialog::fillParticipantMapFromTree(const QModelIndex &pare
     fillParticipantMapFromTree(m_model->index(row, 0, parent));
 
   const ParticipantManagement::ParticipantData data(m_model->getParticipantData(parent));
-  if (data.equipmentNumber().is_set())
-    m_participantMap.insert(data.equipmentNumber().get(), data.id());
+  if (data.equipmentNumber.has_value())
+    m_participantMap.insert(data.equipmentNumber.get(), data.id);
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.h
index 1f4999952..018d5fd77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.h
@@ -20,6 +20,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 
 
@@ -52,7 +53,7 @@ public:
 private slots:
   void slotLookup();
   void updateObjectIndicator();
-  void enterEvent(QEvent *e) override;
+  void enterEvent(QEnterEvent *e) override;
   void leaveEvent(QEvent *e) override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.cpp
index 05b707048..f3ebbcf0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.cpp
@@ -25,27 +25,27 @@ void ParticipantSearchWidget::onOkay()
 }
 void ParticipantSearchWidget::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  const int newEqId = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
+  const int newEqId = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const int oldEqId = m_partId2EqId.value(data.id());
+    const int oldEqId = m_partId2EqId.value(data.id);
     if (oldEqId == newEqId)
       return;
     if (oldEqId != 0)
       m_eqId2PartId.remove(oldEqId);
     if (newEqId == 0)
       return;
-    m_partId2EqId[data.id()] = newEqId;
-    m_eqId2PartId[newEqId] = data.id();
+    m_partId2EqId[data.id] = newEqId;
+    m_eqId2PartId[newEqId] = data.id;
     break;
   }
   case DataModification::eRemoved:
   {
-    const int oldEqId = m_partId2EqId.value(data.id());
-    m_partId2EqId.remove(data.id());
+    const int oldEqId = m_partId2EqId.value(data.id);
+    m_partId2EqId.remove(data.id);
     if (oldEqId != 0)
       m_eqId2PartId.remove(oldEqId);
   }
@@ -59,11 +59,11 @@ bool ParticipantSearchWidget::init(const std::shared_ptr<ParticipantManagement::
 
   auto cb = [this](const Participant &data)
   {
-    if (!data.equipmentNumber().is_set())
+    if (!data.equipmentNumber.has_value())
       return;
-    const int newEqId = data.equipmentNumber().get();
-    m_partId2EqId[data.id()] = newEqId;
-    m_eqId2PartId[newEqId] = data.id();
+    const int newEqId = data.equipmentNumber.get();
+    m_partId2EqId[data.id] = newEqId;
+    m_eqId2PartId[newEqId] = data.id;
   };
   dtc->participants(cb);
   connect(dtc.get(), &Interface::Dtc::participantChanged,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
index f1346c3ff..9972b42b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
@@ -6,6 +6,7 @@
 #include <QtCore/QMap>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 enum class DataModification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp
index 209bd53ca..063ea77af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp
@@ -27,6 +27,7 @@ ParticipantSetInjuryDialog::ParticipantSetInjuryDialog(int participantId, QWidge
   , m_bgBodypart(nullptr)
   , m_bgSide(nullptr)
   , m_ui(new Ui::ParticipantSetInjuryDialog)
+  , m_logger(getLogger("ParticipantSetInjuryDialog"))
 {
   m_ui->setupUi(this);
 }
@@ -57,10 +58,10 @@ bool ParticipantSetInjuryDialog::init(LtsSession::LtsSession *session,
   m_dtcPdm->waitForHistoricalDataSanitationInjuryPlace2(1000);
 
   const Participant participant = m_dtc->participant(m_participantId);
-  if (participant.equipmentNumber().is_set())
-    m_eqId = participant.equipmentNumber().get();
+  if (participant.equipmentNumber.has_value())
+    m_eqId = participant.equipmentNumber.get();
 
-  if (m_dtc->type(participant.typeId()).typeClass() != TypeClass::Human)
+  if (m_dtc->type(participant.typeId).typeClass != TypeClass::Human)
     return false;
   auto vec = vulnerabilityStatesForTypeClass(TypeClass::Human);
   if (!vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage)
@@ -127,8 +128,8 @@ void ParticipantSetInjuryDialog::createButtonGroups()
   m_bgInjury = new QButtonGroup(this);
   for (const auto &injuryKind : std::as_const(m_injuryKind))
   {
-    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryKindName(injuryKind.name()), this);
-    m_bgInjury->addButton(rb, injuryKind.id());
+    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryKindName(injuryKind.name), this);
+    m_bgInjury->addButton(rb, injuryKind.id);
     m_ui->gbInjury->layout()->addWidget(rb);
   }
   
@@ -139,8 +140,8 @@ void ParticipantSetInjuryDialog::createButtonGroups()
   m_bgBodypart = new QButtonGroup(this);
   for (const auto &injuryplace1 : std::as_const(m_injuryPlace1))
   {
-    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace1Name(injuryplace1.name()), this);
-    m_bgBodypart->addButton(rb, injuryplace1.id());
+    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace1Name(injuryplace1.name), this);
+    m_bgBodypart->addButton(rb, injuryplace1.id);
     m_ui->gbBodyPart->layout()->addWidget(rb);
   }
   
@@ -151,29 +152,29 @@ void ParticipantSetInjuryDialog::createButtonGroups()
   m_bgSide = new QButtonGroup(this);
   for (const auto &injuryplace2 : std::as_const(m_injuryPlace2))
   {
-    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace2Name(injuryplace2.name()), this);
-    m_bgSide->addButton(rb, injuryplace2.id());
+    rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace2Name(injuryplace2.name), this);
+    m_bgSide->addButton(rb, injuryplace2.id);
     m_ui->gbSide->layout()->addWidget(rb);
   }
   
   item = new QSpacerItem(2,2,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
   m_ui->gbSide->layout()->addItem(item);
 
-  connect(m_bgInjury,  QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ParticipantSetInjuryDialog::checkRadioStatesBody);
-  connect(m_bgBodypart,  QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ParticipantSetInjuryDialog::checkRadioStatesSides);
+  connect(m_bgInjury,  &QButtonGroup::buttonClicked, this, &ParticipantSetInjuryDialog::checkRadioStatesBody);
+  connect(m_bgBodypart,  &QButtonGroup::buttonClicked, this, &ParticipantSetInjuryDialog::checkRadioStatesSides);
  
 }
 
 void ParticipantSetInjuryDialog::setOldData(const DynamicParticipantData &data)
 {
-  if (data.stateHistory().size() == 0)
+  if (data.stateHistory.size() == 0)
     return;
 
-  const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory());
+  const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory);
   
   
 
-  int index = m_ui->cbState->findData(lastState.vulnerabilityState().underlying());
+  int index = m_ui->cbState->findData(static_cast<int>(lastState.vulnerabilityState));
 
   DEBUG_LOG(m_logger) << "Old vulnerability state = " << index;
 
@@ -206,14 +207,14 @@ void ParticipantSetInjuryDialog::checkRadioStatesBody()
   bool firstAvailable = true;
   for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
   {
-    if (injury.kind() ==  m_bgInjury->checkedId())
+    if (injury.kind ==  m_bgInjury->checkedId())
     {
       if (firstAvailable)
       {
-        m_bgBodypart->button(injury.place1())->setChecked(true);
+        m_bgBodypart->button(injury.place1)->setChecked(true);
         firstAvailable = false;
       }
-      m_bgBodypart->button(injury.place1())->setEnabled(true);
+      m_bgBodypart->button(injury.place1)->setEnabled(true);
     }
   }
 
@@ -230,8 +231,8 @@ void ParticipantSetInjuryDialog::checkRadioStatesSides()
 
   for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
   {
-    if (injury.kind() ==  m_bgInjury->checkedId() && injury.place1() ==  m_bgBodypart->checkedId())
-      m_bgSide->button(injury.place2())->setEnabled(true);
+    if (injury.kind ==  m_bgInjury->checkedId() && injury.place1 ==  m_bgBodypart->checkedId())
+      m_bgSide->button(injury.place2)->setEnabled(true);
   }
   if(!m_bgSide->button(1)->isEnabled())
     m_bgSide->button(0)->setChecked(true);
@@ -261,27 +262,27 @@ void ParticipantSetInjuryDialog::checkState()
 
   for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
   {
-    if (injury.kind() ==  m_bgInjury->checkedId() && injury.place1() ==  m_bgBodypart->checkedId() && injury.place2() == m_bgSide->checkedId())
+    if (injury.kind ==  m_bgInjury->checkedId() && injury.place1 ==  m_bgBodypart->checkedId() && injury.place2 == m_bgSide->checkedId())
     {
 
-      switch (injury.vbg())
+      switch (injury.vbg)
       {
       case 1:
       {
-        if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::LightDamage) < 1)
-          m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState::LightDamage);
+        if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage)) < 1)
+          m_ui->cbState->addItem(lightDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage));
         break;
       }
       case 2:
       {
-        if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::MediumDamage) < 1)
-          m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState::MediumDamage);
+        if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage)) < 1)
+          m_ui->cbState->addItem(mediumDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage));
         break;
       }
       case 3:
       {
-        if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::HeavyDamage) < 1)
-          m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState::HeavyDamage);
+        if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage)) < 1)
+          m_ui->cbState->addItem(heavyDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage));
         break;
       }
       }
@@ -323,13 +324,13 @@ bool ParticipantSetInjuryDialog::apply()
   const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cbState->currentData().toInt());
 
   ModifyStateRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.vulnerabilityState(state);
-  req.participantIds({m_participantId});
-  req.vulnerabilityKind(getInjuryBit());
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.vulnerabilityState = state;
+  req.participantIds = {m_participantId};
+  req.vulnerabilityKind = getInjuryBit();
 
-  DEBUG_LOG(m_logger) << "Saving vulnerability state = " << req.vulnerabilityState();
-  DEBUG_LOG(m_logger) << "Saving vulnerability kind = " << req.vulnerabilityKind();
+  DEBUG_LOG(m_logger) << "Saving vulnerability state = " << req.vulnerabilityState;
+  DEBUG_LOG(m_logger) << "Saving vulnerability kind = " << req.vulnerabilityKind;
 
   return m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
index bc8883eba..7db237d1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
@@ -16,6 +16,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp
index f1bc88f79..1d3a3120d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp
@@ -18,6 +18,7 @@ ParticipantSetSanitationDialog::ParticipantSetSanitationDialog(int participantId
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_participantId(participantId)
   , m_ui(new Ui::ParticipantSetSanitationDialog)
+  , m_logger(getLogger("ParticipantSetSanitationDialog"))
 {
   m_ui->setupUi(this);
   m_uiRequirements->addRequirement({ m_ui->lbl, [this]()
@@ -60,8 +61,8 @@ bool ParticipantSetSanitationDialog::init(LtsSession::LtsSession *session, const
   dtcPdm->waitForHistoricalDataSanitationProcedure(2000);
 
   const Participant participant = m_dtc->participant(m_participantId);
-  if (participant.equipmentNumber().is_set())
-    m_eqId = participant.equipmentNumber().get();
+  if (participant.equipmentNumber.has_value())
+    m_eqId = participant.equipmentNumber.get();
 
   fillCb();
   connect(m_ui->cbQualification, qOverload<int>(&QComboBox::currentIndexChanged), this, &ParticipantSetSanitationDialog::onQualificationChanged);
@@ -95,14 +96,14 @@ void ParticipantSetSanitationDialog::fillCb()
 
   for (const auto &proc : procs)
   {
-    QGroupBox *box = getGroupBox(proc.type());
+    QGroupBox *box = getGroupBox(proc.type);
     if (!box)
       continue;
     QCheckBox *cbx = new QCheckBox(this);
     
-    cbx->setText(ProjectDataManagement::trSanitationProcedureName(proc.name()));
-    cbx->setProperty("dataCode",proc.dataCode());
-    cbx->setProperty("qualification",proc.minimumQualification());
+    cbx->setText(ProjectDataManagement::trSanitationProcedureName(proc.name));
+    cbx->setProperty("dataCode",static_cast<qint64>(proc.dataCode));
+    cbx->setProperty("qualification",proc.minimumQualification);
     box->layout()->addWidget(cbx);
     m_procedures.append(cbx);
   }
@@ -190,15 +191,15 @@ bool ParticipantSetSanitationDialog::apply()
 {
 
   SetSanitationRequest req;
-  req.id(m_participantId);
+  req.id = m_participantId;
   SanitationData sanDat;
-  sanDat.sanitationProceduresTaken(getProcedures());
-  sanDat.qualification(static_cast<Qualification>(m_ui->cbQualification->currentData().toInt()));
-  sanDat.originatorEquipmentNumber(0);
-  req.data(sanDat);
+  sanDat.sanitationProceduresTaken = getProcedures();
+  sanDat.qualification = static_cast<Qualification>(m_ui->cbQualification->currentData().toInt());
+  sanDat.originatorEquipmentNumber = 0;
+  req.data = sanDat;
 
-  DEBUG_LOG(m_logger) << "Medic treatment: qualification = " << sanDat.qualification();
-  DEBUG_LOG(m_logger) << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken();
+  DEBUG_LOG(m_logger) << "Medic treatment: qualification = " << sanDat.qualification;
+  DEBUG_LOG(m_logger) << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken;
 
   return m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.h
index fc8d19ca3..89b2bf491 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.h
@@ -10,6 +10,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
index 068d61d59..435513542 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
@@ -27,15 +27,16 @@ AreaModel::AreaModel(QObject *parent)
   tr("Coords")
 },
 parent)
+  , m_logger(getLogger("AreaModel"))
 {}
 
 
 bool AreaModel::initModel(const TargetInformation &targetInformation)
 {
   
-  INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
+  INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas.size();
 
-  for (auto singleArea : std::as_const(targetInformation.shootbackAreas()))
+  for (auto singleArea : std::as_const(targetInformation.shootbackAreas))
     onShootbackAreaChanged(singleArea, DataModification::eAdded);
 
   
@@ -95,7 +96,7 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
   if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
   {
     if (index.column() == Name)
-      return QString::fromStdString(shootbackArea.identifier());
+      return QString::fromStdString(shootbackArea.identifier);
   }
 
   switch (index.column())
@@ -103,7 +104,7 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
   case Id:
     return 0; 
   case Name:
-    return QString::fromStdString(shootbackArea.identifier());
+    return QString::fromStdString(shootbackArea.identifier);
   case Coords:
   {
     return QVariant();
@@ -126,7 +127,7 @@ void AreaModel::updateColumnFilter()
 {
   m_usedNames.clear();
   for (const ShootbackArea &item : std::as_const(m_vecData))
-    m_usedNames.insert(QString::fromStdString(item.identifier()));
+    m_usedNames.insert(QString::fromStdString(item.identifier));
 }
 
 
@@ -155,7 +156,7 @@ bool AreaProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
   
     
   case AreaModel::Columns::Name:
-    return left.identifier() < right.identifier();
+    return left.identifier < right.identifier;
 
   
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.h
index 9df24da5a..f1675a64e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.h
@@ -5,6 +5,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
index 8c16efebd..ebd1f943a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
@@ -1,6 +1,7 @@
 
 
 #include "participant_target_config_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ui_participant_target_config_dialog.h"
 #include <LtsSession/lts_session_data.h>
@@ -26,7 +27,7 @@ Core::GeoPosition2D convert(const QPointF &coord)
 
 QPointF convert(const Core::GeoPosition2D &geoPos)
 {
-  return QPointF(geoPos.lon(), geoPos.lat());
+  return QPointF(geoPos.lon, geoPos.lat);
 }
 
 
@@ -35,6 +36,7 @@ ParticipantTargetConfigurationDialog::ParticipantTargetConfigurationDialog(QWidg
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ParticipantTargetConfigurationDialog)
+  , m_logger(getLogger("ParticipantTargetConfigurationDialog"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
@@ -50,8 +52,8 @@ ParticipantTargetConfigurationDialog::~ParticipantTargetConfigurationDialog()
 
 void ParticipantTargetConfigurationDialog::retranslate()
 {
-  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_participantId).equipmentNumber();
-  const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
+  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_participantId).equipmentNumber;
+  const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
 
   translate(m_ui, id, false, tr("Target Configuration"));
 }
@@ -61,7 +63,7 @@ bool ParticipantTargetConfigurationDialog::apply()
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   ModifyTargetInformationRequest req;
-  req.targetInfo(m_targetInformation);  
+  req.targetInfo = m_targetInformation;  
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " update m_targetInformation: " << m_targetInformation;
 
@@ -129,7 +131,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
   
   
   
-  pdd.participantId(m_participantId);
+  pdd.participantId = m_participantId;
 
   connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged,
           this, &ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged);
@@ -143,7 +145,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
 
   const std::function<bool(const TargetInformation &data)> cb = [this](const TargetInformation & data) -> bool
   {
-    if (data.participantId() == m_participantId)
+    if (data.participantId == m_participantId)
     {
       m_targetInformation = data;
       return true; 
@@ -152,13 +154,13 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
   };
   m_dtc->targetInformations(cb);
 
-  if (m_targetInformation.participantId() > 0)
+  if (m_targetInformation.participantId > 0)
   {
     onTargetInformationChanged(m_targetInformation, DataModification::eAdded); 
   } else {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " targetInformation not found for participantId = " << m_participantId
                         << " - use default.";
-    m_targetInformation.participantId(m_participantId);  
+    m_targetInformation.participantId = m_participantId;  
   }
 
   setupConnections();
@@ -174,7 +176,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
 
 void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const DynamicParticipantData &dynData, DataModification modType)
 {
-  if (m_participantId != dynData.participantId())
+  if (m_participantId != dynData.participantId)
     return;
 
   switch (modType)
@@ -185,11 +187,11 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory());
-    const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
+    const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory);
+    const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState;
     const ProjectDataManagement::VulnerabilityState vulStateType = static_cast<ProjectDataManagement::VulnerabilityState>(vulState);
 
-    int idx = m_ui->cb_status->findData(vulStateType);
+    int idx = m_ui->cb_status->findData(static_cast<int>(vulStateType));
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: vulState=" << vulState;
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: setCurrentIndex idx=" << idx;
     m_ui->cb_status->setCurrentIndex(idx);
@@ -201,7 +203,7 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
 
 void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const TargetInformation &data, DataModification modType)
 {
-  if (m_participantId != data.participantId())
+  if (m_participantId != data.participantId)
     return;
 
   switch (modType)
@@ -233,21 +235,21 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
   if (newParticipantState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
   {
     InitParticipantRequest req;
-    req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-    req.restockCharges(true);
-    req.resetManipulation(true);
-    req.resetVulnerabilityState(true);
-    req.participantIds({m_participantId});
+    req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+    req.restockCharges = true;
+    req.resetManipulation = true;
+    req.resetVulnerabilityState = true;
+    req.participantIds = {m_participantId};
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->initParticipantRequest(req, this);
     });
   } else {
     ModifyStateRequest req;
-    req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-    req.vulnerabilityState(newParticipantState);
+    req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+    req.vulnerabilityState = newParticipantState;
 
-    req.participantIds({m_participantId});
+    req.participantIds = {m_participantId};
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->modifyStateRequest(req, this);
@@ -301,16 +303,16 @@ void ParticipantTargetConfigurationDialog::fillStatusComboBox()
 {
   std::list<ProjectDataManagement::VulnerabilityState> cont;
   cont = {
-    ProjectDataManagement::VulnerabilityState::NoChange,                 
-    ProjectDataManagement::VulnerabilityState::CombatReady,
-        ProjectDataManagement::VulnerabilityState::CatastrophicKill
+    ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange,                 
+    ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady,
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
   };
 
   m_ui->cb_status->clear();
   for (auto item : std::as_const(cont))
   {
     ProjectDataManagement::VulnerabilityState st = item;
-    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
+    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
     m_ui->cb_status->addItem(str, static_cast<int>(item));
   }
   
@@ -320,17 +322,17 @@ void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox()
 {
   std::list<ProjectDataManagement::VulnerabilityState> cont;
   cont = {
-    ProjectDataManagement::VulnerabilityState::NoChange,              
-        ProjectDataManagement::VulnerabilityState::MobilityKill,
-        ProjectDataManagement::VulnerabilityState::NearMiss,
-        ProjectDataManagement::VulnerabilityState::CatastrophicKill
+    ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange,              
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill,
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss,
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
   };
 
   m_ui->cb_prewarningEffect->clear();
   for (auto item : std::as_const(cont))
   {
     ProjectDataManagement::VulnerabilityState st = item;
-    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
+    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
     m_ui->cb_prewarningEffect->addItem(str, static_cast<int>(item));
   }
   m_ui->cb_prewarningEffect->setCurrentIndex(1);
@@ -340,15 +342,15 @@ void ParticipantTargetConfigurationDialog::fillTakeDownEffectComboBox()
 {
   std::list<ProjectDataManagement::VulnerabilityState> cont;
   cont = {
-        ProjectDataManagement::VulnerabilityState::MobilityKill,      
-        ProjectDataManagement::VulnerabilityState::CatastrophicKill
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill,      
+        ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
   };
 
   m_ui->cb_takeDownEffect->clear();
   for (auto item : std::as_const(cont))
   {
     ProjectDataManagement::VulnerabilityState st = item;
-    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
+    QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
     m_ui->cb_takeDownEffect->addItem(str, static_cast<int>(item));
   }
   m_ui->cb_takeDownEffect->setCurrentIndex(1);
@@ -408,24 +410,24 @@ void ParticipantTargetConfigurationDialog::onGuiChanged()
 
 
   
-  hasChanged |= updateValue(m_targetInformation.silhouette(), m_ui->cb_silhouette->currentData().toInt());
+  hasChanged |= updateValue(m_targetInformation.silhouette, m_ui->cb_silhouette->currentData().toInt());
 
   
-  hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_prewarningEffect->currentData().toInt()) );
-  hasChanged |= updateValue(m_targetInformation.prewarningInterval(), m_ui->sb_prewarningInterval->value());
+  hasChanged |= updateValue(m_targetInformation.prewarningEffect, static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_prewarningEffect->currentData().toInt()) );
+  hasChanged |= updateValue(m_targetInformation.prewarningInterval, m_ui->sb_prewarningInterval->value());
 
-  hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_takeDownEffect->currentData().toInt()) );
-  hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value());
+  hasChanged |= updateValue(m_targetInformation.takedownEffect, static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_takeDownEffect->currentData().toInt()) );
+  hasChanged |= updateValue(m_targetInformation.takedownInterval, m_ui->sb_takeDownInterval->value());
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
 
   
   const std::vector<ParticipantManagement::ShootbackArea> &modelAreasStdVec = m_areaModel.getDataStdVector();
-  if (modelAreasStdVec != m_targetInformation.shootbackAreas())
+  if (modelAreasStdVec != m_targetInformation.shootbackAreas)
   {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
     hasChanged = true;
-    m_targetInformation.shootbackAreas(modelAreasStdVec);
+    m_targetInformation.shootbackAreas = modelAreasStdVec;
   }
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " slotChangesMade sChanged=" << hasChanged;
@@ -444,20 +446,20 @@ void ParticipantTargetConfigurationDialog::onDataChanged()
 
 
 
-  idx = m_ui->cb_silhouette->findData(QVariant(m_targetInformation.silhouette()));
+  idx = m_ui->cb_silhouette->findData(QVariant(m_targetInformation.silhouette));
   m_ui->cb_silhouette->setCurrentIndex(idx);
 
   
-  m_ui->sb_prewarningInterval->setValue(m_targetInformation.prewarningInterval());
-  idx = m_ui->cb_prewarningEffect->findData(QVariant(m_targetInformation.prewarningEffect().underlying()));
+  m_ui->sb_prewarningInterval->setValue(m_targetInformation.prewarningInterval);
+  idx = m_ui->cb_prewarningEffect->findData(QVariant(static_cast<int>(m_targetInformation.prewarningEffect)));
   m_ui->cb_prewarningEffect->setCurrentIndex(idx);
 
-  m_ui->sb_takeDownInterval->setValue(m_targetInformation.takedownInterval());
-  idx = m_ui->cb_takeDownEffect->findData(QVariant(m_targetInformation.takedownEffect().underlying()));
+  m_ui->sb_takeDownInterval->setValue(m_targetInformation.takedownInterval);
+  idx = m_ui->cb_takeDownEffect->findData(QVariant(static_cast<int>(m_targetInformation.takedownEffect)));
   m_ui->cb_takeDownEffect->setCurrentIndex(idx);
 
   
-  const std::vector<ShootbackArea>& areas = m_targetInformation.shootbackAreas();
+  const std::vector<ShootbackArea>& areas = m_targetInformation.shootbackAreas;
   QVector<ShootbackArea> qVec = QVector<ShootbackArea>(areas.begin(), areas.end());
   m_areaModel.setData(qVec);
 
@@ -485,19 +487,19 @@ QPolygonF areaToPolygon(const ShootbackArea &area)
   QPolygonF coordinates;
   QPointF point;
 
-  point = convert(area.coord1());
+  point = convert(area.coord1);
   if (!point.isNull())
     coordinates.append(point);
 
-  point = convert(area.coord2());
+  point = convert(area.coord2);
   if (!point.isNull())
     coordinates.append(point);
 
-  point = convert(area.coord3());
+  point = convert(area.coord3);
   if (!point.isNull())
     coordinates.append(point);
 
-  point = convert(area.coord4());
+  point = convert(area.coord4);
   if (!point.isNull())
     coordinates.append(point);
   return coordinates;
@@ -613,12 +615,12 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
   ShootbackArea newArea;
 
 
-  newArea.coord1( convert(poly.at(0)) );
-  newArea.coord2( convert(poly.at(1)) );
+  newArea.coord1 = convert(poly.at(0));
+  newArea.coord2 = convert(poly.at(1));
   if (poly.size() > 2)
-    newArea.coord3( convert(poly.at(2)) );
+    newArea.coord3 = convert(poly.at(2));
   if (poly.size() > 3)
-    newArea.coord4( convert(poly.at(3)) );
+    newArea.coord4 = convert(poly.at(3));
 
   if (m_rubberbandEditMode)
   {
@@ -626,13 +628,13 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
     if (!curIdx.isValid())
       return;
     ShootbackArea temp = m_areaModel.getRowData(curIdx.row());
-    newArea.identifier(temp.identifier());
+    newArea.identifier = temp.identifier;
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "updating newArea = " << newArea;
     m_areaModel.setRowData(curIdx.row(), newArea);
   } else {
     
     int size = m_areaModel.rowCount();
-    newArea.identifier(QString(QStringLiteral("Area_%1")).arg(size).toStdString());
+    newArea.identifier = QString(QStringLiteral("Area_%1")).arg(size).toStdString();
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " adding tempArea = " << newArea;
     m_areaModel.insertRow(newArea);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
index 47d101ac0..995ef5a8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
@@ -9,6 +9,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_dialog.cpp
index c1a59f48e..f480d35ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_dialog.cpp
@@ -13,6 +13,7 @@ ParticipantsMountedTableDialog::ParticipantsMountedTableDialog(int32_t carrierId
   , m_ppmGuiIfc(nullptr)
   , m_mountedTableModel(nullptr)
   , m_ui(new Ui::ParticipantsMountedTableDialog)
+  , m_logger(getLogger("ParticipantsMountedTableDialog"))
 {
   m_ui->setupUi(this);
 }
@@ -47,14 +48,14 @@ void ParticipantsMountedTableDialog::onShowTlnInfo()
 
   DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
   const QModelIndex idx = m_ui->tvMountedParticipants->currentIndex();
-  const int id = m_mountedTableModel->getRowData(idx.row()).id();
+  const int id = m_mountedTableModel->getRowData(idx.row()).id;
   m_ppmGuiIfc->showParticipantInfoWindow(id);
 }
 
 void ParticipantsMountedTableDialog::retranslate()
 {
-  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_carrierId).equipmentNumber();
-  const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
+  const dds::core::optional<int32_t> eqId = m_dtc->participant(m_carrierId).equipmentNumber;
+  const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
 
   translate(m_ui, id, false, tr("participants on vehicle")); 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.cpp
index f18c6a17e..1c4a7906f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.cpp
@@ -37,9 +37,9 @@ void ParticipantsMountedTableModel::reInitModel()
 
   ParticipantPosition pos = m_dtc->participantPosition(m_carrierId);
 
-  if (pos.mountedParticipants().is_set())
-    for (size_t idx = 0; idx < pos.mountedParticipants().get().size(); ++idx)
-      insertRow(m_dtc->participant(pos.mountedParticipants().get().at(idx)));
+  if (pos.mountedParticipants.has_value())
+    for (size_t idx = 0; idx < pos.mountedParticipants.get().size(); ++idx)
+      insertRow(m_dtc->participant(pos.mountedParticipants.get().at(idx)));
 }
 
 QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role) const
@@ -51,13 +51,13 @@ QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role)
   switch (index.column())
   {
   case 0:
-    return participant.equipmentNumber().is_set()?participant.equipmentNumber().get():0;
+    return participant.equipmentNumber.has_value()?participant.equipmentNumber.get():0;
   case 1:
-    return ParticipantManagement::trPartyName(m_dtc->party(participant.partyId()).name());
+    return ParticipantManagement::trPartyName(m_dtc->party(participant.partyId).name);
   case 2:
-    return QString::fromStdString(participant.designator());
+    return QString::fromStdString(participant.designator);
   case 3:
-    return QString::fromStdString(participant.tacticalIdentifier());
+    return QString::fromStdString(participant.tacticalIdentifier);
   default:
     break;
   }
@@ -68,7 +68,7 @@ QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role)
 void ParticipantsMountedTableModel::onPositionChanged(const ParticipantPosition &data, DataModification modType)
 {
   if (modType != DataModification::eRemoved)
-    if (data.participantId() == m_carrierId)
+    if (data.participantId == m_carrierId)
       reInitModel();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.h
index b9c1e548e..30aeef9c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participants_mounted_table_model.h
@@ -5,6 +5,7 @@
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ParticipantManagement {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.cpp
index 87e7c4786..24e1cfa90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.cpp
@@ -2,6 +2,7 @@
 
 
 #include "combat_power.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_combat_power.h"
 
 namespace ParticipantManagement
@@ -16,6 +17,7 @@ CombatPower::CombatPower(QWidget *parent)
   , m_ppmGuiCbxIfc(nullptr)
   , m_ppmGuiInfoIfc(nullptr)
   , m_ui(new Ui::CombatPower)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CombatPower"))
 {
   m_ui->setupUi(this);
 
@@ -92,10 +94,10 @@ void CombatPower::onOpenInfo(int id)
 void CombatPower::onUpdateParticipant(const Participant &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
-  if (data.partyId() != m_ui->cbParty->currentData().toInt())
+  if (data.partyId != m_ui->cbParty->currentData().toInt())
     return;
   if (modType == DataModification::eModified)
-    m_orgChart->updateParticipant(data.id());
+    m_orgChart->updateParticipant(data.id);
   else
     onPartyChanged();
 }
@@ -103,10 +105,10 @@ void CombatPower::onUpdateParticipant(const Participant &data, DataModification
 void CombatPower::onUpdateDynamicParticipantData(const DynamicParticipantData &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
-  if (m_dtc->participant(data.participantId()).partyId() != m_ui->cbParty->currentData().toInt())
+  if (m_dtc->participant(data.participantId).partyId != m_ui->cbParty->currentData().toInt())
     return;
   if (modType == DataModification::eModified)
-    m_orgChart->updateParticipant(data.participantId());
+    m_orgChart->updateParticipant(data.participantId);
   else
     onPartyChanged();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
index 0bea606c2..89c0e5f64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
@@ -2,6 +2,7 @@
 
 
 #include "org_chart_main.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ui_org_chart_main.h"
 #include <QtCore/QBuffer>
@@ -34,6 +35,7 @@ OrgChartMain::OrgChartMain(LtsSession::LtsSession *session
   , m_isTemplate(false)
   , m_party(-1)
   , m_ui(new Ui::OrgChartMain)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("OrgChartMain"))
 {
   m_ui->setupUi(this);
   m_buttonBox->getButton(LtsWidgets::DialogButton::Close)->hide();
@@ -89,8 +91,8 @@ void OrgChartMain::updateButtonMimeData()
     if (partyId > 0)
     {
       AdvancedSymbology::SymbolDataToRender symDataToRender(symbolString);
-      symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role());
-      symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
+      symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role);
+      symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
       symDataToRender.fillColorReplace = true;
       symbolWatcher->setSymbolResult(m_asbIfc->findImage(symDataToRender));
     }
@@ -109,7 +111,7 @@ QColor OrgChartMain::currentPartyColor()
     partyId = m_ui->cbParty->currentData().toInt();
 
   if (partyId > 0)
-    color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
+    color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " color=" << color.name()
                       << " (partyId = " << partyId << ")"
@@ -129,7 +131,7 @@ AdvancedSymbology::Role OrgChartMain::currentPartyRole()
     partyId = m_ui->cbParty->currentData().toInt();
 
   if (partyId > 0)
-    role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
+    role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role);
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                       << " (partyId = " << partyId << ")"
@@ -281,12 +283,12 @@ bool OrgChartMain::initButtons()
   const QMap<qint32, Type> mapTypes = m_dtc->types();
   for (const Type &type : mapTypes)
   {
-    if ((!m_asSupportService && (type.typeClass() == TypeClass::SupportUnit || type.typeClass() == TypeClass::SupportEntity))
-        || (m_asSupportService  && (type.typeClass() != TypeClass::SupportUnit && type.typeClass() != TypeClass::SupportEntity)))
+    if ((!m_asSupportService && (type.typeClass == TypeClass::SupportUnit || type.typeClass == TypeClass::SupportEntity))
+        || (m_asSupportService  && (type.typeClass != TypeClass::SupportUnit && type.typeClass != TypeClass::SupportEntity)))
       continue;
-    plAction.menuGroup = ParticipantManagement::toString(type.typeClass());
-    plAction.identifier = QString::fromStdString(type.name()) + QString::number(type.equipmentTypeId());
-    plAction.menuText = QString::fromStdString(type.name());
+    plAction.menuGroup = ParticipantManagement::toString(type.typeClass);
+    plAction.identifier = QString::fromStdString(type.name) + QString::number(type.equipmentTypeId);
+    plAction.menuText = QString::fromStdString(type.name);
     plAction.directFunc = [](const LtsWidgets::PluginData &) { return; };
 
     LtsWidgets::LtsDragIcon *icon = m_session->addAction(plAction);
@@ -312,7 +314,7 @@ bool OrgChartMain::initButtons()
       }
     });
 
-    QString symbolString = QString::fromStdString(type.symbol());
+    QString symbolString = QString::fromStdString(type.symbol);
     symbolWatcher->setSymbolResult(m_asbIfc->findPreview(symbolString));
     m_buttonMap.insert(icon, std::tuple<QString, AdvancedSymbology::SymbolResultWatcher *>(symbolString, mimeDataSymbolWatcher));
   }
@@ -328,13 +330,13 @@ bool OrgChartMain::initButtons()
     return true;
   for (const ParticipantManagement::TemplateParticipant &templateData : std::as_const(templates))
   {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId()
-                        << " typeId = " << templateData.typeId()
-                        << " designator= " << templateData.designator().c_str()
-                        << " tactIdent= " << templateData.tacticalIdentifier().c_str();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId
+                        << " typeId = " << templateData.typeId
+                        << " designator= " << templateData.designator.c_str()
+                        << " tactIdent= " << templateData.tacticalIdentifier.c_str();
 
-    const Type &type = m_dtc->type(templateData.typeId());
-    const TypeClass &tc = type.typeClass();
+    const Type &type = m_dtc->type(templateData.typeId);
+    const TypeClass &tc = type.typeClass;
     if ((m_asSupportService &&
          (tc == TypeClass::SupportEntity || tc == TypeClass::SupportUnit))  
         ||
@@ -344,22 +346,22 @@ bool OrgChartMain::initButtons()
     {
       
 
-      plAction.identifier = QString::fromStdString(templateData.designator()) + QString::number(templateData.templateId());
-      QString templateText = QString::fromStdString(templateData.designator());
-      if (!templateText.isEmpty() && templateData.tacticalIdentifier().size() > 0)
+      plAction.identifier = QString::fromStdString(templateData.designator) + QString::number(templateData.templateId);
+      QString templateText = QString::fromStdString(templateData.designator);
+      if (!templateText.isEmpty() && templateData.tacticalIdentifier.size() > 0)
         templateText.append(QStringLiteral(" / "));
-      templateText.append(QString::fromStdString(templateData.tacticalIdentifier()));
+      templateText.append(QString::fromStdString(templateData.tacticalIdentifier));
 
       plAction.menuText = templateText;
       plAction.directFunc = [](const LtsWidgets::PluginData &) { return; };
 
-      const int templateId            = templateData.templateId();
+      const int templateId            = templateData.templateId;
       LtsWidgets::LtsDragIcon *icon   = m_session->addAction(plAction);
 
       
       AdvancedSymbology::SymbolResultWatcherQWidgetBase *symbolWatcher =
           new AdvancedSymbology::SymbolResultWatcherQWidget<LtsWidgets::LtsDragIcon>(icon); 
-      QString symbolString = QString::fromStdString(type.symbol());
+      QString symbolString = QString::fromStdString(type.symbol);
       symbolWatcher->setSymbolResult(m_asbIfc->findPreview(symbolString));
 
 
@@ -383,8 +385,8 @@ bool OrgChartMain::initButtons()
         int partyId = m_ui->cbParty->currentData().toInt();
         if (partyId > 0)
         {
-          color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
-          role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
+          color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color));
+          role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role);
         }
       }
       mimeDataHelper->run(role, color);
@@ -400,18 +402,18 @@ bool OrgChartMain::initButtons()
 QByteArray OrgChartMain::getMimeData(const Type &type, const QImage &image)
 {
   QJsonObject retObj;
-  QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
-                    || type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
+  QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
+                    || type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
       ? QStringLiteral("true") : QString();
 
-  retObj.insert(QStringLiteral("name"), QString::fromStdString(type.name()));
-  retObj.insert(QStringLiteral("title"), QString::fromStdString(type.name()));
-  retObj.insert(QStringLiteral("typeId"), type.id());
-  retObj.insert(QStringLiteral("symbol"), QString::fromStdString(type.symbol()));
+  retObj.insert(QStringLiteral("name"), QString::fromStdString(type.name));
+  retObj.insert(QStringLiteral("title"), QString::fromStdString(type.name));
+  retObj.insert(QStringLiteral("typeId"), type.id);
+  retObj.insert(QStringLiteral("symbol"), QString::fromStdString(type.symbol));
   retObj.insert(QStringLiteral("eqNr"), 0);
   retObj.insert(QStringLiteral("info"), QString());
   retObj.insert(QStringLiteral("sign"), QString());
-  retObj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(type.name()));
+  retObj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(type.name));
   retObj.insert(QStringLiteral("designator"), QString());
   retObj.insert(QStringLiteral("isUnit"), isUnit);
   retObj.insert(QStringLiteral("ddsId"), 0);
@@ -435,27 +437,27 @@ QVector<ParticipantData> OrgChartMain::getDataOf(const QJsonObject &obj, int sup
 {
   QVector<ParticipantData> ret;
   ParticipantData pData;
-  pData.designator() = obj.value(QStringLiteral("designator")).toString().toStdString();
+  pData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
   if (obj.value(QStringLiteral("eqNr")).toInt() > 0)
-    pData.equipmentNumber().set(obj.value(QStringLiteral("eqNr")).toInt());
+    pData.equipmentNumber.set(obj.value(QStringLiteral("eqNr")).toInt());
   
-  pData.info() = obj.value(QStringLiteral("info")).toString().toStdString();
-  pData.name() = obj.value(QStringLiteral("sign")).toString().toStdString();
-  pData.modId(obj.value(QStringLiteral("id")).toInt());
-  pData.id(obj.value(QStringLiteral("ddsId")).toInt() < 0 ? 0 : obj.value(QStringLiteral("ddsId")).toInt());
-  pData.partyId(m_party);
-  pData.superiorModId(superiorModId);
-  pData.hierarchyNumber(hierarchyNr);
-  pData.symbol() = obj.value(QStringLiteral("symbol")).toString().toStdString();
-  pData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
-  pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
+  pData.info = obj.value(QStringLiteral("info")).toString().toStdString();
+  pData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
+  pData.modId = obj.value(QStringLiteral("id")).toInt();
+  pData.id = obj.value(QStringLiteral("ddsId")).toInt() < 0 ? 0 : obj.value(QStringLiteral("ddsId")).toInt();
+  pData.partyId = m_party;
+  pData.superiorModId = superiorModId;
+  pData.hierarchyNumber = hierarchyNr;
+  pData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
+  pData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
+  pData.typeId = obj.value(QStringLiteral("typeId")).toInt();
   if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
-    pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
+    pData.assignState = static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt());
   QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
   int hierarNr = 1;
   for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
   {
-    ret.append(getDataOf((*arrItem).toObject(), pData.modId(), hierarNr));
+    ret.append(getDataOf((*arrItem).toObject(), pData.modId, hierarNr));
     hierarNr++;
   }
   ret.append(pData);
@@ -466,24 +468,24 @@ QVector<TemplateData> OrgChartMain::getTemplateDataOf(const QJsonObject &obj, in
 {
   QVector<TemplateData> ret;
   TemplateData tData;
-  tData.designator() = obj.value(QStringLiteral("designator")).toString().toStdString();
-  tData.equipmentNumber(obj.value(QStringLiteral("eqNr")).toInt());
+  tData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
+  tData.equipmentNumber = obj.value(QStringLiteral("eqNr")).toInt();
   
-  tData.info() = obj.value(QStringLiteral("info")).toString().toStdString();
-  tData.name() = obj.value(QStringLiteral("sign")).toString().toStdString();
-  tData.modId(obj.value(QStringLiteral("id")).toInt());
+  tData.info = obj.value(QStringLiteral("info")).toString().toStdString();
+  tData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
+  tData.modId = obj.value(QStringLiteral("id")).toInt();
   if (obj.value(QStringLiteral("ddsId")).toInt() > 0)
-    tData.templateId(obj.value(QStringLiteral("ddsId")).toInt());
-  tData.superiorModId(superiorModId);
-  tData.hierarchyNumber(hierarchyNr);
-  tData.symbol() = obj.value(QStringLiteral("symbol")).toString().toStdString();
-  tData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
-  tData.typeId(obj.value(QStringLiteral("typeId")).toInt());
+    tData.templateId = obj.value(QStringLiteral("ddsId")).toInt();
+  tData.superiorModId = superiorModId;
+  tData.hierarchyNumber = hierarchyNr;
+  tData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
+  tData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
+  tData.typeId = obj.value(QStringLiteral("typeId")).toInt();
   QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
   int hierarNr = 1;
   for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
   {
-    ret.append(getTemplateDataOf((*arrItem).toObject(), tData.modId(), hierarNr));
+    ret.append(getTemplateDataOf((*arrItem).toObject(), tData.modId, hierarNr));
     hierarNr++;
   }
   ret.append(tData);
@@ -500,34 +502,34 @@ bool OrgChartMain::apply()
 ParticipantData OrgChartMain::convertFromJson(const QJsonObject &obj)
 {
   ParticipantData pData;
-  pData.designator(obj.value(QStringLiteral("designator")).toString().toStdString());
-  pData.tacticalIdentifier(obj.value(QStringLiteral("tactIdentifier")).toString().toStdString());
-  pData.info(obj.value(QStringLiteral("info")).toString().toStdString());
-  pData.equipmentNumber().set(obj.value(QStringLiteral("eqNr")).toInt());
-  pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
-  pData.modId(obj.value(QStringLiteral("ddsId")).toInt());
-  pData.name(obj.value(QStringLiteral("sign")).toString().toStdString());
-  pData.partyId(m_party);
-  pData.id(obj.value(QStringLiteral("ddsId")).toInt());
+  pData.designator = obj.value(QStringLiteral("designator")).toString().toStdString();
+  pData.tacticalIdentifier = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
+  pData.info = obj.value(QStringLiteral("info")).toString().toStdString();
+  pData.equipmentNumber.set(obj.value(QStringLiteral("eqNr")).toInt());
+  pData.typeId = obj.value(QStringLiteral("typeId")).toInt();
+  pData.modId = obj.value(QStringLiteral("ddsId")).toInt();
+  pData.name = obj.value(QStringLiteral("sign")).toString().toStdString();
+  pData.partyId = m_party;
+  pData.id = obj.value(QStringLiteral("ddsId")).toInt();
   if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
-    pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
-  pData.symbol(obj.value(QStringLiteral("symbol")).toString().toStdString());
+    pData.assignState = static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt());
+  pData.symbol = obj.value(QStringLiteral("symbol")).toString().toStdString();
   return pData;
 }
 
 TemplateData OrgChartMain::fromParticipantData(const ParticipantData &data)
 {
   TemplateData ret;
-  ret.name() = data.name();
-  ret.isDeleted(data.isDeleted());
-  ret.modId(data.modId());
-  ret.superiorModId(data.superiorModId());
-  ret.equipmentNumber(data.hierarchyNumber());
-  ret.info() = data.info();
-  ret.symbol() = data.symbol();
-  ret.tacticalIdentifier() = data.tacticalIdentifier();
-  ret.templateId(ret.modId());
-  ret.typeId(data.typeId());
+  ret.name = data.name;
+  ret.isDeleted = data.isDeleted;
+  ret.modId = data.modId;
+  ret.superiorModId = data.superiorModId;
+  ret.equipmentNumber = data.hierarchyNumber;
+  ret.info = data.info;
+  ret.symbol = data.symbol;
+  ret.tacticalIdentifier = data.tacticalIdentifier;
+  ret.templateId = ret.modId;
+  ret.typeId = data.typeId;
   return ret;
 }
 
@@ -621,7 +623,7 @@ void OrgChartMain::onEdit(const QString &data)
   {
     m_session->addWidget(tab,
                          group,
-                         QStringLiteral("Edit %1").arg(pData.modId()),
+                         QStringLiteral("Edit %1").arg(pData.modId),
                          LtsWidgets::LayoutArea::eDialogTab);
     connect(tab, &ParticipantEditItemTab::updateItem, this, &OrgChartMain::onUpdateItem);
   }
@@ -640,7 +642,7 @@ void OrgChartMain::onDelete(const QString &data)
     return;
 
   ParticipantData pData = convertFromJson(obj);
-  pData.isDeleted(true);
+  pData.isDeleted = true;
   if (!m_isTemplate)
     m_participantsToDelete.append(pData);
   else
@@ -656,26 +658,26 @@ void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData
   Q_UNUSED(parent);
   
   QJsonObject obj;
-  Type type = m_dtc->type(editData.typeId());
+  Type type = m_dtc->type(editData.typeId);
 
-  QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
-                    || type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
+  QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
+                    || type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
       ? QStringLiteral("true") : QString();
 
-  QString name = QString::fromStdString(editData.designator()) + QLatin1Char(' ') + QString::fromStdString(editData.tacticalIdentifier());
+  QString name = QString::fromStdString(editData.designator) + QLatin1Char(' ') + QString::fromStdString(editData.tacticalIdentifier);
   obj.insert(QStringLiteral("name"), name);
-  obj.insert(QStringLiteral("designator"), QString::fromStdString(editData.designator()));
-  obj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(editData.tacticalIdentifier()));
-  obj.insert(QStringLiteral("info"), QString::fromStdString(editData.info()));
-  obj.insert(QStringLiteral("sign"), QString::fromStdString(editData.name()));
-  obj.insert(QStringLiteral("title"), QString::fromStdString(type.name()));
-  obj.insert(QStringLiteral("typeId"), editData.typeId());
-  obj.insert(QStringLiteral("symbol"), QString::fromStdString(editData.symbol()));
-  obj.insert(QStringLiteral("eqNr"), editData.equipmentNumber().is_set() ? editData.equipmentNumber().get() : 0);
+  obj.insert(QStringLiteral("designator"), QString::fromStdString(editData.designator));
+  obj.insert(QStringLiteral("tactIdentifier"), QString::fromStdString(editData.tacticalIdentifier));
+  obj.insert(QStringLiteral("info"), QString::fromStdString(editData.info));
+  obj.insert(QStringLiteral("sign"), QString::fromStdString(editData.name));
+  obj.insert(QStringLiteral("title"), QString::fromStdString(type.name));
+  obj.insert(QStringLiteral("typeId"), editData.typeId);
+  obj.insert(QStringLiteral("symbol"), QString::fromStdString(editData.symbol));
+  obj.insert(QStringLiteral("eqNr"), editData.equipmentNumber.is_set() ? editData.equipmentNumber.get() : 0);
   obj.insert(QStringLiteral("isUnit"), isUnit);
-  obj.insert(QStringLiteral("assignState"), editData.assignState().underlying());
-  obj.insert(QStringLiteral("ddsId"), editData.id());
-  obj.insert(QStringLiteral("id"), editData.modId());
+  obj.insert(QStringLiteral("assignState"), static_cast<int>(editData.assignState));
+  obj.insert(QStringLiteral("ddsId"), editData.id);
+  obj.insert(QStringLiteral("id"), editData.modId);
 
 
   
@@ -694,21 +696,21 @@ void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData
       QString imageAdd = QStringLiteral("<img src=\"data:image/png;base64,%1\">")
           .arg(QString::fromLatin1(data.toBase64()));
       obj.insert(QStringLiteral("image"), imageAdd);
-      m_orgChart->sendToOrgChart(editData.modId(), obj);
+      m_orgChart->sendToOrgChart(editData.modId, obj);
       slotChangesMade();
     }
   });
 
   if (m_ui->cbParty->isVisible())
   {
-    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(editData.symbol()));
-    symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role());
-    symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(m_party).color()));
+    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(editData.symbol));
+    symDataToRender.role = AdvancedSymbology::roleToRole(m_dtc->party(m_party).role);
+    symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(m_party).color));
     symDataToRender.fillColorReplace = true;
     watcher->setSymbolResult(m_asbIfc->findImage(symDataToRender));
   }
   else
-    watcher->setSymbolResult(m_asbIfc->findBaseSymbol(QString::fromStdString(editData.symbol())));
+    watcher->setSymbolResult(m_asbIfc->findBaseSymbol(QString::fromStdString(editData.symbol)));
 }
 
 void OrgChartMain::onNewHierarchy(const QString &data)
@@ -727,7 +729,7 @@ void OrgChartMain::onNewHierarchy(const QString &data)
       return;
 
     ModifyParticipantDataRequest req;
-    LtsUtils::convert(sendTo, req.data());
+    LtsUtils::convert(sendTo, req.data);
     m_requestHelper->addRequest([this, req]()
     {
       return m_ftc->modifyParticipantDataRequest(req, this);
@@ -741,7 +743,7 @@ void OrgChartMain::onNewHierarchy(const QString &data)
       return;
 
     ModifyTemplateDataRequest req;
-    LtsUtils::convert(sendTo, req.data());
+    LtsUtils::convert(sendTo, req.data);
     m_requestHelper->addRequest([this, req]()
     {
       return m_ftc->modifyTemplateDataRequest(req, this);
@@ -773,10 +775,10 @@ void OrgChartMain::onReload()
 
 void OrgChartMain::onUpdateParticipant(const Participant &data, DataModification modType)
 {
-  if (data.partyId() != m_party)
+  if (data.partyId != m_party)
     return;
   if (modType == DataModification::eModified)
-    m_orgChart->updateParticipant(data.id());
+    m_orgChart->updateParticipant(data.id);
   else
     onPartyChanged();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
index 979f2896d..3772b5739 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
@@ -2,6 +2,7 @@
 
 
 #include "org_chart_main_helper.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QBuffer>
 
@@ -11,6 +12,7 @@ namespace ParticipantManagement
 
 OrgChartMain_MimeDataHelper::OrgChartMain_MimeDataHelper(QObject *parent)
   : QObject(parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("OrgChartMain_MimeDataHelper"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
   TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
@@ -94,7 +96,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
   const TemplateParticipant &tPart = m_dtc->templateParticipant(templateId);
 
   const AdvancedSymbology::SymbolDataToRender &symDataToRender =
-      symbolDataToRender(QString::fromStdString(tPart.symbol())); 
+      symbolDataToRender(QString::fromStdString(tPart.symbol)); 
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
                       << " tPart = " << tPart
@@ -105,9 +107,9 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
   
   
   
-  if (tPart.inferiorIds().is_set())
+  if (tPart.inferiorIds.is_set())
   {
-    const std::vector<int> &inferior = tPart.inferiorIds().get();
+    const std::vector<int> &inferior = tPart.inferiorIds.get();
     for (int infId : inferior)
       prepareBulkRenderer(infId);
   }
@@ -120,26 +122,26 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
   QJsonObject retObj;
 
   const TemplateParticipant &tPart  = m_dtc->templateParticipant(templateId);
-  const Type &type                  = m_dtc->type(tPart.typeId());
-  QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
-                    || type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
+  const Type &type                  = m_dtc->type(tPart.typeId);
+  QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
+                    || type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
                    ? QLatin1String("true") : QLatin1String("");
 
-  retObj.insert(QLatin1String("name"), QString::fromStdString(tPart.designator()));
-  retObj.insert(QLatin1String("title"), QString::fromStdString(tPart.designator()));
-  retObj.insert(QLatin1String("typeId"), tPart.typeId());
-  retObj.insert(QLatin1String("symbol"), QString::fromStdString(tPart.symbol()));
+  retObj.insert(QLatin1String("name"), QString::fromStdString(tPart.designator));
+  retObj.insert(QLatin1String("title"), QString::fromStdString(tPart.designator));
+  retObj.insert(QLatin1String("typeId"), tPart.typeId);
+  retObj.insert(QLatin1String("symbol"), QString::fromStdString(tPart.symbol));
   retObj.insert(QLatin1String("eqNr"), 0);
-  retObj.insert(QLatin1String("info"), QString::fromStdString(tPart.info()));
-  retObj.insert(QLatin1String("sign"), QString::fromStdString(tPart.name()));
-  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(tPart.tacticalIdentifier()));
+  retObj.insert(QLatin1String("info"), QString::fromStdString(tPart.info));
+  retObj.insert(QLatin1String("sign"), QString::fromStdString(tPart.name));
+  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(tPart.tacticalIdentifier));
   retObj.insert(QLatin1String("isUnit"), isUnit);
   retObj.insert(QLatin1String("ddsId"), -1);
   retObj.insert(QLatin1String("id"), -1);
   retObj.insert(QLatin1String("assignState"), -1);
 
   const AdvancedSymbology::SymbolDataToRender &symDataToRender =
-    symbolDataToRender(QString::fromStdString(tPart.symbol()));
+    symbolDataToRender(QString::fromStdString(tPart.symbol));
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getResult for templateId = " << templateId
                       << " symDataToRender=" << symDataToRender.toString();
@@ -165,11 +167,11 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
   
   
   
-  if (tPart.inferiorIds().is_set())
+  if (tPart.inferiorIds.is_set())
   {
     QJsonArray arr;
 
-    const std::vector<int> &inferior = tPart.inferiorIds().get();
+    const std::vector<int> &inferior = tPart.inferiorIds.get();
     for (int infId : inferior)
       arr.append(getMimeData(infId));
     retObj.insert(QLatin1String("children"), arr);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
index 8366f704f..e98f04287 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
@@ -2,13 +2,13 @@
 
 #include "participant_org_chart.h"
 #include "ui_participant_org_chart.h"
-#include <QtWebEngineWidgets/QWebEngineSettings>
+#include <QtWebEngineCore/QWebEngineSettings>
 
 #include <Symbology/symbol_data_to_render_role.h>
 
 #include <QtCore/QFile>
-#include <QtWebEngine/QtWebEngine>
-#include <QtWebEngineWidgets/QWebEnginePage>
+#include <QtWebEngineWidgets/QtWebEngineWidgets>
+#include <QtWebEngineCore/QWebEnginePage>
 #include <QtCore/QJsonArray>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
index 51b72c3aa..914b9588c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
@@ -2,6 +2,7 @@
 
 
 #include "participant_org_chart_helper.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QBuffer>
 #include <QtCore/QJsonArray>
@@ -12,6 +13,7 @@ namespace ParticipantManagement
 
 ParticipantOrgChart_MimeDataHelper::ParticipantOrgChart_MimeDataHelper(QObject *parent)
   : QObject(parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("ParticipantOrgChart_MimeDataHelper"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
   TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
@@ -104,19 +106,19 @@ bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId,
   if (m_participantMode)
   {
     const Participant &part = m_dtc->participant(participantId);
-    if (part.id() != participantId)
+    if (part.id != participantId)
       return false;
-    inferior = part.inferiorIds();
-    sidc = QString::fromStdString(part.symbol());
+    inferior = part.inferiorIds;
+    sidc = QString::fromStdString(part.symbol);
   }else
   {
     const TemplateParticipant &part = m_dtc->templateParticipant(participantId);
-    if (part.templateId() != participantId)
+    if (part.templateId != participantId)
       return false;
 
-    sidc = QString::fromStdString(part.symbol());
-    if (part.inferiorIds().is_set())
-      inferior = part.inferiorIds().get();
+    sidc = QString::fromStdString(part.symbol);
+    if (part.inferiorIds.is_set())
+      inferior = part.inferiorIds.get();
   }
 
   if (m_bulkRendererFindImage) 
@@ -150,33 +152,33 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
                       << ", single=" << single;
 
   ParticipantManagement::Participant part = m_dtc->participant(participantId);
-  if (part.id() != participantId)
+  if (part.id != participantId)
     return QJsonObject();
-  ParticipantManagement::Type type = m_dtc->type(part.typeId());
+  ParticipantManagement::Type type = m_dtc->type(part.typeId);
 
-  int eqNr = part.equipmentNumber().is_set() ? part.equipmentNumber().get() : 0;
-  QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
-                    || type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
+  int eqNr = part.equipmentNumber.is_set() ? part.equipmentNumber.get() : 0;
+  QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
+                    || type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
       ? QLatin1String("true") : QString();
 
   QJsonObject retObj;
-  QString name = QString::fromStdString(part.designator()) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier());
+  QString name = QString::fromStdString(part.designator) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier);
   retObj.insert(QLatin1String("name"), name);
-  retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator()));
-  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier()));
-  retObj.insert(QLatin1String("title"), QString::fromStdString(type.name()));
-  retObj.insert(QLatin1String("info"), QString::fromStdString(part.info()));
-  retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name()));
-  retObj.insert(QLatin1String("typeId"), part.typeId());
-  retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol()));
+  retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator));
+  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier));
+  retObj.insert(QLatin1String("title"), QString::fromStdString(type.name));
+  retObj.insert(QLatin1String("info"), QString::fromStdString(part.info));
+  retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name));
+  retObj.insert(QLatin1String("typeId"), part.typeId);
+  retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol));
   retObj.insert(QLatin1String("eqNr"), eqNr);
   retObj.insert(QLatin1String("isUnit"), isUnit);
-  retObj.insert(QLatin1String("ddsId"), part.id());
-  retObj.insert(QLatin1String("id"), part.id());
-  retObj.insert(QLatin1String("assignState"), part.assignState().underlying());
+  retObj.insert(QLatin1String("ddsId"), part.id);
+  retObj.insert(QLatin1String("id"), part.id);
+  retObj.insert(QLatin1String("assignState"), static_cast<int>(part.assignState));
 
 
-  const QString &sidc = QString::fromStdString(part.symbol());
+  const QString &sidc = QString::fromStdString(part.symbol);
   QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher;
 
   if (m_bulkRendererFindImage)
@@ -206,11 +208,11 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
   
   
   
-  if (part.inferiorIds().size() > 0 && !single)
+  if (part.inferiorIds.size() > 0 && !single)
   {
     QJsonArray arr;
 
-    const std::vector<int> &inferior = part.inferiorIds();
+    const std::vector<int> &inferior = part.inferiorIds;
     for (int infId : inferior)
       arr.append(getMimeData(infId));
     retObj.insert(QLatin1String("children"), arr);
@@ -228,33 +230,33 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
                       << ", single=" << single;
 
   ParticipantManagement::TemplateParticipant part = m_dtc->templateParticipant(participantId);
-  if (part.templateId() != participantId)
+  if (part.templateId != participantId)
     return QJsonObject();
-  ParticipantManagement::Type type = m_dtc->type(part.typeId());
+  ParticipantManagement::Type type = m_dtc->type(part.typeId);
 
-  int eqNr = part.equipmentNumber();
-  QString isUnit = (type.typeClass() == ParticipantManagement::TypeClass::Unit
-                    || type.typeClass() == ParticipantManagement::TypeClass::SupportUnit)
+  int eqNr = part.equipmentNumber;
+  QString isUnit = (type.typeClass == ParticipantManagement::TypeClass::Unit
+                    || type.typeClass == ParticipantManagement::TypeClass::SupportUnit)
       ? QLatin1String("true") : QString();
 
   QJsonObject retObj;
-  QString name = QString::fromStdString(part.designator()) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier());
+  QString name = QString::fromStdString(part.designator) + QLatin1Char(' ') + QString::fromStdString(part.tacticalIdentifier);
   retObj.insert(QLatin1String("name"), name);
-  retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator()));
-  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier()));
-  retObj.insert(QLatin1String("title"), QString::fromStdString(type.name()));
-  retObj.insert(QLatin1String("info"), QString::fromStdString(part.info()));
-  retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name()));
-  retObj.insert(QLatin1String("typeId"), part.typeId());
-  retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol()));
+  retObj.insert(QLatin1String("designator"), QString::fromStdString(part.designator));
+  retObj.insert(QLatin1String("tactIdentifier"), QString::fromStdString(part.tacticalIdentifier));
+  retObj.insert(QLatin1String("title"), QString::fromStdString(type.name));
+  retObj.insert(QLatin1String("info"), QString::fromStdString(part.info));
+  retObj.insert(QLatin1String("sign"), QString::fromStdString(part.name));
+  retObj.insert(QLatin1String("typeId"), part.typeId);
+  retObj.insert(QLatin1String("symbol"), QString::fromStdString(part.symbol));
   retObj.insert(QLatin1String("eqNr"), eqNr);
   retObj.insert(QLatin1String("isUnit"), isUnit);
-  retObj.insert(QLatin1String("ddsId"), part.templateId());
-  retObj.insert(QLatin1String("id"), part.templateId());
+  retObj.insert(QLatin1String("ddsId"), part.templateId);
+  retObj.insert(QLatin1String("id"), part.templateId);
   retObj.insert(QLatin1String("assignState"), -1);
 
 
-  const QString &sidc = QString::fromStdString(part.symbol());
+  const QString &sidc = QString::fromStdString(part.symbol);
   QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher;
 
   if (m_bulkRendererFindImage)
@@ -284,11 +286,11 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
   
   
   
-  if (part.inferiorIds().is_set() && part.inferiorIds().get().size() > 0 && !single)
+  if (part.inferiorIds.is_set() && part.inferiorIds.get().size() > 0 && !single)
   {
     QJsonArray arr;
 
-    const std::vector<int> &inferior = part.inferiorIds().get();
+    const std::vector<int> &inferior = part.inferiorIds.get();
     for (int infId : inferior)
       arr.append(getTemplateMimeData(infId));
     retObj.insert(QLatin1String("children"), arr);
@@ -299,7 +301,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
 
 AdvancedSymbology::Injury ParticipantOrgChart_MimeDataHelper::stateToInjury(const ProjectDataManagement::VulnerabilityState &state)
 {
-  switch (state.underlying())
+  switch (state)
   {
   case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
   case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
@@ -334,10 +336,10 @@ AdvancedSymbology::SymbolDataToRender ParticipantOrgChart_MimeDataHelper::symbol
   AdvancedSymbology::SymbolDataToRender symDataToRender(sidc);
 
   DynamicParticipantData dData = m_dtc->dynamicParticipantData(participantId);
-  if (dData.participantId() == participantId && !m_isMenuEnabled)
+  if (dData.participantId == participantId && !m_isMenuEnabled)
   {
-    const StateInformation &lastState = m_dtc->youngestStateInformation(dData.stateHistory());
-    symDataToRender.injury = stateToInjury(lastState.vulnerabilityState());
+    const StateInformation &lastState = m_dtc->youngestStateInformation(dData.stateHistory);
+    symDataToRender.injury = stateToInjury(lastState.vulnerabilityState);
     symDataToRender.injuryColor = Qt::black;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
index 49c6ee286..7dd6cfd57 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
@@ -42,6 +42,7 @@ ParticipantSelection::ParticipantSelection(LtsSession::LtsSession *session, QWid
   , m_ppmGuiCbxIfc(nullptr)
   , m_session(session)
   , m_ui(new Ui::ParticipantSelection)
+  , m_logger(getLogger("ParticipantSelection"))
 {
   m_ui->setupUi(this);
 
@@ -229,7 +230,7 @@ void ParticipantSelection::accept()
     QModelIndex sourceIndex = m_proxyTable->mapToSource(index);
     if (index.column() != 0)
       continue;
-    participantIds << m_model->privateData(sourceIndex)->participant.id();
+    participantIds << m_model->privateData(sourceIndex)->participant.id;
   }
   emit selectedParticipants(participantIds);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
index 9ba7d4760..4c45a4c90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
@@ -23,7 +23,7 @@ namespace core
 {
 static inline uint qHash(const ParticipantManagement::TypeClass &tc)
 {
-  return ::qHash(tc.underlying());
+  return ::qHash(tc);
 }
 }
 }
@@ -42,7 +42,7 @@ static QVariant participantToQVariant(const ParticipantData &pd)
   ds << pd.id()
      << pd.partyId()
      << pd.hierarchyNumber()
-     << (pd.equipmentNumber().is_set() ? pd.equipmentNumber().get() : -1)
+     << (pd.equipmentNumber().has_value() ? pd.equipmentNumber().get() : -1)
      << pd.typeId()
      << pd.externalId()
      << QString::fromStdString(pd.symbol())
@@ -51,7 +51,7 @@ static QVariant participantToQVariant(const ParticipantData &pd)
      << QString::fromStdString(pd.designator())
      << QString::fromStdString(pd.tacticalIdentifier())
      << QString::fromStdString(pd.info())
-     << pd.assignState().underlying()
+     << pd.assignState()
      << pd.isSimulated()
      << pd.isDeleted()
      << pd.modId()
@@ -203,7 +203,7 @@ QVariant ParticipantSelectionModel::headerData(int section, Qt::Orientation orie
     {
       for (const auto &typeClassId : m_usedTypeClassIds)
       {
-        cfd.data = typeClassId.underlying();
+        cfd.data = typeClassId;
         cfd.text = ParticipantManagement::toString(typeClassId);
         cfc.data.push_back(cfd);
       }
@@ -269,7 +269,7 @@ QVariant ParticipantSelectionModel::data(const QModelIndex &index, int role) con
       return ParticipantManagement::trTypeName(m_types.value(participantData.typeId()).name());
 
     case ColEquipmentNumber:
-      if (!participantData.equipmentNumber().is_set())
+      if (!participantData.equipmentNumber().has_value())
       {
         if (participantData.assignState() == ParticipantAssignState::HandoutExcon)
           return 0;
@@ -302,7 +302,7 @@ QVariant ParticipantSelectionModel::data(const QModelIndex &index, int role) con
 
   case LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole:
     if (index.column() == ColTypeClass)
-      return typeClassIdFromTypeId(participantData.typeId()).underlying();
+      return typeClassIdFromTypeId(participantData.typeId());
     if (index.column() == ColType)
       return participantData.typeId();
     return QVariant();
@@ -373,7 +373,7 @@ bool ParticipantSelectionModel::isRowRemovable(const CheckedTreeItem *parentItem
   if (!parentItem)
     return false;
   const ParticipantManagement::ParticipantData &participantData = parentItem->participant;
-  if (participantData.equipmentNumber().is_set() && participantData.equipmentNumber().get() > 0)
+  if (participantData.equipmentNumber().has_value() && participantData.equipmentNumber().get() > 0)
     return false;
 
   for (int i = 0; i < parentItem->childCount(); i++)
@@ -975,11 +975,11 @@ bool ParticipantTreeFilterProxyModel::lessThan(const QModelIndex &source_left, c
   case ParticipantSelectionModel::ColType:
     break;  
   case ParticipantSelectionModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber().has_value() && !right->participant.equipmentNumber().has_value())
       return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber().has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber().has_value())
       return false;
     return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
   case ParticipantSelectionModel::ColParticipantId:
@@ -1171,11 +1171,11 @@ bool ParticipantTableFilterProxyModel::lessThan(const QModelIndex &sourceLeft, c
     return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
 
   case ParticipantSelectionModel::ColEquipmentNumber:
-    if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber().has_value() && !right->participant.equipmentNumber().has_value())
       return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
-    if (!left->participant.equipmentNumber().is_set())
+    if (!left->participant.equipmentNumber().has_value())
       return true;
-    if (!right->participant.equipmentNumber().is_set())
+    if (!right->participant.equipmentNumber().has_value())
       return false;
     return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
index 5579cf2c0..953627e15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
@@ -272,6 +272,4 @@ private:
   ParticipantSelectionModel *m_sourceModel{nullptr};
 }; 
 
-} 
-
-Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData)
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
index e0cd454a5..239ec4248 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
@@ -38,6 +38,7 @@ ParticipantTemplateChooser::ParticipantTemplateChooser(const QString &menuGroup,
   , m_session(session)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ParticipantTemplateChooser)
+  , m_logger(getLogger("ParticipantTemplateChooser"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -125,7 +126,7 @@ void ParticipantTemplateChooser::onAddTemplate()
   QObject::connect(namer, &TemplateUnitNamer::newUnitTemplateRoot, this, [this](const ParticipantManagement::TemplateData &tempData)
   {
     ModifyTemplateDataRequest req;
-    req.data({tempData});
+    req.data = {tempData};
 
     m_requestHelper->addRequest([this,req]()
     {
@@ -145,13 +146,13 @@ void ParticipantTemplateChooser::onEditTemplate()
     return;
 
   TemplateParticipant data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  ParticipantTemplateEdit *edit = new ParticipantTemplateEdit(m_session, data.templateId(), m_asSupportService, this);
+  ParticipantTemplateEdit *edit = new ParticipantTemplateEdit(m_session, data.templateId, m_asSupportService, this);
   if (!edit->init(m_dtc, m_ftc, m_ppmGuiCbxIfc, m_asbIfc))
   {
     delete edit;
     return;
   }
-  addDialog(edit, m_menuGroup, QLatin1String("editTemplate") + QString::number(data.templateId()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(edit, m_menuGroup, QLatin1String("editTemplate") + QString::number(data.templateId), LtsWidgets::LayoutArea::eDialogTab);
 }
 
 void ParticipantTemplateChooser::onEditTemplateOrgChart()
@@ -192,7 +193,7 @@ void ParticipantTemplateChooser::onEditTemplateOrgChart()
       return;
     }
 
-    m_ppmGuiOrgChartIfc->loadTemplate(data.templateId(), m_asSupportService);
+    m_ppmGuiOrgChartIfc->loadTemplate(data.templateId, m_asSupportService);
   });
 
   
@@ -206,10 +207,10 @@ void ParticipantTemplateChooser::onRemoveTemplate()
 
   const TemplateParticipant tmplParticipant = m_model->getRowData(idx.row());
   auto tmplData = m_dtc->convertFromParticipantTemplateToTemplateData(tmplParticipant);
-  tmplData.isDeleted(true);
+  tmplData.isDeleted = true;
 
   ModifyTemplateDataRequest req;
-  req.data({tmplData});
+  req.data = {tmplData};
 
   m_requestHelper->startSingleRequest([this, req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.cpp
index 00f135a9c..9d50a4483 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.cpp
@@ -16,6 +16,7 @@ ParticipantTemplateChooserFrameless::ParticipantTemplateChooserFrameless(LtsSess
   , m_dtc(nullptr)
   , m_session(session)
   , m_ui(new Ui::ParticipantTemplateChooserFrameless)
+  , m_logger(getLogger("ParticipantTemplateChooser"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -53,7 +54,7 @@ void ParticipantTemplateChooserFrameless::onAddTemplate()
   if (!idx.isValid())
     return;
   TemplateParticipant data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  emit selectedTemplate(data.templateId());
+  emit selectedTemplate(data.templateId);
   close();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.cpp
index cab9245e0..ab900c2eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.cpp
@@ -22,6 +22,7 @@ ParticipantTemplateChooserModel::ParticipantTemplateChooserModel(bool asSupportS
   , AdvancedSymbology::TableModelSymbolRenderer<ParticipantTemplateChooserModel>(ColDesignatorIdentifier)
   , m_asSupportService(asSupportService)
   , m_dtc(nullptr)
+  , m_logger(getLogger("ParticipantTemplateChooserModel"))
 {}
 
 ParticipantTemplateChooserModel::~ParticipantTemplateChooserModel()
@@ -47,7 +48,7 @@ bool ParticipantTemplateChooserModel::initModel(LtsSession::LtsSessionDataDds *s
   auto cb = [this](const ParticipantManagement::TemplateParticipant &templateData)
   {
     if (insertRow(templateData))
-      tryRenderSymbol(QString::fromStdString(templateData.symbol()), templateData.templateId());
+      tryRenderSymbol(QString::fromStdString(templateData.symbol), templateData.templateId);
   };
   m_dtc->templateParticipants(cb);
 
@@ -63,21 +64,21 @@ QVariant ParticipantTemplateChooserModel::data(const QModelIndex &index, int rol
 
   const ParticipantManagement::TemplateParticipant &templateData = m_vecData.at(index.row());
   if (role == Qt::DecorationRole)
-    return decorationData(index, templateData.templateId());
+    return decorationData(index, templateData.templateId);
 
   switch (index.column())
   {
   case ColDesignatorIdentifier:
   {
-    if (templateData.designator().size() == 0)
-      return QString::fromStdString(templateData.tacticalIdentifier());
-    return QString(QString::fromStdString(templateData.designator()) + QLatin1Char('/') +
-                   QString::fromStdString(templateData.tacticalIdentifier()));
+    if (templateData.designator.size() == 0)
+      return QString::fromStdString(templateData.tacticalIdentifier);
+    return QString(QString::fromStdString(templateData.designator) + QLatin1Char('/') +
+                   QString::fromStdString(templateData.tacticalIdentifier));
   }
   case ColTypeClass:
-    return ParticipantManagement::toString(m_dtc->type(templateData.typeId()).typeClass());
+    return ParticipantManagement::toString(m_dtc->type(templateData.typeId).typeClass);
   case ColType:
-    return ParticipantManagement::trTypeName(m_dtc->type(templateData.typeId()).name());
+    return ParticipantManagement::trTypeName(m_dtc->type(templateData.typeId).name);
   }
   return QVariant();
 }
@@ -98,7 +99,7 @@ QMimeData *ParticipantTemplateChooserModel::mimeData(const QModelIndexList &inde
   {
     if (index.isValid())
     {
-      QByteArray encodedData = QByteArray::number(getRowData(index.row()).templateId());
+      QByteArray encodedData = QByteArray::number(getRowData(index.row()).templateId);
       mimeData->setData(ParticipantManagement::ParticipantTemplateRoot, encodedData);
       return mimeData;
     }
@@ -118,7 +119,7 @@ void ParticipantTemplateChooserModel::onTemplateChanged(const ParticipantManagem
                                                         DataModification modType)
 {
   if (onDataChanged(data, modType) && modType != DataModification::eRemoved)
-    tryRenderSymbol(QString::fromStdString(data.symbol()), data.templateId());
+    tryRenderSymbol(QString::fromStdString(data.symbol), data.templateId);
 }
 
 
@@ -126,9 +127,9 @@ bool ParticipantTemplateChooserModel::isFiltered(const TemplateParticipant &data
 {
   Q_UNUSED(modType);
 
-  if (data.superiorTemplateId() != 0)
+  if (data.superiorTemplateId != 0)
     return true;
-  const TypeClass &tc = m_dtc->type(data.typeId()).typeClass();
+  const TypeClass &tc = m_dtc->type(data.typeId).typeClass;
 
   if (m_asSupportService)
     return (tc != TypeClass::SupportEntity && tc != TypeClass::SupportUnit);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h
index 5c60c4545..8d17c9c37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
@@ -50,7 +51,7 @@ protected:
 NGL::INGLLogger &m_logger;
   int getId(const TemplateParticipant &data) const override
   {
-    return data.templateId();
+    return data.templateId;
   }
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
index 62ab46043..71f0ec324 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
@@ -36,6 +36,7 @@ ParticipantTemplateEdit::ParticipantTemplateEdit(LtsSession::LtsSession *session
   , m_ppmGuiCbxIfc(nullptr)
   , m_session(session)
   , m_ui(new Ui::ParticipantTemplateEdit)
+  , m_logger(getLogger("ParticipantTemplateEdit"))
 {
   m_ui->setupUi(this);
 
@@ -164,14 +165,14 @@ bool ParticipantTemplateEdit::isContainer(const QModelIndex &index)
   Q_UNUSED(index);
   if (!selectedIndexView().isValid())
     return false;
-  int typeId = m_model->privateData(selectedIndexView())->data().value<ParticipantManagement::TemplateData>().typeId();
+  int typeId = m_model->privateData(selectedIndexView())->data().value<ParticipantManagement::TemplateData>().typeId;
   if (typeId <= 0)
     return false;
 
   if (m_asSupportService)
-    return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
+    return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::SupportUnit;
   else
-    return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
+    return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::Unit;
 
 }
 
@@ -216,7 +217,7 @@ void ParticipantTemplateEdit::removeCurrentRow()
   NGLTreeItem *item = m_model->privateData(selIndex);
   ParticipantManagement::TemplateData tmpl = item->data().value<ParticipantManagement::TemplateData>();
 
-  const bool isRootTemplate = (tmpl.templateId() == m_rootId);
+  const bool isRootTemplate = (tmpl.templateId == m_rootId);
   if (!selIndex.isValid() || isRootTemplate)
     return;
   
@@ -238,8 +239,8 @@ void ParticipantTemplateEdit::onAddItem()
   if (selIndex.isValid())
   {
     ParticipantManagement::TemplateData dataAll = m_model->privateData(selIndex)->data().value<ParticipantManagement::TemplateData>();
-    data.designator(dataAll.designator());
-    data.tacticalIdentifier(dataAll.tacticalIdentifier());
+    data.designator = dataAll.designator;
+    data.tacticalIdentifier = dataAll.tacticalIdentifier;
   }
 
   if (!newItemDlg->init(selIndex, m_dtc, m_ppmGuiCbxIfc, m_asbIfc, data, addItem))
@@ -257,7 +258,7 @@ void ParticipantTemplateEdit::onAddItem()
   if (m_firingUnitValidator)
   {
     newItemDlg->setIsAdler(m_firingUnitValidator->isAdler(m_model, selIndex));
-    const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, selIndex);
+    const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, selIndex));
 
     newItemDlg->setFiringUnitRestrictions(m_model, false, m_firingUnitValidator->getRestrictions(m_model, selIndex), m_firingUnitValidator, unitGearClassType);
 
@@ -298,7 +299,7 @@ void ParticipantTemplateEdit::onEditItem()
 
   if (m_firingUnitValidator)
   {
-    const int unitGearClassType = m_firingUnitValidator->getGearClassType(m_model, selIndex);
+    const int unitGearClassType = static_cast<int>(m_firingUnitValidator->getGearClassType(m_model, selIndex));
     newItemDlg->setFiringUnitRestrictions(m_model, true, m_firingUnitValidator->getRestrictions(m_model, selIndex), m_firingUnitValidator, unitGearClassType);
   }
   newItemDlg->show();
@@ -317,8 +318,8 @@ void ParticipantTemplateEdit::onPrint()
 bool ParticipantTemplateEdit::apply()
 {
   ModifyTemplateDataRequest req;
-  req.data(m_model->templateData());
-  if (req.data().size() == 0)
+  req.data = m_model->templateData();
+  if (req.data.size() == 0)
     return true;
 
   m_bNeedCommitModifedData = true;
@@ -359,8 +360,8 @@ void ParticipantTemplateEdit::onSaveAsNewTemplate()
     return;
 
   ModifyTemplateDataRequest req;
-  req.data(m_model->templateDataAsCopy(selIndex));
-  if (req.data().size() == 0)
+  req.data = m_model->templateDataAsCopy(selIndex);
+  if (req.data.size() == 0)
     return;
 
   m_bNeedCommitModifedData = false;
@@ -373,12 +374,12 @@ void ParticipantTemplateEdit::onSaveAsNewTemplate()
 void ParticipantTemplateEdit::onAddItemToModel(const QModelIndex &parent, const TemplateData &templateData)
 {
   bool ret = m_model->onInsertRow(parent, templateData);
-  int typeId = m_model->privateData(parent)->data().value<ParticipantManagement::TemplateData>().typeId();
+  int typeId = m_model->privateData(parent)->data().value<ParticipantManagement::TemplateData>().typeId;
   if (!ret && typeId <= 0)
     return;
   Type type = m_dtc->type(typeId);
-  if (type.typeClass() == TypeClass::Unit ||
-      type.typeClass() == TypeClass::SupportUnit)
+  if (type.typeClass == TypeClass::Unit ||
+      type.typeClass == TypeClass::SupportUnit)
   {
     m_ui->treeViewEdit->setExpanded(m_ui->treeViewEdit->selectionModel()->selectedIndexes().at(0), true);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp
index eeaeb86ca..ffdde42c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp
@@ -19,6 +19,7 @@ TemplateUnitNamer::TemplateUnitNamer(bool asSupportService, const std::shared_pt
   , m_ppmGuiCbxIfc(ppmGuiCbxIfc)
   , m_ui(new Ui::TemplateUnitNamer)
   , m_validator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[^,;\"'´`]*")), this))
+  , m_logger(getLogger("TemplateTemplateChooser"))
 {
   m_ui->setupUi(this);
   if (!m_ppmGuiCbxIfc || !m_dtc)
@@ -62,12 +63,12 @@ TemplateUnitNamer::~TemplateUnitNamer()
 void ParticipantManagement::TemplateUnitNamer::onSetUnitName()
 {
   ParticipantManagement::TemplateData templateData;
-  templateData.modId(1);
-  templateData.hierarchyNumber(1);
-  templateData.designator(m_ui->leDesignator->text().toStdString());
-  templateData.tacticalIdentifier(m_ui->leTactIdentifier->text().toStdString());
-  templateData.typeId(m_ui->cbxType->currentData().toInt());
-  templateData.symbol(m_dtc->type(templateData.typeId()).symbol());
+  templateData.modId = 1;
+  templateData.hierarchyNumber = 1;
+  templateData.designator = m_ui->leDesignator->text().toStdString();
+  templateData.tacticalIdentifier = m_ui->leTactIdentifier->text().toStdString();
+  templateData.typeId = m_ui->cbxType->currentData().toInt();
+  templateData.symbol = m_dtc->type(templateData.typeId).symbol;
 
   emit newUnitTemplateRoot(templateData);
   close();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.h
index df82dff3b..6483b3c19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.h
@@ -5,6 +5,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
index 7691e6208..e2322ddb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
@@ -2,6 +2,7 @@
 
 
 #include "operator_party_assignment.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_operator_party_assignment.h"
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
@@ -24,6 +25,7 @@ OperatorPartyAssignment::OperatorPartyAssignment(const QString &menuGroup, QWidg
   , m_operatorId(-1)
   , m_model(nullptr)
   , m_ui(new Ui::OperatorPartyAssignment)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -103,15 +105,15 @@ QMap<int, bool> OperatorPartyAssignment::getPartyStatesForOpertator() const
   QMap<int,bool> mapPartyCheckStates;
   for (auto p : partys)
   {
-    const QString partyId = QString::number(p.id());
-    QJsonObject mainObj = QJsonDocument::fromJson(QByteArray::fromStdString(p.properties())).object();
+    const QString partyId = QString::number(p.id);
+    QJsonObject mainObj = QJsonDocument::fromJson(QByteArray::fromStdString(p.properties)).object();
     QJsonObject subObj = mainObj.value(s_partyOpAssignStr).toObject();
-    QJsonArray opIdJsArry = subObj.value(QString::number(p.id())).toArray();
+    QJsonArray opIdJsArry = subObj.value(QString::number(p.id)).toArray();
 
     if (opIdJsArry.contains(QJsonValue::fromVariant(m_operatorId)))
-      mapPartyCheckStates.insert(p.id(), true);
+      mapPartyCheckStates.insert(p.id, true);
     else
-      mapPartyCheckStates.insert(p.id(), false);
+      mapPartyCheckStates.insert(p.id, false);
 
   }
 
@@ -124,35 +126,35 @@ void OperatorPartyAssignment::onOperatorChanged(const OperatorManagement::User &
   {
     case DataModification::eRemoved:
     {
-      Q_ASSERT(m_operatorMap.contains(data.id()));
+      Q_ASSERT(m_operatorMap.contains(data.id));
 
       
-      if (m_ui->operatorComboBox->currentData().toInt() == data.id())
+      if (m_ui->operatorComboBox->currentData().toInt() == data.id)
       {
         __unchange__();
       }
 
-      m_operatorMap.remove(data.id());
-      m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id()));
+      m_operatorMap.remove(data.id);
+      m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id));
       break;
     }
 
     case DataModification::eAdded:
     {
-      Q_ASSERT(!m_operatorMap.contains(data.id()));
-      const QString   operatorName = QString::fromStdString(data.name());
-      m_operatorMap.insert(data.id(), operatorName);
-      m_ui->operatorComboBox->addItem(operatorName, data.id());
+      Q_ASSERT(!m_operatorMap.contains(data.id));
+      const QString   operatorName = QString::fromStdString(data.name);
+      m_operatorMap.insert(data.id, operatorName);
+      m_ui->operatorComboBox->addItem(operatorName, data.id);
       m_ui->operatorComboBox->model()->sort(0);
       break;
     }
 
     case DataModification::eModified:
     {
-      Q_ASSERT(m_operatorMap.contains(data.id()));
-      const QString   operatorName = QString::fromStdString(data.name());
-      m_operatorMap.insert(data.id(), operatorName);
-      int   i = m_ui->operatorComboBox->findData(data.id());
+      Q_ASSERT(m_operatorMap.contains(data.id));
+      const QString   operatorName = QString::fromStdString(data.name);
+      m_operatorMap.insert(data.id, operatorName);
+      int   i = m_ui->operatorComboBox->findData(data.id);
       Q_ASSERT(i != -1);
       m_ui->operatorComboBox->setItemText(i, operatorName);
       m_ui->operatorComboBox->model()->sort(0);
@@ -202,13 +204,13 @@ bool OperatorPartyAssignment::apply()
   const auto &partys = m_ppmDtc->partys();
   for (auto party : partys)
   {
-    const QString partyId = QString::number(party.id());
-    QJsonObject propertiesObj = QJsonDocument::fromJson(QByteArray::fromStdString(party.properties())).object();
+    const QString partyId = QString::number(party.id);
+    QJsonObject propertiesObj = QJsonDocument::fromJson(QByteArray::fromStdString(party.properties)).object();
     QJsonObject subObj = propertiesObj.value(s_partyOpAssignStr).toObject();
-    QJsonArray jsArry = subObj.value(QString::number(party.id())).toArray();
+    QJsonArray jsArry = subObj.value(QString::number(party.id)).toArray();
 
     const bool containsOpId   = jsArry.contains(QJsonValue::fromVariant(m_operatorId));
-    const bool isPartyChecked = statesData.value(party.id(), false);
+    const bool isPartyChecked = statesData.value(party.id, false);
     if (!containsOpId && !isPartyChecked)
       continue;
     if (containsOpId  && isPartyChecked)
@@ -222,7 +224,7 @@ bool OperatorPartyAssignment::apply()
         if (jsArry.at(idx).toInt() == m_operatorId)
         {
           jsArry.removeAt(idx);
-          subObj.insert(QString::number(party.id()), jsArry); 
+          subObj.insert(QString::number(party.id), jsArry); 
         }
         break;
       }
@@ -230,7 +232,7 @@ bool OperatorPartyAssignment::apply()
     else if (isPartyChecked)
     {
       jsArry.append(QJsonValue::fromVariant(m_operatorId));
-      subObj.insert(QString::number(party.id()), jsArry); 
+      subObj.insert(QString::number(party.id), jsArry); 
     }
 
     
@@ -239,15 +241,15 @@ bool OperatorPartyAssignment::apply()
 
     
     Party req = party;
-    req.id(party.id());
-    req.name(party.name());
-    req.color(party.color());
-    req.fadingColor(party.fadingColor());
-    req.hlaForceIdentifier(party.hlaForceIdentifier());
-    req.isUsedBy(party.isUsedBy());
-    req.role(party.role());
+    req.id = party.id;
+    req.name = party.name;
+    req.color = party.color;
+    req.fadingColor = party.fadingColor;
+    req.hlaForceIdentifier = party.hlaForceIdentifier;
+    req.isUsedBy = party.isUsedBy;
+    req.role = party.role;
     QString props = QString::fromUtf8(QJsonDocument(propertiesObj).toJson());
-    req.properties(props.toStdString());
+    req.properties = props.toStdString();
 
     m_requestHelper->addRequest([this, req]
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
index c10cde99a..d415f21a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
@@ -1,4 +1,5 @@
 #include "operator_party_assignment_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ParticipantManagement/ppm_translation.h>
 #include <QtGui/QColor>
@@ -17,6 +18,7 @@ OPeratorPartyAssignmentModel::OPeratorPartyAssignmentModel(QObject *parent)
                                                                              tr("Role")},
                                                                              parent)
   , m_dtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 bool OPeratorPartyAssignmentModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc)
@@ -70,9 +72,9 @@ QVariant OPeratorPartyAssignmentModel::data(const QModelIndex &index, int role)
     switch(index.column())
     {
     case Color:
-      return QColor::fromRgb(QRgb(party.color()));
+      return QColor::fromRgb(QRgb(party.color));
     case FadedColor:
-      return QColor::fromRgb(QRgb(party.fadingColor()));
+      return QColor::fromRgb(QRgb(party.fadingColor));
     }
   }
 
@@ -81,20 +83,20 @@ QVariant OPeratorPartyAssignmentModel::data(const QModelIndex &index, int role)
     switch (index.column())
     {
     case Id:
-      return party.id();
+      return party.id;
     case Name:
-      return ParticipantManagement::trPartyName(party.name());
+      return ParticipantManagement::trPartyName(party.name);
     case Color:
       return QVariant();
     case FadedColor:
       return QVariant();
     case Role:
-      return ParticipantManagement::toString(party.role());
+      return ParticipantManagement::toString(party.role);
     }
   }
   if (role == Qt::CheckStateRole && index.column() == Name)
   {
-    Qt::CheckState checkState = m_mapPartyCheckStates.value(party.id(),false) ? Qt::Checked : Qt::Unchecked;
+    Qt::CheckState checkState = m_mapPartyCheckStates.value(party.id,false) ? Qt::Checked : Qt::Unchecked;
     return checkState;
   }
   return QVariant();
@@ -119,7 +121,7 @@ bool OPeratorPartyAssignmentModel::setData(const QModelIndex &index, const QVari
     return QAbstractTableModel::setData(index, value, role);
 
   const ParticipantManagement::Party &party = m_vecData.at(index.row());
-  bool &state = m_mapPartyCheckStates[party.id()];
+  bool &state = m_mapPartyCheckStates[party.id];
   state = state ? false : true;
 
   emit dataChanged(index, index, {role});
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
index 966e58455..93a02f7b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 
 #include <QtCore/QSortFilterProxyModel>
@@ -43,7 +44,7 @@ NGL::INGLLogger &m_logger;
   bool isFiltered(const Party &data, DataModification modType) const override
   {
     
-    if (data.id() <= 1)
+    if (data.id <= 1)
       return true;
     return LtsWidgets::LtsAbstractTableModel<ParticipantManagement::Party>::isFiltered(data, modType);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
index d86ff3df2..b16319bf3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
@@ -54,7 +54,7 @@ PartyEdit::~PartyEdit()
 
 void PartyEdit::retranslate()
 {
-  translate(m_ui, m_dtc->party(m_partyId), trPartyName(m_dtc->party(m_partyId).name()), tr("Party"));
+  translate(m_ui, m_dtc->party(m_partyId), trPartyName(m_dtc->party(m_partyId).name), tr("Party"));
   m_ppmGuiCbxIfc->fillRoleComboBox(m_ui->cbRole);
   m_ppmGuiCbxIfc->fillHlaForceIdentifierComboBox(m_ui->cbHlaForceIdentifier);
 }
@@ -98,7 +98,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
   if (m_partyId >= 0) // pool has id 0 so is a valid party
   {
     const Party &party = m_dtc->party(m_partyId);
-    if(party.id() >= 0)
+    if(party.id >= 0)
     {
       setData(party);
     }
@@ -115,8 +115,8 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
   }
 
   // Could be filled programmatically later
-  m_ui->cbAdlerNotification->setProperty("Notification", NotificationManagement::NotificationType::AdlerNotification);
-  m_ui->cbCombatOrder->setProperty("Notification", NotificationManagement::NotificationType::CombatOrder);
+  m_ui->cbAdlerNotification->setProperty("Notification", static_cast<int>(NotificationManagement::NotificationType::AdlerNotification));
+  m_ui->cbCombatOrder->setProperty("Notification", static_cast<int>(NotificationManagement::NotificationType::CombatOrder));
 
   bool enableNotification = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::NotificationShow) );
   if (!enableNotification)
@@ -127,7 +127,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
 
   const ParticipantManagement::ConnectState status = m_dtc->saaConnectedState(m_partyId);
   const bool enableReset = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::ChargeAdministrationShow)) &&
-      (status.underlying() == ParticipantManagement::ConnectState::NoHeartbeat);
+      (status == ParticipantManagement::ConnectState::NoHeartbeat);
   if (!enableReset)
   {
     m_ui->lblReset->hide();
@@ -156,13 +156,13 @@ bool PartyEdit::apply()
     ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast<ParticipantManagement::HlaForceIdentifierEnum>(m_ui->cbHlaForceIdentifier->currentData().toInt());
     Party req;
 
-    req.id(m_partyId);
-    req.name(m_ui->leName->text().toStdString());
-    req.color(m_color.rgb());
-    req.fadingColor(m_fadedColor.rgb());
-    req.role(role);
-    req.hlaForceIdentifier(hlaIdentfier);
-    req.isUsedBy(m_isUsed);
+    req.id = m_partyId;
+    req.name = m_ui->leName->text().toStdString();
+    req.color = m_color.rgb();
+    req.fadingColor = m_fadedColor.rgb();
+    req.role = role;
+    req.hlaForceIdentifier = hlaIdentfier;
+    req.isUsedBy = m_isUsed;
 
     m_requestHelper->addRequest([req, this]()
     {
@@ -171,23 +171,23 @@ bool PartyEdit::apply()
   }
 
   OperatorManagement::User user = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(user.properties())).object());
+  QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(user.properties)).object());
 
   fillOpmProperties(opmProperties);
 
   OperatorManagement::OperatorCreateModifyRequest reqOpm;
-  reqOpm.id(user.id());
-  reqOpm.name(user.name());
-  reqOpm.description(user.description());
-  reqOpm.audioChannelPriority(user.audioChannelPriority());
-  reqOpm.projectionPriority(user.projectionPriority());
-  reqOpm.image(user.image());
-  reqOpm.visiblePartiesByExercise(user.visiblePartiesByExercise());
-  reqOpm.rolePresetId(user.rolePresetId());
+  reqOpm.id = user.id;
+  reqOpm.name = user.name;
+  reqOpm.description = user.description;
+  reqOpm.audioChannelPriority = user.audioChannelPriority;
+  reqOpm.projectionPriority = user.projectionPriority;
+  reqOpm.image = user.image;
+  reqOpm.visiblePartiesByExercise = user.visiblePartiesByExercise;
+  reqOpm.rolePresetId = user.rolePresetId;
 
   QString properties = QString::fromUtf8(QJsonDocument(opmProperties).toJson());
   DEBUG_LOG(m_logger) << "properties: " << properties;
-  reqOpm.properties(properties.toStdString());
+  reqOpm.properties = properties.toStdString();
 
   m_requestHelper->addRequest([reqOpm, this]()
   {
@@ -238,11 +238,11 @@ void PartyEdit::onResetAdlerConnectionClicked()
 
 void PartyEdit::onPartyChanged(const Party &data, DataModification modType)
 {
-  if (modType == DataModification::eRemoved || data.id() != m_partyId)
+  if (modType == DataModification::eRemoved || data.id != m_partyId)
     return;
 
   const ConnectState connectState = m_dtc->saaConnectedState(m_partyId);
-  switch (connectState.underlying())
+  switch (connectState)
   {
   case ParticipantManagement::ConnectState::NoHeartbeat:
   {
@@ -264,14 +264,14 @@ void PartyEdit::onPartyChanged(const Party &data, DataModification modType)
 
 void PartyEdit::setData(const Party &party)
 {
-  m_ui->leName->setText(ParticipantManagement::trPartyName(party.name()));
-  m_color = QColor::fromRgb(QRgb(party.color()));
-  m_fadedColor = QColor::fromRgb(QRgb(party.fadingColor()));
-  m_isUsed = party.isUsedBy();
+  m_ui->leName->setText(ParticipantManagement::trPartyName(party.name));
+  m_color = QColor::fromRgb(QRgb(party.color));
+  m_fadedColor = QColor::fromRgb(QRgb(party.fadingColor));
+  m_isUsed = party.isUsedBy;
   setColorToButton(m_ui->tbColor, m_color);
   setColorToButton(m_ui->tbFadedColor, m_fadedColor);
-  m_ui->cbRole->setCurrentIndex(m_ui->cbRole->findData(party.role().underlying()));
-  m_ui->cbHlaForceIdentifier->setCurrentIndex(m_ui->cbHlaForceIdentifier->findData(party.hlaForceIdentifier().underlying()));
+  m_ui->cbRole->setCurrentIndex(m_ui->cbRole->findData(static_cast<int>(party.role)));
+  m_ui->cbHlaForceIdentifier->setCurrentIndex(m_ui->cbHlaForceIdentifier->findData(static_cast<int>(party.hlaForceIdentifier)));
 }
 
 void PartyEdit::setColorToButton(QToolButton *button, const QColor &color)
@@ -283,7 +283,7 @@ void PartyEdit::fillJsonSuppressNotifications( QJsonArray &notif, NotificationMa
 {
   QJsonObject suppNotif;
   suppNotif[QStringLiteral("partyId")]          = m_partyId;
-  suppNotif[QStringLiteral("AddressType")]      = NotificationManagement::AddressType::Service;
+  suppNotif[QStringLiteral("AddressType")]      = static_cast<int>(NotificationManagement::AddressType::Service);
   suppNotif[QStringLiteral("Address")]          = AreaEffectSimulation::Offset;
 
   QCheckBox *cbNotif = findCheckBoxByNotificationType(notifType);
@@ -293,7 +293,7 @@ void PartyEdit::fillJsonSuppressNotifications( QJsonArray &notif, NotificationMa
   int index = findSuppressNotification(m_partyId, notifType, notif);
   if (!cbNotif->isChecked())
   {
-    suppNotif[QStringLiteral("NotificationType")] = notifType.underlying();
+    suppNotif[QStringLiteral("NotificationType")] = static_cast<int>(notifType);
     if (index >= 0)
       notif.replace(index, suppNotif);
     else
@@ -310,7 +310,7 @@ QCheckBox* PartyEdit::findCheckBoxByNotificationType(const NotificationManagemen
 {
   for(QCheckBox* cb : findChildren<QCheckBox*>())
   {
-    if (cb->property("Notification").toInt() == notif.underlying())
+    if (cb->property("Notification").toInt() == static_cast<int>(notif))
       return cb;
   }
 
@@ -323,7 +323,7 @@ int PartyEdit::findSuppressNotification( int partyId, NotificationManagement::No
   {
     QJsonObject obj = suppNotif.at(i).toObject();
     if (obj[QStringLiteral("partyId")] == partyId &&
-        obj[QStringLiteral("NotificationType")] == notifType.underlying())
+        obj[QStringLiteral("NotificationType")] == static_cast<int>(notifType))
       return i;
   }
 
@@ -380,7 +380,7 @@ void PartyEdit::notificationCheck()
 
   DEBUG_LOG(m_logger) << "Party allowed for ADLER notifications";
 
-  const std::string properties = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()).properties();
+  const std::string properties = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()).properties;
   QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(properties)).object());
 
   QJsonArray arrExercises = opmProperties[QStringLiteral("Exercises")].toArray();
@@ -419,11 +419,11 @@ void PartyEdit::modifyPartyProperties()
   ParticipantManagement::Party requestParty;
   requestParty = m_dtc->party(m_partyId);
   // Get properties and then update them
-  const QJsonObject &origObj = QJsonDocument::fromJson(requestParty.properties().c_str()).object();
+  const QJsonObject &origObj = QJsonDocument::fromJson(requestParty.properties.c_str()).object();
   QJsonObject adlerPropertiesObj = origObj[QStringLiteral("Adler")].toObject();
-  adlerPropertiesObj[QStringLiteral("saaConnectedState")] = ParticipantManagement::ConnectState::Disconnecting;
+  adlerPropertiesObj[QStringLiteral("saaConnectedState")] = static_cast<int>(ParticipantManagement::ConnectState::Disconnecting);
 
-  const QByteArray &propertiesBa = requestParty.properties().c_str();
+  const QByteArray &propertiesBa = requestParty.properties.c_str();
   QJsonParseError parserError;
   QJsonDocument doc(QJsonDocument::fromJson(propertiesBa, &parserError));
 
@@ -439,7 +439,7 @@ void PartyEdit::modifyPartyProperties()
   obj[QStringLiteral("Adler")] = adlerPropertiesObj;
 
   const QByteArray propertiesStr = QJsonDocument(obj).toJson(QJsonDocument::Compact);
-  requestParty.properties() = propertiesStr.data();
+  requestParty.properties = propertiesStr.data();
 
   m_ftc->modifyPartyDataRequest(requestParty);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit_gui_plugin.h
index f7bed0aaa..d91c4e0bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit_gui_plugin.h
@@ -5,6 +5,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
index 27a0c9090..857a99c33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
@@ -74,9 +74,9 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
     switch(index.column())
     {
     case Color:
-      return QColor::fromRgb(QRgb(party.color()));
+      return QColor::fromRgb(QRgb(party.color));
     case FadedColor:
-      return QColor::fromRgb(QRgb(party.fadingColor()));
+      return QColor::fromRgb(QRgb(party.fadingColor));
     }
   }
 
@@ -85,25 +85,25 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case Id:
-      return party.id();
+      return party.id;
     case Name:
-      return ParticipantManagement::trPartyName(party.name());
+      return ParticipantManagement::trPartyName(party.name);
     case Color:
       return QVariant();
     case FadedColor:
       return QVariant();
     case Role:
-      return ParticipantManagement::toString(party.role());
+      return ParticipantManagement::toString(party.role);
     case IsUsedBy:
-      return party.isUsedBy() ? tr("Yes") : tr("No");
+      return party.isUsedBy ? tr("Yes") : tr("No");
     case IsSaaConnected:
     {
-      if ( party.properties().empty())
+      if ( party.properties.empty())
         return false;
 
-      ParticipantManagement::ConnectState status = m_ppmDtc->saaConnectedState(party.id());
+      ParticipantManagement::ConnectState status = m_ppmDtc->saaConnectedState(party.id);
       QString connectState;
-      switch (status.underlying())
+      switch (status)
       {
       case ParticipantManagement::ConnectState::Undefined:
         connectState = QStringLiteral("");
@@ -116,9 +116,9 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
     }
     case SaaName:
     {
-      if ( party.properties().empty())
+      if ( party.properties.empty())
         return QString{};
-      const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(party.properties())).object());
+      const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(party.properties)).object());
       if (!properties.contains(QStringLiteral("Adler")) )
         return QString{};
       const QJsonObject adlerObj = properties[QStringLiteral("Adler")].toObject();
@@ -131,9 +131,9 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
     }
     case SzenarName:
     {
-      if ( party.properties().empty())
+      if ( party.properties.empty())
         return QString{};
-      const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(party.properties())).object());
+      const QJsonObject properties(QJsonDocument::fromJson(QByteArray::fromStdString(party.properties)).object());
       if (!properties.contains(QStringLiteral("Adler")) )
         return QString{};
       const QJsonObject adlerObj = properties[QStringLiteral("Adler")].toObject();
@@ -148,16 +148,16 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
 
 bool PartyModel::hasParty(const Party &party) const
 {
-  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise();
+  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise;
 
    for (const auto &exerciseParties : visiblePartiesByExercise)
    {
-     if (exerciseParties.exerciseId() != m_session->exerciseId())
+     if (exerciseParties.exerciseId != m_session->exerciseId())
        continue;
-     if (!exerciseParties.visibleParties().is_set()) //has_value not support on windows yet so we need depricated is_set
+     if (!exerciseParties.visibleParties.has_value()) //has_value not support on windows yet so we need depricated is_set
        return false;
-     for (const auto &partyId : exerciseParties.visibleParties().get())
-       if (partyId == party.id())
+     for (const auto &partyId : exerciseParties.visibleParties.get())
+       if (partyId == party.id)
          return true;
      return false;
    }
@@ -165,16 +165,16 @@ bool PartyModel::hasParty(const Party &party) const
 }
 
 bool PartyModel::isPartyHidden(const Party &party) const
-{  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise();
+{  const auto visiblePartiesByExercise = m_opmDtc->user(m_operatorId).visiblePartiesByExercise;
 
    for (const auto &exerciseParties : visiblePartiesByExercise)
    {
-     if (exerciseParties.exerciseId() != m_session->exerciseId())
+     if (exerciseParties.exerciseId != m_session->exerciseId())
        continue;
-     if (!exerciseParties.hiddenParties().is_set()) //has_value not support on windows yet so we need depricated is_set
+     if (!exerciseParties.hiddenParties.has_value()) //has_value not support on windows yet so we need depricated is_set
        return false;
-     for (const auto &partyId : exerciseParties.hiddenParties().get())
-       if (partyId == party.id())
+     for (const auto &partyId : exerciseParties.hiddenParties.get())
+       if (partyId == party.id)
          return true;
      return false;
    }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.h
index 3df5dd2f5..401158f6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.h
@@ -5,6 +5,7 @@
 
 #include <OperatorManagement/opm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 
 #include <LtsSession/lts_session.h>
@@ -45,7 +46,7 @@ NGL::INGLLogger &m_logger;
   bool isFiltered(const Party &data, DataModification modType) const override
   {
     
-    if (data.id() <= 1)
+    if (data.id <= 1)
       return true;
     return LtsWidgets::LtsAbstractTableModel<ParticipantManagement::Party>::isFiltered(data, modType);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
index 2380f4de0..a7ad47293 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ppm_party_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_ppm_party_view.h"
 #include "CustomView/ppm_party.h"
 #include "ppm_party_edit.h"
@@ -23,6 +24,7 @@ PartyView::PartyView(const QString &menuGroup, QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
   , m_ui(new Ui::PartyView)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -103,8 +105,8 @@ void PartyView::enaDisa()
   else
   {
     const ParticipantManagement::Party party = m_model->getRowData(row);
-    bEditEnabled = party.id() > 0; 
-    bRemoveEnabled = !party.isUsedBy();
+    bEditEnabled = party.id > 0; 
+    bRemoveEnabled = !party.isUsedBy;
   }
 
   if (m_session->exerciseId() > 0)
@@ -149,9 +151,9 @@ void PartyView::onEditParty()
 
   ParticipantManagement::Party party = m_model->getRowData(row);
   PartyEdit *dialog = new PartyEdit(this);
-  dialog->init(party.id(), m_session);
+  dialog->init(party.id, m_session);
 
-  addDialog(dialog, m_menuGroup, QLatin1String("ppmEditParty")+QString::number(party.id()), LtsWidgets::LayoutArea::eDialogTab);
+  addDialog(dialog, m_menuGroup, QLatin1String("ppmEditParty")+QString::number(party.id), LtsWidgets::LayoutArea::eDialogTab);
 }
 
 void PartyView::onAddParty()
@@ -168,10 +170,10 @@ void PartyView::onRemoveParty()
   if (!curIdx.isValid())
     return;
   const Party party = m_model->getRowData(curIdx.row());
-  if (party.id() < 0)
+  if (party.id < 0)
     return;
   RemovePartyRequest req;
-  req.partyId(party.id());
+  req.partyId = party.id;
   m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->removePartyRequest(req, this);
@@ -194,9 +196,9 @@ void PartyView::onSyncParties()
     m_requestHelper->startSingleRequest([this]()
     {
       SyncPartiesRequest req;
-      req.exerciseId(m_session->exerciseId());
+      req.exerciseId = m_session->exerciseId();
 
-      DEBUG_LOG(m_logger) << "Sync parties for exercise " << req.exerciseId();
+      DEBUG_LOG(m_logger) << "Sync parties for exercise " << req.exerciseId;
 
       return m_ftc->syncPartiesRequest(req, this);
     });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/CMakeLists.txt
index 10a93b7b2..2149b4da9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/CMakeLists.txt
@@ -5,6 +5,15 @@
 # Created by Mike Wille, SLSE, 2016-05-05
 #
 
+# Build this target as separate translation units (NOT a unity build). It links the
+# ddsftc INTERFACE target, which propagates generic_ftc.cpp /
+# generic_ftc_threading.cpp as INTERFACE sources (legacy design: consumers compile
+# the generic FTC implementation themselves, one TU per file, hidden visibility).
+# A unity build concatenates those .cpp's into this target's single TU, and LTO
+# (USE_IPO) then reports "multiple definition of Threading::..." from the same
+# object. Separate TUs restore the legacy per-file structure (behavior-neutral).
+set(CMAKE_UNITY_BUILD FALSE)
+
 SET(ppm_combobox_gui_SRCS
   ppm_combobox_foreign_gui_interface_impl.cpp
   ppm_combobox_foreign_gui_interface_impl.h
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
index 19b44f477..0bbeccff0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
@@ -23,61 +23,61 @@ bool PpmComboBox::fill(QComboBox *cbx, ComboBoxType type,
     const QMap<qint32, EquipmentType> eqTypes = dtc->equipmentTypes();
     for (const EquipmentType &eqType : eqTypes)
     {
-      if (eqType.id() <= 0)
+      if (eqType.id <= 0)
         continue;
-      if (eqType.deletedInWms())
-        cbx->addItem(QString::fromStdString(eqType.name()) + QObject::tr("(deleted)"), eqType.id());
+      if (eqType.deletedInWms)
+        cbx->addItem(QString::fromStdString(eqType.name) + QObject::tr("(deleted)"), eqType.id);
       else
-        cbx->addItem(QString::fromStdString(eqType.name()), eqType.id());
+        cbx->addItem(QString::fromStdString(eqType.name), eqType.id);
     }
     break;
   }
 
   case ComboBoxType::Role:
   {
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Unknown), ParticipantManagement::Role::Unknown);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Friend), ParticipantManagement::Role::Friend);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Neutral), ParticipantManagement::Role::Neutral);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Enemy), ParticipantManagement::Role::Enemy);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Pending), ParticipantManagement::Role::Pending);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::AssumedFriend), ParticipantManagement::Role::AssumedFriend);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Suspect), ParticipantManagement::Role::Suspect);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Unknown), static_cast<int>(ParticipantManagement::Role::Unknown));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Friend), static_cast<int>(ParticipantManagement::Role::Friend));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Neutral), static_cast<int>(ParticipantManagement::Role::Neutral));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Enemy), static_cast<int>(ParticipantManagement::Role::Enemy));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Pending), static_cast<int>(ParticipantManagement::Role::Pending));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::AssumedFriend), static_cast<int>(ParticipantManagement::Role::AssumedFriend));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Suspect), static_cast<int>(ParticipantManagement::Role::Suspect));
     break;
   }
 
   case ComboBoxType::HlaForceIdentifier:
   {
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Other), ParticipantManagement::HlaForceIdentifierEnum::Other);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1), ParticipantManagement::HlaForceIdentifierEnum::Friendly_1);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1), ParticipantManagement::HlaForceIdentifierEnum::Opposing_1);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1), ParticipantManagement::HlaForceIdentifierEnum::Neutral_1);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2), ParticipantManagement::HlaForceIdentifierEnum::Friendly_2);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2), ParticipantManagement::HlaForceIdentifierEnum::Opposing_2);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2), ParticipantManagement::HlaForceIdentifierEnum::Neutral_2);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3), ParticipantManagement::HlaForceIdentifierEnum::Friendly_3);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3), ParticipantManagement::HlaForceIdentifierEnum::Opposing_3);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3), ParticipantManagement::HlaForceIdentifierEnum::Neutral_3);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4), ParticipantManagement::HlaForceIdentifierEnum::Friendly_4);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4), ParticipantManagement::HlaForceIdentifierEnum::Opposing_4);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4), ParticipantManagement::HlaForceIdentifierEnum::Neutral_4);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5), ParticipantManagement::HlaForceIdentifierEnum::Friendly_5);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5), ParticipantManagement::HlaForceIdentifierEnum::Opposing_5);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5), ParticipantManagement::HlaForceIdentifierEnum::Neutral_5);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6), ParticipantManagement::HlaForceIdentifierEnum::Friendly_6);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6), ParticipantManagement::HlaForceIdentifierEnum::Opposing_6);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6), ParticipantManagement::HlaForceIdentifierEnum::Neutral_6);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7), ParticipantManagement::HlaForceIdentifierEnum::Friendly_7);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7), ParticipantManagement::HlaForceIdentifierEnum::Opposing_7);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7), ParticipantManagement::HlaForceIdentifierEnum::Neutral_7);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8), ParticipantManagement::HlaForceIdentifierEnum::Friendly_8);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8), ParticipantManagement::HlaForceIdentifierEnum::Opposing_8);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8), ParticipantManagement::HlaForceIdentifierEnum::Neutral_8);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9), ParticipantManagement::HlaForceIdentifierEnum::Friendly_9);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9), ParticipantManagement::HlaForceIdentifierEnum::Opposing_9);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9), ParticipantManagement::HlaForceIdentifierEnum::Neutral_9);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10), ParticipantManagement::HlaForceIdentifierEnum::Friendly_10);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10), ParticipantManagement::HlaForceIdentifierEnum::Opposing_10);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10), ParticipantManagement::HlaForceIdentifierEnum::Neutral_10);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Other), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Other));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10));
     break;
   }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.h
index 519f7775b..a57331574 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.h
@@ -4,7 +4,8 @@
 #pragma once
 
 
-#include <ParticipantManagement/ppm.hpp>
+//DDS
+#include <ParticipantManagement/ppm_dtc.h>
 
 class QComboBox;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
index d33ee6505..1ba3fbee1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
@@ -67,17 +67,17 @@ bool ForeignGuiComboboxInterfaceImpl::fillPartyComboBox(QComboBox *cbx, CbxParty
 
   for (const Party &party : std::as_const(parties))
   {
-    if (party.id() < 0)
+    if (party.id < 0)
       continue;
-    if (party.id() == 0 && isBitSet(filter, CbxPartyFilter::Pool))
-      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
-                   ParticipantManagement::trPartyName(party.name()), party.id());
-    else if (party.id() == 1 && isBitSet(filter, CbxPartyFilter::Oc))
-      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
-                   ParticipantManagement::trPartyName(party.name()), party.id());
-    else if (party.id() > 1 &&  isBitSet(filter, CbxPartyFilter::Normal))
-      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
-                   ParticipantManagement::trPartyName(party.name()), party.id());
+    if (party.id == 0 && isBitSet(filter, CbxPartyFilter::Pool))
+      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
+                   ParticipantManagement::trPartyName(party.name), party.id);
+    else if (party.id == 1 && isBitSet(filter, CbxPartyFilter::Oc))
+      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
+                   ParticipantManagement::trPartyName(party.name), party.id);
+    else if (party.id > 1 &&  isBitSet(filter, CbxPartyFilter::Normal))
+      cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
+                   ParticipantManagement::trPartyName(party.name), party.id);
   }
 
   if (curData.isValid() && (cbx->findData(curData) != -1))
@@ -112,12 +112,12 @@ bool ForeignGuiComboboxInterfaceImpl::fillTypeComboBox(QComboBox *cbx, TypeClass
   cbx->clear();
   const auto cb = [this, cbx, typeClass](const Type &type)
   {
-    if (type.typeClass() == typeClass && !type.isDeleted())
+    if (type.typeClass == typeClass && !type.isDeleted)
     {
-      if (!m_dtc->isEditable(type.id()))
+      if (!m_dtc->isEditable(type.id))
         return;
 
-      cbx->addItem(ParticipantManagement::trTypeName(type.name()), type.id());
+      cbx->addItem(ParticipantManagement::trTypeName(type.name), type.id);
     }
   };
   m_dtc->types(cb);
@@ -200,23 +200,23 @@ bool ForeignGuiComboboxInterfaceImpl::fillTypeClassPpmComboBox(QComboBox *cbx, i
 
   if ((filter & eParticipants) == eParticipants)
   {
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Human), ParticipantManagement::TypeClass::Human);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::VehicleWithGear), ParticipantManagement::TypeClass::VehicleWithGear);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::GroundVehicle), ParticipantManagement::TypeClass::GroundVehicle);
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::WeaponSystem), ParticipantManagement::TypeClass::WeaponSystem);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Human), static_cast<int>(ParticipantManagement::TypeClass::Human));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::VehicleWithGear), static_cast<int>(ParticipantManagement::TypeClass::VehicleWithGear));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::GroundVehicle), static_cast<int>(ParticipantManagement::TypeClass::GroundVehicle));
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::WeaponSystem), static_cast<int>(ParticipantManagement::TypeClass::WeaponSystem));
 
     if ((filter & eParticipantsWithCtaEquipment) != eParticipantsWithCtaEquipment)
-      cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Aircraft), ParticipantManagement::TypeClass::Aircraft);
+      cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Aircraft), static_cast<int>(ParticipantManagement::TypeClass::Aircraft));
   }
 
   if ((filter & eUnits) == eUnits)
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Unit), ParticipantManagement::TypeClass::Unit);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Unit), static_cast<int>(ParticipantManagement::TypeClass::Unit));
 
   if ((filter & eOcUnits) == eOcUnits)
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportUnit), ParticipantManagement::TypeClass::SupportUnit);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportUnit), static_cast<int>(ParticipantManagement::TypeClass::SupportUnit));
 
   if ((filter & eOc) == eOc)
-    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportEntity), ParticipantManagement::TypeClass::SupportEntity);
+    cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportEntity), static_cast<int>(ParticipantManagement::TypeClass::SupportEntity));
 
 
   cbx->model()->sort(0);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.h
index 2b1adb66e..fa4035ef9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
index a421f5956..43d1eae82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
@@ -38,9 +38,9 @@ bool PartySelector::init(const std::shared_ptr<ParticipantManagement::Interface:
   {
     
     QCheckBox *cb = new QCheckBox;
-    cb->setText(ParticipantManagement::trPartyName(party.name()));
-    cb->setChecked(preselectedParties.contains(party.id()));
-    const int partyId = party.id();
+    cb->setText(ParticipantManagement::trPartyName(party.name));
+    cb->setChecked(preselectedParties.contains(party.id));
+    const int partyId = party.id;
     connect(cb, &QCheckBox::clicked,
     cb, [this, partyId](bool checked) {partyCheckBoxChanged(partyId, checked);});
     m_ui.layParties->addWidget(cb);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
index b0a6791c0..09855abfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <QtCore/QSet>
 #include "ui_ppm_party_selector.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_gui_plugin.h
index 39a1161f7..495bd33ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_gui_plugin.h
@@ -7,6 +7,7 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
index 8911f7fd0..de4906c39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
@@ -473,7 +473,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   if (!m_mapTypeToSaabSymbol.contains(type.id()))
     mapType(type);
 
-  switch (type.typeClass().underlying())
+  switch (type.typeClass())
   {
   case ParticipantManagement::TypeClass::SupportEntity: 
     result = new SaabOcPlayer;
@@ -539,7 +539,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   result->trashcan = participant.isDeleted();
   result->rank = QStringLiteral("OF1");
   result->isExternalPlayer = true;
-  if (participant.equipmentNumber().is_set())
+  if (participant.equipmentNumber().has_value())
     result->simulatorId = participant.equipmentNumber().get();
   result->force = m_mapPartyToForce.value(participant.partyId()).forceCode;
   result->guid = QUuid(participant.id(), m_currentExercise.id(), w2, static_cast<uchar>(participant.partyId()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
index 79d26e5b4..0f180e31b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
@@ -10,6 +10,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <ExerciseManagement/exm.hpp>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <QtCore/QFile>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
index eb605794c..02000c78f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
@@ -14,6 +14,7 @@
 
 #include <memory>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp
index 85e84a08a..b68da9dac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp
@@ -57,7 +57,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
   }
 
   for (const auto &typeclass : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass.underlying());
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
 
   slotClassTypeChanged();
 
@@ -83,7 +83,7 @@ void MappingDialog::slotClassTypeChanged()
     if(type.isDeleted())
       continue;
 
-    if (type.typeClass().underlying() != currentClass)
+    if (type.typeClass() != currentClass)
       continue;
 
     if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.h
index 59de4bd3e..ea16ca25f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
 
 class Ui_SAABMappingDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp
index 323f708e2..504ebbdfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp
@@ -28,6 +28,7 @@ TypeEdit::TypeEdit(LtsSession::LtsSession *session, QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(session)
   , m_ui(new Ui::TypeEdit)
+  , m_logger(getLogger("TypeEdit"))
 {
   m_ui->setupUi(this);
   m_uiRequirements->addRequirement( { m_ui->lblName,  [this]() { return (!m_ui->leName->text().isEmpty()); } } );
@@ -124,7 +125,7 @@ bool TypeEdit::apply()
 {
   int equipType = isUnitTypeClass() ? 0 : m_ui->cbEquipmentType->currentData().toInt();
 
-  auto &vecDISEntities = m_type.disEntities();
+  auto &vecDISEntities = m_type.disEntities;
 
   if (m_pDISTypeEdit)
   {
@@ -137,7 +138,7 @@ bool TypeEdit::apply()
       vecDISEntities.push_back(DIS::convertDISTypeString2Integer(strDISType));
   }
 
-  const Type req(m_type.id(),
+  const Type req(m_type.id,
                  static_cast<TypeClass>(m_ui->cbTypeClass->currentData().toInt()),
                  equipType,
                  m_symbolSidc.toStdString(),
@@ -167,14 +168,14 @@ bool TypeEdit::apply()
     if (symbolId > 0) 
     {
       FileManagement::FileContent data = m_flmDtc->fileContent(symbolId);
-      if (data.id() == symbolId && data.fileType() == FileManagement::FileType::OperatorDefinedSymbol)
+      if (data.id == symbolId && data.fileType == FileManagement::FileType::OperatorDefinedSymbol)
       {
         FileManagement::FileContentSetUsedRequest flmRequest;
-        flmRequest.id(symbolId);
-        flmRequest.isUsedBy(true);
-        flmRequest.usedBy(data.usedBy()+1);
-        flmRequest.lastModified(QDateTime::currentMSecsSinceEpoch());
-        flmRequest.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+        flmRequest.id = symbolId;
+        flmRequest.isUsedBy = true;
+        flmRequest.usedBy = data.usedBy+1;
+        flmRequest.lastModified = QDateTime::currentMSecsSinceEpoch();
+        flmRequest.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
         m_requestHelper->addRequest([this, flmRequest]()
         {
@@ -192,22 +193,22 @@ bool TypeEdit::apply()
     if (symbolId > 0) 
     {
       FileManagement::FileContent data = m_flmDtc->fileContent(symbolId);
-      if (data.id() == symbolId && data.fileType() == FileManagement::FileType::OperatorDefinedSymbol)
+      if (data.id == symbolId && data.fileType == FileManagement::FileType::OperatorDefinedSymbol)
       {
         FileManagement::FileContentSetUsedRequest flmRequest;
-        flmRequest.id(symbolId);
-        if (data.usedBy() > 1)
+        flmRequest.id = symbolId;
+        if (data.usedBy > 1)
         {
-          flmRequest.isUsedBy(true);
-          flmRequest.usedBy(data.usedBy()-1);
+          flmRequest.isUsedBy = true;
+          flmRequest.usedBy = data.usedBy-1;
         }
         else
         {
-          flmRequest.isUsedBy(false);
-          flmRequest.usedBy(0);
+          flmRequest.isUsedBy = false;
+          flmRequest.usedBy = 0;
         }
-        flmRequest.lastModified(QDateTime::currentMSecsSinceEpoch());
-        flmRequest.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+        flmRequest.lastModified = QDateTime::currentMSecsSinceEpoch();
+        flmRequest.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
         m_symbolSidcOld = m_symbolSidc;
 
@@ -228,9 +229,9 @@ void TypeEdit::onTypeClassChanged()
 
   
 
-  m_ui->cbTypeClass->setEnabled(m_type.id() == 0);
-  m_ui->cbEquipmentType->setEnabled((m_type.id() > 0) ? false : bEnable);
-  if (m_type.id() <= 0)
+  m_ui->cbTypeClass->setEnabled(m_type.id == 0);
+  m_ui->cbEquipmentType->setEnabled((m_type.id > 0) ? false : bEnable);
+  if (m_type.id <= 0)
     m_ui->cbEquipmentType->setCurrentIndex(m_ui->cbEquipmentType->findData(0));
 
   m_ui->lblEquipNo->setEnabled(bEnable);
@@ -318,17 +319,17 @@ void TypeEdit::onChangeSymbolInternal(const QString &sidc, bool bInitial)
 
 void TypeEdit::setData()
 {
-  m_ui->leName->setText(QString::fromStdString(m_type.name()));
-  m_ui->sbRadioCount->setValue(m_type.radioCount());
-  m_ui->sbHierarchyLevel->setValue(m_type.hierarchyLevel());
-  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(m_type.typeClass().underlying()));
-  EquipmentType eqType = m_dtc->equipmentType(m_type.equipmentTypeId());
-  if (eqType.id() > 0)
-    m_ui->cbEquipmentType->setCurrentIndex(m_ui->cbEquipmentType->findData(m_type.equipmentTypeId()));
+  m_ui->leName->setText(QString::fromStdString(m_type.name));
+  m_ui->sbRadioCount->setValue(m_type.radioCount);
+  m_ui->sbHierarchyLevel->setValue(m_type.hierarchyLevel);
+  m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(m_type.typeClass)));
+  EquipmentType eqType = m_dtc->equipmentType(m_type.equipmentTypeId);
+  if (eqType.id > 0)
+    m_ui->cbEquipmentType->setCurrentIndex(m_ui->cbEquipmentType->findData(m_type.equipmentTypeId));
   updateEquipMinMaxLabel(eqType);
 
-  m_symbolSidcOld = QString::fromStdString(m_type.symbol());
-  onChangeSymbolInternal(QString::fromStdString(m_type.symbol()), true);
+  m_symbolSidcOld = QString::fromStdString(m_type.symbol);
+  onChangeSymbolInternal(QString::fromStdString(m_type.symbol), true);
   onTypeClassChanged();
 }
 
@@ -337,10 +338,10 @@ void TypeEdit::updateEquipMinMaxLabel(const EquipmentType &eqType)
   QString txt;
   if (isUnitTypeClass())
     txt = tr("---");
-  else if (eqType.id() > 0)
-    txt = tr("Min: %1 / Max: %2").arg(eqType.minEquipNo()).arg(eqType.maxEquipNo());
+  else if (eqType.id > 0)
+    txt = tr("Min: %1 / Max: %2").arg(eqType.minEquipNo).arg(eqType.maxEquipNo);
   else
-    txt = tr("Unknown (%1)").arg(eqType.id());
+    txt = tr("Unknown (%1)").arg(eqType.id);
   m_ui->lblEquipNo->setText(txt);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.h
index d966c9c55..c25299c45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.h
@@ -11,7 +11,7 @@
 #include <Lts/Services/FileManagement/flm_ftc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <SymbologyGui/symbol_modification_dialog.h>
 
 #include <ParticipantManagement/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit_gui_plugin.h
index 00fdc36f1..74e70e49c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit_gui_plugin.h
@@ -5,13 +5,14 @@
 
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_types_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
index 9d1f87464..30d2b88df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
@@ -18,7 +18,7 @@ namespace core
 {
 static inline uint qHash(const ParticipantManagement::TypeClass &tc)
 {
-  return ::qHash(tc.underlying());
+  return ::qHash(tc);
 }
 }
 }
@@ -38,6 +38,7 @@ TypeModel::TypeModel(QObject *parent)
                                                                    tr("DIS type(s)")},
                                                                    parent)
   , AdvancedSymbology::TableModelSymbolRenderer<TypeModel>(ColName)
+  , m_logger(getLogger("TypeModel"))
 {
 }
 
@@ -61,7 +62,7 @@ bool TypeModel::initModel(LtsSession::LtsSessionDataDds *session,
   auto cbInsert = [this](const ParticipantManagement::Type &type)
   {
     insertRow(type);
-    tryRenderSymbol(QString::fromStdString(type.symbol()), type.id());
+    tryRenderSymbol(QString::fromStdString(type.symbol), type.id);
   };
   dtc->types(cbInsert);
 
@@ -78,15 +79,15 @@ bool TypeModel::initModel(LtsSession::LtsSessionDataDds *session,
 void TypeModel::onDataChangedLocal(const ParticipantManagement::Type &data, DataModification modType)
 {
   if (modType == DataModification::eAdded)
-    tryRenderSymbol(QString::fromStdString(data.symbol()), data.id());
+    tryRenderSymbol(QString::fromStdString(data.symbol), data.id);
 
   if (modType == DataModification::eModified)
   {
     const int id = getIdInternal(data);
     const int row = findRowForId(id);
 
-    if (row >= 0 && m_vecData[row].symbol() != data.symbol())
-      tryRenderSymbol(QString::fromStdString(data.symbol()), data.id());
+    if (row >= 0 && m_vecData[row].symbol != data.symbol)
+      tryRenderSymbol(QString::fromStdString(data.symbol), data.id);
   }
 
   TypeModel::onDataChanged(data, modType);
@@ -119,14 +120,14 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
 
   const ParticipantManagement::Type &type = m_vecData.at(index.row());
   if (role == Qt::DecorationRole)
-    return decorationData(index, type.id());
+    return decorationData(index, type.id);
 
   if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
   {
     switch (index.column())
     {
     case ColTypeClass:
-      return type.typeClass().underlying();
+      return static_cast<int>(type.typeClass);
     default:
       break;
     }
@@ -138,7 +139,7 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
     {
     case ColName:
     {
-      QIcon icon = decorationIcon(index, type.id());
+      QIcon icon = decorationIcon(index, type.id);
 
       QByteArray data;
       QBuffer    buffer(&data);
@@ -155,7 +156,7 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
       toolTip += QStringLiteral("<img src='data:image/png;base64,%1'>").arg(toolTipImageStr);
       toolTip += paragraphEnd + QStringLiteral("<hr>");
 
-      toolTip += paragraphBegin + QString::fromStdString(type.name()) + paragraphEnd;
+      toolTip += paragraphBegin + QString::fromStdString(type.name) + paragraphEnd;
       toolTip += QStringLiteral("</html>");
 
       return toolTip;
@@ -169,33 +170,33 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ColId:
-    return type.id();
+    return type.id;
   case ColName:
-    return QString::fromStdString(type.name());
+    return QString::fromStdString(type.name);
   case ColTypeClass:
-    return ParticipantManagement::toString(type.typeClass());
+    return ParticipantManagement::toString(type.typeClass);
   case ColEquipmentTypeId:
   {
-    if (type.equipmentTypeId() == 0)
+    if (type.equipmentTypeId == 0)
       return tr("NONE");
-    auto it = m_equipmentTypes.constFind(type.equipmentTypeId());
+    auto it = m_equipmentTypes.constFind(type.equipmentTypeId);
     if (it == m_equipmentTypes.constEnd())
-      return tr("Unknown Equipment Type (%1)").arg(type.equipmentTypeId());
+      return tr("Unknown Equipment Type (%1)").arg(type.equipmentTypeId);
     const EquipmentType &et = *it;
-    QString ret = QString::fromStdString(et.name());
-    if (et.deletedInWms())
+    QString ret = QString::fromStdString(et.name);
+    if (et.deletedInWms)
       ret += QLatin1Char(' ') + tr("(deleted in WMS)");
     return ret;
   }
   case ColRadioCount:
-    return type.radioCount();
+    return type.radioCount;
   case ColHierarchyLevel:
-    return type.hierarchyLevel();
+    return type.hierarchyLevel;
   case DISType:
   {
     QStringList slDISTypes;
-    slDISTypes.reserve(type.disEntities().size());
-    for (const auto &distype : type.disEntities())
+    slDISTypes.reserve(type.disEntities.size());
+    for (const auto &distype : type.disEntities)
       slDISTypes += ParticipantManagement::DIS::convertDISTypeInteger2DISString(distype);
 
     return slDISTypes.join(QStringLiteral(", "));
@@ -210,10 +211,10 @@ void TypeModel::onEquipmentTypeChanged(const EquipmentType &data, DataModificati
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_equipmentTypes[data.id()] = data;
+    m_equipmentTypes[data.id] = data;
     break;
   case DataModification::eRemoved:
-    m_equipmentTypes.remove(data.id());
+    m_equipmentTypes.remove(data.id);
     break;
   }
 }
@@ -224,11 +225,11 @@ void TypeModel::updateFilterTypeClasses()
   LtsWidgets::ComboboxFilterData cfd;
   QSet<TypeClass> typeClasses;
   for (const auto &r : std::as_const(m_vecData))
-    typeClasses.insert(r.typeClass());
+    typeClasses.insert(r.typeClass);
 
   for (const auto tc : std::as_const(typeClasses))
   {
-    cfd.data = tc.underlying();
+    cfd.data = static_cast<int>(tc);
     cfd.text = toString(tc);
     cfc.data.push_back(cfd);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.h
index f604b872a..331a642ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
index 5aa8dc8c3..a925bf52c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
@@ -25,6 +25,7 @@ TypeView::TypeView(const QString &menuGroup, LtsSession::LtsSession *session, QW
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(session)
   , m_ui(new Ui::TypeView)
+  , m_logger(getLogger("TypeView"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -95,9 +96,9 @@ void TypeView::onRemoveRow()
   if (!curIdx.isValid())
     return;
   const auto &type = m_model->getRowData(curIdx.row());
-  if (type.id() <= 0)
+  if (type.id <= 0)
     return;
-  const RemoveTypeRequest req(type.id());
+  const RemoveTypeRequest req(type.id);
   m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->removeTypeRequest(req, this);
@@ -114,8 +115,8 @@ void TypeView::onEditType()
 
   ParticipantManagement::Type type = m_model->getRowData(row);
   TypeEdit *dialog = new TypeEdit(m_session, this);
-  dialog->init(type.id(), m_dtc, m_ftc, m_ppmGuiCbxIfc, m_flmDtc, m_flmFtc);
-  addDialog(dialog, m_menuGroup, QLatin1String("ppmEditType")+QString::number(type.id()), LtsWidgets::LayoutArea::eDialogTab);
+  dialog->init(type.id, m_dtc, m_ftc, m_ppmGuiCbxIfc, m_flmDtc, m_flmFtc);
+  addDialog(dialog, m_menuGroup, QLatin1String("ppmEditType")+QString::number(type.id), LtsWidgets::LayoutArea::eDialogTab);
 }
 
 void TypeView::onAddType()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.h
index 7fe09d012..8efa698d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.h
@@ -8,7 +8,7 @@
 #include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
index ebad319e0..85120392a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
@@ -5,16 +5,17 @@
 #include "ui_ppm_uas_edit_dialog.h"
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
 
-#include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
+#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session.h>
 
 #include <QtWidgets/QInputDialog>
@@ -82,7 +83,7 @@ void UasEditDialog::init(LtsSession::LtsSession *session, const UAS &data)
 
 QString UasEditDialog::dialogIdentifier() const
 {
-  return m_data.id() <= 0 ? tr("Add UAS") : tr("Edit UAS %1").arg(m_data.id());
+  return m_data.id <= 0 ? tr("Add UAS") : tr("Edit UAS %1").arg(m_data.id);
 }
 
 
@@ -99,10 +100,10 @@ bool UasEditDialog::apply()
 void UasEditDialog::onCreateModifyUasReply(const Core::FunctionReplyObject &reply)
 {
   m_requestHelper->requestReply(reply);
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
     return;
 
-  const auto &newData  = m_ppmDtc->uAS(m_data.id());
+  const auto &newData  = m_ppmDtc->uAS(m_data.id);
   m_data = newData;
   fillData();
 
@@ -117,18 +118,18 @@ void UasEditDialog::fillParticipantCbx()
   QMap<int, Participant> part_map;
   for  (const auto &part : m_ppmDtc->participants())
   {
-    if (m_ppmDtc->isTypeUas(part.typeId()) && !part.isDeleted())
+    if (m_ppmDtc->isTypeUas(part.typeId) && !part.isDeleted)
     {
-      part_map.insert(part.id(), part);
+      part_map.insert(part.id, part);
     }
   }
   
 
   for (const auto &uav : m_ppmDtc->uASs())
   {
-    if (uav.exerciseId() == m_session->exerciseId() && uav.participantId() != m_data.participantId())
+    if (uav.exerciseId == m_session->exerciseId() && uav.participantId != m_data.participantId)
     {
-      part_map.remove(uav.participantId());
+      part_map.remove(uav.participantId);
     }
 
   }
@@ -136,8 +137,8 @@ void UasEditDialog::fillParticipantCbx()
   for (const auto &uavPart : part_map)
   {
     QPixmap pix = QPixmap(10,10);
-    pix.fill(QColor::fromRgb(m_ppmDtc->party(uavPart.partyId()).color()));
-    m_ui->cbParticpant->insertItem(uavPart.id(), pix, m_ppmDtc->hierarchyFromParticipant(uavPart.id()), uavPart.id());
+    pix.fill(QColor::fromRgb(m_ppmDtc->party(uavPart.partyId).color));
+    m_ui->cbParticpant->insertItem(uavPart.id, pix, m_ppmDtc->hierarchyFromParticipant(uavPart.id), uavPart.id);
   }
 }
 
@@ -153,9 +154,9 @@ void UasEditDialog::fillData()
     else
     {
       fillParticipantCbx();
-      if (m_data.participantId() > 0)
+      if (m_data.participantId > 0)
       {
-        m_ui->cbParticpant->setCurrentIndex(m_ui->cbParticpant->findData(m_data.participantId()));
+        m_ui->cbParticpant->setCurrentIndex(m_ui->cbParticpant->findData(m_data.participantId));
       }
 
     }
@@ -165,39 +166,39 @@ void UasEditDialog::fillData()
 
     QSignalBlocker s(m_ui->cbParticpant);
     m_ui->cbParticpant->clear();
-    if(m_data.participantId() == 0 || m_data.exerciseId() == 0)
+    if(m_data.participantId == 0 || m_data.exerciseId == 0)
     {
       m_ui->cbParticpant->insertItem(0, QStringLiteral("-"));
     }
-    else if (m_data.exerciseId() != m_session->exerciseId())
+    else if (m_data.exerciseId != m_session->exerciseId())
     {
       
 
-      m_ui->cbParticpant->insertItem(0, tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(m_data.exerciseId()).name())));
+      m_ui->cbParticpant->insertItem(0, tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(m_data.exerciseId).name)));
     }
     m_ui->cbParticpant->setEnabled(false);
   }
 
-  m_ui->leIdentifier->setText(QString::fromStdString(m_data.deviceIdentifier()));
-  m_ui->leHost->setText(QString::fromStdString(m_data.hostname()));
-  m_ui->lePort->setText(QString::number(m_data.hostport()));
-  m_ui->pbUnlink->setEnabled(m_data.exerciseId() > 0);
+  m_ui->leIdentifier->setText(QString::fromStdString(m_data.deviceIdentifier));
+  m_ui->leHost->setText(QString::fromStdString(m_data.hostname));
+  m_ui->lePort->setText(QString::number(m_data.hostport));
+  m_ui->pbUnlink->setEnabled(m_data.exerciseId > 0);
 
-  m_ui->tcpRadioBtn->setChecked(m_data.useTcp());
-  m_ui->udpRadioBtn->setChecked(!m_data.useTcp());
+  m_ui->tcpRadioBtn->setChecked(m_data.useTcp);
+  m_ui->udpRadioBtn->setChecked(!m_data.useTcp);
 
 }
 
 bool UasEditDialog::sendData()
 {
   CreateModifyUasRequest req;
-  req.id(m_data.id());
-  req.deviceIdentifier(m_ui->leIdentifier->text().toStdString());
-  req.participantId(m_data.participantId());  
-  req.exerciseId(m_data.exerciseId());
-  req.hostname(m_ui->leHost->text().toStdString());
-  req.hostport(m_ui->lePort->text().toInt());  
-  req.useTcp(m_ui->tcpRadioBtn->isChecked());
+  req.id = m_data.id;
+  req.deviceIdentifier = m_ui->leIdentifier->text().toStdString();
+  req.participantId = m_data.participantId;  
+  req.exerciseId = m_data.exerciseId;
+  req.hostname = m_ui->leHost->text().toStdString();
+  req.hostport = m_ui->lePort->text().toInt();  
+  req.useTcp = m_ui->tcpRadioBtn->isChecked();
 
   m_requestHelper->addRequest([this, req]()
   {
@@ -214,8 +215,8 @@ void UasEditDialog::onUnlinkClicked()
                                  QMessageBox::Yes | QMessageBox::Cancel);
   if(ret == QMessageBox::Yes)
   {
-    m_data.exerciseId() = 0;
-    m_data.participantId() = 0;
+    m_data.exerciseId = 0;
+    m_data.participantId = 0;
     sendData();
   }
 }
@@ -224,13 +225,13 @@ void UasEditDialog::onUAVParticipantChanged()
 {
   if (m_ui->cbParticpant->currentData().toInt() > 0)
   {
-    m_data.exerciseId() = m_session->exerciseId();
-    m_data.participantId() = m_ui->cbParticpant->currentData().toInt();
+    m_data.exerciseId = m_session->exerciseId();
+    m_data.participantId = m_ui->cbParticpant->currentData().toInt();
   }
   else
   {
-    m_data.exerciseId() = 0;
-    m_data.participantId() = 0;
+    m_data.exerciseId = 0;
+    m_data.participantId = 0;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.cpp
index 4122049ec..84e1c2b9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.cpp
@@ -23,6 +23,7 @@ UasListDialog::UasListDialog(LtsSession::LtsSession *session, QWidget *parent)
   , m_session(session)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::UasListDialog)
+  , m_logger(getLogger("UasListDialog"))
 {
   m_ui->setupUi(this);
 
@@ -91,9 +92,9 @@ void UasListDialog::enaDisa()
   QModelIndex currentIndex = m_ui->ldvUas->currentIndex();
   const auto &uasData = m_uasListModel->uasData(m_ui->ldvUas->currentIndex());
   bool isEditable = true;
-  if (m_session->isExercisePartition() && uasData.exerciseId() > 0)
+  if (m_session->isExercisePartition() && uasData.exerciseId > 0)
   {
-    isEditable = (uasData.exerciseId() == m_session->exerciseId());
+    isEditable = (uasData.exerciseId == m_session->exerciseId());
   }
 
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, currentIndex.isValid() && isEditable);
@@ -127,7 +128,7 @@ void UasListDialog::onRemoveClicked()
   if (!m_uasListModel)
     return;
 
-  int idToRemove =m_uasListModel->uasData(m_ui->ldvUas->currentIndex()).id();
+  int idToRemove =m_uasListModel->uasData(m_ui->ldvUas->currentIndex()).id;
   const RemoveUasRequest req(idToRemove);
   m_requestHelper->addRequest([this, req]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
index 216236019..37292e43e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
@@ -30,6 +30,7 @@ UasListModel::UasListModel(QObject *parent)
                                            tr("Linked Participant")
 },
                                            parent)
+  , m_logger(getLogger("UasListModel"))
 {}
 
 
@@ -74,27 +75,27 @@ QVariant UasListModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ColUavId:
-    return uas.id();
+    return uas.id;
   case ColIdentifier:
-    return QString::fromStdString(uas.deviceIdentifier());
+    return QString::fromStdString(uas.deviceIdentifier);
   case ColUavState:
-    return ProjectDataManagement::toString(uas.uasState());
+    return ProjectDataManagement::toString(uas.uasState);
   case ColHostname:
-    return QString::fromStdString(uas.hostname());
+    return QString::fromStdString(uas.hostname);
   case ColHostport:
-    return uas.hostport();
+    return uas.hostport;
   case ColParticipant:
   {
-    if(uas.participantId() == 0 ||
-       uas.exerciseId() == 0)
+    if(uas.participantId == 0 ||
+       uas.exerciseId == 0)
       return QStringLiteral("-");
 
     
-    if (uas.exerciseId() != m_exerciseId)
-      return tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(uas.exerciseId()).name()));
+    if (uas.exerciseId != m_exerciseId)
+      return tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(uas.exerciseId).name));
 
     
-    return m_ppmDtc->hierarchyFromParticipant(uas.participantId());
+    return m_ppmDtc->hierarchyFromParticipant(uas.participantId);
   }
   }
 
@@ -111,7 +112,7 @@ UAS UasListModel::uasData(const QModelIndex &index)
 
 void UasListModel::onUasChanged(const UAS &data, const DataModification modType)
 {
-  int row = findRowForId(data.id());
+  int row = findRowForId(data.id);
 
   switch (modType)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.h
index 95fdcd10e..fe5e4530a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/logger.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_data_plugin_interface.h
index 0a580cfe7..7408299b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_data_plugin_interface.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/attribute_dialog_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/attribute_dialog_manager.cpp
index 0511f2409..d8f7878a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/attribute_dialog_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/attribute_dialog_manager.cpp
@@ -2,6 +2,7 @@
 
 #include "attribute_dialog_manager.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <Symbology/sidc_codec.h>
 #include <SymbologyGui/symbol_modification_dialog.h>
 #include <SymbologyXML/Gui/symbol_dialog.h>
@@ -29,7 +30,7 @@
 #include <QtCore/QPointer>
 
 #include <QtWidgets/QAbstractButton>
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
 #include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QColorDialog>
@@ -145,7 +146,8 @@ public:
   Logger                                      &m_logger;
 
   InternalData(PlanEditor *planEditor, SituationMap::Map *map, SituationMap::GeometryModel *geoModel, const PlanEditorSession &session, AttributeDialogManager *self)
-    : m_planEditor(planEditor)
+    : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AttributeDialogManager::InternalData"))
+    , m_planEditor(planEditor)
     , m_map(map)
     , m_geoModel(geoModel)
     , m_session(session)
@@ -182,7 +184,7 @@ public:
 
     , m_lineWidth(1)
     , m_color(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Highlight))
-    , m_fillColor(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Background))
+    , m_fillColor(m_session.topLevelWidget()->palette().color(QPalette::ColorRole::Window))
     , m_linePattern(SituationMap::GeometryModel::LineStyle::LineSolid)
     , m_fillPattern(SituationMap::GeometryModel::FillPattern::None)
     , m_fillStyle(SituationMap::GeometryModel::FillStyle::Pieslice)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/geometry_placer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/geometry_placer.h
index eb159a41f..acdb05c35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/geometry_placer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/geometry_placer.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "plan_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "logging.h"
 
@@ -117,6 +118,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
   , m_previewGeoModelRenderer(nullptr)
   , m_uidList()
   , m_rubberband(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("GeometryPlacer"))
 
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp
index b42e2176f..eb8841f7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/mil2525d_to_mil2525c.cpp
@@ -57,7 +57,7 @@ class Converter::Internal
   {
     if (line.isEmpty()) return true;
 
-    QVector<QStringRef> tokenList = line.splitRef(QLatin1Char(';'));
+    QList<QString> tokenList = line.split(QLatin1Char(';'));
 
     QRegularExpression sidcTemplate(QStringLiteral("^[A-Z]{1,1}\\*[A-Z]+[\\-\\*X]+$"));
     QString sidc;
@@ -77,7 +77,7 @@ class Converter::Internal
     if (sidc.isEmpty()) return true;
 
     bool               isNumber  = false;
-    const QStringRef &code2525d = tokenList.last();
+    const QString &code2525d = tokenList.last();
     unsigned int       code      = code2525d.toUInt(&isNumber);
 
     if (!isNumber)
@@ -87,7 +87,7 @@ class Converter::Internal
 
     if (m_2525dToSidc.contains(code)) return true;
 
-    QStringRef kindOfRubberband;
+    QString kindOfRubberband;
 
     foreach (auto token, tokenList)
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/model_tree_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/model_tree_widget.cpp
index bbea94067..316694621 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/model_tree_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/model_tree_widget.cpp
@@ -14,7 +14,7 @@
 #include <QtGui/QKeyEvent>
 
 #include <QtWidgets/QAbstractItemView>
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QGroupBox>
 #include <QtWidgets/QHBoxLayout>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.cpp
index 57003a686..697808a47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.cpp
@@ -55,7 +55,7 @@ const char* const REVISION = "$Revision$";
 #include <QtCore/QFileInfo>
 #include <QtCore/QMimeData>
 #include <QtCore/QString>
-#include <QtCore/QStringRef>
+#include <QString>
 #include <QtCore/QSettings>
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QTime>
@@ -70,7 +70,7 @@ const char* const REVISION = "$Revision$";
 #include <QtGui/QTextTable>
 #include <QtGui/QTextTableCell>
 
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
 
 #include <QtWidgets/QFormLayout>
 #include <QtWidgets/QGraphicsView>
@@ -89,6 +89,8 @@ const char* const REVISION = "$Revision$";
 #include <QtWidgets/QVBoxLayout>
 
 #include <QtPrintSupport/QPrintDialog>
+#include <QtGui/QPageLayout>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <SituationMap/LayerAggregation/layer_aggregation_widget.h>
 #include <SituationMap/LayerAggregation/participant_aggregation_dialog.h>
@@ -311,6 +313,7 @@ static void importGuezXMLSymbolsFromFile(const AdvancedSymbology::SymbolDictiona
 
 PlanEditor::PlanEditor(SituationMap::Map *map, LtsSession::LtsSession *ltsSession)
   : QObject()
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor"))
   , m_internal(new PlanEditor::InternalData(map, PlanEditorSession(ltsSession, this), this))
 {
   init();
@@ -319,6 +322,7 @@ PlanEditor::PlanEditor(SituationMap::Map *map, LtsSession::LtsSession *ltsSessio
 
 PlanEditor::PlanEditor(SituationMap::Map *map, LtsWidgets::LtsBaseLayoutWidget *ltsbaseWidget)
   : QObject()
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor"))
   , m_internal(new PlanEditor::InternalData(map, PlanEditorSession(ltsbaseWidget, this), this))
 {
   init();
@@ -2512,7 +2516,7 @@ void PlanEditor::onPlanPrint()
   QSharedPointer<QPrinter>   printer(new QPrinter(QPrinter::PrinterMode::HighResolution));
   QPrintDialog               printDialog(printer.data(), topLevelWidget());   
 
-  printer->setOrientation(QPrinter::Orientation::Landscape);
+  printer->setPageOrientation(QPageLayout::Orientation::Landscape);
 
   if (printDialog.exec() == QDialog::Accepted)
   {
@@ -2549,7 +2553,7 @@ void PlanEditor::onPlanPrint()
 
       const QFont      &defaultFont = defaultFontFormat.font();
       int               marginInt   = defaultFont.pixelSize();
-      const QSizeF      pageSize    = printer->paperRect().size();
+      const QSizeF      pageSize    = printer->paperRect(QPrinter::Point).size();
       const QSizeF      drawingSize = pageSize - QSizeF(2 * marginInt, 5 * marginInt) * 1.5;
       QMarginsF         margins;
 
@@ -2671,18 +2675,18 @@ static QString addPlanFileSuffix(const QString &filePath, const QString &selecte
 
 
 
-  QStringRef    suffix;
+  QString    suffix;
   int           suffixDefStart = selectedNameFilter.lastIndexOf(QLatin1Char('(')) + 1;
   int           suffixDefEnd   = selectedNameFilter.lastIndexOf(QLatin1Char(')')) - 1;
 
   if (suffixDefStart < suffixDefEnd)
   {
-    const QStringRef           &suffixFilter = selectedNameFilter.midRef(suffixDefStart, suffixDefEnd - suffixDefStart + 1);
-    const QVector<QStringRef> &suffixVector = suffixFilter.split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const QString           &suffixFilter = selectedNameFilter.mid(suffixDefStart, suffixDefEnd - suffixDefStart + 1);
+    const QList<QString> &suffixVector = suffixFilter.split(QLatin1Char(' '), Qt::SkipEmptyParts);
 
     if (!suffixVector.isEmpty())
     {
-      const QStringRef &filter = suffixVector.first();
+      const QString &filter = suffixVector.first();
       int indexOfDot = filter.lastIndexOf(QLatin1Char('.'));
       if (indexOfDot >= 0)
         suffix = filter.right(filter.length() - indexOfDot);
@@ -2691,7 +2695,7 @@ static QString addPlanFileSuffix(const QString &filePath, const QString &selecte
 
 
 
-  if (suffix.isEmpty()) suffix = QStringRef(&defaultSuffix);
+  if (suffix.isEmpty()) suffix = QString(defaultSuffix);
   if ((suffix == QStringLiteral(".*")) || (filePath.endsWith(suffix))) return filePath;
 
   return filePath + suffix;
@@ -4882,7 +4886,7 @@ static void importGuezXMLSymbolsFromFile(const AdvancedSymbology::SymbolDictiona
       QString blockBegin = QStringLiteral("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
       QString blockEnd   = QStringLiteral("</symbol>");
 
-      const QVector<QStringRef> & xmlSymbolVector = xmlContent.splitRef(blockEnd,QString::SplitBehavior::SkipEmptyParts);
+      const QList<QString> & xmlSymbolVector = xmlContent.split(blockEnd,Qt::SkipEmptyParts);
       for (auto xmlSymbolRef : std::as_const(xmlSymbolVector))
       {
         int     xmlBegin  = xmlSymbolRef.indexOf(blockBegin);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
index f12fdd914..d11399e60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
@@ -5,6 +5,7 @@
 
 
 #include "plan_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include "plan_editor_const.h"
@@ -194,7 +195,8 @@ public:
   Logger                                      &m_logger;
 
   InternalData(SituationMap::Map *map, const PlanEditorSession &session, PlanEditor *me)
-    : QObject()
+    : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PlanEditor::InternalData"))
+    , QObject()
     , m_title(QStringLiteral("PlanEditor"))
     , m_session(session)
     , m_map(map)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp
index bc48616e7..fffa962c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/symbol_favourites.cpp
@@ -3,6 +3,7 @@
 
 
 #include "symbol_favourites.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "plan_editor.h"
 
 #include <QtCore/QIODevice>
@@ -211,6 +212,7 @@ public:
 
 
   SymbolFavouritesDom() : QDomDocument(QLatin1String(m_rootNodeName) + QLatin1String("Document"))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("symbol_favourites"))
   {
     if (!m_initStaticDone) initStatic();
     QDomElement root = createElement(QLatin1String(m_rootNodeName));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
index de9788ac2..8c82928e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
@@ -27,7 +27,7 @@ PlanTopicEditor::PlanTopicEditor(
   , m_flmDtc(flmDtc)
   , m_model(nullptr)
   , m_ui(new Ui::PlanTopicEditor)
-  .getNGLLogger("PlanTopicEditor"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   
   m_ui->setupUi(this);
@@ -98,7 +98,7 @@ void PlanTopicEditor::updateInternalData()
     fakePlanItem[QStringLiteral("fileId")] = fileId;
     QString fileName;
     if (m_flmDtc)
-      fileName = QString::fromStdString(m_flmDtc->fileContent(fileId).name());
+      fileName = QString::fromStdString(m_flmDtc->fileContent(fileId).name);
     if (fileName.isEmpty())
       fileName = tr("Plan file id %1").arg(fileId);
     fakePlanItem[QStringLiteral("fileName")] = fileName;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/flm_reply_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/flm_reply_handler.cpp
index 90b0e4e63..7a896ceff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/flm_reply_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/flm_reply_handler.cpp
@@ -25,7 +25,7 @@ namespace PlanOverlaysPlugin
 
   void FileManagementReplyHandler::onGetFileContentDataReply( const FileManagement::GetFileContentDataReply & replyObject )
   {
-    m_content = replyObject.content();
+    m_content = replyObject.content;
     m_requestHelper->requestReply(replyObject);
   } 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
index ed6e8457c..ad71399c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
@@ -45,7 +45,7 @@ public:
 
 
 PlanOverlayModel::PlanOverlayModel() : QAbstractItemModel(), m_internal(new InternalData())
-  .getNGLLogger("PlanOverlayModel"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {;}
 
 PlanOverlayModel::~PlanOverlayModel()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
index 1c610a82d..30d84f2ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
@@ -106,7 +106,7 @@ public:
       pi.m_keyId = obj[QStringLiteral("keyId")].toInt();
       pi.m_folderId = obj[QStringLiteral("folderId")].toInt();
       pi.m_fileId = obj[QStringLiteral("fileId")].toInt();
-      pi.m_fileName = obj[QStringLiteral("fileName")].toInt();
+      pi.m_fileName = obj[QStringLiteral("fileName")].toString();
 
       pi.m_exerciseId = obj[QStringLiteral("exerciseId")].toInt();
       pi.m_phaseId = obj[QStringLiteral("phaseId")].toInt();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
index 5bc6a1563..97b3b3c4f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
@@ -8,7 +8,7 @@
 #include "TopicEditor/topic_editor.h"
 #include "flm_reply_handler.h"
 
-#include <LtsUtils/pgarray.h>
+#include <LtsUtilsCore/pgarray.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <NGLLogger/INGLLogger.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
@@ -24,9 +24,9 @@
 #include <PlanEditor/ped_operator_rights.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <FileManagement/Explorer/TopicEditor/topic_editor.h>
+#include <FileManagement/Gui/Explorer/TopicEditor/topic_editor.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <Viewer/SituationMap/Map/map.h>
 #include <Viewer/SituationMap/GeometryModel/geometry_model_factory.h>
@@ -109,6 +109,7 @@ InterfaceImpl::InterfaceImpl(LtsSession::LtsSession * session)
   , m_internal(new InternalData())
   , m_foreignIfc(nullptr)
 
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_internal->m_requestHelper   = new LtsUtils::RequestHelper(this);
   m_internal->m_flmReplyHandler = new FileManagementReplyHandler(m_internal->m_requestHelper);
@@ -248,19 +249,19 @@ bool InterfaceImpl::loadPlan(int planFileId,
   FileManagement::FileContent fileContent = m_internal->m_dtc->fileContent(planFileId);
 
   
-  if (fileContent.id() <= 0) 
+  if (fileContent.id <= 0) 
   {
     ERROR_LOG(m_logger) << "Could not find plan with id " << planFileId << " in filemanagement - removing";
     return false;
   }
 
-  QString nameOfPlan = QString::fromStdString(fileContent.name());
+  QString nameOfPlan = QString::fromStdString(fileContent.name);
 
   std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this, fileContent, applyMinMaxScaleOfMetadata, nameOfPlan, overrideSitMapIfc, planItemObject](const Core::FunctionReply &)
   {
     const QByteArray &planXMLContent = LtsUtils::toQByteArray(m_internal->m_flmReplyHandler->getContent());
 
-    int planFileId = fileContent.id();
+    int planFileId = fileContent.id;
 
     
     if (!overrideSitMapIfc->planOverlaySetContent(planFileId, nameOfPlan, planXMLContent))
@@ -274,12 +275,12 @@ bool InterfaceImpl::loadPlan(int planFileId,
     if (!planItem.isValid())
       planItem = m_internal->m_overlayModel->planItem(-1);
 
-    planItem.m_folderId = fileContent.folderId();
-    if (fileContent.exerciseId().is_set())
+    planItem.m_folderId = fileContent.folderId;
+    if (fileContent.exerciseId.has_value())
     {
-      planItem.m_exerciseId = fileContent.exerciseId().get();
-      if (fileContent.phaseId().is_set())
-        planItem.m_phaseId = fileContent.phaseId().get();
+      planItem.m_exerciseId = fileContent.exerciseId.get();
+      if (fileContent.phaseId.has_value())
+        planItem.m_phaseId = fileContent.phaseId.get();
     }
     planItem.m_fileId = planFileId;
     planItem.m_fileName = nameOfPlan;
@@ -353,7 +354,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
   bool ok = m_internal->m_requestHelper->startSingleRequest([this, planFileId]()
   {
     FileManagement::GetFileContentDataRequest req;
-    req.fileContentId(planFileId);
+    req.fileContentId = planFileId;
     return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
   }, handleContent);
 
@@ -394,13 +395,13 @@ void InterfaceImpl::onUpdatePlan(int planId)
   int                          planFileId  = planItem.m_fileId;
   FileManagement::FileContent  fileContent = m_internal->m_dtc->fileContent(planFileId);
 
-  planItem.m_fileName = QString::fromStdString(fileContent.name());
+  planItem.m_fileName = QString::fromStdString(fileContent.name);
 
   std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this,planFileId,planItem](const Core::FunctionReply &baseReply)
   {
     const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
 
-    const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
+    const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
 
     
     if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(planFileId, planItem.m_fileName, planXMLContent))
@@ -417,7 +418,7 @@ void InterfaceImpl::onUpdatePlan(int planId)
   bool ok = m_internal->m_requestHelper->startSingleRequest([this, planFileId]()
   {
     FileManagement::GetFileContentDataRequest req;
-    req.fileContentId(planFileId);
+    req.fileContentId = planFileId;
     return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
   }, handleContent);
 
@@ -553,13 +554,13 @@ void InterfaceImpl::onReloadPlanById(int planId)
   {
     int                          fileId      = planItem.m_fileId;
     FileManagement::FileContent  fileContent = m_internal->m_dtc->fileContent(fileId);
-    QString                      nameOfPlan  = QString::fromStdString(fileContent.name());
+    QString                      nameOfPlan  = QString::fromStdString(fileContent.name);
 
     std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this,planId,nameOfPlan](const Core::FunctionReply &baseReply)
     {
       const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
 
-      const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
+      const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
       if (planXMLContent.isEmpty())
       {
         ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
@@ -589,7 +590,7 @@ void InterfaceImpl::onReloadPlanById(int planId)
     bool ok = m_internal->m_requestHelper->startSingleRequest([this,fileId]() -> bool
     {
       FileManagement::GetFileContentDataRequest req;
-      req.fileContentId(fileId);
+      req.fileContentId = fileId;
       return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
     }, handleContent);
 
@@ -685,9 +686,9 @@ void InterfaceImpl::onChangePlanOrderOnMap(const QVector<int> &newIdOrder)
 
 void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  if (data.fileType() != FileManagement::FileType::TacticalPlan) return;
+  if (data.fileType != FileManagement::FileType::TacticalPlan) return;
 
-  const PlanOverlaysPlugin::PlanOverlayModel::PlanItem &planItem = m_internal->m_overlayModel->findPlanItemByFileId(data.id());
+  const PlanOverlaysPlugin::PlanOverlayModel::PlanItem &planItem = m_internal->m_overlayModel->findPlanItemByFileId(data.id);
 
   if (planItem.isValid())
   {
@@ -709,7 +710,7 @@ void InterfaceImpl::onExerciseChanged(const ExerciseManagement::Exercise &data,
     case DataModification::eModified:
     {
       DEBUG_LOG(m_logger) << "onExerciseChanged - Modified";
-      m_internal->m_overlayModel->reInitModel(data.id(), data.activePhaseId());
+      m_internal->m_overlayModel->reInitModel(data.id, data.activePhaseId);
       break;
     }
     default:
@@ -737,14 +738,14 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
     }
 
     FileManagement::FileContent  fileContent = m_internal->m_dtc->fileContent(planFileId);
-    QString                      nameOfPlan  = QString::fromStdString(fileContent.name());
+    QString                      nameOfPlan  = QString::fromStdString(fileContent.name);
     int                          planId      = planItem.m_keyId;
 
     std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this, planId, nameOfPlan, fileContent](const Core::FunctionReply &baseReply)
     {
       const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
 
-      const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
+      const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
       if (planXMLContent.isEmpty())
       {
         ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
@@ -761,7 +762,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
         }
 
         
-        if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(fileContent.id(), nameOfPlan, planXMLContent))
+        if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(fileContent.id, nameOfPlan, planXMLContent))
         {
           ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
           return false;
@@ -770,13 +771,13 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
         
 
         pi.m_fileName   = nameOfPlan;
-        pi.m_fileId     = fileContent.id();
-        pi.m_folderId   = fileContent.folderId();
-        if (fileContent.exerciseId().is_set())
+        pi.m_fileId     = fileContent.id;
+        pi.m_folderId   = fileContent.folderId;
+        if (fileContent.exerciseId.has_value())
         {
-          pi.m_exerciseId = fileContent.exerciseId().get();
-          if (fileContent.phaseId().is_set())
-            pi.m_phaseId = fileContent.phaseId().get();
+          pi.m_exerciseId = fileContent.exerciseId.get();
+          if (fileContent.phaseId.has_value())
+            pi.m_phaseId = fileContent.phaseId.get();
         }
         
 
@@ -789,7 +790,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
     bool ok = m_internal->m_requestHelper->startSingleRequest([this,planFileId]() -> bool
     {
       FileManagement::GetFileContentDataRequest req;
-      req.fileContentId(planFileId);
+      req.fileContentId = planFileId;
       return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
     }, handleContent);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
index 9f7480d30..5c47cce5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
@@ -9,7 +9,7 @@
 #include <TopicEditorBase/topic_editor_interface.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <PlanOverlays/plan_overlays_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 
 #include <QtCore/QObject>
@@ -170,9 +170,10 @@ NGL::INGLLogger &m_logger;
   private:
     InterfaceImpl *m_ovr;
     SituationMap::ForeignGuiInterface *m_foreignSitmapIfc;
-    
+
     QVector<int> m_loadedPlanFileIds;
-  }; 
+    NGL::INGLLogger &m_logger;
+  };
 
 
   TopicReplay::Interface *createInterface(TopicEditorBase::TopicType) override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
index d1dc3a610..dac00b5f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pre_edit_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_pre_edit_dialog.h"
 
 #include <LtsSession/lts_session.h>
@@ -20,6 +21,7 @@ PresentationEditDialog::PresentationEditDialog(QWidget *parent)
   , m_opmDtc(nullptr)
   , m_presentationId(-1)
   , m_ui(new Ui::PresentationEditDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   DEBUG_LOG(m_logger) << "PresentationEditDialog ctor";
   
@@ -69,8 +71,8 @@ bool PresentationEditDialog::init(int presentationId,
   if (m_presentationId > 0) 
   {
     PresentationManagement::Presentation p = m_dtc->presentation(m_presentationId);
-    m_ui->leName->setText(QString::fromStdString(p.name()));
-    m_ui->teDesc->setText(QString::fromStdString(p.description()));
+    m_ui->leName->setText(QString::fromStdString(p.name));
+    m_ui->teDesc->setText(QString::fromStdString(p.description));
 
     m_ui->lblFileStatus->setVisible(true);
     m_ui->leFileStatus->setVisible(true);
@@ -81,9 +83,9 @@ bool PresentationEditDialog::init(int presentationId,
     m_ui->lblOperator->setVisible(true);
     m_ui->leOperator->setVisible(true);
 
-    m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(p.operatorId()).name()));
-    m_ui->leLastModified->setText(DTG::toStringMSec(p.lastModified()));
-    m_ui->leFileStatus->setText(PresentationManagement::toString(p.fileStatus()));
+    m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(p.operatorId).name));
+    m_ui->leLastModified->setText(DTG::toStringMSec(p.lastModified));
+    m_ui->leFileStatus->setText(PresentationManagement::toString(p.fileStatus));
 
   }
   m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Add)->setDisabled(m_ui->leName->text().isEmpty());
@@ -120,12 +122,12 @@ void PresentationEditDialog::onSavePresentation()
 bool PresentationEditDialog::apply()
 {
   PresentationModifyRequest req;
-  req.id(m_presentationId);
-  req.name(m_ui->leName->text().toStdString());
-  req.description(m_ui->teDesc->toPlainText().toStdString());
-  req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  req.lastModified(QDateTime::currentMSecsSinceEpoch());
-  req.fileStatus(FileStatus::Valid);
+  req.id = m_presentationId;
+  req.name = m_ui->leName->text().toStdString();
+  req.description = m_ui->teDesc->toPlainText().toStdString();
+  req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  req.lastModified = QDateTime::currentMSecsSinceEpoch();
+  req.fileStatus = FileStatus::Valid;
 
   try
   {
@@ -133,15 +135,15 @@ bool PresentationEditDialog::apply()
     {
       auto reply(m_ftc->getPresentationContentRequest(GetPresentationContentRequest(m_presentationId)));
 
-      m_content = reply.content();
+      m_content = reply.content;
       if (m_content.empty())
       {
-        throw std::runtime_error(QStringLiteral("No content for presentation with id %1").arg(reply.id()).toStdString().c_str());
+        throw std::runtime_error(QStringLiteral("No content for presentation with id %1").arg(reply.id).toStdString().c_str());
       }
     }
 
     DEBUG_LOG(m_logger) << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
-    req.content(m_content);
+    req.content = m_content;
 
     m_presentationId = m_ftc->presentationModifyRequest(req);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.cpp
index 7788f820f..0bc7946c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.cpp
@@ -2,11 +2,13 @@
 
 
 #include "pre_mobile_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace PresentationManagement
 {
 PreMobileDialogModel::PreMobileDialogModel(QObject *parent)
   : PresentationManagementDialogModel(parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   
   m_checkboxColumn = 1;
@@ -71,7 +73,7 @@ QVector<int> PreMobileDialogModel::getDownloadedScriptIds() const
     if (m_vecDownload.size() <= i)  
       break;
     if (m_vecDownload.at(i))
-      ret.push_back(p.id());
+      ret.push_back(p.id);
   }
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.h
index 0add50560..59098ed1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_mobile_model.h
@@ -6,7 +6,7 @@
 #include <PresentationManagement/logger.h>
 #include <preguicommon_export.h>
 
-#include <PresentationManagement/Common/pre_model.h>
+#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
index cbd7739ef..612baa861 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pre_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ngltools/ngltools_dtg.h>
 #include <PresentationManagement/pre_translation.h>
@@ -19,6 +20,7 @@ PresentationManagementDialogModel::PresentationManagementDialogModel(QObject *pa
                                                      tr("LastModified"),
                                                      tr("Status")},
                                                      parent)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -35,15 +37,15 @@ bool PresentationManagementDialogModel::initModel(const std::shared_ptr<Interfac
   m_predicate = predicate;
   connect(dtc.get(), &Interface::Dtc::presentationChanged,
           this, &PresentationManagementDialogModel::onDataChanged);
-  dtc->presentations([this](const Presentation &p) { insertRow(p); m_scriptUsers.append(p.operatorId()); });
+  dtc->presentations([this](const Presentation &p) { insertRow(p); m_scriptUsers.append(p.operatorId); });
 
 
   QMap<qint32, OperatorManagement::User> users = opmDtc->users();
   m_users.clear();
   for (auto it = users.constBegin(); it != users.constEnd(); ++it)
   {
-    if (m_scriptUsers.contains(it->id()))
-      m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
+    if (m_scriptUsers.contains(it->id))
+      m_users.insert(static_cast<int>(it.value().id), QString::fromStdString(it.value().name));
   }
 
   INFO_LOG(m_logger) << "initModel - #presentations: " << m_vecData.size();
@@ -83,7 +85,7 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
 
   if (role == Qt::BackgroundRole)
   {
-    if (pre.fileStatus() == PresentationManagement::FileStatus::Deleted)
+    if (pre.fileStatus == PresentationManagement::FileStatus::Deleted)
       return QGuiApplication::palette().color(QPalette::Disabled, QPalette::AlternateBase);
     return QGuiApplication::palette().color(QPalette::Active, QPalette::Base);
   }
@@ -93,17 +95,17 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
     switch (index.column())
     {
     case Id:
-      return pre.id();
+      return pre.id;
     case Name:
-      return QString::fromStdString(pre.name());
+      return QString::fromStdString(pre.name);
     case Description:
-      return QString::fromStdString(pre.description());
+      return QString::fromStdString(pre.description);
     case Operator:
-      return QString::fromStdString(m_opmDtc->user(pre.operatorId()).name());
+      return QString::fromStdString(m_opmDtc->user(pre.operatorId).name);
     case LastModified:
-      return QDateTime::fromMSecsSinceEpoch(pre.lastModified());
+      return QDateTime::fromMSecsSinceEpoch(pre.lastModified);
     case Status:
-      return PresentationManagement::toString(pre.fileStatus());
+      return PresentationManagement::toString(pre.fileStatus);
     }
   }
 
@@ -112,7 +114,7 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
     switch (index.column())
     {
     case Columns::Operator:
-      return pre.operatorId();
+      return pre.operatorId;
 
     default:
       return {};
@@ -141,7 +143,7 @@ bool  PresentationManagementDialogProxyModel::lessThan(const QModelIndex &source
   switch (source_left.column())
   {
   case PresentationManagementDialogModel::LastModified:
-    return dataLeft.lastModified() < dataRight.lastModified();
+    return dataLeft.lastModified < dataRight.lastModified;
   case PresentationManagementDialogModel::Id:
   case PresentationManagementDialogModel::Name:
   case PresentationManagementDialogModel::Description:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/CMakeLists.txt
index aa9016303..4b892792b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/CMakeLists.txt
@@ -34,6 +34,7 @@ if(QT6_GUI_AVAILABLE)
     NGLLogger
     LtsSession
     svcAvmCommon
+    AvmShared
     svcAsmCommon
     PreDataPluginInterface
     PrePresentationGuiPluginInterface
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
index 5e24cf6b4..306b5d4d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
@@ -2,10 +2,11 @@
 
 
 #include "pre_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_pre_dialog.h"
 
-#include <PresentationManagement/Common/pre_edit_dialog.h>
-#include <PresentationManagement/Common/pre_model.h>
+#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
+#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
@@ -20,7 +21,7 @@ PresentationManagementDialog::PresentationManagementDialog(QWidget *parent)
   , m_ui(new Ui::PresentationManagementDialog)
   , m_dtc(nullptr)
   , m_ftc(nullptr)
-  , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   DEBUG_LOG(m_logger) << "PresentationManagementDialog ctor";
   m_ui->setupUi(this);
@@ -77,9 +78,9 @@ void PresentationManagementDialog::enaDisa()
 
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, (selected == 1));
-  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, (selected == 1 && pre.id() != m_loadedScriptId));
-  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, (selected == 1 && pre.id() != m_loadedScriptId && pre.fileStatus() == FileStatus::Valid) );
-  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (selected == 1 && pre.fileStatus() == FileStatus::Deleted));
+  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, (selected == 1 && pre.id != m_loadedScriptId));
+  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, (selected == 1 && pre.id != m_loadedScriptId && pre.fileStatus == FileStatus::Valid) );
+  m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, (selected == 1 && pre.fileStatus == FileStatus::Deleted));
 }
 
 void PresentationManagementDialog::slotAdd()
@@ -105,7 +106,7 @@ void PresentationManagementDialog::slotEdit()
   PresentationEditDialog *dialog = new PresentationEditDialog(this);
 
 
-  if (!dialog->init(m_model->getRowData(m_ui->widget->currentIndex().row()).id() , m_dtc, m_ftc, m_opmDtc))
+  if (!dialog->init(m_model->getRowData(m_ui->widget->currentIndex().row()).id , m_dtc, m_ftc, m_opmDtc))
   {
     dialog->deleteLater();
     return;
@@ -116,7 +117,7 @@ void PresentationManagementDialog::slotEdit()
   QObject::connect(dialog, &PresentationEditDialog::newScript, this, [this](int scriptId)
   {
     m_loadedScriptId = scriptId;
-    QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name());
+    QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name);
     m_session->baseLayout()->setCustomText(tr("Script: %1").arg(scriptName));
   });
   QObject::connect(dialog, &PresentationEditDialog::rejected, dialog, &PresentationEditDialog::deleteLater);
@@ -131,8 +132,8 @@ void PresentationManagementDialog::slotRemove()
   if (!selIndex.isValid())
     return;
 
-  Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
-  DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id();
+  Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id);
+  DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -164,15 +165,15 @@ void PresentationManagementDialog::changeStatus(const FileStatus &fs)
 
   Presentation pre = m_model->getRowData(m_ui->widget->currentIndex().row());
 
-  if (pre.fileStatus() == fs) 
+  if (pre.fileStatus == fs) 
     return;
 
   PresentationChangeStatusRequest req;
-  req.id(pre.id());
-  req.fileStatus(fs);
-  req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  req.lastModified(QDateTime::currentMSecsSinceEpoch());
-  DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
+  req.id = pre.id;
+  req.fileStatus = fs;
+  req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  req.lastModified = QDateTime::currentMSecsSinceEpoch();
+  DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id;
   m_requestHelper->startSingleRequest([this, req]()
   {
     return m_ftc->presentationChangeStatusRequest(PresentationChangeStatusRequest(req), this);
@@ -205,7 +206,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
   m_model = new PresentationManagementDialogModel(this);
   auto predicate = [](const PresentationManagement::Presentation & p)
   {
-    return (!p.isDeleted());
+    return (!p.isDeleted);
   };
   m_model->initModel(dtc, opmDtc, predicate);
 
@@ -221,7 +222,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
 
   const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
   for (const auto &p : presentations)
-    DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
+    DEBUG_LOG(m_logger) << "Presentation: id = " << p.id << ", name = " << p.name.c_str() << ", desc = " << p.description.c_str();
 
   connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PresentationManagementDialog::enaDisa, Qt::UniqueConnection);
 
@@ -265,7 +266,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
 void PresentationManagementDialog::slotSetScriptName(int scriptId)
 {
   m_loadedScriptId = scriptId;
-  QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name());
+  QString scriptName = QString::fromStdString(m_dtc->presentation(scriptId).name);
   m_session->baseLayout()->setCustomText(tr("Script: %1").arg(scriptName));
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
index 09126f8ff..cf2de4e50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
@@ -2,11 +2,12 @@
 
 
 #include "pre_mobile_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_pre_mobile_dialog.h"
 
-#include <PresentationManagement/Common/pre_edit_dialog.h>
-#include <PresentationManagement/Common/pre_mobile_model.h>
-#include <AudioVideoManagement/AVMenuEdit/topic_replay.h>
+#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
+#include <PresentationManagement/Gui/Common/pre_mobile_model.h>
+#include <Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsScriptTimeline/track_entry_painters.h>
@@ -37,6 +38,7 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
   , m_label(nullptr)
   , m_avScriptsCount(0)
   , m_avScriptsActualDone(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   DEBUG_LOG(m_logger) << "PreMobileDialog ctor";
   connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFailed, this, &PreMobileDialog::onCopyDbFailed);
@@ -168,7 +170,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   m_model = new PreMobileDialogModel(this);
   auto predicate = [](const PresentationManagement::Presentation & p)
   {
-    return (!p.isDeleted());
+    return (!p.isDeleted);
   };
   m_model->initModel(dtc, opmDtc, predicate);
 
@@ -186,7 +188,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 
   const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
   for (const auto &p : presentations)
-    DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
+    DEBUG_LOG(m_logger) << "Presentation: id = " << p.id << ", name = " << p.name.c_str() << ", desc = " << p.description.c_str();
 
   connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PreMobileDialog::enaDisa, Qt::UniqueConnection);
 
@@ -235,18 +237,18 @@ void PreMobileDialog::getAVScripts()
 void PreMobileDialog::onGetPresentationContentReply(const GetPresentationContentReply &reply)
 {
   m_requestHelper->requestReply(reply);
-  if (!reply.errorString().empty())
+  if (!reply.errorString.empty())
     return;
   handlePresentationContent(reply);
 }
 
 void PreMobileDialog::handlePresentationContent(const GetPresentationContentReply &reply)
 {
-  const auto &contentList = reply.content();
+  const auto &contentList = reply.content;
 
   if (contentList.empty())
   {
-    WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id();
+    WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id;
     return;
   }
 
@@ -255,11 +257,11 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
 
   for (const auto &p : contentList)
   {
-    QJsonObject attributes = QJsonDocument::fromJson(QByteArray::fromStdString(p.attributes())).object();
+    QJsonObject attributes = QJsonDocument::fromJson(QByteArray::fromStdString(p.attributes)).object();
     
 
-    if (p.presentationTopicType() == audioStr ||
-        p.presentationTopicType() == videoStr )
+    if (p.presentationTopicType == audioStr ||
+        p.presentationTopicType == videoStr )
     {
       m_vecScripts.append(attributes);
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
index 76846c58c..968d64c5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <PresentationManagement/Common/pre_model.h>
+#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QCloseEvent>
 #include <QtCore/QTimer>
@@ -43,7 +43,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
   
   auto predicate = [](const PresentationManagement::Presentation & p)
   {
-    return (!p.isDeleted() && p.fileStatus() == FileStatus::Valid);
+    return (!p.isDeleted && p.fileStatus == FileStatus::Valid);
   };
   m_model->initModel(dtc, opmDtc, predicate);
   m_proxy->setSourceModel(m_model);
@@ -122,7 +122,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
 
     for (rowCounter = 0; rowCounter < m_model->rowCount(); ++rowCounter)
     {
-      if (m_model->getRowData(rowCounter).id() == scriptId)
+      if (m_model->getRowData(rowCounter).id == scriptId)
       {
         isExistingScriptId = true;
         break;
@@ -140,7 +140,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
     {
       const Presentation p = m_model->getRowData(rowCounter);
 
-      if (p.id() <= 0)
+      if (p.id <= 0)
         return;
 
       setEnabled(false);
@@ -148,7 +148,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
       if (!m_isImportDialog)
         LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(true);
 
-      emit signalSelectScript(p.id());
+      emit signalSelectScript(p.id);
       m_close = true;
       close();
     });
@@ -182,11 +182,11 @@ void ScriptChooser::onDeleteScript()
     const FileStatus fs = FileStatus::Deleted;
     PresentationChangeStatusRequest req;
 
-    req.id(pre.id());
-    req.fileStatus(fs);
-    req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    req.lastModified(QDateTime::currentMSecsSinceEpoch());
-    DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
+    req.id = pre.id;
+    req.fileStatus = fs;
+    req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    req.lastModified = QDateTime::currentMSecsSinceEpoch();
+    DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id;
 
     m_requestHelper->startSingleRequest([this, req]()
     {
@@ -233,7 +233,7 @@ void ScriptChooser::onImportScript()
   const QModelIndex idx = m_ui->ltsDataView->currentIndex();
   const Presentation p = m_model->getRowData(idx.row());
 
-  if (p.id() <= 0)
+  if (p.id <= 0)
     return;
 
   setEnabled(false);
@@ -241,7 +241,7 @@ void ScriptChooser::onImportScript()
   if (!m_isImportDialog)
     LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(true);
 
-  emit signalSelectScript(p.id());
+  emit signalSelectScript(p.id);
   m_close = true;
   close();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
index dfa6ee411..8b9b33e61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
@@ -109,10 +109,10 @@ void ExportProcess::slotStartExport()
 
   for (const PresentationManagement::PresentationContent &content : std::as_const(m_contentList))
   {
-    auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType()));
+    auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType));
     if (it == m_trackEntryAssignments.constEnd())
     {
-      ERROR_LOG(m_logger) << "Invalid content for type (" << content.presentationTopicType() << "): " << QString::fromStdString(content.presentationTopicType());
+      ERROR_LOG(m_logger) << "Invalid content for type (" << content.presentationTopicType << "): " << QString::fromStdString(content.presentationTopicType);
       continue;
     }
 
@@ -121,42 +121,42 @@ void ExportProcess::slotStartExport()
         ta.topicType == TopicEditorBase::TopicType::Situation)
     {
       
-      if (content.attributes().size() == 0)
+      if (content.attributes.size() == 0)
         continue;
 
       QJsonParseError parseError;
-      const QJsonDocument doc(QJsonDocument::fromJson(QByteArray(content.attributes().c_str(), content.attributes().size()), &parseError));
+      const QJsonDocument doc(QJsonDocument::fromJson(QByteArray(content.attributes.c_str(), content.attributes.size()), &parseError));
       if (parseError.error != QJsonParseError::NoError)
         continue;
       const QJsonObject detailData = doc.object();
 
       TopicReplay::Interface::SituationReplayTime sitReplayTime;
-      sitReplayTime.id = content.id();
-      sitReplayTime.topicStart_s = content.startTime();
-      sitReplayTime.topicEnd_s = content.startTime() + content.duration();
+      sitReplayTime.id = content.id;
+      sitReplayTime.topicStart_s = content.startTime;
+      sitReplayTime.topicEnd_s = content.startTime + content.duration;
       sitReplayTime.replaySpeedFactor = qRound64(detailData.value(QStringLiteral("speed")).toDouble(1.0));
       sitReplayTime.replayStart_ms = qRound64(detailData.value(QStringLiteral("start")).toDouble());
-      sitReplayTime.replayEnd_ms = sitReplayTime.replayStart_ms + (content.duration() * sitReplayTime.replaySpeedFactor * 1000); 
+      sitReplayTime.replayEnd_ms = sitReplayTime.replayStart_ms + (content.duration * sitReplayTime.replaySpeedFactor * 1000); 
       allSitReplayTimes.push_back(std::move(sitReplayTime));
     }
   }
 
   for (const PresentationManagement::PresentationContent &content : m_contentList)
   {
-    auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType()));
+    auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType));
 
     if (it == m_trackEntryAssignments.constEnd())
     {
-      ERROR_LOG(m_logger) << "Invalid content for presentation type " << content.presentationTopicType();
+      ERROR_LOG(m_logger) << "Invalid content for presentation type " << content.presentationTopicType;
       continue;
     }
 
     
-    if (content.attributes().size() == 0)
+    if (content.attributes.size() == 0)
       continue;
 
     QJsonParseError parseError;
-    const QJsonDocument doc(QJsonDocument::fromJson(QByteArray(content.attributes().c_str(), content.attributes().size()), &parseError));
+    const QJsonDocument doc(QJsonDocument::fromJson(QByteArray(content.attributes.c_str(), content.attributes.size()), &parseError));
     if (parseError.error != QJsonParseError::NoError)
       continue;
     QJsonObject detailData = doc.object();
@@ -173,19 +173,19 @@ void ExportProcess::slotStartExport()
     }
 
     
-    m_vecExportSteps += parseFilterSteps(content.id(), detailData, allSitReplayTimes);
+    m_vecExportSteps += parseFilterSteps(content.id, detailData, allSitReplayTimes);
 
     
     
     TopicEditorBase::TopicData data(
-      content.id(), ta.topicType, content.startTime(), content.duration(), QString::fromStdString(content.description()),
-      QString::fromStdString(content.channel()), detailData
+      content.id, ta.topicType, content.startTime, content.duration, QString::fromStdString(content.description),
+      QString::fromStdString(content.channel), detailData
     );
     QJsonArray unused;
     bool keepOriginalTopic = false;
-    m_vecExportSteps += checkAdditionalExportEntries(content.id(), data, unused, topicExportIfc, allSitReplayTimes, keepOriginalTopic);
+    m_vecExportSteps += checkAdditionalExportEntries(content.id, data, unused, topicExportIfc, allSitReplayTimes, keepOriginalTopic);
     if (keepOriginalTopic)
-      m_vecExportSteps += createExportStep(content.id(), data, topicExportIfc, allSitReplayTimes);
+      m_vecExportSteps += createExportStep(content.id, data, topicExportIfc, allSitReplayTimes);
   }
 
   connect(m_pProgressDlg, &QProgressDialog::canceled, this, &ExportProcess::slotCancel);
@@ -388,12 +388,12 @@ static inline QJsonArray descVecToArray(const std::vector<AssetManagement::MapDe
   {
     
     const AssetManagement::MapDescription &desc = descriptions.at(i);
-    const bool isElevation = desc.mapDescriptionTypeId() == AssetManagement::MapDescriptionType::Elevation;
-    obj[QStringLiteral("name")] = QString::fromStdString(desc.name());
-    obj[QStringLiteral("description")] = QString::fromStdString(desc.description());
+    const bool isElevation = desc.mapDescriptionTypeId == AssetManagement::MapDescriptionType::Elevation;
+    obj[QStringLiteral("name")] = QString::fromStdString(desc.name);
+    obj[QStringLiteral("description")] = QString::fromStdString(desc.description);
     obj[QStringLiteral("url")] = QString(layerBaseName + QLatin1Char('_') + QString::number(i) + (isElevation ? QStringLiteral(".tiff") : QStringLiteral(".tpk")));
-    obj[QStringLiteral("minScale")] = desc.minScale();
-    obj[QStringLiteral("maxScale")] = desc.maxScale();
+    obj[QStringLiteral("minScale")] = desc.minScale;
+    obj[QStringLiteral("maxScale")] = desc.maxScale;
 
     arr.append(obj);
   }
@@ -419,14 +419,14 @@ void ExportProcess::createLayerMappings(const std::shared_ptr<ExerciseManagement
     return;
 
   const ExerciseManagement::Exercise exercise = exmDtc->exercise(m_pSession->exerciseId());
-  const AssetManagement::TrainingArea ta = asmDtc->trainingArea(exercise.trainingAreaId());
+  const AssetManagement::TrainingArea ta = asmDtc->trainingArea(exercise.trainingAreaId);
 
   
   QJsonObject obj;
-  obj[QStringLiteral("mapUrls")] = descVecToArray(ta.map2D(), QStringLiteral("map2D"));
-  obj[QStringLiteral("sceneUrls")] = descVecToArray(ta.scene3D(), QStringLiteral("scene3D"));
-  obj[QStringLiteral("elevationUrls")] = descVecToArray(ta.elevation(), QStringLiteral("elevation"));
-  obj[QStringLiteral("sceneObjectUrls")] = descVecToArray(ta.sceneObjects(), QStringLiteral("sceneObjects"));
+  obj[QStringLiteral("mapUrls")] = descVecToArray(ta.map2D, QStringLiteral("map2D"));
+  obj[QStringLiteral("sceneUrls")] = descVecToArray(ta.scene3D, QStringLiteral("scene3D"));
+  obj[QStringLiteral("elevationUrls")] = descVecToArray(ta.elevation, QStringLiteral("elevation"));
+  obj[QStringLiteral("sceneObjectUrls")] = descVecToArray(ta.sceneObjects, QStringLiteral("sceneObjects"));
 
   file.write(QJsonDocument(obj).toJson(QJsonDocument::Indented));
   file.close();
@@ -466,18 +466,18 @@ void ExportProcess::createDataJson(const std::shared_ptr<ExerciseManagement::Int
   QJsonObject obj = doc.object();
 
   const ExerciseManagement::Exercise exercise = exmDtc->exercise(m_pSession->exerciseId());
-  const AssetManagement::TrainingArea ta = asmDtc->trainingArea(exercise.trainingAreaId());
+  const AssetManagement::TrainingArea ta = asmDtc->trainingArea(exercise.trainingAreaId);
 
-  obj[QStringLiteral("title")] = QString::fromStdString(exercise.name());
-  obj[QStringLiteral("exerciseName")] = QString::fromStdString(exercise.name());
-  obj[QStringLiteral("exerciseId")] = exercise.id();
-  obj[QStringLiteral("exerciseArea")] = QString::fromStdString(ta.name());
-  obj[QStringLiteral("cycleTime")] = QString(QDateTime::fromMSecsSinceEpoch(exercise.startTime()).toString() +
-      QStringLiteral(" - ") + QDateTime::fromMSecsSinceEpoch(exercise.stopTime()).toString());
-  obj[QStringLiteral("exerciseStart")] = exercise.startTime();
-  obj[QStringLiteral("exerciseEnd")] = exercise.stopTime();
-  obj[QStringLiteral("exercisingForces")] = QString::fromStdString(exercise.forces());
-  obj[QStringLiteral("exercisingPurpose")] = QString::fromStdString(exercise.description());
+  obj[QStringLiteral("title")] = QString::fromStdString(exercise.name);
+  obj[QStringLiteral("exerciseName")] = QString::fromStdString(exercise.name);
+  obj[QStringLiteral("exerciseId")] = exercise.id;
+  obj[QStringLiteral("exerciseArea")] = QString::fromStdString(ta.name);
+  obj[QStringLiteral("cycleTime")] = QString(QDateTime::fromMSecsSinceEpoch(exercise.startTime).toString() +
+      QStringLiteral(" - ") + QDateTime::fromMSecsSinceEpoch(exercise.stopTime).toString());
+  obj[QStringLiteral("exerciseStart")] = static_cast<qint64>(exercise.startTime);
+  obj[QStringLiteral("exerciseEnd")] = static_cast<qint64>(exercise.stopTime);
+  obj[QStringLiteral("exercisingForces")] = QString::fromStdString(exercise.forces);
+  obj[QStringLiteral("exercisingPurpose")] = QString::fromStdString(exercise.description);
 
   
 
@@ -586,7 +586,7 @@ void ExportProcess::createPresentationTable()
                        s->m_topicData.description);
 
     if (s->m_topicData.topicType == TopicEditorBase::TopicType::Audio || s->m_topicData.topicType == TopicEditorBase::TopicType::Video)
-      dispName = s->filename().splitRef(QLatin1Char('/')).last().toString();
+      dispName = s->filename().split(QLatin1Char('/')).last();
 
     if (!s->filename().isEmpty())
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
index 50c59bb00..a38bfc679 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
@@ -7,7 +7,7 @@
 #include <QtCore/QJsonArray>
 
 #include <preguiscriptcommon_export.h>
-#include <PresentationManagement/Common/topic_assignment.h>
+#include <PresentationManagement/Gui/Common/topic_assignment.h>
 #include <SituationReplay/srp_gui_plugin_interface.h>
 #include <PresentationManagement/pre_dtc.h>
 #include <PresentationManagement/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
index be2379e1b..05fdae3bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
@@ -8,7 +8,7 @@
 
 #include <QtWidgets/QWidget>
 #include <QtCore/QVector>
-#include <QLinkedList>
+#include <QList>
 #include <QtCore/QPointer>
 #include <QtWidgets/QScrollArea>
 
@@ -78,7 +78,7 @@ signals:
   void changesMade();
 
 private:
-  QLinkedList<TopicEditorBase::TopicData> m_topicDataList;
+  QList<TopicEditorBase::TopicData> m_topicDataList;
   int m_selectedTopicId; 
   int m_lowestImportIndex;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/CMakeLists.txt
index 36bd1db2c..e20d4a157 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/CMakeLists.txt
@@ -72,6 +72,7 @@ if(QT6_GUI_AVAILABLE)
     PreScriptTimelineGuiPluginInterface
     PreGuiCommon
     PreGuiScriptCommon
+    AvmShared
     LtsTimeline
     svcPreCommon
     ${Qt6_Widgets}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
index ac667c159..28c4f8046 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
@@ -1,6 +1,6 @@
 #include "pre_screen.h"
 
-#include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
+#include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 
 #include <QtGui/QPainter>
 #include <QStyleOption>
@@ -33,7 +33,7 @@ void Screen::setBgColor(const QColor &color)
 void Screen::paintEvent(QPaintEvent *) 
 {
   QStyleOption opt;
-  opt.init(this);
+  opt.initFrom(this);
   QPainter p(this);
   style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
index 52d85b214..b18ca9fa4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pre_script_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <QtCore/QRegularExpression>
 #include "LtsMultiMonitor/lts_screen_base.h"
@@ -45,17 +46,17 @@
 #include <FilterManagement/flt_aes_plugin_interface.h>
 #include <FilterManagement/flt_building_cmpnt_plugin_interface.h>
 #include <MarkerManagement/mrk_gui_plugin_interface.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <PlanOverlays/plan_overlays_plugin_interface.h>
-#include <PresentationManagement/Common/pre_edit_dialog.h>
-#include <PresentationManagement/Common/topic_assignment.h>
-#include <PresentationManagement/Common/toolz.h>
-#include <PresentationManagement/Script/Common/topic_designer.h>
-#include <PresentationManagement/Script/Common/ScriptChooser/script_chooser.h>
-#include <PresentationManagement/Script/Common/TakeHomePackageGenerator/export.h>
-#include <PresentationManagement/Script/Common/TakeHomePackageGenerator/export_process.h>
-#include <PresentationManagement/Script/Common/TakeHomePackageGenerator/dvd_writer.h>
+#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
+#include <PresentationManagement/Gui/Common/topic_assignment.h>
+#include <PresentationManagement/Gui/Common/toolz.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h>
 #include <ReportManagement/rep_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h>
@@ -105,16 +106,16 @@ TopicEditorBase::TopicData ScriptTimelineDialog::topicDataFromContent(
   TopicEditorBase::TopicData data;
   data.id = topicId;
   data.topicType = topicType;
-  data.startTime = content.startTime();
-  data.duration = content.duration();
-  data.description = QString::fromStdString(content.description());
-  data.channel = QString::fromStdString(content.channel());
-  data.properties = QJsonDocument::fromJson(QByteArray(content.attributes().c_str(), content.attributes().size())).object();
-  data.index = content.index();
-  data.x = content.x();
-  data.y = content.y();
-  data.h = content.height();
-  data.w = content.width();
+  data.startTime = content.startTime;
+  data.duration = content.duration;
+  data.description = QString::fromStdString(content.description);
+  data.channel = QString::fromStdString(content.channel);
+  data.properties = QJsonDocument::fromJson(QByteArray(content.attributes.c_str(), content.attributes.size())).object();
+  data.index = content.index;
+  data.x = content.x;
+  data.y = content.y;
+  data.h = content.height;
+  data.w = content.width;
   return data;
 }
 
@@ -140,6 +141,7 @@ ScriptTimelineDialog::ScriptTimelineDialog(const QString &menuGroup, QWidget *pa
   , m_scriptsExerciseId(0)
   , m_presentationTimer(new QTimer(this))
   , m_ui(new Ui::ScriptDialog)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   hide();
@@ -472,10 +474,10 @@ void ScriptTimelineDialog::load()
 
   const Presentation presentation = m_dtc->presentation(m_scriptId);
   m_scriptsExerciseId = m_scriptId; 
-  m_scriptName = QString::fromStdString(presentation.name());
-  m_scriptOwner = QString::fromStdString(m_opmDtc->user(presentation.operatorId()).name());
-  m_lastModified = presentation.lastModified();
-  m_exerciseName = QString::fromStdString(m_exmDtc->exercise(m_exerciseSession->exerciseId()).name());
+  m_scriptName = QString::fromStdString(presentation.name);
+  m_scriptOwner = QString::fromStdString(m_opmDtc->user(presentation.operatorId).name);
+  m_lastModified = presentation.lastModified;
+  m_exerciseName = QString::fromStdString(m_exmDtc->exercise(m_exerciseSession->exerciseId()).name);
   DEBUG_LOG(m_logger) << "### ###Name: " << m_exerciseName;
   
   m_exerciseSession->baseLayout()->setCustomText(tr("Script: %1").arg(m_scriptName));
@@ -610,9 +612,9 @@ bool ScriptTimelineDialog::apply()
   const int opId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   const int64_t lastModified = QDateTime::currentMSecsSinceEpoch();
   const PresentationManagement::Presentation presentation = m_dtc->presentation(m_scriptId);
-  QString name = QString::fromStdString(presentation.name());
-  const QString description = QString::fromStdString(presentation.description());
-  if (presentation.operatorId() != opId)
+  QString name = QString::fromStdString(presentation.name);
+  const QString description = QString::fromStdString(presentation.description);
+  if (presentation.operatorId != opId)
   {
     const bool notSave = (LtsWidgets::Button::No == LtsWidgets::LtsMessageDialog::showMessage(
                       this, tr("Do you want to save a copy of the existing script from another user?<br><strong>Yes:</strong> Copy script and save the changes<br><strong>No:</strong> Cancel and give up changes"),
@@ -628,7 +630,7 @@ bool ScriptTimelineDialog::apply()
     name = tr("Copy of ") + name;
   }
 
-  if (presentation.id() < 1)
+  if (presentation.id < 1)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Unknown script!"));
     return false;
@@ -636,7 +638,7 @@ bool ScriptTimelineDialog::apply()
 
   const QVector<int> mainTopicItemIds = m_model->mainTopicItemIds();
   PresentationModifyRequest req;
-  auto &content = req.content();
+  auto &content = req.content;
   content.resize(mainTopicItemIds.size());
   try
   {
@@ -663,13 +665,13 @@ bool ScriptTimelineDialog::apply()
     return false;
   }
 
-  req.id(m_scriptId);
-  req.name(name.toStdString());
-  req.description(description.toStdString());
-  req.operatorId(opId);
-  req.lastModified(lastModified);
-  req.fileStatus(FileStatus::Valid);
-  req.content(content);
+  req.id = m_scriptId;
+  req.name = name.toStdString();
+  req.description = description.toStdString();
+  req.operatorId = opId;
+  req.lastModified = lastModified;
+  req.fileStatus = FileStatus::Valid;
+  req.content = content;
 
   try
   {
@@ -723,7 +725,7 @@ void ScriptTimelineDialog::getReplaySession() noexcept(false)
   {
     rp = m_coreDtc->replayPartition(replayId);
 
-    if (rp.id() == replayId)
+    if (rp.id == replayId)
     {
       found = true;
       break;
@@ -1232,11 +1234,11 @@ bool ScriptTimelineDialog::enableFireEventFlash(bool enable)
 void ScriptTimelineDialog::exportPresentationContent(const Core::FunctionReply &baseReply)
 {
   const GetPresentationContentReply &reply = static_cast<const GetPresentationContentReply &>(baseReply);
-  const dds::core::vector<PresentationManagement::PresentationContent> &contentList = reply.content();
+  const dds::core::vector<PresentationManagement::PresentationContent> &contentList = reply.content;
 
   if (contentList.size() < 1)
   {
-    ERROR_LOG(m_logger) << "No Presentation Content for Script Id " << reply.id();
+    ERROR_LOG(m_logger) << "No Presentation Content for Script Id " << reply.id;
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("No presentation content, nothing to export!"));
     return;
   }
@@ -1246,10 +1248,10 @@ void ScriptTimelineDialog::exportPresentationContent(const Core::FunctionReply &
     
     for (const PresentationManagement::PresentationContent &content : contentList)
     {
-      TopicEditorBase::TopicType topicType = TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType()));
+      TopicEditorBase::TopicType topicType = TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType));
       if (topicType == TopicEditorBase::TopicType::Invalid)
       {
-        ERROR_LOG(m_logger) << "Topic ignored at export - invalid topic type for presentation's content id " << content.id();
+        ERROR_LOG(m_logger) << "Topic ignored at export - invalid topic type for presentation's content id " << content.id;
         continue;
       }
 #ifndef EXPORT_BDV_TOPIC_AS_JSON
@@ -1324,13 +1326,13 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
   {
     try
     {
-      m_srmForeignDataIfc->replayPartitionRemoveRequest(replay.id(), LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(),
+      m_srmForeignDataIfc->replayPartitionRemoveRequest(replay.id, LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(),
                                                         LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); 
     }
     catch (...)
     {
       ERROR_LOG(m_logger) << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
-                            << " - replay id: " << replay.id()
+                            << " - replay id: " << replay.id
                             << " - url " << m_session->tcpConnectionUrl().toString();
     }
   };
@@ -2744,7 +2746,7 @@ void ScriptTimelineDialog::onExport()
 {
   PresentationManagement::Presentation preSource = m_dtc->presentation(m_scriptId);
 
-  if (preSource.id() < 1)
+  if (preSource.id < 1)
     return;
 
   const QString exportPath(TakeHomePackageGenerator::ExportProcess::exportPath(m_exerciseSession->exerciseId()) + QString::number(m_scriptId));
@@ -2881,6 +2883,7 @@ ElementInfo elementInfoFromTopic(const TopicItem &ti)
 CoolExporter::CoolExporter(ScriptTimelineDialog &dialog)
   : m_this(dialog)
   , m_loading(new LtsWidgets::LtsOverlayLoading)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_loading.get(), &LtsWidgets::LtsOverlayLoading::cancel,
           this, [this]()
@@ -3923,7 +3926,7 @@ void ScriptTimelineDialog::onPresentationContent(const GetPresentationContentRep
 {
   m_ui->timeline->setMinimumZoomFactor(LtsTimeline::ZoomFactor::FifteenSeconds);
 
-  const auto &contentList = reply.content();
+  const auto &contentList = reply.content;
 
   if (contentList.size() == 0)
   {
@@ -3939,7 +3942,7 @@ void ScriptTimelineDialog::onPresentationContent(const GetPresentationContentRep
   {
     try
     {
-      const int topicItemId = m_model->addItem(QString::fromStdString(content.channel()), TopicItem(content));
+      const int topicItemId = m_model->addItem(QString::fromStdString(content.channel), TopicItem(content));
       const TopicItem &topicItem = m_model->topicItem(topicItemId);
       m_lastTopicTime = std::max(m_lastTopicTime, topicItem.startTime() + topicItem.duration());
     }
@@ -4001,7 +4004,7 @@ void ScriptTimelineDialog::startEssentialsView(int topicItemId, int topicType, b
   {
     rp = m_coreDtc->replayPartition(replayId);
 
-    if (rp.id() == replayId)
+    if (rp.id == replayId)
     {
       found = true;
       break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
index 528ccba0f..1229f9a69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
@@ -689,7 +689,7 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
   
   qint64 duration = 0;
   for (const PresentationContent &content : std::as_const(contents))
-    duration = std::max(duration, content.startTime() + content.duration());
+    duration = std::max(duration, static_cast<qint64>(content.startTime + content.duration));
   duration *= 1000LL;
 
   m_dialog->timeline()->view()->setDuration(m_dialog->timeline()->duration() + duration);
@@ -716,7 +716,7 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
   }
 
   for (const PresentationContent &content : std::as_const(contents))
-    addItem(QString::fromStdString(content.channel()), TopicItem(content), pasteTime);
+    addItem(QString::fromStdString(content.channel), TopicItem(content), pasteTime);
 
   m_dialog->timeline()->setCurrentTime(pasteTime);
   m_dialog->timeline()->setZoomFactor(Zoom::ceil(duration * 1.05)); 
@@ -743,7 +743,7 @@ PresentationContent ScriptModel::topicItemPresentationContent(int topicItemId) n
       QJsonObject obj = _topicItem.properties();
       obj[QStringLiteral("Filters")] = filterTopics;
       const QByteArray attributes = QJsonDocument(obj).toJson(QJsonDocument::Compact);
-      content.attributes(attributes.data());
+      content.attributes = attributes.data();
     }
   }
   return content;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
index 167c3c070..86e95d9b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
@@ -7,8 +7,8 @@
 
 #include <Common/TopicEditorBase/topic_editor_base.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
-#include <PresentationManagement/Script/Common/ScriptChooser/script_chooser.h>
-#include <PresentationManagement/Common/pre_edit_dialog.h>
+#include <Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h>
+#include <PresentationManagement/Gui/Common/pre_edit_dialog.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_manager.h>
@@ -228,18 +228,18 @@ bool InterfaceImpl::importScript(int iSource)
   }
 
   PresentationManagement::Presentation presentation = m_preDtc->presentation(iSource);
-  if (presentation.id() < 1)
+  if (presentation.id < 1)
     return false;
 
   
   std::function<void(const Core::FunctionReply &baseReply)> importPresentationContent = [&](const Core::FunctionReply &baseReply)
   {
     const GetPresentationContentReply &reply = static_cast<const GetPresentationContentReply &>(baseReply);
-    const auto &contentList = reply.content();
+    const auto &contentList = reply.content;
 
     if (contentList.empty())
     {
-      ERROR_LOG(m_logger) << "No Presentation Content for Script Id " << reply.id();
+      ERROR_LOG(m_logger) << "No Presentation Content for Script Id " << reply.id;
       return;
     }
 
@@ -247,10 +247,10 @@ bool InterfaceImpl::importScript(int iSource)
     contents.reserve(contentList.size());
     for (const PresentationContent &content : contentList)
     {
-      TopicEditorBase::TopicType topicType = TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType()));
+      TopicEditorBase::TopicType topicType = TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType));
       if (topicType == TopicEditorBase::TopicType::Invalid)
       {
-        ERROR_LOG(m_logger) << "Topic ignored - invalid topic type for presentation's content id = " << content.id();
+        ERROR_LOG(m_logger) << "Topic ignored - invalid topic type for presentation's content id = " << content.id;
         continue;
       }
       contents.append(content);
@@ -259,7 +259,7 @@ bool InterfaceImpl::importScript(int iSource)
   };
 
   GetPresentationContentRequest req(iSource);
-  req.presentationId(iSource);
+  req.presentationId = iSource;
   if (!m_requestHelper->startSingleRequest([req, this](){ return m_preFtc->getPresentationContentRequest(req, this); }, importPresentationContent))
   {
     LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), tr("There is no content to import for this script."));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.h
index e5d04c695..f05a5143b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.h
@@ -20,7 +20,7 @@
 #include <LtsSession/lts_session.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <PluginInterfaces/topic_replay_interface.h>
-#include <PresentationManagement/Common/topic_assignment.h>
+#include <PresentationManagement/Gui/Common/topic_assignment.h>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
index ff0e0f419..cf72d3836 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
@@ -36,22 +36,22 @@ TopicItem::TopicItem(const TopicEditorBase::TopicData &data)
 }
 
 TopicItem::TopicItem(const PresentationContent &content)
-  : LtsTimeline::Item(static_cast<qint64>(content.startTime()) * 1000, static_cast<qint64>(content.duration()) * 1000, TopicEditorBase::topicTypeColor(TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType()))), true)
-  , m_topicType(TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType())))
+  : LtsTimeline::Item(static_cast<qint64>(content.startTime) * 1000, static_cast<qint64>(content.duration) * 1000, TopicEditorBase::topicTypeColor(TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType))), true)
+  , m_topicType(TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType)))
 {
-  m_topicData.id = content.id();
+  m_topicData.id = content.id;
   m_topicData.topicType = m_topicType;
   m_topicData.startTime = m_startTime / 1000;
   m_topicData.duration = m_duration / 1000;
   m_topicData.state = true;
-  m_topicData.index = content.index();
-  m_topicData.description = QString::fromStdString(content.description());
-  m_topicData.channel = QString::fromStdString(content.channel());
-  m_topicData.properties = QJsonDocument::fromJson(QByteArray(content.attributes().c_str(), content.attributes().size())).object();
-  m_topicData.x = content.x();
-  m_topicData.y = content.y();
-  m_topicData.w = content.width();
-  m_topicData.h = content.height();
+  m_topicData.index = content.index;
+  m_topicData.description = QString::fromStdString(content.description);
+  m_topicData.channel = QString::fromStdString(content.channel);
+  m_topicData.properties = QJsonDocument::fromJson(QByteArray(content.attributes.c_str(), content.attributes.size())).object();
+  m_topicData.x = content.x;
+  m_topicData.y = content.y;
+  m_topicData.w = content.width;
+  m_topicData.h = content.height;
   sortSequences();
 }
 
@@ -150,19 +150,19 @@ QJsonObject TopicItem::toJson() const
 PresentationContent TopicItem::toPresentationContent(int scriptId) const
 {
   PresentationManagement::PresentationContent content;
-  content.id(id());
-  content.presentationId(scriptId);
-  content.presentationTopicType(topicTypeString(m_topicType).toStdString());
-  content.channel(m_topicData.channel.toStdString());
-  content.startTime(m_startTime / 1000);
-  content.duration(m_duration / 1000);
+  content.id = id();
+  content.presentationId = scriptId;
+  content.presentationTopicType = topicTypeString(m_topicType).toStdString();
+  content.channel = m_topicData.channel.toStdString();
+  content.startTime = m_startTime / 1000;
+  content.duration = m_duration / 1000;
   const QByteArray attributes = QJsonDocument(m_topicData.properties).toJson(QJsonDocument::Compact);
-  content.attributes(attributes.data());
-  content.description(m_topicData.description.toStdString());
-  content.x(m_topicData.x);
-  content.y(m_topicData.y);
-  content.height(m_topicData.h);
-  content.width(m_topicData.w);
+  content.attributes = attributes.data();
+  content.description = m_topicData.description.toStdString();
+  content.x = m_topicData.x;
+  content.y = m_topicData.y;
+  content.height = m_topicData.h;
+  content.width = m_topicData.w;
   return content;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
index d99e95ad2..534c74f74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pre_topic_recorder.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "pre_screen.h"
 
 #include <LtsUtils/LtsUtilsCore/await.h>
@@ -34,7 +35,7 @@ TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const
   , m_topicId(topicId)
   , m_length((m_stopTime - (m_startTime - offset)) / 1000),
     m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
-  const auto screenGlobalPos = screen->mapToGlobal({0,0});
+  const auto screenGlobalPos = screen->mapToGlobal(QPoint(0, 0));
   const auto screenGeo = screen->geometry();
 
   const double screenX = screenGlobalPos.x() + screenGeo.x();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
index 31df833af..4a7d82d3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pre_topic_shotter.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "pre_screen.h"
 #include <QtCore/QFile>
 #include <QtCore/QThread>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.cpp
index 7927be58e..c45c872e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.cpp
@@ -1,5 +1,7 @@
 #include "pre_utils.h"
 
+#include <ostream>
+
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/CMakeLists.txt
index 83af1aa74..226547cd8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/CMakeLists.txt
@@ -5,6 +5,15 @@
 # Created by Mike Wille, SLSE, 2016-05-05
 #
 
+# Build this target as separate translation units (NOT a unity build). It links the
+# ddsftc INTERFACE target, which propagates generic_ftc.cpp /
+# generic_ftc_threading.cpp as INTERFACE sources (legacy design: consumers compile
+# the generic FTC implementation themselves, one TU per file, hidden visibility).
+# A unity build concatenates those .cpp's into this target's single TU, and LTO
+# (USE_IPO) then reports "multiple definition of Threading::..." from the same
+# object. Separate TUs restore the legacy per-file structure (behavior-neutral).
+set(CMAKE_UNITY_BUILD FALSE)
+
 # Make ${Qt6_Widgets} optional
 if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
   set(Qt6_Widgets ${Qt6_Widgets})
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp
index cb1d47bd5..e1874cd8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp
@@ -41,7 +41,7 @@ ChargeEditDialog::ChargeEditDialog(const int chargeId,
                                     }});
 
   setOnlineHelpFilename(QStringLiteral("Administrator-ChargeEdit"));
-  m_chargeType.id(chargeId);
+  m_chargeType.id = chargeId;
 }
 
 ChargeEditDialog::~ChargeEditDialog()
@@ -60,7 +60,7 @@ bool ChargeEditDialog::init()
       !m_ftc->enableUpdateChargeNames())
     return false;
 
-  m_chargeType = dtc->chargeType(m_chargeType.id());
+  m_chargeType = dtc->chargeType(m_chargeType.id);
   loadUiValues();
 
   return true;
@@ -69,9 +69,9 @@ bool ChargeEditDialog::init()
 void ChargeEditDialog::loadUiValues()
 {
   
-  m_ui->leLongName->setText(QString::fromStdString(m_chargeType.name()));
-  m_ui->leShortName->setText(QString::fromStdString(m_chargeType.shortName()));
-  m_ui->lbPredefinedName->setText(QString::fromStdString(m_chargeType.predefinedName()));
+  m_ui->leLongName->setText(QString::fromStdString(m_chargeType.name));
+  m_ui->leShortName->setText(QString::fromStdString(m_chargeType.shortName));
+  m_ui->lbPredefinedName->setText(QString::fromStdString(m_chargeType.predefinedName));
   retranslate();
 }
 
@@ -93,7 +93,7 @@ void ChargeEditDialog::retranslate()
 
 bool ChargeEditDialog::apply()
 {
-  ProjectDataManagement::UpdateChargeNamesRequest req(m_chargeType.id(),m_ui->leLongName->text().toStdString(),m_ui->leShortName->text().toStdString());
+  ProjectDataManagement::UpdateChargeNamesRequest req(m_chargeType.id,m_ui->leLongName->text().toStdString(),m_ui->leShortName->text().toStdString());
   return m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->updateChargeNamesRequest(req, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h
index baee82b84..08323b541 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h
@@ -4,6 +4,13 @@
 #pragma once
 
 #include <memory>
+#include <LtsWidgets/lts_dialog.h>
+#include <ProjectDataManagement/pdm_ftc.h>
+#include <ProjectDataManagement/logger.h>
+
+namespace Ui {
+class ChargeEditDialog;
+}
 
 namespace Core {
 class FunctionReplyObject;
@@ -25,17 +32,6 @@ namespace ProjectDataManagement
 struct ChargeType;
 #endif
 
-namespace Interface {
-namespace Ftc {
-class UpdateChargeNamesReplyHandler;
-}
-}
-
-// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
-namespace LtsWidgets {
-class LtsDialog;
-}
-
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
 class ChargeEditDialog : public LtsWidgets::LtsDialog
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
index 33710656d..c3d5899b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
@@ -15,9 +15,11 @@
 #include <QtWidgets/QTreeView>
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
+#include <FileManagement/flm_explorer_gui_plugin_interface.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
@@ -34,6 +36,7 @@ ChargeTableDialog::ChargeTableDialog(QWidget *parent, bool organiser)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_model(nullptr)
   , m_isOrganiser(organiser)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -215,11 +218,11 @@ void ChargeTableDialog::onEditCharge()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const ProjectDataManagement::ChargeType ct = m_model->getRowData(idx.row());
 
-  if (ct.id() <= 0)
+  if (ct.id <= 0)
     return;
 
-  ChargeEditDialog *dialog = new ChargeEditDialog(ct.id(), m_session, this);
-  const QString identifier = QLatin1String("EditCharge") + QString::number(ct.id());
+  ChargeEditDialog *dialog = new ChargeEditDialog(ct.id, m_session, this);
+  const QString identifier = QLatin1String("EditCharge") + QString::number(ct.id);
 
   addDialog(dialog, menuGroup(), identifier, LtsWidgets::LayoutArea::eDialogTab);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
index dca48230f..63d9b8ba4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
@@ -6,6 +6,14 @@
 #include <memory>
 #include <vector>
 #include <QtCore/QSet>
+#include <LtsWidgets/lts_dialog.h>
+#include "charge_table_model.h"
+#include <ProjectDataManagement/pdm_ftc.h>
+#include <ProjectDataManagement/logger.h>
+
+namespace Ui {
+class ChargeTableDialog;
+}
 
 namespace Core {
 class FunctionReplyObject;
@@ -26,28 +34,6 @@ class ForeignGuiInterface;
 namespace ProjectDataManagement
 {
 
-#ifdef BUILD_WITH_EXTERNAL_DDS
-// Forward declarations for external dependencies
-struct GearClass;
-struct ChargeType;
-#else
-// Forward declarations for external dependencies
-struct GearClass;
-struct ChargeType;
-#endif
-
-namespace Interface {
-namespace Ftc {
-class UpdateChargeTypeReplyHandler;
-class UpdateChargeNamesReplyHandler;
-}
-}
-
-// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
-namespace LtsWidgets {
-class LtsDialog;
-}
-
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
 class ChargeTableDialog : public LtsWidgets::LtsDialog
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
index b77ae052b..8fb0bff0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
@@ -3,6 +3,7 @@
 
 
 #include "charge_table_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
@@ -53,6 +54,7 @@ ChargeTableDialogModel::ChargeTableDialogModel(bool isOrganiser, QObject *parent
                                                                   parent)
   , m_dtc(nullptr)
   , m_isOrganiser(isOrganiser)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 ChargeTableDialogModel::~ChargeTableDialogModel()
@@ -66,11 +68,11 @@ bool ChargeTableDialogModel::initModel(const std::shared_ptr<ProjectDataManageme
           this, &ChargeTableDialogModel::onDataChanged);
   m_dtc->chargeTypes([this](const ProjectDataManagement::ChargeType &ct)
   {
-    if (!m_isOrganiser && !m_dtc->isVisible(ct.id()))
+    if (!m_isOrganiser && !m_dtc->isVisible(ct.id))
       return;
     insertRow(ct);
-    if (m_isOrganiser && m_dtc->isVisible(ct.id()))
-      m_visibleCharges.insert(ct.id());
+    if (m_isOrganiser && m_dtc->isVisible(ct.id))
+      m_visibleCharges.insert(ct.id);
   });
 
   return true;
@@ -96,19 +98,19 @@ QVariant ChargeTableDialogModel::data(const QModelIndex &index, int role) const
     if (m_isOrganiser)
     {
       if (index.column() == IsVisible)
-        return (m_visibleCharges.contains(ct.id()) ? Qt::Checked : Qt::Unchecked);
+        return (m_visibleCharges.contains(ct.id) ? Qt::Checked : Qt::Unchecked);
       return QVariant();
     }
 
 
     
-    qint32 tasCode = ct.id();
+    qint32 tasCode = ct.id;
 
     
     if (tasCode < 2000)
     {
       if (index.column() == IsVisible)
-        return m_visibleCharges.contains(ct.id()) ? Qt::Checked : Qt::Unchecked;
+        return m_visibleCharges.contains(ct.id) ? Qt::Checked : Qt::Unchecked;
 
       
       if (tasCode >= 1 && tasCode <= 46 && tasCode != 25 && tasCode != 30)
@@ -133,7 +135,7 @@ QVariant ChargeTableDialogModel::data(const QModelIndex &index, int role) const
 
       
       
-      return m_visibleCharges.contains(ct.id()) ? Qt::Checked : Qt::Unchecked;
+      return m_visibleCharges.contains(ct.id) ? Qt::Checked : Qt::Unchecked;
     }
 
     
@@ -192,19 +194,19 @@ QVariant ChargeTableDialogModel::data(const QModelIndex &index, int role) const
     {
     case IsVisible:
       if (m_isOrganiser)
-        return m_dtc->isVisible(ct.id()) ? tr("Yes") : tr("No");
+        return m_dtc->isVisible(ct.id) ? tr("Yes") : tr("No");
       else
-        return ct.id();
+        return ct.id;
     case Id:
-      return QString::number(ct.id());
+      return QString::number(ct.id);
     case PredefinedName:
-      return QString::fromStdString(ct.predefinedName());
+      return QString::fromStdString(ct.predefinedName);
     case ShortName:
-      return QString::fromStdString(ct.shortName());
+      return QString::fromStdString(ct.shortName);
     case LongName:
-      return QString::fromStdString(ct.name());
+      return QString::fromStdString(ct.name);
     case DisEntity:
-      return QString::fromStdString(ct.disEntity());
+      return QString::fromStdString(ct.disEntity);
     }
   }
   return QVariant();
@@ -228,7 +230,7 @@ bool ChargeTableDialogModel::setData(const QModelIndex &idx, const QVariant &val
 
     
     ChargeType    ct = getRowData(idx.row());
-    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(ct.properties()));
+    QJsonDocument propsDoc = QJsonDocument::fromJson(QByteArray::fromStdString(ct.properties));
     QJsonObject   propsObj;
     if (propsDoc.isObject()) 
       propsObj = propsDoc.object();
@@ -237,22 +239,22 @@ bool ChargeTableDialogModel::setData(const QModelIndex &idx, const QVariant &val
     if (bVal)
     {
       propsObj.remove(QLatin1String("suppressVisibility"));
-      m_visibleCharges.insert(m_vecData.at(idx.row()).id());
+      m_visibleCharges.insert(m_vecData.at(idx.row()).id);
     }
     else
     {
       propsObj.insert(QLatin1String("suppressVisibility"), true);
-      m_visibleCharges.remove(m_vecData.at(idx.row()).id());
+      m_visibleCharges.remove(m_vecData.at(idx.row()).id);
     }
 
     
-    ct.properties(QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString());
+    ct.properties = QJsonDocument(propsObj).toJson(QJsonDocument::Compact).toStdString();
     setRowData(idx.row(), ct);
 
-    if (m_dtc->isVisible(ct.id()) != bVal)
-      m_differences.insert(ct.id());
+    if (m_dtc->isVisible(ct.id) != bVal)
+      m_differences.insert(ct.id);
     else
-      m_differences.remove(ct.id());
+      m_differences.remove(ct.id);
 
 
     emit chargeVisibilityChanged(!m_differences.isEmpty());
@@ -260,7 +262,7 @@ bool ChargeTableDialogModel::setData(const QModelIndex &idx, const QVariant &val
   }
   else
   {
-    const int tasCode = m_vecData.at(idx.row()).id();
+    const int tasCode = m_vecData.at(idx.row()).id;
     if (tasCode < 1000)
     {
       if (bVal)
@@ -390,7 +392,7 @@ QVector<ChargeType> ChargeTableDialogModel::getChargeTypesWithChangedVisibility(
 {
   QVector<ChargeType> cts;
   for (const auto &ct : m_vecData)
-    if (m_differences.contains(ct.id()))
+    if (m_differences.contains(ct.id))
       cts << ct;
   return cts;
 }
@@ -411,7 +413,7 @@ bool ChargeTableDialogModel::isFiltered(const ProjectDataManagement::ChargeType
 {
   Q_UNUSED(modType);
 
-  return isFiltered(data.id());
+  return isFiltered(data.id);
 }
 
 QSet<int> ChargeTableDialogModel::selectedCharges() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
index c93cc5639..ca784c151 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
@@ -18,7 +18,7 @@ namespace ProjectDataManagement
 #ifdef BUILD_WITH_EXTERNAL_DDS
 inline uint qHash(GearClass gc)
 {
-  return ::qHash(gc.underlying());
+  return ::qHash(gc);
 }
 #endif
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/CMakeLists.txt
index 46b9ac9cb..6447592a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/CMakeLists.txt
@@ -5,6 +5,15 @@
 # Created by Mike Wille, SLSE, 2016-05-05
 #
 
+# Build this target as separate translation units (NOT a unity build). It links the
+# ddsftc INTERFACE target, which propagates generic_ftc.cpp /
+# generic_ftc_threading.cpp as INTERFACE sources (legacy design: consumers compile
+# the generic FTC implementation themselves, one TU per file, hidden visibility).
+# A unity build concatenates those .cpp's into this target's single TU, and LTO
+# (USE_IPO) then reports "multiple definition of Threading::..." from the same
+# object. Separate TUs restore the legacy per-file structure (behavior-neutral).
+set(CMAKE_UNITY_BUILD FALSE)
+
 # Make ${Qt6_Widgets} optional
 if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
   set(Qt6_Widgets ${Qt6_Widgets})
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
index be16b1b28..994f5ac51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
@@ -39,9 +39,9 @@ bool ChargeSelector::init(const std::shared_ptr<ProjectDataManagement::Interface
   const auto cfgc = dtc->chargesForGearClass(gearClass);
   for (const ChargeType &charge : cfgc)
   {
-    if (LtsUtils::JsonObject::fromJson(charge.properties()).valueOr<bool>("suppressVisibility", false))
+    if (LtsUtils::JsonObject::fromJson(charge.properties).valueOr<bool>("suppressVisibility", false))
       continue;
-    const int chargeId = charge.id();
+    const int chargeId = charge.id;
     QCheckBox *cb = new QCheckBox;
     cb->setText(dtc->trChargeTypeShortName(chargeId, true));
     cb->setChecked(preselectedCharges.contains(chargeId));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
index ddf5f3db5..e44740bfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
@@ -9,7 +9,6 @@
 #include <QtCore/QSet>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
-#include <ProjectDataManagement/pdm_gear_class.h>
 #endif
 
 #include "ui_pdm_charge_selector.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
index 767db3578..28cdae0a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
@@ -74,10 +74,10 @@ void fillGearClass(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<In
   const auto charges = dtc->chargesForGearClass(gearClass);
   for (const ChargeType &charge : charges)
   {
-    QStandardItem *item = new QStandardItem(dtc->trChargeTypeShortName(charge.id(), true));
-    item->setToolTip(dtc->trChargeTypeName(charge.id(), true));
-    item->setData(charge.id(), CBUserRoles::Id);
-    item->setData(QByteArray::fromStdString(charge.properties()), CBUserRoles::Properties);
+    QStandardItem *item = new QStandardItem(dtc->trChargeTypeShortName(charge.id, true));
+    item->setToolTip(dtc->trChargeTypeName(charge.id, true));
+    item->setData(charge.id, CBUserRoles::Id);
+    item->setData(QByteArray::fromStdString(charge.properties), CBUserRoles::Properties);
     itemModel->appendRow(item);
   }
 }
@@ -93,10 +93,10 @@ void fillIgniterType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr<Int
   const auto igniters = dtc->ignitersForChargeType(chargeTypeId);
   for (const IgniterType &igniter : igniters)
   {
-    QStandardItem *item = new QStandardItem(dtc->trIgniterTypeShortName(igniter.id()));
-    item->setToolTip(dtc->trIgniterTypeName(igniter.id()));
-    item->setData(igniter.id(), CBUserRoles::Id);
-    item->setData(QByteArray::fromStdString(igniter.properties()), CBUserRoles::Properties);
+    QStandardItem *item = new QStandardItem(dtc->trIgniterTypeShortName(igniter.id));
+    item->setToolTip(dtc->trIgniterTypeName(igniter.id));
+    item->setData(igniter.id, CBUserRoles::Id);
+    item->setData(QByteArray::fromStdString(igniter.properties), CBUserRoles::Properties);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -117,10 +117,10 @@ void fillIgniterFunction(QComboBox *cbx, int chargeTypeId, int igniterTypeId, co
   const auto chargeTypeIgTypeIgFunMap = dtc->igniterFunctionsForChargeTypeIgniterType(chargeTypeId, igniterTypeId);
   for (const ChargeTypeIgniterTypeIgniterFunction &chargeTypeIgTypeIgFun : chargeTypeIgTypeIgFunMap)
   {
-    QStandardItem *item = new QStandardItem(dtc->trIgniterFunctionShortName(chargeTypeIgTypeIgFun.igniterFunctionId()));
-    item->setToolTip(dtc->trIgniterFunctionName(chargeTypeIgTypeIgFun.igniterFunctionId()));
-    item->setData(chargeTypeIgTypeIgFun.igniterFunctionId(), CBUserRoles::Id);
-    item->setData(QByteArray::fromStdString(chargeTypeIgTypeIgFun.properties()), CBUserRoles::Properties);
+    QStandardItem *item = new QStandardItem(dtc->trIgniterFunctionShortName(chargeTypeIgTypeIgFun.igniterFunctionId));
+    item->setToolTip(dtc->trIgniterFunctionName(chargeTypeIgTypeIgFun.igniterFunctionId));
+    item->setData(chargeTypeIgTypeIgFun.igniterFunctionId, CBUserRoles::Id);
+    item->setData(QByteArray::fromStdString(chargeTypeIgTypeIgFun.properties), CBUserRoles::Properties);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -141,9 +141,9 @@ void fillLoadType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr<Interf
   const auto loads = dtc->loadsForChargeType(chargeTypeId);
   for (const LoadType &load : loads)
   {
-    QStandardItem *item = new QStandardItem(dtc->trLoadTypeShortName(load.id()));
-    item->setToolTip(dtc->trLoadTypeName(load.id()));
-    item->setData(load.id(), CBUserRoles::Id);
+    QStandardItem *item = new QStandardItem(dtc->trLoadTypeShortName(load.id));
+    item->setToolTip(dtc->trLoadTypeName(load.id));
+    item->setData(load.id, CBUserRoles::Id);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -164,9 +164,9 @@ void fillTargetType(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
   const auto targeTypes = dtc->targetTypes();
   for (const TargetType &targetType : targeTypes)
   {
-    QStandardItem *item = new QStandardItem(dtc->trTargetTypeName(targetType.id()));
-    item->setToolTip(dtc->trTargetTypeName(targetType.id()));
-    item->setData(targetType.id(), CBUserRoles::Id);
+    QStandardItem *item = new QStandardItem(dtc->trTargetTypeName(targetType.id));
+    item->setToolTip(dtc->trTargetTypeName(targetType.id));
+    item->setData(targetType.id, CBUserRoles::Id);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -184,10 +184,10 @@ void fillTargetSubType(QComboBox *cbx, int targetTypeId, const std::shared_ptr<I
 
   for (const TargetSubType &targetSubType : targetSubTypeVec)
   {
-    QStandardItem *item = new QStandardItem(dtc->trTargetSubTypeName(targetSubType.id()));
-    item->setToolTip(dtc->trTargetSubTypeName(targetSubType.id()));
-    item->setData(targetSubType.id(), TargetSubTypeRole::Id);
-    item->setData(QString::fromStdString(targetSubType.abbreviation()), TargetSubTypeRole::Abbreviation);
+    QStandardItem *item = new QStandardItem(dtc->trTargetSubTypeName(targetSubType.id));
+    item->setToolTip(dtc->trTargetSubTypeName(targetSubType.id));
+    item->setData(targetSubType.id, TargetSubTypeRole::Id);
+    item->setData(QString::fromStdString(targetSubType.abbreviation), TargetSubTypeRole::Abbreviation);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -204,10 +204,10 @@ void fillFirePurpose(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
   const auto &firePurposes = dtc->firePurposes();
   for (const FirePurpose &firePurpose : firePurposes)
   {
-    QStandardItem *item = new QStandardItem(dtc->trFirePurposeName(firePurpose.id()));
-    item->setToolTip(dtc->trFirePurposeName(firePurpose.id()));
-    item->setData(firePurpose.id(), CBUserRoles::Id);
-    item->setData(QByteArray::fromStdString(firePurpose.properties()), CBUserRoles::Properties);
+    QStandardItem *item = new QStandardItem(dtc->trFirePurposeName(firePurpose.id));
+    item->setToolTip(dtc->trFirePurposeName(firePurpose.id));
+    item->setData(firePurpose.id, CBUserRoles::Id);
+    item->setData(QByteArray::fromStdString(firePurpose.properties), CBUserRoles::Properties);
     itemModel->appendRow(item);
   }
   itemModel->sort(0, Qt::AscendingOrder);
@@ -232,70 +232,70 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
       const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString();
       const QStringList slLang = languages.split(QLatin1Char(','));
       QSet<int> alreadySeen;
-      alreadySeen += Language::NoChange;
-      cbx->addItem(toString(Language::NoChange), Language::NoChange);
+      alreadySeen += static_cast<int>(LanguageConfiguration::LanguageConfiguration_NoChange);
+      cbx->addItem(toString(LanguageConfiguration::LanguageConfiguration_NoChange), static_cast<int>(LanguageConfiguration::LanguageConfiguration_NoChange));
       for (const QString &r : slLang)
       {
         const int langId = r.toInt();
         if (alreadySeen.contains(langId))
           continue;
         alreadySeen += langId;
-        cbx->addItem(toString(static_cast<LanguageConfiguration>(langId)), static_cast<LanguageConfiguration>(langId));
+        cbx->addItem(toString(static_cast<LanguageConfiguration>(langId)), static_cast<int>(static_cast<LanguageConfiguration>(langId)));
       }
       break;
     }
     case PdmComboBoxType::CbOperationMode:
     {
-      cbx->addItem(toString(OperationMode::NoChange), OperationMode::NoChange);
-      cbx->addItem(toString(OperationMode::Normal), OperationMode::Normal);
-      cbx->addItem(toString(OperationMode::BeStill), OperationMode::BeStill);
+      cbx->addItem(toString(OperationMode::OperationMode_NoChange), static_cast<int>(OperationMode::OperationMode_NoChange));
+      cbx->addItem(toString(OperationMode::OperationMode_Normal), static_cast<int>(OperationMode::OperationMode_Normal));
+      cbx->addItem(toString(OperationMode::OperationMode_BeStill), static_cast<int>(OperationMode::OperationMode_BeStill));
       break;
     }
     case PdmComboBoxType::CbModeHelmet:
     case PdmComboBoxType::CbModeVest:
     {
-      cbx->addItem(toString(WphMode::NoChange), WphMode::NoChange);
-      cbx->addItem(toString(WphMode::Without), WphMode::Without);
-      cbx->addItem(toString(WphMode::With), WphMode::With);
+      cbx->addItem(toString(WphMode::WphMode_NoChange), static_cast<int>(WphMode::WphMode_NoChange));
+      cbx->addItem(toString(WphMode::WphMode_Without), static_cast<int>(WphMode::WphMode_Without));
+      cbx->addItem(toString(WphMode::WphMode_With), static_cast<int>(WphMode::WphMode_With));
       break;
     }
     case PdmComboBoxType::CbPersonalProtection:
     {
-      cbx->addItem(toString(PersonalProtection::NoChange), PersonalProtection::NoChange);
-      cbx->addItem(toString(PersonalProtection::Without), PersonalProtection::Without);
-      cbx->addItem(toString(PersonalProtection::Suit), PersonalProtection::Suit);
-      cbx->addItem(toString(PersonalProtection::SuitAndGloves), PersonalProtection::SuitAndGloves);
+      cbx->addItem(toString(PersonalProtection::PersonalProtection_NoChange), static_cast<int>(PersonalProtection::PersonalProtection_NoChange));
+      cbx->addItem(toString(PersonalProtection::PersonalProtection_Without), static_cast<int>(PersonalProtection::PersonalProtection_Without));
+      cbx->addItem(toString(PersonalProtection::PersonalProtection_Suit), static_cast<int>(PersonalProtection::PersonalProtection_Suit));
+      cbx->addItem(toString(PersonalProtection::PersonalProtection_SuitAndGloves), static_cast<int>(PersonalProtection::PersonalProtection_SuitAndGloves));
       break;
     }
     case PdmComboBoxType::CbProtectionLevel:
     {
-      cbx->addItem(toString(ProtectionLevel::NoChange), ProtectionLevel::NoChange);
-      cbx->addItem(toString(ProtectionLevel::IdzBs), ProtectionLevel::IdzBs);
-      cbx->addItem(toString(ProtectionLevel::IdzEs), ProtectionLevel::IdzEs);
-      cbx->addItem(toString(ProtectionLevel::Ksk), ProtectionLevel::Ksk);
-      cbx->addItem(toString(ProtectionLevel::SoldierWithBodyArmor), ProtectionLevel::SoldierWithBodyArmor);
-      cbx->addItem(toString(ProtectionLevel::SoldierActor), ProtectionLevel::SoldierActor);
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_NoChange), static_cast<int>(ProtectionLevel::ProtectionLevel_NoChange));
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_IdzBs), static_cast<int>(ProtectionLevel::ProtectionLevel_IdzBs));
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_IdzEs), static_cast<int>(ProtectionLevel::ProtectionLevel_IdzEs));
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_Ksk), static_cast<int>(ProtectionLevel::ProtectionLevel_Ksk));
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor), static_cast<int>(ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor));
+      cbx->addItem(toString(ProtectionLevel::ProtectionLevel_SoldierActor), static_cast<int>(ProtectionLevel::ProtectionLevel_SoldierActor));
       break;
     }
     case PdmComboBoxType::CbHandgrenadeSearchMode:
     {
-      cbx->addItem(toString(HandgrenadeSearchMode::NoChange), HandgrenadeSearchMode::NoChange);
-      cbx->addItem(toString(HandgrenadeSearchMode::On), HandgrenadeSearchMode::On);
-      cbx->addItem(toString(HandgrenadeSearchMode::Off), HandgrenadeSearchMode::Off);
+      cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange));
+      cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_On), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_On));
+      cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_Off), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_Off));
       break;
     }
     case PdmComboBoxType::CbInternationalMode:
     {
-      cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), InternationalMode::InternationalMode_NoChange);
-      cbx->addItem(toString(InternationalMode::InternationalMode_On), InternationalMode::InternationalMode_On);
-      cbx->addItem(toString(InternationalMode::InternationalMode_Off), InternationalMode::InternationalMode_Off);
+      cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), static_cast<int>(InternationalMode::InternationalMode_NoChange));
+      cbx->addItem(toString(InternationalMode::InternationalMode_On), static_cast<int>(InternationalMode::InternationalMode_On));
+      cbx->addItem(toString(InternationalMode::InternationalMode_Off), static_cast<int>(InternationalMode::InternationalMode_Off));
       break;
     }
     case PdmComboBoxType::CbABCProtectionMode:
     {
-      cbx->addItem(toString(ABCProtectionMode::NoChange), ABCProtectionMode::NoChange);
-      cbx->addItem(toString(ABCProtectionMode::On), ABCProtectionMode::On);
-      cbx->addItem(toString(ABCProtectionMode::Off), ABCProtectionMode::Off);
+      cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_NoChange), static_cast<int>(ABCProtectionMode::ABCProtectionMode_NoChange));
+      cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_On), static_cast<int>(ABCProtectionMode::ABCProtectionMode_On));
+      cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_Off), static_cast<int>(ABCProtectionMode::ABCProtectionMode_Off));
       break;
     }
 #endif // BUILD_WITH_EXTERNAL_DDS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
index 53db23e84..664e3b725 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
@@ -38,9 +38,9 @@ enum class InternationalMode;
 enum class ABCProtectionMode;
 enum class PersonalProtection;
 enum class ProtectionLevel;
-enum class Language;  // from training_area_telegrams.h
-enum class OperationMode;  // from training_area_telegrams.h
-enum class WphMode;  // from training_area_telegrams.h
+enum class LanguageConfiguration;  // RTI enum in ProjectDataManagement (pdm_enums.hpp); legacy used LanguageConfiguration
+enum class OperationMode;
+enum class WphMode;
 #endif
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp
index cb1383870..e91201acb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp
@@ -68,7 +68,7 @@ bool ForeignGuiInterfaceImpl::fillBoobyTrapComboBox(QComboBox *cbx)
 
 bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::OffRouteMine, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_OffRouteMine, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillFunctionalAreaComboBox(QComboBox *cbx)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h
index 8e8dc9849..82934693a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h
@@ -7,7 +7,6 @@
 #include <ProjectDataManagement/pdm_dtc.h>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
-#include <ProjectDataManagement/pdm_gear_class.h>
 #endif
 
 namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h
index ad96a1fd7..c20d8ac1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h
@@ -1,29 +1,22 @@
 
 
-
 #pragma once
 
-#include <memory>
+#include <ProjectDataManagement/pdm_dtc.h>
+#include <ProjectDataManagement/pdm_ftc.h>
+#include <PluginInterfaces/data_plugin_interface.h>
 
-// Forward declarations for external DDS types
 namespace ProjectDataManagement
 {
-namespace Interface
-{
-  class Dtc;
-  class Ftc;
-}
-}
-
 class ForeignDataInterface;
 
-class DataInterface //: public DataPluginBase::Interface
+class DataInterface : public DataPluginBase::Interface
 {
 public:
-  //using DataPluginBase::Interface::Interface;
+  using DataPluginBase::Interface::Interface;
 
   virtual std::shared_ptr<ProjectDataManagement::Interface::Dtc> getDtc() = 0;
   virtual std::shared_ptr<ProjectDataManagement::Interface::Ftc> getFtc() = 0;
 
 };
-} 
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/CMakeLists.txt
index 4ec8bc2d0..2a30bdc28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/CMakeLists.txt
@@ -44,6 +44,7 @@ if(QT6_GUI_AVAILABLE)
     Qt6::Core
     Qt6::Network
     Qt6::OpenGL
+    Qt6::OpenGLWidgets
     LtsSession
     LtsWidgets
     LtsUtilsGuiDds
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
index a383962d2..ba0e9aab3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
@@ -117,9 +117,9 @@ bool ControlDialog::init(LtsSession::LtsSession *session,
   auto getLocationIdFunc =
     [sessionData, this](const AssetManagement::Asset & data) -> bool
   {
-    if (data.id() == sessionData->getWorkstationId())
+    if (data.id == sessionData->getWorkstationId())
     {
-      m_locationId = data.locationId();
+      m_locationId = data.locationId;
       return true;
     }
     return false;
@@ -201,7 +201,7 @@ void ControlDialog::slotOnWebSocketConnected()
   int userId = sessioData->getOperatorId();
   int exerciseId = m_exerciseId;
   OperatorManagement::User user = m_opmDtc->user(userId);
-  if (user.id() > 0)
+  if (user.id > 0)
   {
     
     
@@ -230,12 +230,12 @@ void ControlDialog::slotOnWebSocketConnected()
 
 
     INFO_LOG(m_logger) << " connect userId=" << userId
-                       << ", with prio=" << user.projectionPriority()
+                       << ", with prio=" << user.projectionPriority
                        << ", PwsWorkspace/Id='" <<  workspaceIdToUse << "'";
 
     LtsProjectionWorkstation::CTS::LoginRequest req(QUuid::createUuid().toString(),
                                                     userId,
-                                                    user.projectionPriority(),
+                                                    user.projectionPriority,
                                                     exerciseId, opSettingsData);
     m_webSocketClient->addReply(req.toReplyMessage());
   }
@@ -310,13 +310,13 @@ void ControlDialog::fillCombobox()
   m_asmDtc->assets([this](const AssetManagement::Asset & data)
   {
     if (m_ui->chbProjectionWSOnly->isChecked() &&
-        data.assetTypeId() != AssetManagement::AssetType::ProjectionWorkstation)
+        data.assetTypeId != AssetManagement::AssetType::ProjectionWorkstation)
       return;
     if (m_ui->chbInThisLocationOnly->isChecked() &&
-        data.locationId() != m_locationId)
+        data.locationId != m_locationId)
       return;
 
-    m_ui->cbxWorkstations->addItem(QString::fromStdString(data.name()));
+    m_ui->cbxWorkstations->addItem(QString::fromStdString(data.name));
   });
   m_ui->cbxWorkstations->model()->sort(0);
 
@@ -372,7 +372,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
         break;
       case LoginRequestReply::OtherUser:
         errMsg = tr("The connection is blocked by user %1")
-            .arg(QString::fromStdString(m_opmDtc->user(login->reasonUserId()).name()));
+            .arg(QString::fromStdString(m_opmDtc->user(login->reasonUserId()).name));
         break;
       }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.h
index a01828916..ba6112abf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.h
@@ -13,8 +13,8 @@
 #include <LtsProjectionWorkstation/WebSocket/message_factory.h>
 
 #include <OperatorManagement/opm_settings_gui_plugin_interface.h>
-#include <OperatorManagement/opm_data_plugin.h>
-#include <AssetManagement/asm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
+#include <Plugins/AssetManagement/Data/asm_data_plugin.h>
 
 namespace Ui { class ControlDialog; }
 namespace LtsSession { class LtsSession; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_gui_plugin.h
index f493ee86f..52dcc6cba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_gui_plugin.h
@@ -5,9 +5,9 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <LtsProjectionWorkstation/logger.h>
-#include <OperatorManagement/opm_data_plugin.h>
+#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <OperatorManagement/opm_settings_gui_plugin_interface.h>
-#include <AssetManagement/asm_data_plugin.h>
+#include <Plugins/AssetManagement/Data/asm_data_plugin.h>
 #include <memory>
 
 namespace ProjectionWorkstation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.cpp
index 6cc2fa99d..5b20d6294 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.cpp
@@ -49,8 +49,8 @@ bool OperatorSettingsLoader::loadOperatorRights()
   {
     OperatorManagement::OperatorApplyForeignAclsRequest req;
 
-    req.id(localUserId);
-    req.remoteOperatorId(m_userId);
+    req.id = localUserId;
+    req.remoteOperatorId = m_userId;
 
     auto cb = [this, &req]() -> bool
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.h
index a80eb67cc..92d214202 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_operator_settings_loader.h
@@ -33,7 +33,6 @@ private:
 NGL::INGLLogger &m_logger;
   bool loadOperatorRights();
 
-  LtsProjectionWorkstation::
   std::shared_ptr<OperatorManagement::Interface::Ftc>       m_opmFtc;
 
   LtsUtils::RequestHelper *m_requestHelper;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
index 153089c60..dd9b7d355 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
@@ -119,7 +119,7 @@ void VncViewerDialog::mousePressEvent(QMouseEvent *event)
   event->accept();
   if (event->button() == Qt::LeftButton)
     m_mouseButtonMask |= (1 << 0);
-  else if (event->button() == Qt::MidButton)
+  else if (event->button() == Qt::MiddleButton)
     m_mouseButtonMask |= (1 << 1);
   else if (event->button() == Qt::RightButton)
     m_mouseButtonMask |= (1 << 2);
@@ -135,7 +135,7 @@ void VncViewerDialog::mouseReleaseEvent(QMouseEvent *event)
   event->accept();
   if (event->button() == Qt::LeftButton)
     m_mouseButtonMask &= ~(1 << 0);
-  else if (event->button() == Qt::MidButton)
+  else if (event->button() == Qt::MiddleButton)
     m_mouseButtonMask &= ~(1 << 1);
   else if (event->button() == Qt::RightButton)
     m_mouseButtonMask &= ~(1 << 2);
@@ -177,7 +177,7 @@ void VncViewerDialog::wheelEvent(QWheelEvent *event)
     else if (event->angleDelta().y() < 0)
       m_mouseButtonMask |= (1 << 4);
 
-    QPoint mapped = mapMousePosition(event->pos());
+    QPoint mapped = mapMousePosition(event->position().toPoint());
 
     QByteArray data = RfbProtocol::CTS::RfbPointerEvent(m_mouseButtonMask, mapped.x(), mapped.y());
     m_handler->writeData(data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
index daf5ca373..78609a4f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
@@ -9,7 +9,7 @@
 #include <QtCore/QMutex>
 #include <QOpenGLFramebufferObject>
 #include <QOpenGLTextureBlitter>
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtGui/QOpenGLFunctions>
 #include <QtNetwork/QHostAddress>
 
@@ -40,7 +40,6 @@ NGL::INGLLogger &m_logger;
   mutable QMutex m_mutex;
   QSize m_scaledSize;
   QSize m_scaledSizeAspectRatio;
-  LtsProjectionWorkstation::
 };
 
 class VncRenderArea : public QOpenGLWidget, protected QOpenGLFunctions
@@ -75,7 +74,7 @@ private:
   QOpenGLFramebufferObject *m_fbo;
   QOpenGLTextureBlitter m_blitter;
 
-  LtsProjectionWorkstation::
+  LtsProjectionWorkstation::LOGGER_T m_logger;
 };  
 
 
@@ -128,7 +127,7 @@ private:
   QString m_name;
   bool m_isConnected;
 
-  LtsProjectionWorkstation::
+  LtsProjectionWorkstation::LOGGER_T m_logger;
 };  
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
index 71193cb01..d82fff41a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
@@ -33,7 +33,7 @@ bool ReportAesModel::initModel(int partyId)
 
   clear();
 
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportType::Nbc:
   {
@@ -47,12 +47,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -70,12 +70,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -100,12 +100,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -123,12 +123,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -151,12 +151,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp
index cda76c458..6095c098b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp
@@ -74,7 +74,7 @@ bool ReportChargeModel::isFiltered(const ProjectDataManagement::ChargeType &data
 
 
   const ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(data.id());
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportType::ChargeAdministration:
     return (gc != ProjectDataManagement::GearClass::GearClass_Artillery &&
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.cpp
index 5495853e2..8a49d041b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.cpp
@@ -59,7 +59,7 @@ QVariant ReportTypeModel::data(const QModelIndex &index, int role) const
 bool ReportTypeModel::isFiltered(const ParticipantManagement::Type &data, DataModification) const
 {
   const auto tc = data.typeClass();
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportManagement::ReportType::VehicleRepair:
     return (tc != ParticipantManagement::TypeClass::GroundVehicle &&
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp
index 4e71c70fd..bf030f675 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp
@@ -25,7 +25,7 @@ using namespace ReportManagement;
 
 ReportManagement::AbstractModel *ReportManagement::AbstractModel::create(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
 {
-  switch (report.reportType().underlying())
+  switch (report.reportType())
   {
   case ReportType::UnitPower:
     return new UnitPowerModel(report, session, parent);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
index 192df09bd..a2f0fd4db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
@@ -116,7 +116,7 @@ QVariant ChargeAdministrationModel::data(const QModelIndex &index, int role) con
       case CHARGE_TYPE_ID:
         return (displayInfo.chargeTypeId > 0 ? displayInfo.chargeTypeId : QVariant());
       case EFFECT_SOURCE_ID:
-        return (displayInfo.effectSourceId.underlying() >= 0 ? ProjectDataManagement::toString(displayInfo.effectSourceId) : tr("Total:"));
+        return (displayInfo.effectSourceId >= 0 ? ProjectDataManagement::toString(displayInfo.effectSourceId) : tr("Total:"));
       case GEAR_CLASS:
         return (displayInfo.chargeTypeId > 0 ? ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(displayInfo.chargeTypeId)) : QVariant());
       case CHARGE_TYPE_NAME:
@@ -222,7 +222,7 @@ void ChargeAdministrationModel::fillReportData()
 
         sumUp(bigTotal, totalEffectSource.charges, 6);
       }
-      effectSourceId = resData.effectSourceId.underlying();
+      effectSourceId = resData.effectSourceId;
       std::fill(std::begin(sums), std::end(sums), 0);
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.h
index 1f19ccbaa..bc05db338 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.h
@@ -7,6 +7,7 @@
 #include <ReportManagement/logger.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
index bd68bed5a..30d799fbd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "rep_maintenance_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.h
index 62870f99c..a4bb97ca2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.h
index 31e50d087..73580c37e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.h
index 092bda2bb..a17e6dd13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.h
index 20d299eba..bff6bce6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp
index 02c1bd1b3..8bf965ee9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "rep_treatment_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -577,21 +578,21 @@ void TreatmentModel::fillReportData()
     QMap<int,QSet<int>> tmpVulMap = it.value();
 
     
-    resDataTable.amountLightlyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage).size();
+    resDataTable.amountLightlyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage).size();
     resDataTotal.amountLightlyWounded += resDataTable.amountLightlyWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage))
       INFO_LOG(m_logger) << "participantId: lightlyWouned: " << id;
 
     
-    resDataTable.amountMediumWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage).size();
+    resDataTable.amountMediumWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage).size();
     resDataTotal.amountMediumWounded += resDataTable.amountMediumWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage))
       INFO_LOG(m_logger) << "participantId: mediumWouned: " << id;
 
     
-    resDataTable.amountHeavyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage).size();
+    resDataTable.amountHeavyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage).size();
     resDataTotal.amountHeavyWounded += resDataTable.amountHeavyWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage))
       INFO_LOG(m_logger) << "participantId: heavyWouned: " << id;
 
     
@@ -600,11 +601,11 @@ void TreatmentModel::fillReportData()
     resDataTotal.amountInjuryTotal += resDataTable.amountInjuryTotal;
 
     
-    resDataTable.amountKIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill).size();
+    resDataTable.amountKIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill).size();
     resDataTotal.amountKIA += resDataTable.amountKIA;    
 
     
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill))
     {
       INFO_LOG(m_logger) << "participantId: KIA: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
@@ -612,10 +613,10 @@ void TreatmentModel::fillReportData()
     }
 
     
-    resDataTable.amountKIAAfterWIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance).size();
+    resDataTable.amountKIAAfterWIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance).size();
     resDataTotal.amountKIAAfterWIA += resDataTable.amountKIAAfterWIA;
     
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance))
     {
       INFO_LOG(m_logger) << "participantId: kiaAfterWia: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
@@ -762,12 +763,12 @@ void TreatmentModel::fillParticipantMap()
     QMap<int,QSet<int>> vulnMap;
     QSet<int> partIds;
 
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::LightDamage,      partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::MediumDamage,     partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::HeavyDamage,      partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::CatastrophicKill, partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage,      partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage,     partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage,      partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, partIds);
     
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::TemporarySeverance, partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance, partIds);
 
     m_vulnerabilityMap.insert(it2.key(), vulnMap);
     m_rescueStationTreated.insert(it2.key(), partIds);
@@ -820,9 +821,9 @@ int TreatmentModel::getParticipantKey(int participantId)
 void TreatmentModel::countVulnerabilityState( int key, const resultData &data)
 {
   
-  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady ||
-      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
-      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged)
+  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ||
+      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
+      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged)
     return;
 
   if ( key <= 0)
@@ -859,11 +860,11 @@ void TreatmentModel::countVulnerabilityState( int key, const resultData &data)
     }
   }
 
-  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill && data.kiaAfterWia)
+  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill && data.kiaAfterWia)
   {
-    vulMapTemp[ProjectDataManagement::VulnerabilityState::CatastrophicKill].remove(data.participantId);
+    vulMapTemp[ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill].remove(data.participantId);
     
-    vulMapTemp[ProjectDataManagement::VulnerabilityState::TemporarySeverance].insert(data.participantId);
+    vulMapTemp[ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance].insert(data.participantId);
   }
 
   m_vulnerabilityMap[key] = vulMapTemp;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.h
index cdcb451be..7ab7f035e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp
index 4985ffc64..823735b3c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "rep_treatment_timeline_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -248,7 +249,7 @@ QVariant TreatmentTimelineModel::data(const QModelIndex &index, int role) const
     else if (role == Qt::UserRole + 1)
     {
       if (m_report.visualisationType() == VisualisationType::Line)
-        return displayInfo.eventTypeId.underlying();
+        return displayInfo.eventTypeId;
     }
   }
 
@@ -356,7 +357,7 @@ QString TreatmentTimelineModel::getAreaName(const QString& properties) const
 QColor TreatmentTimelineModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
   DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
   case ReportManagement::EventType::VitalityChanged:     return QColor(Qt::green);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.h
index 46358781b..84a227017 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
index 9deedc3b0..65d28972f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "rep_unit_power_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <ProjectDataManagement/pdm_to_string.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.h
index c920ce89c..2f85c14d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.h
@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
index 043ec4636..d692bbe52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
@@ -164,7 +164,7 @@ void ReportEdit::retranslate()
 {
   QString title;
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::UnitPower:
       title = tr("Unit Power");
@@ -222,7 +222,7 @@ void ReportEdit::retranslate()
       break;
   }
   if (title.isEmpty())
-    title = tr("Unknown (%1)").arg(m_report.reportType().underlying());
+    title = tr("Unknown (%1)").arg(m_report.reportType());
   translate(m_ui, m_report, tr("%1 Report").arg(title));
 
   if (m_useCharge)
@@ -268,7 +268,7 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess
     for (const ProjectDataManagement::EffectSource &es : effects)
     {
       QAction *action = effectSourceMenu->addAction(ProjectDataManagement::toString(es));
-      action->setData(es.underlying());
+      action->setData(es);
       action->setCheckable(true);
       action->setChecked(false);
       connect(action,
@@ -352,7 +352,7 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess
 
   __unchange__();
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::UnitPower:
       setOnlineHelpFilename(QStringLiteral("Situation-Add_Combat_Report"));
@@ -496,7 +496,7 @@ bool ReportEdit::initInputs()
   
   m_ui->gbArea->setVisible(false);
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::ParticipantDistance:
     {
@@ -1022,7 +1022,7 @@ bool ReportEdit::initInputs()
                 m_ui->treeViewAdditionalItems->clearSelection();
             });
     
-    if (m_report.reportType().underlying() == ReportType::ExplosiveDevice)
+    if (m_report.reportType() == ReportType::ExplosiveDevice)
     {
       m_ui->cbAllAdditionalItems->setChecked(true);
       m_ui->treeViewAdditionalItems->selectAll();
@@ -1085,7 +1085,7 @@ bool ReportEdit::initInputs()
     for (QAction *action : m_ui->pbEffectSource->menu()->actions())
     {
       const ProjectDataManagement::EffectSource effectSourceId = static_cast<ProjectDataManagement::EffectSource>(action->data().toInt());
-      auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId.underlying());
+      auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId);
       if (it != m_report.effectSources().end())
       {
         DEBUG_LOG(m_logger) << "To be checked: effectSourceId: " << effectSourceId;
@@ -1688,7 +1688,7 @@ void ReportEdit::onAesChanged(const AreaEffectSimulation::AesItemView &data, Dat
 
 void ReportEdit::onCreateModifyReportReply(const CreateModifyReportReply &replyObject)
 {
-  switch (replyObject.replyState().underlying())
+  switch (replyObject.replyState())
   {
     case Core::FtReplyState::InProgress:
       DEBUG_LOG(m_logger) << "onCreateModifyReportReply InProgress";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
index bdffe5e78..7fe1da024 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
@@ -14,11 +14,11 @@ namespace core
 {
 static inline uint qHash(const ReportManagement::ReportType &t, uint seed)
 {
-  return ::qHash(t.underlying(), seed);
+  return ::qHash(t, seed);
 }
 static inline uint qHash(const ReportManagement::VisualisationType &t, uint seed)
 {
-  return ::qHash(t.underlying(), seed);
+  return ::qHash(t, seed);
 }
 }
 }
@@ -106,11 +106,11 @@ QVariant ReportModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case Type:
-      return reportInfo.reportType().underlying();
+      return reportInfo.reportType();
     case Party:
       return reportInfo.partyId();
     case Visualisation:
-      return reportInfo.visualisationType().underlying();
+      return reportInfo.visualisationType();
     default:
       break;
     }
@@ -197,7 +197,7 @@ void ReportModel::updateComboboxFilterData(const QSet<ReportType> &availableRepo
   LtsWidgets::ComboboxFilterData cfd;
   for (const auto &i : std::as_const(availableReportTypes))
   {
-    cfd.data = i.underlying();
+    cfd.data = i;
     cfd.text = ReportManagement::toString(i);
     cfc.data.push_back(cfd);
   }
@@ -207,7 +207,7 @@ void ReportModel::updateComboboxFilterData(const QSet<ReportType> &availableRepo
   cfc.data.clear();
   for (const auto &i : std::as_const(availableVisualisationTypes))
   {
-    cfd.data = i.underlying();
+    cfd.data = i;
     cfd.text = ReportManagement::toString(i);
     cfc.data.push_back(cfd);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
index 07dae4c81..6b5a35ab0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
@@ -44,7 +44,7 @@
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -164,7 +164,7 @@ bool ReportPreview::displayReport()
     addMessage(tr("No data available"));
 
   
-  switch (m_report.visualisationType().underlying())
+  switch (m_report.visualisationType())
   {
   case VisualisationType::Line:
     displayReportAsLine();
@@ -180,7 +180,7 @@ bool ReportPreview::displayReport()
     break;
   default:
     ERROR_LOG(m_logger) << "Unknown visualisation type for report id = " << m_report.id()
-                        << ": " << m_report.visualisationType().underlying();
+                        << ": " << m_report.visualisationType();
     return false;
   }
 
@@ -681,7 +681,7 @@ void ReportPreview::addToHeaderData(const QString &strLeft, const QString &strRi
 
 void ReportPreview::initInputs()
 {
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
   case ReportType::ParticipantDistance:
   {
@@ -1282,7 +1282,7 @@ void EventTypeModel::initModel()
 QColor EventTypeModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
   DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
   case ReportManagement::EventType::VitalityChanged:     return QColor(Qt::green);
@@ -1302,7 +1302,7 @@ QColor EventTypeModel::eventColor(ReportManagement::EventType eventTypeId) const
 
 KDChart::MarkerAttributes::MarkerStyle EventTypeModel::eventMarker(ReportManagement::EventType eventTypeId) const
 {
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return KDChart::MarkerAttributes::MarkerSquare;
   case ReportManagement::EventType::VitalityChanged:     return KDChart::MarkerAttributes::MarkerDiamond;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.h
index 4dacf9660..e66e2909b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.h
@@ -10,6 +10,7 @@
 #include <ReportManagement/rep_ftc.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
index e93e7fbdd..dcacff8bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
@@ -55,7 +55,7 @@ struct SaaProps
     if (!propertiesObj.contains(QStringLiteral("Adler")) )
       return;
     const QJsonObject adlerObj = propertiesObj[QStringLiteral("Adler")].toObject();
-    isConnected = (adlerObj.value(QStringLiteral("saaConnectedState")).toInt() == ParticipantManagement::ConnectState::Connected);
+    isConnected = (adlerObj.value(QStringLiteral("saaConnectedState")).toInt() == static_cast<int>(ParticipantManagement::ConnectState::Connected));
     name  = adlerObj.value(QStringLiteral("SaaName")).toString(QStringLiteral(""));
     assetId = adlerObj.value(QStringLiteral("assetId")).toInt(-1);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Data/saa_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Data/saa_data_plugin.h
index e4811df8f..80f5a6be1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Data/saa_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Data/saa_data_plugin.h
@@ -6,6 +6,7 @@
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <SAAs/saa_data_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
index 10c218ab8..f02e7d0e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
@@ -2,6 +2,7 @@
 
 
 #include <ConnectDialog/connect_dialog_nt.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session_manager.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
@@ -21,6 +22,7 @@ SaaChooser::SaaChooser(QWidget *parent)
   , m_close(false)
   , m_selected(false)
   , m_pingTimer(new QTimer(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_pingTimer->setInterval(15000); 
@@ -148,7 +150,7 @@ void SaaChooser::slotSelectSaa()
     return;
   const AssetManagement::Asset asset = m_model->getRowData(curIdx.row());
 
-  const SAAUtils::AsmAssetProps assetProps(QString::fromStdString(asset.properties()));
+  const SAAUtils::AsmAssetProps assetProps(QString::fromStdString(asset.properties));
   QPointer<QProcess> process = new QProcess(this);
 
   
@@ -160,7 +162,7 @@ void SaaChooser::slotSelectSaa()
 
     
     if (m_model)
-      m_model->saaConnected(asset.id(), false);
+      m_model->saaConnected(asset.id, false);
 
     QString errMsg = QString::fromUtf8(process->readAllStandardError());
     if (!normalExit(code))
@@ -196,7 +198,7 @@ void SaaChooser::slotSelectSaa()
     if (process->state() != QProcess::Running)
       LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
 
-    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
+    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id<<")"<<" started ";
     
   });
 
@@ -204,12 +206,12 @@ void SaaChooser::slotSelectSaa()
   connect(process, &QProcess::started,
           this, [this, asset]()
   {
-    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
+    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id<<")"<<" started ";
 
     LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
     
     if (m_model)
-      m_model->saaConnected(asset.id(), true);
+      m_model->saaConnected(asset.id, true);
   });
   const QString saaIp = QStringLiteral("%1:%2").arg(assetProps.host).arg(assetProps.port);
   QStringList args;
@@ -235,7 +237,7 @@ void SaaChooser::enaDisa()
   if (!curIdx.isValid())
     return;
   const AssetManagement::Asset &asset = m_model->getRowData(curIdx.row());
-  SAAUtils::AsmAssetProps assetProps(QString::fromStdString(asset.properties()));
+  SAAUtils::AsmAssetProps assetProps(QString::fromStdString(asset.properties));
   m_buttonBox->getButton(LtsWidgets::DialogButton::Show)->setEnabled(assetProps.hasCredential());
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp
index 5361a19fb..0abb89da5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp
@@ -15,6 +15,7 @@ namespace SAAInterfaceAdapterAdler
 using namespace SAAUtils;
 SaaDialogModel::SaaDialogModel(QObject *parent)
     : LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>({tr("Id"), tr("Name"), tr("scenario is running"), tr("Used by Party")}, parent)
+    , m_logger(getLogger("SaaDialogModel"))
     , m_ppmDtc(nullptr)
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
@@ -49,19 +50,19 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
   m_asmDtc->assets(
       [this](const AssetManagement::Asset &asset)
       {
-        if (asset.id() <= 1 || asset.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
+        if (asset.id <= 1 || asset.assetTypeId != AssetManagement::AssetType::AdlerSAA)
           return;
-        AsmAssetProps asmProps(QString::fromStdString(asset.properties()));
+        AsmAssetProps asmProps(QString::fromStdString(asset.properties));
         if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
           return;
 
-        
+
         PingItem pi;
-        pi.assetId = asset.id();
+        pi.assetId = asset.id;
         pi.process = new QProcess(this);
-        pi.host = asmProps.host; 
-        pi.port = asmProps.port; 
-        m_saaPingItems.insert(asset.id(), pi);
+        pi.host = asmProps.host;
+        pi.port = asmProps.port;
+        m_saaPingItems.insert(asset.id, pi);
         
 
         onDataChanged(asset, DataModification::eAdded);
@@ -98,7 +99,7 @@ void SaaDialogModel::pingAllSaa()
             {
               ParticipantManagement::Party party;
               getPartyWithAssetId(pi.assetId, party);
-              DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
+              DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id > 0) << " Ip: " << pi.host
                                   << " PortNumb: " << pi.port;
               pi.reachable = (exitCode == 0);
               pi.process->kill();
@@ -146,18 +147,18 @@ void SaaDialogModel::updateView()
 void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
+  DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id << " properties: " << data.properties;
   update();
 }
 
 bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModification modType) const
 {
   
-  if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
+  if (data.id <= 1 || data.assetTypeId != AssetManagement::AssetType::AdlerSAA)
     return true;
 
-  
-  AsmAssetProps asmProps(QString::fromStdString(data.properties()));
+
+  AsmAssetProps asmProps(QString::fromStdString(data.properties));
   if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
     return true;
   return LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>::isFiltered(data, modType);
@@ -166,9 +167,9 @@ bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModifica
 void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataModification modType)
 {
   
-  if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
+  if (data.id <= 1 || data.assetTypeId != AssetManagement::AssetType::AdlerSAA)
     return;
-  AsmAssetProps asmProps(QString::fromStdString(data.properties()));
+  AsmAssetProps asmProps(QString::fromStdString(data.properties));
   if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId())
     return;
 
@@ -178,17 +179,17 @@ void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataMo
     {
       onDataChanged(data, DataModification::eAdded);
       PingItem pi;
-      pi.assetId = data.id();
+      pi.assetId = data.id;
       pi.process = new QProcess(this);
       pi.host = asmProps.host;
       pi.port = asmProps.port;
-      m_saaPingItems.insert(data.id(), pi);
+      m_saaPingItems.insert(data.id, pi);
     }
     break;
     case DataModification::eModified:
     {
       onDataChanged(data, DataModification::eModified);
-      PingItem pi = m_saaPingItems.take(data.id());
+      PingItem pi = m_saaPingItems.take(data.id);
       if (pi.process != nullptr && pi.process->state() != QProcess::NotRunning)
       {
         pi.process->kill();
@@ -196,19 +197,19 @@ void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataMo
       }
       pi.process = nullptr;
 
-      pi.assetId = data.id();
+      pi.assetId = data.id;
       pi.host = asmProps.host;
       pi.port = asmProps.port;
       pi.connected = false;
       pi.reachable = false;
       pi.process = new QProcess(this);
-      m_saaPingItems.insert(data.id(), pi);
+      m_saaPingItems.insert(data.id, pi);
     }
     break;
     case DataModification::eRemoved:
       onDataChanged(data, DataModification::eRemoved);
 
-      auto pi = m_saaPingItems.take(data.id()); 
+      auto pi = m_saaPingItems.take(data.id);
       if (pi.process != nullptr && pi.process->state() != QProcess::NotRunning)
       {
         pi.process->kill();
@@ -224,7 +225,7 @@ void SaaDialogModel::getPartyWithAssetId(int assetId, ParticipantManagement::Par
   const auto &partys = m_ppmDtc->partys();
   for (const auto &p : partys)
   {
-    SaaProps saaprops(QString::fromStdString(p.properties()));
+    SaaProps saaprops(QString::fromStdString(p.properties));
     if (!saaprops.hasAsset())
       continue;
     if (saaprops.assetId == assetId)
@@ -241,23 +242,23 @@ QVariant SaaDialogModel::data(const QModelIndex &index, int role) const
     return {};
 
   const AssetManagement::Asset &asset = m_vecData.at(index.row());
-  const AsmAssetProps assetProps(QString::fromStdString(asset.properties()));
+  const AsmAssetProps assetProps(QString::fromStdString(asset.properties));
+
 
-  
   ParticipantManagement::Party party;
-  if (asset.assetTypeId() == AssetManagement::AssetType::AdlerSAA && assetProps.hasExerciseId())
-    getPartyWithAssetId(asset.id(), party);
+  if (asset.assetTypeId == AssetManagement::AssetType::AdlerSAA && assetProps.hasExerciseId())
+    getPartyWithAssetId(asset.id, party);
 
   if (role == Qt::DisplayRole)
   {
     switch (index.column())
     {
       case Id:
-        return asset.id();
+        return asset.id;
       case Name:
-        return QString::fromStdString(asset.name());
+        return QString::fromStdString(asset.name);
       case IsUseByParty:
-        return party.id() > 0 ? ParticipantManagement::trPartyName(party.name()) : QStringLiteral("--");
+        return party.id > 0 ? ParticipantManagement::trPartyName(party.name) : QStringLiteral("--");
       default:
         return {};
     }
@@ -275,12 +276,12 @@ QVariant SaaDialogModel::data(const QModelIndex &index, int role) const
     static const QIcon red(QLatin1String("icon:red_light.svg"));
     static const QIcon yellow(QLatin1String("icon:yellow_light.svg"));
     static const QIcon gray(QLatin1String("icon:gray_light.svg"));
-    const bool reacheable = m_saaPingItems.value(asset.id()).reachable;
+    const bool reacheable = m_saaPingItems.value(asset.id).reachable;
     switch (index.column())
     {
       case Connected:
       {
-        const bool szenar = (party.id() > 0); 
+        const bool szenar = (party.id > 0);
         if (szenar && reacheable)
           return green;
         if (szenar && !reacheable)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
index f4c1e8140..adc668168 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
@@ -5,6 +5,7 @@
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AssetManagement/asm_dtc.h>
 #include <LtsSession/lts_session.h>
 #include <SAAs/Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
index 7f0892df9..5c5fbbc99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
@@ -6,6 +6,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AssetManagement/asm_dtc.h>
 #include <QtCore/QPointer>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/saa_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/saa_data_plugin_interface.h
index 73748ea43..501ff3973 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/saa_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/saa_data_plugin_interface.h
@@ -5,6 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 namespace SAAInterfaceAdapterAdler
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
index 75fe11bbf..4880a23d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
@@ -2,6 +2,7 @@
 
 
 #include "scr_gui_plugin.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "screen_recording_dialog.h"
 #include "screen_recording_worker.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.cpp
index f31be71fb..424ec5d9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.cpp
@@ -18,7 +18,7 @@ namespace ScreenRecording
 ScreenRecordingDialog::ScreenRecordingDialog(const QString &menuGroup, QWidget *parent, const LtsWidgets::Behaviour &behaviour)
   : LtsFramelessDialog(parent, behaviour)
   , m_ui(new Ui::ScreenRecordingDialog)
-  .getNGLLogger("ScreenRecording"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   Q_UNUSED(menuGroup);
 
@@ -94,24 +94,24 @@ void ScreenRecordingDialog::onBrowseRecordingFile()
 void ScreenRecordingDialog::onChangeRecordingArea()
 {
   QWidget *mainWidgetPtr = m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eMainTab);
-  QPoint point = m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal({})
-                                                      : m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eInfoTab)->mapToGlobal({});
+  QPoint point = m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal(QPoint())
+                                                      : m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eInfoTab)->mapToGlobal(QPoint());
   QSize  size = {m_baseLayoutPtr->width(),
                  m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->height() : m_baseLayoutPtr->getMenu()->height()};
 
   switch (m_ui->cobRecordingArea->currentData().value<ScreenRecordingWorker::RecordingArea>())
   {
   case ScreenRecordingWorker::RecordingArea::MainArea:
-    point = {mainWidgetPtr->mapToGlobal({}).x(),
-             m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal({}).y()
-             : mainWidgetPtr->mapToGlobal({}).y()};
+    point = {mainWidgetPtr->mapToGlobal(QPoint()).x(),
+             m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal(QPoint()).y()
+             : mainWidgetPtr->mapToGlobal(QPoint()).y()};
     size  = {mainWidgetPtr->width(),
-             m_ui->chbRecordTitleBar->isChecked() ? mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomLeft()).y() - m_baseLayoutPtr->mapToGlobal({}).y() + 1
+             m_ui->chbRecordTitleBar->isChecked() ? mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomLeft()).y() - m_baseLayoutPtr->mapToGlobal(QPoint()).y() + 1
              : mainWidgetPtr->height()};
     break;
 
   case ScreenRecordingWorker::RecordingArea::LeftOfMenu:
-    size.setWidth(mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomRight()).x() - m_baseLayoutPtr->mapToGlobal({}).x() + 1);
+    size.setWidth(mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomRight()).x() - m_baseLayoutPtr->mapToGlobal(QPoint()).x() + 1);
     break;
 
   default:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
index beb56dd9a..99e3b91c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
@@ -169,7 +169,7 @@ const QStringList ScreenRecordingWorker::s_imageFormats = { QLatin1String("jpg")
 
 ScreenRecordingWorker::ScreenRecordingWorker(QObject *parent)
   : QObject(parent)
-  .getNGLLogger("ScreenRecording"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   QDir tmpRecordingDir(s_recordingTmpDir);
   if (!tmpRecordingDir.exists())
@@ -196,7 +196,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
   args << QLatin1String("-f")       << QLatin1String("x11grab");
   args << QLatin1String("-s")       << (QString::number(baseLayout->geometry().width()) + QLatin1String("x") + QString::number(baseLayout->geometry().height()));
   args << QLatin1String("-r")       << QString::number(1);
-  args << QLatin1String("-i")       << (DISPLAY + QString::number(baseLayout->mapToGlobal({}).x()) + QLatin1String(",") + QString::number(baseLayout->mapToGlobal({}).y()));
+  args << QLatin1String("-i")       << (DISPLAY + QString::number(baseLayout->mapToGlobal(QPoint()).x()) + QLatin1String(",") + QString::number(baseLayout->mapToGlobal(QPoint()).y()));
   args << QLatin1String("-vframes") << QString::number(1);
   args << fileInfo.absoluteFilePath();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/scm_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/scm_data_plugin.h
index b9ad1d248..ddde04116 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/scm_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/scm_data_plugin.h
@@ -15,7 +15,7 @@
 namespace ServiceManagement
 {
 
-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
   Q_PLUGIN_METADATA(IID "data:3:scm")
   Q_INTERFACES(DataPluginBase::Plugin)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
index 34b028765..efad3d1dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
@@ -90,18 +90,18 @@ bool ServiceManagementDialog::init(const std::shared_ptr<ServiceManagement::Inte
   {
     // now that all services of that group are represented by a widget, create the group widget which adds all service widgets
     //const int id = gi.id();
-    const int server = gi.domainId();
-    const int exercise = gi.exercisePartitionId();
-    const int32_t replayPartitionId = gi.replayPartitionId();
-    const QString groupName = groupEnumToGroupName(gi.type()); // QLatin1String("Group Name"); // TODO: get real group name
-    long long timestamp = gi.timestamp();
+    const int server = gi.domainId;
+    const int exercise = gi.exercisePartitionId;
+    const int32_t replayPartitionId = gi.replayPartitionId;
+    const QString groupName = groupEnumToGroupName(gi.type); // QLatin1String("Group Name"); // TODO: get real group name
+    long long timestamp = gi.timestamp;
 
     servicesList.clear();
-    servicesList.reserve(gi.services().size());
-    for (auto service : gi.services())
+    servicesList.reserve(gi.services.size());
+    for (auto service : gi.services)
       servicesList.append(service);
 
-    addGroup(gi.type(), server, exercise, replayPartitionId, groupName, timestamp, servicesList);
+    addGroup(gi.type, server, exercise, replayPartitionId, groupName, timestamp, servicesList);
   }
 
 
@@ -122,7 +122,7 @@ GroupWidget *ServiceManagementDialog::addGroup(const Core::ServiceGroupType &gro
 {
   //qWarning() << "ServiceManagementDialog::addGroup: needed services:" << servicesList;
 
-  QString exName = QString::fromStdString(m_dtcExm.get()->exercise(exercise).name());
+  QString exName = QString::fromStdString(m_dtcExm.get()->exercise(exercise).name);
   GroupWidget *group = new GroupWidget(groupType, server, exercise, replayPartitionId, exName, timestamp, servicesList);  // memleak!
 
   QString groupObjectName = craftGroupName(server, exercise, groupName);
@@ -205,11 +205,11 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
   //qWarning() << "slotGroupInformationChanged";
 
   // find group
-  int server = info.domainId();
-  int exercise = info.exercisePartitionId();
-  int32_t replayPartitionId = info.replayPartitionId();
-  QString groupName = groupEnumToGroupName(info.type());
-  long long timestamp = info.timestamp();
+  int server = info.domainId;
+  int exercise = info.exercisePartitionId;
+  int32_t replayPartitionId = info.replayPartitionId;
+  QString groupName = groupEnumToGroupName(info.type);
+  long long timestamp = info.timestamp;
 
   QString findGroupName = craftGroupName(server, exercise, groupName);
 
@@ -220,12 +220,12 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
     //qWarning() << "slotGroupInformationChanged: group not found, adding it";
 
     QVector<int> servicesList;
-    servicesList.reserve(info.services().size());
-    for (auto service : info.services())
+    servicesList.reserve(info.services.size());
+    for (auto service : info.services)
       servicesList << service;
 
     m_ui->lbNoServices->hide();
-    addGroup(info.type(), server, exercise, replayPartitionId, groupName, timestamp, servicesList);
+    addGroup(info.type, server, exercise, replayPartitionId, groupName, timestamp, servicesList);
   }
   else
   {
@@ -238,7 +238,7 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
 
       m_ui->lbNoServices->hide(); // added/modified = there are groups, which show services
 
-      gw->setType(info.type());
+      gw->setType(info.type);
       gw->setServer(server);
       gw->setExercise(exercise);
       gw->setTimestamp(timestamp);
@@ -262,11 +262,11 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
 
 void ServiceManagementDialog::addService(const ServiceManagement::ServiceInformation &svc)
 {
-  const int id = svc.id();
-  const long long pid = svc.pid();
-  const QString name(QString::fromStdString(svc.name()));
-  const Core::RunningState &state = svc.state();
-  const QString errorString(QString::fromStdString(svc.errorString()));
+  const int id = svc.id;
+  const long long pid = svc.pid;
+  const QString name(QString::fromStdString(svc.name));
+  const Core::RunningState &state = svc.state;
+  const QString errorString(QString::fromStdString(svc.errorString));
 
   ServiceWidget *service = new ServiceWidget(id, pid, name, state, errorString);
   service->setObjectName(QLatin1String("service.") + QString::number(id));
@@ -286,12 +286,12 @@ void ServiceManagementDialog::slotServiceInformationChanged(ServiceManagement::S
 
   // find services (because ONE service can be in MANY groups)
 
-  int32_t serviceId = info.id();
-  QString errorString = QString::fromStdString(info.errorString());
-  QString serviceName = QString::fromStdString(info.name());
-  long long pid = info.pid();
-  const Core::RunningState &state = info.state();
-  long long timestamp = info.timestamp();
+  int32_t serviceId = info.id;
+  QString errorString = QString::fromStdString(info.errorString);
+  QString serviceName = QString::fromStdString(info.name);
+  long long pid = info.pid;
+  const Core::RunningState &state = info.state;
+  long long timestamp = info.timestamp;
 
   QString findServiceName = QLatin1String("service.") + QString::number(serviceId);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h
index 19518f6e8..ef9fb9821 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h
@@ -63,7 +63,7 @@ public:
     groupNameMapping.insert(QLatin1String("ExerciseAfterActionReview"), Core::ServiceGroupType::ExerciseAfterActionReview);
     groupNameMapping.insert(QLatin1String("Playback"), Core::ServiceGroupType::Playback);
 
-    return groupNameMapping.key(type.underlying());
+    return groupNameMapping.key(type);
   }
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
index 58ac65bd6..4291a6369 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
@@ -71,7 +71,7 @@ void ServiceWidget::setErrorString(const QString &errorString)
 void ServiceWidget::setState(Core::RunningState state)
 {
   auto status = ServiceWidget::UNKNOWN;
-  switch (state.underlying())
+  switch (state)
   {
   // STARTING
   case Core::RunningState::Starting:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
index e50fdc472..24b7533eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "smo_equipment_error_registration_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_smo_equipment_error_registration_dialog.h"
 
 #include "smo_equipment_error_registration_model.h"
@@ -20,6 +21,7 @@ EquipmentErrorRegistrationDialog::EquipmentErrorRegistrationDialog(QWidget *pare
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_session(nullptr)
   , m_ui(new Ui::EquipmentErrorRegistrationDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &EquipmentErrorRegistrationDialog::onPrint);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
index fdaf618a4..d69cbfd54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "smo_equipment_error_registration_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <ngltools/ngltools_dtg.h>
 
@@ -28,6 +29,7 @@ EquipmentErrorRegistrationModel::EquipmentErrorRegistrationModel(QObject *parent
   , m_chunksRequested(0)
   , m_chunksReceived(0)
   , m_session(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -86,14 +88,14 @@ QVariant EquipmentErrorRegistrationModel::data(const QModelIndex &index, int rol
 void EquipmentErrorRegistrationModel::doEventRequests()
 {
   ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->partitionId());
-  int64_t startTime = ex.beginTime();
-  const int64_t endTime = ex.stopTime() > 0 ? ex.stopTime() : m_session->partitionTime();
+  int64_t startTime = ex.beginTime;
+  const int64_t endTime = ex.stopTime > 0 ? ex.stopTime : m_session->partitionTime();
 
   while (startTime < endTime)
   {
     int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
 
-    m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport});
+    m_requests += m_eemForeign->requestData(startTime, reqEnd, {static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)});
 
     
     startTime += (24 * 60 * 60 * 1000) + 1;
@@ -104,10 +106,10 @@ void EquipmentErrorRegistrationModel::doEventRequests()
 static inline EquipmentErrorRegistrationEntry event2Entry(const ExerciseEventManagement::Event &event)
 {
   EquipmentErrorRegistrationEntry entry;
-  const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties().c_str(),
-                                                                          event.properties().size())).object();
-  entry.equipmentNumber = event.equipmentNumber();
-  entry.sampleTime = event.sampleTime();
+  const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties.c_str(),
+                                                                          event.properties.size())).object();
+  entry.equipmentNumber = event.equipmentNumber;
+  entry.sampleTime = event.sampleTime;
   entry.participant = obj[QStringLiteral("participant")].toString();
   entry.device = obj[QStringLiteral("device")].toString();
   entry.text = obj[QStringLiteral("text")].toString();
@@ -133,9 +135,9 @@ void EquipmentErrorRegistrationModel::onRequestedDataAvailable(TimeLineManagemen
 
 void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement::Event &ev)
 {
-  if (ev.eventTypeId() != ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)
+  if (ev.eventTypeId != ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)
     return;
-  INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
+  INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber;
   insertRow(event2Entry(ev));
 
   emit chunksUpdated(m_chunksReceived, m_chunksRequested);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
index 73c436ec8..86670d4fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <ExerciseManagement/exm_data_plugin.h>
+#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
-#include <ProjectDataManagement/pdm_data_plugin.h>
+#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
 #include <Timeline/tln_data_plugin_interface.h>
 
 #include <LtsSession/lts_session.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
index 00b69f5ea..17f94f15d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "smo_hgr_and_mine_search_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_smo_hgr_and_mine_search_dialog.h"
 
 #include "smo_hgr_and_mine_search_model.h"
@@ -23,6 +24,7 @@ HgrAndMineSearchDialog::HgrAndMineSearchDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_session(nullptr)
   , m_ui(new Ui::HgrAndMineSearchDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &HgrAndMineSearchDialog::onPrint);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_gui_plugin.h
index ad3848732..2bf1fa640 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_gui_plugin.h
@@ -11,9 +11,9 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
-#include <ProjectDataManagement/pdm_data_plugin.h>
+#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
 #include <Timeline/tln_data_plugin_interface.h>
-#include <AreaEffectSimulation/aes_data_plugin.h>
+#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
index a2eff7db8..ac376e812 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "smo_hgr_and_mine_search_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -44,6 +45,7 @@ HgrAndMineSearchModel::HgrAndMineSearchModel(QObject *parent)
   , m_chunksRequested(0)
   , m_chunksReceived(0)
   , m_session(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
@@ -181,9 +183,9 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
     case EventType:
       return ProjectDataManagement::toString(entry.type);
     case EventPosition:
-      if (entry.pos.lon() == 0 || entry.pos.lat() == 0 || std::isnan(entry.pos.lon()))
+      if (entry.pos.lon == 0 || entry.pos.lat == 0 || std::isnan(entry.pos.lon))
         return QStringLiteral("---");
-      return LtsCoordTrans::mgrsFromGeographic(entry.pos.lon(), entry.pos.lat());
+      return LtsCoordTrans::mgrsFromGeographic(entry.pos.lon, entry.pos.lat);
     case EventTime:
       return QDateTime::fromMSecsSinceEpoch(entry.timeStamp);
     case EventSource:
@@ -199,10 +201,10 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
       QString vulnerabilityState = tr("All Types");
       if (entry.vbg>=0)
       {
-        ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId()).typeClass();
+        ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId).typeClass;
         const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
-              ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-              ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+              ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+              ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
               ProjectDataManagement::VulnerabilityState vs = static_cast<ProjectDataManagement::VulnerabilityState>(entry.vbg);
          vulnerabilityState = ProjectDataManagement::toString(vs, vc);
       }
@@ -216,7 +218,7 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case EventType:
-      return entry.type.underlying();
+      return static_cast<int>(entry.type);
     case EventParty:
       return entry.party;
     default:
@@ -235,10 +237,10 @@ QPointF HgrAndMineSearchModel::position(const QModelIndex &index) const
 
   const Core::GeoPosition pos = m_vecData.at(index.row()).pos;
 
-  if (pos.lon() == 0 || pos.lat() == 0 || std::isnan(pos.lon()))
+  if (pos.lon == 0 || pos.lat == 0 || std::isnan(pos.lon))
     return QPointF();
 
-  return {pos.lon(), pos.lat()};
+  return {pos.lon, pos.lat};
 }
 
 void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::FunctionReplyObject &replyObject)
@@ -249,14 +251,14 @@ void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::Function
   {
     auto cb = [this, &replyObject](const ParticipantManagement::EquipmentSystemEventFtcReply &event)
     {
-      if (event.filterId() != replyObject.id())
+      if (event.filterId != replyObject.id())
         return;
       HgrAndMineSearchEntry entry;
 
       entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType::Handgrenade);
-      entry.pos = event.position();
-      entry.timeStamp = event.timeStamp();
-      entry.source = event.equipmentNumber();
+      entry.pos = event.position;
+      entry.timeStamp = event.timeStamp;
+      entry.source = event.equipmentNumber;
       entry.participantId = 0;
       entry.party = 0;
       entry.vbg = 0;
@@ -283,20 +285,20 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin
   HgrAndMineSearchEntry entry;
   for (const auto &event : events)
   {
-    const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties().c_str(),
-                                                                            event.properties().size())).object();
+    const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties.c_str(),
+                                                                            event.properties.size())).object();
     entry.type = m_evtFlt.value(obj.value(QStringLiteral("OriginatorChargeTypeId")).toInt());
 
     if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::Mine)
       continue;
 
-    entry.pos = event.position();
-    entry.timeStamp = event.sampleTime();
-    entry.source = event.equipmentNumber();
-    entry.participantId = event.participantId();
-    entry.party = event.partyId();
+    entry.pos = event.position;
+    entry.timeStamp = event.sampleTime;
+    entry.source = event.equipmentNumber;
+    entry.participantId = event.participantId;
+    entry.party = event.partyId;
     entry.vbg = obj.value(QStringLiteral("VulnerabilityState")).toInt();
-    entry.properties = QString::fromUtf8(event.properties().c_str());
+    entry.properties = QString::fromUtf8(event.properties.c_str());
 
     insertRow(entry);
   }
@@ -307,22 +309,22 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin
 void HgrAndMineSearchModel::doEquipmentSystemEventRequests()
 {
   ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->exerciseId());
-  int64_t start = ex.beginTime();
-  int64_t end = m_session->partitionTime() < ex.endTime() ? m_session->partitionTime() : ex.endTime(); 
+  int64_t start = ex.beginTime;
+  int64_t end = m_session->partitionTime() < ex.endTime ? m_session->partitionTime() : ex.endTime; 
 
   while (start < end)
   {
     ParticipantManagement::EquipmentSystemEventDataRequest req;
     int64_t reqEnd = ((start + 24 * 60 * 60 * 1000) > end ? end : start + 24 * 60 * 60 * 1000);
 
-    req.startTime(start);
-    req.endTime(reqEnd);
+    req.startTime = start;
+    req.endTime = reqEnd;
 
     for (const auto &filter : std::as_const(m_equipSysEvtFlt))
     {
-      req.equipmentFunctionId(filter.equipmentFunctionId());
-      req.subDeviceId(filter.subDeviceId());
-      req.deviceSpecificEventCode(filter.deviceSpecificCode());
+      req.equipmentFunctionId = filter.equipmentFunctionId;
+      req.subDeviceId = filter.subDeviceId;
+      req.deviceSpecificEventCode = filter.deviceSpecificCode;
 
       m_ppmFtc->equipmentSystemEventDataRequest(req, this);
 
@@ -337,8 +339,8 @@ void HgrAndMineSearchModel::doEquipmentSystemEventRequests()
 void HgrAndMineSearchModel::doEventRequests()
 {
   ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->partitionId());
-  int64_t startTime = ex.beginTime();
-  const int64_t endTime = ex.stopTime() > 0 ? ex.stopTime() : m_session->partitionTime();
+  int64_t startTime = ex.beginTime;
+  const int64_t endTime = ex.stopTime > 0 ? ex.stopTime : m_session->partitionTime();
   while (startTime < endTime)
   {
     int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
@@ -347,9 +349,9 @@ void HgrAndMineSearchModel::doEventRequests()
       arr += QJsonValue(it.key());
     const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}});
 
-    m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_Hit,
-                                                                ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
-                                                                ProjectDataManagement::PdmEventType::EventType_HitMine}, filter);
+    m_requests += m_eemForeign->requestData(startTime, reqEnd, {static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Hit),
+                                                                static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation),
+                                                                static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitMine)}, filter);
 
     
     startTime += (24 * 60 * 60 * 1000) + 1;
@@ -372,16 +374,16 @@ void HgrAndMineSearchModel::doInsertMines()
     if (!mineAreas.contains(it.key()))
       mineAreas.insert(it.key(), m_aesDtc->mineArea(it.key()));
 
-    const std::vector<AreaEffectSimulation::DusMine> mines = it.value().mines();
-    entry.party = mineAreas.value(it.key()).partyId().is_set() ? mineAreas.value(it.key()).partyId().get() : 0;
+    const std::vector<AreaEffectSimulation::DusMine> mines = it.value().mines;
+    entry.party = mineAreas.value(it.key()).partyId.has_value() ? mineAreas.value(it.key()).partyId.get() : 0;
 
     for (const AreaEffectSimulation::DusMine &currentMine : mines)
     {
-      properties.insert(tr("Mine-ID"), currentMine.eqId());
+      properties.insert(tr("Mine-ID"), currentMine.eqId);
 
       entry.properties = QString::fromUtf8(QJsonDocument(properties).toJson(QJsonDocument::Compact));
-      entry.pos.lon(currentMine.position().lon());
-      entry.pos.lat(currentMine.position().lat());
+      entry.pos.lon = currentMine.position.lon;
+      entry.pos.lat = currentMine.position.lat;
 
       insertRow(entry);
     }
@@ -396,7 +398,7 @@ void HgrAndMineSearchModel::loadFilterSettings()
   
   auto cb = [this](const ProjectDataManagement::EventFilterHgrMineSearch &filter)
   {
-    m_evtFlt.insert(filter.chargeTypeId(), filter.hgrMineSearchFilterType());
+    m_evtFlt.insert(filter.chargeTypeId, filter.hgrMineSearchFilterType);
   };
   m_pdmDtc->eventFilterHgrMineSearchs(cb);
 }
@@ -457,7 +459,7 @@ QIcon HgrAndMineSearchModel::iconFromPartyId(int partyId) const
   auto it = m_partyIcons.find(partyId);
   if (it != m_partyIcons.end())
     return it.value();
-  const QRgb col = QRgb(m_ppmDtc->party(partyId).color());
+  const QRgb col = QRgb(m_ppmDtc->party(partyId).color);
   const QIcon icon = m_ppmGuiCbxIfc->pixmapFromParty(col);
   m_partyIcons.insert(partyId, icon);
   return icon;
@@ -468,7 +470,7 @@ QVariant HgrAndMineSearchModel::stringFromPartyId(int partyId) const
   auto it = m_partyNames.find(partyId);
   if (it != m_partyNames.end())
     return it.value();
-  const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
+  const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
   m_partyNames.insert(partyId, name);
   return name;
 }
@@ -484,7 +486,7 @@ void HgrAndMineSearchModel::onUpdateComboboxFilterData()
   cfc.data.reserve(types.size());
   for (const auto typeId : types)
   {
-    cfd.data = typeId;
+    cfd.data = static_cast<int>(typeId);
     cfd.text = ProjectDataManagement::toString(typeId);
     cfc.data.push_back(cfd);
   }
@@ -499,7 +501,7 @@ void HgrAndMineSearchModel::onUpdateComboboxFilterData()
   for (const int i : std::as_const(availablePartyIds))
   {
     cfd.data = i;
-    cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name());
+    cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name);
     cfd.icon = iconFromPartyId(i);
     cfc.data.push_back(cfd);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
index d1f583aaf..a8d1b80eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <ExerciseManagement/exm_data_plugin.h>
+#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
-#include <ProjectDataManagement/pdm_data_plugin.h>
+#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
 #include <Timeline/tln_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
-#include <AreaEffectSimulation/aes_data_plugin.h>
+#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
 
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
@@ -19,7 +19,7 @@ namespace ServiceMonitor
 {
 struct HgrAndMineSearchEntry
 {
-  ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType_Unknown;
+  ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType::HgrMineSearchFilterType_Unknown;
   Core::GeoPosition pos;
   int64_t timeStamp = -1;
   int32_t source = -1;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
index 8b70c3e71..97dfd68ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
@@ -86,8 +86,8 @@ void BaseEquipmentCheck::sendBiteRequest(const std::vector<int> &selectedIds,
     return;
 
   ParticipantManagement::CallBiteRequest req;
-  req.participantIds(selectedIds);
-  req.withSelfTest(bWithSelfTest);
+  req.participantIds = selectedIds;
+  req.withSelfTest = bWithSelfTest;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->callBiteRequest(req, this); });
 
   for (int id : selectedIds)
@@ -110,12 +110,12 @@ void BaseEquipmentCheck::sendInitRequest(const std::vector<int> &selectedIds,
   if (!resetManipulation && !restockCharges && !resetVulnerabilityState)
     return;
   ParticipantManagement::InitParticipantRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.participantIds(selectedIds);
-  req.resetManipulation(resetManipulation);
-  req.restockCharges(restockCharges);
-  req.resetVulnerabilityState(resetVulnerabilityState);
-  req.restockSanitationMaterial(restockSanMat);
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.participantIds = selectedIds;
+  req.resetManipulation = resetManipulation;
+  req.restockCharges = restockCharges;
+  req.resetVulnerabilityState = resetVulnerabilityState;
+  req.restockSanitationMaterial = restockSanMat;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->initParticipantRequest(req, this); });
 }
 
@@ -123,9 +123,9 @@ void BaseEquipmentCheck::sendModifyState(const std::vector<int> &selectedIds,
                                          ProjectDataManagement::VulnerabilityState vs)
 {
   ParticipantManagement::ModifyStateRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.participantIds(selectedIds);
-  req.vulnerabilityState(vs);
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.participantIds = selectedIds;
+  req.vulnerabilityState = vs;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->modifyStateRequest(req, this); });
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.h
index 361094cfc..ab4a20530 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/ppm_ftc.h>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 
 #include <LtsSession/lts_session.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
index 2f256d23b..5f3f14c00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
@@ -8,6 +8,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
+#include <LtsUtils/LtsUtilsCore/variant_operators.h>
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
@@ -52,6 +53,7 @@ BasePlayerModel::BasePlayerModel(QObject *parent)
   , m_timeoutCheckTimer(new QTimer(this))
   , m_positionAgeTimer(new QTimer(this))
   , m_session(nullptr)
+  , m_logger(getLogger("BasePlayerModel"))
 {
   m_timeoutCheckTimer->setSingleShot(false);
   connect(m_timeoutCheckTimer, &QTimer::timeout,
@@ -167,22 +169,22 @@ QVariant BasePlayerModel::headerData(int section, Qt::Orientation orientation, i
       auto fill = [&cfc, this](ProjectDataManagement::VulnerabilityState state, const QIcon &icon)
       {
         LtsWidgets::ComboboxFilterData cfd;
-        cfd.data = state.underlying();
+        cfd.data = static_cast<int>(state);
         cfd.text = vulnerabilityStateString(ParticipantManagement::TypeClass::Human, state);
         cfd.icon = icon;
         cfc.data.push_back(std::move(cfd));
       };
 
-      fill(ProjectDataManagement::VulnerabilityState::CombatReady, m_tactStatusGreen);
+      fill(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, m_tactStatusGreen);
       {
         LtsWidgets::ComboboxFilterData cfd;
-        cfd.data = ProjectDataManagement::VulnerabilityState::LightDamage;
+        cfd.data = static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
         cfd.text = tr("Wounded / Damaged");
         cfd.icon = m_tactStatusYellow;
         cfc.data.push_back(std::move(cfd));
       }
-      fill(ProjectDataManagement::VulnerabilityState::CatastrophicKill, m_tactStatusRed);
-      fill(ProjectDataManagement::VulnerabilityState::NotReady, m_tactStatusOrange);
+      fill(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, m_tactStatusRed);
+      fill(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady, m_tactStatusOrange);
 
       return cfc.toVariant();
     }
@@ -211,7 +213,7 @@ QVariant BasePlayerModel::headerData(int section, Qt::Orientation orientation, i
       for (const int typeId : m_usedTypeIds)
       {
         cfd.data = typeId;
-        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name());
+        cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name);
         cfc.data.push_back(cfd);
       }
       cfc.sortItems = true;
@@ -243,7 +245,7 @@ QVariant BasePlayerModel::data(const QModelIndex &index, int role) const
       return decorationData(index, data.participantId);
     case ColTacticalStatus:
     {
-      switch (data.vulnerabilityState.underlying())
+      switch (data.vulnerabilityState)
       {
       case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
         return m_tactStatusOrange;
@@ -341,16 +343,16 @@ QVariant BasePlayerModel::data(const QModelIndex &index, int role) const
       return data.partyId;
     case ColTacticalStatus:
     {
-      switch (data.vulnerabilityState.underlying())
+      switch (data.vulnerabilityState)
       {
       case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
       case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
       case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
-        return data.vulnerabilityState.underlying();
+        return static_cast<int>(data.vulnerabilityState);
       default:
         break;
       }
-      return ProjectDataManagement::VulnerabilityState::LightDamage;
+      return static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
     }
     case ColPosition:
       return data.isOutdated;
@@ -366,7 +368,7 @@ QVariant BasePlayerModel::data(const QModelIndex &index, int role) const
 
 QString BasePlayerModel::getBitResult(const ParticipantManagement::Bite &bite, int equipmnetNumber) const
 {
-  if (bite.equipmentNumber() != equipmnetNumber)
+  if (bite.equipmentNumber != equipmnetNumber)
     return QString();
   const QString bitErrors = m_biteModel->getBitErrors(bite);
   return (bitErrors.isEmpty() ? tr("Ok") : bitErrors);
@@ -374,9 +376,9 @@ QString BasePlayerModel::getBitResult(const ParticipantManagement::Bite &bite, i
 
 QString BasePlayerModel::getBiteWarnings(const ParticipantManagement::Bite &bite, int equipmnetNumber) const
 {
-  if (bite.equipmentNumber() != equipmnetNumber)
+  if (bite.equipmentNumber != equipmnetNumber)
     return QString();
-  const QString s1(m_biteModel->getLowBattery(bite.batteryState()));
+  const QString s1(m_biteModel->getLowBattery(bite.batteryState));
   const QString s2(m_biteModel->getComponents(bite));
 
   QStringList ret;
@@ -384,7 +386,7 @@ QString BasePlayerModel::getBiteWarnings(const ParticipantManagement::Bite &bite
     ret << s1;
   if (!s2.isEmpty())
     ret << s2;
-  if (bite.configError())
+  if (bite.configError)
     ret << tr("Config Error");
   return ret.isEmpty() ? QStringLiteral("-") : ret.join(QStringLiteral(", "));
 }
@@ -392,12 +394,12 @@ QString BasePlayerModel::getBiteWarnings(const ParticipantManagement::Bite &bite
 QString BasePlayerModel::getPositionString(const ParticipantManagement::ParticipantPosition &position,
                                            int participantId) const
 {
-  if (position.participantId() != participantId)
+  if (position.participantId != participantId)
     return QStringLiteral("-");
-  QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.pos().lon(),
-                                                    position.pos().lat());
-  if (!qFuzzyIsNull(position.pos().z()))
-    mgrs.append(QStringLiteral(" ") + QString::number(position.pos().z(), 'f', 2));
+  QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.pos.lon,
+                                                    position.pos.lat);
+  if (!qFuzzyIsNull(position.pos.z))
+    mgrs.append(QStringLiteral(" ") + QString::number(position.pos.z, 'f', 2));
   return mgrs;
 }
 
@@ -495,10 +497,10 @@ void BasePlayerModel::onDynamicParticipantChanged(const ParticipantManagement::D
 {
   DEBUG_LOG(m_logger) << "**** onDynamicParticipantChanged: " << data;
 
-  int row = findRowForId(data.participantId());
+  int row = findRowForId(data.participantId);
   if (row < 0)
   {
-    row = findRowForId(-data.participantId());
+    row = findRowForId(-data.participantId);
     if (row < 0)
       return;
     if (modType == DataModification::eAdded)
@@ -512,9 +514,9 @@ void BasePlayerModel::onDynamicParticipantChanged(const ParticipantManagement::D
   {
     PlayerData playerData = getRowData(row);
     const auto oldSymbol = playerData.symbolStr;
-    playerData.isManipulated = data.manipulation().size();
+    playerData.isManipulated = data.manipulation.size();
     const auto tactStatus = getTacticalStatus(data);
-    playerData.vulnerabilityState = tactStatus.vulnerabilityState();
+    playerData.vulnerabilityState = tactStatus.vulnerabilityState;
     playerData.vulnerabilityStateStr = vulnerabilityStateString(playerData.typeClass,
                                                                 playerData.vulnerabilityState);
 
@@ -540,59 +542,59 @@ void BasePlayerModel::onParticipantChanged(const ParticipantManagement::Particip
   if (modType == DataModification::eRemoved)
     return;
   int row = -1;
-  auto it = m_participants.find(participant.id());
+  auto it = m_participants.find(participant.id);
   if (it == m_participants.end())
   {
-    if (participant.equipmentNumber().is_set())
-      row = findRowForId(-participant.equipmentNumber().get());
+    if (participant.equipmentNumber.has_value())
+      row = findRowForId(-participant.equipmentNumber.get());
     if (row < 0)
     {
       
-      m_participants.insert(participant.id(), participant);
+      m_participants.insert(participant.id, participant);
       return;
     }
-    it = m_participants.insert(participant.id(), ParticipantManagement::Participant());
+    it = m_participants.insert(participant.id, ParticipantManagement::Participant());
   }
 
   const auto old = it.value();
   it.value() = participant;
 
   if (row < 0)
-    row = findRowForId(participant.id());
-  if (row < 0 && participant.equipmentNumber().is_set())
-    row = findRowForId(-participant.equipmentNumber().get());
+    row = findRowForId(participant.id);
+  if (row < 0 && participant.equipmentNumber.has_value())
+    row = findRowForId(-participant.equipmentNumber.get());
   if (row < 0)
     return;
 
-  if (old.equipmentNumber() != participant.equipmentNumber() ||
-      old.partyId() != participant.partyId() ||
-      old.superiorId() != participant.superiorId() ||
-      old.designator() != participant.designator() ||
-      old.tacticalIdentifier() != participant.tacticalIdentifier() ||
-      old.info() != participant.info() ||
-      old.symbol() != participant.symbol() ||
-      old.identification() != participant.identification())
+  if (old.equipmentNumber != participant.equipmentNumber ||
+      old.partyId != participant.partyId ||
+      old.superiorId != participant.superiorId ||
+      old.designator != participant.designator ||
+      old.tacticalIdentifier != participant.tacticalIdentifier ||
+      old.info != participant.info ||
+      old.symbol != participant.symbol ||
+      old.identification != participant.identification)
   {
-    const auto party = m_parties.value(participant.partyId());
-    const auto type = m_types.value(participant.typeId());
+    const auto party = m_parties.value(participant.partyId);
+    const auto type = m_types.value(participant.typeId);
     PlayerData &data = m_vecData[row];
 
     
     data.partyColor = party.color;
     
-    data.equipmentNumber = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
-    data.participantId = participant.id();
-    data.partyId = participant.partyId();
-    data.typeId = participant.typeId();
+    data.equipmentNumber = participant.equipmentNumber.has_value() ? participant.equipmentNumber.get() : 0;
+    data.participantId = participant.id;
+    data.partyId = participant.partyId;
+    data.typeId = participant.typeId;
     
-    data.designator = QString::fromStdString(participant.designator());
+    data.designator = QString::fromStdString(participant.designator);
     data.hierarchy = m_ppmDtc->hierarchyFromParticipant(data.participantId, m_participants);
-    data.info = QString::fromStdString(participant.info());
+    data.info = QString::fromStdString(participant.info);
     data.partyStr = party.name;
-    data.symbolStr = QString::fromStdString(participant.symbol());
-    data.tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier());
-    data.typeName = type.id() > 0 ? ParticipantManagement::trTypeName(type.name()) : tr("Unknown (%1)").arg(participant.typeId());
-    data.identification = QString::fromStdString(participant.identification());
+    data.symbolStr = QString::fromStdString(participant.symbol);
+    data.tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier);
+    data.typeName = type.id > 0 ? ParticipantManagement::trTypeName(type.name) : tr("Unknown (%1)").arg(participant.typeId);
+    data.identification = QString::fromStdString(participant.identification);
 
     tryRenderSymbol(data.symbolStr,
                     data.participantId,
@@ -612,47 +614,47 @@ PlayerData BasePlayerModel::setPlayerData(int participantId,
 PlayerData BasePlayerModel::setPlayerData(const ParticipantManagement::Participant &participant,
                                           const ParticipantManagement::DynamicParticipantData &dp)
 {
-  const auto bite = participant.equipmentNumber().is_set()
-      ? m_bites.value(participant.equipmentNumber().get())
+  const auto bite = participant.equipmentNumber.has_value()
+      ? m_bites.value(participant.equipmentNumber.get())
       : ParticipantManagement::Bite();
-  const auto party = m_parties.value(participant.partyId());
-  const auto pos = m_positions.value(participant.id());
-  const auto type = m_types.value(participant.typeId());
+  const auto party = m_parties.value(participant.partyId);
+  const auto pos = m_positions.value(participant.id);
+  const auto type = m_types.value(participant.typeId);
   const auto tactStatus = getTacticalStatus(dp);
 
   PlayerData data;
   
-  data.biteSampleTime = bite.sampleTime();
-  data.positionSampleTime = pos.sampleTime();
+  data.biteSampleTime = bite.sampleTime;
+  data.positionSampleTime = pos.sampleTime;
   
   data.partyColor = party.color;
   
-  data.vulnerabilityState = tactStatus.vulnerabilityState();
-  data.typeClass = type.typeClass();
+  data.vulnerabilityState = tactStatus.vulnerabilityState;
+  data.typeClass = type.typeClass;
   data.partyRole = party.role;
   
-  data.equipmentNumber = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
-  data.participantId = participant.id();
-  data.partyId = participant.partyId();
-  data.typeId = participant.typeId();
+  data.equipmentNumber = participant.equipmentNumber.has_value() ? participant.equipmentNumber.get() : 0;
+  data.participantId = participant.id;
+  data.partyId = participant.partyId;
+  data.typeId = participant.typeId;
   
-  data.isManipulated  = dp.manipulation().size();
+  data.isManipulated  = dp.manipulation.size();
   data.isOutdated = LtsUtils::isPositionTimeOutdated(m_partitionTime, data.positionSampleTime);
 
   
   data.biteResultStr = getBitResult(bite, data.equipmentNumber);
   data.biteWarningsStr = getBiteWarnings(bite, data.equipmentNumber);
-  data.designator = QString::fromStdString(participant.designator());
+  data.designator = QString::fromStdString(participant.designator);
   data.hierarchy = m_ppmDtc->hierarchyFromParticipant(data.participantId, m_participants);
-  data.info = QString::fromStdString(participant.info());
+  data.info = QString::fromStdString(participant.info);
   data.partyStr = party.name;
   data.positionStr = getPositionString(pos, data.participantId);
-  data.symbolStr = QString::fromStdString(participant.symbol());
-  data.tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier());
-  data.typeName = type.id() > 0 ? ParticipantManagement::trTypeName(type.name()) : tr("Unknown (%1)").arg(participant.typeId());
-  data.vulnerabilityStateStr = vulnerabilityStateString(type.typeClass(),
-                                                        tactStatus.vulnerabilityState());
-  data.identification = QString::fromStdString(participant.identification());
+  data.symbolStr = QString::fromStdString(participant.symbol);
+  data.tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier);
+  data.typeName = type.id > 0 ? ParticipantManagement::trTypeName(type.name) : tr("Unknown (%1)").arg(participant.typeId);
+  data.vulnerabilityStateStr = vulnerabilityStateString(type.typeClass,
+                                                        tactStatus.vulnerabilityState);
+  data.identification = QString::fromStdString(participant.identification);
 
   tryRenderSymbol(data.symbolStr,
                   data.participantId,
@@ -679,7 +681,7 @@ qint64 BasePlayerModel::calculatePositionAge(qint64 sampleTime) const
 
 ParticipantManagement::StateInformation BasePlayerModel::getTacticalStatus(const ParticipantManagement::DynamicParticipantData &data) const
 {
-  return m_ppmDtc->youngestStateInformation(data.stateHistory());
+  return m_ppmDtc->youngestStateInformation(data.stateHistory);
 }
 
 void BasePlayerModel::onPositionChanged(const ParticipantManagement::ParticipantPosition &position,
@@ -689,12 +691,12 @@ void BasePlayerModel::onPositionChanged(const ParticipantManagement::Participant
     return;
   DEBUG_LOG(m_logger) << "**** onPositionChanged: " << position;
 
-  m_positions[position.participantId()] = position;
+  m_positions[position.participantId] = position;
 
-  int row = findRowForId(position.participantId());
+  int row = findRowForId(position.participantId);
   if (row < 0)
   {
-    row = findRowForId(-position.participantId());
+    row = findRowForId(-position.participantId);
     if (row < 0)
       return;
   }
@@ -703,8 +705,8 @@ void BasePlayerModel::onPositionChanged(const ParticipantManagement::Participant
       (modType == DataModification::eModified))
   {
     auto &playerData = m_vecData[row];
-    playerData.positionSampleTime = position.sampleTime();
-    playerData.positionStr = getPositionString(position, position.participantId());
+    playerData.positionSampleTime = position.sampleTime;
+    playerData.positionStr = getPositionString(position, position.participantId);
     playerData.isOutdated = false;
     const auto idxPosition(index(row, ColPosition));
     const auto idxPositionAge(index(row, ColPositionAge));
@@ -720,9 +722,9 @@ void BasePlayerModel::onBiteChanged(const ParticipantManagement::Bite &bite,
     return;
   DEBUG_LOG(m_logger) << "**** onBiteChanged: " << bite;
 
-  m_bites[bite.equipmentNumber()] = bite;
+  m_bites[bite.equipmentNumber] = bite;
 
-  int row = findRowForEquipmentNumber(bite.equipmentNumber());
+  int row = findRowForEquipmentNumber(bite.equipmentNumber);
   if (row < 0)
     return;
 
@@ -730,9 +732,9 @@ void BasePlayerModel::onBiteChanged(const ParticipantManagement::Bite &bite,
       (modType == DataModification::eModified))
   {
     setBiteResult(row,
-                  bite.sampleTime(),
-                  getBitResult(bite, bite.equipmentNumber()),
-                  getBiteWarnings(bite, bite.equipmentNumber()));
+                  bite.sampleTime,
+                  getBitResult(bite, bite.equipmentNumber),
+                  getBiteWarnings(bite, bite.equipmentNumber));
   }
 }
 
@@ -742,10 +744,10 @@ void BasePlayerModel::onPartyChanged(const ParticipantManagement::Party &party,
   if (modType == DataModification::eRemoved)
     return;
   SmoParty smoParty;
-  smoParty.id = party.id();
-  smoParty.name = ParticipantManagement::trPartyName(party.name());
-  smoParty.color = QColor::fromRgb(QRgb(party.color()));
-  smoParty.role = AdvancedSymbology::roleToRole(party.role());
+  smoParty.id = party.id;
+  smoParty.name = ParticipantManagement::trPartyName(party.name);
+  smoParty.color = QColor::fromRgb(QRgb(party.color));
+  smoParty.role = AdvancedSymbology::roleToRole(party.role);
 
   if (m_ppmGuiCbxIfc)
     smoParty.icon = m_ppmGuiCbxIfc->pixmapFromParty(smoParty.color);
@@ -786,8 +788,8 @@ QString BasePlayerModel::vulnerabilityStateString(ParticipantManagement::TypeCla
                                                   ProjectDataManagement::VulnerabilityState vulState) const
 {
   const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
-        ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-        ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+        ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
   return ProjectDataManagement::toString(vulState, vc);
 }
@@ -800,14 +802,14 @@ void BasePlayerModel::onTypeChanged(const ParticipantManagement::Type &type,
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_types[type.id()] = type;
+    m_types[type.id] = type;
     bool bNeedUpdate = false;
     for (auto &data : m_vecData)
     {
-      if (data.typeId != type.id())
+      if (data.typeId != type.id)
         continue;
-      data.typeClass = type.typeClass();
-      data.typeName = ParticipantManagement::trTypeName(type.name());
+      data.typeClass = type.typeClass;
+      data.typeName = ParticipantManagement::trTypeName(type.name);
       bNeedUpdate = true;
     }
     if (bNeedUpdate)
@@ -815,7 +817,7 @@ void BasePlayerModel::onTypeChanged(const ParticipantManagement::Type &type,
     break;
   }
   case DataModification::eRemoved:
-    m_types.remove(type.id());
+    m_types.remove(type.id);
     break;
   }
 }
@@ -895,7 +897,7 @@ bool BasePlayerProxyModel::lessThan(const QModelIndex &source_left, const QModel
   case BasePlayerModel::ColBitResult:
   case BasePlayerModel::ColWarnings:
     
-    return source_left.data() < source_right.data();
+    return LtsUtils::lessThan(source_left.data(), source_right.data());
   };
   return LtsColumnFilterProxyModel::lessThan(source_left, source_right);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.cpp
index e2cdb3797..1b28b882b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.cpp
@@ -17,6 +17,7 @@ BiteModel::BiteModel(QObject *parent)
                                                                    tr("Low Battery"),
                                                                    tr("Component")},
                                                                    parent)
+  , m_logger(getLogger("BiteModel"))
 {}
 
 bool BiteModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
@@ -51,13 +52,13 @@ QVariant BiteModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ReceiveTime:
-    return QDateTime::fromMSecsSinceEpoch(biteMsg.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(biteMsg.sampleTime);
   case EquipmentNummer:
-    return biteMsg.equipmentNumber();
+    return biteMsg.equipmentNumber;
   case BitError:
     return getBitErrors(biteMsg);
   case LowBattery:
-    return getLowBattery(biteMsg.batteryState());
+    return getLowBattery(biteMsg.batteryState);
   case Component:
     return getComponents(biteMsg);
   }
@@ -68,10 +69,10 @@ bool BiteModel::isFiltered(const ParticipantManagement::Bite &data, DataModifica
 {
   Q_UNUSED(modType);
 
-  return data.biteState() == data.configState() &&
-      !data.configError() &&
-      data.batteryState() == 0 &&
-      data.biteErrors().size() == 0;
+  return data.biteState == data.configState &&
+      !data.configError &&
+      data.batteryState == 0 &&
+      data.biteErrors.size() == 0;
 }
 
 QString BiteModel::getBitErrors(const ParticipantManagement::Bite &bite) const
@@ -91,15 +92,15 @@ QString BiteModel::getBitErrors(const ParticipantManagement::Bite &bite) const
 
 QString BiteModel::checkBit(const ParticipantManagement::Bite &bite, quint32 bitValue) const
 {
-  bool available = (bite.biteState() & bitValue) == bitValue;
-  bool statusOk = (bite.configState() & bitValue) == bitValue;
+  bool available = (bite.biteState & bitValue) == bitValue;
+  bool statusOk = (bite.configState & bitValue) == bitValue;
 
   QString name;
   for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
   {
-    if (ccs.bitMask() == bitValue)
+    if (ccs.pdm_bitMask == bitValue)
     {
-      name = m_pdmDtc->trCanComponentStringName(ccs.id());
+      name = m_pdmDtc->trCanComponentStringName(ccs.id);
       break;
     }
   }
@@ -142,9 +143,9 @@ QString BiteModel::checkBatteryBit(int state, qint64 bitValue) const
     
     
     qint64 compareValue = (bitValue << 32);
-    if (ccs.bitMask() == compareValue)
+    if (ccs.pdm_bitMask == compareValue)
     {
-      name = m_pdmDtc->trCanComponentStringName(ccs.id());
+      name = m_pdmDtc->trCanComponentStringName(ccs.id);
       break;
     }
   }
@@ -159,9 +160,9 @@ QString BiteModel::checkBatteryBit(int state, qint64 bitValue) const
 QString BiteModel::getComponents(const ParticipantManagement::Bite &bite) const
 {
   QStringList errorString;
-  for (const auto &bitError : bite.biteErrors())
+  for (const auto &bitError : bite.biteErrors)
   {
-    if (bitError.errorNumber() == 0)
+    if (bitError.errorNumber == 0)
       continue;
     errorString += getErrorString(bitError);
   }
@@ -172,8 +173,8 @@ QString BiteModel::getCanDeviceName(int id) const
 {
   for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
   {
-    if (ccs.canDeviceId() == id)
-      return m_pdmDtc->trCanComponentStringName(ccs.id());
+    if (ccs.canDeviceId == id)
+      return m_pdmDtc->trCanComponentStringName(ccs.id);
   }
   return tr("Unknown Can device (%1)").arg(id);
 }
@@ -182,8 +183,8 @@ QString BiteModel::getSubDeviceName(int id) const
 {
   for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
   {
-    if (ccs.subDeviceId() == id)
-      return m_pdmDtc->trCanComponentStringName(ccs.id());
+    if (ccs.subDeviceId == id)
+      return m_pdmDtc->trCanComponentStringName(ccs.id);
   }
   return tr("Unknown subdevice (%1)").arg(id);
 }
@@ -191,37 +192,37 @@ QString BiteModel::getSubDeviceName(int id) const
 QString BiteModel::getErrorString(const ParticipantManagement::BiteError &error) const
 {
   QString errString;
-  const bool subDevice = (error.subdeviceNumber() != 0);
+  const bool subDevice = (error.subdeviceNumber != 0);
 
   for (const ProjectDataManagement::BiteComponentText &bct : m_bctMap)
   {
-    if (((subDevice && bct.subDeviceId() == error.subdeviceNumber()) ||
-         (bct.canDeviceId() == error.canDeviceNumber())) &&
-        (bct.errorNumber() == error.errorNumber()))
+    if (((subDevice && bct.subDeviceId == error.subdeviceNumber) ||
+         (bct.canDeviceId == error.canDeviceNumber)) &&
+        (bct.errorNumber == error.errorNumber))
     {
-      errString = m_pdmDtc->trBiteComponentTextName(bct.id());
+      errString = m_pdmDtc->trBiteComponentTextName(bct.id);
       break;
     }
   }
   if (errString.isEmpty())
-    errString = tr("Unknown error (%1)").arg(error.errorNumber());
+    errString = tr("Unknown error (%1)").arg(error.errorNumber);
 
   QString subErrString;
   if (subDevice)
     subErrString = QLatin1Char('-') +
-        getSubDeviceName(error.subdeviceNumber()) +
+        getSubDeviceName(error.subdeviceNumber) +
         QLatin1Char('-') +
-        QString::number( error.uniqueId(), 16 ).toUpper();
+        QString::number( error.uniqueId, 16 ).toUpper();
         
 
-  return tr("Error: %1 - Device: %2 %3").arg(errString, getCanDeviceName(error.canDeviceNumber()), subErrString);
+  return tr("Error: %1 - Device: %2 %3").arg(errString, getCanDeviceName(error.canDeviceNumber), subErrString);
 }
 
 int BiteModel::findRowForEquipmentNumber(int equipNo) const
 {
   for (int i = 0; i < m_vecData.size(); ++i)
   {
-    if (m_vecData.at(i).equipmentNumber() == equipNo)
+    if (m_vecData.at(i).equipmentNumber == equipNo)
     {
       DEBUG_LOG(m_logger) << "findRowForEquipmentNumber: "
                           << equipNo << "-->" << i;
@@ -236,7 +237,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
 {
   DEBUG_LOG(m_logger) << "biteDataChanged";
 
-  const int equipNo = data.equipmentNumber();
+  const int equipNo = data.equipmentNumber;
   const int row = findRowForEquipmentNumber(equipNo);
 
   switch (modType)
@@ -293,9 +294,9 @@ bool BiteProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
   switch (source_left.column())
   {
   case BiteModel::ReceiveTime:
-    return dataLeft.sampleTime() < dataRight.sampleTime();
+    return dataLeft.sampleTime < dataRight.sampleTime;
   case BiteModel::EquipmentNummer:
-    return dataLeft.equipmentNumber() < dataRight.equipmentNumber();
+    return dataLeft.equipmentNumber < dataRight.equipmentNumber;
   case BiteModel::BitError:
   case BiteModel::LowBattery:
   case BiteModel::Component:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.h
index 1d46587ff..f501fa143 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_bite_model.h
@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ProjectDataManagement {
 namespace Interface {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
index b0c263b4e..2055f5ede 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
@@ -87,7 +87,7 @@ void CheckButtonHandler::addTacticalState()
   m_vbgs.reserve(13);
 
   
-  ProjectDataManagement::VulnerabilityState vs = ProjectDataManagement::VulnerabilityState::CombatReady;
+  ProjectDataManagement::VulnerabilityState vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   QAction *a1 = new QAction(ProjectDataManagement::toString(vs) + tr(" (Bldg: without cont. reset)"), m_menuTacticalState);
   m_vbgs += a1;
   m_menuTacticalState->addAction(a1);
@@ -97,7 +97,7 @@ void CheckButtonHandler::addTacticalState()
   connect(m_vbgs.last(), &QAction::triggered, this, &CheckButtonHandler::combatReadyRequested);
 
   
-  vs = ProjectDataManagement::VulnerabilityState::CombatReady;
+  vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   QAction *a2 = new QAction(ProjectDataManagement::toString(vs) + tr(" (Bldg: with cont. reset)"), m_menuTacticalState);
   m_vbgs += a2;
   m_menuTacticalState->addAction(a2);
@@ -107,7 +107,7 @@ void CheckButtonHandler::addTacticalState()
   connect(m_vbgs.last(), &QAction::triggered, this, &CheckButtonHandler::combatReadyResetContamintationRequested);
 
   
-  vs = ProjectDataManagement::VulnerabilityState::NoChange;
+  vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange;
   QAction *a3 = new QAction( tr("Contamination reset only"), m_menuTacticalState);
   m_vbgs += a3;
   m_menuTacticalState->addAction(a3);
@@ -120,7 +120,7 @@ void CheckButtonHandler::addTacticalState()
     QAction *ac = new QAction(ProjectDataManagement::toString(vs), m_menuTacticalState);
     m_vbgs += ac;
     m_menuTacticalState->addAction(ac);
-    if (i == static_cast<int>(ProjectDataManagement::VulnerabilityState::CombatReady)) 
+    if (i == static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)) 
     {
       connect(m_vbgs.last(), &QAction::triggered,
       this, [this]() { sendInitRequest(m_selectedParticipants, false, false, true, false);});
@@ -174,12 +174,12 @@ void CheckButtonHandler::sendInitRequest(const std::vector<int> &selectedIds,
   if (!resetManipulation && !restockCharges && !resetVulnerabilityState && !restockSanMat)
     return;
   ParticipantManagement::InitParticipantRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.participantIds(selectedIds);
-  req.resetManipulation(resetManipulation);
-  req.restockCharges(restockCharges);
-  req.resetVulnerabilityState(resetVulnerabilityState);
-  req.restockSanitationMaterial(restockSanMat);
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.participantIds = selectedIds;
+  req.resetManipulation = resetManipulation;
+  req.restockCharges = restockCharges;
+  req.resetVulnerabilityState = resetVulnerabilityState;
+  req.restockSanitationMaterial = restockSanMat;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->initParticipantRequest(req, this); });
 }
 void CheckButtonHandler::sendModifyState(const std::vector<int> &selectedIds,
@@ -190,9 +190,9 @@ void CheckButtonHandler::sendModifyState(const std::vector<int> &selectedIds,
     return;
 
   ParticipantManagement::ModifyStateRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.participantIds(selectedIds);
-  req.vulnerabilityState(vs);
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.participantIds = selectedIds;
+  req.vulnerabilityState = vs;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->modifyStateRequest(req, this); });
 }
 
@@ -203,9 +203,9 @@ void CheckButtonHandler::sendModifyVitality(const std::vector<int> &selectedIds,
     return;
 
   ParticipantManagement::ModifyStateRequest req;
-  req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
-  req.participantIds(selectedIds);
-  req.vitality(vitality);
+  req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
+  req.participantIds = selectedIds;
+  req.vitality = vitality;
   m_requestHelper->startSingleRequest([req, this]() { return m_ppmFtc->modifyStateRequest(req, this); });
 }
 
@@ -233,15 +233,15 @@ std::vector<int> CheckButtonHandler::setSelectedParticipantIds(const std::vector
     const ParticipantManagement::Participant &part = partIter.value();
 
     
-    if (!part.equipmentNumber().is_set() || part.equipmentNumber().get() < 0)
+    if (!part.equipmentNumber.has_value() || part.equipmentNumber.get() < 0)
       continue;
 
     
-    int typeId = part.typeId();
+    int typeId = part.typeId;
     auto typeIter = types.constFind(typeId);
     if (typeIter == types.constEnd())
       continue;
-    const ParticipantManagement::TypeClass &tc = typeIter.value().typeClass();
+    const ParticipantManagement::TypeClass &tc = typeIter.value().typeClass;
 
     m_selectedParticipants.push_back(partIter.key());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
index 42677784a..2f0d2a572 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
@@ -6,6 +6,8 @@
 #include <Lts/Plugins/ServiceMonitor/Gui/Monitors/smocheckbuttonhandler_export.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Interface::Dtc type (legacy include)
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.cpp
index 770446c86..1296f8c8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.cpp
@@ -21,6 +21,7 @@ CtasErrorModel:: CtasErrorModel(QObject *parent)
 },
       parent)
   , m_ppmDtc(nullptr)
+  , m_logger(getLogger("CtasErrorModel"))
 {}
 
 bool CtasErrorModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
@@ -49,15 +50,15 @@ QVariant CtasErrorModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ReceiveTime:
-    return QDateTime::fromMSecsSinceEpoch(error.timeReceipt());
+    return QDateTime::fromMSecsSinceEpoch(error.timeReceipt);
   case EquipmentNummer:
-    return error.equipmentNumber();
+    return error.equipmentNumber;
   case TimePlayerUnit:
-    return QDateTime::fromMSecsSinceEpoch(error.timePlayerUnit());
+    return QDateTime::fromMSecsSinceEpoch(error.timePlayerUnit);
   case ErrorReason:
-    return ProjectDataManagement::toString(error.errorReason());
+    return ProjectDataManagement::toString(error.errorReason);
   case TelegramId:
-    return telegramId2Text(error.telegramId());
+    return telegramId2Text(error.telegramId);
   }
   return QVariant();
 }
@@ -283,11 +284,11 @@ bool CtasErrorProxyModel::lessThan(const QModelIndex &source_left, const QModelI
   switch (source_left.column())
   {
   case CtasErrorModel::ReceiveTime:
-    return dataLeft.timeReceipt() < dataRight.timeReceipt();
+    return dataLeft.timeReceipt < dataRight.timeReceipt;
   case CtasErrorModel::EquipmentNummer:
-    return dataLeft.equipmentNumber() < dataRight.equipmentNumber();
+    return dataLeft.equipmentNumber < dataRight.equipmentNumber;
   case CtasErrorModel::TimePlayerUnit:
-    return dataLeft.timePlayerUnit() < dataRight.timePlayerUnit();
+    return dataLeft.timePlayerUnit < dataRight.timePlayerUnit;
   case CtasErrorModel::ErrorReason:
   case CtasErrorModel::TelegramId:
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.h
index 0bc5f9b30..a86d6ebcd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_ctas_error_model.h
@@ -6,6 +6,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Common/logger.h>
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
index 6084639dd..405eb7251 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
@@ -32,6 +32,7 @@ ServiceMonitorDialog::ServiceMonitorDialog(Monitor monitor,
   , m_proxyModel(nullptr)
   , m_ppmDtc(nullptr)
   , m_pdmDtc(nullptr)
+  , m_logger(getLogger("ServiceMonitorDialog"))
 {
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &ServiceMonitorDialog::onPrint);
@@ -379,7 +380,7 @@ int ServiceMonitorDialog::participantId(const QModelIndex &index) const
     if (bm)
     {
       const ParticipantManagement::Bite &bite = bm->getRowData(index.row());
-      return bite.participantId();
+      return bite.participantId;
     }
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
index 065b0cf43..88418a50a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
@@ -58,28 +58,28 @@ bool EgcuEdit::init(const EgcuData &data, LtsSession::LtsSession *session)
 
   auto cbRelayInfos = [this, l](const AssetManagement::RelayInfo &relayInfo)
   {
-    QLabel *name = new QLabel(QString::fromStdString(relayInfo.name()), this);
+    QLabel *name = new QLabel(QString::fromStdString(relayInfo.name), this);
 
     QComboBox *cb = new QComboBox(this);
-    if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOn, relayInfo.property()))
-      cb->addItem(tr("On"), InfrastructureManagement::EffectOverride::PermanentOn);
-    if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOff, relayInfo.property()))
-      cb->addItem(tr("Off"), InfrastructureManagement::EffectOverride::PermanentOff);
-    cb->addItem(tr("Auto"), InfrastructureManagement::EffectOverride::Automatic);
+    if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOn, relayInfo.property))
+      cb->addItem(tr("On"), static_cast<int>(InfrastructureManagement::EffectOverride::PermanentOn));
+    if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOff, relayInfo.property))
+      cb->addItem(tr("Off"), static_cast<int>(InfrastructureManagement::EffectOverride::PermanentOff));
+    cb->addItem(tr("Auto"), static_cast<int>(InfrastructureManagement::EffectOverride::Automatic));
 
     l->addWidget(name, l->rowCount(), 0);
     l->addWidget(cb, l->rowCount()-1, 1);
 
-    cb->setCurrentIndex(cb->findData(InfrastructureManagement::EffectOverride::Automatic));
-    m_relayCbs.insert(relayInfo.id(), cb);
+    cb->setCurrentIndex(cb->findData(static_cast<int>(InfrastructureManagement::EffectOverride::Automatic)));
+    m_relayCbs.insert(relayInfo.id, cb);
   };
 
   asmDtc->waitForHistoricalDataRelayInfo();
   asmDtc->relayInfos(cbRelayInfos);
   l->addItem(new QSpacerItem(20, 210, QSizePolicy::Minimum, QSizePolicy::Expanding), l->rowCount(), 0);
 
-  m_ui->lblHostname->setText(QString::fromStdString(data.instrumentationAsset.hostname()));
-  m_ui->leSegmentName->setText(QString::fromStdString(data.mountingPointAsset.name().empty() ? data.instrumentationAsset.hostname() : data.mountingPointAsset.name()));
+  m_ui->lblHostname->setText(QString::fromStdString(data.instrumentationAsset.hostname));
+  m_ui->leSegmentName->setText(QString::fromStdString(data.mountingPointAsset.name.empty() ? data.instrumentationAsset.hostname : data.mountingPointAsset.name));
 
   
   
@@ -87,40 +87,40 @@ bool EgcuEdit::init(const EgcuData &data, LtsSession::LtsSession *session)
 
   QMap<qint32, QTreeWidgetItem*> treemap;
 
-  const std::vector<InfrastructureManagement::StructureElement> &vecElements = data.mainStructureElement.elements();
+  const std::vector<InfrastructureManagement::StructureElement> &vecElements = data.mainStructureElement.elements;
   for (const auto &se : vecElements)
   {
-    if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor)
+    if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor)
       continue;
-    QTreeWidgetItem *twi = new QTreeWidgetItem(m_ui->twRooms, {QString::fromStdString(se.displayName())});
+    QTreeWidgetItem *twi = new QTreeWidgetItem(m_ui->twRooms, {QString::fromStdString(se.displayName)});
     twi->setFlags(twi->flags() | Qt::ItemIsAutoTristate | Qt::ItemIsUserCheckable);
     twi->setCheckState(0, Qt::Unchecked);
-    treemap[se.id()] = twi;
+    treemap[se.id] = twi;
   }
 
   
   for (const auto &se : vecElements)
   {
-    if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
+    if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Room)
       continue;
 
-    if (se.path().size() < 2) 
+    if (se.path.size() < 2) 
       continue;
 
     
 
-    const int floorId = se.path()[1];
+    const int floorId = se.path[1];
     if (!treemap.contains(floorId))
       continue;
 
     QTreeWidgetItem *floorItem = treemap[floorId];
 
-    QTreeWidgetItem *mountingPoint = new QTreeWidgetItem(floorItem, {QString::fromStdString(se.displayName())});
+    QTreeWidgetItem *mountingPoint = new QTreeWidgetItem(floorItem, {QString::fromStdString(se.displayName)});
 
-    treemap.insert(se.id(), mountingPoint);
-    bool selected = data.rooms.contains(se.mountingPointId());
+    treemap.insert(se.id, mountingPoint);
+    bool selected = data.rooms.contains(se.mountingPointId);
     mountingPoint->setCheckState(0, selected ? Qt::Checked : Qt::Unchecked);
-    mountingPoint->setData(0, Qt::UserRole, se.mountingPointId());
+    mountingPoint->setData(0, Qt::UserRole, se.mountingPointId);
     if (selected)
       floorItem->setExpanded(true);
   }
@@ -143,9 +143,9 @@ void EgcuEdit::updateRelays()
 {
   
   InfrastructureManagement::StructureElement structureElement;
-  for (const auto &se : m_egcuData.mainStructureElement.elements())
+  for (const auto &se : m_egcuData.mainStructureElement.elements)
   {
-    if (se.id() == m_egcuData.mountingPoint.id())
+    if (se.id == m_egcuData.mountingPoint.id())
     {
       structureElement = se;
       break;
@@ -153,7 +153,7 @@ void EgcuEdit::updateRelays()
   }
 
   QJsonParseError parserError;
-  QByteArray content = QByteArray::fromStdString(structureElement.properties());
+  QByteArray content = QByteArray::fromStdString(structureElement.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
 
   if (parserError.error != QJsonParseError::NoError)
@@ -179,7 +179,7 @@ void EgcuEdit::updateRelays()
 
 void EgcuEdit::onMountinPointAssetChanged(const InfrastructureManagement::MountingPointAsset &mpa, DataModification mod)
 {
-  if (m_egcuData.mountingPointAsset.id() != mpa.id())
+  if (m_egcuData.mountingPointAsset.id != mpa.id)
     return;
 
   if (mod == DataModification::eRemoved)
@@ -188,7 +188,7 @@ void EgcuEdit::onMountinPointAssetChanged(const InfrastructureManagement::Mounti
 
 QString EgcuEdit::dialogIdentifier() const
 {
-  return QLatin1String("EgcuEdit") + QString::number(m_egcuData.instrumentationAsset.id());
+  return QLatin1String("EgcuEdit") + QString::number(m_egcuData.instrumentationAsset.id);
 }
 
 void EgcuEdit::retranslate()
@@ -233,25 +233,25 @@ bool EgcuEdit::apply()
       return false;
   }
 
-  for (const auto &se : m_egcuData.mainStructureElement.elements())
+  for (const auto &se : m_egcuData.mainStructureElement.elements)
   {
-    if (se.id() == m_egcuData.mountingPoint.id())
+    if (se.id == m_egcuData.mountingPoint.id())
     {
       structureElement = se;
       break;
     }
   }
 
-  if (m_ui->leSegmentName->text() != QString::fromStdString(m_egcuData.mountingPointAsset.name()))
+  if (m_ui->leSegmentName->text() != QString::fromStdString(m_egcuData.mountingPointAsset.name))
   {
     InfrastructureManagement::MountingPointAssetModifyRequest req;
     InfrastructureManagement::MountingPointAsset &mpa = req;
     mpa = m_egcuData.mountingPointAsset;
-    mpa.name(m_ui->leSegmentName->text().toStdString());
+    mpa.name = m_ui->leSegmentName->text().toStdString();
     m_requestHelper->addRequest([this, req]() {return m_ismFtc->mountingPointAssetModifyRequest(req, this);});
   }
 
-  properties= structureElement.properties();
+  properties= structureElement.properties;
   DEBUG_LOG(m_logger) << "structureElementId=" << m_egcuData.mountingPoint.id()
                       << " properties=" << properties;
 
@@ -260,7 +260,7 @@ bool EgcuEdit::apply()
   for (auto it = m_relayCbs.cbegin(); it != m_relayCbs.cend(); ++it)
   {
     QJsonObject objRelay;
-    if (it.value()->currentData().toInt() == InfrastructureManagement::EffectOverride::Automatic)
+    if (it.value()->currentData().toInt() == static_cast<int>(InfrastructureManagement::EffectOverride::Automatic))
       continue;
     objRelay[QString::number(it.key())] = it.value()->currentData().toInt();
     arrRelays.append(objRelay);
@@ -272,12 +272,12 @@ bool EgcuEdit::apply()
     overrideObj.insert(QStringLiteral("relays"),arrRelays);
   resultObj.insert (QStringLiteral("Overrides"), overrideObj);
   QByteArray content_neu = QJsonDocument(resultObj).toJson(QJsonDocument::Compact);
-  structureElement.properties(content_neu.toStdString());
+  structureElement.properties = content_neu.toStdString();
 
   InfrastructureManagement::StructureElementModifyRequest request;
-  request.mainStructureElementId(m_egcuData.mainStructureElement.id());
-  request.elements().resize(1);
-  request.elements().at(0) = structureElement;
+  request.mainStructureElementId = m_egcuData.mainStructureElement.id;
+  request.elements.resize(1);
+  request.elements.at(0) = structureElement;
 
   m_requestHelper->addRequest([this, request]() {return m_ismFtc->structureElementModifyRequest(request, this);});
   m_requestHelper->startRequests();
@@ -287,7 +287,7 @@ bool EgcuEdit::apply()
 bool EgcuEdit::saveEgcuToRooms()
 {
   QJsonParseError parserError;
-  QByteArray content = QByteArray::fromStdString(m_egcuData.mainStructureElement.properties());
+  QByteArray content = QByteArray::fromStdString(m_egcuData.mainStructureElement.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
 
   if (parserError.error != QJsonParseError::NoError)
@@ -299,7 +299,7 @@ bool EgcuEdit::saveEgcuToRooms()
   for (int i=0; i<arrEgcus.size(); ++i)
   {
     QJsonObject objRooms = arrEgcus[i].toObject();
-    if (m_egcuData.mountingPoint.data().mountingPointId() != objRooms.value(QStringLiteral("mountpointEgcu")).toInt())
+    if (m_egcuData.mountingPoint.data().mountingPointId != objRooms.value(QStringLiteral("mountpointEgcu")).toInt())
       continue;
 
     
@@ -327,13 +327,13 @@ bool EgcuEdit::saveEgcuToRooms()
     QVariantList roomIds;
     getRoomIds(m_ui->twRooms->invisibleRootItem(), roomIds);
     objRooms.insert(QLatin1String("rooms"), QJsonArray::fromVariantList(roomIds));
-    objRooms.insert(QLatin1String("mountpointEgcu"), m_egcuData.mountingPoint.data().mountingPointId());
+    objRooms.insert(QLatin1String("mountpointEgcu"), m_egcuData.mountingPoint.data().mountingPointId);
     arrEgcus.append(objRooms);
   }
 
   docObj.insert(QStringLiteral("egcusToRooms"), arrEgcus);
   content = QJsonDocument(docObj).toJson(QJsonDocument::Compact);
-  m_egcuData.mainStructureElement.properties(content.toStdString());
+  m_egcuData.mainStructureElement.properties = content.toStdString();
 
   InfrastructureManagement::MainStructureElementModifyRequest request;
   InfrastructureManagement::MainStructureElement &mse = request;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
index 4f3213898..20d22222f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
@@ -2,10 +2,11 @@
 
 
 #include "smo_egcu_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <InfrastructureManagement/ism_translation.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <Common/logger.h>
 #include <LtsSession/lts_session.h>
 
@@ -77,6 +78,7 @@ EgcuModel::EgcuModel(QObject *parent)
                  tr("Hostname"), tr("Properties"), tr("Rooms"), tr("Overrides"), tr("Status")})
   , m_visRoot(new NGLTreeItem(tr("Mounting Points")))
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("EgcuModel"))
 {
 }
 
@@ -94,31 +96,31 @@ QVariant EgcuModel::data(const QModelIndex &index, int role) const
     if (item->data().canConvert<EgcuData>())
     {
       const EgcuData itemData = item->data().value<EgcuData>();
-      InfrastructureManagement::InstrumentationAsset instrumentationAsset = m_dtc->instrumentationAsset(itemData.mountingPointAsset.assetId());
+      InfrastructureManagement::InstrumentationAsset instrumentationAsset = m_dtc->instrumentationAsset(itemData.mountingPointAsset.assetId);
       switch (index.column())
       {
       case Id:
         DEBUG_LOG(m_logger) << "EGCU DATA= "
-                             << " instrumentationAsset.id=" << instrumentationAsset.id()
-                             << " hostname=" << instrumentationAsset.hostname()
-                             << " name=" << instrumentationAsset.name()
-                             << " mountingPointAsset.assetId=" << itemData.mountingPointAsset.assetId()
-                             << " mountingPointAsset.id=" << itemData.mountingPointAsset.id();
-        return itemData.mountingPointAsset.assetId();
+                             << " instrumentationAsset.id=" << instrumentationAsset.id
+                             << " hostname=" << instrumentationAsset.hostname
+                             << " name=" << instrumentationAsset.name
+                             << " mountingPointAsset.assetId=" << itemData.mountingPointAsset.assetId
+                             << " mountingPointAsset.id=" << itemData.mountingPointAsset.id;
+        return itemData.mountingPointAsset.assetId;
         
       case Name:
       {
         QString ret = itemData.segmentName();
-        if (ret == QString::fromStdString(instrumentationAsset.name()))
+        if (ret == QString::fromStdString(instrumentationAsset.name))
           return ret;
-        return tr("%1 / %2").arg(ret).arg(QString::fromStdString(itemData.instrumentationAsset.name()));
+        return tr("%1 / %2").arg(ret).arg(QString::fromStdString(itemData.instrumentationAsset.name));
       }
       case MountingPointType:
         return InfrastructureManagement::toString(itemData.mountingPoint.type());
       case Barcode:
-        return QString::fromStdString(instrumentationAsset.barcode());
+        return QString::fromStdString(instrumentationAsset.barcode);
       case Hostname:
-        return QString::fromStdString(instrumentationAsset.hostname());
+        return QString::fromStdString(instrumentationAsset.hostname);
       case Properties: 
         return itemData.mountingPoint.properties();
       case Rooms:
@@ -135,20 +137,20 @@ QVariant EgcuModel::data(const QModelIndex &index, int role) const
       switch (index.column())
       {
       case Id:
-        return itemData.id();
+        return itemData.id;
       case Name:
-        return QString::fromStdString(itemData.displayName());
+        return QString::fromStdString(itemData.displayName);
       case MountingPointType:
-        return InfrastructureManagement::toString(itemData.structureElementTypeId());
+        return InfrastructureManagement::toString(itemData.structureElementTypeId);
       case Barcode:
-        return QString::fromStdString(itemData.barcode());
+        return QString::fromStdString(itemData.barcode);
       case Properties: 
-        return QString::fromStdString(itemData.properties());
+        return QString::fromStdString(itemData.properties);
       case Rooms:
       case Hostname:
         return {};
       case Overrides:
-        return getOverridesFlash(QByteArray::fromStdString(itemData.properties()));
+        return getOverridesFlash(QByteArray::fromStdString(itemData.properties));
       }
       return {};
     }
@@ -163,10 +165,10 @@ QString EgcuModel::getRoomsString(const EgcuData &data)
   QStringList sl;
   for(int room : std::as_const(data.rooms))
   {
-    for (const auto &elem : std::as_const(data.mainStructureElement.elements()))
-      if (elem.mountingPointId() == room)
+    for (const auto &elem : std::as_const(data.mainStructureElement.elements))
+      if (elem.mountingPointId == room)
       {
-        sl << QString::fromStdString(elem.displayName());
+        sl << QString::fromStdString(elem.displayName);
         break;
       }
   }
@@ -191,7 +193,7 @@ QString EgcuModel::getOverridesFlash(const QByteArray &properties)
 
   InfrastructureManagement::EffectOverride flash = static_cast<InfrastructureManagement::EffectOverride>(overridesObj.value(QStringLiteral("flash")).toInt());
   QString res;
-  switch(flash.underlying())
+  switch(flash)
   {
   case InfrastructureManagement::EffectOverride::PermanentOff:
     res = tr("Off");
@@ -212,9 +214,9 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
 
   for (auto it = data.effectOverrides.cbegin(); it != data.effectOverrides.cend(); ++it)
   {
-    InfrastructureManagement::EffectOverride override = static_cast<InfrastructureManagement::EffectOverride>(it.value().underlying());
+    InfrastructureManagement::EffectOverride override = static_cast<InfrastructureManagement::EffectOverride>(it.value());
     QString res;
-    switch(override.underlying())
+    switch(override)
     {
     case InfrastructureManagement::EffectOverride::PermanentOff:
       res = tr("Off");
@@ -226,7 +228,7 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
     default:
       continue;
     }
-    sl << tr("%1: %2").arg(QString::fromStdString(m_relayInfos.value(it.key()).name())).arg(res);
+    sl << tr("%1: %2").arg(QString::fromStdString(m_relayInfos.value(it.key()).name)).arg(res);
   }
 
   return sl.join(QLatin1String(", "));
@@ -235,13 +237,13 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
 QString EgcuModel::getRelaisStates(const EgcuData &data) const
 {
   DEBUG_LOG(m_logger) << "getRelaisStates"
-                       << " offlineTime=" << data.relayState.offlineTime()
-                       << " stateTime=" << data.relayState.stateTime()
+                       << " offlineTime=" << data.relayState.offlineTime
+                       << " stateTime=" << data.relayState.stateTime
                        << " mountingPoint.id=" << data.mountingPoint.id()
-                       << " mountingPointAsset.id=" << data.mountingPointAsset.id()
-                       << " mountingPointAsset.assetId=" << data.mountingPointAsset.assetId()
+                       << " mountingPointAsset.id=" << data.mountingPointAsset.id
+                       << " mountingPointAsset.assetId=" << data.mountingPointAsset.assetId
                        << " segmentName=" << data.segmentName()
-                       << " instrumentationAsset.id()" << data.instrumentationAsset.id();
+                       << " instrumentationAsset.id()" << data.instrumentationAsset.id;
 
 
 
@@ -252,13 +254,13 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
 
   QStringList sl;
 
-  Buildings::RelayState relayState = m_bldDtc->relayState(data.mountingPointAsset.assetId());
-  DEBUG_LOG(m_logger) << "relayState id=" << relayState.id()
-                       << " offlineTime=" << relayState.offlineTime()
-                       << " stateTime=" << relayState.stateTime()
-                       << " relayStates().size=" << relayState.relayStates().size();
+  Buildings::RelayState relayState = m_bldDtc->relayState(data.mountingPointAsset.assetId);
+  DEBUG_LOG(m_logger) << "relayState id=" << relayState.id
+                       << " offlineTime=" << relayState.offlineTime
+                       << " stateTime=" << relayState.stateTime
+                       << " relayStates().size=" << relayState.relayStates.size();
 
-  if (relayState.offlineTime() > relayState.stateTime())
+  if (relayState.offlineTime > relayState.stateTime)
   {
     DEBUG_LOG(m_logger) << QString(tr("Connection Error"));
     sl << QString(tr("Connection Error"));
@@ -266,18 +268,18 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
   }
 
 
-  for ( unsigned int i = 0; i < relayState.relayStates().size(); ++i)
+  for ( unsigned int i = 0; i < relayState.relayStates.size(); ++i)
   {
-      AssetManagement::RelayInfo relayInfo = m_asmDtc->relayInfo(relayState.relayStates()[i].id());
-      bool state = relayState.relayStates().at(i).state();
-      DEBUG_LOG(m_logger) << "relayInfo id=" << relayInfo.id()
-                           << " name=" << relayInfo.name()
-                           << " property=" << relayInfo.property()
+      AssetManagement::RelayInfo relayInfo = m_asmDtc->relayInfo(relayState.relayStates[i].id);
+      bool state = relayState.relayStates.at(i).state;
+      DEBUG_LOG(m_logger) << "relayInfo id=" << relayInfo.id
+                           << " name=" << relayInfo.name
+                           << " property=" << relayInfo.property
                            << " state=" << state;
 
-      if ( relayInfo.name().size() > 0)
+      if ( relayInfo.name.size() > 0)
       {
-        sl << QString(QStringLiteral("<img src=\"%1\" height=\"32\" />")).arg(getIconFromState(relayInfo.property(), state));
+        sl << QString(QStringLiteral("<img src=\"%1\" height=\"32\" />")).arg(getIconFromState(relayInfo.property, state));
       }
   }
 
@@ -298,7 +300,7 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
 
 
 
-   if ( data.mountingPointAsset.assetId() == 0)
+   if ( data.mountingPointAsset.assetId == 0)
     return (tr("not instrumented"));
   return sl.isEmpty() ? tr("Connection Error") : sl.join(QStringLiteral("&nbsp;"));
 }
@@ -352,7 +354,7 @@ bool EgcuModel::initModel(LtsSession::LtsSession *session)
 
   auto cbRelayInfos = [this](const AssetManagement::RelayInfo & c)
   {
-    m_relayInfos.insert(c.id(), c);
+    m_relayInfos.insert(c.id, c);
   };
   m_asmDtc->waitForHistoricalDataRelayInfo();
   m_asmDtc->relayInfos(cbRelayInfos);
@@ -370,17 +372,17 @@ QModelIndex EgcuModel::getIndexOfVisableRootItem() const
 
 bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructureElement &mse, InfrastructureManagement::MountingPointType mpType)
 {
-  DEBUG_LOG(m_logger) << "mseHasMountedBsm mse.id=" << mse.id()
-                       << " name=" << mse.name();
-  for (const InfrastructureManagement::StructureElement &element : std::as_const(mse.elements()))
+  DEBUG_LOG(m_logger) << "mseHasMountedBsm mse.id=" << mse.id
+                       << " name=" << mse.name;
+  for (const InfrastructureManagement::StructureElement &element : std::as_const(mse.elements))
   {
     
-    if (element.mountingPointTypeId() != mpType)
+    if (element.mountingPointTypeId != mpType)
       continue;
     
-    DEBUG_LOG(m_logger) << "Mountpoint BSM:" << element.id()
-                         << " name=" << element.name();
-    if (isMounted(element.id()))
+    DEBUG_LOG(m_logger) << "Mountpoint BSM:" << element.id
+                         << " name=" << element.name;
+    if (isMounted(element.id))
       return true;
   } 
   return false;
@@ -391,9 +393,9 @@ bool EgcuModel::isMounted(int mountingPointId)
   DEBUG_LOG(m_logger) << "isMounted id=" << mountingPointId;
   for (const InfrastructureManagement::MountingPointAsset &asset : std::as_const(m_mountingPointAssets))
   {
-    DEBUG_LOG(m_logger) << "assetId=" << asset.structureElementId()
+    DEBUG_LOG(m_logger) << "assetId=" << asset.structureElementId
                          << " mountingPointId=" << mountingPointId;
-    if (asset.structureElementId() == mountingPointId)
+    if (asset.structureElementId == mountingPointId)
       return true;
   }
   return false;
@@ -419,28 +421,28 @@ void EgcuModel::initData()
   for (const InfrastructureManagement::MainStructureElement &mse : std::as_const(mainStructEles))
   {
     
-    if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building)
+    if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
       continue;
 
     if ( !m_dtc->isElementAssignedToExercise( mse, m_session->exerciseId()))
     {
-      DEBUG_LOG(m_logger) << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
+      DEBUG_LOG(m_logger) << "EgcuModel::initData mseId=" << mse.id << " not in Exercise";
       continue;
     }
 
     
     QJsonParseError parserError;
-    QByteArray content = QByteArray::fromStdString(mse.properties());
+    QByteArray content = QByteArray::fromStdString(mse.properties);
 
     
     QJsonDocument::fromJson(content, &parserError);
     if (parserError.error != QJsonParseError::NoError)
       continue;
 
-    for (const InfrastructureManagement::StructureElement &currentElement : std::as_const(mse.elements()))
+    for (const InfrastructureManagement::StructureElement &currentElement : std::as_const(mse.elements))
     {
       NGLTreeItem *item = nullptr;
-      if (currentElement.structureElementTypeId() == InfrastructureManagement::StructureElementType::MountingPoint)
+      if (currentElement.structureElementTypeId == InfrastructureManagement::StructureElementType::MountingPoint)
         item = createItemFromMountingPoint(currentElement);
       else
         item = createItemFromStructureElement(currentElement);
@@ -448,7 +450,7 @@ void EgcuModel::initData()
       if (!item)
           continue;
 
-      const auto &path = currentElement.path();
+      const auto &path = currentElement.path;
 
       QModelIndex parentIndex;
       if (path.size() > 1)
@@ -456,15 +458,15 @@ void EgcuModel::initData()
         parentIndex = treeIndices.value(path.at(path.size() - 2), indexFromItem(m_rootItem)); 
         if (!parentIndex.isValid())
         {
-          INFO_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
-          for (const InfrastructureManagement::StructureElement &se : mse.elements())
-            INFO_LOG(m_logger) << "   se: " << se.id() << ", " << se.name();
+          INFO_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id << " mseid: " << mse.id;
+          for (const InfrastructureManagement::StructureElement &se : mse.elements)
+            INFO_LOG(m_logger) << "   se: " << se.id << ", " << se.name;
         }
       }
       else
         parentIndex = indexFromItem(m_rootItem);
 
-      if (currentElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingSensorModule)
+      if (currentElement.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingSensorModule)
         continue;
 
       bool bMseHasMountedBsm  = mseHasMountedAsset(mse, InfrastructureManagement::MountingPointType::BuildingSensorModule);
@@ -473,11 +475,11 @@ void EgcuModel::initData()
       
       
       if ( ( bMseHasMountedBsm || bMseHasMountedEgcu)
-           && (currentElement.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
-           && (currentElement.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor))
+           && (currentElement.structureElementTypeId != InfrastructureManagement::StructureElementType::Room)
+           && (currentElement.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor))
       {
         insertRow(rowCount(parentIndex), parentIndex, item);
-        treeIndices.insert(currentElement.id(), index(item->row(), 0, parentIndex));
+        treeIndices.insert(currentElement.id, index(item->row(), 0, parentIndex));
       }
     }
   }
@@ -485,12 +487,12 @@ void EgcuModel::initData()
 
 NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManagement::StructureElement &currentElement)
 {
-  const InfrastructureManagement::MountingPoint &mountingPoint = m_dataInterface->mountingPoint(currentElement.id());
+  const InfrastructureManagement::MountingPoint &mountingPoint = m_dataInterface->mountingPoint(currentElement.id);
 
   if (!mountingPoint.isValid())
     return {};
 
-  switch (mountingPoint.type().underlying())
+  switch (mountingPoint.type())
   {
   case InfrastructureManagement::MountingPointType::EffectGenerationControlUnit:
   {
@@ -499,13 +501,13 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
     DEBUG_LOG(m_logger) << "mountingPoint Id=" << mountingPoint.buildingId()
                          << " properties=" << mountingPoint.properties()
                          << " associatedAssetId=" << mountingPoint.associatedAssetId()
-                         << " isUsed=" << mountingPoint.data().isUsed()
-                         << " mountingPointId=" << mountingPoint.data().mountingPointId();
+                         << " isUsed=" << mountingPoint.data().isUsed
+                         << " mountingPointId=" << mountingPoint.data().mountingPointId;
 
     const InfrastructureManagement::InstrumentationAsset ia = m_dtc->instrumentationAsset(mountingPoint.associatedAssetId());
 
     int mpaId = 0;
-    m_dtc->getMountingPointAssetId(currentElement.id(), ia.id(), mpaId);
+    m_dtc->getMountingPointAssetId(currentElement.id, ia.id, mpaId);
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     QSet<int> relayIds;
@@ -515,8 +517,8 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
     const QSet<int> relayIds(m_relayInfos.keyBegin(), m_relayInfos.keyEnd());
 #endif
 
-    const auto &mse = m_dtc->mainStructureElement(currentElement.mainStructureElementId());
-    EgcuData mpData(ia, mountingPoint, mse, m_bldDtc->relayState(ia.id()), m_dtc->mountingPointAsset(mpaId), relayIds);
+    const auto &mse = m_dtc->mainStructureElement(currentElement.mainStructureElementId);
+    EgcuData mpData(ia, mountingPoint, mse, m_bldDtc->relayState(ia.id), m_dtc->mountingPointAsset(mpaId), relayIds);
 
     return new NGLTreeItem(QVariant::fromValue(mpData));
     break;
@@ -540,7 +542,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
 
 NGLTreeItem* EgcuModel::createItemFromStructureElement(const InfrastructureManagement::StructureElement &currentElement)
 {
-  DEBUG_LOG(m_logger) << "createItemFromStructureElement" << currentElement.displayName();
+  DEBUG_LOG(m_logger) << "createItemFromStructureElement" << currentElement.displayName;
   return new NGLTreeItem(QVariant::fromValue(currentElement));
 }
 
@@ -572,21 +574,21 @@ InfrastructureManagement::StructureElementType EgcuModel::getStructureElementTyp
 {
   NGLTreeItem *item = privateData(index);
   if (!item)
-    return InfrastructureManagement::StructureElementType::get_default();
+    return InfrastructureManagement::StructureElementType::TrainingArea;
 
   if (item->data().canConvert<EgcuData>())
     return InfrastructureManagement::StructureElementType::MountingPoint;
   else if (item->data().canConvert<InfrastructureManagement::StructureElement>())
-    return item->data().value<InfrastructureManagement::StructureElement>().structureElementTypeId();
+    return item->data().value<InfrastructureManagement::StructureElement>().structureElementTypeId;
   else
-    return InfrastructureManagement::StructureElementType::get_default();
+    return InfrastructureManagement::StructureElementType::TrainingArea;
 }
 
 void EgcuModel::udpatePropertiesForRelayOverride(const int relay,
                                                  const InfrastructureManagement::EffectOverride state,
                                                  InfrastructureManagement::StructureElement &se)
 {
-  QByteArray content = QByteArray::fromStdString(se.properties());
+  QByteArray content = QByteArray::fromStdString(se.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content));
 
   QJsonObject docObj = QJsonObject(doc.object());
@@ -604,15 +606,15 @@ void EgcuModel::udpatePropertiesForRelayOverride(const int relay,
     if (key != relay)
       continue;
 
-    if (state.underlying() != InfrastructureManagement::EffectOverride::Automatic)
-      arrRelays[i] = QJsonObject({qMakePair<QString, QJsonValue>(keyStr, state.underlying())});
+    if (state != InfrastructureManagement::EffectOverride::Automatic)
+      arrRelays[i] = QJsonObject({QPair<QString, QJsonValue>(keyStr, QJsonValue(static_cast<int>(state)))});
     else
       arrRelays.removeAt(i);
     containsRelay = true;
     break;
   }
-  if (!containsRelay && state.underlying() != InfrastructureManagement::EffectOverride::Automatic)
-    arrRelays.append(QJsonObject({qMakePair<QString, QJsonValue>(QString::number(relay), state.underlying())}));
+  if (!containsRelay && state != InfrastructureManagement::EffectOverride::Automatic)
+    arrRelays.append(QJsonObject({QPair<QString, QJsonValue>(QString::number(relay), QJsonValue(static_cast<int>(state)))}));
 
   if (arrRelays.isEmpty())
     overridesObj.remove(QStringLiteral("relays"));
@@ -626,21 +628,21 @@ void EgcuModel::udpatePropertiesForRelayOverride(const int relay,
 
   QByteArray content_neu = QJsonDocument(docObj).toJson(QJsonDocument::Compact);
 
-  se.properties(content_neu.toStdString());
+  se.properties = content_neu.toStdString();
 }
 
 void EgcuModel::udpatePropertiesForOverride(const QString &tagName,
                                             const InfrastructureManagement::EffectOverride state,
                                             InfrastructureManagement::StructureElement &se)
 {
-  QByteArray content = QByteArray::fromStdString(se.properties());
+  QByteArray content = QByteArray::fromStdString(se.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content));
 
   QJsonObject docObj = QJsonObject(doc.object());
   QJsonObject overridesObj = docObj.value(QStringLiteral("Overrides")).toObject();
 
-  if (state.underlying() != InfrastructureManagement::EffectOverride::Automatic)
-    overridesObj.insert(tagName, state.underlying());
+  if (state != InfrastructureManagement::EffectOverride::Automatic)
+    overridesObj.insert(tagName, static_cast<int>(state));
   else
     overridesObj.remove(tagName);
 
@@ -651,7 +653,7 @@ void EgcuModel::udpatePropertiesForOverride(const QString &tagName,
 
   QByteArray content_neu = QJsonDocument(docObj).toJson(QJsonDocument::Compact);
 
-  se.properties(content_neu.toStdString());
+  se.properties = content_neu.toStdString();
 }
 
 
@@ -681,8 +683,8 @@ void EgcuModel::findBuildings(NGLTreeItem *item, QMap<int, InfrastructureManagem
     return;
 
   InfrastructureManagement::StructureElement se = item->data().value<InfrastructureManagement::StructureElement>();
-  if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
-    buildings[se.mainStructureElementId()] = se;
+  if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
+    buildings[se.mainStructureElementId] = se;
 }
 
 QPair<QMap<int, InfrastructureManagement::StructureElement>, QMap<int, InfrastructureManagement::StructureElement> > EgcuModel::findEgcusAndBuildings(const QModelIndexList &indexes)
@@ -744,26 +746,26 @@ void EgcuModel::getContextMenu(const QModelIndexList &indexes, QMenu &menu)
   {
     menu.addSeparator();
     menu.addAction(addContextMenuHeaderItem(tr("Center on Map")));
-    menu.addAction(getCenterAction(buildings.first().mainStructureElementId()));
+    menu.addAction(getCenterAction(buildings.first().mainStructureElementId));
   }
 }
 
 QAction* EgcuModel::getRelayAction(const InfrastructureManagement::EffectOverride eo, const QMap<int, InfrastructureManagement::StructureElement> &egcus, const AssetManagement::RelayInfo &relayInfo)
 {
-  if (!readAllowance(eo, relayInfo.property()))
+  if (!readAllowance(eo, relayInfo.property))
     return nullptr;
 
-  QAction *action = new QAction(QString::fromStdString(relayInfo.name()), this);
+  QAction *action = new QAction(QString::fromStdString(relayInfo.name), this);
 
   for (const InfrastructureManagement::StructureElement &se : std::as_const(egcus))
   {
     connect(action, &QAction::triggered, this, [this, se, eo, relayInfo](){
       auto copy = se;
-      udpatePropertiesForRelayOverride(relayInfo.id(), eo, copy);
+      udpatePropertiesForRelayOverride(relayInfo.id, eo, copy);
       InfrastructureManagement::StructureElementModifyRequest request;
-      request.mainStructureElementId(se.mainStructureElementId());
-      request.elements().resize(1);
-      request.elements().at(0) = copy;
+      request.mainStructureElementId = se.mainStructureElementId;
+      request.elements.resize(1);
+      request.elements.at(0) = copy;
       m_requestHelper->startSingleRequest([request, this]()
       {
         return m_ftc->structureElementModifyRequest(request, this);
@@ -783,7 +785,7 @@ void EgcuModel::setAllOverrides(InfrastructureManagement::EffectOverride eo, con
   QVector<AssetManagement::RelayInfo> allowedRelays;
   for (const AssetManagement::RelayInfo &relayInfo : m_asmDtc->relayInfos())
   {
-    if (readAllowance(eo, relayInfo.property()))
+    if (readAllowance(eo, relayInfo.property))
       allowedRelays << relayInfo;
   }
 
@@ -794,16 +796,16 @@ void EgcuModel::setAllOverrides(InfrastructureManagement::EffectOverride eo, con
   {
     auto copy = egcu;
     for (const AssetManagement::RelayInfo &relayInfo : std::as_const(allowedRelays))
-      udpatePropertiesForRelayOverride(relayInfo.id(), eo, copy);
+      udpatePropertiesForRelayOverride(relayInfo.id, eo, copy);
 
-    if (!requests.contains(egcu.mainStructureElementId()))
+    if (!requests.contains(egcu.mainStructureElementId))
     {
-      requests.insert(egcu.mainStructureElementId(), {});
-      requests[egcu.mainStructureElementId()].mainStructureElementId(egcu.mainStructureElementId());
+      requests.insert(egcu.mainStructureElementId, {});
+      requests[egcu.mainStructureElementId].mainStructureElementId = egcu.mainStructureElementId;
     }
-    auto &req = requests[egcu.mainStructureElementId()];
-    req.elements().resize(req.elements().size() + 1);
-    req.elements().at(req.elements().size() - 1) = copy;
+    auto &req = requests[egcu.mainStructureElementId];
+    req.elements.resize(req.elements.size() + 1);
+    req.elements.at(req.elements.size() - 1) = copy;
   }
 
   for (const InfrastructureManagement::StructureElement &building : std::as_const(buildings))
@@ -811,14 +813,14 @@ void EgcuModel::setAllOverrides(InfrastructureManagement::EffectOverride eo, con
     auto copy = building;
     udpatePropertiesForOverride(QLatin1String("flash"), eo == InfrastructureManagement::EffectOverride::PermanentOn ? InfrastructureManagement::EffectOverride::Automatic : eo, copy);
 
-    if (!requests.contains(building.mainStructureElementId()))
+    if (!requests.contains(building.mainStructureElementId))
     {
-      requests.insert(building.mainStructureElementId(), {});
-      requests[building.mainStructureElementId()].mainStructureElementId(building.mainStructureElementId());
+      requests.insert(building.mainStructureElementId, {});
+      requests[building.mainStructureElementId].mainStructureElementId = building.mainStructureElementId;
     }
-    auto &req = requests[building.mainStructureElementId()];
-    req.elements().resize(req.elements().size() + 1);
-    req.elements().at(req.elements().size() - 1) = copy;
+    auto &req = requests[building.mainStructureElementId];
+    req.elements.resize(req.elements.size() + 1);
+    req.elements.at(req.elements.size() - 1) = copy;
   }
 
   for (const auto &req : std::as_const(requests))
@@ -849,9 +851,9 @@ QAction* EgcuModel::getGenericAction(const InfrastructureManagement::EffectOverr
       auto copy = se;
       udpatePropertiesForOverride(tagName, eo, copy);
       InfrastructureManagement::StructureElementModifyRequest request;
-      request.mainStructureElementId(copy.mainStructureElementId());
-      request.elements().resize(1);
-      request.elements().at(0) = copy;
+      request.mainStructureElementId = copy.mainStructureElementId;
+      request.elements.resize(1);
+      request.elements.at(0) = copy;
       m_requestHelper->startSingleRequest([request, this]()
       {
         return m_ftc->structureElementModifyRequest(request, this);
@@ -864,15 +866,15 @@ QAction* EgcuModel::getGenericAction(const InfrastructureManagement::EffectOverr
 Buildings::SwitchRelayRequest EgcuModel::createSwitchRelayRequest(int buildingId, int assetId, int relayId, Buildings::StateSetRelay state, int pulse, int count, int pause)
 {
   Buildings::SwitchRelayRequest req;
-  req.buildingId(buildingId);
-  req.assetId(assetId);
-  req.number(relayId);
+  req.buildingId = buildingId;
+  req.assetId = assetId;
+  req.number = relayId;
   Buildings::SwitchRelayPulse pulseAttributes;
-  pulseAttributes.count(count);
-  pulseAttributes.delay(pause);
-  pulseAttributes.pulse(pulse);
-  req.pulseAttributes(pulseAttributes);
-  req.state(state);
+  pulseAttributes.count = count;
+  pulseAttributes.delay = pause;
+  pulseAttributes.pulse = pulse;
+  req.pulseAttributes = pulseAttributes;
+  req.state = state;
   return req;
 }
 
@@ -899,7 +901,7 @@ NGLTreeItem* EgcuModel::findItemByAssetId(int assetId, NGLTreeItem *parent) cons
   if (parent->data().canConvert<EgcuData>())
   {
     EgcuData mpData = parent->data().value<EgcuData>();
-    if (mpData.instrumentationAsset.id() == assetId)
+    if (mpData.instrumentationAsset.id == assetId)
       return parent;
   }
   for (NGLTreeItem* child : parent->constChildren())
@@ -916,7 +918,7 @@ NGLTreeItem* EgcuModel::findItemByMseId(int mseId, NGLTreeItem *parent) const
   if (parent->data().canConvert<InfrastructureManagement::StructureElement>())
   {
     InfrastructureManagement::StructureElement se = parent->data().value<InfrastructureManagement::StructureElement>();
-    if (se.mainStructureElementId() == mseId)
+    if (se.mainStructureElementId == mseId)
       return parent;
   }
   for (NGLTreeItem* child : parent->constChildren())
@@ -933,7 +935,7 @@ NGLTreeItem* EgcuModel::findItemByStructureElementId(int seId, NGLTreeItem *pare
   if (parent->data().canConvert<InfrastructureManagement::StructureElement>())
   {
     InfrastructureManagement::StructureElement se = parent->data().value<InfrastructureManagement::StructureElement>();
-    if (se.id() == seId)
+    if (se.id == seId)
       return parent;
   }
   for (NGLTreeItem* child : parent->constChildren())
@@ -961,14 +963,14 @@ void EgcuModel::findStructureElementChildrenByIds(NGLTreeItem *parent, const QVe
   if (parent->data().canConvert<EgcuData>())
   {
     const auto &val = parent->data().value<EgcuData>();
-    if (structureElementIds.contains(val.mountingPoint.data().id()))
-      map.insert(val.mountingPoint.data().id(), indexFromItem(parent));
+    if (structureElementIds.contains(val.mountingPoint.data().id))
+      map.insert(val.mountingPoint.data().id, indexFromItem(parent));
   }
   else if (parent->data().canConvert<InfrastructureManagement::StructureElement>())
   {
     const auto &val = parent->data().value<InfrastructureManagement::StructureElement>();
-    if (structureElementIds.contains(val.id()))
-      map.insert(val.id(), indexFromItem(parent));
+    if (structureElementIds.contains(val.id))
+      map.insert(val.id, indexFromItem(parent));
   }
   for (NGLTreeItem* child : parent->constChildren())
     findStructureElementChildrenByIds(child, structureElementIds, map);
@@ -1026,7 +1028,7 @@ void EgcuModel::onInstrumentationAssetChanged(const InfrastructureManagement::In
   {
     EgcuData mpData = egcu->data().value<EgcuData>();
 
-    if (mpData.instrumentationAsset.id() != instrumentationAsset.id())
+    if (mpData.instrumentationAsset.id != instrumentationAsset.id)
       continue;
 
     mpData.update(instrumentationAsset, false);
@@ -1041,7 +1043,7 @@ void EgcuModel::onMainStructureElementChanged(const InfrastructureManagement::Ma
   if (modType != DataModification::eModified)
     return;
 
-  NGLTreeItem *buildingSe = findItemByMseId(mainStructureElement.id(), m_rootItem);
+  NGLTreeItem *buildingSe = findItemByMseId(mainStructureElement.id, m_rootItem);
   if (!buildingSe)
     return;
 
@@ -1053,10 +1055,10 @@ void EgcuModel::onMainStructureElementChanged(const InfrastructureManagement::Ma
     EgcuData mpData = egcu->data().value<EgcuData>();
     mpData.update(mainStructureElement);
 
-    for (auto se : mainStructureElement.elements())
+    for (auto se : mainStructureElement.elements)
     {
-      int oldId = mpData.mountingPoint.data().id();
-      if (oldId != se.id())
+      int oldId = mpData.mountingPoint.data().id;
+      if (oldId != se.id)
         continue;
       mpData.update(se,false);
       break;
@@ -1070,10 +1072,10 @@ void EgcuModel::onMainStructureElementChanged(const InfrastructureManagement::Ma
   findStructureElementChildren(buildingSe, structureElements);
   for (const auto &item : std::as_const(structureElements))
   {
-    for (const auto &se : std::as_const(mainStructureElement.elements()))
+    for (const auto &se : std::as_const(mainStructureElement.elements))
     {
-      int oldId = item->data().value<InfrastructureManagement::StructureElement>().id();
-      if (oldId != se.id())
+      int oldId = item->data().value<InfrastructureManagement::StructureElement>().id;
+      if (oldId != se.id)
         continue;
       item->setData(QVariant::fromValue(se));
       emit dataChanged(indexFromItem(item), indexFromItem(item,columnCount()-1));
@@ -1085,7 +1087,7 @@ void EgcuModel::onMainStructureElementChanged(const InfrastructureManagement::Ma
 void EgcuModel::onRelayStateChanged(const Buildings::RelayState &data, DataModification modType)
 {
   Q_UNUSED(modType);
-  NGLTreeItem *item = findItemByAssetId(data.id(), m_rootItem);
+  NGLTreeItem *item = findItemByAssetId(data.id, m_rootItem);
   if (!item)
     return;
 
@@ -1098,9 +1100,9 @@ void EgcuModel::onRelayStateChanged(const Buildings::RelayState &data, DataModif
 void EgcuModel::onRelayInfoChanged(const AssetManagement::RelayInfo &data, DataModification modType)
 {
   if (modType == DataModification::eRemoved)
-    m_relayInfos.remove(data.id());
+    m_relayInfos.remove(data.id);
   else
-    m_relayInfos[data.id()] = data;
+    m_relayInfos[data.id] = data;
 }
 
 void EgcuModel::onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &mpa, DataModification modType)
@@ -1108,12 +1110,12 @@ void EgcuModel::onMountingPointAssetChanged(const InfrastructureManagement::Moun
   if (modType == DataModification::eAdded)
   {
     InfrastructureManagement::StructureElement se;
-    m_dtc->getStructureElementById(mpa.structureElementId(), se);
+    m_dtc->getStructureElementById(mpa.structureElementId, se);
     NGLTreeItem *item = createItemFromMountingPoint(se);
     
     if (!item)
       return;
-    int id = se.path()[se.path().size() - 2]; 
+    int id = se.path[se.path.size() - 2]; 
     NGLTreeItem *parent = findItemByStructureElementId(id, m_rootItem);
     if (!parent)
       return;
@@ -1123,17 +1125,16 @@ void EgcuModel::onMountingPointAssetChanged(const InfrastructureManagement::Moun
   }
   else if (modType == DataModification::eRemoved)
   {
-    NGLTreeItem *item = findItemByAssetId(mpa.assetId(), m_rootItem);
+    NGLTreeItem *item = findItemByAssetId(mpa.assetId, m_rootItem);
     if (!item)
       return;
     QModelIndex index = indexFromItem(item);
     removeRow(index.row(), index.parent());
-    emit beginFilterChange();
-    endFilterChange();
+    emit invalidateFilter();
   }
   else if (modType == DataModification::eModified)
   {
-    NGLTreeItem *item = findItemByAssetId(mpa.assetId(), m_rootItem);
+    NGLTreeItem *item = findItemByAssetId(mpa.assetId, m_rootItem);
     if (!item)
       return;
     EgcuData mpData = item->data().value<EgcuData>();
@@ -1213,8 +1214,7 @@ void EgcuProxyModel::showIncluded(const bool bShow)
   if (m_bShowIncluded == bShow)
     return;
   m_bShowIncluded = bShow;
-  beginFilterChange();
-    endFilterChange();
+  invalidateFilter();
 }
 
 void EgcuProxyModel::showNotIncluded(const bool bShow)
@@ -1222,8 +1222,7 @@ void EgcuProxyModel::showNotIncluded(const bool bShow)
   if (m_bShowNotIncluded == bShow)
     return;
   m_bShowNotIncluded = bShow;
-  beginFilterChange();
-    endFilterChange();
+  invalidateFilter();
 }
 
 void EgcuProxyModel::setTypeFilter(const QSet<InfrastructureManagement::MountingPointType> &visibleTypes)
@@ -1231,8 +1230,7 @@ void EgcuProxyModel::setTypeFilter(const QSet<InfrastructureManagement::Mounting
   if (m_visibleTypes == visibleTypes)
     return;
   m_visibleTypes = visibleTypes;
-  beginFilterChange();
-    endFilterChange();
+  invalidateFilter();
 }
 
 void EgcuProxyModel::addToTypeFilter(const InfrastructureManagement::MountingPointType mpt, const bool bAdd)
@@ -1292,12 +1290,12 @@ void EgcuData::update(const InfrastructureManagement::MountingPoint &mp, const b
     return;
 
   mountingPoint = mp;
-  rooms         = EgcuModel::getRoomsForEgcu(mainStructureElement.properties(), mountingPoint.data().mountingPointId());
+  rooms         = EgcuModel::getRoomsForEgcu(mainStructureElement.properties, mountingPoint.data().mountingPointId);
 }
 
 void EgcuData::update(const InfrastructureManagement::InstrumentationAsset &ia, const bool overrideId)
 {
-  if ((ia.id() != instrumentationAsset.id()) && !overrideId)
+  if ((ia.id != instrumentationAsset.id) && !overrideId)
     return;
 
   instrumentationAsset = ia;
@@ -1307,8 +1305,8 @@ EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, con
   , mountingPoint(mp)
   , mainStructureElement(mse)
   , relayState(rs)
-  , mountingPointAsset(mpa),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , mountingPointAsset(mpa)
+{
   for (int relayId : relayIds)
     effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride::Automatic);
 
@@ -1318,13 +1316,13 @@ EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, con
 
 void EgcuData::update(const InfrastructureManagement::MainStructureElement &mse)
 {
-  if (mse.id() != mainStructureElement.id())
+  if (mse.id != mainStructureElement.id)
     return;
 
   mainStructureElement = mse;
-  for(const auto &se : mse.elements())
+  for(const auto &se : mse.elements)
   {
-    if (se.id() != mountingPoint.id())
+    if (se.id != mountingPoint.id())
       continue;
     update(se, false);
   }
@@ -1332,14 +1330,14 @@ void EgcuData::update(const InfrastructureManagement::MainStructureElement &mse)
 
 void EgcuData::update(const InfrastructureManagement::StructureElement &se, const bool overrideId)
 {
-  if ((mountingPoint.id() != se.id()) && !overrideId)
+  if ((mountingPoint.id() != se.id) && !overrideId)
     return;
 
   mountingPoint.updateData(se, -10); 
-  rooms = EgcuModel::getRoomsForEgcu(mainStructureElement.properties(), mountingPoint.data().mountingPointId());
+  rooms = EgcuModel::getRoomsForEgcu(mainStructureElement.properties, mountingPoint.data().mountingPointId);
 
   QJsonParseError parserError;
-  QByteArray content = QByteArray::fromStdString(se.properties());
+  QByteArray content = QByteArray::fromStdString(se.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
 
   if (parserError.error != QJsonParseError::NoError)
@@ -1379,14 +1377,14 @@ void EgcuData::update(const Buildings::RelayState &data)
 
 int EgcuData::update(const InfrastructureManagement::MountingPointAsset &mpa)
 {
-  if (mpa.id() != mountingPointAsset.id())
+  if (mpa.id != mountingPointAsset.id)
     return 0;
 
   mountingPointAsset = mpa;
 
-  if (mpa.assetId() != instrumentationAsset.id())
+  if (mpa.assetId != instrumentationAsset.id)
     return 1; 
-  if (mpa.structureElementId() != mountingPoint.id())
+  if (mpa.structureElementId != mountingPoint.id())
     return 2; 
   return 0;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
index 429c1ed36..00c59480f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
@@ -49,7 +49,7 @@ public:
   QMap<int, InfrastructureManagement::EffectOverride>           effectOverrides; 
 
   QVector<int>                                   rooms;
-  QString segmentName() const { return (mountingPointAsset.name().empty() ? QString::fromStdString(instrumentationAsset.name()) : QString::fromStdString(mountingPointAsset.name())); }
+  QString segmentName() const { return (mountingPointAsset.name.empty() ? QString::fromStdString(instrumentationAsset.name) : QString::fromStdString(mountingPointAsset.name)); }
 
   explicit EgcuData() = default;
 
@@ -60,7 +60,7 @@ public:
            const InfrastructureManagement::MountingPointAsset &mpa,
            const QSet<int> &relayIds);
 
-  bool isNull() const { return (instrumentationAsset.id() == 0 || mountingPoint.id() == 0 || mainStructureElement.id() == 0); }
+  bool isNull() const { return (instrumentationAsset.id == 0 || mountingPoint.id() == 0 || mainStructureElement.id == 0); }
 
   
   void update(const InfrastructureManagement::MainStructureElement &mse);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.cpp
index 332768146..954394252 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.cpp
@@ -121,9 +121,9 @@ bool FaultMessageDialog::apply()
     return false;
 
   OcSituationServer::EquipmentErrorRequest req;
-  req.equipmentNumber(m_ui->leParticipant->text().toInt());
-  req.device(m_ui->leDevice->text().toStdString());
-  req.text(m_ui->teComment->toPlainText().toStdString());
+  req.equipmentNumber = m_ui->leParticipant->text().toInt();
+  req.device = m_ui->leDevice->text().toStdString();
+  req.text = m_ui->teComment->toPlainText().toStdString();
   return m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ossFtc->equipmentErrorRequest(req, this);
@@ -167,8 +167,8 @@ void FaultMessageDialog::onSlotSelectionChanged()
   if (!selIndexes.isEmpty())
   {
     ParticipantManagement::ParticipantData part = m_model->getParticipantData(selIndexes.first());
-    if (part.equipmentNumber().is_set())
-      m_selectedEqNr = part.equipmentNumber().get();
+    if (part.equipmentNumber.has_value())
+      m_selectedEqNr = part.equipmentNumber.get();
     else
       m_selectedEqNr = -1;
   }
@@ -209,9 +209,9 @@ void FaultMessageDialog::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::S
   if (DataModification::eRemoved == modType)
     return;
 
-  m_ownEquipmentId = data.equipmentNumber();
+  m_ownEquipmentId = data.equipmentNumber;
   if (m_ownEquipmentId <= 0)
-    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
+    WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber << " is not present ";
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
index 4a8bb5637..8db7546d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
@@ -15,6 +15,7 @@ ManipulationModel::ManipulationModel(QObject *parent)
                                                         tr("Time (PU)"),
                                                         tr("Equipment Identification")},
                                                         parent)
+  , m_logger(getLogger("ManipulationModel"))
 {}
 
 bool ManipulationModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
@@ -30,7 +31,7 @@ bool ManipulationModel::initModel(const std::shared_ptr<ParticipantManagement::I
 
   auto cbCs = [this](const ProjectDataManagement::CanComponentString &ccs)
   {
-    m_ccsMap[ccs.canDeviceId()] = ccs;
+    m_ccsMap[ccs.canDeviceId] = ccs;
   };
   pdmDtc->canComponentStrings(cbCs);
 
@@ -76,9 +77,9 @@ QVariant ManipulationModel::data(const QModelIndex &index,
 void ManipulationModel::manipulationDataChanged(const ParticipantManagement::DynamicParticipantData &data,
                                                 DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
+  DEBUG_LOG(m_logger) << "manipulationDataChanged: " << data.manipulation.size() << ", " << modType;
 
-  const bool isManipulated = data.manipulation().size() > 0;
+  const bool isManipulated = data.manipulation.size() > 0;
 
   switch (modType)
   {
@@ -92,16 +93,16 @@ void ManipulationModel::manipulationDataChanged(const ParticipantManagement::Dyn
       return;
 
     insertRow(mData);
-    m_participantsWithManipulation += data.participantId();
+    m_participantsWithManipulation += data.participantId;
     break;
   }
   case DataModification::eModified:
   {
-    const int row = findRowForId(data.participantId());
+    const int row = findRowForId(data.participantId);
     if (isManipulated)
     {
-      if (row >= 0 && data.manipulation().size() > 0 &&
-          m_vecData.at(row).manipulationTime == data.manipulation().at(data.manipulation().size() - 1).manipulationTime())
+      if (row >= 0 && data.manipulation.size() > 0 &&
+          m_vecData.at(row).manipulationTime == data.manipulation.at(data.manipulation.size() - 1).manipulationTime)
       {
         
         break;
@@ -113,12 +114,12 @@ void ManipulationModel::manipulationDataChanged(const ParticipantManagement::Dyn
         insertRow(mData);
       else
         setRowData(row, mData);
-      m_participantsWithManipulation += data.participantId();
+      m_participantsWithManipulation += data.participantId;
     }
     else
     {
       removeRow(row);
-      m_participantsWithManipulation -= data.participantId();
+      m_participantsWithManipulation -= data.participantId;
     }
     break;
   }
@@ -129,18 +130,18 @@ void ManipulationModel::manipulationDataChanged(const ParticipantManagement::Dyn
 
 void ManipulationModel::participantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  if (!m_participantsWithManipulation.contains(data.id()))
+  if (!m_participantsWithManipulation.contains(data.id))
     return;
-  const int row = findRowForId(data.id());
+  const int row = findRowForId(data.id);
   if (row < 0)
     return;
-  if (!data.equipmentNumber().is_set() || modType == DataModification::eRemoved)
+  if (!data.equipmentNumber.has_value() || modType == DataModification::eRemoved)
   {
     removeRow(row);
-    m_participantsWithManipulation -= data.id();
+    m_participantsWithManipulation -= data.id;
     return;
   }
-  m_vecData[row].equipNo = data.equipmentNumber().get();
+  m_vecData[row].equipNo = data.equipmentNumber.get();
   const QModelIndex idx(index(row, EquipmentNummer));
   emit dataChanged(idx, idx, {Qt::DisplayRole});
 }
@@ -148,16 +149,16 @@ void ManipulationModel::participantChanged(const ParticipantManagement::Particip
 ManipulationData ManipulationModel::buildManipulationData(const ParticipantManagement::DynamicParticipantData &data) const
 {
   ManipulationData mData;
-  if (data.manipulation().size() == 0)
+  if (data.manipulation.size() == 0)
     return mData;
-  const auto equipNo = m_ppmDtc->participant(data.participantId()).equipmentNumber();
-  if (!equipNo.is_set())
+  const auto equipNo = m_ppmDtc->participant(data.participantId).equipmentNumber;
+  if (!equipNo.has_value())
     return mData;
-  mData.participantId = data.participantId();
+  mData.participantId = data.participantId;
   mData.equipNo = equipNo.get();
-  mData.sampleTime = data.sampleTime();
-  mData.manipulationTime = data.manipulation().at(data.manipulation().size() - 1).manipulationTime();
-  mData.canDevices = buildCanDeviceString(data.manipulation());
+  mData.sampleTime = data.sampleTime;
+  mData.manipulationTime = data.manipulation.at(data.manipulation.size() - 1).manipulationTime;
+  mData.canDevices = buildCanDeviceString(data.manipulation);
   return mData;
 }
 
@@ -166,11 +167,11 @@ QString ManipulationModel::buildCanDeviceString(const std::vector<ParticipantMan
   QStringList canDeviceList;
   for (const ParticipantManagement::ManipulationInformation &mi : manipulations)
   {
-    auto it = m_ccsMap.find(mi.equipmentFunctionId());
+    auto it = m_ccsMap.find(mi.equipmentFunctionId);
     if (it == m_ccsMap.end())
-      canDeviceList.prepend(tr("Unknown can device (%1)").arg(mi.equipmentFunctionId()));
+      canDeviceList.prepend(tr("Unknown can device (%1)").arg(mi.equipmentFunctionId));
     else
-      canDeviceList.prepend(m_pdmDtc->trCanComponentStringName(it.value().id()));
+      canDeviceList.prepend(m_pdmDtc->trCanComponentStringName(it.value().id));
   }
   return canDeviceList.join(QLatin1Char(','));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
index 5bf973d41..55fd84556 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <QtCore/QSet>
 #include <Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_player_model.cpp
index 711038fbb..a59e6f6a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_player_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_player_model.cpp
@@ -23,9 +23,9 @@ bool PartyPlayerModel::initModel(LtsSession::LtsSessionDataDds *session)
   const auto dynPartData = m_ppmDtc->dynamicParticipantDatas();
   for (const ParticipantManagement::Participant &part : std::as_const(m_participants))
   {
-    if (!part.equipmentNumber().is_set())
+    if (!part.equipmentNumber.has_value())
       continue;
-    playerData.push_back(setPlayerData(part, dynPartData.value(part.id())));
+    playerData.push_back(setPlayerData(part, dynPartData.value(part.id)));
   };
   setData(playerData);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_player_model.cpp
index d17cef0a2..0e2f3dfa5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_player_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_player_model.cpp
@@ -30,12 +30,12 @@ void SinglePlayerModel::loadData(const QVector<int> &idList)
     if (itParticipants == participants.end())
       continue; 
     const auto &participant = itParticipants.value();
-    if (!participant.equipmentNumber().is_set())
+    if (!participant.equipmentNumber.has_value())
       continue; 
-    const int row = findRowForId(participant.id());
+    const int row = findRowForId(participant.id);
     if (row == -1)
     {
-      auto itDynData = dynPartData.find(participant.id());
+      auto itDynData = dynPartData.find(participant.id);
       newRows.push_back(setPlayerData(itParticipants.value(), itDynData == dynPartData.end() ?
                                         ParticipantManagement::DynamicParticipantData() :
                                         itDynData.value()));
@@ -51,15 +51,15 @@ void SinglePlayerModel::loadData(const QVector<int> &idList)
     {
       if (equipNos.isEmpty())
         break;
-      if (participant.equipmentNumber().is_set() && equipNos.contains(-participant.equipmentNumber().get()))
+      if (participant.equipmentNumber.has_value() && equipNos.contains(-participant.equipmentNumber.get()))
       {
-        equipNos.removeAll(-participant.equipmentNumber().get());
-        int row = findRowForId(participant.id());
+        equipNos.removeAll(-participant.equipmentNumber.get());
+        int row = findRowForId(participant.id);
         if (row < 0)
-          row = findRowForId(-participant.equipmentNumber().get());
+          row = findRowForId(-participant.equipmentNumber.get());
         if (row == -1)
         {
-          auto itDynData = dynPartData.find(participant.id());
+          auto itDynData = dynPartData.find(participant.id);
           newRows.push_back(setPlayerData(participant, itDynData == dynPartData.end() ?
                                             ParticipantManagement::DynamicParticipantData() :
                                             itDynData.value()));
@@ -70,9 +70,9 @@ void SinglePlayerModel::loadData(const QVector<int> &idList)
   for (int equipNo : std::as_const(equipNos))
   {
     ParticipantManagement::Participant p;
-    p.id(equipNo);  
-    p.equipmentNumber(-equipNo);
-    if (!findParticipantId(p.id()))
+    p.id = equipNo;  
+    p.equipmentNumber = -equipNo;
+    if (!findParticipantId(p.id))
       newRows.push_back(setPlayerData(p, ParticipantManagement::DynamicParticipantData()));
   }
   insertRows(newRows);
@@ -96,18 +96,18 @@ QVector<int> SinglePlayerModel::updateDataView(const QVector<int> &equipNumberLi
     if (itEquipNo == equipNo2PartMap.end())
     {
       ParticipantManagement::Participant p;
-      p.id(-number);
-      p.equipmentNumber(number);
-      if (!findParticipantId(p.id()))
+      p.id = -number;
+      p.equipmentNumber = number;
+      if (!findParticipantId(p.id))
         newRows.push_back(setPlayerData(p, ParticipantManagement::DynamicParticipantData()));
       continue; 
     }
     const auto &participant = itEquipNo.value();
-    ret += participant.id();
-    const int row = findRowForId(participant.id());
+    ret += participant.id;
+    const int row = findRowForId(participant.id);
     if (row == -1)
     {
-      auto itDynData = dynPartData.find(participant.id());
+      auto itDynData = dynPartData.find(participant.id);
       newRows.push_back(setPlayerData(itEquipNo.value(),
                                       itDynData == dynPartData.end() ?
                                         ParticipantManagement::DynamicParticipantData() :
@@ -128,8 +128,8 @@ QHash<int,ParticipantManagement::Participant> SinglePlayerModel::participantsByE
   ret.reserve(m_participants.size());
   for (const ParticipantManagement::Participant &part : m_participants)
   {
-    if (part.equipmentNumber().is_set())
-      ret.insert(part.equipmentNumber().get(), part);
+    if (part.equipmentNumber.has_value())
+      ret.insert(part.equipmentNumber.get(), part);
   }
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
index f5bad832a..7442e445d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
@@ -41,15 +41,15 @@ bool StructureElementEdit::init(const InfrastructureManagement::StructureElement
   if (!session->getFtc<InfrastructureManagement::DataInterface>(m_ismFtc))
     return false;
 
-  if (m_structureElement.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building)
+  if (m_structureElement.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
   {
     m_ui->groupBox->hide(); 
   }
 
 
-  m_ui->cbFlashing->addItem(tr("Off"), InfrastructureManagement::EffectOverride::PermanentOff);
-  m_ui->cbFlashing->addItem(tr("Auto"), InfrastructureManagement::EffectOverride::Automatic);
-  m_ui->cbFlashing->setCurrentIndex(m_ui->cbFlashing->findData(InfrastructureManagement::EffectOverride::Automatic));
+  m_ui->cbFlashing->addItem(tr("Off"), static_cast<int>(InfrastructureManagement::EffectOverride::PermanentOff));
+  m_ui->cbFlashing->addItem(tr("Auto"), static_cast<int>(InfrastructureManagement::EffectOverride::Automatic));
+  m_ui->cbFlashing->setCurrentIndex(m_ui->cbFlashing->findData(static_cast<int>(InfrastructureManagement::EffectOverride::Automatic)));
 
   updateComboBoxes();
 
@@ -58,19 +58,19 @@ bool StructureElementEdit::init(const InfrastructureManagement::StructureElement
   m_ui->lblFloor->hide();
   m_ui->lbxFloor->hide();
 
-  switch (m_structureElement.path().size()) {
+  switch (m_structureElement.path.size()) {
   case 3:
-    m_ui->lblRoom->setText(structureElementName(m_structureElement.path()[2]));
+    m_ui->lblRoom->setText(structureElementName(m_structureElement.path[2]));
     m_ui->lblRoom->show();
     m_ui->lbxRoom->show();
     Q_FALLTHROUGH();
   case 2:
-    m_ui->lblFloor->setText(structureElementName(m_structureElement.path()[1]));
+    m_ui->lblFloor->setText(structureElementName(m_structureElement.path[1]));
     m_ui->lblFloor->show();
     m_ui->lbxFloor->show();
     Q_FALLTHROUGH();
   case 1:
-    m_ui->lblBuilding->setText(structureElementName(m_structureElement.path()[0]));
+    m_ui->lblBuilding->setText(structureElementName(m_structureElement.path[0]));
     break;
   default:
     break;
@@ -83,7 +83,7 @@ QString StructureElementEdit::structureElementName(int seId)
 {
   InfrastructureManagement::StructureElement se;
   m_ismDtc->getStructureElementById(seId, se);
-  return QString::fromStdString(se.displayName());
+  return QString::fromStdString(se.displayName);
 }
 
 
@@ -95,7 +95,7 @@ StructureElementEdit::~StructureElementEdit()
 void StructureElementEdit::updateComboBoxes()
 {
   QJsonParseError parserError;
-  QByteArray content = QByteArray::fromStdString(m_structureElement.properties());
+  QByteArray content = QByteArray::fromStdString(m_structureElement.properties);
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
 
   if (parserError.error != QJsonParseError::NoError)
@@ -113,12 +113,12 @@ void StructureElementEdit::updateComboBoxes()
 
 QString StructureElementEdit::dialogIdentifier() const
 {
-  return QLatin1String("StructureElementEdit") + QString::number(m_structureElement.id());
+  return QLatin1String("StructureElementEdit") + QString::number(m_structureElement.id);
 }
 
 void StructureElementEdit::retranslate()
 {
-  translate(m_ui, tr("Edit Building/Floor/Room: %1").arg(QString::fromStdString(m_structureElement.displayName())));
+  translate(m_ui, tr("Edit Building/Floor/Room: %1").arg(QString::fromStdString(m_structureElement.displayName)));
 }
 
 void StructureElementEdit::onStructureElementModifyReply(const Core::FunctionReplyObject &replyObject)
@@ -131,15 +131,15 @@ bool StructureElementEdit::apply()
   std::string properties;
   QByteArray content_neu;
 
-  properties= m_structureElement.properties();
-  DEBUG_LOG(m_logger) << "structureElementId=" << m_structureElement.id()
+  properties= m_structureElement.properties;
+  DEBUG_LOG(m_logger) << "structureElementId=" << m_structureElement.id
                       << " properties=" << properties
-                      << " MountingPointType=" << m_structureElement.mountingPointTypeId()
-                      << " structureElementTypeId=" << m_structureElement.structureElementTypeId();
+                      << " MountingPointType=" << m_structureElement.mountingPointTypeId
+                      << " structureElementTypeId=" << m_structureElement.structureElementTypeId;
 
   QJsonObject resultObj;
   QJsonObject overrideObj;
-  if (m_ui->cbFlashing->currentData().toInt() != InfrastructureManagement::EffectOverride::Automatic)
+  if (m_ui->cbFlashing->currentData().toInt() != static_cast<int>(InfrastructureManagement::EffectOverride::Automatic))
     overrideObj.insert(QStringLiteral("flash"), m_ui->cbFlashing->currentData().toInt());
   if (overrideObj.size())
     resultObj.insert (QStringLiteral("Overrides"), overrideObj);
@@ -148,16 +148,16 @@ bool StructureElementEdit::apply()
   if (content_neu.toStdString() == properties)
     return true;
 
-  m_structureElement.properties(content_neu.toStdString());
-  ERROR_LOG(m_logger) << "properties=" << m_structureElement.properties()
-                      << " name=" << m_structureElement.name()
-                      << " seId=" << m_structureElement.id()
-                      << " mountingPointId=" << m_structureElement.mountingPointId();
+  m_structureElement.properties = content_neu.toStdString();
+  ERROR_LOG(m_logger) << "properties=" << m_structureElement.properties
+                      << " name=" << m_structureElement.name
+                      << " seId=" << m_structureElement.id
+                      << " mountingPointId=" << m_structureElement.mountingPointId;
 
   InfrastructureManagement::StructureElementModifyRequest request;
-  request.mainStructureElementId(m_structureElement.mainStructureElementId());
-  request.elements().resize(1);
-  request.elements().at(0) = m_structureElement;
+  request.mainStructureElementId = m_structureElement.mainStructureElementId;
+  request.elements.resize(1);
+  request.elements.at(0) = m_structureElement;
 
   m_requestHelper->addRequest([this, request]() {return m_ismFtc->structureElementModifyRequest(request, this);});
   m_requestHelper->startRequests();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/SystemMonitor/smo_system_monitor_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/SystemMonitor/smo_system_monitor_dialog.cpp
index 0e4a3acf2..5a822bce6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/SystemMonitor/smo_system_monitor_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/SystemMonitor/smo_system_monitor_dialog.cpp
@@ -3,7 +3,7 @@
 
 #include "smo_system_monitor_dialog.h"
 #include "ui_smo_system_monitor_dialog.h"
-#include <QWebEngineView>
+#include <QtWebEngineWidgets/QWebEngineView>
 #include <LtsUtilsSettings/settings.h>
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp
index 176cae89b..833800853 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp
@@ -106,7 +106,7 @@ bool ExplosionSingleCentral2SituationMap::updateElementImpl(const Sim2SituationM
   
   int partyId = -1;
 
-  if (ddsData.participantId().is_set())
+  if (ddsData.participantId().has_value())
   {
     const int pId = ddsData.participantId().get();
     const ParticipantManagement::Participant &participant = m_ppmDtc->participant(pId);
@@ -115,7 +115,7 @@ bool ExplosionSingleCentral2SituationMap::updateElementImpl(const Sim2SituationM
   }
   else
   {
-    if (ddsData.partyId().is_set())
+    if (ddsData.partyId().has_value())
       partyId = ddsData.partyId().get();
   }
 
@@ -123,10 +123,10 @@ bool ExplosionSingleCentral2SituationMap::updateElementImpl(const Sim2SituationM
     partyId = 0;
   mapObj->setPartyId(partyId);
 
-  const bool changeToActive = (ddsData.effectStateId().underlying()==AreaEffectSimulation::AesEffectState::EsActivated) &&
+  const bool changeToActive = (ddsData.effectStateId()==AreaEffectSimulation::AesEffectState::EsActivated) &&
       (static_cast<int>(mapObj->aesState()) < static_cast<int>(AreaEffectSimulation::AesEffectState::EsActivated));
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId()));
 
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory, itemView))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
index a54c622b2..dc515cd27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
@@ -84,7 +84,7 @@ namespace SituationMap
 {
 
 AdapterDds::AdapterDds(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+    m_logger(getLogger("AdapterDds")) {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START DDDDDDDD" ;
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
 }
@@ -232,7 +232,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingle;
-      ExplosionSingle2SituationMap *sim2Map = static_cast<ExplosionSingle2SituationMap *>(m_aes2MapCont.value(aesType));
+      ExplosionSingle2SituationMap *sim2Map = static_cast<ExplosionSingle2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new ExplosionSingle2SituationMap(m_pdmHandler,
@@ -263,7 +263,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionArea;
-      ExplosionArea2SituationMap *sim2Map = static_cast<ExplosionArea2SituationMap *>(m_aes2MapCont.value(aesType));
+      ExplosionArea2SituationMap *sim2Map = static_cast<ExplosionArea2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new ExplosionArea2SituationMap(m_map->objectFactory(),
@@ -278,7 +278,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea;
-      MineArea2SituationMap *sim2Map = static_cast<MineArea2SituationMap*>(m_aes2MapCont.value(aesType));
+      MineArea2SituationMap *sim2Map = static_cast<MineArea2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new MineArea2SituationMap(m_map->objectFactory(),
@@ -306,7 +306,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineCorridor;
-      MineCorridor2SituationMap *sim2Map = static_cast<MineCorridor2SituationMap *>(m_aes2MapCont.value(aesType));
+      MineCorridor2SituationMap *sim2Map = static_cast<MineCorridor2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new MineCorridor2SituationMap(m_map->objectFactory(),
@@ -320,7 +320,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBCContamination;
-      BCContamination2SituationMap *sim2Map = static_cast<BCContamination2SituationMap *>(m_aes2MapCont.value(aesType));
+      BCContamination2SituationMap *sim2Map = static_cast<BCContamination2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new BCContamination2SituationMap(m_map->objectFactory(),
@@ -345,7 +345,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
       
       {
         AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtNContamination;
-        NContamination2SituationMap *sim2Map = static_cast<NContamination2SituationMap *>(m_aes2MapCont.value(aesType));
+        NContamination2SituationMap *sim2Map = static_cast<NContamination2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
         if (! sim2Map)
         {
           sim2Map = new NContamination2SituationMap(m_map->objectFactory(),
@@ -361,7 +361,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
       {
         AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionCluster;
-        ExplosionCluster2SituationMap *sim2Map = static_cast<ExplosionCluster2SituationMap *>(m_aes2MapCont.value(aesType));
+        ExplosionCluster2SituationMap *sim2Map = static_cast<ExplosionCluster2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
         if (! sim2Map)
         {
           sim2Map = new ExplosionCluster2SituationMap(m_pdmHandler,
@@ -378,7 +378,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
       
       {
         AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtEffectCluster;
-        EffectCluster2SituationMap *sim2Map = static_cast<EffectCluster2SituationMap *>(m_aes2MapCont.value(aesType));
+        EffectCluster2SituationMap *sim2Map = static_cast<EffectCluster2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
         if (! sim2Map)
         {
           sim2Map = new EffectCluster2SituationMap(m_pdmHandler,
@@ -412,12 +412,12 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
       if (m_map->mode() == Mode::Mode_3D)
       {
         INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
-        initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType::AtBoobyTrap, AreaEffectSimulation::AesType::AtOffRouteMine});
+        initRenderer3D_AesCentral_Booby(layernameAesCentral, {static_cast<int>(AreaEffectSimulation::AesType::AtBoobyTrap), static_cast<int>(AreaEffectSimulation::AesType::AtOffRouteMine)});
       }
 
       {
         AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap;
-        BoobyTrap2SituationMap *sim2Map = static_cast<BoobyTrap2SituationMap *>(m_aes2MapCont.value(aesType));
+        BoobyTrap2SituationMap *sim2Map = static_cast<BoobyTrap2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
         if (!sim2Map)
         {
           sim2Map = new BoobyTrap2SituationMap(m_map->objectFactory(),
@@ -431,7 +431,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
       {
         AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtOffRouteMine;
-        OffRoute2SituationMap *sim2Map = static_cast<OffRoute2SituationMap *>(m_aes2MapCont.value(aesType));
+        OffRoute2SituationMap *sim2Map = static_cast<OffRoute2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
         if (!sim2Map)
         {
           sim2Map = new OffRoute2SituationMap(m_map->objectFactory(),
@@ -450,7 +450,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDangerArea;
-      DangerArea2SituationMap *sim2Map = static_cast<DangerArea2SituationMap *>(m_aes2MapCont.value(aesType));
+      DangerArea2SituationMap *sim2Map = static_cast<DangerArea2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new DangerArea2SituationMap(m_map->objectFactory(),
@@ -464,7 +464,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtFunctionalArea;
-      FunctionalArea2SituationMap *sim2Map = static_cast<FunctionalArea2SituationMap*>(m_aes2MapCont.value(aesType));
+      FunctionalArea2SituationMap *sim2Map = static_cast<FunctionalArea2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new FunctionalArea2SituationMap(m_map->objectFactory(),
@@ -478,7 +478,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBorderline;
-      Borderline2SituationMap *sim2Map = static_cast<Borderline2SituationMap*>(m_aes2MapCont.value(aesType));
+      Borderline2SituationMap *sim2Map = static_cast<Borderline2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new Borderline2SituationMap(m_map->objectFactory(),
@@ -492,7 +492,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtReconArea;
-      ReconArea2SituationMap *sim2Map = static_cast<ReconArea2SituationMap*>(m_aes2MapCont.value(aesType));
+      ReconArea2SituationMap *sim2Map = static_cast<ReconArea2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new ReconArea2SituationMap(m_map->objectFactory(),
@@ -509,7 +509,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
     
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDusSingleMine;
-      DusSingleMine2SituationMap *sim2Map = static_cast<DusSingleMine2SituationMap*>(m_aes2MapCont.value(aesType));
+      DusSingleMine2SituationMap *sim2Map = static_cast<DusSingleMine2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new DusSingleMine2SituationMap(m_map->objectFactory(),
@@ -526,7 +526,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
     
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtGasPipe;
-      GasPipe2SituationMap *sim2Map = static_cast<GasPipe2SituationMap *>(m_aes2MapCont.value(aesType));
+      GasPipe2SituationMap *sim2Map = static_cast<GasPipe2SituationMap *>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new GasPipe2SituationMap(m_map->objectFactory(),
@@ -543,7 +543,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
     
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtAirSupportImpact;
-      AirSupportImpact2SituationMap *sim2Map = static_cast<AirSupportImpact2SituationMap*>(m_aes2MapCont.value(aesType));
+      AirSupportImpact2SituationMap *sim2Map = static_cast<AirSupportImpact2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new AirSupportImpact2SituationMap(m_map->objectFactory(),
@@ -559,7 +559,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
     
     {
       AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtTechnicalArea;
-      TechnicalArea2SituationMap *sim2Map = static_cast<TechnicalArea2SituationMap*>(m_aes2MapCont.value(aesType));
+      TechnicalArea2SituationMap *sim2Map = static_cast<TechnicalArea2SituationMap*>(m_aes2MapCont.value(static_cast<int>(aesType)));
       if (! sim2Map)
       {
         sim2Map = new TechnicalArea2SituationMap(m_map->objectFactory(),
@@ -1699,7 +1699,7 @@ bool AdapterDds::clearMapObjectSelection(MapObjectType mot)
 
 bool AdapterDds::isBuildingOwnershipSupported() const
 {
-  return m_buildingOwnership;
+  return m_buildingOwnership.data() != nullptr;
 }
 bool AdapterDds::isBuildingOwnershipVisible() const
 {
@@ -1719,7 +1719,7 @@ bool AdapterDds::setBuildingOwnershipVisible(bool visible)
 
 bool AdapterDds::isBuildingContaminationSupported() const
 {
-  return m_buildingContamination;
+  return m_buildingContamination.data() != nullptr;
 }
 bool AdapterDds::isBuildingContaminationVisible() const
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h
index 4e836b8f1..3b2c072a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h
@@ -28,7 +28,7 @@ inline PositionCont form2PosCont(const std::vector<Core::GeoPosition2D> &form)
   PositionCont ret;
   ret.reserve(form.size());
   for (const auto &pos : form)
-    ret.push_back({pos.lon(), pos.lat(), 0.0});
+    ret.push_back({pos.lon, pos.lat, 0.0});
   return ret;
 }
 
@@ -37,7 +37,7 @@ inline PositionCont form2PosCont(const std::vector<Core::GeoPosition> &form)
   PositionCont ret;
   ret.reserve(form.size());
   for (const auto &pos : form)
-    ret.push_back({pos.lon(), pos.lat(), pos.z()});
+    ret.push_back({pos.lon, pos.lat, pos.z});
   return ret;
 }
 
@@ -57,7 +57,7 @@ inline SituationMap::AesEffectState effectState2aesState(AreaEffectSimulation::A
 {
   SituationMap::AesEffectState aesState = AesEffectState::Unknown;
 
-  switch (effectState.underlying())   
+  switch (effectState)   
   {
   case AreaEffectSimulation::AesEffectState::EsUnknown:
   case AreaEffectSimulation::AesEffectState::EsError:
@@ -121,7 +121,7 @@ public:
 
   int32_t getSimId(const DDS_TYPE &ddsData) const override
   {
-    return ddsData.id();
+    return ddsData.id;
   }
 
   virtual bool init(PluginProvider *pluginProvider)
@@ -218,12 +218,12 @@ public:
     const SUPER *derived = static_cast<const SUPER*>(this);
     const auto cb = [simIdOut, &umodOut](const DDS_TYPE &data) -> bool
     {
-      if (data.id() == simIdOut)
+      if (data.id == simIdOut)
       {
-        if (data.partyId().is_set())
-          umodOut.m_partyId = data.partyId().get();
+        if (data.partyId.is_set())
+          umodOut.m_partyId = data.partyId.get();
 
-        umodOut.m_description1 = QString::fromStdString(data.name());
+        umodOut.m_description1 = QString::fromStdString(data.name);
 
         return true; 
       }
@@ -260,10 +260,10 @@ protected:
     const SUPER *derived = static_cast<const SUPER*>(this);
     const auto cb = [simId, &effectStart](const DDS_TYPE &data) -> bool
     {
-      if (data.id() == simId)
+      if (data.id == simId)
       {
-        if (data.effectStart().is_set())
-          effectStart = data.effectStart().get();
+        if (data.effectStart.is_set())
+          effectStart = data.effectStart.get();
         return true;
       }
       return false;
@@ -289,16 +289,16 @@ protected:
 
   bool isElapsed(const DDS_TYPE &ddsData) const override
   {
-    const AreaEffectSimulation::AesEffectState &aesEffectState = ddsData.effectStateId();
-    if (ddsData.isDeleted())
+    const AreaEffectSimulation::AesEffectState &aesEffectState = ddsData.effectStateId;
+    if (ddsData.isDeleted)
       return true;
     if (aesEffectState == AreaEffectSimulation::AesEffectState::EsRemoved)
       return true;
     if (aesEffectState == AreaEffectSimulation::AesEffectState::EsExpired)
     {
-      if (!ddsData.effectStart().is_set())
+      if (!ddsData.effectStart.is_set())
         return true;
-      const auto effectEnd = ddsData.effectStart().get() + ddsData.effectDuration();
+      const auto effectEnd = ddsData.effectStart.get() + ddsData.effectDuration;
       const auto afterGlow = m_displayFilter ? m_displayFilter->maxAfterglowDurationMSec() : 0;
       return (m_pluginProvider->partitionTime() > effectEnd + afterGlow);
     }
@@ -315,9 +315,9 @@ protected:
     const auto cb = [this, bCleanup](const DDS_TYPE &data) -> bool
     {
       
-      if (data.isDeleted())
+      if (data.isDeleted)
         return false;
-      if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsExpired)
+      if (data.effectStateId != AreaEffectSimulation::AesEffectState::EsExpired)
         return false;
 
       
@@ -342,10 +342,10 @@ protected:
 
     if (mod != DataModification::eAdded && mod != DataModification::eModified)
       return;
-    if (data.aesTypeId() != Aes2SituationMapTraits<SUPER>::aesType)
+    if (data.aesTypeId != Aes2SituationMapTraits<SUPER>::aesType)
       return;
 
-    const auto uniqueMapId = this->simId2UniqueMapId(data.aesItemId());
+    const auto uniqueMapId = this->simId2UniqueMapId(data.aesItemId);
     if (!isUniqueMapIdValid(uniqueMapId))
     {
       DEBUG_LOG(m_logger) << LOGFUNCTION << " skip due to invalid map id";
@@ -355,7 +355,7 @@ protected:
     RefPointer<MAP_TYPE> mapObj = this->getMapObjectOfUniqueMapId(uniqueMapId);
     if (!mapObj.valid())
     {
-      WARNING_LOG(m_logger) << "Can not find map object for aes item with id " << data.aesItemId();
+      WARNING_LOG(m_logger) << "Can not find map object for aes item with id " << data.aesItemId;
       return;
     }
     updateGeometry(data, mapObj);
@@ -379,7 +379,7 @@ protected:
 
     if (isElapsed(data))
     {
-      DEBUG_LOG(m_logger) << LOGFUNCTION << " skip due to isElapsed map id/simId: " << data.id();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " skip due to isElapsed map id/simId: " << data.id;
       return;
     }
 
@@ -439,7 +439,7 @@ protected:
       {
         mapObj->setVisibility(isVisibile);
         mapObj->updateView();
-        DEBUG_LOG(m_logger) << "Set visibility for object " << data.id() << " to " << (isVisibile ? "visible" : "invisible");
+        DEBUG_LOG(m_logger) << "Set visibility for object " << data.id << " to " << (isVisibile ? "visible" : "invisible");
         this->emit_visibilityHasChangedSignal();
       }
     }
@@ -453,17 +453,17 @@ protected:
     if (!m_displayFilter)
       return true;         
 
-    const auto es = data.effectStart().is_set() ? data.effectStart().get() : 0;
-    const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
+    const auto es = data.effectStart.is_set() ? data.effectStart.get() : 0;
+    const auto partyId = data.partyId.is_set() ? data.partyId.get() : -1;
     bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
     if (isVisibleByFilter)
       isVisibleByFilter = m_displayFilter->isVisible(Aes2SituationMapTraits<SUPER>::aesType,
-                                                     data.effectStateId(),
-                                                     data.chargeStruct().chargeTypeId(),
+                                                     data.effectStateId,
+                                                     data.chargeStruct.chargeTypeId,
                                                      partyId,
-                                                     data.isCentral(),
+                                                     data.isCentral,
                                                      es,
-                                                     data.effectDuration(),
+                                                     data.effectDuration,
                                                      m_pluginProvider->partitionTime());
     return isVisibleByFilter;
   }
@@ -471,14 +471,14 @@ protected:
 protected:
   virtual void onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType) override
   {
-    if (Aes2SituationMapTraits<SUPER>::aesType != aesType.underlying())
+    if (Aes2SituationMapTraits<SUPER>::aesType != aesType)
       return;
 
     SUPER *derived = static_cast<SUPER*>(this);
     const auto cb = [this](const DDS_TYPE &data) -> bool
     {
       
-      if (data.isDeleted())
+      if (data.isDeleted)
         return false;
       this->updateVisibility(data);
       return false;
@@ -516,13 +516,13 @@ public:
   virtual bool updateGeometry(const AreaEffectSimulation::AesItemView &data,
                               RefPointer<MAP_TYPE> mapObj)
   {
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " data.aesTypeId()=" << data.aesTypeId()
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " data.aesTypeId()=" << data.aesTypeId
                         << ", m_debugInfo " << mapObj->debugInfo();
 
-    mapObj->setPositions(form2PosCont(data.form()));
+    mapObj->setPositions(form2PosCont(data.form));
 
     if (!mapObj->updateView())
-      ERROR_LOG(m_logger) << LOGFUNCTION << " aesItemId = " << data.aesItemId() << " updateView failed";
+      ERROR_LOG(m_logger) << LOGFUNCTION << " aesItemId = " << data.aesItemId << " updateView failed";
     return true;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.cpp
index 6df97ee92..876344f7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.cpp
@@ -43,15 +43,15 @@ bool AirSupportImpact2SituationMap::updateElementImpl(const Sim2SituationMap::DD
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtAirSupportImpact, itemView))
@@ -72,8 +72,8 @@ bool AirSupportImpact2SituationMap::updateElementImpl(const Sim2SituationMap::DD
   }
 
   
-  const Core::GeoPosition2D &impactPos2D = ddsData.impactPosition();
-  mapObj->setImpactOrigin(Point3D(impactPos2D.lon(), impactPos2D.lat(), 0.0));
+  const Core::GeoPosition2D &impactPos2D = ddsData.impactPosition;
+  mapObj->setImpactOrigin(Point3D(impactPos2D.lon, impactPos2D.lat, 0.0));
 
   updateVisibility(ddsData, mapObj);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
index b06005eb8..17b35c5fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
@@ -108,7 +108,7 @@ bool AlarmToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
 
 
 
-  if (data.eventType().underlying() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
+  if (data.eventType() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
     return true;
 
   return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.cpp
index 59452ed39..20fb4860f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.cpp
@@ -38,21 +38,21 @@ bool BCContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
   else
   {
     mapObj->setLineStyle(LineStyle(Qt::yellow, 2));
     mapObj->setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
   }
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtBCContamination, itemView))
     this->updateGeometry(itemView, mapObj);
@@ -72,8 +72,8 @@ bool BCContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
   }
 
   
-  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition();
-  mapObj->setImpactOrigin(Point3D(impactPos2D.lon(), impactPos2D.lat(), 0.0));
+  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition;
+  mapObj->setImpactOrigin(Point3D(impactPos2D.lon, impactPos2D.lat, 0.0));
 
   
   
@@ -82,7 +82,7 @@ bool BCContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
   
   
   
-  if (ddsData.partyId().is_set())
+  if (ddsData.partyId.has_value())
   {
     
     
@@ -90,7 +90,7 @@ bool BCContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
     
     
 
-    int height = ddsData.upperOffset();
+    int height = ddsData.upperOffset;
     if (height > 0)
       mapObj->setExtrusionHeight(height);
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp
index f0fdec918..66bad112d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp
@@ -39,25 +39,25 @@ bool BoobyTrap2SituationMap::run()
 
 void BoobyTrap2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << " data.aesTypeId()=" << data.aesTypeId() << " modType=" << modType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << " data.aesTypeId()=" << data.aesTypeId << " modType=" << modType;
 
   
   
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
     return;
 
   if (modType == DataModification::eRemoved)
     return;
 
 
-  const int32_t simId = data.aesItemId(); 
+  const int32_t simId = data.aesItemId; 
   if (simId < 0)
     return;
 
   
   updateSecondary(simId);
 
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " data.aesTypeId()=" << data.aesTypeId() << " modType=" << modType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " data.aesTypeId()=" << data.aesTypeId << " modType=" << modType;
 }
 
 void BoobyTrap2SituationMap::onPartitionTimeChanged(qint64 newPartitionTime)
@@ -93,7 +93,7 @@ void BoobyTrap2SituationMap::updateAllDetonationSpheres(qint64 newPartitionTime)
 
     const int simId = it.key();
     const AreaEffectSimulation::BoobyTrap &boobyTrap = m_aesDtc->boobyTrap(simId);
-    if (boobyTrap.id() != simId)
+    if (boobyTrap.id != simId)
       continue;
 
     if (updateDetonationSphere3D(mapObj, boobyTrap, newPartitionTime))
@@ -106,17 +106,17 @@ void BoobyTrap2SituationMap::updateAllDetonationSpheres(qint64 newPartitionTime)
 
 bool BoobyTrap2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMap::MAP_T> mapObj, const AreaEffectSimulation::BoobyTrap &data, qint64 newPartitionTime)
 {
-  const int32_t simId = data.id(); 
+  const int32_t simId = data.id; 
 
   if (!mapObj)
     return false;
 
   bool bUpdateRequired = false;
 
-  const bool bDesiredNewState = data.triggered() && ((newPartitionTime - data.sampleTime() < 5000));  
+  const bool bDesiredNewState = data.triggered && ((newPartitionTime - data.sampleTime < 5000));  
 
   TRACE_LOG(m_logger) << LOGFUNCTION << ", START" << " simId = " << simId
-                      << ", sampleTime " << data.sampleTime()
+                      << ", sampleTime " << data.sampleTime
                       << ", bDesiredNewState " << bDesiredNewState;
 
   
@@ -153,7 +153,7 @@ bool BoobyTrap2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMa
     attribMap.insert(QStringLiteral("IMPACT_RADIUS"), attribValue);
 
     LayerFactory::UniqueValueDataAesCentral::TYPE type{LayerFactory::UniqueValueDataAesCentral::TYPE::SPHERE};
-    if (data.centralAngle().is_set())
+    if (data.centralAngle().has_value())
       type = LayerFactory::UniqueValueDataAesCentral::TYPE::CONE;
 
     attribValue = QString(QStringLiteral("Impact_Type_%1")).arg(LayerFactory::toString(type));
@@ -161,7 +161,7 @@ bool BoobyTrap2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMa
 
     
     int heading = 0;
-    if (data.rotationAngle().is_set())
+    if (data.rotationAngle().has_value())
       heading = static_cast<int>(data.rotationAngle().get());
     attribMap.insert(QStringLiteral("HEADING"), ((heading+90)%360)); 
     attribMap.insert(QStringLiteral("PITCH"), 0);
@@ -187,22 +187,22 @@ bool BoobyTrap2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMa
   {
     FATAL_LOG(m_logger) << LOGFUNCTION << ", START ADD " << " simId = " << simId;
 
-    const Core::GeoPosition2D &geoPos = data.impactPosition();
-    Point3D markerOrigin(geoPos.lon(), geoPos.lat(), 0);  
+    const Core::GeoPosition2D &geoPos = data.impactPosition;
+    Point3D markerOrigin(geoPos.lon, geoPos.lat, 0);  
 
     VirtualMine::SceneSymbolData ssData;
 
     const QColor &majorColor = mapObj->majorColor();
     ssData.color = majorColor;
 
-    ssData.radius = std::max(data.impactRadius(), 10.0); 
+    ssData.radius = std::max(data.impactRadius, 10.0); 
 
     
-    ssData.cone = data.centralAngle().is_set();
+    ssData.cone = data.centralAngle.has_value();
 
     int heading = 0;
-    if (data.rotationAngle().is_set())
-      heading = static_cast<int>(data.rotationAngle().get());
+    if (data.rotationAngle.has_value())
+      heading = static_cast<int>(data.rotationAngle.get());
 
     ssData.heading = (heading+90)%360;
     ssData.pitch = 0.0;
@@ -240,21 +240,21 @@ bool BoobyTrap2SituationMap::updateSecondary(int32_t simId)
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtBoobyTrapSecondary, dataAesItemView))
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << "  AesItemViewForSecondary found :-) ";
-    trap = m_aesDtc->boobyTrap(dataAesItemView.aesItemId());
+    trap = m_aesDtc->boobyTrap(dataAesItemView.aesItemId);
   } else {
     ERROR_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << " no AesItemViewForSecondary found. :-( ";
   }
 
   
-  if ((dataAesItemView.aesItemId() == simId) &&
-      (trap.id() == simId) &&
-      trap.triggered())
+  if ((dataAesItemView.aesItemId == simId) &&
+      (trap.id == simId) &&
+      trap.triggered)
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << " setSubsidiaryLine";
     VirtualMine::OptionalData optData;
     optData.closed = true;
     mapObj->setSubsidiaryLine(0, 
-                              form2PosCont(dataAesItemView.form()), optData);
+                              form2PosCont(dataAesItemView.form), optData);
   } else {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << " removeSubsidiaryLine";
     mapObj->removeSubsidiaryLine(0);
@@ -266,7 +266,7 @@ bool BoobyTrap2SituationMap::updateSecondary(int32_t simId)
   }
 
   TRACE_LOG(m_logger) << LOGFUNCTION << ", END" << " simId = " << simId
-                      << " trap.triggered(" << trap.triggered();
+                      << " trap.triggered(" << trap.triggered;
 
   return true;
 }
@@ -279,15 +279,15 @@ bool BoobyTrap2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dd
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
 
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtBoobyTrap, itemView))
@@ -326,17 +326,17 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const
   if (!m_displayFilter)
     return true;         
 
-  const auto es = data.effectStart().is_set() ? data.effectStart().get() : 0;
-  const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
+  const auto es = data.effectStart.has_value() ? data.effectStart.get() : 0;
+  const auto partyId = data.partyId.has_value() ? data.partyId.get() : -1;
   bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
   if (isVisibleByFilter)
     isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType::AtMineArea,
-                                                   data.effectStateId(),
-                                                   data.chargeStruct().chargeTypeId(),
+                                                   data.effectStateId,
+                                                   data.chargeStruct.chargeTypeId,
                                                    partyId,
-                                                   data.isCentral(),
+                                                   data.isCentral,
                                                    es,
-                                                   data.effectDuration(),
+                                                   data.effectDuration,
                                                    m_pluginProvider->partitionTime());
 
   return isVisibleByFilter;
@@ -344,14 +344,14 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const
 
 void BoobyTrap2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
 {
-  if ((AreaEffectSimulation::AesType::AtBoobyTrap != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying()))
+  if ((AreaEffectSimulation::AesType::AtBoobyTrap != aesType) &&
+      (AreaEffectSimulation::AesType::AtMineArea != aesType))
     return;
 
   const auto cb = [this](const DDS_TYPE &data) -> bool
   {
     
-    if (data.isDeleted())
+    if (data.isDeleted)
       return false;
     this->updateVisibility(data);
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.cpp
index bcaf9157f..a8a4a71fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.cpp
@@ -46,12 +46,12 @@ bool Borderline2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &d
   ls.setLineWidth(2);
   mapObj->setLineStyle(ls);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtBorderline, itemView))
     this->updateGeometry(itemView, mapObj);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
index 7cc7cb06b..c7ff85d5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
@@ -37,7 +37,7 @@ public:
   
   bool isElapsed(const DDS_TYPE &ddsData) const override
   {
-    return (ddsData.operatorId() > 0 && m_pluginProvider->operatorId() != ddsData.operatorId());
+    return (ddsData.operatorId > 0 && m_pluginProvider->operatorId() != ddsData.operatorId);
   }
 
   bool iterateAesData(const std::function<bool(const AreaEffectSimulation::Borderline &data)> &cb) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
index 157bf98bd..87f35fea5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
@@ -15,8 +15,18 @@
 
 #define USE_BUFFER_APPROACH
 #ifdef USE_BUFFER_APPROACH
-#  include <arcgis/PolygonBuilder.h>
-#  include <arcgis/GeometryEngine.h>
+#  include <PolygonBuilder.h>
+#  include <GeometryEngine.h>
+#  include <Geometry.h>
+#  include <Polygon.h>
+#  include <Multipart.h>
+#  include <SpatialReference.h>
+#  include <Point.h>
+#  include <ImmutablePartCollection.h>
+#  include <ImmutablePart.h>
+#  include <ImmutablePointCollection.h>
+#  include <LinearUnit.h>
+#  include <GeometryTypes.h>
 #endif 
 
 namespace SituationMap
@@ -137,7 +147,7 @@ public:
 
 BuildingContamination::BuildingContamination(int drawOrder, QObject *parent) : BaseClass(parent)
   , d(new Private()),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+    m_logger(getLogger("BuildingContamination")) {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->m_drawOrder = drawOrder;
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -270,7 +280,7 @@ void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingStat
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
-  const int buildingId = data.id();
+  const int buildingId = data.id;
 
   switch (modType)
   {
@@ -304,7 +314,7 @@ void BuildingContamination::updateBuilding(int buildingId)
   
   d->m_buildingStateData[buildingId] = bos;
 
- const auto contaminations = bos.contaminationStates();
+ const auto contaminations = bos.contaminationStates;
 
  DEBUG_LOG(m_logger) << "Statecount " << contaminations.size();
 
@@ -314,7 +324,7 @@ void BuildingContamination::updateBuilding(int buildingId)
   {
     
     QSet<int> rooms;
-    for (const auto &room : contaminationState.rooms())
+    for (const auto &room : contaminationState.rooms)
     {
       rooms.insert(room);
     }
@@ -412,7 +422,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
     return -1;
   }
 
-  const std::vector<int32_t> path = roomSe.path();
+  const std::vector<int32_t> path = roomSe.path;
 
   for (const int parentSeId : path)
   {
@@ -421,7 +431,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
       continue;
     
 
-    if (parentSe.structureElementTypeId().underlying() != InfrastructureManagement::StructureElementType::Floor)
+    if (parentSe.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor)
       continue;
 
     
@@ -430,7 +440,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
     return parentSeId;
   }
 
-  throw QStringLiteral("findFloorId: floor id for room %1 not found").arg(roomSe.id());
+  throw QStringLiteral("findFloorId: floor id for room %1 not found").arg(roomSe.id);
 }
 
 bool BuildingContamination::getRoom(int roomSeId, InfrastructureManagement::StructureElement &roomSe)
@@ -474,14 +484,14 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
     const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
-                        << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
+                        << " mainFootprint.elements.size()=" << mainFootprint.elements.size();
 
-    relPositions.reserve(mainFootprint.elements().size());
+    relPositions.reserve(mainFootprint.elements.size());
     
-    for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements())
+    for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements)
     {
-      const auto &relPos = element.relPosition();
-      relPositions += QPointF(relPos.offsetX(), relPos.offsetY());
+      const auto &relPos = element.relPosition;
+      relPositions += QPointF(relPos.offsetX, relPos.offsetY);
     }
   }
   
@@ -530,10 +540,10 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
 
   const InfrastructureManagement::MainStructureElement &mse = m_ismDtc->mainStructureElement(buildingId);
 
-  const Core::GeoPosition &geoPosition                      = mse.geoPosition();
-  const QPointF &referencePointGeo                          = QPointF(geoPosition.lon(), geoPosition.lat());
+  const Core::GeoPosition &geoPosition                      = mse.geoPosition;
+  const QPointF &referencePointGeo                          = QPointF(geoPosition.lon, geoPosition.lat);
   const LtsCoordTrans::UtmCoordinate &referencePointUTM     = LtsCoordTrans::UtmCoordinate::fromGeographic(referencePointGeo);
-  const double angleRad                                     = mse.angle() * LtsCoordTrans::deg2rad();
+  const double angleRad                                     = mse.angle * LtsCoordTrans::deg2rad();
 
   
   const QPointF center;
@@ -569,7 +579,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
     const Esri::ArcGISRuntime::Polygon &polyline =
         Esri::ArcGISRuntime::GeometryEngine::bufferGeodetic(esriGeometry,
                                                             distance,
-                                                            Esri::ArcGISRuntime::LinearUnitId::Meters,
+                                                            Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters),
                                                             0.1,
                                                             Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
 
@@ -582,7 +592,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
 
     INFO_LOG(m_logger) << " pointCollection.size = " << pointCollection.size()
                          << " - buildingId = " << buildingId
-                         << ", mse.name = " << mse.name();
+                         << ", mse.name = " << mse.name;
 
     absPositionsGeo.clear();
     absPositionsGeo.reserve(size);
@@ -607,12 +617,12 @@ QMap<int, double> BuildingContamination::retrieveBuildingAbsHeight(int buildingI
   const InfrastructureManagement::MainStructureElement &mse = m_ismDtc->mainStructureElement(buildingId);
 
   
-  for (const InfrastructureManagement::StructureElement &element : mse.elements())
+  for (const InfrastructureManagement::StructureElement &element : mse.elements)
   {
-    if (element.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor)
+    if (element.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor)
       continue;
 
-    const int floorId = element.id();
+    const int floorId = element.id;
 
     
     
@@ -622,7 +632,7 @@ QMap<int, double> BuildingContamination::retrieveBuildingAbsHeight(int buildingI
     
     
     
-    double height = element.geoPosition().z();
+    double height = element.geoPosition.z;
 
     
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
index 579282ffd..0e5adbed3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
@@ -16,8 +16,18 @@
 
 #define USE_BUFFER_APPROACH
 #ifdef USE_BUFFER_APPROACH
-#  include <arcgis/PolygonBuilder.h>
-#  include <arcgis/GeometryEngine.h>
+#  include <PolygonBuilder.h>
+#  include <GeometryEngine.h>
+#  include <Geometry.h>
+#  include <Polygon.h>
+#  include <Multipart.h>
+#  include <SpatialReference.h>
+#  include <Point.h>
+#  include <ImmutablePartCollection.h>
+#  include <ImmutablePart.h>
+#  include <ImmutablePointCollection.h>
+#  include <LinearUnit.h>
+#  include <GeometryTypes.h>
 #endif 
 
 namespace SituationMap
@@ -213,7 +223,7 @@ public:
 
 BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent) : BaseClass(parent)
   , d(new Private()),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+    m_logger(getLogger("BuildingOwnership")) {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->m_drawOrder = drawOrder;
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -348,7 +358,7 @@ void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
-  const int buildingId = data.buildingId();
+  const int buildingId = data.buildingId;
 
   switch (modType)
   {
@@ -381,14 +391,14 @@ void BuildingOwnership::updateBuilding(int buildingId)
   
   d->m_ownershipData[buildingId] = bos;
 
-  const auto &ownerships = bos.ownerships();
+  const auto &ownerships = bos.ownerships;
 
   
   QMap<int, int> floor2Party;
   for (const CentralEffectSimulation::Ownership &ownership : ownerships)
     
-    if (ownership.partyId() > 0)
-      floor2Party[ownership.floorId()] = ownership.partyId();
+    if (ownership.partyId > 0)
+      floor2Party[ownership.floorId] = ownership.partyId;
 
 
 
@@ -464,15 +474,15 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
     const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
-                        << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
+                        << " mainFootprint.elements.size()=" << mainFootprint.elements.size();
 
-    relPositions.reserve(mainFootprint.elements().size());
+    relPositions.reserve(mainFootprint.elements.size());
     
-    const auto &fpElements = mainFootprint.elements();
+    const auto &fpElements = mainFootprint.elements;
     for (const InfrastructureManagement::FootprintElement &element : fpElements)
     {
-      const auto &relPos = element.relPosition();
-      relPositions += QPointF(relPos.offsetX(), relPos.offsetY());
+      const auto &relPos = element.relPosition;
+      relPositions += QPointF(relPos.offsetX, relPos.offsetY);
     }
   }
   
@@ -521,10 +531,10 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
 
   const InfrastructureManagement::MainStructureElement &mse = m_ismDtc->mainStructureElement(buildingId);
 
-  const Core::GeoPosition &geoPosition                = mse.geoPosition();
-  const QPointF &referencePointGeo                    = QPointF(geoPosition.lon(), geoPosition.lat());
+  const Core::GeoPosition &geoPosition                = mse.geoPosition;
+  const QPointF &referencePointGeo                    = QPointF(geoPosition.lon, geoPosition.lat);
   const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(referencePointGeo);
-  const double angleRad                               = mse.angle() * LtsCoordTrans::deg2rad();
+  const double angleRad                               = mse.angle * LtsCoordTrans::deg2rad();
 
   
   const QPointF center;
@@ -560,7 +570,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
     const Esri::ArcGISRuntime::Polygon polyline =
         Esri::ArcGISRuntime::GeometryEngine::bufferGeodetic(esriGeometry,
                                                             distance,
-                                                            Esri::ArcGISRuntime::LinearUnitId::Meters,
+                                                            Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters),
                                                             0.1,
                                                             Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
 
@@ -603,12 +613,12 @@ QMap<int, double> BuildingOwnership::retrieveBuildingAbsHeightInternal(int build
   const InfrastructureManagement::MainStructureElement &mse = m_ismDtc->mainStructureElement(buildingId);
 
   
-  for (const InfrastructureManagement::StructureElement &element : mse.elements())
+  for (const InfrastructureManagement::StructureElement &element : mse.elements)
   {
-    if (element.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor)
+    if (element.structureElementTypeId != InfrastructureManagement::StructureElementType::Floor)
       continue;
 
-    const int floorId = element.id();
+    const int floorId = element.id;
 
     
     
@@ -618,7 +628,7 @@ QMap<int, double> BuildingOwnership::retrieveBuildingAbsHeightInternal(int build
     
     
     
-    double height = element.geoPosition().z();
+    double height = element.geoPosition.z;
 
     
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
index ef0d7076d..3acb07240 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
@@ -39,7 +39,7 @@ BuildingHitlineInfo2SituationMap::~BuildingHitlineInfo2SituationMap()
 
 int32_t BuildingHitlineInfo2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool BuildingHitlineInfo2SituationMap::init(PluginProvider *pluginProvider)
@@ -152,10 +152,10 @@ bool BuildingHitlineInfo2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMa
 
   const auto cb = [this, simIdOut, &umodOut](const Sim2SituationMap::DDS_T & ddsData) -> bool
   {
-    if (ddsData.id() == simIdOut)
+    if (ddsData.id == simIdOut)
     {
-      umodOut.m_partyId         = ddsData.originatorPartyId();
-      const int32_t originatorChargeTypeId = ddsData.chargeTypeId();
+      umodOut.m_partyId         = ddsData.originatorPartyId;
+      const int32_t originatorChargeTypeId = ddsData.chargeTypeId;
       umodOut.m_description1    = chargeTypeIdentifier(originatorChargeTypeId);
       return true; 
     }
@@ -182,24 +182,24 @@ void BuildingHitlineInfo2SituationMap::onMainStructureElementChanged(const Infra
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    if (mse.modelId() != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
+    if (mse.modelId != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
     {
-      DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id() << " z=" << mse.geoPosition().z();
-      m_buildingHeight.insert(mse.id(), mse.geoPosition().z());
+      DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id << " z=" << mse.geoPosition.z;
+      m_buildingHeight.insert(mse.id, mse.geoPosition.z);
     }
     break;
   }
   case DataModification::eRemoved:
-    m_buildingHeight.remove(mse.id());
+    m_buildingHeight.remove(mse.id);
     break;
   }
 }
 
 bool isValidPos(const Core::GeoPosition &pos)
 {
-  if (qFuzzyIsNull(pos.lat()) && qFuzzyIsNull(pos.lon()))
+  if (qFuzzyIsNull(pos.lat) && qFuzzyIsNull(pos.lon))
     return false;
-  return !std::isnan(pos.lat()) && !std::isnan(pos.lon());
+  return !std::isnan(pos.lat) && !std::isnan(pos.lon);
 }
 
 bool BuildingHitlineInfo2SituationMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
@@ -214,11 +214,11 @@ bool BuildingHitlineInfo2SituationMap::isElapsed(const Sim2SituationMap::DDS_T &
   
   
   {
-    const Core::GeoPosition &startGeoPos = data.originatorPos();
+    const Core::GeoPosition &startGeoPos = data.originatorPos;
     if (!isValidPos(startGeoPos))
       return true;
 
-    const Core::GeoPosition &endGeoPos   = data.buildingPos();
+    const Core::GeoPosition &endGeoPos   = data.buildingPos;
     if (!isValidPos(endGeoPos))
       return true;
   }
@@ -238,7 +238,7 @@ bool BuildingHitlineInfo2SituationMap::isElapsed(const Sim2SituationMap::DDS_T &
 bool BuildingHitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
                                                          RefPointer<MAP_T> mapObj)
 {
-  const qint32 hitlineId = ddsData.id();
+  const qint32 hitlineId = ddsData.id;
   TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " id=" << hitlineId;
 
   
@@ -247,7 +247,7 @@ bool BuildingHitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap:
 
   
   LineStyle ls = mapObj->lineStyle();
-  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
   switch (sct)
   {
   case SpecialChargeType::LRF:
@@ -264,22 +264,22 @@ bool BuildingHitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap:
   mapObj->setLineStyle(ls);
 
   
-  mapObj->setPartyId(ddsData.originatorPartyId());
+  mapObj->setPartyId(ddsData.originatorPartyId);
 
   
-  const int32_t originatorChargeTypeId = ddsData.chargeTypeId();
+  const int32_t originatorChargeTypeId = ddsData.chargeTypeId;
   mapObj->setIdentifier(chargeTypeIdentifier(originatorChargeTypeId));
 
 
   
-  const Core::GeoPosition &startGeoPos = ddsData.originatorPos();
-  const Core::GeoPosition &endGeoPos   = ddsData.buildingPos();
+  const Core::GeoPosition &startGeoPos = ddsData.originatorPos;
+  const Core::GeoPosition &endGeoPos   = ddsData.buildingPos;
 
-  int bldgId = ddsData.buildingId(); 
+  int bldgId = ddsData.buildingId; 
   double buildingHeight = m_buildingHeight.value(bldgId, 0); 
 
-  mapObj->setStartAndEndPoint(Point3D(startGeoPos.lon(), startGeoPos.lat(), startGeoPos.z()),
-                              Point3D(endGeoPos.lon(), endGeoPos.lat(), endGeoPos.z()-buildingHeight));
+  mapObj->setStartAndEndPoint(Point3D(startGeoPos.lon, startGeoPos.lat, startGeoPos.z),
+                              Point3D(endGeoPos.lon, endGeoPos.lat, endGeoPos.z-buildingHeight));
 
   
   handleSymbolAppearanceSettings(mapObj, ddsData);
@@ -318,10 +318,10 @@ void BuildingHitlineInfo2SituationMap::handleSymbolAppearanceSettings()
 {
   for (const Buildings::BuildingHitLineInfo &buildingHitline : std::as_const(m_ddsDataContainer))
   {
-    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(buildingHitline.id(), INVALID_MAP_ID);
+    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(buildingHitline.id, INVALID_MAP_ID);
     if (uniqueMapId == INVALID_MAP_ID)
     {
-      WARNING_LOG(m_logger) << LOGFUNCTION << "Found a buildingHitline which is in internal map but has no map object...: " << buildingHitline.id();
+      WARNING_LOG(m_logger) << LOGFUNCTION << "Found a buildingHitline which is in internal map but has no map object...: " << buildingHitline.id;
       continue;
     }
     RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
@@ -351,7 +351,7 @@ void BuildingHitlineInfo2SituationMap::handleSymbolAppearanceSettings(RefPointer
     
     QTimer::singleShot(200, this, [this, ddsData]()
     {
-      RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id());
+      RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id);
       if (!mapObj.valid())
         return;
       handleSymbolAppearanceSettings(mapObj, ddsData);
@@ -378,7 +378,7 @@ bool BuildingHitlineInfo2SituationMap::isVisible(const Sim2SituationMap::DDS_T &
 bool BuildingHitlineInfo2SituationMap::visibleBySymbolPartyAppearance(const Sim2SituationMap::DDS_T &ddsData) const
 {
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
-  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.originatorPartyId());
+  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.originatorPartyId);
   return spa.isVisible;
 }
 
@@ -391,7 +391,7 @@ bool BuildingHitlineInfo2SituationMap::visibleByParticipants(const Sim2Situation
     return true;
 
   bool bParticipantExists = true;
-  bool bRet = m_participant2SituationMap->isParticipantVisible(ddsData.originatorParticipantId(), &bParticipantExists);
+  bool bRet = m_participant2SituationMap->isParticipantVisible(ddsData.originatorParticipantId, &bParticipantExists);
   if (!bParticipantExists && bUncertain)
     *bUncertain = true;
 
@@ -402,7 +402,7 @@ bool BuildingHitlineInfo2SituationMap::visibleByHitLineDisplayLength(const qint6
 {
   qint64 displayLength = m_currentSymbolSettings.symbolSettings.hitLineDisplayLengthMSec;
 
-  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
   switch (sct)
   {
   case SpecialChargeType::LRF:
@@ -425,7 +425,7 @@ bool BuildingHitlineInfo2SituationMap::visibleByHitLineDisplayLength(const qint6
 
   if (displayLength < 0)
     return true;
-  return (newPartitionTime - ddsData.sampleTime()) <= displayLength;   
+  return (newPartitionTime - ddsData.sampleTime) <= displayLength;   
 }
 
 void BuildingHitlineInfo2SituationMap::onPartitionTimeChanged()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
index 504d3abd8..fca6a9b7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
@@ -25,7 +25,7 @@ namespace SituationMap
 
 int32_t Building2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool Building2SituationMap::init(PluginProvider *pluginProvider, bool enableDamageVisualization)
@@ -95,7 +95,7 @@ bool Building2SituationMap::isElapsed(const InfrastructureManagement::MainStruct
 
   
   
-  const InfrastructureManagement::StructureElementType set = ddsData.structureElementTypeId().underlying();
+  const InfrastructureManagement::StructureElementType set = ddsData.structureElementTypeId;
   if ((set == InfrastructureManagement::StructureElementType::MeteoDataUnit) ||
       (set == InfrastructureManagement::StructureElementType::RadioStation) ||
       (set == InfrastructureManagement::StructureElementType::ApproachingPoint)
@@ -116,12 +116,12 @@ bool Building2SituationMap::isElapsed(const InfrastructureManagement::MainStruct
   
 
 
-  const qint32 mseId = ddsData.id();
+  const qint32 mseId = ddsData.id;
   const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(mseId);
-  if (mainFootprint.elements().size() < 3)
+  if (mainFootprint.elements.size() < 3)
   {
     ERROR_LOG(m_logger) << LOGFUNCTION << " mainFootprint with id=" << mseId << " is not sufficiant."
-                        << " mainFootprint.elements().size() = " << mainFootprint.elements().size();
+                        << " mainFootprint.elements().size() = " << mainFootprint.elements.size();
     if (!m_mseIdWithoutValidFootprint.contains(mseId))
     {
       INFO_LOG(m_logger) << LOGFUNCTION << " Save for future mainFootPrintChanged..."
@@ -170,10 +170,10 @@ bool Building2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Unifie
   if (m_bldDtc)
   {
     const Buildings::BuildingState &bldgState = m_bldDtc->buildingState(buildingId);
-    if (bldgState.id() == buildingId)
+    if (bldgState.id == buildingId)
     {
-      umodOut.m_participantData.m_vulnerabilityState = bldgState.vulnerabilityState().underlying();
-      umodOut.m_participantData.m_vulnerabilityString = ProjectDataManagement::toString(bldgState.vulnerabilityState());
+      umodOut.m_participantData.m_vulnerabilityState = static_cast<int>(bldgState.vulnerabilityState);
+      umodOut.m_participantData.m_vulnerabilityString = ProjectDataManagement::toString(bldgState.vulnerabilityState);
     }
   }
 
@@ -211,15 +211,15 @@ void Building2SituationMap::onMainFootprintChanged(const InfrastructureManagemen
 {
   if (modType == DataModification::eRemoved)
     return;
-  if (data.elements().size() < 3)
+  if (data.elements.size() < 3)
     return;
 
-  const int32_t mseId = data.id(); 
+  const int32_t mseId = data.id; 
   if (m_mseIdWithoutValidFootprint.contains(mseId))
   {
     
     const InfrastructureManagement::MainStructureElement &mseData = m_ismDtc->mainStructureElement(mseId);
-    if (mseData.id() == mseId)
+    if (mseData.id == mseId)
     {
       m_mseIdWithoutValidFootprint.removeAll(mseId);
       onMainStructureElementChanged(mseData, DataModification::eAdded);
@@ -237,7 +237,7 @@ void Building2SituationMap::onBuildingStateChanged(const Buildings::BuildingStat
 
 
 
-  const int buildingId = data.id(); 
+  const int buildingId = data.id; 
 
   auto it = m_simId2UniqueMapId.constFind(buildingId);
   if (it == m_simId2UniqueMapId.constEnd())
@@ -275,10 +275,10 @@ bool Building2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
                                               RefPointer<MAP_T> mapObj)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " id=" << ddsData.id()
-                      << " name=" << ddsData.name()
-                      << " geoPosition=" << ddsData.geoPosition()
-                      << " angle=" << ddsData.angle();
+                      << " id=" << ddsData.id
+                      << " name=" << ddsData.name
+                      << " geoPosition=" << ddsData.geoPosition
+                      << " angle=" << ddsData.angle;
 
   
   
@@ -296,8 +296,8 @@ bool Building2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
   bool isGroundLevel = false;
   const QPolygonF &absUtmPositions2D = m_ismDtc->getUtmFootprintById(buildingId, zoneOut, isGroundLevel);
 
-  const Core::GeoPosition &geoPosition = ddsData.geoPosition();
-  const QPointF referencePointGeo(geoPosition.lon(), geoPosition.lat());
+  const Core::GeoPosition &geoPosition = ddsData.geoPosition;
+  const QPointF referencePointGeo(geoPosition.lon, geoPosition.lat);
 
   
   PositionCont absPositionsGeo;
@@ -344,7 +344,7 @@ bool Building2SituationMap::updateBldgDamage(RefPointer<MAP_T> mapObj, qint32 bu
     return false;
 
   const Buildings::BuildingState &bldgState = m_bldDtc->buildingState(buildingId);
-  const bool bIsContaminated = !bldgState.contaminationStates().empty();
+  const bool bIsContaminated = !bldgState.contaminationStates.empty();
 
   
   LineStyle ls = mapObj->lineStyle();
@@ -358,11 +358,11 @@ bool Building2SituationMap::updateBldgDamage(RefPointer<MAP_T> mapObj, qint32 bu
   FillStyle fs = mapObj->fillStyle();
   fs.setFillPattern(FillPattern::Solid);
 
-  int damagePercent = bldgState.damagePercent();
+  int damagePercent = bldgState.damagePercent;
 
   
   
-  if (bldgState.id() != buildingId)
+  if (bldgState.id != buildingId)
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " simId/buildingId = " << buildingId
                         << " not found!! (mapObj = " << mapObj->debugInfo() << ")";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
index 840d80f0e..fe7ebb3d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
@@ -3,6 +3,7 @@
 
 #include "charge_effect_to_map.h"
 #include <utility>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Dtc type for &Dtc::typeChanged (signal-pointer connect)
 #include "aes_to_situation_map_tmpl.h"
 #include <AreaEffectSimulation/Utils/polygons.h>
 #include <GuezIedManagement/gim_dtc.h>
@@ -142,53 +143,53 @@ int ChargeEffectToMap::getPartyIdFromOriginator(const int originatorId, const in
   int partyId = -1;
   switch (originatorType)
   {
-    case ProjectDataManagement::StateChangeOriginator::Participant:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant):
     {
       const auto &participant = m_pluginProvider->ppmDtc()->participant(originatorId);
-      partyId = participant.partyId();
+      partyId = participant.partyId;
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::Party:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party):
     {
       partyId = originatorId;
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation):
     {
       AreaEffectSimulation::AesItem aesItem;
       if (m_pluginProvider->aesDtc()->aesItemFromId(originatorId, aesItem))
-        partyId = aesItem.partyId().get();
+        partyId = aesItem.partyId.get();
 
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::DusMine:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine):
     {
       partyId = m_pluginProvider->aesDtc()->partyForDusMine(originatorId);
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::Unknown:
-    case ProjectDataManagement::StateChangeOriginator::ObserverController:
-    case ProjectDataManagement::StateChangeOriginator::Initialization:
-    case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl):
     {
       partyId = 1; 
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: 
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice): 
     {
       auto guezIedDtc = m_pluginProvider->gimDtc();
       if (guezIedDtc)
       {
         const GuezIedManagement::Ied &gIed = guezIedDtc->iedForEquipmentNumber(originatorId);
-        if (gIed.id() > 0)
-          partyId = gIed.partyId();
+        if (gIed.id > 0)
+          partyId = gIed.partyId;
       }
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-    case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-    case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-    case ProjectDataManagement::StateChangeOriginator::Sanitation:
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice):
+    case static_cast<int>(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation):
     default:
       DEBUG_LOG(m_logger) << LOGFUNCTION << " originator state change for " << originatorType << " not (yet) implemented >>> "
                           << ", originatorId = " << originatorId;
@@ -212,10 +213,10 @@ bool ChargeEffectToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMap
 
   const auto cb = [simIdOut, &umodOut](const AreaEffectSimulation::ChargeEffect &data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
       QString desc = QStringLiteral("id: %1\time: %2");
-      umodOut.m_description1 = desc.arg(data.id()).arg(QDateTime::fromMSecsSinceEpoch(data.sampleTime()).toString());
+      umodOut.m_description1 = desc.arg(data.id).arg(QDateTime::fromMSecsSinceEpoch(data.sampleTime).toString());
       return true; 
     }
     return false;
@@ -241,30 +242,30 @@ bool ChargeEffectToMap::updateElementImpl(const DDS_T &ddsData, RefPointer<MAP_T
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
   mapObj->setPickable(true);
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  const int partyId = getPartyIdFromOriginator(ddsData.originatorId(), ddsData.originatorTypeId().underlying());
+  const int partyId = getPartyIdFromOriginator(ddsData.originatorId, static_cast<int>(ddsData.originatorTypeId));
   mapObj->setPartyId(partyId);
 
   
   
   
-  const bool bIsSmoke = m_pluginProvider->pdmDtc()->isSmoke(ddsData.chargeTypeId(), ddsData.igniterTypeId(), ddsData.igniterFunctionId());
+  const bool bIsSmoke = m_pluginProvider->pdmDtc()->isSmoke(ddsData.chargeTypeId, ddsData.igniterTypeId, ddsData.igniterFunctionId);
   if (bIsSmoke)
     mapObj->forcePartyColor(Qt::darkYellow);
 
   
-  const Core::GeoPosition &impactGeoPos = ddsData.position();
-  const Point3D origin = LtsUtils::QPoint3D(impactGeoPos.lon(), impactGeoPos.lat(), impactGeoPos.z());
-  double impactRadius = m_pluginProvider->pdmDtc()->impactRadius(ddsData.chargeTypeId(), ddsData.igniterTypeId(), ddsData.igniterFunctionId()); 
+  const Core::GeoPosition &impactGeoPos = ddsData.position;
+  const Point3D origin = LtsUtils::QPoint3D(impactGeoPos.lon, impactGeoPos.lat, impactGeoPos.z);
+  double impactRadius = m_pluginProvider->pdmDtc()->impactRadius(ddsData.chargeTypeId, ddsData.igniterTypeId, ddsData.igniterFunctionId); 
   if (impactRadius <= 5)
     impactRadius = 5; 
 
   const auto polygon = form2PosCont(AreaEffectSimulation::Polygons::circle(origin.toPointF(), impactRadius));
   mapObj->setPositions(polygon);
 
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.state().underlying();
-  mapObj->setAesState(effectState2aesState(effectState.underlying()));
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.state;
+  mapObj->setAesState(effectState2aesState(effectState));
 
   
   updateVisibility(mapObj, ddsData);
@@ -283,7 +284,7 @@ bool ChargeEffectToMap::isElapsed(const DDS_T &data) const
   return bIsElapsed;
 }
 
-int32_t ChargeEffectToMap::getSimId(const DDS_T &ddsData) const { return ddsData.id(); }
+int32_t ChargeEffectToMap::getSimId(const DDS_T &ddsData) const { return ddsData.id; }
 
 bool ChargeEffectToMap::removeElement(const int32_t simId) { return BaseClass::removeElement(simId); }
 
@@ -327,7 +328,7 @@ void ChargeEffectToMap::handleSymbolAppearanceSettings(RefPointer<MAP_T> &mapObj
 
   const int simId = m_uniqueMapId2SimId.value(mapObj->uniqueMapId());
   const auto &data = m_pluginProvider->aesDtc()->chargeEffect(simId);
-  if (data.id() <= 0)
+  if (data.id <= 0)
   {
     WARNING_LOG(m_logger) << "[handleSymbolAppearanceSettings] data id is invalid! mapObjUniqueId: " << mapObj->uniqueMapId();
     return;
@@ -345,17 +346,17 @@ void ChargeEffectToMap::updateAllChargeEffects()
     if (isElapsed(data))
       return false;
 
-    const UniqueMapId uniqueMapId = this->m_simId2UniqueMapId.value(data.id(), INVALID_MAP_ID);
+    const UniqueMapId uniqueMapId = this->m_simId2UniqueMapId.value(data.id, INVALID_MAP_ID);
     if (uniqueMapId == INVALID_MAP_ID)
     {
-      WARNING_LOG(m_logger) << " [updateAllChargeEffects] !!! Found a ChargeEffect which is in internal map but has no map object...: data.id: " << data.id();
+      WARNING_LOG(m_logger) << " [updateAllChargeEffects] !!! Found a ChargeEffect which is in internal map but has no map object...: data.id: " << data.id;
       return false;
     }
 
     RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
     if (!mapObj.valid())
     {
-      WARNING_LOG(m_logger) << " [updateAllChargeEffects] !!! invalid map object...: data.id: " << data.id();
+      WARNING_LOG(m_logger) << " [updateAllChargeEffects] !!! invalid map object...: data.id: " << data.id;
       return false;
     }
     this->updateVisibility(mapObj, data);
@@ -371,7 +372,7 @@ void ChargeEffectToMap::updateVisibility(RefPointer<MAP_T> &mapObj, const Sim2Si
 
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
   const bool isVisi = isVisible(data);
-  INFO_LOG(m_logger) << " [updateVisibility]: >> data.id: " << data.id() << " is visible? " << isVisi;
+  INFO_LOG(m_logger) << " [updateVisibility]: >> data.id: " << data.id << " is visible? " << isVisi;
 
   if (isVisi) 
   {
@@ -398,8 +399,8 @@ void ChargeEffectToMap::updateVisibility(RefPointer<MAP_T> &mapObj, const Sim2Si
 
 void ChargeEffectToMap::updateGunToTargetLine_SimpleOnSurface(RefPointer<MAP_T> &mapObj, const DDS_T &data)
 {
-  const Core::GeoPosition2D &impactPos2D = data.position();
-  const Point3D origin = LtsUtils::QPoint3D(impactPos2D.lon(), impactPos2D.lat(), .0);
+  const Core::GeoPosition2D &impactPos2D = data.position;
+  const Point3D origin = LtsUtils::QPoint3D(impactPos2D.lon, impactPos2D.lat, .0);
   
 
   
@@ -417,10 +418,10 @@ void ChargeEffectToMap::updateGunToTargetLine_SimpleOnSurface(RefPointer<MAP_T>
     
     Point3D originatorPos;
     Point3D targetPos;
-    if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant)
+    if (data.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
     {
-      const auto &ppPos = m_pluginProvider->ppmDtc()->participantPosition(data.originatorId());
-      originatorPos = Point3D(ppPos.pos().lon(), ppPos.pos().lat(), ppPos.pos().z());
+      const auto &ppPos = m_pluginProvider->ppmDtc()->participantPosition(data.originatorId);
+      originatorPos = Point3D(ppPos.pos.lon, ppPos.pos.lat, ppPos.pos.z);
       targetPos = origin;
     }
     mapObj->setGunToTargetLineSurface(originatorPos, targetPos);
@@ -437,10 +438,10 @@ bool ChargeEffectToMap::updateSingleTrajectory(const AreaEffectSimulation::Traje
 
   
   
-  if (traj.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::ChargeEffect)
+  if (traj.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect)
     return false;
 
-  const int32_t simId = traj.originatorId(); 
+  const int32_t simId = traj.originatorId; 
   if (!m_simId2UniqueMapId.contains(simId))
     return false;
 
@@ -454,9 +455,9 @@ bool ChargeEffectToMap::updateSingleTrajectory(const AreaEffectSimulation::Traje
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START "
                       << ", simId=" << simId << ", traj=" << traj << ", considerTime=" << considerTime
-                      << ", partitionTimeMsec - traj.trajectoryStartTime() = " << partitionTimeMsec - traj.trajectoryStartTime();
+                      << ", partitionTimeMsec - traj.trajectoryStartTime() = " << partitionTimeMsec - traj.trajectoryStartTime;
 
-  if (traj.trajectoryStartTime() > partitionTimeMsec)
+  if (traj.trajectoryStartTime > partitionTimeMsec)
     return false;
 
   
@@ -480,7 +481,7 @@ bool ChargeEffectToMap::updateSingleTrajectory(const AreaEffectSimulation::Traje
   {
     
     
-    const std::vector<Core::GeoPositionRelativeTime> &geometry = traj.geometry();
+    const std::vector<Core::GeoPositionRelativeTime> &geometry = traj.geometry;
     const PositionCont &curPath = mapObj->trajectory(index);
     if (geometry.size() > static_cast<size_t>(curPath.size()))
     {
@@ -489,9 +490,9 @@ bool ChargeEffectToMap::updateSingleTrajectory(const AreaEffectSimulation::Traje
       posCont.reserve(geometry.size());
       for (const Core::GeoPositionRelativeTime &posTime : std::as_const(geometry))
       {
-        if (considerTime && ((traj.trajectoryStartTime() + posTime.relativeTime()) > partitionTimeMsec))
+        if (considerTime && ((traj.trajectoryStartTime + posTime.relativeTime) > partitionTimeMsec))
           break;
-        posCont.append(Point3D(posTime.lon(), posTime.lat(), posTime.z()));
+        posCont.append(Point3D(posTime.lon, posTime.lat, posTime.z));
       }
 
       DEBUG_LOG(m_logger) << "update trajectory, simId=" << simId << ", index=" << index << ", posCont.size() " << posCont.size();
@@ -553,16 +554,16 @@ void ChargeEffectToMap::updateImpacts2D3D(RefPointer<MAP_T> &mapObj, const DDS_T
       = {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired};
 
   
-  const bool bDisplayDueToEffectState = relevantEffectStates.contains(data.state().underlying());
+  const bool bDisplayDueToEffectState = relevantEffectStates.contains(data.state);
 
   if (bDisplayDueToEffectState)
   {
     
-    const Core::GeoPosition &impactGeoPos = data.position();
-    const Point3D &origin = LtsUtils::QPoint3D(impactGeoPos.lon(), impactGeoPos.lat(), impactGeoPos.z());
+    const Core::GeoPosition &impactGeoPos = data.position;
+    const Point3D &origin = LtsUtils::QPoint3D(impactGeoPos.lon, impactGeoPos.lat, impactGeoPos.z);
 
-    const Core::ZReference zReference = data.zReference();
-    switch (zReference.underlying())
+    const Core::ZReference zReference = data.zReference;
+    switch (zReference)
     {
       case Core::ZReference::ZrDrapedOnGround:
         mapObj->setImpacts({origin}); 
@@ -584,8 +585,8 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer<MAP_T> &mapObj, const DDS_
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START ";
 
-  const int32_t simId = data.id(); 
-  const AreaEffectSimulation::AesEffectState effectState = data.state();
+  const int32_t simId = data.id; 
+  const AreaEffectSimulation::AesEffectState effectState = data.state;
 
   bool bHasChanged = false;
 
@@ -604,22 +605,22 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer<MAP_T> &mapObj, const DDS_
   static QVector<AreaEffectSimulation::AesEffectState> relevantEffectStates
       = {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired, AreaEffectSimulation::AesEffectState::EsExpired};
 
-  bDisplay = bDisplay && relevantEffectStates.contains(effectState.underlying());
+  bDisplay = bDisplay && relevantEffectStates.contains(effectState);
 
-  const qint64 age = partitionTimeMsec - data.effectStart() + data.effectDuration();
-  DEBUG_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId << ", bDisplay=" << bDisplay<<" effectState: "<<data.state()<<" age[msec]: "<<age;
+  const qint64 age = partitionTimeMsec - data.effectStart + data.effectDuration;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId << ", bDisplay=" << bDisplay<<" effectState: "<<data.state<<" age[msec]: "<<age;
 
   if (bDisplay && age <= s_effect3dMaxDisplayDuration)
   {
-    double impactRadius = m_pluginProvider->pdmDtc()->impactRadius(data.chargeTypeId(), data.igniterTypeId(), data.igniterFunctionId());
+    double impactRadius = m_pluginProvider->pdmDtc()->impactRadius(data.chargeTypeId, data.igniterTypeId, data.igniterFunctionId);
     if (impactRadius <= 5)
       impactRadius = 5; 
 
-    const Core::GeoPosition &effectGeoPos = data.position();
-    const Point3D &origin = Point3D(effectGeoPos.lon(), effectGeoPos.lat(), effectGeoPos.z());
-    const Core::ZReference &zRef = data.zReference();
+    const Core::GeoPosition &effectGeoPos = data.position;
+    const Point3D &origin = Point3D(effectGeoPos.lon, effectGeoPos.lat, effectGeoPos.z);
+    const Core::ZReference &zRef = data.zReference;
 
-    switch (zRef.underlying())
+    switch (zRef)
     {
       case Core::ZReference::ZrDrapedOnGround:
         if (mapObj->setDetonationsDraped({origin}, std::round(impactRadius)))
@@ -658,7 +659,7 @@ bool ChargeEffectToMap::isVisible(const DDS_T &data) const
 bool ChargeEffectToMap::visibleBySymbolPartyAppearance(const DDS_T &data) const
 {
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
-  const int partyId = getPartyIdFromOriginator(data.originatorId(), data.originatorTypeId().underlying());
+  const int partyId = getPartyIdFromOriginator(data.originatorId, static_cast<int>(data.originatorTypeId));
   const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(partyId);
   return spa.isVisible;
 }
@@ -668,14 +669,14 @@ bool ChargeEffectToMap::visibleByAesFilter(const DDS_T &data) const
   if (!m_displayFilter)
     return true; 
 
-  switch (data.state().underlying())
+  switch (data.state)
   {
     case AreaEffectSimulation::AesEffectState::EsError:
     case AreaEffectSimulation::AesEffectState::EsUnknown:
     case AreaEffectSimulation::AesEffectState::EsRemoved:
     case AreaEffectSimulation::AesEffectState::EsReceived:
     case AreaEffectSimulation::AesEffectState::EsFired:
-      DEBUG_LOG(m_logger) << "[visibleByAesFilter] set unvisible id: " << data.id() << ", state:" << data.state();
+      DEBUG_LOG(m_logger) << "[visibleByAesFilter] set unvisible id: " << data.id << ", state:" << data.state;
       return false;
     case AreaEffectSimulation::AesEffectState::EsCreated:
       DEBUG_LOG(m_logger) << "[visibleByAesFilter][EsCreated] created visible: " << m_effectStateStruct.displayCreated;
@@ -689,7 +690,7 @@ bool ChargeEffectToMap::visibleByAesFilter(const DDS_T &data) const
       return m_effectStateStruct.displayActivated;
     case AreaEffectSimulation::AesEffectState::EsExpired:
     {
-      auto timeTriggered = data.sampleTime();
+      auto timeTriggered = data.sampleTime;
       const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions);
       const auto afterGlow = m_effectStateStruct.expiredAfterglowDurationMSec;
       DEBUG_LOG(m_logger) << "[visibleByAesFilter] [EsExpired] >>> partitionTime: " << m_pluginProvider->partitionTime() << " timeTriggered: " << timeTriggered
@@ -705,8 +706,8 @@ void ChargeEffectToMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType
 {
   DEBUG_LOG(m_logger) << "[ChargeEffectToMap] onAesDisplayFilterChanged aes Type: " << aesType;
   if (!m_displayFilter
-      || ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying())
-          && (AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying())))
+      || ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType)
+          && (AreaEffectSimulation::AesType::AtExplosionArea != aesType)))
     return;
 
   m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType::AtExplosionArea);
@@ -717,8 +718,8 @@ void ChargeEffectToMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType
 
 void ChargeEffectToMap::onChargeEffectChanged(const DDS_T &data, DataModification modType)
 {
-  INFO_LOG(m_logger) << "[onChargeEffectChanged] >>> " << data.id() << " name: " << data.name() << " originId: " << data.originatorId()
-                     << " originTypeId: " << data.originatorTypeId().underlying() << " chargeTypeId: " << data.chargeTypeId() << " state: " << data.state();
+  INFO_LOG(m_logger) << "[onChargeEffectChanged] >>> " << data.id << " name: " << data.name << " originId: " << data.originatorId
+                     << " originTypeId: " << data.originatorTypeId << " chargeTypeId: " << data.chargeTypeId << " state: " << data.state;
   this->handleChanged(data, modType);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.cpp
index 7eb066eef..90d53d947 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.cpp
@@ -37,16 +37,16 @@ bool DangerArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &d
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
   
   
   
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtDangerArea, itemView))
     this->updateGeometry(itemView, mapObj);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp
index 2c09200fb..261a0c914 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp
@@ -5,7 +5,7 @@
 #include <AreaEffectSimulation/Utils/polygons.h>      
 #include <AreaEffectSimulation/Utils/ddsdbconvert.h>  
 
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 #include <SituationMap/Symbology/sidc_codec.h>
 
@@ -62,10 +62,10 @@ bool DusSingleMine2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, U
 
   const std::function<bool(const AreaEffectSimulation::DusSingleMine &data)> cb = [simIdOut, &umodOut](const AreaEffectSimulation::DusSingleMine & data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
 
-      umodOut.m_description2 = QString::number(data.mineId());
+      umodOut.m_description2 = QString::number(data.mineId);
       return true; 
     }
     return false;
@@ -100,13 +100,13 @@ bool DusSingleMine2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 
 
   
-  mapObj->setOrigin(Point3D(ddsData.position().lon(), ddsData.position().lat(), .0));
+  mapObj->setOrigin(Point3D(ddsData.position.lon, ddsData.position.lat, .0));
 
 
 
 
   
-  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation, QString::number(ddsData.mineId()));
+  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation, QString::number(ddsData.mineId));
   
   updateVisibility(ddsData, mapObj);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
index 3548cca91..cf050c1f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
@@ -4,10 +4,11 @@
 #include "effect_cluster_to_map.h"
 #include <utility>
 #include "pdm_handler.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AreaEffectSimulation/Utils/polygons.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Map/map.h>
 
 #define ADD_UNIQUE_MAP_ID_TO_NOTIFIY(uniqueMapId) addUniqueMapIdToNotifiy(uniqueMapId, __FILE__, __LINE__)
@@ -124,8 +125,8 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
     return false;
   }
 
-  const int32_t simId = ddsData.id();
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId().underlying();
+  const int32_t simId = ddsData.id;
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId;
 
   bool bIsMode3D = false;
   if (m_objFac.map() && (m_objFac.map()->mode() == Mode::Mode_3D))
@@ -156,14 +157,14 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
     
     
     AreaEffectSimulation::AesItemView itemViewGunToTargetLine;
-    const std::vector<Core::GeoPosition>& form = itemViewGunToTargetLine.form(); 
+    const std::vector<Core::GeoPosition>& form = itemViewGunToTargetLine.form; 
     if (bDisplayFilterShowGTL || bDisplayFilterShowGFK)
       m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtEffectClusterGunToTargetLine, itemViewGunToTargetLine);
 
     
     if (bDisplayFilterShowGTL && (form.size() >= 2))
-      mapObj->setGunToTargetLineSurface(Point3D(form.front().lon(), form.front().lat(), 0.0),
-                                        Point3D(form.back().lon() , form.back().lat() , 0.0));
+      mapObj->setGunToTargetLineSurface(Point3D(form.front().lon, form.front().lat, 0.0),
+                                        Point3D(form.back().lon , form.back().lat , 0.0));
     else
       mapObj->setGunToTargetLineSurface(Point3D(), Point3D());
 
@@ -176,7 +177,7 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
         PositionCont gunToTargetPath;
         gunToTargetPath.reserve(static_cast<int>(form.size()));
         for (const Core::GeoPosition& item : std::as_const(form))
-          gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
+          gunToTargetPath.append(Point3D(item.lon, item.lat, item.z));
 
         mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
       } else {
@@ -192,11 +193,11 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
       bDisplayFilterShowMHP = m_displayFilter->showExplosionClusterMeanHitPoint(); 
 
     PositionCont mhps;
-    mhps.reserve(static_cast<int>(ddsData.effectors().size()));
-    for (const auto &effector : std::as_const(ddsData.effectors()))
+    mhps.reserve(static_cast<int>(ddsData.effectors.size()));
+    for (const auto &effector : std::as_const(ddsData.effectors))
     {
-      const Core::GeoPosition &mhpPos = effector.mhpPosition();
-      mhps.append(Point3D(mhpPos.lon(), mhpPos.lat(), mhpPos.z())); 
+      const Core::GeoPosition &mhpPos = effector.mhpPosition;
+      mhps.append(Point3D(mhpPos.lon, mhpPos.lat, mhpPos.z)); 
     }
     if (bDisplayFilterShowMHP)
     {
@@ -204,8 +205,8 @@ bool EffectCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TY
       
       
       QColor impactsColor;
-      const auto &chargeStruct = ddsData.chargeStruct();
-      const bool bIsSmoke = m_pluginProvider->pdmDtc()->isSmoke(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
+      const auto &chargeStruct = ddsData.chargeStruct;
+      const bool bIsSmoke = m_pluginProvider->pdmDtc()->isSmoke(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
       if (bIsSmoke)
         impactsColor = Qt::darkYellow;
       mapObj->setScheduledImpacts(mhps, impactsColor);
@@ -228,18 +229,18 @@ bool EffectCluster2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 
   BENCHMARK_SETUP_AND_START();
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId().underlying();
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId;
   mapObj->setAesState(effectState2aesState(effectState));
 
 
@@ -305,7 +306,7 @@ bool EffectCluster2SituationMap::updateGeometry(const AreaEffectSimulation::AesI
   
 
   
-  const int simId = aesItemView.aesItemId();
+  const int simId = aesItemView.aesItemId;
   auto it = m_ddsDataContainer.find(simId);
   if (it != m_ddsDataContainer.end())
     updateNonLethalArea(mapObj, *it, aesItemView);
@@ -326,13 +327,13 @@ bool EffectCluster2SituationMap::onAesItemViewChanged(const AreaEffectSimulation
 
 
 
-  const int simId = aesItemView.aesItemId();
+  const int simId = aesItemView.aesItemId;
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
 
   bool success = false;
 
-  if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType::AtEffectClusterGunToTargetLine)
+  if (aesItemView.aesTypeId == AreaEffectSimulation::AesType::AtEffectClusterGunToTargetLine)
   {
     
     RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(simId);
@@ -348,13 +349,13 @@ bool EffectCluster2SituationMap::onAesItemViewChanged(const AreaEffectSimulation
 bool EffectCluster2SituationMap::updateGunToTargetLineAndTrajectory(const AreaEffectSimulation::AesItemView &itemView,
                                                                        RefPointer<Sim2SituationMap::MAP_T> mapObj)
 {
-  const std::vector<Core::GeoPosition>& formRef = itemView.form();
+  const std::vector<Core::GeoPosition>& formRef = itemView.form;
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, form.size = " << formRef.size();
 
   if (formRef.size() >= 2)
   {
-    mapObj->setGunToTargetLineSurface(Point3D(formRef.front().lon(), formRef.front().lat(), 0.0),
-                                      Point3D(formRef.back().lon() , formRef.back().lat() , 0.0));
+    mapObj->setGunToTargetLineSurface(Point3D(formRef.front().lon, formRef.front().lat, 0.0),
+                                      Point3D(formRef.back().lon , formRef.back().lat , 0.0));
   } else {
     
     mapObj->setGunToTargetLineSurface(Point3D(), Point3D());
@@ -366,7 +367,7 @@ bool EffectCluster2SituationMap::updateGunToTargetLineAndTrajectory(const AreaEf
     PositionCont gunToTargetPath;
     gunToTargetPath.reserve(static_cast<int>(formRef.size()));
     for (const Core::GeoPosition& item : std::as_const(formRef))
-      gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
+      gunToTargetPath.append(Point3D(item.lon, item.lat, item.z));
 
     mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
   }
@@ -400,7 +401,7 @@ bool EffectCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2SituationMap
   if (!m_pdmHandler)
     return false;
 
-  if (EffectCluster.id() != aesItemView.aesItemId())
+  if (EffectCluster.id != aesItemView.aesItemId)
     return false;
 
   
@@ -410,11 +411,11 @@ bool EffectCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2SituationMap
   
 
 
-  const int chargeTypeId = EffectCluster.chargeStruct().chargeTypeId();
+  const int chargeTypeId = EffectCluster.chargeStruct.chargeTypeId;
   const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(chargeTypeId);
-  if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport)
+  if (gc == ProjectDataManagement::GearClass::GearClass_AirSupport)
   {
-    const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(EffectCluster.chargeStruct());
+    const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(EffectCluster.chargeStruct);
     
     
     
@@ -423,13 +424,13 @@ bool EffectCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2SituationMap
       const ProjectDataManagement::CasEffect &ce = casEffectsVec[1];
 
       
-      const double impactRadius                 = ce.impactRadius();
+      const double impactRadius                 = ce.impactRadius;
 
-      const AreaEffectSimulation::Area &areaRef = EffectCluster.area();
+      const AreaEffectSimulation::Area &areaRef = EffectCluster.area;
       
-      const Core::GeoPosition2D &blGeo          = aesItemView.boundingBoxBottomLeft();
-      const QPointF &centerGeo = AreaEffectSimulation::Polygons::bottomLeft2CenterPoint(QPointF(blGeo.lon(), blGeo.lat()),
-                                                                                      areaRef.width(), areaRef.height(), areaRef.rotation());
+      const Core::GeoPosition2D &blGeo          = aesItemView.boundingBoxBottomLeft;
+      const QPointF &centerGeo = AreaEffectSimulation::Polygons::bottomLeft2CenterPoint(QPointF(blGeo.lon, blGeo.lat),
+                                                                                      areaRef.width, areaRef.height, areaRef.rotation);
 
       updateNonLethalArea(mapObj, centerGeo, impactRadius);
     }
@@ -512,24 +513,24 @@ AreaEffectSimulation::AesType EffectCluster2SituationMap::aesTypeFromGearClassCh
 {
   static QMap<int, AreaEffectSimulation::AesType> s_aesTypeMap;
 
-  if (s_aesTypeMap.contains(data.chargeStruct().chargeTypeId()))
-    return s_aesTypeMap[data.chargeStruct().chargeTypeId()];
+  if (s_aesTypeMap.contains(data.chargeStruct.chargeTypeId))
+    return s_aesTypeMap[data.chargeStruct.chargeTypeId];
 
-  const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
-  switch (gc.underlying())
+  const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct.chargeTypeId);
+  switch (gc)
   {
   case ProjectDataManagement::GearClass::GearClass_AirSupport:
-    s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
+    s_aesTypeMap[data.chargeStruct.chargeTypeId] = AreaEffectSimulation::AesType::AtAirSupportImpact;
     break;
   case ProjectDataManagement::GearClass::GearClass_Artillery:
   case ProjectDataManagement::GearClass::GearClass_Mortar:
   case ProjectDataManagement::GearClass::GearClass_Rocket:
-    s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
+    s_aesTypeMap[data.chargeStruct.chargeTypeId] = AreaEffectSimulation::AesType::AtExplosionArea;
     break;
   default:
     return AreaEffectSimulation::AesType::AtUnknown;
   }
-  return s_aesTypeMap[data.chargeStruct().chargeTypeId()];
+  return s_aesTypeMap[data.chargeStruct.chargeTypeId];
 }
 
 void EffectCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
@@ -537,9 +538,9 @@ void EffectCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation:
   TRACE_LOG(m_logger) << " onAesDisplayFilterChanged, aesType =" << aesType
                       << ", this " << this;
 
-  if ((AreaEffectSimulation::AesType::AtEffectCluster != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtExplosionArea    != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying()))
+  if ((AreaEffectSimulation::AesType::AtEffectCluster != aesType) &&
+      (AreaEffectSimulation::AesType::AtExplosionArea    != aesType) &&
+      (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType))
     return;
 
   const auto cb = [this](const DDS_TYPE &data) -> bool
@@ -559,8 +560,8 @@ bool EffectCluster2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_T
   if (!m_displayFilter)
     return true;         
 
-  const auto es = data.effectStart().is_set() ? data.effectStart().get() : 0;
-  const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
+  const auto es = data.effectStart.has_value() ? data.effectStart.get() : 0;
+  const auto partyId = data.partyId.has_value() ? data.partyId.get() : -1;
   bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
   if (isVisibleByFilter)
   {
@@ -572,12 +573,12 @@ bool EffectCluster2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_T
     }
 
     isVisibleByFilter = m_displayFilter->isVisible(aestype,
-                                                   data.effectStateId(),
-                                                   data.chargeStruct().chargeTypeId(),
+                                                   data.effectStateId,
+                                                   data.chargeStruct.chargeTypeId,
                                                    partyId,
-                                                   data.isCentral(),
+                                                   data.isCentral,
                                                    es,
-                                                   data.effectDuration(),
+                                                   data.effectDuration,
                                                    m_pluginProvider->partitionTime());
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
index 4dc953ebd..c9b2b2e9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
@@ -152,11 +152,11 @@ bool EmergencyCallToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMa
 
  const auto cb = [ simIdOut, &umodOut](const AlarmManagement::AlmEmergencyCall & data) -> bool
  {
-   if (data.id() == simIdOut)
+   if (data.id == simIdOut)
    {
-     umodOut.m_equipmentNumber = data.issi();
+     umodOut.m_equipmentNumber = data.issi;
      QString desc = QStringLiteral("id: %1\ntime: %2");
-     umodOut.m_description1 = desc.arg(data.id()).arg(QDateTime::fromMSecsSinceEpoch(data.sampleTime()).toString());
+     umodOut.m_description1 = desc.arg(data.id).arg(QDateTime::fromMSecsSinceEpoch(data.sampleTime).toString());
      return true; 
    }
    return false;
@@ -188,12 +188,12 @@ bool EmergencyCallToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
   
   
 
-  bool bIsValid = m_showExpired || !data.expired();
+  bool bIsValid = m_showExpired || !data.expired;
 
   DEBUG_LOG(m_logger) << LOGFUNCTION
-                      << ", id: "<< data.id()
-                      << ", issi: "<< data.issi()
-                      << ", data.expired: " << data.expired()
+                      << ", id: "<< data.id
+                      << ", issi: "<< data.issi
+                      << ", data.expired: " << data.expired
                       << ", m_showExpired: " << m_showExpired
                       << " -> bIsValid=" << bIsValid;
 
@@ -203,22 +203,22 @@ bool EmergencyCallToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
 
 int32_t EmergencyCallToMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool EmergencyCallToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, RefPointer<Sim2SituationMap::MAP_T> mapObj)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << ", id " << ddsData.id();
+  TRACE_LOG(m_logger) << LOGFUNCTION << ", id " << ddsData.id;
 
   mapObj->setPickable(true);
   mapObj->setDrawOrder(1);
 
   
-  mapObj->setIdentifier(QStringLiteral("SOS_%1").arg(ddsData.issi())); 
+  mapObj->setIdentifier(QStringLiteral("SOS_%1").arg(ddsData.issi)); 
 
   TextStyle textStyle;
   textStyle.setSize(20);
-  if (ddsData.expired())
+  if (ddsData.expired)
     textStyle.setTextColor(Qt::gray);
   else
     textStyle.setTextColor(Qt::red);
@@ -227,18 +227,18 @@ bool EmergencyCallToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
   mapObj->setTextStyle(textStyle);
 
   
-  const Core::GeoPosition2D &geoPos = ddsData.position();
-  mapObj->setOrigin(Point3D(geoPos.lon(), geoPos.lat(), 0.0)); 
+  const Core::GeoPosition2D &geoPos = ddsData.position;
+  mapObj->setOrigin(Point3D(geoPos.lon, geoPos.lat, 0.0)); 
 
   
-  mapObj->setProxyImage(renderEmergencySymbol(ddsData.expired()), QSize(50, 50));
+  mapObj->setProxyImage(renderEmergencySymbol(ddsData.expired), QSize(50, 50));
 
   
   mapObj->setPinEnabled(true);
 
   forceEmergencyCallLayerVisibility();
 
-  emit emergencyCallUpdated(mapObj->identifier(), Point3D(geoPos.lon(), geoPos.lat(), 0)); 
+  emit emergencyCallUpdated(mapObj->identifier(), Point3D(geoPos.lon, geoPos.lat, 0)); 
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp
index cc6353977..8d9cf4ae5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp
@@ -2,7 +2,7 @@
 
 
 #include "explosion_area_to_map.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 
 namespace SituationMap
@@ -40,19 +40,19 @@ bool ExplosionArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
 
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId().underlying();
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId;
   mapObj->setAesState(effectState2aesState(effectState));
 
   
@@ -101,7 +101,7 @@ bool ExplosionArea2SituationMap::onTriggeredImpactsChanged(const AreaEffectSimul
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
   
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)
     return false;
 
   if (modType == DataModification::eRemoved)
@@ -113,7 +113,7 @@ bool ExplosionArea2SituationMap::onTriggeredImpactsChanged(const AreaEffectSimul
 
   
 
-  const int32_t simId = data.aesItemId(); 
+  const int32_t simId = data.aesItemId; 
 
   
   RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(simId);
@@ -133,11 +133,11 @@ bool ExplosionArea2SituationMap::onTriggeredImpactsChanged(const AreaEffectSimul
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions, itemView))
   {
-    const PositionCont &posCont = form2PosCont(itemView.form());
-    const auto &bitField = data.bitfield();
+    const PositionCont &posCont = form2PosCont(itemView.form);
+    const auto &bitField = data.bitfield;
     
 
-    int32_t impactCount = data.impactCount();
+    int32_t impactCount = data.impactCount;
     if (impactCount != posCont.size())
     {
       ERROR_LOG(m_logger) << LOGFUNCTION
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
index 607693975..d593d9c0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
@@ -4,10 +4,11 @@
 #include "explosion_cluster_to_map.h"
 #include <utility>
 #include "pdm_handler.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AreaEffectSimulation/Utils/polygons.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <Map/map.h>
 
 
@@ -150,8 +151,8 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
     return false;
   }
 
-  const int32_t simId = ddsData.id();
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId().underlying();
+  const int32_t simId = ddsData.id;
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId;
 
   bool bIsMode3D = false;
   if (m_objFac.map() && (m_objFac.map()->mode() == Mode::Mode_3D))
@@ -177,20 +178,20 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
     if (m_displayFilter)
       bDisplayFilterShowGTL = m_displayFilter->showExplosionClusterGunToTargetLine();
     const bool bDisplayFilterShowGFK = bDisplayFilterShowGTL && bIsMode3D &&
-        ((effectState.underlying() != AreaEffectSimulation::AesEffectState::EsActivated) &&
-         (effectState.underlying() != AreaEffectSimulation::AesEffectState::EsExpired));
+        ((effectState != AreaEffectSimulation::AesEffectState::EsActivated) &&
+         (effectState != AreaEffectSimulation::AesEffectState::EsExpired));
 
     
     
     AreaEffectSimulation::AesItemView itemViewGunToTargetLine;
-    const std::vector<Core::GeoPosition>& form = itemViewGunToTargetLine.form(); 
+    const std::vector<Core::GeoPosition>& form = itemViewGunToTargetLine.form; 
     if (bDisplayFilterShowGTL || bDisplayFilterShowGFK)
       m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine, itemViewGunToTargetLine);
 
     
     if (bDisplayFilterShowGTL && (form.size() >= 2))
-      mapObj->setGunToTargetLineSurface(Point3D(form.front().lon(), form.front().lat(), 0.0),
-                                        Point3D(form.back().lon() , form.back().lat() , 0.0));
+      mapObj->setGunToTargetLineSurface(Point3D(form.front().lon, form.front().lat, 0.0),
+                                        Point3D(form.back().lon , form.back().lat , 0.0));
     else
       mapObj->setGunToTargetLineSurface(Point3D(), Point3D());
 
@@ -203,7 +204,7 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
         PositionCont gunToTargetPath;
         gunToTargetPath.reserve(form.size());
         for (const Core::GeoPosition& item : std::as_const(form))
-          gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
+          gunToTargetPath.append(Point3D(item.lon, item.lat, item.z));
 
         mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
       } else {
@@ -222,7 +223,7 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
       bDisplayFilterShowMHP = m_displayFilter->showExplosionClusterMeanHitPoint();
 
     if (bDisplayFilterShowMHP)
-      mapObj->setScheduledImpacts(form2PosCont(ddsData.mhPoints()));
+      mapObj->setScheduledImpacts(form2PosCont(ddsData.mhPoints));
     else
       mapObj->setScheduledImpacts({});
   }
@@ -244,25 +245,25 @@ bool ExplosionCluster2SituationMap::updateElementImpl(const Sim2SituationMap::DD
 
   BENCHMARK_SETUP_AND_START();
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
 
-  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId().underlying();
+  const AreaEffectSimulation::AesEffectState effectState = ddsData.effectStateId;
   mapObj->setAesState(effectState2aesState(effectState));
 
 
   
   LineStyle ls = mapObj->lineStyle();
-  if (ddsData.annotationString().empty())
+  if (ddsData.annotationString.empty())
     ls.setLinePattern(LinePattern::Solid);
   else
     ls.setLinePattern(LinePattern::Dash);
@@ -307,7 +308,7 @@ bool ExplosionCluster2SituationMap::updateElementImpl(const Sim2SituationMap::DD
   
   
   
-  if (ddsData.partyId().is_set())
+  if (ddsData.partyId.has_value())
   {
     
     
@@ -348,7 +349,7 @@ bool ExplosionCluster2SituationMap::updateGeometry(const AreaEffectSimulation::A
   
 
   
-  const int simId = aesItemView.aesItemId();
+  const int simId = aesItemView.aesItemId;
   auto it = m_ddsDataContainer.find(simId);
   if (it != m_ddsDataContainer.end())
     updateNonLethalArea(mapObj, *it, aesItemView);
@@ -370,13 +371,13 @@ bool ExplosionCluster2SituationMap::onAesItemViewChanged(const AreaEffectSimulat
 
 
 
-  const int simId = aesItemView.aesItemId();
+  const int simId = aesItemView.aesItemId;
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
 
   bool success = false;
 
-  if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine)
+  if (aesItemView.aesTypeId == AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine)
   {
     
     RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(simId);
@@ -395,10 +396,10 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
                       << ", modType = " << modType;
 
   
-  if (effects.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (effects.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
     return false;
 
-  const int aesItemId = effects.aesItemId();
+  const int aesItemId = effects.aesItemId;
   const int simId = aesItemId;
 
   
@@ -411,7 +412,7 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
     return false;
   }
 
-  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects();
+  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects;
 
   PositionCont posContImpactsDraped, posContImpactsAbsolute;
   posContImpactsDraped.reserve(singleEffectsRef.size());
@@ -420,16 +421,16 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
   
   for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
   {
-    if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
+    if (se.singleEffectState != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
       continue;
 
-    switch (se.zPlacement().underlying())
+    switch (se.zPlacement)
     {
     case AreaEffectSimulation::AesZPlacement::ZpDraped:
-        posContImpactsDraped.append({se.position().lon(), se.position().lat(), se.position().z()});
+        posContImpactsDraped.append({se.position.lon, se.position.lat, se.position.z});
     break;
     case AreaEffectSimulation::AesZPlacement::ZpAbsolute:
-      posContImpactsAbsolute.append({se.position().lon(), se.position().lat(), se.position().z()});
+      posContImpactsAbsolute.append({se.position.lon, se.position.lat, se.position.z});
     break;
     case AreaEffectSimulation::AesZPlacement::ZpRelative:
     
@@ -467,13 +468,13 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
 bool ExplosionCluster2SituationMap::updateGunToTargetLineAndTrajectory(const AreaEffectSimulation::AesItemView &itemView,
                                                                        RefPointer<Sim2SituationMap::MAP_T> mapObj)
 {
-  const std::vector<Core::GeoPosition>& formRef = itemView.form();
+  const std::vector<Core::GeoPosition>& formRef = itemView.form;
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, form.size = " << formRef.size();
 
   if (formRef.size() >= 2)
   {
-    mapObj->setGunToTargetLineSurface(Point3D(formRef.front().lon(), formRef.front().lat(), 0.0),
-                                      Point3D(formRef.back().lon() , formRef.back().lat() , 0.0));
+    mapObj->setGunToTargetLineSurface(Point3D(formRef.front().lon, formRef.front().lat, 0.0),
+                                      Point3D(formRef.back().lon , formRef.back().lat , 0.0));
   } else {
     
     mapObj->setGunToTargetLineSurface(Point3D(), Point3D());
@@ -485,7 +486,7 @@ bool ExplosionCluster2SituationMap::updateGunToTargetLineAndTrajectory(const Are
     PositionCont gunToTargetPath;
     gunToTargetPath.reserve(formRef.size());
     for (const Core::GeoPosition& item : std::as_const(formRef))
-      gunToTargetPath.append(Point3D(item.lon(), item.lat(), item.z()));
+      gunToTargetPath.append(Point3D(item.lon, item.lat, item.z));
 
     mapObj->setGunToTargetTrajectory3D(gunToTargetPath);
   }
@@ -532,7 +533,7 @@ bool ExplosionCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2Situation
   if (!m_pdmHandler)
     return false;
 
-  if (explosionCluster.id() != aesItemView.aesItemId())
+  if (explosionCluster.id != aesItemView.aesItemId)
     return false;
 
   
@@ -542,11 +543,11 @@ bool ExplosionCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2Situation
   
 
 
-  const int chargeTypeId = explosionCluster.chargeStruct().chargeTypeId();
+  const int chargeTypeId = explosionCluster.chargeStruct.chargeTypeId;
   const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(chargeTypeId);
-  if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport)
+  if (gc == ProjectDataManagement::GearClass::GearClass_AirSupport)
   {
-    const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(explosionCluster.chargeStruct());
+    const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(explosionCluster.chargeStruct);
     
     
     
@@ -555,13 +556,13 @@ bool ExplosionCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2Situation
       const ProjectDataManagement::CasEffect &ce = casEffectsVec[1];
 
       
-      const double impactRadius                 = ce.impactRadius();
+      const double impactRadius                 = ce.impactRadius;
 
-      const AreaEffectSimulation::Area &areaRef = explosionCluster.area();
+      const AreaEffectSimulation::Area &areaRef = explosionCluster.area;
       
-      const Core::GeoPosition2D &blGeo          = aesItemView.boundingBoxBottomLeft();
-      const QPointF &centerGeo = AreaEffectSimulation::Polygons::bottomLeft2CenterPoint(QPointF(blGeo.lon(), blGeo.lat()),
-                                                                                      areaRef.width(), areaRef.height(), areaRef.rotation());
+      const Core::GeoPosition2D &blGeo          = aesItemView.boundingBoxBottomLeft;
+      const QPointF &centerGeo = AreaEffectSimulation::Polygons::bottomLeft2CenterPoint(QPointF(blGeo.lon, blGeo.lat),
+                                                                                      areaRef.width, areaRef.height, areaRef.rotation);
 
       updateNonLethalArea(mapObj, centerGeo, impactRadius);
     }
@@ -595,10 +596,10 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
 {
   
   
-  if (traj.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+  if (traj.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
     return false;
 
-  const int32_t simId = traj.originatorId(); 
+  const int32_t simId = traj.originatorId; 
   if (!m_simId2UniqueMapId.contains(simId))
     return false;
 
@@ -607,7 +608,7 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
   if (m_displayFilter)
     bDisplayFilterShowTRJ = m_displayFilter->showExplosionClusterTrajectory();
 
-  const int32_t index = traj.index();     
+  const int32_t index = traj.index;     
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, traj=" << traj
                       << ", simId=" << simId
@@ -621,7 +622,7 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
 
   
   const qint64 partitionTimeMsec = m_pluginProvider->partitionTime();
-  if (traj.trajectoryStartTime() > partitionTimeMsec)
+  if (traj.trajectoryStartTime > partitionTimeMsec)
     return false;
 
   
@@ -644,7 +645,7 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
   {
     
     
-    const std::vector<Core::GeoPositionRelativeTime>& geometry = traj.geometry();
+    const std::vector<Core::GeoPositionRelativeTime>& geometry = traj.geometry;
     const PositionCont &curPath = mapObj->trajectory(index);
     if (geometry.size() > static_cast<size_t>(curPath.size()))
     {
@@ -653,9 +654,9 @@ bool ExplosionCluster2SituationMap::updateSingleTracjectory(const AreaEffectSimu
       posCont.reserve(geometry.size());
       for (const Core::GeoPositionRelativeTime& posTime : std::as_const(geometry))
       {
-        if (considerTime && ((traj.trajectoryStartTime() + posTime.relativeTime()) > partitionTimeMsec) )
+        if (considerTime && ((traj.trajectoryStartTime + posTime.relativeTime) > partitionTimeMsec) )
           break;
-        posCont.append(Point3D(posTime.lon(), posTime.lat(), posTime.z()));
+        posCont.append(Point3D(posTime.lon, posTime.lat, posTime.z));
       }
 
       INFO_LOG(m_logger) << "update trajectory, simId=" << simId
@@ -697,9 +698,9 @@ bool ExplosionCluster2SituationMap::updateAllTracjectories(int simToRestrict)
   auto cb = [this, simToRestrict](const AreaEffectSimulation::TrajectoryTimeAware &traj)
   {
     
-    if (traj.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+    if (traj.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
       return;
-    const int aesItemId = traj.originatorId();
+    const int aesItemId = traj.originatorId;
     if ((simToRestrict < 0) || (simToRestrict == aesItemId))
       updateSingleTracjectory(traj);
   };
@@ -721,10 +722,10 @@ bool ExplosionCluster2SituationMap::updateAllTracjectories(int simToRestrict)
 bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSimulation::Effects &effects)
 {
   
-  if (effects.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (effects.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
     return false;
 
-  const int32_t simId = effects.aesItemId(); 
+  const int32_t simId = effects.aesItemId; 
   if (!m_simId2UniqueMapId.contains(simId))
     return false;
 
@@ -756,7 +757,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
 
   if (bDisplayFilterShowDetoSphere)
   {
-    const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects();
+    const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects;
 
     PositionCont posContImpactsDraped, posContImpactsAbsolute;
     posContImpactsDraped.reserve(singleEffectsRef.size());
@@ -767,11 +768,11 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
     {
       ++i;
 
-      if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
+      if (se.singleEffectState != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
         continue;
 
-      const qint64 age = partitionTimeMsec - se.singleEffectTime();
-      const Core::GeoPosition &singleEffectPosGeo = se.position();
+      const qint64 age = partitionTimeMsec - se.singleEffectTime;
+      const Core::GeoPosition &singleEffectPosGeo = se.position;
 
       DEBUG_LOG(m_logger) << LOGFUNCTION << " simId=" << simId << ", SingleEffect, i = " << i
                           << ", age = " << age << ", s_effect3dMaxDisplayDuration = " << s_effect3dMaxDisplayDuration
@@ -780,13 +781,13 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
       if (age > s_effect3dMaxDisplayDuration)
         continue;
 
-      switch (se.zPlacement().underlying())
+      switch (se.zPlacement)
       {
       case AreaEffectSimulation::AesZPlacement::ZpDraped:
-        posContImpactsDraped.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()});
+        posContImpactsDraped.append({singleEffectPosGeo.lon, singleEffectPosGeo.lat, singleEffectPosGeo.z});
       break;
       case AreaEffectSimulation::AesZPlacement::ZpAbsolute:
-          posContImpactsAbsolute.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()});
+          posContImpactsAbsolute.append({singleEffectPosGeo.lon, singleEffectPosGeo.lat, singleEffectPosGeo.z});
       break;
       case AreaEffectSimulation::AesZPlacement::ZpRelative:
       
@@ -804,7 +805,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
     double impactRadius = 5;
     auto it = m_ddsDataContainer.find(simId);
     if (it != m_ddsDataContainer.end())
-      impactRadius = m_pdmHandler->impactRadius(it->chargeStruct(), 5); 
+      impactRadius = m_pdmHandler->impactRadius(it->chargeStruct, 5); 
 
     if (mapObj->setDetonationsDraped(posContImpactsDraped, impactRadius))
       bHasChanged = true;
@@ -838,7 +839,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DAllItems(int simToRestrict)
   
   auto cb = [this, simToRestrict](const AreaEffectSimulation::Effects &effect)
   {
-    if ((simToRestrict < 0) || (simToRestrict == effect.aesItemId()))
+    if ((simToRestrict < 0) || (simToRestrict == effect.aesItemId))
       updateEffects3DSingleItem(effect);
   };
   m_aesDtc->effectss(cb);
@@ -914,24 +915,24 @@ AreaEffectSimulation::AesType ExplosionCluster2SituationMap::aesTypeFromGearClas
 {
   static QMap<int, AreaEffectSimulation::AesType> s_aesTypeMap;
 
-  if (s_aesTypeMap.contains(data.chargeStruct().chargeTypeId()))
-    return s_aesTypeMap[data.chargeStruct().chargeTypeId()];
+  if (s_aesTypeMap.contains(data.chargeStruct.chargeTypeId))
+    return s_aesTypeMap[data.chargeStruct.chargeTypeId];
 
-  const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
-  switch (gc.underlying())
+  const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct.chargeTypeId);
+  switch (gc)
   {
   case ProjectDataManagement::GearClass::GearClass_AirSupport:
-    s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
+    s_aesTypeMap[data.chargeStruct.chargeTypeId] = AreaEffectSimulation::AesType::AtAirSupportImpact;
     break;
   case ProjectDataManagement::GearClass::GearClass_Artillery:
   case ProjectDataManagement::GearClass::GearClass_Mortar:
   case ProjectDataManagement::GearClass::GearClass_Rocket:
-    s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
+    s_aesTypeMap[data.chargeStruct.chargeTypeId] = AreaEffectSimulation::AesType::AtExplosionArea;
     break;
   default:
     return AreaEffectSimulation::AesType::AtUnknown;
   }
-  return s_aesTypeMap[data.chargeStruct().chargeTypeId()];
+  return s_aesTypeMap[data.chargeStruct.chargeTypeId];
 }
 
 void ExplosionCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
@@ -939,9 +940,9 @@ void ExplosionCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulati
   TRACE_LOG(m_logger) << "START onAesDisplayFilterChanged, aesType =" << aesType
                       << ", this " << this;
 
-  if ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtExplosionArea    != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying()))
+  if ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType) &&
+      (AreaEffectSimulation::AesType::AtExplosionArea    != aesType) &&
+      (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType))
     return;
 
   const auto cb = [this](const DDS_TYPE &data) -> bool
@@ -963,8 +964,8 @@ bool ExplosionCluster2SituationMap::isVisibleByFilter(const Aes2SituationMap::DD
   if (!m_displayFilter)
     return true;         
 
-  const auto es = data.effectStart().is_set() ? data.effectStart().get() : 0;
-  const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
+  const auto es = data.effectStart.has_value() ? data.effectStart.get() : 0;
+  const auto partyId = data.partyId.has_value() ? data.partyId.get() : -1;
   bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
   if (isVisibleByFilter)
   {
@@ -976,12 +977,12 @@ bool ExplosionCluster2SituationMap::isVisibleByFilter(const Aes2SituationMap::DD
     }
 
     isVisibleByFilter = m_displayFilter->isVisible(aestype,
-                                                   data.effectStateId(),
-                                                   data.chargeStruct().chargeTypeId(),
+                                                   data.effectStateId,
+                                                   data.chargeStruct.chargeTypeId,
                                                    partyId,
-                                                   data.isCentral(),
+                                                   data.isCentral,
                                                    es,
-                                                   data.effectDuration(),
+                                                   data.effectDuration,
                                                    m_pluginProvider->partitionTime());
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.cpp
index 67cc7f13a..4c31afda3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.cpp
@@ -43,15 +43,15 @@ bool ExplosionSingle2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionSingle, itemView))
@@ -72,11 +72,11 @@ bool ExplosionSingle2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
   }
 
   
-  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition();
-  mapObj->setImpactOrigin(Point3D(impactPos2D.lon(), impactPos2D.lat(), 0.0));
+  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition;
+  mapObj->setImpactOrigin(Point3D(impactPos2D.lon, impactPos2D.lat, 0.0));
 
   
-  if (m_pdmHandler && m_pdmHandler->isSmart(ddsData.chargeStruct()))
+  if (m_pdmHandler && m_pdmHandler->isSmart(ddsData.chargeStruct))
     mapObj->setImpactType(SingleFire::ImpactType::doubleImpact);
   else
     mapObj->setImpactType(SingleFire::ImpactType::normalImpact);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.cpp
index 1f3dd2b0c..b772ff884 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.cpp
@@ -37,15 +37,15 @@ bool FunctionalArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtFunctionalArea, itemView))
     this->updateGeometry(itemView, mapObj);
@@ -65,9 +65,9 @@ bool FunctionalArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_
   }
 
   
-  if (ddsData.pointSymbol().is_set())
+  if (ddsData.pointSymbol.has_value())
   {
-    const QString pointSymbolSidc = QString::fromStdString(ddsData.pointSymbol().get());
+    const QString pointSymbolSidc = QString::fromStdString(ddsData.pointSymbol.get());
     DEBUG_LOG(m_logger) << LOGFUNCTION
                         << " pointSymbolSidc ='" << pointSymbolSidc << "'"
                         << " simId=" << simId ;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp
index 0155bf100..838e52126 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp
@@ -2,7 +2,7 @@
 
 
 #include "gas_pipe_to_map.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 
 namespace SituationMap
@@ -34,13 +34,13 @@ bool GasPipe2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsD
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
   
   AreaEffectSimulation::AesItemView itemView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp
index 28e011ba3..e999976f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp
@@ -35,7 +35,7 @@ GuezIed2SituationMap::~GuezIed2SituationMap()
 
 int32_t GuezIed2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool GuezIed2SituationMap::init(PluginProvider *pluginProvider)
@@ -135,12 +135,12 @@ bool GuezIed2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Unified
 
   const auto cb = [simIdOut, &umodOut](const GuezIedManagement::Ied & data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
-      umodOut.m_equipmentNumber = data.equipmentNumber();
-      umodOut.m_partyId = data.partyId();
-      umodOut.m_description1 = QString::fromStdString(data.name());
-      umodOut.m_description2 = QString::number(data.explosiveForce());
+      umodOut.m_equipmentNumber = data.equipmentNumber;
+      umodOut.m_partyId = data.partyId;
+      umodOut.m_description1 = QString::fromStdString(data.name);
+      umodOut.m_description2 = QString::number(data.explosiveForce);
       return true; 
     }
     return false;
@@ -169,8 +169,8 @@ void GuezIed2SituationMap::onIedPositionChanged(const GuezIedManagement::IedPosi
 
   DEBUG_LOG(m_logger) << "onIedPositionChanged: " << data;
 
-  const int32_t simId = data.id();
-  const Core::GeoPosition &geoPos = data.position();
+  const int32_t simId = data.id;
+  const Core::GeoPosition &geoPos = data.position;
 
   
   auto it = m_simId2UniqueMapId.constFind(simId);
@@ -185,7 +185,7 @@ void GuezIed2SituationMap::onIedPositionChanged(const GuezIedManagement::IedPosi
   if (mapObj)
   {
     
-    mapObj->setOrigin(Point3D(geoPos.lon(), geoPos.lat(), geoPos.z()));
+    mapObj->setOrigin(Point3D(geoPos.lon, geoPos.lat, geoPos.z));
     if (!mapObj->updateView())
     {
       ERROR_LOG(m_logger) << LOGFUNCTION << " GUEZ Ied updateView failed"
@@ -207,7 +207,7 @@ void GuezIed2SituationMap::onIedPositionChanged(const GuezIedManagement::IedPosi
 
 Injury guezIedStateToInjury(const GuezIedManagement::IedTacticalState &iedState)
 {
-  switch (iedState.underlying())
+  switch (iedState)
   {
   case GuezIedManagement::IedTacticalState::Active:
     return AdvancedSymbology::Injury::NoInjury;          
@@ -232,7 +232,7 @@ void updateIedPyro(const GuezIedManagement::IedTacticalState &iedStateIn,
   if (injuryInOut != AdvancedSymbology::Injury::TotalKill)
     return;
 
-  switch (iedStateIn.underlying())
+  switch (iedStateIn)
   {
   case GuezIedManagement::IedTacticalState::Unknown:
   case GuezIedManagement::IedTacticalState::NotActive:
@@ -268,22 +268,22 @@ bool GuezIed2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsD
                                              RefPointer<MAP_T> mapObj)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " id=" << ddsData.id()
-                      << " name=" << ddsData.name();
+                      << " id=" << ddsData.id
+                      << " name=" << ddsData.name;
 
   
 
   
   
   SymbolData symData = mapObj->symbol();
-  symData.sidc = QString::fromStdString(ddsData.symbol());
+  symData.sidc = QString::fromStdString(ddsData.symbol);
 
   
-  mapObj->setTextModifier(Participant::TextModifier::T_UniqueDesignation, QString::fromStdString(ddsData.name()));
-  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation,   QString::number(ddsData.explosiveForce()));
+  mapObj->setTextModifier(Participant::TextModifier::T_UniqueDesignation, QString::fromStdString(ddsData.name));
+  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation,   QString::number(ddsData.explosiveForce));
 
   
-  mapObj->setPartyId(ddsData.partyId());
+  mapObj->setPartyId(ddsData.partyId);
 
   
   
@@ -299,11 +299,11 @@ bool GuezIed2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsD
   
   
 
-  AdvancedSymbology::Injury injury = guezIedStateToInjury(ddsData.tacticalState());
-  if ((ddsData.type() == GuezIedManagement::IedType::IedSmallPyro) ||
-      (ddsData.type() == GuezIedManagement::IedType::IedBigPyro))
+  AdvancedSymbology::Injury injury = guezIedStateToInjury(ddsData.tacticalState);
+  if ((ddsData.type == GuezIedManagement::IedType::IedSmallPyro) ||
+      (ddsData.type == GuezIedManagement::IedType::IedBigPyro))
   {
-    updateIedPyro(ddsData.tacticalState(), injury, symData.sidc);
+    updateIedPyro(ddsData.tacticalState, injury, symData.sidc);
   }
 
   int32_t injuryPartyId = -1;
@@ -375,10 +375,10 @@ void GuezIed2SituationMap::handleSymbolAppearanceSettings()
 {
   for (const GuezIedManagement::Ied &ied : std::as_const(m_ddsDataContainer))
   {
-    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(ied.id(), INVALID_MAP_ID);
+    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(ied.id, INVALID_MAP_ID);
     if (uniqueMapId == INVALID_MAP_ID)
     {
-      WARNING_LOG(m_logger) << LOGFUNCTION << "Found a ied which is in internal map but has no map object...: " << ied.id();
+      WARNING_LOG(m_logger) << LOGFUNCTION << "Found a ied which is in internal map but has no map object...: " << ied.id;
       continue;
     }
     RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
@@ -400,7 +400,7 @@ void GuezIed2SituationMap::handleSymbolAppearanceSettings(RefPointer<MAP_T> &map
   mapObj->setScale(filterSettings.symbolSettings.symbolScale);
   mapObj->setUserSymbolOpacity(1.0f - filterSettings.symbolSettings.symbolTransparency);
 
-  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.partyId());
+  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.partyId);
   mapObj->setTextModifierVisibility(Participant::TextModifier::T_UniqueDesignation, spa.showDesignator);
   mapObj->setTextModifierVisibility(Participant::TextModifier::M_HigherFormation,   spa.showTacticalIdentifier);
 
@@ -421,7 +421,7 @@ bool GuezIed2SituationMap::isVisible(const Sim2SituationMap::DDS_T &ddsData) con
 bool GuezIed2SituationMap::visibleBySymbolPartyAppearance(const Sim2SituationMap::DDS_T &ddsData) const
 {
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
-  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.partyId());
+  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.partyId);
   return spa.isVisible;
 }
 
@@ -430,7 +430,7 @@ bool GuezIed2SituationMap::visibleByAesFilter(const Sim2SituationMap::DDS_T &dds
   if (!m_displayFilter)
     return true;
 
-  switch (ddsData.tacticalState().underlying())
+  switch (ddsData.tacticalState)
   {
   
   
@@ -451,7 +451,7 @@ bool GuezIed2SituationMap::visibleByAesFilter(const Sim2SituationMap::DDS_T &dds
   case GuezIedManagement::IedTacticalState::TriggeredByRemote:
   case GuezIedManagement::IedTacticalState::TriggeredBySwitch:
   case GuezIedManagement::IedTacticalState::TriggeredByTautWire:
-    auto timeTriggered = ddsData.sampleTime();
+    auto timeTriggered = ddsData.sampleTime;
     const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
     const auto afterGlow = m_effectStateStruct.expiredAfterglowDurationMSec;                                               
     DEBUG_LOG(m_logger) << LOGFUNCTION
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.h
index 33c3072be..8445a37dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.h
@@ -5,6 +5,7 @@
 
 #include "sim_to_situation_map_tmpl.h"
 #include <GuezIedManagement/gim_data_plugin_interface.h>
+#include <GuezIedManagement/gim_dtc.h>   // complete Dtc type for &Dtc::signal connects
 #include <GuezIedManagement/gim_info_gui_plugin_interface.h>
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <AreaEffectSimulation/aes_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
index f532b1751..fafe36f9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
@@ -24,7 +24,7 @@ namespace SituationMap
 
 int32_t GuezNasat9Liner2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 GuezNasat9Liner2SituationMap::GuezNasat9Liner2SituationMap(ObjectFactory &objFac, const QString &layername, int drawOrder, const char *loggerName)
@@ -162,7 +162,7 @@ bool GuezNasat9Liner2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId,
   if (mapObj.valid())
     umodOut.m_image = mapObj->previewImage();
 
-  umodOut.m_description1 = QString::fromStdString(m_gnaDtc->nasat9Liner(simIdOut).name());
+  umodOut.m_description1 = QString::fromStdString(m_gnaDtc->nasat9Liner(simIdOut).name);
   return true;
 
 }
@@ -170,16 +170,16 @@ bool GuezNasat9Liner2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId,
 void GuezNasat9Liner2SituationMap::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " pId=" << data.id()
-                      << " parytIdOld=" << m_participantToPartyId.value(data.id(), -1)
-                      << " parytId=" << data.partyId()
+                      << " pId=" << data.id
+                      << " parytIdOld=" << m_participantToPartyId.value(data.id, -1)
+                      << " parytId=" << data.partyId
                       << ", m_participantToPartyId.size()=" << m_participantToPartyId.size();
-  const int simId = data.id();
+  const int simId = data.id;
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_participantToPartyId[simId] = data.partyId();
+    m_participantToPartyId[simId] = data.partyId;
     break;
   case DataModification::eRemoved:
     m_ddsDataContainer.remove(simId);
@@ -207,14 +207,14 @@ bool GuezNasat9Liner2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
                                                      RefPointer<MAP_T> mapObj)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " id=" << ddsData.id()
-                      << " name=" << ddsData.name()
-                      << " isCurrent=" << ddsData.isCurrent()
-                      << " initialPoint=" << ddsData.initialPoint()
-                      << " targetPosition=" << ddsData.targetPosition()
-                      << " participantId=" << ddsData.participantId()
+                      << " id=" << ddsData.id
+                      << " name=" << ddsData.name
+                      << " isCurrent=" << ddsData.isCurrent
+                      << " initialPoint=" << ddsData.initialPoint
+                      << " targetPosition=" << ddsData.targetPosition
+                      << " participantId=" << ddsData.participantId
                       << " m_participantToPartyId.size()=" << m_participantToPartyId.size()
-                      << " partyId.size()=" << m_participantToPartyId.value(ddsData.participantId(), -1);
+                      << " partyId.size()=" << m_participantToPartyId.value(ddsData.participantId, -1);
 
   mapObj->setPickable(false);
 
@@ -223,24 +223,24 @@ bool GuezNasat9Liner2SituationMap::updateElementImpl(const Sim2SituationMap::DDS
 
   
   
-  mapObj->setPartyId(m_participantToPartyId.value(ddsData.participantId(), -1));
+  mapObj->setPartyId(m_participantToPartyId.value(ddsData.participantId, -1));
 
   TextStyle ts = mapObj->textStyle();
   ts.setHorizontalAlignment(HorizontalAlignment::Center);
   mapObj->setTextStyle(ts);
 
   MAP_T::NineLinerData data;
-  data.initialPoint   = Point3D(ddsData.initialPoint().lon(),   ddsData.initialPoint().lat(),   .0);
-  data.targetPosition = Point3D(ddsData.targetPosition().lon(), ddsData.targetPosition().lat(), .0);
-  data.fah            = ddsData.finalAttackHeading();
-  data.fahLow         = ddsData.finalAttackHeadingLow();
-  data.fahHigh        = ddsData.finalAttackHeadingHigh();
-  data.friendliesBearing  = ddsData.friendliesBearing();
-  data.friendliesDistance = ddsData.friendliesDistance();
+  data.initialPoint   = Point3D(ddsData.initialPoint.lon,   ddsData.initialPoint.lat,   .0);
+  data.targetPosition = Point3D(ddsData.targetPosition.lon, ddsData.targetPosition.lat, .0);
+  data.fah            = ddsData.finalAttackHeading;
+  data.fahLow         = ddsData.finalAttackHeadingLow;
+  data.fahHigh        = ddsData.finalAttackHeadingHigh;
+  data.friendliesBearing  = ddsData.friendliesBearing;
+  data.friendliesDistance = ddsData.friendliesDistance;
 
   mapObj->setNineLinerData(data);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
   return true;
@@ -258,7 +258,7 @@ void GuezNasat9Liner2SituationMap::handleSymbolAppearanceSettings()
 
   for (const GuezNasat::Nasat9Liner &nineLiner : std::as_const(m_ddsDataContainer))
   {
-    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(nineLiner.id());
+    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(nineLiner.id);
     if (!mapObj.valid())
       continue;
 
@@ -298,7 +298,7 @@ void GuezNasat9Liner2SituationMap::handleSymbolAppearanceSettings(RefPointer<Sim
 {
   mapObj->setScale(m_currentSymbolSettings.symbolSettings.symbolScale);
 
-  const bool isVisi = visibleByDisplayLength(m_pluginProvider->partitionTime(), ddsData.sampleTime());
+  const bool isVisi = visibleByDisplayLength(m_pluginProvider->partitionTime(), ddsData.sampleTime);
 
   if (mapObj->visibility() != isVisi)
   {
@@ -333,7 +333,7 @@ void GuezNasat9Liner2SituationMap::updateAllItems()
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_ddsDataContainer.size()=" << m_ddsDataContainer.size();
   for (const DDS_T &ddsData : std::as_const(m_ddsDataContainer))
   {
-    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id());
+    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id);
     if (!mapObj.valid())
       continue;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.h
index fd13eacaa..eda57728d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.h
@@ -6,6 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <GuezNasat/gna_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Dtc type for &Dtc::signal connects / ->disconnect
 #include <MapObjects/polyline.h>
 #include <MapObjects/nine_liner.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
index 85581cac2..773048872 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
@@ -4,6 +4,7 @@
 
 #include "hitlineinfo_to_map.h"
 #include <utility>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Dtc type for &Dtc::typeChanged (signal-pointer connect)
 #include "pdm_handler.h"
 #include <Map/object_factory.h>
 #include <Map/map.h>
@@ -48,7 +49,7 @@ HitlineInfo2SituationMap::~HitlineInfo2SituationMap()
 
 int32_t HitlineInfo2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool HitlineInfo2SituationMap::init(PluginProvider *pluginProvider)
@@ -132,15 +133,15 @@ bool HitlineInfo2SituationMap::isElapsed(const ParticipantManagement::HitLineInf
   
   
   
-  const Core::GeoPosition &startGeoPos = ddsData.originatorPos();
-  const Core::GeoPosition &endGeoPos   = ddsData.injuryPos();
+  const Core::GeoPosition &startGeoPos = ddsData.originatorPos;
+  const Core::GeoPosition &endGeoPos   = ddsData.injuryPos;
   {
-    Point3D dummy(startGeoPos.lon(), startGeoPos.lat(), startGeoPos.z());
+    Point3D dummy(startGeoPos.lon, startGeoPos.lat, startGeoPos.z);
     if (dummy.isNull())
       return true;
   }
   {
-    Point3D dummy(endGeoPos.lon(), endGeoPos.lat(), endGeoPos.z());
+    Point3D dummy(endGeoPos.lon, endGeoPos.lat, endGeoPos.z);
     if (dummy.isNull())
       return true;
   }
@@ -152,9 +153,9 @@ bool HitlineInfo2SituationMap::isElapsed(const ParticipantManagement::HitLineInf
   
   if (m_objFac.map() && (m_objFac.map()->mode() == Mode::Mode_3D))
   {
-    if (startGeoPos.z() < 0)
+    if (startGeoPos.z < 0)
       return true;
-    if (endGeoPos.z() < 0)
+    if (endGeoPos.z < 0)
       return true;
   }
 
@@ -202,10 +203,10 @@ bool HitlineInfo2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Uni
 
   const auto cb = [this, simIdOut, &umodOut](const Sim2SituationMap::DDS_T & ddsData) -> bool
   {
-    if (ddsData.id() == simIdOut)
+    if (ddsData.id == simIdOut)
     {
-      umodOut.m_partyId         = ddsData.originatorPartyId();
-      const int32_t originatorChargeTypeId = ddsData.chargeTypeId();
+      umodOut.m_partyId         = ddsData.originatorPartyId;
+      const int32_t originatorChargeTypeId = ddsData.chargeTypeId;
       umodOut.m_description1    = chargeTypeIdentifier(originatorChargeTypeId);
       return true; 
     }
@@ -220,8 +221,8 @@ bool HitlineInfo2SituationMap::onHitLineInfoChanged(const Sim2SituationMap::DDS_
                                                     DataModification modType)
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
-                      << ", ddsData.id()=" << ddsData.id()
-                      << ", ddsData.injuryBuildingId()=" << ddsData.injuryBuildingId()
+                      << ", ddsData.id()=" << ddsData.id
+                      << ", ddsData.injuryBuildingId()=" << ddsData.injuryBuildingId
                       << ", modType=" << modType
                       << ", m_buildingHits.size()=" << m_buildingHits.size();
 
@@ -243,9 +244,9 @@ bool HitlineInfo2SituationMap::onHitLineInfoChanged(const Sim2SituationMap::DDS_
 void HitlineInfo2SituationMap::onBuildingHitlineInfoChanged(const Buildings::BuildingHitLineInfo &data, DataModification modType)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << ", data.id()=" << data.id()
-                      << ", data.originatorParticipantId()=" << data.originatorParticipantId()
-                      << ", data.buildingId()=" << data.buildingId()
+                      << ", data.id()=" << data.id
+                      << ", data.originatorParticipantId()=" << data.originatorParticipantId
+                      << ", data.buildingId()=" << data.buildingId
                       << ", modType=" << modType
                       << ", m_buildingHits.size()=" << m_buildingHits.size();
 
@@ -253,15 +254,15 @@ void HitlineInfo2SituationMap::onBuildingHitlineInfoChanged(const Buildings::Bui
     return;
 
   BuildingHit bh;
-  bh.sampleTime = data.sampleTime();
-  bh.originatorParticipantId = data.originatorParticipantId();
-  bh.chargeTypeId = data.chargeTypeId();
-  m_buildingHits[data.buildingId()].push_back(bh);
+  bh.sampleTime = data.sampleTime;
+  bh.originatorParticipantId = data.originatorParticipantId;
+  bh.chargeTypeId = data.chargeTypeId;
+  m_buildingHits[data.buildingId].push_back(bh);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END"
-                      << ", data.id()=" << data.id()
-                      << ", data.originatorParticipantId()=" << data.originatorParticipantId()
-                      << ", data.buildingId()=" << data.buildingId()
+                      << ", data.id()=" << data.id
+                      << ", data.originatorParticipantId()=" << data.originatorParticipantId
+                      << ", data.buildingId()=" << data.buildingId
                       << ", modType=" << modType
                       << ", m_buildingHits.size()=" << m_buildingHits.size();
 }
@@ -284,9 +285,9 @@ bool HitlineInfo2SituationMap::createElement(const DDS_T &ddsData)
   {
     INFO_LOG(m_logger) << LOGFUNCTION << " new Hitline !!!!" << " simId = " << simId;
 
-    const SpecialChargeType specialChargeTypeId = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+    const SpecialChargeType specialChargeTypeId = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
     if (PdmHandler::isChargeTypeLtdOrLrf(specialChargeTypeId))
-      m_participant2SituationMap->onParticipantFakeGearEventChanged(ddsData.originatorParticipantId(), ddsData.sampleTime(), specialChargeTypeId);
+      m_participant2SituationMap->onParticipantFakeGearEventChanged(ddsData.originatorParticipantId, ddsData.sampleTime, specialChargeTypeId);
 
     
     
@@ -302,7 +303,7 @@ bool HitlineInfo2SituationMap::createElement(const DDS_T &ddsData)
 bool HitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
                                                  RefPointer<MAP_T> mapObj)
 {
-  const qint32 hitlineId = ddsData.id();
+  const qint32 hitlineId = ddsData.id;
   TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " id=" << hitlineId;
 
   
@@ -312,7 +313,7 @@ bool HitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &
   
   LineStyle ls = mapObj->lineStyle();
 
-  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
   switch (sct)
   {
   case SpecialChargeType::LRF:
@@ -329,18 +330,18 @@ bool HitlineInfo2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &
   mapObj->setLineStyle(ls);
 
   
-  mapObj->setPartyId(ddsData.originatorPartyId());
+  mapObj->setPartyId(ddsData.originatorPartyId);
 
   
-  const int32_t originatorChargeTypeId = ddsData.chargeTypeId();
+  const int32_t originatorChargeTypeId = ddsData.chargeTypeId;
   mapObj->setIdentifier(chargeTypeIdentifier(originatorChargeTypeId));
 
 
   
-  const Core::GeoPosition &startGeoPos = ddsData.originatorPos();
-  const Core::GeoPosition &endGeoPos   = ddsData.injuryPos();
-  mapObj->setStartAndEndPoint(Point3D(startGeoPos.lon(), startGeoPos.lat(), startGeoPos.z()),
-                              Point3D(endGeoPos.lon(), endGeoPos.lat(), endGeoPos.z()));
+  const Core::GeoPosition &startGeoPos = ddsData.originatorPos;
+  const Core::GeoPosition &endGeoPos   = ddsData.injuryPos;
+  mapObj->setStartAndEndPoint(Point3D(startGeoPos.lon, startGeoPos.lat, startGeoPos.z),
+                              Point3D(endGeoPos.lon, endGeoPos.lat, endGeoPos.z));
 
   
   handleSymbolAppearanceSettings(mapObj, ddsData);
@@ -381,7 +382,7 @@ void HitlineInfo2SituationMap::handleSymbolAppearanceSettings()
 
   for (const ParticipantManagement::HitLineInfo &hitline : std::as_const(m_ddsDataContainer))
   {
-    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(hitline.id());
+    RefPointer<MAP_T> mapObj = getMapObjectOfSimId(hitline.id);
     if (!mapObj.valid())
       continue;
 
@@ -392,7 +393,7 @@ void HitlineInfo2SituationMap::handleSymbolAppearanceSettings()
 
 void HitlineInfo2SituationMap::handleSymbolAppearanceSettings(RefPointer<MAP_T> mapObj, const Sim2SituationMap::DDS_T &ddsData)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " ddsData.id()=" << ddsData.id()
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " ddsData.id()=" << ddsData.id
                       << ", mapObj = " << mapObj->debugInfo();
 
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
@@ -408,7 +409,7 @@ void HitlineInfo2SituationMap::handleSymbolAppearanceSettings(RefPointer<MAP_T>
     
     QTimer::singleShot(200, this, [this, ddsData]()
     {
-      RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id());
+      RefPointer<MAP_T> mapObj = getMapObjectOfSimId(ddsData.id);
       if (!mapObj.valid())
         return;
       handleSymbolAppearanceSettings(mapObj, ddsData);
@@ -421,7 +422,7 @@ void HitlineInfo2SituationMap::handleSymbolAppearanceSettings(RefPointer<MAP_T>
       WARNING_LOG(m_logger) << LOGFUNCTION << " updateView failed,"
                             << " mapObj = " << mapObj->debugInfo();
   }
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " ddsData.id()=" << ddsData.id()
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " ddsData.id()=" << ddsData.id
                       << ", mapObj = " << mapObj->debugInfo();
 }
 
@@ -437,7 +438,7 @@ bool HitlineInfo2SituationMap::isVisible(const Sim2SituationMap::DDS_T &ddsData,
 bool HitlineInfo2SituationMap::visibleBySymbolPartyAppearance(const Sim2SituationMap::DDS_T &ddsData) const
 {
   const FilterManagement::SymbolAppearanceSettings::Settings &filterSettings = m_symbolAppearanceSettings->settings();
-  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.originatorPartyId());
+  const auto spa = filterSettings.symbolSettings.symbolPartyAppearance.value(ddsData.originatorPartyId);
   return spa.isVisible;
 }
 
@@ -452,8 +453,8 @@ bool HitlineInfo2SituationMap::visibleByParticipants(const Sim2SituationMap::DDS
   bool bParticipant1Exists = true;
   bool bParticipant2Exists = true;
   bool visi =
-    m_participant2SituationMap->isParticipantVisible(ddsData.originatorParticipantId(), &bParticipant1Exists) &&
-    m_participant2SituationMap->isParticipantVisible(ddsData.injuryParticipantId(), &bParticipant2Exists);
+    m_participant2SituationMap->isParticipantVisible(ddsData.originatorParticipantId, &bParticipant1Exists) &&
+    m_participant2SituationMap->isParticipantVisible(ddsData.injuryParticipantId, &bParticipant2Exists);
 
   if ((!bParticipant1Exists || !bParticipant2Exists) && bUncertain)
     *bUncertain = true;
@@ -462,14 +463,14 @@ bool HitlineInfo2SituationMap::visibleByParticipants(const Sim2SituationMap::DDS
 
 bool HitlineInfo2SituationMap::visibleByBldgHitlines(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  auto itBuildingHit = m_buildingHits.constFind(ddsData.injuryBuildingId());
+  auto itBuildingHit = m_buildingHits.constFind(ddsData.injuryBuildingId);
   if (itBuildingHit != m_buildingHits.constEnd())
   {
     const QVector<BuildingHit> &bHits = itBuildingHit.value();
 
     
     qint64 displayLength = m_currentSymbolSettings.symbolSettings.hitLineDisplayLengthMSec;
-    const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+    const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
     switch (sct)
     {
     case SpecialChargeType::LRF:
@@ -488,9 +489,9 @@ bool HitlineInfo2SituationMap::visibleByBldgHitlines(const Sim2SituationMap::DDS
     
     for (const BuildingHit &bh : bHits)
     {
-      if (bh.chargeTypeId == ddsData.chargeTypeId() &&
-          bh.originatorParticipantId == ddsData.originatorParticipantId() &&
-          ddsData.sampleTime() - displayLength < bh.sampleTime)
+      if (bh.chargeTypeId == ddsData.chargeTypeId &&
+          bh.originatorParticipantId == ddsData.originatorParticipantId &&
+          ddsData.sampleTime - displayLength < bh.sampleTime)
       {
         DEBUG_LOG(m_logger) << "Not showing participant hitline " << ddsData << " since there is already a hitline on the building";
         return false;
@@ -502,10 +503,10 @@ bool HitlineInfo2SituationMap::visibleByBldgHitlines(const Sim2SituationMap::DDS
 
 bool HitlineInfo2SituationMap::visibleByHitLineDisplayLength(const qint64 newPartitionTime, const Sim2SituationMap::DDS_T &ddsData) const
 {
-  const qint64 stateTime = ddsData.sampleTime();
+  const qint64 stateTime = ddsData.sampleTime;
   qint64 displayLength = m_currentSymbolSettings.symbolSettings.hitLineDisplayLengthMSec;
 
-  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId());
+  const SpecialChargeType sct = m_pdmHandler->isSpecialChargeType(ddsData.chargeTypeId);
   switch (sct)
   {
   case SpecialChargeType::LRF:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.h
index bd98a0532..f2242889b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.h
@@ -9,6 +9,7 @@
 
 #include <Buildings/bld_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
index 52b2e3675..ec3d5e544 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
@@ -6,7 +6,7 @@
 #include <AreaEffectSimulation/Utils/ddsdbconvert.h>  
 #include <ProjectDataManagement/pdm_dtc.h>
 
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 #include <SituationMap/Symbology/sidc_codec.h>
 
@@ -17,6 +17,7 @@ DusMineStateProxy::DusMineStateProxy(QObject *parent)
   : BaseClass(parent)
   , m_lastDusMineState()
   , m_lastItemView()
+  , m_logger(getLogger("DusMineStateProxy"))
 {
 }
 
@@ -91,11 +92,11 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::DusMineState &
 {
   Q_UNUSED(modType);
   
-  if (ddsData.id() != 0)
+  if (ddsData.id != 0)
     return false;
 
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
-                      << " ddsData.mines().size() = " << ddsData.mines().size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id
+                      << " ddsData.mines().size() = " << ddsData.mines.size();
 
   if (modType == DataModification::eRemoved)
     m_lastDusMineState = AreaEffectSimulation::DusMineState();
@@ -109,11 +110,11 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::AesItemView &d
 {
   Q_UNUSED(modType);
   
-  if (ddsData.id() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
+  if (ddsData.id != static_cast<int>(AreaEffectSimulation::AesType::AtMineAreaSingleMines))
     return false;
 
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
-                      << " ddsData.form().size() = " << ddsData.form().size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id
+                      << " ddsData.form().size() = " << ddsData.form.size();
 
   if (modType == DataModification::eRemoved)
     m_lastItemView = AreaEffectSimulation::AesItemView();
@@ -125,7 +126,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::AesItemView &d
 
 bool DusMineStateProxy::publishNewMap()
 {
-  if (m_lastItemView.setId() != m_lastDusMineState.setId()) 
+  if (m_lastItemView.setId != m_lastDusMineState.setId) 
     return false;
 
   const QMap<int32_t, DusMineStateAndPositionData> &mapContVeryNew = getFromDds();
@@ -165,14 +166,14 @@ bool DusMineStateProxy::publishNewMap()
 
 const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
 {
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id()
-                       << " ddsData.mines().size() = " << m_lastDusMineState.mines().size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id
+                       << " ddsData.mines().size() = " << m_lastDusMineState.mines.size();
 
   QMap<int32_t, DusMineStateAndPositionData> mapCont;
 
-  const auto size = m_lastDusMineState.mines().size();
+  const auto size = m_lastDusMineState.mines.size();
 
-  const auto &mines = m_lastDusMineState.mines();
+  const auto &mines = m_lastDusMineState.mines;
   if (m_logger.isDebugEnabled())
   {
     int idx = 0;
@@ -180,40 +181,40 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
     {
       DEBUG_LOG(m_logger) << Q_FUNC_INFO
                           << " idx=" << idx++
-                          << ", eqId=" << mine.eqId()
-                          << ", chargeTypeId=" << mine.chargeTypeId();
+                          << ", eqId=" << mine.eqId
+                          << ", chargeTypeId=" << mine.chargeTypeId;
     }
   }
 
   
-  if (size != m_lastItemView.form().size())
+  if (size != m_lastItemView.form.size())
   {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id
                         << " size does not match"
                         << " ddsData.mines().size() = " << mines.size()
-                        << " itemView.form().size() = " << m_lastItemView.form().size();
+                        << " itemView.form().size() = " << m_lastItemView.form.size();
     return mapCont;
   }
 
-  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id
                        << " size ::"
                        << " ddsData.mines().size() = " << mines.size()
-                       << " itemView.form().size() = " << m_lastItemView.form().size();
+                       << " itemView.form().size() = " << m_lastItemView.form.size();
 
   for (size_t i = 0; i < size; ++i)
   {
     const AreaEffectSimulation::DusMine &dusMine = mines[i];
-    const Core::GeoPosition2D &pos               = m_lastItemView.form().at(i);
+    const Core::GeoPosition2D &pos               = m_lastItemView.form.at(i);
 
-    DusMineStateAndPositionData dmsDdsData(dusMine.eqId(),
-                                           {dusMine.chargeTypeId(),0,0},
-                                           dusMine.triggered(),
+    DusMineStateAndPositionData dmsDdsData(dusMine.eqId,
+                                           {dusMine.chargeTypeId,0,0},
+                                           dusMine.triggered,
                                            pos
                                           );
 
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " i=" << i << ", id/eqId=" << dusMine.eqId() << ", pos=" << pos;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " i=" << i << ", id/eqId=" << dusMine.eqId << ", pos=" << pos;
 
-    mapCont.insert(dusMine.eqId(), dmsDdsData);
+    mapCont.insert(dusMine.eqId, dmsDdsData);
   } 
 
   return mapCont;
@@ -227,7 +228,7 @@ bool DusMineStateProxy::getItemView(AreaEffectSimulation::AesItemView &itemView)
 
   const AreaEffectSimulation::AesItemView &localItemView = m_aesDtc->aesItemView(aesType);
 
-  if (localItemView.id() != aesType)
+  if (localItemView.id != aesType)
     return false;
   itemView = localItemView;
   return true;
@@ -315,10 +316,10 @@ bool MineAreaNull2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Un
 
   const auto cb = [simIdOut, &umodOut](const DusMineStateAndPositionData &data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
-      umodOut.m_description1 = QString::number(data.id()); 
-      umodOut.m_description2 = data.triggered() ? tr("disarmed") : tr("armed");
+      umodOut.m_description1 = QString::number(data.id);
+      umodOut.m_description2 = data.triggered ? tr("disarmed") : tr("armed");
       return true; 
     }
     return false;
@@ -360,13 +361,13 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::
 {
   
   
-  if (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying())
+  if (AreaEffectSimulation::AesType::AtMineArea != aesType)
     return;
 
   const auto cb = [this](const DDS_TYPE &data) -> bool
   {
     
-    if (data.isDeleted())
+    if (data.isDeleted)
       return false;
     this->updateVisibility(data);
     return false;
@@ -384,7 +385,7 @@ bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
 
-  const int32_t simId_eqId = ddsData.id(); 
+  const int32_t simId_eqId = ddsData.id;
 
   
   SymbolData symData;
@@ -396,7 +397,7 @@ bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 
   
   SituationMap::Injury injury = SituationMap::Injury::NoInjury;
-  if (ddsData.triggered())
+  if (ddsData.triggered)
     injury = SituationMap::Injury::TotalKill;
   mapObj->setInjury(injury, QColor(Qt::black));
 
@@ -407,7 +408,7 @@ bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->setVisibility(true);
 
   
-  mapObj->setOrigin(Point3D(ddsData.position().lon(), ddsData.position().lat(), .0));
+  mapObj->setOrigin(Point3D(ddsData.position().lon, ddsData.position().lat, .0));
 
   
   mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation, QString::number(simId_eqId));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
index 8c6146d75..a178e48ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
@@ -41,39 +41,31 @@ public:
   explicit AesItemProxy(int32_t id = 0,
                         const AreaEffectSimulation::ChargeStruct &chargeStruct = {-1,0,0},
                         const Core::GeoPosition2D &form = Core::GeoPosition2D())
-    : m_id_param(id),
-      m_chargeStruct(chargeStruct),
-      m_form_param(form)
+    : id(id),
+      chargeStruct(chargeStruct),
+      m_position(form)
   {}
 
   virtual ~AesItemProxy() = default;
 
+  void setId(const int32_t &value)                  { id = value; }
 
-  int32_t id() const                                { return m_id_param;     }
-  void setId(const int32_t &value)                  { m_id_param = value;    }
+  // Member-based access (mirrors the RTI DDS data structs, whose fields are plain members)
+  int32_t                              id{0};
+  std::string                          name;
+  bool                                 isDeleted{false};
+  EffectStart                          effectStart;
+  PartyId                              partyId;
+  bool                                 isCentral{false};
+  AreaEffectSimulation::AesEffectState effectStateId{AreaEffectSimulation::AesEffectState::EsCreated};
+  AreaEffectSimulation::ChargeStruct   chargeStruct;
+  qint64                               effectDuration{-1};
 
-  static std::string name()                         { return std::string();  }
-
-  static bool isDeleted()                           { return false; }
-
-  static EffectStart effectStart()                  { return {};  }
-  static PartyId partyId()                          { return {};  }
-  static bool isCentral()                           { return false;}
-
-  static AreaEffectSimulation::AesEffectState effectStateId() { return AreaEffectSimulation::AesEffectState::EsCreated;}
-  AreaEffectSimulation::ChargeStruct chargeStruct() const { return m_chargeStruct; }
-
-  int chargeTypeId() const                          { return m_chargeStruct.chargeTypeId(); }
-  static qint64 effectDuration()                    { return -1; }
-
-  Core::GeoPosition2D position() const              { return m_form_param;  }
+  int chargeTypeId() const                          { return chargeStruct.chargeTypeId; }
+  Core::GeoPosition2D position() const              { return m_position; }
 
 private:
-
-NGL::INGLLogger &m_logger;
-  int32_t                             m_id_param;
-  AreaEffectSimulation::ChargeStruct  m_chargeStruct;
-  Core::GeoPosition2D     m_form_param;
+  Core::GeoPosition2D                  m_position;
 };
 
 
@@ -94,17 +86,14 @@ public:
                                        const Core::GeoPosition2D &form = Core::GeoPosition2D()
                                        )
     : BaseClass(id, chargeStruct, form),
-    m_triggered(triggered)
+    triggered(triggered)
   {}
 
   virtual ~DusMineStateAndPositionData() = default;
 
-  bool triggered() const                          { return m_triggered;     }
-  void setTriggered(bool onOff)                   { m_triggered = onOff;    }
-
-private:
-  bool  m_triggered;
+  void setTriggered(bool onOff) { triggered = onOff; }
 
+  bool triggered{false};
 };
 
 
@@ -150,6 +139,7 @@ protected:
   AreaEffectSimulation::DusMineState                        m_lastDusMineState;
   AreaEffectSimulation::AesItemView                         m_lastItemView;
   QMap<int32_t, DusMineStateAndPositionData>                m_map;
+  LOGGER_T                                                  m_logger;
 
   QSharedPointer<MineAreaNull2SituationMap>                 m_mineAreaNull2SituationMap;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp
index 0ed7a85f2..6251b95c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp
@@ -7,7 +7,7 @@
 #include <AreaEffectSimulation/Utils/ddsdbconvert.h> 
 #include <ProjectDataManagement/pdm_dtc.h>
 
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 
 
@@ -102,15 +102,15 @@ bool MineArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
   
   {
@@ -133,7 +133,7 @@ bool MineArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
     }
 
     const QVector<AreaEffectSimulation::Database::AesMineAreaSegment> segments(AreaEffectSimulation::DdsDbConvert::mineAreaSegments(ddsData));
-    const QVector<QPolygonF> singleSegments(AreaEffectSimulation::Polygons::mineAreaSingleSegments(segments, ddsData.width(), ddsData.isCenterLine()));
+    const QVector<QPolygonF> singleSegments(AreaEffectSimulation::Polygons::mineAreaSingleSegments(segments, ddsData.width, ddsData.isCenterLine));
 
     QList<int> keysInUse = mapObj->keysInUse();
 
@@ -208,7 +208,7 @@ bool MineArea2SituationMap::updateGeometry(const AreaEffectSimulation::AesItemVi
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const PositionCont &posCont = form2PosCont(data.form());
+  const PositionCont &posCont = form2PosCont(data.form);
 
 
   
@@ -229,12 +229,12 @@ void MineArea2SituationMap::onTriggeredImpactsChanged(const AreaEffectSimulation
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const int32_t simId = data.aesItemId(); 
+  const int32_t simId = data.aesItemId; 
   if (simId < 0)
     return;
 
   
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
     return;
 
   
@@ -261,15 +261,15 @@ void MineArea2SituationMap::onTriggeredImpactsChanged(const AreaEffectSimulation
 
 void MineArea2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " data.aesTypeId()=" << data.aesTypeId() << " modType=" << modType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " data.aesTypeId()=" << data.aesTypeId << " modType=" << modType;
 
-  const int32_t simId = data.aesItemId(); 
+  const int32_t simId = data.aesItemId; 
   if (simId < 0)
     return;
 
   
   {
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineArea)
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtMineArea)
     {
       
       RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(simId);
@@ -287,7 +287,7 @@ void MineArea2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::Aes
   
 
 
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
     return;
 
   if (modType == DataModification::eRemoved)
@@ -349,8 +349,8 @@ bool MineArea2SituationMap::completeMissingData(int32_t simId,
 
 
   
-  const int32_t impactCount = dataTriggeredImpacts.impactCount();
-  const int32_t formSize    = dataAesItemView.form().size();
+  const int32_t impactCount = dataTriggeredImpacts.impactCount;
+  const int32_t formSize    = dataAesItemView.form.size();
 
   if (impactCount != formSize)
   {
@@ -391,7 +391,7 @@ bool MineArea2SituationMap::updateMines(const int32_t simId)
   AreaEffectSimulation::TriggeredImpacts  dataTriggeredImpacts;
   AreaEffectSimulation::AesItemView       dataAesItemView;
   bool bothTopicsMatch = completeMissingData(simId, dataTriggeredImpacts, dataAesItemView); 
-  const PositionCont &posCont = form2PosCont(dataAesItemView.form());
+  const PositionCont &posCont = form2PosCont(dataAesItemView.form);
 
   
   
@@ -403,7 +403,7 @@ bool MineArea2SituationMap::updateMines(const int32_t simId)
     posContActivated.reserve(posCont.size());
     posContDeActivated.reserve(posCont.size());
 
-    const auto &bitField = dataTriggeredImpacts.bitfield();
+    const auto &bitField = dataTriggeredImpacts.bitfield;
     
     
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp
index a464906ca..a3ba44e33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp
@@ -5,7 +5,7 @@
 #include <AreaEffectSimulation/Utils/polygons.h> 
 #include <AreaEffectSimulation/Utils/ddsdbconvert.h> 
 
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 
 namespace SituationMap
@@ -37,7 +37,7 @@ bool MineCorridor2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   
   QColor color(Qt::gray);
@@ -46,7 +46,7 @@ bool MineCorridor2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->rFillStyle().setFillColor(color);
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
   AreaEffectSimulation::AesItemView itemView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
index cecf1ea58..84687daff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
@@ -497,7 +497,7 @@ bool MountingPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
   const InfrastructureManagement::MountingPointType mpType = data.type();
 
   
-  if (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingNetworkSwitch)
+  if (mpType == InfrastructureManagement::MountingPointType::BuildingNetworkSwitch)
     return true;
 
   
@@ -507,26 +507,26 @@ bool MountingPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
     switch (m_resourceManagerMode) {
     case ResourceManagerMode::RMM_PlanActivityView:
       
-      return ( (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit) ||
-               (data.aimState().underlying() == InfrastructureManagement::MountingPointState::Idle)
+      return ( (mpType == InfrastructureManagement::MountingPointType::BuildingControlUnit) ||
+               (data.aimState() == InfrastructureManagement::MountingPointState::Idle)
                );
       break;
     case ResourceManagerMode::RMM_PlanDefinitionView:
       
-      return (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit);
+      return (mpType == InfrastructureManagement::MountingPointType::BuildingControlUnit);
       break;
     case ResourceManagerMode::RMM_ComponentMonitor:
       
       return
           ! (data.hasAssociatedAsset() &&
              (
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorCamera) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) ||
-               (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingSensorModule)
+               (mpType == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
+               (mpType == InfrastructureManagement::MountingPointType::IndoorIPS) ||
+               (mpType == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
+               (mpType == InfrastructureManagement::MountingPointType::IndoorCamera) ||
+               (mpType == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
+               (mpType == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) ||
+               (mpType == InfrastructureManagement::MountingPointType::BuildingSensorModule)
                )
              );
       break;
@@ -546,8 +546,8 @@ bool MountingPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
   
   
   
-  if ((mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
-      (mpType.underlying() == InfrastructureManagement::MountingPointType::AnnouncementUnit))
+  if ((mpType == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
+      (mpType == InfrastructureManagement::MountingPointType::AnnouncementUnit))
     return data.hasAssociatedAsset() == false;
 
   return true;
@@ -574,7 +574,7 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
   
 
   const Core::GeoPosition &geoPos = ddsData.geoPosition();
-  mapObj->setOrigin(Point3D(geoPos.lon(), geoPos.lat(), geoPos.z()));
+  mapObj->setOrigin(Point3D(geoPos.lon, geoPos.lat, geoPos.z));
 
   
   QString attribValue;
@@ -608,8 +608,8 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
     InfrastructureManagement::MountingPoint::MpColor col = InfrastructureManagement::MountingPoint::MpColor::GRAY;
 
     const InfrastructureManagement::MountingPointType mpType = ddsData.type();
-    if ( (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
-         (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) )
+    if ( (mpType == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
+         (mpType == InfrastructureManagement::MountingPointType::IndoorIPS) )
     {
       col = InfrastructureManagement::MountingPoint::MpColor::GRAY;
     } else {
@@ -621,7 +621,7 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
         {
           DEBUG_LOG(m_logger) << LOGFUNCTION << " componentStateOfHostname: '" << hostname << "' -> " << stateOut;
 
-          switch (stateOut.underlying()) {
+          switch (stateOut) {
           case ComponentMonitor::ComponentState::Undefined:
             if (QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier))
               col = InfrastructureManagement::MountingPoint::MpColor::ORANGE;
@@ -810,9 +810,9 @@ std::string MountingPointToMap::mountingPointHostname(const InfrastructureManage
 
   const int assAssetId = mountingPoint.associatedAssetId();
   const InfrastructureManagement::InstrumentationAsset &iAsset = m_ismDtc->instrumentationAsset(assAssetId);
-  if (iAsset.id() == assAssetId)
+  if (iAsset.id == assAssetId)
   {
-    const std::string &hostname = iAsset.hostname();
+    const std::string &hostname = iAsset.hostname;
     if (!hostname.empty())
       return hostname;
   }
@@ -827,9 +827,9 @@ bool MountingPointToMap::componentStateOfHostname(const std::string &hostname, C
 
   const auto cb = [hostname, &stateOut](const ComponentMonitor::ComponentStatus &ddsData) -> bool
   {
-    if (ddsData.hostname().compare(hostname) == 0)
+    if (ddsData.hostname.compare(hostname) == 0)
     {
-      stateOut = ddsData.state();
+      stateOut = ddsData.state;
       return true; 
     }
     return false;
@@ -865,7 +865,7 @@ bool MountingPointToMap::onComponentStatusChanged(const ComponentMonitor::Compon
   
   
   
-  const std::string &hostname = data.hostname();
+  const std::string &hostname = data.hostname;
   if (hostname.empty())
     return false;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
index c8933525b..a8ec42dc1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
@@ -13,7 +13,7 @@
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 #include <ComponentMonitor/cmo_data_plugin_interface.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <MapObjects/geo_image.h>
 #include <MapObjects/map_object_attributes.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
index d89d6e39e..db49451c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
@@ -26,7 +26,7 @@ namespace SituationMap
 
 int32_t MSEBridgeToMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool MSEBridgeToMap::init(PluginProvider *pluginProvider)
@@ -83,15 +83,15 @@ bool MSEBridgeToMap::isElapsed(const InfrastructureManagement::MainStructureElem
   if (BaseClass::isElapsed(ddsData))
     return true;
 
-  if (ddsData.structureElementTypeId() != InfrastructureManagement::StructureElementType::Bridge)
+  if (ddsData.structureElementTypeId != InfrastructureManagement::StructureElementType::Bridge)
     return true;
 
-  const qint32 mseId = ddsData.id();
+  const qint32 mseId = ddsData.id;
   const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(mseId);
-  if (mainFootprint.elements().size() < 4)
+  if (mainFootprint.elements.size() < 4)
   {
     ERROR_LOG(m_logger) << LOGFUNCTION << " mainFootprint with id=" << mseId << " is not sufficiant."
-                        << " mainFootprint.elements().size() = " << mainFootprint.elements().size();
+                        << " mainFootprint.elements().size() = " << mainFootprint.elements.size();
     if (!m_mseIdWithoutValidFootprint.contains(mseId))
     {
       INFO_LOG(m_logger) << LOGFUNCTION << " Save for future mainFootPrintChanged..."
@@ -132,10 +132,10 @@ bool MSEBridgeToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMapObj
 
   const auto cb = [this, simIdOut, &umodOut](const InfrastructureManagement::MainStructureElement & data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
       umodOut.m_description1 = m_ismDtc->getBuildingDisplayName(data);
-      umodOut.m_participantData.m_typeName = InfrastructureManagement::toString(data.structureElementTypeId());
+      umodOut.m_participantData.m_typeName = InfrastructureManagement::toString(data.structureElementTypeId);
       return true; 
     }
     return false;
@@ -176,15 +176,15 @@ void MSEBridgeToMap::onMainFootprintChanged(const InfrastructureManagement::Main
 {
   if (modType == DataModification::eRemoved)
     return;
-  if (data.elements().size() < 4)
+  if (data.elements.size() < 4)
     return;
 
-  const int32_t mseId = data.id(); 
+  const int32_t mseId = data.id; 
   if (m_mseIdWithoutValidFootprint.contains(mseId))
   {
     
     const InfrastructureManagement::MainStructureElement &mseData= m_ismDtc->mainStructureElement(mseId);
-    if (mseData.id() == mseId)
+    if (mseData.id == mseId)
     {
       m_mseIdWithoutValidFootprint.removeAll(mseId);
       onMainStructureElementChanged(mseData, DataModification::eAdded);
@@ -196,10 +196,10 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
                                               RefPointer<MAP_T> mapObj)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " id=" << ddsData.id()
-                      << " name=" << ddsData.name()
-                      << " geoPosition=" << ddsData.geoPosition()
-                      << " angle=" << ddsData.angle();
+                      << " id=" << ddsData.id
+                      << " name=" << ddsData.name
+                      << " geoPosition=" << ddsData.geoPosition
+                      << " angle=" << ddsData.angle;
 
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
@@ -226,16 +226,16 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
     const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(bridgeId);
 
     TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                        << " id=" << ddsData.id()
-                        << " name=" << ddsData.name()
-                        << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
+                        << " id=" << ddsData.id
+                        << " name=" << ddsData.name
+                        << " mainFootprint.elements().size()=" << mainFootprint.elements.size();
 
-    relPositions2D.reserve(mainFootprint.elements().size());
+    relPositions2D.reserve(mainFootprint.elements.size());
     
-    for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements())
+    for (const InfrastructureManagement::FootprintElement &element : mainFootprint.elements)
     {
-      const auto &relPos = element.relPosition();
-      relPositions2D += QPointF(relPos.offsetX(), relPos.offsetY());
+      const auto &relPos = element.relPosition;
+      relPositions2D += QPointF(relPos.offsetX, relPos.offsetY);
     }
   }
   DEBUG_LOG(m_logger) << "footprint = " << relPositions2D;
@@ -246,9 +246,9 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
   
   PositionCont absPositionsGeo;
 
-  const Core::GeoPosition &geoPosition = ddsData.geoPosition();
-  const double angleRad = ddsData.angle() * LtsCoordTrans::deg2rad();
-  const QPointF referencePointGeo(geoPosition.lon(), geoPosition.lat());
+  const Core::GeoPosition &geoPosition = ddsData.geoPosition;
+  const double angleRad = ddsData.angle * LtsCoordTrans::deg2rad();
+  const QPointF referencePointGeo(geoPosition.lon, geoPosition.lat);
   const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(referencePointGeo);
 
   
@@ -289,7 +289,7 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
 
   
   
-  switch(m_ismDtc->getBridgeStatus(ddsData.id()).underlying())
+  switch(m_ismDtc->getBridgeStatus(ddsData.id))
   {
   case InfrastructureManagement::BridgeStatus::Broken:
   {
@@ -330,7 +330,7 @@ bool MSEBridgeToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
   mapObj->setLineStyle(ls);
   mapObj->setFillStyle(fs);
 
-  mssd.heading = (ddsData.angle()*-1)+90; 
+  mssd.heading = (ddsData.angle*-1)+90; 
   mapObj->setModelSceneSymbolData(mssd);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
index 1dfd2799b..d330b0704 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
@@ -135,11 +135,11 @@ bool MSEPointToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMapObje
 
   const auto cb = [simIdOut, &umodOut](const InfrastructureManagement::MainStructureElement & data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
 
-      umodOut.m_description1 = QString::fromStdString(data.name());
-      umodOut.m_participantData.m_typeName = InfrastructureManagement::toString(data.structureElementTypeId());
+      umodOut.m_description1 = QString::fromStdString(data.name);
+      umodOut.m_participantData.m_typeName = InfrastructureManagement::toString(data.structureElementTypeId);
       return true; 
     }
     return false;
@@ -159,10 +159,10 @@ bool MSEPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
   if (BaseClass::isElapsed(data))
     return true;
 
-  if (data.isDeleted())
+  if (data.isDeleted)
     return true;
 
-  if (data.structureElementTypeId() != InfrastructureManagement::StructureElementType::ApproachingPoint)
+  if (data.structureElementTypeId != InfrastructureManagement::StructureElementType::ApproachingPoint)
     return true;
 
   return false;
@@ -170,23 +170,23 @@ bool MSEPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
 
 int32_t MSEPointToMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool MSEPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, RefPointer<Sim2SituationMap::MAP_T> mapObj)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION
-                      << ", id " << ddsData.id()
-                      << ", name = " << ddsData.name();
+                      << ", id " << ddsData.id
+                      << ", name = " << ddsData.name;
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   TextStyle textStyle;
   textStyle.setSize(10);
 
 
-  if (ddsData.structureElementTypeId() == InfrastructureManagement::StructureElementType::ApproachingPoint)
+  if (ddsData.structureElementTypeId == InfrastructureManagement::StructureElementType::ApproachingPoint)
   {
     textStyle.setTextColor(Qt::yellow);
     mapObj->setProxyImage(renderApproachingPoint(Qt::yellow), QSize(50, 50));
@@ -195,8 +195,8 @@ bool MSEPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, Re
   mapObj->setTextStyle(textStyle);
 
   
-  const Core::GeoPosition &geoPos = ddsData.geoPosition();
-  mapObj->setOrigin(Point3D(geoPos.lon(), geoPos.lat(), geoPos.z()));
+  const Core::GeoPosition &geoPos = ddsData.geoPosition;
+  mapObj->setOrigin(Point3D(geoPos.lon, geoPos.lat, geoPos.z));
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp
index eb08d70f3..0f72a724f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp
@@ -67,7 +67,7 @@ void NContamination2SituationMap::updateAllSpheres3D(qint64 newPartitionTime)
 
     const int simId = it.key();
     const AreaEffectSimulation::NContamination &nCont = m_aesDtc->nContamination(simId);
-    if (nCont.id() != simId)
+    if (nCont.id != simId)
       continue;
 
     if (updateSphere3D(mapObj, nCont, newPartitionTime))
@@ -80,18 +80,18 @@ void NContamination2SituationMap::updateAllSpheres3D(qint64 newPartitionTime)
 
 bool NContamination2SituationMap::updateSphere3D(RefPointer<Sim2SituationMap::MAP_T> mapObj, const AreaEffectSimulation::NContamination &data, qint64 newPartitionTime)
 {
-  const int32_t simId = data.id(); 
+  const int32_t simId = data.id; 
 
   if (!mapObj)
     return false;
 
   bool bUpdateRequired = false;
 
-  const bool bDesiredNewState = (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsActivated) &&  
-      ((newPartitionTime - data.sampleTime() < 5000));  
+  const bool bDesiredNewState = (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated) &&  
+      ((newPartitionTime - data.sampleTime < 5000));  
 
   TRACE_LOG(m_logger) << LOGFUNCTION << ", START" << " simId = " << simId
-                      << ", sampleTime " << data.sampleTime()
+                      << ", sampleTime " << data.sampleTime
                       << ", bDesiredNewState " << bDesiredNewState;
 
   
@@ -112,9 +112,9 @@ bool NContamination2SituationMap::updateSphere3D(RefPointer<Sim2SituationMap::MA
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << ", START ADD " << " simId = " << simId;
 
-    const Core::GeoPosition2D &geoPos = data.impactPosition();
-    Point3D markerOrigin(geoPos.lon(), geoPos.lat(), 0);  
-    mapObj->setDetonation(markerOrigin, data.impactRadius());
+    const Core::GeoPosition2D &geoPos = data.impactPosition;
+    Point3D markerOrigin(geoPos.lon, geoPos.lat, 0);  
+    mapObj->setDetonation(markerOrigin, data.impactRadius);
 
     bUpdateRequired = true;
   }
@@ -131,18 +131,18 @@ bool NContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
   if (m_objFac.map() && (m_objFac.map()->mode() == Mode::Mode_3D))
     updateSphere3D(mapObj, ddsData, m_pluginProvider->partitionTime());
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtNContamination, itemView))
     this->updateGeometry(itemView, mapObj);
@@ -162,8 +162,8 @@ bool NContamination2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_
   }
 
   
-  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition();
-  mapObj->setImpactOrigin(Point3D(impactPos2D.lon(), impactPos2D.lat(), 0.0));
+  const Core::GeoPosition2D& impactPos2D = ddsData.impactPosition;
+  mapObj->setImpactOrigin(Point3D(impactPos2D.lon, impactPos2D.lat, 0.0));
 
 
   updateVisibility(ddsData, mapObj);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp
index 1b4b2236e..fda720311 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp
@@ -50,21 +50,21 @@ void OffRoute2SituationMap::onPartitionTimeChanged(qint64 newPartitionTime)
 
 void OffRoute2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << " data.aesTypeId()=" << data.aesTypeId() << " modType=" << modType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << " data.aesTypeId()=" << data.aesTypeId << " modType=" << modType;
 
   
   
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
     return;
 
-  const int32_t simId = data.aesItemId(); 
+  const int32_t simId = data.aesItemId; 
   if (simId < 0)
     return;
 
   
   updateSecondary(simId);
 
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " data.aesTypeId()=" << data.aesTypeId() << " modType=" << modType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " data.aesTypeId()=" << data.aesTypeId << " modType=" << modType;
 }
 
 void OffRoute2SituationMap::updateAllDetonationSpheres(qint64 newPartitionTime)
@@ -91,7 +91,7 @@ void OffRoute2SituationMap::updateAllDetonationSpheres(qint64 newPartitionTime)
 
     const int simId = it.key();
     const AreaEffectSimulation::OffRouteMine &offRouteMine = m_aesDtc->offRouteMine(simId);
-    if (offRouteMine.id() != simId)
+    if (offRouteMine.id != simId)
       continue;
 
     if (updateDetonationSphere3D(mapObj, offRouteMine, newPartitionTime))
@@ -104,17 +104,17 @@ void OffRoute2SituationMap::updateAllDetonationSpheres(qint64 newPartitionTime)
 
 bool OffRoute2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMap::MAP_T> mapObj, const AreaEffectSimulation::OffRouteMine &trap, qint64 newPartitionTime)
 {
-  const int32_t simId = trap.id(); 
+  const int32_t simId = trap.id; 
 
   if (!mapObj)
     return false;
 
   bool bUpdateRequired = false;
 
-  const bool bDesiredNewState = trap.triggered() && ((newPartitionTime - trap.sampleTime() < 5000));  
+  const bool bDesiredNewState = trap.triggered && ((newPartitionTime - trap.sampleTime < 5000));  
 
   TRACE_LOG(m_logger) << LOGFUNCTION << ", START" << " simId = " << simId
-                      << ", sampleTime " << trap.sampleTime()
+                      << ", sampleTime " << trap.sampleTime
                       << ", bDesiredNewState " << bDesiredNewState;
 
   
@@ -191,15 +191,15 @@ bool OffRoute2SituationMap::updateDetonationSphere3D(RefPointer<Sim2SituationMap
   {
     FATAL_LOG(m_logger) << LOGFUNCTION << ", START ADD " << " simId = " << simId;
 
-    const Core::GeoPosition2D &geoPos = trap.area().cornerBottomLeft(); 
-    Point3D markerOrigin(geoPos.lon(), geoPos.lat(), 0);  
+    const Core::GeoPosition2D &geoPos = trap.area.cornerBottomLeft; 
+    Point3D markerOrigin(geoPos.lon, geoPos.lat, 0);  
 
     VirtualMine::SceneSymbolData ssData;
 
     const QColor &majorColor = mapObj->majorColor();
     ssData.color = majorColor;
 
-    ssData.radius = std::max( (trap.impactRadius().is_set() ? trap.impactRadius().get() : 1) , 1.0); 
+    ssData.radius = std::max( (trap.impactRadius.has_value() ? trap.impactRadius.get() : 1) , 1.0); 
 
     
     
@@ -244,7 +244,7 @@ bool OffRoute2SituationMap::updateSecondary(int32_t simId, bool bUpdateJust3DPar
   
   const AreaEffectSimulation::OffRouteMine &trap = m_aesDtc->offRouteMine(simId);
 
-  if (trap.chargeStruct().chargeTypeId() == s_offRouteMine2) 
+  if (trap.chargeStruct.chargeTypeId == s_offRouteMine2) 
   {
     AreaEffectSimulation::AesItemView dataAesItemView;
     if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtOffRouteMineSecondary, dataAesItemView))
@@ -255,15 +255,15 @@ bool OffRoute2SituationMap::updateSecondary(int32_t simId, bool bUpdateJust3DPar
     }
 
     
-    if ((dataAesItemView.aesItemId() == simId) &&
-        (trap.id() == simId) &&
-        trap.triggered())
+    if ((dataAesItemView.aesItemId == simId) &&
+        (trap.id == simId) &&
+        trap.triggered)
     {
       DEBUG_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << " setSubsidiaryLine";
       VirtualMine::OptionalData optData;
       optData.closed = true;
       mapObj->setSubsidiaryLine(0, 
-                                form2PosCont(dataAesItemView.form()), optData);
+                                form2PosCont(dataAesItemView.form), optData);
     } else {
       DEBUG_LOG(m_logger) << LOGFUNCTION << " simId = " << simId << " removeSubsidiaryLine";
       mapObj->removeSubsidiaryLine(0);
@@ -276,7 +276,7 @@ bool OffRoute2SituationMap::updateSecondary(int32_t simId, bool bUpdateJust3DPar
   }
 
   TRACE_LOG(m_logger) << LOGFUNCTION << ", END" << " simId = " << simId
-                      << " trap.triggered(" << trap.triggered();
+                      << " trap.triggered(" << trap.triggered;
 
   return true;
 }
@@ -289,15 +289,15 @@ bool OffRoute2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dds
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtOffRouteMine, itemView))
   {
@@ -335,17 +335,17 @@ bool OffRoute2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_TYPE &
   if (!m_displayFilter)
     return true;         
 
-  const auto es = data.effectStart().is_set() ? data.effectStart().get() : 0;
-  const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
+  const auto es = data.effectStart.has_value() ? data.effectStart.get() : 0;
+  const auto partyId = data.partyId.has_value() ? data.partyId.get() : -1;
   bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
   if (isVisibleByFilter)
     isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType::AtMineArea,
-                                                   data.effectStateId(),
-                                                   data.chargeStruct().chargeTypeId(),
+                                                   data.effectStateId,
+                                                   data.chargeStruct.chargeTypeId,
                                                    partyId,
-                                                   data.isCentral(),
+                                                   data.isCentral,
                                                    es,
-                                                   data.effectDuration(),
+                                                   data.effectDuration,
                                                    m_pluginProvider->partitionTime());
 
   return isVisibleByFilter;
@@ -353,14 +353,14 @@ bool OffRoute2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_TYPE &
 
 void OffRoute2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
 {
-  if ((AreaEffectSimulation::AesType::AtOffRouteMine != aesType.underlying()) &&
-      (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying()))
+  if ((AreaEffectSimulation::AesType::AtOffRouteMine != aesType) &&
+      (AreaEffectSimulation::AesType::AtMineArea != aesType))
     return;
 
   const auto cb = [this](const DDS_TYPE &data) -> bool
   {
     
-    if (data.isDeleted())
+    if (data.isDeleted)
       return false;
     this->updateVisibility(data);
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
index 3327b0449..b44ff0e5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
@@ -3,6 +3,8 @@
 
 #include "participant_to_map.h"
 #include <utility>
+#include <ParticipantManagement/ppm_dtc.h>   // complete Dtc type for &Dtc::typeChanged (signal-pointer connect)
+#include <GuezIedManagement/gim_dtc.h>   // complete GuezIedManagement Dtc type + Ied struct
 #include "pdm_handler.h"
 
 #include <Map/map.h>
@@ -33,19 +35,19 @@ static QString participantToString(const ParticipantManagement::Participant &dat
 {
   QString str;
 
-  str.append(QStringLiteral("participantId=%1").arg(data.id()));
-  str.append(QStringLiteral(", symbol=%1").arg(QString::fromStdString(data.symbol())));
-  str.append(QStringLiteral(", typeId=%1").arg(data.typeId()));
-  str.append(QStringLiteral(", designator=%1").arg(QString::fromStdString(data.designator())));
-  str.append(QStringLiteral(", tacticalIdentifier=%1").arg(QString::fromStdString(data.tacticalIdentifier())));
+  str.append(QStringLiteral("participantId=%1").arg(data.id));
+  str.append(QStringLiteral(", symbol=%1").arg(QString::fromStdString(data.symbol)));
+  str.append(QStringLiteral(", typeId=%1").arg(data.typeId));
+  str.append(QStringLiteral(", designator=%1").arg(QString::fromStdString(data.designator)));
+  str.append(QStringLiteral(", tacticalIdentifier=%1").arg(QString::fromStdString(data.tacticalIdentifier)));
   return str;
 }
 
 static bool hasGeoPositionNaN(const Core::GeoPosition &geoPos)
 {
-  return std::isnan(geoPos.lat()) ||
-      std::isnan(geoPos.lon()) ||
-      std::isnan(geoPos.z());
+  return std::isnan(geoPos.lat) ||
+      std::isnan(geoPos.lon) ||
+      std::isnan(geoPos.z);
 }
 
 
@@ -73,7 +75,7 @@ Participant2SituationMap::~Participant2SituationMap()
 
 int32_t Participant2SituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool Participant2SituationMap::init(LayerFactory *layerFactory,
@@ -151,13 +153,13 @@ bool Participant2SituationMap::run()
   
   m_ppmDtc->bites([this](const ParticipantManagement::Bite & data)
   {
-    if (data.biteErrors().size() > 0)
-      m_hasBiteError.insert(data.equipmentNumber());
+    if (data.biteErrors.size() > 0)
+      m_hasBiteError.insert(data.equipmentNumber);
   });
   
   m_ppmDtc->dynamicParticipantDatas([this](const ParticipantManagement::DynamicParticipantData & data)
   {
-    m_participantDynamicData.insert(data.participantId(), data);
+    m_participantDynamicData.insert(data.participantId, data);
   });
   
   m_ppmDtc->participants([this](const ParticipantManagement::Participant & data)
@@ -321,34 +323,34 @@ bool Participant2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Uni
 
   umodOut = UnifiedMapObjectData();
   const ParticipantManagement::Participant &particpantData = it.value();
-  if (particpantData.equipmentNumber().is_set())
-    umodOut.m_equipmentNumber = particpantData.equipmentNumber().get();
-  umodOut.m_participantData.m_participantId = particpantData.id();
-  umodOut.m_participantData.m_typeId        = particpantData.typeId();
-  umodOut.m_participantData.m_typeName      = QString::fromStdString(m_ppmDtc->type(particpantData.typeId()).name());
-  const auto itDynData = m_participantDynamicData.find(particpantData.id());
+  if (particpantData.equipmentNumber.has_value())
+    umodOut.m_equipmentNumber = particpantData.equipmentNumber.get();
+  umodOut.m_participantData.m_participantId = particpantData.id;
+  umodOut.m_participantData.m_typeId        = particpantData.typeId;
+  umodOut.m_participantData.m_typeName      = QString::fromStdString(m_ppmDtc->type(particpantData.typeId).name);
+  const auto itDynData = m_participantDynamicData.find(particpantData.id);
   if (itDynData != m_participantDynamicData.end())
   {
     const auto &dynData = itDynData.value();
-    if (dynData.stateHistory().size() != 0)
+    if (dynData.stateHistory.size() != 0)
     {
-      const ParticipantManagement::Type type             = m_ppmDtc->type(particpantData.typeId());
-      const ParticipantManagement::TypeClass typeClass   = type.typeClass();
+      const ParticipantManagement::Type type             = m_ppmDtc->type(particpantData.typeId);
+      const ParticipantManagement::TypeClass typeClass   = type.typeClass;
       const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
-            ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
-            ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+            ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
+            ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
 
-      const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(dynData.stateHistory());
-      const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
-      umodOut.m_participantData.m_vulnerabilityState = vulState.underlying();
+      const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(dynData.stateHistory);
+      const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState;
+      umodOut.m_participantData.m_vulnerabilityState = static_cast<int>(vulState);
       umodOut.m_participantData.m_vulnerabilityString = ProjectDataManagement::toString(vulState, vc);
     }
   }
 
-  umodOut.m_partyId = particpantData.partyId();
+  umodOut.m_partyId = particpantData.partyId;
 
-  umodOut.m_description1 = QString::fromStdString(particpantData.designator());
-  umodOut.m_description2 = QString::fromStdString(particpantData.tacticalIdentifier());
+  umodOut.m_description1 = QString::fromStdString(particpantData.designator);
+  umodOut.m_description2 = QString::fromStdString(particpantData.tacticalIdentifier);
 
   RefPointer<SituationMap::Participant> mapObj = this->getMapObjectOfUniqueMapId(uniqueMapId);
   if (mapObj.valid())
@@ -420,7 +422,7 @@ void Participant2SituationMap::onPartitionTimeChanged(qint64 newPartitionTime)
   for (const InternalPosition &pos : std::as_const(m_participantPositions))
   {
     if (LtsUtils::isPositionTimeOutdated(newPartitionTime, pos.sampleTime()))
-      handleSymbolAppearanceSettingsParticipant(pos.participantId());
+      handleSymbolAppearanceSettingsParticipant(pos.participantId);
   }
 
   
@@ -486,11 +488,11 @@ void Participant2SituationMap::onTypesChanged(const ParticipantManagement::Type
 {
   if (modType == DataModification::eRemoved)
   {
-    m_types.remove(data.id());
+    m_types.remove(data.id);
     return;
   }
 
-  m_types[data.id()] = data;
+  m_types[data.id] = data;
   updateHierarchyLevels();
 }
 
@@ -503,7 +505,7 @@ void Participant2SituationMap::updateHierarchyLevels()
   {
     std::set<qint32> hLevels;     
     for (const ParticipantManagement::Type &type : std::as_const(m_types))
-      hLevels.insert(type.hierarchyLevel());
+      hLevels.insert(type.hierarchyLevel);
 
 
     RenderingMode renderingMode       = m_layerFactory->participantLayerRenderingMode();
@@ -549,16 +551,16 @@ void Participant2SituationMap::onParticipantChanged(const ParticipantManagement:
                                                     DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
-  updateContainer(m_participants, data, data.id(), modType);
-  checkForUnknownOriginatorsParticipant(data.id());
+  updateContainer(m_participants, data, data.id, modType);
+  checkForUnknownOriginatorsParticipant(data.id);
   if (handleChanged(data, modType) && modType != DataModification::eRemoved)
-    updateParticipantPosition(data.id()); 
+    updateParticipantPosition(data.id); 
 
 
   const ParticipantManagement::ParticipantData &ppData =  m_ppmDtc->convertParticipantToParticipantData(data);
-  const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId());
-  const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties())).object());
-  updateContainer(m_participantsWithProperties, typeProperties[QStringLiteral("isArtillery")].toBool(false), data.id(), modType);
+  const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId);
+  const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties)).object());
+  updateContainer(m_participantsWithProperties, typeProperties[QStringLiteral("isArtillery")].toBool(false), data.id, modType);
 
 
 }
@@ -573,14 +575,14 @@ void Participant2SituationMap::onPositionChanged(const ParticipantManagement::Pa
     
     if(m_ppmDtc != nullptr)
     {
-      auto participant = m_ppmDtc.get()->participant(data.participantId());
-      if(participant.equipmentNumber().is_set())
+      auto participant = m_ppmDtc.get()->participant(data.participantId);
+      if(participant.equipmentNumber.has_value())
       {
-        if(participant.equipmentNumber().get() == 1)
+        if(participant.equipmentNumber.get() == 1)
         {
           DEBUG_LOG(m_logger) << "ownPositionChanged2!!!";
-          const Point3D newPos(data.pos().lon(), data.pos().lat(), data.pos().z());
-          emit participantOwnPositionChanged(newPos, data.sampleTime());
+          const Point3D newPos(data.pos.lon, data.pos.lat, data.pos.z);
+          emit participantOwnPositionChanged(newPos, data.sampleTime);
 
           return;
         }
@@ -597,22 +599,22 @@ void Participant2SituationMap::onPositionChanged(const ParticipantManagement::Pa
   }
 
   InternalPosition pos;
-  pos.participantId(data.participantId());
-  pos.positionLeader(data.pos());
-  pos.sampleTimeLeader(data.sampleTime());
-  pos.reportingSource = data.reportingSource();
+  pos.participantId = data.participantId;
+  pos.positionLeader = data.pos;
+  pos.sampleTimeLeader = data.sampleTime;
+  pos.reportingSource = data.reportingSource;
   pos.isUnit = false;
 
-  if (data.mountedOn().is_set() && data.mountedOn().get() > 0)
+  if (data.mountedOn.has_value() && data.mountedOn.get() > 0)
     pos.bIsMountedOn = true;
 
-  if (data.mountedParticipants().is_set() && data.mountedParticipants().get().size() > 0)
+  if (data.mountedParticipants.has_value() && data.mountedParticipants.get().size() > 0)
     pos.bHasMountedParticipants = true;
 
 
 
-  updateContainer(m_participantPositions, std::move(pos), data.participantId(), modType);
-  updateParticipantPosition(data.participantId());
+  updateContainer(m_participantPositions, std::move(pos), data.participantId, modType);
+  updateParticipantPosition(data.participantId);
 }
 
 void Participant2SituationMap::onUnitPositionChanged(const ParticipantManagement::UnitPosition &data,
@@ -629,7 +631,7 @@ void Participant2SituationMap::onUnitPositionChanged(const ParticipantManagement
   }
 #endif
   InternalPosition pos(data, m_bShowCenterPositions);
-  updateContainer(m_participantPositions, pos, data.participantId(), modType);
+  updateContainer(m_participantPositions, pos, data.participantId, modType);
 
   updateParticipantPosition(pos);
 }
@@ -645,11 +647,11 @@ void Participant2SituationMap::updateParticipantPosition(int participantId, bool
 void Participant2SituationMap::updateParticipantPosition(const InternalPosition &pos, bool bHandleSymbolAppearanceSettingsParticipant)
 {
   
-  const auto it = m_simId2UniqueMapId.constFind(pos.participantId());
+  const auto it = m_simId2UniqueMapId.constFind(pos.participantId);
   if (it == m_simId2UniqueMapId.constEnd())
     return;
 
-  const auto participantId = pos.participantId();
+  const auto participantId = pos.participantId;
   const UniqueMapId uniqueMapId = it.value();
   RefPointer<Sim2SituationMap::MAP_T> mapObj = m_objFac.get<Sim2SituationMap::MAP_T>(uniqueMapId);
   if (!mapObj)
@@ -663,8 +665,8 @@ void Participant2SituationMap::updateParticipantPosition(const InternalPosition
   {
     DEBUG_LOG(m_logger) << "InternalPosition of participantId " << participantId
                         << " has nan!"
-                        << " pos.positionCenter() = " << pos.positionCenter()
-                        << " pos.positionLeader() = " << pos.positionLeader();
+                        << " pos.positionCenter() = " << pos.positionCenter
+                        << " pos.positionLeader() = " << pos.positionLeader;
     if (mapObj->visibility())
     {
       mapObj->setVisibility(false); 
@@ -710,7 +712,7 @@ void Participant2SituationMap::updateParticipantPosition(const InternalPosition
   }
 
   const Core::GeoPosition &geoPos = pos.position();
-  const Point3D newPos(geoPos.lon(), geoPos.lat(), geoPos.z());
+  const Point3D newPos(geoPos.lon, geoPos.lat, geoPos.z);
 
   
   bool positionChanged = mapObj->setOrigin(newPos);
@@ -741,7 +743,7 @@ void Participant2SituationMap::onDynamicParticipantDataChanged(const Participant
 {
   DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged: " << data;
 
-  const int32_t simId = data.participantId();
+  const int32_t simId = data.participantId;
 
   updateContainer(m_participantDynamicData, data, simId, modType);
 
@@ -764,7 +766,7 @@ void Participant2SituationMap::onDynamicParticipantDataChanged(const Participant
     return;
   }
 
-  checkForUnknownOriginatorsParticipant(data.participantId());
+  checkForUnknownOriginatorsParticipant(data.participantId);
 
   
   updateDynamicParticipantData(mapObj, data);
@@ -779,24 +781,24 @@ void Participant2SituationMap::onBiteChanged(const ParticipantManagement::Bite &
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    if (data.biteErrors().size() > 0)
-      m_hasBiteError.insert(data.participantId());
+    if (data.biteErrors.size() > 0)
+      m_hasBiteError.insert(data.participantId);
     else
-      m_hasBiteError.remove(data.participantId());
+      m_hasBiteError.remove(data.participantId);
     break;
   case DataModification::eRemoved:
-    m_hasBiteError.remove(data.participantId());
+    m_hasBiteError.remove(data.participantId);
     break;
   }
-  handleSymbolAppearanceSettingsParticipant(data.participantId());
+  handleSymbolAppearanceSettingsParticipant(data.participantId);
 }
 
 void Participant2SituationMap::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent &data,
                                                              DataModification modType)
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION <<  " ParticipantGearEvent = "
-                      << " participantId= " << data.participantId()
-                      << " sampleTime= " << data.sampleTime();
+                      << " participantId= " << data.participantId
+                      << " sampleTime= " << data.sampleTime;
 
   
   
@@ -806,7 +808,7 @@ void Participant2SituationMap::onParticipantGearEventChanged(const ParticipantMa
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_participantGearEvents[data.participantId()] = data.sampleTime();
+    m_participantGearEvents[data.participantId] = data.sampleTime;
   }
     break;
 
@@ -814,7 +816,7 @@ void Participant2SituationMap::onParticipantGearEventChanged(const ParticipantMa
     
   case DataModification::eRemoved:
   {
-    const int participantId = data.participantId();
+    const int participantId = data.participantId;
     RefPointer<MAP_T> mapObj = this->getMapObjectOfSimId(participantId);
     if (mapObj.valid())
       mapObj->forcePartyColor(QColor());  
@@ -867,7 +869,7 @@ void Participant2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::
                                                                                      AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory,
                                                                                      AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine};
 
-  if (subOrdinateAesTypeIds.contains(data.aesTypeId().underlying()))
+  if (subOrdinateAesTypeIds.contains(data.aesTypeId))
     return;
 
   
@@ -875,19 +877,19 @@ void Participant2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    if (data.partyId().is_set())
-      m_aesItemView2PartyId[data.aesItemId()] = data.partyId().get();
+    if (data.partyId.has_value())
+      m_aesItemView2PartyId[data.aesItemId] = data.partyId.get();
     else
-      m_aesItemView2PartyId.remove(data.aesItemId());
+      m_aesItemView2PartyId.remove(data.aesItemId);
     break;
   case DataModification::eRemoved:
-    m_aesItemView2PartyId.remove(data.aesItemId());
+    m_aesItemView2PartyId.remove(data.aesItemId);
     break;
   }
 
   if (modType == DataModification::eRemoved)
     return;
-  checkForUnknownOriginatorsAes(data.aesItemId()); 
+  checkForUnknownOriginatorsAes(data.aesItemId); 
 }
 
 void Participant2SituationMap::onDusMineStateChanged(const AreaEffectSimulation::DusMineState &, DataModification )
@@ -895,7 +897,7 @@ void Participant2SituationMap::onDusMineStateChanged(const AreaEffectSimulation:
   auto copy = m_participantDynamicData;
   for (const ParticipantManagement::DynamicParticipantData &dynPartData : std::as_const(copy))
   {
-    if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId()))
+    if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId))
       continue;
     onDynamicParticipantDataChanged(dynPartData, DataModification::eModified);
   }
@@ -980,11 +982,11 @@ void Participant2SituationMap::onMovementTrackRemoved(int trackId)
 
 int Participant2SituationMap::participantHierachyLevel(const ParticipantManagement::Participant &data) const
 {
-  const qint32 typeId = data.typeId();
+  const qint32 typeId = data.typeId;
   auto it = m_types.find(typeId);
   if (it == m_types.end())
     return 0;
-  return it.value().hierarchyLevel();
+  return it.value().hierarchyLevel;
 }
 
 
@@ -1009,14 +1011,14 @@ bool Participant2SituationMap::isElapsed(const ParticipantManagement::Participan
   if(strcmp(PROJECTBUILD, "commaster") == 0 ||
      strcmp(PROJECTBUILD, "demotablet") == 0)
   {
-    if(data.equipmentNumber().is_set())
-      if(data.equipmentNumber().get() == 1)
+    if(data.equipmentNumber.has_value())
+      if(data.equipmentNumber.get() == 1)
         isOwnPosition = true;
   }
 
   
 
-  return data.isDeleted() || isOwnPosition;
+  return data.isDeleted || isOwnPosition;
 }
 
 
@@ -1063,7 +1065,7 @@ void Participant2SituationMap::checkForUnknownOriginatorsAes(int possibleOrigina
 bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2SituationMap::MAP_T> mapObj,
                                                             const ParticipantManagement::DynamicParticipantData &data)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", data.participantId() " << data.participantId();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", data.participantId() " << data.participantId;
 
   if (!mapObj)
     return false;
@@ -1073,11 +1075,11 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
   int32_t injuryPartyId = -1;
 
   
-  const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory());
-  if (data.stateHistory().size() != 0)
+  const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory);
+  if (data.stateHistory.size() != 0)
   {
-    const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
-    switch (vulState.underlying())  
+    const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState;
+    switch (vulState)  
     {
     case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
     case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
@@ -1114,46 +1116,46 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
     } 
 
     
-    switch (lastState.originatorType().underlying())
+    switch (lastState.originatorType)
     {
-    case ProjectDataManagement::StateChangeOriginator::Participant:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
     {
-      const int32_t originParticipantId = lastState.originatorId();
+      const int32_t originParticipantId = lastState.originatorId;
       if (originParticipantId != 0)
       {
         auto it = m_participants.constFind(originParticipantId);
         if (it == m_participants.constEnd())
         {
           const ParticipantManagement::Participant &participantOrigin = m_ppmDtc->participant(originParticipantId);
-          if (participantOrigin.id() > 0) 
+          if (participantOrigin.id > 0) 
           {
-            m_participants.insert(participantOrigin.id(), participantOrigin);
-            injuryPartyId = participantOrigin.partyId();
+            m_participants.insert(participantOrigin.id, participantOrigin);
+            injuryPartyId = participantOrigin.partyId;
             const ParticipantManagement::ParticipantData &ppData =  m_ppmDtc->convertParticipantToParticipantData(participantOrigin);
-            const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId());
-            const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties())).object());
-            m_participantsWithProperties.insert(participantOrigin.id(), typeProperties[QStringLiteral("isArtillery")].toBool(false));
+            const ParticipantManagement::Type &ppType = m_ppmDtc->type(ppData.typeId);
+            const QJsonObject typeProperties(QJsonDocument::fromJson(QByteArray::fromStdString(ppType.properties)).object());
+            m_participantsWithProperties.insert(participantOrigin.id, typeProperties[QStringLiteral("isArtillery")].toBool(false));
           }
-          else if (originParticipantId != data.participantId())  
-            m_unknownOriginatorsParticipant.push_back(qMakePair(originParticipantId, data.participantId()));    
+          else if (originParticipantId != data.participantId)  
+            m_unknownOriginatorsParticipant.push_back(qMakePair(originParticipantId, data.participantId));    
 
         }
         else
-          injuryPartyId = it.value().partyId();
+          injuryPartyId = it.value().partyId;
       }
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::Party:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party:
     {
-      const ParticipantManagement::Party &partyOrigin = m_ppmDtc->party(lastState.originatorId());
-      if(partyOrigin.id())
-        injuryPartyId = partyOrigin.id();
+      const ParticipantManagement::Party &partyOrigin = m_ppmDtc->party(lastState.originatorId);
+      if(partyOrigin.id)
+        injuryPartyId = partyOrigin.id;
       break;
     }
-    case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-    case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
     {
-      const int32_t originEffectSimulationId = lastState.originatorId();
+      const int32_t originEffectSimulationId = lastState.originatorId;
 
       if (originEffectSimulationId != 0)
       {
@@ -1162,7 +1164,7 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
         if (itAesItemView == m_aesItemView2PartyId.constEnd())
         {
           DEBUG_LOG(m_logger) << LOGFUNCTION << " aesItemViewFromEntityId failed 1, originEffectSimulationId = " << originEffectSimulationId
-                              << ", data.participantId() " << data.participantId();
+                              << ", data.participantId() " << data.participantId;
 
 #ifdef EXPENSIVE_FALLBACK
           
@@ -1174,7 +1176,7 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
           
           AreaEffectSimulation::AesItem aesItem;
           m_aesDtc->aesItemFromId(originEffectSimulationId, aesItem);
-          if (aesItem.partyId().is_set())
+          if (aesItem.partyId().has_value())
           {
             injuryPartyId = aesItem.partyId().get();
 
@@ -1194,9 +1196,9 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
 #endif 
           {
             DEBUG_LOG(m_logger) << LOGFUNCTION << " aesItemViewFromEntityId failed 2, originEffectSimulationId = " << originEffectSimulationId
-                                << ", data.participantId() " << data.participantId();
+                                << ", data.participantId() " << data.participantId;
 
-            m_unknownOriginatorsAes.push_back(qMakePair(originEffectSimulationId, data.participantId()));    
+            m_unknownOriginatorsAes.push_back(qMakePair(originEffectSimulationId, data.participantId));    
           }
 
         }
@@ -1205,42 +1207,42 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
       }
     }
       break;
-    case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
     {
       auto guezIedDtc = m_pluginProvider->gimDtc();
       if (guezIedDtc)
       {
-        const GuezIedManagement::Ied &gIed = guezIedDtc->iedForEquipmentNumber(lastState.originatorId());
-        if (gIed.id() > 0)
-          injuryPartyId = gIed.partyId();
+        const GuezIedManagement::Ied &gIed = guezIedDtc->iedForEquipmentNumber(lastState.originatorId);
+        if (gIed.id > 0)
+          injuryPartyId = gIed.partyId;
       }
     }
       break;
-    case ProjectDataManagement::StateChangeOriginator::DusMine:
-      injuryPartyId = m_aesDtc->partyForDusMine(lastState.originatorId());
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
+      injuryPartyId = m_aesDtc->partyForDusMine(lastState.originatorId);
 
       if (injuryPartyId == -1)
-        m_participantWithMaybeMissingPartyId.insert(data.participantId());
+        m_participantWithMaybeMissingPartyId.insert(data.participantId);
       else
-        m_participantWithMaybeMissingPartyId.remove(data.participantId());
+        m_participantWithMaybeMissingPartyId.remove(data.participantId);
 
       break;
-    case ProjectDataManagement::StateChangeOriginator::Unknown:
-    case ProjectDataManagement::StateChangeOriginator::ObserverController:
-    case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-    case ProjectDataManagement::StateChangeOriginator::Initialization:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
     {
       injuryPartyId = 1; 
     }
       break;
-    case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-    case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-    case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-    case ProjectDataManagement::StateChangeOriginator::Sanitation:
-      DEBUG_LOG(m_logger) << LOGFUNCTION << " originator state change for " << lastState.originatorType() << " not (yet) implemented"
-                            << ", participantId = " << data.participantId()
-                            << ", sampleTime=" << data.sampleTime()
-                            << ", eqNumber=" << m_participants.value(data.participantId()).equipmentNumber()
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+    case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " originator state change for " << lastState.originatorType << " not (yet) implemented"
+                            << ", participantId = " << data.participantId
+                            << ", sampleTime=" << data.sampleTime
+                            << ", eqNumber=" << m_participants.value(data.participantId).equipmentNumber
                             << ", mapObj->debugInfo() = " << mapObj->debugInfo();
       break;
     }
@@ -1249,25 +1251,25 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
     injury = SituationMap::Injury::NoInjury;
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " injuryPartyId = " << injuryPartyId
-                       << ", data.participantId() " << data.participantId();
+                       << ", data.participantId() " << data.participantId;
 
 
   
   
-  updateParticipantPosition(data.participantId(), false);
+  updateParticipantPosition(data.participantId, false);
 
 
   
   if ((injury != Injury::NoInjury) &&
       (injuryPartyId >= 0) &&
-      (lastState.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant))
+      (lastState.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant))
   {
     DEBUG_LOG(m_logger) << "Hit Event: "
-                        << " stateTime=" << lastState.stateTime()
+                        << " stateTime=" << lastState.stateTime
                         << " injury=" << injury
                         << " injuryPartyId=" << injuryPartyId
-                        << " originatorType=" << lastState.originatorType()
-                        << " originatorChargeTypeId=" << lastState.originatorChargeTypeId();
+                        << " originatorType=" << lastState.originatorType
+                        << " originatorChargeTypeId=" << lastState.originatorChargeTypeId;
 
     
     
@@ -1276,10 +1278,10 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
     
 
     HitlineInfo hlInfo;
-    hlInfo.participantId        = data.participantId();
-    hlInfo.participantPosition  = m_ppmDtc->participantPosition(data.participantId());
+    hlInfo.participantId        = data.participantId;
+    hlInfo.participantPosition  = m_ppmDtc->participantPosition(data.participantId);
     hlInfo.participantState     = lastState;
-    hlInfo.originatorPosition   = m_ppmDtc->participantPosition(lastState.originatorId());
+    hlInfo.originatorPosition   = m_ppmDtc->participantPosition(lastState.originatorId);
     hlInfo.injuryPartyId        = injuryPartyId;
 
     emit hitlineOccured(hlInfo);
@@ -1289,24 +1291,24 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
   const bool bInjuryChanged = mapObj->setInjury(injury, injuryPartyId);
 
   
-  const bool bAddSymbolChanged = mapObj->setAdditionalSymbol(SituationMap::AdditionalSymbolType::NbcProtection, data.hasNbcProtectionActive() || data.hasNbcProtectionConfigured());
+  const bool bAddSymbolChanged = mapObj->setAdditionalSymbol(SituationMap::AdditionalSymbolType::NbcProtection, data.hasNbcProtectionActive || data.hasNbcProtectionConfigured);
 
   
   
   
   
   QVector<QPair<int, int>> validGearCharges;
-  validGearCharges.reserve(data.gear().size());
-  for (auto const &gear : data.gear())
+  validGearCharges.reserve(data.gear.size());
+  for (auto const &gear : data.gear)
   {
-    QPair<int, int> candidate(gear.gearTypeId(), gear.chargeTypeId());
+    QPair<int, int> candidate(gear.gearTypeId, gear.chargeTypeId);
     if (!validGearCharges.contains(candidate))
       validGearCharges.append(candidate);
   } 
   
 
   QVector<int> gearRanges;
-  gearRanges.reserve(data.gear().size());
+  gearRanges.reserve(data.gear.size());
   for (const QPair<int, int> &gearCharge : std::as_const(validGearCharges))
   {
     const int range = m_pdmHandler->maxRangeFromGearTypeIdAndChargeTypeId(gearCharge.first, gearCharge.second);
@@ -1318,7 +1320,7 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
   
 
   
-  const std::vector<ParticipantManagement::LaserDesignation> &designations = data.designations();
+  const std::vector<ParticipantManagement::LaserDesignation> &designations = data.designations;
 
   
   QVector<Participant::DesignationData> designationDataVec;
@@ -1327,13 +1329,13 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
   for (const ParticipantManagement::LaserDesignation &des : std::as_const(designations))
   {
     Participant::DesignationData designationData;
-    const Core::GeoPosition &spotLocation = des.spotLocation();
-    designationData.spotLocation.rx() = spotLocation.lon();
-    designationData.spotLocation.ry() = spotLocation.lat();
-    designationData.spotLocation.rz() = spotLocation.z();
+    const Core::GeoPosition &spotLocation = des.spotLocation;
+    designationData.spotLocation.rx() = spotLocation.lon;
+    designationData.spotLocation.ry() = spotLocation.lat;
+    designationData.spotLocation.rz() = spotLocation.z;
     if (designationData.spotLocation.isNull())  
       continue;
-    designationData.code = des.code();
+    designationData.code = des.code;
     designationDataVec.push_back(designationData);
   }
   const bool bDesignationChanged = mapObj->setDesignations(designationDataVec);
@@ -1343,11 +1345,11 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
     addToUpdateNotify(mapObj);
 
   
-  auto itPart = m_participants.constFind(data.participantId());
+  auto itPart = m_participants.constFind(data.participantId);
   handleSymbolAppearanceSettingsParticipant(mapObj,
                                             itPart == m_participants.constEnd() ? ParticipantManagement::Participant() : itPart.value());
 
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", data.participantId()" << data.participantId();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", data.participantId()" << data.participantId;
   return true;
 }
 
@@ -1359,17 +1361,17 @@ bool Participant2SituationMap::updateElementImpl(const ParticipantManagement::Pa
   
   
   SymbolData symData = mapObj->symbol();
-  symData.sidc = QString::fromStdString(ddsData.symbol());
+  symData.sidc = QString::fromStdString(ddsData.symbol);
   mapObj->setSymbol(symData);
 
   
-  mapObj->setPartyId(ddsData.partyId());
+  mapObj->setPartyId(ddsData.partyId);
 
   
-  mapObj->setTextModifier(Participant::TextModifier::T_UniqueDesignation, QString::fromStdString(ddsData.designator()));
-  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation,   QString::fromStdString(ddsData.tacticalIdentifier()));
+  mapObj->setTextModifier(Participant::TextModifier::T_UniqueDesignation, QString::fromStdString(ddsData.designator));
+  mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation,   QString::fromStdString(ddsData.tacticalIdentifier));
 
-  const int32_t participantId = ddsData.id();
+  const int32_t participantId = ddsData.id;
   
   auto itDpd = m_participantDynamicData.constFind(participantId);
   if (itDpd != m_participantDynamicData.cend())
@@ -1695,10 +1697,10 @@ void Participant2SituationMap::onSymbolAppearanceSettingsChanged(FilterManagemen
 
   for (const ParticipantManagement::Participant &participant : std::as_const(m_participants))
   {
-    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(participant.id(), INVALID_MAP_ID);
+    const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(participant.id, INVALID_MAP_ID);
     if (uniqueMapId == INVALID_MAP_ID)
     {
-      DEBUG_LOG(m_logger) << LOGFUNCTION << "Found a participant which is in internal map but has no map object...: " << participant.id();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Found a participant which is in internal map but has no map object...: " << participant.id;
       continue;
     }
     RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
@@ -1720,12 +1722,12 @@ void Participant2SituationMap::onSymbolAppearanceSettingsChanged(FilterManagemen
 
 static inline bool hasManipulation(const ParticipantManagement::DynamicParticipantData &dpd)
 {
-  return dpd.manipulation().size() > 0;
+  return dpd.manipulation.size() > 0;
 }
 
 bool Participant2SituationMap::hasBitError(const ParticipantManagement::DynamicParticipantData &dpd) const
 {
-  return m_hasBiteError.contains(dpd.participantId());
+  return m_hasBiteError.contains(dpd.participantId);
 }
 
 bool Participant2SituationMap::isSimulatedPosition(const InternalPosition &pos) const
@@ -1765,8 +1767,8 @@ void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(int par
 void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(RefPointer<MAP_T> &mapObj,
                                                                          const ParticipantManagement::Participant &participant)
 {
-  const auto itDpd = m_participantDynamicData.constFind(participant.id());
-  const auto itPos = m_participantPositions.constFind(participant.id());
+  const auto itDpd = m_participantDynamicData.constFind(participant.id);
+  const auto itPos = m_participantPositions.constFind(participant.id);
   handleSymbolAppearanceSettingsParticipant(mapObj,
                                             participant,
                                             itPos == m_participantPositions.cend() ? InternalPosition() : itPos.value(),
@@ -1787,7 +1789,7 @@ void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(RefPoin
 
   const FilterManagement::SymbolAppearanceSettings::Settings &s = m_symbolAppearanceSettings->settings();
 
-  const auto l = s.symbolSettings.symbolPartyAppearance.value(participant.partyId());
+  const auto l = s.symbolSettings.symbolPartyAppearance.value(participant.partyId);
   mapObj->setTextModifierVisibility(Participant::TextModifier::T_UniqueDesignation, l.showDesignator);
   mapObj->setTextModifierVisibility(Participant::TextModifier::M_HigherFormation, l.showTacticalIdentifier);
   mapObj->setUserSymbolOpacity(1.0f - s.symbolSettings.symbolTransparency);
@@ -1823,14 +1825,14 @@ void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(RefPoin
     break;
   }
 
-  if (!bSymbolVisible && s.symbolSettings.showFiringUnits && m_participantsWithProperties.value(participant.id(), false))
+  if (!bSymbolVisible && s.symbolSettings.showFiringUnits && m_participantsWithProperties.value(participant.id, false))
     bSymbolVisible = true;
 
   if (!l.isVisible)
     bSymbolVisible = false;
-  if (bSymbolVisible && !m_pluginProvider->isVisibleParty(participant.partyId()))
+  if (bSymbolVisible && !m_pluginProvider->isVisibleParty(participant.partyId))
     bSymbolVisible = false;
-  if (bSymbolVisible && s.hiddenTypeFilter.value(participant.partyId()).contains(participant.typeId()))
+  if (bSymbolVisible && s.hiddenTypeFilter.value(participant.partyId).contains(participant.typeId))
     bSymbolVisible = false;
   if (bSymbolVisible && hasGeoPositionNaN(pPos.position()))
     bSymbolVisible = false;
@@ -1839,11 +1841,11 @@ void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(RefPoin
 
   if (bSymbolVisible)
   {
-    const auto youngestState = m_ppmDtc->youngestStateInformation(dpd.stateHistory());
-    if (s.hiddenStateFilter.value(participant.partyId()).contains(youngestState.vulnerabilityState().underlying()))
+    const auto youngestState = m_ppmDtc->youngestStateInformation(dpd.stateHistory);
+    if (s.hiddenStateFilter.value(participant.partyId).contains(static_cast<int>(youngestState.vulnerabilityState)))
       bSymbolVisible = false;
   }
-  if (bSymbolVisible && m_symbolAppearanceSettings->isParticipantVisibileCollapseExpand(participant.id()))
+  if (bSymbolVisible && m_symbolAppearanceSettings->isParticipantVisibileCollapseExpand(participant.id))
     bSymbolVisible = false;
 
   bool oldVisibility = mapObj->visibility();
@@ -1862,8 +1864,8 @@ void Participant2SituationMap::handleSymbolAppearanceSettingsParticipant(RefPoin
     emit mapObjectChanged(mapObj->uniqueMapId());
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " Symbol visibilty for Entity: " << mapObj->debugInfo()
-                      << " with participant.id " << participant.id()
-                      << " and partyId " << participant.partyId()
+                      << " with participant.id " << participant.id
+                      << " and partyId " << participant.partyId
                       << " is " << bSymbolVisible;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
index beae4e705..1619fc1b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
@@ -58,11 +58,11 @@ class Participant2SituationMap final : public Sim2SituationMap<ParticipantManage
 
     inline const Core::GeoPosition &position() const OMG_NOEXCEPT
     {
-      return (isUnit && bShowCenter) ? positionCenter() : positionLeader();
+      return (isUnit && bShowCenter) ? positionCenter : positionLeader;
     }
     inline rti::core::int64 sampleTime() const OMG_NOEXCEPT
     {
-      return (isUnit && bShowCenter) ? sampleTimeCenter() : sampleTimeLeader();
+      return (isUnit && bShowCenter) ? sampleTimeCenter : sampleTimeLeader;
     }
 
     InternalPosition() = default;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
index 755344392..37552ba1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
@@ -26,7 +26,7 @@ QString toString(SpecialChargeType value)
 }
 
 PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm) : m_dtcPdm(dtcPdm),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+    m_logger(getLogger("PdmHandler")) {}
 
 
 void PdmHandler::initializePdm()
@@ -53,7 +53,7 @@ void PdmHandler::onChargeTypeChanged(const ProjectDataManagement::ChargeType &da
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_chargeTypes[data.id()] = data;
+    m_chargeTypes[data.id] = data;
     break;
   case DataModification::eRemoved:
     break;
@@ -66,7 +66,7 @@ void PdmHandler::onGearTypeChargeTypeChanged(const ProjectDataManagement::GearTy
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_gearTypeChargeTypes[data.id()] = data;
+    m_gearTypeChargeTypes[data.id] = data;
     break;
   case DataModification::eRemoved:
     break;
@@ -101,41 +101,41 @@ int PdmHandler::maxRangeFromGearTypeIdAndChargeTypeId(int gearTypeId, int charge
 
   
   for (const auto &entry : std::as_const(m_gearTypeChargeTypes))
-    if ((entry.gearTypeId() == gearTypeId) &&
-        (entry.chargeTypeId() == chargeTypeId))
-      return entry.maxRange();
+    if ((entry.gearTypeId == gearTypeId) &&
+        (entry.chargeTypeId == chargeTypeId))
+      return entry.maxRange;
 
   
   for (const auto &entry : std::as_const(m_gearTypeChargeTypes))
-    if ((entry.gearTypeId() == 1000) &&
-        (entry.chargeTypeId() == chargeTypeId))
-      return entry.maxRange();
+    if ((entry.gearTypeId == 1000) &&
+        (entry.chargeTypeId == chargeTypeId))
+      return entry.maxRange;
 
   return -1;
 }
 
 double PdmHandler::impactRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct, double defaultValue)
 {
-  if (chargeStruct.chargeTypeId() < 0)
+  if (chargeStruct.chargeTypeId < 0)
     return defaultValue;
 
   initializePdm();
   if (!m_dtcPdm)
     return defaultValue;
 
-  return m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
+  return m_dtcPdm->impactRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
 }
 
 bool PdmHandler::isSmart(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
-  if (chargeStruct.chargeTypeId() < 0)
+  if (chargeStruct.chargeTypeId < 0)
     return false;
 
   initializePdm();
   if (!m_dtcPdm)
     return false;
 
-  return m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
+  return m_dtcPdm->isSmart(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
 }
 
 QString PdmHandler::trChargeTypeShortName(int chargeTypeId)
@@ -164,7 +164,7 @@ bool PdmHandler::isChargeTypeLtdOrLrf(SpecialChargeType sct)
 ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int chargeTypeId)
 {
   if (!m_dtcPdm)
-    return ProjectDataManagement::GearClass::Unknown;
+    return ProjectDataManagement::GearClass::GearClass_Unknown;
   return m_dtcPdm->gearClassFromChargeTypeId(chargeTypeId);
 }
 
@@ -172,7 +172,7 @@ QVector<ProjectDataManagement::CasEffect> PdmHandler::casEffects(const AreaEffec
 {
   if (!m_dtcPdm)
     return {};
-  return m_dtcPdm->casEffects(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
+  return m_dtcPdm->casEffects(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
 }
 
 bool PdmHandler::isChargeTypeLtdOrLrf(int chargeTypeId)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.cpp
index 374a876df..c74ca2b5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.cpp
@@ -35,20 +35,20 @@ bool ReconArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &dd
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
   
-  if (ddsData.partyId().is_set())
-    mapObj->setPartyId(ddsData.partyId().get());
+  if (ddsData.partyId.has_value())
+    mapObj->setPartyId(ddsData.partyId.get());
   else
   {
     mapObj->rLineStyle().setLineColor(Qt::black);
     mapObj->rFillStyle().setFillColor(Qt::black);
   }
 
-  mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
+  mapObj->setAesState(effectState2aesState(ddsData.effectStateId));
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
   AreaEffectSimulation::AesItemView itemView;
   if (m_aesDtc->aesItemViewFromEntityId(simId, Aes2SituationMapTraits<ReconArea2SituationMap>::aesType, itemView))
     this->updateGeometry(itemView, mapObj);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp
index 9f5f050b6..c74457a18 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp
@@ -2,7 +2,7 @@
 
 
 #include "shootback_area_to_map.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 
@@ -63,7 +63,7 @@ void ShootbackAreaToSituationMap::stop()
 
 int32_t ShootbackAreaToSituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool ShootbackAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
@@ -79,12 +79,12 @@ bool ShootbackAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_
 
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  const Core::GeoPosition2D &center = ddsData.position();
-  const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(center.lon(), center.lat());
+  const Core::GeoPosition2D &center = ddsData.position;
+  const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(center.lon, center.lat);
 
-  const QPointF size(ddsData.width() / 2.0, ddsData.height() / 2.0);
+  const QPointF size(ddsData.width / 2.0, ddsData.height / 2.0);
 
   PositionCont posCont;
   posCont.reserve(4);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
index 3c9f5022d..9120ef0dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
@@ -194,6 +194,7 @@ protected:
   QMap<UniqueMapId, int32_t> m_uniqueMapId2SimId;
 
   QString               m_loggerName;
+  LOGGER_T              m_logger;       ///< Interface to the Logging-Facility
 };
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
index 102ed0be7..ccdab6cab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
@@ -24,7 +24,7 @@ inline PositionCont form2PosCont2D(const std::vector<Core::GeoPosition2D> &form)
   PositionCont ret;
   ret.reserve(form.size());
   for (const auto &pos : form)
-    ret.push_back({pos.lon(), pos.lat(), 0.0});
+    ret.push_back({pos.lon, pos.lat, 0.0});
   return ret;
 }
 
@@ -133,10 +133,10 @@ bool SoundAreaToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMapObj
 
   const auto cb = [simIdOut, &umodOut](const InfrastructureManagement::EffectArea &data) -> bool
   {
-    if (data.id() == simIdOut)
+    if (data.id == simIdOut)
     {
-      umodOut.m_description1 = QString::fromStdString(data.name());
-      umodOut.m_description2 = tr("Sound Area") + QString(QStringLiteral(" (%1)")).arg(data.id());
+      umodOut.m_description1 = QString::fromStdString(data.name);
+      umodOut.m_description2 = tr("Sound Area") + QString(QStringLiteral(" (%1)")).arg(data.id);
       return true; 
     }
     return false;
@@ -149,10 +149,10 @@ bool SoundAreaToMap::unifiedMapObjectData(UniqueMapId uniqueMapId, UnifiedMapObj
 bool SoundAreaToMap::onEffectAreaChanged(const InfrastructureManagement::EffectArea &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << " onEffectAreaChanged"
-                      << " id=" << data.id()
-                      << " name='" << data.name() << "'"
-                      << " areaEgcuId=" << data.areaEgcuId()
-                      << " ata.geometry().size()=" << data.geometry().size()
+                      << " id=" << data.id
+                      << " name='" << data.name << "'"
+                      << " areaEgcuId=" << data.areaEgcuId
+                      << " ata.geometry().size()=" << data.geometry.size()
                       << " exerciseId=" << m_pluginProvider->exerciseId();
 
 
@@ -172,7 +172,7 @@ bool SoundAreaToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
   if (BaseClass::isElapsed(data))
     return true;
 
-  if (data.geometry().size() < 3)
+  if (data.geometry.size() < 3)
     return true;
 
   return false;
@@ -180,7 +180,7 @@ bool SoundAreaToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
 
 int32_t SoundAreaToMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 SituationMap::PositionCont soundGeometryToPositions(const QJsonDocument &jdoc)
@@ -232,10 +232,10 @@ InfrastructureManagement::MountingPoint SoundAreaToMap::mountingPointWithAssocia
 bool SoundAreaToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, RefPointer<Sim2SituationMap::MAP_T> mapObj)
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION
-                      << " id " << ddsData.id()
-                      << ", name = " << ddsData.name();
+                      << " id " << ddsData.id
+                      << ", name = " << ddsData.name;
 
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name())); 
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name)); 
 
   mapObj->setPickable(true); 
 
@@ -246,16 +246,16 @@ bool SoundAreaToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, R
   mapObj->setLineStyle(LineStyle(col, 1, LinePattern::DashDotDot));
   mapObj->setFillStyle(FillStyle(col, FillPattern::BackwardDiagonal));
 
-  const SituationMap::PositionCont &posCont = form2PosCont2D(ddsData.geometry());
+  const SituationMap::PositionCont &posCont = form2PosCont2D(ddsData.geometry);
   mapObj->setPositions(posCont);
 
   
   
   
-  const InfrastructureManagement::MountingPoint &associatedMountingPoint = mountingPointWithAssociatedId(ddsData.areaEgcuId());
+  const InfrastructureManagement::MountingPoint &associatedMountingPoint = mountingPointWithAssociatedId(ddsData.areaEgcuId);
   DEBUG_LOG(m_logger) << LOGFUNCTION
-                      << " id " << ddsData.id()
-                      << ", name = " << ddsData.name()
+                      << " id " << ddsData.id
+                      << ", name = " << ddsData.name
                       << " MP: buildingId" << associatedMountingPoint.buildingId()
                       << " MP: geoPosition" << associatedMountingPoint.geoPosition();
 
@@ -263,7 +263,7 @@ bool SoundAreaToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, R
   {
     mapObj->setMarkerData(MarkerData(associatedMountingPoint.toImage(), QSize(25,25)));
     const Core::GeoPosition &geoPos = associatedMountingPoint.geoPosition();
-    mapObj->setMarkerOrigin(Point3D(geoPos.lon(), geoPos.lat(), geoPos.z()));
+    mapObj->setMarkerOrigin(Point3D(geoPos.lon, geoPos.lat, geoPos.z));
   } else {
     mapObj->setMarkerData(MarkerData());
     mapObj->setMarkerOrigin(Point3D());
@@ -308,21 +308,21 @@ bool SoundAreaToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData, R
 bool SoundAreaToMap::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data,
                                                        DataModification modType)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << "SoundAreaToMap::onMainStructureElementChanged data.id=" << data.id();
+  TRACE_LOG(m_logger) << LOGFUNCTION << "SoundAreaToMap::onMainStructureElementChanged data.id=" << data.id;
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " vorher " << m_bldgsInExcersise.values();
 
-  m_bldgsInExcersise.remove(data.id());
+  m_bldgsInExcersise.remove(data.id);
 
   if (modType == DataModification::eAdded || modType == DataModification::eModified)
   {
     QJsonParseError parseError;
-    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties()), &parseError);
+    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties), &parseError);
 
     if (parseError.error != QJsonParseError::NoError)
     {
       INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
-                         << data.id()
+                         << data.id
                          << ". Reason: "
                          << parseError.errorString()
                          << "; JSON: "
@@ -342,8 +342,8 @@ bool SoundAreaToMap::onMainStructureElementChanged(const InfrastructureManagemen
                           << " available_in_exercise=" << tmp;
       if (tmp == actualExerciseId)
       {
-        DEBUG_LOG(m_logger) << "m_bldgsInExcersise.append:" << data.id();
-        m_bldgsInExcersise.insert(data.id());
+        DEBUG_LOG(m_logger) << "m_bldgsInExcersise.append:" << data.id;
+        m_bldgsInExcersise.insert(data.id);
       }
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.h
index c97fa9784..95d0fe714 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.h
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <MapObjects/sound_area.h>
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp
index 8c1bb3869..46dc22d24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp
@@ -3,7 +3,7 @@
 
 #include "special_areas_to_map.h"
 #include <utility>
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 
@@ -74,7 +74,7 @@ bool SpecialAreaToSituationMap::isElapsed(const Sim2SituationMap::DDS_T &data) c
 
 int32_t SpecialAreaToSituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool SpecialAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
@@ -91,14 +91,14 @@ bool SpecialAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->setFillStyle(FillStyle(FillPattern::Null));
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  const std::vector<Core::GeoPosition2D> &polygon = ddsData.polygon();
+  const std::vector<Core::GeoPosition2D> &polygon = ddsData.polygon;
 
   PositionCont posCont;
   posCont.reserve(polygon.size());
   for (const auto &p : std::as_const(polygon))
-    posCont.push_back(Point3D(p.lon(), p.lat(), .0));
+    posCont.push_back(Point3D(p.lon, p.lat, .0));
 
   mapObj->setPositions(posCont);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp
index 8483e84bd..35a4c01ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp
@@ -2,7 +2,7 @@
 
 
 #include "technical_area_to_map.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 
 
 namespace SituationMap
@@ -34,7 +34,7 @@ bool TechnicalArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  const int32_t simId = ddsData.id();
+  const int32_t simId = ddsData.id;
 
   mapObj->setPickable(false);  
 
@@ -43,7 +43,7 @@ bool TechnicalArea2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
 
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp
index e6bc84a02..f2c4b1e76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp
@@ -2,7 +2,7 @@
 
 
 #include "training_area_to_map.h"
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 
@@ -25,7 +25,7 @@ bool TrainingAreaToSituationMap::init(PluginProvider *pluginProvider)
   if (m_pluginProvider->exmDtc())
   {
     const int curExerciseId = m_pluginProvider->exerciseId();
-    m_trainingAreaIdOfCurrentExercise = m_pluginProvider->exmDtc()->exercise(curExerciseId).trainingAreaId();
+    m_trainingAreaIdOfCurrentExercise = m_pluginProvider->exmDtc()->exercise(curExerciseId).trainingAreaId;
   }
 
   m_asmDtc = m_pluginProvider->asmDtc();
@@ -76,12 +76,12 @@ bool TrainingAreaToSituationMap::isElapsed(const Sim2SituationMap::DDS_T &data)
   if (m_trainingAreaIdOfCurrentExercise <= 0)
     return false; 
 
-  return (m_trainingAreaIdOfCurrentExercise != data.id());
+  return (m_trainingAreaIdOfCurrentExercise != data.id);
 }
 
 int32_t TrainingAreaToSituationMap::getSimId(const Sim2SituationMap::DDS_T &ddsData) const
 {
-  return ddsData.id();
+  return ddsData.id;
 }
 
 bool TrainingAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
@@ -98,16 +98,16 @@ bool TrainingAreaToSituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->setFillStyle(FillStyle(FillPattern::Null));
 
   
-  mapObj->setIdentifier(QString::fromStdString(ddsData.name()));
+  mapObj->setIdentifier(QString::fromStdString(ddsData.name));
 
-  const Core::GeoPosition2D &bottomLeft = ddsData.bottomLeft();
-  const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(bottomLeft.lon(), bottomLeft.lat());
+  const Core::GeoPosition2D &bottomLeft = ddsData.bottomLeft;
+  const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(bottomLeft.lon, bottomLeft.lat);
 
-  const QPointF size(ddsData.width(), ddsData.height());
+  const QPointF size(ddsData.width, ddsData.height);
 
   PositionCont posCont;
   posCont.reserve(4);
-  posCont.push_back(Point3D(bottomLeft.lon(), bottomLeft.lat(), .0));
+  posCont.push_back(Point3D(bottomLeft.lon, bottomLeft.lat, .0));
   posCont.push_back(Point3D::fromQPointF(referencePointUTM.geographic(0       , size.y())));
   posCont.push_back(Point3D::fromQPointF(referencePointUTM.geographic(size.x(), size.y())));
   posCont.push_back(Point3D::fromQPointF(referencePointUTM.geographic(size.x(),        0)));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/CMakeLists.txt
index 6c5ed9106..4ae62e0f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/CMakeLists.txt
@@ -257,4 +257,11 @@ if(QT6_GUI_AVAILABLE)
     TgtDataPluginInterface
     CmoDataPluginInterface
   )
+  # ArcGIS 300: SitmapGuiPlugin TUs include Viewer headers (map.h -> layer_factory.h)
+  # that need the ArcGIS SDK include dir (arcgisversion.h). situationMap links
+  # ArcGIS::ArcGIS PRIVATE so the include dir is not propagated; provide it here
+  # (Qt6/ArcGIS-300 uses a per-target include, not the legacy global arcgis/ path).
+  if(TARGET ArcGIS::ArcGIS)
+    NGL_TARGET_LINK_LIBRARIES(SitmapGuiPlugin ArcGIS::ArcGIS)
+  endif()
 endif()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp
index ba8fb4445..a68ad3bf6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp
@@ -69,12 +69,12 @@ QVariant ConfigureMapUrlModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Columns::Url:
-    return QString::fromStdString(md.url());
+    return QString::fromStdString(md.url);
   case Columns::Name:
-    return QString::fromStdString(md.name());
+    return QString::fromStdString(md.name);
   case Columns::MapType:
   {
-    switch (md.mapTypeId().underlying())
+    switch (md.mapTypeId)
     {
     case AssetManagement::MapType::Aerial:
       return tr("Aerial");
@@ -90,9 +90,9 @@ QVariant ConfigureMapUrlModel::data(const QModelIndex &index, int role) const
     return tr("Unknown");
   }
   case Columns::MinScale:
-    return md.minScale();
+    return md.minScale;
   case Columns::MaxScale:
-    return md.maxScale();
+    return md.maxScale;
   }
 
   return QVariant();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
index 41f5f0d7a..4635950d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
@@ -56,19 +56,19 @@ void ConfigureSingleMapUrl::setPlaceholderTextForFile()
 
 void ConfigureSingleMapUrl::setData(const ConfigureSingleMapUrl::DATA_T &data)
 {
-  m_ui->le_url->setText(QString::fromStdString(data.url()));
-  m_ui->le_name->setText(QString::fromStdString(data.name()));
-  m_ui->le_minScale->setText(QString::number(data.minScale()));
-  m_ui->le_maxScale->setText(QString::number(data.maxScale()));
+  m_ui->le_url->setText(QString::fromStdString(data.url));
+  m_ui->le_name->setText(QString::fromStdString(data.name));
+  m_ui->le_minScale->setText(QString::number(data.minScale));
+  m_ui->le_maxScale->setText(QString::number(data.maxScale));
 }
 
 ConfigureSingleMapUrl::DATA_T ConfigureSingleMapUrl::data()
 {
   ConfigureSingleMapUrl::DATA_T data;
-  data.url(m_ui->le_url->text().trimmed().toStdString());
-  data.name(m_ui->le_name->text().trimmed().toStdString());
-  data.minScale(m_ui->le_minScale->text().toDouble());
-  data.maxScale(m_ui->le_maxScale->text().toDouble());
+  data.url = m_ui->le_url->text().trimmed().toStdString();
+  data.name = m_ui->le_name->text().trimmed().toStdString();
+  data.minScale = m_ui->le_minScale->text().toDouble();
+  data.maxScale = m_ui->le_maxScale->text().toDouble();
   return data;
 }
 
@@ -88,7 +88,7 @@ void ConfigureSingleMapUrl::onClose()
 
 ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent) : QWidget(parent)
   , m_ui(new Ui::Configure_Urls_Widget),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+    m_logger(getLogger("ConfigureMapUrlsWidget")) {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
index b3efa81a9..a9f419bbf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
@@ -60,8 +60,6 @@ protected Q_SLOTS:
   void onClose();
 
 private:
-
-NGL::INGLLogger &m_logger;
   Ui::Configure_Single_Url *m_ui;
   LtsWidgets::LtsDialogButtonBox *m_buttonBox;
 };
@@ -106,6 +104,8 @@ private:
   Ui::Configure_Urls_Widget *m_ui;
   ConfigureMapUrlModel      *m_configureMapUrlModel = nullptr;
   bool                       m_placeholderTextFile = false;
+
+  NGL::INGLLogger &m_logger;
 };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
index edbe5aba7..096da0489 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
@@ -18,6 +18,7 @@ namespace SituationMap
 
 ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
   : LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("ConfigureMapUrls"))
   , m_pluginProvider(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::Configure_Urls)
@@ -121,7 +122,7 @@ void ConfigureMapUrls::fillTrainingAreaCbx()
     m_ui->cbTrainingArea->clear();
     auto cb = [this](const AssetManagement::TrainingArea & ta)
     {
-      m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name()), QVariant(ta.id()));
+      m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name), QVariant(ta.id));
     };
     m_asmDtc->trainingAreas(cb);
     m_ui->cbTrainingArea->model()->sort(0);
@@ -148,7 +149,7 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
-  if (m_trainingArea.id() == newTrainingAreaId)
+  if (m_trainingArea.id == newTrainingAreaId)
     return;
 
   if (hasUnsavedChanges())
@@ -164,8 +165,8 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
       }
       break;
     case LtsWidgets::Button::Cancel:
-      INFO_LOG(m_logger) << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id();
-      m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id()), Qt::UserRole));
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id;
+      m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id), Qt::UserRole));
       break;
     case LtsWidgets::Button::Discard:
       if (!retrieveTaOfService(newTrainingAreaId))
@@ -208,13 +209,13 @@ bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
 
 
   AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(trainingAreaId);
-  if (ta.id() != trainingAreaId)
+  if (ta.id != trainingAreaId)
   {
     ERROR_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
     return false;
   }
   m_trainingArea = ta;
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea "  << m_trainingArea.id()
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea "  << m_trainingArea.id
                      << ", ta" << ta;
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -258,7 +259,7 @@ void ConfigureMapUrls::syncTaToGui()
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(0));
   if (w && w->model())
   {
-    w->model()->setData(vecToVec(m_trainingArea.map2D()));
+    w->model()->setData(vecToVec(m_trainingArea.map2D));
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
   }
   basicConfig(w);
@@ -273,19 +274,19 @@ void ConfigureMapUrls::syncTaToGui()
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(1));
   if (w && w->model())
   {
-    w->model()->setData(vecToVec(m_trainingArea.scene3D()));
+    w->model()->setData(vecToVec(m_trainingArea.scene3D));
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
 }
   basicConfig(w);
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(2));
   if (w && w->model())
-    w->model()->setData(vecToVec(m_trainingArea.elevation()));
+    w->model()->setData(vecToVec(m_trainingArea.elevation));
   basicConfig(w, false);
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(3));
   if (w && w->model())
-    w->model()->setData(vecToVec(m_trainingArea.sceneObjects()));
+    w->model()->setData(vecToVec(m_trainingArea.sceneObjects));
   basicConfig(w, false);
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -299,31 +300,31 @@ void ConfigureMapUrls::syncGuiToTa()
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(0));
   if (w && w->model())
-    m_trainingArea.map2D(vecToVec(w->model()->allData()));
+    m_trainingArea.map2D = vecToVec(w->model()->allData());
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(1));
   if (w && w->model())
-    m_trainingArea.scene3D(vecToVec(w->model()->allData()));
+    m_trainingArea.scene3D = vecToVec(w->model()->allData());
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(2));
   if (w && w->model())
-    m_trainingArea.elevation(vecToVec(w->model()->allData()));
+    m_trainingArea.elevation = vecToVec(w->model()->allData());
 
   w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(3));
   if (w && w->model())
-    m_trainingArea.sceneObjects(vecToVec(w->model()->allData()));
+    m_trainingArea.sceneObjects = vecToVec(w->model()->allData());
 
 
   
   
-  for (auto &item : m_trainingArea.map2D())
-    item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Map2D);
-  for (auto &item : m_trainingArea.scene3D())
-    item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Scene3D);
-  for (auto &item : m_trainingArea.elevation())
-    item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Elevation);
-  for (auto &item : m_trainingArea.sceneObjects())
-    item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::SceneObj);
+  for (auto &item : m_trainingArea.map2D)
+    item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Map2D;
+  for (auto &item : m_trainingArea.scene3D)
+    item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Scene3D;
+  for (auto &item : m_trainingArea.elevation)
+    item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Elevation;
+  for (auto &item : m_trainingArea.sceneObjects)
+    item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::SceneObj;
 
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
index 5aa4ea433..f3ebe937a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
@@ -98,6 +98,7 @@ MapObjectModel::MapObjectModel(QObject *parent)
   tr("Picture")
 },
 parent)
+, m_logger(getLogger("MapObjectModel"))
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
index 306246068..06800db0f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
@@ -149,6 +149,8 @@ private:
   QMap<int, int>                          m_usedPartyIds;  
   QSet<QString>                           m_usedTypeName;
   QMap<int, QString>                      m_usedVulnerabilities;
+  LOGGER_T                                m_logger;
+
   friend class MapObjectProxyModel;
 
 };
@@ -171,7 +173,6 @@ protected:
   bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
 
 protected:
-  NGL::INGLLogger &m_logger;
   MapObjectModel *m_sourceModel = nullptr;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
index 41689a13f..33fa4991d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
@@ -3,6 +3,7 @@
 
 
 #include "map_object_selection_widget.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "map_object_custom_view.h"
 #include "map_object_model.h"
@@ -211,17 +212,17 @@ void MapObjectSelectionLtsDialog::updateCheckButtonHandler()
 
 void MapObjectSelectionLtsDialog::onServiceMonitorBtnCombatReadyRequested()
 {
-  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::CombatReady, false);
+  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, false);
 }
 
 void MapObjectSelectionLtsDialog::onServiceMonitorBtnCombatReadyResetContaminationRequested()
 {
-  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::CombatReady, true);
+  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, true);
 }
 
 void MapObjectSelectionLtsDialog::onServiceMonitorBtnResetContaminationRequested()
 {
-  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::NoChange, true);
+  onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange, true);
 }
 
 void MapObjectSelectionLtsDialog::onServiceMonitorBtnVulnerabiltyResetRequested( const ProjectDataManagement::VulnerabilityState &vs, bool resetContamination )
@@ -238,13 +239,13 @@ void MapObjectSelectionLtsDialog::onServiceMonitorBtnVulnerabiltyResetRequested(
   Buildings::Building bldg;
   for (int buildingId : buildingIds)
   {
-    bldg.buildingId(buildingId);
+    bldg.buildingId = buildingId;
     buildings.push_back(bldg);
   } 
   Buildings::SetBuildingStatesRequest request;
-  request.buildings(buildings);
-  request.vulnerabilityState(vs);
-  request.resetContamination(resetContamination);
+  request.buildings = buildings;
+  request.vulnerabilityState = vs;
+  request.resetContamination = resetContamination;
 
   m_requestHelper->addRequest([this, request]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
index 476fb4dbc..6e51ae8e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
@@ -2,6 +2,7 @@
 
 
 #include "layers_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <SituationMap/Map/layer_parameter.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
index 74998297f..a7279309b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
@@ -14,6 +14,7 @@
 #include <ngltools/ngltools_dtg.h>
 #include <LtsPrinting/printing.h>
 #include <LtsSession/lts_session.h>
+#include <QtCore/QFile>
 #include <LtsWidgets/lts_base_layout_widget.h>    
 #include <LtsWidgets/lts_events.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
@@ -123,6 +124,7 @@ namespace SituationMap
 
 MyMapWidgetDialog::MyMapWidgetDialog(QWidget *parent, LtsWidgets::ButtonCombination buttonCombination)
   : BaseClass(parent, buttonCombination, false )
+  , m_logger(getLogger("MyMapWidgetDialog"))
 {
   QHBoxLayout *box = new QHBoxLayout();
   box->setObjectName(QStringLiteral("boxAroundSituationMapWidget"));
@@ -3257,18 +3259,18 @@ void InterfaceImpl::onTrainingAreaChanged(const AssetManagement::TrainingArea &t
 
   const int curExerciseId = m_session->exerciseId();
   m_pluginProvider->exmDtc()->waitForHistoricalDataExercise(2000);
-  const int trainingAreaIdOfCurrentExercise = m_pluginProvider->exmDtc()->exercise(curExerciseId).trainingAreaId();
+  const int trainingAreaIdOfCurrentExercise = m_pluginProvider->exmDtc()->exercise(curExerciseId).trainingAreaId;
 
-  if ( (curExerciseId > 0) && (trainingAreaIdOfCurrentExercise == trainingArea.id()) )
+  if ( (curExerciseId > 0) && (trainingAreaIdOfCurrentExercise == trainingArea.id) )
   {
-    const Core::GeoPosition2D &bottomLeft = trainingArea.bottomLeft();
-    const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(bottomLeft.lon(), bottomLeft.lat());
+    const Core::GeoPosition2D &bottomLeft = trainingArea.bottomLeft;
+    const LtsCoordTrans::UtmCoordinate referencePointUTM = LtsCoordTrans::UtmCoordinate::fromGeographic(bottomLeft.lon, bottomLeft.lat);
 
-    const QPointF size(trainingArea.width(), trainingArea.height());
+    const QPointF size(trainingArea.width, trainingArea.height);
 
     QVector<QPointF> trainingAreaCoords;
     trainingAreaCoords.reserve(4);
-    trainingAreaCoords.push_back(QPointF(bottomLeft.lon(), bottomLeft.lat()));
+    trainingAreaCoords.push_back(QPointF(bottomLeft.lon, bottomLeft.lat));
     trainingAreaCoords.push_back(QPointF(referencePointUTM.geographic(0       , size.y())));
     trainingAreaCoords.push_back(QPointF(referencePointUTM.geographic(size.x(), size.y())));
     trainingAreaCoords.push_back(QPointF(referencePointUTM.geographic(size.x(),        0)));
@@ -3621,7 +3623,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
     return;
 
   const int operatorId = m_pluginProvider->operatorId();
-  if (data.operatorId() != operatorId)
+  if (data.operatorId != operatorId)
     return;
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Someone would like to use our (Filter) settings ";
@@ -3644,12 +3646,12 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
 
   FilterManagement::FilterData req;
   
-  req.operatorId(operatorId);
-  req.screenTypeId(m_session->screenTypeId());
-  req.screenId(m_session->screenId());
-  req.screenContainerId(m_session->screenContainerId());
-  req.requestTime(m_session->partitionTime());
-  req.id(req.operatorId() * 1000 + req.screenId());
+  req.operatorId = operatorId;
+  req.screenTypeId = m_session->screenTypeId();
+  req.screenId = m_session->screenId();
+  req.screenContainerId = m_session->screenContainerId();
+  req.requestTime = m_session->partitionTime();
+  req.id = req.operatorId * 1000 + req.screenId;
 
   {
     
@@ -3658,7 +3660,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
     if (displayFilter)
     {
       FilterManagement::AesFilter aesFilter = displayFilter->filterToData();
-      req.aesFilterContent(aesFilter.content());
+      req.aesFilterContent = aesFilter.content;
     } else {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " no AesDisplayFilter";
     }
@@ -3671,7 +3673,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
     if (symbolAppearanceSettings)
     {
       FilterManagement::SymbolAppearance symApp = symbolAppearanceSettings->settingsToData();
-      req.symbolAppearanceContent(symApp.content());
+      req.symbolAppearanceContent = symApp.content;
     } else {
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " no SymbolAppearanceSettings";
     }
@@ -3688,7 +3690,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
     if (buildingComponentSettings)
     {
       FilterManagement::BuildingComponentFilter filter = buildingComponentSettings->bldCmpSettingsToData();
-      req.buildingComponentsFilterContent(filter.content());
+      req.buildingComponentsFilterContent = filter.content;
     } else {
         WARNING_LOG(m_logger) << Q_FUNC_INFO << " no BuildingComponentSettings";
     }
@@ -3697,17 +3699,17 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
 
   {
     
-    req.operatorMapSettingsContent(operatorMapSettingsJson().constData());
+    req.operatorMapSettingsContent = operatorMapSettingsJson().constData();
   }
 
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << " filterDataUpdateRequest:"
-                      << ", OperatorId= " << req.operatorId()
-                      << ", screenId= " << req.screenId()
-                      << ", screenContainerId= " << req.screenContainerId()
-                      << ", Aes size = " << req.aesFilterContent().size()
-                      << ", SA size = " << req.symbolAppearanceContent().size()
-                      << ", BC size = " << req.buildingComponentsFilterContent().size()
-                      << ", OMS size = " << req.operatorMapSettingsContent().size();
+                      << ", OperatorId= " << req.operatorId
+                      << ", screenId= " << req.screenId
+                      << ", screenContainerId= " << req.screenContainerId
+                      << ", Aes size = " << req.aesFilterContent.size()
+                      << ", SA size = " << req.symbolAppearanceContent.size()
+                      << ", BC size = " << req.buildingComponentsFilterContent.size()
+                      << ", OMS size = " << req.operatorMapSettingsContent.size();
 
   
   
@@ -4262,6 +4264,7 @@ void InterfaceImpl::doPrint()
 TopicReplayInterface::TopicReplayInterface()
   : m_startTimeSec(0)
   , m_durationSec(0)
+  , m_logger(getLogger("TopicReplayInterface"))
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
index 4b89b393a..fb7b7152a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
@@ -28,6 +28,11 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_drag_icon.h>
 #include <Map/operator_map_settings.h>
+// Qt6 moc meta-type registration of the onMapObjectsClicked slot parameter
+// (Map::RefPointerMapObjectList = QVector<RefPointer<AbstractMapObject>>) instantiates
+// RefPointer<AbstractMapObject>::~RefPointer() at compile time, which requires the
+// complete type. map.h only forward-declares AbstractMapObject, so include it here.
+#include <Map/abstract_map_object.h>
 #include <Utils/movement_track_manager.h>
 #include <Rubberbands/rubberband_factory.h>
 
@@ -523,5 +528,6 @@ private:
   qint64 m_startTimeSec;
   qint64 m_durationSec;
   QVector<SituationReplayTime> m_sitReplayTimes;
+  NGL::INGLLogger &m_logger;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
index d02a3b4f6..fa216febd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
@@ -182,6 +182,7 @@ private:
 
 LayerControlDialog::LayerControlDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("LayerControlDialog"))
   , m_session(nullptr)
   , m_situationMap(nullptr)
   , m_layersModel(nullptr)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.cpp
index 2f0543004..77732b54e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "sitmap_register_app_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Common/situation_map_logging.h>
 #include <LtsSession/lts_session.h>
@@ -13,7 +14,7 @@ namespace SituationMap
 
 static inline bool isScreenIdValid(const OperatorManagement::ActiveApp &item)
 {
-  return item.screenId() >= 0;
+  return item.screenId >= 0;
 }
 
 
@@ -23,13 +24,13 @@ RegisterAppHandler::RegisterAppHandler() : BaseClass()
   INFO_LOG(m_logger) << "RAH c_tor";
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
-  m_activeApp.id(-1);
-  m_activeApp.appId(-1);
-  m_activeApp.exerciseId(-1);
-  m_activeApp.operatorId(-1);
-  m_activeApp.screenTypeId(-1);
-  m_activeApp.screenId(-1);
-  m_activeApp.screenContainerId(-1);
+  m_activeApp.id = -1;
+  m_activeApp.appId = -1;
+  m_activeApp.exerciseId = -1;
+  m_activeApp.operatorId = -1;
+  m_activeApp.screenTypeId = -1;
+  m_activeApp.screenId = -1;
+  m_activeApp.screenContainerId = -1;
 
   m_updateTimer->setSingleShot(true);
   m_updateTimer->setInterval(5000);
@@ -99,12 +100,12 @@ void RegisterAppHandler::registerApp(QObject *plugin, LtsSession::LtsSession *se
       return;
 
   OperatorManagement::ActiveApp aApp;
-  aApp.appId(static_cast<int>(session->app()));
-  aApp.exerciseId(session->exerciseId());
-  aApp.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-  aApp.screenTypeId(session->screenTypeId());
-  aApp.screenId(session->screenId());
-  aApp.screenContainerId(session->screenContainerId());
+  aApp.appId = static_cast<int>(session->app());
+  aApp.exerciseId = session->exerciseId();
+  aApp.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  aApp.screenTypeId = session->screenTypeId();
+  aApp.screenId = session->screenId();
+  aApp.screenContainerId = session->screenContainerId();
 
   
   registerApp(aApp);
@@ -130,7 +131,7 @@ void RegisterAppHandler::registerApp(const OperatorManagement::ActiveApp &item)
 
   updateRequest();
 
-  if (m_activeApp.id() <= 0)
+  if (m_activeApp.id <= 0)
     m_updateTimer->start(); 
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END " << item;
@@ -142,7 +143,7 @@ void RegisterAppHandler::deRegisterApp(const OperatorManagement::ActiveApp &item
   if (!isScreenIdValid(item))
     return;
 
-  if (m_activeApp.id() <= 0)
+  if (m_activeApp.id <= 0)
   {
     WARNING_LOG(m_logger) << Q_FUNC_INFO << " nothing was registered, skip DeRegister - " << m_activeApp;
     return;
@@ -167,7 +168,7 @@ bool RegisterAppHandler::updateRequest()
   try
   {
     INFO_LOG(m_logger) << "RAH update";
-    m_activeApp.id(m_opmFtc->activeAppUpdateRequest(m_activeApp));
+    m_activeApp.id = m_opmFtc->activeAppUpdateRequest(m_activeApp);
   }
   catch(const std::runtime_error &err)
   {
@@ -176,7 +177,7 @@ bool RegisterAppHandler::updateRequest()
     return false;
   }
 
-  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_requestHelper->getRepliedId() " << m_activeApp.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_requestHelper->getRepliedId() " << m_activeApp.id;
 
   return true;
 }
@@ -191,13 +192,13 @@ bool RegisterAppHandler::removeRequest()
     return false;
   }
 
-  m_activeApp.appId(-1);        
-  m_activeApp.exerciseId(-1);   
+  m_activeApp.appId = -1;        
+  m_activeApp.exerciseId = -1;   
 
   try
   {
     INFO_LOG(m_logger) << "RAH remove";
-    m_opmFtc->activeAppRemoveRequest(Core::RemoveElementRequest(m_activeApp.id()));
+    m_opmFtc->activeAppRemoveRequest(Core::RemoveElementRequest(m_activeApp.id));
     return true;
   }
   catch (const std::runtime_error &err)
@@ -222,8 +223,8 @@ void RegisterAppHandler::handleSvcStartupRequest(const OperatorManagement::Activ
   if (modType != DataModification::eAdded)
     return;
 
-  if ((data.operatorId() < 0) &&      
-      (m_activeApp.appId() >= 0))     
+  if ((data.operatorId < 0) &&      
+      (m_activeApp.appId >= 0))     
   {
     INFO_LOG(m_logger) << Q_FUNC_INFO << " startUpRequest recognized, reDo updateRequest";
     updateRequest();
@@ -234,10 +235,10 @@ void RegisterAppHandler::onScreenIdChanged(int screenId, int screenContainerId,
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, screenId=" << screenId << ", screenContainerId=" << screenContainerId << ", screenTypeId=" << screenTypeId;
 
-  INFO_LOG(m_logger) << Q_FUNC_INFO << " screenId: " << m_activeApp.screenId() << " -> " << screenId;
-  m_activeApp.screenTypeId(screenTypeId);
-  m_activeApp.screenId(screenId);
-  m_activeApp.screenContainerId(screenContainerId);
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " screenId: " << m_activeApp.screenId << " -> " << screenId;
+  m_activeApp.screenTypeId = screenTypeId;
+  m_activeApp.screenId = screenId;
+  m_activeApp.screenContainerId = screenContainerId;
   updateRequest();
 
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, screenId=" << screenId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
index 110fdca05..6c53d8080 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
@@ -18,6 +18,7 @@ namespace SituationMap
 
 MapWidgetControl::MapWidgetControl(const QString &menuGroup, QWidget *parent)
   : LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("MapWidgetControl"))
   , m_menuGroup(menuGroup)
   , m_situationMap(nullptr)
   , m_ui(new Ui::MapWidgetControl)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
index 3934bf9aa..4b70c4c04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
@@ -29,13 +29,14 @@
 #include <Symbology/symbol_dictionary.h>
 #include <Symbology/symbol_data_to_render_role.h>
 #include <ParticipantManagement/ppm_translation.h>
+#include <ParticipantManagement/ppm_dtc.h>   // complete ParticipantManagement::Interface::Dtc type (waitForHistoricalDataParty / &Dtc::partyChanged / partys)
 
 
 #include <OperatorManagement/opm_data_plugin_interface.h>
-#include <OperatorManagement/opm_data_plugin.h>
+#include <OperatorManagement/Data/opm_data_plugin.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <OperatorManagement/opm.hpp>
-#include <Plugins
+#include <Plugins//AssetManagement/asm_data_plugin_interface.h>
 #include <LtsUtilsSettings/settings.h>
 
 
@@ -262,21 +263,21 @@ void ThatPartyIdToColorFunctor::onPartyChanged(const ParticipantManagement::Part
 {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", modType= " << modType
-                      << " partyId=" << data.id()
-                      << " partyName='" << data.name() << "'"
-                      << " data.role().inner_enum=" << data.role();
+                      << " partyId=" << data.id
+                      << " partyName='" << data.name << "'"
+                      << " data.role().inner_enum=" << data.role;
 
-  const int partyId = data.id();
+  const int partyId = data.id;
   if (modType == DataModification::eRemoved
       && m_doRemovePartyFlag)                       
     removeParty(partyId);
   else
   {
-    const AdvancedSymbology::Role role = AdvancedSymbology::roleToRole<>(data.role());
-    const PartyData pData(ParticipantManagement::trPartyName(data.name()),
+    const AdvancedSymbology::Role role = AdvancedSymbology::roleToRole<>(data.role);
+    const PartyData pData(ParticipantManagement::trPartyName(data.name),
                           role,
-                          QColor::fromRgb(QRgb(data.color())),
-                          QColor::fromRgb(QRgb(data.fadingColor())));
+                          QColor::fromRgb(QRgb(data.color)),
+                          QColor::fromRgb(QRgb(data.fadingColor)));
 
     setParty(partyId, pData);
   }
@@ -926,13 +927,13 @@ static QVector<BaseUrl> convertMapDecription2BaseUrlVec(const std::vector<AssetM
 
   for (const AssetManagement::MapDescription &mapDescription : vecIn)
   {
-    BaseUrl baseUrl(QString::fromStdString(mapDescription.url()),
-                    mapDescription.minScale(), mapDescription.maxScale());
+    BaseUrl baseUrl(QString::fromStdString(mapDescription.url),
+                    mapDescription.minScale, mapDescription.maxScale);
 
-    baseUrl.setName(QString::fromStdString(mapDescription.name()));
-    baseUrl.setDescription(QString::fromStdString(mapDescription.description()));
+    baseUrl.setName(QString::fromStdString(mapDescription.name));
+    baseUrl.setDescription(QString::fromStdString(mapDescription.description));
 
-    switch (mapDescription.mapTypeId().underlying()) {
+    switch (mapDescription.mapTypeId) {
     case AssetManagement::MapType::Aerial:
       baseUrl.setBasemapType(BasemapType::Aerial);
       break;
@@ -962,14 +963,14 @@ bool SituationMapInit::trainingAreaExists() const
   if (exerciseId <= 0)
     return false;
 
-  const int trainingAreaId = m_pluginProvider->exmDtc()->exercise(exerciseId).trainingAreaId();
+  const int trainingAreaId = m_pluginProvider->exmDtc()->exercise(exerciseId).trainingAreaId;
   if (trainingAreaId <= 0)
     return false;
 
   const AssetManagement::TrainingArea &ta = m_pluginProvider->asmDtc()->trainingArea(trainingAreaId);
 
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, trainingAreaExists = " << (ta.id() == trainingAreaId);
-  return (ta.id() == trainingAreaId);
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, trainingAreaExists = " << (ta.id == trainingAreaId);
+  return (ta.id == trainingAreaId);
 }
 
 MapSettingsJson SituationMapInit::getMapSettingsFromService() const
@@ -980,20 +981,20 @@ MapSettingsJson SituationMapInit::getMapSettingsFromService() const
     return msj;
 
   const int exerciseId     = m_pluginProvider->exerciseId();
-  const int trainingAreaId = m_pluginProvider->exmDtc()->exercise(exerciseId).trainingAreaId();
+  const int trainingAreaId = m_pluginProvider->exmDtc()->exercise(exerciseId).trainingAreaId;
 
   AssetManagement::TrainingArea ta = m_pluginProvider->asmDtc()->trainingArea(trainingAreaId);
 
-  if (ta.id() != trainingAreaId)
+  if (ta.id != trainingAreaId)
   {
     ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrainingArea does not exists (yet)";
     return msj;
   }
 
-  msj.setMapUrls        (convertMapDecription2BaseUrlVec(ta.map2D()));
-  msj.setSceneUrls      (convertMapDecription2BaseUrlVec(ta.scene3D()));
-  msj.setSceneObjectUrls(convertMapDecription2BaseUrlVec(ta.sceneObjects()));
-  msj.setElevationUrls  (convertMapDecription2BaseUrlVec(ta.elevation()));
+  msj.setMapUrls        (convertMapDecription2BaseUrlVec(ta.map2D));
+  msj.setSceneUrls      (convertMapDecription2BaseUrlVec(ta.scene3D));
+  msj.setSceneObjectUrls(convertMapDecription2BaseUrlVec(ta.sceneObjects));
+  msj.setElevationUrls  (convertMapDecription2BaseUrlVec(ta.elevation));
 
   return msj;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h
index c5d196ba9..78c3c5cae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h
@@ -4,6 +4,8 @@
 #pragma once
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>   // global DataModification enum (onPartyChanged default arg)
 #include <Common/situation_map_logging.h>
 
 #include <Map/generic_object_factory.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp
index 618c5ce71..80e3e655a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "terrain_profile_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsSession/lts_session.h>
 
 #include <Map/map.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
index 7b0819e4c..02777a9b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
@@ -4,8 +4,8 @@
 #include "topic_editor.h"
 #include "ui_topic_editor.h"
 
-#include <MarkerManagement/Common/mrk_dialog_model.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <MarkerManagement/Gui/Common/mrk_dialog_model.h>
+#include <MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <MarkerManagement/mrk.hpp>
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>
@@ -154,13 +154,13 @@ void SituationMapScriptFilterTopicEditor::onMarkerSelected()
   const QModelIndex idx = m_ui->markerView->currentIndex();
   const MarkerManagement::Marker marker = m_markerModel->getRowData(idx.row());
 
-  if (marker.id() <= 0)
+  if (marker.id <= 0)
     return;
 
   
   {
     QJsonParseError parseError;
-    QJsonValue settings = QJsonDocument::fromJson(QByteArray(marker.mapSettings().c_str(), marker.mapSettings().size()), &parseError).object();
+    QJsonValue settings = QJsonDocument::fromJson(QByteArray(marker.mapSettings.c_str(), marker.mapSettings.size()), &parseError).object();
 
     if (parseError.error != QJsonParseError::NoError)
     {
@@ -176,7 +176,7 @@ void SituationMapScriptFilterTopicEditor::onMarkerSelected()
   
   {
     QJsonParseError parseError;
-    QJsonValue settings = QJsonDocument::fromJson(QByteArray(marker.filter().c_str(), marker.filter().size()), &parseError).object();
+    QJsonValue settings = QJsonDocument::fromJson(QByteArray(marker.filter.c_str(), marker.filter.size()), &parseError).object();
 
     if (parseError.error != QJsonParseError::NoError)
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.h
index 267215535..593b9a3af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.h
@@ -8,7 +8,7 @@
 #include <SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <MarkerManagement/mrk_gui_plugin_interface.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <MarkerManagement/Gui/Common/mrk_apply_filter.h>
 
 
 namespace SituationMap
@@ -67,6 +67,7 @@ public:
   private:
     ForeignGuiInterface *m_sitmapIfc;
     QPointer<MarkerManagement::MarkerManagementApplyFilter> m_applyFilter;
+    NGL::INGLLogger &m_logger;
     QJsonValue m_oldMapData;
     QJsonValue m_oldFilterData;
   };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
index e5f72d44b..e5a49d1fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
@@ -5,8 +5,8 @@
 
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_interface.h>
-#include <SituationMapPlugin/SituationMap/AdapterDds/map_object_type.h>
-#include <SituationMapPlugin/SituationMap/AdapterDds/resource_manager_mode.h>
+#include <Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/map_object_type.h>
+#include <Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h>
 
 #include <QtGui/QColor>
 #include <QtCore/QPointer>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
index 596f6658b..4e3e4cf85 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
@@ -2,6 +2,7 @@
 
 
 #include "topic_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_topic_editor.h"
 #include "../replay_control_widget.h"
 
@@ -45,6 +46,7 @@ SituationReplayEditor::SituationReplayEditor(
   , m_markerModel(markerModel)
   , m_applyFilter(applyFilter)
   , m_ui(new Ui::SituationReplayEditor)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->lblDuration->setText(QStringLiteral(" - "));
@@ -461,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
 {
   const MarkerManagement::Marker marker = m_markerModel->getRowData(idx.row());
 
-  if (marker.id() <= 0)
+  if (marker.id <= 0)
   {
     ERROR_LOG(m_logger) << "marker has id 0";
     return;
@@ -471,7 +473,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
   
   
   onChangesMade();
-  setFilterAndSettings(QByteArray(marker.filter().c_str(), marker.filter().size()), QByteArray(marker.mapSettings().c_str(), marker.mapSettings().size()));
+  setFilterAndSettings(QByteArray(marker.filter.c_str(), marker.filter.size()), QByteArray(marker.mapSettings.c_str(), marker.mapSettings.size()));
   slotChangesMade();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.h
index 7c5403021..49fcc6a9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.h
@@ -2,8 +2,8 @@
 
 
 #pragma once
-#include <MarkerManagement/Common/mrk_dialog_model.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <MarkerManagement/mrk.hpp>
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
index f221e4e70..eb565166c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
@@ -2,6 +2,7 @@
 
 
 #include "replay_control_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtWidgets/QHBoxLayout>
 
@@ -11,6 +12,7 @@ namespace SituationReplay
 
 SituationReplayControlDialog::SituationReplayControlDialog(SituationReplayControlWidget *replayWidget, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   auto l = new QHBoxLayout;
   setLayout(l);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
index cec92c729..b8566c564 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
@@ -13,6 +13,7 @@
 #include <SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h>
 
 #include <QtCore/QJsonDocument>
+#include <QtCore/QFile>
 
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
index 06f8ed896..1c7ff18ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
@@ -3,6 +3,7 @@
 
 
 #include "replay_control_widget.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "replay_control_dialog.h"
 #include "ui_replay_control_widget.h"
@@ -36,6 +37,7 @@ SituationReplayControlWidget::SituationReplayControlWidget(QWidget *parent)
   , m_state(SrpState::Unknown)
   , m_toggleStartPauseButton(true)
   , m_speedValueChangedTimer(new QTimer(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->pbStart->setHidden(m_toggleStartPauseButton);
@@ -136,12 +138,12 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
     const QMap<qint32, SituationReplay::SitReplay> replays = m_dtc->sitReplays();
     for (const SituationReplay::SitReplay &replay : replays)
     {
-      if (replay.replayPartitionId() == m_partitionId)
+      if (replay.replayPartitionId == m_partitionId)
       {
-        m_state = replay.state();
-        m_id = replay.id();
+        m_state = replay.state;
+        m_id = replay.id;
         DEBUG_LOG(m_logger) << "recycling replay with id" << m_id;
-        m_ui->dteStartTime->setMsecsSinceEpoch(replay.beginTime());
+        m_ui->dteStartTime->setMsecsSinceEpoch(replay.beginTime);
         useExistingReplay = true; 
         break;
       }
@@ -186,7 +188,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
 
   const ExerciseManagement::Exercise &exercise = m_exmDtc->exercise(m_session->exerciseId());
-  const qint64 stopTime = exercise.stopTime();
+  const qint64 stopTime = exercise.stopTime;
   if (stopTime > 0)
   {
     m_ui->lblEnd->setText(DTG::toStringMSec(stopTime));
@@ -207,7 +209,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
       excDtc->waitForHistoricalDataExercise(3000);
       ExerciseManagement::Exercise exc = excDtc->exercise(excId);
-      qint64 startTime = exc.startTime();
+      qint64 startTime = exc.startTime;
 
       if (startTime > 0)
       {
@@ -216,7 +218,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
       }
       else
       {
-        qint64 beginTime = exc.beginTime();
+        qint64 beginTime = exc.beginTime;
 
         if (beginTime > 0)
         {
@@ -370,10 +372,10 @@ void SituationReplayControlWidget::pauseReplay()
     disableAllReplayButtons(); 
 
     ChangeReplayStateRequest req;
-    req.id(m_id);
-    req.replayPartitionId(m_partitionId);
-    req.state(SrpState::Paused);
-    req.pace(m_ui->slSpeed->value() / 10.);
+    req.id = m_id;
+    req.replayPartitionId = m_partitionId;
+    req.state = SrpState::Paused;
+    req.pace = m_ui->slSpeed->value() / 10.;
 
     if (!m_requestHelper->startSingleRequest([req, this]()
     {
@@ -405,9 +407,9 @@ void SituationReplayControlWidget::stopReplay()
   disableAllReplayButtons(); 
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Stopped);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Stopped;
 
   
   const bool wasQuiet = m_requestHelper->quiet();
@@ -440,12 +442,12 @@ void SituationReplayControlWidget::resumeReplay()
   disableAllReplayButtons(); 
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Resumed);
-  req.beginTime(m_ui->dteStartTime->msecsSinceEpoch());
-  req.endTime(0); 
-  req.pace(m_ui->slSpeed->value() / 10.);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Resumed;
+  req.beginTime = m_ui->dteStartTime->msecsSinceEpoch();
+  req.endTime = 0; 
+  req.pace = m_ui->slSpeed->value() / 10.;
 
   if (!m_requestHelper->startSingleRequest([req, this]()
   {
@@ -460,15 +462,15 @@ void SituationReplayControlWidget::resumeReplay()
 
 void SituationReplayControlWidget::onSitReplayChanged(const SitReplay &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onSitReplayChanged: id = " << data.id() << ", exId = " << data.exerciseId() << ", repPartitionId = " << data.replayPartitionId()
-                        << ", state = " << (int)data.state().underlying() << ", m_partitionId = " << m_partitionId << ", modType = " << (int)modType;
+  DEBUG_LOG(m_logger) << "onSitReplayChanged: id = " << data.id << ", exId = " << data.exerciseId << ", repPartitionId = " << data.replayPartitionId
+                        << ", state = " << (int)data.state << ", m_partitionId = " << m_partitionId << ", modType = " << (int)modType;
 
-  if (m_partitionId != data.replayPartitionId())
+  if (m_partitionId != data.replayPartitionId)
     return;
 
   if (modType == DataModification::eAdded ||
       modType == DataModification::eModified)
-    m_state = data.state();
+    m_state = data.state;
   else
     m_state = SrpState::Stopped;
 
@@ -497,7 +499,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     return;
 
   MarkerManagement::Marker marker = m_markerModel->getRowData(index.row());
-  const qint64 mSecsSinceEpoch = marker.timeStamp() - marker.timeStampOffset();
+  const qint64 mSecsSinceEpoch = marker.timeStamp - marker.timeStampOffset;
   m_ui->slPeriodSlider->setValue(getSecs(mSecsSinceEpoch));
   m_ui->dteStartTime->setMsecsSinceEpoch(mSecsSinceEpoch);
 
@@ -516,9 +518,9 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
 
 
   
-  if (marker.filter().size() > 0 && appFilter != nullptr)
+  if (marker.filter.size() > 0 && appFilter != nullptr)
   {
-    QByteArray mapFilter(QByteArray::fromRawData(marker.filter().c_str(), marker.filter().size()));
+    QByteArray mapFilter(QByteArray::fromRawData(marker.filter.c_str(), marker.filter.size()));
     if (appFilter->applyFilter(mapFilter))
       emit signalSetMapFilter(mapFilter);
     else
@@ -529,14 +531,14 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     
     if (m_sitMapGuiIfc != nullptr)
     {
-      const std::vector<MarkerManagement::MarkerDescription> &descriptionsRef = marker.descriptions();
+      const std::vector<MarkerManagement::MarkerDescription> &descriptionsRef = marker.descriptions;
       QList<MarkerManagement::MarkerType> markerTypes;
       markerTypes.reserve(descriptionsRef.size());
       for (const MarkerManagement::MarkerDescription &desc : std::as_const(descriptionsRef))
-        markerTypes.append(desc.markerType());
+        markerTypes.append(desc.markerType);
 
       if (markerTypes.contains(MarkerManagement::MarkerType::Situation))
-        m_sitMapGuiIfc->setCenterPoint(QPointF(marker.position().lon(), marker.position().lat()));
+        m_sitMapGuiIfc->setCenterPoint(QPointF(marker.position.lon, marker.position.lat));
     }
   }
 
@@ -544,7 +546,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
   
   if (appFilter)
   {
-    QByteArray mapSettings(QByteArray::fromRawData(marker.mapSettings().c_str(), marker.mapSettings().size()));
+    QByteArray mapSettings(QByteArray::fromRawData(marker.mapSettings.c_str(), marker.mapSettings.size()));
     DEBUG_LOG(m_logger) << "set map settings from marker " << (mapSettings.toStdString());
 
     
@@ -558,7 +560,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     auto pos = std::remove_if( oms.orderedLayers.begin(),
                          oms.orderedLayers.end(),
                          [](const QPair<QString, SituationMap::LayerParameter> &pair) { return pair.first == LayerNameEmergencyCall; } );
-    DEBUG_LOG(m_logger) << ">>>> remove iterator: " << pos << " END: " << oms.orderedLayers.end();
+    DEBUG_LOG(m_logger) << ">>>> remove iterator: " << (pos - oms.orderedLayers.begin()) << " END: " << oms.orderedLayers.size();
     if(pos != oms.orderedLayers.end())
       oms.orderedLayers.erase(pos);
 
@@ -581,7 +583,7 @@ void SituationReplayControlWidget::enaDisa()
   bool enaStop = false;
   bool enaPause = false;
 
-  switch (m_state.underlying())
+  switch (m_state)
   {
   case SrpState::Paused:
     enaStart = false;
@@ -627,12 +629,12 @@ bool SituationReplayControlWidget::startReplayDelayed(qint64 start, qint64 end,
   }
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Started);
-  req.beginTime(start);
-  req.endTime(end);
-  req.pace(speed);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Started;
+  req.beginTime = start;
+  req.endTime = end;
+  req.pace = speed;
 
   ERROR_LOG(m_logger) << "Start Replay Partition: "
                      << "id: " << m_id
@@ -725,9 +727,9 @@ void SituationReplayControlWidget::onSpeedValueChanged()
     return;
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.pace(speed);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.pace = speed;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
index c2ba2522d..28ee14d70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
@@ -65,7 +65,7 @@ public:
       if (rp.fi != nullptr)
         continue;
 
-      if (rp.id() == partitionId)
+      if (rp.id == partitionId)
         rp.fi = fi;
     }
   }
@@ -144,19 +144,19 @@ public:
       });
 
       repl.fi = nullptr;
-      repl.id(idToUse);
-      repl.name((QStringLiteral("srp_%1").arg(idToUse)).toStdString());
-      repl.exerciseId(exerciseId);
-      repl.workstationId(workstationId);
-      repl.operatorId(operatorId);
-      repl.replayType(replayType);
-      repl.domainId(domainIdReplay);
+      repl.id = idToUse;
+      repl.name = (QStringLiteral("srp_%1").arg(idToUse)).toStdString();
+      repl.exerciseId = exerciseId;
+      repl.workstationId = workstationId;
+      repl.operatorId = operatorId;
+      repl.replayType = replayType;
+      repl.domainId = domainIdReplay;
       repl.proc->setProgram(QCoreApplication::applicationDirPath() + QStringLiteral("/svcSituationReplay"));
       QString input = QString::number(domainId) + QLatin1Char(',') + QString::number(exerciseId);
       if (!tcpConnectionUrl.isEmpty())
         input += QLatin1Char(',') + tcpConnectionUrl.toString();
 
-      QString output = QString::number(repl.domainId()) + QLatin1Char(',') + QString::number(repl.id());
+      QString output = QString::number(repl.domainId) + QLatin1Char(',') + QString::number(repl.id);
 
       repl.proc->setArguments({QStringLiteral("--input"), input,
                                QStringLiteral("--output"), output,
@@ -299,9 +299,9 @@ public:
     while (it != m_replayPartitions.end())
     {
       const ReplayPartitionEx &rp = it.value();
-      if ((partitionId != 0 && rp.id() != partitionId) ||
-          (workstationId != 0 && rp.workstationId() != workstationId) ||
-          (operatorId != 0 && rp.operatorId() != operatorId) ||
+      if ((partitionId != 0 && rp.id != partitionId) ||
+          (workstationId != 0 && rp.workstationId != workstationId) ||
+          (operatorId != 0 && rp.operatorId != operatorId) ||
           (fi != nullptr && rp.fi != fi))
       {
         ++it;
@@ -338,12 +338,12 @@ public:
           {
             try
             {
-              DEBUG_LOG(m_logger) << "Waiting for replay to process to shutdown... Replay id: " << rp.id();
+              DEBUG_LOG(m_logger) << "Waiting for replay to process to shutdown... Replay id: " << rp.id;
               LtsUtils::awaitTimeout(10000, rp.proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), true);
             }
             catch (...)
             {
-              WARNING_LOG(m_logger) << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id();
+              WARNING_LOG(m_logger) << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id;
               cb();
             }
           }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
index a5775df43..53b82a2d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
@@ -47,8 +47,6 @@ public:
   std::shared_ptr<ForeignDataInterface> getForeignDataInterface() override { return m_foreignInterface; }
 
 private:
-
-NGL::INGLLogger &m_logger;
   std::shared_ptr<Core::Interface::Dtc> m_dtc;
   std::shared_ptr<ForeignDataInterface> m_foreignInterface;
 };
@@ -74,6 +72,8 @@ private:
 private:
   std::shared_ptr<ReplayHandler> m_replayHandler;
   QPointer<LtsSession::LtsSessionDataDds> m_session;
+  NGL::INGLLogger &m_logger;
+
   friend class ReplayHandler;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
index 5c7d2ed81..4ed75aaf5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
@@ -39,6 +39,7 @@ if(QT6_GUI_AVAILABLE)
     SrmGuiPluginInterface
     SrmDataPluginInterface
     FltAesGuiPluginInterface
+    AvmShared
     ddscore
     svcCoreClient
     ${Qt6_Widgets}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
index 0f373cabb..78f1e5964 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
@@ -29,6 +29,7 @@ SituationReplayManagementDialog::SituationReplayManagementDialog(LtsSession::Lts
   , m_ui(new Ui::SituationReplayManagementDialog)
   , m_srmForeign(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("SituationReplayManagementDialog"))
 {
   m_ui->setupUi(this);
 
@@ -76,7 +77,7 @@ void SituationReplayManagementDialog::slotStartReplay()
   const QModelIndex idx = m_ui->widget->currentIndex();
   const Core::ReplayPartition rp = m_model->getRowData(idx.row());
 
-  int replayPartition = rp.id();
+  int replayPartition = rp.id;
 
   if (replayPartition < 1)
   {
@@ -144,8 +145,8 @@ void SituationReplayManagementDialog::onRemoveReplayPartition()
   for (auto i = selectedRows.constBegin(); i != selectedRows.constEnd(); ++i)
   {
     const Core::ReplayPartition &rp = m_model->getRowData((*i).row());
-    int id = rp.id();
-    int wsId = rp.workstationId();
+    int id = rp.id;
+    int wsId = rp.workstationId;
 
     if (id < 1 || wsId < 1) 
       continue;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.cpp
index 22e62399d..6cb0daad2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.cpp
@@ -13,6 +13,7 @@ ReplayPartitionDialogModel::ReplayPartitionDialogModel(QObject *parent)
                                                                       parent)
   , m_partitionid(-1)
   , m_dtc(nullptr)
+  , m_logger(getLogger("ReplayPartitionDialogModel"))
 {}
 
 ReplayPartitionDialogModel::~ReplayPartitionDialogModel()
@@ -41,20 +42,20 @@ QVariant ReplayPartitionDialogModel::data(const QModelIndex &index, int role) co
   switch (index.column())
   {
   case Id:
-    return partition.id();
+    return partition.id;
   case Name:
-    return QString::fromStdString(partition.name());
+    return QString::fromStdString(partition.name);
   case Exercise:
-    return partition.exerciseId(); 
+    return partition.exerciseId;
   case WorkstationId:
-    return partition.workstationId();
+    return partition.workstationId;
   case ConnectionString:
   {
-    if (partition.tcpConnectionUrl().size() == 0)
-      return QString::number(partition.domainId());
-    return QString(QString::fromUtf8(partition.tcpConnectionUrl().c_str()) +
+    if (partition.tcpConnectionUrl.size() == 0)
+      return QString::number(partition.domainId);
+    return QString(QString::fromUtf8(partition.tcpConnectionUrl.c_str()) +
                    QStringLiteral(" - ") +
-                   QString::number(partition.domainId()));
+                   QString::number(partition.domainId));
   }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h
index 04a1805ad..d387c69ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h
@@ -46,7 +46,7 @@ public:
 protected:
   bool isFiltered(const Core::ReplayPartition &data, DataModification modType) const override
   {
-    if (data.exerciseId() != m_partitionid)
+    if (data.exerciseId != m_partitionid)
       return true;
     return LtsWidgets::LtsAbstractTableModel<Core::ReplayPartition>::isFiltered(data, modType);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
index ef7e9fdff..9766333bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
@@ -159,7 +159,7 @@ void InterfaceImpl::startReplay()
   {
     rp = m_coreDtc->replayPartition(replayId);
 
-    if (rp.id() == replayId)
+    if (rp.id == replayId)
     {
       found = true;
       break;
@@ -233,7 +233,7 @@ bool InterfaceImpl::transferFilter(const Core::ReplayPartition &data)
   
   const int operatorId  = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   const QString context = m_session->workspaceId();
-  const QString replayContext = QStringLiteral("replay_%1").arg(data.id());
+  const QString replayContext = QStringLiteral("replay_%1").arg(data.id);
 
   
   auto fOrig   = m_fltAesIfc->aesFilterForOperator(operatorId, context);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.h
index 3060ac086..ad563d28b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
+#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <SituationReplayManagement/srm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
index a04cb5f54..8220f4d23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
@@ -51,8 +51,9 @@ err error(const QString &msg) { return err(msg.toStdString()); }
 namespace TakeHomePackageManager
 {
 
-Compressor::Compressor() : QObject(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+Compressor::Compressor()
+  : QObject(nullptr)
+{}
 
 
 void Compressor::go(ProcessOverlay *processOverlay, QIODevice &out, const QString &sourceDir, const QString &destRootDir) noexcept(false)
@@ -124,6 +125,7 @@ void Compressor::go(ProcessOverlay *processOverlay, QIODevice &out, const QStrin
 
 HttpProcess::HttpProcess(LtsWidgets::LtsDialog *dialog, const QString &statusMessage)
   : QObject()
+  , m_logger(getLogger("ExportedScriptsDialog.HttpProcess"))
   , m_process(new ProcessOverlay)
   , m_nam(new QNetworkAccessManager)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
index aa7f5f264..4512fe456 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
@@ -75,6 +75,7 @@ namespace TakeHomePackageManager
 
 USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
     : LtsWidgets::LtsDialog(parent)
+    , m_logger(getLogger("USB2Dialog"))
     , m_localThpModel(new ExportedScriptsModel(this))
     , m_localTopicsModel(new TopicsModel(this))
     , m_usbThpModel(new ExportedScriptsModel(this))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
index a5c7702f9..6a2d61007 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
@@ -7,6 +7,7 @@
 #include "tgt_telegrams.h"
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <TargetManagement/tgt_data_plugin_interface.h>
@@ -28,6 +29,7 @@ AreaDialog::AreaDialog(const QString &menuGroup, LtsSession::LtsSession *session
   , m_ui(new Ui::AreaDialog)
   , m_menuGroup(menuGroup)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -158,7 +160,7 @@ void AreaDialog::onRemoveArea()
   for (const auto &mi : selectedRows)
   {
     Core::RemoveElementRequest req;
-    req.id(m_areaModel->getRowData(mi.row()).id());
+    req.id = m_areaModel->getRowData(mi.row()).id;
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->shootbackAreaRemoveRequest(req, this);
@@ -206,11 +208,11 @@ QByteArray AreaDialog::toJson() const
     for (const TargetManagement::ShootbackArea &area : modelData)
     {
       ShootbackAreaData sbad;
-      sbad.id   = area.id();
-      sbad.name = QString::fromStdString(area.name());
-      sbad.position = GeoPosition2D(area.position());
-      sbad.width    = area.width();
-      sbad.height   = area.height();
+      sbad.id   = area.id;
+      sbad.name = QString::fromStdString(area.name);
+      sbad.position = GeoPosition2D(area.position);
+      sbad.width    = area.width;
+      sbad.height   = area.height;
       jArray.append(sbad.toJson());
     }
     obj[QStringLiteral("ShootbackAreas")] = jArray;
@@ -239,11 +241,11 @@ QVector<ShootbackArea> AreaDialog::fromJson(const QByteArray &content)
   {
     const ShootbackAreaData &sbad = ShootbackAreaData::fromJson(item.toObject());
     TargetManagement::ShootbackArea area;
-    area.id(sbad.id);
-    area.name(sbad.name.toStdString());
-    area.position({sbad.position.lon, sbad.position.lat}); 
-    area.width(sbad.width);
-    area.height(sbad.height);
+    area.id = sbad.id;
+    area.name = sbad.name.toStdString();
+    area.position = {sbad.position.lon, sbad.position.lat};
+    area.width = sbad.width;
+    area.height = sbad.height;
     vecData.push_back(std::move(area));
   }
   return vecData;
@@ -307,7 +309,7 @@ void AreaDialog::onImport()
       const QVector<ShootbackArea> &curData = m_areaModel->getData();
       for (auto item : curData)
       {
-        Core::RemoveElementRequest req(item.id());
+        Core::RemoveElementRequest req(item.id);
         m_requestHelper->addRequest([this, req]()
         {
           return m_ftc->shootbackAreaRemoveRequest(req, this);
@@ -320,7 +322,7 @@ void AreaDialog::onImport()
       {
         DEBUG_LOG(m_logger) << "area " <<area;
 
-        area.id(0); 
+        area.id = 0; 
         m_requestHelper->addRequest([this, area]()
         {
           return m_ftc->shootbackAreaModifyRequest(area, this);
@@ -344,7 +346,7 @@ void AreaDialog::onAssignTargetButtonClicked()
   if (!curIdx.isValid())
     return;
 
-  const int areaId = m_areaModel->getRowData(curIdx.row()).id();
+  const int areaId = m_areaModel->getRowData(curIdx.row()).id;
 
   
   
@@ -371,7 +373,7 @@ void AreaDialog::onMapCenterClicked()
   if (!curIdx.isValid())
     return;
 
-  const int id = m_areaModel->getRowData(curIdx.row()).id();
+  const int id = m_areaModel->getRowData(curIdx.row()).id;
   m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_ShootbackArea, id);
 }
 
@@ -387,7 +389,7 @@ void AreaDialog::onMapZoomToClicked()
   if (!m_areaModel || !m_sitMapGuiIfc)
     return;
 
-  int areaId = m_areaModel->getRowData(index.row()).id();
+  int areaId = m_areaModel->getRowData(index.row()).id;
   if (areaId<=0)
     return;
 
@@ -395,8 +397,8 @@ void AreaDialog::onMapZoomToClicked()
   QVector<int> assignedTargets;
   auto cb = [areaId, &assignedTargets](const TargetManagement::TargetAreaAssignment &assignment)
   {
-    if (assignment.areaId() == areaId)
-      assignedTargets.push_back(assignment.targetParticipantId());
+    if (assignment.areaId == areaId)
+      assignedTargets.push_back(assignment.targetParticipantId);
   };
   m_dtc->targetAreaAssignments(cb);
 
@@ -421,7 +423,7 @@ void AreaDialog::onObjectEntered(const QModelIndex &index)
     m_sitMapGuiIfc->removeObjectIndicator();
     return;
   }
-  int areaId = m_areaModel->getRowData(index.row()).id();
+  int areaId = m_areaModel->getRowData(index.row()).id;
   if (areaId>0)
   {
     
@@ -431,8 +433,8 @@ void AreaDialog::onObjectEntered(const QModelIndex &index)
     QVector<int> assignedTargets;
     auto cb = [areaId, &assignedTargets](const TargetManagement::TargetAreaAssignment &assignment)
     {
-      if (assignment.areaId() == areaId)
-        assignedTargets.push_back(assignment.targetParticipantId());
+      if (assignment.areaId == areaId)
+        assignedTargets.push_back(assignment.targetParticipantId);
     };
     m_dtc->targetAreaAssignments(cb);
     m_sitMapGuiIfc->setMapObjectSelected(SituationMap::MapObjectType::MOT_Participant, assignedTargets, true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.h
index cdfd22d26..176d1343f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.h
@@ -8,7 +8,7 @@
 #include <TargetManagement/tgt_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <TargetManagement/logger.h>
-#include <TargetManagement/ShootbackTargetConfiguration/tgt_area_model.h>
+#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_edit.cpp
index d1fd5cf2e..28b775a28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_edit.cpp
@@ -15,6 +15,7 @@ AreaEdit::AreaEdit(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::AreaEdit)
+  , m_logger(getLogger("AreaEdit"))
 {
   m_ui->setupUi(this);
 
@@ -85,11 +86,11 @@ void AreaEdit::enaDisa()
 
 bool AreaEdit::apply()
 {
-  m_area.name(m_ui->leName->text().toStdString());
+  m_area.name = m_ui->leName->text().toStdString();
   const QPointF &coord = m_ui->positionEdit->coordinate();
-  m_area.position({coord.x(), coord.y()});
-  m_area.width(m_ui->sbWidth->value());
-  m_area.height(m_ui->sbHeight->value());
+  m_area.position = {coord.x(), coord.y()};
+  m_area.width = m_ui->sbWidth->value();
+  m_area.height = m_ui->sbHeight->value();
 
   m_requestHelper->addRequest([this]()
   {
@@ -155,12 +156,12 @@ void AreaEdit::setData(const ShootbackArea &area)
 {
   m_area = area;
 
-  if (m_area.id() > 0)
+  if (m_area.id > 0)
   {
-    m_ui->leName->setText(QString::fromStdString(m_area.name()));
-    m_ui->positionEdit->setCoordinate(m_area.position().lon(), m_area.position().lat());
-    m_ui->sbWidth->setValue(m_area.width());
-    m_ui->sbHeight->setValue(m_area.height());
+    m_ui->leName->setText(QString::fromStdString(m_area.name));
+    m_ui->positionEdit->setCoordinate(m_area.position.lon, m_area.position.lat);
+    m_ui->sbWidth->setValue(m_area.width);
+    m_ui->sbHeight->setValue(m_area.height);
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
index e21cf7cd0..c62e80d2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
@@ -30,6 +30,7 @@ AreaModel::AreaModel(QObject *parent)
   tr("Height"),
 },
 parent)
+, m_logger(getLogger("AreaModel"))
 {}
 
 
@@ -105,11 +106,11 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
   if (role == Qt::BackgroundRole)
   {
     if ((index.column() == Center) &&
-        ((shootbackArea.position().lat() <= 0) || (shootbackArea.position().lon() <= 0)))
-      return getWarningBackgroundRole();                          
-    if (index.column() == Width && shootbackArea.width() <= 0)
-      return getWarningBackgroundRole();                          
-    if (index.column() == Height && shootbackArea.height() <= 0)
+        ((shootbackArea.position.lat <= 0) || (shootbackArea.position.lon <= 0)))
+      return getWarningBackgroundRole();
+    if (index.column() == Width && shootbackArea.width <= 0)
+      return getWarningBackgroundRole();
+    if (index.column() == Height && shootbackArea.height <= 0)
       return getWarningBackgroundRole();                          
   }
   else
@@ -117,24 +118,24 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
     if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
     {
       if (index.column() == Name)
-        return QString::fromStdString(shootbackArea.name());
+        return QString::fromStdString(shootbackArea.name);
     }
 
   switch (index.column())
   {
   case Id:
-    return shootbackArea.id();
+    return shootbackArea.id;
   case Name:
-    return QString::fromStdString(shootbackArea.name());
+    return QString::fromStdString(shootbackArea.name);
   case Center:
   {
-    const Core::GeoPosition2D &pos = shootbackArea.position();
-    return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+    const Core::GeoPosition2D &pos = shootbackArea.position;
+    return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
   }
   case Width:
-    return shootbackArea.width();
+    return shootbackArea.width;
   case Height:
-    return shootbackArea.height();
+    return shootbackArea.height;
   } 
 
   return QVariant();
@@ -151,7 +152,7 @@ void AreaModel::updateColumnFilter()
 {
   m_usedNames.clear();
   for (const ShootbackArea &item : std::as_const(m_vecData))
-    m_usedNames.insert(QString::fromStdString(item.name()));
+    m_usedNames.insert(QString::fromStdString(item.name));
 }
 
 
@@ -178,13 +179,13 @@ bool AreaProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
   switch (source_left.column())
   {
   case AreaModel::Columns::Id:
-    return left.id() < right.id();
+    return left.id < right.id;
   case AreaModel::Columns::Name:
-    return left.name() < right.name();
+    return left.name < right.name;
   case AreaModel::Columns::Width:
-    return left.width() < right.width();
+    return left.width < right.width;
   case AreaModel::Columns::Height:
-    return left.height() < right.height();
+    return left.height < right.height;
 
   case AreaModel::Columns::Center:
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
index 89ad78749..b5886b93f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
@@ -18,12 +18,12 @@ namespace TargetManagement
 bool isEqual(const ShootbackConfiguration &c1, const ShootbackConfiguration &c2)
 {
   return (
-           (c1.interval1() == c2.interval1()) &&
-           (c1.flash1() == c2.flash1()) &&
-           (c1.effect1() == c2.effect1()) &&
-           (c1.interval2() == c2.interval2()) &&
-           (c1.flash2() == c2.flash2()) &&
-           (c1.effect2() == c2.effect2())
+           (c1.interval1 == c2.interval1) &&
+           (c1.flash1 == c2.flash1) &&
+           (c1.effect1 == c2.effect1) &&
+           (c1.interval2 == c2.interval2) &&
+           (c1.flash2 == c2.flash2) &&
+           (c1.effect2 == c2.effect2)
          );
 }
 
@@ -32,12 +32,12 @@ bool isDefault(const ShootbackConfiguration &c) {  return isEqual(c, ShootbackCo
 bool isEqual(const TargetAreaAssignment &a1, const TargetAreaAssignment &a2, bool ignoringAreaIdAndParticipantId)
 {
   return (
-           (a1.id() == a2.id()) &&
-           (a1.name() == a2.name()) &&
-           (ignoringAreaIdAndParticipantId || (a1.areaId() == a2.areaId())) &&
-           (ignoringAreaIdAndParticipantId || (a1.targetParticipantId() == a2.targetParticipantId())) &&
-           (a1.isActive() == a2.isActive()) &&
-           isEqual(a1.configuration(), a2.configuration())
+           (a1.id == a2.id) &&
+           (a1.name == a2.name) &&
+           (ignoringAreaIdAndParticipantId || (a1.areaId == a2.areaId)) &&
+           (ignoringAreaIdAndParticipantId || (a1.targetParticipantId == a2.targetParticipantId)) &&
+           (a1.isActive == a2.isActive) &&
+           isEqual(a1.configuration, a2.configuration)
          );
 }
 
@@ -73,6 +73,7 @@ AssignmentParticipantModel::AssignmentParticipantModel(QObject *parent)
   tr("Effect_2")
 },
 parent)
+, m_logger(getLogger("AssignmentParticipantModel"))
 {}
 
 
@@ -202,7 +203,7 @@ QVariant AssignmentParticipantModel::headerData(int section, Qt::Orientation ori
 template <typename T>
 QVariant handleIsDefault(const TargetManagement::TargetAreaAssignment &assignment, const T &value)
 {
-  if (isDefault(assignment.configuration()))
+  if (isDefault(assignment.configuration))
     return QStringLiteral("-");
   return value;
 }
@@ -232,54 +233,54 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
     
     if (!flags(index).testFlag(Qt::ItemIsUserCheckable))
       return QVariant();
-    return assignment.isActive() ? Qt::Checked : Qt::Unchecked;
+    return assignment.isActive ? Qt::Checked : Qt::Unchecked;
   }
   else if (role == Qt::DecorationRole)
   {
     if (index.column() == Participant)
     {
       static const int pmSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-      const QPixmap &pm = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId());
+      const QPixmap &pm = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId);
       if (!pm.isNull())
         return pm.scaled(pmSize, pmSize);
     }
     else if ((index.column() == Flash_1))
-      return assignment.configuration().flash1() ? m_yes : m_no;
+      return assignment.configuration.flash1 ? m_yes : m_no;
     else if ((index.column() == Flash_2))
-      return assignment.configuration().flash2() ? m_yes : m_no;
+      return assignment.configuration.flash2 ? m_yes : m_no;
     return QVariant();
   }
   else if (role == Qt::BackgroundRole)
   {
     if ((index.column() == TargetId) || (index.column() == TargetName))
     {
-      int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
+      int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
       if (targetId <= 0)
         return getNoParticipantColor();                         
     }
 
     else if ((index.column() == AreaId) || (index.column() == AreaName))
     {
-      if (m_tgt_dtc->shootbackArea(assignment.areaId()).id()<=0)
+      if (m_tgt_dtc->shootbackArea(assignment.areaId).id<=0)
         return getNoParticipantColor();                         
     }
 
 
-    else if ((index.column() == TargetPartipantId) && (assignment.targetParticipantId() <= 0))
+    else if ((index.column() == TargetPartipantId) && (assignment.targetParticipantId <= 0))
       return getNoParticipantColor();                           
     else if (index.column() == TargetPartipantEquipmentNumber)
     {
-      const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
+      const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
       if (eqNo <= 0)
         return getNoParticipantColor();                         
     }
     
-    if (assignment.isActive() && isDefault(assignment.configuration()))
+    if (assignment.isActive && isDefault(assignment.configuration))
       return getAssignedButNoConfigurationColor();              
   }
   else if (role == Qt::ForegroundRole)
   {
-    if (!assignment.isActive() && (index.column() != Participant))
+    if (!assignment.isActive && (index.column() != Participant))
       return QColor(Qt::gray);
   }
   else if (role == Qt::ToolTipRole)
@@ -288,7 +289,7 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
     {
       QString tooltip(QStringLiteral("<html>"));
 
-      const QPixmap &img = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId());
+      const QPixmap &img = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId);
       if (!img.isNull())
       {
         
@@ -298,10 +299,10 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
         tooltip.append(QStringLiteral("<center><img src='data:image/png;base64,%1'></center>").arg(QString::fromLatin1(data.toBase64())));
 
         QString hdr = this->headerData(AssignmentName, Qt::Horizontal, Qt::DisplayRole).toString();
-        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(assignment.name())));
+        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(assignment.name)));
 
         hdr = this->headerData(Participant, Qt::Horizontal, Qt::DisplayRole).toString();
-        const QString &val = m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId());
+        const QString &val = m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId);
         tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, val));
 
         tooltip.append(QStringLiteral("</html>"));
@@ -313,73 +314,73 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
   {
         
         if (index.column() == IsActive)
-          return static_cast<int>(assignment.isActive());
+          return static_cast<int>(assignment.isActive);
         if (index.column() == AreaId)
-        return assignment.areaId();
+        return assignment.areaId;
         if (index.column() == TargetPartipantId)
-          return assignment.targetParticipantId();
+          return assignment.targetParticipantId;
   }
 
   switch (index.column())
   {
   case Id:
-    return assignment.id();
+    return assignment.id;
 
   case AssignmentName:
-    return QString::fromStdString(assignment.name());
+    return QString::fromStdString(assignment.name);
   case IsActive:
-    return assignment.isActive() ? tr("Yes") : tr("No");
+    return assignment.isActive ? tr("Yes") : tr("No");
 
   case TargetId:
   {
-    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
+    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
     return targetId;
   }
 
   case TargetName:
   {
-    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
+    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
     if (targetId <= 0)
       return QStringLiteral("-");
     const ShootbackTarget &st = m_tgt_dtc->shootbackTarget(targetId);
-    if (st.id() != targetId)
+    if (st.id != targetId)
       return QStringLiteral("-");
-    return QString::fromStdString(st.name());
+    return QString::fromStdString(st.name);
   }
 
   
   case TargetPartipantId:
-    return assignment.targetParticipantId();
+    return assignment.targetParticipantId;
   case TargetPartipantEquipmentNumber:
   {
-    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
+    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
     if (eqNo <= 0)
       return QStringLiteral("-");
     return eqNo;
   }
 
   case Participant:
-    return m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId());
+    return m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId);
 
   
   case AreaId:
-    return assignment.areaId();
+    return assignment.areaId;
   case AreaName:
-    return QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId()).name());
+    return QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId).name);
 
   
   case Interval_1:
-    return handleIsDefault(assignment, assignment.configuration().interval1());
+    return handleIsDefault(assignment, assignment.configuration.interval1);
   case Flash_1:
-    return handleIsDefault(assignment, assignment.configuration().flash1());
+    return handleIsDefault(assignment, assignment.configuration.flash1);
   case Effect_1:
-    return handleIsDefault(assignment, effectToString(assignment.configuration().effect1()));
+    return handleIsDefault(assignment, effectToString(assignment.configuration.effect1));
   case Interval_2:
-    return handleIsDefault(assignment, assignment.configuration().interval2());
+    return handleIsDefault(assignment, assignment.configuration.interval2);
   case Flash_2:
-    return handleIsDefault(assignment, assignment.configuration().flash2());
+    return handleIsDefault(assignment, assignment.configuration.flash2);
   case Effect_2:
-    return handleIsDefault(assignment, effectToString(assignment.configuration().effect2()));
+    return handleIsDefault(assignment, effectToString(assignment.configuration.effect2));
 
   } 
 
@@ -400,9 +401,9 @@ bool AssignmentParticipantModel::setData(const QModelIndex &index, const QVarian
   bool bVal = value.toBool();
 
   TargetAreaAssignment &data = m_vecData[index.row()];
-  if (data.isActive() != bVal)
+  if (data.isActive != bVal)
   {
-    data.isActive(bVal);
+    data.isActive = bVal;
     emit dataChanged(index, index);
     emit signalEditableItemChanged();
   }
@@ -428,7 +429,7 @@ QSet<int> AssignmentParticipantModel::getAssociatedParticipantIds() const
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
-    ret += data.targetParticipantId();
+    ret += data.targetParticipantId;
   return ret;
 }
 
@@ -437,8 +438,8 @@ QSet<int> AssignmentParticipantModel::getAssociatedParticipantIdsForArea(int are
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
-    if (data.areaId() == areaId)
-      ret += data.targetParticipantId();
+    if (data.areaId == areaId)
+      ret += data.targetParticipantId;
   return ret;
 }
 
@@ -447,8 +448,8 @@ QSet<int> AssignmentParticipantModel::getAssociatedAreasIdsForParticipantId(int
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
-    if (data.targetParticipantId() == participantId)
-      ret += data.areaId();
+    if (data.targetParticipantId == participantId)
+      ret += data.areaId;
   return ret;
 }
 
@@ -457,7 +458,7 @@ int AssignmentParticipantModel::findRowForAreaTargetParticipantId(int areaId, in
   for (int i = 0; i < m_vecData.size(); ++i) 
   {
     const TargetAreaAssignment &curAssignment = m_vecData.at(i);
-    if ((curAssignment.areaId() == areaId) && (curAssignment.targetParticipantId() == targetParticipantId))
+    if ((curAssignment.areaId == areaId) && (curAssignment.targetParticipantId == targetParticipantId))
       return i;
   }
   return -1;
@@ -481,9 +482,9 @@ void AssignmentParticipantModel::addGapFillerForArea(int areaId)
     if (!associatedParticipantIds.contains(pId))
     {
       TargetManagement::TargetAreaAssignment gapFiller;
-      gapFiller.areaId(areaId);
-      gapFiller.targetParticipantId(pId);
-      gapFiller.isActive(false);
+      gapFiller.areaId = areaId;
+      gapFiller.targetParticipantId = pId;
+      gapFiller.isActive = false;
       gapFillers.push_back(gapFiller);
     }
   } 
@@ -523,12 +524,12 @@ void AssignmentParticipantModel::addGapFillerForTargetParticipantId(int targetPa
 
   auto cb = [associatedAreaIds, targetParticipantId, &gapFillers](const TargetManagement::ShootbackArea & area)
   {
-    if (!associatedAreaIds.contains(area.id()))
+    if (!associatedAreaIds.contains(area.id))
     {
       TargetManagement::TargetAreaAssignment gapFiller;
-      gapFiller.areaId(area.id());
-      gapFiller.targetParticipantId(targetParticipantId);
-      gapFiller.isActive(false);
+      gapFiller.areaId = area.id;
+      gapFiller.targetParticipantId = targetParticipantId;
+      gapFiller.isActive = false;
       gapFillers.push_back(gapFiller);
     }
   };
@@ -546,7 +547,7 @@ void AssignmentParticipantModel::onTargetAreaAssignmentChanged(const TargetManag
   
   if (modType == DataModification::eAdded)
   {
-    int row = findRowForAreaTargetParticipantId(data.areaId(), data.targetParticipantId());
+    int row = findRowForAreaTargetParticipantId(data.areaId, data.targetParticipantId);
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " row=" << row;
     if (row >= 0)
     {
@@ -580,25 +581,25 @@ void AssignmentParticipantModel::updateColumnFilter()
   {
     ++row;
     
-    m_usedIsActive.insert(assignment.isActive());
+    m_usedIsActive.insert(assignment.isActive);
 
-    m_usedAreaIds.insert(assignment.areaId());
-    m_usedAreas.insert( QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId()).name()) );
+    m_usedAreaIds.insert(assignment.areaId);
+    m_usedAreas.insert( QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId).name) );
 
-    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
+    int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
     m_usedTargetIds.insert(targetId);
     m_usedTargets.insert(this->data(index(row, TargetName), Qt::DisplayRole).toString());
 
-    m_usedTargetParticipantIds.insert(assignment.targetParticipantId());
-    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
+    m_usedTargetParticipantIds.insert(assignment.targetParticipantId);
+    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
     m_usedParticipantEqNo.insert(eqNo);
-    m_usedParticipants.insert(m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId()));
+    m_usedParticipants.insert(m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId));
   }
 }
 
 QString AssignmentParticipantModel::effectToString(const Effect &effect) const
 {
-  switch (effect.underlying())
+  switch (effect)
   {
   case TargetManagement::Effect::NearMiss:
     return tr("NearMiss");
@@ -648,12 +649,12 @@ bool AssignmentParticipantProxyModel::filterAcceptsRow(int source_row, const QMo
   if (m_areaId > 0)
   {
     const TargetManagement::TargetAreaAssignment &item = m_sourceModel->m_vecData.at(source_row);
-    return (item.areaId() == m_areaId) && BaseClass::filterAcceptsRow(source_row, source_parent);
+    return (item.areaId == m_areaId) && BaseClass::filterAcceptsRow(source_row, source_parent);
   }
   else if ((m_targetParticipantId > 0))
   {
     const TargetManagement::TargetAreaAssignment &item = m_sourceModel->m_vecData.at(source_row);
-    return (item.targetParticipantId() == m_targetParticipantId) && BaseClass::filterAcceptsRow(source_row, source_parent);;
+    return (item.targetParticipantId == m_targetParticipantId) && BaseClass::filterAcceptsRow(source_row, source_parent);;
   }
   return BaseClass::filterAcceptsRow(source_row, source_parent);
 }
@@ -673,19 +674,19 @@ bool AssignmentParticipantProxyModel::lessThan(const QModelIndex &source_left, c
   switch (source_left.column())
   {
   case AssignmentParticipantModel::Columns::Id:
-    return left.id() < right.id();
+    return left.id < right.id;
   case AssignmentParticipantModel::Columns::AssignmentName:
-    return left.name() < right.name();
+    return left.name < right.name;
   case AssignmentParticipantModel::Columns::TargetPartipantId:
-    return left.targetParticipantId() < right.targetParticipantId();
+    return left.targetParticipantId < right.targetParticipantId;
   case AssignmentParticipantModel::Columns::TargetPartipantEquipmentNumber:
   {
-    const int eqNoLeft  = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
-    const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(right.targetParticipantId());
+    const int eqNoLeft  = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
+    const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(right.targetParticipantId);
     return eqNoLeft < eqNoRight;
   }
   case AssignmentParticipantModel::Columns::AreaId:
-    return left.areaId() < right.areaId();
+    return left.areaId < right.areaId;
 
   case AssignmentParticipantModel::Columns::Participant:
   case AssignmentParticipantModel::Columns::AreaName:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
index dd96b70be..d04630ee5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
@@ -17,6 +17,7 @@ namespace TargetManagement
 
 ParticipantHandler::ParticipantHandler(QObject *parent)
   : BaseClass(parent)
+  , m_logger(getLogger("ParticipantHandler"))
 {}
 
 
@@ -70,7 +71,7 @@ QString ParticipantHandler::getParticipantHierarchie(int participantId) const
 
 QString ParticipantHandler::target_wmsTypeClassToString(const ParticipantManagement::WmsTypeClass &wmsTypeClass)
 {
-  switch (wmsTypeClass.underlying())
+  switch (wmsTypeClass)
   {
   case ParticipantManagement::WmsTypeClass::TargetHuman:
     return QStringLiteral("Human");
@@ -92,11 +93,11 @@ void ParticipantHandler::onShootbackTargetChanged(const TargetManagement::Shootb
   switch (modType)
   {
   case DataModification::eRemoved:
-    m_participantIdToTargetId.remove(data.targetParticipantId());
+    m_participantIdToTargetId.remove(data.targetParticipantId);
     break;
   case DataModification::eModified:
   case DataModification::eAdded:
-    m_participantIdToTargetId.insert(data.targetParticipantId(), data.id());
+    m_participantIdToTargetId.insert(data.targetParticipantId, data.id);
     break;
   }
 }
@@ -109,11 +110,11 @@ void ParticipantHandler::onTypeChanged(const ParticipantManagement::Type  &data,
   switch (modType)
   {
   case DataModification::eRemoved:
-    m_typeToTypeClass.remove(data.id());
+    m_typeToTypeClass.remove(data.id);
     break;
   case DataModification::eModified:
   case DataModification::eAdded:
-    m_typeToTypeClass.insert(data.id(), data.typeClass());
+    m_typeToTypeClass.insert(data.id, data.typeClass);
     break;
   }
 }
@@ -123,10 +124,10 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
 {
   TRACE_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
 
-  if (data.isDeleted())
+  if (data.isDeleted)
     modType = DataModification::eRemoved;
 
-  const int dataId = data.id();
+  const int dataId = data.id;
   switch (modType)
   {
   case DataModification::eRemoved:
@@ -139,22 +140,22 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
   {
     DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
                         << " Id=" << dataId
-                        << " TypeId=" << data.typeId()
-                        << " eqId=" << (data.equipmentNumber().is_set() ? data.equipmentNumber().get() : -1)
-                        << " " << data.name();
+                        << " TypeId=" << data.typeId
+                        << " eqId=" << (data.equipmentNumber.has_value() ? data.equipmentNumber.get() : -1)
+                        << " " << data.name;
 
-    const int typeId = data.typeId();
+    const int typeId = data.typeId;
     const ParticipantManagement::Type &type = m_ppm_dtc->type(typeId);
-    if (type.id() != typeId)
+    if (type.id != typeId)
       return;
-    const int equipmentTypeId = type.equipmentTypeId();
+    const int equipmentTypeId = type.equipmentTypeId;
     const ParticipantManagement::EquipmentType &eqType = m_ppm_dtc->equipmentType(equipmentTypeId);
-    if (eqType.id() != equipmentTypeId)
+    if (eqType.id != equipmentTypeId)
       return;
 
-    m_participantIdToWmsTypeClass.insert(dataId, eqType.wmsTypeClass());
+    m_participantIdToWmsTypeClass.insert(dataId, eqType.wmsTypeClass);
     bool bIsTarget{false};
-    switch (eqType.wmsTypeClass().underlying())
+    switch (eqType.wmsTypeClass)
     {
     case ParticipantManagement::WmsTypeClass::None:
     case ParticipantManagement::WmsTypeClass::Building:
@@ -177,8 +178,8 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
 
     
     int eqId = -1;
-    if (data.equipmentNumber().is_set())
-      eqId = data.equipmentNumber().get();
+    if (data.equipmentNumber.has_value())
+      eqId = data.equipmentNumber.get();
     if (eqId >= 0)
       m_participantIdToEq[dataId] = eqId;
     else
@@ -187,8 +188,8 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
 
     
     const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(dataId);
-    if (data.equipmentNumber().is_set())
-      m_participantHierarchies.insert(dataId, hierarchy + QString(QStringLiteral(" (%1)")).arg(data.equipmentNumber().get()));
+    if (data.equipmentNumber.has_value())
+      m_participantHierarchies.insert(dataId, hierarchy + QString(QStringLiteral(" (%1)")).arg(data.equipmentNumber.get()));
     else
       m_participantHierarchies.insert(dataId, hierarchy);
     if (m_ppmGuiCbxIfc)
@@ -200,12 +201,12 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
       if (!m_participantDecorations.contains(dataId))
       {
         
-        const auto party = m_ppm_dtc->party(data.partyId());
-        const QRgb col = QRgb(party.color());
+        const auto party = m_ppm_dtc->party(data.partyId);
+        const QRgb col = QRgb(party.color);
         m_participantDecorations.insert(dataId, m_ppmGuiCbxIfc->pixmapFromParty(col));
 
-        AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(data.symbol()));
-        symDataToRender.fillColor = m_ppm_dtc->party(data.partyId()).color();
+        AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(data.symbol));
+        symDataToRender.fillColor = m_ppm_dtc->party(data.partyId).color;
         symDataToRender.fillColorReplace = true;
 
         AdvancedSymbology::SymbolResultWatcher *srw =
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h
index 3204fce5c..f860277d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h
@@ -9,7 +9,7 @@
 #include <TargetManagement/tgt_dtc.h>
 
 
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
index f69a9df73..fb58f29ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
@@ -16,6 +16,7 @@ ShootbackTargetEdit::ShootbackTargetEdit(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ShootbackTargetEdit)
+  , m_logger(getLogger("ShootbackTargetEdit"))
 {
   m_ui->setupUi(this);
 }
@@ -79,7 +80,7 @@ void ShootbackTargetEdit::initCmbParticipants()
     const int participantId = it.key();
     const QString hierarchy(it.value());
 
-    if (!m_targetParticipantModel->getAssociatedParticipantIds().contains(participantId) || m_target.targetParticipantId() == participantId)
+    if (!m_targetParticipantModel->getAssociatedParticipantIds().contains(participantId) || m_target.targetParticipantId == participantId)
     {
       const QPixmap &pm = decorations.value(participantId);
 
@@ -104,7 +105,7 @@ void ShootbackTargetEdit::initCmbParticipants()
     }
   }
 
-  int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId());
+  int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId);
   if (newIdx >= 0)
     m_ui->cmbParticipants->setCurrentIndex(newIdx);
   m_ui->cmbParticipants->model()->sort(0);
@@ -148,17 +149,17 @@ void ShootbackTargetEdit::onCmbParticipantsChanged()
 
 bool ShootbackTargetEdit::apply()
 {
-  m_target.name(m_ui->leName->text().toStdString());
+  m_target.name = m_ui->leName->text().toStdString();
 
-  m_target.activateLaserDesignation(m_ui->cb_activateLaserDetection->isChecked());
-  m_target.activateLights(m_ui->cb_activateLights->isChecked());
-  m_target.activatePopupAutomatic(m_ui->cb_activatePopupAutomatic->isChecked());
-  m_target.permanentInstalledTarget(m_ui->cb_permanentInstalledTarget->isChecked());
-  m_target.hitsToKill(m_ui->sp_hitsToKill->value());
+  m_target.activateLaserDesignation = m_ui->cb_activateLaserDetection->isChecked();
+  m_target.activateLights = m_ui->cb_activateLights->isChecked();
+  m_target.activatePopupAutomatic = m_ui->cb_activatePopupAutomatic->isChecked();
+  m_target.permanentInstalledTarget = m_ui->cb_permanentInstalledTarget->isChecked();
+  m_target.hitsToKill = m_ui->sp_hitsToKill->value();
 
   
   int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
-  m_target.targetParticipantId(participantId);
+  m_target.targetParticipantId = participantId;
 
   m_requestHelper->addRequest([this]()
   {
@@ -175,16 +176,16 @@ void ShootbackTargetEdit::setData(const ShootbackTarget &target)
 {
   m_target = target;
 
-  m_ui->leName->setText(QString::fromStdString(m_target.name()));
+  m_ui->leName->setText(QString::fromStdString(m_target.name));
 
-  m_ui->cb_activateLaserDetection->setChecked(m_target.activateLaserDesignation());
-  m_ui->cb_activateLights->setChecked(m_target.activateLights());
-  m_ui->cb_activatePopupAutomatic->setChecked(m_target.activatePopupAutomatic());
-  m_ui->cb_permanentInstalledTarget->setChecked(m_target.permanentInstalledTarget());
-  m_ui->sp_hitsToKill->setValue(m_target.hitsToKill());
+  m_ui->cb_activateLaserDetection->setChecked(m_target.activateLaserDesignation);
+  m_ui->cb_activateLights->setChecked(m_target.activateLights);
+  m_ui->cb_activatePopupAutomatic->setChecked(m_target.activatePopupAutomatic);
+  m_ui->cb_permanentInstalledTarget->setChecked(m_target.permanentInstalledTarget);
+  m_ui->sp_hitsToKill->setValue(m_target.hitsToKill);
 
   
-  int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId());
+  int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId);
   if (newIdx >= 0)
     m_ui->cmbParticipants->setCurrentIndex(newIdx);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
index ce8b07acc..d71475432 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
@@ -8,6 +8,7 @@
 #include "tgt_telegrams.h"
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <TargetManagement/tgt_data_plugin_interface.h>
@@ -32,6 +33,7 @@ AssignmentDialog::AssignmentDialog(const QString &menuGroup, LtsSession::LtsSess
   , m_ui(new Ui::TargetAreaAssignmentsDialog)
   , m_menuGroup(menuGroup)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -203,7 +205,7 @@ void AssignmentDialog::retranslate()
     if (areadId > 0)
     {
       translate(m_ui,
-                QString::fromStdString(m_dtc->shootbackArea(areadId).name()),
+                QString::fromStdString(m_dtc->shootbackArea(areadId).name),
                 false,
                 tr("Targets assigned to"));
       return;
@@ -218,9 +220,9 @@ void AssignmentDialog::retranslate()
           m_dtc->shootbackTargets();
       for (const TargetManagement::ShootbackTarget &target : std::as_const(shootbackTargets))
       {
-        if (target.targetParticipantId() == targetParticipantId)
+        if (target.targetParticipantId == targetParticipantId)
         {
-          name = QString::fromStdString(target.name());
+          name = QString::fromStdString(target.name);
           break;
         }
       } 
@@ -268,7 +270,7 @@ void AssignmentDialog::onRemoveAssignment()
   for (const auto &mi : selectedRows)
   {
     Core::RemoveElementRequest req;
-    req.id(m_assignmentParticipantModel->getRowData(mi.row()).id());
+    req.id = m_assignmentParticipantModel->getRowData(mi.row()).id;
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->targetAreaAssignmentRemoveRequest(req, this);
@@ -290,7 +292,7 @@ void AssignmentDialog::onEditAssignment()
 
   const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(curIdx.row());
 
-  DEBUG_LOG(m_logger) << " onEditTargetArea, row = " << curIdx.row() << ", assignment.id() = " << assignment.id();
+  DEBUG_LOG(m_logger) << " onEditTargetArea, row = " << curIdx.row() << ", assignment.id() = " << assignment.id;
   if (!dialog->init(m_dtc, m_ftc, m_assignmentParticipantModel, assignment))
   {
     ERROR_LOG(m_logger) << Q_FUNC_INFO << QLatin1String("Can't initialize ShootbackTarget!");
@@ -310,12 +312,12 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
 {
   INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, item=" << assignment;
 
-  if (assignment.id()>0)
+  if (assignment.id>0)
   {
     
     
     
-    QModelIndex mi = m_assignmentParticipantModel->findIndexForId(assignment.id());
+    QModelIndex mi = m_assignmentParticipantModel->findIndexForId(assignment.id);
     int row = mi.row();
     INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
     if (row < 0)
@@ -338,7 +340,7 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
     
     
     
-    int row = m_assignmentParticipantModel->findRowForAreaTargetParticipantId(assignment.areaId(), assignment.targetParticipantId());
+    int row = m_assignmentParticipantModel->findRowForAreaTargetParticipantId(assignment.areaId, assignment.targetParticipantId);
     INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
     if (row < 0)
     {
@@ -373,21 +375,21 @@ QByteArray AssignmentDialog::toJson() const
     for (const TargetManagement::TargetAreaAssignment &taa : modelData)
     {
       TargetAreaAssignmentData taad;
-      taad.id = taa.id();
-      taad.name = QString::fromStdString(taa.name());
+      taad.id = taa.id;
+      taad.name = QString::fromStdString(taa.name);
 
-      taad.areaId               = taa.areaId();
-      taad.targetParticipantId  = taa.targetParticipantId();
+      taad.areaId               = taa.areaId;
+      taad.targetParticipantId  = taa.targetParticipantId;
 
-      taad.isActive             = taa.isActive();
+      taad.isActive             = taa.isActive;
 
       
-      taad.configuration.interval1  = taa.configuration().interval1();
-      taad.configuration.flash1     = taa.configuration().flash1();
-      taad.configuration.effect1    = taa.configuration().effect1();
-      taad.configuration.interval2  = taa.configuration().interval2();
-      taad.configuration.flash2     = taa.configuration().flash2();
-      taad.configuration.effect2    = taa.configuration().effect2();
+      taad.configuration.interval1  = taa.configuration.interval1;
+      taad.configuration.flash1     = taa.configuration.flash1;
+      taad.configuration.effect1    = taa.configuration.effect1;
+      taad.configuration.interval2  = taa.configuration.interval2;
+      taad.configuration.flash2     = taa.configuration.flash2;
+      taad.configuration.effect2    = taa.configuration.effect2;
 
 
       jArray.append(taad.toJson());
@@ -417,21 +419,21 @@ QVector<TargetManagement::TargetAreaAssignment> AssignmentDialog::fromJson(const
   {
     const TargetAreaAssignmentData &taad = TargetAreaAssignmentData::fromJson(item.toObject());
     TargetManagement::TargetAreaAssignment taa;
-    taa.id(taad.id);
-    taa.name(taad.name.toStdString());
+    taa.id = taad.id;
+    taa.name = taad.name.toStdString();
 
-    taa.areaId(taad.areaId);
-    taa.targetParticipantId(taad.targetParticipantId);
+    taa.areaId = taad.areaId;
+    taa.targetParticipantId = taad.targetParticipantId;
 
-    taa.isActive(taad.isActive);
+    taa.isActive = taad.isActive;
 
     
-    taa.configuration().interval1(taad.configuration.interval1);
-    taa.configuration().flash1(taad.configuration.flash1);
-    taa.configuration().effect1(taad.configuration.effect1);
-    taa.configuration().interval2(taad.configuration.interval2);
-    taa.configuration().flash2(taad.configuration.flash2);
-    taa.configuration().effect2(taad.configuration.effect2);
+    taa.configuration.interval1 = taad.configuration.interval1;
+    taa.configuration.flash1 = taad.configuration.flash1;
+    taa.configuration.effect1 = taad.configuration.effect1;
+    taa.configuration.interval2 = taad.configuration.interval2;
+    taa.configuration.flash2 = taad.configuration.flash2;
+    taa.configuration.effect2 = taad.configuration.effect2;
 
     vecData.push_back(std::move(taa));
   }
@@ -445,10 +447,10 @@ bool AssignmentDialog::apply()
   const QVector<TargetAreaAssignment> &assignments = m_assignmentParticipantModel->getData();
   for (const TargetAreaAssignment &updateCandidate : std::as_const(assignments))
   {
-    const int assignmentId = updateCandidate.id();
+    const int assignmentId = updateCandidate.id;
     const TargetAreaAssignment &curAssignment = m_dtc->targetAreaAssignment(assignmentId);
 
-    if (updateCandidate.isActive() && isDefault(updateCandidate.configuration()))
+    if (updateCandidate.isActive && isDefault(updateCandidate.configuration))
     {
       
       ERROR_LOG(m_logger) << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
@@ -469,7 +471,7 @@ bool AssignmentDialog::apply()
     if (!isEqual(curAssignment, updateCandidate, isGapFiller))
     {
       INFO_LOG(m_logger) << Q_FUNC_INFO << " add request for: assignmentId:" << assignmentId
-                          << " name: " << QString::fromStdString(updateCandidate.name());
+                          << " name: " << QString::fromStdString(updateCandidate.name);
       m_requestHelper->addRequest([this, updateCandidate]()
       {
         return m_ftc->targetAreaAssignmentModifyRequest(updateCandidate, this);
@@ -541,7 +543,7 @@ void AssignmentDialog::onImport()
       const QVector<TargetAreaAssignment> &curData = m_assignmentParticipantModel->getData();
       for (auto item : curData)
       {
-        Core::RemoveElementRequest req(item.id());
+        Core::RemoveElementRequest req(item.id);
         m_requestHelper->addRequest([this, req]()
         {
           return m_ftc->targetAreaAssignmentRemoveRequest(req, this);
@@ -552,7 +554,7 @@ void AssignmentDialog::onImport()
       const QVector<TargetManagement::TargetAreaAssignment> vecDataCandidate(fromJson(content));
       for (TargetAreaAssignment assignment : vecDataCandidate)
       {
-        assignment.id(0); 
+        assignment.id = 0; 
         m_requestHelper->addRequest([this, assignment]()
         {
           return m_ftc->targetAreaAssignmentModifyRequest(assignment, this);
@@ -580,12 +582,12 @@ void AssignmentDialog::onMapCenterClicked()
 
   if (m_mode == MODE::FILTERED_TO_SINGLE_TARGET_PARTICPANT)
   {
-    const int areaId = m_assignmentParticipantModel->getRowData(curIdx.row()).areaId();
+    const int areaId = m_assignmentParticipantModel->getRowData(curIdx.row()).areaId;
     if (areaId<=0)
       return;
     m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_ShootbackArea, areaId);
   } else {
-    const int pId = m_assignmentParticipantModel->getRowData(curIdx.row()).targetParticipantId();
+    const int pId = m_assignmentParticipantModel->getRowData(curIdx.row()).targetParticipantId;
     if (pId<=0)
       return;
     m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_Participant, pId);
@@ -605,8 +607,8 @@ void AssignmentDialog::onMapZoomToClicked()
     return;
 
   const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(index.row());
-  const int areaId = assignment.areaId();
-  const int pId = assignment.targetParticipantId();
+  const int areaId = assignment.areaId;
+  const int pId = assignment.targetParticipantId;
 
   if ((areaId<=0) || (pId<=0))
     return;
@@ -624,8 +626,8 @@ void AssignmentDialog::onObjectEntered(const QModelIndex &index)
     return;
   }
   const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(index.row());
-  const int areaId = assignment.areaId();
-  const int pId = assignment.targetParticipantId();
+  const int areaId = assignment.areaId;
+  const int pId = assignment.targetParticipantId;
 
   if ((areaId<=0) || (pId<=0))
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.h
index f3b4218cf..975aeb556 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.h
@@ -7,9 +7,10 @@
 #include <TargetManagement/tgt_dtc.h>
 #include <TargetManagement/tgt_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <TargetManagement/logger.h>
-#include <TargetManagement/ShootbackTargetConfiguration/tgt_assignment_part_model.h>
+#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
index 98479f890..3dd33329b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
@@ -18,6 +18,7 @@ AssignmentEditDialog::AssignmentEditDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::AssignmentEdit)
+  , m_logger(getLogger("AssignmentEditDialog"))
 {
   m_ui->setupUi(this);
 }
@@ -127,7 +128,7 @@ void AssignmentEditDialog::initCmbParticipants()
     }
   }
 
-  int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId());
+  int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId);
   if (newIdx >= 0)
     m_ui->cmbParticipants->setCurrentIndex(newIdx);
   m_ui->cmbParticipants->model()->sort(0);
@@ -142,9 +143,9 @@ void AssignmentEditDialog::fillCmbEffect(QComboBox *cmb)
 {
   if (!cmb)
     return;
-  cmb->addItem(tr("Near Miss"),     TargetManagement::Effect::NearMiss);
-  cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect::MobilityKill);
-  cmb->addItem(tr("WeaponK ill"),   TargetManagement::Effect::WeaponKill);
+  cmb->addItem(tr("Near Miss"), static_cast<int>(TargetManagement::Effect::NearMiss));
+  cmb->addItem(tr("Mobility Kill"), static_cast<int>(TargetManagement::Effect::MobilityKill));
+  cmb->addItem(tr("WeaponK ill"), static_cast<int>(TargetManagement::Effect::WeaponKill));
   cmb->setCurrentIndex(0);
 }
 
@@ -153,7 +154,7 @@ void AssignmentEditDialog::initCmbPreWarningEffect()
   QComboBox *cmb = m_ui->cmb_preWarningEffect;
   fillCmbEffect(cmb);
 
-  int newIdx = cmb->findData(m_assignment.configuration().effect1().underlying());
+  int newIdx = cmb->findData(static_cast<int>(m_assignment.configuration.effect1));
   if (newIdx >= 0)
     cmb->setCurrentIndex(newIdx);
 }
@@ -163,7 +164,7 @@ void AssignmentEditDialog::initCmbTimeToEffectEffect()
   QComboBox *cmb = m_ui->cmb_timeToEffectEffect;
   fillCmbEffect(cmb);
 
-  int newIdx = cmb->findData(m_assignment.configuration().effect2().underlying());
+  int newIdx = cmb->findData(static_cast<int>(m_assignment.configuration.effect2));
   if (newIdx >= 0)
     cmb->setCurrentIndex(newIdx);
 }
@@ -175,7 +176,7 @@ void AssignmentEditDialog::initCmbAreas()
 
   auto cb = [this](const TargetManagement::ShootbackArea & area)
   {
-    m_ui->cmbAreas->addItem(QString::fromStdString(area.name()), area.id());
+    m_ui->cmbAreas->addItem(QString::fromStdString(area.name), area.id);
   };
   m_dtc->shootbackAreas(cb);
 }
@@ -214,25 +215,25 @@ void AssignmentEditDialog::onCmbParticipantsChanged()
 bool AssignmentEditDialog::apply()
 {
   
-  m_assignment.name(m_ui->leName->text().toStdString());
+  m_assignment.name = m_ui->leName->text().toStdString();
 
   
   int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
-  m_assignment.targetParticipantId(participantId);
+  m_assignment.targetParticipantId = participantId;
 
   
-  m_assignment.areaId(m_ui->cmbAreas->currentData().toInt());
+  m_assignment.areaId = m_ui->cmbAreas->currentData().toInt();
 
   
   {
-    ShootbackConfiguration &configRef = m_assignment.configuration();
-    configRef.interval1(m_ui->sb_preWarningInterval->value());
-    configRef.effect1( static_cast<Effect>(m_ui->cmb_preWarningEffect->currentData().toInt()) );
-    configRef.flash1(m_ui->cb_flashAfterExpiration_1->isChecked());
+    ShootbackConfiguration &configRef = m_assignment.configuration;
+    configRef.interval1 = m_ui->sb_preWarningInterval->value();
+    configRef.effect1 = static_cast<Effect>(m_ui->cmb_preWarningEffect->currentData().toInt());
+    configRef.flash1 = m_ui->cb_flashAfterExpiration_1->isChecked();
 
-    configRef.interval2(m_ui->sb_timeToEffectInterval->value());
-    configRef.effect2( static_cast<Effect>(m_ui->cmb_timeToEffectEffect->currentData().toInt()) );
-    configRef.flash2(m_ui->cb_flashAfterExpiration_2->isChecked());
+    configRef.interval2 = m_ui->sb_timeToEffectInterval->value();
+    configRef.effect2 = static_cast<Effect>(m_ui->cmb_timeToEffectEffect->currentData().toInt());
+    configRef.flash2 = m_ui->cb_flashAfterExpiration_2->isChecked();
   }
 
   emit updateItem(m_assignment);
@@ -249,36 +250,36 @@ void AssignmentEditDialog::setData(const TargetAreaAssignment &assignment)
 {
   m_assignment = assignment;
 
-  m_ui->leName->setText(QString::fromStdString(assignment.name()));
+  m_ui->leName->setText(QString::fromStdString(assignment.name));
 
   
   {
-    int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId());
+    int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId);
     if (newIdx >= 0)
       m_ui->cmbParticipants->setCurrentIndex(newIdx);
   }
 
   
   {
-    int newIdx = m_ui->cmbAreas->findData(m_assignment.areaId());
+    int newIdx = m_ui->cmbAreas->findData(m_assignment.areaId);
     if (newIdx >= 0)
       m_ui->cmbAreas->setCurrentIndex(newIdx);
   }
 
   
-  const ShootbackConfiguration &config = assignment.configuration();
+  const ShootbackConfiguration &config = assignment.configuration;
   {
-    m_ui->sb_preWarningInterval->setValue(config.interval1());
-    m_ui->cb_flashAfterExpiration_1->setChecked(config.flash1());
-    int newIdx = m_ui->cmb_preWarningEffect->findData(config.effect1().underlying());
+    m_ui->sb_preWarningInterval->setValue(config.interval1);
+    m_ui->cb_flashAfterExpiration_1->setChecked(config.flash1);
+    int newIdx = m_ui->cmb_preWarningEffect->findData(static_cast<int>(config.effect1));
     if (newIdx >= 0)
       m_ui->cmb_preWarningEffect->setCurrentIndex(newIdx);
   }
 
   {
-    m_ui->sb_timeToEffectInterval->setValue(config.interval2());
-    m_ui->cb_flashAfterExpiration_2->setChecked(config.flash1());
-    int newIdx = m_ui->cmb_timeToEffectEffect->findData(config.effect2().underlying());
+    m_ui->sb_timeToEffectInterval->setValue(config.interval2);
+    m_ui->cb_flashAfterExpiration_2->setChecked(config.flash1);
+    int newIdx = m_ui->cmb_timeToEffectEffect->findData(static_cast<int>(config.effect2));
     if (newIdx >= 0)
       m_ui->cmb_timeToEffectEffect->setCurrentIndex(newIdx);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
index f50866373..21ccdc098 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
@@ -7,6 +7,7 @@
 #include "tgt_telegrams.h"
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <TargetManagement/tgt_data_plugin_interface.h>
@@ -32,6 +33,7 @@ TargetPartDialog::TargetPartDialog(const QString &menuGroup, LtsSession::LtsSess
   , m_ui(new Ui::TargetPartDialog)
   , m_menuGroup(menuGroup)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 
@@ -208,7 +210,7 @@ void TargetPartDialog::onRemoveTargetPart()
   for (const auto &mi : selectedRows)
   {
     Core::RemoveElementRequest req;
-    req.id(m_targetParticipantModel->getRowData(mi.row()).id());
+    req.id = m_targetParticipantModel->getRowData(mi.row()).id;
     m_requestHelper->addRequest([req, this]()
     {
       return m_ftc->shootbackTargetRemoveRequest(req, this);
@@ -259,23 +261,23 @@ QByteArray TargetPartDialog::toJson() const
     for (const TargetManagement::ShootbackTarget &sbt : modelData)
     {
       ShootbackTargetData sbtd;
-      sbtd.id = sbt.id();
-      sbtd.name = QString::fromStdString(sbt.name());
+      sbtd.id = sbt.id;
+      sbtd.name = QString::fromStdString(sbt.name);
 
       sbtd.targetParticipantEquipmentNumber = -1;
       if (m_ppmDtc)
       {
-        const ParticipantManagement::Participant &participant = m_ppmDtc->participant(sbt.targetParticipantId());
-        if (participant.id() == sbt.targetParticipantId() &&
-            participant.equipmentNumber().is_set())
-          sbtd.targetParticipantEquipmentNumber = participant.equipmentNumber().get();
+        const ParticipantManagement::Participant &participant = m_ppmDtc->participant(sbt.targetParticipantId);
+        if (participant.id == sbt.targetParticipantId &&
+            participant.equipmentNumber.has_value())
+          sbtd.targetParticipantEquipmentNumber = participant.equipmentNumber.get();
       }
 
-      sbtd.activateLaserDesignation = sbt.activateLaserDesignation();
-      sbtd.activateLights = sbt.activateLights();
-      sbtd.activatePopupAutomatic = sbt.activatePopupAutomatic();
-      sbtd.hitsToKill = sbt.hitsToKill();
-      sbtd.permanentInstalledTarget = sbt.permanentInstalledTarget();
+      sbtd.activateLaserDesignation = sbt.activateLaserDesignation;
+      sbtd.activateLights = sbt.activateLights;
+      sbtd.activatePopupAutomatic = sbt.activatePopupAutomatic;
+      sbtd.hitsToKill = sbt.hitsToKill;
+      sbtd.permanentInstalledTarget = sbt.permanentInstalledTarget;
       
       jArray.append(sbtd.toJson());
     }
@@ -304,17 +306,17 @@ QVector<TargetManagement::ShootbackTarget> TargetPartDialog::fromJson(const QByt
   {
     const ShootbackTargetData &sbtd = ShootbackTargetData::fromJson(item.toObject());
     TargetManagement::ShootbackTarget sbt;
-    sbt.id(sbtd.id);
-    sbt.name(sbtd.name.toStdString());
+    sbt.id = sbtd.id;
+    sbt.name = sbtd.name.toStdString();
 
     if (m_ppmDtc)
-      sbt.targetParticipantId(m_ppmDtc->participantIdByEquipmentNumber(sbtd.targetParticipantEquipmentNumber));
+      sbt.targetParticipantId = m_ppmDtc->participantIdByEquipmentNumber(sbtd.targetParticipantEquipmentNumber);
 
-    sbt.activateLaserDesignation(sbtd.activateLaserDesignation);
-    sbt.activateLights(sbtd.activateLights);
-    sbt.activatePopupAutomatic(sbtd.activatePopupAutomatic);
-    sbt.hitsToKill(sbtd.hitsToKill);
-    sbt.permanentInstalledTarget(sbtd.permanentInstalledTarget);
+    sbt.activateLaserDesignation = sbtd.activateLaserDesignation;
+    sbt.activateLights = sbtd.activateLights;
+    sbt.activatePopupAutomatic = sbtd.activatePopupAutomatic;
+    sbt.hitsToKill = sbtd.hitsToKill;
+    sbt.permanentInstalledTarget = sbtd.permanentInstalledTarget;
     vecData.push_back(std::move(sbt));
   }
   return vecData;
@@ -378,7 +380,7 @@ void TargetPartDialog::onImport()
       const QVector<ShootbackTarget> &curData = m_targetParticipantModel->getData();
       for (auto item : curData)
       {
-        Core::RemoveElementRequest req(item.id());
+        Core::RemoveElementRequest req(item.id);
         m_requestHelper->addRequest([this, req]()
         {
           return m_ftc->shootbackTargetRemoveRequest(req, this);
@@ -389,7 +391,7 @@ void TargetPartDialog::onImport()
       const QVector<TargetManagement::ShootbackTarget> vecDataCandidate(fromJson(content));
       for (ShootbackTarget shootbackTargetCandidate : vecDataCandidate)
       {
-        shootbackTargetCandidate.id(0); 
+        shootbackTargetCandidate.id = 0; 
         m_requestHelper->addRequest([this, shootbackTargetCandidate]()
         {
           return m_ftc->shootbackTargetModifyRequest(shootbackTargetCandidate, this);
@@ -413,7 +415,7 @@ void TargetPartDialog::onAssignAreaClicked()
   if (!curIdx.isValid())
     return;
 
-  const int targetParticipantId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId();
+  const int targetParticipantId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId;
 
   
   
@@ -441,7 +443,7 @@ void TargetPartDialog::onMapCenterClicked()
   if (!curIdx.isValid())
     return;
 
-  const int pId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId();
+  const int pId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId;
   m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_Participant, pId);
 }
 
@@ -457,7 +459,7 @@ void TargetPartDialog::onMapZoomToClicked()
   if (!m_targetParticipantModel || !m_sitMapGuiIfc)
     return;
 
-  int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId();
+  int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId;
   if (pId<=0)
     return;
 
@@ -465,8 +467,8 @@ void TargetPartDialog::onMapZoomToClicked()
   QVector<int> assignedAreas;
   auto cb = [pId, &assignedAreas](const TargetManagement::TargetAreaAssignment &assignment)
   {
-    if (assignment.targetParticipantId() == pId)
-      assignedAreas.push_back(assignment.areaId());
+    if (assignment.targetParticipantId == pId)
+      assignedAreas.push_back(assignment.areaId);
   };
   m_dtc->targetAreaAssignments(cb);
 
@@ -491,7 +493,7 @@ void TargetPartDialog::onObjectEntered(const QModelIndex &index)
     m_sitMapGuiIfc->removeObjectIndicator();
     return;
   }
-  int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId();
+  int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId;
   if (pId>0)
   {
     
@@ -501,8 +503,8 @@ void TargetPartDialog::onObjectEntered(const QModelIndex &index)
     QVector<int> assignedAreas;
     auto cb = [pId, &assignedAreas](const TargetManagement::TargetAreaAssignment &assignment)
     {
-      if (assignment.targetParticipantId() == pId)
-        assignedAreas.push_back(assignment.areaId());
+      if (assignment.targetParticipantId == pId)
+        assignedAreas.push_back(assignment.areaId);
     };
     m_dtc->targetAreaAssignments(cb);
     m_sitMapGuiIfc->setMapObjectSelected(SituationMap::MapObjectType::MOT_ShootbackArea, assignedAreas, true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.h
index ca1215dd3..9f57ba673 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.h
@@ -7,9 +7,10 @@
 #include <TargetManagement/tgt_dtc.h>
 #include <TargetManagement/tgt_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <TargetManagement/logger.h>
-#include <TargetManagement/ShootbackTargetConfiguration/tgt_target_part_model.h>
+#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
index 1eb58657a..2ad7d54e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
@@ -49,6 +49,7 @@ TargetParticipantModel::TargetParticipantModel(QObject *parent)
 
 },
 parent)
+, m_logger(getLogger("TargetParticipantModel"))
 {}
 
 
@@ -169,28 +170,28 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
     if (index.column() == Participant)
     {
       static const int pmSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-      const QPixmap &pm = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId());
+      const QPixmap &pm = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId);
       if (!pm.isNull())
         return pm.scaled(pmSize, pmSize);
     }
     else if ((index.column() == ActivateLaserDesignation))
-      return shootbackTarget.activateLaserDesignation() ? m_yes : m_no;
+      return shootbackTarget.activateLaserDesignation ? m_yes : m_no;
     else if ((index.column() == ActivateLights))
-      return shootbackTarget.activateLights() ? m_yes : m_no;
+      return shootbackTarget.activateLights ? m_yes : m_no;
     else if ((index.column() == ActivatePopupAutomatic))
-      return shootbackTarget.activatePopupAutomatic() ? m_yes : m_no;
+      return shootbackTarget.activatePopupAutomatic ? m_yes : m_no;
     else if ((index.column() == PermanentInstalledTarget))
-      return shootbackTarget.permanentInstalledTarget() ? m_yes : m_no;
+      return shootbackTarget.permanentInstalledTarget ? m_yes : m_no;
 
     return QVariant();
   }
   else if (role == Qt::BackgroundRole)
   {
-    if ((index.column() == TargetPartipantId) && (shootbackTarget.targetParticipantId() <= 0))
+    if ((index.column() == TargetPartipantId) && (shootbackTarget.targetParticipantId <= 0))
       return getWarningBackgroundRole();                          
     if (index.column() == TargetPartipantEquipmentNumber)
     {
-      const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId());
+      const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId);
       if (eqNo <= 0)
         return getWarningBackgroundRole();                        
     }
@@ -201,7 +202,7 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
     {
       QString tooltip(QStringLiteral("<html>"));
 
-      const QPixmap &img = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId());
+      const QPixmap &img = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId);
       if (!img.isNull())
       {
         
@@ -211,10 +212,10 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
         tooltip.append(QStringLiteral("<center><img src='data:image/png;base64,%1'></center>").arg(QString::fromLatin1(data.toBase64())));
 
         QString hdr = this->headerData(ShootbackTargetName, Qt::Horizontal, Qt::DisplayRole).toString();
-        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(shootbackTarget.name())));
+        tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(shootbackTarget.name)));
 
         hdr = this->headerData(Participant, Qt::Horizontal, Qt::DisplayRole).toString();
-        const QString &val = m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId());
+        const QString &val = m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId);
         tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, val));
 
         tooltip.append(QStringLiteral("</html>"));
@@ -226,60 +227,60 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
   {
     
     if (index.column() == ActivateLaserDesignation)
-      return static_cast<int>(shootbackTarget.activateLaserDesignation());
+      return static_cast<int>(shootbackTarget.activateLaserDesignation);
     if (index.column() == ActivateLights)
-      return static_cast<int>(shootbackTarget.activateLights());
+      return static_cast<int>(shootbackTarget.activateLights);
     if (index.column() == ActivatePopupAutomatic)
-      return static_cast<int>(shootbackTarget.activatePopupAutomatic());
+      return static_cast<int>(shootbackTarget.activatePopupAutomatic);
     if (index.column() == HitsToKill)
-      return shootbackTarget.hitsToKill();
+      return shootbackTarget.hitsToKill;
   }
 
   switch (index.column())
   {
   case Id:
-    return shootbackTarget.id();
+    return shootbackTarget.id;
 
 
   
 
   case ShootbackTargetName:
-    return QString::fromStdString(shootbackTarget.name());
+    return QString::fromStdString(shootbackTarget.name);
 
   case TargetPartipantId:
-    return shootbackTarget.targetParticipantId();
+    return shootbackTarget.targetParticipantId;
   case TargetPartipantEquipmentNumber:
   {
-    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId());
+    const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId);
     if (eqNo <= 0)
       return QStringLiteral("-");
     return eqNo;
   }
   case TargetPartipantEquipmentType:
   {
-    const auto type = m_participantHandler->getParticipantIdToWmsTypeClass(shootbackTarget.targetParticipantId());
+    const auto type = m_participantHandler->getParticipantIdToWmsTypeClass(shootbackTarget.targetParticipantId);
     return ParticipantHandler::target_wmsTypeClassToString(type);
   }
   case Participant:
-    return m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId());
+    return m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId);
   
   case Position:
   {
-    const Core::GeoPosition2D &pos = shootbackTarget.position();
-    return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+    const Core::GeoPosition2D &pos = shootbackTarget.position;
+    return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
   }
   case ActivateLaserDesignation:
-    return shootbackTarget.activateLaserDesignation() ? tr("Yes") : tr("No");
+    return shootbackTarget.activateLaserDesignation ? tr("Yes") : tr("No");
   case ActivateLights:
-    return shootbackTarget.activateLights() ? tr("Yes") : tr("No");
+    return shootbackTarget.activateLights ? tr("Yes") : tr("No");
   case ActivatePopupAutomatic:
-    return shootbackTarget.activatePopupAutomatic() ? tr("Yes") : tr("No");
+    return shootbackTarget.activatePopupAutomatic ? tr("Yes") : tr("No");
   case HitsToKill:
-    return shootbackTarget.hitsToKill();
+    return shootbackTarget.hitsToKill;
   case PermanentInstalledTarget:
-    return shootbackTarget.permanentInstalledTarget() ? tr("Yes") : tr("No");
+    return shootbackTarget.permanentInstalledTarget ? tr("Yes") : tr("No");
   case VisibleParticipants:
-    return TargetManagement::toString(shootbackTarget.visibleParticipants());
+    return TargetManagement::toString(shootbackTarget.visibleParticipants);
   } 
 
   return QVariant();
@@ -290,7 +291,7 @@ QSet<int> TargetParticipantModel::getAssociatedParticipantIds() const
   QSet<int> ret;
   ret.reserve(m_vecData.size());
   for (const TargetManagement::ShootbackTarget &data : m_vecData)
-    ret += data.targetParticipantId();
+    ret += data.targetParticipantId;
   return ret;
 }
 
@@ -311,11 +312,11 @@ void TargetParticipantModel::updateColumnFilter()
 
   for (const ShootbackTarget &item : std::as_const(m_vecData))
   {
-    m_usedActiveLaserDesignations.insert(item.activateLaserDesignation());
-    m_usedActivateLights.insert(item.activateLights());
-    m_usedActivatePopupAutomatic.insert(item.activatePopupAutomatic());
-    m_usedHitsToKill.insert(item.hitsToKill());
-    m_usedPermanetTargetInstalled.insert(item.permanentInstalledTarget());
+    m_usedActiveLaserDesignations.insert(item.activateLaserDesignation);
+    m_usedActivateLights.insert(item.activateLights);
+    m_usedActivatePopupAutomatic.insert(item.activatePopupAutomatic);
+    m_usedHitsToKill.insert(item.hitsToKill);
+    m_usedPermanetTargetInstalled.insert(item.permanentInstalledTarget);
   }
 }
 
@@ -344,32 +345,32 @@ bool TargetParticipantProxyModel::lessThan(const QModelIndex &source_left, const
   switch (source_left.column())
   {
   case TargetParticipantModel::Columns::Id:
-    return left.id() < right.id();
+    return left.id < right.id;
   case TargetParticipantModel::Columns::ShootbackTargetName:
-    return left.name() < right.name();
+    return left.name < right.name;
   case TargetParticipantModel::Columns::TargetPartipantId:
-    return left.targetParticipantId() < right.targetParticipantId();
+    return left.targetParticipantId < right.targetParticipantId;
   case TargetParticipantModel::Columns::TargetPartipantEquipmentNumber:
   {
-    const int eqNoLeft  = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
-    const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
+    const int eqNoLeft  = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
+    const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
     return eqNoLeft < eqNoRight;
   }
 
 
 
   case TargetParticipantModel::Columns::ActivateLaserDesignation:
-    return left.activateLaserDesignation() < right.activateLaserDesignation();
+    return left.activateLaserDesignation < right.activateLaserDesignation;
   case TargetParticipantModel::Columns::ActivateLights:
-    return left.activateLights() < right.activateLights();
+    return left.activateLights < right.activateLights;
   case TargetParticipantModel::Columns::ActivatePopupAutomatic:
-    return left.activatePopupAutomatic() < right.activatePopupAutomatic();
+    return left.activatePopupAutomatic < right.activatePopupAutomatic;
   case TargetParticipantModel::Columns::HitsToKill:
-    return left.hitsToKill() < right.hitsToKill();
+    return left.hitsToKill < right.hitsToKill;
   case TargetParticipantModel::Columns::PermanentInstalledTarget:
-    return left.permanentInstalledTarget() < right.permanentInstalledTarget();
+    return left.permanentInstalledTarget < right.permanentInstalledTarget;
   case TargetParticipantModel::Columns::VisibleParticipants:
-    return toString(left.visibleParticipants()) < toString(right.visibleParticipants());
+    return toString(left.visibleParticipants) < toString(right.visibleParticipants);
 
   case TargetParticipantModel::Columns::Participant:
     
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
index 347f514ab..f683b4453 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
@@ -211,10 +211,10 @@ QJsonObject ShootbackConfigurationData::toJson() const
 {
   return QJsonObject({{QStringLiteral("interval1"), interval1},
                       {QStringLiteral("flash1"), flash1},
-                      {QStringLiteral("effect1"), enumToJson(effect1.underlying())},
+                      {QStringLiteral("effect1"), enumToJson(effect1)},
                       {QStringLiteral("interval2"), interval2},
                       {QStringLiteral("flash2"), flash2},
-                      {QStringLiteral("effect2"), enumToJson(effect2.underlying())},
+                      {QStringLiteral("effect2"), enumToJson(effect2)},
                      });
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
index 1a0b89289..88d9cbaf6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
@@ -52,7 +52,7 @@ struct GeoPosition2D
 {
   GeoPosition2D() = default;
   explicit GeoPosition2D(const Core::GeoPosition2D pos)
-    : lat(pos.lat()), lon(pos.lon()) {}
+    : lat(pos.lat), lon(pos.lon) {}
 
   double lat = 0; 
   double lon = 0; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/tgt_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/tgt_data_plugin_interface.h
index 92bdc3819..9b08d6603 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/tgt_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/tgt_data_plugin_interface.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
-#include <TargetManagement
+#include <TargetManagement//tgt_dtc.h>
 #include <TargetManagement/tgt_ftc.h>
 
 namespace TargetManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/CMakeLists.txt
index 433f73382..026e0336b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/CMakeLists.txt
@@ -34,7 +34,7 @@ ADD_INTERFACE_LIBRARY(TlnEventTimelineGuiPluginInterface
 NGL_ADD_LIBRARY2(WS TlnDataPluginInterface SHARED tln_data_plugin_interface.h)
 NGL_TARGET_LINK_LIBRARIES(TlnDataPluginInterface
   Qt6::Core
-##  svcEemCommon
+  svcEemCommon
   DataPluginInterface
 )
 NGL_INSTALL_TARGET(TlnDataPluginInterface)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
index a47970fb2..d34894838 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
@@ -29,7 +29,7 @@ std::shared_ptr<DataPluginBase::Interface> DataPlugin::createDataInterface(LtsSe
 DataInterfaceImpl::DataInterfaceImpl(LtsSession::LtsSessionDataDds *session)
   : DataInterface()
   , m_foreign(std::make_shared<ForeignInterfaceImpl>(session))
-  .getNGLLogger("Plugins.Timeline.Data"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 ForeignInterfaceImpl::ForeignInterfaceImpl(LtsSession::LtsSessionDataDds *session)
@@ -37,7 +37,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(LtsSession::LtsSessionDataDds *sessio
   , m_webSocketScm(nullptr)
   , m_webSocketEem(nullptr)
   , m_liveHistoryBufferTimer(new QTimer(this))
-  .getNGLLogger("Plugins.Timeline.Data"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_liveHistoryBufferTimer, &QTimer::timeout, this, &ForeignInterfaceImpl::onClearHistoryBuffer);
   m_liveHistoryBufferTimer->setInterval(5000);
@@ -58,17 +58,17 @@ ForeignInterfaceImpl::~ForeignInterfaceImpl()
 static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Database::EemEvent &evDb)
 {
   ExerciseEventManagement::Event ev;
-  ev.id(evDb.id & 0xffffffff);
-  ev.sampleTime(evDb.sampleTime);
-  ev.eventTypeId(evDb.eventTypeId);
-  ev.participantId(evDb.participantId);
-  ev.partyId(evDb.partyId);
-  ev.equipmentNumber(evDb.equipmentNumber);
-  ev.properties(evDb.properties.toUtf8().data());
+  ev.id = evDb.id & 0xffffffff;
+  ev.sampleTime = evDb.sampleTime;
+  ev.eventTypeId = evDb.eventTypeId;
+  ev.participantId = evDb.participantId;
+  ev.partyId = evDb.partyId;
+  ev.equipmentNumber = evDb.equipmentNumber;
+  ev.properties = evDb.properties.toUtf8().data();
   
-  if ( ev.eventTypeId() == ProjectDataManagement::PdmEventType::EventType_HitBuilding)
+  if ( ev.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitBuilding)
   {
-    QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties()).toUtf8()).object();
+    QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties).toUtf8()).object();
 
     if ( properties.contains(QStringLiteral("AesName")))
     {
@@ -76,7 +76,7 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
     } else if ( properties.contains(QStringLiteral("OriginatorEquipmentNumber")))
     {
       QJsonParseError parseError;
-      QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(ev.properties()), &parseError);
+      QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(ev.properties), &parseError);
 
       long originatorEquipmentNumber = properties.value(QStringLiteral("OriginatorEquipmentNumber")).toInt();
       QString originatorEquipmentNumberStr = QString::number(originatorEquipmentNumber);
@@ -85,9 +85,9 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
     QJsonDocument doc(properties);
     
     std::string propertiesStd = QJsonDocument(properties).toJson(QJsonDocument::Compact).toStdString();
-    ev.properties(propertiesStd);
+    ev.properties = propertiesStd;
   }
-  ev.position(Core::GeoPosition(evDb.position.x(), evDb.position.y(), evDb.position.z()));
+  ev.position = Core::GeoPosition(evDb.position.x(), evDb.position.y(), evDb.position.z());
 
   return ev;
 }
@@ -101,7 +101,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
   , m_bFinshed(false)
   , m_requestMin(from)
   , m_requestMax(to)
-  .getNGLLogger("Plugins.Timeline.Data"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_webSocketEem, &QWebSocket::disconnected,
           this, &TimelineDataProvider::disconnectedFromEem);
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
       {
         const QJsonObject &port = valPort.toObject();
         int typeId = port.value(QStringLiteral("typeId")).toInt();
-        if (typeId == Core::CorePortType::WebSocketServer)
+        if (typeId == static_cast<int>(Core::CorePortType::WebSocketServer))
         {
           m_eemPort = port.value(QStringLiteral("number")).toInt();
           connectToEem();
@@ -295,7 +295,7 @@ void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
   using namespace ExerciseEventManagement::Database;
   ExerciseEventManagement::Event ev(db2dds(fromJson<EemEvent>(obj)));
   emit liveEvent(ev);
-  m_liveHistoryBuffer[ev.sampleTime() / 1000].push_back(std::move(ev));
+  m_liveHistoryBuffer[ev.sampleTime / 1000].push_back(std::move(ev));
 }
 
 void ForeignInterfaceImpl::requestFinished()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
index 187518e0b..6aa7579a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
@@ -77,6 +77,7 @@ private:
   bool m_bFinshed;
   qint64 m_requestMin;
   qint64 m_requestMax;
+  NGL::INGLLogger &m_logger;
 };
 
 class ForeignInterfaceImpl final : public ForeignDataInterface
@@ -116,6 +117,7 @@ private:
   QWebSocket *m_webSocketEem;
   QTimer *m_liveHistoryBufferTimer;
   quint16 m_eemPort;
+  NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
index ff98122e1..63a80f02c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
@@ -217,9 +217,9 @@ QString CameraVideoFilter::getDisplayName(const QString &internalName)
 
   m_avmDtc->streamNames(static_cast<std::function<bool(const AudioVideoManagement::StreamName &)>>([&result, internalName](const AudioVideoManagement::StreamName &streamName)
   {
-    if (QString::fromStdString(streamName.internalName()) == internalName)
+    if (QString::fromStdString(streamName.internalName) == internalName)
     {
-      result = QString::fromStdString(streamName.displayName());
+      result = QString::fromStdString(streamName.displayName);
       return true;
     }
 
@@ -246,23 +246,23 @@ void CameraVideoFilter::updateMenuStreams()
   QVector<QString> outdor;
   QVector<QString> indoor;
 
-  for (auto it = menuStruct.menuEntries().begin(); it != menuStruct.menuEntries().end(); ++it)
+  for (auto it = menuStruct.menuEntries.begin(); it != menuStruct.menuEntries.end(); ++it)
   {
-    if (!(it->mountingPointId().is_set() && it->name().is_set()))
+    if (!(it->mountingPointId.has_value() && it->name.has_value()))
       continue;
 
-    int32_t mountingPointId = it->mountingPointId().get();
+    int32_t mountingPointId = it->mountingPointId.get();
     QString streamDisplayName = QStringLiteral("");
     if(streamNameMapping)
-      streamDisplayName = streamNameMapping->displayName(QString::fromStdString(it->name().get()));
+      streamDisplayName = streamNameMapping->displayName(QString::fromStdString(it->name.get()));
 
     if (mountingPointId < 0)
     {
       m_avmDtc->videoTeams([&streamDisplayName, mountingPointId](const AudioVideoManagement::VideoTeam &data)
       {
-        if (data.id() == -mountingPointId)
+        if (data.id == -mountingPointId)
         {
-          streamDisplayName = QString::fromStdString(data.streamName());
+          streamDisplayName = QString::fromStdString(data.streamName);
         }
       });
       mvs.append(streamDisplayName);
@@ -270,7 +270,7 @@ void CameraVideoFilter::updateMenuStreams()
     {
       InfrastructureManagement::StructureElement mpiE;
       m_ismDtc->getStructureElementById(mountingPointId,mpiE);
-      if(mpiE.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera)
+      if(mpiE.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera)
       {
         outdor.append(streamDisplayName);
       }
@@ -408,13 +408,13 @@ QStringList CameraVideoFilter::getInternalStreamNamesBySelectedStreams() const
 
   m_avmDtc->streamNames([this, &result, &displayNames](const AudioVideoManagement::StreamName &streamName)
   {
-    if (displayNames.contains(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.displayName()))))
-      result.append(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.internalName())));
+    if (displayNames.contains(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.displayName))))
+      result.append(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.internalName)));
   });
 
   m_avmDtc->videoTeams([this, &result, &displayNames](const AudioVideoManagement::VideoTeam &data)
   {
-    const QString streamName = QStringLiteral("'%1'").arg(QString::fromStdString(data.streamName()));
+    const QString streamName = QStringLiteral("'%1'").arg(QString::fromStdString(data.streamName));
 
     if (displayNames.contains(streamName) && !result.contains(streamName))
       result.append(streamName);
@@ -443,12 +443,12 @@ void CameraVideoFilter::onStreamChanged(const AudioVideoManagement::StreamName &
 void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
   QJsonParseError parseError;
-  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties()), &parseError);
+  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties), &parseError);
 
   if (parseError.error != QJsonParseError::NoError)
   {
     INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
-                       << data.id()
+                       << data.id
                        << ". Reason: "
                        << parseError.errorString()
                        << "; JSON: "
@@ -470,8 +470,8 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
     }
   }
 
-  if (m_mainStructureElements.contains(data.id()) && !inExercise)
-    m_mainStructureElements.remove(data.id());
+  if (m_mainStructureElements.contains(data.id) && !inExercise)
+    m_mainStructureElements.remove(data.id);
 
   if (!inExercise)
     return;
@@ -480,12 +480,12 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
   {
     case DataModification::eAdded:
     case DataModification::eModified:
-      m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
-                                                                                                                                         : QString::fromStdString(data.description());
+      m_mainStructureElements[data.id] = data.structureElementTypeId == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id)
+                                                                                                                                         : QString::fromStdString(data.description);
       break;
 
     case DataModification::eRemoved:
-      m_mainStructureElements.remove(data.id());
+      m_mainStructureElements.remove(data.id);
       break;
   }
 }
@@ -512,9 +512,9 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
 
     for (auto strm : m_avmDtc->streamNames())
     {
-      if (strm.displayName() == stream.toStdString())
+      if (strm.displayName == stream.toStdString())
       {
-        mpi = strm.mountingPointId();
+        mpi = strm.mountingPointId;
         break;
       }
     }
@@ -524,7 +524,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
       
       InfrastructureManagement::StructureElement mpiE;
       m_ismDtc->getStructureElementById(mpi,mpiE);
-      if(mpiE.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera)
+      if(mpiE.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera)
       {
         outdor.append(stream);
       }
@@ -542,7 +542,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
       {
         if (isMVS)
           break;
-        if (mvsTeam.streamName() == stream.toStdString())
+        if (mvsTeam.streamName == stream.toStdString())
         {
           isMVS= true;
           mvs.append(stream);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
index 99721a8a4..ae9dcb67f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
@@ -144,31 +144,31 @@ void FireEventFilter::updateFilterString()
 
 void FireEventFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
 {
-  if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
+  if (data.gearClassId != ProjectDataManagement::GearClass::GearClass_DuelSim || data.name == "N/A")
     return;
 
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_gearTypes[data.id()] = QString::fromStdString(data.name());
+    m_gearTypes[data.id] = QString::fromStdString(data.name);
     break;
 
   case DataModification::eRemoved:
-    m_gearTypes.remove(data.id());
+    m_gearTypes.remove(data.id);
     break;
   }
 }
 
 void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
 {
-  if (data.id() < 1)
+  if (data.id < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
     return;
 
-  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
   if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
     return;
 
@@ -177,12 +177,12 @@ void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeTyp
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
-    m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
+    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
+    m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
     break;
   }
   case DataModification::eRemoved:
-    m_chargeTypes.remove(data.id());
+    m_chargeTypes.remove(data.id);
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
index 2473df204..99582c708 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
@@ -75,25 +75,25 @@ bool HitFilter::init(
   if (m_vulnerabilityStates.isEmpty())
   {
     using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_LightDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MediumDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_NearMiss, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss));
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CombatReady), ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_LightDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_MediumDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_HeavyDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_MobilityKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_VisibleMobilityKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_WeaponSystemDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CatastrophicKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_TemporarySeverance), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_NearMiss), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_HitWithNoEffect), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect));
   }
 
   if (m_partys.isEmpty())
   {
     QMap<qint32, ParticipantManagement::Party> partys = m_ppmDtc->partys();
     for (auto it = partys.constBegin(); it != partys.constEnd(); ++it)
-      m_partys.insert(static_cast<int>(it.value().id()), ParticipantManagement::trPartyName(it.value().name()));
+      m_partys.insert(static_cast<int>(it.value().id), ParticipantManagement::trPartyName(it.value().name));
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::partyChanged,
             this, &HitFilter::onPartyChanged);
   }
@@ -101,8 +101,8 @@ bool HitFilter::init(
   if (m_originatorEquipmentNumbers.isEmpty())
   {
     for (const ParticipantManagement::Participant &participant : m_ppmDtc->participants())
-      if (participant.equipmentNumber().is_set())
-        m_originatorEquipmentNumbers.insert(participant.id(), participant.equipmentNumber().get());
+      if (participant.equipmentNumber.has_value())
+        m_originatorEquipmentNumbers.insert(participant.id, participant.equipmentNumber.get());
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
             this, &HitFilter::onParticipantChanged);
   }
@@ -195,7 +195,7 @@ void HitFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout,
       connect(selectionDialog, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, [this, spinBox](const QVector<int> &participantIds)
       {
         if (!participantIds.isEmpty())
-          spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
+          spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
       });
       selectionDialog->show();
     });
@@ -217,7 +217,7 @@ void HitFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout,
       connect(selectionDialog, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, [this, spinBox](const QVector<int> &participantIds)
       {
         if (!participantIds.isEmpty())
-          spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
+          spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
       });
       selectionDialog->show();
     });
@@ -269,13 +269,13 @@ void HitFilter::updateFilterString()
 
 void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
 {
-  if (data.id() < 1)
+  if (data.id < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
     return;
 
-  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
   if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
     return;
 
@@ -284,12 +284,12 @@ void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &dat
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
-    m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
+    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
+    m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
     break;
   }
   case DataModification::eRemoved:
-    m_chargeTypes.remove(data.id());
+    m_chargeTypes.remove(data.id);
     break;
   }
 }
@@ -300,11 +300,11 @@ void HitFilter::onPartyChanged(const ParticipantManagement::Party &data, DataMod
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_partys[data.id()] = ParticipantManagement::trPartyName(data.name());
+    m_partys[data.id] = ParticipantManagement::trPartyName(data.name);
     break;
 
   case DataModification::eRemoved:
-    m_partys.remove(data.id());
+    m_partys.remove(data.id);
     break;
   }
 }
@@ -317,11 +317,11 @@ void HitFilter::onParticipantChanged(const ParticipantManagement::Participant &d
     {
     case DataModification::eAdded:
     case DataModification::eModified:
-      m_originatorEquipmentNumbers[data.id()] = data.equipmentNumber().get();
+      m_originatorEquipmentNumbers[data.id] = data.equipmentNumber.get();
       break;
 
     case DataModification::eRemoved:
-      m_originatorEquipmentNumbers.remove(data.id());
+      m_originatorEquipmentNumbers.remove(data.id);
       break;
     }
   } catch (...) {}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h
index a8f99beb8..e6e7629dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h
@@ -42,7 +42,7 @@ public:
   int originatorEquipmentNumber(int id) const { return m_originatorEquipmentNumbers.value(id, 0); }
   QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState>(id)); }
   QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
-  QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); }
+  QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name); }
 
 private:
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
index f382d7fff..3dc39a7f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
@@ -124,7 +124,7 @@ bool HitBuildingFilter::init(
   if (m_vulnerabilityStates.isEmpty())
   {
     using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CombatReady), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady));
 
 
 
@@ -132,7 +132,7 @@ bool HitBuildingFilter::init(
 
 
 
-    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
+    m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CatastrophicKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
 
 
 
@@ -260,7 +260,7 @@ void HitBuildingFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *
         try
         {
           if (!participantIds.isEmpty())
-            spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
+            spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
         } catch (...) {}
       });
       selectionDialog->show();
@@ -287,7 +287,7 @@ void HitBuildingFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *
         try
         {
           if (!participantIds.isEmpty())
-            spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
+            spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
         } catch (...) {}
       });
       selectionDialog->show();
@@ -348,10 +348,10 @@ void HitBuildingFilter::updateFilterString()
 
 void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
 {
-  if (data.id() < 1)
+  if (data.id < 1)
     return;
 
-  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
   if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
     return;
 
@@ -360,12 +360,12 @@ void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeT
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
-    m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
+    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
+    m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
     break;
   }
   case DataModification::eRemoved:
-    m_chargeTypes.remove(data.id());
+    m_chargeTypes.remove(data.id);
     break;
   }
 }
@@ -373,12 +373,12 @@ void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeT
 void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
   QJsonParseError parseError;
-  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties()), &parseError);
+  QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties), &parseError);
 
   if (parseError.error != QJsonParseError::NoError)
   {
     INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
-                       << data.id()
+                       << data.id
                        << ". Reason: "
                        << parseError.errorString()
                        << "; JSON: "
@@ -400,17 +400,17 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
     }
   }
 
-  if (m_mainStructureElements.contains(data.id()) && !inExercise)
-    m_mainStructureElements.remove(data.id());
+  if (m_mainStructureElements.contains(data.id) && !inExercise)
+    m_mainStructureElements.remove(data.id);
 
   if (!inExercise)
     return;
 
   
   bool isOutdoor = true;
-  for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements()))
+  for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements))
   {
-    if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera)
+    if (structureElement.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorCamera)
     {
       isOutdoor = false;
       break;
@@ -423,12 +423,12 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
-                                                                                                                                       : QString::fromStdString(data.description());
+    m_mainStructureElements[data.id] = data.structureElementTypeId == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id)
+                                                                                                                                       : QString::fromStdString(data.description);
     break;
 
   case DataModification::eRemoved:
-    m_mainStructureElements.remove(data.id());
+    m_mainStructureElements.remove(data.id);
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
index 60a0fa377..7bc96937c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
@@ -187,13 +187,13 @@ void HitEffectSimulationFilter::updateFilterString()
 
 void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
 {
-  if (data.id() < 1)
+  if (data.id < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id) == ProjectDataManagement::GearClass::GearClass_DuelSim)
     return;
 
-  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
   if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
     return;
 
@@ -202,12 +202,12 @@ void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement:
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
-    m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
+    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
+    m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
     break;
   }
   case DataModification::eRemoved:
-    m_chargeTypes.remove(data.id());
+    m_chargeTypes.remove(data.id);
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
index a1176bbfa..f077cad94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
@@ -46,7 +46,7 @@ bool MarkerFilter::init(std::shared_ptr<OperatorManagement::Interface::Dtc> opmD
     QMap<qint32, OperatorManagement::User> users = opmDtc->users();
     m_users.clear();
     for (auto it = users.constBegin(); it != users.constEnd(); ++it)
-      m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
+      m_users.insert(static_cast<int>(it.value().id), QString::fromStdString(it.value().name));
     connect(opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged,
             this, &MarkerFilter::onUserChanged);
   }
@@ -151,11 +151,11 @@ void MarkerFilter::onUserChanged(const OperatorManagement::User &data, DataModif
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_users[data.id()] = QString::fromStdString(data.name());
+    m_users[data.id] = QString::fromStdString(data.name);
     break;
 
   case DataModification::eRemoved:
-    m_users.remove(data.id());
+    m_users.remove(data.id);
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
index 9b4e40b99..90273c5e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
@@ -46,7 +46,7 @@ bool RadioCnrFilter::init(const std::shared_ptr<AudioVideoManagement::Interface:
 
   std::function<bool(const AudioVideoManagement::CnrTvcProfile &data)> cb = [this](const AudioVideoManagement::CnrTvcProfile &data)
   {
-    if (data.exerciseId() == m_exerciseId && data.operatorId() == m_operatorId)
+    if (data.exerciseId == m_exerciseId && data.operatorId == m_operatorId)
     {
       onCnrTvcProfileChanged(data, DataModification::eAdded);
       return true;
@@ -153,7 +153,7 @@ void RadioCnrFilter::updateFilterString()
 
 void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcProfile &data, DataModification modType)
 {
-  if (data.exerciseId() != m_exerciseId || data.operatorId() != m_operatorId)
+  if (data.exerciseId != m_exerciseId || data.operatorId != m_operatorId)
     return;
 
   switch (modType)
@@ -189,12 +189,12 @@ void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
     
     m_avmDtc->cnrConfigs([this, data](const AudioVideoManagement::CnrConfig &cnrConfig)
     {
-      for (const AudioVideoManagement::CnrTvcProfileData &current : data.data())
+      for (const AudioVideoManagement::CnrTvcProfileData &current : data.data)
       {
-        if (current.radioSystemId() != AudioVideoManagement::RadioSystem::Cnr || cnrConfig.id() != current.radioCircuitId())
+        if (current.radioSystemId != AudioVideoManagement::RadioSystem::Cnr || cnrConfig.id != current.radioCircuitId)
           continue;
 
-        m_streams.insert(current.radioCircuitId(), QString::fromStdString(cnrConfig.radioCircuit()));
+        m_streams.insert(current.radioCircuitId, QString::fromStdString(cnrConfig.radioCircuit));
 
         break;
       }
@@ -212,7 +212,7 @@ void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
     {
       AudioVideoManagement::CnrConfig dummy;
 
-      dummy.id(currentKey);
+      dummy.id = currentKey;
 
       onCnrConfigChanged(dummy, DataModification::eRemoved);
     }
@@ -229,13 +229,13 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
   {
   case DataModification::eModified:
   {
-    if (!m_streams.contains(data.id()))
+    if (!m_streams.contains(data.id))
       return;
 
-    QString temp = m_streams.value(data.id());
+    QString temp = m_streams.value(data.id);
     QVariantList attributeValues = attribute(RadioCnrEventFactory::s_radioCircuit).values();
 
-    m_streams[data.id()] = QString::fromStdString(data.radioCircuit());
+    m_streams[data.id] = QString::fromStdString(data.radioCircuit);
 
     for (const QVariant &attributeValue : attributeValues)
     {
@@ -243,7 +243,7 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
         continue;
 
       removeAttributeValue(RadioCnrEventFactory::s_radioCircuit, attributeValue);
-      insertAttributeValue(RadioCnrEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id())));
+      insertAttributeValue(RadioCnrEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id)));
 
       break;
     }
@@ -254,10 +254,10 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
   }
   case DataModification::eRemoved:
   {
-    if (!m_streams.contains(data.id()))
+    if (!m_streams.contains(data.id))
       return;
 
-    QString temp = m_streams.take(data.id());
+    QString temp = m_streams.take(data.id);
     QVariantList attributeValues = attribute(RadioCnrEventFactory::s_radioCircuit).values();
 
     for (const QVariant &attributeValue : attributeValues)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
index 7ccd0c197..cd4c90135 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
@@ -44,7 +44,7 @@ bool RadioTvcFilter::init(std::shared_ptr<AudioVideoManagement::Interface::Dtc>
 
   std::function<bool(const AudioVideoManagement::CnrTvcProfile &data)> cb = [this](const AudioVideoManagement::CnrTvcProfile &data)
   {
-    if (data.exerciseId() == m_exerciseId && data.operatorId() == m_operatorId)
+    if (data.exerciseId == m_exerciseId && data.operatorId == m_operatorId)
     {
       onCnrTvcProfileChanged(data, DataModification::eAdded);
       return true;
@@ -147,7 +147,7 @@ void RadioTvcFilter::updateFilterString()
 
 void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcProfile &data, DataModification modType)
 {
-  if (data.exerciseId() != m_exerciseId || data.operatorId() != m_operatorId)
+  if (data.exerciseId != m_exerciseId || data.operatorId != m_operatorId)
     return;
 
   switch (modType)
@@ -183,12 +183,12 @@ void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
     
     m_avmDtc->tvcConfigs([this, data](const AudioVideoManagement::TvcConfig &tvcConfig)
     {
-      for (const AudioVideoManagement::CnrTvcProfileData &current : data.data())
+      for (const AudioVideoManagement::CnrTvcProfileData &current : data.data)
       {
-        if (current.radioSystemId() != AudioVideoManagement::RadioSystem::Tvc || tvcConfig.id() != current.radioCircuitId())
+        if (current.radioSystemId != AudioVideoManagement::RadioSystem::Tvc || tvcConfig.id != current.radioCircuitId)
           continue;
 
-        m_streams.insert(current.radioCircuitId(), QString::fromStdString(tvcConfig.radioCircuit()));
+        m_streams.insert(current.radioCircuitId, QString::fromStdString(tvcConfig.radioCircuit));
 
         break;
       }
@@ -206,7 +206,7 @@ void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
     {
       AudioVideoManagement::TvcConfig dummy;
 
-      dummy.id(currentKey);
+      dummy.id = currentKey;
 
       onTvcConfigChanged(dummy, DataModification::eRemoved);
     }
@@ -223,13 +223,13 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
   {
   case DataModification::eModified:
   {
-    if (!m_streams.contains(data.id()))
+    if (!m_streams.contains(data.id))
       return;
 
-    QString temp = m_streams.value(data.id());
+    QString temp = m_streams.value(data.id);
     QVariantList attributeValues = attribute(RadioTvcEventFactory::s_radioCircuit).values();
 
-    m_streams[data.id()] = QString::fromStdString(data.radioCircuit());
+    m_streams[data.id] = QString::fromStdString(data.radioCircuit);
 
     for (const QVariant &attributeValue : attributeValues)
     {
@@ -237,7 +237,7 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
         continue;
 
       removeAttributeValue(RadioTvcEventFactory::s_radioCircuit, attributeValue);
-      insertAttributeValue(RadioTvcEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id())));
+      insertAttributeValue(RadioTvcEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id)));
 
       break;
     }
@@ -248,10 +248,10 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
   }
   case DataModification::eRemoved:
   {
-    if (!m_streams.contains(data.id()))
+    if (!m_streams.contains(data.id))
       return;
 
-    QString temp = m_streams.take(data.id());
+    QString temp = m_streams.take(data.id);
     QVariantList attributeValues = attribute(RadioTvcEventFactory::s_radioCircuit).values();
 
     for (const QVariant &attributeValue : attributeValues)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
index e5650e406..743c1d183 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
@@ -162,31 +162,31 @@ void WeaponAssignmentFilter::updateFilterString()
 
 void WeaponAssignmentFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
 {
-  if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
+  if (data.gearClassId != ProjectDataManagement::GearClass::GearClass_DuelSim || data.name == "N/A")
     return;
 
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_gearTypes[data.id()] = QString::fromStdString(data.name());
+    m_gearTypes[data.id] = QString::fromStdString(data.name);
     break;
 
   case DataModification::eRemoved:
-    m_gearTypes.remove(data.id());
+    m_gearTypes.remove(data.id);
     break;
   }
 }
 
 void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
 {
-  if (data.id() < 1)
+  if (data.id < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
     return;
 
-  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
+  const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
   if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
     return;
 
@@ -195,12 +195,12 @@ void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::Ch
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
-    m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
+    const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
+    m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
     break;
   }
   case DataModification::eRemoved:
-    m_chargeTypes.remove(data.id());
+    m_chargeTypes.remove(data.id);
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
index 35714197f..01d330fc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
@@ -33,8 +33,6 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
-
-NGL::INGLLogger &m_logger;
   FilterDialog *m_dialog { nullptr };
   QPushButton *m_button { nullptr };
 
@@ -87,6 +85,7 @@ private:
   QString m_menuGroup;
 
   Ui::FilterDialog *m_ui { nullptr };
+  NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
index 577002b4d..9d3913958 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
@@ -58,8 +58,6 @@ public:
   int row() const { return m_parent ? m_parent->m_children.indexOf(const_cast<FilterModelItem *>(this)) : 0; }
 
 private:
-
-NGL::INGLLogger &m_logger;
   EventType m_eventType;
   FilterAttribute::Type m_attributeType;
   QString m_name;
@@ -113,6 +111,8 @@ private:
 private:
   QHash<EventType, AbstractEventFilter *> m_filter;
   FilterModelItem *m_rootItem { nullptr };
+
+  NGL::INGLLogger &m_logger;
 };
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
index 34f3829c1..e07b8696c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <AudioVideoManagement/stream_name_mapping.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <MarkerManagement/mrk_data_plugin_interface.h>
 #include <SituationReplay/srp_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -29,6 +29,7 @@ namespace Timeline
 ItemInfoDialog::ItemInfoDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_ui(new Ui::ItemInfoDialog)
+  , m_logger(getLogger("TimelineItemInfoDialog"))
 {
   setOnlineHelpFilename(QStringLiteral("Timeline-Items"));
 
@@ -459,9 +460,9 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
   QJsonObject obj =  m_item->properties();
   QJsonValue val;
   DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
-                      << " id=" << data.id()
+                      << " id=" << data.id
                       << " id Marke=" << m_item->markerDbId()
-                      << " note=" << data.note();
+                      << " note=" << data.note;
 
   for(int i=0 ; i < obj.keys().length() ; i++)
   {
@@ -469,9 +470,9 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
                         << " " << (obj.keys().at(i))
                         << " value=" << obj[obj.keys().at(i)].toString();
   }
-  if ( data.id() ==  m_item->markerDbId())
+  if ( data.id ==  m_item->markerDbId())
   {
-    QString str =  QString::fromStdString (data.note());
+    QString str =  QString::fromStdString (data.note);
     val = QJsonValue(str);
     obj.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
index ae786f46c..7802d93ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
@@ -32,6 +32,7 @@ ItemListDialog::ItemListDialog(
   , m_menuGroup(menuGroup)
   , m_model(new ItemListModel(model, m_session, ppmDtc, pdmDtc, ismDtc, opmDtc, avmDtc, this))
   , m_ui(new Ui::ItemListDialog)
+  , m_logger(getLogger("ItemListDialog"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
index 38cea5c5f..e6acd63af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
@@ -70,6 +70,7 @@ ItemListModel::ItemListModel(TimelineModel *model,
   , m_ismDtc(ismDtc)
   , m_opmDtc(opmDtc)
   , m_avmDtc(avmDtc)
+  , m_logger(getLogger("ItemListModel"))
 {}
 
 
@@ -105,9 +106,9 @@ QString ItemListModel::getDisplayName(const QString &internalName) const
   QString result(internalName); 
   m_avmDtc->streamNames(static_cast<std::function<bool(const AudioVideoManagement::StreamName &)>>([&result, internalName](const AudioVideoManagement::StreamName &streamName)
   {
-    if (QString::fromStdString(streamName.internalName()) == internalName)
+    if (QString::fromStdString(streamName.internalName) == internalName)
     {
-      result = QString::fromStdString(streamName.displayName());
+      result = QString::fromStdString(streamName.displayName);
       return true;
     }
     return false;
@@ -165,16 +166,16 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
       return {};
     else if (participantItem->isPartyIdSet())
     {
-      if (item->type() == EventType::HitBuilding && m_ppmDtc->party(participantItem->partyId()).id() == 0)
+      if (item->type() == EventType::HitBuilding && m_ppmDtc->party(participantItem->partyId()).id == 0)
         return {};
-      return ParticipantManagement::trPartyName(m_ppmDtc->party(participantItem->partyId()).name());
+      return ParticipantManagement::trPartyName(m_ppmDtc->party(participantItem->partyId()).name);
     }
     try
     {
       if (item->type() == EventType::HitBuilding)
         return {};
       int partyId = static_cast<const ParticipantTrack &>(m_model->track(item->parentTrackId())).partyId();
-      return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
+      return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
     }
     catch (const QString &str) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
     catch (...) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
@@ -331,7 +332,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
   }
   case Columns::Operator:
   {
-    const auto ele = QString::fromStdString(m_opmDtc->user(obj.value(QStringLiteral("Operator")).toInt()).name());
+    const auto ele = QString::fromStdString(m_opmDtc->user(obj.value(QStringLiteral("Operator")).toInt()).name);
     if (ele.length() <= 0)
       return tr("unknown");
     return ele;
@@ -411,17 +412,17 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
 void ItemListModel::updateMarker(const MarkerManagement::Marker &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
-    << " id=" << data.id()
-    << " note=" << data.note();
+    << " id=" << data.id
+    << " note=" << data.note;
   for (EventItemPtr &itemPtr : m_items)
   {
     DEBUG_LOG(m_logger) << "id=" << itemPtr.get()->id()
         << " dbId=" << itemPtr.get()->markerDbId();
-    if ( itemPtr.get()->markerDbId() == data.id())
+    if ( itemPtr.get()->markerDbId() == data.id)
     {
       QJsonObject properties = itemPtr.get()->properties();
 
-      QString str =  QString::fromStdString (data.note());
+      QString str =  QString::fromStdString (data.note);
           QJsonValue val = QJsonValue(str);
           properties.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
index 164216d9a..7b6996f85 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
@@ -97,6 +97,7 @@ QVector<EventType> TimelineLegend::possibleEvents()
 TimelineLegend::TimelineLegend(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_ui(new Ui::TimelineLegend)
+  , m_logger(getLogger("TimelineLegend"))
 {
   m_ui->setupUi(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
index 50f68704a..b068e04c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
@@ -89,6 +89,7 @@ TimelineDialog::TimelineDialog(
   , m_srmIfc(srmIfc)
   , m_liveTimer(new QTimer(this))
   , m_ui(new Ui::TimelineDialog)
+  , m_logger(getLogger("TimelineDialog"))
 {
   INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
@@ -115,19 +116,19 @@ TimelineDialog::TimelineDialog(
     throw "EXM-DTC unavailable";
 
   ExerciseManagement::Exercise exc = exmDtc->exercise(session->exerciseId());
-  if (exc.id() == 0) 
+  if (exc.id == 0) 
     throw "exercise not found";
 
-  m_exerciseStart = exc.startTime() > 0 ? exc.startTime() : exc.beginTime();
-  m_exerciseEnd = exc.stopTime() > 0 ? exc.stopTime() : exc.endTime();
+  m_exerciseStart = exc.startTime > 0 ? exc.startTime : exc.beginTime;
+  m_exerciseEnd = exc.stopTime > 0 ? exc.stopTime : exc.endTime;
   m_range.minStartMSecs = m_exerciseStart;
   m_range.minStartSecs = m_range.minStartMSecs / 1000LL;
 
   if (m_exerciseEnd == 0)
-    throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id());
+    throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id);
   if (m_session->app() == LtsAppDescriptor::App::ThpSituationReplay ||
-      exc.state() == ExerciseManagement::ExerciseState::Paused ||
-      exc.state() == ExerciseManagement::ExerciseState::Stopped)
+      exc.state == ExerciseManagement::ExerciseState::Paused ||
+      exc.state == ExerciseManagement::ExerciseState::Stopped)
   {
     m_range.maxEndSecs = m_exerciseEnd / 1000LL;
     m_range.maxEndMSecs = static_cast<qint64>(m_range.maxEndSecs) * 1000LL; 
@@ -181,7 +182,7 @@ TimelineDialog::TimelineDialog(
   resizeTimelineProgress();
 
 
-  if (!static_cast<CameraVideoFilter *>(m_model->filter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id()))
+  if (!static_cast<CameraVideoFilter *>(m_model->filter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id))
     WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
   if (!static_cast<FireEventFilter *>(m_model->filter(EventType::FireEvent))->init(m_pdmDtc))
     WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
@@ -193,16 +194,16 @@ TimelineDialog::TimelineDialog(
     WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
   if (!static_cast<MarkerFilter *>(m_model->filter(EventType::Marker))->init(m_opmDtc))
     WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
-  if (!static_cast<RadioCnrFilter *>(m_model->filter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
+  if (!static_cast<RadioCnrFilter *>(m_model->filter(EventType::RadioCnr))->init(m_avmDtc, exc.id, m_model))
     WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
-  if (!static_cast<RadioTvcFilter *>(m_model->filter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
+  if (!static_cast<RadioTvcFilter *>(m_model->filter(EventType::RadioTvc))->init(m_avmDtc, exc.id, m_model))
     WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
   if (!static_cast<WeaponAssignmentFilter *>(m_model->filter(EventType::WeaponAssignment))->init(m_pdmDtc))
     WARNING_LOG(m_logger) << "initializing WeaponAssignmentFilter failed";
 
 
   
-  if (!static_cast<CameraVideoFilter *>(m_model->tempFilter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id()))
+  if (!static_cast<CameraVideoFilter *>(m_model->tempFilter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id))
     WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
   if (!static_cast<FireEventFilter *>(m_model->tempFilter(EventType::FireEvent))->init(m_pdmDtc))
     WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
@@ -214,9 +215,9 @@ TimelineDialog::TimelineDialog(
     WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
   if (!static_cast<MarkerFilter *>(m_model->tempFilter(EventType::Marker))->init(m_opmDtc))
     WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
-  if (!static_cast<RadioCnrFilter *>(m_model->tempFilter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
+  if (!static_cast<RadioCnrFilter *>(m_model->tempFilter(EventType::RadioCnr))->init(m_avmDtc, exc.id, m_model))
     WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
-  if (!static_cast<RadioTvcFilter *>(m_model->tempFilter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
+  if (!static_cast<RadioTvcFilter *>(m_model->tempFilter(EventType::RadioTvc))->init(m_avmDtc, exc.id, m_model))
     WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
   if (!static_cast<WeaponAssignmentFilter *>(m_model->tempFilter(EventType::WeaponAssignment))->init(m_pdmDtc))
     WARNING_LOG(m_logger) << "initializing WeaponAssignmentFilter failed";
@@ -733,7 +734,7 @@ void TimelineDialog::onStartReplay()
   {
     rp = m_coreDtc->replayPartition(replayId);
 
-    if (rp.id() == replayId)
+    if (rp.id == replayId)
     {
       found = true;
       break;
@@ -783,7 +784,7 @@ void TimelineDialog::onStartReplay()
     return;
   }
 
-  LtsSession::LtsSession *replayAppSession = m_replayApp->m_sessionManager->getSession(IDL::PartitionType::Replay, rp.id());
+  LtsSession::LtsSession *replayAppSession = m_replayApp->m_sessionManager->getSession(IDL::PartitionType::Replay, rp.id);
   if (replayAppSession == nullptr)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
index 2257ea51c..e61aa451c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
@@ -400,10 +400,10 @@ void TimelineModel::getParticipantTracks()
   
   for (ParticipantManagement::Party party : m_ppmDtc->partys())
   {
-    DEBUG_LOG(m_logger) << "party id: " << party.id() << ", name: " << party.name();
+    DEBUG_LOG(m_logger) << "party id: " << party.id << ", name: " << party.name;
     try
     {
-      m_modelState.partys.insert(party.id(), Party(party.id(), addTrack(rootTrack().id(), PartyTrack(ParticipantManagement::trPartyName(party.name()), party.id()))));
+      m_modelState.partys.insert(party.id, Party(party.id, addTrack(rootTrack().id(), PartyTrack(ParticipantManagement::trPartyName(party.name), party.id))));
     }
     catch (const QString &msg)
     {
@@ -417,33 +417,33 @@ void TimelineModel::getParticipantTracks()
   QVector<int> superiorIds;
   auto cb = [this, &superiorIds](const ParticipantManagement::Participant &participant)
   {
-    Q_ASSERT(participant.id() != 0);
+    Q_ASSERT(participant.id != 0);
 
-    if (participant.isDeleted())
+    if (participant.isDeleted)
       return;
 
-    int equipmentNumber = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
+    int equipmentNumber = participant.equipmentNumber.has_value() ? participant.equipmentNumber.get() : 0;
 
-    if (QString::fromStdString(participant.designator()).contains(QStringLiteral("Ausb")))
-      DEBUG_LOG(m_logger) << "FOUND Ausb! " << participant.id();
+    if (QString::fromStdString(participant.designator).contains(QStringLiteral("Ausb")))
+      DEBUG_LOG(m_logger) << "FOUND Ausb! " << participant.id;
 
     QVector<int> inferiorIds;
-    std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(inferiorIds),
+    std::transform(participant.inferiorIds.cbegin(), participant.inferiorIds.cend(), std::back_inserter(inferiorIds),
                    [](int32_t id) { return (int)id; });
 
     m_modelState.participants.insert(
-          participant.id(),
-          Participant(participant.id(), equipmentNumber, participant.partyId(), QString::fromStdString(participant.designator()),
-                      0, participant.superiorId(), std::move(inferiorIds))
+          participant.id,
+          Participant(participant.id, equipmentNumber, participant.partyId, QString::fromStdString(participant.designator),
+                      0, participant.superiorId, std::move(inferiorIds))
           );
 
-    if (participant.superiorId() == 0)
+    if (participant.superiorId == 0)
     {
       QStringList infs;
-      std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(infs),
+      std::transform(participant.inferiorIds.cbegin(), participant.inferiorIds.cend(), std::back_inserter(infs),
                      [](int32_t id) { return QString::number(id); });
-      DEBUG_LOG(m_logger) << "sup " << participant.id() << " has infs: " << infs.join(QStringLiteral(", "));
-      superiorIds += participant.id();
+      DEBUG_LOG(m_logger) << "sup " << participant.id << " has infs: " << infs.join(QStringLiteral(", "));
+      superiorIds += participant.id;
     }
   };
   m_ppmDtc->participants(cb);
@@ -516,7 +516,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
   if (m_isCurrentlyUpdating)
     return;
 
-  qint64 time = marker.timeStamp() - marker.timeStampOffset();
+  qint64 time = marker.timeStamp - marker.timeStampOffset;
 
   try
   {
@@ -550,13 +550,13 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
       }
       catch (const QString &errMsg)
       {
-        ERROR_LOG(m_logger) << "Marker " << marker.id() << " has invalid properties: " << errMsg;
+        ERROR_LOG(m_logger) << "Marker " << marker.id << " has invalid properties: " << errMsg;
         
       }
 
       
-      EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(marker.position().lon(), marker.position().lat(), marker.position().z())); 
-      markerEvent->m_markerDbId = marker.id();
+      EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(marker.position.lon, marker.position.lat, marker.position.z)); 
+      markerEvent->m_markerDbId = marker.id;
       m_modelState.markerTimes += time;
 
       if (!filter->check(*markerEvent.get()))
@@ -566,12 +566,12 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
     }
     else if (mod == DataModification::eModified)
     {
-      MarkerItem &mi = dynamic_cast<MarkerItem &>(itemWithMarkerDbId(marker.id()));
+      MarkerItem &mi = dynamic_cast<MarkerItem &>(itemWithMarkerDbId(marker.id));
 
       
       std::replace(m_modelState.markerTimes.begin(), m_modelState.markerTimes.end(), mi.startTime(), time);
 
-      mi.setStartTime(marker.timeStamp() - marker.timeStampOffset());
+      mi.setStartTime(marker.timeStamp - marker.timeStampOffset);
       mi.setProperties(eventPropertiesFromMarker(marker));
       
       
@@ -579,7 +579,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
   }
   catch (const QString &msg)
   {
-    ERROR_LOG(m_logger) << "cannot add/modify ("<<(int)mod<<") marker with id "<<marker.id()<<": " << msg;
+    ERROR_LOG(m_logger) << "cannot add/modify ("<<(int)mod<<") marker with id "<<marker.id<<": " << msg;
     return;
   }
   
@@ -597,7 +597,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
   try
   {
-    properties = objectFromStdString(eemEvent.properties());
+    properties = objectFromStdString(eemEvent.properties);
   }
   catch (const QString &errMsg)
   {
@@ -607,10 +607,10 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
   auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t)
   {
-    int type = (int)eemEvent.eventTypeId().underlying();
-    if (type == ProjectDataManagement::PdmEventType::EventType_CameraVideo
-        || type == ProjectDataManagement::PdmEventType::EventType_RadioTvc
-        || type == ProjectDataManagement::PdmEventType::EventType_RadioCnr)
+    int type = (int)eemEvent.eventTypeId;
+    if (type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CameraVideo)
+        || type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioTvc)
+        || type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioCnr))
     {
       int duration = properties[QStringLiteral("duration")].toInt(0);
 
@@ -626,7 +626,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
   try
   {
 
-    const QVector<int> itemIds(findItemIdsForDbId(eemEvent.id())); 
+    const QVector<int> itemIds(findItemIdsForDbId(eemEvent.id)); 
 
     for (int id : itemIds)
     {
@@ -668,7 +668,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
         for (ItemPtr &itemPtr : bi.items())
         {
           EventItem &ei2 = static_cast<EventItem &>(*itemPtr.get());
-          if (ei2.dbId() == eemEvent.id())
+          if (ei2.dbId() == eemEvent.id)
           {
             updateItem(ei2, track(bi.parentTrackId()));
             DEBUG_LOG(m_logger) << "done2";
@@ -717,13 +717,13 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
   } 
 
 
-  qint64 start = eemEvent.sampleTime();
+  qint64 start = eemEvent.sampleTime;
   DEBUG_LOG(m_logger) << "start = " << start;
 
   
-  EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
-  if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline ||
-      eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline) 
+  EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId));
+  if (eemEvent.eventTypeId == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline ||
+      eemEvent.eventTypeId == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline) 
     eventType = EventType::CrossBorderline;
 
   EventItemPtr eventItem;
@@ -734,7 +734,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
     
     auto const & evt = eemEvent;
 
-    eventItem = createItem(evt.id(), evt.sampleTime(), properties, (int)eemEvent.eventTypeId().underlying(), evt.participantId(), evt.partyId(), evt.equipmentNumber(), evt.position().lon(), evt.position().lat(), evt.position().z());
+    eventItem = createItem(evt.id, evt.sampleTime, properties, (int)eemEvent.eventTypeId, evt.participantId, evt.partyId, evt.equipmentNumber, evt.position.lon, evt.position.lat, evt.position.z);
 
     if (!eventFilter->check(*eventItem.get()))
     {
@@ -782,9 +782,9 @@ void TimelineModel::onStreamListReceived(const QMap<QString, QString> &streamLis
   const auto streamsDtc = m_avmDtc->streams();
   for(auto value : streamsDtc.values())
   {
-    if(streamList.values().contains(QString::fromStdString(value.name())))
+    if(streamList.values().contains(QString::fromStdString(value.name)))
       continue;
-    addTrack(m_videosRootTrackId, VideoTrack(QString::fromStdString(value.name())));
+    addTrack(m_videosRootTrackId, VideoTrack(QString::fromStdString(value.name)));
   }
 }
 
@@ -1340,9 +1340,9 @@ QJsonObject TimelineModel::eventPropertiesFromMarker(const MarkerManagement::Mar
   bool isSfx = false;
   QStringList streamNames;
 
-  for (const MarkerManagement::MarkerDescription &md : marker.descriptions())
+  for (const MarkerManagement::MarkerDescription &md : marker.descriptions)
   {
-    switch (md.markerType().underlying())
+    switch (md.markerType)
     {
       case MarkerManagement::MarkerType::Situation:
       {
@@ -1353,30 +1353,30 @@ QJsonObject TimelineModel::eventPropertiesFromMarker(const MarkerManagement::Mar
       {
         isGfx = true;
         
-        streamNames += QString::fromStdString(md.content());
+        streamNames += QString::fromStdString(md.content);
         break;
       }
       case MarkerManagement::MarkerType::Audio:
       {
         isSfx = true;
-        streamNames += QString::fromStdString(md.content());
+        streamNames += QString::fromStdString(md.content);
         break;
       }
       default:
       {
-        WARNING_LOG(m_logger) << "Marker " << marker.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
+        WARNING_LOG(m_logger) << "Marker " << marker.id << "'s description has an invalid marker type: " << (int)md.markerType;
         break;
       }
     }
   }
 
   return QJsonObject({
-                       { QStringLiteral("MarkerName"), QString::fromStdString(marker.name()) }
-                       , { QStringLiteral("MarkerNote"), QString::fromStdString(marker.note()) }
-                       , { QStringLiteral("Operator"), marker.operatorId() }
-                       , { QStringLiteral("MarkerOffset"), marker.timeStampOffset() }
-                       , { QStringLiteral("MapSettings"), QString::fromStdString(marker.mapSettings()) }
-                       , { QStringLiteral("Filter"), QString::fromStdString(marker.filter()) }
+                       { QStringLiteral("MarkerName"), QString::fromStdString(marker.name) }
+                       , { QStringLiteral("MarkerNote"), QString::fromStdString(marker.note) }
+                       , { QStringLiteral("Operator"), marker.operatorId }
+                       , { QStringLiteral("MarkerOffset"), QJsonValue(static_cast<double>(marker.timeStampOffset)) }
+                       , { QStringLiteral("MapSettings"), QString::fromStdString(marker.mapSettings) }
+                       , { QStringLiteral("Filter"), QString::fromStdString(marker.filter) }
                        , { QStringLiteral("IsSituationType"), isSit }
                        , { QStringLiteral("IsVideoType"), isGfx }
                        , { QStringLiteral("IsAudioType"), isSfx }
@@ -1415,7 +1415,7 @@ std::vector<EventItemPtr> TimelineModel::getMarkerItems(const Filters &filters,
     if (limit != -1 && count > limit) 
       return;
 
-    qint64 time = data.timeStamp() - data.timeStampOffset();
+    qint64 time = data.timeStamp - data.timeStampOffset;
     if (rangeOnly && (time < m_view->startTime() || time > m_view->endTime()))
       return;
 
@@ -1426,17 +1426,17 @@ std::vector<EventItemPtr> TimelineModel::getMarkerItems(const Filters &filters,
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG(m_logger) << "Marker " << data.id() << " has invalid properties: " << errMsg;
+      ERROR_LOG(m_logger) << "Marker " << data.id << " has invalid properties: " << errMsg;
       
     }
     
-    EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(data.position().lon(),
-                                                                                           data.position().lat(),
-                                                                                           data.position().z())); 
+    EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(data.position.lon,
+                                                                                           data.position.lat,
+                                                                                           data.position.z)); 
 
     if (filter->check(*markerEvent.get()))
     {
-      markerEvent->m_markerDbId = data.id();
+      markerEvent->m_markerDbId = data.id;
       ret.push_back(std::move(markerEvent));
       count++;
     }
@@ -1472,8 +1472,8 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
       int msei = cameraVideoItem.mainStructureElementId();
       const QString &streamName = cameraVideoItem.internalStreamName();
       InfrastructureManagement::StructureElement structureElement;
-      m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
-      bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
+      m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId, structureElement);
+      bool isOutdoorCameraEvent = structureElement.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera;
 
       if (!m_mainStructureElements.contains(msei) && msei != 0 )
         throw QStringLiteral("camera video event with msei %1 is not inside msei list (maybe building not mapped into current exercise)").arg(msei);
@@ -1993,9 +1993,9 @@ void TimelineModel::getOfflineVideoTracks()
     QStringList streamNames;
     QStringList mvsNames;
     for(auto s : streamsDtc)
-      streamNames.append(QString::fromStdString(s.name()));
+      streamNames.append(QString::fromStdString(s.name));
     for(auto s : streamsMvs)
-      mvsNames.append(QString::fromStdString(s.streamName()));
+      mvsNames.append(QString::fromStdString(s.streamName));
 
     QMapIterator<QString, QString> it(streamList);
     while (it.hasNext())
@@ -2053,7 +2053,7 @@ void TimelineModel::getBuildings()
     
 
 
-    if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building
+    if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::Building
         || !m_ismDtc->isElementAssignedToExercise(mse, m_session->exerciseId())) 
       continue;
 
@@ -2071,7 +2071,7 @@ void TimelineModel::getBuildings()
 
 
 
-    int msei = mse.id();
+    int msei = mse.id;
     QString name(m_ismDtc->getBuildingDisplayName(msei));
 
     try
@@ -2092,18 +2092,18 @@ void TimelineModel::getBuildings()
 
     
     int mappingCounter = 0;
-    for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements()))
+    for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements))
     {
-      if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint
-          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera
-          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
+      if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint
+          && se.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorCamera
+          && se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorCamera)
         continue;
 
-      m_mountingPointsToMainStructureElementMapping.insert(se.id(), msei);
+      m_mountingPointsToMainStructureElementMapping.insert(se.id, msei);
       mappingCounter++;
     }
 
-    DEBUG_LOG(m_logger) << "added building " << mse.id() << " '"<<name<<"'" << " with " << mappingCounter << " mpi-to-msei mappings";
+    DEBUG_LOG(m_logger) << "added building " << mse.id << " '"<<name<<"'" << " with " << mappingCounter << " mpi-to-msei mappings";
   }
 
   
@@ -2125,12 +2125,12 @@ void TimelineModel::getRadioTracks()
     m_avmDtc->waitForHistoricalDataCnrConfig(8000);
     for (const AudioVideoManagement::CnrConfig &config : m_avmDtc->cnrConfigs())
     {
-      if (config.exerciseId() == m_session->exerciseId())
+      if (config.exerciseId == m_session->exerciseId())
       {
-        m_cnrChannelDisplayNames.insert(config.cnrChannelId(), QString::fromStdString(config.radioCircuit()));
+        m_cnrChannelDisplayNames.insert(config.cnrChannelId, QString::fromStdString(config.radioCircuit));
         
-        DEBUG_LOG(m_logger) << "!!!!!!!!!! config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
-                            << ", channelId: " << config.cnrChannelId();
+        DEBUG_LOG(m_logger) << "!!!!!!!!!! config => id: " << config.id << ", circuit: " << QString::fromStdString(config.radioCircuit)
+                            << ", channelId: " << config.cnrChannelId;
       }
     }
 
@@ -2139,8 +2139,8 @@ void TimelineModel::getRadioTracks()
 
     for (const AudioVideoManagement::CnrChannel &channel : channels)
     {
-      const int channelId = channel.id();
-      const QString internalChannelName(QString::fromStdString(channel.name()));
+      const int channelId = channel.id;
+      const QString internalChannelName(QString::fromStdString(channel.name));
       QString displayName;
 
       try
@@ -2172,13 +2172,13 @@ void TimelineModel::getRadioTracks()
     m_avmDtc->waitForHistoricalDataTvcConfig(8000);
     for (const AudioVideoManagement::TvcConfig &config : m_avmDtc->tvcConfigs())
     {
-      if (config.exerciseId() == m_session->exerciseId())
+      if (config.exerciseId == m_session->exerciseId())
       {
-        m_tvcStreams.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
-        m_tvcChannelDisplayNames.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
+        m_tvcStreams.insert(config.tetraChannelId, QString::fromStdString(config.radioCircuit));
+        m_tvcChannelDisplayNames.insert(config.tetraChannelId, QString::fromStdString(config.radioCircuit));
 
-        DEBUG_LOG(m_logger) << "!!!!!!!!!! TETRA config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
-                            << ", channelId: " << config.tetraChannelId();
+        DEBUG_LOG(m_logger) << "!!!!!!!!!! TETRA config => id: " << config.id << ", circuit: " << QString::fromStdString(config.radioCircuit)
+                            << ", channelId: " << config.tetraChannelId;
       }
     }
   }
@@ -2188,8 +2188,8 @@ void TimelineModel::getRadioTracks()
 
     for (const AudioVideoManagement::TvcChannel &channel : channels)
     {
-      const int channelId = channel.id();
-      const QString internalChannelName(QString::fromStdString(channel.name()));
+      const int channelId = channel.id;
+      const QString internalChannelName(QString::fromStdString(channel.name));
       QString displayName;
 
       try
@@ -2230,11 +2230,11 @@ void TimelineModel::getBuildingVideoStreams()
 
   for (auto it1 = streams.constBegin(); it1 != streams.constEnd(); ++it1)
   {
-    if (it1->type() != AudioVideoManagement::StreamType::Video)
+    if (it1->type != AudioVideoManagement::StreamType::Video)
       continue;
 
-    int32_t mountingPointId = it1->mountingPointId();
-    QString internalStreamName(QString::fromStdString(it1->name()));
+    int32_t mountingPointId = it1->mountingPointId;
+    QString internalStreamName(QString::fromStdString(it1->name));
     QString streamDisplayName;
 
     if (mountingPointId >= 0)
@@ -2247,9 +2247,9 @@ void TimelineModel::getBuildingVideoStreams()
           [&streamDisplayName, mountingPointId](const AudioVideoManagement::VideoTeam &data) -> bool
       {
         
-        if (data.id() == -mountingPointId)
+        if (data.id == -mountingPointId)
         {
-          streamDisplayName = QString::fromStdString(data.streamName());
+          streamDisplayName = QString::fromStdString(data.streamName);
           return true;
         }
 
@@ -2272,8 +2272,8 @@ void TimelineModel::getBuildingVideoStreams()
 
     int msei = it2.value();
     InfrastructureManagement::StructureElement structureElement;
-    m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
-    bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
+    m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId, structureElement);
+    bool isOutdoorCameraStream = structureElement.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera;
 
     if (isOutdoorCameraStream)
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
index 75bbdf129..b9a8cbeb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
@@ -78,8 +78,6 @@ public:
   const QStringList &tableNames() const { return m_tableNames; }
 
 private:
-
-NGL::INGLLogger &m_logger;
   friend struct TimelineTableInfosHandler;
 
   QStringList m_tableNames;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
index afcbd1f44..c22afc49e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
@@ -1,4 +1,5 @@
 #include "tln_timeline_progress.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_tln_timeline_progress.h"
 #include "tln_item_list_model.h"
 #include "tln_item_info_dialog.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
index 3edbe04ba..9443d7303 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
@@ -191,8 +191,8 @@ EventType toEventType(int eventType)
   case EventType::LeaveMineArea:
     return EventType::LeaveMineArea;
 
-  case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline:
-  case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline:
+  case static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline):
+  case static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline):
     return EventType::CrossBorderline;
 
   case EventType::EnterFunctionalArea:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
index e7440512a..6ea86a712 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
@@ -10,46 +10,46 @@ namespace Timeline
 
 enum EventType
 {
-  Unknown = ProjectDataManagement::PdmEventType::EventType_Unknown,
-  Hit = ProjectDataManagement::PdmEventType::EventType_Hit,
-  WeaponAssignment = ProjectDataManagement::PdmEventType::EventType_WeaponAssignment,
-  BiteMessage = ProjectDataManagement::PdmEventType::EventType_BiteMessage,
-  FireEvent = ProjectDataManagement::PdmEventType::EventType_FireEvent,
-  HitBuilding = ProjectDataManagement::PdmEventType::EventType_HitBuilding,
-  Manipulation = ProjectDataManagement::PdmEventType::EventType_Manipulation,
-  CameraVideo = ProjectDataManagement::PdmEventType::EventType_CameraVideo,
-  RadioCnr = ProjectDataManagement::PdmEventType::EventType_RadioCnr,
-  RadioTvc = ProjectDataManagement::PdmEventType::EventType_RadioTvc,
-  HitEffectSimulation = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
-  HitMine = ProjectDataManagement::PdmEventType::EventType_HitMine,
-  HitN = ProjectDataManagement::PdmEventType::EventType_HitN,
-  HitC = ProjectDataManagement::PdmEventType::EventType_HitC,
-  EnterDangerArea = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea,
-  LeaveDangerArea = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea,
-  EnterMineArea = ProjectDataManagement::PdmEventType::EventType_EnterMineArea,
-  LeaveMineArea = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea,
-  CrossBorderline = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline,
+  Unknown = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Unknown),
+  Hit = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Hit),
+  WeaponAssignment = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_WeaponAssignment),
+  BiteMessage = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_BiteMessage),
+  FireEvent = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FireEvent),
+  HitBuilding = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitBuilding),
+  Manipulation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Manipulation),
+  CameraVideo = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CameraVideo),
+  RadioCnr = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioCnr),
+  RadioTvc = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioTvc),
+  HitEffectSimulation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation),
+  HitMine = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitMine),
+  HitN = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitN),
+  HitC = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitC),
+  EnterDangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea),
+  LeaveDangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea),
+  EnterMineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterMineArea),
+  LeaveMineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea),
+  CrossBorderline = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline),
 
-  EnterFunctionalArea = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea,
-  LeaveFunctionalArea = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea,
-  EnterNuclear = ProjectDataManagement::PdmEventType::EventType_EnterNuclear,
-  LeaveNuclear = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear,
+  EnterFunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea),
+  LeaveFunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea),
+  EnterNuclear = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterNuclear),
+  LeaveNuclear = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear),
 
-  HitB = ProjectDataManagement::PdmEventType::EventType_HitB,
-  FriendlyFire = ProjectDataManagement::PdmEventType::EventType_FriendlyFire,
-  HitGasPipe = ProjectDataManagement::PdmEventType::EventType_HitGasPipe,
-  MineArea = ProjectDataManagement::PdmEventType::EventType_MineArea,
-  NContamination = ProjectDataManagement::PdmEventType::EventType_NContamination,
-  BCContamination = ProjectDataManagement::PdmEventType::EventType_BCContamination,
-  DangerArea = ProjectDataManagement::PdmEventType::EventType_DangerArea,
-  FunctionalArea = ProjectDataManagement::PdmEventType::EventType_FunctionalArea,
-  MineCorridor = ProjectDataManagement::PdmEventType::EventType_MineCorridor,
-  Borderline = ProjectDataManagement::PdmEventType::EventType_Borderline,
-  TechnicalArea = ProjectDataManagement::PdmEventType::EventType_TechnicalArea,
-  GasPipe = ProjectDataManagement::PdmEventType::EventType_GasPipe,
-  Sanitation = ProjectDataManagement::PdmEventType::EventType_Sanitation,
-  EquipmentErrorReport = ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport,
-  EmergencyCall = ProjectDataManagement::PdmEventType::EventType_EmergencyCall,
+  HitB = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitB),
+  FriendlyFire = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FriendlyFire),
+  HitGasPipe = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitGasPipe),
+  MineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_MineArea),
+  NContamination = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_NContamination),
+  BCContamination = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_BCContamination),
+  DangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_DangerArea),
+  FunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FunctionalArea),
+  MineCorridor = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_MineCorridor),
+  Borderline = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Borderline),
+  TechnicalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_TechnicalArea),
+  GasPipe = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_GasPipe),
+  Sanitation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Sanitation),
+  EquipmentErrorReport = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport),
+  EmergencyCall = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EmergencyCall),
   Marker = 666,
   Block = 999,
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
index 2130fc50f..2d7ae58d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
@@ -40,10 +40,10 @@ AttributeValueMap AvmChargeType::getAttributeValueMap(int eventType) const
   case EventType::Hit:
   case EventType::WeaponAssignment:
   case EventType::FireEvent:
-    charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
+    charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
     break;
   case EventType::HitBuilding:
-    charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
+    charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
     Q_FALLTHROUGH();
   case EventType::HitEffectSimulation:
     charges += m_dtc->chargesForGearClass(GearClass::Artillery);
@@ -107,7 +107,7 @@ AttributeValueMap AvmGearType::getAttributeValueMap(int eventType) const
   AttributeValueMap ret;
   for (const auto &data : gearTypes)
   {
-    if (data.gearClassId() == GearClass::DuelSim &&
+    if (data.gearClassId() == GearClass::GearClass_DuelSim &&
         data.tasCode() != 0)
       ret.insert(data.id(), m_dtc->trGearTypeName(data.id()));
   }
@@ -163,7 +163,7 @@ AttributeValueMap AvmEquipmentNumber::getAttributeValueMap(int eventType) const
   AttributeValueMap ret;
   auto cb = [&ret](const ParticipantManagement::Participant & p) -> void
   {
-    if (!p.equipmentNumber().is_set())
+    if (!p.equipmentNumber().has_value())
       return;
     const auto equipNo = p.equipmentNumber().get();
     ret.insert(equipNo, QString::number(equipNo));
@@ -177,7 +177,7 @@ QString AvmEquipmentNumber::getValueStringFromValueId(int attributeValueId) cons
   if (!m_dtc)
     return {};
   auto ret = m_dtc->participant(attributeValueId).equipmentNumber();
-  return ret.is_set() ? QString::number(ret.get()) : QString();
+  return ret.has_value() ? QString::number(ret.get()) : QString();
 }
 
 //
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
index fb014bb9d..5b44d050e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
@@ -89,7 +89,7 @@ void DetailData::addEventType(int eventTypeId, const QString &eventTypeString) /
 
 void DetailData::addEventType(const ProjectDataManagement::EventType &eventType) // with default attribute types [time, etc.]
 {
-  addEventType(eventType.underlying(), ProjectDataManagement::toString(eventType));
+  addEventType(eventType, ProjectDataManagement::toString(eventType));
 }
 
 
@@ -122,7 +122,7 @@ void DetailData::populate() // call on any retranslate
   const auto possibleEventTypes = TimelineLegendDialog::possibleEvents();
   for (const auto eventType : possibleEventTypes)
   {
-    switch (eventType.underlying())
+    switch (eventType)
     {
     case EventType::Hit:
       attributeEventLookup.addAttributesToEvent(eventType, {QStringLiteral("VulnerabilityState"),
@@ -292,19 +292,19 @@ void DetailData::populate() // call on any retranslate
 
   // Vulnerability State:
   addAttributeType(QStringLiteral("VulnerabilityState"), tr("Vulnerability State:"));
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::CombatReady);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::LightDamage);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::MediumDamage);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::HeavyDamage);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::MobilityKill);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::CatastrophicKill);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::TemporarySeverance);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::NearMiss);
-  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::HitWithNoEffect);
-  //addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::NotReady);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss);
+  addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect);
+  //addAttributeValue(QStringLiteral("VulnerabilityState"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady);
 
 
   // Marker Types:
@@ -407,21 +407,21 @@ void DetailData::populate() // call on any retranslate
 
   // Originator Types:
   addAttributeType(QStringLiteral("OriginatorType"), tr("Originator Type:"));
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Unknown);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Participant);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ObserverController);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ExerciseControl);
-  //addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice);
-  //addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::MaintainanceDevice);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::FunctionalArea);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Initialization);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice);
-  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::DusMine);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
+  //addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice);
+  //addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice);
+  addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine);
   const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
                                                                       QStringLiteral("HasPvSan"));
   if (showPvSan)
-    addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::Sanitation);
+    addAttributeValue(QStringLiteral("OriginatorType"), ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation);
 
 
   // (ISM) Structure Elements:
@@ -716,7 +716,7 @@ void DetailData::AttributeEventLookup::addAttributesToEvent(const int eventType,
 
 void DetailData::AttributeEventLookup::addAttributesToEvent(const ProjectDataManagement::EventType &eventType, const AttributeList &attributeTypeList)
 {
-  addAttributesToEvent(eventType.underlying(), attributeTypeList);
+  addAttributesToEvent(eventType, attributeTypeList);
 }
 
 bool DetailData::AttributeEventLookup::isAttributeInEvent(const int eventType, const QString &attributeType)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
index 62ff29e5d..64fa6bea1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
@@ -195,7 +195,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
 
 
   // don't add if event type not in list of active event types
-  int eventType = static_cast<int>(event.eventTypeId().underlying());
+  int eventType = static_cast<int>(event.eventTypeId());
   if (!m_activeEventTypeIds.contains(eventType))
   {
     DEBUG_LOG(m_logger) << "live event not added - event type ("<<eventType<<") inactive";
@@ -927,7 +927,7 @@ void DDSTimelineModel::setColorPaintFun(LtsTimelineClassic::Event::EventPaintFun
 {
   paintFunc = nullptr;
   color = QColor();
-  switch (eventType.underlying())
+  switch (eventType)
   {
   case ProjectDataManagement::EventType::BiteMessage:
     paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
@@ -1078,7 +1078,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
 
   for (const MarkerManagement::MarkerDescription &md : data.descriptions())
   {
-    switch (md.markerType().underlying())
+    switch (md.markerType())
     {
       case MarkerManagement::MarkerType::Situation:
       {
@@ -1097,7 +1097,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
       }
       default:
       {
-        WARNING_LOG(m_logger) << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
+        WARNING_LOG(m_logger) << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType();
         break;
       }
     }
@@ -1252,7 +1252,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
   QStringList path;
   path.append(partyStr);
 
-  switch (data.eventTypeId().underlying())
+  switch (data.eventTypeId())
   {
     case ProjectDataManagement::EventType::HitBuilding: // 5 - Hit Building
       path = getPathForBuildingEvents(tr("Buildings"), root);
@@ -1310,7 +1310,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
   const LtsUtils::QPoint3D pos(data.position().lon(),
                                data.position().lat(),
                                data.position().z());
-  LtsTimelineClassic::Event *event = new LtsTimelineClassic::Event(data.id(), data.eventTypeId().underlying(), data.sampleTime(), endTime,
+  LtsTimelineClassic::Event *event = new LtsTimelineClassic::Event(data.id(), data.eventTypeId(), data.sampleTime(), endTime,
                                                                data.participantId(), data.partyId(), data.equipmentNumber(), path, paintFunc, color,
                                                                root, -1,
                                                                pos,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
index 165f6e8fc..dfd945c4b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
@@ -188,7 +188,7 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
 // helper for grouped sorting
 static int categoryFromEventType(ProjectDataManagement::EventType et)
 {
-  switch (et.underlying())
+  switch (et)
   {
   case ProjectDataManagement::EventType::Unknown:
     return 0;
@@ -259,7 +259,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
   helperCont.reserve(events.size());
   for (const ProjectDataManagement::EventType eventType : events)
   {
-    model->setColorPaintFun(paintFunc, c, eventType.underlying());
+    model->setColorPaintFun(paintFunc, c, eventType);
 
     if (paintFunc == nullptr)
     {
@@ -280,7 +280,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
     wsh.et = eventType;
     wsh.cbx = new QCheckBox(ProjectDataManagement::toString(eventType), this);
     wsh.cbx->setObjectName(checkBoxName(eventType));
-    wsh.cbx->setChecked(activeEventTypeIds.contains(eventType.underlying()));
+    wsh.cbx->setChecked(activeEventTypeIds.contains(eventType));
     wsh.cbx->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     helperCont.push_back(wsh);
@@ -316,7 +316,7 @@ bool TimelineLegendDialog::apply()
   for (const ProjectDataManagement::EventType eventType : events)
   {
     if (checkBox(eventType)->isChecked())
-      activeEventTypeIds.insert(eventType.underlying());
+      activeEventTypeIds.insert(eventType);
   }
   emit signalEventTypesChanged(activeEventTypeIds);
   return false; // because this has to happen async.. (reset changes after async ops are (successfully) done)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h
index 419fa7674..baac891d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h
@@ -45,9 +45,9 @@ private:
   void retranslate() override;
 
   static QString checkBoxName(int eventTypeId) { return QStringLiteral("CheckBoxEvent%1").arg(eventTypeId); }
-  static QString checkBoxName(ProjectDataManagement::EventType eventType) { return checkBoxName(eventType.underlying()); }
+  static QString checkBoxName(ProjectDataManagement::EventType eventType) { return checkBoxName(eventType); }
   QCheckBox *checkBox(int eventTypeId) { return findChild<QCheckBox *>(checkBoxName(eventTypeId)); }
-  QCheckBox *checkBox(ProjectDataManagement::EventType eventType) { return checkBox(eventType.underlying()); }
+  QCheckBox *checkBox(ProjectDataManagement::EventType eventType) { return checkBox(eventType); }
 
 private:
   Ui::TimelineLegendDialog *m_ui;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
index 27a598169..da5ea237f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
@@ -76,20 +76,20 @@ void InterfaceImpl::onConnections(const Connections &data, DataModification modT
   case DataModification::eModified:
   {
     QStringList sl;
-    sl.reserve(data.connections().size());
+    sl.reserve(data.connections.size());
 
     bool allConnected = true;
     InterfaceImpl::State state = InterfaceImpl::State::Red;
 
-    if (data.connections().size() == 0)
+    if (data.connections.size() == 0)
       allConnected = false;
     else
     {
-      for (auto it = data.connections().begin(); it != data.connections().end(); ++it)
+      for (auto it = data.connections.begin(); it != data.connections.end(); ++it)
       {
         const TrainingAreaBase::ConnectionState &connection = *it;
-        const QString name = QCoreApplication::translate("dds", connection.name().c_str());
-        if (connection.state())
+        const QString name = QCoreApplication::translate("dds", connection.name.c_str());
+        if (connection.state)
         {
           state = InterfaceImpl::State::Yellow;
           sl += tr("%1 connected").arg(name);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
index 7c83d57a2..4f298b07c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
@@ -49,7 +49,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
     m_notiPos->setAction([this]()
     {
       
-      int participantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
+      int participantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
       if (participantId > 0)
         m_sitMapGuiIfc->centerMapToParticipant(participantId);
     }
@@ -109,11 +109,11 @@ void InterfaceImpl::clearInterfaces()
 void InterfaceImpl::onStatusSfmChanged(const TechnicalStateSfm &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  setRadioStatus(data.radioAvailable(), data.licensed());
-  setSfmStatus(data.sfmConnected());
+  setRadioStatus(data.radioAvailable, data.licensed);
+  setSfmStatus(data.sfmConnected);
 
   if (m_notiRadio != nullptr)
-    m_notiRadio->setToolTip(data.licensed() ? tr("Licensed") : tr("Not Licensed")); 
+    m_notiRadio->setToolTip(data.licensed ? tr("Licensed") : tr("Not Licensed"));
 }
 
 void InterfaceImpl::setRadioStatus(bool isAvilable, bool isLicensed)
@@ -177,7 +177,7 @@ void InterfaceImpl::onInitDone()
   connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &InterfaceImpl::onPositionChanged);
   connect(m_dtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsEquipmentChanged, this, &InterfaceImpl::onSpecificsEquipmentChanged);
 
-  m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
+  m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
   if (m_curParticipantId)
     onPositionChanged(m_ppmDtc->participantPosition(m_curParticipantId), DataModification::eAdded);
 
@@ -189,12 +189,12 @@ void InterfaceImpl::onPositionChanged(const ParticipantManagement::ParticipantPo
     return;
 
   if (m_curParticipantId <= 0)
-    m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
+    m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
 
-  if (data.participantId() == m_curParticipantId)
+  if (data.participantId == m_curParticipantId)
   {
     if (LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("MovingMapToSelf"), false).toBool())
-      m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos().lon(), data.pos().lat())); 
+      m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos.lon, data.pos.lat));
   }
 }
 
@@ -202,7 +202,7 @@ void InterfaceImpl::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specif
 {
   if (modType == DataModification::eRemoved)
     return;
-  m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
+  m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber);
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
index bf1e8dd94..23d278593 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
@@ -20,6 +20,7 @@ SfmMessagesDialog::SfmMessagesDialog(QWidget *parent)
   , m_dtc(nullptr)
   , m_ui(new Ui::SfmMessagesDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("MessagingDialog"))
 {
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
index c345fe072..16dd17a1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
@@ -72,8 +72,8 @@ void InterfaceImpl::handleNewData(const FreeText &data, DataModification modType
 {
   if (modType != DataModification::eAdded || m_unreadCounterIsLocked)
     return;
-  if (data.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
-      || data.timeStamp() < m_lastClearTime) 
+  if (data.timeStamp < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
+      || data.timeStamp < m_lastClearTime)
     return;
   ++m_unread;
   updateUnreadCount();
@@ -83,8 +83,8 @@ void InterfaceImpl::handleNewData(const ShortMessage &data, DataModification mod
 {
   if (modType != DataModification::eAdded || m_unreadCounterIsLocked)
     return;
-  if (data.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
-      || data.timeStamp() < m_lastClearTime) 
+  if (data.timeStamp < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
+      || data.timeStamp < m_lastClearTime)
     return;
   ++m_unread;
   updateUnreadCount();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.cpp
index 7bad17318..da3ee219f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.cpp
@@ -20,6 +20,7 @@ MessagingModel::MessagingModel(QObject *parent)
   , m_dtc(nullptr)
   , m_operatorId(0)
   , m_lastClearTime(0)
+  , m_logger(getLogger("MessagingModel"))
 {}
 
 
@@ -47,15 +48,15 @@ void MessagingModel::insertData(const TrainingAreaBaseOC::FreeText &data, DataMo
   if (modType == DataModification::eRemoved)
     return;
 
-  if (dontAdd(data.timeStamp()))
+  if (dontAdd(data.timeStamp))
     return;
 
-  QString text = QString::fromStdString(data.text().c_str());
+  QString text = QString::fromStdString(data.text.c_str());
   if (text.size() > 1)
     text.chop(1);
   QString msg = tr("Text: %1").arg(text);
 
-  insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp()), msg});
+  insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp), msg});
 }
 
 void MessagingModel::insertData(const TrainingAreaBaseOC::ShortMessage &data, DataModification modType)
@@ -63,16 +64,15 @@ void MessagingModel::insertData(const TrainingAreaBaseOC::ShortMessage &data, Da
   if (modType == DataModification::eRemoved)
     return;
 
-  if (dontAdd(data.timeStamp()))
+  if (dontAdd(data.timeStamp))
     return;
 
-  
 
   QString msg = tr("Type: %1 - %2")
-      .arg(textTypeToString(static_cast<TextType>(data.textType())),
-           vbgVbaIndexToText(data.textType(), data.indexVbg()));
+      .arg(textTypeToString(static_cast<TextType>(data.textType)),
+           vbgVbaIndexToText(data.textType, data.indexVbg));
 
-  insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp()), msg});
+  insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp), msg});
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp
index 0ae96b5a2..f8ee1a318 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp
@@ -64,81 +64,81 @@ bool EquipmentEditDialog::init()
 void EquipmentEditDialog::loadUiStandards()
 {
   
-  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman);
-  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish);
-  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench);
+  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman));
+  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish));
+  m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench));
 
   
-  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment);
-  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle);
-  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle);
+  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment));
+  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle));
+  m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle));
 
   
-  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest);
-  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest);
-  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest);
+  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest));
+  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest));
+  m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest));
 
-  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle);
-  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson);
-  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit);
+  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle));
+  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson));
+  m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit));
 
-  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay);
-  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe);
-  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe);
-  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW);
-  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46);
+  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay));
+  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe));
+  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe));
+  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW));
+  m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46));
 
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4);
-  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs);
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4));
+  m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs));
 
   m_ui->cmbConfEffectModelAgdus->addItem(QObject::tr("NONE"), 0);
   auto cb = [this](const WarehouseGuez::InjuryModelAgdusWh &injModel)
   {
-    m_ui->cmbConfEffectModelAgdus->addItem(QString::fromStdString(injModel.name()), injModel.id());
+    m_ui->cmbConfEffectModelAgdus->addItem(QString::fromStdString(injModel.name), injModel.id);
   };
   m_dtc->injuryModelAgdusWhs(cb);
 
   
-  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration);
-  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir);
-  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder);
+  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration));
+  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir));
+  m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder));
 
-  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration);
-  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv);
-  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv);
+  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration));
+  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv));
+  m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv));
 
-  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration);
-  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc);
-  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf);
-  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr);
-  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf);
+  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration));
+  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc));
+  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf));
+  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr));
+  m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf));
   
 }
 
@@ -147,43 +147,43 @@ void EquipmentEditDialog::loadUiValues()
   WarehouseGuez::EquipmentTypeWh eq = m_dtc->equipmentTypeWh(m_equipmentId);
 
   
-  m_ui->lblId->setText(QString::number(eq.id()));
-  m_ui->leName->setText(QString::fromStdString(eq.name()));
-  m_ui->sbGroup->setValue(eq.equipGroup());
+  m_ui->lblId->setText(QString::number(eq.id));
+  m_ui->leName->setText(QString::fromStdString(eq.name));
+  m_ui->sbGroup->setValue(eq.equipGroup);
   
   
   
   m_ui->sbMinEquipNo->setMaximum(50000);
   m_ui->sbMaxEquipNo->setMaximum(50000);
   
-  m_ui->sbMinEquipNo->setValue(eq.minEquipNo());
-  m_ui->sbMaxEquipNo->setValue(eq.maxEquipNo());
+  m_ui->sbMinEquipNo->setValue(eq.minEquipNo);
+  m_ui->sbMaxEquipNo->setValue(eq.maxEquipNo);
   
-  setCanDevicesInUi(eq.canDevices());
-  m_ui->sbCanStartUpTime->setValue(eq.configurationStartupTime());
+  setCanDevicesInUi(eq.canDevices);
+  m_ui->sbCanStartUpTime->setValue(eq.configurationStartupTime);
   
-  m_ui->cmbDisplayLanguage->setCurrentText(WarehouseGuez::toString(eq.configurationAbeLanguage()));
-  m_ui->chbDisplayAudioFeedback->setChecked(eq.configurationAudioResponse());
+  m_ui->cmbDisplayLanguage->setCurrentText(WarehouseGuez::toString(eq.configurationAbeLanguage));
+  m_ui->chbDisplayAudioFeedback->setChecked(eq.configurationAudioResponse);
   
-  m_ui->cmbMhgrOperatingMode->setCurrentText(WarehouseGuez::toString(eq.configurationMhgrOperatingMode()));
-  m_ui->chbMhgrEnergySaveMode->setChecked(eq.configurationMhgrEnergieSave());
+  m_ui->cmbMhgrOperatingMode->setCurrentText(WarehouseGuez::toString(eq.configurationMhgrOperatingMode));
+  m_ui->chbMhgrEnergySaveMode->setChecked(eq.configurationMhgrEnergieSave);
   
-  m_ui->cmbConfAgdusHv->setCurrentText(WarehouseGuez::toString(eq.configurationAgdusHV()));
-  m_ui->cmbConfPositionUpdate->setCurrentText(WarehouseGuez::toString(eq.posUpdate()));
-  m_ui->cmbConfDisplayAdag->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdag()));
-  m_ui->cmbConfDisplayAdagSubunit->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdagSubUnit()));
-  m_ui->cmbConfEffectModelAgdus->setCurrentIndex(m_ui->cmbConfEffectModelAgdus->findData(eq.vbAgdusId()));
-  m_ui->sbConfEffectModelMineIed->setValue(eq.vbMineIed());
-  m_ui->sbConfEffectModelHighAngleFire->setValue(eq.vbFireArea());
-  m_ui->sbConfEffectModelResources->setValue(eq.vbAirSupport());
-  m_ui->sbConfEffectModelAcWeapon->setValue(eq.vbNc());
+  m_ui->cmbConfAgdusHv->setCurrentText(WarehouseGuez::toString(eq.configurationAgdusHV));
+  m_ui->cmbConfPositionUpdate->setCurrentText(WarehouseGuez::toString(eq.posUpdate));
+  m_ui->cmbConfDisplayAdag->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdag));
+  m_ui->cmbConfDisplayAdagSubunit->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdagSubUnit));
+  m_ui->cmbConfEffectModelAgdus->setCurrentIndex(m_ui->cmbConfEffectModelAgdus->findData(eq.vbAgdusId));
+  m_ui->sbConfEffectModelMineIed->setValue(eq.vbMineIed);
+  m_ui->sbConfEffectModelHighAngleFire->setValue(eq.vbFireArea);
+  m_ui->sbConfEffectModelResources->setValue(eq.vbAirSupport);
+  m_ui->sbConfEffectModelAcWeapon->setValue(eq.vbNc);
   
-  m_ui->chbEffSimPyrotechnic->setChecked(eq.configurationCedPyrotechnic());
+  m_ui->chbEffSimPyrotechnic->setChecked(eq.configurationCedPyrotechnic);
   
-  m_ui->chbSpecialSensorFirSan->setChecked(eq.configurationSsFirSan());
-  m_ui->cmbSpecialSensorFir->setCurrentText(WarehouseGuez::toString(eq.configurationSsFirFunction()));
-  m_ui->cmbSpecialSensorMv->setCurrentText(WarehouseGuez::toString(eq.configurationSsMineFitFunction()));
-  m_ui->cmbSpecialSensorStd->setCurrentText(WarehouseGuez::toString(eq.configurationSsStandardFunction()));
+  m_ui->chbSpecialSensorFirSan->setChecked(eq.configurationSsFirSan);
+  m_ui->cmbSpecialSensorFir->setCurrentText(WarehouseGuez::toString(eq.configurationSsFirFunction));
+  m_ui->cmbSpecialSensorMv->setCurrentText(WarehouseGuez::toString(eq.configurationSsMineFitFunction));
+  m_ui->cmbSpecialSensorStd->setCurrentText(WarehouseGuez::toString(eq.configurationSsStandardFunction));
   
 
   
@@ -239,38 +239,38 @@ quint32 EquipmentEditDialog::canDevicesFromUi()
 {
   quint32 ret = 0;
 
-  if (m_ui->chbCanAgdus->isChecked()) { ret |= WarehouseGuez::CanDevices::AGDUS; }
-  if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::ABE; }
-  if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_FIR; }
-  if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_MV; }
-  if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_STD; }
-  if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::MHGR; }
-  if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_UEBERDR; }
-  if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_STROEM; }
-  if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= WarehouseGuez::CanDevices::WIRKDARST; }
-  if (m_ui->chbCanOcLaptop->isChecked()) { ret |= WarehouseGuez::CanDevices::SRT; }
-  if (m_ui->chbCanFireMarker->isChecked()) { ret |= WarehouseGuez::CanDevices::DMF; }
-  if (m_ui->chbCanIedSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_SENSOR; }
-  if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_KONT_EINH; }
+  if (m_ui->chbCanAgdus->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::AGDUS); }
+  if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABE); }
+  if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_FIR); }
+  if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_MV); }
+  if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_STD); }
+  if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::MHGR); }
+  if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABC_UEBERDR); }
+  if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABC_STROEM); }
+  if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::WIRKDARST); }
+  if (m_ui->chbCanOcLaptop->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SRT); }
+  if (m_ui->chbCanFireMarker->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::DMF); }
+  if (m_ui->chbCanIedSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::IED_SENSOR); }
+  if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::IED_KONT_EINH); }
 
   return ret;
 }
 
 void EquipmentEditDialog::setCanDevicesInUi(quint32 devices)
 {
-  m_ui->chbCanAgdus->setChecked(devices & WarehouseGuez::CanDevices::AGDUS);
-  m_ui->chbCanDisplayUnit->setChecked(devices & WarehouseGuez::CanDevices::ABE);
-  m_ui->chbCanSpecialSensorFir->setChecked(devices & WarehouseGuez::CanDevices::SS_FIR);
-  m_ui->chbCanSpecialSensorMv->setChecked(devices & WarehouseGuez::CanDevices::SS_MV);
-  m_ui->chbCanSpecialSensorStd->setChecked(devices & WarehouseGuez::CanDevices::SS_STD);
-  m_ui->chbCanMhgrSensor->setChecked(devices & WarehouseGuez::CanDevices::MHGR);
-  m_ui->chbCanOverpressureSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_UEBERDR);
-  m_ui->chbCanNbcFlowSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_STROEM);
-  m_ui->chbCanEffectSimulator->setChecked(devices & WarehouseGuez::CanDevices::WIRKDARST);
-  m_ui->chbCanOcLaptop->setChecked(devices & WarehouseGuez::CanDevices::SRT);
-  m_ui->chbCanFireMarker->setChecked(devices & WarehouseGuez::CanDevices::DMF);
-  m_ui->chbCanIedSensor->setChecked(devices & WarehouseGuez::CanDevices::IED_SENSOR);
-  m_ui->chbCanIedControlUnit->setChecked(devices & WarehouseGuez::CanDevices::IED_KONT_EINH);
+  m_ui->chbCanAgdus->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::AGDUS));
+  m_ui->chbCanDisplayUnit->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABE));
+  m_ui->chbCanSpecialSensorFir->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_FIR));
+  m_ui->chbCanSpecialSensorMv->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_MV));
+  m_ui->chbCanSpecialSensorStd->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_STD));
+  m_ui->chbCanMhgrSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::MHGR));
+  m_ui->chbCanOverpressureSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABC_UEBERDR));
+  m_ui->chbCanNbcFlowSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABC_STROEM));
+  m_ui->chbCanEffectSimulator->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::WIRKDARST));
+  m_ui->chbCanOcLaptop->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SRT));
+  m_ui->chbCanFireMarker->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::DMF));
+  m_ui->chbCanIedSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::IED_SENSOR));
+  m_ui->chbCanIedControlUnit->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::IED_KONT_EINH));
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.h
index 9e7c6ef29..c756bbf09 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.h
@@ -58,7 +58,6 @@ private:
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
   std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
   LtsUtils::RequestHelper *m_requestHelper;
-  WarehouseGuez::
   Ui::EquipmentEditDialog *m_ui;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.cpp
index 1e7a9d999..24bb7885d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.cpp
@@ -111,7 +111,7 @@ void EquipmentList::enaDisa()
 void EquipmentList::onRemoveEquipment()
 {
   QModelIndex idx = m_ui->widget->currentIndex();
-  Core::RemoveElementRequest req = Core::RemoveElementRequest(m_model->getRowData(idx.row()).id());
+  Core::RemoveElementRequest req = Core::RemoveElementRequest(m_model->getRowData(idx.row()).id);
 
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -129,7 +129,7 @@ void EquipmentList::onAddEquipment()
 void EquipmentList::onNewEquipment(int id, int copyOf)
 {
   WarehouseGuez::EquipmentTypeWh equ = m_dtc->equipmentTypeWh(copyOf);
-  equ.id(0-id);
+  equ.id = 0-id;
   m_requestHelper->startSingleRequest([equ, this]()
   {
     return m_ftc->modifyEquipmentTypeWhRequest(equ, this);
@@ -141,10 +141,10 @@ void EquipmentList::onEditEquipment()
   const QModelIndex idx = m_ui->widget->currentIndex();
   WarehouseGuez::EquipmentTypeWh equip = m_model->getRowData(idx.row());
 
-  if (equip.id() < 0)
+  if (equip.id < 0)
     return;
 
-  editEquipment(equip.id());
+  editEquipment(equip.id);
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.h
index 00aa17ff6..8346d79aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_list.h
@@ -51,7 +51,6 @@ private:
   std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
   LtsUtils::RequestHelper *m_requestHelper;
-  WarehouseGuez::
   Ui::EquipmentList *m_ui;
 
   void editEquipment(int id);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.cpp
index 73649ab4a..15bad2523 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.cpp
@@ -87,49 +87,49 @@ QVariant EquipmentModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ID:
-    return equip.id();
+    return equip.id;
   case Name:
-    return QString::fromStdString(equip.name());
+    return QString::fromStdString(equip.name);
   case Group:
-    return equip.equipGroup();
+    return equip.equipGroup;
   case GroupRange:
-    return QStringLiteral("%1 - %2").arg(equip.minEquipNo()).arg(getUnsignedShortValue(equip.maxEquipNo()));
+    return QStringLiteral("%1 - %2").arg(equip.minEquipNo).arg(getUnsignedShortValue(equip.maxEquipNo));
   case PositionUpdate:
-    return WarehouseGuez::toString(equip.posUpdate());
+    return WarehouseGuez::toString(equip.posUpdate);
   case DisplayAdag:
-    return WarehouseGuez::toString(equip.configurationDisplayAdag());
+    return WarehouseGuez::toString(equip.configurationDisplayAdag);
   case DisplayAdagSubUnit:
-    return WarehouseGuez::toString(equip.configurationDisplayAdagSubUnit());
+    return WarehouseGuez::toString(equip.configurationDisplayAdagSubUnit);
   case AgdusHv:
-    return WarehouseGuez::toString(equip.configurationAgdusHV());
+    return WarehouseGuez::toString(equip.configurationAgdusHV);
   case AgdusName:
-    return m_injuryModelNames.value(equip.vbAgdusId());
+    return m_injuryModelNames.value(equip.vbAgdusId);
   case MineIed:
-    return equip.vbMineIed();
+    return equip.vbMineIed;
   case FireArea:
-    return equip.vbFireArea();
+    return equip.vbFireArea;
   case AirSupport:
-    return equip.vbAirSupport();
+    return equip.vbAirSupport;
   case Nc:
-    return equip.vbNc();
+    return equip.vbNc;
   case Language:
-    return WarehouseGuez::toString(equip.configurationAbeLanguage());
+    return WarehouseGuez::toString(equip.configurationAbeLanguage);
   case AudioResponse:
-    return equip.configurationAudioResponse() ? tr("Yes") : tr("No");
+    return equip.configurationAudioResponse ? tr("Yes") : tr("No");
   case MhgrMode:
-    return WarehouseGuez::toString(equip.configurationMhgrOperatingMode());
+    return WarehouseGuez::toString(equip.configurationMhgrOperatingMode);
   case MhgrEnergySave:
-    return equip.configurationMhgrEnergieSave() ? tr("Yes") : tr("No");;
+    return equip.configurationMhgrEnergieSave ? tr("Yes") : tr("No");;
   case Pyrotechnic:
-    return equip.configurationCedPyrotechnic() ? tr("Yes") : tr("No");
+    return equip.configurationCedPyrotechnic ? tr("Yes") : tr("No");
   case SensorFir:
-    return WarehouseGuez::toString(equip.configurationSsFirFunction());
+    return WarehouseGuez::toString(equip.configurationSsFirFunction);
   case SensorMineFit:
-    return WarehouseGuez::toString(equip.configurationSsMineFitFunction());
+    return WarehouseGuez::toString(equip.configurationSsMineFitFunction);
   case SensorStandard:
-    return WarehouseGuez::toString(equip.configurationSsStandardFunction());
+    return WarehouseGuez::toString(equip.configurationSsStandardFunction);
   case StartupTime:
-    return equip.configurationStartupTime();
+    return equip.configurationStartupTime;
   }
   return QVariant();
 }
@@ -138,13 +138,13 @@ QMap<int, QString> EquipmentModel::equipmentTypeNames() const
 {
   QMap<int, QString> retVal;
   for(auto val : m_vecData)
-    retVal.insert(val.id(), QString::fromStdString(val.name()));
+    retVal.insert(val.id, QString::fromStdString(val.name));
   return retVal;
 }
 
 void EquipmentModel::onInjuryModelChanged(const WarehouseGuez::InjuryModelAgdusWh &im)
 {
-  m_injuryModelNames[im.id()] = QString::fromStdString(im.name());
+  m_injuryModelNames[im.id] = QString::fromStdString(im.name);
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
index 6de755fc8..02808489c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
@@ -57,7 +57,6 @@ NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
   QHash<qint32, QString> m_injuryModelNames;
-  WarehouseGuez::
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.cpp
index b228be569..6fb8a7b2e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.cpp
@@ -59,10 +59,10 @@ void InjuryModelEditDialog::loadUiValues()
 {
   WarehouseGuez::InjuryModelAgdusWh inj = m_dtc->injuryModelAgdusWh(m_injuryModelId);
 
-  m_ui->lblId->setText(QString::number(inj.id()));
-  m_ui->leName->setText(QString::fromStdString(inj.name()));
-  m_ui->leVersion->setText(QString::fromStdString(inj.version()));
-  m_ui->pteDescription->insertPlainText(QString::fromStdString(inj.description()));
+  m_ui->lblId->setText(QString::number(inj.id));
+  m_ui->leName->setText(QString::fromStdString(inj.name));
+  m_ui->leVersion->setText(QString::fromStdString(inj.version));
+  m_ui->pteDescription->insertPlainText(QString::fromStdString(inj.description));
 }
 
 void InjuryModelEditDialog::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &reply)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.h
index 7ee4c4564..62357f46c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_edit_dialog.h
@@ -53,7 +53,6 @@ private:
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
   std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
   LtsUtils::RequestHelper *m_requestHelper;
-  WarehouseGuez::
   Ui::InjuryModelEditDialog *m_ui;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.cpp
index 323c895b7..50abe0b95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.cpp
@@ -104,7 +104,7 @@ void InjuryModelList::enaDisa()
 void InjuryModelList::onRemoveInjuryModel()
 {
   QModelIndex idx = m_ui->widget->currentIndex();
-  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id());
+  Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id);
 
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -145,9 +145,9 @@ void InjuryModelList::onEditInjuryModel()
 void InjuryModelList::onNewInjuryModel(int id)
 {
   WarehouseGuez::InjuryModelAgdusWh im;
-  im.id(0-id);
-  im.name(tr("New Name").toStdString());
-  im.version("-");
+  im.id = 0-id;
+  im.name = tr("New Name").toStdString();
+  im.version = "-";
   m_requestHelper->startSingleRequest([im, this]()
   {
     return m_ftc->modifyInjuryModelAgdusWhRequest(im, this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.h
index d8ab95cd7..e402887b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_list.h
@@ -51,7 +51,6 @@ private:
   std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
   LtsUtils::RequestHelper *m_requestHelper;
-  WarehouseGuez::
   Ui::InjuryModelList *m_ui;
 
   void editInjuryModel(int id);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
index 243140aa9..14a226e4f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
@@ -55,13 +55,13 @@ QVariant InjuryModelModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ID:
-    return inj.id();
+    return inj.id;
   case Name:
-    return QString::fromStdString(inj.name());
+    return QString::fromStdString(inj.name);
   case Version:
-    return QString::fromStdString(inj.version());
+    return QString::fromStdString(inj.version);
   case Description:
-    return QString::fromStdString(inj.description());
+    return QString::fromStdString(inj.description);
   }
   return QVariant();
 }
@@ -71,7 +71,7 @@ QSet<int> InjuryModelModel::takenIds() const
   QSet<int> set;
   set.reserve(m_vecData.size());
   for(const auto &m : m_vecData)
-    set << m.id();
+    set << m.id;
   return set;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.h
index aadef4a22..b744e4989 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.h
@@ -35,6 +35,5 @@ private:
 
 NGL::INGLLogger &m_logger;
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
-  WarehouseGuez::
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
index d78012cb5..9840e8143 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
@@ -2,6 +2,7 @@
 
 
 #include "xmlreader.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QUrlQuery>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp
index 67db4757e..5e6f5ad84 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp
@@ -2,6 +2,7 @@
 
 
 #include "json_api.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "web_socket_handler.h"
 #include "web_socket_telegrams.h"
@@ -15,6 +16,7 @@ namespace Json
 Api::Api(QObject *parent)
   : QObject(parent)
   , m_webSocketHandler(new WebSocketHandler(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_webSocketHandler, &WebSocketHandler::telegramReceived,
           this, &Api::onTelegramReceived);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp
index 0236d9045..b047af1cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "web_socket_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "web_socket_telegrams.h"
 #include <QtWebSockets/QWebSocket>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
index 7f15d9ca3..8e403ff3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
@@ -2,6 +2,7 @@
 
 
 #include "handle_http_request.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QAuthenticator>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.cpp
index 49586bcb8..fa8732615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "main_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <QtWebSockets/QWebSocket>
 #include "VWM/vwm_types.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
index ea28b9d63..bb6fdaafd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
@@ -219,7 +219,7 @@ Core::FunctionReplyObject BuildingControlHandler::onSetBuildingStatesRequestInte
 
     BuildingProcess *bldg = it.value();
 
-    if (data.resetContamination.is_set())
+    if (data.resetContamination.has_value())
     {
       if (data.resetContamination.get() && !bldg->resetContaminationState())
         return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "reset contamination of building with id %1 failed.")).arg(building.buildingId);
@@ -232,7 +232,7 @@ Core::FunctionReplyObject BuildingControlHandler::onSetBuildingStatesRequestInte
         data.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady )
       return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(building.buildingId);
 
-    if (building.roomIds.is_set())
+    if (building.roomIds.has_value())
       roomIds = building.roomIds.get();
 
     if (!bldg->setVulnerabilityState(data.vulnerabilityState, roomIds))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
index 58573549b..848599ece 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
@@ -3,6 +3,7 @@
 
 #pragma once
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <QtCore/QObject>
 #include <QtCore/QHash>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
index 3435ea71b..39b9832d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
@@ -89,18 +89,18 @@ void ConfigCnr::buildConfigCnrData()
 
         AudioVideoManagement::FrequencySetDataWithId &fsd = fsdMap[rcVhf->freqSetDataId];
         subCircuit.agc = false;
-        subCircuit.akw = fsd.akwBundle.is_set() ? fsd.akwBundle.get() : 0;
+        subCircuit.akw = fsd.akwBundle.has_value() ? fsd.akwBundle.get() : 0;
         subCircuit.channelSpacing = 0;
         subCircuit.clipper = false;
-        subCircuit.comsec = fsd.comsec.is_set() ? fsd.comsec.get() : 0;
+        subCircuit.comsec = fsd.comsec.has_value() ? fsd.comsec.get() : 0;
         subCircuit.crossbeam = 0;
         subCircuit.frequency = fsd.frequency * 1000;
         subCircuit.frequencyBand = static_cast<int>(fsd.frequencyBand);
-        subCircuit.fsb = fsd.fsbBundle.is_set() ? fsd.fsbBundle.get() : 0;
+        subCircuit.fsb = fsd.fsbBundle.has_value() ? fsd.fsbBundle.get() : 0;
         subCircuit.modulationType = 0;
         subCircuit.orientation = 0;
         subCircuit.ptSig = rcVhf->pilotTone;
-        subCircuit.rcAkw = fsd.akwRadioCircuit.is_set() ? fsd.akwRadioCircuit.get() : 0;
+        subCircuit.rcAkw = fsd.akwRadioCircuit.has_value() ? fsd.akwRadioCircuit.get() : 0;
         subCircuit.rcMode = static_cast<int>(rcVhf->operatingMode);
         subCircuit.rcSubId = toRcIdString(cnrChannel);
         subCircuit.rcSubName = rcVhf->name;
@@ -216,7 +216,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency
   if (!plan)
     return;
 
-  if (data.id == plan->id || !data.exerciseId.is_set())
+  if (data.id == plan->id || !data.exerciseId.has_value())
     m_timer.start();
 }
 
@@ -226,7 +226,7 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
   DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
 
   Q_UNUSED(modType);
-  bool   isGlobal = !data.exerciseId.is_set();
+  bool   isGlobal = !data.exerciseId.has_value();
   if ((isGlobal || data.exerciseId.get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
     m_timer.start();
 }
@@ -235,7 +235,7 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
 bool ConfigCnr::isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data)
 {
   
-  if(!data.exerciseId.is_set())
+  if(!data.exerciseId.has_value())
     return true;
 
   const auto activePlans = m_avmDtc->activeFrequencyPlannings();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
index 8a113470c..2745371a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
@@ -75,14 +75,14 @@ WebSocketInterface::Messages::PositionsCnrMessage::PositionsCnrMessageData Posit
 
 QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsForGlobal(const AudioVideoManagement::CnrConfig &config) const
 {
-  bool   isGlobal = !config.exerciseId.is_set();
+  bool   isGlobal = !config.exerciseId.has_value();
   Q_ASSERT(isGlobal);
   return positionsForLocal(config);
 }
 
 QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsFor(const AudioVideoManagement::CnrConfig &config) const
 {
-  bool   isLocal = config.exerciseId.is_set();
+  bool   isLocal = config.exerciseId.has_value();
   if (isLocal)
     return positionsForLocal(config);
   else
@@ -96,11 +96,11 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
   auto   allParticipants = m_ppmDtc->participants();
 
   QSet<int> participantIdsInUnit;
-  if (config.unitId.is_set())
+  if (config.unitId.has_value())
     m_ppmDtc->participantIdsByUnit(config.unitId.get(), allParticipants, participantIdsInUnit);
   else
   {
-    bool   isGlobal = !config.exerciseId.is_set();
+    bool   isGlobal = !config.exerciseId.has_value();
     participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId, isGlobal);
   }
 
@@ -110,7 +110,7 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
   for (int participantId : std::as_const(participantIdsInUnit))
   {
     const ParticipantManagement::Participant   &participant = allParticipants.value(participantId);
-    if (!participant.equipmentNumber.is_set())
+    if (!participant.equipmentNumber.has_value())
       continue;
 
     const ParticipantManagement::Type   &type = m_ppmDtc->type(participant.typeId);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
index a4e6c60d9..36ae660c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
@@ -2,6 +2,7 @@
 
 
 #include "feedGeoJson.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 
 #include <nglapplication/nglcoreapplication.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
index 9cdb96e25..cceee6cfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
@@ -9,6 +9,7 @@
 #include <FeedGeoJson/logger.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
index 0c00637af..84832df6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
@@ -10,6 +10,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
index 8251d9bc6..c129aa6b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
@@ -62,7 +62,7 @@ void AesHandler::onAirSupportImpact(AirSupportImpactModifyRequest asi, int equip
 {
   asi.participantId(m_dtcPpm->participantIdByEquipmentNumber(equipmentNumber));
 
-  if (!asi.externalId().is_set())
+  if (!asi.externalId().has_value())
     return;
 
   m_requestHelper->startSingleRequest([this, asi]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
index ffd5ea52b..1b946c3f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
@@ -7,6 +7,7 @@
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
index 0e9e1914b..31dc3081c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
@@ -30,16 +30,16 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityStateFromDam
   switch(status)
   {
   case rpr2::DamageStatusEnum32::NoDamage:
-    vs = ProjectDataManagement::VulnerabilityState::CombatReady;
+    vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
     break;
   case rpr2::DamageStatusEnum32::SlightDamage:
-    vs = ProjectDataManagement::VulnerabilityState::LightDamage;
+    vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
     break;
   case rpr2::DamageStatusEnum32::ModerateDamage:
-    vs = ProjectDataManagement::VulnerabilityState::HeavyDamage;
+    vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
     break;
   case rpr2::DamageStatusEnum32::Destroyed:
-    vs = ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    vs = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
     break;
   }
 
@@ -61,33 +61,33 @@ rpr2::DamageStatusEnum32::ET DamageModel::damageState(qint64 simTimeMSec) const
     return rpr2::DamageStatusEnum32::NoDamage;
 
   
-  switch (m_vulnerabilityStates.at(idx).vulnerabilityState.underlying())
+  switch (m_vulnerabilityStates.at(idx).vulnerabilityState)
   {
-  case ProjectDataManagement::VulnerabilityState::CombatReady:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
     return rpr2::DamageStatusEnum32::NoDamage;
-  case ProjectDataManagement::VulnerabilityState::LightDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
     return rpr2::DamageStatusEnum32::SlightDamage;
-  case ProjectDataManagement::VulnerabilityState::MediumDamage:
-  case ProjectDataManagement::VulnerabilityState::HeavyDamage:
-  case ProjectDataManagement::VulnerabilityState::MobilityKill:
-  case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
-  case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
-  case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
     return rpr2::DamageStatusEnum32::ModerateDamage;
-  case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
     return rpr2::DamageStatusEnum32::Destroyed;
-  case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
-  case ProjectDataManagement::VulnerabilityState::NearMiss:
-  case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
     return rpr2::DamageStatusEnum32::NoDamage;
-  case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged:
-  case ProjectDataManagement::VulnerabilityState::Reserved:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_Reserved:
     return rpr2::DamageStatusEnum32::NoDamage;
-  case ProjectDataManagement::VulnerabilityState::NContamination:
-  case ProjectDataManagement::VulnerabilityState::BContamination:
-  case ProjectDataManagement::VulnerabilityState::CContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination:
     return rpr2::DamageStatusEnum32::SlightDamage;
-  case ProjectDataManagement::VulnerabilityState::NotReady:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
     return rpr2::DamageStatusEnum32::NoDamage;
   }
   return rpr2::DamageStatusEnum32::NoDamage;
@@ -98,9 +98,9 @@ bool DamageModel::immobilized(qint64 simTimeMSec) const
   int idx = indexForTime(simTimeMSec);
   if (idx < 0)
     return false;
-  if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill ||
-      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill ||
-      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill ||
+      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill ||
+      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     return true;
   return false;
 }
@@ -110,9 +110,9 @@ bool DamageModel::firePowerDisabled(qint64 simTimeMSec) const
   int idx = indexForTime(simTimeMSec);
   if (idx < 0)
     return false;
-  if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::WeaponSystemDamage ||
-      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
-      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage ||
+      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
+      m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     return true;
   return false;
 }
@@ -149,7 +149,7 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
 {
   int idx = indexForTime(simTimeMSec);
   if (idx < 0)
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   return m_vulnerabilityStates.at(idx).vulnerabilityState;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
index 8d1e57169..bad9c5fd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
@@ -26,7 +26,7 @@ public:
   explicit DamageModel(const ProjectDataManagement::VulnerabilityState &state);
   explicit DamageModel(const IdentifierStruct &is, const rpr2::DamageStatusEnum32::ET &status);
   explicit DamageModel(const IdentifierStruct &is)
-    : DamageModel(is, ProjectDataManagement::VulnerabilityState::CombatReady)
+    : DamageModel(is, ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
   {}
 
   const IdentifierStruct &identifierStruct() const { return m_is; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
index 5293902b5..0215f04fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
@@ -3,6 +3,7 @@
 
 
 #include "ngs_connector.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ngs_handler.h"
 #include "ppm_handler.h"
@@ -986,10 +987,10 @@ void NgsConnector::onBaseEntityEntityIdentifierChanged(const rpr2::EntityIdentif
 
 
   GuezHitStruct hs;
-  hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
+  hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
   hs.sampleTime     = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); 
   hs.targetId       = is.entityNumber();
-  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
 
   QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable
   {
@@ -1048,10 +1049,10 @@ void NgsConnector::onEmbeddedSystemEntityIdentifierChanged(const rpr2::EntityIde
 
 
   GuezHitStruct hs;
-  hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
+  hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
   hs.sampleTime     = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); 
   hs.targetId       = is.entityNumber();
-  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
 
   QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable
   {
@@ -1149,11 +1150,11 @@ bool NgsConnector::onDamageStateChanged(const rpr2::EntityIdentifierStruct &eis,
   GuezHitStruct hitStruct;
   hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString();
   hitStruct.originatorId = 0;
-  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
   hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition();
   hitStruct.sampleTime = simTimeMSecs;
   hitStruct.targetId = is.entityNumber();
-  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
   hitStruct.vulnerabilityKind = 0;
 
 
@@ -1317,7 +1318,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
   if (sender > 0)
   {
     state.originatorId(sender);
-    state.originatorType(ProjectDataManagement::StateChangeOriginator::Participant);
+    state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant);
   }
   else
   {
@@ -1326,35 +1327,35 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
     if (source == QLatin1String("excon"))
     {
       state.originatorId(0);
-      state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
+      state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
     }
     else if (source == QLatin1String("cis"))
     {
       state.originatorId(1);
-      state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
+      state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
     }
     else if (source == QLatin1String("greenkey"))
     {
       state.originatorId(0);
-      state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
+      state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
     }
     else if (source == QLatin1String("optical"))
     {
       state.originatorId(0);
-      state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
+      state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
     }
     else
     {
       
       state.originatorId(2);
-      state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
+      state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
     }
   }
   state.sampleTime(simTimeToMSec(interaction.getReceiveTimeStamp()));
   
   DamageModel dm(IdentifierStruct(0), interaction.getResultingDamageState());
   const auto ds = dm.vulnerabilityState(QDateTime::currentMSecsSinceEpoch());
-  state.vulnerabilityBits(1 << ds.underlying());
+  state.vulnerabilityBits(1 << ds);
   state.vulnerabilityKindId();
   state.vulnerabilityState(ds);
 
@@ -1707,17 +1708,17 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
 
 
 
-  switch (originatorType.underlying()) {
-  case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
+  switch (originatorType) {
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
   {
     break;
   }
-  case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
     break;
-  case ProjectDataManagement::StateChangeOriginator::ObserverController:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
     break;
-  case ProjectDataManagement::StateChangeOriginator::Participant:
-    if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
+    if (originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
     {
       if (m_playerMap.contains(originatorEqNo))
         is = IdentifierStruct(originatorEqNo);
@@ -1731,14 +1732,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
       break;
     }
     Q_FALLTHROUGH();
-  case ProjectDataManagement::StateChangeOriginator::Initialization:
-  case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
-  case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-  case ProjectDataManagement::StateChangeOriginator::Unknown:
-  case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
     
-  case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
-  case ProjectDataManagement::StateChangeOriginator::DusMine:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
 
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
index 0cbd68a3d..4e4918dcd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ngs_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include <Common/logger.h>
 #include "ngs_connector.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp
index a6103aa8f..6315d666b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp
@@ -150,7 +150,7 @@ int PpmHandler::getEquipmentNo(int participantId) const
     return 0;
 
   const ParticipantManagement::Participant &p = m_partData[participantId];
-  if (!p.equipmentNumber().is_set())
+  if (!p.equipmentNumber().has_value())
     return 0;
 
   return p.equipmentNumber().get();
@@ -192,7 +192,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
     if (oldStateInfo != newStateInfo)
     {
       m_dynPartData[data.participantId()] = data;
-      if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+      if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
       {
         
         conn->setParticipantHit(equipmentNo,
@@ -202,7 +202,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
                                 newStateInfo.originatorType(),
                                 newStateInfo.originatorId());
       }
-      else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant)
+      else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
       {
         
         conn->setParticipantHit(equipmentNo,
@@ -262,15 +262,15 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
     }
 
     
-    int  oldEqNo = m_partData[data.id()].equipmentNumber().is_set() ? m_partData[data.id()].equipmentNumber().get() : 0;
-    int  newEqNo = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
+    int  oldEqNo = m_partData[data.id()].equipmentNumber().has_value() ? m_partData[data.id()].equipmentNumber().get() : 0;
+    int  newEqNo = data.equipmentNumber().has_value() ? data.equipmentNumber().get() : 0;
     if (oldEqNo != newEqNo)
     {
       removeParticipant(m_partData[data.id()]);
       createParticipant(data);
     }
 
-    if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().is_set())
+    if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().has_value())
       m_ngsHandler->ngsConnector()->setParticipantName(data.equipmentNumber().get(), QString::fromStdString(data.designator()));
 
     m_partData[data.id()] = data;
@@ -286,7 +286,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
   if (it == m_externalEquipmentNumbers.end())
   {
     
-    if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
+    if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
       return;
     int equipNo = data.equipmentNumber().get();
     m_externalEquipmentNumbers.insert(data.id(), equipNo);
@@ -296,7 +296,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
   {
     
     int oldEquipNo = it.value();
-    if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
+    if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
     {
       m_externalEquipmentNumbers.erase(it);
       emit externalEquipmentNumberRemoved(oldEquipNo);
@@ -512,7 +512,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
   const ParticipantManagement::Type partType = getParticipantType(participant.typeId());
   bool bCreated;
-  switch (partType.typeClass().underlying())
+  switch (partType.typeClass())
   {
   case ParticipantManagement::TypeClass::Human:
     bCreated = createHuman(participant);
@@ -544,7 +544,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
 bool PpmHandler::removeParticipant(const ParticipantManagement::Participant &participant)
 {
-  if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0)
+  if (!participant.equipmentNumber().has_value() || participant.equipmentNumber().get() == 0)
     return false;
 
   return m_ngsHandler->ngsConnector()->removeBaseEntity(participant.equipmentNumber().get());
@@ -617,7 +617,7 @@ ProjectDataManagement::VulnerabilityState PpmHandler::currentVulnerabilityState(
       return ts;
     }
   }
-  ts = ProjectDataManagement::VulnerabilityState::TemporarySeverance;
+  ts = ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
   return ts;
 }
 
@@ -728,7 +728,7 @@ int PpmHandler::gearTypeIdFromChargeTypeId(int chargeTypeId)
 rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIdentifier(const ParticipantManagement::HlaForceIdentifierEnum& ppmForceIdentifier) const
 {
   rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other;
-  switch (ppmForceIdentifier.underlying()) {
+  switch (ppmForceIdentifier) {
   case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1:
     eqfi = rpr2::ForceIdentifierEnum8::Friendly;
     break;
@@ -899,7 +899,7 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct)
   TrainingAreaBase::EquipmentState es;
   es.equipmentNumber(hitStruct.targetId);
   es.originatorChargeTypeId(ct.id());
-  if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+  if (hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
   {
     int aesItemId = 0;
     if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown)
@@ -971,7 +971,7 @@ void PpmHandler::onEquipmentState(const TrainingAreaBase::EquipmentState &event)
 
 bool PpmHandler::onExconEngagement(int eqNo, const ProjectDataManagement::VulnerabilityState &state)
 {
-  if (state != ProjectDataManagement::VulnerabilityState::CombatReady)
+  if (state != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
   {
     TrainingAreaBase::DemandVulnerabilityStateChangeRequest req;
     req.equipmentNumbers().push_back(eqNo);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
index a92b988e9..dd5599295 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
@@ -6,6 +6,7 @@
 #include <QtCore/QSet>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.cpp
index 2fc82d242..c4e66d65a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.cpp
@@ -15,8 +15,7 @@ namespace HighLevelArchitecture {
 SocketReader::SocketReader(QObject *parent) : QThread(parent)
   , m_socket(new QTcpSocket(this))
   , m_hlaRequestIdentifier(0)
-  .getNGLLogger("SocketReader")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }
 
 bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
index ebd528ca3..ba36b77c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "web_socket_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantinformation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantinformation.cpp
index 76ba316c5..0df64fbba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantinformation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantinformation.cpp
@@ -10,7 +10,7 @@ ParticipantInformation::ParticipantInformation(const ParticipantManagement::Part
                                                const TypeStruct &_typestruct,
                                                const ParticipantPosition &_position)
   : participantId(participant.id())
-  , equipmentNo(participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0)
+  , equipmentNo(participant.equipmentNumber().has_value() ? participant.equipmentNumber().get() : 0)
   , partyId(participant.partyId())
   , parentId(participant.superiorId())
   , typeStruct(_typestruct)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
index b74778ff5..9406aa6e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
@@ -187,7 +187,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
                         << "\nboundingBoxBottomLeft: " << ParticipantPosition(data.boundingBoxBottomLeft()).toString()
                         << "\nboundingBoxTopRight: " << ParticipantPosition(data.boundingBoxTopRight()).toString()
                         << "\neffectStateId: " << toString(data.effectStateId())
-                        << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                        << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
                         << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                         << "\neffectStart: " << data.effectStart() << "\n";
   }
@@ -212,7 +212,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
   
   else if (data.aesTypeId() == AesType::AtBCContamination)
   {
-    m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
+    m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId(), data.form());
     DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
   }
 }
@@ -260,7 +260,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
   if (chargeTypeId <= 0)
     return;
 
-  rpr2::ForceIdentifierEnum8::ET forceId = aesItemView.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(aesItemView.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
+  rpr2::ForceIdentifierEnum8::ET forceId = aesItemView.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(aesItemView.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
 
   for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
   {
@@ -303,8 +303,8 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
 
   
   
-  if (!exCluster.partyId().is_set() &&
-     (!exCluster.participantId().is_set() || exCluster.participantId().get() <= 0))
+  if (!exCluster.partyId().has_value() &&
+     (!exCluster.participantId().has_value() || exCluster.participantId().get() <= 0))
     return;
 
   const int chargeTypeId = exCluster.chargeStruct().chargeTypeId();
@@ -316,7 +316,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
   
 
   
-  const rpr2::ForceIdentifierEnum8::ET forceId = exCluster.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(exCluster.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
+  const rpr2::ForceIdentifierEnum8::ET forceId = exCluster.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(exCluster.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
 
 
   int curSeIndex = -1;
@@ -359,10 +359,10 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
                       << "\nsampleTime: " << data.sampleTime()
                       << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                       << "\neffectDuration: " << data.effectDuration()
-                      << "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
+                      << "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
                       << "\neffectStateId: " << toString(data.effectStateId())
-                      << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
-                      << "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
+                      << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                      << "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
                       << "\nimpactPosition: " << ParticipantPosition(data.impactPosition()).toString()
                       << "\nfireRequestTime: " << data.fireRequestTime()
                       << "\naltitude: " << data.altitude()
@@ -372,13 +372,13 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
     return;
 
   
-  if (!data.partyId().is_set() &&
-     (!data.participantId().is_set() || data.participantId().get() <= 0))
+  if (!data.partyId().has_value() &&
+     (!data.participantId().has_value() || data.participantId().get() <= 0))
     return;
 
   
-  ParticipantPosition pos(data.impactPosition(), data.effectStart().is_set() ? data.effectStart().get() : data.sampleTime());
-  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
+  ParticipantPosition pos(data.impactPosition(), data.effectStart().has_value() ? data.effectStart().get() : data.sampleTime());
+  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
   m_ngsHandler->ngsConnector()->sendMunitionDetonation(pos, data.chargeStruct().chargeTypeId(), forceId);
 
 }
@@ -397,10 +397,10 @@ void AesHandler::onAesMineAreaChanged(const MineArea &data, DataModification mod
                       << "\nsampleTime: " << data.sampleTime()
                       << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                       << "\neffectDuration: " << data.effectDuration()
-                      << "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
+                      << "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
                       << "\neffectStateId: " << toString(data.effectStateId())
-                      << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
-                      << "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
+                      << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                      << "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
                       << "\n";
 
   m_ngsHandler->ngsConnector()->guezMineField(data);
@@ -420,10 +420,10 @@ void AesHandler::onAesMineCorridorChanged(const MineCorridor &data, DataModifica
                       << "\nsampleTime: " << data.sampleTime()
                       << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                       << "\neffectDuration: " << data.effectDuration()
-                      << "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
+                      << "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
                       << "\neffectStateId: " << toString(data.effectStateId())
-                      << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
-                      << "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
+                      << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                      << "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
                       << "\n";
 
   m_ngsHandler->ngsConnector()->guezMineFieldBreach(data);
@@ -445,10 +445,10 @@ void AesHandler::onAesNContaminationChanged(const NContamination &data, DataModi
                       << "\nsampleTime: " << data.sampleTime()
                       << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                       << "\neffectDuration: " << data.effectDuration()
-                      << "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
+                      << "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
                       << "\neffectStateId: " << toString(data.effectStateId())
-                      << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
-                      << "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
+                      << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                      << "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
                       << "\n";
 
 }
@@ -468,10 +468,10 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
                       << "\nsampleTime: " << data.sampleTime()
                       << "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
                       << "\neffectDuration: " << data.effectDuration()
-                      << "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
+                      << "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
                       << "\neffectStateId: " << toString(data.effectStateId())
-                      << "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
-                      << "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
+                      << "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
+                      << "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
                       << "\n";
 
 }
@@ -491,7 +491,7 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
   int aesItemId = 0;
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -565,7 +565,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
 
   DEBUG_LOG(m_logger) << "Remove Item for " << aesItemId << " requested. Type: " << type;
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -627,7 +627,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
   if (msecsSinceEpoch < earliest && msecsSinceEpoch > 0)
     msecsSinceEpoch = earliest;
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -637,7 +637,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
     if (!req)
     {
       AreaEffectSimulation::MineCorridor item = m_dtcAes->mineCorridor(aesItemId);
-      if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
+      if ((item.effectStart().has_value() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
         return;
       req = makeMinefieldBreachRequest(item);
       addRequestToQueue(aesItemId, req);
@@ -653,7 +653,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
     {
       DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea - Request NOT found";
       AreaEffectSimulation::MineArea item = m_dtcAes->mineArea(aesItemId);
-      if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
+      if ((item.effectStart().has_value() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
         return;
       req = makeMinefieldRequest(item);
       addRequestToQueue(aesItemId, req);
@@ -699,7 +699,7 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
   int aesItemId = 0;
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -782,7 +782,7 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
   int aesItemId = 0;
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -854,7 +854,7 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
   int aesItemId = 0;
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -960,7 +960,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
 
   DEBUG_LOG(m_logger) << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
 
-  switch (type.underlying())
+  switch (type)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     break;
@@ -1061,7 +1061,7 @@ void AesHandler::onSendRequest(const MineAreaModifyRequest &item)
 
 bool AesHandler::onNewMinefieldBreach(const MineCorridorModifyRequest &mc)
 {
-  if (!mc.externalId().is_set())
+  if (!mc.externalId().has_value())
     return false;
 
   return m_requestHelper->startSingleRequest([this, mc]()
@@ -1077,7 +1077,7 @@ void AesHandler::onSendRequest(const MineCorridorModifyRequest &item)
 
 void AesHandler::onMunitionDetonation(const ExplosionSingleModifyRequest &es)
 {
-  if (!es.externalId().is_set())
+  if (!es.externalId().has_value())
     return;
 
   m_requestHelper->startSingleRequest([this, es]()
@@ -1089,7 +1089,7 @@ void AesHandler::onMunitionDetonation(const ExplosionSingleModifyRequest &es)
 #ifdef SUPPORT_EXPLOSION_CLUSTER_SINGLE_EFFECT
 void AesHandler::onMunitionDetonationExplosionClusterSingleEffect(const ExplosionClusterSingleEffectOnlyRequest &es)
 {
-  if (!es.externalId().is_set())
+  if (!es.externalId().has_value())
     return;
 
   m_requestHelper->startSingleRequest([this, es]()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
index 1cb5584e8..9b5ba992d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
@@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
 {
   int idx = indexForTime(simTimeMSec);
   if (idx < 0)
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   switch (m_tacticalStates.at(idx).tss.TacticalStatus)
   {
   case rpr2::TacticalStatusEnum8::CombatReady:
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   case rpr2::TacticalStatusEnum8::LightHit:
-    return ProjectDataManagement::VulnerabilityState::LightDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
   case rpr2::TacticalStatusEnum8::MediumHit:
-    return ProjectDataManagement::VulnerabilityState::MediumDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage;
   case rpr2::TacticalStatusEnum8::HeavyHit:
-    return ProjectDataManagement::VulnerabilityState::HeavyDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
   case rpr2::TacticalStatusEnum8::Immobilized:
-    return ProjectDataManagement::VulnerabilityState::MobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill;
   case rpr2::TacticalStatusEnum8::ImmobilizedVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
   case rpr2::TacticalStatusEnum8::WeaponKill:
-    return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
   case rpr2::TacticalStatusEnum8::WeaponKillVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
   case rpr2::TacticalStatusEnum8::TotalKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::TacticalStatusEnum8::TemporaryFailure:
-    return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
   case rpr2::TacticalStatusEnum8::NearMiss:
-    return ProjectDataManagement::VulnerabilityState::NearMiss;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss;
   case rpr2::TacticalStatusEnum8::HitWithoutEffect:
-    return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect;
   }
-  return ProjectDataManagement::VulnerabilityState::CombatReady;
+  return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 }
 
 int DamageModel::indexForTime(qint64 simTimeMSec) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
index cad4dbf7d..a8760a8e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
@@ -3,6 +3,7 @@
 
 
 #include "ngs_connector.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ngs_handler.h"
 #include "ppm_handler.h"
@@ -693,7 +694,7 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data)
         << ", number of segments reduced, removing earlier published segment";
   }
 
-  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
+  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
 
   m_environmentObjects.remove(data.id());
   for (int i = 0; i < minefields.size(); ++i)
@@ -704,10 +705,10 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data)
 
     const AreaEffectSimulation::MineSegment &segment = data.segments()[i];
 
-    icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
-    icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
-    if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
-        data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
+    icb->setActivationTime(getClockTimeStruct(data.effectStart().has_value() ? data.effectStart().get() : 0));
+    icb->setDeactivated(data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated);
+    if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
+        data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
       icb->setPercentComplete(100);
     else
       icb->setPercentComplete(0);
@@ -796,12 +797,12 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor
     rpr2::IPlayerGuezMineFieldBreachObjInstance *icb = map.value(i);
     if (!icb)
       continue; 
-    icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
+    icb->setActivationTime(getClockTimeStruct(data.effectStart().has_value() ? data.effectStart().get() : 0));
     icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name()));
     icb->setPointsData(positionArray(mineCorridorSegment(data.segments().at(i), data.segments().at(i + 1), data.width())));
-    icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
-    if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
-        data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
+    icb->setDeactivated(data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated);
+    if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
+        data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
       icb->setPercentComplete(100);
     else
       icb->setPercentComplete(0);
@@ -853,7 +854,7 @@ bool NgsConnector::guezNuclearAgent(const AreaEffectSimulation::NContamination &
   
   is.setEntityNumber(10 * data.id());
   icb->setObjectIdentifier(is.toEIS());
-  icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
+  icb->setActivationTime(getClockTimeStruct(data.effectStart().has_value() ? data.effectStart().get() : 0));
   icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name()));
   icb->setDuration(data.effectDuration());
   icb->setDetonationLocation(pos.toWorldLocation());
@@ -922,20 +923,20 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination
   }
   is.setEntityNumber(10 * data.id());
   icb->setObjectIdentifier(is.toEIS());
-  icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
-  icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
+  icb->setDeactivated(data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated);
+  icb->setActivationTime(getClockTimeStruct(data.effectStart().has_value() ? data.effectStart().get() : 0));
   icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name()));
   icb->setDuration(data.effectDuration() / 1000 / 60); 
   icb->setDetonationLocation(pos.toWorldLocation());
-  if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
-      data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
+  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
+      data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
     icb->setPercentComplete(100);
   else
     icb->setPercentComplete(0);
   
   icb->setChemicalAgentType(type);
   icb->setRadius(data.impactRadius());
-  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
+  rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
   icb->setForceIdentifier(forceId);
   icb->setIsPermanentAgent(type != rpr2::ChemicalAgentTypeEnum8::Sarin);
   icb->setObjectType(dummyEOS());
@@ -1575,35 +1576,35 @@ rpr2::ArrayOfHLAoctetN_slsh_AperfectalwaysN_slsh_ADynamicHLApaddingTo32Array Ngs
 
 rpr2::HitResultEnum16::ET NgsConnector::getHitResultEnum(const ProjectDataManagement::VulnerabilityState &ts)
 {
-  switch (ts.underlying())
+  switch (ts)
   {
-  case ProjectDataManagement::VulnerabilityState::CombatReady:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
     return rpr2::HitResultEnum16::Reset;
-  case ProjectDataManagement::VulnerabilityState::LightDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
     return rpr2::HitResultEnum16::LightDamage;
-  case ProjectDataManagement::VulnerabilityState::MediumDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
     return rpr2::HitResultEnum16::MediumDamage;
-  case ProjectDataManagement::VulnerabilityState::HeavyDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
     return rpr2::HitResultEnum16::HeavyDamage;
-  case ProjectDataManagement::VulnerabilityState::MobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
     return rpr2::HitResultEnum16::MobilityKill;
-  case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
     return rpr2::HitResultEnum16::MobilityKillVisible;
-  case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
     return rpr2::HitResultEnum16::WeaponDamage;
-  case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
     return rpr2::HitResultEnum16::WeaponDamageVisible;
-  case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
     return rpr2::HitResultEnum16::TotalKill;
-  case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
     return rpr2::HitResultEnum16::TemporaryFailure;
-  case ProjectDataManagement::VulnerabilityState::NearMiss:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
     return rpr2::HitResultEnum16::NearMiss;
-  case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
     return rpr2::HitResultEnum16::HitWithNoEffect;
-  case ProjectDataManagement::VulnerabilityState::NContamination:
-  case ProjectDataManagement::VulnerabilityState::BContamination:
-  case ProjectDataManagement::VulnerabilityState::CContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination:
     return rpr2::HitResultEnum16::Contaminated;
   default:
     return rpr2::HitResultEnum16::Reset;
@@ -1616,37 +1617,37 @@ ProjectDataManagement::VulnerabilityState NgsConnector::getTacticalStatusEnum(co
   switch (hr)
   {
   case rpr2::HitResultEnum16::Reset:
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   case rpr2::HitResultEnum16::LightDamage:
-    return ProjectDataManagement::VulnerabilityState::LightDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
   case rpr2::HitResultEnum16::MediumDamage:
-    return ProjectDataManagement::VulnerabilityState::MediumDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage;
   case rpr2::HitResultEnum16::HeavyDamage:
-    return ProjectDataManagement::VulnerabilityState::HeavyDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
   case rpr2::HitResultEnum16::MobilityKill:
-    return ProjectDataManagement::VulnerabilityState::MobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill;
   case rpr2::HitResultEnum16::MobilityKillVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
   case rpr2::HitResultEnum16::WeaponDamage:
-    return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
   case rpr2::HitResultEnum16::WeaponDamageVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
   case rpr2::HitResultEnum16::TotalKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::HitResultEnum16::CheatingKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::HitResultEnum16::NearMiss:
-    return ProjectDataManagement::VulnerabilityState::NearMiss;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss;
   case rpr2::HitResultEnum16::HitWithNoEffect:
-    return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect;
   case rpr2::HitResultEnum16::Contaminated:
-    return ProjectDataManagement::VulnerabilityState::CContamination;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination;
   case rpr2::HitResultEnum16::TemporaryFailure:
-    return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
   default:
-    return ProjectDataManagement::VulnerabilityState::NoChange;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange;
   }
-  return ProjectDataManagement::VulnerabilityState::NoChange;
+  return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange;
 }
 
 QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::UtmCoordinate &base)
@@ -1681,10 +1682,10 @@ void NgsConnector::onEntityIdentifierChanged(const rpr2::EntityIdentifierStruct
 
 
   GuezHitStruct hs;
-  hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
+  hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
   hs.sampleTime     = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); 
   hs.targetId       = is.entityNumber();
-  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
 
   QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj]() mutable
   {
@@ -2083,11 +2084,11 @@ bool NgsConnector::onTacticalStatusChanged(const rpr2::EntityIdentifierStruct &e
   GuezHitStruct hitStruct;
   hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString();
   hitStruct.originatorId = 0;
-  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
   hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition();
   hitStruct.sampleTime = simTimeMSecs;
   hitStruct.targetId = is.entityNumber();
-  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
   hitStruct.vulnerabilityKind = 0;
 
   const auto vulnerabilityBits = m_damageModelMap[is.entityNumber()]->totalState(hitStruct.sampleTime);
@@ -2423,31 +2424,31 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
   GuezHitStruct hitStruct;
   hitStruct.originatorChargeTypeEtsString = TypeStruct(interaction.getMunition()).toString();
   hitStruct.originatorId = interaction.getOriginatorIdentifier().EntityNumber;
-  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
   switch (interaction.getOriginatorType())
   {
   case rpr2::OriginatorTypeEnum16::Unknown:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
     break;
   case rpr2::OriginatorTypeEnum16::NoMedicalTreatment: 
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
     if (hitStruct.originatorId == 0)  
       hitStruct.originatorId   = hitStruct.targetId;
     break;
   case rpr2::OriginatorTypeEnum16::Participant:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
     if (hitStruct.originatorId == 0)  
-      hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
+      hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl;
     break;
   case rpr2::OriginatorTypeEnum16::AreaEffectSimulation:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation;
     hitStruct.originatorId = IdentifierStruct(interaction.getOriginatorIdentifier()).toInt64();
     break;
   case rpr2::OriginatorTypeEnum16::ObserverController:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ObserverController;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController;
     break;
   case rpr2::OriginatorTypeEnum16::ExerciseControl:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl;
     break;
   }
   hitStruct.position = ParticipantPosition(interaction.getTargetLocation()).toGeoPosition();
@@ -2458,16 +2459,16 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
   hitStruct.vulnerabilityState = getTacticalStatusEnum(interaction.getHitResult());
 
   
-  if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ExerciseControl ||
-       hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ObserverController
+  if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl ||
+       hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController
        )
-      && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::HitWithNoEffect)
+      && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
   {
     auto ptr = m_damageModelMap.value(eqNo);
     if (ptr)
     {
       hitStruct.vulnerabilityState = ptr->vulnerabilityState(hitStruct.sampleTime);
-      if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
+      if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
         ptr->setTacticalStatus(rpr2::HitResultEnum16::Reset, simTimeToMSec(interaction.getReceiveTimeStamp()));
     }
   }
@@ -2642,7 +2643,7 @@ rpr2::EventIdentifierStruct NgsConnector::getEventIdentifierStruct()
 rpr2::TacticalStatusStruct NgsConnector::getTacticalStatusFromState(const ParticipantManagement::StateInformation &state)
 {
   rpr2::TacticalStatusStruct ts;
-  ts.TacticalStatus    = static_cast<rpr2::TacticalStatusEnum8::ET>(state.vulnerabilityState().underlying());
+  ts.TacticalStatus    = static_cast<rpr2::TacticalStatusEnum8::ET>(state.vulnerabilityState());
   ts.TotalStatus       = static_cast<rpr2::TotalStatusEnum32::ET>(state.vulnerabilityBits());
   ts.VulnerabilityKind = state.vulnerabilityKindId();
   return ts;
@@ -2712,9 +2713,9 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
 
   rpr2::OriginatorTypeEnum16::ET originatorTypeRpr = rpr2::OriginatorTypeEnum16::Unknown;
 
-  switch (originatorType.underlying())
+  switch (originatorType)
   {
-  case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
   {
     if (m_environmentObjects.contains(originatorEqNo)) 
       is = IdentifierStruct(10 * originatorEqNo);
@@ -2734,14 +2735,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
     originatorTypeRpr = rpr2::OriginatorTypeEnum16::AreaEffectSimulation;
     break;
   }
-  case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
     originatorTypeRpr = rpr2::OriginatorTypeEnum16::ExerciseControl;
     break;
-  case ProjectDataManagement::StateChangeOriginator::ObserverController:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
     originatorTypeRpr = rpr2::OriginatorTypeEnum16::ObserverController;
     break;
-  case ProjectDataManagement::StateChangeOriginator::Participant:
-    if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
+    if (originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
     {
       if (m_playerMap.contains(originatorEqNo))
         is = IdentifierStruct(originatorEqNo);
@@ -2756,16 +2757,16 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
       break;
     }
     Q_FALLTHROUGH();
-  case ProjectDataManagement::StateChangeOriginator::Initialization:
-  case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
-  case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-  case ProjectDataManagement::StateChangeOriginator::Unknown:
-  case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-  case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-  case ProjectDataManagement::StateChangeOriginator::Sanitation:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
   
-  case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
-  case ProjectDataManagement::StateChangeOriginator::DusMine:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
+  case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
     originatorTypeRpr = rpr2::OriginatorTypeEnum16::Unknown;
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
index 12ca07c29..7ea70d427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ngs_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ngs_connector.h"
 #include <Common/logger.h>
 #include <Common/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp
index 4c4b271f2..e1453dc79 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp
@@ -154,7 +154,7 @@ int PpmHandler::getEquipmentNo(int participantId) const
     return 0;
 
   const ParticipantManagement::Participant &p = m_partData[participantId];
-  if (!p.equipmentNumber().is_set())
+  if (!p.equipmentNumber().has_value())
     return 0;
 
   return p.equipmentNumber().get();
@@ -196,7 +196,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
     if (oldStateInfo != newStateInfo)
     {
       m_dynPartData[data.participantId()] = data;
-      if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+      if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
       {
         
         conn->setParticipantHit(equipmentNo,
@@ -206,7 +206,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
                                 newStateInfo.originatorType(),
                                 newStateInfo.originatorId());
       }
-      else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant)
+      else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
       {
         
         conn->setParticipantHit(equipmentNo,
@@ -282,18 +282,18 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
     }
 
     
-    int  oldEqNo = m_partData[data.id()].equipmentNumber().is_set() ? m_partData[data.id()].equipmentNumber().get() : 0;
-    int  newEqNo = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
+    int  oldEqNo = m_partData[data.id()].equipmentNumber().has_value() ? m_partData[data.id()].equipmentNumber().get() : 0;
+    int  newEqNo = data.equipmentNumber().has_value() ? data.equipmentNumber().get() : 0;
     if (oldEqNo != newEqNo)
     {
       removeParticipant(m_partData[data.id()]);
       createParticipant(data);
     }
 
-    if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().is_set())
+    if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().has_value())
       m_ngsHandler->ngsConnector()->setParticipantName(data.equipmentNumber().get(), QString::fromStdString(data.designator()));
 
-    if (m_partData[data.id()].partyId() != data.partyId() && data.equipmentNumber().is_set())
+    if (m_partData[data.id()].partyId() != data.partyId() && data.equipmentNumber().has_value())
       m_ngsHandler->ngsConnector()->setParticipantForce(data.equipmentNumber().get(), forceIdentifierFromPartyId(data.partyId()));
 
     m_partData[data.id()] = data;
@@ -309,7 +309,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
   if (it == m_externalEquipmentNumbers.end())
   {
     
-    if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
+    if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
       return;
     int equipNo = data.equipmentNumber().get();
     m_externalEquipmentNumbers.insert(data.id(), equipNo);
@@ -319,7 +319,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
   {
     
     int oldEquipNo = it.value();
-    if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
+    if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
     {
       m_externalEquipmentNumbers.erase(it);
       emit externalEquipmentNumberRemoved(oldEquipNo);
@@ -349,7 +349,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
       if (eqNo == 0)
         return;
       ParticipantPosition pos(data.pos(), data.sampleTime());
-      int mountedOnEqNo = data.mountedOn().is_set() ? getEquipmentNo(data.mountedOn().get()) : 0;
+      int mountedOnEqNo = data.mountedOn().has_value() ? getEquipmentNo(data.mountedOn().get()) : 0;
       m_ngsHandler->ngsConnector()->setWorldLocation(eqNo, pos, mountedOnEqNo);
     }
     m_partPosData[data.participantId()] = data;
@@ -381,8 +381,8 @@ void PpmHandler::onParticipantReceivedInit(int eqId, qint64 simTimeMSecs)
   init.equipmentNumber(eqId);
   init.sampleTime(simTimeMSecs);
   init.vulnerabilityBits(1);
-  init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
-  init.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
+  init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+  init.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
   m_dtsTab->publish(init);
 }
 
@@ -474,7 +474,7 @@ void PpmHandler::participantBiteRequest(const TrainingAreaBase::TetraIcd::Demand
 void PpmHandler::createParticipant(const ParticipantManagement::Participant &participant)
 {
   
-  if (participant.externalId() > 0 || !participant.equipmentNumber().is_set() || participant.isDeleted() || participant.equipmentNumber().get() == 0)
+  if (participant.externalId() > 0 || !participant.equipmentNumber().has_value() || participant.isDeleted() || participant.equipmentNumber().get() == 0)
     return;
 
   if (!m_ngsHandler->ngsConnector()->canPublishData())
@@ -488,7 +488,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
   const ParticipantManagement::Type partType = getParticipantType(participant.typeId());
   bool bCreated;
-  switch (partType.typeClass().underlying())
+  switch (partType.typeClass())
   {
   case ParticipantManagement::TypeClass::Human:
     bCreated = createHuman(participant);
@@ -513,7 +513,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
 bool PpmHandler::removeParticipant(const ParticipantManagement::Participant &participant)
 {
-  if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0)
+  if (!participant.equipmentNumber().has_value() || participant.equipmentNumber().get() == 0)
     return false;
 
   return m_ngsHandler->ngsConnector()->removeBaseEntity(participant.equipmentNumber().get());
@@ -578,7 +578,7 @@ rpr2::TacticalStatusStruct PpmHandler::currentTacticalStatus(int participantId)
         if (sh.at(idxCurrent).stateTime() < sh.at(i).stateTime())
           idxCurrent = i;
       }
-      ts.TacticalStatus    = static_cast<rpr2::TacticalStatusEnum8::ET>(sh.at(idxCurrent).vulnerabilityState().underlying());
+      ts.TacticalStatus    = static_cast<rpr2::TacticalStatusEnum8::ET>(sh.at(idxCurrent).vulnerabilityState());
       ts.VulnerabilityKind = sh.at(idxCurrent).vulnerabilityKindId();
       ts.TotalStatus       = static_cast<rpr2::TotalStatusEnum32::ET>(sh.at(idxCurrent).vulnerabilityBits());
       return ts;
@@ -660,7 +660,7 @@ ProjectDataManagement::ChargeType PpmHandler::chargeTypeFromDisEntity(const std:
 rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIdentifier(const ParticipantManagement::HlaForceIdentifierEnum& ppmForceIdentifier) const
 {
   rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other;
-  switch (ppmForceIdentifier.underlying()) {
+  switch (ppmForceIdentifier) {
   case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1:
     eqfi = rpr2::ForceIdentifierEnum8::Friendly;
     break;
@@ -831,7 +831,7 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct)
   TrainingAreaBase::EquipmentState es;
   es.equipmentNumber(hitStruct.targetId);
   es.originatorChargeTypeId(ct.id());
-  if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+  if (hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
   {
     int aesItemId = 0;
     if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown)
@@ -906,7 +906,7 @@ void PpmHandler::onIsPartOfChanged(int eqNo, int eqNoHost, qint64 simTimeMSecs)
     TrainingAreaBase::EquipmentPosition &newHost = m_observerPositions[eqNoHost];
 
     
-    auto mountedParticipants = newHost.mountedParticipants().is_set() ? newHost.mountedParticipants().get() : std::vector<int32_t>();
+    auto mountedParticipants = newHost.mountedParticipants().has_value() ? newHost.mountedParticipants().get() : std::vector<int32_t>();
     
     mountedParticipants.push_back(eqNo);
 
@@ -925,7 +925,7 @@ void PpmHandler::onIsPartOfChanged(int eqNo, int eqNoHost, qint64 simTimeMSecs)
     TrainingAreaBase::EquipmentPosition &oldHost = m_observerPositions[eqNoOldHost];
 
     
-    if (!oldHost.mountedParticipants().is_set())
+    if (!oldHost.mountedParticipants().has_value())
       return;
 
     
@@ -968,16 +968,16 @@ bool PpmHandler::onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::Acti
   bool bNoChange = false;
   switch (aho) {
   case rpr2::ActivateHelmetObservationEnum8::WithoutHelmetWithoutVest:
-    helmet = ProjectDataManagement::WphMode::Without;
-    vest   = ProjectDataManagement::WphMode::Without;
+    helmet = ProjectDataManagement::WphMode::WphMode_Without;
+    vest   = ProjectDataManagement::WphMode::WphMode_Without;
     break;
   case rpr2::ActivateHelmetObservationEnum8::HelmetWithoutVest:
-    helmet = ProjectDataManagement::WphMode::With;
-    vest   = ProjectDataManagement::WphMode::Without;
+    helmet = ProjectDataManagement::WphMode::WphMode_With;
+    vest   = ProjectDataManagement::WphMode::WphMode_Without;
     break;
   case rpr2::ActivateHelmetObservationEnum8::HelmetAndVest:
-    helmet = ProjectDataManagement::WphMode::With;
-    vest   = ProjectDataManagement::WphMode::With;
+    helmet = ProjectDataManagement::WphMode::WphMode_With;
+    vest   = ProjectDataManagement::WphMode::WphMode_With;
     break;
   case rpr2::ActivateHelmetObservationEnum8::NoChange:
     helmet = ProjectDataManagement::WphMode::NoChange;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
index 24f31df93..bfd483028 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
@@ -6,6 +6,7 @@
 #include <QtCore/QSet>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
index facea3745..9aa30a445 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "web_socket_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
index 1cb5584e8..9b5ba992d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
@@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
 {
   int idx = indexForTime(simTimeMSec);
   if (idx < 0)
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   switch (m_tacticalStates.at(idx).tss.TacticalStatus)
   {
   case rpr2::TacticalStatusEnum8::CombatReady:
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   case rpr2::TacticalStatusEnum8::LightHit:
-    return ProjectDataManagement::VulnerabilityState::LightDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
   case rpr2::TacticalStatusEnum8::MediumHit:
-    return ProjectDataManagement::VulnerabilityState::MediumDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage;
   case rpr2::TacticalStatusEnum8::HeavyHit:
-    return ProjectDataManagement::VulnerabilityState::HeavyDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
   case rpr2::TacticalStatusEnum8::Immobilized:
-    return ProjectDataManagement::VulnerabilityState::MobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill;
   case rpr2::TacticalStatusEnum8::ImmobilizedVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
   case rpr2::TacticalStatusEnum8::WeaponKill:
-    return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
   case rpr2::TacticalStatusEnum8::WeaponKillVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
   case rpr2::TacticalStatusEnum8::TotalKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::TacticalStatusEnum8::TemporaryFailure:
-    return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
   case rpr2::TacticalStatusEnum8::NearMiss:
-    return ProjectDataManagement::VulnerabilityState::NearMiss;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss;
   case rpr2::TacticalStatusEnum8::HitWithoutEffect:
-    return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect;
   }
-  return ProjectDataManagement::VulnerabilityState::CombatReady;
+  return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 }
 
 int DamageModel::indexForTime(qint64 simTimeMSec) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
index c13cdbade..492d42b4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
@@ -3,6 +3,7 @@
 
 
 #include "ngs_connector.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ngs_handler.h"
 #include "damage_model.h"
@@ -1229,35 +1230,35 @@ rpr2::ArrayOfHLAoctetN_slsh_AperfectalwaysN_slsh_ADynamicHLApaddingTo32Array Ngs
 
 rpr2::HitResultEnum16::ET NgsConnector::getHitResultEnum(const ProjectDataManagement::VulnerabilityState &ts)
 {
-  switch (ts.underlying())
+  switch (ts)
   {
-  case ProjectDataManagement::VulnerabilityState::CombatReady:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
     return rpr2::HitResultEnum16::Reset;
-  case ProjectDataManagement::VulnerabilityState::LightDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
     return rpr2::HitResultEnum16::LightDamage;
-  case ProjectDataManagement::VulnerabilityState::MediumDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
     return rpr2::HitResultEnum16::MediumDamage;
-  case ProjectDataManagement::VulnerabilityState::HeavyDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
     return rpr2::HitResultEnum16::HeavyDamage;
-  case ProjectDataManagement::VulnerabilityState::MobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
     return rpr2::HitResultEnum16::MobilityKill;
-  case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
     return rpr2::HitResultEnum16::MobilityKillVisible;
-  case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
     return rpr2::HitResultEnum16::WeaponDamage;
-  case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
     return rpr2::HitResultEnum16::WeaponDamageVisible;
-  case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
     return rpr2::HitResultEnum16::TotalKill;
-  case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
     return rpr2::HitResultEnum16::TemporaryFailure;
-  case ProjectDataManagement::VulnerabilityState::NearMiss:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
     return rpr2::HitResultEnum16::NearMiss;
-  case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
     return rpr2::HitResultEnum16::HitWithNoEffect;
-  case ProjectDataManagement::VulnerabilityState::NContamination:
-  case ProjectDataManagement::VulnerabilityState::BContamination:
-  case ProjectDataManagement::VulnerabilityState::CContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination:
     return rpr2::HitResultEnum16::Contaminated;
   default:
     return rpr2::HitResultEnum16::Reset;
@@ -1270,37 +1271,37 @@ ProjectDataManagement::VulnerabilityState NgsConnector::getTacticalStatusEnum(co
   switch (hr)
   {
   case rpr2::HitResultEnum16::Reset:
-    return ProjectDataManagement::VulnerabilityState::CombatReady;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
   case rpr2::HitResultEnum16::LightDamage:
-    return ProjectDataManagement::VulnerabilityState::LightDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage;
   case rpr2::HitResultEnum16::MediumDamage:
-    return ProjectDataManagement::VulnerabilityState::MediumDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage;
   case rpr2::HitResultEnum16::HeavyDamage:
-    return ProjectDataManagement::VulnerabilityState::HeavyDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage;
   case rpr2::HitResultEnum16::MobilityKill:
-    return ProjectDataManagement::VulnerabilityState::MobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill;
   case rpr2::HitResultEnum16::MobilityKillVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
   case rpr2::HitResultEnum16::WeaponDamage:
-    return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
   case rpr2::HitResultEnum16::WeaponDamageVisible:
-    return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
   case rpr2::HitResultEnum16::TotalKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::HitResultEnum16::CheatingKill:
-    return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   case rpr2::HitResultEnum16::NearMiss:
-    return ProjectDataManagement::VulnerabilityState::NearMiss;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss;
   case rpr2::HitResultEnum16::HitWithNoEffect:
-    return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect;
   case rpr2::HitResultEnum16::Contaminated:
-    return ProjectDataManagement::VulnerabilityState::CContamination;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination;
   case rpr2::HitResultEnum16::TemporaryFailure:
-    return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
   default:
-    return ProjectDataManagement::VulnerabilityState::NoChange;
+    return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange;
   }
-  return ProjectDataManagement::VulnerabilityState::NoChange;
+  return ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange;
 }
 
 QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::UtmCoordinate &base)
@@ -1335,10 +1336,10 @@ void NgsConnector::onEntityIdentifierChanged(const rpr2::EntityIdentifierStruct
 
 
   GuezHitStruct hs;
-  hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
+  hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
   hs.sampleTime     = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); 
   hs.targetId       = is.entityNumber();
-  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
 
   QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj]() mutable
   {
@@ -1619,11 +1620,11 @@ bool NgsConnector::onTacticalStatusChanged(const rpr2::EntityIdentifierStruct &e
   GuezHitStruct hitStruct;
   hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString();
   hitStruct.originatorId = 0;
-  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
   hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition();
   hitStruct.sampleTime = simTimeMSecs;
   hitStruct.targetId = is.entityNumber();
-  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; 
+  hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged; 
   hitStruct.vulnerabilityKind = 0;
 
   const auto vulnerabilityBits = m_damageModelMap[is.entityNumber()]->totalState(hitStruct.sampleTime);
@@ -1910,31 +1911,31 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
   GuezHitStruct hitStruct;
   hitStruct.originatorChargeTypeEtsString = TypeStruct(interaction.getMunition()).toString();
   hitStruct.originatorId = interaction.getOriginatorIdentifier().EntityNumber;
-  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+  hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
   switch (interaction.getOriginatorType())
   {
   case rpr2::OriginatorTypeEnum16::Unknown:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
     break;
   case rpr2::OriginatorTypeEnum16::NoMedicalTreatment: 
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
     if (hitStruct.originatorId == 0)  
       hitStruct.originatorId   = hitStruct.targetId;
     break;
   case rpr2::OriginatorTypeEnum16::Participant:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant;
     if (hitStruct.originatorId == 0)  
-      hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
+      hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl;
     break;
   case rpr2::OriginatorTypeEnum16::AreaEffectSimulation:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation;
     hitStruct.originatorId = IdentifierStruct(interaction.getOriginatorIdentifier()).toInt64();
     break;
   case rpr2::OriginatorTypeEnum16::ObserverController:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ObserverController;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController;
     break;
   case rpr2::OriginatorTypeEnum16::ExerciseControl:
-    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
+    hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl;
     break;
   }
   hitStruct.position = ParticipantPosition(interaction.getTargetLocation()).toGeoPosition();
@@ -1945,16 +1946,16 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
   hitStruct.vulnerabilityState = getTacticalStatusEnum(interaction.getHitResult());
 
   
-  if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ExerciseControl ||
-       hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ObserverController
+  if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl ||
+       hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController
        )
-      && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::HitWithNoEffect)
+      && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
   {
     auto ptr = m_damageModelMap.value(eqNo);
     if (ptr)
     {
       hitStruct.vulnerabilityState = ptr->vulnerabilityState(hitStruct.sampleTime);
-      if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
+      if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
         ptr->setTacticalStatus(rpr2::HitResultEnum16::Reset, simTimeToMSec(interaction.getReceiveTimeStamp()));
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
index 03820dc5c..3deb99986 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ngs_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ngs_connector.h"
 #include <Common/logger.h>
 #include <Common/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
index 7ddcb571f..d01a3e863 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ngs_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "ngs_connector.h"
 #include "web_socket_interface.h"
@@ -22,8 +23,7 @@ namespace HighLevelArchitecture
 WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent) : QObject(parent)
   , m_wsServer(new QWebSocketServer(QStringLiteral("GNA"), QWebSocketServer::NonSecureMode, this))
   , m_ngsHandler(ngsHandler)
-  .getNGLLogger("HlaTestTool.WsInterface")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/msgcompares.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/msgcompares.cpp
index e4e92ef85..122dd1f7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/msgcompares.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/msgcompares.cpp
@@ -147,7 +147,7 @@ void MsgCompares::compareFeuerstellungsdaten(const AdlerJson::Feuerstellungsdate
   QCOMPARE(feuerstellungsdaten.status, ProjectDataManagement::L28_Status::Einsatzbereit);
   QCOMPARE(feuerstellungsdaten.feuereinheit.verein, QStringLiteral("verein ExFeuerstellungFS"));
   QCOMPARE(feuerstellungsdaten.feuereinheit.r, 5);
-  QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
+  QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_F3);
   QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.latitude, 53.37791);
   QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.longitude, 8.759);
   QCOMPARE(feuerstellungsdaten.mittelpunkt.hoehe, 20);
@@ -163,7 +163,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
    QCOMPARE(waffensystemdaten.status,  ProjectDataManagement::L28_Status::NichtEinsatzbereit);
    QCOMPARE(waffensystemdaten.einheit.verein,  QStringLiteral("AB7X"));
    QCOMPARE(waffensystemdaten.einheit.r,  6);
-   QCOMPARE(waffensystemdaten.einheit.oi,  ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6);
+   QCOMPARE(waffensystemdaten.einheit.oi,  ProjectDataManagement::L19_Oi::L19_Oi_F6);
    MsgCompares::compareGeschosse(waffensystemdaten.geschosse);
    QCOMPARE(waffensystemdaten.koordinate.koordinate.latitude, 53.088354);
    QCOMPARE(waffensystemdaten.koordinate.koordinate.longitude, 8.853092);
@@ -176,7 +176,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
 
  void MsgCompares::compareLadeplatzdaten(const AdlerJson::Ladeplatzdaten &ladeplatzdaten)
  {
-    QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
+    QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::L19_Oi_F3);
     QCOMPARE(ladeplatzdaten.einheit.r, 5);
     QCOMPARE(ladeplatzdaten.einheit.verein, QStringLiteral("verein StellungsmeldungLP"));
     QCOMPARE(ladeplatzdaten.koordinate.koordinate.latitude, 53.37791);
@@ -187,7 +187,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
 
  void MsgCompares::compareStellungswechseldaten(const AdlerJson::Stellungswechseldaten &stellungswechseldaten)
  {
-    QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
+    QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::L19_Oi_F3);
     QCOMPARE(stellungswechseldaten.r, 5);
     QCOMPARE(stellungswechseldaten.verein, QStringLiteral("verein ExStellungswechsel"));
  }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
index 27a383283..468aa1154 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
@@ -102,7 +102,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
     extq.technischeDaten.beschreibung = replyObject.translated();
     extq.technischeDaten.status = Status_L32::DAT;
     // I dont Like it.. as we might get two request at the same time.. overriding  but should work most of the
-    m_mainDispatcher->jsonDispatcher()->sendExTqTechnischeQuittung(extq, m_mainDispatcher->ppmHandler()->getDtc()->participant(m_participantId).partyId());
+    m_mainDispatcher->jsonDispatcher()->sendExTqTechnischeQuittung(extq, m_mainDispatcher->ppmHandler()->getDtc()->participant(m_participantId).partyId);
     return;
   }
   QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(replyObject.additionalInfo())).object();
@@ -132,35 +132,35 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
   for (const auto &str : std::as_const(argsList))
     args.emplace_back(str.toStdString());
 
-  req.notification().content(content.toStdString());
-  req.notification().contentArgs(args);
+  req.notification.content = content.toStdString();
+  req.notification.contentArgs = args;
   // Which Exercise should parse the notification
-  req.notification().exerciseId(m_mainDispatcher->exerciseId());
+  req.notification.exerciseId = m_mainDispatcher->exerciseId();
 
-  req.notification().timeStamp(m_mainDispatcher->ddsHandler()->partitionTime());
+  req.notification.timeStamp = m_mainDispatcher->ddsHandler()->partitionTime();
   // Priority: Highest: Klick Links immediatly
   // Priority: High: Show message Box
-  req.notification().priority(NotificationManagement::Priority::High);
+  req.notification.priority = NotificationManagement::Priority::High;
 
   // set priority after proccesed for all
-  req.notification().processedPriority(NotificationManagement::Priority::Low);
+  req.notification.processedPriority = NotificationManagement::Priority::Low;
   //req.notification().title(tr_lts("Notification", "Wirkfeldplanung"));
-  req.notification().title(tr_lts("Notification", "AES-Planning"));
+  req.notification.title = tr_lts("Notification", "AES-Planning");
   // Who is the sender, most of the time a Service
   NotificationManagement::Address addressSender;
-  addressSender.addressType(NotificationManagement::AddressType::Service);
+  addressSender.addressType = NotificationManagement::AddressType::Service;
   auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByParty(partyId);
   if (saa)
   {
-    addressSender.name(saa->getSAAName().toStdString());
+    addressSender.name = saa->getSAAName().toStdString();
   }else
   {
     // use Backup
-    addressSender.name(QStringLiteral("TAB").toStdString());
+    addressSender.name = QStringLiteral("TAB").toStdString();
   }
-  req.notification().sender(addressSender);
-  req.notification().notificationType(NotificationManagement::NotificationType::CombatOrder);
-  req.notification().messageType(NotificationManagement::MessageType(NotificationManagement::MessageType::Success));
+  req.notification.sender = addressSender;
+  req.notification.notificationType = NotificationManagement::NotificationType::CombatOrder;
+  req.notification.messageType = NotificationManagement::MessageType(NotificationManagement::MessageType::Success);
 
   // Notify all Adler User for Party
   std::vector<NotificationManagement::Address> recipentVec;
@@ -168,22 +168,22 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
   const QVector<int> recipientIds = m_mainDispatcher->ddsHandler()->dtcOpm()->getNotificationRecipents(m_mainDispatcher->exerciseId(),
                                                                                                        partyId,
                                                                                                        OperatorRights::AdlerExplosionClusterEdit,
-                                                                                                       req.notification().notificationType().underlying());
+                                                                                                       static_cast<int>(req.notification.notificationType));
   std::vector<NotificationManagement::Address> recipientIdsDds;
   recipientIdsDds.reserve(recipientIds.size());
 
   for (const auto &recipientId : std::as_const(recipientIds))
   {
     NotificationManagement::Address addr;
-    addr.addressId(recipientId);
-    addr.isRead(false);
+    addr.addressId = recipientId;
+    addr.isRead = false;
     const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId);
-    addr.name(user.name());
-    addr.addressType(NotificationManagement::AddressType::Operator);
+    addr.name = user.name;
+    addr.addressType = NotificationManagement::AddressType::Operator;
     recipentVec.emplace_back(addr);
   }
-  req.notification().recipientIds(recipentVec);
-  if (req.notification().recipientIds().size() > 0)
+  req.notification.recipientIds = recipentVec;
+  if (req.notification.recipientIds.size() > 0)
   {
     m_mainDispatcher->ddsHandler()->ftcNom()->createNotificationRequest(req, this);
   }
@@ -203,20 +203,20 @@ bool AesHandler::sendAesModifyRequest(const QJsonObject &data)
   int equipmentNumber = data[QStringLiteral("header")].toObject()[QStringLiteral("equipmentNumber")].toInt();
 
   AreaEffectSimulation::AirSupportImpactModifyRequest request;
-  request.chargeTypeId(data[QStringLiteral("chargeTypeId")].toInt());
-  request.externalId(data[QStringLiteral("eventId")].toInt());
-  request.name(data[QStringLiteral("name")].toString().toStdString());
-  request.impactPosition(Core::GeoPosition2D(data[QStringLiteral("impactPosition")].toObject()[QStringLiteral("lon")].toDouble(),
-      data[QStringLiteral("impactPosition")].toObject()[QStringLiteral("lat")].toDouble()));
-  request.flightTime(0);
+  request.chargeTypeId = data[QStringLiteral("chargeTypeId")].toInt();
+  request.externalId = data[QStringLiteral("eventId")].toInt();
+  request.name = data[QStringLiteral("name")].toString().toStdString();
+  request.impactPosition = Core::GeoPosition2D(data[QStringLiteral("impactPosition")].toObject()[QStringLiteral("lon")].toDouble(),
+      data[QStringLiteral("impactPosition")].toObject()[QStringLiteral("lat")].toDouble());
+  request.flightTime = 0;
   qint64 requestedTime = static_cast<qint64>(data[QStringLiteral("header")].toObject()[QStringLiteral("timeStamp")].toDouble());
   if (requestedTime < m_mainDispatcher->ddsHandler()->partitionTime())
     requestedTime = m_mainDispatcher->ddsHandler()->partitionTime() + 500;
-  request.effectStart(requestedTime);
+  request.effectStart = requestedTime;
 
   QJsonDocument doc(data);
   if (equipmentNumber)
-    request.participantId(m_dtcPpm->participantIdByEquipmentNumber(equipmentNumber));
+    request.participantId = m_dtcPpm->participantIdByEquipmentNumber(equipmentNumber);
   m_requestHelper->startSingleRequest([this, request]() { return m_ftcAes->airSupportImpactModifyRequest(request, this); });
   return true;
 }
@@ -226,22 +226,22 @@ bool AesHandler::sendExplosionArea(const QJsonObject &data)
   Q_UNUSED(data)
 
   AreaEffectSimulation::OffRouteMine orm;
-  orm.id(0);
-  orm.name(QString(QStringLiteral("test_offRouteMine_02")).toStdString());
-  orm.chargeStruct().chargeTypeId(254);
-  orm.effectDuration(6000);
-  orm.partyId(2);
-  orm.impactRadius(10);
+  orm.id = 0;
+  orm.name = QString(QStringLiteral("test_offRouteMine_02")).toStdString();
+  orm.chargeStruct.chargeTypeId = 254;
+  orm.effectDuration = 6000;
+  orm.partyId = 2;
+  orm.impactRadius = 10;
 
-  orm.area().cornerBottomLeft(Core::GeoPosition2D(0, 0));
-  orm.area().height(50);
-  orm.area().width(1);
-  orm.area().rotation(85);
+  orm.area.cornerBottomLeft = Core::GeoPosition2D(0, 0);
+  orm.area.height = 50;
+  orm.area.width = 1;
+  orm.area.rotation = 85;
 
-  orm.effectStart((time(nullptr) + 10) * 1000);
+  orm.effectStart = (time(nullptr) + 10) * 1000;
 
   AreaEffectSimulation::OffRouteMineModifyRequest
-      req(orm.id(), orm.name(), orm.effectDuration(), orm.chargeStruct().chargeTypeId(), orm.area(), orm.impactRadius(), orm.effectStart(), orm.partyId());
+      req(orm.id, orm.name, orm.effectDuration, orm.chargeStruct.chargeTypeId, orm.area, orm.impactRadius, orm.effectStart, orm.partyId);
 
   m_ftcAes->offRouteMineModifyRequest(req, this);
 
@@ -264,12 +264,12 @@ void AesHandler::handleEXFire(const Feuerkampfdaten &data, int wsId)
     return;
 
   auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId);
-  int particpantId = m_dtcPpm->getParticipantByInternalName(saa->getPartyId(), data.verein, waffensystemkennerMap.key(data.kenner)).id();
+  int particpantId = m_dtcPpm->getParticipantByInternalName(saa->getPartyId(), data.verein, waffensystemkennerMap.key(data.kenner)).id;
   TrainingAreaBase::EX_Fire outData;
-  outData.equipmentNumber() = particpantId;
-  outData.reference() = data.feuerkampfReferenz.toStdString();
-  outData.identifier() = data.verein.toStdString();
-  outData.effectorId() = data.kenner.underlying(); // static_cast<L27_EffectorId_def>((int)data.kenner);
+  outData.equipmentNumber = particpantId;
+  outData.reference = data.feuerkampfReferenz.toStdString();
+  outData.identifier = data.verein.toStdString();
+  outData.effectorId = data.kenner; // static_cast<L27_EffectorId_def>((int)data.kenner);
   m_ddsHandler->dtsTab()->publish(outData);
   QTimer::singleShot(3000, [this, particpantId]() { m_ddsHandler->dtsTab()->removeEX_FireByKey(particpantId); });
 
@@ -296,7 +296,7 @@ void AesHandler::handleEXDontFire(const Feuerkampfdaten &data, int wsId)
 
   DEBUG_LOG(m_logger) << "[EX-FQ(nFN)] data from SSA " << wsId << " : "
                       << "verein: " << data.verein << " "
-                      << "kenner: " << data.kenner.underlying() << " "
+                      << "kenner: " << data.kenner << " "
                       << "feuerkampfReferenz: " << data.feuerkampfReferenz;
 
   handleAmmoCount(data, saa->getPartyId(), true);
@@ -357,12 +357,12 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
   }
 
   AreaEffectSimulation::TrajectoryAdlerModifyRequest *newRequest = new AreaEffectSimulation::TrajectoryAdlerModifyRequest();
-  newRequest->aesItemId(aesId);
-  newRequest->explosionIndex(wirkmittelIndex);
+  newRequest->aesItemId = aesId;
+  newRequest->explosionIndex = wirkmittelIndex;
 
   int zone = -1;
-  Core::GeoPosition positionLaunch = subordinatePositions.at(wirkmittelIndex).pos();
-  auto utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon(), positionLaunch.lat(), zone);
+  Core::GeoPosition positionLaunch = subordinatePositions.at(wirkmittelIndex).pos;
+  auto utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon, positionLaunch.lat, zone);
 
   double grad = (data.zieldaten.zielachse / 6400.) * 360.0;
 
@@ -385,7 +385,7 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
     QPointF utmLaunchPt(utmLaunch.x, utmLaunch.y);
 
     utm += utmLaunchPt;
-    double z = positionLaunch.z() + pos.yRelativ;
+    double z = positionLaunch.z + pos.yRelativ;
 
     // see also: coordtrans_test::testRelativeMetricalOffet()
     LtsCoordTrans::UtmCoordinate utmCoord;
@@ -430,24 +430,24 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
   }
 
   Core::GeoPosition impactPosition;
-  impactPosition.lat(data.zieldaten.koordinate.koordinate.latitude * M_PI / 180.0);
-  impactPosition.lon(data.zieldaten.koordinate.koordinate.longitude * M_PI / 180.0);
-  impactPosition.z(data.zieldaten.koordinate.hoehe);
-  newRequest->impactPosition(impactPosition);
-  newRequest->geometry(geometryRef);
-  DEBUG_LOG(m_logger) << "geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size();
+  impactPosition.lat = data.zieldaten.koordinate.koordinate.latitude * M_PI / 180.0;
+  impactPosition.lon = data.zieldaten.koordinate.koordinate.longitude * M_PI / 180.0;
+  impactPosition.z = data.zieldaten.koordinate.hoehe;
+  newRequest->impactPosition = impactPosition;
+  newRequest->geometry = geometryRef;
+  DEBUG_LOG(m_logger) << "geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry.size();
 
-  if (newRequest->aesItemId() <= 0)
+  if (newRequest->aesItemId <= 0)
   {
     ERROR_LOG(m_logger) << "newRequest->aesItemId() <=0"
-                        << ", aesItemId :" << newRequest->aesItemId();
+                        << ", aesItemId :" << newRequest->aesItemId;
     return;
   }
-  newRequest->peakAltitude(data.feuerkommando.wirkmittel.at(wirkmittelIndex).gipfelhoehe);
-  newRequest->mhpScatterLenght(data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.laengsstreuung);
-  newRequest->mhpScatterWidth(data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.seitenstreuung);
-  newRequest->mhpScatterLengthDetonationHeight(data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.laengsstreuungH);
-  newRequest->mhpScatterWidthDetonationHeight(data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.seitenstreuungH);
+  newRequest->peakAltitude = data.feuerkommando.wirkmittel.at(wirkmittelIndex).gipfelhoehe;
+  newRequest->mhpScatterLenght = data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.laengsstreuung;
+  newRequest->mhpScatterWidth = data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.seitenstreuung;
+  newRequest->mhpScatterLengthDetonationHeight = data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.laengsstreuungH;
+  newRequest->mhpScatterWidthDetonationHeight = data.feuerkommando.wirkmittel.at(wirkmittelIndex).streuung.seitenstreuungH;
   m_ftcAes->trajectoryAdlerModifyRequest(*newRequest, this);
 }
 
@@ -471,7 +471,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   const bool isVerbund = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId)->getIsVerbund();
   const ParticipantManagement::Participant &part = m_mainDispatcher->ppmHandler()->findParticipantByInternalName(verein, partyId, isVerbund);
   // #endif
-  if (part.id() <= 0)
+  if (part.id <= 0)
   {
     ERROR_LOG(m_logger) << "Got EffectClusterData for " << verein << " but unit not found";
     return;
@@ -479,7 +479,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
   // get overall impacts
   m_wirkfeldPlanungsData = data;
-  m_participantId = part.id();
+  m_participantId = part.id;
   m_wirkmittelIndex = 0;
 
   // for (const auto &wm : data.feuerkommando.wirkmittel)
@@ -511,38 +511,38 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     const int impactRadius = m_mainDispatcher->pdmHandler()->getDtc()->impactRadius(chargeTypeId, igniterTypeId, igniterFunctionId);
 
     DEBUG_LOG(m_logger) << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
-    area.height(impactRadius * 2);
-    area.width(impactRadius * 2);
+    area.height = impactRadius * 2;
+    area.width = impactRadius * 2;
   }
   if (!createArea && data.zieldaten.geometrie == ProjectDataManagement::L4_TargetGeometry::Radial)
   {
     geometry = AreaEffectSimulation::AesExplosionGeometry::EgRadial;
     // In Radial we need to double the radius and also set it as height/width
-    area.height(data.zieldaten.breiteRadius * 2);
-    area.width(data.zieldaten.breiteRadius * 2);
+    area.height = data.zieldaten.breiteRadius * 2;
+    area.width = data.zieldaten.breiteRadius * 2;
   }
   else if (!createArea) // we need the rect or the line
   {
     // maye wrong?
     // not only maybe.. we need to swap .. yes..
-    area.height(data.zieldaten.breiteRadius);
+    area.height = data.zieldaten.breiteRadius;
     if (data.zieldaten.tiefe > 0)
-      area.width(data.zieldaten.tiefe);
+      area.width = data.zieldaten.tiefe;
     else
       if (data.zieldaten.geometrie == ProjectDataManagement::L4_TargetGeometry::Linear)
-        area.width(5); // E01562-472 [Verbund] ImpactWidth invalid. Ein Wirkfeld mit der Zielgeometrie "Linear" kann nicht verarbeitet werden.
+        area.width = 5; // E01562-472 [Verbund] ImpactWidth invalid. Ein Wirkfeld mit der Zielgeometrie "Linear" kann nicht verarbeitet werden.
   }
 
   if (!createArea)
   {
-    area.rotation((data.zieldaten.zielachse / 6400.) * 360); // UTM STRICH?
+    area.rotation = (data.zieldaten.zielachse / 6400.) * 360; // UTM STRICH?
 
     // point is center
     const QPointF centerPoint(data.zieldaten.koordinate.koordinate.longitude * (M_PI / 180.0), data.zieldaten.koordinate.koordinate.latitude * (M_PI / 180.0));
-    QRectF rect(QPointF(), QSizeF(area.height(), area.width()));
+    QRectF rect(QPointF(), QSizeF(area.height, area.width));
     rect.moveCenter(QPointF());
     // Compass, not mathematical! "90-" left out as Polygon already is rotated by 90 degree
-    const QPointF bl = QTransform().rotate(-area.rotation()).map(rect.topLeft());
+    const QPointF bl = QTransform().rotate(-area.rotation).map(rect.topLeft());
     const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
     DEBUG_LOG(m_logger) << "centerUtm="
                         << ", x :" << centerUtm.x << ", y :" << centerUtm.y << ", zone :" << centerUtm.zone;
@@ -551,11 +551,11 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
                         << ", x :" << bl.x() << ", y :" << bl.y();
     DEBUG_LOG(m_logger) << "bottomLeft="
                         << ", x :" << bottomLeft.x() << ", y :" << bottomLeft.y();
-    area.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
+    area.cornerBottomLeft = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
     DEBUG_LOG(m_logger) << "area.cornerBottomLeft="
-                        << ", lon :" << area.cornerBottomLeft().lon() << ", lat :" << area.cornerBottomLeft().lat();
+                        << ", lon :" << area.cornerBottomLeft.lon << ", lat :" << area.cornerBottomLeft.lat;
 
-    const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
+    const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft.lon, area.cornerBottomLeft.lat);
     DEBUG_LOG(m_logger) << "cornerBottomLeftUtm="
                         << ", x :" << cornerBottomLeftUtm.x << ", y :" << cornerBottomLeftUtm.y << ", zone :" << cornerBottomLeftUtm.zone;
   }
@@ -579,16 +579,16 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       const int impactRadius = m_mainDispatcher->pdmHandler()->getDtc()->impactRadius(chargeTypeId, igniterTypeId, igniterFunctionId);
 
       DEBUG_LOG(m_logger) << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
-      area.height(impactRadius * 2);
-      area.width(impactRadius * 2);
+      area.height = impactRadius * 2;
+      area.width = impactRadius * 2;
 
       // point is center
 
       const QPointF centerPoint(wirkmittel.auftreffpunkt.koordinate.longitude * (M_PI / 180.0), wirkmittel.auftreffpunkt.koordinate.latitude * (M_PI / 180.0));
-      QRectF rect(QPointF(), QSizeF(area.height(), area.width()));
+      QRectF rect(QPointF(), QSizeF(area.height, area.width));
       rect.moveCenter(QPointF());
       // Compass, not mathematical! "90-" left out as Polygon already is rotated by 90 degree
-      const QPointF bl = QTransform().rotate(-area.rotation()).map(rect.topLeft());
+      const QPointF bl = QTransform().rotate(-area.rotation).map(rect.topLeft());
       const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
       DEBUG_LOG(m_logger) << "centerUtm="
                           << ", x :" << centerUtm.x << ", y :" << centerUtm.y << ", zone :" << centerUtm.zone;
@@ -597,11 +597,11 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
                           << ", x :" << bl.x() << ", y :" << bl.y();
       DEBUG_LOG(m_logger) << "bottomLeft="
                           << ", x :" << bottomLeft.x() << ", y :" << bottomLeft.y();
-      area.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
+      area.cornerBottomLeft = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
       DEBUG_LOG(m_logger) << "area.cornerBottomLeft="
-                          << ", lon :" << area.cornerBottomLeft().lon() << ", lat :" << area.cornerBottomLeft().lat();
+                          << ", lon :" << area.cornerBottomLeft.lon << ", lat :" << area.cornerBottomLeft.lat;
 
-      const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
+      const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft.lon, area.cornerBottomLeft.lat);
       ERROR_LOG(m_logger) << "cornerBottomLeftUtm="
                           << ", x :" << cornerBottomLeftUtm.x << ", y :" << cornerBottomLeftUtm.y << ", zone :" << cornerBottomLeftUtm.zone;
     }
@@ -632,9 +632,9 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
         const QPointF centerPoint(effector.auftreffpunkt.koordinate.longitude * (M_PI / 180.0), effector.auftreffpunkt.koordinate.latitude * (M_PI / 180.0));
 
         AreaEffectSimulation::Area areaEffector;
-        areaEffector.height() = impactRadius * 2;
-        areaEffector.width() = impactRadius * 2;
-        QRectF rect(QPointF(), QSizeF(areaEffector.height(), areaEffector.width()));
+        areaEffector.height = impactRadius * 2;
+        areaEffector.width = impactRadius * 2;
+        QRectF rect(QPointF(), QSizeF(areaEffector.height, areaEffector.width));
         rect.moveCenter(QPointF());
 
         // Compass, not mathematical! "90-" left out as Polygon already is rotated by 90 degree
@@ -643,7 +643,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
         const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
         zone = centerUtm.zone;
         const QPointF bottomLeft = centerUtm.geographic(bl);
-        areaEffector.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
+        areaEffector.cornerBottomLeft = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
         rect.moveCenter(QPointF(centerUtm.x, centerUtm.y));
         // now add Area to list
@@ -657,7 +657,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       // Finally use the rerturning rect as Area
       area = createMinimumRect(zone, vecPoints);
-      DEBUG_LOG(m_logger) << "FINAL AREA " << area.cornerBottomLeft() << "   " << area.height() << " " << area.width();
+      DEBUG_LOG(m_logger) << "FINAL AREA " << area.cornerBottomLeft << "   " << area.height << " " << area.width;
     }
     else if (data.feuerkommando.wirkmittelRakete.size() > 0)
     {
@@ -682,9 +682,9 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
           const QPointF centerPoint(treffpunkt.koordinate.koordinate.longitude * (M_PI / 180.0), treffpunkt.koordinate.koordinate.latitude * (M_PI / 180.0));
 
           AreaEffectSimulation::Area areaEffector;
-          areaEffector.height() = impactRadius * 2;
-          areaEffector.width() = impactRadius * 2;
-          QRectF rect(QPointF(), QSizeF(areaEffector.height(), areaEffector.width()));
+          areaEffector.height = impactRadius * 2;
+          areaEffector.width = impactRadius * 2;
+          QRectF rect(QPointF(), QSizeF(areaEffector.height, areaEffector.width));
           rect.moveCenter(QPointF());
 
           // Compass, not mathematical! "90-" left out as Polygon already is rotated by 90 degree
@@ -693,7 +693,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
           const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
           zone = centerUtm.zone;
           const QPointF bottomLeft = centerUtm.geographic(bl);
-          areaEffector.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
+          areaEffector.cornerBottomLeft = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y());
 
           rect.moveCenter(QPointF(centerUtm.x, centerUtm.y));
           // now add Area to list
@@ -706,7 +706,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       // Finally use the returning rect as Area
       area = createMinimumRect(zone, vecPoints);
-      DEBUG_LOG(m_logger) << "FINAL AREA " << area.cornerBottomLeft() << "   " << area.height() << " " << area.width();
+      DEBUG_LOG(m_logger) << "FINAL AREA " << area.cornerBottomLeft << "   " << area.height << " " << area.width;
     }
   }
 
@@ -714,24 +714,24 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   for (const AreaEffectSimulation::EffectCluster &clus : m_dtcAes->effectClusters())
   {
     // ERROR_LOG(m_logger) << "Look for if: " << clus.element() << " is data: " << data.feuerkampfReferenz;
-    if (clus.partyId() != part.partyId())
+    if (clus.partyId != part.partyId)
       continue;
-    if (clus.isDeleted())
+    if (clus.isDeleted)
       continue;
-    if (clus.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared && clus.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated
-        && clus.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived)
+    if (clus.effectStateId != AreaEffectSimulation::AesEffectState::EsPrepared && clus.effectStateId != AreaEffectSimulation::AesEffectState::EsCreated
+        && clus.effectStateId != AreaEffectSimulation::AesEffectState::EsReceived)
       continue;
 
-    if (clus.element() != data.feuerkampfReferenz.trimmed().toStdString())
+    if (clus.element != data.feuerkampfReferenz.trimmed().toStdString())
       continue;
-    req.id(clus.id());
+    req.id = clus.id;
   }
 
   QJsonObject obj;
   obj[AdlerJson::JsonKeys::FEUERKAMPFREFERENZ()] = data.feuerkampfReferenz;
 
   obj[QStringLiteral("useReceived")] = true;
-  obj[QStringLiteral("effectSource")] = ProjectDataManagement::EffectSource::ES_ADLER;
+  obj[QStringLiteral("effectSource")] = static_cast<int>(ProjectDataManagement::EffectSource::ES_ADLER);
   obj[AdlerJson::JsonKeys::ABFEUERUNGSART()] = static_cast<int>(data.abfeuerungsArt);
   // TargetData is often only optional
   obj[AdlerJson::JsonKeys::TYP()] = m_mainDispatcher->pdmHandler()->getDtc()->getTargetTypeIdFromAdlerTargetType(data.zieldaten.typ);
@@ -739,7 +739,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   obj[AdlerJson::JsonKeys::ELEMENTE()] = data.zieldaten.elemente;
   obj[AdlerJson::JsonKeys::NUMMER()] = data.zieldaten.nummer;
 
-  obj[QStringLiteral("partyId")] = part.partyId();
+  obj[QStringLiteral("partyId")] = part.partyId;
   // fill EffectorData
   std::vector<AreaEffectSimulation::EffectorData> effectorVec;
 
@@ -748,22 +748,22 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     for (const auto &effectorAdler : std::as_const(data.feuerkommando.wirkmittel))
     {
       AreaEffectSimulation::EffectorData effectorData;
-      effectorData.angleOfFall() = 0;
-      effectorData.chargeAmount() = effectorAdler.geschoss.anzahl;
-      effectorData.chargeStruct().chargeTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getChargeTypeIdFromAdlerCharges(effectorAdler.geschoss.geschosssorte);
-      effectorData.chargeStruct().igniterTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
-      effectorData.chargeStruct().igniterFunctionId()
+      effectorData.angleOfFall = 0;
+      effectorData.chargeAmount = effectorAdler.geschoss.anzahl;
+      effectorData.chargeStruct.chargeTypeId = m_mainDispatcher->pdmHandler()->getDtc()->getChargeTypeIdFromAdlerCharges(effectorAdler.geschoss.geschosssorte);
+      effectorData.chargeStruct.igniterTypeId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
+      effectorData.chargeStruct.igniterFunctionId
           = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(effectorAdler.geschoss.zuenderFunktion);
-      DEBUG_LOG(m_logger) << "FOUND chargeTypeId " << effectorData.chargeStruct().chargeTypeId() << " for " << effectorAdler.geschoss.geschosssorte;
-      DEBUG_LOG(m_logger) << "igniterTypeId: " << effectorData.chargeStruct().igniterTypeId();
-      DEBUG_LOG(m_logger) << "igniterFunctionId: " << effectorData.chargeStruct().igniterFunctionId();
-      effectorData.participantId()
-          = m_dtcPpm->getParticipantByInternalName(part.partyId(), QString::fromStdString(part.name()), waffensystemkennerMap.key(effectorAdler.kenner)).id();
+      DEBUG_LOG(m_logger) << "FOUND chargeTypeId " << effectorData.chargeStruct.chargeTypeId << " for " << effectorAdler.geschoss.geschosssorte;
+      DEBUG_LOG(m_logger) << "igniterTypeId: " << effectorData.chargeStruct.igniterTypeId;
+      DEBUG_LOG(m_logger) << "igniterFunctionId: " << effectorData.chargeStruct.igniterFunctionId;
+      effectorData.participantId
+          = m_dtcPpm->getParticipantByInternalName(part.partyId, QString::fromStdString(part.name), waffensystemkennerMap.key(effectorAdler.kenner)).id;
       std::vector<Core::RelativePositionRelativeTime> flightCurve;
       flightCurve.reserve(effectorAdler.flugbahnpunkt.size());
 
-      const auto &startPos = m_dtcPpm->participantPosition(effectorData.participantId());
-      const auto coordStart = LtsCoordTrans::UtmCoordinate::fromGeographic(startPos.pos().lon(), startPos.pos().lat());
+      const auto &startPos = m_dtcPpm->participantPosition(effectorData.participantId);
+      const auto coordStart = LtsCoordTrans::UtmCoordinate::fromGeographic(startPos.pos.lon, startPos.pos.lat);
       DEBUG_LOG(m_logger) << "Start point: " << coordStart;
 
       const auto coordEnd = LtsCoordTrans::UtmCoordinate::fromGeographic(effectorAdler.auftreffpunkt.koordinate.longitude * (M_PI / 180.0),
@@ -782,42 +782,42 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       for (const auto &flightPointAdler : std::as_const(effectorAdler.flugbahnpunkt))
       {
         Core::RelativePositionRelativeTime flightPoint;
-        flightPoint.offsetX() = 0; // flightPointAdler.zRelativ;
-        flightPoint.offsetY() = flightPointAdler.xRelativ;
-        flightPoint.offsetZ() = flightPointAdler.yRelativ;
-        flightPoint.relativeTime() = flightPointAdler.zeit * 1000;
+        flightPoint.offsetX = 0; // flightPointAdler.zRelativ;
+        flightPoint.offsetY = flightPointAdler.xRelativ;
+        flightPoint.offsetZ = flightPointAdler.yRelativ;
+        flightPoint.relativeTime = flightPointAdler.zeit * 1000;
 
         QTransform matrix;
         matrix.rotate(useNewGrad);
-        const QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
+        const QPointF point(flightPoint.offsetX, flightPoint.offsetY);
         TRACE_LOG(m_logger) << " POS bevore rot: " << point;
 
         const auto rotatePoint = matrix.map(point);
         TRACE_LOG(m_logger) << " POS after rot: " << rotatePoint;
 
-        flightPoint.offsetX() = rotatePoint.x();
-        flightPoint.offsetY() = rotatePoint.y();
+        flightPoint.offsetX = rotatePoint.x();
+        flightPoint.offsetY = rotatePoint.y();
 
         flightCurve.push_back(flightPoint);
       }
-      effectorData.trajectoryRelative() = flightCurve;
-      effectorData.flightTime() = effectorAdler.flugzeit * 1000;
-      effectorData.chargeStruct().igniterTypeId() = 1; // effectorAdler.geschoss.zuender; //XKCD
-      effectorData.interval() = effectorAdler.geschoss.intervall;
+      effectorData.trajectoryRelative = flightCurve;
+      effectorData.flightTime = effectorAdler.flugzeit * 1000;
+      effectorData.chargeStruct.igniterTypeId = 1; // effectorAdler.geschoss.zuender; //XKCD
+      effectorData.interval = effectorAdler.geschoss.intervall;
       Core::GeoPosition mhpPos;
-      mhpPos.lat() = effectorAdler.auftreffpunkt.koordinate.latitude * (M_PI / 180.0);
-      mhpPos.lon() = effectorAdler.auftreffpunkt.koordinate.longitude * (M_PI / 180.0);
-      mhpPos.z() = effectorAdler.auftreffpunkt.hoehe;
-      effectorData.mhpPosition() = mhpPos;
-      effectorData.mhpRotation() = 90.0 - (effectorAdler.schussrichtung / 6400.) * 360;
-      effectorData.mhpScatterLenght() = effectorAdler.streuung.laengsstreuung;
-      effectorData.mhpScatterLengthDetonationHeight() = effectorAdler.streuung.laengsstreuungH;
-      effectorData.mhpScatterWidth() = effectorAdler.streuung.seitenstreuung;
-      effectorData.mhpScatterWidthDetonationHeight() = effectorAdler.streuung.seitenstreuungH;
+      mhpPos.lat = effectorAdler.auftreffpunkt.koordinate.latitude * (M_PI / 180.0);
+      mhpPos.lon = effectorAdler.auftreffpunkt.koordinate.longitude * (M_PI / 180.0);
+      mhpPos.z = effectorAdler.auftreffpunkt.hoehe;
+      effectorData.mhpPosition = mhpPos;
+      effectorData.mhpRotation = 90.0 - (effectorAdler.schussrichtung / 6400.) * 360;
+      effectorData.mhpScatterLenght = effectorAdler.streuung.laengsstreuung;
+      effectorData.mhpScatterLengthDetonationHeight = effectorAdler.streuung.laengsstreuungH;
+      effectorData.mhpScatterWidth = effectorAdler.streuung.seitenstreuung;
+      effectorData.mhpScatterWidthDetonationHeight = effectorAdler.streuung.seitenstreuungH;
       DEBUG_LOG(m_logger) << effectorAdler.kenner;
-      DEBUG_LOG(m_logger) << "Looking for participantID with stats = party: " << part.partyId() << " unitname: " << part.name()
+      DEBUG_LOG(m_logger) << "Looking for participantID with stats = party: " << part.partyId << " unitname: " << part.name
                           << " effectorname: " << waffensystemkennerMap.key(effectorAdler.kenner);
-      effectorData.peakHeight() = effectorAdler.gipfelhoehe;
+      effectorData.peakHeight = effectorAdler.gipfelhoehe;
       effectorVec.push_back(effectorData);
 
       // We will override with the last one but okay should be suffice
@@ -831,23 +831,23 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     {
       AreaEffectSimulation::EffectorData effectorData;
 
-      effectorData.chargeAmount() = effectorAdler.geschoss.anzahl;
-      effectorData.angleOfFall() = effectorAdler.fallwinkel;
-      effectorData.chargeStruct().chargeTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getChargeTypeIdFromAdlerCharges(effectorAdler.geschoss.geschosssorte);
-      effectorData.chargeStruct().igniterTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
-      effectorData.chargeStruct().igniterFunctionId()
+      effectorData.chargeAmount = effectorAdler.geschoss.anzahl;
+      effectorData.angleOfFall = effectorAdler.fallwinkel;
+      effectorData.chargeStruct.chargeTypeId = m_mainDispatcher->pdmHandler()->getDtc()->getChargeTypeIdFromAdlerCharges(effectorAdler.geschoss.geschosssorte);
+      effectorData.chargeStruct.igniterTypeId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
+      effectorData.chargeStruct.igniterFunctionId
           = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(effectorAdler.geschoss.zuenderFunktion);
 
-      DEBUG_LOG(m_logger) << "FOUND chargeTypeId " << effectorData.chargeStruct().chargeTypeId() << " for " << effectorAdler.geschoss.geschosssorte;
-      DEBUG_LOG(m_logger) << "igniterTypeId: " << effectorData.chargeStruct().igniterTypeId();
-      DEBUG_LOG(m_logger) << "igniterFunctionId: " << effectorData.chargeStruct().igniterFunctionId();
+      DEBUG_LOG(m_logger) << "FOUND chargeTypeId " << effectorData.chargeStruct.chargeTypeId << " for " << effectorAdler.geschoss.geschosssorte;
+      DEBUG_LOG(m_logger) << "igniterTypeId: " << effectorData.chargeStruct.igniterTypeId;
+      DEBUG_LOG(m_logger) << "igniterFunctionId: " << effectorData.chargeStruct.igniterFunctionId;
 
-      effectorData.participantId()
-          = m_dtcPpm->getParticipantByInternalName(part.partyId(), QString::fromStdString(part.name()), waffensystemkennerMap.key(effectorAdler.kenner)).id();
-      if (effectorData.participantId() == 0)
-        WARNING_LOG(m_logger) << "Could not find participant for partiyId " << part.partyId() << ", name " << part.name() << ", kenner " << effectorAdler.kenner;
-      effectorData.chargeStruct().igniterTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
-      effectorData.interval() = effectorAdler.geschoss.intervall;
+      effectorData.participantId
+          = m_dtcPpm->getParticipantByInternalName(part.partyId, QString::fromStdString(part.name), waffensystemkennerMap.key(effectorAdler.kenner)).id;
+      if (effectorData.participantId == 0)
+        WARNING_LOG(m_logger) << "Could not find participant for partiyId " << part.partyId << ", name " << part.name << ", kenner " << effectorAdler.kenner;
+      effectorData.chargeStruct.igniterTypeId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
+      effectorData.interval = effectorAdler.geschoss.intervall;
 
       // create centroid
       Core::GeoPosition mhpPos;
@@ -857,26 +857,26 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       centroid /= effectorAdler.treffpunkte.size();
 
-      mhpPos.lat() = centroid.x() * (M_PI / 180.0);
-      mhpPos.lon() = centroid.y() * (M_PI / 180.0);
-      mhpPos.z() = effectorAdler.treffpunkte.at(0).koordinate.hoehe;
-      effectorData.mhpPosition() = mhpPos;
-      effectorData.mhpRotation() = 90.0 - (effectorAdler.schussrichtung / 6400.) * 360;
-      effectorData.mhpScatterLenght() = 0.0;
-      effectorData.mhpScatterLengthDetonationHeight() = 0.0;
-      effectorData.mhpScatterWidth() = 0.0;
-      effectorData.mhpScatterWidthDetonationHeight() = 0.0;
-      effectorData.peakHeight() = effectorAdler.gipfelhoehe;
+      mhpPos.lat = centroid.x() * (M_PI / 180.0);
+      mhpPos.lon = centroid.y() * (M_PI / 180.0);
+      mhpPos.z = effectorAdler.treffpunkte.at(0).koordinate.hoehe;
+      effectorData.mhpPosition = mhpPos;
+      effectorData.mhpRotation = 90.0 - (effectorAdler.schussrichtung / 6400.) * 360;
+      effectorData.mhpScatterLenght = 0.0;
+      effectorData.mhpScatterLengthDetonationHeight = 0.0;
+      effectorData.mhpScatterWidth = 0.0;
+      effectorData.mhpScatterWidthDetonationHeight = 0.0;
+      effectorData.peakHeight = effectorAdler.gipfelhoehe;
 
       QJsonObject properties;
       AdlerJson::wirkmittelFeuerkommandoRaketeToJson(properties, effectorAdler);
-      effectorData.properties() = QJsonDocument(properties).toJson(QJsonDocument::Compact).toStdString();
+      effectorData.properties = QJsonDocument(properties).toJson(QJsonDocument::Compact).toStdString();
 
       // trajectory without time start ------------------------------------------
-      const ParticipantManagement::ParticipantPosition &participantPosition = m_dtcPpm->participantPosition(effectorData.participantId());
-      const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos().lon(), participantPosition.pos().lat(), participantPosition.pos().z());
+      const ParticipantManagement::ParticipantPosition &participantPosition = m_dtcPpm->participantPosition(effectorData.participantId);
+      const LtsUtils::QPoint3D trajectoryStart(participantPosition.pos.lon, participantPosition.pos.lat, participantPosition.pos.z);
 
-      const LtsUtils::QPoint3D trajectoryEnd(effectorData.mhpPosition().lon(), effectorData.mhpPosition().lat(), effectorData.mhpPosition().z());
+      const LtsUtils::QPoint3D trajectoryEnd(effectorData.mhpPosition.lon, effectorData.mhpPosition.lat, effectorData.mhpPosition.z);
 
       AreaEffectSimulation::TrajectoryGeoPosition trajectoryWithoutTime;
 
@@ -885,16 +885,16 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       // trajectory without time end -------------------------------------------
 
       // trajectory with time start -------------------------------------------
-      effectorData.flightTime() = effectorAdler.flugzeit * 1000;
-      const double flightTimeStep = effectorData.flightTime() / static_cast<double>(trajectoryWithoutTime.size());
+      effectorData.flightTime = effectorAdler.flugzeit * 1000;
+      const double flightTimeStep = effectorData.flightTime / static_cast<double>(trajectoryWithoutTime.size());
       double currentFlightTime = 0.0;
 
-      const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat());
+      const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos.lon, participantPosition.pos.lat);
       for (const Core::GeoPosition &pos : std::as_const(trajectoryWithoutTime))
       {
-        const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat());
+        const LtsCoordTrans::UtmCoordinate utmCurrentPos = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon, pos.lat);
 
-        effectorData.trajectoryRelative().emplace_back(utmCurrentPos.x - utmStartPos.x, utmCurrentPos.y - utmStartPos.y, pos.z(),
+        effectorData.trajectoryRelative.emplace_back(utmCurrentPos.x - utmStartPos.x, utmCurrentPos.y - utmStartPos.y, pos.z,
                                                        currentFlightTime);
 
         currentFlightTime += flightTimeStep;
@@ -907,23 +907,23 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       effectorVec.push_back(effectorData);
     }
   }
-  req.effectors() = effectorVec;
+  req.effectors = effectorVec;
 
   QString propertiesStr = QString::fromStdString(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
   std::string properties = propertiesStr.toStdString();
-  req.properties(properties);
-  req.area(area);
-  req.effectMarkingInTa(true);
-  req.partyId(part.partyId());
-  req.explosionGeometry(geometry);
-  req.firePurposeId(static_cast<int>(data.forderung.underlying())); // TODO Mapping
-  req.effectSourceId(ProjectDataManagement::EffectSource::ES_ADLER);
-  req.name(data.feuerkampfReferenz.toStdString());
-  req.element(data.feuerkampfReferenz.toStdString());
-  req.effectDuration(data.dauer * 1000);
-  req.participantId(part.id());
-  req.externalId(7);
-  req.tla(data.zieldaten.zog); // defaults to 0 if not set
+  req.properties = properties;
+  req.area = area;
+  req.effectMarkingInTa = true;
+  req.partyId = part.partyId;
+  req.explosionGeometry = geometry;
+  req.firePurposeId = static_cast<int>(data.forderung); // TODO Mapping
+  req.effectSourceId = ProjectDataManagement::EffectSource::ES_ADLER;
+  req.name = data.feuerkampfReferenz.toStdString();
+  req.element = data.feuerkampfReferenz.toStdString();
+  req.effectDuration = data.dauer * 1000;
+  req.participantId = part.id;
+  req.externalId = 7;
+  req.tla = data.zieldaten.zog; // defaults to 0 if not set
 
   if (data.feuerkommando.wirkmittel.empty())
     DEBUG_LOG(m_logger) << "flugzeit :"
@@ -957,16 +957,16 @@ QList<qint32> AesHandler::findAllPendingEffectCluster(int partyId)
   const auto &effectClusters = m_dtcAes->effectClusters();
   for (const auto &effectCluster : std::as_const(effectClusters))
   {
-    if (effectCluster.partyId() != partyId)
+    if (effectCluster.partyId != partyId)
       continue;
-    if (effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived
-        && effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated)
+    if (effectCluster.effectStateId != AreaEffectSimulation::AesEffectState::EsReceived
+        && effectCluster.effectStateId != AreaEffectSimulation::AesEffectState::EsCreated)
       continue;
-    if (effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER /*&&
+    if (effectCluster.effectSourceId != ProjectDataManagement::EffectSource::ES_ADLER /*&&
             effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE*/)
       continue;
 
-    ret.append(effectCluster.id());
+    ret.append(effectCluster.id);
   }
   return ret;
 }
@@ -996,7 +996,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo
 
   for (const auto &aes : std::as_const(aesEffetClusters))
   {
-    if (aes.isDeleted() || aes.partyId() != saaPartyId || aes.element() != refTrimmed.toStdString())
+    if (aes.isDeleted || aes.partyId != saaPartyId || aes.element != refTrimmed.toStdString())
     {
       continue;
     }
@@ -1007,7 +1007,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo
     bool outOfAmmo = false;
     const int newAmmoAmount = std::max(0, refAmmoCounter - 1);
 
-    DEBUG_LOG(m_logger) << "Handle ammo count - ID: " << aes.id() << " | Ref: " << refTrimmed << " | PartyID: " << saaPartyId << " | oldAmmoCount: " << refAmmoCounter
+    DEBUG_LOG(m_logger) << "Handle ammo count - ID: " << aes.id << " | Ref: " << refTrimmed << " | PartyID: " << saaPartyId << " | oldAmmoCount: " << refAmmoCounter
                         << " | newAmmoCount: " << newAmmoAmount;
 
     if (newAmmoAmount <= 0)
@@ -1038,7 +1038,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo
       }
 
       Core::RemoveElementRequest req;
-      req.id(aes.id());
+      req.id = aes.id;
 
       m_ftcAes->effectClusterRemoveRequest(req);
       // After remove effectCluster remove FeuerkampfReferenz from Maps
@@ -1059,7 +1059,7 @@ void AesHandler::removeAllPendingEffectCluster(int partyId)
   Core::RemoveElementRequest req;
   for (const qint32 id : std::as_const(effectClusterIds))
   {
-    req.id(id);
+    req.id = id;
     INFO_LOG(m_logger) << "Remove effect cluster id: " << id;
 
     qint32 ret = m_ftcAes->effectClusterRemoveRequest(req);
@@ -1075,10 +1075,10 @@ AreaEffectSimulation::Area AesHandler::createMinimumRect(int zone, const QVector
   auto rec = AreaEffectSimulation::Polygons::getMinAreaRect(points, angle);
 
   LtsCoordTrans::UtmCoordinate coord(zone, rec.bottomLeft().x(), rec.bottomLeft().y());
-  ret.cornerBottomLeft() = Core::GeoPosition2D(coord.geographic().x(), coord.geographic().y());
-  ret.rotation() = angle;
-  ret.height() = abs(rec.height());
-  ret.width() = abs(rec.width());
+  ret.cornerBottomLeft = Core::GeoPosition2D(coord.geographic().x(), coord.geographic().y());
+  ret.rotation = angle;
+  ret.height = abs(rec.height());
+  ret.width = abs(rec.width());
 
   return ret;
 }
@@ -1088,39 +1088,39 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
   if (modType == DataModification::eRemoved)
   {
     DEBUG_LOG(m_logger) << "----------------- remove area ------------- ";
-    m_singleExplosions.remove(data.id());
+    m_singleExplosions.remove(data.id);
     return;
   }
   if (modType == DataModification::eAdded)
   {
-    DEBUG_LOG(m_logger) << "----------------- add area ------------- " << data.effectStateId();
-    m_singleExplosions.insert(data.id(), data.effectStateId());
+    DEBUG_LOG(m_logger) << "----------------- add area ------------- " << data.effectStateId;
+    m_singleExplosions.insert(data.id, data.effectStateId);
     return;
   }
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated
-      && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState::EsActivated)
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated
+      && m_singleExplosions.value(data.id, AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState::EsActivated)
   {
-    const auto state = data.effectStateId();
+    const auto state = data.effectStateId;
     DEBUG_LOG(m_logger) << "----------------- switch state ------------- " << state;
-    m_singleExplosions.insert(data.id(), state);
+    m_singleExplosions.insert(data.id, state);
     QJsonObject telegram;
     telegram[QStringLiteral("typeId")] = 80082;
     telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaExplosionSingleChanged");
 
     QJsonObject headerJson;
-    headerJson[QStringLiteral("aesId")] = data.id();
+    headerJson[QStringLiteral("aesId")] = data.id;
     headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
     QJsonObject impactPosition;
-    impactPosition[QStringLiteral("lon")] = data.impactPosition().lon();
-    impactPosition[QStringLiteral("lat")] = data.impactPosition().lat();
+    impactPosition[QStringLiteral("lon")] = data.impactPosition.lon;
+    impactPosition[QStringLiteral("lat")] = data.impactPosition.lat;
 
     QJsonObject jsonData;
     jsonData[QStringLiteral("header")] = headerJson;
     jsonData[QStringLiteral("impactPosition")] = impactPosition; // detonationLocation
-    if (data.participantId().is_set())
+    if (data.participantId.has_value())
     {
-      jsonData[QStringLiteral("participantId")] = data.participantId().get(); // firingObjectIdentifier
+      jsonData[QStringLiteral("participantId")] = data.participantId.get(); // firingObjectIdentifier
     }
 
     telegram[QStringLiteral("data")] = jsonData;
@@ -1130,54 +1130,54 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
 
 void AesHandler::onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: " << data.name();
+  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: " << data.name;
 
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: probs: " << data.properties();
+  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: probs: " << data.properties;
 
-  if (data.properties().empty())
+  if (data.properties.empty())
     return;
 
-  if (!data.partyId().is_set())
+  if (!data.partyId.has_value())
     return;
 
-  DEBUG_LOG(m_logger) << "has PARTY " << data.properties();
+  DEBUG_LOG(m_logger) << "has PARTY " << data.properties;
 
-  if (!data.participantId().is_set())
+  if (!data.participantId.has_value())
     return;
 
-  if (data.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER)
+  if (data.effectSourceId != ProjectDataManagement::EffectSource::ES_ADLER)
     return;
-  DEBUG_LOG(m_logger) << "has PARTICIPANTID " << data.properties();
+  DEBUG_LOG(m_logger) << "has PARTICIPANTID " << data.properties;
 
-  QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties())).object();
+  QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties)).object();
   if (!propertiesObject.value(QStringLiteral("useReceived")).toBool())
     return;
 
-  DEBUG_LOG(m_logger) << "has USE RECEIVED " << data.effectStateId().underlying();
+  DEBUG_LOG(m_logger) << "has USE RECEIVED " << data.effectStateId;
 
-  switch (data.effectStateId().underlying())
+  switch (data.effectStateId)
   {
   case AreaEffectSimulation::AesEffectState::EsCreated:
   {
     // Auftragsannahme (manuelle Quittung)
     // Could be send via notification managment??
-    if (m_aesIdToFeuerkampfReferenz.contains(data.id()))
+    if (m_aesIdToFeuerkampfReferenz.contains(data.id))
     {
-      const QJsonObject probObject = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties())).object();
+      const QJsonObject probObject = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties)).object();
       const QString reference = probObject[AdlerJson::JsonKeys::FEUERKAMPFREFERENZ()].toString();
 
       ExMqManuelleQuittung exmq;
       // exmq.mqManuelleQuittungDaten.feuerkampfreferenz = QString::fromStdString(data.element());
 
       exmq.mqManuelleQuittungDaten.feuerkampfreferenz = reference;
-      m_mainDispatcher->jsonDispatcher()->sendExMqManuelleQuittung(exmq, data.partyId().get());
+      m_mainDispatcher->jsonDispatcher()->sendExMqManuelleQuittung(exmq, data.partyId.get());
 
       // After that we'll remove it form the list to not send an MQ again!
-      m_aesIdToFeuerkampfReferenz.remove(data.id());
-      DEBUG_LOG(m_logger) << "SEND MQ for " << data.name() << " " << reference;
+      m_aesIdToFeuerkampfReferenz.remove(data.id);
+      DEBUG_LOG(m_logger) << "SEND MQ for " << data.name << " " << reference;
       break;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
index 7939db0e2..4ff3c4b9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "asm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -15,6 +16,7 @@ AsmHandler::AsmHandler(QObject *parent)
   , m_dtcAsm(nullptr)
   , m_ftcAsm(nullptr)
   , m_exerciseId(-1)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 bool AsmHandler::init(MainDispatcher* mainDispatcher)
@@ -40,12 +42,12 @@ void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
   WARNING_LOG(m_logger)<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
   
   AssetManagement::Asset asset = m_dtcAsm->asset(assetId);
-  if (asset.id() <= 0)
+  if (asset.id <= 0)
     return;
 
-  QJsonObject assetPropsObj = QJsonDocument::fromJson(asset.properties().c_str()).object();
+  QJsonObject assetPropsObj = QJsonDocument::fromJson(asset.properties.c_str()).object();
   assetPropsObj[QStringLiteral("exerciseId")] = isSaaConnected ? m_exerciseId : -1;
-  asset.properties(QJsonDocument(assetPropsObj).toJson().toStdString());
+  asset.properties = QJsonDocument(assetPropsObj).toJson().toStdString();
   m_ftcAsm->assetModifyRequest(asset);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
index 83234e866..6b943a5c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "flm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "FileManagement/flm_operator_rights.h"
 #include "main_dispatcher.h"
@@ -25,6 +26,7 @@ FlmHandler::FlmHandler(QObject *parent)
   , m_ftcFlm(nullptr)
   , m_ftcNom(nullptr)
   , m_opmDtc(nullptr)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -67,24 +69,24 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   }
 
   FileManagement::FileContentModifyRequest fileContentReq;
-  fileContentReq.isTemplate(false);
-  fileContentReq.isHidden(true);
-  fileContentReq.folderId(folderHXMessagesId);
-  const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtcFlm->folder(folderHXMessagesId).path());
-  fileContentReq.fileCategory(FileManagement::FileCategory::Exercise);
-  fileContentReq.fileType(FileManagement::FileType::AdlerJson);
-  fileContentReq.fileStatus(FileManagement::FileStatus::Valid);
+  fileContentReq.isTemplate = false;
+  fileContentReq.isHidden = true;
+  fileContentReq.folderId = folderHXMessagesId;
+  const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtcFlm->folder(folderHXMessagesId).path);
+  fileContentReq.fileCategory = FileManagement::FileCategory::Exercise;
+  fileContentReq.fileType = FileManagement::FileType::AdlerJson;
+  fileContentReq.fileStatus = FileManagement::FileStatus::Valid;
 
   QByteArray content = QJsonDocument(obj).toJson(QJsonDocument::Compact).constData();
-  fileContentReq.content(LtsUtils::convert<std::vector<uint8_t>>(content));
+  fileContentReq.content = LtsUtils::convert<std::vector<uint8_t>>(content);
 
-  fileContentReq.isUsedBy(false);
-  fileContentReq.usedBy(0);
-  fileContentReq.lastModified(m_mainDispatcher->ddsHandler()->partitionTime());
-  fileContentReq.exerciseId(m_exerciseId);
-  fileContentReq.operatorId(99); 
+  fileContentReq.isUsedBy = false;
+  fileContentReq.usedBy = 0;
+  fileContentReq.lastModified = m_mainDispatcher->ddsHandler()->partitionTime();
+  fileContentReq.exerciseId = m_exerciseId;
+  fileContentReq.operatorId = 99; 
 
-  DEBUG_LOG(m_logger) << "HQ: name: " << fileContentReq.name() << ", folderId: " << folderHXMessagesId << ", exerciseId: " << m_exerciseId << ", partyId: " << partyId;
+  DEBUG_LOG(m_logger) << "HQ: name: " << fileContentReq.name << ", folderId: " << folderHXMessagesId << ", exerciseId: " << m_exerciseId << ", partyId: " << partyId;
 
   
   QRegularExpression re(QStringLiteral("_\\d+$"));
@@ -96,7 +98,7 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   ERROR_LOG(m_logger) << "BaseName: " << baseName << "|";
 
   QStringList fileNames;
-  if (!m_dtcFlm->getAllFiles(fileContentReq.fileType(), folderHXMessagesId, fileNames, true))
+  if (!m_dtcFlm->getAllFiles(fileContentReq.fileType, folderHXMessagesId, fileNames, true))
   {
     ERROR_LOG(m_logger) << "Error while reading fileNames for folderId: " << folderHXMessagesId;
     return false;
@@ -134,7 +136,7 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   const QString newName = baseName
       + QStringLiteral("_") + QString::number(++maxNumber);
   DEBUG_LOG(m_logger) << "newName : " << newName;
-  fileContentReq.name(newName.toStdString());
+  fileContentReq.name = newName.toStdString();
 
   
   m_partyId = partyId;
@@ -152,7 +154,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
   qint64 expiryTime = currentTime + s->getInteger(QStringLiteral("NOM/expiryIntervalMSec"), 2 * 24 * 60 * 60 * 1000); 
   NotificationManagement::NomNotification notif;
 
-  notif.title(tr("HQ Report").toStdString());
+  notif.title = tr("HQ Report").toStdString();
   
   QString linkName = tr("Open HQ Report Dialog");
   QString content = QStringLiteral("[%1](//flmHQReport/?party=%2&folder=%3&file=%4)").arg(linkName).arg(partyId).arg(folderId).arg(fileId);
@@ -167,28 +169,28 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
     content = content.replace(QStringLiteral("[%1](%2)").arg(it.value(), it.key()), QStringLiteral("<a href='%1'>%2</a>").arg(it.key(), it.value()));
   }
 
-  notif.content(content.toStdString());
-  notif.timeStamp(currentTime);
-  notif.expiryTime(expiryTime);
+  notif.content = content.toStdString();
+  notif.timeStamp = currentTime;
+  notif.expiryTime = expiryTime;
 
   int prio = s->getInteger(QStringLiteral("NOM/notificationPriority"), 3); 
   DEBUG_LOG(m_logger) << " Setting: NotificationPriority: " << prio;
-  notif.priority(static_cast<NotificationManagement::Priority>(prio));
-  notif.processedPriority(NotificationManagement::Priority::Low);
-  notif.exerciseId(m_exerciseId);
+  notif.priority = static_cast<NotificationManagement::Priority>(prio);
+  notif.processedPriority = NotificationManagement::Priority::Low;
+  notif.exerciseId = m_exerciseId;
 
   for (const auto &userId : m_opmDtc->getOperatorsByOperatorRight(OperatorRights::FileManagementFilesEdit))
   {
     NotificationManagement::Address addr;
-    addr.addressId(userId);
-    addr.isRead(false);
-    addr.name(m_opmDtc->user(userId).name());
-    addr.addressType(NotificationManagement::AddressType::Operator);
-    notif.recipientIds().push_back(addr);
+    addr.addressId = userId;
+    addr.isRead = false;
+    addr.name = m_opmDtc->user(userId).name;
+    addr.addressType = NotificationManagement::AddressType::Operator;
+    notif.recipientIds.push_back(addr);
   }
 
   NotificationManagement::CreateNotificationRequest notifReq;
-  notifReq.notification(notif);
+  notifReq.notification = notif;
 
   if (!m_ftcNom->createNotificationRequest(notifReq, this))
     ERROR_LOG(m_logger) << "Error requesting create Notification data";
@@ -210,10 +212,10 @@ void FlmHandler::initHQFolders(int partyId)
   std::vector<std::string> vecFolderNames = {"HQ Data", partyName.toStdString(), "Messages"};
 
   FileManagement::PathCreateRequest req;
-  req.path(vecFolderNames);
-  req.parentId(exerciseFolderId);
-  req.isEditable(false);
-  req.operatorId(99); 
+  req.path = vecFolderNames;
+  req.parentId = exerciseFolderId;
+  req.isEditable = false;
+  req.operatorId = 99; 
 
   m_ftcFlm->pathCreateRequest(req, this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
index eac15006e..66ea7b95e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
@@ -121,14 +121,14 @@ int JsonDispatcher::getAssetId(const QString &saaName) const
 
   for (const auto &currAsset : m_mainDispatcher->asmHandler()->getDtc()->assets())
   {
-    if (currAsset.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
+    if (currAsset.assetTypeId != AssetManagement::AssetType::AdlerSAA)
       continue;
-    const auto &dbSaa = saaNameFromProps(currAsset.properties());
+    const auto &dbSaa = saaNameFromProps(currAsset.properties);
 
     if (dbSaa.toLower() != saaName.toLower())
       continue;
 
-    return currAsset.id();
+    return currAsset.id;
   }
   return -1;
 }
@@ -436,10 +436,10 @@ void JsonDispatcher::onSAAStatus(const int wsId, const EXStatus &status)
 QString JsonDispatcher::getParticipantInfoLink(const QString &verein, const int partyId, const bool isVerbund)
 {
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(verein, partyId, isVerbund);
-  DEBUG_LOG(m_logger) << "ParticipantId=" << part.id();
+  DEBUG_LOG(m_logger) << "ParticipantId=" << part.id;
 
   QString ppmlink = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br />"))
-                    .arg(part.id());
+                    .arg(part.id);
 
 
   return ppmlink;
@@ -481,7 +481,7 @@ void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQWS.einheit.verein, partyId, isVerbund);
 
   m_ppmHandler->parseSQWS(exSQWS, wsId);
-  if (part.id() > 0)
+  if (part.id > 0)
   {
     sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQWS.einheit);
     return;
@@ -500,7 +500,7 @@ void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS
 
   m_ppmHandler->parseSQFS(exSQFS, wsId);
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQFS.feuereinheit.verein, partyId, isVerbund);
-  if (part.id() > 0)
+  if (part.id > 0)
   {
     sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQFS.feuereinheit);
     return;
@@ -521,7 +521,7 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
 
 
   m_ppmHandler->parseSQLP(exSQLP, wsId);
-  if (part.id() > 0)
+  if (part.id > 0)
   {
     sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQLP.einheit);
     return;
@@ -537,11 +537,11 @@ void JsonDispatcher::sendParticipantInfoNotification(const int wsId, const int p
   QStringList args;
 
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(einheit.verein, partyId, isVerbund);
-  DEBUG_LOG(m_logger) << "sendParticipantInfoNotification ParticipantId=" << part.id();
+  DEBUG_LOG(m_logger) << "sendParticipantInfoNotification ParticipantId=" << part.id;
 
   QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
 
-  args.append(QString::number(part.id()));
+  args.append(QString::number(part.id));
   args.append(ortsIdMap.key(einheit.oi));
   args.append(QString::number(einheit.r));
   args.append(einheit.verein);
@@ -626,8 +626,8 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
 
   DEBUG_LOG(m_logger) << "[EX-FH] data from SSA " << wsId << " : "
                       << "verein: " << feuerhaltdaten.verein << " "
-                      << "kenner: " << feuerhaltdaten.kenner.underlying() << " "
-                      << "kategorie: " << feuerhaltdaten.kategorie.underlying() << " "
+                      << "kenner: " << feuerhaltdaten.kenner << " "
+                      << "kategorie: " << feuerhaltdaten.kategorie << " "
                       << "feuerkampfReferenz: " << feuerhaltdaten.feuerkampfReferenz << " "
                       << "zpNummer: " << feuerhaltdaten.zpNummer << " "
                       << "koordinaten: "
@@ -642,17 +642,17 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
 
   AreaEffectSimulation::EffectClusterFireHaltRequest req;
 
-  req.partyId(partyId);
-  req.fireHaltCategory(kategorie);
-  req.kenner(kenner);
-  req.longitude(feuerhaltdaten.koordinate.longitude);
-  req.latitude(feuerhaltdaten.koordinate.latitude);
-  req.radius(feuerhaltdaten.radius);
-  req.entladenSchuss(feuerhaltdaten.entladenSchuss);
+  req.partyId = partyId;
+  req.fireHaltCategory = kategorie;
+  req.kenner = kenner;
+  req.longitude = feuerhaltdaten.koordinate.longitude;
+  req.latitude = feuerhaltdaten.koordinate.latitude;
+  req.radius = feuerhaltdaten.radius;
+  req.entladenSchuss = feuerhaltdaten.entladenSchuss;
 
   const bool bRet = m_mainDispatcher->aesHandler()->getFtc()->effectClusterFireHaltRequest(req);
 
-  if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::E && !feuerhaltdaten.entladenSchuss) //we can send the EXVollzugsmeldung immediatly
+  if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E && !feuerhaltdaten.entladenSchuss) //we can send the EXVollzugsmeldung immediatly
   {
     Feuerkampfdaten fkd;
     fkd.feuerkampfReferenz = feuerhaltdaten.feuerkampfReferenz;
@@ -770,27 +770,27 @@ QUrl JsonDispatcher::webSocketUrl() const { return QUrl(QStringLiteral("ws://127
 void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const AdlerCalculateTrajectoryRequest &request)
 {
   Core::FunctionReplyObject ret;
-  m_explosionIndex = request.explosionIndex();
+  m_explosionIndex = request.explosionIndex;
   m_cookieCalculateTrajectoryAdler = cookie;
   DEBUG_LOG(m_logger) << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
                       << ", m_saaInterfaces.size=" << m_saaInterfaces.size();
 
   int wsId = 0;
-  std::shared_ptr<SAAInterface> saaInterface = getSAAByParty(request.partyId());
+  std::shared_ptr<SAAInterface> saaInterface = getSAAByParty(request.partyId);
   if (saaInterface)
     wsId = saaInterface->getWsId();
 
   if (wsId == 0)
   {
     DEBUG_LOG(m_logger) << " No wsId found wsId=" << wsId << " return";
-    ret.setId(request.explosionIndex());
+    ret.setId(request.explosionIndex);
     m_ftsTab->adlerCalculateTrajectoryReply(cookie, ret);
 
     return;
   }
   DEBUG_LOG(m_logger) << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
                       << " connect to SAA and send data"
-                      << ", partyId :" << request.partyId() << ", wsId :" << wsId;
+                      << ", partyId :" << request.partyId << ", wsId :" << wsId;
   ExFlugbahnberechnung exFlugbahnberechnung;
 
   exFlugbahnberechnung.sender = QStringLiteral("EXCON@GUEZ.DE");
@@ -804,57 +804,57 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   exFlugbahnberechnung.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
   exFlugbahnberechnung.version = QStringLiteral("0.0.5");
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.standort.koordinate.latitude = request.positionLaunch().lat() * 180.0 / M_PI;
-  exFlugbahnberechnung.flugbahnberechnungDaten.standort.koordinate.longitude = request.positionLaunch().lon() * 180.0 / M_PI;
-  exFlugbahnberechnung.flugbahnberechnungDaten.standort.hoehe = request.positionLaunch().z();
+  exFlugbahnberechnung.flugbahnberechnungDaten.standort.koordinate.latitude = request.positionLaunch.lat * 180.0 / M_PI;
+  exFlugbahnberechnung.flugbahnberechnungDaten.standort.koordinate.longitude = request.positionLaunch.lon * 180.0 / M_PI;
+  exFlugbahnberechnung.flugbahnberechnungDaten.standort.hoehe = request.positionLaunch.z;
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.latitude = request.positionTarget().lat() * 180.0 / M_PI;
-  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.longitude = request.positionTarget().lon() * 180.0 / M_PI;
-  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.hoehe = request.positionTarget().z();
+  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.latitude = request.positionTarget.lat * 180.0 / M_PI;
+  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.longitude = request.positionTarget.lon * 180.0 / M_PI;
+  exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.hoehe = request.positionTarget.z;
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType(request.weaponSystemType().underlying() + 1);
-  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  weaponSystemType " << request.weaponSystemType().underlying();
+  exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = static_cast<ProjectDataManagement::L26_EffectingSystemType>(static_cast<int>(request.weaponSystemType) + 1);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  weaponSystemType " << request.weaponSystemType;
 
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  L26_EffectingSystemType " << exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem;
 
   exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.geschosssorte
-      = m_mainDispatcher->pdmHandler()->getDtc()->adlerChargeTypeName(request.trajectory().chargeTypeId());
-  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  chargeTypeId " << request.trajectory().chargeTypeId();
+      = m_mainDispatcher->pdmHandler()->getDtc()->adlerChargeTypeName(request.trajectory.chargeTypeId);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  chargeTypeId " << request.trajectory.chargeTypeId;
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  geschosssorte " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.geschosssorte;
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuender = m_mainDispatcher->pdmHandler()->getDtc()->adlerIgniterTypeName(request.trajectory().igniterTypeId());
-  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterTypeId " << request.trajectory().igniterTypeId();
+  exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuender = m_mainDispatcher->pdmHandler()->getDtc()->adlerIgniterTypeName(request.trajectory.igniterTypeId);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterTypeId " << request.trajectory.igniterTypeId;
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  zuender " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuender;
 
   exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuenderFunktion
-      = m_mainDispatcher->pdmHandler()->getDtc()->adlerIgniterFunctionName(request.trajectory().igniterFunctionId());
-  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterFunctionId " << request.trajectory().igniterFunctionId();
+      = m_mainDispatcher->pdmHandler()->getDtc()->adlerIgniterFunctionName(request.trajectory.igniterFunctionId);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterFunctionId " << request.trajectory.igniterFunctionId;
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  zuenderFunktion " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuenderFunktion;
 
-  if (request.trajectory().loadTypeId() > 0)
-    exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.ladung = m_mainDispatcher->pdmHandler()->getDtc()->adlerLoadTypeName(request.trajectory().loadTypeId());
+  if (request.trajectory.loadTypeId > 0)
+    exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.ladung = m_mainDispatcher->pdmHandler()->getDtc()->adlerLoadTypeName(request.trajectory.loadTypeId);
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  ladung " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.ladung;
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.sprenghoehe = static_cast<int>(request.explosionHeight());
-  exFlugbahnberechnung.flugbahnberechnungDaten.winkelgruppe = AdlerJson::Winkelgruppe(request.angleGroup().underlying());
+  exFlugbahnberechnung.flugbahnberechnungDaten.sprenghoehe = static_cast<int>(request.explosionHeight);
+  exFlugbahnberechnung.flugbahnberechnungDaten.winkelgruppe = AdlerJson::Winkelgruppe(request.angleGroup);
 
   //////////////////////////////////////////////////
   /// Daten aus dem ESG-Simulator
 
-  if (request.properties().empty())
+  if (request.properties.empty())
     ERROR_LOG(m_logger) << "No properties available";
-  DEBUG_LOG(m_logger) << ", request.aesItemId() :" << request.aesItemId();
+  DEBUG_LOG(m_logger) << ", request.aesItemId() :" << request.aesItemId;
 
   //////////////////////////////////////////////////
 
   DEBUG_LOG(m_logger) << "UUID=" << exFlugbahnberechnung.uuid;
   TrajectoryIdentifier trajectoryIdentifier;
 
-  trajectoryIdentifier.aesItemId = request.aesItemId();
-  trajectoryIdentifier.explosionId = request.explosionIndex();
+  trajectoryIdentifier.aesItemId = request.aesItemId;
+  trajectoryIdentifier.explosionId = request.explosionIndex;
   QString uuidCleaned = exFlugbahnberechnung.uuid.remove(QStringLiteral("-"));
   m_trajectoryIdentifier.insert(uuidCleaned, trajectoryIdentifier);
-  m_positionsLaunch.insert(uuidCleaned, request.positionLaunch());
+  m_positionsLaunch.insert(uuidCleaned, request.positionLaunch);
 
   QJsonObject telegram;
   telegram = exFlugbahnberechnung.toJson();
@@ -896,7 +896,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
   const qint64 expiryTime = currentTime + 100 * 1000;
   NotificationManagement::NomNotification notif;
 
-  notif.title(title.toStdString());
+  notif.title = title.toStdString();
 
   const auto saa = getSAAByWs(wsId);
   if (!saa)
@@ -907,25 +907,25 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
   //QString content = QStringLiteral("[Open Notification List ](//nomEditGuiPlugin/)") + QStringLiteral("<br />");
   const int partyId = saa->getPartyId();
   const ParticipantManagement::Party party = m_ppmHandler->getDtc()->party(partyId);
-  const QString partyStr = QString::fromStdString(party.name());
+  const QString partyStr = QString::fromStdString(party.name);
 
   std::vector<std::string> args;
   args.reserve(contentArgs.size());
   for (const auto & str : std::as_const(contentArgs))
     args.emplace_back(str.toStdString());
 
-  notif.content(content.toStdString());
-  notif.contentArgs(args);
-  notif.timeStamp(currentTime);
-  notif.expiryTime(expiryTime);
-  notif.priority(NotificationManagement::Priority::High);
-  notif.processedPriority(NotificationManagement::Priority::High);
-  notif.exerciseId(m_mainDispatcher->exerciseId());
+  notif.content = content.toStdString();
+  notif.contentArgs = args;
+  notif.timeStamp = currentTime;
+  notif.expiryTime = expiryTime;
+  notif.priority = NotificationManagement::Priority::High;
+  notif.processedPriority = NotificationManagement::Priority::High;
+  notif.exerciseId = m_mainDispatcher->exerciseId();
 
   const QVector<int> recipientIds = m_mainDispatcher->ddsHandler()->dtcOpm()->getNotificationRecipents(m_mainDispatcher->exerciseId(),
                                                                                                        partyId,
                                                                                                        OperatorRights::AdlerExplosionClusterEdit,
-                                                                                                       data.notification().notificationType().underlying());
+                                                                                                       static_cast<int>(data.notification.notificationType));
   DEBUG_LOG(m_logger) << "getCreateNotificationRequestData recipientIds.size=" << recipientIds.size()
                       << ", exerciseId=" << m_mainDispatcher->exerciseId();
   std::vector<NotificationManagement::Address> recipientIdsDds;
@@ -934,22 +934,22 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
   for (const auto &recipientId : std::as_const(recipientIds))
   {
     NotificationManagement::Address addr;
-    addr.addressId(recipientId);
-    addr.isRead(false);
+    addr.addressId = recipientId;
+    addr.isRead = false;
     const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId);
-    addr.name(user.name());
-    addr.addressType(NotificationManagement::AddressType::Operator);
-    notif.recipientIds().push_back(addr);
-    DEBUG_LOG(m_logger) << "recipientId=" << addr.name()
-                        << ", addr.addressId=" << addr.addressId();
+    addr.name = user.name;
+    addr.addressType = NotificationManagement::AddressType::Operator;
+    notif.recipientIds.push_back(addr);
+    DEBUG_LOG(m_logger) << "recipientId=" << addr.name
+                        << ", addr.addressId=" << addr.addressId;
   }
 
   NotificationManagement::Address addrSender;
-  addrSender.name(saa->getSAAName().toStdString());
-  addrSender.addressType(NotificationManagement::AddressType::Service);
-  notif.sender(addrSender);
+  addrSender.name = saa->getSAAName().toStdString();
+  addrSender.addressType = NotificationManagement::AddressType::Service;
+  notif.sender = addrSender;
 
-  data.notification(notif);
+  data.notification = notif;
 } // end of getCreateNotificationRequestData()
 
 void JsonDispatcher::createNotificationRequest(const int wsId,
@@ -963,16 +963,16 @@ void JsonDispatcher::createNotificationRequest(const int wsId,
                        << ", content=" << content;
   NotificationManagement::CreateNotification req;
   getCreateNotificationRequestData(wsId, title, req, content, args);
-  if (req.notification().content().empty())
+  if (req.notification.content.empty())
   {
     INFO_LOG(m_logger) << "req.notification().content().empty()";
     return;
   }
-  req.notification().messageType(messageType);
-  req.notification().notificationType(notificationType);
+  req.notification.messageType = messageType;
+  req.notification.notificationType = notificationType;
 
   INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
-  if (req.notification().recipientIds().size() == 0)
+  if (req.notification.recipientIds.size() == 0)
   {
     INFO_LOG(m_logger) << "req.notification().recipientIds().size() == 0";
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
index 412a759a1..3206ff909 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "json_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "json_dispatcher.h"
 #include "ppm_handler.h"
 #include "pdm_handler.h"
@@ -17,6 +18,7 @@ JsonHandlerTx::JsonHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, MainDi
   , m_mainDispatcher(mainDispatcher)
   , m_webSocket(nullptr)
   , m_bWebsocketConnectedToExternalSystem(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 void JsonHandlerTx::onWebSocketConnected(QWebSocket *webSocket)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
index 655a932fa..a5f2bea3b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
@@ -87,7 +87,7 @@ bool MainDispatcher::init()
 void MainDispatcher::onWebsocketConnected(quint16 port)
 {
   ERROR_LOG(m_logger) << "ApAdler started, Domain Id: " << QString::number(port);
-  m_ddsHandler->pacemaker()->addPort(port, Core::PortType::WebSocketAdlerServer);
+  m_ddsHandler->pacemaker()->addPort(port, Core::CorePortType::WebSocketAdlerServer);
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
index 9155b7641..5b5280cb6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pdm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -46,25 +47,25 @@ void PdmHandler::getChargeTypes()
 
   for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
   {
-    if (charge.disEntity().empty())
+    if (charge.disEntity.empty())
       continue;
 
     QJsonObject chargeType;
-    chargeType[QStringLiteral("id")] = charge.id();
-    chargeType[QStringLiteral("name")] = QString::fromStdString(charge.name());
-    chargeType[QStringLiteral("entityTypeStruct")] = QString::fromStdString(charge.disEntity());
+    chargeType[QStringLiteral("id")] = charge.id;
+    chargeType[QStringLiteral("name")] = QString::fromStdString(charge.name);
+    chargeType[QStringLiteral("entityTypeStruct")] = QString::fromStdString(charge.disEntity);
     int gearTypeId = 0;
     
     for(const ProjectDataManagement::GearTypeChargeType &val : gearTypeChargeTypes)
     {
-      if(val.chargeTypeId() == charge.id())
+      if(val.chargeTypeId == charge.id)
       {
-        gearTypeId = val.gearTypeId();
+        gearTypeId = val.gearTypeId;
         break;
       }
     }
-    chargeType[QStringLiteral("primaryGearTasCode")] = gearTypes[gearTypeId].tasCode();
-    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(charge.properties()));
+    chargeType[QStringLiteral("primaryGearTasCode")] = gearTypes[gearTypeId].tasCode;
+    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(charge.properties));
 
     QJsonObject prop = doc.object();
     chargeType[QStringLiteral("radius")] = prop[QStringLiteral("impactRadius")];
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
index 7fb8c041a..94ea22fd3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ppm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "Core/core.hpp"
 
@@ -22,6 +23,7 @@ static const int ADLER_NOT_OPERATIONAL = 127;
 PpmHandler::PpmHandler(QObject *parent)
     : QObject(parent)
     , m_sendParticipantDataTimer(new QTimer(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -77,17 +79,17 @@ void PpmHandler::modifyPartyAdlerProperties(const int wsId,
   ParticipantManagement::Party requestParty;
   requestParty = m_dtcPpm->party(partyId);
   
-  QJsonObject origObj = QJsonDocument::fromJson(requestParty.properties().c_str()).object();
+  QJsonObject origObj = QJsonDocument::fromJson(requestParty.properties.c_str()).object();
   
   QJsonObject adlerPropertiesObj = origObj[QStringLiteral("Adler")].toObject();
-  adlerPropertiesObj[QStringLiteral("saaConnectedState")] = connectState.underlying();
+  adlerPropertiesObj[QStringLiteral("saaConnectedState")] = static_cast<int>(connectState);
   adlerPropertiesObj[QStringLiteral("szenarName")] = szenarName;
   adlerPropertiesObj[QStringLiteral("saaName")] = saaName;
   adlerPropertiesObj[QStringLiteral("wsId")] = wsId;
   adlerPropertiesObj[QStringLiteral("assetId")] = ((connectState == ParticipantManagement::ConnectState::Connected) ? assetId : -1); 
   adlerPropertiesObj[QStringLiteral("isVerbund")] = isVerbund;
 
-  const QByteArray &propertiesBa = requestParty.properties().c_str();
+  const QByteArray &propertiesBa = requestParty.properties.c_str();
   QJsonParseError parserError;
   QJsonDocument doc(QJsonDocument::fromJson(propertiesBa, &parserError));
 
@@ -103,7 +105,7 @@ void PpmHandler::modifyPartyAdlerProperties(const int wsId,
   obj[QStringLiteral("Adler")] = adlerPropertiesObj;
 
   const QByteArray propertiesStr = QJsonDocument(obj).toJson(QJsonDocument::Compact);
-  requestParty.properties() = propertiesStr.data();
+  requestParty.properties = propertiesStr.data();
 
   m_ftcPpm->modifyPartyDataRequest(requestParty);
 }
@@ -145,13 +147,13 @@ void PpmHandler::parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId)
   int superiorModId = 1000000007;
   ParticipantManagement::Participant pUnit = findParticipantByInternalName(verein, saa->getPartyId(), saa->getIsVerbund());
   
-  if (pUdata.modId() > 0)
+  if (pUdata.modId > 0)
   {
     m_sendParticipantDataTimer->start();
     return;
   }
   
-  if (pUnit.id() > 0)
+  if (pUnit.id > 0)
   {
     
     
@@ -171,38 +173,38 @@ void PpmHandler::parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId)
   {
     std::vector<ParticipantManagement::ParticipantData> list;
     
-    const ParticipantManagement::Type unitType = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType.underlying()), true, saa->getIsVerbund());
+    const ParticipantManagement::Type unitType = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType), true, saa->getIsVerbund());
 
     
     
     
     const auto root = findRootUnit(saa->getPartyId());
-    if (root.id() > 0)
+    if (root.id > 0)
     {
       DEBUG_LOG(m_logger) << "Append FS Unit to root Unit";
       list.push_back(root);
     }
 
     ParticipantManagement::ParticipantData data = findParticipantDataByInternalName(rndNmbr, verein, saa->getIsVerbund()); 
-    data.id(0);
-    data.partyId(saa->getPartyId());
-    data.externalId(0);
-    data.hierarchyNumber(1);
-    data.name(verein.toStdString());
-    data.designator(verein.toStdString());
-    data.symbol(unitType.symbol());
-    data.tacticalIdentifier(verein.toStdString());
-    data.typeId(unitType.id());
-    data.modId(superiorModId);
-    data.isDeleted(false);
-    data.isSimulated(false);
-    data.superiorModId(root.modId());
+    data.id = 0;
+    data.partyId = saa->getPartyId();
+    data.externalId = 0;
+    data.hierarchyNumber = 1;
+    data.name = verein.toStdString();
+    data.designator = verein.toStdString();
+    data.symbol = unitType.symbol;
+    data.tacticalIdentifier = verein.toStdString();
+    data.typeId = unitType.id;
+    data.modId = superiorModId;
+    data.isDeleted = false;
+    data.isSimulated = false;
+    data.superiorModId = root.modId;
 
     list.push_back(data);
 
     ParticipantManagement::ModifyParticipantDataRequest newRequest;
-    newRequest.requestId(rndNmbr); 
-    newRequest.data(list);
+    newRequest.requestId = rndNmbr; 
+    newRequest.data = list;
 
     
     m_tempPartDataList.insert(rndNmbr, list);
@@ -250,7 +252,7 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
 
   m_tempPositionMap.insert(currentRandomNumber, posMap);
 
-  if (pp.id() > 0)
+  if (pp.id > 0)
   {
     
     DEBUG_LOG(m_logger) << "Found Participant only update pos";
@@ -266,9 +268,9 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
   {
 
     
-    const ParticipantManagement::Type type = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType.underlying()), false, saa->getIsVerbund());
-    DEBUG_LOG(m_logger) << "found type with id: " << type.id() << " for name: " << waffensystemtypMap.key(internalType);
-    if (type.id() <= 0)
+    const ParticipantManagement::Type type = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType), false, saa->getIsVerbund());
+    DEBUG_LOG(m_logger) << "found type with id: " << type.id << " for name: " << waffensystemtypMap.key(internalType);
+    if (type.id <= 0)
     {
       ERROR_LOG(m_logger) << "NO Type Found";
       return;
@@ -280,27 +282,27 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
     uint superiorModId = QRandomGenerator::global()->generate() / 2;
 
     ParticipantManagement::Participant pUnit = findParticipantByInternalName(verein, saa->getPartyId(), saa->getIsVerbund());
-    DEBUG_LOG(m_logger) << "Looking for Verein: " << verein << " found Unit: " << pUnit.id() << " foundData: " << pUdata.modId();
+    DEBUG_LOG(m_logger) << "Looking for Verein: " << verein << " found Unit: " << pUnit.id << " foundData: " << pUdata.modId;
 
-    if (pUdata.modId() > 0)
+    if (pUdata.modId > 0)
     {
-      superiorModId = pUdata.modId();
+      superiorModId = pUdata.modId;
       DEBUG_LOG(m_logger) << "FOUND UNIT in list use their modId " << superiorModId << " RND: " << currentRandomNumber;
     }
-    else if (pUnit.id() > 0)
+    else if (pUnit.id > 0)
     {
       
       ParticipantManagement::ParticipantData pUData = m_dtcPpm->convertParticipantToParticipantData(pUnit);
-      pUData.modId(superiorModId);
-      pUData.hierarchyNumber(1);
+      pUData.modId = superiorModId;
+      pUData.hierarchyNumber = 1;
 
       list.push_back(pUData);
       m_tempPartDataList.insert(currentRandomNumber, list);
       DEBUG_LOG(m_logger) << "CREATE Uit from ppm " << superiorModId << " RND: " << currentRandomNumber;
       ParticipantManagement::Participant tmp = pUnit;
-      while (tmp.superiorId() > 0)
+      while (tmp.superiorId > 0)
       {
-        tmp = m_dtcPpm->participant(tmp.superiorId());
+        tmp = m_dtcPpm->participant(tmp.superiorId);
         pUData = m_dtcPpm->convertParticipantToParticipantData(tmp);
         list.push_back(pUData);
       }
@@ -312,7 +314,7 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
       
       
       const auto root = findRootUnit(saa->getPartyId());
-      if (root.id() > 0)
+      if (root.id > 0)
       {
         DEBUG_LOG(m_logger) << "Append to Unit" << superiorModId << " RND: " << currentRandomNumber;
         list.push_back(root);
@@ -320,19 +322,19 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
       const ParticipantManagement::Type unitType = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType), true, saa->getIsVerbund());
       DEBUG_LOG(m_logger) << "CREATE NEW Unit use supId" << superiorModId << " RND: " << currentRandomNumber;
       ParticipantManagement::ParticipantData data;
-      data.id(0);
-      data.partyId(saa->getPartyId());
-      data.externalId(0);
-      data.hierarchyNumber(1);
-      data.name(verein.toStdString());
-      data.designator(verein.toStdString());
-      data.symbol(unitType.symbol());
-      data.tacticalIdentifier(verein.toStdString());
-      data.typeId(unitType.id()); 
-      data.modId(superiorModId);
-      data.isDeleted(false);
-      data.isSimulated(false);
-      data.superiorModId(root.modId());
+      data.id = 0;
+      data.partyId = saa->getPartyId();
+      data.externalId = 0;
+      data.hierarchyNumber = 1;
+      data.name = verein.toStdString();
+      data.designator = verein.toStdString();
+      data.symbol = unitType.symbol;
+      data.tacticalIdentifier = verein.toStdString();
+      data.typeId = unitType.id; 
+      data.modId = superiorModId;
+      data.isDeleted = false;
+      data.isSimulated = false;
+      data.superiorModId = root.modId;
       
       list.push_back(data);
     }
@@ -342,19 +344,19 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
 
     ParticipantManagement::ParticipantData data;
 
-    data.id(0);
-    data.partyId(saa->getPartyId());
-    data.externalId(0);
-    data.hierarchyNumber(list.size());
-    data.name(waffensystemkennerMap.key(internalName).toStdString());
-    data.designator(waffensystemkennerMap.key(internalName).toStdString());
-    data.symbol(type.symbol());
-    data.tacticalIdentifier(verein.toStdString());
-    data.typeId(type.id()); 
-    data.modId(QRandomGenerator::global()->generate() / 2);
-    data.isDeleted(false);
-    data.isSimulated(false);
-    data.superiorModId(superiorModId);
+    data.id = 0;
+    data.partyId = saa->getPartyId();
+    data.externalId = 0;
+    data.hierarchyNumber = list.size();
+    data.name = waffensystemkennerMap.key(internalName).toStdString();
+    data.designator = waffensystemkennerMap.key(internalName).toStdString();
+    data.symbol = type.symbol;
+    data.tacticalIdentifier = verein.toStdString();
+    data.typeId = type.id; 
+    data.modId = QRandomGenerator::global()->generate() / 2;
+    data.isDeleted = false;
+    data.isSimulated = false;
+    data.superiorModId = superiorModId;
     
     
     list.push_back(data);
@@ -392,7 +394,7 @@ void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
   
   ParticipantManagement::Participant pp = findParticipantByInternalName(verein, saa->getPartyId(), saa->getIsVerbund());
   const ParticipantManagement::Type type = m_dtcPpm->getTypeFromAdlerType(QStringLiteral("LP"), false, saa->getIsVerbund());
-  if (pp.id() > 0)
+  if (pp.id > 0)
   {
     
     sendPositionFromTempMap(rndNmbr, saa->getPartyId(), saa->getIsVerbund());
@@ -416,7 +418,7 @@ void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
     
     
     const auto root = findRootUnit(saa->getPartyId());
-    if (root.id() > 0)
+    if (root.id > 0)
     {
       DEBUG_LOG(m_logger) << "Append LP to Unit";
       list.push_back(root);
@@ -424,23 +426,23 @@ void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
 
     ParticipantManagement::ParticipantData data;
 
-    data.id(0);
-    data.partyId(saa->getPartyId());
-    data.externalId(0);
-    data.hierarchyNumber(1);
-    data.name(verein.toStdString());
-    data.designator(verein.toStdString());
-    data.symbol(type.symbol());
-    data.tacticalIdentifier(verein.toStdString());
-    data.typeId(type.id()); 
-    data.modId(1000000001);
-    data.isDeleted(false);
-    data.isSimulated(false);
-    data.superiorModId(root.modId());
+    data.id = 0;
+    data.partyId = saa->getPartyId();
+    data.externalId = 0;
+    data.hierarchyNumber = 1;
+    data.name = verein.toStdString();
+    data.designator = verein.toStdString();
+    data.symbol = type.symbol;
+    data.tacticalIdentifier = verein.toStdString();
+    data.typeId = type.id; 
+    data.modId = 1000000001;
+    data.isDeleted = false;
+    data.isSimulated = false;
+    data.superiorModId = root.modId;
     ParticipantManagement::ModifyParticipantDataRequest *newRequest = new ParticipantManagement::ModifyParticipantDataRequest();
-    newRequest->requestId(rndNmbr); 
+    newRequest->requestId = rndNmbr; 
     list.push_back(data);
-    newRequest->data(list);
+    newRequest->data = list;
 
     
     m_tempPartDataList.insert(rndNmbr, list);
@@ -459,18 +461,18 @@ void PpmHandler::removeAllSAAParticipants(const int partyId)
   std::vector<ParticipantManagement::ParticipantData> list;
   for (const auto &part : std::as_const(participants))
   {
-    const ParticipantManagement::Type &participantType = m_dtcPpm->type(part.typeId());
+    const ParticipantManagement::Type &participantType = m_dtcPpm->type(part.typeId);
     bool isUnitType
-        = (participantType.typeClass() == ParticipantManagement::TypeClass::Unit) || (participantType.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
+        = (participantType.typeClass == ParticipantManagement::TypeClass::Unit) || (participantType.typeClass == ParticipantManagement::TypeClass::SupportUnit);
     if (isUnitType)
       continue;
 
     ParticipantManagement::ParticipantData pToDel;
-    pToDel.id() = part.id();
-    pToDel.isDeleted() = true;
+    pToDel.id = part.id;
+    pToDel.isDeleted = true;
     list.push_back(pToDel);
   }
-  req.data(list);
+  req.data = list;
   DEBUG_LOG(m_logger) << "Remove all participants (without Units): " << list.size();
   m_ftcPpm->modifyParticipantDataRequest(req, this);
 }
@@ -484,24 +486,24 @@ void PpmHandler::onCreateParticipant()
 {
   ParticipantManagement::ParticipantData data;
 
-  data.id(0);
-  data.partyId(3);
-  data.externalId(0);
-  data.hierarchyNumber(1);
-  data.name("Noah Thiering");
-  data.designator("Hund");
-  data.symbol("AP6D|CMPL|10011000001308000000");
-  data.tacticalIdentifier("14");
-  data.typeId(177);
-  data.modId(1000000001);
-  data.isDeleted(false);
-  data.isSimulated(false);
-  data.superiorModId(0);
+  data.id = 0;
+  data.partyId = 3;
+  data.externalId = 0;
+  data.hierarchyNumber = 1;
+  data.name = "Noah Thiering";
+  data.designator = "Hund";
+  data.symbol = "AP6D|CMPL|10011000001308000000";
+  data.tacticalIdentifier = "14";
+  data.typeId = 177;
+  data.modId = 1000000001;
+  data.isDeleted = false;
+  data.isSimulated = false;
+  data.superiorModId = 0;
   ParticipantManagement::ModifyParticipantDataRequest *newRequest = new ParticipantManagement::ModifyParticipantDataRequest();
-  newRequest->requestId(2);
+  newRequest->requestId = 2;
   std::vector<ParticipantManagement::ParticipantData> liste;
   liste.push_back(data);
-  newRequest->data(liste);
+  newRequest->data = liste;
   
   
   
@@ -556,26 +558,26 @@ bool PpmHandler::isEqNumberInExercise(const int equipmentNumber) const
 
 void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &participant, DataModification modType)
 {
-  if (!participant.equipmentNumber().is_set())
+  if (!participant.equipmentNumber.has_value())
   {
     for (auto it = m_participantIdsByEqNo.begin(); it != m_participantIdsByEqNo.end(); ++it)
-      if (it.value() == participant.id())
+      if (it.value() == participant.id)
       {
         m_participantIdsByEqNo.remove(it.key());
         break;
       }
     return;
   }
-  if (participant.externalId() > 0)
+  if (participant.externalId > 0)
     return;
 
   QJsonObject headerJson;
-  headerJson[QStringLiteral("equipmentNumber")] = participant.equipmentNumber().get();
+  headerJson[QStringLiteral("equipmentNumber")] = participant.equipmentNumber.get();
   headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
   if (modType == DataModification::eRemoved)
   {
-    m_participantIdsByEqNo.remove(participant.equipmentNumber().get());
+    m_participantIdsByEqNo.remove(participant.equipmentNumber.get());
     QJsonObject telegram;
     QJsonObject data;
     data[QStringLiteral("header")] = headerJson;
@@ -587,39 +589,39 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
 
     return;
   }
-  if (m_participantIdsByEqNo.contains(participant.equipmentNumber().get()))
+  if (m_participantIdsByEqNo.contains(participant.equipmentNumber.get()))
   {
-    if (m_participantIdsByEqNo[participant.equipmentNumber().get()] != participant.id())
+    if (m_participantIdsByEqNo[participant.equipmentNumber.get()] != participant.id)
     {
       for (auto it = m_participantIdsByEqNo.begin(); it != m_participantIdsByEqNo.end(); ++it)
-        if (it.value() == participant.id())
+        if (it.value() == participant.id)
         {
           m_participantIdsByEqNo.remove(it.key());
           break;
         }
-      m_participantIdsByEqNo[participant.equipmentNumber().get()] = participant.id();
+      m_participantIdsByEqNo[participant.equipmentNumber.get()] = participant.id;
     }
   }
   else
-    m_participantIdsByEqNo[participant.equipmentNumber().get()] = participant.id();
+    m_participantIdsByEqNo[participant.equipmentNumber.get()] = participant.id;
 
-  ParticipantManagement::DynamicParticipantData dynamicData = m_dtcPpm->dynamicParticipantData(participant.id());
-  ParticipantManagement::Party party = m_dtcPpm->party(participant.partyId());
-  ParticipantManagement::Type type = m_dtcPpm->type(participant.typeId());
-  ParticipantManagement::ParticipantPosition partPos = m_dtcPpm->participantPosition(participant.id());
+  ParticipantManagement::DynamicParticipantData dynamicData = m_dtcPpm->dynamicParticipantData(participant.id);
+  ParticipantManagement::Party party = m_dtcPpm->party(participant.partyId);
+  ParticipantManagement::Type type = m_dtcPpm->type(participant.typeId);
+  ParticipantManagement::ParticipantPosition partPos = m_dtcPpm->participantPosition(participant.id);
 
   QJsonObject telegram;
 
   QJsonObject geoPositionObj;
-  geoPositionObj[QStringLiteral("lon")] = partPos.pos().lon();
-  geoPositionObj[QStringLiteral("lat")] = partPos.pos().lat();
-  geoPositionObj[QStringLiteral("z")] = partPos.pos().z();
+  geoPositionObj[QStringLiteral("lon")] = partPos.pos.lon;
+  geoPositionObj[QStringLiteral("lat")] = partPos.pos.lat;
+  geoPositionObj[QStringLiteral("z")] = partPos.pos.z;
 
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
 
-  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory()).vulnerabilityState().underlying());
-  data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier().underlying());
+  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory).vulnerabilityState);
+  data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier);
 
   data[QStringLiteral("geoPosition")] = geoPositionObj;
   telegram[QStringLiteral("data")] = data;
@@ -633,7 +635,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
   if (modType == DataModification::eRemoved)
     return;
 
-  const bool participantIsExternal = m_dtcPpm->participant(position.participantId()).externalId() > 0;
+  const bool participantIsExternal = m_dtcPpm->participant(position.participantId).externalId > 0;
 
   if (participantIsExternal)
   {
@@ -650,9 +652,9 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
   if (modType == DataModification::eRemoved)
     return;
 
-  ParticipantManagement::Participant part = m_dtcPpm->participant(dynPartData.participantId());
+  ParticipantManagement::Participant part = m_dtcPpm->participant(dynPartData.participantId);
 
-  if (part.externalId() > 0 || !part.equipmentNumber().is_set())
+  if (part.externalId > 0 || !part.equipmentNumber.has_value())
     return;
 
   QJsonObject telegram;
@@ -660,13 +662,13 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaVulnerabilityStateChanged");
 
   QJsonObject headerJson;
-  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber().get();
+  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber.get();
   headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
 
-  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory()).vulnerabilityState().underlying());
+  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory).vulnerabilityState);
   telegram[QStringLiteral("data")] = data;
 
   emit participantChanged(telegram);
@@ -679,57 +681,57 @@ void PpmHandler::onSendParticipantDataTimeout()
     ERROR_LOG(m_logger) << "Cant Send ParticipantData RandomNumbers is empty";
   ParticipantManagement::ModifyParticipantDataRequest *newRequest = new ParticipantManagement::ModifyParticipantDataRequest();
   int currentRandomNumber = m_randomNumbers.first();
-  newRequest->requestId(currentRandomNumber); 
-  newRequest->data(m_tempPartDataList.value(currentRandomNumber));
+  newRequest->requestId = currentRandomNumber; 
+  newRequest->data = m_tempPartDataList.value(currentRandomNumber);
 
   m_ftcPpm->modifyParticipantDataRequest(*newRequest, this);
 }
 
 void PpmHandler::handleParticipantPositionChangedExternal(const ParticipantManagement::ParticipantPosition &position)
 {
-  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
+  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId);
 
-  const bool participantPreviouslyMounted = m_mountedParticipants.contains(part.equipmentNumber().get());
+  const bool participantPreviouslyMounted = m_mountedParticipants.contains(part.equipmentNumber.get());
   if (!participantPreviouslyMounted)
     return;
-  const bool mountedOnOtherParticipant = position.mountedOn().is_set();
+  const bool mountedOnOtherParticipant = position.mountedOn.has_value();
   if (!mountedOnOtherParticipant)
   {
     sendParticipantUnmount(part);
     return;
   }
-  const bool newMountedParticipantIsExternal = m_dtcPpm->participant(position.mountedOn().get()).externalId() != 0;
+  const bool newMountedParticipantIsExternal = m_dtcPpm->participant(position.mountedOn.get()).externalId != 0;
   if (newMountedParticipantIsExternal)
   { 
-    m_mountedParticipants.remove(part.equipmentNumber().get());
+    m_mountedParticipants.remove(part.equipmentNumber.get());
   }
 }
 
 void PpmHandler::handleParticipantPositionChangedInternal(const ParticipantManagement::ParticipantPosition &position)
 {
   DEBUG_LOG(m_logger) << "handleParticipantPositionChangedInternal";
-  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
+  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId);
 
-  const bool hasMountedParticipants = position.mountedParticipants().is_set() && position.mountedParticipants().get().size() > 0;
+  const bool hasMountedParticipants = position.mountedParticipants.has_value() && position.mountedParticipants.get().size() > 0;
   if (hasMountedParticipants)
   {
-    const QVector<int32_t> mountedParticipantIds(position.mountedParticipants().get().begin(), position.mountedParticipants().get().end());
+    const QVector<int32_t> mountedParticipantIds(position.mountedParticipants.get().begin(), position.mountedParticipants.get().end());
 
     for (int mountedParticipantId : std::as_const(mountedParticipantIds))
     {
       ParticipantManagement::Participant mountedParticipant = m_dtcPpm->participant(mountedParticipantId);
-      const bool isExternal = mountedParticipant.externalId() > 0;
-      const bool wasMountedOnThisPart = m_mountedParticipants.contains(mountedParticipant.equipmentNumber().get())
-                                        && m_mountedParticipants[mountedParticipant.equipmentNumber().get()] == part.equipmentNumber().get();
+      const bool isExternal = mountedParticipant.externalId > 0;
+      const bool wasMountedOnThisPart = m_mountedParticipants.contains(mountedParticipant.equipmentNumber.get())
+                                        && m_mountedParticipants[mountedParticipant.equipmentNumber.get()] == part.equipmentNumber.get();
       if (!isExternal || wasMountedOnThisPart)
         continue;
 
-      if (!part.equipmentNumber().is_set())
+      if (!part.equipmentNumber.has_value())
         continue;
       sendParticipantMount(mountedParticipant, part);
     }
 
-    if (part.equipmentNumber().is_set())
+    if (part.equipmentNumber.has_value())
     {
       sendParticipantPositionChanged(position);
     }
@@ -738,19 +740,19 @@ void PpmHandler::handleParticipantPositionChangedInternal(const ParticipantManag
 
 void PpmHandler::sendParticipantMount(const ParticipantManagement::Participant &part, const ParticipantManagement::Participant &partToBeMounted) 
 {
-  m_mountedParticipants.insert(part.equipmentNumber().get(), partToBeMounted.equipmentNumber().get());
+  m_mountedParticipants.insert(part.equipmentNumber.get(), partToBeMounted.equipmentNumber.get());
   ERROR_LOG(m_logger) << "Mount Participant";
   QJsonObject telegram;
   
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaParticipantMount");
 
   QJsonObject headerJson;
-  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber().get();
+  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber.get();
   headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
-  data[QStringLiteral("mountedOn")] = QJsonValue(partToBeMounted.equipmentNumber().get());
+  data[QStringLiteral("mountedOn")] = QJsonValue(partToBeMounted.equipmentNumber.get());
 
   telegram[QStringLiteral("data")] = data;
   emit participantMount(telegram);
@@ -758,14 +760,14 @@ void PpmHandler::sendParticipantMount(const ParticipantManagement::Participant &
 
 void PpmHandler::sendParticipantUnmount(const ParticipantManagement::Participant &participant)
 {
-  m_mountedParticipants.remove(participant.equipmentNumber().get());
+  m_mountedParticipants.remove(participant.equipmentNumber.get());
   DEBUG_LOG(m_logger) << "Unmount Participant";
   QJsonObject telegram;
   
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaParticipantUnmount");
 
   QJsonObject headerJson;
-  headerJson[QStringLiteral("equipmentNumber")] = participant.equipmentNumber().get();
+  headerJson[QStringLiteral("equipmentNumber")] = participant.equipmentNumber.get();
   headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
   QJsonObject data;
@@ -777,21 +779,21 @@ void PpmHandler::sendParticipantUnmount(const ParticipantManagement::Participant
 void PpmHandler::sendParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &position)
 {
 
-  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
+  ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId);
 
   QJsonObject telegram;
   
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaPositionChanged");
 
   QJsonObject headerJson;
-  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber().get();
+  headerJson[QStringLiteral("equipmentNumber")] = part.equipmentNumber.get();
   headerJson[QStringLiteral("timeStamp")] = m_mainDispatcher->ddsHandler()->partitionTime();
 
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
-  data[QStringLiteral("lon")] = position.pos().lon();
-  data[QStringLiteral("lat")] = position.pos().lat();
-  data[QStringLiteral("z")] = position.pos().z();
+  data[QStringLiteral("lon")] = position.pos.lon;
+  data[QStringLiteral("lat")] = position.pos.lat;
+  data[QStringLiteral("z")] = position.pos.z;
 
   telegram[QStringLiteral("data")] = data;
 
@@ -808,7 +810,7 @@ void PpmHandler::onModifyParticipantDataReply(const Core::FunctionReplyObject &r
     if (!m_tempPartDataList.contains(reply.id()))
       return;
 
-    const int partyId = m_tempPartDataList.value(reply.id()).data()->partyId();
+    const int partyId = m_tempPartDataList.value(reply.id()).data()->partyId;
 
     if (!m_mainDispatcher->jsonDispatcher()->getSAAByParty(partyId))
       return;
@@ -853,11 +855,11 @@ QList<ParticipantManagement::Participant> PpmHandler::findAllSAAParticipants(con
   const auto &list = m_dtcPpm->participants();
   for (const auto &part : std::as_const(list))
   {
-    if (part.partyId() != partyId || part.isDeleted())
+    if (part.partyId != partyId || part.isDeleted)
       continue;
-    if (!m_dtcPpm->isArtilleryType(part.typeId()))
+    if (!m_dtcPpm->isArtilleryType(part.typeId))
       continue;
-    if (part.name().empty())
+    if (part.name.empty())
       continue;
     ret.append(part);
   }
@@ -872,10 +874,10 @@ ParticipantManagement::ParticipantData PpmHandler::findParticipantDataByInternal
   {
     for (const auto &part : m_tempPartDataList.value(randomNumber))
     {
-      if (part.name() != internalName.toStdString())
+      if (part.name != internalName.toStdString())
         continue;
 
-      if (m_dtcPpm->isAdlerVerbund(part.typeId()) != isVerbund)
+      if (m_dtcPpm->isAdlerVerbund(part.typeId) != isVerbund)
         continue;
 
       randomNumberInOut = randomNumber;
@@ -891,13 +893,13 @@ ParticipantManagement::ParticipantData PpmHandler::findRootUnit(const int partyI
   const auto &list = m_dtcPpm->participants();
   for (const auto &part : std::as_const(list))
   {
-    if (part.partyId() != partyId || part.isDeleted())
+    if (part.partyId != partyId || part.isDeleted)
       continue;
-    if (m_dtcPpm->type(part.typeId()).typeClass() != ParticipantManagement::TypeClass::Unit)
+    if (m_dtcPpm->type(part.typeId).typeClass != ParticipantManagement::TypeClass::Unit)
       continue;
-    if (m_dtcPpm->isArtilleryType(part.typeId()))
+    if (m_dtcPpm->isArtilleryType(part.typeId))
       continue;
-    if (part.superiorId() > 0)
+    if (part.superiorId > 0)
       continue;
     ret = m_dtcPpm->convertParticipantToParticipantData(part);
   }
@@ -912,15 +914,15 @@ ParticipantManagement::Participant PpmHandler::findParticipantByInternalName(con
   auto participantMap = m_dtcPpm->participants();
   for (const auto &part : std::as_const(participantMap))
   {
-    if (part.partyId() != partyId || part.isDeleted())
+    if (part.partyId != partyId || part.isDeleted)
       continue;
 
-    if (!m_dtcPpm->isArtilleryType(part.typeId()))
+    if (!m_dtcPpm->isArtilleryType(part.typeId))
       continue;
-    if (m_dtcPpm->isAdlerVerbund(part.typeId()) != isVerbund)
+    if (m_dtcPpm->isAdlerVerbund(part.typeId) != isVerbund)
       continue;
 
-    if (part.name() != internalName.toStdString())
+    if (part.name != internalName.toStdString())
       continue;
 
     pp = part;
@@ -936,14 +938,14 @@ void PpmHandler::onPartyChanged(const ParticipantManagement::Party &data, DataMo
   if (modType == DataModification::eRemoved)
     return;
 
-  const ParticipantManagement::ConnectState connectState = m_dtcPpm->saaConnectedState(data.id());
+  const ParticipantManagement::ConnectState connectState = m_dtcPpm->saaConnectedState(data.id);
   DEBUG_LOG(m_logger) << "++++ connectState: " << connectState;
 
   
   if (connectState != ParticipantManagement::ConnectState::Disconnecting)
     return;
 
-  auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByParty(data.id());
+  auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByParty(data.id);
   if (!saa)
     return;
 
@@ -952,7 +954,7 @@ void PpmHandler::onPartyChanged(const ParticipantManagement::Party &data, DataMo
   EXStatus status;
   status.status = Szenarstatus::Gestoppt;
   m_mainDispatcher->jsonDispatcher()->onSAAStatus(saa->getWsId(), status);
-  m_mainDispatcher->jsonDispatcher()->onSAADeregistration(saa->getWsId(), data.id());
+  m_mainDispatcher->jsonDispatcher()->onSAADeregistration(saa->getWsId(), data.id);
 }
 
 void PpmHandler::sendPositionFromTempMap(int rndNmbr, const int partyId, const bool isVerbund)
@@ -967,22 +969,22 @@ void PpmHandler::sendPositionFromTempMap(int rndNmbr, const int partyId, const b
   {
     it.next();
     ParticipantManagement::Participant pp = findParticipantByInternalName(it.key(), partyId, isVerbund);
-    if (pp.id() <= 0)
+    if (pp.id <= 0)
       return;
 
     TrainingAreaBase::EquipmentPosition equipPosReq;
     Core::GeoPosition tlnPos;
     TrainingAreaBase::TabPosition tabPos;
-    tlnPos.lat(it.value().koordinate.latitude * (M_PI / 180.0));
-    tlnPos.lon(it.value().koordinate.longitude * (M_PI / 180.0));
+    tlnPos.lat = it.value().koordinate.latitude * (M_PI / 180.0);
+    tlnPos.lon = it.value().koordinate.longitude * (M_PI / 180.0);
     
     
-    tabPos.position(tlnPos);
-    tabPos.reportingSource(Core::PositionReportingSource::SetByOperator);
+    tabPos.position = tlnPos;
+    tabPos.reportingSource = Core::PositionReportingSource::SetByOperator;
 
-    equipPosReq.sampleTime(m_mainDispatcher->ddsHandler()->partitionTime());
-    equipPosReq.position(tabPos);
-    equipPosReq.equipmentNumber(-1 * pp.id());
+    equipPosReq.sampleTime = m_mainDispatcher->ddsHandler()->partitionTime();
+    equipPosReq.position = tabPos;
+    equipPosReq.equipmentNumber = -1 * pp.id;
     
     
     m_mainDispatcher->ddsHandler()->dtsTab()->publish(equipPosReq);
@@ -1015,18 +1017,18 @@ void PpmHandler::sendChargesFromTempMap(const int rndNmbr, const int partyId, co
       if (chargeTypeId <= 0)
         continue;
 
-      DEBUG_LOG(m_logger) << "---- participant.id:" << participant.id() << (participant.typeId() == type.id() ? " (Ladeplatz)" : "");
+      DEBUG_LOG(m_logger) << "---- participant.id:" << participant.id << (participant.typeId == type.id ? " (Ladeplatz)" : "");
 
       QVector<int> gearTypesIds = m_mainDispatcher->pdmHandler()->getDtc()->gearTypeIdFromChargeTypeId(chargeTypeId);
       
-      gc.gearTypeId() = !gearTypesIds.isEmpty() ? gearTypesIds.first() : 0;
-      gc.gearId(participant.id());
-      gc.chargeTypeId(chargeTypeId);
-      gc.remain() = c.anzahl;
-      gearChargeState.charge().push_back(gc);
+      gc.gearTypeId = !gearTypesIds.isEmpty() ? gearTypesIds.first() : 0;
+      gc.gearId = participant.id;
+      gc.chargeTypeId = chargeTypeId;
+      gc.remain = c.anzahl;
+      gearChargeState.charge.push_back(gc);
     }
-    gearChargeState.sampleTime(m_mainDispatcher->ddsHandler()->partitionTime());
-    gearChargeState.equipmentNumber(-1 * participant.id());
+    gearChargeState.sampleTime = m_mainDispatcher->ddsHandler()->partitionTime();
+    gearChargeState.equipmentNumber = -1 * participant.id;
     m_mainDispatcher->ddsHandler()->dtsTab()->publish(gearChargeState);
   }
   m_tempChargesMap.remove(rndNmbr);
@@ -1040,9 +1042,9 @@ void PpmHandler::sendReadyMessageFromTempMap(int rndNmbr, const int partyId, con
   {
     ParticipantManagement::Participant participant = findParticipantByInternalName(readyMsg.first, partyId, isVerbund);
     TrainingAreaBase::SpecialSensorData ssData;
-    ssData.sampleTime(m_mainDispatcher->ddsHandler()->partitionTime());
-    ssData.operationalState(convertStatus_L28(readyMsg.second));
-    ssData.equipmentNumber(-1 * participant.id());
+    ssData.sampleTime = m_mainDispatcher->ddsHandler()->partitionTime();
+    ssData.operationalState = convertStatus_L28(readyMsg.second);
+    ssData.equipmentNumber = -1 * participant.id;
     m_mainDispatcher->ddsHandler()->dtsTab()->publish(ssData);
   }
 
@@ -1051,7 +1053,7 @@ void PpmHandler::sendReadyMessageFromTempMap(int rndNmbr, const int partyId, con
 
 int PpmHandler::convertStatus_L28(const ProjectDataManagement::L28_Status &status)
 {
-  switch (status.underlying())
+  switch (status)
   {
     case ProjectDataManagement::L28_Status::Einsatzbereit:
       return ADLER_OPERATIONAL;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
index 24ee8fd92..a8e400804 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
@@ -7,6 +7,7 @@
 #include "main_dispatcher.h"
 #include "logger.h"
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.cpp
index 136520e62..aa3348140 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.cpp
@@ -130,12 +130,12 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
   geometryRef.reserve(flugbahndaten.flugbahnpunkt.size());
 
   AreaEffectSimulation::TrajectoryAdlerModifyRequest *newRequest = new AreaEffectSimulation::TrajectoryAdlerModifyRequest();
-  newRequest->aesItemId(aesItemId);
-  newRequest->explosionIndex(exposionId);
+  newRequest->aesItemId = aesItemId;
+  newRequest->explosionIndex = exposionId;
 
   int zone = -1;
 
-  const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon(), positionLaunch.lat(), zone);
+  const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon, positionLaunch.lat, zone);
 
   
   DEBUG_LOG(m_logger) << " mmilirad: " << flugbahndaten.schussrichtung;
@@ -178,9 +178,9 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
                          << ", yRelativ :" << pos.yRelativ
                          << ", zRelativ :" << pos.zRelativ
                          << ", zeit :" << pos.zeit
-                         << ", positionLaunch :" << positionLaunch.lon()
-                         << " / " << positionLaunch.lat()
-                         << " / " << positionLaunch.z()
+                         << ", positionLaunch :" << positionLaunch.lon
+                         << " / " << positionLaunch.lat
+                         << " / " << positionLaunch.z
                          << "<< utmLaunch :" << utmLaunch.x
                          << " / " << utmLaunch.y
                          << " / " << utmLaunch.zone;
@@ -189,7 +189,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     QPointF utmLaunchPt(utmLaunch.x, utmLaunch.y);
 
     utm += utmLaunchPt;
-    double z = positionLaunch.z() + pos.yRelativ;
+    double z = positionLaunch.z + pos.yRelativ;
 
     
     LtsCoordTrans::UtmCoordinate utmCoord;
@@ -204,11 +204,11 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     matrix.rotate(useNewGrad);
 
     Core::RelativePositionRelativeTime flightPoint;
-    flightPoint.offsetX() = 0;
-    flightPoint.offsetY() = pos.xRelativ;
-    flightPoint.offsetZ() = pos.yRelativ;
-    flightPoint.relativeTime() = pos.zeit;
-    QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
+    flightPoint.offsetX = 0;
+    flightPoint.offsetY = pos.xRelativ;
+    flightPoint.offsetZ = pos.yRelativ;
+    flightPoint.relativeTime = pos.zeit;
+    QPointF point(flightPoint.offsetX, flightPoint.offsetY);
 
     TRACE_LOG(m_logger) << " POS bevore rot: " << point;
 
@@ -224,30 +224,30 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     
     
     
-    flightPoint.offsetX() = rotatePoint.x();
-    flightPoint.offsetY() = rotatePoint.y();
-    flightPoint.offsetZ() = pos.yRelativ;
-    flightPoint.relativeTime() = std::round(pos.zeit * 1000.0);
+    flightPoint.offsetX = rotatePoint.x();
+    flightPoint.offsetY = rotatePoint.y();
+    flightPoint.offsetZ = pos.yRelativ;
+    flightPoint.relativeTime = std::round(pos.zeit * 1000.0);
 
     geometryRef.emplace_back(flightPoint);
   }
 
   Core::GeoPosition impactPosition;
-  impactPosition.lat(flugbahndaten.zielkoordinate.koordinate.latitude * M_PI / 180.0);
-  impactPosition.lon(flugbahndaten.zielkoordinate.koordinate.longitude * M_PI / 180.0);
-  impactPosition.z(flugbahndaten.zielkoordinate.hoehe);
-  newRequest->impactPosition(impactPosition);
-  newRequest->geometry(geometryRef);
-  newRequest->peakAltitude(flugbahndaten.gipfelhoehe);
-  newRequest->mhpScatterLenght(flugbahndaten.streuung.laengsstreuung);
-  newRequest->mhpScatterLengthDetonationHeight(flugbahndaten.streuung.laengsstreuungH);
-  newRequest->mhpScatterWidth(flugbahndaten.streuung.seitenstreuung);
-  newRequest->mhpScatterWidthDetonationHeight(flugbahndaten.streuung.seitenstreuungH);
-  newRequest->shootDirection((flugbahndaten.schussrichtung / 6400.) * 360);
-  newRequest->errorcode(static_cast<int>(flugbahndaten.fehlercode));
-  DEBUG_LOG(m_logger) << "!!!!!!!!!!!geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size()
-                      << ", newRequest->errorcode :" << newRequest->errorcode() << ", newRequest->Peak:" << newRequest->peakAltitude()
-                      << ", newRequest->direction:" << newRequest->shootDirection() << ", flugbahndaten.fehlercode :" << static_cast<int>(flugbahndaten.fehlercode);
+  impactPosition.lat = flugbahndaten.zielkoordinate.koordinate.latitude * M_PI / 180.0;
+  impactPosition.lon = flugbahndaten.zielkoordinate.koordinate.longitude * M_PI / 180.0;
+  impactPosition.z = flugbahndaten.zielkoordinate.hoehe;
+  newRequest->impactPosition = impactPosition;
+  newRequest->geometry = geometryRef;
+  newRequest->peakAltitude = flugbahndaten.gipfelhoehe;
+  newRequest->mhpScatterLenght = flugbahndaten.streuung.laengsstreuung;
+  newRequest->mhpScatterLengthDetonationHeight = flugbahndaten.streuung.laengsstreuungH;
+  newRequest->mhpScatterWidth = flugbahndaten.streuung.seitenstreuung;
+  newRequest->mhpScatterWidthDetonationHeight = flugbahndaten.streuung.seitenstreuungH;
+  newRequest->shootDirection = (flugbahndaten.schussrichtung / 6400.) * 360;
+  newRequest->errorcode = static_cast<int>(flugbahndaten.fehlercode);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry.size()
+                      << ", newRequest->errorcode :" << newRequest->errorcode << ", newRequest->Peak:" << newRequest->peakAltitude
+                      << ", newRequest->direction:" << newRequest->shootDirection << ", flugbahndaten.fehlercode :" << static_cast<int>(flugbahndaten.fehlercode);
 
   m_ftcAes->trajectoryAdlerModifyRequest(*newRequest, this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
index d4392cde8..9f32488c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
@@ -8,6 +8,7 @@
 #include <AreaEffectSimulation/aes.hpp>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
index c3dc31183..cff00e2d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "hla_handler_rx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "hla_dispatcher.h"
 #include "aes_handler.h"
 #include "ppm_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
index 41403972c..a8f8c853e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "pdm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
index f8e63f3a6..dc4f2ad53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
@@ -2,6 +2,7 @@
 
 
 #include "ppm_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QJsonDocument>
 
@@ -101,7 +102,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
 
 
 
-  if(!participant.equipmentNumber().is_set())
+  if(!participant.equipmentNumber().has_value())
   {
     for(auto it = m_participantIdsByEqNo.begin(); it != m_participantIdsByEqNo.end(); ++it)
       if (it.value() == participant.id())
@@ -164,8 +165,8 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
 
-  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory()).vulnerabilityState().underlying());
-  data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier().underlying());
+  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory()).vulnerabilityState());
+  data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier());
 
   data[QStringLiteral("ets")] = type.disEntities().empty() ? QStringLiteral("2.0.0.0.0.0.1") : fromDisInt(type.disEntities().front());
   data[QStringLiteral("geoPosition")] = geoPositionObj;
@@ -184,7 +185,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
 
   ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
 
-  if (part.externalId() > 0 || !part.equipmentNumber().is_set())
+  if (part.externalId() > 0 || !part.equipmentNumber().has_value())
     return;
 
   QJsonObject telegram;
@@ -215,7 +216,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
 
   ParticipantManagement::Participant part = m_dtcPpm->participant(dynPartData.participantId());
 
-  if (part.externalId() > 0 || !part.equipmentNumber().is_set())
+  if (part.externalId() > 0 || !part.equipmentNumber().has_value())
     return;
 
   QJsonObject telegram;
@@ -229,7 +230,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
   QJsonObject data;
   data[QStringLiteral("header")] = headerJson;
 
-  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory()).vulnerabilityState().underlying());
+  data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory()).vulnerabilityState());
   telegram[QStringLiteral("data")] = data;
 
   emit participantChanged(telegram);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
index 60df386e9..4fa7027a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
@@ -6,6 +6,7 @@
 #include "logger.h"
 #include "dds_handler.h"
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <QtCore/QObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
index a236e6a36..ed23e8720 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
@@ -14,7 +14,7 @@ ConvertToJsonFile::ConvertToJsonFile(const QString &txDir)
   : SendToTab()
   , m_bRetvalOnError(false)
   , m_txDir(txDir + QLatin1Char('/'))
-  .getNGLLogger("TAB.Plugin.ConvertToJsonFile"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   resetSendCounter();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
index bb31835d5..ebe5ec93e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
@@ -22,8 +22,7 @@ namespace TetraRadio
 DirectoryCleaner::DirectoryCleaner(const QString &directory, unsigned int maxAgeSec, QObject *parent) : QObject(parent)
   , m_cleanerThread(new QThread(this))
   , m_worker(new DirectoryCleanerWorker(directory, maxAgeSec))
-  .getNGLLogger("TAB.Plugin.DirectoryCleaner")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   QDir().mkpath(directory);
   doInitialCleanup(directory);
   m_worker->moveToThread(m_cleanerThread);
@@ -96,7 +95,7 @@ DirectoryCleanerWorker::DirectoryCleanerWorker(const QString &directory, unsigne
   : m_directory(directory)
   , m_maxAgeSec(maxAgeSec)
   , m_bWarnedOnce(false)
-  .getNGLLogger("TRA.Plugin.DirectoryCleaner"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 void DirectoryCleanerWorker::onTimeout()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
index e7eea709f..fa30e52a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 
 #include "hla_dispatcher.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "hla_handler_rx.h"
 #include "hla_handler_tx.h"
 
@@ -22,6 +23,7 @@ HlaDispatcher::HlaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
   , m_webSocketReconnectTimer(new QTimer(this))
   , m_bWarnedOnce(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
           this, &HlaDispatcher::onWebSocketError);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
index 776a68120..3faff0d4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "hla_handler_rx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "hla_dispatcher.h"
 
 #include <TrainingAreaBase/training_area_telegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
index 6f9355f19..2a60b51d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "hla_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 
@@ -12,6 +13,7 @@ HlaHandlerTx::HlaHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp)
   : m_pdp(pdp)
   , m_webSocket(nullptr)
   , m_bHlaConnectedToExternalSystem(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 void HlaHandlerTx::onHlaConnected(QWebSocket *webSocket)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.cpp
index 135a09852..4e0e4d856 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 
 #include "main_dispatcher.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "main_handler_tx.h"
 #include "hla_dispatcher.h"
 #include "hla_handler_tx.h"
@@ -14,6 +15,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   : m_wlsDispatcher(new HlaDispatcher(pdp, recvFromTabCb, settings))
   , m_recvFromTabCb(recvFromTabCb)
   , m_mainHandlerTx(std::make_shared<MainHandlerTx>(std::dynamic_pointer_cast<HlaHandlerTx>(m_wlsDispatcher->sendToTab())))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 MainDispatcher::~MainDispatcher()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.cpp
index 40f09f76b..1b4734e1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "main_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "hla_handler_tx.h"
 
 using namespace TrainingAreaBase;
@@ -10,6 +11,7 @@ namespace HlaJson
 {
 MainHandlerTx::MainHandlerTx(const std::shared_ptr<HlaHandlerTx> &wlsTx)
   : m_wlsHandlerTx(wlsTx)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
index f33f3a4df..0d35bf2eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "nmea_handler_rx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <TrainingAreaBase/training_area_telegrams.h>
 #include <QtCore/QDateTime>
 #include <QtCore/QJsonDocument>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
index 752474055..bbc2182a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
@@ -13,8 +13,7 @@ namespace TetraRadio
 ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler,
                                  const char *loggerName) : m_rxHandler(rxHandler)
   , m_bWarnedOnce(false)
-  .getNGLLogger(loggerName)),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
 
 bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
index c276c8504..b93d0f1b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
@@ -12,7 +12,7 @@ ConvertToJson::ConvertToJson(const char *loggerName)
   : QObject()
   , SendToTab()
   , m_bConnected(false)
-  .getNGLLogger(loggerName))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   resetSendCounter();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
index 2ffdcb807..4496355f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
@@ -39,7 +39,7 @@ TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataPro
   , m_prtCnvApp(nullptr)
   , m_exerciseId(0)
   , m_radioGrpId(0)
-  .getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
         settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
@@ -68,16 +68,16 @@ bool TetraJsonInterfaceImpl::init()
 void TetraJsonInterfaceImpl::exerciseChanged()
 {
   NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
-  if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId) 
+  if (m_pdp->exerciseRadioGroup().id != m_radioGrpId) 
     if (!updatePrtCnv())
       ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
                           << m_radioGrpId
-                          << " to " << m_pdp->exerciseRadioGroup().id();
+                          << " to " << m_pdp->exerciseRadioGroup().id;
 }
 
 bool TetraJsonInterfaceImpl::updatePrtCnv()
 {
-  int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
+  int newRadioGrpId = m_pdp->exerciseRadioGroup().id;
 
   if (newRadioGrpId == m_radioGrpId) 
   {
@@ -103,13 +103,13 @@ bool TetraJsonInterfaceImpl::updatePrtCnv()
       s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
       s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
       s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection")); 
-      s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname()));
-      s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort());
-      s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname()));
-      s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort());
-      s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi());
-      s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1());
-      s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2());
+      s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname));
+      s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort);
+      s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname));
+      s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort);
+      s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi);
+      s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1);
+      s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2);
       s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
       s.setValue(QStringLiteral("Injection/Port"), m_socketDispatcher->randomListenPort());
       NOTICE_LOG(m_logger) << "TetraJson Injection/Port = " << s.value(QStringLiteral("Injection/Port")).toInt();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
index f7cf5df87..71a73b271 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
@@ -2,6 +2,7 @@
 
 
 #include "uav_commander_impl.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "logger.h"
 
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
index ac1ae2e2c..2034b7ab0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
@@ -23,7 +23,7 @@ FromTab::FromTab(const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler
   , m_sendToDds(sendToDds)
   , m_uavIAManager(uavIAManager)
   , m_exerciseId(exerciseId)
-  .getNGLLogger("FromTab"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_dtcPpm->enableUAS();
   m_dtcPpm->enableParticipant();
@@ -43,7 +43,7 @@ TrainingAreaBase::SendToTab::HandleState FromTab::canHandleTelegram(int equipmen
     }
 
     const auto &part = m_dtcPpm->participant(uas.participantId());
-    if (!part.equipmentNumber().is_set())
+    if (!part.equipmentNumber().has_value())
     {
       continue;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.h
index 5fda34d4e..97a077cd0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.h
@@ -7,6 +7,7 @@
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/dds_handler.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ProjectDataManagement { namespace Interface { class Dtc; } }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
index 5ee41c319..04e10dc6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
@@ -2,6 +2,7 @@
 
 
 #include "plugin_instance.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "from_tab.h"
 #include "uav_ia_manager.h"
@@ -11,6 +12,7 @@
 #include <CentralEffectSimulation/ces_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <FileManagement/flm_dtc.h>
 #include <Lts/Services/FileManagement/flm_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
index ddd74b036..b58b7cb52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
@@ -2,7 +2,9 @@
 
 
 #include "uav_ia_manager.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ParticipantManagement/ppm_ftc.h"
+#include <ParticipantManagement/ppm_dtc.h>
 #include "logger.h"
 
 #include <LtsUtilsCore/json.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
index 3c7a26feb..42cea5fec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 
 #include "main_dispatcher.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "main_handler_tx.h"
 #include "wls_dispatcher.h"
 #include "wls_handler_tx.h"
@@ -20,6 +21,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_recvFromTabCb(recvFromTabCb)
   , m_mainHandlerTx(std::make_shared<MainHandlerTx>(std::dynamic_pointer_cast<WlsHandlerTx>(m_wlsDispatcher->sendToTab()),
                                                     std::dynamic_pointer_cast<TetraHandlerTx>(m_tetraDispatcher->sendToTab())))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
         settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.cpp
index 3880c6042..932632683 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "main_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "tetra_handler_tx.h"
 #include "wls_handler_tx.h"
 
@@ -40,6 +41,7 @@ MainHandlerTx::MainHandlerTx(const std::shared_ptr<WlsHandlerTx> &wlsTx,
                              const std::shared_ptr<TetraHandlerTx> &tetraTx)
   : m_wlsHandlerTx(wlsTx)
   , m_tetraHandlerTx(tetraTx)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
@@ -257,6 +259,30 @@ bool MainHandlerTx::txData(const TetraIcd::SetDevicePowerRequest &data)
 {
   return sendToTxMixin(&data);
 }
+bool MainHandlerTx::txData(const TetraIcd::UAVPerformMission &data)
+{
+  return sendToTxMixin(&data);
+}
+bool MainHandlerTx::txData(const TetraIcd::OcCommand &data)
+{
+  return sendToTxMixin(&data);
+}
+bool MainHandlerTx::txData(const TetraIcd::ExFireReadiness &data)
+{
+  return sendToTxMixin(&data);
+}
+bool MainHandlerTx::txData(const TetraIcd::ExFiredReport &data)
+{
+  return sendToTxMixin(&data);
+}
+bool MainHandlerTx::txData(const TetraIcd::ExConfirmationReport &data)
+{
+  return sendToTxMixin(&data);
+}
+bool MainHandlerTx::txData(const TetraIcd::UAVChangeState &data)
+{
+  return sendToTxMixin(&data);
+}
 template <typename T>
 bool MainHandlerTx::sendToTxMixin(const T *data)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
index a7e117350..20308c30d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
@@ -63,6 +63,11 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
 private:
   template <typename T>
   bool sendToTxMixin(const T *data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.cpp
index 1c6289e2e..915e767d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.cpp
@@ -14,6 +14,7 @@ namespace WlsTetra
 std::shared_ptr<TrainingAreaBase::Plugin::Interface> TabWlsPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
                                                                                    const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
                                                                                    const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
+                                                                                   const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
                                                                                    NGL::Settings *settings)
 {
   Q_UNUSED(sendToTabCb);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
index c359c98b5..8f443091d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
@@ -19,6 +19,7 @@ public:
   std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
                                                                        const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
                                                                        const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
+                                                                       const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
                                                                        NGL::Settings *settings) override;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.cpp
index 2d2e00b51..ccd83e5b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 
 #include "tetra_dispatcher.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "tetra_handler_rx.h"
 #include "tetra_handler_tx.h"
 
@@ -18,6 +19,7 @@ TetraDispatcher::TetraDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_txHandler(std::make_shared<TetraHandlerTx>())
   , m_tetraPrtCnv(new TetraPrtCnv(pdp, this))
   , m_dataProvider(pdp)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_tetraPrtCnv, &TetraPrtCnv::tetraConnectionChanged,
           this, &TetraDispatcher::onTetraConnectionChanged);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
index 5f9ea5d32..471d2963a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "tetra_handler_rx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <TrainingAreaBase/training_area_telegrams.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
index f015059e7..b70e4c3ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "tetra_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
@@ -10,6 +11,7 @@ namespace WlsTetra
 TetraHandlerTx::TetraHandlerTx()
   : QObject()
   , SendToTab()
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   resetSendCounter();
 }
@@ -248,6 +250,31 @@ bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission
   Q_UNUSED(data);
   return false;
 }
+bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
 
 bool TetraHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
index 4ec6d504e..82fe6e35e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
@@ -62,6 +62,11 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
 
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
 Q_SIGNALS:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
index d277ed1de..ac4b054ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
@@ -2,6 +2,7 @@
 
 
 #include "plugin.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "tetra_prtcnv.h"
 #include <nglsettings/nglsettings_connections.h>
 #include <QtCore/QCoreApplication>
@@ -20,6 +21,7 @@ TetraPrtCnv::TetraPrtCnv(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_prtCnvApp(nullptr)
   , m_exerciseId(0)
   , m_radioGrpId(0)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 TetraPrtCnv::~TetraPrtCnv()
@@ -41,11 +43,11 @@ bool TetraPrtCnv::init()
 
 void TetraPrtCnv::onExerciseChanged()
 {
-  if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId) 
+  if (m_pdp->exerciseRadioGroup().id != m_radioGrpId) 
     if (!updatePrtCnv())
       ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
                           << m_radioGrpId
-                          << " to " << m_pdp->exerciseRadioGroup().id();
+                          << " to " << m_pdp->exerciseRadioGroup().id;
 }
 
 void TetraPrtCnv::logWlsTelegram(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele, bool bIsSend)
@@ -56,7 +58,7 @@ void TetraPrtCnv::logWlsTelegram(const TrainingAreaBase::TetraIcd::TrainingAreaT
 
 bool TetraPrtCnv::updatePrtCnv()
 {
-  int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
+  int newRadioGrpId = m_pdp->exerciseRadioGroup().id;
 
   if (newRadioGrpId == m_radioGrpId) 
   {
@@ -83,13 +85,13 @@ bool TetraPrtCnv::updatePrtCnv()
       s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
       s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
       s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection")); 
-      s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname()));
-      s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort());
-      s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname()));
-      s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort());
-      s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi());
-      s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1());
-      s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2());
+      s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname));
+      s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort);
+      s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname));
+      s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort);
+      s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi);
+      s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1);
+      s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2);
       s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
       s.setValue(QStringLiteral("Injection/Port"), randomListenPort());
       s.sync();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
index 1602016a1..14c4d8a8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 
 #include "wls_dispatcher.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "wls_handler_rx.h"
 #include "wls_handler_tx.h"
 
@@ -22,6 +23,7 @@ WlsDispatcher::WlsDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
   , m_webSocketReconnectTimer(new QTimer(this))
   , m_bWarnedOnce(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
           this, &WlsDispatcher::onWebSocketError);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
index 8c05a60e9..4ef575fda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "wls_handler_rx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "wls_dispatcher.h"
 
 #include <TrainingAreaBase/training_area_telegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
index debd3bcaf..fada5ebec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
@@ -2,6 +2,7 @@
 
 
 #include "wls_handler_tx.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "wls_dispatcher.h"
 
 #include <QtCore/QJsonDocument>
@@ -19,6 +20,7 @@ WlsHandlerTx::WlsHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, WlsDispa
   , m_webSocket(nullptr)
   , m_dispatcher(dispatcher)
   , m_bWlsConnectedToExternalSystem(false)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 void WlsHandlerTx::onWlsConnected(QWebSocket *webSocket)
@@ -288,16 +290,41 @@ bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunitio
   return sendToTx(&data);
 }
 
-bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
-{
-  return sendToTx(&data);
-}
-
 bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
 {
   Q_UNUSED(data);
   return false;
 }
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
+bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
+{
+  Q_UNUSED(data);
+  return false;
+}
 
 void WlsHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
index 935cef3d0..7ae6fd3a8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
@@ -64,6 +64,11 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
+  bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
 
 public Q_SLOTS:
   void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp
index 1a9fd61fa..cb7326327 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp
@@ -37,7 +37,7 @@ ExerciseManagement::Exercise ExmHandler::exercise(int exerciseId)
 
 void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
 {
-  if (!data.radioGroupId.is_set() || data.radioGroupId.get() == 0)
+  if (!data.radioGroupId.has_value() || data.radioGroupId.get() == 0)
     modType = DataModification::eRemoved;
 
   bool bExercise2RadioGroupChanged = false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
index e4db397f6..d102bef80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
@@ -207,7 +207,7 @@ ProjectDataManagement::RadioGroup MainHandler::exerciseRadioGroup() const
   }
 
   const auto ex = m_exmHandler->exercise(exerciseId());
-  if (ex.radioGroupId.is_set())
+  if (ex.radioGroupId.has_value())
     return m_pdmHandler->radioGroup(ex.radioGroupId.get());
   return ProjectDataManagement::RadioGroup();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
index 90be21836..e52560950 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
@@ -50,7 +50,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
 
    ParticipantManagement::Participant participant = m_ppmDtc->participant(data.participantId);
    int equipNo = 0;
-   if (participant.equipmentNumber.is_set())
+   if (participant.equipmentNumber.has_value())
      equipNo = participant.equipmentNumber.get();
 
    if (equipNo > 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp
index 3daedffda..2f174f044 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp
@@ -422,7 +422,7 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT
       
       sendResumeEffectSimulation(data);
     }
-    else if (!data.effectStart.is_set() ||
+    else if (!data.effectStart.has_value() ||
              data.effectStart.get() == 0 ||
              data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved ||
              data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
@@ -700,14 +700,14 @@ void setCommonParams(T &out, const S &in, const int aesTetraId)
   Q_UNUSED(aesTetraId);
   
   out.name = in.name;
-  out.partyId = in.partyId.is_set() ? in.partyId.get() : 0;
+  out.partyId = in.partyId.has_value() ? in.partyId.get() : 0;
 }
 
 template<typename T, typename S>
 void setCommonCombatParams(T &out, const S &in, const int aesTetraId)
 {
   setCommonParams(out, in, aesTetraId);
-  out.effectStart = in.effectStart.is_set() ? in.effectStart.get() : 0;
+  out.effectStart = in.effectStart.has_value() ? in.effectStart.get() : 0;
   out.effectDuration = in.effectDuration;
 }
 
@@ -1275,7 +1275,7 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
                                                                       aes.originalEffectDuration,
                                                                       aes.effectDuration);            
   dAes.nextImpact = aes.remainExplosionNumber;
-  dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0;
+  dAes.resumeTime = aes.effectStart.has_value() ? aes.effectStart.get() : 0;
   dAes.remainDuration = aes.effectDuration;
 
   txData(dAes);
@@ -1315,7 +1315,7 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
                                                                       aes.originalEffectDuration,
                                                                       aes.effectDuration);            
   dAes.nextImpact = aes.remainExplosionNumber;
-  dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0;
+  dAes.resumeTime = aes.effectStart.has_value() ? aes.effectStart.get() : 0;
   dAes.remainDuration = aes.effectDuration;
 
   txData(dAes);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp
index 4429e5617..88c3e8ef9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp
@@ -147,9 +147,9 @@ void RecvFromDdsFts::onSendLanguageSelectionRequest(const rti::core::SampleIdent
 
 void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdentity &cookie, const SendEquipmentMessageRequest &request)
 {
-  if (request.sender.is_set() &&
-      request.subject.is_set() &&
-      request.message.is_set())
+  if (request.sender.has_value() &&
+      request.subject.has_value() &&
+      request.message.has_value())
   {
     // Message to O/C
     TetraIcd::EquipmentMessageOC data;
@@ -173,9 +173,9 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
   else
   {
     TetraIcd::EquipmentMessage data;
-    if (request.messageId.is_set())
+    if (request.messageId.has_value())
       data.msgId = request.messageId.get();
-    else if (request.message.is_set())
+    else if (request.message.has_value())
       data.message = request.message.get();
     else
     {
@@ -336,8 +336,8 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
   else
     data.originatorEquipmentNumber = request.originatorEquipmentNumber;
   const auto &tabPos = request.position;
-  data.buildingId = tabPos.moutObjectId.is_set() ? tabPos.moutObjectId.get() : 0;
-  data.roomId = tabPos.moutRoomId.is_set() ? tabPos.moutRoomId.get() : 0;
+  data.buildingId = tabPos.moutObjectId.has_value() ? tabPos.moutObjectId.get() : 0;
+  data.roomId = tabPos.moutRoomId.has_value() ? tabPos.moutRoomId.get() : 0;
   data.remainEffectPercent = request.remainEffectPercent;
   data.relPosition = m_mainHandler->posHandler()->geographicToRelative(tabPos.position);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
index d87f909e3..874853f98 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
@@ -262,7 +262,7 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData)
   {
     TetraIcd::MineTriggered mt;
     mt.header.timeStamp = inData.header.timeStamp;
-    if (outData.position.is_set())
+    if (outData.position.has_value())
     {
       const TrainingAreaBase::TabPosition pos = outData.position.get();
       mt.relPosition = m_posHandler->geographicToRelative(pos.position);
@@ -1108,7 +1108,7 @@ bool SendToDds::setPosition(T &data,
       }
 
       if (lastPosition.reportingSource == Core::PositionReportingSource::Ops &&
-          lastPosition.moutObjectId.is_set())
+          lastPosition.moutObjectId.has_value())
       {
         DEBUG_LOG(m_logger) << "Check leave Building equipmentNumber=" << data.equipmentNumber;
         DEBUG_LOG(m_logger) << "relPos=" << relPos.offsetX << "/" << relPos.offsetY;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
index 0a2525e19..b59ca5638 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
@@ -465,7 +465,7 @@ void HandlerAesData::explosionAreas(const QByteArray &data)
 
     if ((exp.effectStateId >= AreaEffectSimulation::AesEffectState::EsPrepared)
         || ((exp.effectStateId >= AreaEffectSimulation::AesEffectState::EsActivated)
-            && (((exp.effectStart.is_set() && ((exp.effectStart.get() + exp.effectDuration)) < (m_dds->currentPartitionTime() - 5000)))
+            && (((exp.effectStart.has_value() && ((exp.effectStart.get() + exp.effectDuration)) < (m_dds->currentPartitionTime() - 5000)))
                 ||
                 (exp.effectStateId == AreaEffectSimulation::AesEffectState::EsPaused))))
     {
@@ -518,7 +518,7 @@ void HandlerAesData::explosionSingles(const QByteArray &data)
     if (exp.isCentral)
       continue;
     if ((exp.effectStateId > AreaEffectSimulation::AesEffectState::EsRemoved)
-        && (exp.effectStart.is_set() && (exp.effectStart.get() > (m_dds->currentPartitionTime() + 5000))))
+        && (exp.effectStart.has_value() && (exp.effectStart.get() > (m_dds->currentPartitionTime() + 5000))))
     {
       DEBUG_LOG(m_logger) << "Removing explosion single id: " << id;
       m_aesFtc->explosionSingleRemoveRequest(Core::RemoveElementRequest(id), this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp
index 0b25a3a41..def180ce9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp
@@ -79,20 +79,20 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
   ParticipantManagement::RegisterParticipantRequest req;
   req.assignState = assignState;
 
-  if (equipNo.is_set())
+  if (equipNo.has_value())
     req.equipmentNumber = equipNo.get();
-  if (identification.is_set())
+  if (identification.has_value())
     req.identification = identification.get().toStdString();
-  if (info.is_set())
+  if (info.has_value())
     req.info = info.get().toStdString();
-  if (!equipNo.is_set() || !info.is_set() || !identification.is_set())
+  if (!equipNo.has_value() || !info.has_value() || !identification.has_value())
   {
     const auto participant = m_ddsHandlerExercise->ppmDtc()->participant(participantId);
-    if (!equipNo.is_set() && participant.equipmentNumber.is_set())
+    if (!equipNo.has_value() && participant.equipmentNumber.has_value())
       req.equipmentNumber = participant.equipmentNumber.get();
-    if (!info.is_set())
+    if (!info.has_value())
       req.info = participant.info;
-    if (!identification.is_set())
+    if (!identification.has_value())
       req.identification = participant.identification;
   }
   req.participantId = participantId;
@@ -125,7 +125,7 @@ void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantMan
 void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::Participant &participant)
 {
   
-  if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0)
+  if (!participant.equipmentNumber.has_value() || participant.equipmentNumber.get() == 0)
   {
 
     INFO_LOG(m_logger) << "New participant but no equipment number - ignoring";
@@ -150,7 +150,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
   {
 
 
-    if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0)
+    if (!participant.equipmentNumber.has_value() || participant.equipmentNumber.get() == 0)
     {
 
       return;
@@ -161,18 +161,18 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
   }
 
 
-  if (participant.equipmentNumber.is_set() && itEquipNumber.value() == participant.equipmentNumber.get())
+  if (participant.equipmentNumber.has_value() && itEquipNumber.value() == participant.equipmentNumber.get())
   {
 
     return;
   }
-  if (participant.equipmentNumber.is_set())
+  if (participant.equipmentNumber.has_value())
   {
     INFO_LOG(m_logger) << "Participant with id " << participant.id << " changed its equipment number from "
                        << itEquipNumber.value() << " to " << participant.equipmentNumber.get();
   }
 
-  if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == 0)
+  if (participant.equipmentNumber.has_value() && participant.equipmentNumber.get() == 0)
   {
 
     removeParticipant(participant.id, participant.equipmentNumber.get());
@@ -181,7 +181,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
 
 
   removeParticipant(itEquipNumber.key(), itEquipNumber.value());
-  if (participant.equipmentNumber.is_set())
+  if (participant.equipmentNumber.has_value())
     addParticipant(participant.id, participant.equipmentNumber.get());
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
index 635a1142d..c16f32685 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
@@ -47,7 +47,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
   pi.alias       = QString::fromStdString(part.identification);
   pi.assignState = convert(part.assignState);
   pi.designator  = QString::fromStdString(part.designator);
-  if (part.equipmentNumber.is_set())
+  if (part.equipmentNumber.has_value())
     pi.equipNo     = part.equipmentNumber.get();
   else if (part.assignState == ParticipantManagement::ParticipantAssignState::HandoutExcon)
     pi.equipNo     = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
index 520a10877..a0395124d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
@@ -252,7 +252,7 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
       /*DEBUG_LOG(m_logger) << " alarmConfigItem.id=" << alarm.id
                           << " alarmConfigItem.participantId=" << alarm.participantId
                           << " alarmConfigItem.eventTypeId=" << alarm.eventTypeId
-                          << " eventDatalocal.eventTypeId()=" << eventDatalocal.eventTypeId().underlying()
+                          << " eventDatalocal.eventTypeId()=" << eventDatalocal.eventTypeId()
                           << " alarm.operatorId=" << alarm.operatorId
                           << " friendyFire =" << friendlyFireBool;*/
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.cpp
index 632554aa6..9cfd5427d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.cpp
@@ -64,7 +64,7 @@ bool HandlerParticipant::init()
   {
     const ParticipantManagement::Participant &participant = i.value();
 
-    if (participant.equipmentNumber.is_set())
+    if (participant.equipmentNumber.has_value())
     {
       m_partId2EquipNoMap.insert(participant.id, participant.equipmentNumber.get());
       DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << participant.id << "EquimentNo=" << participant.equipmentNumber.get();
@@ -110,7 +110,7 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
     DEBUG_LOG(m_logger) << "onParticipantChanged:" << data;
     m_participantHierarchy.insert(data.id,
                                   AlarmManagement::HandlerParticipant::ParticipantHierarchy(data));
-    const int equipNo = data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0;
+    const int equipNo = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
     m_partId2EquipNoMap.insert(data.id, equipNo);
 
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
index 1f7af4c7f..1ff658504 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
@@ -162,7 +162,7 @@ void ModuleTestEffectCluster::onAesItemViewChanged(const AesItemView &aesItemVie
   if (modType == DataModification::eRemoved)
     return;
 
-  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId());
+  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId);
   if (aesType != AreaEffectSimulation::AesType::AtEffectCluster)
     return;
 
@@ -199,7 +199,7 @@ void ModuleTestEffectCluster::onEffectsChanged(const Effects &effects, DataModif
 {
   if (modType == DataModification::eRemoved)
     return;
-  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId());
+  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId);
   DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id << ", aesType=" << aesType;
   ++m_counterDds.cntEffectClusterEffects;
 
@@ -387,13 +387,13 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
   QString dateTimeString = QDateTime::currentDateTime().toString(QStringLiteral("dd.MM.yyyy hh:mm"));
   m_reference = dateTimeString;
 
-  if (eaData.effectStart.is_set())
+  if (eaData.effectStart.has_value())
     INFO_LOG(m_logger) << "  effectClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart.get()).toString();
   else
     INFO_LOG(m_logger) << "  effectClusterModifyRequest with effectStart: not set ";
 
   FlightCurve fc;
-  //  if (eaData.flightCurve.is_set())
+  //  if (eaData.flightCurve.has_value())
   //    fc = eaData.flightCurve.get();
 
   QJsonObject obj;
@@ -407,7 +407,7 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
   obj[QStringLiteral("subTyp")] = 0;
   obj[QStringLiteral("typ")] = 0;
   obj[QStringLiteral("useReceived")] = true;
-  obj[QStringLiteral("effectSource")] = ProjectDataManagement::EffectSource::ES_ADLER;
+  obj[QStringLiteral("effectSource")] = static_cast<int>(ProjectDataManagement::EffectSource::ES_ADLER);
 
   QString propertiesStr = QString::fromStdString(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
index e16f66fbe..831a51513 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
@@ -185,7 +185,7 @@ void ModuleTestExplosionCluster::onExplosionClusterChanged(const ExplosionCluste
 
   m_data = data;
   qint64 startTimeMsec = -1;
-  if (m_data.effectStart.is_set())
+  if (m_data.effectStart.has_value())
     startTimeMsec = m_data.effectStart.get();
 
   DEBUG_LOG(m_logger) << " got changed - m_data: " << m_data.id << ", state=" << m_data.effectStateId
@@ -210,7 +210,7 @@ void ModuleTestExplosionCluster::onAesItemViewChanged(const AesItemView &aesItem
   if (modType == DataModification::eRemoved)
     return;
 
-  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId());
+  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId);
   DEBUG_LOG(m_logger) << " got onAesItemViewChanged - m_data: " << m_data.id << ", aesType=" << aesType;
 
   switch (aesType) {
@@ -233,7 +233,7 @@ void ModuleTestExplosionCluster::onEffectsChanged(const Effects &effects, DataMo
 {
   if (modType == DataModification::eRemoved)
     return;
-  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId());
+  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId);
   DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id << ", aesType=" << aesType;
   ++m_counterDds.cntExplosionClusterEffects;
 
@@ -442,10 +442,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1104(const QString &eaName)
   eaData.partyId = 2;
   eaData.participantId = 5;
 
-  eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
+  eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
-                   Core::GeoPosition2D(0.0, 0.0)});
+                   Core::GeoPosition2D(0.0, 0.0)};
   eaData.impactCount = 4;
 
   // SubStruct FlightCurve
@@ -492,10 +492,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1106(const QString &eaName)
   eaData.partyId = 2;
   eaData.participantId = 6;
 
-  eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
+  eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
-                   Core::GeoPosition2D(0.0, 0.0)});
+                   Core::GeoPosition2D(0.0, 0.0)};
   eaData.impactCount = 4;
 
   // SubStruct FlightCurve
@@ -547,10 +547,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcForUBAHN(const QString &eaName
   eaData.partyId = 2;
   eaData.participantId = 5;
 
-  eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
+  eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
-                   Core::GeoPosition2D(0.0, 0.0)});
+                   Core::GeoPosition2D(0.0, 0.0)};
   eaData.impactCount = 4;
 
   // SubStruct FlightCurve
@@ -600,10 +600,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName)
   eaData.partyId = 2;
   eaData.participantId = 89;
 
-  eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
+  eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
                    Core::GeoPosition2D(0.0, 0.0),
-                   Core::GeoPosition2D(0.0, 0.0)});
+                   Core::GeoPosition2D(0.0, 0.0)};
   eaData.impactCount = 4;
 
   // SubStruct FlightCurve
@@ -636,13 +636,13 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName)
 
 int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionCluster &eaData)
 {
-  if (eaData.effectStart.is_set())
+  if (eaData.effectStart.has_value())
     INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart.get()).toString();
   else
     INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: not set ";
 
   FlightCurve fc;
-  if (eaData.flightCurve.is_set())
+  if (eaData.flightCurve.has_value())
     fc = eaData.flightCurve.get();
 
   const std::string properties = "{}";
@@ -686,7 +686,7 @@ int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionC
 
 int ModuleTestExplosionCluster::doExplosionClusterSingleEffectOnlyModifyRequest(const ExplosionClusterSingleEffectOnlyRequest &request)
 {
-  if (request.effectStart.is_set())
+  if (request.effectStart.has_value())
     INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(request.effectStart.get()).toString();
   else
     INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: not set ";
@@ -2071,7 +2071,7 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104()
   eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
   eaData.chargeStruct.chargeTypeId = 371; // radius == 25, diameter == 50m
 
-  QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
+  QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
   eaData.flightCurve.get().requestedRelativePeakHeight = 500;
 
   eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint;
@@ -2127,10 +2127,10 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104_SMArt_Proximity()
   eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
   eaData.chargeStruct.chargeTypeId = 374; // 374: isSMArt=true ; radius == 25, diameter == 50m
 
-  NOTICE_LOG(m_logger) << LOGFUNCTION << "Vor eaData.flightCurve.is_set()";
+  NOTICE_LOG(m_logger) << LOGFUNCTION << "Vor eaData.flightCurve.has_value()";
 
-  QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
-  NOTICE_LOG(m_logger) << LOGFUNCTION << "Nach eaData.flightCurve.is_set()";
+  QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
+  NOTICE_LOG(m_logger) << LOGFUNCTION << "Nach eaData.flightCurve.has_value()";
 
   eaData.flightCurve.get().requestedRelativePeakHeight = 500;
 
@@ -2407,7 +2407,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104()
   eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
   eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
 
-  QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
+  QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
   eaData.flightCurve.get().requestedRelativePeakHeight = 11100;  // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
   eaData.flightCurve.get().launchVelocity = 500;
   eaData.flightCurve.get().launchAngle = 0;  // calculated ; parameter is prepared for ADLER
@@ -2464,7 +2464,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify()
   eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
   eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
 
-  QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
+  QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
   eaData.flightCurve.get().requestedRelativePeakHeight = 11100;  // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
   eaData.flightCurve.get().launchVelocity = 500;
   eaData.flightCurve.get().launchAngle = 0;  // calculated ; parameter is prepared for ADLER
@@ -2489,7 +2489,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify()
 
   QTimer::singleShot(2000, this, [this] ()  {      // local static is captured implicit by gcc and for MSVS
     qint64 startTimeMsec = -1;
-    if (m_data.effectStart.is_set())
+    if (m_data.effectStart.has_value())
       startTimeMsec = m_data.effectStart.get();
 
     const qint64 nowMsec  = QDateTime::currentMSecsSinceEpoch();
@@ -2568,7 +2568,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify2()
   eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
   eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
 
-  QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
+  QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
   eaData.flightCurve.get().requestedRelativePeakHeight = 11100;  // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
   eaData.flightCurve.get().launchVelocity = 500;
   eaData.flightCurve.get().launchAngle = 0;  // calculated ; parameter is prepared for ADLER
@@ -2596,7 +2596,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify2()
   QTimer::singleShot(2000, this, [this] () { // local static is captured implicit by gcc and for MSVS
 
     qint64 startTimeMsec = -1;
-    if (m_data.effectStart.is_set())
+    if (m_data.effectStart.has_value())
       startTimeMsec = m_data.effectStart.get();
 
     const qint64 nowMsec  = QDateTime::currentMSecsSinceEpoch();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
index 43a9e9b69..96defb05c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
@@ -126,7 +126,7 @@ void ModuleTestAesOthers::boobyTrapChanged(const BoobyTrap &data, DataModificati
 
   m_dataBoobyTrap = data;
   qint64 startTimeMsec = -1;
-  if (m_dataBoobyTrap.effectStart.is_set())
+  if (m_dataBoobyTrap.effectStart.has_value())
     startTimeMsec = m_dataBoobyTrap.effectStart.get();
 
   DEBUG_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id << ", state=" << m_dataBoobyTrap.effectStateId
@@ -145,7 +145,7 @@ void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModi
 
   m_dataOffRouteMine = data;
   qint64 startTimeMsec = -1;
-  if (m_dataOffRouteMine.effectStart.is_set())
+  if (m_dataOffRouteMine.effectStart.has_value())
     startTimeMsec = m_dataOffRouteMine.effectStart.get();
 
   DEBUG_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id << ", state=" << m_dataOffRouteMine.effectStateId
@@ -160,7 +160,7 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D
   if (modType == DataModification::eRemoved)
     return;
 
-  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId());
+  AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId);
   DEBUG_LOG(m_logger) << " got onAesItemViewChanged, aesType=" << aesType;
 
   switch (aesType)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
index 03796563c..291cd1482 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
@@ -28,7 +28,7 @@ bool TestAirSupportImpact::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataExplosionSingle();
-  m_asData.id(-1);
+  m_asData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged,
           this, &TestAirSupportImpact::airSupportImpactChanged);
@@ -42,9 +42,9 @@ bool TestAirSupportImpact::checkBaseData(const AreaEffectSimulation::AirSupportI
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.impactPosition() != b.impactPosition())
+  if (a.impactPosition != b.impactPosition)
   {
-    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition() << " - " << b.impactPosition();
+    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition << " - " << b.impactPosition;
     return false;
   }
   return true;
@@ -57,15 +57,15 @@ void TestAirSupportImpact::tryCreate()
 {
   m_asData = AreaEffectSimulation::AirSupportImpact();
   AreaEffectSimulation::AirSupportImpact asData;
-  asData.id(0);
-  asData.name("chris");
-  asData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  asData.chargeStruct().chargeTypeId(345863487);
-  asData.impactPosition(Core::GeoPosition2D(0.15525, 0.926080));
-  asData.partyId(7);
-  asData.participantId(1234);
-  asData.externalId(1);
-  asData.flightTime(123);
+  asData.id = 0;
+  asData.name = "chris";
+  asData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  asData.chargeStruct.chargeTypeId = 345863487;
+  asData.impactPosition = Core::GeoPosition2D(0.15525, 0.926080);
+  asData.partyId = 7;
+  asData.participantId = 1234;
+  asData.externalId = 1;
+  asData.flightTime = 123;
 
   INFO_LOG(m_logger) << "trying to send explosionSingleCreateRequest()";
   m_replyError = false;
@@ -74,14 +74,14 @@ void TestAirSupportImpact::tryCreate()
   if (!m_ftc->airSupportImpactModifyRequest(
         AirSupportImpactModifyRequest(
           0,
-          asData.name(),
-          asData.effectStart(),
-          asData.chargeStruct().chargeTypeId(),
-          asData.impactPosition(),
-          asData.partyId(),
-          asData.participantId(),
-          asData.flightTime(),
-          asData.externalId()),
+          asData.name,
+          asData.effectStart,
+          asData.chargeStruct.chargeTypeId,
+          asData.impactPosition,
+          asData.partyId,
+          asData.participantId,
+          asData.flightTime,
+          asData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionSingleCreateRequest()";
@@ -98,19 +98,19 @@ void TestAirSupportImpact::tryCreate()
   m_bExpectedFailure = false;
   m_expectedAesId = -1;
 
-  asData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  asData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   m_bIsCreatedRequest = true;
   if (!m_ftc->airSupportImpactModifyRequest(
         AirSupportImpactModifyRequest(
           0,
-          asData.name(),
-          asData.effectStart(),
-          asData.chargeStruct().chargeTypeId(),
-          asData.impactPosition(),
-          asData.partyId(),
-          asData.participantId(),
-          asData.flightTime(),
-          asData.externalId()),
+          asData.name,
+          asData.effectStart,
+          asData.chargeStruct.chargeTypeId,
+          asData.impactPosition,
+          asData.partyId,
+          asData.participantId,
+          asData.flightTime,
+          asData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionSingleCreateRequest()";
@@ -118,7 +118,7 @@ void TestAirSupportImpact::tryCreate()
     return;
   }
 
-  if (!waitForData([this]() { return m_asData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_asData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating single explosion object";
     failExit();
@@ -137,36 +137,36 @@ void TestAirSupportImpact::tryCreate()
 void TestAirSupportImpact::tryModify()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_asData.name("chris2");
-  m_asData.effectStart(m_asData.effectStart.get() + 2000);
-  m_asData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_asData.impactPosition(Core::GeoPosition2D(0.15525, 0.92607));
-  m_asData.partyId(8);
-  m_asData.participantId(1235);
-  m_asData.flightTime(321);
+  m_asData.name = "chris2";
+  m_asData.effectStart = m_asData.effectStart.get() + 2000;
+  m_asData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_asData.impactPosition = Core::GeoPosition2D(0.15525, 0.92607);
+  m_asData.partyId = 8;
+  m_asData.participantId = 1235;
+  m_asData.flightTime = 321;
   const AreaEffectSimulation::AirSupportImpact asData(m_asData);
   m_asData = AreaEffectSimulation::AirSupportImpact();
-  m_asData.id(asData.id());
+  m_asData.id = asData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->airSupportImpactModifyRequest(
         AirSupportImpactModifyRequest(
-          asData.id(),
-          asData.name(),
-          asData.effectStart(),
-          asData.chargeStruct().chargeTypeId(),
-          asData.impactPosition(),
-          asData.partyId(),
-          asData.participantId(),
-          asData.flightTime(),
-          asData.externalId()),
+          asData.id,
+          asData.name,
+          asData.effectStart,
+          asData.chargeStruct.chargeTypeId,
+          asData.impactPosition,
+          asData.partyId,
+          asData.participantId,
+          asData.flightTime,
+          asData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_asData.chargeStruct().chargeTypeId() == s_ChargeTypeId2;}))
+  if (!waitForData([this]() { return m_asData.chargeStruct.chargeTypeId == s_ChargeTypeId2;}))
   {
     ERROR_LOG(m_logger) << "Error updating single explosion object";
     failExit();
@@ -186,9 +186,9 @@ void TestAirSupportImpact::waitExpire()
 {
   INFO_LOG(m_logger) << "waiting until explosion single expires";
 
-  if (!waitForData([this]() { return m_asData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_asData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_asData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_asData.id;
     failExit();
     return;
   }
@@ -199,7 +199,7 @@ void TestAirSupportImpact::waitExpire()
 
 void TestAirSupportImpact::airSupportImpactChanged(const AreaEffectSimulation::AirSupportImpact &data, DataModification modType)
 {
-  if (m_asData.id() == -1)
+  if (m_asData.id == -1)
     return;
   onAesChanged(data, modType, m_asData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
index d74a1b04b..3238e78eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
@@ -22,7 +22,7 @@ TestBase::TestBase(const char *loggerName, QObject *parent)
   , m_replyError(false)
   , m_bTestsSuccessful(true)
   , m_testId(0)
-  , m_aesTypeName(QString::fromLatin1(loggerName).split(QLatin1Char('.')).last().toString())
+  , m_aesTypeName(QString::fromLatin1(loggerName).split(QLatin1Char('.')).last())
   , m_logger(getLogger(loggerName))
 {}
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
index 7f26c27cd..a97df476e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
@@ -47,17 +47,17 @@ protected:
   void onAesChanged(const T &dataIn, DataModification modType, T &dataOut)
   {
     INFO_LOG(m_logger) << "Got " << m_aesTypeName << " with mod type " << (int)modType
-                       << ", id: " << dataIn.id() << ", chargeType: " << dataIn.chargeStruct().chargeTypeId()
-                       << ", effectState: " << dataIn.effectStateId();
-    if (m_expectedAesId == dataIn.id())
+                       << ", id: " << dataIn.id << ", chargeType: " << dataIn.chargeStruct.chargeTypeId
+                       << ", effectState: " << dataIn.effectStateId;
+    if (m_expectedAesId == dataIn.id)
     {
       DEBUG_LOG(m_logger) << "Expected aes id - updating data for " << m_aesTypeName;
       dataOut = dataIn;
     }
-    if (modType == DataModification::eRemoved && dataOut.id() == dataIn.id())
+    if (modType == DataModification::eRemoved && dataOut.id == dataIn.id)
     {
-      DEBUG_LOG(m_logger) << "Removed " << m_aesTypeName << " with id " << dataIn.id();
-      m_expectedAesId = dataIn.id();
+      DEBUG_LOG(m_logger) << "Removed " << m_aesTypeName << " with id " << dataIn.id;
+      m_expectedAesId = dataIn.id;
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
index 5c21ad835..eba4f503f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
@@ -27,7 +27,7 @@ bool TestBCContamination::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataBCContamination();
-  m_bcData.id(-1);
+  m_bcData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged,
           this, &TestBCContamination::bCContaminationChanged);
 
@@ -40,14 +40,14 @@ bool TestBCContamination::checkBaseData(const AreaEffectSimulation::BCContaminat
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.impactPosition() != b.impactPosition())
+  if (a.impactPosition != b.impactPosition)
   {
-    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition() << " - " << b.impactPosition();
+    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition << " - " << b.impactPosition;
     return false;
   }
-  if (a.impactRadius() != b.impactRadius())
+  if (a.impactRadius != b.impactRadius)
   {
-    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius() << " - " << b.impactRadius();
+    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius << " - " << b.impactRadius;
     return false;
   }
   return true;
@@ -61,17 +61,17 @@ void TestBCContamination::tryCreateBCContamination()
   m_bcData = AreaEffectSimulation::BCContamination();
   AreaEffectSimulation::BCContamination bcData;
 
-  bcData.id(0);
-  bcData.name("chris");
-  bcData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  bcData.effectDuration(10234); // msec
-  bcData.chargeStruct().chargeTypeId(345863487);
-  bcData.impactPosition(Core::GeoPosition2D(0.16, 0.92));
-  bcData.impactRadius(100); // 100m
-  bcData.partyId(2);
-  bcData.participantId(1234);  
-  bcData.upperOffset(6.0);
-  bcData.lowerOffset(-1000.0);
+  bcData.id = 0;
+  bcData.name = "chris";
+  bcData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  bcData.effectDuration = 10234; // msec
+  bcData.chargeStruct.chargeTypeId = 345863487;
+  bcData.impactPosition = Core::GeoPosition2D(0.16, 0.92);
+  bcData.impactRadius = 100; // 100m
+  bcData.partyId = 2;
+  bcData.participantId = 1234;  
+  bcData.upperOffset = 6.0;
+  bcData.lowerOffset = -1000.0;
 
   INFO_LOG(m_logger) << "trying to send BCContaminationCreateRequest()";
   m_replyError = false;
@@ -82,22 +82,22 @@ void TestBCContamination::tryCreateBCContamination()
   if(!m_ftc->bCContaminationModifyRequest(
          BCContaminationModifyRequest(
            0,
-           bcData.name(),
-           bcData.effectStart(),
-           bcData.effectDuration(),
-           bcData.chargeStruct().chargeTypeId(),
-           bcData.impactPosition(),
-           bcData.impactRadius(),
+           bcData.name,
+           bcData.effectStart,
+           bcData.effectDuration,
+           bcData.chargeStruct.chargeTypeId,
+           bcData.impactPosition,
+           bcData.impactRadius,
            AesWeatherSource::AwsStatic,
-           bcData.partyId(),
-           bcData.participantId(),
+           bcData.partyId,
+           bcData.participantId,
            dds::core::optional<double>(), // propagationDirection
            dds::core::optional<double>(), // windSpeed
            dds::core::optional<Core::GeoPosition2D>(), // weatherPosition
            dds::core::optional<rti::core::int64>(), // weatherTimestamp
-           dds::core::optional<long long>(), // externalId
-           bcData.upperOffset(),
-           bcData.lowerOffset(),
+           dds::core::optional<rti::core::int64>(), // externalId
+           bcData.upperOffset,
+           bcData.lowerOffset,
            dds::core::optional<bool>()),
          this))
   {
@@ -118,26 +118,26 @@ void TestBCContamination::tryCreateBCContamination()
   m_bIsCreatedRequest = true;
   m_expectedAesId = -1;
 
-  bcData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  bcData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   if (!m_ftc->bCContaminationModifyRequest(
         BCContaminationModifyRequest(
           0,
-          bcData.name(),
-          bcData.effectStart(),
-          bcData.effectDuration(),
-          bcData.chargeStruct().chargeTypeId(),
-          bcData.impactPosition(),
-          bcData.impactRadius(),
+          bcData.name,
+          bcData.effectStart,
+          bcData.effectDuration,
+          bcData.chargeStruct.chargeTypeId,
+          bcData.impactPosition,
+          bcData.impactRadius,
           AesWeatherSource::AwsStatic,
-          bcData.partyId(),
-          bcData.participantId(),
+          bcData.partyId,
+          bcData.participantId,
           dds::core::optional<double>(),
           dds::core::optional<double>(),
           dds::core::optional<Core::GeoPosition2D>(),
           dds::core::optional<rti::core::int64>(),
-          dds::core::optional<long long>(),
-          bcData.upperOffset(),
-          bcData.lowerOffset(),
+          dds::core::optional<rti::core::int64>(),
+          bcData.upperOffset,
+          bcData.lowerOffset,
           dds::core::optional<bool>()),
         this))
   {
@@ -146,7 +146,7 @@ void TestBCContamination::tryCreateBCContamination()
     return;
   }
 
-  if (!waitForData([this]() { return m_bcData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_bcData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating bc contamination object";
     failExit();
@@ -165,39 +165,39 @@ void TestBCContamination::tryCreateBCContamination()
 void TestBCContamination::tryModifyBCContamination()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_bcData.name("chris2");
-  m_bcData.effectStart(m_bcData.effectStart.get() + 2000);
-  m_bcData.effectDuration(3200); // msec
-  m_bcData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_bcData.impactPosition(Core::GeoPosition2D(0.17, 0.93));
-  m_bcData.partyId(3);
-  m_bcData.participantId(1235);
-  m_bcData.upperOffset(6.0);
-  m_bcData.lowerOffset(false);
+  m_bcData.name = "chris2";
+  m_bcData.effectStart = m_bcData.effectStart.get() + 2000;
+  m_bcData.effectDuration = 3200; // msec
+  m_bcData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_bcData.impactPosition = Core::GeoPosition2D(0.17, 0.93);
+  m_bcData.partyId = 3;
+  m_bcData.participantId = 1235;
+  m_bcData.upperOffset = 6.0;
+  m_bcData.lowerOffset = false;
   const AreaEffectSimulation::BCContamination bcData(m_bcData);
   m_bcData = AreaEffectSimulation::BCContamination();
-  m_bcData.id(bcData.id());
+  m_bcData.id = bcData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->bCContaminationModifyRequest(
         BCContaminationModifyRequest(
-          bcData.id(),
-          bcData.name(),
-          bcData.effectStart(),
-          bcData.effectDuration(),
-          bcData.chargeStruct().chargeTypeId(),
-          bcData.impactPosition(),
-          bcData.impactRadius(),
+          bcData.id,
+          bcData.name,
+          bcData.effectStart,
+          bcData.effectDuration,
+          bcData.chargeStruct.chargeTypeId,
+          bcData.impactPosition,
+          bcData.impactRadius,
           AesWeatherSource::AwsStatic,
-          bcData.partyId(),
-          bcData.participantId(),
+          bcData.partyId,
+          bcData.participantId,
           dds::core::optional<double>(),
           dds::core::optional<double>(),
           dds::core::optional<Core::GeoPosition2D>(),
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<rti::core::int64>(),
-          bcData.upperOffset(),
-          bcData.lowerOffset(),
+          bcData.upperOffset,
+          bcData.lowerOffset,
       dds::core::optional<bool>()),
         this))
   {
@@ -205,7 +205,7 @@ void TestBCContamination::tryModifyBCContamination()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_bcData.chargeStruct().chargeTypeId() == s_ChargeTypeId2;}))
+  if (!waitForData([this]() { return m_bcData.chargeStruct.chargeTypeId == s_ChargeTypeId2;}))
   {
     ERROR_LOG(m_logger) << "Error updating bc contamination object";
     failExit();
@@ -225,9 +225,9 @@ void TestBCContamination::waitExpireBCContamination()
 {
   INFO_LOG(m_logger) << "waiting until bc contamination expires";
 
-  if (!waitForData([this]() { return m_bcData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_bcData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of bc contamination with id " << m_bcData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of bc contamination with id " << m_bcData.id;
     failExit();
     return;
   }
@@ -241,33 +241,33 @@ void TestBCContamination::tryRemoveBCContamination()
   INFO_LOG(m_logger) << "tryRemoveBCContamination start";
 
   AreaEffectSimulation::BCContamination bcData(m_bcData);
-  bcData.name("RemoveTest");
-  bcData.effectStart(0);  // not set
+  bcData.name = "RemoveTest";
+  bcData.effectStart = 0;  // not set
   m_bcData = AreaEffectSimulation::BCContamination();
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
-  bcData.upperOffset(6.0);
-  bcData.lowerOffset(false);
+  bcData.upperOffset = 6.0;
+  bcData.lowerOffset = false;
 
   if (!m_ftc->bCContaminationModifyRequest(
         BCContaminationModifyRequest(
           0,
-          bcData.name(),
-          bcData.effectStart(),
-          bcData.effectDuration(),
-          bcData.chargeStruct().chargeTypeId(),
-          bcData.impactPosition(),
-          bcData.impactRadius(),
+          bcData.name,
+          bcData.effectStart,
+          bcData.effectDuration,
+          bcData.chargeStruct.chargeTypeId,
+          bcData.impactPosition,
+          bcData.impactRadius,
           AesWeatherSource::AwsStatic,
-          bcData.partyId(),
-          bcData.participantId(),
+          bcData.partyId,
+          bcData.participantId,
           dds::core::optional<double>(),
           dds::core::optional<double>(),
           dds::core::optional<Core::GeoPosition2D>(),
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<rti::core::int64>(),
-          bcData.upperOffset(),
-          bcData.lowerOffset(),
+          bcData.upperOffset,
+          bcData.lowerOffset,
       dds::core::optional<bool>()),
         this))
   {
@@ -276,7 +276,7 @@ void TestBCContamination::tryRemoveBCContamination()
     return;
   }
 
-  if (!waitForData([this]() { return m_bcData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_bcData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating bc contamination object";
     failExit();
@@ -284,14 +284,14 @@ void TestBCContamination::tryRemoveBCContamination()
   }
 
   m_expectedAesId = -1;
-  if (!m_ftc->bCContaminationRemoveRequest(Core::RemoveElementRequest(m_bcData.id()), this))
+  if (!m_ftc->bCContaminationRemoveRequest(Core::RemoveElementRequest(m_bcData.id), this))
   {
     ERROR_LOG(m_logger) << "Error during BCContaminationRemoveRequest()";
     failExit();
     return;
   }
 
-  if (!waitForData([this]() { return m_bcData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_bcData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error removing bc contamination object";
     failExit();
@@ -304,7 +304,7 @@ void TestBCContamination::tryRemoveBCContamination()
 
 void TestBCContamination::bCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
 {
-  if (m_bcData.id() == -1)
+  if (m_bcData.id == -1)
     return;
   onAesChanged(data, modType, m_bcData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
index ef440ef28..771786f90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
@@ -27,7 +27,7 @@ bool TestBoobyTrap::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataBoobyTrap();
-  m_btData.id(-1);
+  m_btData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged,
           this, &TestBoobyTrap::boobyTrapChanged);
 
@@ -40,14 +40,14 @@ bool TestBoobyTrap::checkBaseData(const AreaEffectSimulation::BoobyTrap &a,
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.impactPosition() != b.impactPosition())
+  if (a.impactPosition != b.impactPosition)
   {
-    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition() << " - " << b.impactPosition();
+    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition << " - " << b.impactPosition;
     return false;
   }
-  if (a.impactRadius() != b.impactRadius())
+  if (a.impactRadius != b.impactRadius)
   {
-    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius() << " - " << b.impactRadius();
+    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius << " - " << b.impactRadius;
     return false;
   }
   return true;
@@ -61,17 +61,17 @@ void TestBoobyTrap::tryCreateBoobyTrap()
   m_btData = AreaEffectSimulation::BoobyTrap();
   AreaEffectSimulation::BoobyTrap btData;
 
-  btData.id(0);
-  btData.name("BoobyTrap1");
-  btData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  btData.effectDuration(10234); // msec
-  btData.chargeStruct().chargeTypeId(3456789);
-  btData.impactPosition(Core::GeoPosition2D(0.1547, 0.926));
-  btData.impactRadius(800); // 100m
-  btData.triggerRadius(200);
-  btData.rotationAngle(45);
-  btData.centralAngle(90);
-  btData.partyId(2);
+  btData.id = 0;
+  btData.name = "BoobyTrap1";
+  btData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  btData.effectDuration = 10234; // msec
+  btData.chargeStruct.chargeTypeId = 3456789;
+  btData.impactPosition = Core::GeoPosition2D(0.1547, 0.926);
+  btData.impactRadius = 800; // 100m
+  btData.triggerRadius = 200;
+  btData.rotationAngle = 45;
+  btData.centralAngle = 90;
+  btData.partyId = 2;
   //btData.participantId(1234);
 
   INFO_LOG(m_logger) << "trying to send BoobyTrapCreateRequest()";
@@ -83,12 +83,12 @@ void TestBoobyTrap::tryCreateBoobyTrap()
   if (!m_ftc->boobyTrapModifyRequest(
         BoobyTrapModifyRequest(
           0,
-          btData.name(),
-          btData.effectDuration(),
-          btData.chargeStruct().chargeTypeId(),
-          btData.impactPosition(),
-          btData.impactRadius(),
-          btData.triggerRadius(),
+          btData.name,
+          btData.effectDuration,
+          btData.chargeStruct.chargeTypeId,
+          btData.impactPosition,
+          btData.impactRadius,
+          btData.triggerRadius,
           btData.rotationAngle.get(),
           btData.centralAngle.get(),
           btData.effectStart.get(),
@@ -112,16 +112,16 @@ void TestBoobyTrap::tryCreateBoobyTrap()
   m_bIsCreatedRequest = true;
   m_expectedAesId = -1;
 
-  btData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  btData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   if (!m_ftc->boobyTrapModifyRequest(
         BoobyTrapModifyRequest(
           0,
-          btData.name(),
-          btData.effectDuration(),
-          btData.chargeStruct().chargeTypeId(),
-          btData.impactPosition(),
-          btData.impactRadius(),
-          btData.triggerRadius(),
+          btData.name,
+          btData.effectDuration,
+          btData.chargeStruct.chargeTypeId,
+          btData.impactPosition,
+          btData.impactRadius,
+          btData.triggerRadius,
           btData.rotationAngle.get(),
           btData.centralAngle.get(),
           btData.effectStart.get(),
@@ -133,7 +133,7 @@ void TestBoobyTrap::tryCreateBoobyTrap()
     return;
   }
 
-  if (!waitForData([this]() { return m_btData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_btData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating booby trap object";
     failExit();
@@ -152,27 +152,27 @@ void TestBoobyTrap::tryCreateBoobyTrap()
 void TestBoobyTrap::tryModifyBoobyTrap()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_btData.name("Booby Trap 2");
-  m_btData.effectStart(m_btData.effectStart.get() + 2000);
-  m_btData.effectDuration(3200); // msec
-  m_btData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_btData.impactPosition(Core::GeoPosition2D(0.1547, 0.926));
-  m_btData.partyId(3);
+  m_btData.name = "Booby Trap 2";
+  m_btData.effectStart = m_btData.effectStart.get() + 2000;
+  m_btData.effectDuration = 3200; // msec
+  m_btData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_btData.impactPosition = Core::GeoPosition2D(0.1547, 0.926);
+  m_btData.partyId = 3;
   //m_btData.participantId(1235);
   const AreaEffectSimulation::BoobyTrap btData(m_btData);
   m_btData = AreaEffectSimulation::BoobyTrap();
-  m_btData.id(btData.id());
+  m_btData.id = btData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->boobyTrapModifyRequest(
         BoobyTrapModifyRequest(
-          btData.id(),
-          btData.name(),
-          btData.effectDuration(),
-          btData.chargeStruct().chargeTypeId(),
-          btData.impactPosition(),
-          btData.impactRadius(),
-          btData.triggerRadius(),
+          btData.id,
+          btData.name,
+          btData.effectDuration,
+          btData.chargeStruct.chargeTypeId,
+          btData.impactPosition,
+          btData.impactRadius,
+          btData.triggerRadius,
           btData.rotationAngle.get(),
           btData.centralAngle.get(),
           btData.effectStart.get(),
@@ -183,7 +183,7 @@ void TestBoobyTrap::tryModifyBoobyTrap()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_btData.chargeStruct().chargeTypeId() == s_ChargeTypeId2;}))
+  if (!waitForData([this]() { return m_btData.chargeStruct.chargeTypeId == s_ChargeTypeId2;}))
   {
     ERROR_LOG(m_logger) << "Error updating booby trap object";
     failExit();
@@ -204,8 +204,8 @@ void TestBoobyTrap::tryTriggerBoobyTrap()
   INFO_LOG(m_logger) << "trigger booby trap  -> expires";
 
   BoobyTrapTriggerRequest req;
-  req.id(m_btData.id());
-  req.triggered(true);
+  req.id = m_btData.id;
+  req.triggered = true;
   if (!m_ftc->boobyTrapTriggerRequest(req, this))
   {
     ERROR_LOG(m_logger) << "Error requesting trigger data";
@@ -221,9 +221,9 @@ void TestBoobyTrap::waitExpireBoobyTrap()
 {
   INFO_LOG(m_logger) << "waiting until booby trap expires";
 
-  if (!waitForData([this]() { return m_btData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_btData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of booby trap with id " << m_btData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of booby trap with id " << m_btData.id;
     failExit();
     return;
   }
@@ -237,8 +237,8 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
   INFO_LOG(m_logger) << "tryRemoveBoobyTrap start";
 
   AreaEffectSimulation::BoobyTrap btData(m_btData);
-  btData.name("RemoveTest");
-  btData.effectStart(0);  // not set
+  btData.name = "RemoveTest";
+  btData.effectStart = 0;  // not set
   m_btData = AreaEffectSimulation::BoobyTrap();
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
@@ -246,12 +246,12 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
   if (!m_ftc->boobyTrapModifyRequest(
         BoobyTrapModifyRequest(
           0,
-          btData.name(),
-          btData.effectDuration(),
-          btData.chargeStruct().chargeTypeId(),
-          btData.impactPosition(),
-          btData.impactRadius(),
-          btData.triggerRadius(),
+          btData.name,
+          btData.effectDuration,
+          btData.chargeStruct.chargeTypeId,
+          btData.impactPosition,
+          btData.impactRadius,
+          btData.triggerRadius,
           btData.rotationAngle.get(),
           btData.centralAngle.get(),
           btData.effectStart.get(),
@@ -263,7 +263,7 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
     return;
   }
 
-  if (!waitForData([this]() { return m_btData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_btData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating booby trap object";
     failExit();
@@ -271,14 +271,14 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
   }
 
   m_expectedAesId = -1;
-  if (!m_ftc->boobyTrapRemoveRequest(Core::RemoveElementRequest(m_btData.id()), this))
+  if (!m_ftc->boobyTrapRemoveRequest(Core::RemoveElementRequest(m_btData.id), this))
   {
     ERROR_LOG(m_logger) << "Error during BoobyTrapRemoveRequest()";
     failExit();
     return;
   }
 
-  if (!waitForData([this]() { return m_btData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_btData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error removing booby trap object";
     failExit();
@@ -291,7 +291,7 @@ void TestBoobyTrap::tryRemoveBoobyTrap()
 
 void TestBoobyTrap::boobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
 {
-  if (m_btData.id() == -1)
+  if (m_btData.id == -1)
     return;
   onAesChanged(data, modType, m_btData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
index 8b0773d94..12fa5073a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
@@ -25,7 +25,7 @@ bool TestChargeAdministration::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_testId = testId;
-  m_caData.id(-1);
+  m_caData.id = -1;
   DEBUG_LOG(m_logger) << "Test Id = " << m_testId;
 
   m_dtc->waitForHistoricalDataChargeAdministration();
@@ -37,33 +37,33 @@ bool TestChargeAdministration::init(int domainId, int exerciseId, int testId)
 bool TestChargeAdministration::checkBaseData(const AreaEffectSimulation::ChargeAdministration &a, const AreaEffectSimulation::ChargeAdministration &b) const
 {
 
-  if (a.amount() != b.amount())
+  if (a.amount != b.amount)
   {
-    WARNING_LOG(m_logger) << "Amount does not match: " << a.amount() << " - " << b.amount();
+    WARNING_LOG(m_logger) << "Amount does not match: " << a.amount << " - " << b.amount;
     return false;
   }
 
-  if (a.planned() != b.planned())
+  if (a.planned != b.planned)
   {
-    WARNING_LOG(m_logger) << "Planned does not match: " << a.planned() << " - " << b.planned();
+    WARNING_LOG(m_logger) << "Planned does not match: " << a.planned << " - " << b.planned;
     return false;
   }
 
-  if (a.chargeTypeId() != b.chargeTypeId())
+  if (a.chargeTypeId != b.chargeTypeId)
   {
-    WARNING_LOG(m_logger) << "ChargeTypeId does not match: " << a.chargeTypeId() << " - " << b.chargeTypeId();
+    WARNING_LOG(m_logger) << "ChargeTypeId does not match: " << a.chargeTypeId << " - " << b.chargeTypeId;
     return false;
   }
 
-  if (a.partyId() != b.partyId())
+  if (a.partyId != b.partyId)
   {
-    WARNING_LOG(m_logger) << "PartyId does not match: " << a.partyId() << " - " << b.partyId();
+    WARNING_LOG(m_logger) << "PartyId does not match: " << a.partyId << " - " << b.partyId;
     return false;
   }
 
-  if (a.used() != b.used())
+  if (a.used != b.used)
   {
-    WARNING_LOG(m_logger) << "Used does not match: " << a.used() << " - " << b.used();
+    WARNING_LOG(m_logger) << "Used does not match: " << a.used << " - " << b.used;
     return false;
   }
 
@@ -78,10 +78,10 @@ void TestChargeAdministration::tryCreateChargeAdministration()
   m_expectedAesId = -1;
   AreaEffectSimulation::ChargeAdministration esData;
 
-  esData.chargeTypeId(471);
-  esData.partyId(2);
-  esData.amount(450);
-  esData.effectSourceId(ProjectDataManagement::EffectSource::ES_Internal);
+  esData.chargeTypeId = 471;
+  esData.partyId = 2;
+  esData.amount = 450;
+  esData.effectSourceId = ProjectDataManagement::EffectSource::ES_Internal;
 
   INFO_LOG(m_logger) << "trying to send ChargeAdministrationCreateRequest()";
   m_replyError = false;
@@ -89,10 +89,10 @@ void TestChargeAdministration::tryCreateChargeAdministration()
 
   // amountChangedByOperator=true
   if (!m_ftc->chargeAdministrationModifyRequest(ChargeAdministrationModifyRequest(0,
-                                                                                  esData.chargeTypeId(),
-                                                                                  esData.partyId(),
-                                                                                  esData.effectSourceId(),
-                                                                                  esData.amount(),
+                                                                                  esData.chargeTypeId,
+                                                                                  esData.partyId,
+                                                                                  esData.effectSourceId,
+                                                                                  esData.amount,
                                                                                   true),
                                                 this))
   {
@@ -101,7 +101,7 @@ void TestChargeAdministration::tryCreateChargeAdministration()
     return;
   }
 
-  if (!waitForData([this]() { return m_caData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_caData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating charge admin object";
     failExit();
@@ -120,21 +120,21 @@ void TestChargeAdministration::tryCreateChargeAdministration()
 void TestChargeAdministration::tryModifyChargeAdministration()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_caData.chargeTypeId(471);
-  m_caData.partyId(2);
-  m_caData.amount(600);
+  m_caData.chargeTypeId = 471;
+  m_caData.partyId = 2;
+  m_caData.amount = 600;
 
   const AreaEffectSimulation::ChargeAdministration esData(m_caData);
   m_caData = AreaEffectSimulation::ChargeAdministration();
-  m_caData.id(esData.id());
+  m_caData.id = esData.id;
   m_bIsCreatedRequest = false;
 
   // amountChangedByOperator=true
-  if (!m_ftc->chargeAdministrationModifyRequest(ChargeAdministrationModifyRequest(esData.id(),
-                                                                                  esData.chargeTypeId(),
-                                                                                  esData.partyId(),
-                                                                                  esData.effectSourceId(),
-                                                                                  esData.amount(),
+  if (!m_ftc->chargeAdministrationModifyRequest(ChargeAdministrationModifyRequest(esData.id,
+                                                                                  esData.chargeTypeId,
+                                                                                  esData.partyId,
+                                                                                  esData.effectSourceId,
+                                                                                  esData.amount,
                                                                                   true),
                                                 this))
   {
@@ -143,7 +143,7 @@ void TestChargeAdministration::tryModifyChargeAdministration()
     return;
   }
 
-  if (!waitForData([this]() { return m_caData.amount() == s_ChargeAmount; }))
+  if (!waitForData([this]() { return m_caData.amount == s_ChargeAmount; }))
   {
     ERROR_LOG(m_logger) << "Error updating charge admin object";
     failExit();
@@ -159,11 +159,11 @@ void TestChargeAdministration::tryModifyChargeAdministration()
 //
 void TestChargeAdministration::chargeAdministrationChanged(const AreaEffectSimulation::ChargeAdministration &data, DataModification modType)
 {
-  if (m_caData.id() < 0)
+  if (m_caData.id < 0)
     return;
-  INFO_LOG(m_logger) << "Got ChargeAdministrationData with mod type " << (int)modType << ", id: " << data.id() << ", name: " << data.chargeTypeId()
-                     << ", amount: " << data.amount();
-  if ((modType == DataModification::eAdded && m_caData.id() == 0) || (modType == DataModification::eModified && m_caData.id() == data.id()))
+  INFO_LOG(m_logger) << "Got ChargeAdministrationData with mod type " << (int)modType << ", id: " << data.id << ", name: " << data.chargeTypeId
+                     << ", amount: " << data.amount;
+  if ((modType == DataModification::eAdded && m_caData.id == 0) || (modType == DataModification::eModified && m_caData.id == data.id))
   {
     DEBUG_LOG(m_logger) << "** Updating m_caData";
     m_caData = data;
@@ -194,20 +194,20 @@ void TestChargeAdministration::tryCreateChargeAdministration(int chargeTypeId, i
   m_caData = AreaEffectSimulation::ChargeAdministration();
   AreaEffectSimulation::ChargeAdministration esData;
 
-  esData.chargeTypeId(chargeTypeId);
-  esData.partyId(partyId);
-  esData.amount(amount);
-  esData.amountChangedByOperator(true);
+  esData.chargeTypeId = chargeTypeId;
+  esData.partyId = partyId;
+  esData.amount = amount;
+  esData.amountChangedByOperator = true;
 
   INFO_LOG(m_logger) << "trying to send ChargeAdministrationCreateRequest(int,int,int)";
   m_replyError = false;
   m_bIsCreatedRequest = true;
   // amountChangedByOperator=true
   if (!m_ftc->chargeAdministrationModifyRequest(ChargeAdministrationModifyRequest(0,
-                                                                                  esData.chargeTypeId(),
-                                                                                  esData.partyId(),
-                                                                                  esData.effectSourceId(),
-                                                                                  esData.amount(),
+                                                                                  esData.chargeTypeId,
+                                                                                  esData.partyId,
+                                                                                  esData.effectSourceId,
+                                                                                  esData.amount,
                                                                                   true),
                                                 this))
   {
@@ -216,7 +216,7 @@ void TestChargeAdministration::tryCreateChargeAdministration(int chargeTypeId, i
     return;
   }
 
-  if (!waitForData([this]() { return m_caData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_caData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating charge admin object";
     failExit();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
index 82dfc41b6..1c84fd4c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
@@ -25,7 +25,7 @@ bool TestDangerArea::init(int domainId, int exerciseId, int testId)
 
   m_dtc->waitForHistoricalDataDangerArea();
 
-  m_daData.id(-1);
+  m_daData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged,
           this, &TestDangerArea::dangerAreaChanged);
   return true;
@@ -35,23 +35,23 @@ bool TestDangerArea::checkBaseData(const AreaEffectSimulation::DangerArea &a,
                            const AreaEffectSimulation::DangerArea &b) const
 {
 
-  if (a.name() != b.name())
+  if (a.name != b.name)
   {
-    WARNING_LOG(m_logger) << "Name does not macht: " << a.name() << " - " << b.name();
+    WARNING_LOG(m_logger) << "Name does not macht: " << a.name << " - " << b.name;
     return false;
   }
 
-  if (a.effectStart() != b.effectStart())
+  if (a.effectStart != b.effectStart)
   {
-    WARNING_LOG(m_logger) << "StartTime does not match: " << a.effectStart() << " - " << b.effectStart();
+    WARNING_LOG(m_logger) << "StartTime does not match: " << a.effectStart << " - " << b.effectStart;
     return false;
   }
 
-  for (size_t i = 0; i<a.segments().size() && i<b.segments().size(); ++i)
+  for (size_t i = 0; i<a.segments.size() && i<b.segments.size(); ++i)
   {
-    if (a.segments()[i] != b.segments()[i])
+    if (a.segments[i] != b.segments[i])
     {
-      WARNING_LOG(m_logger) << "impactPosition does not match: " << a.segments()[i] << " - " << b.segments()[i];
+      WARNING_LOG(m_logger) << "impactPosition does not match: " << a.segments[i] << " - " << b.segments[i];
       return false;
     }
   }
@@ -64,10 +64,10 @@ void TestDangerArea::tryCreateDangerArea()
 {
   m_daData = AreaEffectSimulation::DangerArea();
   AreaEffectSimulation::DangerArea esData;
-  esData.id(0);
-  esData.name("chris");
-  esData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  esData.sampleTime(time(nullptr) *1000);
+  esData.id = 0;
+  esData.name = "chris";
+  esData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  esData.sampleTime = time(nullptr) *1000;
 
   std::vector<Core::GeoPosition2D> segments;
   segments.emplace_back(Core::GeoPosition2D(0.17001, 0.93001));
@@ -80,10 +80,10 @@ void TestDangerArea::tryCreateDangerArea()
   if (!m_ftc->dangerAreaModifyRequest(
         DangerAreaModifyRequest(
           0,
-          esData.name(),
+          esData.name,
           0, // Effect Duration
           311, // Charge Type Id -> 311 = Danger Area Dummy
-          esData.effectStart(),
+          esData.effectStart,
           segments,
           dds::core::optional<int32_t>(), // Party Id
           dds::core::optional<int32_t>(), // Player Id
@@ -96,7 +96,7 @@ void TestDangerArea::tryCreateDangerArea()
     return;
   }
 
-  if (!waitForData([this]() { return m_daData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_daData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating danger area object";
     failExit();
@@ -115,12 +115,12 @@ void TestDangerArea::tryCreateDangerArea()
 void TestDangerArea::tryModifyDangerArea()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_daData.name(s_name);
-  m_daData.effectStart(time(nullptr)+ 6 * 1000);
+  m_daData.name = s_name;
+  m_daData.effectStart = time(nullptr)+ 6 * 1000;
 
   const AreaEffectSimulation::DangerArea esData(m_daData);
   m_daData = AreaEffectSimulation::DangerArea();
-  m_daData.id(esData.id());
+  m_daData.id = esData.id;
 
   // resize to 2 elements
   std::vector<Core::GeoPosition2D> segments;
@@ -130,11 +130,11 @@ void TestDangerArea::tryModifyDangerArea()
   m_bIsCreatedRequest = false;
   if (!m_ftc->dangerAreaModifyRequest(
         DangerAreaModifyRequest(
-          esData.id(),
-          esData.name(),
+          esData.id,
+          esData.name,
           0,  // Effect Duration
           311, // Charge Type Id -> 311 = Danger Area Dummy
-          esData.effectStart(),
+          esData.effectStart,
           segments,
           dds::core::optional<int32_t>(), // Party Id
           dds::core::optional<int32_t>(),  // Player Id
@@ -146,7 +146,7 @@ void TestDangerArea::tryModifyDangerArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_daData.segments().size() == 2;}))
+  if (!waitForData([this]() { return m_daData.segments.size() == 2;}))
   {
     ERROR_LOG(m_logger) << "Error updating danger area object";
     failExit();
@@ -162,11 +162,11 @@ void TestDangerArea::tryModifyDangerArea()
 
   if (!m_ftc->dangerAreaModifyRequest(
         DangerAreaModifyRequest(
-          esData.id(),
-          esData.name(),
+          esData.id,
+          esData.name,
           0,  // Effect Duration
           311, // Charge Type Id -> 311 = Danger Area Dummy
-          esData.effectStart(),
+          esData.effectStart,
           segments,
           dds::core::optional<int32_t>(), // Party Id
           dds::core::optional<int32_t>(),  // Player Id
@@ -178,7 +178,7 @@ void TestDangerArea::tryModifyDangerArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_daData.segments().size() == 4;}))
+  if (!waitForData([this]() { return m_daData.segments.size() == 4;}))
   {
     ERROR_LOG(m_logger) << "Error updating danger area object";
     failExit();
@@ -193,16 +193,16 @@ void TestDangerArea::tryRemoveDangerArea()
 {
   m_expectedAesId = -1;
   if (!m_ftc->dangerAreaRemoveRequest(
-        Core::RemoveElementRequest( m_daData.id()),
+        Core::RemoveElementRequest( m_daData.id),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_daData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_daData.id == m_expectedAesId; }))
   {
-    ERROR_LOG(m_logger) << "Error removing bc contamination object " << m_daData.id() << " != " << m_expectedAesId;
+    ERROR_LOG(m_logger) << "Error removing bc contamination object " << m_daData.id << " != " << m_expectedAesId;
     failExit();
     return;
   }
@@ -216,7 +216,7 @@ void TestDangerArea::tryRemoveDangerArea()
 //
 void TestDangerArea::dangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType)
 {
-  if (m_daData.id() == -1)
+  if (m_daData.id == -1)
     return;
   onAesChanged(data, modType, m_daData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
index d27918d52..016dcf7ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
@@ -8,6 +8,7 @@
 #include "aes_test_explosion_area.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
+#include <QtCore/QElapsedTimer>
 #include <QTest>
 
 namespace AreaEffectSimulation
@@ -27,7 +28,7 @@ bool TestExplosionArea::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataExplosionArea();
-  m_eaData.id(-1);
+  m_eaData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged,
           this, &TestExplosionArea::explosionAreaChanged);
@@ -43,19 +44,19 @@ bool TestExplosionArea::checkBaseData(const AreaEffectSimulation::ExplosionArea
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.area() != b.area())
+  if (a.area != b.area)
   {
-    WARNING_LOG(m_logger) << "area does not match: " << a.area() << " - " << b.area();
+    WARNING_LOG(m_logger) << "area does not match: " << a.area << " - " << b.area;
     return false;
   }
-  if (a.cannonCount() != b.cannonCount())
+  if (a.cannonCount != b.cannonCount)
   {
-    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount() << " - " << b.cannonCount();
+    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount << " - " << b.cannonCount;
     return false;
   }
-  if (a.cannonRounds() != b.cannonRounds())
+  if (a.cannonRounds != b.cannonRounds)
   {
-    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount() << " - " << b.cannonCount();
+    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount << " - " << b.cannonCount;
     return false;
   }
   return true;
@@ -66,17 +67,17 @@ void TestExplosionArea::tryCreateExplosionArea()
   INFO_LOG(m_logger) << "tryCreateExplosionArea start";
   m_eaData = AreaEffectSimulation::ExplosionArea();
   AreaEffectSimulation::ExplosionArea eaData;
-  eaData.id(0);
-  eaData.name("af1");
-  eaData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  eaData.effectDuration(10000);  // 10 seconds
-  eaData.chargeStruct().chargeTypeId(345863487);
-  eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.16, 0.92), 50, 60, 70));
-  eaData.partyId(2);
-  eaData.participantId(1234);
-  eaData.cannonCount(1);
-  eaData.cannonRounds(2);
-  eaData.externalId(2);
+  eaData.id = 0;
+  eaData.name = "af1";
+  eaData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  eaData.effectDuration = 10000;  // 10 seconds
+  eaData.chargeStruct.chargeTypeId = 345863487;
+  eaData.area = AreaEffectSimulation::Area(Core::GeoPosition2D(0.16, 0.92), 50, 60, 70);
+  eaData.partyId = 2;
+  eaData.participantId = 1234;
+  eaData.cannonCount = 1;
+  eaData.cannonRounds = 2;
+  eaData.externalId = 2;
 
   INFO_LOG(m_logger) << "trying to send explosionAreaCreateRequest()";
   m_replyError = false;
@@ -85,21 +86,21 @@ void TestExplosionArea::tryCreateExplosionArea()
   if (!m_ftc->explosionAreaModifyRequest(
         ExplosionAreaModifyRequest(
           0,
-          eaData.name(),
-          eaData.effectStart(),
-          eaData.effectDuration(),
-          eaData.effectSourceId(),
-          eaData.chargeStruct().chargeTypeId(),
-          eaData.area(),
-          eaData.partyId(),
-          eaData.participantId(),
-          eaData.cannonCount(),
-          eaData.cannonRounds(),
-          eaData.fireRequestTime(),
-          eaData.altitude(),
-          eaData.purpose(),
-          eaData.effectMarkingInTa(),
-          eaData.externalId()
+          eaData.name,
+          eaData.effectStart,
+          eaData.effectDuration,
+          eaData.effectSourceId,
+          eaData.chargeStruct.chargeTypeId,
+          eaData.area,
+          eaData.partyId,
+          eaData.participantId,
+          eaData.cannonCount,
+          eaData.cannonRounds,
+          eaData.fireRequestTime,
+          eaData.altitude,
+          eaData.purpose,
+          eaData.effectMarkingInTa,
+          eaData.externalId
           ),
         this))
   {
@@ -119,26 +120,26 @@ void TestExplosionArea::tryCreateExplosionArea()
   m_bExpectedFailure = false;
   m_expectedAesId = -1;
 
-  eaData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  eaData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   m_bIsCreatedRequest = true;
   if (!m_ftc->explosionAreaModifyRequest(
         ExplosionAreaModifyRequest(
           0,
-          eaData.name(),
-          eaData.effectStart(),
-          eaData.effectDuration(),
-          eaData.effectSourceId(),
-          eaData.chargeStruct().chargeTypeId(),
-          eaData.area(),
-          eaData.partyId(),
-          eaData.participantId(),
-          eaData.cannonCount(),
-          eaData.cannonRounds(),
-          eaData.fireRequestTime(),
-          eaData.altitude(),
-          eaData.purpose(),
-          eaData.effectMarkingInTa(),
-          eaData.externalId()),
+          eaData.name,
+          eaData.effectStart,
+          eaData.effectDuration,
+          eaData.effectSourceId,
+          eaData.chargeStruct.chargeTypeId,
+          eaData.area,
+          eaData.partyId,
+          eaData.participantId,
+          eaData.cannonCount,
+          eaData.cannonRounds,
+          eaData.fireRequestTime,
+          eaData.altitude,
+          eaData.purpose,
+          eaData.effectMarkingInTa,
+          eaData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionAreaCreateRequest()";
@@ -146,7 +147,7 @@ void TestExplosionArea::tryCreateExplosionArea()
     return;
   }
 
-  if (!waitForData([this]() { return m_eaData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_eaData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating area explosion object";
     failExit();
@@ -166,47 +167,47 @@ void TestExplosionArea::tryCreateExplosionArea()
 void TestExplosionArea::tryModifyExplosionArea()
 {
   INFO_LOG(m_logger) << "tryModifyExplosionArea start";
-  m_eaData.name("af2");
-  m_eaData.effectStart(m_eaData.effectStart.get() + 3000);
-  m_eaData.effectDuration(9000);  // 9 sec
-  m_eaData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70));
-  m_eaData.partyId(3);
-  m_eaData.participantId(1235);
-  m_eaData.cannonCount(2);
-  m_eaData.cannonRounds(2);
-  m_eaData.effectMarkingInTa(true);
+  m_eaData.name = "af2";
+  m_eaData.effectStart = m_eaData.effectStart.get() + 3000;
+  m_eaData.effectDuration = 9000;  // 9 sec
+  m_eaData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_eaData.area = AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70);
+  m_eaData.partyId = 3;
+  m_eaData.participantId = 1235;
+  m_eaData.cannonCount = 2;
+  m_eaData.cannonRounds = 2;
+  m_eaData.effectMarkingInTa = true;
 
   const AreaEffectSimulation::ExplosionArea eaData(m_eaData);
   m_eaData = AreaEffectSimulation::ExplosionArea();
-  m_eaData.id(eaData.id());
+  m_eaData.id = eaData.id;
   m_bIsCreatedRequest = false;
 
   if (!m_ftc->explosionAreaModifyRequest(
         ExplosionAreaModifyRequest(
-          eaData.id(),
-          eaData.name(),
-          eaData.effectStart(),
-          eaData.effectDuration(),
-          eaData.effectSourceId(),
-          eaData.chargeStruct().chargeTypeId(),
-          eaData.area(),
-          eaData.partyId(),
-          eaData.participantId(),
-          eaData.cannonCount(),
-          eaData.cannonRounds(),
-          eaData.fireRequestTime(),
-          eaData.altitude(),
-          eaData.purpose(),
-          eaData.effectMarkingInTa(),
-          eaData.externalId()),
+          eaData.id,
+          eaData.name,
+          eaData.effectStart,
+          eaData.effectDuration,
+          eaData.effectSourceId,
+          eaData.chargeStruct.chargeTypeId,
+          eaData.area,
+          eaData.partyId,
+          eaData.participantId,
+          eaData.cannonCount,
+          eaData.cannonRounds,
+          eaData.fireRequestTime,
+          eaData.altitude,
+          eaData.purpose,
+          eaData.effectMarkingInTa,
+          eaData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.chargeStruct().chargeTypeId() == s_ChargeTypeId2; }))
+  if (!waitForData([this]() { return m_eaData.chargeStruct.chargeTypeId == s_ChargeTypeId2; }))
   {
     ERROR_LOG(m_logger) << "Error updating area explosion object";
     failExit();
@@ -227,9 +228,9 @@ void TestExplosionArea::tryWaitForActivationExplosionArea()
 {
   INFO_LOG(m_logger) << "tryWaitForActivationExplosionArea start";
 
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
-    DEBUG_LOG(m_logger) << "Effect State = " << m_eaData.effectStateId();
+    DEBUG_LOG(m_logger) << "Effect State = " << m_eaData.effectStateId;
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
     return;
@@ -246,7 +247,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -268,7 +269,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -279,7 +280,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsPaused; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsPaused; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for pause of area explosion";
     failExit();
@@ -291,7 +292,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -313,7 +314,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -324,7 +325,7 @@ void TestExplosionArea::tryPauseResumeExplosionArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -339,7 +340,7 @@ void TestExplosionArea::checkTriggeredExplosions()
   INFO_LOG(m_logger) << "checkTriggeredExplosions start";
 
   // first we should wait for Activation
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -353,7 +354,7 @@ void TestExplosionArea::checkTriggeredExplosions()
   checkTriggeredExplosionsHelper(0x00); // 0b00000000
 
   // last step: wait for expiry
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for expiring of area explosion";
     failExit();
@@ -369,7 +370,7 @@ void TestExplosionArea::checkTriggeredExplosionsHelper(int bitfield)
   // since we've 9 seconds duration and the first hit is at 0, every 2.5sec should be a new TriggeredExplosions telegram
   QElapsedTimer et;
   et.start();
-  if (!waitForData([this, bitfield]() { return m_tiData.bitfield()[0] == bitfield; }))
+  if (!waitForData([this, bitfield]() { return m_tiData.bitfield[0] == bitfield; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for triggered explosison telegram with bitfield 0x" << QByteArray::number(bitfield, 16);
     failExit();
@@ -386,16 +387,16 @@ void TestExplosionArea::checkTriggeredExplosionsHelper(int bitfield)
 
 void TestExplosionArea::explosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
 {
-  if (m_eaData.id() == -1)
+  if (m_eaData.id == -1)
     return;
   onAesChanged(data, modType, m_eaData);
 }
 
 void TestExplosionArea::triggeredImpactsChanged(const AreaEffectSimulation::TriggeredImpacts &data, DataModification modType)
 {
-  if (m_eaData.id() != data.aesItemId() || modType == DataModification::eRemoved)
+  if (m_eaData.id != data.aesItemId || modType == DataModification::eRemoved)
     return;
-  INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield()[0]), 16);
+  INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield[0]), 16);
   m_tiData = data;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
index 5d650ea9d..377e0e051 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
@@ -9,6 +9,7 @@
 #include "aes_test_explosion_area_bulk.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
+#include <QtCore/QElapsedTimer>
 #include <QTest>
 
 namespace AreaEffectSimulation
@@ -28,7 +29,7 @@ bool TestExplosionAreaBulk::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataExplosionArea();
-  m_eaData.id(-1);
+  m_eaData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged,
           this, &TestExplosionAreaBulk::explosionAreaChanged);
@@ -44,19 +45,19 @@ bool TestExplosionAreaBulk::checkBaseData(const AreaEffectSimulation::ExplosionA
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.area() != b.area())
+  if (a.area != b.area)
   {
-    WARNING_LOG(m_logger) << "area does not match: " << a.area() << " - " << b.area();
+    WARNING_LOG(m_logger) << "area does not match: " << a.area << " - " << b.area;
     return false;
   }
-  if (a.cannonCount() != b.cannonCount())
+  if (a.cannonCount != b.cannonCount)
   {
-    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount() << " - " << b.cannonCount();
+    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount << " - " << b.cannonCount;
     return false;
   }
-  if (a.cannonRounds() != b.cannonRounds())
+  if (a.cannonRounds != b.cannonRounds)
   {
-    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount() << " - " << b.cannonCount();
+    WARNING_LOG(m_logger) << "cannonCount does not match: " << a.cannonCount << " - " << b.cannonCount;
     return false;
   }
   return true;
@@ -77,21 +78,21 @@ void TestExplosionAreaBulk::tryCreateExplosionArea()
 
     m_eaData = AreaEffectSimulation::ExplosionArea();
     AreaEffectSimulation::ExplosionArea eaData;
-    eaData.id(0);
-    eaData.name(objName.toStdString().c_str());
-    eaData.effectStart((time(nullptr) + 4) * 1000);  // msec
-    eaData.effectDuration(effectDurationMesc);  // 10 seconds
-    eaData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+    eaData.id = 0;
+    eaData.name = objName.toStdString().c_str();
+    eaData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+    eaData.effectDuration = effectDurationMesc;  // 10 seconds
+    eaData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
 
     // Bremen : 0.155 ; 0.926
-    eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.15 + (lonOffset*i), 0.926), 500, 600, 70));
+    eaData.area = AreaEffectSimulation::Area(Core::GeoPosition2D(0.15 + (lonOffset*i), 0.926), 500, 600, 70);
 
 
-    eaData.partyId((i%3) + 2);
-    eaData.participantId(1234);
-    eaData.cannonCount(10);
-    eaData.cannonRounds(10);
-    eaData.externalId(2);
+    eaData.partyId = (i%3) + 2;
+    eaData.participantId = 1234;
+    eaData.cannonCount = 10;
+    eaData.cannonRounds = 10;
+    eaData.externalId = 2;
 
     INFO_LOG(m_logger) << "trying to send explosionAreaCreateRequest()";
     m_replyError = false;
@@ -100,21 +101,21 @@ void TestExplosionAreaBulk::tryCreateExplosionArea()
     if (!m_ftc->explosionAreaModifyRequest(
           ExplosionAreaModifyRequest(
             0,
-            eaData.name(),
-            eaData.effectStart(),
-            eaData.effectDuration(),
-            eaData.effectSourceId(),
-            eaData.chargeStruct().chargeTypeId(),
-            eaData.area(),
-            eaData.partyId(),
-            eaData.participantId(),
-            eaData.cannonCount(),
-            eaData.cannonRounds(),
-            eaData.fireRequestTime(),
-            eaData.altitude(),
-            eaData.purpose(),
-            eaData.effectMarkingInTa(),
-            eaData.externalId()
+            eaData.name,
+            eaData.effectStart,
+            eaData.effectDuration,
+            eaData.effectSourceId,
+            eaData.chargeStruct.chargeTypeId,
+            eaData.area,
+            eaData.partyId,
+            eaData.participantId,
+            eaData.cannonCount,
+            eaData.cannonRounds,
+            eaData.fireRequestTime,
+            eaData.altitude,
+            eaData.purpose,
+            eaData.effectMarkingInTa,
+            eaData.externalId
             ),
           this))
     {
@@ -147,47 +148,47 @@ void TestExplosionAreaBulk::tryCreateExplosionArea()
 void TestExplosionAreaBulk::tryModifyExplosionArea()
 {
   INFO_LOG(m_logger) << "tryModifyExplosionArea start";
-  m_eaData.name("af2");
-  m_eaData.effectStart(m_eaData.effectStart.get() + 3000);
-  m_eaData.effectDuration(9000);  // 9 sec
-  m_eaData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70));
-  m_eaData.partyId(3);
-  m_eaData.participantId(1235);
-  m_eaData.cannonCount(2);
-  m_eaData.cannonRounds(2);
-  m_eaData.effectMarkingInTa(true);
+  m_eaData.name = "af2";
+  m_eaData.effectStart = m_eaData.effectStart.get() + 3000;
+  m_eaData.effectDuration = 9000;  // 9 sec
+  m_eaData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_eaData.area = AreaEffectSimulation::Area(Core::GeoPosition2D(0.165, 0.921), 50, 60, 70);
+  m_eaData.partyId = 3;
+  m_eaData.participantId = 1235;
+  m_eaData.cannonCount = 2;
+  m_eaData.cannonRounds = 2;
+  m_eaData.effectMarkingInTa = true;
 
   const AreaEffectSimulation::ExplosionArea eaData(m_eaData);
   m_eaData = AreaEffectSimulation::ExplosionArea();
-  m_eaData.id(eaData.id());
+  m_eaData.id = eaData.id;
   m_bIsCreatedRequest = false;
 
   if (!m_ftc->explosionAreaModifyRequest(
         ExplosionAreaModifyRequest(
-          eaData.id(),
-          eaData.name(),
-          eaData.effectStart(),
-          eaData.effectDuration(),
-          eaData.effectSourceId(),
-          eaData.chargeStruct().chargeTypeId(),
-          eaData.area(),
-          eaData.partyId(),
-          eaData.participantId(),
-          eaData.cannonCount(),
-          eaData.cannonRounds(),
-          eaData.fireRequestTime(),
-          eaData.altitude(),
-          eaData.purpose(),
-          eaData.effectMarkingInTa(),
-          eaData.externalId()),
+          eaData.id,
+          eaData.name,
+          eaData.effectStart,
+          eaData.effectDuration,
+          eaData.effectSourceId,
+          eaData.chargeStruct.chargeTypeId,
+          eaData.area,
+          eaData.partyId,
+          eaData.participantId,
+          eaData.cannonCount,
+          eaData.cannonRounds,
+          eaData.fireRequestTime,
+          eaData.altitude,
+          eaData.purpose,
+          eaData.effectMarkingInTa,
+          eaData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.chargeStruct().chargeTypeId() == s_ChargeTypeId2; }))
+  if (!waitForData([this]() { return m_eaData.chargeStruct.chargeTypeId == s_ChargeTypeId2; }))
   {
     ERROR_LOG(m_logger) << "Error updating area explosion object";
     failExit();
@@ -208,9 +209,9 @@ void TestExplosionAreaBulk::tryWaitForActivationExplosionArea()
 {
   INFO_LOG(m_logger) << "tryWaitForActivationExplosionArea start";
 
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
-    DEBUG_LOG(m_logger) << "Effect State = " << m_eaData.effectStateId();
+    DEBUG_LOG(m_logger) << "Effect State = " << m_eaData.effectStateId;
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
     return;
@@ -227,7 +228,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -249,7 +250,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -260,7 +261,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsPaused; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsPaused; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for pause of area explosion";
     failExit();
@@ -272,7 +273,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -294,7 +295,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionAreaPauseResumeRequest(
         ExplosionAreaPauseResumeRequest(
-          m_eaData.id(),
+          m_eaData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -305,7 +306,7 @@ void TestExplosionAreaBulk::tryPauseResumeExplosionArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -320,7 +321,7 @@ void TestExplosionAreaBulk::checkTriggeredExplosions()
   INFO_LOG(m_logger) << "checkTriggeredExplosions start";
 
   // first we should wait for Activation
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -334,7 +335,7 @@ void TestExplosionAreaBulk::checkTriggeredExplosions()
   checkTriggeredExplosionsHelper(0x00); // 0b00000000
 
   // last step: wait for expiry
-  if (!waitForData([this]() { return m_eaData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired; }))
+  if (!waitForData([this]() { return m_eaData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for expiring of area explosion";
     failExit();
@@ -350,7 +351,7 @@ void TestExplosionAreaBulk::checkTriggeredExplosionsHelper(int bitfield)
   // since we've 9 seconds duration and the first hit is at 0, every 2.5sec should be a new TriggeredExplosions telegram
   QElapsedTimer et;
   et.start();
-  if (!waitForData([this, bitfield]() { return m_tiData.bitfield()[0] == bitfield; }))
+  if (!waitForData([this, bitfield]() { return m_tiData.bitfield[0] == bitfield; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for triggered explosison telegram with bitfield 0x" << QByteArray::number(bitfield, 16);
     failExit();
@@ -367,18 +368,18 @@ void TestExplosionAreaBulk::checkTriggeredExplosionsHelper(int bitfield)
 
 void TestExplosionAreaBulk::explosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
 {
-  if (m_eaData.id() == -1)
+  if (m_eaData.id == -1)
     return;
   onAesChanged(data, modType, m_eaData);
 }
 
 void TestExplosionAreaBulk::triggeredImpactsChanged(const AreaEffectSimulation::TriggeredImpacts &data, DataModification modType)
 {
-  if (m_eaData.id() != data.aesItemId() || modType == DataModification::eRemoved)
+  if (m_eaData.id != data.aesItemId || modType == DataModification::eRemoved)
     return;
 
-  if (data.bitfield().size() > 0)
-    INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield()[0]), 16);
+  if (data.bitfield.size() > 0)
+    INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield[0]), 16);
   m_tiData = data;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
index b603361fc..84b0b21b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
@@ -10,6 +10,7 @@
 #include <ProjectDataManagement/pdm.hpp>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
+#include <QtCore/QElapsedTimer>
 #include <QTest>
 
 namespace AreaEffectSimulation
@@ -33,7 +34,7 @@ bool TestExplosionCluster::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataExplosionCluster();
-  m_ecData.id(-1);
+  m_ecData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged,
           this, &TestExplosionCluster::explosionClusterChanged);
@@ -49,9 +50,9 @@ bool TestExplosionCluster::checkBaseData(const AreaEffectSimulation::ExplosionCl
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.area() != b.area())
+  if (a.area != b.area)
   {
-    WARNING_LOG(m_logger) << "area does not match: " << a.area() << " - " << b.area();
+    WARNING_LOG(m_logger) << "area does not match: " << a.area << " - " << b.area;
     return false;
   }
 
@@ -64,17 +65,17 @@ void TestExplosionCluster::tryCreateExplosionCluster()
   INFO_LOG(m_logger) << "tryCreateExplosionCluster start";
   m_ecData = AreaEffectSimulation::ExplosionCluster();
   AreaEffectSimulation::ExplosionCluster eaData;
-  eaData.id(0);
+  eaData.id = 0;
 
-  eaData.effectStart((time(nullptr) + 30) * 1000);  // msec
+  eaData.effectStart = (time(nullptr) + 30) * 1000;  // msec
 
   QString name(QStringLiteral("ec__"));
   name += QString::number(eaData.effectStart.get());
-  eaData.name(name.toStdString());
+  eaData.name = name.toStdString();
 
-  eaData.effectDuration(10000);  // 10 seconds
-  eaData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
-  eaData.chargeStruct().igniterTypeId(s_IgniterTypeImpact);
+  eaData.effectDuration = 10000;  // 10 seconds
+  eaData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
+  eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
 
   // 32 U MD 93860 79903 -> 0.155484041, 0.92622146
 //  eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.202560, 0.91611), 200, 50, 20)); // width, height, rotation
@@ -83,14 +84,14 @@ void TestExplosionCluster::tryCreateExplosionCluster()
   //  eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.202564, 0.916112), 200, 50, 20)); // width, height, rotation
   //  eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.202562, 0.916115), 200, 50, 20)); // width, height, rotation
 
-  eaData.area(AreaEffectSimulation::Area(Core::GeoPosition2D(0.202562, 0.916114), 30, 20, 20)); // width, height, rotation
-  eaData.mhPoints({{0.2025611, 0.9161111}, {0.2025611, 0.9161111}, {0.2025611, 0.9161111}}); // 3
+  eaData.area = AreaEffectSimulation::Area(Core::GeoPosition2D(0.202562, 0.916114), 30, 20, 20); // width, height, rotation
+  eaData.mhPoints = {{0.2025611, 0.9161111}, {0.2025611, 0.9161111}, {0.2025611, 0.9161111}}; // 3
 
 
-  eaData.partyId(3);
-  eaData.participantId(5);
+  eaData.partyId = 3;
+  eaData.participantId = 5;
 
-  eaData.externalId(0);
+  eaData.externalId = 0;
 
   INFO_LOG(m_logger) << "trying to send explosionClusterCreateRequest()";
   m_replyError = false;
@@ -108,15 +109,15 @@ void TestExplosionCluster::tryCreateExplosionCluster()
   if (!m_ftc->explosionClusterModifyRequest(
         ExplosionClusterModifyRequest(
           0,
-          eaData.name(),
-          eaData.element(),
-          eaData.effectStart(),
-          eaData.effectDuration(),
-          eaData.effectSourceId(),
-          eaData.area(),
+          eaData.name,
+          eaData.element,
+          eaData.effectStart,
+          eaData.effectDuration,
+          eaData.effectSourceId,
+          eaData.area,
           AreaEffectSimulation::AesExplosionGeometry::EgArea,
           0,                        // zog
-          eaData.mhPoints().size(),                  // mhpCount;
+          eaData.mhPoints.size(),                  // mhpCount;
           dds::core::optional<double>(),             // mhpRotation for ExplosionClusterOcModify only
           3,                        // impactCount
           { 12345,                    // eaData.chargeTypeId(),
@@ -127,10 +128,10 @@ void TestExplosionCluster::tryCreateExplosionCluster()
 //          25,                     // firing_elevation_angle
           123,                      // peakHeight,
           10 * 1000,                // flightDuration [msec],
-          eaData.partyId(),
-          eaData.participantId(),
+          eaData.partyId,
+          eaData.participantId,
           {}, // esmParticipantIds
-          eaData.externalId(),
+          eaData.externalId,
           -1, // eaData.launchVelocity(),
           -1, // eaData.launchAngleDeg(),
           -1, // eaData.dropAngle(),
@@ -138,7 +139,7 @@ void TestExplosionCluster::tryCreateExplosionCluster()
           -1, // eaData.lcAttack(),         // fka lcPrf
           -1, // eaData.lcTermination(),
           -1, // eaData.cloudBase(),        // Wolkenuntergrenze
-          eaData.effectMarkingInTa(),
+          eaData.effectMarkingInTa,
           properties),
         this))
   {
@@ -278,9 +279,9 @@ void TestExplosionCluster::tryWaitForActivationExplosionCluster()
 {
   INFO_LOG(m_logger) << "tryWaitForActivationExplosionCluster start";
 
-  if (!waitForData([this]() { return m_ecData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_ecData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
-    DEBUG_LOG(m_logger) << "Effect State = " << m_ecData.effectStateId();
+    DEBUG_LOG(m_logger) << "Effect State = " << m_ecData.effectStateId;
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
     return;
@@ -297,7 +298,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionClusterPauseResumeRequest(
         ExplosionClusterPauseResumeRequest(
-          m_ecData.id(),
+          m_ecData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -319,7 +320,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionClusterPauseResumeRequest(
         ExplosionClusterPauseResumeRequest(
-          m_ecData.id(),
+          m_ecData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -330,7 +331,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_ecData.effectStateId() == AreaEffectSimulation::AesEffectState::EsPaused; }))
+  if (!waitForData([this]() { return m_ecData.effectStateId == AreaEffectSimulation::AesEffectState::EsPaused; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for pause of area explosion";
     failExit();
@@ -342,7 +343,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
   m_bExpectedFailure = true;
   if (!m_ftc->explosionClusterPauseResumeRequest(
         ExplosionClusterPauseResumeRequest(
-          m_ecData.id(),
+          m_ecData.id,
           false,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -364,7 +365,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
   m_bExpectedFailure = false;
   if (!m_ftc->explosionClusterPauseResumeRequest(
         ExplosionClusterPauseResumeRequest(
-          m_ecData.id(),
+          m_ecData.id,
           true,
           dds::core::optional<rti::core::int64>(),
           dds::core::optional<int32_t>(),
@@ -375,7 +376,7 @@ void TestExplosionCluster::tryPauseResumeExplosionCluster()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_ecData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_ecData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -390,7 +391,7 @@ void TestExplosionCluster::checkTriggeredExplosions()
   INFO_LOG(m_logger) << "checkTriggeredExplosions start";
 
   // first we should wait for Activation
-  if (!waitForData([this]() { return m_ecData.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated; }))
+  if (!waitForData([this]() { return m_ecData.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for activation of area explosion";
     failExit();
@@ -404,7 +405,7 @@ void TestExplosionCluster::checkTriggeredExplosions()
   checkTriggeredExplosionsHelper(0x00); // 0b00000000
 
   // last step: wait for expiry
-  if (!waitForData([this]() { return m_ecData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired; }))
+  if (!waitForData([this]() { return m_ecData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for expiring of area explosion";
     failExit();
@@ -420,7 +421,7 @@ void TestExplosionCluster::checkTriggeredExplosionsHelper(int bitfield)
   // since we've 9 seconds duration and the first hit is at 0, every 2.5sec should be a new TriggeredExplosions telegram
   QElapsedTimer et;
   et.start();
-  if (!waitForData([this, bitfield]() { return m_tiData.bitfield()[0] == bitfield; }))
+  if (!waitForData([this, bitfield]() { return m_tiData.bitfield[0] == bitfield; }))
   {
     ERROR_LOG(m_logger) << "Error while waiting for triggered explosison telegram with bitfield 0x" << QByteArray::number(bitfield, 16);
     failExit();
@@ -437,16 +438,16 @@ void TestExplosionCluster::checkTriggeredExplosionsHelper(int bitfield)
 
 void TestExplosionCluster::explosionClusterChanged(const AreaEffectSimulation::ExplosionCluster &data, DataModification modType)
 {
-  if (m_ecData.id() == -1)
+  if (m_ecData.id == -1)
     return;
   onAesChanged(data, modType, m_ecData);
 }
 
 void TestExplosionCluster::triggeredImpactsChanged(const AreaEffectSimulation::TriggeredImpacts &data, DataModification modType)
 {
-  if (m_ecData.id() != data.aesItemId() || modType == DataModification::eRemoved)
+  if (m_ecData.id != data.aesItemId || modType == DataModification::eRemoved)
     return;
-  INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield()[0]), 16);
+  INFO_LOG(m_logger) << "Got TriggeredImpacts data - bitfield[0] = 0x" << QByteArray::number(static_cast<int>(data.bitfield[0]), 16);
   m_tiData = data;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
index 9d5a7c309..5a8cb32cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
@@ -28,7 +28,7 @@ bool TestExplosionSingle::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataExplosionSingle();
-  m_esData.id(-1);
+  m_esData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged,
           this, &TestExplosionSingle::explosionSingleChanged);
@@ -42,9 +42,9 @@ bool TestExplosionSingle::checkBaseData(const AreaEffectSimulation::ExplosionSin
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.impactPosition() != b.impactPosition())
+  if (a.impactPosition != b.impactPosition)
   {
-    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition() << " - " << b.impactPosition();
+    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition << " - " << b.impactPosition;
     return false;
   }
   return true;
@@ -57,15 +57,15 @@ void TestExplosionSingle::tryCreateExplosionSingle()
 {
   m_esData = AreaEffectSimulation::ExplosionSingle();
   AreaEffectSimulation::ExplosionSingle esData;
-  esData.id(0);
-  esData.name("chris");
-  esData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  esData.chargeStruct().chargeTypeId(345863487);
-  esData.impactPosition(Core::GeoPosition2D(0.16, 0.92));
-  esData.partyId(7);
-  esData.participantId(1234);
-  esData.externalId(1);
-  esData.effectMarkingInTa(false);
+  esData.id = 0;
+  esData.name = "chris";
+  esData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  esData.chargeStruct.chargeTypeId = 345863487;
+  esData.impactPosition = Core::GeoPosition2D(0.16, 0.92);
+  esData.partyId = 7;
+  esData.participantId = 1234;
+  esData.externalId = 1;
+  esData.effectMarkingInTa = false;
 
   INFO_LOG(m_logger) << "trying to send explosionSingleCreateRequest()";
   m_replyError = false;
@@ -74,18 +74,18 @@ void TestExplosionSingle::tryCreateExplosionSingle()
   if (!m_ftc->explosionSingleModifyRequest(
         ExplosionSingleModifyRequest(
           0,
-          esData.name(),
-          esData.effectStart(),
-          esData.effectSourceId(),
-          esData.chargeStruct().chargeTypeId(),
-          esData.impactPosition(),
-          esData.partyId(),
-          esData.participantId(),
-          esData.fireRequestTime(),
-          esData.altitude(),
-          esData.purpose(),
-          esData.effectMarkingInTa(),
-          esData.externalId()),
+          esData.name,
+          esData.effectStart,
+          esData.effectSourceId,
+          esData.chargeStruct.chargeTypeId,
+          esData.impactPosition,
+          esData.partyId,
+          esData.participantId,
+          esData.fireRequestTime,
+          esData.altitude,
+          esData.purpose,
+          esData.effectMarkingInTa,
+          esData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionSingleCreateRequest()";
@@ -102,24 +102,24 @@ void TestExplosionSingle::tryCreateExplosionSingle()
   m_bExpectedFailure = false;
   m_expectedAesId = -1;
 
-  esData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
-  esData.partyId(2);
+  esData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
+  esData.partyId = 2;
   m_bIsCreatedRequest = true;
   if (!m_ftc->explosionSingleModifyRequest(
         ExplosionSingleModifyRequest(
           0,
-          esData.name(),
-          esData.effectStart(),
-          esData.effectSourceId(),
-          esData.chargeStruct().chargeTypeId(),
-          esData.impactPosition(),
-          esData.partyId(),
-          esData.participantId(),
-          esData.fireRequestTime(),
-          esData.altitude(),
-          esData.purpose(),
-          esData.effectMarkingInTa(),
-          esData.externalId()),
+          esData.name,
+          esData.effectStart,
+          esData.effectSourceId,
+          esData.chargeStruct.chargeTypeId,
+          esData.impactPosition,
+          esData.partyId,
+          esData.participantId,
+          esData.fireRequestTime,
+          esData.altitude,
+          esData.purpose,
+          esData.effectMarkingInTa,
+          esData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionSingleCreateRequest()";
@@ -127,7 +127,7 @@ void TestExplosionSingle::tryCreateExplosionSingle()
     return;
   }
 
-  if (!waitForData([this]() { return m_esData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_esData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating single explosion object";
     failExit();
@@ -146,39 +146,39 @@ void TestExplosionSingle::tryCreateExplosionSingle()
 void TestExplosionSingle::tryModifyExplosionSingle()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_esData.name("chris2");
-  m_esData.effectStart(m_esData.effectStart.get() + 2000);
-  m_esData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_esData.impactPosition(Core::GeoPosition2D(0.17, 0.93));
-  m_esData.partyId(3);
-  m_esData.participantId(1235);
+  m_esData.name = "chris2";
+  m_esData.effectStart = m_esData.effectStart.get() + 2000;
+  m_esData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_esData.impactPosition = Core::GeoPosition2D(0.17, 0.93);
+  m_esData.partyId = 3;
+  m_esData.participantId = 1235;
   const AreaEffectSimulation::ExplosionSingle esData(m_esData);
   m_esData = AreaEffectSimulation::ExplosionSingle();
-  m_esData.id(esData.id());
+  m_esData.id = esData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->explosionSingleModifyRequest(
         ExplosionSingleModifyRequest(
-          esData.id(),
-          esData.name(),
-          esData.effectStart(),
-          esData.effectSourceId(),
-          esData.chargeStruct().chargeTypeId(),
-          esData.impactPosition(),
-          esData.partyId(),
-          esData.participantId(),
-          esData.fireRequestTime(),
-          esData.altitude(),
-          esData.purpose(),
-          esData.effectMarkingInTa(),
-          esData.externalId()),
+          esData.id,
+          esData.name,
+          esData.effectStart,
+          esData.effectSourceId,
+          esData.chargeStruct.chargeTypeId,
+          esData.impactPosition,
+          esData.partyId,
+          esData.participantId,
+          esData.fireRequestTime,
+          esData.altitude,
+          esData.purpose,
+          esData.effectMarkingInTa,
+          esData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_esData.chargeStruct().chargeTypeId() == s_ChargeTypeId2;}))
+  if (!waitForData([this]() { return m_esData.chargeStruct.chargeTypeId == s_ChargeTypeId2;}))
   {
     ERROR_LOG(m_logger) << "Error updating single explosion object";
     failExit();
@@ -198,9 +198,9 @@ void TestExplosionSingle::waitExpireExplosionSingle()
 {
   INFO_LOG(m_logger) << "waiting until explosion single expires";
 
-  if (!waitForData([this]() { return m_esData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_esData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_esData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_esData.id;
     failExit();
     return;
   }
@@ -211,7 +211,7 @@ void TestExplosionSingle::waitExpireExplosionSingle()
 
 void TestExplosionSingle::explosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
 {
-  if (m_esData.id() == -1)
+  if (m_esData.id == -1)
     return;
   onAesChanged(data, modType, m_esData);
 }
@@ -247,15 +247,15 @@ void TestExplosionSingleTestVWM::tryCreateExplosionSingleVWM(const std::string &
                      << " position = " << position;
   m_esData = AreaEffectSimulation::ExplosionSingle();
   AreaEffectSimulation::ExplosionSingle esData;
-  esData.id(0);
-  esData.name(esName);
-  esData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  esData.chargeStruct().chargeTypeId(ammoId);
-  esData.impactPosition(position);
-  esData.partyId(3);  // 3 -> blau
-  esData.participantId(1234);
-  esData.externalId(1);
-  esData.effectMarkingInTa(false);
+  esData.id = 0;
+  esData.name = esName;
+  esData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  esData.chargeStruct.chargeTypeId = ammoId;
+  esData.impactPosition = position;
+  esData.partyId = 3;  // 3 -> blau
+  esData.participantId = 1234;
+  esData.externalId = 1;
+  esData.effectMarkingInTa = false;
 
   INFO_LOG(m_logger) << "trying to send explosionSingleCreateRequest()";
   m_replyError = false;
@@ -267,18 +267,18 @@ void TestExplosionSingleTestVWM::tryCreateExplosionSingleVWM(const std::string &
   if (!m_ftc->explosionSingleModifyRequest(
         ExplosionSingleModifyRequest(
           0,
-          esData.name(),
-          esData.effectStart(),
-          esData.effectSourceId(),
-          esData.chargeStruct().chargeTypeId(),
-          esData.impactPosition(),
-          esData.partyId(),
-          esData.participantId(),
-          esData.fireRequestTime(),
-          esData.altitude(),
-          esData.purpose(),
-          esData.effectMarkingInTa(),
-          esData.externalId()),
+          esData.name,
+          esData.effectStart,
+          esData.effectSourceId,
+          esData.chargeStruct.chargeTypeId,
+          esData.impactPosition,
+          esData.partyId,
+          esData.participantId,
+          esData.fireRequestTime,
+          esData.altitude,
+          esData.purpose,
+          esData.effectMarkingInTa,
+          esData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during explosionSingleCreateRequest()";
@@ -287,7 +287,7 @@ void TestExplosionSingleTestVWM::tryCreateExplosionSingleVWM(const std::string &
   }
 
   // TestBase::onAesCreateReply should update m_expectedAesId:
-  if (!waitForData([this]() { return m_esData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_esData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating single explosion object (try with error)";
   }
@@ -330,9 +330,9 @@ int main(int argc, char **argv)
       if (strcmp(argv[i], "ammoId") == 0)
           ammoId = atoi(argv[i+1]);
       if (strcmp(argv[i], "x") == 0)
-          position.lon(atof(argv[i+1]));
+          position.lon = atof(argv[i+1]);
       if (strcmp(argv[i], "y") == 0)
-        position.lat(atof(argv[i+1]));
+        position.lat = atof(argv[i+1]);
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
index 85c8d6780..40a86343c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
@@ -26,7 +26,7 @@ bool TestGasPipe::init(int domainId, int exerciseId, int testId)
   tryCreateGasPipe();
 
   m_dtc->waitForHistoricalDataGasPipe();
-  m_esData.id(-1);
+  m_esData.id = -1;
 
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::gasPipeChanged,
           this, &TestGasPipe::gasPipeChanged);
@@ -60,15 +60,15 @@ void TestGasPipe::tryCreateGasPipe()
 {
   AreaEffectSimulation::GasPipeModifyRequest gp;
   //AreaEffectSimulation::GasPipe gp;
-  gp.id(0);
-  gp.name("GasPipe");
-  gp.partyId(1);
+  gp.id = 0;
+  gp.name = "GasPipe";
+  gp.partyId = 1;
 
-  setPos(gp.segments(), m_refPos.geographic(3,  3));
-  setPos(gp.segments(), m_refPos.geographic(4,  4));
-  setPos(gp.segments(), m_refPos.geographic(5,  3));
+  setPos(gp.segments, m_refPos.geographic(3,  3));
+  setPos(gp.segments, m_refPos.geographic(4,  4));
+  setPos(gp.segments, m_refPos.geographic(5,  3));
 
-  DEBUG_LOG(m_logger) << LOGFUNCTION << " GasPipe created. id: " << gp.id();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " GasPipe created. id: " << gp.id;
   DEBUG_LOG(m_logger) << "request GasPipe";
   if (!m_ftc->gasPipeModifyRequest( gp, this))
   {
@@ -87,9 +87,9 @@ void TestGasPipe::waitExpireGasPipe()
 {
   INFO_LOG(m_logger) << "waiting until explosion single expires";
 
-  if (!waitForData([this]() { return m_esData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_esData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_esData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of explosion single with id " << m_esData.id;
     failExit();
     return;
   }
@@ -100,7 +100,7 @@ void TestGasPipe::waitExpireGasPipe()
 
 void TestGasPipe::gasPipeChanged(const AreaEffectSimulation::GasPipe &data, DataModification modType)
 {
-  if (m_esData.id() == -1)
+  if (m_esData.id == -1)
     return;
   onAesChanged(data, modType, m_esData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
index e7810e552..009db2d25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
@@ -34,7 +34,7 @@ bool TestMineArea::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataMineArea();
-  m_maData.id(-1);
+  m_maData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, &TestMineArea::mineAreaChanged);
 
   return true;
@@ -46,7 +46,7 @@ void TestMineArea::startTest()
   m_referencedAesItemId = 0;
   for (const auto &ec : effectClusterList)
   {
-    m_referencedAesItemId = ec.id();
+    m_referencedAesItemId = ec.id;
   }
 
   if (m_testId <= 0)
@@ -78,11 +78,11 @@ bool TestMineArea::checkBaseData(const AreaEffectSimulation::MineArea &a, const
   if (!checkAesItem(a, b))
     return false;
 
-  for (size_t i = 0; i < a.segments().size() && i < b.segments().size(); ++i)
+  for (size_t i = 0; i < a.segments.size() && i < b.segments.size(); ++i)
   {
-    if (a.segments()[i] != b.segments()[i])
+    if (a.segments[i] != b.segments[i])
     {
-      WARNING_LOG(m_logger) << "impactPosition does not match: " << a.segments()[i] << " - " << b.segments()[i];
+      WARNING_LOG(m_logger) << "impactPosition does not match: " << a.segments[i] << " - " << b.segments[i];
       return false;
     }
   }
@@ -97,17 +97,17 @@ void TestMineArea::tryCreateMineArea()
   ERROR_LOG(m_logger) << " >>>> create Mine Area...";
   m_maData = AreaEffectSimulation::MineArea();
   AreaEffectSimulation::MineArea esData;
-  esData.id(0);
-  esData.name("chris");
-  esData.effectStart((time(nullptr) + 4) * 1000); // msec
-  esData.chargeStruct().chargeTypeId(345863487);  // Todo: Is this intended?
-  esData.effectDuration(400 * 1000);
-  esData.density(0.2);
-  esData.width(7.0);
-  esData.partyId(7);
-  esData.participantId(1234);
-  esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery);
-  esData.isLaidHidden(true);
+  esData.id = 0;
+  esData.name = "chris";
+  esData.effectStart = (time(nullptr) + 4) * 1000; // msec
+  esData.chargeStruct.chargeTypeId = 345863487;  // Todo: Is this intended?
+  esData.effectDuration = 400 * 1000;
+  esData.density = 0.2;
+  esData.width = 7.0;
+  esData.partyId = 7;
+  esData.participantId = 1234;
+  esData.layingProcedureType = AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery;
+  esData.isLaidHidden = true;
 
   std::vector<Core::GeoPosition2D> segments;
   segments.emplace_back(Core::GeoPosition2D(0.17001, 0.93001));
@@ -120,22 +120,22 @@ void TestMineArea::tryCreateMineArea()
   m_bExpectedFailure = true;
   m_bIsCreatedRequest = true;
   if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(0,
-                                                          esData.name(),
-                                                          esData.effectStart(),
-                                                          esData.effectDuration(),
-                                                          esData.effectSourceId(),
-                                                          esData.density(),
-                                                          esData.width(),
-                                                          {esData.chargeStruct().chargeTypeId(), 0, 0},
+                                                          esData.name,
+                                                          esData.effectStart,
+                                                          esData.effectDuration,
+                                                          esData.effectSourceId,
+                                                          esData.density,
+                                                          esData.width,
+                                                          {esData.chargeStruct.chargeTypeId, 0, 0},
                                                           segments,
-                                                          esData.partyId(),
-                                                          esData.participantId(),
-                                                          esData.layingProcedureType(),
-                                                          esData.isLaidHidden(),
-                                                          esData.effectMarkingInTa(),
+                                                          esData.partyId,
+                                                          esData.participantId,
+                                                          esData.layingProcedureType,
+                                                          esData.isLaidHidden,
+                                                          esData.effectMarkingInTa,
                                                           true,
                                                           distance,
-                                                          esData.externalId(),
+                                                          esData.externalId,
                                                           true),
                                     this))
   {
@@ -155,24 +155,24 @@ void TestMineArea::tryCreateMineArea()
   m_bExpectedFailure = false;
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
-  esData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
-  if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(esData.id(),
-                                                          esData.name(),
-                                                          esData.effectStart(),
-                                                          esData.effectDuration(),
-                                                          esData.effectSourceId(),
-                                                          esData.density(),
-                                                          esData.width(),
-                                                          {esData.chargeStruct().chargeTypeId(), 0, 0},
+  esData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
+  if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(esData.id,
+                                                          esData.name,
+                                                          esData.effectStart,
+                                                          esData.effectDuration,
+                                                          esData.effectSourceId,
+                                                          esData.density,
+                                                          esData.width,
+                                                          {esData.chargeStruct.chargeTypeId, 0, 0},
                                                           segments,
-                                                          esData.partyId(),
-                                                          esData.participantId(),
-                                                          esData.layingProcedureType(),
-                                                          esData.isLaidHidden(),
-                                                          esData.effectMarkingInTa(),
+                                                          esData.partyId,
+                                                          esData.participantId,
+                                                          esData.layingProcedureType,
+                                                          esData.isLaidHidden,
+                                                          esData.effectMarkingInTa,
                                                           true,
                                                           distance,
-                                                          esData.externalId(),
+                                                          esData.externalId,
                                                           true),
                                     this))
   {
@@ -181,7 +181,7 @@ void TestMineArea::tryCreateMineArea()
     return;
   }
 
-  if (!waitForData([this]() { return m_maData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_maData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating mine area object";
     failExit();
@@ -232,9 +232,9 @@ void TestMineArea::testMineData_11()
   {
     MineData m;
     // auto dt = QDateTime::fromMSecsSinceEpoch(date.toMSecsSinceEpoch());
-    m.appearenceTime(date.toMSecsSinceEpoch());
-    m.armingTime(date.addDays(count).toMSecsSinceEpoch());
-    m.position() = pos;
+    m.appearenceTime = date.toMSecsSinceEpoch();
+    m.armingTime = date.addDays(count).toMSecsSinceEpoch();
+    m.position = pos;
     count += 6;
     mineData.push_back(m);
   }
@@ -291,9 +291,9 @@ void TestMineArea::testAddMineData_11()
   {
     MineData m;
     // auto dt = QDateTime::fromMSecsSinceEpoch(date.toMSecsSinceEpoch());
-    m.appearenceTime(date.toMSecsSinceEpoch());
-    m.armingTime(date.addDays(count).toMSecsSinceEpoch());
-    m.position() = pos;
+    m.appearenceTime = date.toMSecsSinceEpoch();
+    m.armingTime = date.addDays(count).toMSecsSinceEpoch();
+    m.position = pos;
     count += 6;
     mineData.push_back(m);
   }
@@ -338,9 +338,9 @@ void TestMineArea::testMineData_21()
   {
     MineData m;
     // auto dt = QDateTime::fromMSecsSinceEpoch(date.toMSecsSinceEpoch());
-    m.appearenceTime(date.toMSecsSinceEpoch());
-    m.armingTime(date.addDays(count).toMSecsSinceEpoch());
-    m.position() = pos;
+    m.appearenceTime = date.toMSecsSinceEpoch();
+    m.armingTime = date.addDays(count).toMSecsSinceEpoch();
+    m.position = pos;
     count += 6;
     mineData.push_back(m);
   }
@@ -387,9 +387,9 @@ void TestMineArea::testAddMineData_21()
   {
     MineData m;
     // auto dt = QDateTime::fromMSecsSinceEpoch(date.toMSecsSinceEpoch());
-    m.appearenceTime(date.toMSecsSinceEpoch());
-    m.armingTime(date.addDays(count).toMSecsSinceEpoch());
-    m.position() = pos;
+    m.appearenceTime = date.toMSecsSinceEpoch();
+    m.armingTime = date.addDays(count).toMSecsSinceEpoch();
+    m.position = pos;
     count += 6;
     mineData.push_back(m);
   }
@@ -432,20 +432,20 @@ void TestMineArea::setSegmentForTesMineData()
 void TestMineArea::tryModifyMineArea()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_maData.name("chris2");
-  m_maData.effectStart(m_maData.effectStart.get() + 2000);
-  m_maData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_maData.effectDuration(4 * 1000);
-  m_maData.density(0.2);
-  m_maData.width(7.0);
-  m_maData.partyId(8);
-  m_maData.participantId(1235);
-  m_maData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery);
-  m_maData.isLaidHidden(false);
+  m_maData.name = "chris2";
+  m_maData.effectStart = m_maData.effectStart.get() + 2000;
+  m_maData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_maData.effectDuration = 4 * 1000;
+  m_maData.density = 0.2;
+  m_maData.width = 7.0;
+  m_maData.partyId = 8;
+  m_maData.participantId = 1235;
+  m_maData.layingProcedureType = AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery;
+  m_maData.isLaidHidden = false;
   const AreaEffectSimulation::MineArea esData(m_maData);
   m_maData = AreaEffectSimulation::MineArea();
-  m_maData.id(esData.id());
-  m_maData.effectMarkingInTa(true);
+  m_maData.id = esData.id;
+  m_maData.effectMarkingInTa = true;
 
   std::vector<Core::GeoPosition2D> segments;
   segments.emplace_back(Core::GeoPosition2D(0.17004, 0.93004));
@@ -454,23 +454,23 @@ void TestMineArea::tryModifyMineArea()
   const double distance = 100.0;
 
   m_bIsCreatedRequest = false;
-  if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(esData.id(),
-                                                          esData.name(),
-                                                          esData.effectStart(),
-                                                          esData.effectDuration(),
-                                                          esData.effectSourceId(),
-                                                          esData.density(),
-                                                          esData.width(),
-                                                          {esData.chargeStruct().chargeTypeId(), 0, 0},
+  if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(esData.id,
+                                                          esData.name,
+                                                          esData.effectStart,
+                                                          esData.effectDuration,
+                                                          esData.effectSourceId,
+                                                          esData.density,
+                                                          esData.width,
+                                                          {esData.chargeStruct.chargeTypeId, 0, 0},
                                                           segments,
-                                                          esData.partyId(),
-                                                          esData.participantId(),
-                                                          esData.layingProcedureType(),
-                                                          esData.isLaidHidden(),
-                                                          esData.effectMarkingInTa(),
+                                                          esData.partyId,
+                                                          esData.participantId,
+                                                          esData.layingProcedureType,
+                                                          esData.isLaidHidden,
+                                                          esData.effectMarkingInTa,
                                                           true,
                                                           distance,
-                                                          esData.externalId(),
+                                                          esData.externalId,
                                                           true),
                                     this))
   {
@@ -478,7 +478,7 @@ void TestMineArea::tryModifyMineArea()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_maData.chargeStruct().chargeTypeId() == s_ChargeTypeId2; }))
+  if (!waitForData([this]() { return m_maData.chargeStruct.chargeTypeId == s_ChargeTypeId2; }))
   {
     ERROR_LOG(m_logger) << "Error updating mine area object";
     failExit();
@@ -502,17 +502,17 @@ void TestMineArea::tryCreateAnotherMineArea()
 {
   INFO_LOG(m_logger) << "trying to create another area request";
   AreaEffectSimulation::MineArea esData;
-  esData.id(0);
-  esData.name("chris");
-  esData.effectStart((time(nullptr) + 4) * 1000); // msec
-  esData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  esData.effectDuration(4 * 1000);
-  esData.density(0.2);
-  esData.width(7.0);
-  esData.partyId(7);
-  esData.participantId(1234);
-  esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery);
-  esData.isLaidHidden(false);
+  esData.id = 0;
+  esData.name = "chris";
+  esData.effectStart = (time(nullptr) + 4) * 1000; // msec
+  esData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  esData.effectDuration = 4 * 1000;
+  esData.density = 0.2;
+  esData.width = 7.0;
+  esData.partyId = 7;
+  esData.participantId = 1234;
+  esData.layingProcedureType = AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery;
+  esData.isLaidHidden = false;
 
   std::vector<Core::GeoPosition2D> segments;
   segments.emplace_back(Core::GeoPosition2D(0.17004, 0.93004));
@@ -524,22 +524,22 @@ void TestMineArea::tryCreateAnotherMineArea()
   m_replyError = true;
   m_bIsCreatedRequest = true;
   if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(0,
-                                                          esData.name(),
-                                                          esData.effectStart(),
-                                                          esData.effectDuration(),
-                                                          esData.effectSourceId(),
-                                                          esData.density(),
-                                                          esData.width(),
-                                                          {esData.chargeStruct().chargeTypeId(), 0, 0},
+                                                          esData.name,
+                                                          esData.effectStart,
+                                                          esData.effectDuration,
+                                                          esData.effectSourceId,
+                                                          esData.density,
+                                                          esData.width,
+                                                          {esData.chargeStruct.chargeTypeId, 0, 0},
                                                           segments,
-                                                          esData.partyId(),
-                                                          esData.participantId(),
-                                                          esData.layingProcedureType(),
-                                                          esData.isLaidHidden(),
-                                                          esData.effectMarkingInTa(),
+                                                          esData.partyId,
+                                                          esData.participantId,
+                                                          esData.layingProcedureType,
+                                                          esData.isLaidHidden,
+                                                          esData.effectMarkingInTa,
                                                           true,
                                                           distance,
-                                                          esData.externalId(),
+                                                          esData.externalId,
                                                           true),
                                     this))
   {
@@ -562,17 +562,17 @@ void TestMineArea::tryCreateMineArea2(int chargeTypeId, double density)
 {
   m_maData = AreaEffectSimulation::MineArea();
   AreaEffectSimulation::MineArea esData;
-  esData.id(0);
-  esData.name("1337Test");
-  esData.effectStart((time(nullptr) + 4) * 1000); // msec
-  esData.chargeStruct().chargeTypeId(chargeTypeId);
-  esData.effectDuration(400 * 1000);
-  esData.density(density);
-  esData.width(7.0);
-  esData.partyId(7);
-  esData.participantId(1234);
-  esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery);
-  esData.isLaidHidden(false);
+  esData.id = 0;
+  esData.name = "1337Test";
+  esData.effectStart = (time(nullptr) + 4) * 1000; // msec
+  esData.chargeStruct.chargeTypeId = chargeTypeId;
+  esData.effectDuration = 400 * 1000;
+  esData.density = density;
+  esData.width = 7.0;
+  esData.partyId = 7;
+  esData.participantId = 1234;
+  esData.layingProcedureType = AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery;
+  esData.isLaidHidden = false;
 
   std::vector<Core::GeoPosition2D> segments;
   /* Erzeugung der GeoKoordinaten fuer den guez-spezifischen zentralen Bereich (Sueden)
@@ -603,22 +603,22 @@ void TestMineArea::tryCreateMineArea2(int chargeTypeId, double density)
   m_bExpectedFailure = false;
   m_bIsCreatedRequest = true;
   if (!m_ftc->mineAreaModifyRequest(MineAreaModifyRequest(0,
-                                                          esData.name(),
-                                                          esData.effectStart(),
-                                                          esData.effectDuration(),
-                                                          esData.effectSourceId(),
-                                                          esData.density(),
-                                                          esData.width(),
-                                                          {esData.chargeStruct().chargeTypeId(), 0, 0},
+                                                          esData.name,
+                                                          esData.effectStart,
+                                                          esData.effectDuration,
+                                                          esData.effectSourceId,
+                                                          esData.density,
+                                                          esData.width,
+                                                          {esData.chargeStruct.chargeTypeId, 0, 0},
                                                           segments,
-                                                          esData.partyId(),
-                                                          esData.participantId(),
-                                                          esData.layingProcedureType(),
-                                                          esData.isLaidHidden(),
-                                                          esData.effectMarkingInTa(),
+                                                          esData.partyId,
+                                                          esData.participantId,
+                                                          esData.layingProcedureType,
+                                                          esData.isLaidHidden,
+                                                          esData.effectMarkingInTa,
                                                           true,
                                                           distance,
-                                                          esData.externalId(),
+                                                          esData.externalId,
                                                           true),
                                     this))
   {
@@ -638,14 +638,14 @@ void TestMineArea::tryCreateMineArea2(int chargeTypeId, double density)
 void TestMineArea::tryTriggerDusMineInBoth()
 {
   AreaEffectSimulation::MineTriggeredRequest mtr;
-  mtr.mineAreaId(0); // DUS does not send mine area ID!
-  mtr.mineId(123);
-  mtr.position(Core::GeoPosition2D(0.170041, 0.930041));
-  mtr.chargeTypeId(48);
+  mtr.mineAreaId = 0; // DUS does not send mine area ID!
+  mtr.mineId = 123;
+  mtr.position = Core::GeoPosition2D(0.170041, 0.930041);
+  mtr.chargeTypeId = 48;
 
   INFO_LOG(m_logger) << "trying to send mineTriggeredRequest()";
   m_replyError = true;
-  if (!m_ftc->mineTriggeredRequest(MineTriggeredRequest(mtr.mineAreaId(), mtr.mineId(), mtr.position.get(), mtr.chargeTypeId.get()), this))
+  if (!m_ftc->mineTriggeredRequest(MineTriggeredRequest(mtr.mineAreaId, mtr.mineId, mtr.position.get(), mtr.chargeTypeId.get()), this))
   {
     ERROR_LOG(m_logger) << "Error during mineTriggeredRequest()";
     failExit();
@@ -667,9 +667,9 @@ void TestMineArea::waitExpireMineArea()
 {
   INFO_LOG(m_logger) << "waiting until mine area expires";
 
-  if (!waitForData([this]() { return m_maData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired; }))
+  if (!waitForData([this]() { return m_maData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired; }))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of mine area with id " << m_maData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of mine area with id " << m_maData.id;
     failExit();
     return;
   }
@@ -680,7 +680,7 @@ void TestMineArea::waitExpireMineArea()
 
 void TestMineArea::mineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType)
 {
-  if (m_maData.id() == -1)
+  if (m_maData.id == -1)
     return;
   onAesChanged(data, modType, m_maData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
index d37ddab6c..476dc1850 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
@@ -26,7 +26,7 @@ bool TestNContamination::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataNContamination();
-  m_ncData.id(-1);
+  m_ncData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged,
           this, &TestNContamination::nContaminationChanged);
 
@@ -39,9 +39,9 @@ bool TestNContamination::checkBaseData(const AreaEffectSimulation::NContaminatio
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.impactPosition() != b.impactPosition())
+  if (a.impactPosition != b.impactPosition)
   {
-    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition() << " - " << b.impactPosition();
+    WARNING_LOG(m_logger) << "impactPosition does not match: " << a.impactPosition << " - " << b.impactPosition;
     return false;
   }
   return true;
@@ -54,20 +54,20 @@ void TestNContamination::tryCreateNContamination()
 {
   m_ncData = AreaEffectSimulation::NContamination();
   AreaEffectSimulation::NContamination ncData;
-  ncData.id(0);
-  ncData.name("ncont1");
-  ncData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  ncData.effectDuration(10000); // 10 sec
-  ncData.chargeStruct().chargeTypeId(345863487);
-  ncData.impactPosition(Core::GeoPosition2D(0.16, 0.92));
-  ncData.borderLengthInner(1000); // 1km
-  ncData.borderLengthOuter(2000); // 2km
-  ncData.impactRadius(500); // 500m
-  ncData.spanAngle(31);
-  ncData.rotationAngle(57);
-  ncData.detonationValue(1000); // kt, only cosmetical
-  ncData.partyId(7);
-  ncData.participantId(1234);
+  ncData.id = 0;
+  ncData.name = "ncont1";
+  ncData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  ncData.effectDuration = 10000; // 10 sec
+  ncData.chargeStruct.chargeTypeId = 345863487;
+  ncData.impactPosition = Core::GeoPosition2D(0.16, 0.92);
+  ncData.borderLengthInner = 1000; // 1km
+  ncData.borderLengthOuter = 2000; // 2km
+  ncData.impactRadius = 500; // 500m
+  ncData.spanAngle = 31;
+  ncData.rotationAngle = 57;
+  ncData.detonationValue = 1000; // kt, only cosmetical
+  ncData.partyId = 7;
+  ncData.participantId = 1234;
 
   INFO_LOG(m_logger) << "trying to send NContaminationCreateRequest()";
   m_replyError = false;
@@ -76,21 +76,21 @@ void TestNContamination::tryCreateNContamination()
   if (!m_ftc->nContaminationModifyRequest(
         NContaminationModifyRequest(
           0,
-          ncData.name(),
-          ncData.effectStart(),
-          ncData.effectDuration(),
-          ncData.chargeStruct().chargeTypeId(),
-          ncData.impactPosition(),
-          ncData.borderLengthInner(),
-          ncData.borderLengthOuter(),
-          ncData.impactRadius(),
-          ncData.spanAngle(),
-          ncData.rotationAngle(),
-          ncData.detonationValue(),
-          ncData.weatherSource(),
-          ncData.partyId(),
-          ncData.participantId(),
-          ncData.externalId()),
+          ncData.name,
+          ncData.effectStart,
+          ncData.effectDuration,
+          ncData.chargeStruct.chargeTypeId,
+          ncData.impactPosition,
+          ncData.borderLengthInner,
+          ncData.borderLengthOuter,
+          ncData.impactRadius,
+          ncData.spanAngle,
+          ncData.rotationAngle,
+          ncData.detonationValue,
+          ncData.weatherSource,
+          ncData.partyId,
+          ncData.participantId,
+          ncData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during NContaminationCreateRequest()";
@@ -109,25 +109,25 @@ void TestNContamination::tryCreateNContamination()
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
   // now with correct charge type
-  ncData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  ncData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   if (!m_ftc->nContaminationModifyRequest(
         NContaminationModifyRequest(
           0,
-          ncData.name(),
-          ncData.effectStart(),
-          ncData.effectDuration(),
-          ncData.chargeStruct().chargeTypeId(),
-          ncData.impactPosition(),
-          ncData.borderLengthInner(),
-          ncData.borderLengthOuter(),
-          ncData.impactRadius(),
-          ncData.spanAngle(),
-          ncData.rotationAngle(),
-          ncData.detonationValue(),
-          ncData.weatherSource(),
-          ncData.partyId(),
-          ncData.participantId(),
-          ncData.externalId()),
+          ncData.name,
+          ncData.effectStart,
+          ncData.effectDuration,
+          ncData.chargeStruct.chargeTypeId,
+          ncData.impactPosition,
+          ncData.borderLengthInner,
+          ncData.borderLengthOuter,
+          ncData.impactRadius,
+          ncData.spanAngle,
+          ncData.rotationAngle,
+          ncData.detonationValue,
+          ncData.weatherSource,
+          ncData.partyId,
+          ncData.participantId,
+          ncData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during NContaminationCreateRequest()";
@@ -135,7 +135,7 @@ void TestNContamination::tryCreateNContamination()
     return;
   }
 
-  if (!waitForData([this]() { return m_ncData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ncData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating ncontamination object";
     failExit();
@@ -154,49 +154,49 @@ void TestNContamination::tryCreateNContamination()
 void TestNContamination::tryModifyNContamination()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_ncData.name("ncont2");
-  m_ncData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  m_ncData.effectDuration(3000); // 3 sec
-  m_ncData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
-  m_ncData.impactPosition(Core::GeoPosition2D(0.162, 0.925));
-  m_ncData.borderLengthInner(1100); // 1.1km
-  m_ncData.borderLengthOuter(1800); // 1.8km
-  m_ncData.impactRadius(600); // 600m
-  m_ncData.spanAngle(14);
-  m_ncData.rotationAngle(187);
-  m_ncData.detonationValue(2000); // kt, only cosmetical
-  m_ncData.partyId(3);
-  m_ncData.participantId(1235);
+  m_ncData.name = "ncont2";
+  m_ncData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  m_ncData.effectDuration = 3000; // 3 sec
+  m_ncData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
+  m_ncData.impactPosition = Core::GeoPosition2D(0.162, 0.925);
+  m_ncData.borderLengthInner = 1100; // 1.1km
+  m_ncData.borderLengthOuter = 1800; // 1.8km
+  m_ncData.impactRadius = 600; // 600m
+  m_ncData.spanAngle = 14;
+  m_ncData.rotationAngle = 187;
+  m_ncData.detonationValue = 2000; // kt, only cosmetical
+  m_ncData.partyId = 3;
+  m_ncData.participantId = 1235;
   const AreaEffectSimulation::NContamination ncData(m_ncData);
   m_ncData = AreaEffectSimulation::NContamination();
-  m_ncData.id(ncData.id());
+  m_ncData.id = ncData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->nContaminationModifyRequest(
         NContaminationModifyRequest(
-          ncData.id(),
-          ncData.name(),
-          ncData.effectStart(),
-          ncData.effectDuration(),
-          ncData.chargeStruct().chargeTypeId(),
-          ncData.impactPosition(),
-          ncData.borderLengthInner(),
-          ncData.borderLengthOuter(),
-          ncData.impactRadius(),
-          ncData.spanAngle(),
-          ncData.rotationAngle(),
-          ncData.detonationValue(),
-          ncData.weatherSource(),
-          ncData.partyId(),
-          ncData.participantId(),
-          ncData.externalId()),
+          ncData.id,
+          ncData.name,
+          ncData.effectStart,
+          ncData.effectDuration,
+          ncData.chargeStruct.chargeTypeId,
+          ncData.impactPosition,
+          ncData.borderLengthInner,
+          ncData.borderLengthOuter,
+          ncData.impactRadius,
+          ncData.spanAngle,
+          ncData.rotationAngle,
+          ncData.detonationValue,
+          ncData.weatherSource,
+          ncData.partyId,
+          ncData.participantId,
+          ncData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_ncData.partyId() == 3;}))
+  if (!waitForData([this]() { return m_ncData.partyId == 3;}))
   {
     ERROR_LOG(m_logger) << "Error updating ncontamination object";
     failExit();
@@ -216,9 +216,9 @@ void TestNContamination::waitExpireNContamination()
 {
   INFO_LOG(m_logger) << "waiting until ncontamination expires";
 
-  if (!waitForData([this]() { return m_ncData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_ncData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of ncontamination with id " << m_ncData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of ncontamination with id " << m_ncData.id;
     failExit();
     return;
   }
@@ -232,8 +232,8 @@ void TestNContamination::tryRemoveNContamination()
   INFO_LOG(m_logger) << "tryRemoveNContamination start";
 
   AreaEffectSimulation::NContamination ncData(m_ncData);
-  ncData.name("RemoveTest");
-  ncData.effectStart(0);  // not set
+  ncData.name = "RemoveTest";
+  ncData.effectStart = 0;  // not set
   m_ncData = AreaEffectSimulation::NContamination();
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
@@ -241,21 +241,21 @@ void TestNContamination::tryRemoveNContamination()
   if (!m_ftc->nContaminationModifyRequest(
         NContaminationModifyRequest(
           0,
-          ncData.name(),
-          ncData.effectStart(),
-          ncData.effectDuration(),
-          ncData.chargeStruct().chargeTypeId(),
-          ncData.impactPosition(),
-          ncData.borderLengthInner(),
-          ncData.borderLengthOuter(),
-          ncData.impactRadius(),
-          ncData.spanAngle(),
-          ncData.rotationAngle(),
-          ncData.detonationValue(),
-          ncData.weatherSource(),
-          ncData.partyId(),
-          ncData.participantId(),
-          ncData.externalId()),
+          ncData.name,
+          ncData.effectStart,
+          ncData.effectDuration,
+          ncData.chargeStruct.chargeTypeId,
+          ncData.impactPosition,
+          ncData.borderLengthInner,
+          ncData.borderLengthOuter,
+          ncData.impactRadius,
+          ncData.spanAngle,
+          ncData.rotationAngle,
+          ncData.detonationValue,
+          ncData.weatherSource,
+          ncData.partyId,
+          ncData.participantId,
+          ncData.externalId),
         this))
   {
     ERROR_LOG(m_logger) << "Error during NContaminationCreateRequest()";
@@ -263,7 +263,7 @@ void TestNContamination::tryRemoveNContamination()
     return;
   }
 
-  if (!waitForData([this]() { return m_ncData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ncData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating ncontamination object";
     failExit();
@@ -271,14 +271,14 @@ void TestNContamination::tryRemoveNContamination()
   }
 
   m_expectedAesId = -1;
-  if (!m_ftc->nContaminationRemoveRequest(Core::RemoveElementRequest(m_ncData.id()), this))
+  if (!m_ftc->nContaminationRemoveRequest(Core::RemoveElementRequest(m_ncData.id), this))
   {
     ERROR_LOG(m_logger) << "Error during NContaminationRemoveRequest()";
     failExit();
     return;
   }
 
-  if (!waitForData([this]() { return m_ncData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ncData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error removing ncontamination object";
     failExit();
@@ -292,7 +292,7 @@ void TestNContamination::tryRemoveNContamination()
 
 void TestNContamination::nContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
 {
-  if (m_ncData.id() == -1)
+  if (m_ncData.id == -1)
     return;
   onAesChanged(data, modType, m_ncData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
index fb8e3f888..14337be5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
@@ -27,7 +27,7 @@ bool TestOffRouteMine::init(int domainId, int exerciseId, int testId)
     return false;
 
   m_dtc->waitForHistoricalDataOffRouteMine();
-  m_ormData.id(-1);
+  m_ormData.id = -1;
   connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged,
           this, &TestOffRouteMine::offRouteMineChanged);
 
@@ -40,14 +40,14 @@ bool TestOffRouteMine::checkBaseData(const AreaEffectSimulation::OffRouteMine &a
   if (!checkAesItem(a, b))
     return false;
 
-  if (a.area().cornerBottomLeft() != b.area().cornerBottomLeft())
+  if (a.area.cornerBottomLeft != b.area.cornerBottomLeft)
   {
-    WARNING_LOG(m_logger) << "cornerBottomLeft does not match: " << a.area().cornerBottomLeft() << " - " << b.area().cornerBottomLeft();
+    WARNING_LOG(m_logger) << "cornerBottomLeft does not match: " << a.area.cornerBottomLeft << " - " << b.area.cornerBottomLeft;
     return false;
   }
-  if (a.impactRadius() != b.impactRadius())
+  if (a.impactRadius != b.impactRadius)
   {
-    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius() << " - " << b.impactRadius();
+    WARNING_LOG(m_logger) << "impactRadius does not match: " << a.impactRadius << " - " << b.impactRadius;
     return false;
   }
   return true;
@@ -61,17 +61,17 @@ void TestOffRouteMine::tryCreateOffRouteMine()
   m_ormData = AreaEffectSimulation::OffRouteMine();
   AreaEffectSimulation::OffRouteMine ormData;
 
-  ormData.id(0);
-  ormData.name("OffRouteMine1");
-  ormData.effectStart((time(nullptr) + 4) * 1000);  // msec
-  ormData.effectDuration(10234); // msec
-  ormData.chargeStruct().chargeTypeId(3456789);
-  ormData.area().cornerBottomLeft(Core::GeoPosition2D(0.154, 0.926));
-  ormData.area().width(1000);//(20);
-  ormData.area().height(200);//(15);
-  ormData.area().rotation(0.0);//(20.5);
-  ormData.impactRadius(100); // 100m
-  ormData.partyId(2);
+  ormData.id = 0;
+  ormData.name = "OffRouteMine1";
+  ormData.effectStart = (time(nullptr) + 4) * 1000;  // msec
+  ormData.effectDuration = 10234; // msec
+  ormData.chargeStruct.chargeTypeId = 3456789;
+  ormData.area.cornerBottomLeft = Core::GeoPosition2D(0.154, 0.926);
+  ormData.area.width = 1000;//(20);
+  ormData.area.height = 200;//(15);
+  ormData.area.rotation = 0.0;//(20.5);
+  ormData.impactRadius = 100; // 100m
+  ormData.partyId = 2;
   //ormData.participantId(1234);
 
   INFO_LOG(m_logger) << "trying to send OffRouteMineCreateRequest()";
@@ -83,10 +83,10 @@ void TestOffRouteMine::tryCreateOffRouteMine()
   if (!m_ftc->offRouteMineModifyRequest(
         OffRouteMineModifyRequest(
           0,
-          ormData.name(),
-          ormData.effectDuration(),
-          ormData.chargeStruct().chargeTypeId(),
-          ormData.area(),
+          ormData.name,
+          ormData.effectDuration,
+          ormData.chargeStruct.chargeTypeId,
+          ormData.area,
           ormData.impactRadius.get(),
           ormData.effectStart.get(),
           ormData.partyId.get()),
@@ -109,14 +109,14 @@ void TestOffRouteMine::tryCreateOffRouteMine()
   m_bIsCreatedRequest = true;
   m_expectedAesId = -1;
 
-  ormData.chargeStruct().chargeTypeId(s_ChargeTypeId1);
+  ormData.chargeStruct.chargeTypeId = s_ChargeTypeId1;
   if (!m_ftc->offRouteMineModifyRequest(
         OffRouteMineModifyRequest(
           0,
-          ormData.name(),
-          ormData.effectDuration(),
-          ormData.chargeStruct().chargeTypeId(),
-          ormData.area(),
+          ormData.name,
+          ormData.effectDuration,
+          ormData.chargeStruct.chargeTypeId,
+          ormData.area,
           ormData.impactRadius.get(),
           ormData.effectStart.get(),
           ormData.partyId.get()),
@@ -127,7 +127,7 @@ void TestOffRouteMine::tryCreateOffRouteMine()
     return;
   }
 
-  if (!waitForData([this]() { return m_ormData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ormData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating off route mine object";
     failExit();
@@ -146,28 +146,28 @@ void TestOffRouteMine::tryCreateOffRouteMine()
 void TestOffRouteMine::tryModifyOffRouteMine()
 {
   INFO_LOG(m_logger) << "trying to send modify request";
-  m_ormData.name("OffRouteMine 2");
-  m_ormData.effectStart(m_ormData.effectStart.get() + 2000);
-  m_ormData.effectDuration(3200); // msec
-  m_ormData.chargeStruct().chargeTypeId(s_ChargeTypeId2);
-  m_ormData.area().cornerBottomLeft(Core::GeoPosition2D(0.154, 0.926));
-  m_ormData.area().width(1000);//(50);
-  m_ormData.area().height(200);//(25);
-  m_ormData.area().rotation(90);//(20.5);
-  m_ormData.partyId(3);
+  m_ormData.name = "OffRouteMine 2";
+  m_ormData.effectStart = m_ormData.effectStart.get() + 2000;
+  m_ormData.effectDuration = 3200; // msec
+  m_ormData.chargeStruct.chargeTypeId = s_ChargeTypeId2;
+  m_ormData.area.cornerBottomLeft = Core::GeoPosition2D(0.154, 0.926);
+  m_ormData.area.width = 1000;//(50);
+  m_ormData.area.height = 200;//(25);
+  m_ormData.area.rotation = 90;//(20.5);
+  m_ormData.partyId = 3;
   //m_ormData.participantId(1235);
   const AreaEffectSimulation::OffRouteMine ormData(m_ormData);
   m_ormData = AreaEffectSimulation::OffRouteMine();
-  m_ormData.id(ormData.id());
+  m_ormData.id = ormData.id;
 
   m_bIsCreatedRequest = false;
   if (!m_ftc->offRouteMineModifyRequest(
         OffRouteMineModifyRequest(
-          ormData.id(),
-          ormData.name(),
-          ormData.effectDuration(),
-          ormData.chargeStruct().chargeTypeId(),
-          ormData.area(),
+          ormData.id,
+          ormData.name,
+          ormData.effectDuration,
+          ormData.chargeStruct.chargeTypeId,
+          ormData.area,
           ormData.impactRadius.get(),
           ormData.effectStart.get(),
           ormData.partyId.get()),
@@ -177,7 +177,7 @@ void TestOffRouteMine::tryModifyOffRouteMine()
     failExit();
     return;
   }
-  if (!waitForData([this]() { return m_ormData.chargeStruct().chargeTypeId() == s_ChargeTypeId2;}))
+  if (!waitForData([this]() { return m_ormData.chargeStruct.chargeTypeId == s_ChargeTypeId2;}))
   {
     ERROR_LOG(m_logger) << "Error updating off route mine object";
     failExit();
@@ -198,8 +198,8 @@ void TestOffRouteMine::tryTriggerOffRouteMine()
   INFO_LOG(m_logger) << "trigger off route mine  -> expires";
 
   OffRouteMineTriggerRequest req;
-  req.id(m_ormData.id());
-  req.triggered(true);
+  req.id = m_ormData.id;
+  req.triggered = true;
   if (!m_ftc->offRouteMineTriggerRequest(req, this))
   {
     ERROR_LOG(m_logger) << "Error requesting trigger data";
@@ -214,9 +214,9 @@ void TestOffRouteMine::waitExpireOffRouteMine()
 {
   INFO_LOG(m_logger) << "waiting until off route mine expires";
 
-  if (!waitForData([this]() { return m_ormData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired;}))
+  if (!waitForData([this]() { return m_ormData.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired;}))
   {
-    ERROR_LOG(m_logger) << "Timeout waiting for expiry of off route mine with id " << m_ormData.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for expiry of off route mine with id " << m_ormData.id;
     failExit();
     return;
   }
@@ -230,8 +230,8 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
   INFO_LOG(m_logger) << "tryRemoveOffRouteMine start";
 
   AreaEffectSimulation::OffRouteMine ormData(m_ormData);
-  ormData.name("RemoveTest");
-  ormData.effectStart(0);  // not set
+  ormData.name = "RemoveTest";
+  ormData.effectStart = 0;  // not set
   m_ormData = AreaEffectSimulation::OffRouteMine();
   m_expectedAesId = -1;
   m_bIsCreatedRequest = true;
@@ -239,10 +239,10 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
   if (!m_ftc->offRouteMineModifyRequest(
         OffRouteMineModifyRequest(
           0,
-          ormData.name(),
-          ormData.effectDuration(),
-          ormData.chargeStruct().chargeTypeId(),
-          ormData.area(),
+          ormData.name,
+          ormData.effectDuration,
+          ormData.chargeStruct.chargeTypeId,
+          ormData.area,
           ormData.impactRadius.get(),
           ormData.effectStart.get(),
           ormData.partyId.get()),
@@ -253,7 +253,7 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
     return;
   }
 
-  if (!waitForData([this]() { return m_ormData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ormData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error creating off route mine object";
     failExit();
@@ -261,14 +261,14 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
   }
 
   m_expectedAesId = -1;
-  if (!m_ftc->offRouteMineRemoveRequest(Core::RemoveElementRequest(m_ormData.id()), this))
+  if (!m_ftc->offRouteMineRemoveRequest(Core::RemoveElementRequest(m_ormData.id), this))
   {
     ERROR_LOG(m_logger) << "Error during OffRouteMineRemoveRequest()";
     failExit();
     return;
   }
 
-  if (!waitForData([this]() { return m_ormData.id() == m_expectedAesId; }))
+  if (!waitForData([this]() { return m_ormData.id == m_expectedAesId; }))
   {
     ERROR_LOG(m_logger) << "Error removing off route mine object";
     failExit();
@@ -281,7 +281,7 @@ void TestOffRouteMine::tryRemoveOffRouteMine()
 
 void TestOffRouteMine::offRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
 {
-  if (m_ormData.id() == -1)
+  if (m_ormData.id == -1)
     return;
   onAesChanged(data, modType, m_ormData);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.cpp
index b18813108..a77940057 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/RecordReplay/aes_record_replay_plugin_custom.cpp
@@ -375,7 +375,7 @@ void RecordReplayPluginCustom::removeOld(QMultiMap<long long, T> &map, qint64 de
         continue;
       }
       // keep planned
-      if (!inner.effectStart.is_set())
+      if (!inner.effectStart.has_value())
         continue;
       // Remove to old ones
       if (inner.effectStart.get()+inner.effectDuration < desiredTime - 210*1000 )
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp
index 3a85a8368..68c4ba0a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp
@@ -8,6 +8,7 @@
 
 #include "trajectory_unit_test.h"
 #include <utility>
+#include <QtCore/QElapsedTimer>
 #include <Trajectory/trajectory_helper.h>
 #include <Trajectory/trajectory_generator.h>
 #include <Trajectory/trajectory_generator_vulcano.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/ddsdbconvert.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/ddsdbconvert.cpp
index da736d6c0..ad84a8f5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/ddsdbconvert.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/ddsdbconvert.cpp
@@ -21,10 +21,10 @@ Database::AesNContamination nContamination(const AreaEffectSimulation::NContamin
   dst.id = src.id;
   dst.chargeTypeId = src.chargeStruct.chargeTypeId;
   dst.effectStateId = src.effectStateId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.effectDuration = src.effectDuration;
-  dst.effectStart = src.effectStart.is_set() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.name = QString::fromStdString(src.name);
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
@@ -44,10 +44,10 @@ Database::AesBCContamination bcContamination(const BCContamination &src)
   Database::AesBCContamination dst;
   dst.id = src.id;
   dst.effectStateId = src.effectStateId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.effectDuration = src.effectDuration;
-  dst.effectStart = src.effectStart.is_set() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.name = QString::fromStdString(src.name);
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
@@ -71,10 +71,10 @@ Database::AesExplosionArea explosionArea(const ExplosionArea &src)
   Database::AesExplosionArea dst;
   dst.id = src.id;
   dst.effectStateId = src.effectStateId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.effectDuration = src.effectDuration;
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.name = QString::fromStdString(src.name);
   dst.impactPosition.rx() = src.area.cornerBottomLeft.lon;
   dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
@@ -100,10 +100,10 @@ Database::AesExplosionSingle explosionSingle(const ExplosionSingle &src)
   Database::AesExplosionSingle dst;
   dst.id = src.id;
   dst.effectStateId = src.effectStateId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.effectDuration = src.effectDuration;
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.name = QString::fromStdString(src.name);
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
@@ -119,11 +119,11 @@ Database::AesMineArea mineArea(const MineArea &src)
   Database::AesMineArea dst;
   dst.id = src.id;
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeStruct.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.density = src.density;
   dst.width = src.width;
   dst.layingProcedureTypeId = src.layingProcedureType;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
index 095f9fe21..abac94198 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
@@ -70,16 +70,16 @@ static void fillData(const ExplosionSingleCentralModifyRequest &src, Database::A
 
   fillGeometryData(src, dst);
   dst.name = QString::fromStdString(src.name());
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = 1000;  // 1sec
   dst.chargeTypeId = src.chargeTypeId();
   dst.altitude = src.altitude();
   dst.firePurpose = QString::fromStdString(src.purpose());
   dst.fireRequestTime = QDateTime::fromMSecsSinceEpoch(src.fireRequestTime());
   dst.effectMarkingInTa = src.effectMarkingInTa();
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
   dst.angle = src.angle();
-  dst.fuseTypeId = src.fuseType().underlying();
+  dst.fuseTypeId = src.fuseType();
   dst.participantId = src.participantId();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp
index 9d56d6baa..3df383354 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc_impl_custom.cpp
@@ -252,7 +252,7 @@ int DtcImplCustom::partyForDusMine(int dusMineId) const
         auto it =  m_mineAreaCont.find(dms.id);
         if (it == m_mineAreaCont.end())
           return 1;
-        return it.value().partyId.is_set() ? it.value().partyId.get() : 1;
+        return it.value().partyId.has_value() ? it.value().partyId.get() : 1;
       }
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp
index db3c25efe..7523f9806 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_air_support_impact.cpp
@@ -74,13 +74,13 @@ static void fillData(const AirSupportImpactModifyRequest &src, Database::AesAirS
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = 1000;  // 1sec
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.flightTime = src.flightTime;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 }
 
 void HandlerAirSupportImpact::onAirSupportImpactModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -97,7 +97,7 @@ void HandlerAirSupportImpact::onAirSupportImpactModifyRequest(const rti::core::S
 
 Core::FunctionReplyObject HandlerAirSupportImpact::airSupportImpactCreateRequest(const AirSupportImpactModifyRequest &request)
 {
-  if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtAirSupportImpact)] && request.effectStart.is_set())
+  if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtAirSupportImpact)] && request.effectStart.has_value())
   {
     ERROR_LOG(m_logger) << LOGFUNCTION << " Too many active air support impacts, request:" << request;
     return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active air support impacts."));
@@ -152,7 +152,7 @@ Core::FunctionReplyObject HandlerAirSupportImpact::airSupportImpactModifyRequest
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
   if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtAirSupportImpact)]
-      && request.effectStart.is_set()
+      && request.effectStart.has_value()
       && !ifs->isActivationTimeSet()
       && !ifs->isObjectModifiable())
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.cpp
index 2b3f9d598..ff8e37c78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.cpp
@@ -109,34 +109,34 @@ static void fillData(const BCContaminationModifyRequest &src, Database::AesBCCon
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
   dst.impactRadius = src.impactRadius;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.weatherSourceId = src.weatherSource;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
   dst.upperOffset = src.upperOffset;
   dst.lowerOffset = src.lowerOffset;
 
   // weather parameter are delivered, when adding in OC-laptop
-  if (src.weatherPosition.is_set())
+  if (src.weatherPosition.has_value())
   {
     dst.weatherPosition.rx() = src.weatherPosition.get().lon;
     dst.weatherPosition.ry() = src.weatherPosition.get().lat;
   }
   else
     dst.weatherPosition = dst.impactPosition; // initial, is not used during update therefore it's ok here
-  if(src.windSpeed.is_set())
+  if(src.windSpeed.has_value())
     dst.windSpeed = src.windSpeed.get();
-  if(src.propagationDirection.is_set())
+  if(src.propagationDirection.has_value())
     dst.propagationDirection = src.propagationDirection.get();
-  if(src.weatherTimestamp.is_set())
+  if(src.weatherTimestamp.has_value())
     dst.weatherTimestamp = QDateTime::fromMSecsSinceEpoch(src.weatherTimestamp.get());
-  else if(src.effectStart.is_set())
+  else if(src.effectStart.has_value())
     dst.weatherTimestamp = QDateTime::fromMSecsSinceEpoch(src.effectStart.get());
 }
 
@@ -170,7 +170,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
 
   if (ifs->data().isCentral)
   {
-    if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.is_set())
+    if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.has_value())
     {
       ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
       ifs->removeObjectFromDb();
@@ -180,7 +180,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
   }
   else
   {
-    if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.is_set())
+    if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.has_value())
     {
 
       ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
@@ -208,7 +208,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
   }
   m_objectMap.insert(ifs->id(), ifs);
 
-  if (request.withDangerArea.is_set() && request.withDangerArea.get())
+  if (request.withDangerArea.has_value() && request.withDangerArea.get())
   {
     DangerAreaModifyRequest req;
     req.id = 0;
@@ -238,7 +238,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
 {
   Core::FunctionReplyObject ret;
   ObjectBCContamination *ifs = nullptr;
-  if (request.externalId.is_set() && request.externalId.get() > 0)
+  if (request.externalId.has_value() && request.externalId.get() > 0)
     ifs = getObjectFromMapByExternalId(m_objectMap, request.externalId.get(), ret);
 
   if (!ifs)
@@ -252,7 +252,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
       return ret;
   }
 
-  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   Database::AesBCContamination aea(ifs->data());
@@ -277,13 +277,13 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
   /*!
    * If the effect start added after creation, the max amount need to be checked
   */
-  if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
   {
 
     if (isCentral)
     {
       if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)])
-          /*&& request.effectStart.is_set()*/)
+          /*&& request.effectStart.has_value()*/)
       {
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central B/C or N contamination areas."));
       }
@@ -291,7 +291,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
     else
     {
       if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)])
-          /*&& request.effectStart.is_set()*/)
+          /*&& request.effectStart.has_value()*/)
       {
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active B/C or N contamination areas."));
       }
@@ -299,7 +299,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
   }
 
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
   {
 
     DEBUG_LOG(m_logger) << "isCentral: " << isCentral;
@@ -361,7 +361,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
         ERROR_LOG(m_logger)<<"[bCContaminationModifyRequest] couldn't update danger area: bccontamination.id: "<<ifs->id()
                           <<" dangerArea.name: "<<dangerRequest.name;
     }
-    else if (request.withDangerArea.is_set() && request.withDangerArea.get())
+    else if (request.withDangerArea.has_value() && request.withDangerArea.get())
     {
       DEBUG_LOG(m_logger)<<"[bCContaminationModifyRequest] add new danger area to bcId: " <<ifs->id();
       DangerAreaModifyRequest newDangerRequest;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.cpp
index 000cd5464..106701b00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.cpp
@@ -78,18 +78,18 @@ static void fillData(const BoobyTrapModifyRequest &src, Database::AesBoobyTrap &
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
   dst.impactRadius = src.impactRadius;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  //dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
-  //dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  //dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
+  //dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
   dst.triggerRadius = src.triggerRadius;
-  dst.rotationAngle = src.rotationAngle.is_set() ? src.rotationAngle.get() : 0;
-  dst.centralAngle  = src.centralAngle.is_set() ? src.centralAngle.get() : 0;
+  dst.rotationAngle = src.rotationAngle.has_value() ? src.rotationAngle.get() : 0;
+  dst.centralAngle  = src.centralAngle.has_value() ? src.centralAngle.get() : 0;
   dst.isCentral     = true;
   dst.triggered     = false;
 }
@@ -106,7 +106,7 @@ void HandlerBoobyTrap::onBoobyTrapModifyRequest(const rti::core::SampleIdentity
 
 Core::FunctionReplyObject HandlerBoobyTrap::boobyTrapCreateRequest(const BoobyTrapModifyRequest &request)
 {
-  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)]) && request.effectStart.is_set())
+  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)]) && request.effectStart.has_value())
     return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active booby traps."));
 
   Database::AesBoobyTrap newData;
@@ -153,13 +153,13 @@ Core::FunctionReplyObject HandlerBoobyTrap::boobyTrapModifyRequest(const BoobyTr
   if (!ifs)
     return ret;
 
-  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
   if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)])
-      && request.effectStart.is_set()
+      && request.effectStart.has_value()
       && !ifs->isActivationTimeSet()
       /* && !ifs->isObjectModifiable()*/)
     return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active booby traps."));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp
index 24fe39254..0a35948eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.cpp
@@ -181,7 +181,7 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
     newChargeEffect->init();
 
     // create trajectory
-    if (request.trajectoryTimeAware.is_set())
+    if (request.trajectoryTimeAware.has_value())
     {
       int trajId = m_trajectoryHandler->create(trajectoryData(newChargeEffect->id(), request.trajectoryTimeAware.get()));
       if (trajId < 0)
@@ -252,7 +252,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
   reply = chargeEffetObj->update(request);
 
   // update trajectory
-  if (!reply.error() && request.trajectoryTimeAware.is_set()
+  if (!reply.error() && request.trajectoryTimeAware.has_value()
       && m_trajectoryHandler->update(trajectoryData(chargeEffetObj->id(), request.trajectoryTimeAware.get(), m_trajObjIds.value(chargeEffetObj->id(), -1))))
   {
     // update failed should the trajectory be created again?
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
index 408b0d0dd..6a655df9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
@@ -91,12 +91,12 @@ Core::FunctionReplyObject HandlerDangerArea::dangerAreaCreateRequest(const Dange
   if (request.id < 0) // is the id given as negative? set id -> used by OC-Laptop
     newData.id = request.id;
   newData.name = QString::fromStdString(request.name);
-  newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+  newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
   newData.chargeTypeId = request.chargeTypeId;
   newData.effectDuration = request.effectDuration;
-  newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
-  newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
-  newData.associatedAesId = request.associatedAesId.is_set() ? request.associatedAesId.get() : 0;
+  newData.partyId = request.partyId.has_value() ? request.partyId.get() : 0;
+  newData.participantId = request.participantId.has_value() ? request.participantId.get() : 0;
+  newData.associatedAesId = request.associatedAesId.has_value() ? request.associatedAesId.get() : 0;
 
 
   ObjectDangerArea *ifs(new ObjectDangerArea(m_mainHandler, this));
@@ -163,12 +163,12 @@ Core::FunctionReplyObject HandlerDangerArea::dangerAreaModifyRequest(const Dange
   if (request.id < 0) // is the id given as negative? set id -> used by OC-Laptop
     newData.id = request.id;
   newData.name = QString::fromStdString(request.name);
-  newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+  newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
   newData.chargeTypeId = request.chargeTypeId;
   newData.effectDuration = request.effectDuration;
-  newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
-  newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
-  newData.associatedAesId = request.associatedAesId.is_set() ? request.associatedAesId.get() : 0;
+  newData.partyId = request.partyId.has_value() ? request.partyId.get() : 0;
+  newData.participantId = request.participantId.has_value() ? request.participantId.get() : 0;
+  newData.associatedAesId = request.associatedAesId.has_value() ? request.associatedAesId.get() : 0;
 
   return ifs->updateObject(newData, request.segments);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
index f4cc39339..26d319faa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
@@ -256,7 +256,7 @@ static void fillData(const EffectClusterModifyRequest &src,
   dst.explosionGeometryId = src.explosionGeometry;
   dst.tla = src.tla;
 
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   // Effect Duration might be set and will be used for the AutoFire
   //  -- Module Duration
   if (src.effectDuration)
@@ -272,13 +272,13 @@ static void fillData(const EffectClusterModifyRequest &src,
 
   dst.firePurposeId = src.firePurposeId;
 
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : -1; // -1 -> avoid trajectory
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : -1; // -1 -> avoid trajectory
 
   dst.altitude = -1;
 
   dst.effectMarkingInTa = src.effectMarkingInTa;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 
   dst.properties = QString::fromStdString(src.properties);
   dst.esmParticipantIds = LtsUtils::IntArray(src.esmParticipantIds);
@@ -422,7 +422,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
   // external (externalId==0) -> partyId required
   // We keep the old charge behavior
   // and also ignore it from ADLER?
-  const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
+  const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
   if (request.effectors.size() == 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Invalid Effector Count"));
 
@@ -457,7 +457,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
 
         QString chargeName = QString::fromStdString(m_mainHandler->dds()->pdmDtc()->chargeType(it.key()).name);
         QString fireUnitName;
-        if (request.participantId.is_set())
+        if (request.participantId.has_value())
           fireUnitName = QString::fromStdString(m_mainHandler->dds()->ppmDtc()->participant(request.participantId.get()).designator);
 
         if (chargeNeeded > chargeLeft)
@@ -477,7 +477,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
 
   fillData(request, newData, newEffectorDataVec, m_mainHandler);
   DEBUG_LOG(m_logger) << "AUTO newData " << newData.impactCount;
-  if (!request.properties.empty() && (!request.effectStart.is_set() || request.effectStart.get() == 0))
+  if (!request.properties.empty() && (!request.effectStart.has_value() || request.effectStart.get() == 0))
   {
     newData.isUsingEffectStateReceived = propertiesObject.value(QStringLiteral("useReceived")).toBool();
   }
@@ -512,7 +512,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
       return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active air supports."));
     }
   }
-  else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtEffectCluster)]) + (s_currentAirSupportCount) && request.effectStart.is_set())
+  else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtEffectCluster)]) + (s_currentAirSupportCount) && request.effectStart.has_value())
   {
     ifs->removeObject(); // Not finally deleted from db after this,Fallback if DB deletion is not working correct
     ifs->removeObjectFromDb();
@@ -542,8 +542,8 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
   //  // externalId maybe set be HLA interface:
   //  // from external (externalIdValue>0)  -> no partyId required
   //  // from internal (externalIdValue==0) -> partyId required
-  //  const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
-  //  if (externalIdValue == 0 && !request.partyId.is_set())
+  //  const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
+  //  if (externalIdValue == 0 && !request.partyId.has_value())
   //    return Core::FunctionReplyObject(tr_lts("dds", "Explosion areas need a party id."));
 
   DEBUG_LOG(m_logger) << "request.effectStart :" << request.effectStart << ", effectDuration :"
@@ -573,7 +573,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
   const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
   ifs->setAirSupportSource(bChargeIsAirSupport);
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable()) // ToDo: check
+  if (request.effectStart.has_value() && ifs->isObjectModifiable()) // ToDo: check
   {
     // Calculate new polygon here. Not nice, though
     auto poly = Polygons::effectClusterArea(aea);
@@ -589,7 +589,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
     }
     else
     {
-      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtEffectCluster)] + (s_currentAirSupportCount)) && request.effectStart.is_set()
+      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtEffectCluster)] + (s_currentAirSupportCount)) && request.effectStart.has_value()
           && ((wasCentral && !ifs->isActivationTimeSet()) || !wasCentral))
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central effect clusters."));
     }
@@ -719,9 +719,9 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
       // the fire hold with the corresponding target coordinate and circular area.
       for (auto *ifs : std::as_const(effectClusterPartyMap))
       {
-        const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0;
-        const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0;
-        const int radius = request.radius.is_set() ? request.radius.get() : 0;
+        const double lonRad = request.longitude.has_value() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0;
+        const double latRad = request.latitude.has_value() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0;
+        const int radius = request.radius.has_value() ? request.radius.get() : 0;
 
         DEBUG_LOG(m_logger) << "[Feuer Halt Referenziert] " << "lonRad : " << lonRad << " " << "latRad : " << latRad << " " << "radius : " << radius;
 
@@ -749,7 +749,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
       {
         DEBUG_LOG(m_logger) << "[Feuer Einstellen ----- markAsExpired] " << "effectClusterId: " << ifs->data().id;
 
-        ifs->markAsExpired(request.entladenSchuss.is_set() ? request.entladenSchuss.get() : false);
+        ifs->markAsExpired(request.entladenSchuss.has_value() ? request.entladenSchuss.get() : false);
       }
       break;
     }
@@ -769,9 +769,9 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
     {
       for (auto *ifs : std::as_const(effectClusterPartyMap))
       {
-        const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional<lonRad>
-        const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0;   // optional <latRad>
-        const int radius = request.radius.is_set() ? request.radius.get() : 0;
+        const double lonRad = request.longitude.has_value() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional<lonRad>
+        const double latRad = request.latitude.has_value() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0;   // optional <latRad>
+        const int radius = request.radius.has_value() ? request.radius.get() : 0;
 
         DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Referenziert] " << "lonRad : " << lonRad << " " << "latRad : " << latRad << " " << "radius : " << radius;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.cpp
index cf7b817c5..fe20aa6d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.cpp
@@ -101,21 +101,21 @@ static void fillData(const ExplosionAreaModifyRequest &src, Database::AesExplosi
   dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
   dst.rotationAngle = src.area.rotation;
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.effectSourceId = src.effectSourceId;
   dst.impactLength = src.area.height;
   dst.impactWidth = src.area.width;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.cannonCount = src.cannonCount;
   dst.cannonRounds = src.cannonRounds;
   dst.altitude = src.altitude;
   dst.firePurpose = QString::fromStdString(src.purpose);
   dst.fireRequestTime = QDateTime::fromMSecsSinceEpoch(src.fireRequestTime);
   dst.effectMarkingInTa = src.effectMarkingInTa;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 }
 
 void HandlerExplosionArea::onExplosionAreaModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -130,7 +130,7 @@ void HandlerExplosionArea::onExplosionAreaModifyRequest(const rti::core::SampleI
 
 Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const ExplosionAreaModifyRequest &request)
 {
-  if (!request.partyId.is_set())
+  if (!request.partyId.has_value())
     return Core::FunctionReplyObject(tr_lts("dds", "Explosion areas need a party id."));
 
   int chargeNeeded = request.cannonCount * request.cannonRounds;
@@ -164,7 +164,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const
 
   if (ifs->data().isCentral)
     {
-      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
+      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -174,7 +174,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const
     }
   else
     {
-      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
+      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -230,7 +230,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyRequest(const
   /*!
    *   Check if the max amount is reached if the effect start added after creation.
   !*/
-  if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
     {
       if (isCentral)
         {
@@ -249,7 +249,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyRequest(const
     }
 
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
     {
 
       // Calculate new polygon here. Not nice, though
@@ -304,7 +304,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyGeometryReque
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
   if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)])
-      && request.effectStart.is_set()
+      && request.effectStart.has_value()
       && !ifs->isActivationTimeSet() // if time was not set before change and now check  count
       && !ifs->isObjectModifiable())
     return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active explosion areas and explosion singles"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
index 043e48914..43055736a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
@@ -161,7 +161,7 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
   dst.explosionGeometryId = src.explosionGeometry;
   dst.zog = src.tla;
 
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.effectSourceId = src.effectSourceId;
 
@@ -170,13 +170,13 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
   dst.igniterFunctionId = src.chargeStruct.igniterFunctionId;
   dst.firePurposeId = src.firePurposeId;
 
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : -1; // -1 -> avoid trajectory
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : -1; // -1 -> avoid trajectory
   // dst.firingGeoPosition // not provided, has to be retrieved from dds
 
   dst.impactCount = src.impactCount;
   dst.mhpCountRequest = src.mhpCount;
-  if (src.mhpRotation.is_set())
+  if (src.mhpRotation.has_value())
     dst.mhpRotationRequest = src.mhpRotation.get();
   else
     dst.mhpRotationRequest = ObjectExplosionCluster::s_invalid_rotation_angle;
@@ -189,7 +189,7 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
   //  dst.firePurpose = QString::fromStdString(src.purpose());
   //  dst.fireRequestTime = QDateTime::fromMSecsSinceEpoch(src.fireRequestTime());
   dst.effectMarkingInTa = src.effectMarkingInTa;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 
   dst.launchVelocity = src.launchVelocity;
   dst.launchAngleDeg = src.launchAngleDeg;
@@ -321,7 +321,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
   // HLA Interface is using externalId...
   // external (externalId>0)  -> no partyId required
   // external (externalId==0) -> partyId required
-  const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
+  const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
   const ProjectDataManagement::GearClass gearClass = m_mainHandler->gearClassOfChargeTypeId(request.chargeStruct.chargeTypeId);
 
   const bool bDoClaimPlannedCharge = (request.id == 0) &&
@@ -339,7 +339,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
 
       QString  chargeName= QString::fromStdString(m_mainHandler->dds()->pdmDtc()->chargeType(request.chargeStruct.chargeTypeId).name);
       QString fireUnitName;
-      if (request.participantId.is_set())
+      if (request.participantId.has_value())
         fireUnitName = QString::fromStdString(m_mainHandler->dds()->ppmDtc()->participant(request.participantId.get()).designator);
 
       if (chargeNeeded > chargeLeft)
@@ -355,7 +355,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
   fillData(request, newData, m_mainHandler);
 
   if (!request.properties.empty() &&
-      (!request.effectStart.is_set() ||
+      (!request.effectStart.has_value() ||
        request.effectStart.get() == 0))
   {
     QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(request.properties)).object();
@@ -396,7 +396,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active air supports."));
       }
     }
-    else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)]) + (s_currentAirSupportCount) && request.effectStart.is_set())
+    else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)]) + (s_currentAirSupportCount) && request.effectStart.has_value())
     {
       ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
       ifs->removeObjectFromDb();
@@ -406,9 +406,9 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
   }
   else
   {
-    DEBUG_LOG(m_logger) << "New dec ExplosionCluster: " << totalAreas() << " Max: " << s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)] << " Is Set: " << request.effectStart.is_set();
+    DEBUG_LOG(m_logger) << "New dec ExplosionCluster: " << totalAreas() << " Max: " << s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)] << " Is Set: " << request.effectStart.has_value();
 
-    if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.is_set())
+    if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.has_value())
     {
       ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
       ifs->removeObjectFromDb();
@@ -447,8 +447,8 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
   //  // externalId maybe set be HLA interface:
   //  // from external (externalIdValue>0)  -> no partyId required
   //  // from internal (externalIdValue==0) -> partyId required
-  //  const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
-  //  if (externalIdValue == 0 && !request.partyId.is_set())
+  //  const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
+  //  if (externalIdValue == 0 && !request.partyId.has_value())
   //    return Core::FunctionReplyObject(tr_lts("dds", "Explosion areas need a party id."));
 
   DEBUG_LOG(m_logger) << "request.effectStart :" << request.effectStart
@@ -476,7 +476,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
   ifs->setAirSupportSource(bChargeIsAirSupport);
 
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())  // ToDo: check
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())  // ToDo: check
   {
     // Calculate new polygon here. Not nice, though
     auto poly = Polygons::explosionClusterArea(aea);
@@ -503,7 +503,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
       {
         // case 1: war zentral && effectStart war nicht gesetzt
         // case 2: war dezentral && effectStart ist gesetzt.
-        if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)] + (s_currentAirSupportCount)) && request.effectStart.is_set()
+        if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)] + (s_currentAirSupportCount)) && request.effectStart.has_value()
             && ((wasCentral && !ifs->isActivationTimeSet()) || !wasCentral))
         {
           return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central explosion clusters."));
@@ -514,7 +514,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
     {
       // case 1: war dezentral && effectStart war nicht gesetzt
       // case 2: war zentral && effectStart ist gesetzt.
-      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.is_set()
+      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.has_value()
           && (( !wasCentral && !ifs->isActivationTimeSet()) || wasCentral))
       {
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active explosion clusters."));
@@ -523,7 +523,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
 
 
     // For counting, only Elements being at least prepared are important:
-    if (request.effectStart.is_set() && ifs->isObjectModifiable())
+    if (request.effectStart.has_value() && ifs->isObjectModifiable())
     {
 
       DEBUG_LOG(m_logger) << "isCentral: " << isCentral;
@@ -580,7 +580,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyGeometr
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
-  if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.is_set() && !ifs->isObjectModifiable())
+  if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.has_value() && !ifs->isObjectModifiable())
     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active explosion areas."));
 
   // Todo: IsObjectModifiable() ?!?
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp
index 571eda494..7268697b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.cpp
@@ -102,17 +102,17 @@ static void fillData(const ExplosionSingleModifyRequest &src, Database::AesExplo
 
   fillGeometryData(src, dst);
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = 1000;  // 1sec
   dst.effectSourceId = src.effectSourceId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.altitude = src.altitude;
   dst.firePurpose = QString::fromStdString(src.purpose);
   dst.fireRequestTime = QDateTime::fromMSecsSinceEpoch(src.fireRequestTime);
   dst.effectMarkingInTa = src.effectMarkingInTa;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 }
 
 void HandlerExplosionSingle::onExplosionSingleModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -145,7 +145,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleCreateRequest(c
 
   if (ifs->data().isCentral)
     {
-      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
+      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -155,7 +155,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleCreateRequest(c
     }
   else
     {
-      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
+      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -192,7 +192,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleModifyRequest(c
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
-  // if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.is_set())
+  // if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.has_value())
   //     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active single explosions."));
 
   Database::AesExplosionSingle aes(ifs->data());
@@ -207,7 +207,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleModifyRequest(c
   bool wasCentral = ifs->data().isCentral;
 
 
-  if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
     {
       if (isCentral)
         {
@@ -225,7 +225,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleModifyRequest(c
         }
     }
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
     {
 
       DEBUG_LOG(m_logger) << "isCentral: " << isCentral;
@@ -278,7 +278,7 @@ Core::FunctionReplyObject HandlerExplosionSingle::explosionSingleModifyGeometryR
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
   if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)])
-      && request.effectStart.is_set()
+      && request.effectStart.has_value()
       && !ifs->isActivationTimeSet()
       && !ifs->isObjectModifiable())
     return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active single explosions."));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp
index 6ba0617fd..54ba71014 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp
@@ -164,16 +164,16 @@ static void fillData(const T &src, Database::AesFunctionalArea &dst)
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.position.rx() = src.area.cornerBottomLeft.lon;
   dst.position.ry() = src.area.cornerBottomLeft.lat;
   dst.length = src.area.height;
   dst.width = src.area.width;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
-  dst.pointSymbol = src.pointSymbol.is_set() ? QString::fromStdString(src.pointSymbol.get()) : QString();
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
+  dst.pointSymbol = src.pointSymbol.has_value() ? QString::fromStdString(src.pointSymbol.get()) : QString();
   dst.functionalAreaTypeId = src.functionalAreaTypeId;
   dst.deconMode = src.deconMode;
   dst.deconTime = src.deconTime;
@@ -197,9 +197,9 @@ void HandlerFunctionalArea::onFunctionalAreaModifyRequest(const rti::core::Sampl
 
 Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(const FunctionalAreaModifyRequest &request)
 {
-  if (!request.partyId.is_set() && (request.supplyMode != AesOperatingMode::OmWaitingTime))
+  if (!request.partyId.has_value() && (request.supplyMode != AesOperatingMode::OmWaitingTime))
     return Core::FunctionReplyObject(tr_lts("dds", "Functional areas need a party id."));
-  if ((!request.participantId.is_set()) && (request.supplyMode == AesOperatingMode::OmWaitingTime))
+  if ((!request.participantId.has_value()) && (request.supplyMode == AesOperatingMode::OmWaitingTime))
     return Core::FunctionReplyObject(tr_lts("dds", "Functional areas Supply need a participant id."));
 
 
@@ -221,7 +221,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(con
   if (ifs->data().isCentral)
     {
 
-      if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)]  && request.effectStart.is_set())
+      if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)]  && request.effectStart.has_value())
         {
 
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
@@ -232,7 +232,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(con
     }
   else
     {
-      if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)] && request.effectStart.is_set())
+      if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)] && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -268,7 +268,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
-  // if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea] && request.effectStart.is_set() && !ifs->isObjectModifiable())
+  // if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea] && request.effectStart.has_value() && !ifs->isObjectModifiable())
   //     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active functional areas."));
 
   // Todo: IsObjectModifiable() ?!?
@@ -287,7 +287,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
   /*!
    *  If the effect start added after creation, the max amount need to be checked
   !*/
-  if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
   {
     if (isCentral)
     {
@@ -307,7 +307,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
   }
 
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
     {
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
index b606eccde..ef0fdbd42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
@@ -97,8 +97,8 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeCreateRequest(const GasPipeModi
     Database::AesGasPipe newData;
 
     newData.name = QString::fromStdString(request.name);
-    newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
-    newData.partyId =  request.partyId.is_set() ? request.partyId.get() : 0;
+    newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+    newData.partyId =  request.partyId.has_value() ? request.partyId.get() : 0;
     newData.width = request.width;
     newData.effectDuration = request.effectDuration;
 
@@ -115,7 +115,7 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeCreateRequest(const GasPipeModi
     if (ifs->data().isCentral)
     {
 
-        if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtGasPipe)]  && request.effectStart.is_set())
+        if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtGasPipe)]  && request.effectStart.has_value())
         {
             ifs->removeObject();
             delete ifs;
@@ -124,7 +124,7 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeCreateRequest(const GasPipeModi
     }
     else
     {
-        if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtGasPipe)] && request.effectStart.is_set())
+        if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtGasPipe)] && request.effectStart.has_value())
         {
             ifs->removeObject();
             delete ifs;
@@ -159,8 +159,8 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeModifyRequest(const GasPipeModi
     Database::AesGasPipe newData;
 
     newData.name = QString::fromStdString(request.name);
-    newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
-    newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
+    newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+    newData.partyId = request.partyId.has_value() ? request.partyId.get() : 0;
     newData.width = request.width;
     newData.effectDuration = request.effectDuration;
     if (request.id < 0 && checkStateForSfm(ifs))
@@ -172,7 +172,7 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeModifyRequest(const GasPipeModi
     /*!
      *  If the effect start added after creation, the max amount need to be checked
     !*/
-    if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+    if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
     {
       if (ifs->data().isCentral)
       {
@@ -192,7 +192,7 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeModifyRequest(const GasPipeModi
     }
 //TODO: Implement switch from decentral to central in gasp pipes
 //    // For counting, only Elements being at least prepared are important:
-//    if (request.effectStart.is_set() && ifs->isObjectModifiable())
+//    if (request.effectStart.has_value() && ifs->isObjectModifiable())
 //    {
 
 //        // Calculate new polygon here. Not nice, though
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
index 874f9b099..2f269db7d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
@@ -203,7 +203,7 @@ int HandlerMineArea::totalAreasCentral() const { return s_areaCountCentral[stati
 
 template <typename T> T getValueHelper(T in) { return in; }
 
-template <typename T> T getValueHelper(const dds::core::optional<T> &in) { return in.is_set() ? in.get() : T(); }
+template <typename T> T getValueHelper(const dds::core::optional<T> &in) { return in.has_value() ? in.get() : T(); }
 
 template <typename T> static void fillData(const T &src, Database::AesMineArea &dst)
 {
@@ -211,12 +211,12 @@ template <typename T> static void fillData(const T &src, Database::AesMineArea &
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.effectSourceId = src.effectSourceId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeStruct.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
   dst.density = src.density;
   dst.width = src.width;
   dst.layingProcedureTypeId = src.layingProcedureType;
@@ -254,7 +254,7 @@ void HandlerMineArea::onMineAreaModifyRequest(const rti::core::SampleIdentity &c
 template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateRequest(const T &request)
 {
   // if ( !isDusMineArea(request.chargeTypeId())
-  //         && (totalAreas() >= s_maxActiveAreas[AesType::AtMineArea] && request.effectStart.is_set()))
+  //         && (totalAreas() >= s_maxActiveAreas[AesType::AtMineArea] && request.effectStart.has_value()))
   //     return Core::FunctionReplyObject(1, tr_lts("dds", "Too many peripheral mine areas."));
 
   Database::AesMineArea newData;
@@ -302,7 +302,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
   bool isCentral = ifs->checkIsCentral(_form);
   if (isCentral)
   {
-    if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] && request.effectStart.is_set())
+    if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] && request.effectStart.has_value())
     {
       ifs->removeObject(); // Not finally deleted from db after this,Fallback if DB deletion is not working correct
       ifs->removeObjectFromDb();
@@ -330,14 +330,14 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
 
     if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
     {
-      if (request.effectStart.is_set())
+      if (request.effectStart.has_value())
         --pzAbwWMiSafe;
     }
 
     if (pzAbwWMiSafe < 0)
       pzAbwWMiSafe = 0;
 
-    if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe && request.effectStart.is_set())
+    if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe && request.effectStart.has_value())
     {
       ifs->removeObject(); // Not finally deleted from db after this,Fallback if DB deletion is not working correct
       ifs->removeObjectFromDb();
@@ -347,7 +347,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaCreateR
 
     if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
     {
-      if (request.effectStart.is_set())
+      if (request.effectStart.has_value())
         ++m_totalPzAbwWMis;
     }
   }
@@ -399,7 +399,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
       return ret;
   }
 
-  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   Database::AesMineArea newData(ifs->data());
@@ -423,12 +423,12 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
   /*!
    * If the effect start added after creation, the max amount need to be checked
    */
-  if (!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if (!ifs->isActivationTimeSet() && request.effectStart.has_value())
   {
     if (isCentral)
     {
 
-      if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] /*&& request.effectStart.is_set()*/)
+      if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtMineArea)] /*&& request.effectStart.has_value()*/)
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many central mine areas."));
 
       ret = ifs->checkDensity(newData.density, totalLength, s_maxCentralSingleMinesCount);
@@ -454,7 +454,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
       if (pzAbwWMiSafe < 0)
         pzAbwWMiSafe = 0;
 
-      if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe /*&& request.effectStart.is_set()*/)
+      if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtMineArea)] - pzAbwWMiSafe /*&& request.effectStart.has_value()*/)
         return Core::FunctionReplyObject(1, tr_lts("dds", "Too many peripheral mine areas."));
 
       if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
@@ -465,7 +465,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
   }
 
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
   {
     // Calculate new polygon here. Not nice, though
 
@@ -482,7 +482,7 @@ template <typename T> Core::FunctionReplyObject HandlerMineArea::mineAreaModifyR
 
         if (newData.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery /*PzAbwWmiV */)
         {
-          if (request.effectStart.is_set())
+          if (request.effectStart.has_value())
             --pzAbwWMiSafe;
         }
 
@@ -601,7 +601,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
   if (request.mineAreaId == 0)
   {
     // If single mine...
-    if (request.mineId.is_set())
+    if (request.mineId.has_value())
     {
       DEBUG_LOG(m_logger) << "Checking in DUS-Mine-Areas";
       bool found = false;
@@ -638,7 +638,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
     return Core::FunctionReplyObject(request.mineAreaId, tr_lts("dds", "Mine area with id %1 not found.")).arg(request.mineAreaId);
 
   bool bOk;
-  if (request.mineId.is_set())
+  if (request.mineId.has_value())
     bOk = ifs->resetMine(request.mineId.get());
   else
     bOk = ifs->resetMines();
@@ -658,9 +658,9 @@ void HandlerMineArea::onMineTriggered(const TrainingAreaBase::MineTriggered &dat
   mtr.mineAreaId = data.mineAreaId;
   // from tab - mine area mine index starts at 1 ...
   mtr.mineId = data.mineAreaId == 0 ? data.mineIndex : data.mineIndex - 1;
-  if (data.position.is_set())
+  if (data.position.has_value())
     mtr.position = data.position.get();
-  if (data.chargeTypeId.is_set())
+  if (data.chargeTypeId.has_value())
     mtr.chargeTypeId = data.chargeTypeId.get();
 
   auto ret = mineTriggeredRequest(mtr);
@@ -680,14 +680,14 @@ Core::FunctionReplyObject HandlerMineArea::mineTriggeredRequest(const MineTrigge
 {
   DEBUG_LOG(m_logger) << "mineTriggeredRequest: " << request;
   // NOTE: igniterType/IgniterFunciton = 0 as long as MineTriggeredRequest does not contain values
-  if (request.mineAreaId == 0 || (request.chargeTypeId.is_set() && isConcreteMine(request.chargeTypeId.get(), 0, 0)))
+  if (request.mineAreaId == 0 || (request.chargeTypeId.has_value() && isConcreteMine(request.chargeTypeId.get(), 0, 0)))
   {
-    int chargeTypeId = request.chargeTypeId.is_set() ? request.chargeTypeId.get() : 0;
+    int chargeTypeId = request.chargeTypeId.has_value() ? request.chargeTypeId.get() : 0;
 
     // DUS Mines:
     // NOTE: igniterType/IgniterFunciton = 0 as long as MineTriggeredRequest does not contain values
     QPointF position;
-    if (request.position.is_set() && !isFromMineLayer(chargeTypeId, 0, 0))
+    if (request.position.has_value() && !isFromMineLayer(chargeTypeId, 0, 0))
     {
       position.setX(request.position.get().lon);
       position.setY(request.position.get().lat);
@@ -748,7 +748,7 @@ Core::FunctionReplyObject HandlerMineArea::mineTriggeredRequest(const MineTrigge
 
     if (mine.id != 0) // mine did exist already
     {
-      if (request.position.is_set()) // update position
+      if (request.position.has_value()) // update position
         mine.position = position;
     }
 
@@ -1444,7 +1444,7 @@ QPolygonF HandlerMineArea::msGetBoundingBoxPolygon(const QPolygonF &minen, doubl
 
 bool HandlerMineArea::triggerUnpairedMine(const MineTriggeredRequest &request)
 {
-  if (!request.position.is_set())
+  if (!request.position.has_value())
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " failed, because there is no position.";
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp
index 4da4bf091..fb6151777 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.cpp
@@ -94,7 +94,7 @@ void HandlerMineCorridor::onSpecialSensorDataChanged(const TrainingAreaBase::Spe
   if (data.operationalState == MRF_RAEUMEN)
   {
     auto it = m_corridorCreators.constFind(data.equipmentNumber);
-    if (data.position.is_set())
+    if (data.position.has_value())
     {
       MineCorridorCreator *mcc = nullptr;
       if (it == m_corridorCreators.constEnd())
@@ -170,14 +170,14 @@ Core::FunctionReplyObject HandlerMineCorridor::mineCorridorCreateRequest(const M
   Database::AesMineCorridor newData;
 
   newData.name = QString::fromStdString(request.name);
-  newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+  newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
   newData.chargeTypeId = 315;
   newData.effectDuration = request.effectDuration;
   newData.effectSourceId = request.effectSourceId;
-  newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
-  newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
+  newData.partyId = request.partyId.has_value() ? request.partyId.get() : 0;
+  newData.participantId = request.participantId.has_value() ? request.participantId.get() : 0;
   newData.width = request.width;
-  newData.externalId = request.externalId.is_set() ? request.externalId.get() : 0;
+  newData.externalId = request.externalId.has_value() ? request.externalId.get() : 0;
 
   ObjectMineCorridor *ifs(new ObjectMineCorridor(m_mainHandler, this));
 
@@ -201,7 +201,7 @@ Core::FunctionReplyObject HandlerMineCorridor::mineCorridorModifyRequest(const M
 
   Core::FunctionReplyObject ret;
   ObjectMineCorridor *ifs = nullptr;
-  if (request.externalId.is_set() && request.externalId.get() > 0)
+  if (request.externalId.has_value() && request.externalId.get() > 0)
     ifs = getObjectFromMapByExternalId(m_objectMap, request.externalId.get(), ret);
 
   if (!ifs)
@@ -215,19 +215,19 @@ Core::FunctionReplyObject HandlerMineCorridor::mineCorridorModifyRequest(const M
       return ret;
   }
 
-  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   Database::AesMineCorridor newData(ifs->data());
   newData.id = request.id;
   newData.name = QString::fromStdString(request.name);
-  newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
+  newData.effectStart = request.effectStart.has_value() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
   newData.chargeTypeId = 315;
   newData.effectDuration = request.effectDuration;
-  newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
-  newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
+  newData.partyId = request.partyId.has_value() ? request.partyId.get() : 0;
+  newData.participantId = request.participantId.has_value() ? request.participantId.get() : 0;
   newData.width = request.width;
-  newData.externalId = request.externalId.is_set() ? request.externalId.get() : 0;
+  newData.externalId = request.externalId.has_value() ? request.externalId.get() : 0;
   if (request.id < 0 && checkStateForSfm(ifs))
   {
     DEBUG_LOG(m_logger) << "Overwrite mine corridor Effect State for OC";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp
index e3395c8cb..dc6c2865e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.cpp
@@ -115,7 +115,7 @@ static void fillData(const NContaminationModifyRequest &src, Database::AesNConta
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.impactPosition.rx() = src.impactPosition.lon;
   dst.impactPosition.ry() = src.impactPosition.lat;
@@ -125,10 +125,10 @@ static void fillData(const NContaminationModifyRequest &src, Database::AesNConta
   dst.spanAngle = src.spanAngle;
   dst.rotationAngle = src.rotationAngle;
   dst.detonationValue = src.detonationValue;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
-  dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
-  dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
+  dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
   dst.weatherSourceId = src.weatherSource;
 }
 
@@ -163,7 +163,7 @@ Core::FunctionReplyObject HandlerNContamination::nContaminationCreateRequest(con
 
   if (ifs->data().isCentral)
     {
-      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)]) && request.effectStart.is_set())
+      if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -173,7 +173,7 @@ Core::FunctionReplyObject HandlerNContamination::nContaminationCreateRequest(con
     }
   else
     {
-      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)]) && request.effectStart.is_set())
+      if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)]) && request.effectStart.has_value())
         {
           ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
           ifs->removeObjectFromDb();
@@ -212,7 +212,7 @@ Core::FunctionReplyObject HandlerNContamination::nContaminationModifyRequest(con
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
   // vorher noch ohne Wirkbeginn
-  // if (totalAreas() >= (s_maxActiveAreas[AesType::AtBCContamination] + s_maxActiveAreas[AesType::AtNContamination]) && request.effectStart.is_set() && !ifs->isObjectModifiable())
+  // if (totalAreas() >= (s_maxActiveAreas[AesType::AtBCContamination] + s_maxActiveAreas[AesType::AtNContamination]) && request.effectStart.has_value() && !ifs->isObjectModifiable())
   //     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active N contamination areas."));
 
   Database::AesNContamination aea(ifs->data());
@@ -229,25 +229,25 @@ Core::FunctionReplyObject HandlerNContamination::nContaminationModifyRequest(con
   /*!
    * If the effect start added after creation, the max amount need to be checked
   */
-  if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
+  if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
     {
       if (isCentral)
         {
-          if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)]) /*&& request.effectStart.is_set()*/)
+          if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)]) /*&& request.effectStart.has_value()*/)
             {
               return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central N or B/C contamination areas."));
             }
         }
       else
         {
-          if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)]) /*&& request.effectStart.is_set()*/) // upper if-condition handle start-time
+          if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)]) /*&& request.effectStart.has_value()*/) // upper if-condition handle start-time
             {
               return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active N or B/C contamination areas."));
             }
         }
     }
   // For counting, only Elements being at least prepared are important:
-  if (request.effectStart.is_set() && ifs->isObjectModifiable())
+  if (request.effectStart.has_value() && ifs->isObjectModifiable())
     {
 
       DEBUG_LOG(m_logger) << "isCentral: " << isCentral;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.cpp
index 0f4aaaffb..07a9729d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.cpp
@@ -76,20 +76,20 @@ static void fillData(const OffRouteMineModifyRequest &src, Database::AesOffRoute
     dst.id = src.id;
 
   dst.name = QString::fromStdString(src.name);
-  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.effectDuration = src.effectDuration;
   dst.impactPosition.rx() = src.area.cornerBottomLeft.lon;
   dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
   dst.width = src.area.width;
   dst.length = src.area.height;
   dst.rotationAngle = src.area.rotation;
-  dst.impactRadius = src.impactRadius.is_set() ? src.impactRadius.get() : 0;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.impactRadius = src.impactRadius.has_value() ? src.impactRadius.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.chargeTypeId = src.chargeTypeId;
   dst.isCentral = true;
   dst.triggered = false;
-  //dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
-  //dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
+  //dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
+  //dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
 
 }
 
@@ -105,7 +105,7 @@ void HandlerOffRouteMine::onOffRouteMineModifyRequest(const rti::core::SampleIde
 
 Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineCreateRequest(const OffRouteMineModifyRequest &request)
 {
-  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)]) && request.effectStart.is_set())
+  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)]) && request.effectStart.has_value())
     return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active off route mines."));
 
   Database::AesOffRouteMine newData;
@@ -143,7 +143,7 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
   if (!ifs)
     return ret;
 
-  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
@@ -152,7 +152,7 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
    *  If the effect start added after creation, the max amount need to be checked
   !*/
   if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)])
-      && request.effectStart.is_set()
+      && request.effectStart.has_value()
       && !ifs->isActivationTimeSet() // check if time before change was not setted.
       /*&& !ifs->isObjectModifiable()*/)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp
index d30569a56..c87be0b13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp
@@ -65,9 +65,9 @@ static void fillData(const ReconAreaModifyRequest &src, Database::AesReconArea &
   dst.height = src.area.height;
   dst.width = src.area.width;
   dst.effectMarkingInTa = false;
-  dst.effectStart = src.effectStart.is_set() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectStart = src.effectStart.has_value() ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
   dst.participantId = src.participantId;
-  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
   dst.purpose = QString::fromStdString(src.purpose);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
index 453a5137e..72a0da4db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
@@ -178,12 +178,12 @@ Core::FunctionReplyObject ObjectExplosionArea::resumePause(const ExplosionAreaPa
 {
   if (req.resumeExecution)
   {
-    if (req.timeToResume.is_set())
+    if (req.timeToResume.has_value())
       m_data.effectStart = QDateTime::fromMSecsSinceEpoch(req.timeToResume.get());
     else
       m_data.effectStart = partitionTime();
 
-    if (req.remainingDuration.is_set())
+    if (req.remainingDuration.has_value())
       m_data.effectDuration = req.remainingDuration.get();
 
     // req.resumeSeed() currently not used, as it is calculated internaly. maybe in the future
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
index 8746f919d..49b86185e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
@@ -744,12 +744,12 @@ Core::FunctionReplyObject ObjectExplosionCluster::resumePause(const ExplosionClu
   //  if (req.resumeExecution())
   //  {
   //    // resume
-  //    if (req.timeToResume.is_set())
+  //    if (req.timeToResume.has_value())
   //      m_data.effectStart = QDateTime::fromMSecsSinceEpoch(req.timeToResume.get());
   //    else
   //      m_data.effectStart = partitionTime();
 
-  //    if (req.remainingDuration.is_set())
+  //    if (req.remainingDuration.has_value())
   //      m_data.effectDuration = req.remainingDuration.get();
 
   //    // req.resumeSeed() currently not used, as it is calculated internaly. maybe in the future
@@ -1887,7 +1887,7 @@ void ObjectExplosionCluster::checkNextFire()
 //          continue;
 
 //        SingleEffect &ref = singleEffectsRef[idx];
-//        if (ref.singleEffectState().underlying() != AesSingleEffectState::SesTriggered)
+//        if (ref.singleEffectState() != AesSingleEffectState::SesTriggered)
 //        {
 //          ref.singleEffectState(AesSingleEffectState::SesTriggered);
 //          ref.singleEffectTime(curPartTime);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_qmetatypes.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_qmetatypes.h
new file mode 100644
index 000000000..ca009ecd5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_qmetatypes.h
@@ -0,0 +1,17 @@
+#pragma once
+
+// Registers Qt metatypes for AVM DDS types used as QVariant values in GUI code.
+//
+// Declared in a single, guarded location so the QMetaTypeId<T> specialization is
+// defined before any Q_OBJECT slot/signal QtMocHelpers::SlotData instantiates the
+// primary QMetaTypeId<T> template. Qt6 rejects a class-template specialization that
+// follows the primary template's implicit instantiation ("specialization of
+// QMetaTypeId<T> after instantiation"), which Qt5 tolerated, so the declaration must
+// precede the first such SlotData in a translation unit.
+#include <AudioVideoManagement/avm_dtc.h>
+#include <QMetaType>
+
+#ifndef Q_DECLARE_METATYPE_AVM_FREQUENCYPLANNING
+#define Q_DECLARE_METATYPE_AVM_FREQUENCYPLANNING
+Q_DECLARE_METATYPE(AudioVideoManagement::FrequencyPlanning)
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
index a5c55ccbb..e2f6bd2b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
@@ -263,7 +263,7 @@ void AvsMenus::Menu::replaceMvsEntries(MenuStruct &menu) const
   newMenu.reserve(menu.menuEntries.size());
   for (auto menuEntry : menu.menuEntries)
   {
-    if (menuEntry.mountingPointId.is_set() && menuEntry.mountingPointId.get() < 0)
+    if (menuEntry.mountingPointId.has_value() && menuEntry.mountingPointId.get() < 0)
       menuEntry.name = m_dtc->videoTeam(menuEntry.mountingPointId.get()*-1).streamName;
     newMenu.push_back(std::move(menuEntry));
   }
@@ -360,12 +360,12 @@ void AvsMenus::Menu::setMenu(const MenuStruct &menu, const boost::optional<int>
   std::vector<AudioVideoManagement::AvMenuEntry> menuEntriesToUse;
   for (const auto &entry : realMenu.menuEntries())
   {
-    if (!entry.isGroup() && !entry.mountingPointId.is_set()  )
+    if (!entry.isGroup() && !entry.mountingPointId.has_value()  )
       continue;
 
     bool isMounted = false;
 
-    if(!entry.isGroup() && entry.mountingPointId.is_set())
+    if(!entry.isGroup() && entry.mountingPointId.has_value())
     {
 
       for (const auto &mountedAsset : mountedAssets)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
index 03b3a6cfa..300849131 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
@@ -92,10 +92,10 @@ Database::AvmCnrConfig toDb(const ModifyCnrConfigRequest &config)
   result.radioCircuit = QString::fromStdString(config.radioCircuit);
   result.callSign = QString::fromStdString(config.callSign);
   result.partyId = config.partyId;
-  if (config.unitId.is_set())
+  if (config.unitId.has_value())
     result.unitId = config.unitId.get();
   result.recording = config.recording;
-  if (config.exerciseId.is_set())
+  if (config.exerciseId.has_value())
     result.exerciseId = config.exerciseId.get();
 
   return result;
@@ -491,7 +491,7 @@ bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &
     // or when both exercises are currently active.
     // If one is global and one local the constraint must always hold if the local exercise is active
     // Otherwise the constraint must always hold
-    bool   bothLocal = config.exerciseId.is_set() && exerciseId.is_initialized();
+    bool   bothLocal = config.exerciseId.has_value() && exerciseId.is_initialized();
     if (bothLocal)
     {
       bool   sameExercise = config.exerciseId.get() == *exerciseId;
@@ -500,12 +500,12 @@ bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &
       if (!sameExercise && !bothActive)
         continue;
     }
-    else if(config.exerciseId.is_set() && !exerciseId.is_initialized())
+    else if(config.exerciseId.has_value() && !exerciseId.is_initialized())
     {
       if(!isActiveExercise(config.exerciseId.get()))
         continue;
     }
-    else if(exerciseId.is_initialized() && !config.exerciseId.is_set())
+    else if(exerciseId.is_initialized() && !config.exerciseId.has_value())
     {
       if(!isActiveExercise(*exerciseId))
         continue;
@@ -663,7 +663,7 @@ bool CnrHandler::isActiveExercise(int exerciseId) const
 bool CnrHandler::needDeviceConfig(const CnrConfig &config) const
 {
   // For global, we always need the config
-  if (!config.exerciseId.is_set())
+  if (!config.exerciseId.has_value())
     return true;
 
   int32_t   exerciseId = config.exerciseId.get();
@@ -703,7 +703,7 @@ bool CnrHandler::haveActiveFrequencyPlanning() const
 QString CnrHandler::exerciseList(const CnrConfig &config) const
 {
   // Local
-  if (config.exerciseId.is_set())
+  if (config.exerciseId.has_value())
     return ExerciseContext(config.exerciseId.get()).toString();
 
   // Global - all active exercises, no matter if they have active plannings or not
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp
index 1b4e111fc..da86f1690 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp
@@ -101,7 +101,7 @@ Core::FunctionReplyObject isValid(int configId, int64_t exerciseId, Handler *han
     return reply.setStr(tr_lts("dds", "%1 config %2 does not exist")).arg(configTypeAsString).arg(configId);
 
   const auto   &config = handler->config(configId);
-  if (config.exerciseId.is_set() && config.exerciseId.get() != exerciseId)
+  if (config.exerciseId.has_value() && config.exerciseId.get() != exerciseId)
     return reply.setStr(tr_lts("dds", "%1 config %2 cannot be used in exercise %3")).arg(configTypeAsString).arg(configId).arg(exerciseId);
 
   return reply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
index 9c58179cd..105958e2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
@@ -51,7 +51,7 @@ namespace AudioVideoManagement
 template<class T>
 boost::optional<T> toBoost(const dds::core::optional<T> &optionalValue)
 {
-  if (!optionalValue.is_set())
+  if (!optionalValue.has_value())
     return boost::none;
   return optionalValue.get();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
index 4e71cb4ce..96b426d61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
@@ -87,7 +87,7 @@ Database::AvmFrequencyPlanning toDb(const FrequencyPlanning &ddsPlan)
 {
   Database::AvmFrequencyPlanning   dbPlan;
   dbPlan.id = ddsPlan.id;
-  if (ddsPlan.exerciseId.is_set())
+  if (ddsPlan.exerciseId.has_value())
     dbPlan.exerciseId = ddsPlan.exerciseId.get();
   dbPlan.dateOfCreation = ddsPlan.date;
   dbPlan.frequencySetId = ddsPlan.frequencySetId;
@@ -385,8 +385,8 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateModifyRequest(const
 
   const FrequencyPlanning   &oldPlan = *found;
 
-  if ((oldPlan.exerciseId.is_set() && oldPlan.exerciseId.get() != request.exerciseId)
-      || (!oldPlan.exerciseId.is_set() && request.exerciseId != 0))
+  if ((oldPlan.exerciseId.has_value() && oldPlan.exerciseId.get() != request.exerciseId)
+      || (!oldPlan.exerciseId.has_value() && request.exerciseId != 0))
     return reply.setStr(tr_lts("dds", "Exercise may not be changed"));
 
   if (request.frequencySetId != oldPlan.frequencySetId)
@@ -418,7 +418,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Core::
     return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.id);
 
   const FrequencyPlanning   &plan = *foundPlan;
-  int exerciseId = plan.exerciseId.is_set() ? plan.exerciseId.get() : 0;
+  int exerciseId = plan.exerciseId.has_value() ? plan.exerciseId.get() : 0;
   auto   foundActivePlan = m_activePlannings.constFind(exerciseId);
   bool   isActive = foundActivePlan != m_activePlannings.constEnd() && foundActivePlan->frequencyPlanningId == plan.id;
   if (isActive)
@@ -543,7 +543,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve
   for (const FrequencyPlanningData &entry : entries)
   {
     const CnrConfig   &cnrConfig = m_cnrHandler->config(entry.cnrConfigId);
-    bool   isGlobal = !cnrConfig.exerciseId.is_set();
+    bool   isGlobal = !cnrConfig.exerciseId.has_value();
     if (!isGlobal)
       continue;
 
@@ -620,7 +620,7 @@ std::vector<int> FrequencyPlanningHandler::takenGlobalCnrConfigs(const std::vect
     for (const FrequencyPlanningData &entry : plan.data)
     {
       const CnrConfig   &cnrConfig = m_cnrHandler->config(entry.cnrConfigId);
-      bool   isGlobal = !cnrConfig.exerciseId.is_set();
+      bool   isGlobal = !cnrConfig.exerciseId.has_value();
       if (isGlobal)
         result.push_back(cnrConfig.id);
     }
@@ -775,7 +775,7 @@ void FrequencyPlanningHandler::onCnrConfigRemoved(int cnrConfigId)
     req.data.erase(found);
 
     req.date = fp.date;
-    req.exerciseId = fp.exerciseId.is_set() ? fp.exerciseId.get() : 0;
+    req.exerciseId = fp.exerciseId.has_value() ? fp.exerciseId.get() : 0;
     req.frequencySetId = fp.frequencySetId;
     req.id = fp.id;
     req.name = fp.name;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp
index 9c6c06f80..b82a7fe95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp
@@ -29,14 +29,14 @@ static FrequencyPlanningStatus convert(const ModifyFrequencyPlanningStatusReques
   }
   newData.uuid = request.uuid.empty() ? oldData.uuid : request.uuid;
   newData.id = oldData.id;
-  if (request.sent.is_set())
+  if (request.sent.has_value())
   {
     newData.sent = request.sent.get();
     newData.requester = request.requester; // ! Requester is only sent, when data gets sent.
   }
-  if (request.received.is_set())
+  if (request.received.has_value())
     newData.received = request.received.get();
-  if (request.activated.is_set())
+  if (request.activated.has_value())
   {
     newData.activated = request.activated.get();
     newData.requester = request.requester; // ! Requester is only sent, when data gets activated.
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp
index 5a9fa7ea4..39c940b94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp
@@ -124,11 +124,11 @@ Database::AvmFrequencyPlanningStatus ObjectFrequencyPlanningStatus::toDbData(con
   dbData.content    = QString::fromStdString(ddsData.content);
   dbData.reason     = static_cast<int>(ddsData.reason);
 
-  if (ddsData.sent.is_set())
+  if (ddsData.sent.has_value())
     dbData.sent = static_cast<qint64>(ddsData.sent.get());
-  if (ddsData.received.is_set())
+  if (ddsData.received.has_value())
     dbData.received = static_cast<qint64>(ddsData.received.get());
-  if (ddsData.activated.is_set())
+  if (ddsData.activated.has_value())
     dbData.activated = static_cast<qint64>(ddsData.activated.get());
 
   return dbData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
index 24e65f620..d0ef1870d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
@@ -67,7 +67,7 @@ Database::AvmTvcConfig toDb(const ModifyTvcConfigRequest &request)
   result.info = QString::fromStdString(request.info);
   result.recording = request.recording;
   result.tetraChannelId = request.tetraChannelId;
-  if (request.exerciseId.is_set())
+  if (request.exerciseId.has_value())
     result.exerciseId = request.exerciseId.get();
 
   return result;
@@ -427,7 +427,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context)
 
   for (const TvcConfig &tvcConfig : std::as_const(m_cache))
   {
-    bool   isLocal = tvcConfig.exerciseId.is_set();
+    bool   isLocal = tvcConfig.exerciseId.has_value();
     if (isLocal)
     {
       if (tvcConfig.exerciseId == context.id())
@@ -449,7 +449,7 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context)
 
   for (const TvcConfig &tvcConfig : std::as_const(m_cache))
   {
-    bool   isLocal = tvcConfig.exerciseId.is_set();
+    bool   isLocal = tvcConfig.exerciseId.has_value();
 
     if (isLocal)
     {
@@ -535,7 +535,7 @@ bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &
     // If both configs are local the constraint must hold if they are in the same exercise
     // or when both exercises are currently active.
     // Otherwise (one or both are global) the constraint must always hold
-    bool   bothLocal = config.exerciseId.is_set() && exerciseId.is_initialized();
+    bool   bothLocal = config.exerciseId.has_value() && exerciseId.is_initialized();
     if (bothLocal)
     {
       bool   sameExercise = config.exerciseId.get() == *exerciseId;
@@ -557,7 +557,7 @@ bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &
  */
 QString TvcHandler::exerciseList(const TvcConfig &config) const
 {
-  bool   isLocal = config.exerciseId.is_set();
+  bool   isLocal = config.exerciseId.has_value();
   if (isLocal)
     return ExerciseContext(config.exerciseId.get()).toString();
 
@@ -575,7 +575,7 @@ QString TvcHandler::exerciseList(const TvcConfig &config) const
 
 bool TvcHandler::needDeviceConfig(const TvcConfig &config) const
 {
-  bool   isGlobal = !config.exerciseId.is_set();
+  bool   isGlobal = !config.exerciseId.has_value();
   bool   hasActiveExericse = m_activeExercises->count() > 0;
   return (isGlobal && hasActiveExericse) || (!isGlobal && isActiveExercise(config.exerciseId.get()));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
index 2b83b8828..25d1762be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
@@ -62,29 +62,29 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
   {
-    m_explosionSingleState.remove(data.id());
+    m_explosionSingleState.remove(data.id);
     return;
   }
 
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
   {
     DEBUG_LOG(m_logger) << "Remove SingleExplosion";
-    m_explosionSingleState.remove(data.id());
+    m_explosionSingleState.remove(data.id);
     return;
   }
   // Only handle transitions from prepared or fired to activated
-  if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared ||
-       m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) &&
-      data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+  if ((m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsPrepared ||
+       m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsFired) &&
+      data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
   {
     DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
-  m_explosionSingleState.insert(data.id(), data.effectStateId());
+  m_explosionSingleState.insert(data.id, data.effectStateId);
 
 
-  DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId()
-                      <<  " id=" << data.id();
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId
+                      <<  " id=" << data.id;
   if (handleExplosion)
   {
     DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
@@ -107,7 +107,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
                          << "/" << i.value().positionUtm.y()
                          << " zone=" << i.value().zone;
       // Calculate the distance between the speaker and the explosion
-      const QPointF posExplosionUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition(), i.value().zone);
+      const QPointF posExplosionUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition, i.value().zone);
       const qreal distance = qSqrt(qPow(posExplosionUtm.x() - i.value().positionUtm.x(), 2) + qPow(posExplosionUtm.y() - i.value().positionUtm.y(), 2));
       int sound = Settings::cesSoundId();
       const qreal distanceThreshold = Settings::cesDistanceThreshold(); // [m]
@@ -193,24 +193,24 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
   {
-    m_technicalAreas.remove(data.id());
+    m_technicalAreas.remove(data.id);
     return;
   }
 
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
   {
     DEBUG_LOG(m_logger) << "Remove TechnicalArea";
-    m_technicalAreas.remove(data.id());
+    m_technicalAreas.remove(data.id);
     return;
   }
-  if (data.type() == AreaEffectSimulation::AesTechnicalAreaType::TatSoundZone)
+  if (data.type == AreaEffectSimulation::AesTechnicalAreaType::TatSoundZone)
   {
     int zone = -1;
-    m_technicalAreas.insert(data.id(), data);
-    DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id();
-    QPointF cornerButtomLeft = CentralEffectSimulation::geographic2Utm(data.area().cornerBottomLeft(), &zone);
-    qreal x = cornerButtomLeft.x() + data.area().width() / 2;
-    qreal y = cornerButtomLeft.y() + data.area().height() / 2;
+    m_technicalAreas.insert(data.id, data);
+    DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id;
+    QPointF cornerButtomLeft = CentralEffectSimulation::geographic2Utm(data.area.cornerBottomLeft, &zone);
+    qreal x = cornerButtomLeft.x() + data.area.width / 2;
+    qreal y = cornerButtomLeft.y() + data.area.height / 2;
     QPointF center(x, y);
     DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
                         << " zone=" << zone;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
index 6a1300ca6..852f8c5bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
@@ -69,14 +69,14 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio
   switch (modType)
   {
   case DataModification::eRemoved:
-    DEBUG_LOG(m_logger) << " remove Borderline- data.id()=" << data.id();
-    m_borderlines.remove(data.id());
+    DEBUG_LOG(m_logger) << " remove Borderline- data.id()=" << data.id;
+    m_borderlines.remove(data.id);
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-    switch (effectState.underlying())
+    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+    switch (effectState)
     {
     case AreaEffectSimulation::AesEffectState::EsReceived:
     case AreaEffectSimulation::AesEffectState::EsFired:
@@ -85,14 +85,14 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
       BorderlineUtm borderline(data);
-      DEBUG_LOG(m_logger) << "m_borderlines.insert id=" << data.id();
-      m_borderlines.insert(data.id(), borderline);
+      DEBUG_LOG(m_logger) << "m_borderlines.insert id=" << data.id;
+      m_borderlines.insert(data.id, borderline);
       break;
     }
     case AreaEffectSimulation::AesEffectState::EsRemoved:
     case AreaEffectSimulation::AesEffectState::EsExpired:
     case AreaEffectSimulation::AesEffectState::EsPaused:
-      m_borderlines.remove(data.id());
+      m_borderlines.remove(data.id);
       break;
     case AreaEffectSimulation::AesEffectState::EsUnknown:
     case AreaEffectSimulation::AesEffectState::EsError:
@@ -111,7 +111,7 @@ bool HandlerParticipantBorderline::intersect(const QPolygonF &polygonf, const QL
   {
     const QLineF segment(a, b);
     DEBUG_LOG(m_logger) << "segment:" << CentralEffectSimulation::debug(a) << " -  " << CentralEffectSimulation::debug(b);
-    if (QLineF::BoundedIntersection == linef.intersect(segment, nullptr))
+    if (QLineF::BoundedIntersection == linef.intersects(segment, nullptr))
       return true;
     a = b;
   }
@@ -123,8 +123,8 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
 {
   // Bounding Box von der Linie
   DEBUG_LOG(m_logger) << "ParicipantStep "
-                      << " participantId=" << partPos.participantId()
-                      << " participantTypeId=" << partPos.participantTypeId()
+                      << " participantId=" << partPos.participantId
+                      << " participantTypeId=" << partPos.participantTypeId
                       << " Anzahl Borderlines=" << m_borderlines.size();
 
   for (const BorderlineUtm &borderline : std::as_const(m_borderlines))
@@ -132,7 +132,7 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
     DEBUG_LOG(m_logger) << "borderline id = " << borderline.id
                         << ", Box bottomLeft = " << CentralEffectSimulation::debug(borderline.boundingBox.bottomLeft())
                         << ", topRight = " << CentralEffectSimulation::debug(borderline.boundingBox.topRight());
-    const QPolygonF utmStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId(), borderline.zone);
+    const QPolygonF utmStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId, borderline.zone);
     if (utmStepPoly.size() < 2)
       continue;
 
@@ -162,7 +162,7 @@ void HandlerParticipantBorderline::sendParticipantEvent(const BorderlineUtm &bor
                                                         const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
                                                         const ProjectDataManagement::PdmEventType eventType)
 {
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
 
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -170,40 +170,40 @@ void HandlerParticipantBorderline::sendParticipantEvent(const BorderlineUtm &bor
       typeClass == ParticipantManagement::TypeClass::Unknown)
     return;
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   if (equipmentNumber <= 0)
     return;
 
   CentralEffectSimulation::ParticipantEvent pe;
-  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
-                      << " lat= " << participantPosition.pos().lat()
-                      << " lon= " << participantPosition.pos().lon()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId
+                      << " lat= " << participantPosition.pos.lat
+                      << " lon= " << participantPosition.pos.lon
                       << " equipmentNumber=" << equipmentNumber
                       << " eventType=" << eventType;
-  pe.id(m_ddsHandler->getParticipantEventId());
-  pe.eventTypeId(eventType);
-  pe.participantId(participantPosition.participantId());
-  pe.eventTime(participantPosition.sampleTime());
-  pe.aesItemId(borderline.id);
-  pe.partyId(participantPosition.partyId());
-  pe.aesName(borderline.name.toStdString());
-  pe.equipmentNumber(equipmentNumber);
-  pe.position(participantPosition.pos());
+  pe.id = m_ddsHandler->getParticipantEventId();
+  pe.eventTypeId = eventType;
+  pe.participantId = participantPosition.participantId;
+  pe.eventTime = participantPosition.sampleTime;
+  pe.aesItemId = borderline.id;
+  pe.partyId = participantPosition.partyId;
+  pe.aesName = borderline.name.toStdString();
+  pe.equipmentNumber = equipmentNumber;
+  pe.position = participantPosition.pos;
 
   m_ddsHandler->dtsCes()->publish(pe);
-  qint64 id = pe.id();
+  qint64 id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
 
 HandlerParticipantBorderline::BorderlineUtm::BorderlineUtm(const AreaEffectSimulation::Borderline &bl)
-  : id(bl.id())
-  , operatorId(bl.operatorId())
-  , partyId(bl.partyId.is_set() ? bl.partyId.get() : -1)
-  , name(QString::fromStdString(bl.name()))
+  : id(bl.id)
+  , operatorId(bl.operatorId)
+  , partyId(bl.partyId.has_value() ? bl.partyId.get() : -1)
+  , name(QString::fromStdString(bl.name))
 {
-  points.reserve(bl.segments().size());
-  for (const Core::GeoPosition2D &pointGeo : bl.segments())
+  points.reserve(bl.segments.size());
+  for (const Core::GeoPosition2D &pointGeo : bl.segments)
     points.push_back(CentralEffectSimulation::geographic2Utm(pointGeo, &zone));
 
   boundingBox = points.boundingRect();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
index 675f66c15..4dc3df59e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
@@ -69,12 +69,12 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
   for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : std::as_const(simMoveVec))
   {
     CentralEffectSimulation::SimulatedMovement request;
-    request.id(data.id);
-    request.name(data.name.toStdString());
-    request.startTime(data.startTime);
-    request.participantId(data.participantId);
-    request.repeat(data.repeat);
-    request.nextPoint(data.nextpoint);
+    request.id = data.id;
+    request.name = data.name.toStdString();
+    request.startTime = data.startTime;
+    request.participantId = data.participantId;
+    request.repeat = data.repeat;
+    request.nextPoint = data.nextpoint;
     DEBUG_LOG(m_logger) << "Loading SimulatedMovement: " << request;
 
     QMap <int, CentralEffectSimulation::Database::CesSimulatedMovementSegment> segDbMap; // QMap to get it sorted
@@ -83,16 +83,16 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
       if (segData.simulatedMovementId == data.id)
         segDbMap.insert(segData.positionIndex, segData);
     }
-    request.segments().reserve(segDbMap.size());
+    request.segments.reserve(segDbMap.size());
     CentralEffectSimulation::SimulatedMovementSegment seg;
     for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segDb : std::as_const(segDbMap))
     {
-      seg.delay(segDb.delay);
-      seg.name(segDb.name.toStdString());
-      seg.speed(segDb.speed);
-      seg.position(Core::GeoPosition2D(segDb.position.x(),
-                                       segDb.position.y()));
-      request.segments().push_back(seg);
+      seg.delay = segDb.delay;
+      seg.name = segDb.name.toStdString();
+      seg.speed = segDb.speed;
+      seg.position = Core::GeoPosition2D(segDb.position.x(),
+                                       segDb.position.y());
+      request.segments.push_back(seg);
     }
     SimulationMovement *sm = new SimulationMovement(m_ddsHandler, m_db, m_handlerParticipant, request);
     m_simulationMovements.insert(sm->id(), sm);
@@ -108,8 +108,8 @@ Core::FunctionReplyObject HandlerSimulatedMovement::insertInDb(const CentralEffe
 
   DBTransaction trans(m_db->database());
 
-  if (m_simulationMovements.contains(request.id()))
-    newSimulatedMovement.nextpoint = m_simulationMovements.value(request.id())->getNextPoint();
+  if (m_simulationMovements.contains(request.id))
+    newSimulatedMovement.nextpoint = m_simulationMovements.value(request.id)->getNextPoint();
   else // new Simulation
     newSimulatedMovement.nextpoint = 1;
 
@@ -119,13 +119,13 @@ Core::FunctionReplyObject HandlerSimulatedMovement::insertInDb(const CentralEffe
 
   CentralEffectSimulation::Database::CesSimulatedMovementSegment newSegment;
   newSegment.simulatedMovementId = newSimulatedMovement.id;
-  for (const CentralEffectSimulation::SimulatedMovementSegment &seg : request.segments())
+  for (const CentralEffectSimulation::SimulatedMovementSegment &seg : request.segments)
   {
     newSegment.id = 0; // insert
-    newSegment.delay = seg.delay();
-    newSegment.speed = seg.speed();
-    newSegment.name = QString::fromStdString(seg.name());
-    newSegment.position = QPointF(seg.position().lon(), seg.position().lat());
+    newSegment.delay = seg.delay;
+    newSegment.speed = seg.speed;
+    newSegment.name = QString::fromStdString(seg.name);
+    newSegment.position = QPointF(seg.position.lon, seg.position.lat);
     if (!m_db->insert(newSegment))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'CesSimulatedMovementSegment' to database"));
 
@@ -134,7 +134,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::insertInDb(const CentralEffe
 
   trans.commit();
 
-  DEBUG_LOG(m_logger) << "newSimulatedMovement.id=" << newSimulatedMovement.id << " request.id=" << request.id();
+  DEBUG_LOG(m_logger) << "newSimulatedMovement.id=" << newSimulatedMovement.id << " request.id=" << request.id;
   return Core::FunctionReplyObject(newSimulatedMovement.id);
 } // end of insertInDb
 
@@ -152,19 +152,19 @@ Core::FunctionReplyObject HandlerSimulatedMovement::updateDb(const CentralEffect
   // Insert new segments:
   CentralEffectSimulation::Database::CesSimulatedMovementSegment newSegment;
   newSegment.simulatedMovementId = newSimulatedMovement.id;
-  for (const CentralEffectSimulation::SimulatedMovementSegment &seg : request.segments())
+  for (const CentralEffectSimulation::SimulatedMovementSegment &seg : request.segments)
   {
     newSegment.id = 0; // insert
-    newSegment.delay = seg.delay();
-    newSegment.speed = seg.speed();
-    newSegment.name = QString::fromStdString(seg.name());
-    newSegment.position = QPointF(seg.position().lon(), seg.position().lat());
+    newSegment.delay = seg.delay;
+    newSegment.speed = seg.speed;
+    newSegment.name = QString::fromStdString(seg.name);
+    newSegment.position = QPointF(seg.position.lon, seg.position.lat);
     if (!m_db->insert(newSegment))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'CesSimulatedMovementSegment' to database"));
     ++newSegment.positionIndex;
   }
 
-  DEBUG_LOG(m_logger) << "newSimulatedMovement.id=" << newSimulatedMovement.id << " request.id=" << request.id();
+  DEBUG_LOG(m_logger) << "newSimulatedMovement.id=" << newSimulatedMovement.id << " request.id=" << request.id;
   return Core::FunctionReplyObject(newSimulatedMovement.id);
 } // end of updateDb
 
@@ -208,23 +208,23 @@ void HandlerSimulatedMovement::onSimulatedMovementModifyRequest(const rti::core:
                                                                 const CentralEffectSimulation::SimulatedMovement &request)
 {
   DEBUG_LOG(m_logger) << "onSimulatedMovementModifyRequest: " << request;
-  m_jumpToStart = request.jumpToStart();
+  m_jumpToStart = request.jumpToStart;
 
   // we allow a modify with requestId = 0 and participantId != 0
-  SimulationMovement *sm = findSimulationMovement(request.id(), request.participantId());
+  SimulationMovement *sm = findSimulationMovement(request.id, request.participantId);
   if (sm)
     sm->setSimulatedMovementRequest(request);
   else
     sm = new SimulationMovement(m_ddsHandler, m_db, m_handlerParticipant, request);
 
   // New Route
-  if (request.jumpToStart())
+  if (request.jumpToStart)
   {
     DEBUG_LOG(m_logger) << "sm->setJump(true)";
     sm->setJump(true);
   }
 
-  Core::FunctionReplyObject reply = request.id() > 0
+  Core::FunctionReplyObject reply = request.id > 0
                                     ? updateDb(sm->simMovementData())
                                     : insertInDb(sm->simMovementData());
 
@@ -232,7 +232,7 @@ void HandlerSimulatedMovement::onSimulatedMovementModifyRequest(const rti::core:
   m_simulationMovements[sm->id()] = sm;
   publishSimulatedMovement(request);
 
-  setParticipantAsSimulated(request.participantId(), true);
+  setParticipantAsSimulated(request.participantId, true);
 
   DEBUG_LOG(m_logger) << "simulatedMovementModifyReply id=" << reply.id();
 
@@ -268,7 +268,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::removeSimulatedMovement(int3
 void HandlerSimulatedMovement::onSimulatedMovementRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                                 const Core::RemoveElementRequest &request)
 {
-  Core::FunctionReplyObject reply = removeSimulatedMovement(request.id());
+  Core::FunctionReplyObject reply = removeSimulatedMovement(request.id);
   if (reply.error())
     WARNING_LOG(m_logger) << reply();
   m_ddsHandler->ftsCes()->simulatedMovementRemoveReply(cookie, reply);
@@ -283,7 +283,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveByParticipantIdRequest(c
   int id = 0;
   for (const SimulationMovement *simMovement : std::as_const(m_simulationMovements))
   {
-    if (simMovement->participantId() == request.participantId())
+    if (simMovement->participantId() == request.participantId)
     {
       id = simMovement->id();
       break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
index 72695f0bf..9f21c1e31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
@@ -44,18 +44,18 @@ SimulationMovement::SimulationMovement(const std::shared_ptr<CentralEffectSimula
 SimulationMovement::~SimulationMovement()
 {
   DEBUG_LOG(m_logger) << "Delete SimulatedMovement "
-                      << " id=" << m_simMovement.id()
-                      << " participantId= " << m_simMovement.participantId();
-  m_ddsHandler->dtsCes()->removeSimulatedMovementByKey(m_simMovement.id());
+                      << " id=" << m_simMovement.id
+                      << " participantId= " << m_simMovement.participantId;
+  m_ddsHandler->dtsCes()->removeSimulatedMovementByKey(m_simMovement.id);
   m_segTimer->stop();
   m_moveTimer->stop();
 }
 
 void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulation::SimulatedMovement &sml)
 {
-  int nextPoint = m_simMovement.nextPoint();
+  int nextPoint = m_simMovement.nextPoint;
   m_simMovement = sml;
-  m_simMovement.nextPoint(nextPoint);
+  m_simMovement.nextPoint = nextPoint;
 
   m_moveTime = 1;
   m_segTimer->stop();
@@ -64,32 +64,32 @@ void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulati
   m_points.clear();
   m_segSpeed.clear();
   m_segDelay.clear();
-  m_points.reserve(sml.segments().size());
-  m_segSpeed.reserve(sml.segments().size());
-  m_segDelay.reserve(sml.segments().size());
+  m_points.reserve(sml.segments.size());
+  m_segSpeed.reserve(sml.segments.size());
+  m_segDelay.reserve(sml.segments.size());
 
-  for (const CentralEffectSimulation::SimulatedMovementSegment &point : sml.segments())
+  for (const CentralEffectSimulation::SimulatedMovementSegment &point : sml.segments)
   {
-    const Core::GeoPosition2D &pointGeo = point.position();
+    const Core::GeoPosition2D &pointGeo = point.position;
     m_points.push_back(m_zone == -1 ? CentralEffectSimulation::geographic2Utm(pointGeo, &m_zone) : CentralEffectSimulation::geographic2Utm(pointGeo, m_zone));
-    DEBUG_LOG(m_logger) << "pointGeo lat=" << pointGeo.lat() << " lon=" << pointGeo.lon()
-                        << " point lat=" << point.position().lat() << " lon=" << point.position().lon()
+    DEBUG_LOG(m_logger) << "pointGeo lat=" << pointGeo.lat << " lon=" << pointGeo.lon
+                        << " point lat=" << point.position.lat << " lon=" << point.position.lon
                         << " utmPoint=" << CentralEffectSimulation::debug(m_points.last());
-    m_segSpeed.append(point.speed());
-    m_segDelay.append(point.delay());
+    m_segSpeed.append(point.speed);
+    m_segDelay.append(point.delay);
   }
 
   // Only start simulation in future
-  DEBUG_LOG(m_logger) << "m_startTime - QDateTime::currentMSecsSinceEpoch()=" << m_simMovement.startTime() - QDateTime::currentMSecsSinceEpoch()
-                      << " m_startTime=" << m_simMovement.startTime()
+  DEBUG_LOG(m_logger) << "m_startTime - QDateTime::currentMSecsSinceEpoch()=" << m_simMovement.startTime - QDateTime::currentMSecsSinceEpoch()
+                      << " m_startTime=" << m_simMovement.startTime
                       << " currentTime=" << QDateTime::currentMSecsSinceEpoch()
-                      << " m_nextPoint=" << m_simMovement.nextPoint();
+                      << " m_nextPoint=" << m_simMovement.nextPoint;
 
-  if (m_simMovement.nextPoint() > 0 && m_points.size() > m_simMovement.nextPoint())
-    m_newPos = m_points[m_simMovement.nextPoint()].toPoint();
+  if (m_simMovement.nextPoint > 0 && m_points.size() > m_simMovement.nextPoint)
+    m_newPos = m_points[m_simMovement.nextPoint].toPoint();
 
-  if (m_simMovement.startTime() - QDateTime::currentMSecsSinceEpoch() > 0)
-    m_moveTimer->start(m_simMovement.startTime() - QDateTime::currentMSecsSinceEpoch());
+  if (m_simMovement.startTime - QDateTime::currentMSecsSinceEpoch() > 0)
+    m_moveTimer->start(m_simMovement.startTime - QDateTime::currentMSecsSinceEpoch());
   else
   {
     DEBUG_LOG(m_logger) << "Service-Start";
@@ -99,7 +99,7 @@ void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulati
 
 void SimulationMovement::updateNextPointInDb()
 {
-  if (m_simMovement.id() <= 0)
+  if (m_simMovement.id <= 0)
   {
     WARNING_LOG(m_logger) << "Internal error - id not set!";
     return;
@@ -111,55 +111,55 @@ void SimulationMovement::updateNextPointInDb()
 
 void SimulationMovement::startNewSegment()
 {
-  DEBUG_LOG(m_logger) << "simulate participantId = " << m_simMovement.participantId()
-                      << " m_nextPoint = " << m_simMovement.nextPoint();
+  DEBUG_LOG(m_logger) << "simulate participantId = " << m_simMovement.participantId
+                      << " m_nextPoint = " << m_simMovement.nextPoint;
 
   m_moveTime = 1;
-  if (m_simMovement.nextPoint() < m_points.size())
+  if (m_simMovement.nextPoint < m_points.size())
   {
     QPointF p1;
     // Next segment
-    const CentralEffectSimulation::HandlerParticipant::CesParticipantData pos = m_handlerParticipant->position(m_simMovement.participantId());
-    if (pos.participantId() == m_simMovement.participantId())
+    const CentralEffectSimulation::HandlerParticipant::CesParticipantData pos = m_handlerParticipant->position(m_simMovement.participantId);
+    if (pos.participantId == m_simMovement.participantId)
     {
-      p1 = CentralEffectSimulation::geographic2Utm(pos.pos(), m_zone);
+      p1 = CentralEffectSimulation::geographic2Utm(pos.pos, m_zone);
       DEBUG_LOG(m_logger) << "Next segment ParticipantPosition =" << CentralEffectSimulation::debug(p1);
     }
     else
     {
       if (m_simStart)  // Wait for participantPosition
       {
-        INFO_LOG(m_logger) << "Wait for participant position participantId =" << m_simMovement.participantId();
+        INFO_LOG(m_logger) << "Wait for participant position participantId =" << m_simMovement.participantId;
         m_segTimer->start(1000);
         return;
       }
-      if (m_simMovement.nextPoint() > 0)
+      if (m_simMovement.nextPoint > 0)
       {
-        p1 = m_points.at(m_simMovement.participantId() - 1);
-        DEBUG_LOG(m_logger) << "nextPoint>0 (" << m_simMovement.nextPoint() << ") ParticipantPosition =" << CentralEffectSimulation::debug(p1);
+        p1 = m_points.at(m_simMovement.participantId - 1);
+        DEBUG_LOG(m_logger) << "nextPoint>0 (" << m_simMovement.nextPoint << ") ParticipantPosition =" << CentralEffectSimulation::debug(p1);
       }
       else
       {
         p1 = m_points.at(m_points.size() - 1);
-        DEBUG_LOG(m_logger) << "nextPoint=" << m_simMovement.nextPoint() << " ParticipantPosition =" << CentralEffectSimulation::debug(p1);
+        DEBUG_LOG(m_logger) << "nextPoint=" << m_simMovement.nextPoint << " ParticipantPosition =" << CentralEffectSimulation::debug(p1);
       }
     }
-    const QPointF &p2 = m_points.at(m_simMovement.nextPoint());
+    const QPointF &p2 = m_points.at(m_simMovement.nextPoint);
     m_actSegment.setPoints(p1, p2);
-    int curDelay = m_segDelay.at(m_simMovement.nextPoint());
+    int curDelay = m_segDelay.at(m_simMovement.nextPoint);
     DEBUG_LOG(m_logger) << "New Segment: p1 = " << CentralEffectSimulation::debug(p1) << " p2=" << CentralEffectSimulation::debug(p2)
                         << " delay =" << curDelay;
     m_moveTimer->start(curDelay);
   }
   else
   {
-    if (m_simMovement.repeat())
+    if (m_simMovement.repeat)
     {
-      m_simMovement.nextPoint(0);
-      m_moveTimer->start(m_segDelay.at(m_simMovement.nextPoint()));
+      m_simMovement.nextPoint = 0;
+      m_moveTimer->start(m_segDelay.at(m_simMovement.nextPoint));
     }
     else
-      m_simMovement.nextPoint(-1); // Invalid value
+      m_simMovement.nextPoint = -1; // Invalid value
   }
 }
 
@@ -168,10 +168,10 @@ void SimulationMovement::setJump(bool jump)
   DEBUG_LOG(m_logger) << "Jump";
   if (jump)
   {
-    m_simMovement.nextPoint(1);
+    m_simMovement.nextPoint = 1;
     m_newPos = m_points.at(0);
     m_actSegment.setPoints(m_newPos,
-                           m_points.at(m_simMovement.nextPoint()));
+                           m_points.at(m_simMovement.nextPoint));
     m_moveTime = 1;
     m_simStart = false;
     publishNewPos();
@@ -181,7 +181,7 @@ void SimulationMovement::setJump(bool jump)
 
 void SimulationMovement::publishSimulatedMovement()
 {
-  DEBUG_LOG(m_logger) << " m_nextPoint= " << m_simMovement.nextPoint();
+  DEBUG_LOG(m_logger) << " m_nextPoint= " << m_simMovement.nextPoint;
   m_ddsHandler->dtsCes()->publish(m_simMovement);
 }
 
@@ -202,10 +202,10 @@ void SimulationMovement::publishNewPos()
 
   const Core::GeoPosition pos(Core::GeoPosition(posGeo.x(), posGeo.y(), 0));
 
-  participantPos.equipmentNumber(-m_simMovement.participantId()); // negative - treat as participantId
-  participantPos.sampleTime(m_ddsHandler->currentPartitionTime());
-  participantPos.position().position(pos);
-  participantPos.position().reportingSource(Core::PositionReportingSource::MovementSimulation);
+  participantPos.equipmentNumber = -m_simMovement.participantId; // negative - treat as participantId
+  participantPos.sampleTime = m_ddsHandler->currentPartitionTime();
+  participantPos.position.position = pos;
+  participantPos.position.reportingSource = Core::PositionReportingSource::MovementSimulation;
 
   m_ddsHandler->dtsTab()->publish(participantPos);
 
@@ -214,23 +214,23 @@ void SimulationMovement::publishNewPos()
 void SimulationMovement::move()
 {
   DEBUG_LOG(m_logger) << "move";
-  if (m_simMovement.nextPoint() < 0)
+  if (m_simMovement.nextPoint < 0)
   {
     DEBUG_LOG(m_logger) << "move next point < 0";
     return;
   }
 
-  const CentralEffectSimulation::HandlerParticipant::CesParticipantData partPos = m_handlerParticipant->position(m_simMovement.participantId());
-  const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(partPos.pos(), m_zone);
-  if (partPos.participantId() != m_simMovement.participantId())
+  const CentralEffectSimulation::HandlerParticipant::CesParticipantData partPos = m_handlerParticipant->position(m_simMovement.participantId);
+  const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(partPos.pos, m_zone);
+  if (partPos.participantId != m_simMovement.participantId)
   {
-    DEBUG_LOG(m_logger) << "move no ParticipantId=" << m_simMovement.participantId();
+    DEBUG_LOG(m_logger) << "move no ParticipantId=" << m_simMovement.participantId;
     m_moveTimer->start(1000);
     return;
   }
   if (!partPos.positionValid)
   {
-    DEBUG_LOG(m_logger) << "move no ParticipantId=" << m_simMovement.participantId();
+    DEBUG_LOG(m_logger) << "move no ParticipantId=" << m_simMovement.participantId;
     m_moveTimer->start(1000);
     return;
   }
@@ -240,7 +240,7 @@ void SimulationMovement::move()
   if (m_simStart)
   {
     m_actSegment.setPoints(participantPosUtm,
-                           m_points.at(m_simMovement.nextPoint()));
+                           m_points.at(m_simMovement.nextPoint));
     step = m_actSegment;
     DEBUG_LOG(m_logger) << "m_simStart set m_actSegment"
                         << " p1: " << CentralEffectSimulation::debug(m_actSegment.p1())
@@ -248,14 +248,14 @@ void SimulationMovement::move()
     m_simStart = false;
   }
 
-  if (m_segSpeed[m_simMovement.nextPoint()] <= 0.0)
+  if (m_segSpeed[m_simMovement.nextPoint] <= 0.0)
   {
     DEBUG_LOG(m_logger) << "move next point < 0";
     return;
   }
 
-  m_newPos = m_points[m_simMovement.nextPoint()];
-  step.setLength(m_segSpeed[m_simMovement.nextPoint()] * m_moveTime);
+  m_newPos = m_points[m_simMovement.nextPoint];
+  step.setLength(m_segSpeed[m_simMovement.nextPoint] * m_moveTime);
   m_moveTime++;
   // ready criterion
   if (step.length() >= m_actSegment.length() + 0.1 ||
@@ -263,25 +263,25 @@ void SimulationMovement::move()
   {
     DEBUG_LOG(m_logger) << "move ready step.length()=" << step.length()
                         << " m_actSegment.length()=" << m_actSegment.length();
-    m_simMovement.nextPoint(m_simMovement.nextPoint() + 1);
-    if (m_simMovement.nextPoint() >= m_points.size())
+    m_simMovement.nextPoint = m_simMovement.nextPoint + 1;
+    if (m_simMovement.nextPoint >= m_points.size())
     {
-      if (m_simMovement.repeat())
-        m_simMovement.nextPoint(0);
+      if (m_simMovement.repeat)
+        m_simMovement.nextPoint = 0;
       else
       {
-        m_simMovement.nextPoint(-1); // Invalid value
+        m_simMovement.nextPoint = -1; // Invalid value
         return;
       }
     }
     updateNextPointInDb();
-    DEBUG_LOG(m_logger) << "ready move participantId = " << m_simMovement.participantId()
-                        << " m_nextPoint =" << m_simMovement.nextPoint()
+    DEBUG_LOG(m_logger) << "ready move participantId = " << m_simMovement.participantId
+                        << " m_nextPoint =" << m_simMovement.nextPoint
                         << " newPos =" << m_newPos.x() << "/" << m_newPos.y()
                         << " m_moveTime=" << m_moveTime
-                        << " length=" << m_segSpeed[m_simMovement.nextPoint()] * m_moveTime
+                        << " length=" << m_segSpeed[m_simMovement.nextPoint] * m_moveTime
                         << " step.length=" << step.length()
-                        << " m_segSpeed[m_nextPoint]=" << m_segSpeed[m_simMovement.nextPoint()]
+                        << " m_segSpeed[m_nextPoint]=" << m_segSpeed[m_simMovement.nextPoint]
                         << " m_moveTime=" << m_moveTime
                         << " m_actSegment.length=" << m_actSegment.length()
                         << " m_zone=" << m_zone;
@@ -291,13 +291,13 @@ void SimulationMovement::move()
     return;
   }
   m_newPos = step.p2();
-  DEBUG_LOG(m_logger) << "move participantId = " << m_simMovement.participantId()
-                      << " m_nextPoint =" << m_simMovement.nextPoint()
+  DEBUG_LOG(m_logger) << "move participantId = " << m_simMovement.participantId
+                      << " m_nextPoint =" << m_simMovement.nextPoint
                       << " newPos =" << m_newPos.x() << "/" << m_newPos.y()
                       << " m_moveTime=" << m_moveTime
-                      << " length=" << m_segSpeed[m_simMovement.nextPoint()] * m_moveTime
+                      << " length=" << m_segSpeed[m_simMovement.nextPoint] * m_moveTime
                       << " step.length=" << step.length()
-                      << " m_speed=" << m_segSpeed[m_simMovement.nextPoint()]
+                      << " m_speed=" << m_segSpeed[m_simMovement.nextPoint]
                       << " m_moveTime=" << m_moveTime
                       << " m_actSegment.length=" << m_actSegment.length()
                       << " m_zone=" << m_zone;
@@ -308,12 +308,12 @@ void SimulationMovement::move()
 CentralEffectSimulation::Database::CesSimulatedMovement SimulationMovement::toDb(const CentralEffectSimulation::SimulatedMovement &ddsSimMovement)
 {
   CentralEffectSimulation::Database::CesSimulatedMovement ret;
-  ret.id = ddsSimMovement.id();
-  ret.name = QString::fromStdString(ddsSimMovement.name());
-  ret.startTime = ddsSimMovement.startTime();
-  ret.participantId = ddsSimMovement.participantId();
-  ret.repeat = ddsSimMovement.repeat();
-  ret.nextpoint = ddsSimMovement.nextPoint();
+  ret.id = ddsSimMovement.id;
+  ret.name = QString::fromStdString(ddsSimMovement.name);
+  ret.startTime = ddsSimMovement.startTime;
+  ret.participantId = ddsSimMovement.participantId;
+  ret.repeat = ddsSimMovement.repeat;
+  ret.nextpoint = ddsSimMovement.nextPoint;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
index 3ee740e30..7e15c8bd8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
@@ -32,13 +32,13 @@ public:
 
   ~SimulationMovement();
   void setSimulatedMovementRequest(const CentralEffectSimulation::SimulatedMovement &sml);
-  int id() const { return m_simMovement.id(); }
-  void setId(int id) { m_simMovement.id(id); }
-  int participantId() const { return m_simMovement.participantId(); }
+  int id() const { return m_simMovement.id; }
+  void setId(int id) { m_simMovement.id = id; }
+  int participantId() const { return m_simMovement.participantId; }
 
   void setJump(bool jump);
-  void setnextPoint(int nextPoint) { m_simMovement.nextPoint(nextPoint); }
-  int getNextPoint() const { return m_simMovement.nextPoint(); }
+  void setnextPoint(int nextPoint) { m_simMovement.nextPoint = nextPoint; }
+  int getNextPoint() const { return m_simMovement.nextPoint; }
   void publishSimulatedMovement();
   const CentralEffectSimulation::SimulatedMovement &simMovementData() const { return m_simMovement; }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
index 613046361..104eab2a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
@@ -54,7 +54,7 @@ bool BuildingModel::isValid(const LtsUtils::QPoint3D &point)
 
 bool BuildingModel::isValid(const Core::GeoPosition &point)
 {
-  return !qFuzzyIsNull(point.lon()) && !qFuzzyIsNull(point.lat()) && point.z() > invalidGeoPosition().z();
+  return !qFuzzyIsNull(point.lon) && !qFuzzyIsNull(point.lat) && point.z > invalidGeoPosition().z;
 }
 
 LtsUtils::QPoint3D BuildingModel::invalidPosition()
@@ -93,10 +93,10 @@ bool BuildingModel::init(
   m_buildingId = buildingId;
   TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_buildingId=" << m_buildingId;
 
-  m_angle = mse.angle() * M_PI / 180.;
-  m_refPosGeo = mse.geoPosition();
-  m_refPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(mse.geoPosition().lon(), mse.geoPosition().lat());
-  m_refPos = {m_refPosUtm.x, m_refPosUtm.y, m_refPosGeo.z()};
+  m_angle = mse.angle * M_PI / 180.;
+  m_refPosGeo = mse.geoPosition;
+  m_refPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(mse.geoPosition.lon, mse.geoPosition.lat);
+  m_refPos = {m_refPosUtm.x, m_refPosUtm.y, m_refPosGeo.z};
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START, m_buildingId=" << m_buildingId
                       << ", m_angle=" << m_angle
@@ -104,8 +104,8 @@ bool BuildingModel::init(
                       << ", m_refPos=" << m_refPos;
 
 
-  for (const InfrastructureManagement::FootprintElement &footprintElement : std::as_const(mfp.elements()))
-    m_footprint << QPointF(footprintElement.relPosition().offsetX(), footprintElement.relPosition().offsetY());
+  for (const InfrastructureManagement::FootprintElement &footprintElement : std::as_const(mfp.elements))
+    m_footprint << QPointF(footprintElement.relPosition.offsetX, footprintElement.relPosition.offsetY);
   if (m_footprint.isEmpty())
   {
     ERROR_LOG(m_logger) << "Error reading MainFootprint for building " << m_buildingId;
@@ -303,9 +303,9 @@ LtsUtils::QPoint3D BuildingModel::fromGeographic(const Core::GeoPosition &point)
 {
 //  qCritical() << " point.z = " << point.z();
 //  qCritical() << " m_refPos = " << m_refPos.x() << " - " << m_refPos.y() << " - " << m_refPos.z();
-  const LtsCoordTrans::UtmCoordinate utm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.lon(), point.lat());
+  const LtsCoordTrans::UtmCoordinate utm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.lon, point.lat);
 //  qCritical() << " utm = " << utm.mgrs(7);
-  return toReference({utm.x, utm.y, point.z()});
+  return toReference({utm.x, utm.y, point.z});
 }
 
 QVector<LtsUtils::QPoint3D> BuildingModel::fromGeographic(const std::vector<Core::GeoPosition> &points) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
index 7e00a25b7..63c5e670f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
@@ -16,6 +16,7 @@
 #include <QtCore/QPointF>
 #include <QtGui/QPolygonF>
 #include <QtCore/QTimer>
+#include <QtCore/QVariant>
 #include <QtGui/QTransform>
 
 #include <LtsUtilsCore/dds_bitarray.h>
@@ -92,34 +93,34 @@ bool HandlerAesData::init()
 void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onBoobyTrapChanged"
-                      << " id=" << data.id()
-                      << " impactPosition=" << data.impactPosition()
-                      << " impactRadius=" << data.impactRadius()
-                      << " effectStateId=" << data.effectStateId();
+                      << " id=" << data.id
+                      << " impactPosition=" << data.impactPosition
+                      << " impactRadius=" << data.impactRadius
+                      << " effectStateId=" << data.effectStateId;
 
-  if (data.isDeleted()
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
+  if (data.isDeleted
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved
       || modType == DataModification::eRemoved)
     return;
 
-  if (!data.triggered())
+  if (!data.triggered)
     return;
 
   INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
-                     << " data.id=" << data.id()
-                     << " effectStateId=" << data.effectStateId();
+                     << " data.id=" << data.id
+                     << " effectStateId=" << data.effectStateId;
 
-  if (!data.effectStart.is_set())
+  if (!data.effectStart.has_value())
     return;
 
-  if ((m_ddsHandler->currentPartitionTime() - (data.effectStart.get() + data.effectDuration())) > 2000)
+  if ((m_ddsHandler->currentPartitionTime() - (data.effectStart.get() + data.effectDuration)) > 2000)
   {
     INFO_LOG(m_logger) << "onBoobyTrap outdated";
     return;
   }
   AreaEffectSimulation::AesItemView itemView;
   AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap;
-  m_ddsHandler->dtcAes()->aesItemViewFromEntityId(data.id(), aesType, itemView);
+  m_ddsHandler->dtcAes()->aesItemViewFromEntityId(data.id, aesType, itemView);
 
   checkBuildingsHit(itemView);
 }
@@ -132,40 +133,40 @@ void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &d
 void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
   DEBUG_LOG(m_logger) << "onAesItemViewChanged"
-                      << " data.aesTypeId()=" <<  data.aesTypeId();
+                      << " data.aesTypeId()=" <<  data.aesTypeId;
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId;
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
   {
     INFO_LOG(m_logger) << "AesEffectState::EsExpired"
                        << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
-                       << " effectStart=" <<  data.effectStart()
-                       << " diff = " << m_ddsHandler->currentPartitionTime() - data.effectStart() ;
+                       << " effectStart=" <<  data.effectStart
+                       << " diff = " << m_ddsHandler->currentPartitionTime() - data.effectStart ;
     if (m_ddsHandler->currentPartitionTime() == 0)
       return;
 
-    if ((data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
-        || (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary))
+    if ((data.aesTypeId == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+        || (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrapSecondary))
     {
 
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
       {
-        DEBUG_LOG(m_logger) << "AtOffRouteMineSecondary id=" << data.id() / 1000;
-        auto offRouteMine = m_ddsHandler->dtcAes()->offRouteMine((int)(data.id() / 1000));
-        if (!offRouteMine.effectStart.is_set())
+        DEBUG_LOG(m_logger) << "AtOffRouteMineSecondary id=" << data.id / 1000;
+        auto offRouteMine = m_ddsHandler->dtcAes()->offRouteMine((int)(data.id / 1000));
+        if (!offRouteMine.effectStart.has_value())
         {
-          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart.is_set()";
+          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart.has_value()";
           return;
         }
         DEBUG_LOG(m_logger) << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
-                            << " effectStart=" <<  offRouteMine.effectStart()
-                            << " effectDuration=" << offRouteMine.effectDuration()
-                            << " diff = " << m_ddsHandler->currentPartitionTime() - (offRouteMine.effectStart.get() + offRouteMine.effectDuration()) ;
+                            << " effectStart=" <<  offRouteMine.effectStart
+                            << " effectDuration=" << offRouteMine.effectDuration
+                            << " diff = " << m_ddsHandler->currentPartitionTime() - (offRouteMine.effectStart.get() + offRouteMine.effectDuration) ;
 
-        if ((m_ddsHandler->currentPartitionTime() - (offRouteMine.effectStart.get() + offRouteMine.effectDuration())) < 2000)
+        if ((m_ddsHandler->currentPartitionTime() - (offRouteMine.effectStart.get() + offRouteMine.effectDuration)) < 2000)
         {
           DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
           checkBuildingsHit(data);
@@ -177,22 +178,22 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
           return;
         }
       }
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
       {
-        DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary id=" << data.id() / 1000;
+        DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary id=" << data.id / 1000;
         //auto offRouteMine = m_ddsHandler->dtcAes()->offRouteMine((int) (data.id() / 1000));
-        auto boobyTrap = m_ddsHandler->dtcAes()->boobyTrap((int)(data.id() / 1000));
-        if (!boobyTrap.effectStart.is_set())
+        auto boobyTrap = m_ddsHandler->dtcAes()->boobyTrap((int)(data.id / 1000));
+        if (!boobyTrap.effectStart.has_value())
         {
-          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart.is_set()";
+          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart.has_value()";
           return;
         }
         DEBUG_LOG(m_logger) << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
-                            << " effectStart=" <<  boobyTrap.effectStart()
-                            << " effectDuration=" << boobyTrap.effectDuration()
-                            << " diff = " << m_ddsHandler->currentPartitionTime() - (boobyTrap.effectStart.get() + boobyTrap.effectDuration()) ;
+                            << " effectStart=" <<  boobyTrap.effectStart
+                            << " effectDuration=" << boobyTrap.effectDuration
+                            << " diff = " << m_ddsHandler->currentPartitionTime() - (boobyTrap.effectStart.get() + boobyTrap.effectDuration) ;
 
-        if ((m_ddsHandler->currentPartitionTime() - (boobyTrap.effectStart.get() + boobyTrap.effectDuration())) < 2000)
+        if ((m_ddsHandler->currentPartitionTime() - (boobyTrap.effectStart.get() + boobyTrap.effectDuration)) < 2000)
         {
           DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
           checkBuildingsHit(data);
@@ -207,20 +208,20 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
 
       DEBUG_LOG(m_logger) << "removeStates data";
       removeStates(data);
-      DEBUG_LOG(m_logger) << "m_aesItemViewsUtm remove id" << data.aesItemId();
-      m_aesItemViewsUtm.remove(data.aesItemId());
+      DEBUG_LOG(m_logger) << "m_aesItemViewsUtm remove id" << data.aesItemId;
+      m_aesItemViewsUtm.remove(data.aesItemId);
     }
   }
 }
 
 void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data)
 {
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionArea)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtExplosionArea)
     return;
-  DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId();
+  DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId;
   // remove State for each building
   for (CentralEffectSimulation::BitfieldStates &bfs : m_bitfieldStatesBld)
-    bfs.remove(data.aesItemId());
+    bfs.remove(data.aesItemId);
 } // end removeStates
 
 void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::ChargeStruct &chargeStruct,
@@ -238,24 +239,24 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char
   for (const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint : std::as_const(footprints))
   {
 
-    const Core::GeoPosition2D impactPosition2D(impactPosition.lon(), impactPosition.lat());
+    const Core::GeoPosition2D impactPosition2D(impactPosition.lon, impactPosition.lat);
     if (inFootprint(impactPosition, footprint, impactRadius))
     {
       DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
-                          << " chargeTypeId = " << chargeStruct.chargeTypeId()
+                          << " chargeTypeId = " << chargeStruct.chargeTypeId
                           << " id = " << id
                           << " currentPartitionTime = " << m_ddsHandler->currentPartitionTime()
-                          << " impactPosition2D.lon = " << impactPosition2D.lon()
-                          << " impactPosition2D.lat = " << impactPosition2D.lat();
+                          << " impactPosition2D.lon = " << impactPosition2D.lon
+                          << " impactPosition2D.lat = " << impactPosition2D.lat;
 
       Buildings::SendCesHitOnBuildingRequest requestBld(
             footprint.mseId,
-            chargeStruct.chargeTypeId(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(chargeStruct.chargeTypeId()).destructiveFactor(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(chargeStruct.chargeTypeId()).penetrationFactor(),
+            chargeStruct.chargeTypeId,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(chargeStruct.chargeTypeId).destructiveFactor,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(chargeStruct.chargeTypeId).penetrationFactor,
             id,
             m_ddsHandler->currentPartitionTime(),
-            Core::GeoPosition(impactPosition2D.lon(), impactPosition2D.lat(), 0.0),
+            Core::GeoPosition(impactPosition2D.lon, impactPosition2D.lat, 0.0),
             QStringLiteral("properties").toStdString());
       m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
     }
@@ -292,8 +293,8 @@ void HandlerAesData::onStartTimeReached()
 
   // Timer stoppen und loeschen
   AreaEffectSimulation::ChargeEffect data = m_chargeEffects.value(chargeEffectId);
-  AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId(),data.igniterTypeId(), data.igniterFunctionId());
-  calculateBuildingExplosion(chargeStruct, data.position(), data.id());
+  AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId,data.igniterTypeId, data.igniterFunctionId);
+  calculateBuildingExplosion(chargeStruct, data.position, data.id);
   sender()->deleteLater();
   m_chargeEffects.remove(chargeEffectId);
 }
@@ -303,7 +304,7 @@ void HandlerAesData::onChargeEffectChanged(const AreaEffectSimulation::ChargeEff
   DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged";
   if (modType == DataModification::eRemoved)
     return;
-  const long long effectStart = data.effectStart();
+  const long long effectStart = data.effectStart;
 
   DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged"
                       << ", effectStart=" << effectStart
@@ -318,23 +319,23 @@ void HandlerAesData::onChargeEffectChanged(const AreaEffectSimulation::ChargeEff
   }
   // Startzeit entspricht der aktuellen Zeit
   if (    effectStart > m_ddsHandler->currentPartitionTime() - TIMEDIFFVALID
-       && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration() )
+       && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration )
   {
     DEBUG_LOG(m_logger) << "Startzeit entspricht der aktuellen Zeit";
     AreaEffectSimulation::ChargeStruct chargeStruct;
-    chargeStruct.chargeTypeId(data.chargeTypeId());
-    chargeStruct.igniterTypeId(data.igniterTypeId());
-    calculateBuildingExplosion(chargeStruct, data.position(), data.id());
+    chargeStruct.chargeTypeId = data.chargeTypeId;
+    chargeStruct.igniterTypeId = data.igniterTypeId;
+    calculateBuildingExplosion(chargeStruct, data.position, data.id);
   }
   // Startzeit in der Zukunft:
-  else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration())
+  else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration)
   {
     // Start mit Timer
     DEBUG_LOG(m_logger) << "Startzeit in der Zukunft"
-                         << ", id :" << data.id()
+                         << ", id :" << data.id
                          << ", duration=" << effectStart - m_ddsHandler->currentPartitionTime();
-    m_chargeEffects.insert(data.id(), data);
-    startTimer(data.id(), effectStart - m_ddsHandler->currentPartitionTime());
+    m_chargeEffects.insert(data.id, data);
+    startTimer(data.id, effectStart - m_ddsHandler->currentPartitionTime());
   }
   DEBUG_LOG(m_logger) << "END onChargeEffectChanged";
 
@@ -346,30 +347,30 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
   {
-    m_explosionSingleState.remove(data.id());
+    m_explosionSingleState.remove(data.id);
     return;
   }
 
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
   {
     DEBUG_LOG(m_logger) << "Remove SingleExplosion";
-    m_explosionSingleState.remove(data.id());
+    m_explosionSingleState.remove(data.id);
     return;
   }
   // Only handle transitions from prepared or fired to activated
-  if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared ||
-       m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) &&
-      data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+  if ((m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsPrepared ||
+       m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsFired) &&
+      data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
   {
     DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
-  m_explosionSingleState.insert(data.id(), data.effectStateId());
+  m_explosionSingleState.insert(data.id, data.effectStateId);
 
   DEBUG_LOG(m_logger) << "Got ExplosionSingle";
   if (handleExplosion)
   {
-    calculateBuildingExplosion(data.chargeStruct(), data.impactPosition(), data.id());
+    calculateBuildingExplosion(data.chargeStruct, data.impactPosition, data.id);
   }
 } // onExplosionSingleChanged
 
@@ -377,10 +378,10 @@ void HandlerAesData::onAirSupportImpactChanged(const AreaEffectSimulation::AirSu
 {
   DEBUG_LOG(m_logger) << "Got onAirSupportImpactChanged()";
   AreaEffectSimulation::ExplosionSingle esData;
-  esData.id(data.id());
-  esData.chargeStruct().chargeTypeId(data.chargeStruct().chargeTypeId());
-  esData.impactPosition(data.impactPosition());
-  esData.effectStateId(data.effectStateId());
+  esData.id = data.id;
+  esData.chargeStruct.chargeTypeId = data.chargeStruct.chargeTypeId;
+  esData.impactPosition = data.impactPosition;
+  esData.effectStateId = data.effectStateId;
   onExplosionSingleChanged(esData, modType);
 }
 
@@ -400,7 +401,7 @@ void HandlerAesData::onEffectsChanged(const AreaEffectSimulation::Effects &effec
   if (modType == DataModification::eRemoved)
     return;
 
-  if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (effects.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
     return;
 
   DEBUG_LOG(m_logger) << " Got typechecked effects " << effects;
@@ -470,22 +471,22 @@ bool HandlerAesData::inFootprint(const Core::GeoPosition2D &geoPosition,
 
 void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data)
 {
-  if (data.id() <= 0)
+  if (data.id <= 0)
     return;
   DEBUG_LOG(m_logger) << "preCalculateImpacts";
   // Find AES ItemView and set Bounding-Box of Aes-Field
 
-  const int aesItemId = data.aesItemId();
+  const int aesItemId = data.aesItemId;
 
   // Search corresponding itemView. If not available no impact to participant.
   // Use dtcAes since sender (AES) publishes TriggeredImpacts and AesItemView
   //
   AreaEffectSimulation::AesItemView aesItemView;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc> dtcAes = m_ddsHandler->dtcAes();
-  if (!dtcAes->aesItemViewFromEntityId(aesItemId, data.aesTypeId(), aesItemView))
+  if (!dtcAes->aesItemViewFromEntityId(aesItemId, data.aesTypeId, aesItemView))
   {
     static long msgCnt = 0;
-    WARNING_LOG(m_logger) << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available"
+    WARNING_LOG(m_logger) << "TriggeredExplosions.aesItemId=" << data.aesItemId << " No aesItemView available"
                           << " (cnt=" << ++msgCnt << ")";
     return;
   }
@@ -543,7 +544,7 @@ void HandlerAesData::onSetBuildingStatesReply(const Core::FunctionReplyObject &r
 void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data, const AreaEffectSimulation::AesItemView &aesItemView,
                                       const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint)
 {
-  const int aesItemId = data.aesItemId();
+  const int aesItemId = data.aesItemId;
   bool bIsExplosionCluster = false;
   ProjectDataManagement::IgniterFunctionBase ignFuncBase = ProjectDataManagement::IgniterFunctionBase::IfbImpact;
 
@@ -556,14 +557,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
     AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions,
   };
 
-  if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (data.aesTypeId == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
   {
     bIsExplosionCluster = true;
     ignFuncBase = igniterFunctionBaseExplosionCluster(aesItemId); // assume that fuseType does not differ within a single ExplosionArea
     DEBUG_LOG(m_logger) << "Calculate, bIsExplosionCluster = " << bIsExplosionCluster
                         << ", ignFuncBase = " << ignFuncBase;
   }
-  else if (s_relevantTypes.contains(data.aesTypeId().underlying()))
+  else if (s_relevantTypes.contains(data.aesTypeId))
     DEBUG_LOG(m_logger) << "Calculate";
   else
   {
@@ -571,11 +572,11 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
     return;
   }
 
-  if (aesItemId != aesItemView.aesItemId())
+  if (aesItemId != aesItemView.aesItemId)
   {
     WARNING_LOG(m_logger) << "mismatch: "
-                          << ", TriggeredExplosions.aesItemId=" << data.aesItemId()
-                          << ", AesItemView.aesItemId=" << aesItemView.aesItemId();
+                          << ", TriggeredExplosions.aesItemId=" << data.aesItemId
+                          << ", AesItemView.aesItemId=" << aesItemView.aesItemId;
     return;
   }
 
@@ -589,24 +590,24 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   for (int i : std::as_const(bitfieldState))
     DEBUG_LOG(m_logger) << "bitfieldState for " << aesItemId << ": " << i;
 
-  for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
+  for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount; ++bitFieldIdx)
   {
     // no break, because every bit can be a hit
-    if (LtsUtils::BitArray::testBit(data.bitfield(), bitFieldIdx))
+    if (LtsUtils::BitArray::testBit(data.bitfield, bitFieldIdx))
       continue;
 
     // get position of impact to corresponding bit
-    if (aesItemView.form().size() <= size_t(bitFieldIdx))
+    if (aesItemView.form.size() <= size_t(bitFieldIdx))
       continue;
 
-    const Core::GeoPosition &impactPosition = aesItemView.form()[bitFieldIdx];
+    const Core::GeoPosition &impactPosition = aesItemView.form[bitFieldIdx];
     DEBUG_LOG(m_logger) << LOGFUNCTION
-                        << " impactPosition: lat/lon" << impactPosition.lat() << "/" << impactPosition.lon() << " z=" << impactPosition.z()
+                        << " impactPosition: lat/lon" << impactPosition.lat << "/" << impactPosition.lon << " z=" << impactPosition.z
                         << " UTM=" << CentralEffectSimulation::debug(CentralEffectSimulation::geographic2Utm(impactPosition));
 
     // check, if impact-pos + munition-radius touch the building
     // get radius of munition
-    const double impactRadius = m_ddsHandler->chargeTypeRadius(aesItemView.chargeStruct());
+    const double impactRadius = m_ddsHandler->chargeTypeRadius(aesItemView.chargeStruct);
     if (inFootprint(impactPosition, footprint, impactRadius))
     {
       DEBUG_LOG(m_logger) << "In Footprint of mseId = " << footprint.mseId;
@@ -620,7 +621,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
                             << ", bitFieldIdx= " << bitFieldIdx
                             << ", ignFuncBase = " << ignFuncBase;
 
-        if (! qFuzzyIsNull(impactPosition.z()))
+        if (! qFuzzyIsNull(impactPosition.z))
         {
           // since HandlerBuildingModel::handleDetonationLocationRequest has already
           // calculated to fuseType, the impactPosition is the detonationLocation:
@@ -628,7 +629,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
           //
 
           double detonationDistance = 0;
-          switch (ignFuncBase.underlying())
+          switch (ignFuncBase)
           {
           case ProjectDataManagement::IgniterFunctionBase::IfbProximity:
             detonationDistance = -5;
@@ -646,9 +647,9 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
 
           Buildings::SendCesHit3DonBuildingRequest requestBld(
             footprint.mseId,
-            aesItemView.chargeStruct().chargeTypeId(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct().chargeTypeId()).destructiveFactor(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct().chargeTypeId()).penetrationFactor(),
+            aesItemView.chargeStruct.chargeTypeId,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct.chargeTypeId).destructiveFactor,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct.chargeTypeId).penetrationFactor,
             aesItemId,
             m_ddsHandler->currentPartitionTime(),
             impactPosition,
@@ -667,12 +668,12 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
           // z-Value is 0 -> old / ! AtExplosionClusterSingleExplosions
           Buildings::SendCesHitOnBuildingRequest requestBld(
             footprint.mseId,
-            aesItemView.chargeStruct().chargeTypeId(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct().chargeTypeId()).destructiveFactor(),
-            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct().chargeTypeId()).penetrationFactor(),
+            aesItemView.chargeStruct.chargeTypeId,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct.chargeTypeId).destructiveFactor,
+            m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(aesItemView.chargeStruct.chargeTypeId).penetrationFactor,
             aesItemId,
             m_ddsHandler->currentPartitionTime(),
-            Core::GeoPosition(impactPosition.lon(), impactPosition.lat(), 0.0),
+            Core::GeoPosition(impactPosition.lon, impactPosition.lat, 0.0),
             QStringLiteral("properties").toStdString());
 
           DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
@@ -692,31 +693,31 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
 
 void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effects, const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint)
 {
-  if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (effects.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
     return;
 
-  const int aesItemId = effects.aesItemId();
+  const int aesItemId = effects.aesItemId;
   DEBUG_LOG(m_logger) << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << aesItemId;
 
-  const AreaEffectSimulation::ExplosionCluster &ec = m_ddsHandler->dtcAes()->explosionCluster(effects.aesItemId());
-  if (ec.id() != aesItemId)
+  const AreaEffectSimulation::ExplosionCluster &ec = m_ddsHandler->dtcAes()->explosionCluster(effects.aesItemId);
+  if (ec.id != aesItemId)
     return;
 
   const ProjectDataManagement::IgniterFunctionBase ignFuncBase = igniterFunctionBaseExplosionCluster(aesItemId);
-  const double impactRadius                                    = m_ddsHandler->chargeTypeRadius(ec.chargeStruct());
+  const double impactRadius                                    = m_ddsHandler->chargeTypeRadius(ec.chargeStruct);
 
 
   CentralEffectSimulation::BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
   QSet<int> &bitfieldState = bitfieldStates[aesItemId];
 
-  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects();
+  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects;
   int indexBitFieldIdx = -1;
   for (const AreaEffectSimulation::SingleEffect &singleEffect : std::as_const(singleEffectsRef))
   {
     ++indexBitFieldIdx;
 
     // just SesTriggered are relevant:
-    if (singleEffect.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
+    if (singleEffect.singleEffectState != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
       continue;
 
     // already processed?
@@ -724,7 +725,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
       continue;
 
     // is building in range?
-    const Core::GeoPosition &impactPositionGeo = singleEffect.position();
+    const Core::GeoPosition &impactPositionGeo = singleEffect.position;
     if (!inFootprint(impactPositionGeo, footprint, impactRadius))
       continue;
 
@@ -744,13 +745,13 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
     DEBUG_LOG(m_logger) << "findBuildingsBetween returns mseIdAsStr =" << mseIdAsStr;
 
 
-    const ProjectDataManagement::BuildingChargeEffect &bldgChargeEffect = m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(ec.chargeStruct().chargeTypeId());
-    if (bldgChargeEffect.id() <= 0)
-      ERROR_LOG(m_logger) << "getBuildingChargeEffectByChargeTypeId failed, chargeTypeId not found: =" << ec.chargeStruct().chargeTypeId();
+    const ProjectDataManagement::BuildingChargeEffect &bldgChargeEffect = m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(ec.chargeStruct.chargeTypeId);
+    if (bldgChargeEffect.id <= 0)
+      ERROR_LOG(m_logger) << "getBuildingChargeEffectByChargeTypeId failed, chargeTypeId not found: =" << ec.chargeStruct.chargeTypeId;
 
 
-    qint32 destructiveFactor = bldgChargeEffect.destructiveFactor();
-    qint32 penetrationFactor = bldgChargeEffect.penetrationFactor();
+    qint32 destructiveFactor = bldgChargeEffect.destructiveFactor;
+    qint32 penetrationFactor = bldgChargeEffect.penetrationFactor;
 
     if ((destructiveFactor <= 0) || (penetrationFactor <= 0))
       WARNING_LOG(m_logger) << "getBuildingChargeEffectByChargeTypeId failed, destructiveFactor or penetrationFactor invalid"
@@ -769,25 +770,25 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
     properties += mseIdAsStr;
 
 
-    const AreaEffectSimulation::AesZPlacement zPlacement = static_cast<AreaEffectSimulation::AesZPlacement>(singleEffect.zPlacement());
+    const AreaEffectSimulation::AesZPlacement zPlacement = static_cast<AreaEffectSimulation::AesZPlacement>(singleEffect.zPlacement);
 
     if (zPlacement == AreaEffectSimulation::AesZPlacement::ZpDraped)
     {
       // z-Value is 0 -> old:
       Buildings::SendCesHitOnBuildingRequest requestBld(
         footprint.mseId,
-        ec.chargeStruct().chargeTypeId(),
+        ec.chargeStruct.chargeTypeId,
         destructiveFactor,
         penetrationFactor,
         aesItemId,
         m_ddsHandler->currentPartitionTime(),
-        Core::GeoPosition(impactPositionGeo.lon(), impactPositionGeo.lat(), 0.0),
+        Core::GeoPosition(impactPositionGeo.lon, impactPositionGeo.lat, 0.0),
         properties.toStdString());
 
       DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
                           << " bitFieldIdx= " << indexBitFieldIdx
                           << ", impactPositionGeo= " << impactPositionGeo
-                          << ", chargeTypeId= " << ec.chargeStruct().chargeTypeId()
+                          << ", chargeTypeId= " << ec.chargeStruct.chargeTypeId
                           << ", destructiveFactor= " << destructiveFactor
                           << ", penetrationFactor= " << penetrationFactor;
       m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
@@ -801,7 +802,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
       Core::GeoPosition detonationLocation = impactPositionGeo;
 
       double detonationDistance = 0;
-      switch (ignFuncBase.underlying())
+      switch (ignFuncBase)
       {
       case ProjectDataManagement::IgniterFunctionBase::IfbProximity:
         detonationDistance = -5;
@@ -821,7 +822,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
 
       Buildings::SendCesHit3DonBuildingRequest requestBld(
         footprint.mseId,
-        ec.chargeStruct().chargeTypeId(),
+        ec.chargeStruct.chargeTypeId,
         destructiveFactor,
         penetrationFactor,
         aesItemId,
@@ -835,7 +836,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
                           << " bitFieldIdx= " << indexBitFieldIdx
                           << ", impactPosition= " << impactPositionGeo
                           << ", zPlacement= " << zPlacement
-                          << ", chargeTypeId= " << ec.chargeStruct().chargeTypeId()
+                          << ", chargeTypeId= " << ec.chargeStruct.chargeTypeId
                           << ", destructiveFactor= " << destructiveFactor
                           << ", penetrationFactor= " << penetrationFactor;
 
@@ -851,16 +852,16 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
   const int exerciseId      = m_ddsHandler->getExerciseId();
   QPolygonF polyGeo;
 
-  DEBUG_LOG(m_logger) << "checkBuildingsHit " << ", aesItemId=" << data.aesItemId();
+  DEBUG_LOG(m_logger) << "checkBuildingsHit " << ", aesItemId=" << data.aesItemId;
 
-  DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary data.form().size()=" << data.form().size();
+  DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary data.form().size()=" << data.form.size();
   // BoobyTrap
-  polyGeo.reserve(data.form().size());
-  for (const auto &pointGeo : std::as_const(data.form()))
+  polyGeo.reserve(data.form.size());
+  for (const auto &pointGeo : std::as_const(data.form))
   {
     QPointF point;
-    point.setX(pointGeo.lon());
-    point.setY(pointGeo.lat());
+    point.setX(pointGeo.lon);
+    point.setY(pointGeo.lat);
     DEBUG_LOG(m_logger) << "point= " << point.x() << "/" << point.y();
     polyGeo.append(point);
   }
@@ -877,28 +878,28 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
   {
     DEBUG_LOG(m_logger) << " BuildingId=" << buildingId;
     Buildings::Building tmpBldg;
-    tmpBldg.buildingId(buildingId);
+    tmpBldg.buildingId = buildingId;
 
     Core::GeoPosition impactPosition;
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
     {
-      impactPosition.lat(m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId()).impactPosition().lat());
-      impactPosition.lon(m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId()).impactPosition().lon());
+      impactPosition.lat = m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId).impactPosition.lat;
+      impactPosition.lon = m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId).impactPosition.lon;
     }
-    else if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+    else if (data.aesTypeId == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
     {
       int zone = -1;
-      LtsCoordTrans::UtmCoordinate bottomLeft = LtsCoordTrans::UtmCoordinate::fromGeographic(data.boundingBoxBottomLeft().lon(), data.boundingBoxBottomLeft().lat(), zone);
-      LtsCoordTrans::UtmCoordinate topRight = LtsCoordTrans::UtmCoordinate::fromGeographic(data.boundingBoxTopRight().lon(), data.boundingBoxTopRight().lat(), zone);
+      LtsCoordTrans::UtmCoordinate bottomLeft = LtsCoordTrans::UtmCoordinate::fromGeographic(data.boundingBoxBottomLeft.lon, data.boundingBoxBottomLeft.lat, zone);
+      LtsCoordTrans::UtmCoordinate topRight = LtsCoordTrans::UtmCoordinate::fromGeographic(data.boundingBoxTopRight.lon, data.boundingBoxTopRight.lat, zone);
 
 
       LtsCoordTrans::UtmCoordinate impactPosPoint(topRight.zone, ((topRight.x + bottomLeft.x) / 2), ((topRight.y + bottomLeft.y) / 2), true);
       impactPosPoint.zone = topRight.zone;
 
       QPointF pointGeo = impactPosPoint.geographic();
-      impactPosition.lon(pointGeo.x());
-      impactPosition.lat(pointGeo.y());
-      DEBUG_LOG(m_logger) << "impactPosition lon/lat=" << impactPosition.lon() << "/" << impactPosition.lat()
+      impactPosition.lon = pointGeo.x();
+      impactPosition.lat = pointGeo.y();
+      DEBUG_LOG(m_logger) << "impactPosition lon/lat=" << impactPosition.lon << "/" << impactPosition.lat
                           << " impactPosPoint.zone" << impactPosPoint.zone
                           << " impactPosPoint=" << impactPosPoint.x << "/" << impactPosPoint.y
                           << " topRight=" << topRight.x << "/" << topRight.y
@@ -906,17 +907,17 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
     }
 
     Buildings::SendCesHitOnBuildingRequest requestBld(
-      tmpBldg.buildingId(),
-      data.chargeStruct().chargeTypeId(),
-      m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(data.chargeStruct().chargeTypeId()).destructiveFactor(),
-      m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(data.chargeStruct().chargeTypeId()).penetrationFactor(),
-      data.aesItemId(),
+      tmpBldg.buildingId,
+      data.chargeStruct.chargeTypeId,
+      m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(data.chargeStruct.chargeTypeId).destructiveFactor,
+      m_ddsHandler->dtcPdm()->getBuildingChargeEffectByChargeTypeId(data.chargeStruct.chargeTypeId).penetrationFactor,
+      data.aesItemId,
       m_ddsHandler->currentPartitionTime(),
       impactPosition,
       QStringLiteral("properties").toStdString());
 
 
-    DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << data.aesItemId()
+    DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << data.aesItemId
                         << ", impactPosition= " << impactPosition;
     m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
index cbf90d640..d0ada3328 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
@@ -59,14 +59,14 @@ public:
   AreaEffectSimulation::AesItemView itemView(const int &aesId) const { return m_aesItemViews.value(aesId); }
   ProjectDataManagement::IgniterFunctionBase igniterFunctionBaseExplosionCluster(const int &aesId) const
   {
-    auto chargeStruct = m_ddsHandler->dtcAes()->explosionCluster(aesId).chargeStruct();
-    return m_ddsHandler->dtcPdm()->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId(),
-                                                                           chargeStruct.igniterTypeId(),
-                                                                           chargeStruct.igniterFunctionId()).igniterFunctionBaseId();
+    auto chargeStruct = m_ddsHandler->dtcAes()->explosionCluster(aesId).chargeStruct;
+    return m_ddsHandler->dtcPdm()->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId,
+                                                                           chargeStruct.igniterTypeId,
+                                                                           chargeStruct.igniterFunctionId).igniterFunctionBaseId;
   }
   int chargeTypeId(const int &aesId) const
   {
-    return m_ddsHandler->dtcAes()->explosionCluster(aesId).chargeStruct().chargeTypeId();
+    return m_ddsHandler->dtcAes()->explosionCluster(aesId).chargeStruct.chargeTypeId;
   }
 
 protected:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
index eb5e80498..72caffe39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
@@ -89,8 +89,8 @@ HandlerBuildingModelInterface::LineBuildingIntersectionResult HandlerBuildingMod
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
-  newRequest.line(line);
-  newRequest.requestId(requestIdOpt);
+  newRequest.line = line;
+  newRequest.requestId = requestIdOpt;
 
   const bool justForLineOfSight = false;
   const CentralEffectSimulation::GetLineBuildingIntersectionReply &reply =
@@ -101,9 +101,9 @@ HandlerBuildingModelInterface::LineBuildingIntersectionResult HandlerBuildingMod
 
   LineBuildingIntersectionResult result;
   result.requestId    = requestIdOpt;
-  result.errorString  = reply.errorString();
-  result.errorParams  = reply.errorParams();
-  result.intersection = reply.intersection();
+  result.errorString  = reply.errorString;
+  result.errorParams  = reply.errorParams;
+  result.intersection = reply.intersection;
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
   return result;
@@ -114,8 +114,8 @@ HandlerBuildingModelInterface::LineBuildingIntersectsResult HandlerBuildingModel
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
-  newRequest.line(line);
-  newRequest.requestId(requestIdOpt);
+  newRequest.line = line;
+  newRequest.requestId = requestIdOpt;
 
   const bool justForLineOfSight = true;
   const CentralEffectSimulation::GetLineBuildingIntersectionReply &reply =
@@ -126,9 +126,9 @@ HandlerBuildingModelInterface::LineBuildingIntersectsResult HandlerBuildingModel
 
   LineBuildingIntersectsResult result;
   result.requestId    = requestIdOpt;
-  result.errorString  = reply.errorString();
-  result.errorParams  = reply.errorParams();
-  result.intersects   = ! std::isnan(reply.intersection().lat()); // ! std::isnan
+  result.errorString  = reply.errorString;
+  result.errorParams  = reply.errorParams;
+  result.intersects   = ! std::isnan(reply.intersection.lat); // ! std::isnan
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
   return result;
@@ -136,7 +136,7 @@ HandlerBuildingModelInterface::LineBuildingIntersectsResult HandlerBuildingModel
 
 void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  const int mseBldgId = data.id();
+  const int mseBldgId = data.id;
 
   TRACE_LOG(m_logger) << "MainStructureElement === " << data;
 
@@ -152,7 +152,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
   }
 
   // skip "Outdoor Cameras / Announcement Units"
-  if (data.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building)
+  if (data.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
     return;
 
   // Vor allem in der GUEZ-DB sind ca 23 Gebäude per Hand eingefügt. (Sakralbau, Bahnhof, Wasserwerk etc.)
@@ -160,13 +160,13 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
   // Für diese steht natürlich kein Verwundungsmodell zur Verfügung.
   // Wie können wir diese erkennen und hier überspringen?
   // Ich habe keine bessere Möglichkeit gefunden als diese:
-  const Core::GeoPosition &geoPos = data.geoPosition();
-  if (qFuzzyIsNull(geoPos.z()))
+  const Core::GeoPosition &geoPos = data.geoPosition;
+  if (qFuzzyIsNull(geoPos.z))
   {
     INFO_LOG(m_logger) << "BuildingId " << mseBldgId
                        << " kann übersprungen werden, da von Hand importiert."
-                       << ", name: '" << data.name() << "'"
-                       << ", name: '" << data.description() << "'";
+                       << ", name: '" << data.name << "'"
+                       << ", name: '" << data.description << "'";
     return;
   }
 
@@ -186,7 +186,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
   }
 
   DEBUG_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << mseBldgId
-                      << " properties=" << data.properties();
+                      << " properties=" << data.properties;
 
 
 //  const QVector<int> buildingIds = m_ddsHandler->dtcIsm()->getBuildingIdsByExercise(exerciseId);
@@ -194,9 +194,9 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
 //  QMap<int, InfrastructureManagement::VulnerabilityModelData> vulnerabilityModelData;
 
   // InfrastructureManagement::VulnerabilityModelData vulnerabilityModelDataEle;
-  QByteArray vulnerabilityModelData = m_ddsHandler->dtcIsm()->getVulnerabilityModelData(data.id());
+  QByteArray vulnerabilityModelData = m_ddsHandler->dtcIsm()->getVulnerabilityModelData(data.id);
   TRACE_LOG(m_logger) << "vulnerabilityModelData=" << vulnerabilityModelData
-                      << " id=" << data.id();
+                      << " id=" << data.id;
 
 
 //  int id = -1;
@@ -245,7 +245,7 @@ void HandlerBuildingModel::onGetLineBuildingIntersectionRequest(const rti::core:
                                                                 const CentralEffectSimulation::GetLineBuildingIntersectionRequest &request)
 {
   const int exerciseId = m_ddsHandler->getExerciseId();
-  DEBUG_LOG(m_logger) << "START onGetLineBuildingIntersectionRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "START onGetLineBuildingIntersectionRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId << "'";
 
   const bool justForLineOfSight = false;
   const CentralEffectSimulation::GetLineBuildingIntersectionReply &reply = getLineBuildingIntersectionInternal(request, justForLineOfSight);
@@ -253,34 +253,34 @@ void HandlerBuildingModel::onGetLineBuildingIntersectionRequest(const rti::core:
   // sendReply
   m_ddsHandler->ftsCes()->getLineBuildingIntersectionReply(cookie, reply);
 
-  DEBUG_LOG(m_logger) << "END onGetLineBuildingIntersectionRequest, request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "END onGetLineBuildingIntersectionRequest, request '" << request.requestId << "'";
 }
 
 void HandlerBuildingModel::onGetLineBuildingIntersectsRequest(const rti::core::SampleIdentity &cookie,
                                                               const CentralEffectSimulation::GetLineBuildingIntersectsRequest &request)
 {
   const int exerciseId = m_ddsHandler->getExerciseId();
-  DEBUG_LOG(m_logger) << "START onGetLineBuildingIntersectsRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "START onGetLineBuildingIntersectsRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId << "'";
 
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
-  newRequest.line(request.line());
-  newRequest.requestId(request.requestId());
+  newRequest.line = request.line;
+  newRequest.requestId = request.requestId;
 
   const bool justForLineOfSight = true;
   const CentralEffectSimulation::GetLineBuildingIntersectionReply &reply = getLineBuildingIntersectionInternal(newRequest, justForLineOfSight);
 
   // sendReply
   CentralEffectSimulation::GetLineBuildingIntersectsReply newReply;
-  newReply.id(reply.id());
-  newReply.errorString(reply.errorString());
-  newReply.errorParams(reply.errorParams());
-  newReply.requestId(reply.requestId());
-  newReply.intersects(! std::isnan(reply.intersection().lat()));    // ! std::isnan
+  newReply.id = reply.id;
+  newReply.errorString = reply.errorString;
+  newReply.errorParams = reply.errorParams;
+  newReply.requestId = reply.requestId;
+  newReply.intersects = ! std::isnan(reply.intersection.lat);    // ! std::isnan
 
   m_ddsHandler->ftsCes()->getLineBuildingIntersectsReply(cookie, newReply);
 
-  DEBUG_LOG(m_logger) << "END onGetLineBuildingIntersectsRequest, request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "END onGetLineBuildingIntersectsRequest, request '" << request.requestId << "'";
 }
 
 
@@ -301,29 +301,29 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
   const int exerciseId = m_ddsHandler->getExerciseId();
 
-  DEBUG_LOG(m_logger) << "START getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
-                      << ", request.line().size() = " << request.line().size();
+  DEBUG_LOG(m_logger) << "START getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId << "'"
+                      << ", request.line().size() = " << request.line.size();
 
   CentralEffectSimulation::GetLineBuildingIntersectionReply reply;
-  reply.requestId(request.requestId());
+  reply.requestId = request.requestId;
   // prepare invalid 'answer'
-  reply.intersection(s_invalidPos);
+  reply.intersection = s_invalidPos;
 
   // empty (poly-)line
   // (think of  a trajectory)
-  const std::vector<Core::GeoPosition> &polylineRef = request.line();
+  const std::vector<Core::GeoPosition> &polylineRef = request.line;
   if (polylineRef.size() < 2)
   {
-    reply.errorString("insufficiant number of points");
-    WARNING_LOG(m_logger) << "getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
-                          << ", error: '" << reply.errorString() << "'";
+    reply.errorString = "insufficiant number of points";
+    WARNING_LOG(m_logger) << "getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId << "'"
+                          << ", error: '" << reply.errorString << "'";
     return reply;
   }
 
   QPolygonF polygon2D;
   polygon2D.reserve(polylineRef.size());
   for (const Core::GeoPosition &geoPos : std::as_const(polylineRef))
-    polygon2D << QPointF(geoPos.lon(), geoPos.lat());
+    polygon2D << QPointF(geoPos.lon, geoPos.lat);
 
   // Only the buildings where the line/trajectory flies over the building footprint are taken into account.
   bool completeEnclosed = false;
@@ -389,11 +389,11 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
       const Buildings::BuildingState &buildingState = dtcBld->buildingState(bldgId);
       // if buildingState is not found, assume intact:
-      if (/*(buildingState.id() == bldgId) && */(buildingState.damagePercent() >= 80))
+      if (/*(buildingState.id() == bldgId) && */(buildingState.damagePercent >= 80))
       {
         WARNING_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                               << ", lineSegmentIdx=" << lineSegmentIdx
-                              << ", damagePercent > 80% (" << buildingState.damagePercent() << ")";
+                              << ", damagePercent > 80% (" << buildingState.damagePercent << ")";
         continue;
       }
 
@@ -467,8 +467,8 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       // justForLineOfSight :
       if (justForLineOfSight)
       {
-        reply.intersection(intersection);
-        DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, return due to justForLineOfSight " << request.requestId() << "'";
+        reply.intersection = intersection;
+        DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, return due to justForLineOfSight " << request.requestId << "'";
         return reply;
       }
       // : justForLineOfSight
@@ -482,7 +482,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
           DEBUG_LOG(m_logger) << "Building " << buildingModel->buildingId() << " was hit prior to building " << buildingId << ".";
         buildingId = buildingModel->buildingId();
         distance = dist;
-        reply.intersection(intersection);
+        reply.intersection = intersection;
         if (segmentIdxOfIntersectionPtrOut)
           *segmentIdxOfIntersectionPtrOut = lineSegmentIdx;
 
@@ -491,7 +491,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
     } // for (const int bldgId :  std::as_const(relevantBuildings))
   } // for(lineIt = polylineRef.begin(); lineIt != polylineRef.end()-1; ++lineIt)
 
-  DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, request '" << request.requestId() << "'"
+  DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, request '" << request.requestId << "'"
                       << " buildingIdOut=" << *buildingIdOut;
 
   return reply;
@@ -506,10 +506,10 @@ void HandlerBuildingModel::onDetonationLocationRequest(
   const rti::core::SampleIdentity &cookie, const CentralEffectSimulation::DetonationLocationRequest &request
 )
 {
-  DEBUG_LOG(m_logger) << "Received DetonationLocationRequest for aesId: " << request.id();
+  DEBUG_LOG(m_logger) << "Received DetonationLocationRequest for aesId: " << request.id;
   const CentralEffectSimulation::DetonationLocationReply reply = handleDetonationLocationRequest(request);
-  if (!reply.errorString().empty())
-    WARNING_LOG(m_logger) << "DetonationLocationRequest for aesId " << request.id() << " failed: " << reply.errorString();
+  if (!reply.errorString.empty())
+    WARNING_LOG(m_logger) << "DetonationLocationRequest for aesId " << request.id << " failed: " << reply.errorString;
   // if
   m_ddsHandler->ftsCes()->detonationLocationReply(cookie, reply);
 }
@@ -528,17 +528,17 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
 
   // prepare reply and store some values from request:
   CentralEffectSimulation::DetonationLocationReply reply;
-  reply.id(request.id());           // AES: aesItemId
-  reply.index(request.index());     // AES: explosionIndex
+  reply.id = request.id;           // AES: aesItemId
+  reply.index = request.index;     // AES: explosionIndex
 
   if ( m_buildingModels.size() <= 0)
     return reply;
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest lbRequest;
-  lbRequest.requestId("handleDetonationLocationRequest");
-  lbRequest.line(request.trajectory());
+  lbRequest.requestId = "handleDetonationLocationRequest";
+  lbRequest.line = request.trajectory;
 
-  const std::vector<Core::GeoPosition>& reqTrajRef = request.trajectory();
+  const std::vector<Core::GeoPosition>& reqTrajRef = request.trajectory;
 
   if (reqTrajRef.size() < 2)
   {
@@ -548,10 +548,10 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
 
   // next step: determine detonationDistance according fuseType:
   double detonationDistance = 0;
-  ProjectDataManagement::IgniterFunctionBase ignFuncBase = m_ddsHandler->getIgniterFunctionBaseFromChargeTypeId(request.chargeTypeId(),
-                                                                                                                request.igniterTypeId(),
-                                                                                                                request.igniterFunctionId());
-  switch (ignFuncBase.underlying())
+  ProjectDataManagement::IgniterFunctionBase ignFuncBase = m_ddsHandler->getIgniterFunctionBaseFromChargeTypeId(request.chargeTypeId,
+                                                                                                                request.igniterTypeId,
+                                                                                                                request.igniterFunctionId);
+  switch (ignFuncBase)
   {
   case ProjectDataManagement::IgniterFunctionBase::IfbProximity:  detonationDistance = -5;  break;
   case ProjectDataManagement::IgniterFunctionBase::IfbImpact:     detonationDistance =  0;  break;
@@ -568,7 +568,7 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
   const CentralEffectSimulation::GetLineBuildingIntersectionReply &lbiReply =
       getLineBuildingIntersectionInternal(lbRequest, justForLineOfSight, &buildingId, &validSizeOfOriginalTraj);
 
-  const LtsCoordTrans::LtsCoordinate bldgIntersectionCoord(lbiReply.intersection());
+  const LtsCoordTrans::LtsCoordinate bldgIntersectionCoord(lbiReply.intersection);
   const bool bHasBuildingIntersection = BuildingModel::isValid(bldgIntersectionCoord.geoPosition());
   if (bHasBuildingIntersection)
   {
@@ -623,8 +623,8 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
                         << ", detonationLocation: " << detonationLocation.toString(true)
                         << ", buildingId: " << buildingId;
 
-    reply.position(detonationLocation.geoPosition());
-    reply.buildingId(buildingId);
+    reply.position = detonationLocation.geoPosition();
+    reply.buildingId = buildingId;
   }
   else
   {
@@ -650,8 +650,8 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
                         << ", trajectoryCopy.size()=" << trajectoryCopy.size() << " back: " << trajectoryCopy.back()
                         << ", detonationLocation: " << detonationLocation.toString(true)
                         << ", buildingId: " << buildingId;
-    reply.buildingId(buildingId);
-    reply.position(detonationLocation.geoPosition());
+    reply.buildingId = buildingId;
+    reply.position = detonationLocation.geoPosition();
   }
 
   // otherwise let reply.position be untouched.
@@ -674,18 +674,18 @@ Core::GeoPosition HandlerBuildingModel::calculateDetonationLocation(const std::v
   // geometrySize-3]; - see comment below
   //             ^^^
   auto p1 = trajectoryGeometry[geometrySize - 3];
-  LtsCoordTrans::UtmCoordinate utm1 = LtsCoordTrans::UtmCoordinate::fromGeographic(p1.lon(), p1.lat());  // ToDo: Zone des Bldgs?
-  QVector3D segStart(utm1.x, utm1.y, p1.z());
+  LtsCoordTrans::UtmCoordinate utm1 = LtsCoordTrans::UtmCoordinate::fromGeographic(p1.lon, p1.lat);  // ToDo: Zone des Bldgs?
+  QVector3D segStart(utm1.x, utm1.y, p1.z);
 
   auto p2 = trajectoryGeometry[geometrySize - 1];
-  LtsCoordTrans::UtmCoordinate utm2 = LtsCoordTrans::UtmCoordinate::fromGeographic(p2.lon(), p2.lat());  // ToDo: Zone des Bldgs?
-  QVector3D segEnd(utm2.x, utm2.y, p2.z());
+  LtsCoordTrans::UtmCoordinate utm2 = LtsCoordTrans::UtmCoordinate::fromGeographic(p2.lon, p2.lat);  // ToDo: Zone des Bldgs?
+  QVector3D segEnd(utm2.x, utm2.y, p2.z);
 
   QVector3D flightVec = segEnd - segStart;
 
   INFO_LOG(m_logger) << "flightVec1 "
-                     << ", utm1 " << utm1 << " , z " << p1.z()
-                     << ", utm2 " << utm2 << " , z " << p2.z()
+                     << ", utm1 " << utm1 << " , z " << p1.z
+                     << ", utm2 " << utm2 << " , z " << p2.z
                      << ", flightVec " << flightVec;
 
   // 'auto p1 = trajectoryGeometry[geometrySize-3];'
@@ -722,8 +722,8 @@ Core::GeoPosition HandlerBuildingModel::calculateDetonationLocation(const std::v
   Core::GeoPosition geoPosDeto(pointDeto.x(), pointDeto.y(), detonationLoc.z());
 
   DEBUG_LOG(m_logger) << "flightVec2 "
-                      << ", utm1 " << utm1 << " , z " << p1.z()
-                      << ", utm2 " << utm2 << " , z " << p2.z()
+                      << ", utm1 " << utm1 << " , z " << p1.z
+                      << ", utm2 " << utm2 << " , z " << p2.z
                       << ", flightVec " << flightVec
                       << ", detonationLoc " << detonationLoc
                       << ", utmDeto " << utmDeto;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
index 258a52180..1f4770974 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
@@ -86,26 +86,26 @@ void HandlerBuildingOwnership::onSetOwnershipRequest(const rti::core::SampleIden
   INFO_LOG(m_logger) << "onSetOwnershipRequest: " << request;
 
   // remove Ownership, if partyId == 0
-  if (request.partyId() == 0)
-    removeFromDbBuildingId(request.buildingId());
+  if (request.partyId == 0)
+    removeFromDbBuildingId(request.buildingId);
 
-  const QVector<int> floors = m_handlerBuildingData->getFloorsFromBuilding(request.buildingId());
+  const QVector<int> floors = m_handlerBuildingData->getFloorsFromBuilding(request.buildingId);
   for (int floorId : floors)
-    saveBuildingOwnership(floorId, request.partyId(), request.buildingId());
+    saveBuildingOwnership(floorId, request.partyId, request.buildingId);
 
   if (!floors.isEmpty())
-    sendBuildingOwnership(request.buildingId());
+    sendBuildingOwnership(request.buildingId);
 
-  m_ddsHandler->ftsCes()->setOwnershipReply(cookie, Core::FunctionReplyObject(request.buildingId()));
+  m_ddsHandler->ftsCes()->setOwnershipReply(cookie, Core::FunctionReplyObject(request.buildingId));
 }
 
 void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
 
-  const int participantId = partPos.participantId();
+  const int participantId = partPos.participantId;
   INFO_LOG(m_logger) << "BuildingOwnership onParticipantPositionChanged participantId=" << participantId
                      << " vulnerabilityState=" << partPos.vulnerabilityState
-                     << " buildingId=" << partPos.buildingId()
+                     << " buildingId=" << partPos.buildingId
                      << " notfightMode=" << partPos.notfightMode;
 
   // [GUEZE-2256] 3D Wirksim - Funktionsraum Nicht Kampffaehig
@@ -113,8 +113,8 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS
   if (partPos.notfightMode)
     return;
 
-  int floorId = m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId());
-  if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  int floorId = m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId);
+  if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     m_participantFloor.remove(participantId);
   else
     m_participantFloor.insert(participantId, floorId);
@@ -131,23 +131,23 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS
 // ///////////////////////////////////
 void HandlerBuildingOwnership::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  INFO_LOG(m_logger) << "onMainStructureElementChanged id=" << data.id()
-                     << " modelId =" << data.modelId();
-  if (modType == DataModification::eRemoved || data.modelId() <= 0)
+  INFO_LOG(m_logger) << "onMainStructureElementChanged id=" << data.id
+                     << " modelId =" << data.modelId;
+  if (modType == DataModification::eRemoved || data.modelId <= 0)
   {
-    m_buildingOwnership.remove(data.id());
+    m_buildingOwnership.remove(data.id);
     return;
   }
 
-  QJsonArray jsonArray = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties())).object().value(QLatin1String("available_in_exercise")).toArray();
+  QJsonArray jsonArray = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties)).object().value(QLatin1String("available_in_exercise")).toArray();
   DEBUG_LOG(m_logger) << "available_in_exercise jsonDocument.size()=" <<  jsonArray.size();
   QVector<int> result;
   result.reserve(jsonArray.size());
 
   // Check if present in the current exercise and remove
-  if (m_buildingOwnership.contains(data.id()))
+  if (m_buildingOwnership.contains(data.id))
   {
-    int id = data.id();
+    int id = data.id;
     m_buildingOwnership.remove(id);
     m_ddsHandler->dtsCes()->removeBuildingOwnershipByKey(id);
   }
@@ -159,16 +159,16 @@ void HandlerBuildingOwnership::onMainStructureElementChanged(const Infrastructur
       continue;
 
     DEBUG_LOG(m_logger) << "Got MainStructureElement"
-                        << " data.id()=" << data.id()
-                        << " data.modelId=" << data.modelId();
-    if (!m_buildingOwnership.contains(data.id()))
+                        << " data.id()=" << data.id
+                        << " data.modelId=" << data.modelId;
+    if (!m_buildingOwnership.contains(data.id))
     {
       // insert in m_buildingOwnership and publish to dds
       CentralEffectSimulation::BuildingOwnership bo;
-      bo.buildingId(data.id());
-      bo.sampleTime(QDateTime::currentMSecsSinceEpoch());
+      bo.buildingId = data.id;
+      bo.sampleTime = QDateTime::currentMSecsSinceEpoch();
       updateOwnerships(&bo);
-      m_buildingOwnership.insert(data.id(), bo);
+      m_buildingOwnership.insert(data.id, bo);
       m_ddsHandler->dtsCes()->publish(bo);
     } // if
   } // for
@@ -193,7 +193,7 @@ int HandlerBuildingOwnership::calculateOwnershipByParticipantId(const int partic
 {
   INFO_LOG(m_logger) << "BuildingOwnership calculateOwnershipByParticipantId participantId=" << participantId;
   CentralEffectSimulation::HandlerParticipant::CesParticipantData partPos = m_handlerParticipant->position(participantId);
-  return calculateOwnershipByFloorId(m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId()));
+  return calculateOwnershipByFloorId(m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId));
 }
 
 int HandlerBuildingOwnership::calculateOwnershipByFloorId(const int floorId)
@@ -216,7 +216,7 @@ int HandlerBuildingOwnership::calculateOwnershipByFloorId(const int floorId)
       const CentralEffectSimulation::HandlerParticipant::CesParticipantData &localPartPos = m_handlerParticipant->position(iteratorParticipant);
       if (localPartPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
         continue; // Don't count participants with catastrophic Kill
-      const int partyId = localPartPos.partyId();
+      const int partyId = localPartPos.partyId;
       ++partyCount[partyId];
     }
   }
@@ -241,10 +241,10 @@ int HandlerBuildingOwnership::getOwnership(int buildingId, int floorId) const
   if (itBldg == m_buildingOwnership.end())
     return -1;
   const CentralEffectSimulation::BuildingOwnership &bo = itBldg.value();
-  for (const CentralEffectSimulation::Ownership &ownership : bo.ownerships())
+  for (const CentralEffectSimulation::Ownership &ownership : bo.ownerships)
   {
-    if (ownership.floorId() == floorId)
-      return ownership.partyId();
+    if (ownership.floorId == floorId)
+      return ownership.partyId;
   }
   return -1;
 }
@@ -282,27 +282,27 @@ void HandlerBuildingOwnership::updateOwnerships(CentralEffectSimulation::Buildin
   INFO_LOG(m_logger) << "BuildingOwnership updateOwnerships";
   QMap <int, int> ownershipMap;
 
-  const QVector<int> floors = m_handlerBuildingData->getFloorsFromBuilding(bo->buildingId());
+  const QVector<int> floors = m_handlerBuildingData->getFloorsFromBuilding(bo->buildingId);
   DEBUG_LOG(m_logger) << "updateOwnerships floors.size= " << floors.size();
   for (const int floorId : floors)
     ownershipMap[floorId] = 0;
 
-  for (const CentralEffectSimulation::Ownership &ownership : bo->ownerships())
+  for (const CentralEffectSimulation::Ownership &ownership : bo->ownerships)
   {
-    DEBUG_LOG(m_logger) << "updateOwnerships floorId=" << ownership.floorId() << ": " << ownership.partyId();
-    ownershipMap[ownership.floorId()] = ownership.partyId();
+    DEBUG_LOG(m_logger) << "updateOwnerships floorId=" << ownership.floorId << ": " << ownership.partyId;
+    ownershipMap[ownership.floorId] = ownership.partyId;
   }
 
-  bo->ownerships().resize(0);
-  bo->ownerships().reserve(ownershipMap.size());
+  bo->ownerships.resize(0);
+  bo->ownerships.reserve(ownershipMap.size());
 
   CentralEffectSimulation::Ownership ownership;
   for (auto it = ownershipMap.cbegin(); it != ownershipMap.cend(); ++it)
   {
     DEBUG_LOG(m_logger) << it.key() << ": " << it.value();
-    ownership.floorId(it.key());
-    ownership.partyId(it.value());
-    bo->ownerships().push_back(ownership);
+    ownership.floorId = it.key();
+    ownership.partyId = it.value();
+    bo->ownerships.push_back(ownership);
   }
 
 }
@@ -318,20 +318,20 @@ void HandlerBuildingOwnership::saveBuildingOwnership(int floorId, int partyId, i
   {
     CentralEffectSimulation::BuildingOwnership &bo = *it;
     // Vorhanden Eintrag für das Stockwerk suchen:
-    for (CentralEffectSimulation::Ownership &ownership : bo.ownerships())
+    for (CentralEffectSimulation::Ownership &ownership : bo.ownerships)
     {
-      if (ownership.floorId() == floorId)
+      if (ownership.floorId == floorId)
       {
-        ownership.partyId(partyId);
+        ownership.partyId = partyId;
         return;
       }
     }
 
     // Neuen Eintrag für das Stockwerk anlegen
     CentralEffectSimulation::Ownership ownership;
-    ownership.floorId(floorId);
-    ownership.partyId(partyId);
-    bo.ownerships().push_back(std::move(ownership));
+    ownership.floorId = floorId;
+    ownership.partyId = partyId;
+    bo.ownerships.push_back(std::move(ownership));
     m_buildingOwnership.insert(buildingId, bo);
     return;
   }
@@ -340,10 +340,10 @@ void HandlerBuildingOwnership::saveBuildingOwnership(int floorId, int partyId, i
   CentralEffectSimulation::BuildingOwnership bo;
   CentralEffectSimulation::Ownership ownership;
 
-  bo.buildingId(buildingId);
-  ownership.floorId(floorId);
-  ownership.partyId(partyId);
-  bo.ownerships().resize(1, ownership);
+  bo.buildingId = buildingId;
+  ownership.floorId = floorId;
+  ownership.partyId = partyId;
+  bo.ownerships.resize(1, ownership);
   m_buildingOwnership.insert(buildingId, bo);
 }
 
@@ -351,8 +351,8 @@ void HandlerBuildingOwnership::sendBuildingOwnership(int buildingId)
 {
   INFO_LOG(m_logger) << "sendBuildingOwnership for building: " << buildingId;
   CentralEffectSimulation::BuildingOwnership bo = m_buildingOwnership.value(buildingId);
-  bo.buildingId(buildingId);
-  bo.sampleTime(QDateTime::currentMSecsSinceEpoch());
+  bo.buildingId = buildingId;
+  bo.sampleTime = QDateTime::currentMSecsSinceEpoch();
   updateOwnerships(&bo);
   m_ddsHandler->dtsCes()->publish(bo);
   insertInDb(bo);
@@ -388,16 +388,16 @@ void HandlerBuildingOwnership::insertInDb(const CentralEffectSimulation::Buildin
 {
   DBTransaction trans(m_db->database());
 
-  removeFromDbBuildingId(bo.buildingId());
-  INFO_LOG(m_logger) << "insertInDb buildingId: " << bo.buildingId()
-                     << ", bo.ownerships().size(): " << bo.ownerships().size();
+  removeFromDbBuildingId(bo.buildingId);
+  INFO_LOG(m_logger) << "insertInDb buildingId: " << bo.buildingId
+                     << ", bo.ownerships().size(): " << bo.ownerships.size();
   CentralEffectSimulation::Database::CesOwnership newOwnership;
-  newOwnership.buildingId = bo.buildingId();
-  for (const CentralEffectSimulation::Ownership &ownership : bo.ownerships())
+  newOwnership.buildingId = bo.buildingId;
+  for (const CentralEffectSimulation::Ownership &ownership : bo.ownerships)
   {
     newOwnership.id = 0;
-    newOwnership.floorId = ownership.floorId();
-    newOwnership.partyId = ownership.partyId();
+    newOwnership.floorId = ownership.floorId;
+    newOwnership.partyId = ownership.partyId;
     DEBUG_LOG(m_logger) << "ownership: floorId = " << newOwnership.floorId
                         << " partyId = " << newOwnership.partyId;
     if (!m_db->insert(newOwnership))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp
index e09e07982..f44756fe9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp
@@ -102,17 +102,17 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId()
-                      << " data.aesItemId()" << data.aesItemId()
-                      << " data.aesTypeId()" << data.aesTypeId();
-  switch (data.effectStateId().underlying())
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId
+                      << " data.aesItemId()" << data.aesItemId
+                      << " data.aesTypeId()" << data.aesTypeId;
+  switch (data.effectStateId)
   {
   case AreaEffectSimulation::AesEffectState::EsActivated:
   {
     double chargeHeight; // Alle Stockwerke beruecksichtigen
     double chargeDepression; // Alle Kellerraeume beruecksichtigen
 
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination)
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtNContamination)
     {
       chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen
       chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen
@@ -121,37 +121,37 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
     }
     else
     {
-      chargeHeight = m_aesBCContaminations.value(data.aesItemId()).upperOffset();
-      chargeDepression = m_aesBCContaminations.value(data.aesItemId()).lowerOffset();
+      chargeHeight = m_aesBCContaminations.value(data.aesItemId).upperOffset;
+      chargeDepression = m_aesBCContaminations.value(data.aesItemId).lowerOffset;
       DEBUG_LOG(m_logger) << "BCContaminations: chargeHeight=" << chargeHeight
                           << " chargeDepression=" << chargeDepression;
     }
 
-    if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBCContamination
-        && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination)
+    if (data.aesTypeId != AreaEffectSimulation::AesType::AtBCContamination
+        && data.aesTypeId != AreaEffectSimulation::AesType::AtNContamination)
     {
-      DEBUG_LOG(m_logger) << "return1: AesItemView: " << data.effectStateId();
+      DEBUG_LOG(m_logger) << "return1: AesItemView: " << data.effectStateId;
       return;
     }
 
     // Gebaeude die von einem sesshaften Kampfstoff betroffen sind, müssen als kontaminiert gelten.
-    const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct());
+    const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct);
     if (volatilityType != ProjectDataManagement::VolatilityType::Resident
-        && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination)
+        && data.aesTypeId != AreaEffectSimulation::AesType::AtNContamination)
     {
-      DEBUG_LOG(m_logger) << "return2: AesItemView: " << data.effectStateId();
+      DEBUG_LOG(m_logger) << "return2: AesItemView: " << data.effectStateId;
       return;
     }
 
-    DEBUG_LOG(m_logger) << "HandlerContamination::onAesItemViewChanged data.aesItemId=" << data.aesItemId();
+    DEBUG_LOG(m_logger) << "HandlerContamination::onAesItemViewChanged data.aesItemId=" << data.aesItemId;
     auto dtcIsm = m_ddsHandler->dtcIsm();
     // Form in UTM-Polygon wandeln
     int exerciseId = m_ddsHandler->getExerciseId();
     QPolygonF polygonGeo;
 
     // Convert Form to UTM
-    for (unsigned int i = 0; i < data.form().size(); i++)
-      polygonGeo.append(QPointF(data.form()[i].lon(), data.form()[i].lat()));
+    for (unsigned int i = 0; i < data.form.size(); i++)
+      polygonGeo.append(QPointF(data.form[i].lon, data.form[i].lat));
 
     bool completeEnclosed = true;
     bool isGroundLevel = false;
@@ -178,16 +178,16 @@ void HandlerContamination::calculateBuilding(int buildingId,
   QVector<int> effectedRooms;
   QVector<int> effectedFloors;
 
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBCContamination
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtBCContamination
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtNContamination)
   {
-    DEBUG_LOG(m_logger) << "return: NO BC-Contamination AesItemView: " << data.effectStateId();
+    DEBUG_LOG(m_logger) << "return: NO BC-Contamination AesItemView: " << data.effectStateId;
     return;
   }
 
-  const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct());
+  const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct);
   if (   volatilityType != ProjectDataManagement::VolatilityType::Resident
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination)
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtNContamination)
       return;
 
   DEBUG_LOG(m_logger) << "buildingId=" << buildingId;
@@ -201,35 +201,35 @@ void HandlerContamination::calculateBuilding(int buildingId,
     ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 
     // [GUEZE-2752] N-Contamination: Only Contamionation inside Range1
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination
-        && !isInsideRange1(buildingId,  data.aesItemId()))
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtNContamination
+        && !isInsideRange1(buildingId,  data.aesItemId))
     {
       DEBUG_LOG(m_logger) << "!isInsideRange1 buildingId=" << buildingId;
       return;
     }
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBCContamination
-        && !isInsideBCContamination(buildingId,  data.aesItemId()))
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtBCContamination
+        && !isInsideBCContamination(buildingId,  data.aesItemId))
     {
       DEBUG_LOG(m_logger) << "AtBCContamination !isInsideRange buildingId=" << buildingId << "return";
       return;
     }
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination
-            && isInsideInnerCircle(buildingId,  data.aesItemId()))
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtNContamination
+            && isInsideInnerCircle(buildingId,  data.aesItemId))
     {
         constexpr int TIME_2_SECONDS = 2000;
         // Only actual explosion not old N-Fields
-        if ( m_ddsHandler->dtcCore()->partitionTime().timeStamp() < (data.effectStart() + TIME_2_SECONDS))
+        if ( m_ddsHandler->dtcCore()->partitionTime().timeStamp < (data.effectStart + TIME_2_SECONDS))
         {
             DEBUG_LOG(m_logger) << "VulnerabilityState=CatastrophicKill";
             vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill;
         }
     }
     DEBUG_LOG(m_logger) << "setBuildingContaminationStateRequest buildingId=" << buildingId
-                        << " data.aesTypeId()=" << data.aesTypeId()
-                        << " isInsideInnerCircle(buildingId,  data.aesItemId()=" << isInsideInnerCircle(buildingId,  data.aesItemId());
+                        << " data.aesTypeId()=" << data.aesTypeId
+                        << " isInsideInnerCircle(buildingId,  data.aesItemId()=" << isInsideInnerCircle(buildingId,  data.aesItemId);
     {
       DEBUG_LOG(m_logger) << "isInsideInnerCircle buildingId=" << buildingId;
-      setBuildingContaminationStateRequest(buildingId, data.aesItemId(), vulnerabilityState, effectedRooms);
+      setBuildingContaminationStateRequest(buildingId, data.aesItemId, vulnerabilityState, effectedRooms);
     }
   }
 }
@@ -245,12 +245,12 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
     return;
 
   INFO_LOG(m_logger) << "onBuildingStateChanged"
-                     << " id=" << data.id()
-                     << " aesId=" << data.aesId()
-                     << " contaminationStates().size=" << data.contaminationStates().size();
+                     << " id=" << data.id
+                     << " aesId=" << data.aesId
+                     << " contaminationStates().size=" << data.contaminationStates.size();
   // Reset:
-  if (data.contaminationStates().empty())
-    m_contaminationState.remove(data.id());
+  if (data.contaminationStates.empty())
+    m_contaminationState.remove(data.id);
   // If a building is reset in an area where there is an active nuclear weapon, it will not be recontaminated -> in this case,
   // regular checks should be carried out to see if the building needs to be contaminated
   // Buildings that have been reset or decontaminated will be recontaminated as long as the nuclear weapon is still present
@@ -258,16 +258,16 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
   const auto  aesItemViews  = m_ddsHandler->dtcAes()->aesItemViews();
   for (const auto &aesItemView : std::as_const(aesItemViews))
   {
-    if (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+    if (aesItemView.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
     {
-      DEBUG_LOG(m_logger) << "Wirkfeld aesItemView.id()=" << aesItemView.id()
-                          << " aesItemView.aesItemId()=" << aesItemView.aesItemId()
-                          << " fuer Gebaeude " << data.id() << " neu berechnen";
+      DEBUG_LOG(m_logger) << "Wirkfeld aesItemView.id()=" << aesItemView.id
+                          << " aesItemView.aesItemId()=" << aesItemView.aesItemId
+                          << " fuer Gebaeude " << data.id << " neu berechnen";
 
       double chargeHeight = 0.0;
       double chargeDepression = 0.0;
 
-      if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination)
+      if (aesItemView.aesTypeId == AreaEffectSimulation::AesType::AtNContamination)
       {
         chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen
         chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen
@@ -276,16 +276,16 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
       }
       else
       {
-        if ( m_aesBCContaminations.contains(aesItemView.aesItemId()))
+        if ( m_aesBCContaminations.contains(aesItemView.aesItemId))
         {
-          chargeHeight = m_aesBCContaminations.value(aesItemView.aesItemId()).upperOffset();
-          chargeDepression = m_aesBCContaminations.value(aesItemView.aesItemId()).lowerOffset();
+          chargeHeight = m_aesBCContaminations.value(aesItemView.aesItemId).upperOffset;
+          chargeDepression = m_aesBCContaminations.value(aesItemView.aesItemId).lowerOffset;
           DEBUG_LOG(m_logger) << "BCContaminations: chargeHeight=" << chargeHeight
                               << " chargeDepression=" << chargeDepression;
         }
         else
         {
-          DEBUG_LOG(m_logger) << "BCContaminations: m_aesBCContaminations not contains:"<< aesItemView.aesItemId();
+          DEBUG_LOG(m_logger) << "BCContaminations: m_aesBCContaminations not contains:"<< aesItemView.aesItemId;
         }
       }
 
@@ -293,18 +293,18 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
       auto dtcIsm = m_ddsHandler->dtcIsm();
       int exerciseId = m_ddsHandler->getExerciseId();
       QPolygonF polygonGeo;
-      polygonGeo.reserve(aesItemView.form().size());
+      polygonGeo.reserve(aesItemView.form.size());
       // Convert Form to UTM
-      for (const auto point : aesItemView.form())
-          polygonGeo.append(QPointF(point.lon(), point.lat()));
+      for (const auto point : aesItemView.form)
+          polygonGeo.append(QPointF(point.lon, point.lat));
       bool completeEnclosed = true;
       bool isGroundLevel = false;
 
       const QVector<int> &buildingIds = dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel);
-      if (buildingIds.contains(data.id() ))
-          calculateBuilding(data.id(), aesItemView, chargeHeight, chargeDepression);
+      if (buildingIds.contains(data.id ))
+          calculateBuilding(data.id, aesItemView, chargeHeight, chargeDepression);
       else
-          DEBUG_LOG(m_logger) << "Building not in Area BuildingId="  << data.id();
+          DEBUG_LOG(m_logger) << "Building not in Area BuildingId="  << data.id;
     }
   }
 }
@@ -317,8 +317,8 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
 {
   Buildings::ContaminationState contaminationState;
 
-  contaminationState.aesId(aesId);
-  contaminationState.vulnerabilityState(vulnerabilityState);
+  contaminationState.aesId = aesId;
+  contaminationState.vulnerabilityState = vulnerabilityState;
 //  contaminationState.vulne
 
   DEBUG_LOG(m_logger) << "setBuildingContaminationStateRequest"
@@ -326,11 +326,11 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
                       << " aesId=" << aesId
                       << " vulnerabilityState=" << vulnerabilityState
                       << " rooms.size=" << rooms.size();
-  contaminationState.rooms().resize(rooms.size());
+  contaminationState.rooms.resize(rooms.size());
   for (int i = 0; i < rooms.size(); i++)
   {
-    contaminationState.rooms()[i] = rooms[i];
-    contaminationState.vulnerabilityState(vulnerabilityState);
+    contaminationState.rooms[i] = rooms[i];
+    contaminationState.vulnerabilityState = vulnerabilityState;
     DEBUG_LOG(m_logger) << "    room[" << i << "]=" << rooms[i];
   }
 
@@ -342,7 +342,7 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   if (!m_contaminationState.contains(buildingId))
   {
     DEBUG_LOG(m_logger) << "Neue Kontamination BuildingId=" << buildingId
-                        << " requestContamination aesId=" << requestContamination.contaminationState().aesId();
+                        << " requestContamination aesId=" << requestContamination.contaminationState.aesId;
 
     m_ddsHandler->ftcBld()->setBuildingContaminationStateRequest(requestContamination, this);
     m_contaminationState.insert(buildingId, requestContamination);
@@ -353,7 +353,7 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   if (lastRequestContamination != requestContamination)
   {
     DEBUG_LOG(m_logger) << "Änderung der Kontamination BuildingId=" << buildingId
-                        << " aesId=" << requestContamination.contaminationState().aesId();
+                        << " aesId=" << requestContamination.contaminationState.aesId;
     m_ddsHandler->ftcBld()->setBuildingContaminationStateRequest(requestContamination, this);
     m_contaminationState.insert(buildingId, requestContamination);
     return;
@@ -416,10 +416,10 @@ void HandlerContamination::onSetBuildingContaminationStateReply(const Core::Func
 void HandlerContamination::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
 {
   if ((modType == DataModification::eRemoved)
-      || data.isDeleted())
-    m_aesBCContaminations.remove(data.id());
+      || data.isDeleted)
+    m_aesBCContaminations.remove(data.id);
   else
-    m_aesBCContaminations.insert(data.id(), data);
+    m_aesBCContaminations.insert(data.id, data);
 }
 
 // Returns true if the building is in the inner circle at the time of impact and should fail as a result.
@@ -429,20 +429,20 @@ bool HandlerContamination::isInsideInnerCircle(int buildingId, int aesId)
   InfrastructureManagement::MainStructureElement mse  = m_ddsHandler->dtcIsm()->mainStructureElement(buildingId);
   AreaEffectSimulation::NContamination nContamination = m_ddsHandler->dtcAes()->nContamination(aesId);
 
-  DEBUG_LOG(m_logger) << "isInsideInnerCircle borderLengthInner=" << nContamination.borderLengthInner()
-                      << " borderLengthOuter=" << nContamination.borderLengthOuter()
-                      << " impactRadius=" << nContamination.impactRadius();
+  DEBUG_LOG(m_logger) << "isInsideInnerCircle borderLengthInner=" << nContamination.borderLengthInner
+                      << " borderLengthOuter=" << nContamination.borderLengthOuter
+                      << " impactRadius=" << nContamination.impactRadius;
 
   int zone = -1;
-  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(nContamination.impactPosition(), zone);
+  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(nContamination.impactPosition, zone);
   DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
-  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
+  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition, zone);
   DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
-  if (squareDistance < nContamination.impactRadius() * nContamination.impactRadius())
+  if (squareDistance < nContamination.impactRadius * nContamination.impactRadius)
   {
     DEBUG_LOG(m_logger) << "isInsideInnerCircle return true";
     return true;
@@ -464,18 +464,18 @@ bool HandlerContamination::isInsideBCContamination(int buildingId, int aesId)
   //AreaEffectSimulation::NContamination nContamination = m_ddsHandler->dtcAes()->nContamination(aesId);
   AreaEffectSimulation::BCContamination bcContamination = m_ddsHandler->dtcAes()->bCContamination(aesId);
 
-  DEBUG_LOG(m_logger) << " impactRadius=" << bcContamination.impactRadius();
+  DEBUG_LOG(m_logger) << " impactRadius=" << bcContamination.impactRadius;
 
   int zone = -1;
-  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(bcContamination.impactPosition(), zone);
+  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(bcContamination.impactPosition, zone);
   DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
-  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
+  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition, zone);
   DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
-  if (squareDistance < bcContamination.impactRadius() * bcContamination.impactRadius())
+  if (squareDistance < bcContamination.impactRadius * bcContamination.impactRadius)
   {
     DEBUG_LOG(m_logger) << "isInsideInnerCircle return true";
     return true;
@@ -496,20 +496,20 @@ bool HandlerContamination::isInsideRange1(int buildingId, int aesId)
   InfrastructureManagement::MainStructureElement mse  = m_ddsHandler->dtcIsm()->mainStructureElement(buildingId);
   AreaEffectSimulation::NContamination nContamination = m_ddsHandler->dtcAes()->nContamination(aesId);
 
-  DEBUG_LOG(m_logger) << "isInsideRange1 borderLengthInner=" << nContamination.borderLengthInner()
-                      << " borderLengthOuter=" << nContamination.borderLengthOuter()
-                      << " impactRadius=" << nContamination.impactRadius();
+  DEBUG_LOG(m_logger) << "isInsideRange1 borderLengthInner=" << nContamination.borderLengthInner
+                      << " borderLengthOuter=" << nContamination.borderLengthOuter
+                      << " impactRadius=" << nContamination.impactRadius;
 
   int zone = -1;
-  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(nContamination.impactPosition(), zone);
+  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(nContamination.impactPosition, zone);
   DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
-  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
+  const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition, zone);
   DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
-  if (squareDistance < nContamination.borderLengthInner() * nContamination.borderLengthInner())
+  if (squareDistance < nContamination.borderLengthInner * nContamination.borderLengthInner)
   {
     DEBUG_LOG(m_logger) << "isInsideRange1 return true";
     return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
index 0ec62d82e..5784bcc5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
@@ -117,7 +117,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
     return;
 
   DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
-  switch (data.effectStateId().underlying())
+  switch (data.effectStateId())
   {
   case AreaEffectSimulation::AesEffectState::EsUnknown:
   case AreaEffectSimulation::AesEffectState::EsError:
@@ -381,7 +381,7 @@ void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObjec
 void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data, const Footprint &footprint)
 {
   // check for correct AES type artillery only
-  switch (data.aesTypeId().underlying())
+  switch (data.aesTypeId())
   {
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtExplosionSingle:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
index c39048a7e..519067b3c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
@@ -26,7 +26,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -280,7 +280,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
   const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
   const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
   DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
-  switch (effectState.underlying())
+  switch (effectState)
   {
   case AreaEffectSimulation::AesEffectState::EsPrepared:
   {
@@ -291,7 +291,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
   {
     const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius));
 
-    switch (data.aesTypeId().underlying())
+    switch (data.aesTypeId())
     {
     case AreaEffectSimulation::AesType::AtExplosionArea:
     case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -353,7 +353,7 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation::
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
-    switch (data.effectStateId().underlying())
+    switch (data.effectStateId())
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
@@ -361,7 +361,7 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation::
       CentralEffectSimulation::AesItemViewUtm itemView;
       itemView.aesItemId = data.id();
       itemView.chargeTypeId = data.chargeTypeId();
-      itemView.partyId = data.partyId.is_set() ? data.partyId.get() : -1;
+      itemView.partyId = data.partyId.has_value() ? data.partyId.get() : -1;
       itemView.aesTypeId = AreaEffectSimulation::AesType::AtDusSingleMine;
       itemView.effectStart = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
       itemView.formMines.push_back(CentralEffectSimulation::geographic2Utm(data.position(), &itemView.zone));
@@ -394,7 +394,7 @@ void HandlerParticipantArea::onBCContaminationChanged(const AreaEffectSimulation
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
-    switch (data.effectStateId().underlying())
+    switch (data.effectStateId())
     {
     case AreaEffectSimulation::AesEffectState::EsReceived:
     case AreaEffectSimulation::AesEffectState::EsCreated:
@@ -426,7 +426,7 @@ void HandlerParticipantArea::onNContaminationChanged(const AreaEffectSimulation:
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
-    switch (data.effectStateId().underlying())
+    switch (data.effectStateId())
     {
     case AreaEffectSimulation::AesEffectState::EsReceived:
     case AreaEffectSimulation::AesEffectState::EsCreated:
@@ -502,7 +502,7 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
     DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
-    switch (itemView.aesTypeId.underlying())
+    switch (itemView.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtMineArea:
       if (inFormCheck(itemView, participantPos))
@@ -625,7 +625,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
   {
     DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId()
                         << ", aesItemId: " << itemView.aesItemId;
-    switch (itemView.aesTypeId.underlying())
+    switch (itemView.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtBCContamination:
       sendEffectTypeEvent(itemView, participantPosition, effectTypeForBCContaminationArea(itemView, participantPosUtmPoint), -1, -1);
@@ -654,7 +654,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
   } // if inside
 
   // outside
-  switch (itemView.aesTypeId.underlying())
+  switch (itemView.aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     sendEffectTypeEvent(itemView, participantPosition, EffectType::BCContaminationLeave, -1, -1);
@@ -698,7 +698,7 @@ void HandlerParticipantArea::onTriggeredImpactsChanged(const AreaEffectSimulatio
     return;
 
   DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data;
-  switch (data.aesTypeId().underlying())
+  switch (data.aesTypeId())
   {
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -725,7 +725,7 @@ void HandlerParticipantArea::onExplosionAreaChanged(const AreaEffectSimulation::
     return;
 
   DEBUG_LOG(m_logger) << "Got ExplosionArea, m_aesItemId2partIdMap.insert " << data.id() << " / " << data.participantId();
-  if (data.participantId.is_set())
+  if (data.participantId.has_value())
     m_aesItemId2partIdMap.insert(data.id(), data.participantId.get());
   else
     m_aesItemId2partIdMap.remove(data.id());
@@ -916,7 +916,7 @@ void HandlerParticipantArea::calculateImpacts(const AreaEffectSimulation::Trigge
   const auto participantPositions = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : participantPositions)
   {
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     if (pPos.insideBuilding())
       continue;
@@ -992,7 +992,7 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae
     return;
   }
   if (participantPosition.participantId() != 0 &&
-      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
@@ -1059,7 +1059,7 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt
   } // if
 
   if (participantPosition.participantId() != 0 &&
-      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
@@ -1158,14 +1158,14 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
   CentralEffectSimulation::ParticipantEvent pe;
   pe.id(m_ddsHandler->getParticipantEventId());
 
-  pe.eventTypeId(eventType.underlying());
+  pe.eventTypeId(eventType);
   pe.participantId(participantPosition.participantId());
   pe.eventTime(participantPosition.sampleTime());
   pe.aesItemId(itemView.aesItemId);
   pe.partyId(participantPosition.partyId());
   //pe.aesName(m_handlerAesData->aesName(itemView.aesItemId));
   pe.equipmentNumber(equipmentNumber);
-  pe.vulnerability(participantPosition.vulnerabilityState.underlying());
+  pe.vulnerability(participantPosition.vulnerabilityState);
   pe.position(participantPosition.pos());
 
   // Criterion for friendly Fire:
@@ -1267,7 +1267,7 @@ bool HandlerParticipantArea::eventMustBeSend(int aesItemId,
   activeEvents.insert(eventType);
 
   // - remove opposite events (e.g remove Enter event when we leave the area)
-  switch (eventType.underlying())
+  switch (eventType)
   {
   case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
     activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
@@ -1423,7 +1423,7 @@ bool HandlerParticipantArea::inCircle(const QPointF &centerUtm, const double rad
 
 ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
 {
-  switch (aesTypeId.underlying())
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtDangerArea:
     return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
@@ -1441,7 +1441,7 @@ ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAes
 
 EffectType HandlerParticipantArea::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
 {
-  switch (aesTypeId.underlying())
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     return EffectType::BCContaminationLeave;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp
index c1aed9abb..a56f1e348 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.cpp
@@ -13,6 +13,12 @@
 
 #include <PolygonBuilder.h>
 #include <GeometryEngine.h>
+#include <Point.h>
+#include <Geometry.h>
+#include <Polygon.h>
+#include <SpatialReference.h>
+#include <ImmutablePartCollection.h>
+#include <ImmutablePart.h>
 
 namespace CesExplosions
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
index 950cb4427..336dfd9d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
@@ -8,6 +8,7 @@
 
 #include "handler_explosions.h"
 #include <utility>
+#include <iterator>
 #include "expand_polygon.h"
 
 #include <LtsUtilsCore/dds_bitarray.h>
@@ -113,18 +114,18 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   // NASAT, MIDAS, AirSupport
   // Der explizite HandlerAirSupport wird gestrichen.
   // Der HandlerExplosions übernimmt die Aufgaben mit, da quasi identisch!!
-  //  if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
+  //  if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass::GearClass_AirSupport)
   //    return;
 
   static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType::AtEffectCluster, AesType::AtExplosionAreaSingleExplosions, AesType::AtExplosionSingle, AesType::AtExplosionCluster};
-  if (!validAesTypes.contains(data.aesTypeId()))
+  if (!validAesTypes.contains(data.aesTypeId))
     return;
 
-  const AreaEffectSimulation::AesType aesTypeId     = data.aesTypeId();
-  const int aesItemId                               = data.aesItemId();
-  const int chargeTypeId                            = data.chargeStruct().chargeTypeId();
+  const AreaEffectSimulation::AesType aesTypeId     = data.aesTypeId;
+  const int aesItemId                               = data.aesItemId;
+  const int chargeTypeId                            = data.chargeStruct.chargeTypeId;
   const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeTypeId);
-  const double impactRadius                         = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
+  const double impactRadius                         = m_ddsHandler->chargeTypeRadius(data.chargeStruct);
   bool isCentral                                    = false;
 
   DEBUG_LOG(m_logger) << "onAesItemViewChanged 1 "
@@ -133,15 +134,15 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
                       << ", chargeTypeId=" << chargeTypeId
                       << ", gearClass=" << gearClass
                       << ", impactRadius=" << impactRadius
-                      << ", effectStateId=" << data.effectStateId()
-                      << ", chargeStruct=" << data.chargeStruct();
+                      << ", effectStateId=" << data.effectStateId
+                      << ", chargeStruct=" << data.chargeStruct;
 
-  switch (aesTypeId.underlying())
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtExplosionSingle:
   {
     const AreaEffectSimulation::ExplosionSingle &explosionSingle = m_ddsHandler->dtcAes()->explosionSingle(aesItemId);
-    isCentral = explosionSingle.isCentral();
+    isCentral = explosionSingle.isCentral;
     DEBUG_LOG(m_logger) << "ExplosionSingle";
     break;
   }
@@ -149,14 +150,14 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
   {
     const AreaEffectSimulation::ExplosionArea &explosionArea = m_ddsHandler->dtcAes()->explosionArea(aesItemId);
-    isCentral = explosionArea.isCentral();
+    isCentral = explosionArea.isCentral;
     DEBUG_LOG(m_logger) << "explosionArea";
     break;
   }
   case AreaEffectSimulation::AesType::AtExplosionCluster:
   {
     const AreaEffectSimulation::ExplosionCluster &explosionCluster = m_ddsHandler->dtcAes()->explosionCluster(aesItemId);
-    isCentral  = explosionCluster.isCentral() || m_ddsHandler->isLaserGuidable(explosionCluster.chargeStruct());
+    isCentral  = explosionCluster.isCentral || m_ddsHandler->isLaserGuidable(explosionCluster.chargeStruct);
     DEBUG_LOG(m_logger) << "explosionCluster";
     break;
   }
@@ -171,7 +172,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   } // switch
 
   // skip SMART
-  if (m_ddsHandler->isSmartChargeType(data.chargeStruct()))
+  if (m_ddsHandler->isSmartChargeType(data.chargeStruct))
   {
     DEBUG_LOG(m_logger) << " S M A R T return onAesItemViewChanged";
     return;
@@ -203,16 +204,16 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
                       << ", gearClass=" << gearClass
                       << ", isCentral=" << isCentral
                       << ", impactRadius=" << impactRadius
-                      << ", effectStateId=" << data.effectStateId();
+                      << ", effectStateId=" << data.effectStateId;
 
-  switch (data.effectStateId().underlying())
+  switch (data.effectStateId)
   {
   case AreaEffectSimulation::AesEffectState::EsUnknown:
   case AreaEffectSimulation::AesEffectState::EsError:
   case AreaEffectSimulation::AesEffectState::EsExpired:
   case AreaEffectSimulation::AesEffectState::EsRemoved:
   {
-    DEBUG_LOG(m_logger) << " remove aesItemId=" << data.aesItemId();
+    DEBUG_LOG(m_logger) << " remove aesItemId=" << data.aesItemId;
     // do some cleanup:
     m_handledImpactsStorage.removeAesItem(aesItemId);
     Q_FALLTHROUGH();
@@ -232,9 +233,9 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     const auto &participantPositions = m_handlerParticipant->positions();
     for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
     {
-      if (!allParticipantIdsInArea.contains(pPos.participantId()))
+      if (!allParticipantIdsInArea.contains(pPos.participantId))
         continue;
-      sendLeaveHazardDistance(pPos.participantId(), aesItemId, remaining);
+      sendLeaveHazardDistance(pPos.participantId, aesItemId, remaining);
     } // for
 
     // jetzt sollte m_enteredHazardDistanceStore eigentlich bereinigt sein:
@@ -246,7 +247,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
 
 
     // cleanup:
-    if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused)
+    if (data.effectStateId != AreaEffectSimulation::AesEffectState::EsPaused)
     {
       DEBUG_LOG(m_logger) << "Expired, remove aesItemId=" << aesItemId
                           << ", m_aesItemViewsUtm.remove(" << aesItemId << ")";
@@ -262,13 +263,13 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   case AreaEffectSimulation::AesEffectState::EsFired:
   case AreaEffectSimulation::AesEffectState::EsActivated:
   {
-    DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId()
+    DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId
                         << " aesItemId=" << aesItemId
                         << " isCentral=" << isCentral;
 
-    DEBUG_LOG(m_logger) << "insert AesItemView: " << data.effectStateId()
+    DEBUG_LOG(m_logger) << "insert AesItemView: " << data.effectStateId
                         << " aesItemViewUtm.effectStateId=" << aesItemViewUtm.effectStateId
-                        << " chargeTypeId" << aesItemViewUtm.chargeStruct.chargeTypeId();
+                        << " chargeTypeId" << aesItemViewUtm.chargeStruct.chargeTypeId;
 
     // pre-calculate 'hazardDistanceForm' only in case of -> EsPrepared and EsActivated
     // race condition: what comes first?
@@ -279,9 +280,9 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     {
       // useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType::AtExplosionCluster);
 
-      const double hazardDistance = m_ddsHandler->dtcPdm()->hazardDistance(data.chargeStruct().chargeTypeId(),
-                                                                           data.chargeStruct().igniterTypeId(),
-                                                                           data.chargeStruct().igniterFunctionId());
+      const double hazardDistance = m_ddsHandler->dtcPdm()->hazardDistance(data.chargeStruct.chargeTypeId,
+                                                                           data.chargeStruct.igniterTypeId,
+                                                                           data.chargeStruct.igniterFunctionId);
 
       DEBUG_LOG(m_logger) << "+++++++++++ ExplosionCluster: hazardDistance=" << hazardDistance
                           << ", impactRadius ="  << impactRadius;
@@ -332,8 +333,8 @@ void HandlerExplosions::onTriggeredImpactsChanged(const AreaEffectSimulation::Tr
     return;
 
   DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data
-                      << " bitfield().size=" << data.bitfield().size();
-  switch (data.aesTypeId().underlying())
+                      << " bitfield().size=" << data.bitfield.size();
+  switch (data.aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -355,26 +356,26 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
   const auto &participantPositions = m_handlerParticipant->positions();
 
   // GeoPosition to UTM
-  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(data.position(), zone);
-  AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId(),data.igniterTypeId(), data.igniterFunctionId());
+  const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(data.position, zone);
+  AreaEffectSimulation::ChargeStruct chargeStruct(data.chargeTypeId,data.igniterTypeId, data.igniterFunctionId);
   const double impactRadius = m_ddsHandler->chargeTypeRadius(chargeStruct);
 
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId;
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
 
-    const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(pPos.pos(), zone);
+    const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(pPos.pos, zone);
 
-    int equipNo = m_ddsHandler->dtcPpm()->equipmentNumberByParticipantId(pPos.participantId());
-    ParticipantManagement::DynamicParticipantData dynPart = m_ddsHandler->dtcPpm()->dynamicParticipantData(pPos.participantId());
-    ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(pPos.participantId());
+    int equipNo = m_ddsHandler->dtcPpm()->equipmentNumberByParticipantId(pPos.participantId);
+    ParticipantManagement::DynamicParticipantData dynPart = m_ddsHandler->dtcPpm()->dynamicParticipantData(pPos.participantId);
+    ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(pPos.participantId);
 
     int remainEffectPercent = 100; // TODO hier ist keine Gebäudewand dazwischen der Effekt wirkt komplett auf den Teilnehmer. Ist 100 richtig oder 0?
 
@@ -385,50 +386,50 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
       TrainingAreaBase::TabPosition tabPosition;
       TrainingAreaBase::SendCesHitRequest requestTab;
 
-      tabPosition.position().lat(data.position().lat());
-      tabPosition.position().lon(data.position().lon());
-      tabPosition.position().z(data.position().z());
-      requestTab.equipmentNumber(equipNo);
-      requestTab.participantId(pPos.participantId());
-      requestTab.chargeTypeId(data.chargeTypeId());
+      tabPosition.position.lat = data.position.lat;
+      tabPosition.position.lon = data.position.lon;
+      tabPosition.position.z = data.position.z;
+      requestTab.equipmentNumber = equipNo;
+      requestTab.participantId = pPos.participantId;
+      requestTab.chargeTypeId = data.chargeTypeId;
       //default
-      requestTab.aesId(0);
-      requestTab.eventType(ProjectDataManagement::EventType::FireEvent);
+      requestTab.aesId = 0;
+      requestTab.pdmEventType = ProjectDataManagement::PdmEventType::EventType_FireEvent;
       //
-      if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant)
+      if (data.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
       {
         // if we get the equipmentNumber from the participant we will send this (needed by tab)
         // if not fall back to participantId, not negated yet as it's not tested and probalbly handled by the TNE
-        const ParticipantManagement::Participant &part = m_ddsHandler->dtcPpm()->participant(data.originatorId());
-        if (part.equipmentNumber.is_set())
-           requestTab.originatorEquipmentNumber(part.equipmentNumber.get());
+        const ParticipantManagement::Participant &part = m_ddsHandler->dtcPpm()->participant(data.originatorId);
+        if (part.equipmentNumber.has_value())
+           requestTab.originatorEquipmentNumber = part.equipmentNumber.get();
         else
         {
-          WARNING_LOG(m_logger) << "Sending CesHitRequest without EquipNo, using negative ParticipantID : " << data.originatorId();
-          requestTab.originatorEquipmentNumber(-data.originatorId());
+          WARNING_LOG(m_logger) << "Sending CesHitRequest without EquipNo, using negative ParticipantID : " << data.originatorId;
+          requestTab.originatorEquipmentNumber = -data.originatorId;
         }
       }
-      else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Party)
+      else if (data.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party)
       {
-        requestTab.originatorEquipmentNumber(data.originatorId());
+        requestTab.originatorEquipmentNumber = data.originatorId;
       }
-      else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+      else if (data.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
       {
-        requestTab.aesId(data.originatorId());
-        requestTab.eventType(ProjectDataManagement::EventType::ExplosionCluster);
+        requestTab.aesId = data.originatorId;
+        requestTab.pdmEventType = ProjectDataManagement::PdmEventType::EventType_ExplosionCluster;
       }
-      requestTab.remainEffectPercent(remainEffectPercent);
-      requestTab.position(tabPosition);
-      requestTab.effectTime(data.effectStart() / 1000);
-      ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId());
-      requestTab.partyId(originator.partyId());
-      requestTab.mineId(0);
-      requestTab.partyId(originator.partyId());
+      requestTab.remainEffectPercent = remainEffectPercent;
+      requestTab.position = tabPosition;
+      requestTab.effectTime = data.effectStart / 1000;
+      ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId);
+      requestTab.partyId = originator.partyId;
+      requestTab.mineId = 0;
+      requestTab.partyId = originator.partyId;
 
-      DEBUG_LOG(m_logger) << " participantId=" << pPos.participantId()
-                          << ", chargeTypeId=" << data.chargeTypeId()
+      DEBUG_LOG(m_logger) << " participantId=" << pPos.participantId
+                          << ", chargeTypeId=" << data.chargeTypeId
                           << ", m_sendCesHitRequestQueue.size()=" << m_sendCesHitRequestQueue.size()
-                          << ", duration=" << data.effectDuration()
+                          << ", duration=" << data.effectDuration
                           << " \n" << requestTab;
 
       DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab;
@@ -473,7 +474,7 @@ void HandlerExplosions::onChargeEffectChanged(const AreaEffectSimulation::Charge
   DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged";
   if (modType == DataModification::eRemoved)
     return;
-  const long long effectStart = data.effectStart();
+  const long long effectStart = data.effectStart;
 
   DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged"
                       << ", effectStart=" << effectStart
@@ -488,51 +489,51 @@ void HandlerExplosions::onChargeEffectChanged(const AreaEffectSimulation::Charge
   }
   // Startzeit entspricht der aktuellen Zeit
   if (    effectStart > m_ddsHandler->currentPartitionTime() - 3000
-       && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration() )
+       && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration )
   {
     DEBUG_LOG(m_logger) << "Startzeit entspricht der aktuellen Zeit";
     calculateImpact(data);
   }
   // Startzeit in der Zukunft:
-  else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration())
+  else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration)
   {
     // Start mit Timer
     DEBUG_LOG(m_logger) << "Startzeit in der Zukunft"
-                         << ", id :" << data.id()
+                         << ", id :" << data.id
                          << ", duration=" << effectStart - m_ddsHandler->currentPartitionTime();
-    m_chargeEffects.insert(data.id(), data);
-    startTimer(data.id(), effectStart - m_ddsHandler->currentPartitionTime());
+    m_chargeEffects.insert(data.id, data);
+    startTimer(data.id, effectStart - m_ddsHandler->currentPartitionTime());
   }
   DEBUG_LOG(m_logger) << "END onChargeEffectChanged";
 }
 
 void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "\n onExplosionSingleChanged id=" << data.id()
-                      << " AesEffectState=" << data.effectStateId();
+  DEBUG_LOG(m_logger) << "\n onExplosionSingleChanged id=" << data.id
+                      << " AesEffectState=" << data.effectStateId;
   if (modType == DataModification::eRemoved)
     return;
 
   DEBUG_LOG(m_logger) << "onExplosionSingleChanged 1";
 
-  if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated)
+  if (data.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated)
     return;
 
   DEBUG_LOG(m_logger) << "onExplosionSingleChanged"
-                      << " isCentral=" << data.isCentral();
+                      << " isCentral=" << data.isCentral;
 
-  if (!data.isCentral())
+  if (!data.isCentral)
     return;
 
-  DEBUG_LOG(m_logger) << "onExplosionSingle Activated isCentral=" << data.isCentral()
-                      << " id=" << data.id();
+  DEBUG_LOG(m_logger) << "onExplosionSingle Activated isCentral=" << data.isCentral
+                      << " id=" << data.id;
 
   // get access to the aesItemViewUtm storing the data for bbox check:
   CentralEffectSimulation::AesItemViewUtm aesItemViewUtm;
-  if (m_aesItemViewsUtm.contains(data.id()))
-    aesItemViewUtm = m_aesItemViewsUtm.value(data.id());
-  else if (m_aesItemViewsImpactsUtm.contains(data.id()))
-    aesItemViewUtm = m_aesItemViewsImpactsUtm.value(data.id());
+  if (m_aesItemViewsUtm.contains(data.id))
+    aesItemViewUtm = m_aesItemViewsUtm.value(data.id);
+  else if (m_aesItemViewsImpactsUtm.contains(data.id))
+    aesItemViewUtm = m_aesItemViewsImpactsUtm.value(data.id);
   else
     ERROR_LOG(m_logger) << "Kein AesItemViewUtm ";
 
@@ -542,17 +543,17 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
   // GeoPosition to UTM
   QVector<QPointF> triggeredEffectsUtmPos;
   triggeredEffectsUtmPos.reserve(1);
-  const QPointF &posUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition(), aesItemViewUtm.zone);
+  const QPointF &posUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition, aesItemViewUtm.zone);
   triggeredEffectsUtmPos.push_back(posUtm);
 
-  if (m_ddsHandler->isSmartChargeType(data.chargeStruct()))
+  if (m_ddsHandler->isSmartChargeType(data.chargeStruct))
   {
     DEBUG_LOG(m_logger) << " S M A R T "
                         << " aesItemId=" << aesItemViewUtm.aesItemId
-                        << " chargeTypeId=" << data.chargeStruct().chargeTypeId()
+                        << " chargeTypeId=" << data.chargeStruct.chargeTypeId
                         << " partyId=" << aesItemViewUtm.partyId
-                        << " sampleTime=" << data.sampleTime();
-    calculateSmartExplosion(aesItemViewUtm.aesItemId, data.chargeStruct(), aesItemViewUtm.partyId, data.impactPosition(), data.sampleTime());
+                        << " sampleTime=" << data.sampleTime;
+    calculateSmartExplosion(aesItemViewUtm.aesItemId, data.chargeStruct, aesItemViewUtm.partyId, data.impactPosition, data.sampleTime);
     return;
   }
 
@@ -560,8 +561,8 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId;
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
@@ -572,7 +573,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
       continue;
 
     DEBUG_LOG(m_logger) << "calculateImpacts zone=" << aesItemViewUtm.zone;
-    const Core::GeoPosition impactPosition3D(data.impactPosition().lon(), data.impactPosition().lat(), 0.0);
+    const Core::GeoPosition impactPosition3D(data.impactPosition.lon, data.impactPosition.lat, 0.0);
 
     Options options;
     calculateImpactsEffect_outdated(aesItemViewUtm,
@@ -593,19 +594,19 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   Q_UNUSED(modType);
 
   // Until now (04/2024) AreaEffectSimulation::Effects is used at ExplosionCluster only:
-  if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+  if (effects.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
     return;
 
   // older then 10sec? ignore
-  if (effects.sampleTime() < m_ddsHandler->currentPartitionTime() - 10 * 1000)
+  if (effects.sampleTime < m_ddsHandler->currentPartitionTime() - 10 * 1000)
     return;
 
-  const int aesItemId = effects.aesItemId();
+  const int aesItemId = effects.aesItemId;
   AreaEffectSimulation::AesItem aesItem;
-  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId(), aesItem);
+  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId, aesItem);
   if ( itemAvailable)
   {
-    if (m_ddsHandler->isSmartChargeType(aesItem.chargeStruct()))
+    if (m_ddsHandler->isSmartChargeType(aesItem.chargeStruct))
     {
       DEBUG_LOG(m_logger) << "Calculate SMART";
       calculateSmartEffect(effects);
@@ -614,7 +615,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   }
   else
   {
-    DEBUG_LOG(m_logger) << "No aesItem found for effect aesItemId=" << effects.aesItemId();
+    DEBUG_LOG(m_logger) << "No aesItem found for effect aesItemId=" << effects.aesItemId;
   }
 
   // get access to the aesItemViewUtm storing the data for bbox check:
@@ -633,7 +634,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   // assume that areas with (isCentral = false) are not stored at m_aesItemViewsUtm
   //
 
-  const int chargeTypeId                            = aesItemViewUtm.chargeStruct.chargeTypeId();
+  const int chargeTypeId                            = aesItemViewUtm.chargeStruct.chargeTypeId;
   const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeTypeId);
 
   DEBUG_LOG(m_logger) << "onEffectsChanged, aesItemId=" << aesItemId
@@ -641,7 +642,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
                       << ", gearClass = " << gearClass;
 
   // determine relevant positions:
-  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects();
+  const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = effects.singleEffects;
 
   QVector<LtsCoordinate> triggeredEffectsLtsCoord;
   triggeredEffectsLtsCoord.reserve(singleEffectsRef.size());
@@ -650,7 +651,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
   {
     ++curSeIndex;
-    if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
+    if (se.singleEffectState != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
       continue;
 
     // compare current triggered idx with triggered idx of the past
@@ -658,7 +659,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
       continue;
 
     // okay, the current idx is triggered now and was not triggered before -> changing
-    triggeredEffectsLtsCoord.push_back(LtsCoordinate(se.position())); // ZpDraped and ZpAbsolute should have a valid zValue
+    triggeredEffectsLtsCoord.push_back(LtsCoordinate(se.position)); // ZpDraped and ZpAbsolute should have a valid zValue
 
     // update storage ('remember')
     m_handledImpactsStorage.setIndexProcessed(aesItemId, curSeIndex);
@@ -673,11 +674,11 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   const auto &participantPositions = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : std::as_const(participantPositions))
   {
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId()
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId
                         << ", vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
@@ -687,14 +688,14 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
     //    if (!inBoundingBoxCheck(aesItemViewUtm, pPos))
     //      continue;
 
-    DEBUG_LOG(m_logger) << "calculateImpactsEffect for participantId " << pPos.participantId()
+    DEBUG_LOG(m_logger) << "calculateImpactsEffect for participantId " << pPos.participantId
                         << " Pos=" << pPos.ltsCoordinate().toString() << " ....";
     // both: BLDG_LOS, ELEVATION_LOS
     Options options = EXECUTE_BLDG_LOS_CALC |
         EXECUTE_ELEVATION_LOS_CALC;
     calculateImpactsEffect(aesItemViewUtm, triggeredEffectsLtsCoord, pPos, options);
 
-    DEBUG_LOG(m_logger) << "calculateImpactsEffect for participantId " << pPos.participantId() << " DONE";
+    DEBUG_LOG(m_logger) << "calculateImpactsEffect for participantId " << pPos.participantId << " DONE";
   } // for const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos
 
   INFO_LOG(m_logger) << " onEffectsChanged took [ms] " << timer.elapsed();
@@ -705,7 +706,7 @@ void HandlerExplosions::onNewParticipantCesPosition(const CentralEffectSimulatio
 {
   if (m_aesItemViewsUtm.empty())
   {
-    TRACE_LOG(m_logger) << "++++++++ onNewParticipantOutdoorPosition participantId="  << participantData.participantId()
+    TRACE_LOG(m_logger) << "++++++++ onNewParticipantOutdoorPosition participantId="  << participantData.participantId
                         << ", m_aesItemViewsUtm.size=" << m_aesItemViewsUtm.size();
     return;
   }
@@ -715,12 +716,12 @@ void HandlerExplosions::onNewParticipantCesPosition(const CentralEffectSimulatio
   //
   // const reference (but if required we can benefit from implicit data sharing)
   const auto &participantPositions = m_handlerParticipant->positions();
-  const HandlerParticipant::POSITIONS_CONST_ITER curPartIt = participantPositions.find(participantData.participantId());
+  const HandlerParticipant::POSITIONS_CONST_ITER curPartIt = participantPositions.find(participantData.participantId);
   if (curPartIt == participantPositions.constEnd())
     return;
 
   const int numberOfParametrizedObjects = checkPartEnterLeaveArea(m_aesItemViewsUtm.constBegin(), m_aesItemViewsUtm.constEnd(),
-                                                                  curPartIt, curPartIt + 1);                     // parametrize a single item
+                                                                  curPartIt, std::next(curPartIt));                     // parametrize a single item
 
   DEBUG_LOG(m_logger) << "++++++++ checkPartEnterLeaveArea checkPartEnterLeaveAreaNumber="  << numberOfParametrizedObjects;
 }
@@ -753,11 +754,11 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
       ++numberOfParametrizedObjects;
 
       const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData = *currentParticipantIt;
-      const int participantId                    = participantData.participantId();
-      const Core::GeoPosition &participantGeoPos = participantData.pos();
+      const int participantId                    = participantData.participantId;
+      const Core::GeoPosition &participantGeoPos = participantData.pos;
 
-      if (LtsCoordTrans::LtsCoordinate::valueIsNullOrNan(participantGeoPos.lon()) ||
-          LtsCoordTrans::LtsCoordinate::valueIsNullOrNan(participantGeoPos.lat()))
+      if (LtsCoordTrans::LtsCoordinate::valueIsNullOrNan(participantGeoPos.lon) ||
+          LtsCoordTrans::LtsCoordinate::valueIsNullOrNan(participantGeoPos.lat))
         continue;
 
       if (m_handlerParticipant->isOutdated(participantData)) // Participant Position is not valid Todo Magic Number
@@ -850,7 +851,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
           if (participantIsInsideForm)
             remaining = 1;
           DEBUG_LOG(m_logger) << "Send HazardDistanceMessage to participant (LEAVING)... remaining =" << remaining;
-          sendLeaveHazardDistance(participantData.participantId(), curAivUtmArea.aesItemId, remaining);
+          sendLeaveHazardDistance(participantData.participantId, curAivUtmArea.aesItemId, remaining);
         }
       } // if (bWasRealInHazardDistance != bRealInHazardDistance)
 
@@ -885,14 +886,14 @@ bool HandlerExplosions::inBoundingBoxCheck(const CentralEffectSimulation::AesIte
   const QRectF boundingBoxImpact(itemViewUtm.boundingBoxBottomLeft,
                                  itemViewUtm.boundingBoxTopRight);
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemViewUtm.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemViewUtm.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId
                         << " inside AesItemView:" << itemViewUtm.aesItemId;
     return true;
   }
-  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId
                       << " outside AesItemView:" << itemViewUtm.aesItemId;
   return false;
 } // END inBoundingBoxCheck
@@ -904,23 +905,23 @@ void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects
   DEBUG_LOG(m_logger) << "calculateSmartEffect";
 
   AreaEffectSimulation::AesItem aesItem;
-  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId(), aesItem);
+  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId, aesItem);
   if ( itemAvailable)
   {
-    for (const AreaEffectSimulation::SingleEffect &se : std::as_const(effects.singleEffects()))
+    for (const AreaEffectSimulation::SingleEffect &se : std::as_const(effects.singleEffects))
     {
       DEBUG_LOG(m_logger) << LOGFUNCTION << " ---> singleEffect=" << se
                           << ", aesItem= " << aesItem;
-      calculateSmartExplosion(effects.aesItemId(),
-                              aesItem.chargeStruct(),
-                              aesItem.partyId.is_set() ? aesItem.partyId.get() : 0,
-                              Core::GeoPosition(se.position().lon(), se.position().lat(), 0),
-                              effects.sampleTime());
+      calculateSmartExplosion(effects.aesItemId,
+                              aesItem.chargeStruct,
+                              aesItem.partyId.has_value() ? aesItem.partyId.get() : 0,
+                              Core::GeoPosition(se.position.lon, se.position.lat, 0),
+                              effects.sampleTime);
     } // for
   } // if
   else
   {
-    WARNING_LOG(m_logger) << "No aesItem found for effect aesItemId=" << effects.aesItemId();
+    WARNING_LOG(m_logger) << "No aesItem found for effect aesItemId=" << effects.aesItemId;
   } // else
 } // END calculateSmartEffect
 
@@ -940,7 +941,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
 
   QVector <ParticipantDistance> vehiclesInSmartExplosion;
 
-  DEBUG_LOG(m_logger) << "calculateSmartExplosion chargeTypeId=" << chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << "calculateSmartExplosion chargeTypeId=" << chargeStruct.chargeTypeId;
   // Insert all Vehicles inside of explosion-Radius in list vehiclesInSmartExplosion
   const double searchRadius = m_ddsHandler->searchRadius(chargeStruct);  // where the smart munition should search for targets
   const double impactRadius = m_ddsHandler->chargeTypeRadius(chargeStruct);  // the real explosion area radius
@@ -953,12 +954,12 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
     if (m_handlerParticipant->isOutdated(participantPosition)) // Participant Position is not valid Todo Magic Number
       continue;
 
-    const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), impactPosZone);
+    const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, impactPosZone);
 
-    ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
-    DEBUG_LOG(m_logger) << "participant id=" << participantPosition.participantId()
-                        << " participantTypeId=" << participantPosition.participantTypeId()
-                        << " partyType =" << participantPosition.partyId()
+    ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
+    DEBUG_LOG(m_logger) << "participant id=" << participantPosition.participantId
+                        << " participantTypeId=" << participantPosition.participantTypeId
+                        << " partyType =" << participantPosition.partyId
                         << " typeClass=" << typeClass;
 
     // Only send, if Any Participant is in Smart-Range (save Tetra load)
@@ -970,10 +971,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
         typeClass != ParticipantManagement::TypeClass::WeaponSystem)
       continue;
 
-    DEBUG_LOG(m_logger) << "participantPosition.timestamp =" << participantPosition.sampleTime()
+    DEBUG_LOG(m_logger) << "participantPosition.timestamp =" << participantPosition.sampleTime
                         << " effectTime                   = " << m_ddsHandler->currentPartitionTime();
 
-    DEBUG_LOG(m_logger) << "Vehicle => calculate SMART participantId=" << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "Vehicle => calculate SMART participantId=" << participantPosition.participantId
                         << " ImpactPos=" << CentralEffectSimulation::debug(impactPos)
                         << " searchRadius=" << searchRadius
                         << " participantPosition=" << CentralEffectSimulation::debug(participantPosUtmPoint);
@@ -983,7 +984,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
       oneEntry.squareDistance = CentralEffectSimulation::getSquareDistance(impactPos, participantPosUtmPoint);
       oneEntry.participantPosition = participantPosition;
       DEBUG_LOG(m_logger) << "squareDistance = " << oneEntry.squareDistance
-                          << " append participantId=" << participantPosition.participantId();
+                          << " append participantId=" << participantPosition.participantId;
       vehiclesInSmartExplosion.append(std::move(oneEntry));
     }
   }
@@ -991,14 +992,14 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
   CentralEffectSimulation::AesItemViewUtm itemViewUtm = m_aesItemViewsImpactsUtm.value(aesItemId);
   itemViewUtm.chargeStruct = chargeStruct; // SingleExplosion: no Entry
   itemViewUtm.aesItemId = aesItemId;
-  DEBUG_LOG(m_logger) << "aesItemViewUtm itemView.chargeTypeId =" << itemViewUtm.chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << "aesItemViewUtm itemView.chargeTypeId =" << itemViewUtm.chargeStruct.chargeTypeId;
   if (vehiclesInSmartExplosion.size() == 0)
   {
     DEBUG_LOG(m_logger) << "size=0";
     if (bHumanFound)
     {
       CentralEffectSimulation::HandlerParticipant::CesParticipantData pos;
-      pos.pos(Core::GeoPosition(impactPosition.lon(), impactPosition.lat(), 0));
+      pos.pos = Core::GeoPosition(impactPosition.lon, impactPosition.lat, 0);
       // send single fire to all if at least one participant is inside circle
       // REGG-4160 no SMART-reachtion in GUEZ
       // sendCesHitRequest(itemView, pos, impactTime);
@@ -1008,10 +1009,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
   {
     DEBUG_LOG(m_logger) << "size=1";
     // send two single fire to the same vehicle
-    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime       , 100, ProjectDataManagement::EventType::HitEffectSimulation);           // 100 Percent
-    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType::HitEffectSimulation);    // 100 Percent
-    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType::HitEffectSimulation);
-    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType::HitEffectSimulation);
+    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime       , 100, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);           // 100 Percent
+    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);    // 100 Percent
+    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
+    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
   }
   else
   {
@@ -1025,10 +1026,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
     };
     std::sort(vehiclesInSmartExplosion.begin(), vehiclesInSmartExplosion.end(), mapSortLessThan);
 
-    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::EventType::HitEffectSimulation);    // 100 Percent
-    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::EventType::HitEffectSimulation);    // 100 Percent
-    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::EventType::HitEffectSimulation);
-    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::EventType::HitEffectSimulation);
+    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);    // 100 Percent
+    sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);    // 100 Percent
+    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
+    sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
 
   }
 } // calculateSmartExplosion
@@ -1040,45 +1041,45 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
   DEBUG_LOG(m_logger) << "calculateImpacts m_aesItemViewsImpactsUtm.size " << m_aesItemViewsImpactsUtm.size();
 
   // older then 10sec? ignore
-  if (data.sampleTime() < m_ddsHandler->currentPartitionTime() - 10 * 1000)
+  if (data.sampleTime < m_ddsHandler->currentPartitionTime() - 10 * 1000)
     return;
 
-  if (!m_aesItemViewsImpactsUtm.contains(data.aesItemId()))
+  if (!m_aesItemViewsImpactsUtm.contains(data.aesItemId))
   {
-    DEBUG_LOG(m_logger) << "calculateImpacts no aesItemId " << data.aesItemId();
+    DEBUG_LOG(m_logger) << "calculateImpacts no aesItemId " << data.aesItemId;
     return;
   }
 
   //CentralEffectSimulation::AesItemViewUtm aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast<int>(data.aesItemId()));
   CentralEffectSimulation::AesItemViewUtm aesItemViewUtm;
-  if ((data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
-      || (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions))
-    aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast<int>(data.aesItemId()));
+  if ((data.aesTypeId == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
+      || (data.aesTypeId == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions))
+    aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast<int>(data.aesItemId));
   else
-    aesItemViewUtm = m_aesItemViewsUtm.value(static_cast<int>(data.aesItemId()));
+    aesItemViewUtm = m_aesItemViewsUtm.value(static_cast<int>(data.aesItemId));
   DEBUG_LOG(m_logger) << "m_aesItemViewsUtm.insert aesItemId=" << aesItemViewUtm.aesItemId;
 
   const bool bIsSmartChargeType = m_ddsHandler->isSmartChargeType(aesItemViewUtm.chargeStruct);
   DEBUG_LOG(m_logger) << "calculateImpacts, isSMart: " << bIsSmartChargeType;
 
 
-  DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts1  " << data.aesItemId();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts1  " << data.aesItemId;
 
   QVector<int> bitsToCheck;
-  for (int bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
+  for (int bitFieldIdx = 0; bitFieldIdx < data.impactCount; ++bitFieldIdx)
   {
     // not yet triggered (bit is still 1)
-    if (LtsUtils::BitArray::testBit(data.bitfield(), bitFieldIdx))
+    if (LtsUtils::BitArray::testBit(data.bitfield, bitFieldIdx))
       continue;
 
-    if (m_handledImpactsStorage.isIndexProcessed(data.aesItemId(), bitFieldIdx))
+    if (m_handledImpactsStorage.isIndexProcessed(data.aesItemId, bitFieldIdx))
       continue;
 
     bitsToCheck += bitFieldIdx;
     DEBUG_LOG(m_logger) << "bitsToCheck+=" << bitFieldIdx;
 
     // update storage ('remember')
-    m_handledImpactsStorage.setIndexProcessed(data.aesItemId(), bitFieldIdx);
+    m_handledImpactsStorage.setIndexProcessed(data.aesItemId, bitFieldIdx);
 
     if (bIsSmartChargeType)
     {
@@ -1095,8 +1096,8 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId;
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
@@ -1117,7 +1118,7 @@ void HandlerExplosions::calculateImpacts(const CentralEffectSimulation::AesItemV
 
   // get radius of munition
   const double impactRadius = m_ddsHandler->chargeTypeRadius(itemView.chargeStruct);
-  const QPointF &participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
+  const QPointF &participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemView.zone);
 
   DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts2a  impactsToCheck.size " << impactsToCheck.size();
 
@@ -1144,7 +1145,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
 {
   const LtsCoordinate &partLtsCoordinate = participantPosition.ltsCoordinate(); // WITH zValue
 
-  const int participantId = participantPosition.participantId();
+  const int participantId = participantPosition.participantId;
   INFO_LOG(m_logger) << "calculateImpactsEffect" << " START"
                      << ", participantId = " << participantId
                      << ", participantPosition.ltsCoordinate = '" << participantPosition.ltsCoordinate().toString() << "'"
@@ -1158,15 +1159,15 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
 
 
   // get radius of munition
-  const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(itemView.chargeStruct.chargeTypeId());
-  const bool bIsAirSupport = (gearClass.underlying() == ProjectDataManagement::GearClass::AirSupport);
+  const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(itemView.chargeStruct.chargeTypeId);
+  const bool bIsAirSupport = (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport);
 
   const QVector<double> &rangesInMeter = chargeRanges(itemView.chargeStruct);
   DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " chargeRanges:"
-                      << ", chargeTypeId = " << itemView.chargeStruct.chargeTypeId()
+                      << ", chargeTypeId = " << itemView.chargeStruct.chargeTypeId
                       << ", gearClass = " << gearClass
                       << ", bIsAirSupport = " << bIsAirSupport
-                      << ", chargeTypeId = " << itemView.chargeStruct.chargeTypeId()
+                      << ", chargeTypeId = " << itemView.chargeStruct.chargeTypeId
                       << ", ranges.size = " << rangesInMeter.size();
 
   Q_ASSERT(!rangesInMeter.isEmpty());
@@ -1198,7 +1199,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
     //
     // 1 range  -> typical explosionCluster
     //  == impactRadius
-    // 3 ranges -> typical explosionCluster with chargeTypeId of GearClass::AirSupport
+    // 3 ranges -> typical explosionCluster with chargeTypeId of GearClass::GearClass_AirSupport
     //  == lethalRadius, nonLethalRadius, hazardDistance
     //
 
@@ -1219,7 +1220,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
         effect = 3;   // hazardDistance
         DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
         sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
-                          effect, ProjectDataManagement::EventType::EnterHazardDistance);
+                          effect, ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance);
       }
         break;
       case RANGE::NON_LETHAL:
@@ -1244,14 +1245,14 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
         {
           DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
           sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
-                            effect, ProjectDataManagement::EventType::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
+                            effect, ProjectDataManagement::PdmEventType::EventType_AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
         }
 #ifdef GUEZE_3136_IMPLEMENTED
         else
         {
           DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << "  (Verdeckung -> EnterHazardDistance)";
           sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
-                            effect, ProjectDataManagement::EventType::EnterHazardDistance);
+                            effect, ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance);
         }
 #endif // GUEZE_3136_IMPLEMENTED
       } // case
@@ -1307,7 +1308,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
   const LtsCoordTrans::LtsCoordinate &partLtsCoordinate = participantPosition.ltsCoordinate(); // WITH zValue
 
   INFO_LOG(m_logger) << LOGFUNCTION << " START"
-                     << " participantId = " << participantPosition.participantId()
+                     << " participantId = " << participantPosition.participantId
                      << " participantPosition.ltsCoordinate = '" << participantPosition.ltsCoordinate().toString() << "'"
                      << ", triggeredEffectsGeoPos.size() = " << triggeredEffectsGeoPos.size()
                      << ", triggeredEffectsUtmPos.size() = " << triggeredEffectsUtmPos.size()
@@ -1334,10 +1335,10 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
   // Wir heben pauschal um 0.5m an.
   // Muss dies evtl. Typ-anhaengig geschehen?
   Core::GeoPosition participantPositionGeoPos        = partLtsCoordinate.geoPosition();  // WITH zValue
-  participantPositionGeoPos.z() += 0.5; // shift 0.5m
+  participantPositionGeoPos.z += 0.5; // shift 0.5m
 
   const QPointF &participantPosUtmPoint              = CentralEffectSimulation::geographic2Utm(participantPositionGeoPos, itemView.zone);
-  DEBUG_LOG(m_logger) << " participantPositionGeoPos=" << participantPositionGeoPos.lon() << "/" << participantPositionGeoPos.lat()
+  DEBUG_LOG(m_logger) << " participantPositionGeoPos=" << participantPositionGeoPos.lon << "/" << participantPositionGeoPos.lat
                       << " itemView.zone=" << itemView.zone
                       << " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/"  << participantPosUtmPoint.y();
 
@@ -1354,7 +1355,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
                         << " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/"  << participantPosUtmPoint.y()
                         << " impactRadius=" << impactRadius
                         << ", inCircle = " << bInCircle
-                        << " participantId=" << participantPosition.participantId();
+                        << " participantId=" << participantPosition.participantId;
 
     if (!bInCircle)
     {
@@ -1382,10 +1383,10 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
 
     // check LOS / LineOfSight
     DEBUG_LOG(m_logger) << LOGFUNCTION << " check LOS / LineOfSight bLOS=" << bLOS
-                        << " participantId=" << participantPosition.participantId();
+                        << " participantId=" << participantPosition.participantId;
     if (bLOS)
     {
-      INFO_LOG(m_logger) << "calculateImpactsEffect 3 participantId = " << participantPosition.participantId()
+      INFO_LOG(m_logger) << "calculateImpactsEffect 3 participantId = " << participantPosition.participantId
                          << " -> bInCircle and given LOS -> sendEffectTypeEvent ...";
       sendEffectTypeEvent(itemView, participantPosition, EffectType::ExplosionArea, m_ddsHandler->currentPartitionTime());
     }
@@ -1408,10 +1409,10 @@ bool HandlerExplosions::inCircle(const QPointF &centerUtm, const double radius,
 
 QVector<double> HandlerExplosions::chargeRanges(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
 {
-  const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeStruct.chargeTypeId());
-  DEBUG_LOG(m_logger) << "chargeTypeId = " << chargeStruct.chargeTypeId() << ", gearClass = " << gearClass;
+  const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeStruct.chargeTypeId);
+  DEBUG_LOG(m_logger) << "chargeTypeId = " << chargeStruct.chargeTypeId << ", gearClass = " << gearClass;
 
-  if (gearClass.underlying() == ProjectDataManagement::GearClass::AirSupport)
+  if (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
   {
     const double lethalRadius     = m_ddsHandler->getLethalRadius(chargeStruct);
     const double nonLethalRadius  = m_ddsHandler->getNonLethalRadius(chargeStruct);
@@ -1473,22 +1474,22 @@ RANGE HandlerExplosions::getMostInnerRange(const QVector<double> &ranges, double
 
 RANGE HandlerExplosions::getMostInnerRange(double currentDistance, const AreaEffectSimulation::ChargeStruct &chargeStruct, int &retEffect)
 {
-  int hazard_Distance = m_ddsHandler->dtcPdm()->hazardDistance(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
+  int hazard_Distance = m_ddsHandler->dtcPdm()->hazardDistance(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
   if (currentDistance > hazard_Distance)
     return RANGE::OUTSIDE;
   int lastRange = 9999;
   ProjectDataManagement::SeverityType lastST = ProjectDataManagement::SeverityType::noEffect;
   for (const auto &casEffect : m_ddsHandler->getCasEffects(chargeStruct))
   {
-   if (currentDistance < casEffect.impactRadius() && casEffect.impactRadius() < lastRange)
+   if (currentDistance < casEffect.impactRadius && casEffect.impactRadius < lastRange)
    {
-     lastRange = casEffect.impactRadius();
-     lastST = casEffect.severityType();
-     retEffect = iedClassToEffect(casEffect.iedClass());
+     lastRange = casEffect.impactRadius;
+     lastST = casEffect.severityType;
+     retEffect = iedClassToEffect(casEffect.iedClass);
    }
   }
 
-  switch (lastST.underlying())
+  switch (lastST)
   {
   case ProjectDataManagement::SeverityType::noEffect:
     return RANGE::HAZARD_DISTANCE;
@@ -1514,7 +1515,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt
   // Trefferereignis Sekundaerwirkung
 
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
-  const int participantId = participantPosition.participantId();
+  const int participantId = participantPosition.participantId;
   DEBUG_LOG(m_logger) << "Sending EffectType event " << ctasEffectType
                       << ", participant: " << participantId
                       << ", aesItemId: " << itemView.aesItemId
@@ -1524,7 +1525,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt
                     //effectTime >= 0 ? effectTime : participantPosition.sampleTime(),
                     QDateTime::currentMSecsSinceEpoch(),
                     ctasEffectType,
-                    ProjectDataManagement::EventType::HitEffectSimulation);
+                    ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
 }
 
 // Send via TAB-Proxy to battlefield
@@ -1532,7 +1533,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
                                           const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
                                           const qint64 effectTime,
                                           const int remaining,
-                                          const ProjectDataManagement::EventType eventType)
+                                          const ProjectDataManagement::PdmEventType eventType)
 {
   int32_t legacyChargeTypeId = 0;
   legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct);
@@ -1543,10 +1544,10 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
     return;
 
   DEBUG_LOG(m_logger) << "sendCesHitRequest"
-                      << " participantId=" << participantPosition.participantId()
+                      << " participantId=" << participantPosition.participantId
                       << " remaining=" << remaining
                       << " eventType=" << eventType
-                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
+                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId;
 
   // Bei Nebel soll die Weste nur einmal piepen und nicht regelmaessig. Das wird mit Wirkung = 3 uebertragen
   int effect = remaining;
@@ -1554,19 +1555,19 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
     effect = 3;
 
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId()
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId
                       << " equipNo = " << equipNo
                       << " aesItemId =" << itemView.aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if ((participantPosition.participantId() != 0) && (equipNo <= 0))
+  if ((participantPosition.participantId != 0) && (equipNo <= 0))
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
-  if (participantPosition.participantId() != 0 &&
-      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantPosition.participantId != 0 &&
+      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
@@ -1579,28 +1580,28 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
   const int originatorEquipNo = 0;
 #endif // ORIGINATOR_AT_SENDCESHITREQUEST
 
-  const TrainingAreaBase::TabPosition pos(participantPosition.pos(),
+  const TrainingAreaBase::TabPosition pos(participantPosition.pos,
                                           Core::PositionReportingSource::Gps, // irrelevant
-                                          participantPosition.buildingId(),
-                                          participantPosition.roomId());
+                                          participantPosition.buildingId,
+                                          participantPosition.roomId);
 
   // mineFieldBitIndex wird als reserve1 uegertragen und hier wird die Wirkdauer uebertragen.
-  const int duration = m_ddsHandler->dtcAes().get()->explosionCluster(itemView.aesItemId).effectDuration() / 1000;
+  const int duration = m_ddsHandler->dtcAes().get()->explosionCluster(itemView.aesItemId).effectDuration / 1000;
 
   // mineFieldBitIndex wird als reserve2 uebertragen und hier wird die Wirkbeginn uebertragen.
   int effectTime2 = 0;
-  if (eventType == ProjectDataManagement::EventType::EnterHazardDistance)
+  if (eventType == ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance)
   {
     const auto &ec = m_ddsHandler->dtcAes().get()->explosionCluster(itemView.aesItemId);
-    if (ec.effectStart.is_set())
+    if (ec.effectStart.has_value())
       effectTime2 = ec.effectStart.get() / 1000; // msec to sec
   }
 
 
   TrainingAreaBase::SendCesHitRequest requestTab(
         equipNo,                                                                    // equipmentNumber (injured/damaged)
-        participantPosition.participantId(),                                        // participantId
-        legacyChargeTypeId > 0 ? legacyChargeTypeId : itemView.chargeStruct.chargeTypeId(),        // chargeTypeId
+        participantPosition.participantId,                                        // participantId
+        legacyChargeTypeId > 0 ? legacyChargeTypeId : itemView.chargeStruct.chargeTypeId,        // chargeTypeId
         itemView.aesItemId,                                                         // aesId
         originatorEquipNo,                                                          // originatorEquipmentNumber
         effect,                                                                     // Wirkung
@@ -1610,8 +1611,8 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
         itemView.partyId,                                                           // originPartyId
         duration
         );
-  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId()
-                      << ", chargeTypeId=" << itemView.chargeStruct.chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId
+                      << ", chargeTypeId=" << itemView.chargeStruct.chargeTypeId
                       << ", legacyChargeTypeId=" << legacyChargeTypeId
                       << ", m_sendCesHitRequestQueue.size()=" << m_sendCesHitRequestQueue.size()
                       << ", duration=" << duration;
@@ -1619,7 +1620,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
   DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab;
   m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   if (!m_ddsHandler->isSmartChargeType(itemView.chargeStruct))
-    sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::EventType::HitEffectSimulation);
+    sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
 }
 
 double HandlerExplosions::getSquareDistance(const QPointF &centerUtm, const QPointF &pointUtm)
@@ -1646,13 +1647,13 @@ void HandlerExplosions::sendEnterHazardDistance(const int participantId, const i
 
   m_enteredHazardDistanceStore.participantEnteringArea(participantId, aesItemId);
 
-  ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType::EnterHazardDistance;
+  ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance;
   sendCesHitRequest(m_aesItemViewsUtm.value(aesItemId),
                     cesParticipantData,
                     QDateTime::currentMSecsSinceEpoch(),
                     ctasEffectType,
                     eventType);
-  sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::EventType::EnterHazardDistance);
+  sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance);
 }
 
 void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const int aesItemId, const int remaining)
@@ -1672,28 +1673,28 @@ void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const i
                     cesParticipantData,
                     QDateTime::currentMSecsSinceEpoch(),
                     ctasEffectType,
-                    ProjectDataManagement::EventType::LeaveHazardDistance);
-  sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::EventType::LeaveHazardDistance);
+                    ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance);
+  sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance);
 }
 
 void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &item,
                                              const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
-                                             const ProjectDataManagement::EventType eventType)
+                                             const ProjectDataManagement::PdmEventType eventType)
 {
-  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId();
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId;
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
 
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
       typeClass == ParticipantManagement::TypeClass::SupportEntity ||
       typeClass == ParticipantManagement::TypeClass::Unknown)
     return;
-  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId();
+  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId;
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   if (equipmentNumber <= 0)
     return;
-  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId();
+  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId;
 
   //const AreaEffectSimulation::OffRouteMine &of = m_ddsHandler->dtcAes()->offRouteMine(offRouteItem.aesItemId);
   const AreaEffectSimulation::ExplosionCluster &explosionCluster = m_ddsHandler->dtcAes()->explosionCluster(item.aesItemId);
@@ -1701,26 +1702,26 @@ void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesI
 
   CentralEffectSimulation::ParticipantEvent pe;
 
-  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId()
-                      << " lat= " << participantPosition.pos().lat()
-                      << " lon= " << participantPosition.pos().lon()
+  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId
+                      << " lat= " << participantPosition.pos.lat
+                      << " lon= " << participantPosition.pos.lon
                       << " equipmentNumber=" << equipmentNumber
                       << " eventType=" << eventType
-                      << " Name=" << explosionCluster.name()
-                      << " position=" << participantPosition.pos().lat() << "/" <<  participantPosition.pos().lon();
-  pe.id(m_ddsHandler->getParticipantEventId());
-  pe.eventTypeId(eventType);
-  pe.participantId(participantPosition.participantId());
-  pe.eventTime(participantPosition.sampleTime());
-  pe.aesItemId(item.aesItemId);
-  pe.partyId(participantPosition.partyId());
-  pe.aesName(explosionCluster.name());
-  pe.equipmentNumber(equipmentNumber);
-  pe.friendlyFire(item.partyId == participantPosition.partyId());
-  pe.position(participantPosition.pos());
+                      << " Name=" << explosionCluster.name
+                      << " position=" << participantPosition.pos.lat << "/" <<  participantPosition.pos.lon;
+  pe.id = m_ddsHandler->getParticipantEventId();
+  pe.eventTypeId = eventType;
+  pe.participantId = participantPosition.participantId;
+  pe.eventTime = participantPosition.sampleTime;
+  pe.aesItemId = item.aesItemId;
+  pe.partyId = participantPosition.partyId;
+  pe.aesName = explosionCluster.name;
+  pe.equipmentNumber = equipmentNumber;
+  pe.friendlyFire = item.partyId == participantPosition.partyId;
+  pe.position = participantPosition.pos;
 
   m_ddsHandler->dtsCes()->publish(pe);
-  qint64 id = pe.id();
+  qint64 id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
index cbd24b431..74d1c0c2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
@@ -91,62 +91,62 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo
 {
   // order checks by effort:
   if ((modType == DataModification::eRemoved)
-      || (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
-      || (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated))
+      || (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
+      || (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated))
     return;
 
-  if (!data.effectStart.is_set())
+  if (!data.effectStart.has_value())
   {
     DEBUG_LOG(m_logger) << "No effectStart";
     return;
   }
 
   // Kriterium fuer NASAT/MIDAS
-  if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
+  if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeStruct.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
     return;
 
-  if (!m_ddsHandler->isLaserGuidable(data.chargeStruct()))
+  if (!m_ddsHandler->isLaserGuidable(data.chargeStruct))
     return;
 
-  if (!data.flightCurve.is_set() || !data.laserGuiding.is_set())
+  if (!data.flightCurve.has_value() || !data.laserGuiding.has_value())
     return;
   const AreaEffectSimulation::FlightCurve  &fcData = data.flightCurve.get();
   const AreaEffectSimulation::LaserGuiding &lgData = data.laserGuiding.get();
 
-  DEBUG_LOG(m_logger) << "\n onExplosionClusterChanged id=" << data.id()
-                      << " AesEffectState=" << data.effectStateId()
-                      << " lcPrf=" << lgData.lcAttack()
-                      << " originalEffectDuration=" << data.originalEffectDuration()
-                      << " effectStart=" << data.effectStart();
+  DEBUG_LOG(m_logger) << "\n onExplosionClusterChanged id=" << data.id
+                      << " AesEffectState=" << data.effectStateId
+                      << " lcPrf=" << lgData.lcAttack
+                      << " originalEffectDuration=" << data.originalEffectDuration
+                      << " effectStart=" << data.effectStart;
 
-  DEBUG_LOG(m_logger) << "m_prfToAesId.insert(" << lgData.lcAttack() << ", " << data.id() << ")"
-                      << " tapTimepoint=" << lgData.tapTime()
+  DEBUG_LOG(m_logger) << "m_prfToAesId.insert(" << lgData.lcAttack << ", " << data.id << ")"
+                      << " tapTimepoint=" << lgData.tapTime
                       << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
-                      << " Timer interval =" << lgData.tapTime() - m_ddsHandler->currentPartitionTime();
+                      << " Timer interval =" << lgData.tapTime - m_ddsHandler->currentPartitionTime();
 
-  int aesId = data.id();
+  int aesId = data.id;
   QTimer *timer = new QTimer(this);
   timer->setSingleShot(true);
   QObject::connect(timer, &QTimer::timeout,
                    this, &HandlerVulcano::onFiringTimeTimeout);
-  if (m_aesTimers.contains(data.id()))
+  if (m_aesTimers.contains(data.id))
   {
-    m_aesTimers.value(data.id())->stop();
-    delete m_aesTimers.value(data.id());
-    m_aesTimers.remove(data.id());
+    m_aesTimers.value(data.id)->stop();
+    delete m_aesTimers.value(data.id);
+    m_aesTimers.remove(data.id);
   }
-  m_aesTimers.insert(data.id(), timer);
+  m_aesTimers.insert(data.id, timer);
   timer->setProperty("aesId", aesId);
   {
-    long long effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
-    long long calculatedFlightDurationMSec = fcData.calculatedFlightDuration();
+    long long effectStart = data.effectStart.has_value() ? data.effectStart.get() : 0;
+    long long calculatedFlightDurationMSec = fcData.calculatedFlightDuration;
     long long currentPartitionTime = m_ddsHandler->currentPartitionTime();
     const int timerTimeout = effectStart - calculatedFlightDurationMSec - currentPartitionTime;
     DEBUG_LOG(m_logger) << "Timer started mit Abflugzeit des Vulcano=" << timerTimeout;
     if (timerTimeout >= 0)
       timer->start(timerTimeout);
   }
-  m_explosionCluster.insert(data.id(), data);
+  m_explosionCluster.insert(data.id, data);
 }
 
 void HandlerVulcano::onFiringTimeTimeout()
@@ -159,9 +159,9 @@ void HandlerVulcano::onFiringTimeTimeout()
 
   DEBUG_LOG(m_logger) << "onTimerTimeout aesId=" << aesId;
   const auto &myEC = m_explosionCluster.value(aesId);
-  if (myEC.id() != aesId)
+  if (myEC.id != aesId)
     return;
-  if (!myEC.flightCurve.is_set())
+  if (!myEC.flightCurve.has_value())
     return;
   const AreaEffectSimulation::FlightCurve &fcData = myEC.flightCurve.get();
 
@@ -184,7 +184,7 @@ void HandlerVulcano::onFiringTimeTimeout()
   timer->setProperty("aesId", aesId);
   auto dtcAes = m_ddsHandler->dtcAes();
   const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware = firstTrajectoryTimeAwareFromAesId(aesId);
-  if (trajectoryTimeAware.geometry().size() < 2)
+  if (trajectoryTimeAware.geometry.size() < 2)
   {
     DEBUG_LOG(m_logger) << "return";
     return;
@@ -203,12 +203,12 @@ void HandlerVulcano::onFiringTimeTimeout()
   //        ----------------| Surface
   */
 
-  const std::vector<Core::GeoPositionRelativeTime> &geometryRef = trajectoryTimeAware.geometry();
-  int calculatedFlightDurationMSec = fcData.calculatedFlightDuration();
+  const std::vector<Core::GeoPositionRelativeTime> &geometryRef = trajectoryTimeAware.geometry;
+  int calculatedFlightDurationMSec = fcData.calculatedFlightDuration;
   // TAP' kann auch TAP sein -> Es ist immer der vorletzte Wert. = size() - 2.
-  int relTimeTap                   = geometryRef[geometryRef.size() - 2].relativeTime();
+  int relTimeTap                   = geometryRef[geometryRef.size() - 2].relativeTime;
   // Der letzte Wert ist immer der Einschlag = size() - 1.
-  int relTimeExplosion             = geometryRef[geometryRef.size() - 1].relativeTime();
+  int relTimeExplosion             = geometryRef[geometryRef.size() - 1].relativeTime;
   // Flugzeit zwischen TAP(') und Einschlag
   int timeDiffTapToExplosion       = relTimeExplosion - relTimeTap;
   // Somit ist die absolute Zeit am TAP(') die Startzeit abzüglich der Flugzeit
@@ -230,33 +230,33 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
   m_aesTimers.remove(aesId);
   DEBUG_LOG(m_logger) << "++++++++++++++ onTrajectoryTimeAwareTimeout aesId=" << aesId;
   const auto &myEC = m_explosionCluster.value(aesId);
-  if (myEC.id() != aesId)
+  if (myEC.id != aesId)
     return;
-  if (!myEC.laserGuiding.is_set())
+  if (!myEC.laserGuiding.has_value())
     return;
   const AreaEffectSimulation::LaserGuiding &lgData = myEC.laserGuiding.get();
 
-  const int prf = lgData.lcAttack();
+  const int prf = lgData.lcAttack;
 
   const auto &dtcPpm          = m_ddsHandler->dtcPpm();
   const auto &dtcAes          = m_ddsHandler->dtcAes();
   auto participantId          = dtcPpm->getParticipantFromPrf(prf);
   auto dpd                    = dtcPpm->dynamicParticipantData(participantId);
-  const auto &designationsVec = dpd.designations();
+  const auto &designationsVec = dpd.designations;
   DEBUG_LOG(m_logger) << "onTimerTimeout participantId=" << participantId;
 
   for (const auto &designation : std::as_const(designationsVec))
   {
-    if (designation.code() == prf && designation.outputPower() > 0)
+    if (designation.code == prf && designation.outputPower > 0)
     {
       const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware = firstTrajectoryTimeAwareFromAesId(aesId);
-      const std::vector<Core::GeoPositionRelativeTime> &trajGeometry       = trajectoryTimeAware.geometry();
+      const std::vector<Core::GeoPositionRelativeTime> &trajGeometry       = trajectoryTimeAware.geometry;
 
       DEBUG_LOG(m_logger) << "trajectoryTimeAware.geometry().size()=" << trajGeometry.size();
-      DEBUG_LOG(m_logger) << "Designation code=" << designation.code()
+      DEBUG_LOG(m_logger) << "Designation code=" << designation.code
                           << " prf=" << prf
-                          << " outputPower=" << designation.outputPower()
-                          << " designation.spotlocation=" << designation.spotLocation().lon() << "/" << designation.spotLocation().lat();
+                          << " outputPower=" << designation.outputPower
+                          << " designation.spotlocation=" << designation.spotLocation.lon << "/" << designation.spotLocation.lat;
 
       if (trajGeometry.size() < 2)
       {
@@ -266,20 +266,20 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
 
       const Core::GeoPosition topGeo           = trajGeometry.at(trajGeometry.size() - 2);
       const Core::GeoPosition bottomGeo        = trajGeometry.at(trajGeometry.size() - 1);
-      const Core::GeoPosition2D pointToTestGeo = designation.spotLocation();
+      const Core::GeoPosition2D pointToTestGeo = designation.spotLocation;
 
       int zone = -1;
       const QPointF &topPt         = CentralEffectSimulation::geographic2Utm(topGeo, &zone);
       const QPointF &bottomPt      = CentralEffectSimulation::geographic2Utm(bottomGeo, &zone);
       const QPointF &pointToTestPt = CentralEffectSimulation::geographic2Utm(pointToTestGeo, &zone);
 
-      const QVector3D top(topPt.x(), topPt.y(), topGeo.z());
+      const QVector3D top(topPt.x(), topPt.y(), topGeo.z);
       DEBUG_LOG(m_logger) <<  "top=" << top.x() << "/" << top.y() << "/" << top.z() << " zone=" << zone;
 
-      const QVector3D bottom(bottomPt.x(), bottomPt.y(), bottomGeo.z());
+      const QVector3D bottom(bottomPt.x(), bottomPt.y(), bottomGeo.z);
       DEBUG_LOG(m_logger) <<  "bottom=" << bottom.x() << "/" << bottom.y() << "/" << bottom.z() << " zone=" << zone;
 
-      const QVector3D pointToTest(pointToTestPt.x(), pointToTestPt.y(), designation.spotLocation().z());
+      const QVector3D pointToTest(pointToTestPt.x(), pointToTestPt.y(), designation.spotLocation.z);
       DEBUG_LOG(m_logger) <<  "pointToTest=" << pointToTest.x() << "/" << pointToTest.y() << "/" << pointToTest.z() << " zone=" << zone;
 
       float vulcanoViewAngleDeg = CesExplosions::Settings::vulcanoViewAngleDeg();
@@ -294,7 +294,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
         return;
       }
 
-      const auto observerPos = dtcPpm->participantPosition(participantId).pos();
+      const auto observerPos = dtcPpm->participantPosition(participantId).pos;
       QPointF fePt = CentralEffectSimulation::geographic2Utm(trajGeometry.at(0), &zone);
       QVector3D fe(fePt.x(), fePt.y(), 0);
 
@@ -320,11 +320,11 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
 
 
       AreaEffectSimulation::TargetPositionsModifyRequest posModify;
-      posModify.aesItemId(aesId);
-      posModify.positions().push_back(designation.spotLocation());
-      DEBUG_LOG(m_logger) << "targetPositionsModifyRequest z=" << posModify.positions().at(0).z()
-                          << " designation.z=" << designation.spotLocation().z()
-                          << " PosVulcano=" << posVulcano.lon() << "/" << posVulcano.lat();
+      posModify.aesItemId = aesId;
+      posModify.positions.push_back(designation.spotLocation);
+      DEBUG_LOG(m_logger) << "targetPositionsModifyRequest z=" << posModify.positions.at(0).z
+                          << " designation.z=" << designation.spotLocation.z
+                          << " PosVulcano=" << posVulcano.lon << "/" << posVulcano.lat;
       m_ddsHandler->ftcAes()->targetPositionsModifyRequest(posModify, this);
       return;
     }
@@ -336,7 +336,7 @@ AreaEffectSimulation::TrajectoryTimeAware HandlerVulcano::firstTrajectoryTimeAwa
   // be aware of: [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
   const auto &dtcAes = m_ddsHandler->dtcAes();
   const auto &trajectories = dtcAes->trajectoriesTimeAwareFromOriginatorIdAndType(aesId,
-                                                                                  ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation);
+                                                                                  ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation);
   if (trajectories.empty())
   {
     DEBUG_LOG(m_logger) << "no trajectories found for originatorId/aesItemId " << aesId;
@@ -353,15 +353,15 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
   // be aware of:  [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
   const auto &trajectoryTimeAwareValue = firstTrajectoryTimeAwareFromAesId(aesId);
 
-  const qint64 relTime = timeParam - trajectoryTimeAwareValue.trajectoryStartTime();
+  const qint64 relTime = timeParam - trajectoryTimeAwareValue.trajectoryStartTime;
 
   //trajectoryTimeAwareValue = trajectoryTimeAware(aesId);
   DEBUG_LOG(m_logger) << " getTrajectoryPosFromTime aesId=" << aesId
-                      << " trajectoryTimeAwareValue.id=" << trajectoryTimeAwareValue.id()
+                      << " trajectoryTimeAwareValue.id=" << trajectoryTimeAwareValue.id
                       << " time=" << timeParam
-                      << " trajectoryStartTime=" << trajectoryTimeAwareValue.trajectoryStartTime()
+                      << " trajectoryStartTime=" << trajectoryTimeAwareValue.trajectoryStartTime
                       << " relTime=" << relTime;
-  if (trajectoryTimeAwareValue.geometry().empty())
+  if (trajectoryTimeAwareValue.geometry.empty())
   {
     DEBUG_LOG(m_logger) << "getTrajectoryPosFromTime no pos available";
     return {};
@@ -369,13 +369,13 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
 
   Core::GeoPosition result;
   int i = 0;
-  for (const auto &point : std::as_const(trajectoryTimeAwareValue.geometry()))
+  for (const auto &point : std::as_const(trajectoryTimeAwareValue.geometry))
   {
-    DEBUG_LOG(m_logger) << "time=" << point.relativeTime();
-    if ( (point.relativeTime() > relTime) && (i > 0))
+    DEBUG_LOG(m_logger) << "time=" << point.relativeTime;
+    if ( (point.relativeTime > relTime) && (i > 0))
     {
       // Beachte: Geschwindigkeit wird _NICHT_ beruecksichtigt
-      const Core::GeoPositionRelativeTime &geoPosRelTime = trajectoryTimeAwareValue.geometry()[i-1];
+      const Core::GeoPositionRelativeTime &geoPosRelTime = trajectoryTimeAwareValue.geometry[i-1];
       // avoid expensive operations like following
       //      result.lat() = trajectoryTimeAwareValue.geometry()[i -1].lat();
       //      result.lon() = trajectoryTimeAwareValue.geometry()[i -1].lon();
@@ -383,14 +383,14 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
       // and take benefits from downcasting
       result = geoPosRelTime; // implicit downcast :-)
       DEBUG_LOG(m_logger) << "found i=" << i
-                          << " result=" << result.lat() << "/" << result.lon() << "/" << result.z();
+                          << " result=" << result.lat << "/" << result.lon << "/" << result.z;
       return result;
     }
     ++i;
   } // for
-  result = trajectoryTimeAwareValue.geometry().back();
+  result = trajectoryTimeAwareValue.geometry.back();
   DEBUG_LOG(m_logger) << " return last point result="
-                      << " result=" << result.lat() << "/" << result.lon() << "/" << result.z();
+                      << " result=" << result.lat << "/" << result.lon << "/" << result.z;
   return result;
 
 }
@@ -401,16 +401,16 @@ void HandlerVulcano::onDynamicParticipantChanged(const ParticipantManagement::Dy
     return;
 
   DEBUG_LOG(m_logger) << "onDynamicParticipantChanged"
-                      << data.participantId()
-                      << data.designations().size();
-  if (data.designations().size() > 0)
+                      << data.participantId
+                      << data.designations.size();
+  if (data.designations.size() > 0)
   {
-    for (const ParticipantManagement::LaserDesignation &designation : std::as_const(data.designations()))
+    for (const ParticipantManagement::LaserDesignation &designation : std::as_const(data.designations))
     {
-      DEBUG_LOG(m_logger) << "gearId=" << designation.gearId()
-                          << " code=" << designation.code()
-                          << " z=" << designation.spotLocation().z()
-                          << " outputPower=" << designation.outputPower();
+      DEBUG_LOG(m_logger) << "gearId=" << designation.gearId
+                          << " code=" << designation.code
+                          << " z=" << designation.spotLocation.z
+                          << " outputPower=" << designation.outputPower;
     }
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
index 055403f9c..812cb4776 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
@@ -22,7 +22,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -165,19 +165,19 @@ void HandlerFunctionalAreas::onDemandInitReply(const Core::FunctionReplyObject &
 // ///////////////////////////////////
 void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  const int aesItemId = data.aesItemId();
-  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-  if (data.aesTypeId().underlying() !=  AreaEffectSimulation::AesType::AtFunctionalArea)
+  const int aesItemId = data.aesItemId;
+  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+  if (data.aesTypeId !=  AreaEffectSimulation::AesType::AtFunctionalArea)
     return;
 
-  const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(data.aesItemId());
+  const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(data.aesItemId);
 
-  if (!fa.isCentral())
+  if (!fa.isCentral)
   {
     DEBUG_LOG(m_logger) << " !isCentral"
                         " Got AesItemView id: " << aesItemId
-                        << ", type: " << data.aesTypeId()
-                        << ", effectState: " << data.effectStateId()
+                        << ", type: " << data.aesTypeId
+                        << ", effectState: " << data.effectStateId
                         << ", modType: " << modType;
     if (m_aesItemViews.contains(aesItemId))
       m_aesItemViews.remove(aesItemId);
@@ -186,50 +186,50 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
   }
 
   DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
-                      << ", type: " << data.aesTypeId()
-                      << ", effectState: " << data.effectStateId()
+                      << ", type: " << data.aesTypeId
+                      << ", effectState: " << data.effectStateId
                       << ", modType: " << modType;
 
 
-  switch (effectState.underlying())
+  switch (effectState)
   {
   case AreaEffectSimulation::AesEffectState::EsPrepared:
     break;
   case AreaEffectSimulation::AesEffectState::EsActivated:
   {
     bool isSupplyTruck = false;
-    if (fa.supplyMode() == AreaEffectSimulation::AesOperatingMode::OmWaitingTime)
+    if (fa.supplyMode == AreaEffectSimulation::AesOperatingMode::OmWaitingTime)
     {
       DEBUG_LOG(m_logger) << "isSupplyTruck = true";
       isSupplyTruck = true;
     }
-    auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], 0, isSupplyTruck));
-    if (fa.participantId.is_set())
+    auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId], 0, isSupplyTruck));
+    if (fa.participantId.has_value())
       aesItemViewUtm.participantId = fa.participantId.get();
 
-    if (!m_aesPolygonEncloseBuilding.contains(data.aesItemId()))
+    if (!m_aesPolygonEncloseBuilding.contains(data.aesItemId))
     {
       QVector<int> enclosedBuildings;
       QPolygonF polygon;
-      polygon.reserve(data.form().size());
-      for (size_t i = 0; i < data.form().size(); i++)
+      polygon.reserve(data.form.size());
+      for (size_t i = 0; i < data.form.size(); i++)
       {
         //QPointF point(itemView.form[i].x(), itemView.form[i].y());
-        QPointF point(data.form().at(i).lon(), data.form().at(i).lat());
+        QPointF point(data.form.at(i).lon, data.form.at(i).lat);
         polygon.append(point);
       }
       enclosedBuildings = m_handlerBuildingData->polygonEncloseBuildings(polygon);
       DEBUG_LOG(m_logger) << "enclosedBuildings.size=" << enclosedBuildings.size();
       // local memory for the results, so that the polygonEncloseBuildings method is only run once for each effective field
       // and not for each position report
-      m_aesPolygonEncloseBuilding.insert(data.aesItemId(), enclosedBuildings);
+      m_aesPolygonEncloseBuilding.insert(data.aesItemId, enclosedBuildings);
       DEBUG_LOG(m_logger) << "insert enclosedBuildings.size=" << enclosedBuildings.size();
     }
 
     calculateFunctionalArea(aesItemViewUtm);
-    m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
+    m_aesItemViews.insert(data.aesItemId, aesItemViewUtm);
     DEBUG_LOG(m_logger) << "insert Functiona Area AesItemView id: " << aesItemId
-                        << ", type: " << data.aesTypeId();
+                        << ", type: " << data.aesTypeId;
     break;
   } // case EsActivated
   case AreaEffectSimulation::AesEffectState::EsRemoved:
@@ -255,34 +255,34 @@ void HandlerFunctionalAreas::calculateFunctionalArea(const CentralEffectSimulati
     if (m_handlerParticipant->isOutdated(participantPos))
       continue;
 
-    DEBUG_LOG(m_logger) << "participant id= " << participantPos.participantId()
-                        << " buildingId=" << participantPos.buildingId();
+    DEBUG_LOG(m_logger) << "participant id= " << participantPos.participantId
+                        << " buildingId=" << participantPos.buildingId;
 
-    if ( participantPos.buildingId() ==0 )
+    if ( participantPos.buildingId ==0 )
       inForm = inFormCheck(itemView, participantPos);
     else
     {
       for (int i = 0; i < m_aesPolygonEncloseBuilding.value(itemView.aesItemId).size(); i++)
       {
         inForm = false;
-        if (m_aesPolygonEncloseBuilding.value(itemView.aesItemId).at(i) == participantPos.buildingId())
+        if (m_aesPolygonEncloseBuilding.value(itemView.aesItemId).at(i) == participantPos.buildingId)
         {
           inForm = true;
-          m_handlerParticipant->setNotfightMode(participantPos.participantId(), true);
-          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
+          m_handlerParticipant->setNotfightMode(participantPos.participantId, true);
+          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId
                               << " aesId=" << itemView.aesItemId
                               << " in Form = true";
           break;
         }
         else
         {
-          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
+          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId
                               << " aesId=" << itemView.aesItemId
                               << " in Form = false";
         }
       }
     }
-    sendEnterLeave(itemView, participantPos.participantId(), inForm);
+    sendEnterLeave(itemView, participantPos.participantId, inForm);
   }
   // for
 } // calculateFunctionalArea
@@ -290,23 +290,23 @@ void HandlerFunctionalAreas::calculateFunctionalArea(const CentralEffectSimulati
 
 void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
-  DEBUG_LOG(m_logger) << "++++++++ onNewParticipantPosition participantId="  << participantData.participantId();
+  DEBUG_LOG(m_logger) << "++++++++ onNewParticipantPosition participantId="  << participantData.participantId;
 
   if (m_handlerParticipant->isOutdated(participantData))
     return;
 
-  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
+  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId);
   if (equipmentNumber <= 0)
   {
     DEBUG_LOG(m_logger) << "equipmentNumber <=0";
     return;
   }
 
-  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId();
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId;
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
     DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
-    switch (itemView.aesTypeId.underlying())
+    switch (itemView.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtFunctionalArea:
     {
@@ -315,13 +315,13 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat
       /// Die Teilnehmer der Partei des Wirkfeldes werden nicht berücksichtig.
       ///
       AreaEffectSimulation::FunctionalArea functionalArea =  m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
-      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
+      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId
                           << " itemView.partyId=" << itemView.partyId
-                          << " participantData.partyId=" << participantData.partyId()
+                          << " participantData.partyId=" << participantData.partyId
                           << " insideBuilding=" << participantData.insideBuilding();
       ///////////////////
       bool inForm = inFormCheck(itemView, participantData);
-      sendEnterLeave(itemView, participantData.participantId(), inForm);
+      sendEnterLeave(itemView, participantData.participantId, inForm);
       break;
     }
     default:
@@ -333,23 +333,23 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat
 
 void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
-  DEBUG_LOG(m_logger) << "New Indoor Position paticipantId=" << participantData.participantId();
+  DEBUG_LOG(m_logger) << "New Indoor Position paticipantId=" << participantData.participantId;
 
   if (m_handlerParticipant->isOutdated(participantData))
     return;
 
-  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
+  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId);
   if (equipmentNumber <= 0)
   {
     DEBUG_LOG(m_logger) << "equipmentNumber <=0";
     return;
   }
 
-  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId();
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId;
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
     DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
-    switch (itemView.aesTypeId.underlying())
+    switch (itemView.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtFunctionalArea:
     {
@@ -358,13 +358,13 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS
       /// Die Teilnehmer der Partei des Wirkfeldes werden nicht berücksichtig.
       ///
       AreaEffectSimulation::FunctionalArea functionalArea =  m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
-      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
+      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId
                           << " itemView.partyId=" << itemView.partyId
-                          << " participantData.partyId=" << participantData.partyId()
+                          << " participantData.partyId=" << participantData.partyId
                           << " insideBuilding=" << participantData.insideBuilding();
       {
-        if (   (itemView.partyId == participantData.partyId())
-            && (functionalArea.functionalAreaTypeId() == 8)) // Funktionsraum Nicht Kampffaehig [GUEZE-2256]
+        if (   (itemView.partyId == participantData.partyId)
+            && (functionalArea.functionalAreaTypeId == 8)) // Funktionsraum Nicht Kampffaehig [GUEZE-2256]
         {
           DEBUG_LOG(m_logger) << "Position mit Funktionsraum Nicht Kampffähig hat die Partei des Wirkfeldes => nicht beruecksichtigen";
           continue;
@@ -374,16 +374,16 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS
       bool inForm = false;
       for (int i = 0; i < m_aesPolygonEncloseBuilding.value(itemView.aesItemId).size(); i++)
       {
-        if (m_aesPolygonEncloseBuilding.value(itemView.aesItemId).at(i) == participantData.buildingId())
+        if (m_aesPolygonEncloseBuilding.value(itemView.aesItemId).at(i) == participantData.buildingId)
         {
           inForm = true;
-          m_handlerParticipant->setNotfightMode(participantData.participantId(), true);
+          m_handlerParticipant->setNotfightMode(participantData.participantId, true);
           break;
         }
       }
 
       ///////////////////
-      sendEnterLeave(itemView, participantData.participantId(), inForm);
+      sendEnterLeave(itemView, participantData.participantId, inForm);
       break;
     }
     default:
@@ -414,14 +414,14 @@ bool HandlerFunctionalAreas::inBoundingBoxCheck(const CentralEffectSimulation::A
   const QRectF boundingBoxImpact(itemView.boundingBoxBottomLeft,
                                  itemView.boundingBoxTopRight);
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos, itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId
                         << " inside AesItemView:" << itemView.aesItemId;
     return true;
   }
-  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId
                       << " outside AesItemView:" << itemView.aesItemId;
   return false;
 }
@@ -435,9 +435,9 @@ bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemV
 
   const QRectF boundingBox(itemView.boundingBoxBottomLeft,
                            itemView.boundingBoxTopRight);
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
-  const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos(), itemView.zone);
-  DEBUG_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantData.participantId()
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos, itemView.zone);
+  const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos, itemView.zone);
+  DEBUG_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantData.participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size()
@@ -446,7 +446,7 @@ bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemV
   if (boundingBox.contains(participantPosUtmPoint) &&
       itemView.form.containsPoint(participantPosUtmPoint, Qt::FillRule::OddEvenFill))
   {
-    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantData.participantId
                         << ", aesItemId: " << itemView.aesItemId;
     return true;
   } // if inside
@@ -475,7 +475,7 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
 //  qint64 mineFieldBitIndex = 0;
   int remaining = 0;
 
-  switch (eventType.underlying())
+  switch (eventType)
   {
   case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea:
     DEBUG_LOG(m_logger) << "-------------- EnterFunctionalArea itemView =" << itemView.aesItemId;
@@ -495,21 +495,21 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
   DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeStruct)
-                      << " participantId=" << participantData.participantId();
+                      << " participantId=" << participantData.participantId;
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId
                       << " equipNo = " << equipNo
                       << " aesItemId =" << itemView.aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if (participantData.participantId() != 0 && equipNo <= 0)
+  if (participantData.participantId != 0 && equipNo <= 0)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0";
     return;
   }
-  if (participantData.participantId() != 0 &&
-      participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantData.participantId != 0 &&
+      participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
@@ -517,17 +517,17 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
 
   const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
 
-  const TrainingAreaBase::TabPosition pos(participantData.pos(),
+  const TrainingAreaBase::TabPosition pos(participantData.pos,
                                           Core::PositionReportingSource::Gps, // irrelevant
-                                          participantData.buildingId(),
-                                          participantData.roomId());
-  const int medicTime = fa.medicTime() / 600000; //reserve 2 = medical treatment
-  const int maintanceTime = fa.maintTime() / 600000; //reserve 1 = maintance time
-  const int decontaminatonTime = fa.deconTime() / 600000; //reserve Munitionsart = decontaminaton time
+                                          participantData.buildingId,
+                                          participantData.roomId);
+  const int medicTime = fa.medicTime / 600000; //reserve 2 = medical treatment
+  const int maintanceTime = fa.maintTime / 600000; //reserve 1 = maintance time
+  const int decontaminatonTime = fa.deconTime / 600000; //reserve Munitionsart = decontaminaton time
 
-  const int operationModeDecontamination = fa.deconMode().underlying();
-  const int operationModeMaintenance = fa.maintMode().underlying();
-  const int operationModeMedical = fa.medicMode().underlying();
+  const int operationModeDecontamination = static_cast<int>(fa.deconMode);
+  const int operationModeMaintenance = static_cast<int>(fa.maintMode);
+  const int operationModeMedical = static_cast<int>(fa.medicMode);
 
   //const int originatorEquipNo = fa.medicTime()/60000; //reserve 2 = medical treatment
   //const int mineId = fa.maintTime()/60000; //reserve 1 = maintance time
@@ -539,7 +539,7 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
 
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                        // equipmentNumber
-    participantData.participantId(), // participantId
+    participantData.participantId, // participantId
     chargeType,                   // chargeTypeId
     itemView.aesItemId,             // aesId
     originatorEquipNo,              // originatorEquipmentNumber
@@ -550,8 +550,8 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
     itemView.partyId,               // originPartyId
     mineId
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
-                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId
+                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId;
 
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
@@ -567,7 +567,7 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
                                                   const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
                                                   const ProjectDataManagement::PdmEventType eventType)
 {
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId);
   // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar)
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -576,46 +576,46 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
       typeClass == ParticipantManagement::TypeClass::Vessel ||
       typeClass == ParticipantManagement::TypeClass::Unknown)
   {
-    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId
                         << " has invalid typeClass: " << typeClass
                         << " eventType: " << eventType;
     return;
   }
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId);
   if (equipmentNumber <= 0)
   {
-    WARNING_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId()
+    WARNING_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId
                           << " - participant has no equipment number";
     return;
   }
 
   DEBUG_LOG(m_logger) << "sendParticipantEvent" << eventType
-                      << " participantId=" << participantData.participantId()
+                      << " participantId=" << participantData.participantId
                       << " AesItemId=" << itemView.aesItemId;
 
   const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
 
   CentralEffectSimulation::ParticipantEvent pe;
-  pe.id(m_ddsHandler->getParticipantEventId());
+  pe.id = m_ddsHandler->getParticipantEventId();
 
-  pe.eventTypeId(eventType.underlying());
-  pe.participantId(participantData.participantId());
-  pe.eventTime(participantData.sampleTime());
-  pe.aesItemId(itemView.aesItemId);
-  pe.partyId(participantData.partyId());
-  pe.aesName(fa.name());
-  pe.equipmentNumber(equipmentNumber);
-  pe.vulnerability(participantData.vulnerabilityState.underlying());
-  pe.position(participantData.pos());
-  pe.friendlyFire(false);
+  pe.eventTypeId = eventType;
+  pe.participantId = participantData.participantId;
+  pe.eventTime = participantData.sampleTime;
+  pe.aesItemId = itemView.aesItemId;
+  pe.partyId = participantData.partyId;
+  pe.aesName = fa.name;
+  pe.equipmentNumber = equipmentNumber;
+  pe.vulnerability = static_cast<int>(participantData.vulnerabilityState);
+  pe.position = participantData.pos;
+  pe.friendlyFire = false;
 
   INFO_LOG(m_logger) << "sendParticipantEvent: " << pe
                      << ", currentMSecsSinceEpoch = " << QDateTime::currentMSecsSinceEpoch()
-                     << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime();
+                     << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime;
   m_ddsHandler->dtsCes()->publish(pe);
 
-  const auto id = pe.id();
+  const auto id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
@@ -689,7 +689,7 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
                             << " aesItemId=" << key.first
                             << " participantId=" << key.second
                             << " enterLeaveType=" << enterLeaveType.eventType;
-        startSupplyTimer(participantId, itemView.aesItemId, fa.supplyTime());
+        startSupplyTimer(participantId, itemView.aesItemId, fa.supplyTime);
         m_cesEnterLeaveFunctionalArea.insert(key, enterLeaveType);
       }
     }
@@ -718,11 +718,11 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
     sendParticipantEvent(itemView,  cesParticipantData, enterLeaveType.eventType);
 
     const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
-    DEBUG_LOG(m_logger) << "fa.isCentral()=" << fa.isCentral()
+    DEBUG_LOG(m_logger) << "fa.isCentral()=" << fa.isCentral
                         << " isSupplyTruck=" << itemView.isSupplyTruck
                         << " eventType=" << m_cesEnterLeaveFunctionalArea.value(key).eventType
                         << " isAlreadySupplied=" << enterLeaveType.isAlreadySupplied;
-    if (fa.isCentral() && !itemView.isSupplyTruck)
+    if (fa.isCentral && !itemView.isSupplyTruck)
     {
       DEBUG_LOG(m_logger) << "sendCesHitRequest";
       sendCesHitRequest(itemView, cesParticipantData, enterLeaveType.eventType);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
index 18c77ffd5..09cd4d831 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
@@ -75,7 +75,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
     return;
 
   DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
-  switch (data.effectStateId().underlying())
+  switch (data.effectStateId())
   {
   case AreaEffectSimulation::AesEffectState::EsUnknown:
   case AreaEffectSimulation::AesEffectState::EsError:
@@ -335,7 +335,7 @@ void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObjec
 void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data, const Footprint &footprint)
 {
   // check for correct AES type artillery only
-  switch (data.aesTypeId().underlying())
+  switch (data.aesTypeId())
   {
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtExplosionSingle:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
index 9827aac64..d8234a5a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
@@ -100,7 +100,7 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation:
   {
 
     const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-    switch (effectState.underlying())
+    switch (effectState)
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
index bfe43776a..21fcee05f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
@@ -136,7 +136,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
   while (i.hasNext())
   {
     i.next();
-    SInt32 vulnerabilityState = i.value().vulnerabilityState.underlying();
+    SInt32 vulnerabilityState = i.value().vulnerabilityState;
     Float64 lat = i.value().pos().lat() * 180 / M_PI;
     Float64 lon = i.value().pos().lon() * 180 / M_PI;
     DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
index f57048a27..8c9e28285 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
@@ -195,11 +195,11 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
   m_meteoData = data;
 
   DEBUG_LOG(m_logger) << "Got onMeteoDataChanged "
-                       << " id=" << m_meteoData.id()
-                       << " windSpeed=" << m_meteoData.windSpeed()
-                       << " windDirection=" << m_meteoData.windDirection()
-                       << " pressure=" << m_meteoData.pressure()
-                       << " temperature=" << m_meteoData.temperature();
+                       << " id=" << m_meteoData.id
+                       << " windSpeed=" << m_meteoData.windSpeed
+                       << " windDirection=" << m_meteoData.windDirection
+                       << " pressure=" << m_meteoData.pressure
+                       << " temperature=" << m_meteoData.temperature;
 }
 
 // ///////////////////////////////////
@@ -370,18 +370,18 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
   }
   unsigned char msgType = 0xE3;
 
-  if (static_cast<unsigned char>(data.payload().at(0)) != msgType)
+  if (static_cast<unsigned char>(data.payload.at(0)) != msgType)
   {
     DEBUG_LOG(m_logger) << "data.payload().at(0) != msgType";
     return;
   }
 
-  double y = static_cast<double>(data.position().lat() * 180.0 / M_PI);
-  double x = static_cast<double>(data.position().lon() * 180.0 / M_PI);
+  double y = static_cast<double>(data.position.lat * 180.0 / M_PI);
+  double x = static_cast<double>(data.position.lon * 180.0 / M_PI);
 
   int zone = -1;
 
-  const QPointF posUtm = CentralEffectSimulation::geographic2Utm(data.position(), &zone);
+  const QPointF posUtm = CentralEffectSimulation::geographic2Utm(data.position, &zone);
 
 
   double impactPositionLat = 0.0;
@@ -391,37 +391,37 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
   //QByteArray time = payloadAr.mid(2, 3); // Byte 2 ..3
   int time = 0;
   int startIndex = 2;
-  time += (static_cast<unsigned char>(data.payload().at(startIndex)));
-  time += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
+  time += (static_cast<unsigned char>(data.payload.at(startIndex)));
+  time += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
 
   // QByteArray elevationBa = payloadAr.mid(5, 8); // Byte 5 .. 8
   int elevation = 0;
   startIndex = 5;
-  elevation += (static_cast<unsigned char>(data.payload().at(startIndex)));
-  elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
-  elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 2)) << 16);
-  elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 3)) << 24);
+  elevation += (static_cast<unsigned char>(data.payload.at(startIndex)));
+  elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
+  elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 2)) << 16);
+  elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 3)) << 24);
 
 
   // QByteArray azimutBa = payloadAr.mid(9, 12); // Byte 9.. 12
   int azimut = 0;
   startIndex = 9;
-  azimut += (static_cast<unsigned char>(data.payload().at(startIndex)));
-  azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
-  azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 2)) << 16);
-  azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 3)) << 24);
+  azimut += (static_cast<unsigned char>(data.payload.at(startIndex)));
+  azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
+  azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 2)) << 16);
+  azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 3)) << 24);
 
-  int temperature = (static_cast<unsigned char>(data.payload().at(13)));
+  int temperature = (static_cast<unsigned char>(data.payload.at(13)));
 
   // QByteArray timeToDetonationBa = payloadAr.mid(14, 15); // Byte 14-15;
   int timeToDetonation = 0;
   startIndex = 14;
-  timeToDetonation += (static_cast<unsigned char>(data.payload().at(startIndex)));
-  timeToDetonation += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
+  timeToDetonation += (static_cast<unsigned char>(data.payload.at(startIndex)));
+  timeToDetonation += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
 
 
   N_Ballistic::ammunitionTypeIndirectFire ammunitionType = N_Ballistic::MOERSER;
-  int ammunition = (data.payload().at(4) >> 1) & 0x03;
+  int ammunition = (data.payload.at(4) >> 1) & 0x03;
   QString ammunitionStr;
   switch (ammunition)
   {
@@ -442,11 +442,11 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
 
   }
 
-  int treibmittel = (data.payload().at(4) >> 3) & 0x07;
+  int treibmittel = (data.payload.at(4) >> 3) & 0x07;
 
   //int participantId = m_handlerParticipant->getParticipantId(data.equipmentNumber());
-  int participantId = m_ddsHandlerAes->dtcPpm()->participantIdByEquipmentNumber(data.equipmentNumber());
-  int partyId = m_ddsHandlerAes->dtcPpm()->participant(participantId).partyId();
+  int participantId = m_ddsHandlerAes->dtcPpm()->participantIdByEquipmentNumber(data.equipmentNumber);
+  int partyId = m_ddsHandlerAes->dtcPpm()->participant(participantId).partyId;
 
   float v0 = 200.0;
   if ( treibmittel == 0)
@@ -466,12 +466,12 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
 
 
   DEBUG_LOG(m_logger) << "Got onGeoPairingDataChanged "
-                       << "\nequipmentNumber=" << data.equipmentNumber()
-                       << "\nposition lat=" << data.position().lat()
-                       << "/" << data.position().lon()
+                       << "\nequipmentNumber=" << data.equipmentNumber
+                       << "\nposition lat=" << data.position.lat
+                       << "/" << data.position.lon
                        << "\nposition xy=" << x << "/" << y
                        << "\nposition UTM=" << posUtm.x() << "/" << posUtm.y() << " zone=" << zone
-                       << "\nsampleTime=" << data.sampleTime()
+                       << "\nsampleTime=" << data.sampleTime
                        << "\nammunitionType=" << ammunitionType
                        << "\ntemperature=" << temperature
                        << "\nelevation=" << elevation
@@ -484,7 +484,7 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
 
   float rw = calculateDistance(v0, elevation / 10.0);
   float t1 = calculateFlightTime(rw, v0, elevation / 10.0);
-  impactTime = data.sampleTime() + static_cast<int64_t> (t1) * 1000;
+  impactTime = data.sampleTime + static_cast<int64_t> (t1) * 1000;
   //QPointF distVector = calculateDistVector ( rw, azimut/10.0);
   QPointF explosionPosUtm = calculateExplosionPosUtm(rw, azimut / 10.0, posUtm);
 
@@ -499,20 +499,20 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
   impactPositionLat = explosionPosGeoCoordinate.y();
 
   AreaEffectSimulation::ExplosionSingleModifyRequest explosionSingleModifyRequest;
-  explosionSingleModifyRequest.id(0);
-  explosionSingleModifyRequest.impactPosition().lat(impactPositionLat);
-  explosionSingleModifyRequest.impactPosition().lon(impactPositionLon);
+  explosionSingleModifyRequest.id = 0;
+  explosionSingleModifyRequest.impactPosition.lat = impactPositionLat;
+  explosionSingleModifyRequest.impactPosition.lon = impactPositionLon;
   // Statement by the 5000: impactTime must be in the future
-  explosionSingleModifyRequest.effectStart(impactTime);
-  explosionSingleModifyRequest.chargeTypeId(ammunitionType);
-  explosionSingleModifyRequest.participantId(participantId);
-  QString name = QStringLiteral("Geopairing:") + QString::number(data.equipmentNumber());
-  explosionSingleModifyRequest.name(name.toStdString());
+  explosionSingleModifyRequest.effectStart = impactTime;
+  explosionSingleModifyRequest.chargeTypeId = ammunitionType;
+  explosionSingleModifyRequest.participantId = participantId;
+  QString name = QStringLiteral("Geopairing:") + QString::number(data.equipmentNumber);
+  explosionSingleModifyRequest.name = name.toStdString();
   //const CentralEffectSimulation::HandlerParticipant::CesParticipantData pos = m_handlerParticipant->position(participantId);
-  explosionSingleModifyRequest.partyId(partyId);
+  explosionSingleModifyRequest.partyId = partyId;
 
 
-  DEBUG_LOG(m_logger) << "impactTime=" << data.sampleTime()
+  DEBUG_LOG(m_logger) << "impactTime=" << data.sampleTime
                        << " name=" << name
                        << " m_ddsHandler->currentPartitionTime=" << m_ddsHandlerAes->currentPartitionTime()
                        << " participantId=" << participantId << " " << participantId
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
index 4285da414..35d2da990 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
@@ -24,7 +24,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -79,19 +79,19 @@ bool HandlerJamming::init()
 void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent &data, DataModification modType)
 {
   ERROR_LOG(m_logger) << "onParticipantGearEventChanged << modType=" << modType
-                       << " originatorId=" << data.participantId()
-                       << " chargeTypeId=" << data.charge().chargeTypeId()
-                       << " gearTypeId=" << data.charge().gearTypeId()
-                       << " isJamming=" << m_ddsHandler->isJamming({data.charge().chargeTypeId(),0,0});
+                       << " originatorId=" << data.participantId
+                       << " chargeTypeId=" << data.charge.chargeTypeId
+                       << " gearTypeId=" << data.charge.gearTypeId
+                       << " isJamming=" << m_ddsHandler->isJamming({data.charge.chargeTypeId,0,0});
   // Check, if Munition isJamming
   // NOTE: igniterType/IgniterFunciton = 0 as long as ParticipantGearEvent does not contain values
-  if (!m_ddsHandler->isJamming({data.charge().chargeTypeId(),0,0}))
+  if (!m_ddsHandler->isJamming({data.charge.chargeTypeId,0,0}))
     return;
   QVector<int> uasIds = m_ddsHandler->dtcPpm()->getUasIds();
   QVector<int> jammedUasIds;
   int jammedUasId = 0;
 
-  double radius = m_ddsHandler->dtcPdm()->getMaxRange(data.charge().chargeTypeId(), data.charge().gearTypeId());
+  double radius = m_ddsHandler->dtcPdm()->getMaxRange(data.charge.chargeTypeId, data.charge.gearTypeId);
 
   // int radius = 15;
   DEBUG_LOG(m_logger) << "Radius=" << radius;
@@ -105,19 +105,19 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
       continue;
     }
 
-    if (LtsUtils::isPositionTimeOutdated(QDateTime::currentMSecsSinceEpoch(), cesParticipantData.sampleTime()))
+    if (LtsUtils::isPositionTimeOutdated(QDateTime::currentMSecsSinceEpoch(), cesParticipantData.sampleTime))
     {
       DEBUG_LOG(m_logger) << "continue positionTime outdated participantId=" << uasId;
       continue;
     }
 
-    long distance = m_handlerParticipant->getDistance(data.participantId(), uasId);
+    long distance = m_handlerParticipant->getDistance(data.participantId, uasId);
     DEBUG_LOG(m_logger) << "distance = " << distance;
     if ( distance < radius)
     {
       DEBUG_LOG(m_logger) << " Send Jamming to TAB and destroy uasId";
       //sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
-      if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+      if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
         jammedUasIds.append(uasId);
     }
     else
@@ -138,7 +138,7 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
   }
 
   CentralEffectSimulation::HandlerParticipant::CesParticipantData cesParticipantData = m_handlerParticipant->position(jammedUasId);
-  sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
+  sendCesHitRequest(data.charge.chargeTypeId, data.participantId,cesParticipantData);
 
 }
 
@@ -184,32 +184,32 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
 
   DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
-                      << " participantId=" << participantData.participantId();
+                      << " participantId=" << participantData.participantId;
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId);
   const int originatorEquimentNumber = m_ddsHandler->participantId2EquipNo(originatorId);
-  const int originatorPartyId = m_handlerParticipant->getParticipantPosition(originatorId).partyId();
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
+  const int originatorPartyId = m_handlerParticipant->getParticipantPosition(originatorId).partyId;
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId
                       << " equipNo = " << equipNo
                       << " chargeTypeId =" << chargeTypeId;
 
-  if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId == 0 CatastrophicKill)";
     return;
   }
 
-  const TrainingAreaBase::TabPosition pos(participantData.pos(),
+  const TrainingAreaBase::TabPosition pos(participantData.pos,
                                           Core::PositionReportingSource::Gps, // irrelevant
-                                          participantData.buildingId(),
-                                          participantData.roomId());
+                                          participantData.buildingId,
+                                          participantData.roomId);
 
   const int aesId = 0; // not used
   const int mineId = 0; // not used
 
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                         // equipmentNumber
-    participantData.participantId(), // participantId
+    participantData.participantId, // participantId
     chargeTypeId,                    // chargeTypeId
     aesId,                           // aesId
     originatorEquimentNumber,        // originatorEquipmentNumber
@@ -220,7 +220,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
     originatorPartyId,               // originPartyId
     mineId
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId
                       << " chargeTypeId=" << chargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
index 9967bb09a..eb6d7ddb4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
@@ -25,7 +25,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -166,43 +166,43 @@ void HandlerMineAreas::onMineTriggeredReply(const Core::FunctionReplyObject &rep
 // ///////////////////////////////////
 void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtMineAreaSingleMines
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtMineArea
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtMineCorridor)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtMineAreaSingleMines
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtMineArea
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtMineCorridor)
   {
     DEBUG_LOG(m_logger) << "AesItemView return";
     return;
   }
 
-  const AreaEffectSimulation::MineArea &ma = m_ddsHandler->dtcAes()->mineArea(data.aesItemId());
-  DEBUG_LOG(m_logger) << "aesItemId=" << data.aesItemId()
-                      << " chargeTypeId=" << data.chargeStruct().chargeTypeId()
-                      << " isCentral=" << ma.isCentral();
+  const AreaEffectSimulation::MineArea &ma = m_ddsHandler->dtcAes()->mineArea(data.aesItemId);
+  DEBUG_LOG(m_logger) << "aesItemId=" << data.aesItemId
+                      << " chargeTypeId=" << data.chargeStruct.chargeTypeId
+                      << " isCentral=" << ma.isCentral;
 
   // 240 = Verlegemine muss immer berechnet werden.
-  if (!ma.isCentral() && (data.chargeStruct().chargeTypeId() != 240))
+  if (!ma.isCentral && (data.chargeStruct.chargeTypeId != 240))
     return;
 
 
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
   {
-    DEBUG_LOG(m_logger) << "AesItemView expired return id=" << data.aesItemId();
-    aesItemViewRemoved(data.aesItemId());
+    DEBUG_LOG(m_logger) << "AesItemView expired return id=" << data.aesItemId;
+    aesItemViewRemoved(data.aesItemId);
     return;
   }
 
-  if (m_ddsHandler->isDus(data.chargeStruct()))
+  if (m_ddsHandler->isDus(data.chargeStruct))
   {
-    DEBUG_LOG(m_logger) << "isDus aesItemId=" << data.aesItemId()
-                        << " chargeTypeId=" << data.chargeStruct().chargeTypeId() << " do not consider";
+    DEBUG_LOG(m_logger) << "isDus aesItemId=" << data.aesItemId
+                        << " chargeTypeId=" << data.chargeStruct.chargeTypeId << " do not consider";
     return;
   }
 
-  const int aesItemId = data.aesItemId();
+  const int aesItemId = data.aesItemId;
 
   DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
-                      << ", type: " << data.aesTypeId()
-                      << ", effectState: " << data.effectStateId()
+                      << ", type: " << data.aesTypeId
+                      << ", effectState: " << data.effectStateId
                       << ", modType: " << modType;
   DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
 
@@ -213,7 +213,7 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
     return;
   }
 
-  if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
+  if (data.aesTypeId == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
   {
     if (!m_aesItemViews.contains(aesItemId))
     {
@@ -222,21 +222,21 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
     }
     // build Polygon Mines:
     DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
-    auto &formMines = m_aesItemViews[data.aesItemId()].formMines;
+    auto &formMines = m_aesItemViews[data.aesItemId].formMines;
     DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
-    int &zone = m_aesItemViews[data.aesItemId()].zone;
+    int &zone = m_aesItemViews[data.aesItemId].zone;
     DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
     formMines.clear();
-    formMines.reserve(data.form().size());
-    for (const Core::GeoPosition2D &pointGeo : data.form())
+    formMines.reserve(data.form.size());
+    for (const Core::GeoPosition2D &pointGeo : data.form)
       formMines.push_back(CentralEffectSimulation::geographic2Utm(pointGeo, &zone));
     return;
   }
 
-  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-  const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
+  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+  const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct);
   DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
-  switch (effectState.underlying())
+  switch (effectState)
   {
   case AreaEffectSimulation::AesEffectState::EsPrepared:
   {
@@ -244,11 +244,11 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
   }
   case AreaEffectSimulation::AesEffectState::EsActivated:
   {
-    const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius));
+    const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId], impactRadius));
 
-    DEBUG_LOG(m_logger) << "EsActivated m_aesItemViews.insert data.aesItemId()= " << data.aesItemId()
+    DEBUG_LOG(m_logger) << "EsActivated m_aesItemViews.insert data.aesItemId()= " << data.aesItemId
                         << " m_aesItemViews.size=" << m_aesItemViews.size();
-    m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
+    m_aesItemViews.insert(data.aesItemId, aesItemViewUtm);
     DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
 
     printAesItemViews();
@@ -277,13 +277,13 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
   if (m_handlerParticipant->isOutdated(participantPosition))
     return;
 
-  if (m_handlerParticipant->getEquipmentNumber(participantPosition.participantId()) == 0)
+  if (m_handlerParticipant->getEquipmentNumber(participantPosition.participantId) == 0)
   {
     DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
   // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar)
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -292,51 +292,51 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
       typeClass == ParticipantManagement::TypeClass::Vessel ||
       typeClass == ParticipantManagement::TypeClass::Unknown)
   {
-    DEBUG_LOG(m_logger) << "return New Position Participant with id " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "return New Position Participant with id " << participantPosition.participantId
                         << " has invalid typeClass: " << typeClass;
     return;
   }
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   if (equipmentNumber <= 0)
   {
     TRACE_LOG(m_logger) << "return New Position - participant has no equipment number"
-                        << " participantId=" << participantPosition.participantId()
+                        << " participantId=" << participantPosition.participantId
                         << " typeClass=" << typeClass;
     return;
   }
 
-  if (participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "New Position CatastrophicKill return";
     return;
   }
 
-  if (m_mineLists.contains(participantPosition.participantId()))
+  if (m_mineLists.contains(participantPosition.participantId))
   {
     DEBUG_LOG(m_logger) << "Naechste Mine schicken ohne Bounding-Box-Check... return"
-                        << " Anzahl Minen in Liste:" << m_mineLists[participantPosition.participantId()].size()
+                        << " Anzahl Minen in Liste:" << m_mineLists[participantPosition.participantId].size()
                         << " cesMaxPeriodForCashedMines=" << Settings::cesPeriodStoredMinesOutdated();
     //DEBUG_LOG(m_logger) << "Settings::cesMaxPeriodForCashedMines() =" << Settings::cesMaxPeriodForCashedMines();
 
-    if ((m_mineLists[participantPosition.participantId()].size() > 0)
-        && (QDateTime::currentMSecsSinceEpoch() - m_mineLists[participantPosition.participantId()][0].time  <  Settings::cesPeriodStoredMinesOutdated()))
+    if ((m_mineLists[participantPosition.participantId].size() > 0)
+        && (QDateTime::currentMSecsSinceEpoch() - m_mineLists[participantPosition.participantId][0].time  <  Settings::cesPeriodStoredMinesOutdated()))
     {
       DEBUG_LOG(m_logger) << "Send Stored mines";
       // Search mine with the next no distance
-      int distance =  m_mineLists[participantPosition.participantId()][0].distance;
+      int distance =  m_mineLists[participantPosition.participantId][0].distance;
       int index = 0;
-      for (int i = 0; i < m_mineLists[participantPosition.participantId()].size(); i++)
+      for (int i = 0; i < m_mineLists[participantPosition.participantId].size(); i++)
       {
-        if (m_mineLists[participantPosition.participantId()][i].distance < distance)
+        if (m_mineLists[participantPosition.participantId][i].distance < distance)
         {
-          distance = m_mineLists[participantPosition.participantId()][i].distance;
+          distance = m_mineLists[participantPosition.participantId][i].distance;
           index = i;
         }
       }
       //m_mineLists[participantPos.participantId()].value()
-      int mineIndex = m_mineLists[participantPosition.participantId()][index].mineIndex;
-      int aesItemId = m_mineLists[participantPosition.participantId()][index].aesItemId;
+      int mineIndex = m_mineLists[participantPosition.participantId][index].mineIndex;
+      int aesItemId = m_mineLists[participantPosition.participantId][index].aesItemId;
       if (!m_aesItemViews.contains(aesItemId))
         return;
 
@@ -349,12 +349,12 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
       //                         << " z=" << minePosGeo.z();
       sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::PdmEventType::EventType_HitMine);
 
-      m_mineLists[participantPosition.participantId()].remove(index);
+      m_mineLists[participantPosition.participantId].remove(index);
 
-      if (m_mineLists[participantPosition.participantId()].size() == 0)
+      if (m_mineLists[participantPosition.participantId].size() == 0)
       {
-        m_mineLists[participantPosition.participantId()].clear();
-        m_mineLists.remove(participantPosition.participantId());
+        m_mineLists[participantPosition.participantId].clear();
+        m_mineLists.remove(participantPosition.participantId);
       }
       return;
     }
@@ -363,13 +363,13 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
       DEBUG_LOG(m_logger) << "Stored mines are outdated!"
                           << " actTime=" <<   QDateTime::currentMSecsSinceEpoch()
                           << " Settings::cesPeriodStoredMinesOutdated()="   <<  Settings::cesPeriodStoredMinesOutdated();
-      m_mineLists[participantPosition.participantId()].clear();
-      m_mineLists.remove(participantPosition.participantId());
+      m_mineLists[participantPosition.participantId].clear();
+      m_mineLists.remove(participantPosition.participantId);
     }// end if time-check
   }
 
 
-  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPosition.participantId
                       << " m_aesItemViews.size=" << m_aesItemViews.size();
 
   // const QVector<QPointF> utmStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), m_zone);
@@ -392,29 +392,29 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
     if (typeClass == ParticipantManagement::TypeClass::Human && m_ddsHandler->isAtMine(itemView.chargeStruct))
       continue;
 
-    if (itemView.aesTypeId.underlying() == AreaEffectSimulation::AesType::AtMineArea)
+    if (itemView.aesTypeId == AreaEffectSimulation::AesType::AtMineArea)
     {
 
       // checks whether the participant has been positioned in the minefield or across it.
       bool inBoundingBox = inBoundingBoxCheck(itemView, participantPosition);
       if (!inBoundingBox)
       {
-        bool intersectsBoundingBox = intersectsBoundingBoxCheck(itemView, participantPosition.participantId());
+        bool intersectsBoundingBox = intersectsBoundingBoxCheck(itemView, participantPosition.participantId);
         if (!intersectsBoundingBox)
         {
           DEBUG_LOG(m_logger) << "Continue nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
-                              << " paricipantId=" << participantPosition.participantId();
+                              << " paricipantId=" << participantPosition.participantId;
           continue;
         }
       }
       DEBUG_LOG(m_logger) << "Weiter nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
-                          << " paricipantId=" << participantPosition.participantId();
+                          << " paricipantId=" << participantPosition.participantId;
 
       bool inFormCheckResult = inFormCheck(itemView, participantPosition);
       if (!inFormCheckResult)
       {
         DEBUG_LOG(m_logger) << "!inForm";
-        if (!intersectFormCheck(itemView, participantPosition.participantId()))
+        if (!intersectFormCheck(itemView, participantPosition.participantId))
         {
           DEBUG_LOG(m_logger) << "!intersectForm continue";
           continue;
@@ -436,14 +436,14 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
 void HandlerMineAreas::onNewParticipantState(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos)
 {
   DEBUG_LOG(m_logger) << "onNewParticipantState ";
-  if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
+  if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
   {
-    DEBUG_LOG(m_logger) << "m_mineLists.contains(participantPos.participantId():" << m_mineLists.contains(participantPos.participantId());
-    if (m_mineLists.contains(participantPos.participantId()))
+    DEBUG_LOG(m_logger) << "m_mineLists.contains(participantPos.participantId():" << m_mineLists.contains(participantPos.participantId);
+    if (m_mineLists.contains(participantPos.participantId))
     {
       DEBUG_LOG(m_logger) << "onNewParticipantState CombatReady, loesche Minenliste Eintrag";
-      m_mineLists[participantPos.participantId()].clear();
-      m_mineLists.remove(participantPos.participantId());
+      m_mineLists[participantPos.participantId].clear();
+      m_mineLists.remove(participantPos.participantId);
     }
     DEBUG_LOG(m_logger) << "onNewParticipantState CombatReady, loesche Minenliste";
   }
@@ -465,11 +465,11 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
   int32_t bitFieldIdx = 0;
   const double impactRadius = m_ddsHandler->chargeTypeRadius(itemView.chargeStruct);
 
-  const QPolygonF utmStep = m_handlerParticipant->getParticipantStep(participantPosition.participantId(), itemView.zone);
+  const QPolygonF utmStep = m_handlerParticipant->getParticipantStep(participantPosition.participantId, itemView.zone);
   for (const auto &itPos : itemView.formMines)
   {
     DEBUG_LOG(m_logger) << " itemId=" << itemView.aesItemId
-                        << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId()
+                        << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId
                         << ", MinePosUtm: " << CentralEffectSimulation::debug(itPos)
                         << " utmStep:" << utmStep[0].x() << utmStep[0].y()
                         << ", " << utmStep[1].x() << utmStep[1].y();
@@ -478,7 +478,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     if (m_triggeredImpacts.contains(itemView.aesItemId))
     {
       const AreaEffectSimulation::TriggeredImpacts &triggeredImpact = m_triggeredImpacts[itemView.aesItemId];
-      if (!LtsUtils::BitArray::testBit(triggeredImpact.bitfield(), bitFieldIdx))
+      if (!LtsUtils::BitArray::testBit(triggeredImpact.bitfield, bitFieldIdx))
       {
         ++bitFieldIdx;
         DEBUG_LOG(m_logger) << "Mine is active continue bitFieldIdx=" << bitFieldIdx;
@@ -490,7 +490,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
                         ? itemView.dusMineId : bitFieldIdx + 1; // mineIdx in minefield starts at 1
 
     // Check, if participant is inside danger-radius of the mine
-    distance = crossCircle(itPos, impactRadius, participantPosition.participantId(), itemView.zone);
+    distance = crossCircle(itPos, impactRadius, participantPosition.participantId, itemView.zone);
     DEBUG_LOG(m_logger) << "distance=" << distance;
     if (distance < 0.0)
     {
@@ -507,17 +507,17 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     mineListItem.mineIndex = mineIdx;
     mineListItem.minePos = minePos;
     mineListItem.time = QDateTime::currentMSecsSinceEpoch();
-    m_mineLists[participantPosition.participantId()].append(mineListItem);
+    m_mineLists[participantPosition.participantId].append(mineListItem);
     mineListIndex++;
-    DEBUG_LOG(m_logger) << " m_mineLists[" << participantPosition.participantId()
-                        << "].length=" <<  m_mineLists[participantPosition.participantId()].length();
+    DEBUG_LOG(m_logger) << " m_mineLists[" << participantPosition.participantId
+                        << "].length=" <<  m_mineLists[participantPosition.participantId].length();
 
     if (distance < lastDistance)
     {
       DEBUG_LOG(m_logger) << " distance < lastDistance crossCircle for aesItemId: " << itemView.aesItemId
                           << ", mineIdx: " << mineIdx
                           << ", impactRadius:" << impactRadius
-                          << ", participantId: " << participantPosition.participantId()
+                          << ", participantId: " << participantPosition.participantId
                           << ", lastDistance:" << lastDistance
                           << ", distance:" << distance;
       minePos = itPos;
@@ -528,12 +528,12 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     bitFieldIdx++;
   } // for each mine
 
-  DEBUG_LOG(m_logger) << "End of for-loop participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "End of for-loop participantId=" << participantPosition.participantId
                       << " mineIndex=" << mineIndex
                       << " lastDistance=" << lastDistance;
   if (lastDistance > 0)
   {
-    DEBUG_LOG(m_logger) << "sendEffectTypeEvent participantId=" << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "sendEffectTypeEvent participantId=" << participantPosition.participantId
                         << " mineIndex=" << mineIndex;
     // TODO Minenposition fuer den Event nehmen und nicht die Participant-Position
     sendFtcMineTrigger(itemView.aesItemId, mineIndex - 1);
@@ -545,7 +545,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     //                         << " z=" << minePosGeo.z();
     sendParticipantEvent(itemView, minePosition, ProjectDataManagement::PdmEventType::EventType_HitMine);
     // aktuell verarbeitete Mine aus der Liste entfernen.
-    m_mineLists[participantPosition.participantId()].remove(mineListItemIndex);
+    m_mineLists[participantPosition.participantId].remove(mineListItemIndex);
   }
   return false;
 }
@@ -605,14 +605,14 @@ bool HandlerMineAreas::inBoundingBoxCheck(const CentralEffectSimulation::AesItem
                                  boundingBoxTopRight);
 
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId
                         << " inside AesItemView:" << itemView.aesItemId << " return true";
     return true;
   }
-  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId
                       << " outside AesItemView:" << itemView.aesItemId << " return false";
   return false;
 }
@@ -622,15 +622,15 @@ bool HandlerMineAreas::inFormCheck(const CentralEffectSimulation::AesItemViewUtm
                                    const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition)
 {
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
-  DEBUG_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantPosition.participantId()
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemView.zone);
+  DEBUG_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantPosition.participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size();
 
   if (itemView.form.containsPoint(participantPosUtmPoint, Qt::FillRule::OddEvenFill))
   {
-    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId
                         << ", aesItemId: " << itemView.aesItemId;
     return true;
   } // if inside
@@ -670,7 +670,7 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri
     return;
 
   DEBUG_LOG(m_logger) << "Got TriggeredImpacts: ";
-  switch (data.aesTypeId().underlying())
+  switch (data.aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -682,7 +682,7 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri
   case AreaEffectSimulation::AesType::AtMineArea:
     // participant run on mine
     // => store Mine-State and take into account when a participant runs to one of this mines
-    m_triggeredImpacts.insert(data.aesItemId(), data);
+    m_triggeredImpacts.insert(data.aesItemId, data);
     break;
   default:
     //nothigng
@@ -694,36 +694,36 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri
 void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data)
 {
 
-  if ((data.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)
-      || (data.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions))
+  if ((data.aesTypeId == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)
+      || (data.aesTypeId == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions))
     return;
 
 
-  auto it = m_aesItemViews.find(data.aesItemId());
+  auto it = m_aesItemViews.find(data.aesItemId);
   if (it == m_aesItemViews.end())
   {
-    WARNING_LOG(m_logger) << "Could not find item view for aes with id " << data.aesItemId();
+    WARNING_LOG(m_logger) << "Could not find item view for aes with id " << data.aesItemId;
     return;
   }
   CentralEffectSimulation::AesItemViewUtm &aesItemView = *it;
 
   // older then 10sec? ignore
-  if (data.sampleTime() < m_ddsHandler->currentPartitionTime() - 10 * 1000)
+  if (data.sampleTime < m_ddsHandler->currentPartitionTime() - 10 * 1000)
   {
-    if (aesItemView.sampleTimeHandledImpacts < data.sampleTime())
+    if (aesItemView.sampleTimeHandledImpacts < data.sampleTime)
     {
-      aesItemView.sampleTimeHandledImpacts = data.sampleTime();
-      aesItemView.handledImpacts = data.bitfield();
+      aesItemView.sampleTimeHandledImpacts = data.sampleTime;
+      aesItemView.handledImpacts = data.bitfield;
     }
     return;
   }
 
   QVector<int> bitsToCheck;
-  aesItemView.handledImpacts.resize(data.bitfield().size(), 0xFF);
-  for (int bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
+  aesItemView.handledImpacts.resize(data.bitfield.size(), 0xFF);
+  for (int bitFieldIdx = 0; bitFieldIdx < data.impactCount; ++bitFieldIdx)
   {
     // not yet triggered (bit is still 1)
-    if (LtsUtils::BitArray::testBit(data.bitfield(), bitFieldIdx))
+    if (LtsUtils::BitArray::testBit(data.bitfield, bitFieldIdx))
       continue;
 
     // already checked (bit is already 0)
@@ -734,17 +734,17 @@ void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImp
   }
 
   // remember handled impacts
-  aesItemView.sampleTimeHandledImpacts = data.sampleTime();
-  aesItemView.handledImpacts = data.bitfield();
+  aesItemView.sampleTimeHandledImpacts = data.sampleTime;
+  aesItemView.handledImpacts = data.bitfield;
 
   const auto participantPositions = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : participantPositions)
   {
-    DEBUG_LOG(m_logger) << "pos participantId=" << pPos.participantId()
-                         << " buildingId=" << pPos.buildingId()
+    DEBUG_LOG(m_logger) << "pos participantId=" << pPos.participantId
+                         << " buildingId=" << pPos.buildingId
                          << " insideBuilding=" << pPos.insideBuilding()
                          << " positionValid=" << pPos.positionValid;
-    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
       continue;
     if (pPos.insideBuilding())
       continue;
@@ -763,7 +763,7 @@ void HandlerMineAreas::calculateImpacts(const CentralEffectSimulation::AesItemVi
 
   // get radius of munition
   const double impactRadius = m_ddsHandler->chargeTypeRadius(itemView.chargeStruct);
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemView.zone);
 
   for (int bitFieldIdx : impactsToCheck)
   {
@@ -789,20 +789,20 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
 
   DEBUG_LOG(m_logger) << "sendCesHitRequest "
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
-                      << " participantId=" << participantPosition.participantId();
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId()
+                      << " participantId=" << participantPosition.participantId;
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId
                       << " equipNo = " << equipNo
                       << " aesItemId =" << itemView.aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if (participantPosition.participantId() != 0 && equipNo <= 0)
+  if (participantPosition.participantId != 0 && equipNo <= 0)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
-  if (participantPosition.participantId() != 0 &&
-      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantPosition.participantId != 0 &&
+      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
@@ -810,18 +810,18 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
 
   int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0);
 
-  const TrainingAreaBase::TabPosition pos(participantPosition.pos(),
+  const TrainingAreaBase::TabPosition pos(participantPosition.pos,
                                           Core::PositionReportingSource::Gps, // irrelevant
-                                          participantPosition.buildingId(),
-                                          participantPosition.roomId());
+                                          participantPosition.buildingId,
+                                          participantPosition.roomId);
   const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
 
   const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
 
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                        // equipmentNumber
-    participantPosition.participantId(), // participantId
-    itemView.chargeStruct.chargeTypeId(),                   // chargeTypeId
+    participantPosition.participantId, // participantId
+    itemView.chargeStruct.chargeTypeId,                   // chargeTypeId
     itemView.aesItemId,             // aesId
     originatorEquipNo,              // originatorEquipmentNumber
     remaining,                      // remainEffectPercent ( no protection outside Building )
@@ -831,8 +831,8 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
     itemView.partyId,               // originPartyId
     mineFieldBitIndex
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId()
-                       << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId
+                       << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
@@ -847,45 +847,45 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView
                                          qint64 effectTime,
                                          int mineFieldBitIndex)
 {
-  int remaining = m_ddsHandler->remainingTasCode(itemView.chargeStruct());
+  int remaining = m_ddsHandler->remainingTasCode(itemView.chargeStruct);
 
   int32_t legacyChargeTypeId = 0;
-  legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct());
+  legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct);
   DEBUG_LOG(m_logger) << "sendCesHitRequest"
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
-                      << " participantId=" << participantPosition.participantId();
+                      << " participantId=" << participantPosition.participantId;
 
-  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId()
-                      << " equipNo = " << equipmentNumber << " aesItemId =" << itemView.aesItemId();
+  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantPosition.participantId
+                      << " equipNo = " << equipmentNumber << " aesItemId =" << itemView.aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if (participantPosition.participantId() != 0 && equipmentNumber <= 0)
+  if (participantPosition.participantId != 0 && equipmentNumber <= 0)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   } // if
 
-  if (participantPosition.participantId() != 0 &&
-      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+  if (participantPosition.participantId != 0 &&
+      participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   } // if
 
-  int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId(), 0);
+  int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0);
   const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
   const TrainingAreaBase::TabPosition pos(
-    participantPosition.pos(), Core::PositionReportingSource::Gps, participantPosition.buildingId(),
-    participantPosition.roomId()
+    participantPosition.pos, Core::PositionReportingSource::Gps, participantPosition.buildingId,
+    participantPosition.roomId
   );
   const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
 
   TrainingAreaBase::SendCesHitRequest requestTab(
-    equipmentNumber, participantPosition.participantId(), legacyChargeTypeId, itemView.aesItemId(), originatorEquipmentNumber,
+    equipmentNumber, participantPosition.participantId, legacyChargeTypeId, itemView.aesItemId, originatorEquipmentNumber,
     remaining, pos, effectTime, eventType, itemView.partyId.get(), mineFieldBitIndex
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId() << " chargeTypeId=" << itemView.chargeStruct().chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
@@ -901,7 +901,7 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat
                                                       const bool inFormCheckResult)
 {
 
-  const ProjectDataManagement::PdmEventType &lastEvent = m_eventStates[itemView.aesItemId][participantPosition.participantId()];
+  const ProjectDataManagement::PdmEventType &lastEvent = m_eventStates[itemView.aesItemId][participantPosition.participantId];
 
 
   ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
@@ -914,7 +914,7 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat
     else
     {
       eventType = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
-      m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
+      m_eventStates[itemView.aesItemId][participantPosition.participantId] = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
     }
   }
   else
@@ -924,7 +924,7 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat
     else
     {
       eventType = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
-      m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
+      m_eventStates[itemView.aesItemId][participantPosition.participantId] = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
     }
   }
 
@@ -939,31 +939,31 @@ void HandlerMineAreas::sendParticipantEvent(const CentralEffectSimulation::AesIt
 
 
   DEBUG_LOG(m_logger) << "sendParticipantEvent " << itemView.aesItemId
-                      << " participantId=" << participantPosition.participantId()
+                      << " participantId=" << participantPosition.participantId
                       << " eventType=" << eventType
-                      << " pos=" << participantPosition.pos().lat()
-                      << "/" << participantPosition.pos().lon()
-                      << "/" << participantPosition.pos().z();
+                      << " pos=" << participantPosition.pos.lat
+                      << "/" << participantPosition.pos.lon
+                      << "/" << participantPosition.pos.z;
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   const AreaEffectSimulation::MineArea &ma = m_ddsHandler->dtcAes()->mineArea(itemView.aesItemId);
 
   CentralEffectSimulation::ParticipantEvent pe;
-  pe.id(m_ddsHandler->getParticipantEventId());
+  pe.id = m_ddsHandler->getParticipantEventId();
 
-  pe.eventTypeId(eventType.underlying());
-  pe.participantId(participantPosition.participantId());
-  pe.eventTime(participantPosition.sampleTime());
-  pe.aesItemId(itemView.aesItemId);
-  pe.partyId(participantPosition.partyId());
-  pe.aesName(ma.name());
-  pe.equipmentNumber(equipmentNumber);
-  pe.vulnerability(participantPosition.vulnerabilityState.underlying());
-  pe.position(participantPosition.pos());
+  pe.eventTypeId = eventType;
+  pe.participantId = participantPosition.participantId;
+  pe.eventTime = participantPosition.sampleTime;
+  pe.aesItemId = itemView.aesItemId;
+  pe.partyId = participantPosition.partyId;
+  pe.aesName = ma.name;
+  pe.equipmentNumber = equipmentNumber;
+  pe.vulnerability = static_cast<int>(participantPosition.vulnerabilityState);
+  pe.position = participantPosition.pos;
 
   m_ddsHandler->dtsCes()->publish(pe);
 
-  const auto id = pe.id();
+  const auto id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
@@ -974,11 +974,11 @@ void HandlerMineAreas::sendFtcMineTrigger(int aesItemId, int mineIndex)
 
   auto ftcAes = m_ddsHandler->ftcAes();
   AreaEffectSimulation::MineTriggeredRequest tr;
-  tr.mineAreaId(aesItemId);
-  tr.mineId(mineIndex);
-  tr.chargeTypeId(ma.chargeStruct().chargeTypeId());
-  DEBUG_LOG(m_logger)  << "send  sendFtcMineTrigger: aesItemId=" << tr.mineAreaId()
-                       << " MineIndex=" << tr.mineId();
+  tr.mineAreaId = aesItemId;
+  tr.mineId = mineIndex;
+  tr.chargeTypeId = ma.chargeStruct.chargeTypeId;
+  DEBUG_LOG(m_logger)  << "send  sendFtcMineTrigger: aesItemId=" << tr.mineAreaId
+                       << " MineIndex=" << tr.mineId;
   ftcAes->mineTriggeredRequest(tr, this);
 }
 
@@ -989,7 +989,7 @@ void HandlerMineAreas::sendEffectTypeEvent(const CentralEffectSimulation::AesIte
                                            qint64 effectTime)
 {
   DEBUG_LOG(m_logger) << "sendEffectTypeEvent aesItemId=" << itemView.aesItemId
-                      << " participantId=" << participantPosition.participantId()
+                      << " participantId=" << participantPosition.participantId
                       << " effectType=" << effectTime
                       << " mineFieldBitIndex=" << mineFieldBitIndex;
   Q_UNUSED(effectTime);
@@ -1001,7 +1001,7 @@ void HandlerMineAreas::sendEffectTypeEvent(const CentralEffectSimulation::AesIte
     mfb = ", mineFieldBitIndex: " + QByteArray::number(mineFieldBitIndex);
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
   DEBUG_LOG(m_logger) << "Sending EffectType event " << toString(effectType)
-                      << ", participant: " << participantPosition.participantId()
+                      << ", participant: " << participantPosition.participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << mfb
                       << ", ctasEffectType: " << ctasEffectType;
@@ -1082,7 +1082,7 @@ bool HandlerMineAreas::inExtededFormCheck(const CentralEffectSimulation::AesItem
                                           const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition) const
 {
   const double distance = m_ddsHandler->chargeTypeRadius(itemView.chargeStruct);
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos, itemView.zone);
 
 
   ///////////////////////////////////////////////////////////
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
index 3e0181b63..97c0b8ce8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
@@ -56,14 +56,14 @@ bool HandlerMineLayingArtillery::init()
 
 double HandlerMineLayingArtillery::calculateAngle(const AreaEffectSimulation::TrajectoryTimeAware &trajectory)
 {
-  Core::GeoPositionRelativeTime trajectoryGeometryFirst = trajectory.geometry().front();
-  Core::GeoPositionRelativeTime trajectoryGeometryLast = trajectory.geometry().back();
+  Core::GeoPositionRelativeTime trajectoryGeometryFirst = trajectory.geometry.front();
+  Core::GeoPositionRelativeTime trajectoryGeometryLast = trajectory.geometry.back();
 
   const LtsCoordTrans::UtmCoordinate &trajectoryGeometryFirstUtm
-      = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryFirst.lon(), trajectoryGeometryFirst.lat()));
+      = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryFirst.lon, trajectoryGeometryFirst.lat));
 
   const LtsCoordTrans::UtmCoordinate &trajectoryGeometryLastUtm
-      = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryLast.lon(), trajectoryGeometryLast.lat()), trajectoryGeometryFirstUtm.zone);
+      = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryLast.lon, trajectoryGeometryLast.lat), trajectoryGeometryFirstUtm.zone);
 
   QLineF lineFromStartToImpact
       = QLineF(QPointF(trajectoryGeometryFirstUtm.x, trajectoryGeometryFirstUtm.y), QPointF(trajectoryGeometryLastUtm.x, trajectoryGeometryLastUtm.y));
@@ -89,7 +89,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
 
   DEBUG_LOG(m_logger) << "[calculateImpacts] ## \n\tappearanceTimeOffset: " << appearanceTimeOffset << "\n\tappearanceJitter: " << appearanceJitter << "\n\tarmingTimeOffset: " << armingTimeOffset<<"\n\ttime: "<<time;
 
-  const LtsCoordTrans::UtmCoordinate impactPostionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(impactPositon.lon(), impactPositon.lat()));
+  const LtsCoordTrans::UtmCoordinate impactPostionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(impactPositon.lon, impactPositon.lat));
 
   QJsonObject patternObj = patternsArray[patternCounter].toObject();
   QJsonArray positionsArray = patternObj[QStringLiteral("positions")].toArray();
@@ -114,14 +114,14 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
     QPointF transformedImpactPosition = impactPostionUtm.geographic(positionRot.x(), positionRot.y());
 
 
-    const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, appearanceJitter * 2) - appearanceJitter;
-    const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, armingJitter * 2) - armingJitter;
+    const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, static_cast<int>(appearanceJitter * 2)) - appearanceJitter;
+    const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, static_cast<int>(armingJitter * 2)) - armingJitter;
 
     DEBUG_LOG(m_logger) <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
 
-    mineData.position(Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y()));
-    mineData.appearenceTime(appearenceTime);
-    mineData.armingTime(armingTime);
+    mineData.position = Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y());
+    mineData.appearenceTime = appearenceTime;
+    mineData.armingTime = armingTime;
 
     transformedImpacts.push_back(mineData);
   }
@@ -138,16 +138,16 @@ void HandlerMineLayingArtillery::onChargeTypeChanged(const ProjectDataManagement
     case DataModification::eAdded:
     case DataModification::eModified:
     {
-      if (!m_dtcPdm->isMineLaying(data.id(), 0, 0))
+      if (!m_dtcPdm->isMineLaying(data.id, 0, 0))
         return;
 
-      QJsonObject mineLayingPattern = m_dtcPdm->mineLayingPattern(data.id(), 0, 0);
-      m_mineLayingChargeTypes.insert(data.id(), mineLayingPattern);
+      QJsonObject mineLayingPattern = m_dtcPdm->mineLayingPattern(data.id, 0, 0);
+      m_mineLayingChargeTypes.insert(data.id, mineLayingPattern);
 
       return;
     }
     case DataModification::eRemoved:
-      m_mineLayingChargeTypes.remove(data.id());
+      m_mineLayingChargeTypes.remove(data.id);
       return;
   }
 }
@@ -164,9 +164,9 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
     return;
 
   const AreaEffectSimulation::ChargeEffect chargeEffect = m_effectClusterQue.dequeue();
-  const int chargeTypeId = chargeEffect.chargeTypeId();
+  const int chargeTypeId = chargeEffect.chargeTypeId;
 
-  QByteArray jsonData = QByteArray::fromStdString(chargeEffect.properties());
+  QByteArray jsonData = QByteArray::fromStdString(chargeEffect.properties);
   QJsonDocument doc = QJsonDocument::fromJson(jsonData);
 
   bool alreadyUsed = false;
@@ -180,12 +180,12 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
   if (!m_mineLayingChargeTypes.contains(chargeTypeId) || alreadyUsed)
     return;
 
-  const int chargeEffectId = chargeEffect.id();
+  const int chargeEffectId = chargeEffect.id;
 
   const QJsonObject &mineLayingProperties = m_mineLayingChargeTypes[chargeTypeId];
   const int mineChargeTypeId = mineLayingProperties[QStringLiteral("mineChargeTypeId")].toInt();
-  AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId());
-  DEBUG_LOG(m_logger)<<" [onChargeEffectChanged]  effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
+  AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId);
+  DEBUG_LOG(m_logger)<<" [onChargeEffectChanged]  effectClusterId: "<<ec.id<<" mineChargeTypeId: "<<mineChargeTypeId;
 
   if (mineChargeTypeId <= 0)
   {
@@ -195,54 +195,54 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
 
   for (const auto &trajectory : m_dtcAes->trajectoryTimeAwares())
   {
-    if (trajectory.originatorId() != chargeEffectId && trajectory.originatorTypeId().underlying() != ProjectDataManagement::StateChangeOriginator::ChargeEffect)
+    if (trajectory.originatorId != chargeEffectId && trajectory.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect)
       continue;
 
-    if (!m_impactCounters.contains(chargeEffect.originatorId()))
-      m_impactCounters[chargeEffect.originatorId()] = 0;
+    if (!m_impactCounters.contains(chargeEffect.originatorId))
+      m_impactCounters[chargeEffect.originatorId] = 0;
 
-    const int impactCounter = m_impactCounters.value(chargeEffect.originatorId());
+    const int impactCounter = m_impactCounters.value(chargeEffect.originatorId);
     const double angle = calculateAngle(trajectory);
-    const qint64 timeFromLastTrajectoryPointAbsolute = chargeEffect.effectStart() + trajectory.geometry().back().relativeTime();
+    const qint64 timeFromLastTrajectoryPointAbsolute = chargeEffect.effectStart + trajectory.geometry.back().relativeTime;
     const int patternCount = mineLayingProperties.value(QStringLiteral("pattern")).toArray().size();
     const int patternCounter =  patternCounterByImpactCount(ec, patternCount, impactCounter);
     const int effectorIndex = effectorIndexByImpactCount(ec, impactCounter);
-    const Core::GeoPosition mhpPositionGeo = ec.effectors().at(effectorIndex).mhpPosition();
-    const Core::GeoPosition2D mhpPositionGeo2D(mhpPositionGeo.lon(), mhpPositionGeo.lat());
+    const Core::GeoPosition mhpPositionGeo = ec.effectors.at(effectorIndex).mhpPosition;
+    const Core::GeoPosition2D mhpPositionGeo2D(mhpPositionGeo.lon, mhpPositionGeo.lat);
     const std::vector<AreaEffectSimulation::MineData> mineImpacts
         = calculateImpacts(mineLayingProperties, mhpPositionGeo2D, angle, timeFromLastTrajectoryPointAbsolute, patternCounter);
 
     AreaEffectSimulation::MineAreaReferenceModifyRequest request;
-    request.chargeTypeId(mineChargeTypeId);
-    request.referenceAesItemId(chargeEffect.originatorId());
-    request.mineData(mineImpacts);
+    request.chargeTypeId = mineChargeTypeId;
+    request.referenceAesItemId = chargeEffect.originatorId;
+    request.mineData = mineImpacts;
 
-    QJsonObject chargeEffectPropsObj = QJsonDocument::fromJson(QByteArray::fromStdString(chargeEffect.properties())).object();
-    request.effectDurationMsec(chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000));
+    QJsonObject chargeEffectPropsObj = QJsonDocument::fromJson(QByteArray::fromStdString(chargeEffect.properties)).object();
+    request.effectDurationMsec = chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000);
 
     const int ret = m_ftcAes->mineAreaReferenceModifyRequest(request);
     DEBUG_LOG(m_logger)<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
                        << "\n\tchargeTypeId: " << chargeTypeId
-                       << "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id()
+                       << "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id
                        << "\n\tangle: " << angle << "\n\ttimeFromLastTrajectoryPointAbsolute: " << timeFromLastTrajectoryPointAbsolute;
 
     AreaEffectSimulation::ChargeEffectModifyRequest chargeEffectRequest;
-    chargeEffectRequest.chargeTypeId(chargeEffect.chargeTypeId());
-    chargeEffectRequest.effectDuration(chargeEffect.effectDuration());
-    chargeEffectRequest.effectStart(chargeEffect.effectStart());
-    chargeEffectRequest.gearTypeId(chargeEffect.gearTypeId());
-    chargeEffectRequest.id(chargeEffect.id());
-    chargeEffectRequest.igniterTypeId(chargeEffect.igniterTypeId());
-    chargeEffectRequest.originatorId(chargeEffect.originatorId());
-    chargeEffectRequest.originatorTypeId(chargeEffect.originatorTypeId());
-    chargeEffectRequest.position(chargeEffect.position());
+    chargeEffectRequest.chargeTypeId = chargeEffect.chargeTypeId;
+    chargeEffectRequest.effectDuration = chargeEffect.effectDuration;
+    chargeEffectRequest.effectStart = chargeEffect.effectStart;
+    chargeEffectRequest.gearTypeId = chargeEffect.gearTypeId;
+    chargeEffectRequest.id = chargeEffect.id;
+    chargeEffectRequest.igniterTypeId = chargeEffect.igniterTypeId;
+    chargeEffectRequest.originatorId = chargeEffect.originatorId;
+    chargeEffectRequest.originatorTypeId = chargeEffect.originatorTypeId;
+    chargeEffectRequest.position = chargeEffect.position;
 
     chargeEffectPropsObj.insert(QStringLiteral("used"), QJsonValue::fromVariant(true));
-    chargeEffectRequest.properties(QJsonDocument(chargeEffectPropsObj).toJson().toStdString());
+    chargeEffectRequest.properties = QJsonDocument(chargeEffectPropsObj).toJson().toStdString();
 
     m_ftcAes->chargeEffectModifyRequest(chargeEffectRequest);
 
-    ++m_impactCounters[chargeEffect.originatorId()];
+    ++m_impactCounters[chargeEffect.originatorId];
 
     break;
   }
@@ -253,22 +253,22 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
 
 int HandlerMineLayingArtillery::patternCounterByImpactCount(const AreaEffectSimulation::EffectCluster &effectCluster, int patternCount, int impactCounter) const
 {
-  return impactCounter / effectCluster.effectors().size() % patternCount;
+  return impactCounter / effectCluster.effectors.size() % patternCount;
 }
 
 int HandlerMineLayingArtillery::effectorIndexByImpactCount(const AreaEffectSimulation::EffectCluster &effectCluster, int impactCounter) const
 {
-  return impactCounter % effectCluster.effectors().size();
+  return impactCounter % effectCluster.effectors.size();
 }
 
 void HandlerMineLayingArtillery::onChargeEffectChanged(const AreaEffectSimulation::ChargeEffect &data, DataModification modType)
 {
   Q_UNUSED(modType);
 
-  if (data.state() != AreaEffectSimulation::AesEffectState::EsActivated)
+  if (data.state != AreaEffectSimulation::AesEffectState::EsActivated)
     return;
 
-  if (data.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+  if (data.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
     return;
 
   // since there are some mines missing when adding them too fast, they are queued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
index e3a07b0bd..23391a51c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
@@ -22,7 +22,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -71,21 +71,21 @@ bool CesMissionPlanHandler::init()
 
 void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::MissionPlan &data)
 {
-  CesMissionPlanObject *obj = m_missionPlanObjects.value(data.id(), nullptr);
+  CesMissionPlanObject *obj = m_missionPlanObjects.value(data.id, nullptr);
 
   if (obj)
   {
-    m_missionPlanObjects[data.id()]->setMissionPlan(data);
+    m_missionPlanObjects[data.id]->setMissionPlan(data);
     return;
   }
 
   // check if mission start is in the future before proceeding..
-  DEBUG_LOG(m_logger)<<" -- [updateMissionPlanList] new missionPlan : "<<data.name()<< " planId: "<<data.id();
+  DEBUG_LOG(m_logger)<<" -- [updateMissionPlanList] new missionPlan : "<<data.name<< " planId: "<<data.id;
 
-  if (data.missionStart() < m_ddsHandler->currentPartitionTime())
+  if (data.missionStart < m_ddsHandler->currentPartitionTime())
   {
-    WARNING_LOG(m_logger) << " -- updateMissionPlanList mission startTime ("<<data.missionStart()<<") in the past ignore mission plan id: "<<data.id()
-                          << " name: " << data.name() << " - now: " << m_ddsHandler->currentPartitionTime();
+    WARNING_LOG(m_logger) << " -- updateMissionPlanList mission startTime ("<<data.missionStart<<") in the past ignore mission plan id: "<<data.id
+                          << " name: " << data.name << " - now: " << m_ddsHandler->currentPartitionTime();
     return;
   }
 
@@ -101,25 +101,25 @@ void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::M
   };
   connect(obj, &CesMissionPlanObject::destroyed, this, onDeleteObj);
 
-  m_missionPlanObjects.insert(data.id(), obj);
+  m_missionPlanObjects.insert(data.id, obj);
 }
 
 void CesMissionPlanHandler::onUasChanged(const ParticipantManagement::UAS &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  DEBUG_LOG(m_logger)<<" -- onUasChanged : uas.id = "<<data.id() <<" participantId = "<<data.participantId();
+  DEBUG_LOG(m_logger)<<" -- onUasChanged : uas.id = "<<data.id <<" participantId = "<<data.participantId;
   // get mission object of corresponding uas participant
   // if drone status is manual mode then cancel mission.
-  if (data.uasState() != ProjectDataManagement::UasState::Manual && modType != DataModification::eRemoved)
+  if (data.uasState != ProjectDataManagement::UasState::UasState_Manual && modType != DataModification::eRemoved)
     return;
 
   for (auto planObj :  m_missionPlanObjects)
   {
-    if (planObj->participantId() != data.participantId())
+    if (planObj->participantId() != data.participantId)
       continue;
 
     // if waypoint started and state switched to manual abord mission
-    if (planObj->missionPlan().missionStart() < m_ddsHandler->currentPartitionTime())
+    if (planObj->missionPlan().missionStart < m_ddsHandler->currentPartitionTime())
       planObj->abortMission();
     break;
   }
@@ -127,8 +127,8 @@ void CesMissionPlanHandler::onUasChanged(const ParticipantManagement::UAS &data,
 
 void CesMissionPlanHandler::onMissionPlanChanged(const ParticipantManagement::MissionPlan &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger)<<" -- onMissionPlanChanged : missionPlanName: "<<data.name() << ", modType: " << (int)modType;
-  if (data.id() <= 0)
+  DEBUG_LOG(m_logger)<<" -- onMissionPlanChanged : missionPlanName: "<<data.name << ", modType: " << (int)modType;
+  if (data.id <= 0)
     return;
   switch (modType)
   {
@@ -138,12 +138,12 @@ void CesMissionPlanHandler::onMissionPlanChanged(const ParticipantManagement::Mi
     break;
   case DataModification::eRemoved:
   {
-    auto obj = m_missionPlanObjects.value(data.id(), nullptr);
+    auto obj = m_missionPlanObjects.value(data.id, nullptr);
     if (!obj)
       return;
     delete obj;
 
-    m_missionPlanObjects.remove(data.id());
+    m_missionPlanObjects.remove(data.id);
   }
     break;
   default:
@@ -157,15 +157,15 @@ bool CesMissionPlanHandler::isUasInAutoMode(int participantId)
   m_ddsHandler->dtcPpm()->waitForHistoricalDataUAS(3000);
   const auto uas = m_ddsHandler->dtcPpm()->getUasByParticipantId(participantId, m_ddsHandler->getExerciseId());
 
-  if (uas.id() < 1)
+  if (uas.id < 1)
   {
     ERROR_LOG(m_logger) << "no uas for pid " << participantId;
     return false;
   }
 
-  DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState().underlying();
+  DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState;
 
-  return (uas.uasState() == ProjectDataManagement::UasState::UasState_Auto);
+  return (uas.uasState == ProjectDataManagement::UasState::UasState_Auto);
 }
 
 // stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
@@ -175,53 +175,53 @@ bool CesMissionPlanHandler::isUasCombatReady(int participantId)
   m_ddsHandler->dtcPpm()->waitForHistoricalDataDynamicParticipantData(3000);
   const auto data = m_ddsHandler->dtcPpm()->dynamicParticipantData(participantId);
 
-  if (data.participantId() == 0)
+  if (data.participantId == 0)
   {
     return false;
   }
 
   //Current State
-  DEBUG_LOG(m_logger) << "stateHistory count" << data.stateHistory().size();
-  if (data.stateHistory().empty())
+  DEBUG_LOG(m_logger) << "stateHistory count" << data.stateHistory.size();
+  if (data.stateHistory.empty())
   {
     return false;
   }
 
-  const auto &history = data.stateHistory();
+  const auto &history = data.stateHistory;
 
   //LasState is the last "real" state, that has a VBG <=8 (Castastrophic)
   //It's not the last state received, as there can be other state changes like Sanitation, or NearMiss
   auto lastState = m_ddsHandler->dtcPpm()->youngestStateInformation(history/*, true*/ /* debug */);
   decltype(lastState) youngestState;
-  youngestState.stateTime(0);
+  youngestState.stateTime = 0;
   for (const auto &si : history)
   {
     DEBUG_LOG(m_logger) << "StateInformation "
-                         << " time=" << si.stateTime()
-                         << " vulnerabilityBits=" << si.vulnerabilityBits()
-                         << " vulnerabilityKindId=" << si.vulnerabilityKindId();
-    if (youngestState.stateTime() < si.stateTime())
+                         << " time=" << si.stateTime
+                         << " vulnerabilityBits=" << si.vulnerabilityBits
+                         << " vulnerabilityKindId=" << si.vulnerabilityKindId;
+    if (youngestState.stateTime < si.stateTime)
       youngestState = si;
   }
 
-  return (youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+  return (youngestState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
 }
 
 void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement::MissionAction &msa)
 {
-  auto missionPlan = m_missionPlanObjects.value(msa.planId(), nullptr);
+  auto missionPlan = m_missionPlanObjects.value(msa.planId, nullptr);
   if (!missionPlan)
   {
-    DEBUG_LOG(m_logger)<<" -- [SEND NEXT MISSION] Object not found. PlanId: "<<msa.planId();
+    DEBUG_LOG(m_logger)<<" -- [SEND NEXT MISSION] Object not found. PlanId: "<<msa.planId;
     return;
   }
 
 
   // send to TAB
-  const auto participantId = missionPlan->m_missionPlan.participantId();
+  const auto participantId = missionPlan->m_missionPlan.participantId;
   const auto participant = m_handlerParticipant->participant(participantId);
 
-  if (!participant.equipmentNumber())
+  if (!participant.equipmentNumber)
   {
     ERROR_LOG(m_logger) << "unable to send next mission action to uav without equipment number";
     return;
@@ -245,12 +245,12 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
     return;
   }
 
-  const auto eqId = participant.equipmentNumber().value();
+  const auto eqId = participant.equipmentNumber.value();
 
   try
   {
     // send action to uav via tab - if this doesn't throw, waypoint is now executing
-    m_ddsHandler->ftcTab()->sendUasWaypointRequest(TrainingAreaBase::SendUasWaypointRequest(eqId, participantId, msa.actionNumber(), msa.itemNumber(), msa.planId(), msa.name(), msa.properties()));
+    m_ddsHandler->ftcTab()->sendUasWaypointRequest(TrainingAreaBase::SendUasWaypointRequest(eqId, participantId, msa.actionNumber, msa.itemNumber, msa.planId, msa.name, msa.properties));
     // PPM will send a change request to the current active action, which in return tell us (updateMissionPlanList) and finally we will start the next action - so we are done here for now
   }
   catch (const std::exception &ex)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
index f0e8109ef..2385d1d7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
@@ -29,9 +29,9 @@ CesMissionPlanObject::CesMissionPlanObject(const ParticipantManagement::MissionP
 
   m_missionStartimer->setSingleShot(true);
   connect(m_missionStartimer, &QTimer::timeout, this, &CesMissionPlanObject::sendNextMissionAction);
-  if (missionPlan.missionStart() > m_ddsHandler->currentPartitionTime())
+  if (missionPlan.missionStart > m_ddsHandler->currentPartitionTime())
   {
-    const int time = m_missionPlan.missionStart() - m_ddsHandler->currentPartitionTime();
+    const int time = m_missionPlan.missionStart - m_ddsHandler->currentPartitionTime();
     // DEBUG_LOG(m_logger)<<" -- [CesMissionPlanObject] start mission after << "<<time/1000<<" sec.";
     m_missionStartimer->start(time);
   }
@@ -53,74 +53,74 @@ void CesMissionPlanObject::setMissionActionFulfilled(const ParticipantManagement
 
   //DEBUG_LOG(m_logger)<<" -- [setMissionActionFullfiled] -> msa.number: "<<msa.actionNumber()<<" planId: "<<msa.planId();
   // actionNumb=-1 && itemNumb=-1 |-> mission will be aborted
-  if (msa.itemNumber() < 0 && msa.actionNumber() < 0)
+  if (msa.itemNumber < 0 && msa.actionNumber < 0)
   {
-    ParticipantManagement::SetMissionActionFulfilledRequest abortReq(m_missionPlan.id(),
+    ParticipantManagement::SetMissionActionFulfilledRequest abortReq(m_missionPlan.id,
                                                                      m_ddsHandler->currentPartitionTime(),
                                                                      -1,
                                                                      -1);
     if ( !m_ddsHandler->ftcPpm()->setMissionActionFulfilledRequest(abortReq))
-        WARNING_LOG(m_logger) << " -- unable to abort mission with planId:"<<abortReq.missionId();
+        WARNING_LOG(m_logger) << " -- unable to abort mission with planId:"<<abortReq.missionId;
 
     return;
   }
 
-  if (msa.itemNumber() >= static_cast<int>(m_missionPlan.items().size()) )
+  if (msa.itemNumber >= static_cast<int>(m_missionPlan.items.size()) )
   {
     //WARNING_LOG(m_logger)<<" -- [setMissionActionFulfilled] item size invalid !!";
     return;
   }
 
-  const int actionCount = m_missionPlan.items()[msa.itemNumber()].actions().size();
-  if (msa.actionNumber() >= actionCount)
+  const int actionCount = m_missionPlan.items[msa.itemNumber].actions.size();
+  if (msa.actionNumber >= actionCount)
   {
     //WARNING_LOG(m_logger)<<" -- [setMissionActionFulfilled] actions size invalid !!";
     return;
   }
 
-  auto &action = m_missionPlan.items()[msa.itemNumber()].actions()[msa.actionNumber()];
-  action.fulfilled(m_ddsHandler->currentPartitionTime());
+  auto &action = m_missionPlan.items[msa.itemNumber].actions[msa.actionNumber];
+  action.fulfilled = m_ddsHandler->currentPartitionTime();
   ParticipantManagement::SetMissionActionFulfilledRequest req;
-  req.actionNumber(action.actionNumber());
-  req.fulfilled(action.fulfilled());
-  req.itemNumber(action.itemNumber());
-  req.missionId(m_missionPlan.id());
+  req.actionNumber = action.actionNumber;
+  req.fulfilled = action.fulfilled;
+  req.itemNumber = action.itemNumber;
+  req.missionId = m_missionPlan.id;
 
   if (!m_ddsHandler->ftcPpm()->setMissionActionFulfilledRequest(req))
-    WARNING_LOG(m_logger) << " -- unable to setMissionActionFulfilledRequest: planId:"<<req.missionId();
+    WARNING_LOG(m_logger) << " -- unable to setMissionActionFulfilledRequest: planId:"<<req.missionId;
 
 }
 
 int CesMissionPlanObject::planId() const
 {
-  return m_missionPlan.id();
+  return m_missionPlan.id;
 }
 
 int CesMissionPlanObject::participantId() const
 {
-  return m_missionPlan.participantId();
+  return m_missionPlan.participantId;
 }
 
 bool CesMissionPlanObject::isMissionFulfilled(const ParticipantManagement::MissionPlan &mission)
 {
   int itemCount   = 0;
   int actionCount = 0;
-  for (const auto &item : mission.items())
+  for (const auto &item : mission.items)
   {
     actionCount = 0;
-    for (const auto &a : item.actions())
+    for (const auto &a : item.actions)
     {
       //DEBUG_LOG(m_logger)<<" -- [setMissionPlan] action.Num : "<<a.actionNumber()<<" itemNum: "<<a.itemNumber()<<" fulfilled: "<<a.fulfilled();
-      if (a.fulfilled() > 0)
+      if (a.fulfilled > 0)
         actionCount++;
       else
         return false;
     }
-    if (actionCount == (int) item.actions().size())
+    if (actionCount == (int) item.actions.size())
       itemCount++;
   }
 
-  return (itemCount == (int)mission.items().size());
+  return (itemCount == (int)mission.items.size());
 }
 
 void CesMissionPlanObject::sendActionAttact()
@@ -130,7 +130,7 @@ void CesMissionPlanObject::sendActionAttact()
   //3- setActionFulfilled
   int ret = m_ddsHandler->ftcAes()->explosionClusterSingleEffectOnlyModifyRequest(getExplosionCluster());
   if (!ret)
-    WARNING_LOG(m_logger)<<" -- sendActionAttact ret error for planId: "<<m_missionPlan.id();
+    WARNING_LOG(m_logger)<<" -- sendActionAttact ret error for planId: "<<m_missionPlan.id;
 
   setMissionActionFulfilled(getNextAction());
 }
@@ -139,28 +139,28 @@ AreaEffectSimulation::ExplosionClusterSingleEffectOnlyRequest CesMissionPlanObje
 {
   auto msa = getNextAction();
 
-  QJsonObject jsobj = QJsonDocument::fromJson(QByteArray::fromStdString(msa.properties())).object();
+  QJsonObject jsobj = QJsonDocument::fromJson(QByteArray::fromStdString(msa.properties)).object();
   const int chargeTypeId = jsobj.value(QStringLiteral("chargeTypeId")).toInt();
 
 
-  const ParticipantManagement::Participant participant = m_ddsHandler->dtcPpm()->participant(m_missionPlan.participantId());
-  const ParticipantManagement::UAS uas = m_ddsHandler->dtcPpm()->getUasByParticipantId(m_missionPlan.participantId(),
+  const ParticipantManagement::Participant participant = m_ddsHandler->dtcPpm()->participant(m_missionPlan.participantId);
+  const ParticipantManagement::UAS uas = m_ddsHandler->dtcPpm()->getUasByParticipantId(m_missionPlan.participantId,
                                                                                                   m_ddsHandler->dds()->getPartitionId());
 
   QDateTime timeStamp = QDateTime::fromMSecsSinceEpoch(m_ddsHandler->currentPartitionTime());
   timeStamp = timeStamp.addSecs(10);
-  const QString exploName = QStringLiteral("%1_%2").arg(QString::fromStdString(uas.deviceIdentifier())).arg(DTG::toStringMSec(timeStamp.toMSecsSinceEpoch(), DTG::DisplayFormat::Short));
+  const QString exploName = QStringLiteral("%1_%2").arg(QString::fromStdString(uas.deviceIdentifier)).arg(DTG::toStringMSec(timeStamp.toMSecsSinceEpoch(), DTG::DisplayFormat::Short));
   Core::GeoPosition geoPos(jsobj.value(QStringLiteral("location_x")).toDouble(),
                            jsobj.value(QStringLiteral("location_y")).toDouble(), 0.0);
 
   AreaEffectSimulation::ExplosionClusterSingleEffectOnlyRequest ecReq;
-  ecReq.id(0);
-  ecReq.effectStart(timeStamp.toMSecsSinceEpoch());
-  ecReq.name(exploName.toStdString());
-  ecReq.element(ecReq.name());
-  ecReq.impactPosition(geoPos);
-  ecReq.chargeTypeId(chargeTypeId);
-  ecReq.partyId(participant.partyId());
+  ecReq.id = 0;
+  ecReq.effectStart = timeStamp.toMSecsSinceEpoch();
+  ecReq.name = exploName.toStdString();
+  ecReq.element = ecReq.name;
+  ecReq.impactPosition = geoPos;
+  ecReq.chargeTypeId = chargeTypeId;
+  ecReq.partyId = participant.partyId;
   // ecReq.externalId(0); // not used!!
 
   return ecReq;
@@ -180,14 +180,14 @@ void CesMissionPlanObject::sendNextMissionAction()
   //DEBUG_LOG(m_logger)<<" -- ########## ###### SEND NEXT ACTION ###### #############";
 
   // set mission plan completed! or aborted
-  if (isMissionFulfilled(m_missionPlan) || m_missionPlan.aborted())
+  if (isMissionFulfilled(m_missionPlan) || m_missionPlan.aborted)
   {
-    DEBUG_LOG(m_logger)<<" -- [sendNextMissionAction] No action mission Completed for plan id: "<<m_missionPlan.id();
+    DEBUG_LOG(m_logger)<<" -- [sendNextMissionAction] No action mission Completed for plan id: "<<m_missionPlan.id;
     deleteMissionPlanObject();
     return;
   }
 
-  switch (action.actionType().underlying()) {
+  switch (action.actionType) {
   case ParticipantManagement::MissionActionType::MoveTo:
   {
     emit ready2SendNextAction(action);
@@ -195,7 +195,7 @@ void CesMissionPlanObject::sendNextMissionAction()
   }
   case ParticipantManagement::MissionActionType::Loiter:
   {
-    m_loiterTimer->start(action.duration() * 1000); // duration is in sec -> in msec: x * 1000
+    m_loiterTimer->start(action.duration * 1000); // duration is in sec -> in msec: x * 1000
     return;
   }
   case ParticipantManagement::MissionActionType::Attack:
@@ -215,14 +215,14 @@ void CesMissionPlanObject::setMissionPlan(const ParticipantManagement::MissionPl
   ///3- send Next Mission Action
 
   m_missionPlan = plan;
-  if (plan.missionStart() > m_ddsHandler->currentPartitionTime())
+  if (plan.missionStart > m_ddsHandler->currentPartitionTime())
   {
     //DEBUG_LOG(m_logger)<<" -- [setMissionPlan] restart Timer for plan.id: "<<plan.id();
-    m_missionStartimer->start(m_missionPlan.missionStart() - m_ddsHandler->currentPartitionTime());
+    m_missionStartimer->start(m_missionPlan.missionStart - m_ddsHandler->currentPartitionTime());
     return;
   }  
 
-  if (isMissionFulfilled(plan) || plan.aborted())
+  if (isMissionFulfilled(plan) || plan.aborted)
   {
     DEBUG_LOG(m_logger) << "setMissionPlan deleteMissionPlanObject";
     deleteMissionPlanObject();
@@ -240,21 +240,21 @@ ParticipantManagement::MissionPlan &CesMissionPlanObject::missionPlan()
 const ParticipantManagement::MissionAction CesMissionPlanObject::getNextAction()
 {
 
-  DEBUG_LOG(m_logger)<<" -- [getNextAction]: planId: "<<m_missionPlan.id()<<" itemSize: "<<m_missionPlan.items().size();
-  std::vector<ParticipantManagement::MissionItem> items = m_missionPlan.items();
+  DEBUG_LOG(m_logger)<<" -- [getNextAction]: planId: "<<m_missionPlan.id<<" itemSize: "<<m_missionPlan.items.size();
+  std::vector<ParticipantManagement::MissionItem> items = m_missionPlan.items;
 
   // std::sort(items.begin(), items.end(), [](const ParticipantManagement::MissionItem &itemA, const ParticipantManagement::MissionItem &itemB){ return (itemA.itemNumber() < itemB.itemNumber()); });
 
-  for (auto &item : m_missionPlan.items())
+  for (auto &item : m_missionPlan.items)
   {
-    for (auto &msa : item.actions())
+    for (auto &msa : item.actions)
     {
-      if (msa.fulfilled() > 0)
+      if (msa.fulfilled > 0)
       {
         continue;
       }
-      DEBUG_LOG(m_logger)<<" -- [getNextActopm]mission with planId: " << m_missionPlan.id() << " // action_number " << msa.actionNumber()
-                           << " // action_type " << msa.actionType();
+      DEBUG_LOG(m_logger)<<" -- [getNextActopm]mission with planId: " << m_missionPlan.id << " // action_number " << msa.actionNumber
+                           << " // action_type " << msa.actionType;
 
       return msa;
     }
@@ -267,14 +267,14 @@ void CesMissionPlanObject::setMissionCompleted()
 {
   const ParticipantManagement::MissionPlan &msp = m_missionPlan;
   ParticipantManagement::ModifyMissionPlanRequest req;
-  req.missionStart(msp.missionStart());
-  req.jumpToStart(msp.jumpToStart());
-  req.id(msp.id());
-  req.items(msp.items());
-  req.name(msp.name());
-  req.participantId(msp.participantId());
-  req.properties(msp.properties());
-  req.repeat(msp.repeat());
+  req.missionStart = msp.missionStart;
+  req.jumpToStart = msp.jumpToStart;
+  req.id = msp.id;
+  req.items = msp.items;
+  req.name = msp.name;
+  req.participantId = msp.participantId;
+  req.properties = msp.properties;
+  req.repeat = msp.repeat;
 
   if (!m_ddsHandler->ftcPpm()->modifyMissionPlanRequest(req))
     ERROR_LOG(m_logger)<<" -- couldn't modify mission plan ";
@@ -292,16 +292,16 @@ void CesMissionPlanObject::setMissionCompleted()
  */
 void CesMissionPlanObject::abortMission()
 {
-  DEBUG_LOG(m_logger)<<" -- [abortMission] abord mission with planId: "<<m_missionPlan.id()<<" // uas id: "<<m_missionPlan.participantId();
+  DEBUG_LOG(m_logger)<<" -- [abortMission] abord mission with planId: "<<m_missionPlan.id<<" // uas id: "<<m_missionPlan.participantId;
   ParticipantManagement::MissionAction msa = getNextAction();
-  msa.actionNumber(-1);
-  msa.itemNumber(-1);
+  msa.actionNumber = -1;
+  msa.itemNumber = -1;
   setMissionActionFulfilled(msa);
 }
 
 void CesMissionPlanObject::deleteMissionPlanObject()
 {
-  DEBUG_LOG(m_logger)<<" -- [DELETE OBJECT] plan fullfiled: delete Object planId: "<<m_missionPlan.id();
+  DEBUG_LOG(m_logger)<<" -- [DELETE OBJECT] plan fullfiled: delete Object planId: "<<m_missionPlan.id;
   deleteLater();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
index 9f5275c63..6a55753ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
@@ -23,7 +23,7 @@ namespace core
 {
 inline uint qHash(ProjectDataManagement::PdmEventType et)
 {
-  return ::qHash(et.underlying());
+  return ::qHash(et);
 }
 }
 }
@@ -171,45 +171,45 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
   double lowerOffset = 0;
   bool offsetIsSet = false;
   TRACE_LOG(m_logger) << "onAesItemViewChanged"
-                      << " aesItemId=" << data.aesItemId();
+                      << " aesItemId=" << data.aesItemId;
 
 
-  AreaEffectSimulation::BCContamination bCContamination = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId());
+  AreaEffectSimulation::BCContamination bCContamination = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId);
 
 
 
-  const int aesItemId = data.aesItemId();
-  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-  if ((data.aesTypeId().underlying() !=  AreaEffectSimulation::AesType::AtDangerArea)
-      && (data.aesTypeId().underlying() !=  AreaEffectSimulation::AesType::AtBCContamination)
-      && (data.aesTypeId().underlying() !=  AreaEffectSimulation::AesType::AtNContamination))
+  const int aesItemId = data.aesItemId;
+  const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+  if ((data.aesTypeId !=  AreaEffectSimulation::AesType::AtDangerArea)
+      && (data.aesTypeId !=  AreaEffectSimulation::AesType::AtBCContamination)
+      && (data.aesTypeId !=  AreaEffectSimulation::AesType::AtNContamination))
     return;
 
-  if (data.aesTypeId().underlying() ==  AreaEffectSimulation::AesType::AtBCContamination)
+  if (data.aesTypeId ==  AreaEffectSimulation::AesType::AtBCContamination)
   {
-    const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId());
-    if (!bc.isCentral())
+    const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId);
+    if (!bc.isCentral)
     {
       DEBUG_LOG(m_logger) << "!Central BCContamination id: " << aesItemId;
       return;
     }
     offsetIsSet = true;
-    upperOffset = bCContamination.upperOffset();
-    lowerOffset = bCContamination.lowerOffset();
+    upperOffset = bCContamination.upperOffset;
+    lowerOffset = bCContamination.lowerOffset;
   }
-  else if (data.aesTypeId().underlying() ==  AreaEffectSimulation::AesType::AtDangerArea)
+  else if (data.aesTypeId ==  AreaEffectSimulation::AesType::AtDangerArea)
   {
-    const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(data.aesItemId());
-    if (!da.isCentral())
+    const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(data.aesItemId);
+    if (!da.isCentral)
     {
       DEBUG_LOG(m_logger) << "!Central DangerArea id: " << aesItemId;
       return;
     }
   }
-  else if (data.aesTypeId().underlying() ==  AreaEffectSimulation::AesType::AtNContamination)
+  else if (data.aesTypeId ==  AreaEffectSimulation::AesType::AtNContamination)
   {
-    const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(data.aesItemId());
-    if (!nc.isCentral())
+    const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(data.aesItemId);
+    if (!nc.isCentral)
     {
       DEBUG_LOG(m_logger) << "!Central NContamination id: " << aesItemId;
       return;
@@ -218,26 +218,26 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
 
 
   TRACE_LOG(m_logger) << "Got AesItemView id: " << aesItemId
-                      << ", type: " << data.aesTypeId()
-                      << ", effectState: " << data.effectStateId()
+                      << ", type: " << data.aesTypeId
+                      << ", effectState: " << data.effectStateId
                       << ", modType: " << modType;
 
 
-  const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
+  const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct);
   DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
-  switch (effectState.underlying())
+  switch (effectState)
   {
   case AreaEffectSimulation::AesEffectState::EsPrepared:
   {
     const auto &aesItemViewUtm = CentralEffectSimulation::AesItemViewUtm::create(data,
-                                                                                 m_aesItemViews[data.aesItemId()],
+                                                                                 m_aesItemViews[data.aesItemId],
                                                                                  impactRadius,
                                                                                  isSupplyTruck,
                                                                                  hazardDistance,
                                                                                  offsetIsSet,
                                                                                  upperOffset,
                                                                                  lowerOffset);
-    m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
+    m_aesItemViews.insert(data.aesItemId, aesItemViewUtm);
   }
     break;
   case AreaEffectSimulation::AesEffectState::EsActivated:
@@ -245,23 +245,23 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
 
     CentralEffectSimulation::AesItemViewUtm aesItemViewUtm =
         CentralEffectSimulation::AesItemViewUtm::create(data,
-                                                        m_aesItemViews[data.aesItemId()],
+                                                        m_aesItemViews[data.aesItemId],
                                                         impactRadius,
                                                         isSupplyTruck,
                                                         hazardDistance,
                                                         offsetIsSet,
                                                         upperOffset,
                                                         lowerOffset);
-    const Core::GeoPosition2D &pointGeo = bCContamination.impactPosition();
+    const Core::GeoPosition2D &pointGeo = bCContamination.impactPosition;
     int zone = aesItemViewUtm.zone;
 
     //aesItemViewUtm.center = CentralEffectSimulation::geographic2Utm(pointGeo, &zone);
 
-    auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(pointGeo.lon(), pointGeo.lat(), zone);
+    auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(pointGeo.lon, pointGeo.lat, zone);
     QPointF impactPositionUtm = QPointF(utm.x, utm.y);
     aesItemViewUtm.center = impactPositionUtm;
 
-    switch (data.aesTypeId().underlying())
+    switch (data.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtBCContamination:
     case AreaEffectSimulation::AesType::AtNContamination:
@@ -270,15 +270,15 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
       // form-Check
       // if new field for this participant send sendCesHitRequest
       calculateBcContamination(aesItemViewUtm);
-      m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
+      m_aesItemViews.insert(data.aesItemId, aesItemViewUtm);
 //      DEBUG_LOG(m_logger) << "insert AtBCContamination oder AtNContamination AesItemView id: " << aesItemId
 //                          << ", type: " << data.aesTypeId();
       break;
     case AreaEffectSimulation::AesType::AtDangerArea:
       calculateDangerArea(aesItemViewUtm);
-      m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
+      m_aesItemViews.insert(data.aesItemId, aesItemViewUtm);
       DEBUG_LOG(m_logger) << "insert AtDangerArea AesItemView id: " << aesItemId
-                          << ", type: " << data.aesTypeId();
+                          << ", type: " << data.aesTypeId;
       break;
     default:
       break;
@@ -301,9 +301,9 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
 
 void HandlerNBC::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
 {
-  if (!data.isCentral())
+  if (!data.isCentral)
   {
-    aesItemViewRemoved(data.id());
+    aesItemViewRemoved(data.id);
     return;
   }
 
@@ -313,15 +313,15 @@ void HandlerNBC::onBCContaminationChanged(const AreaEffectSimulation::BCContamin
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
-    switch (data.effectStateId().underlying())
+    switch (data.effectStateId)
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
-      CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()];
-      if (m_ddsHandler->volatilityTypeId(data.chargeStruct()) == ProjectDataManagement::VolatilityType::Resident)
+      CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id];
+      if (m_ddsHandler->volatilityTypeId(data.chargeStruct) == ProjectDataManagement::VolatilityType::Resident)
       {
-        ref.radials = {data.impactRadius()};
-        ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition(), &ref.zone);
+        ref.radials = {data.impactRadius};
+        ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition, &ref.zone);
       }
       else
         ref.radials.clear();
@@ -337,60 +337,60 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
 {
 
   DEBUG_LOG(m_logger) << "onNContaminationChanged"
-                      << " id=" << data.id();
+                      << " id=" << data.id;
   switch (modType)
   {
   case DataModification::eRemoved:
     break;
   case DataModification::eAdded:
   case DataModification::eModified:
-    switch (data.effectStateId().underlying())
+    switch (data.effectStateId)
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
-      CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()];
-      ref.radials = {data.impactRadius(),
-                     data.borderLengthInner(),
-                     data.borderLengthInner() + data.borderLengthOuter()
+      CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id];
+      ref.radials = {data.impactRadius,
+                     data.borderLengthInner,
+                     data.borderLengthInner + data.borderLengthOuter
                     };
-      ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition(), &ref.zone);
+      ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition, &ref.zone);
       const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> participantsMap = m_handlerParticipant->positions();
       for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
       {
         if (m_handlerParticipant->isOutdated(participantPos))
           continue;
-        DEBUG_LOG(m_logger) << "onNContaminationChanged participantId=" << participantPos.participantId()
+        DEBUG_LOG(m_logger) << "onNContaminationChanged participantId=" << participantPos.participantId
                             << "  insideBuilding=" << participantPos.insideBuilding()
-                            << " buildingId=" << participantPos.buildingId();
+                            << " buildingId=" << participantPos.buildingId;
 
-        const QPointF posUtm = CentralEffectSimulation::geographic2Utm(participantPos.pos(), &ref.zone);
-        const bool isInCircle = inCircle(ref.center, data.impactRadius(), posUtm);
+        const QPointF posUtm = CentralEffectSimulation::geographic2Utm(participantPos.pos, &ref.zone);
+        const bool isInCircle = inCircle(ref.center, data.impactRadius, posUtm);
 
         const EffectType effectType = CES_NBC::EffectType::NContaminationDetonation;
         const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
         DEBUG_LOG(m_logger) << "onNContaminationChanged isInCircle=" << isInCircle
-                            << " aesItemId=" << data.id();
+                            << " aesItemId=" << data.id;
         if ( isInCircle)
         {
-          QHash<int, bool> aesIds = m_participantAes.value(participantPos.participantId());
-          aesIds.insert(data.id(), true);
+          QHash<int, bool> aesIds = m_participantAes.value(participantPos.participantId);
+          aesIds.insert(data.id, true);
 
-          m_participantAes.insert( participantPos.participantId(), aesIds);
+          m_participantAes.insert( participantPos.participantId, aesIds);
 
-          QHash<int, QSet<EffectType>> effectTypeStatesFromAesItem = m_effectTypeStates.value(data.id());
+          QHash<int, QSet<EffectType>> effectTypeStatesFromAesItem = m_effectTypeStates.value(data.id);
 
 
-          QSet<EffectType> effectSet = effectTypeStatesFromAesItem.value(participantPos.participantId());
+          QSet<EffectType> effectSet = effectTypeStatesFromAesItem.value(participantPos.participantId);
 
           effectSet.insert(EffectType::NContaminationDetonation);
 
-          effectTypeStatesFromAesItem.insert(participantPos.participantId(), effectSet);
+          effectTypeStatesFromAesItem.insert(participantPos.participantId, effectSet);
 
-          m_effectTypeStates.insert(data.id(), effectTypeStatesFromAesItem);
+          m_effectTypeStates.insert(data.id, effectTypeStatesFromAesItem);
 
 
-          DEBUG_LOG(m_logger) << "m_participantAes.insert  participantId=" << participantPos.participantId()
-                               << " aesId=" << data.id();
+          DEBUG_LOG(m_logger) << "m_participantAes.insert  participantId=" << participantPos.participantId
+                               << " aesId=" << data.id;
         sendCesHitRequest(ref,
                           participantPos,
                           //effectTime >= 0 ? effectTime : participantPosition.sampleTime(),
@@ -416,10 +416,10 @@ void HandlerNBC::calculateBcContamination(const CentralEffectSimulation::AesItem
   {
     if (m_handlerParticipant->isOutdated(participantPos))
       continue;
-    DEBUG_LOG(m_logger) << "participantId=" << participantPos.participantId()
+    DEBUG_LOG(m_logger) << "participantId=" << participantPos.participantId
                         << "  insideBuilding=" << participantPos.insideBuilding()
-                        << " buildingId=" << participantPos.buildingId()
-                        << " roomId=" << participantPos.roomId();
+                        << " buildingId=" << participantPos.buildingId
+                        << " roomId=" << participantPos.roomId;
     inFormCheck(itemView, participantPos);
   }
   // for
@@ -442,61 +442,61 @@ void HandlerNBC::deleteDangerArea(const int aesItemId)
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
     sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
-    DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId;
   }// for all Participants
 } // deleteDangerArea
 
 void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
   bool leave = false;
-  DEBUG_LOG(m_logger) << "++++++++ onNewOutdoorParticipantPosition participantId="  << participantData.participantId()
-                      << " buildingId=" << participantData.buildingId()
-                      << " roomId=" << participantData.roomId()
-                      << " reportingSource=" << participantData.reportingSource()
+  DEBUG_LOG(m_logger) << "++++++++ onNewOutdoorParticipantPosition participantId="  << participantData.participantId
+                      << " buildingId=" << participantData.buildingId
+                      << " roomId=" << participantData.roomId
+                      << " reportingSource=" << participantData.reportingSource
                       << " m_aesItemViews.size=" << m_aesItemViews.size();
 
   if (m_handlerParticipant->isOutdated(participantData))
     return;
 
-  if (m_handlerParticipant->getEquipmentNumber(participantData.participantId()) == 0)
+  if (m_handlerParticipant->getEquipmentNumber(participantData.participantId) == 0)
   {
     DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
-  if (m_lastRoomId.value(participantData.participantId()) > 0)
+  if (m_lastRoomId.value(participantData.participantId) > 0)
   {
-    DEBUG_LOG(m_logger) << "Leave Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId()
+    DEBUG_LOG(m_logger) << "Leave Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId
                         << " m_isInContaminatedRoom.\nremove!!!";
 
 
     AreaEffectSimulation::AesItemView aesItemView;
-    bool aesIsAvailable = m_ddsHandler->dtcAes()->aesItemViewFromEntityId(m_isInContaminatedRoom.value(participantData.participantId()),AreaEffectSimulation::AesType::AtUnknown, aesItemView );
+    bool aesIsAvailable = m_ddsHandler->dtcAes()->aesItemViewFromEntityId(m_isInContaminatedRoom.value(participantData.participantId),AreaEffectSimulation::AesType::AtUnknown, aesItemView );
 
     if (aesIsAvailable
-        && (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated))
+        && (aesItemView.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated))
     {
-      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
-      m_isInContaminatedRoom.remove(participantData.participantId());
+      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId;
+      m_isInContaminatedRoom.remove(participantData.participantId);
 
     }
     else
     {
-      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
-      sendLeaveEvent(aesItemView.aesItemId(),participantData );
+      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId;
+      sendLeaveEvent(aesItemView.aesItemId,participantData );
     }
     leave = true;
   }
   else
   {
-    DEBUG_LOG(m_logger) << "m_lastRoomId.contains(" << m_lastRoomId.contains(participantData.participantId())
-                        << " roomId=" << m_lastRoomId.value(participantData.participantId());
+    DEBUG_LOG(m_logger) << "m_lastRoomId.contains(" << m_lastRoomId.contains(participantData.participantId)
+                        << " roomId=" << m_lastRoomId.value(participantData.participantId);
   }
 
-  m_lastRoomId.insert(participantData.participantId(), 0);
+  m_lastRoomId.insert(participantData.participantId, 0);
 
 
-  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId()
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantData.participantId
                       << " m_aesItemViews.size()=" << m_aesItemViews.size();
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
@@ -505,13 +505,13 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
     if (leave)
     {
       QHash<int, QSet<EffectType>> effectTypeHash = m_effectTypeStates.value(itemView.aesItemId);
-      if ( effectTypeHash.contains(participantData.participantId()))
+      if ( effectTypeHash.contains(participantData.participantId))
       {
-        effectTypeHash.remove(participantData.participantId());
+        effectTypeHash.remove(participantData.participantId);
       }
       m_effectTypeStates.insert(itemView.aesItemId, effectTypeHash);
     }
-    switch (itemView.aesTypeId.underlying())
+    switch (itemView.aesTypeId)
     {
     case AreaEffectSimulation::AesType::AtBCContamination:
     case AreaEffectSimulation::AesType::AtNContamination:
@@ -578,14 +578,14 @@ bool HandlerNBC::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUt
   const QRectF boundingBoxImpact(itemView.boundingBoxBottomLeft,
                                  itemView.boundingBoxTopRight);
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos, itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId
                         << " inside AesItemView:" << itemView.aesItemId;
     return true;
   }
-  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId
                       << " outside AesItemView:" << itemView.aesItemId;
   return false;
 }
@@ -597,14 +597,14 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
   m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId,AreaEffectSimulation::AesType::AtUnknown, aesItemView );
 
 
-  DEBUG_LOG(m_logger) << "sendEnterEvent, paricipantId: " << participantData.participantId()
+  DEBUG_LOG(m_logger) << "sendEnterEvent, paricipantId: " << participantData.participantId
                       << ", aesItemId: " << aesItemId
                       << ", aesType=" << aesTypeId
                       << ", isIndoor=" << isIndoor;
 
-  QHash<int, bool> aesIds = m_participantAes.value(participantData.participantId());
+  QHash<int, bool> aesIds = m_participantAes.value(participantData.participantId);
   aesIds.insert(aesItemId, true);
-  m_participantAes.insert(participantData.participantId(), aesIds);
+  m_participantAes.insert(participantData.participantId, aesIds);
   int zone = -1;
 
   if ( m_aesItemViews.contains(aesItemId))
@@ -614,8 +614,8 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
     ERROR_LOG(m_logger) << "No m_aesItemViews.contains aesItemId=" << aesItemId;
   }
 
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), zone);
-  switch (aesTypeId.underlying())
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos, zone);
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
   {
@@ -632,7 +632,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
     break;
   case AreaEffectSimulation::AesType::AtNContamination:
     sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_EnterNuclear);
-    sendEffectTypeEvent(aesItemId, participantData, effectTypeForNContaminationArea(m_aesItemViews.value(aesItemId), participantPosUtmPoint, participantData.sampleTime(), participantData.insideBuilding()));
+    sendEffectTypeEvent(aesItemId, participantData, effectTypeForNContaminationArea(m_aesItemViews.value(aesItemId), participantPosUtmPoint, participantData.sampleTime, participantData.insideBuilding()));
     break;
   case AreaEffectSimulation::AesType::AtExplosionArea:
   case AreaEffectSimulation::AesType::AtFunctionalArea:
@@ -651,11 +651,11 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati
 
   DEBUG_LOG(m_logger) << "sendLeaveEvent"
                       << " aesId=" << aesItemId
-                      << " participantId=" << participantData.participantId()
-                      << " aesTypeId=" << aesItemView.aesTypeId();
+                      << " participantId=" << participantData.participantId
+                      << " aesTypeId=" << aesItemView.aesTypeId;
 
 
-  switch (aesItemView.aesTypeId().underlying())
+  switch (aesItemView.aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     sendEffectTypeEvent(aesItemId, participantData, EffectType::BCContaminationLeave);
@@ -687,9 +687,9 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
 
   const QRectF boundingBoxImpact(itemView.boundingBoxBottomLeft,
                                  itemView.boundingBoxTopRight);
-  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
-  const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos(), itemView.zone);
-  TRACE_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantData.participantId()
+  const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos, itemView.zone);
+  const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos, itemView.zone);
+  TRACE_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantData.participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size()
@@ -699,30 +699,30 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
   if (boundingBoxImpact.contains(participantPosUtmPoint) &&
       itemView.form.containsPoint(participantPosUtmPoint, Qt::FillRule::OddEvenFill))
   {
-    DEBUG_LOG(m_logger) << "Participant id=" << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant id=" << participantData.participantId
                          << " inside Area"
                          << " inside Building:" << participantData.insideBuilding()
-                         << " roomId=" << participantData.roomId();
-    if ( participantData.roomId() > 0 )
+                         << " roomId=" << participantData.roomId;
+    if ( participantData.roomId > 0 )
     {
 
       InfrastructureManagement::StructureElement structureElement;
-      bool roomFound = m_ddsHandler->dtcIsm()->getStructureElementById(participantData.roomId(), structureElement);
+      bool roomFound = m_ddsHandler->dtcIsm()->getStructureElementById(participantData.roomId, structureElement);
 
-      DEBUG_LOG (m_logger) << "Participant id=" << participantData.participantId()
-                            << " pos.z=" << participantData.pos().z()
+      DEBUG_LOG (m_logger) << "Participant id=" << participantData.participantId
+                            << " pos.z=" << participantData.pos.z
                             << " upperOffset =" << itemView.upperOffset
                             << " lowerOffset=" << itemView.lowerOffset
                             << " roomFound=" << roomFound
-                            << " offsetZ=" << structureElement.relPosition().offsetZ();
+                            << " offsetZ=" << structureElement.relPosition.offsetZ;
 
-      if ( (itemView.aesTypeId.underlying() !=  AreaEffectSimulation::AesType::AtNContamination)
+      if ( (itemView.aesTypeId !=  AreaEffectSimulation::AesType::AtNContamination)
           && itemView.offsetIsSet
-          && (    ( structureElement.relPosition().offsetZ() + 1.5 > itemView.upperOffset )
-               || ( structureElement.relPosition().offsetZ() + 1.5 < itemView.lowerOffset)))
+          && (    ( structureElement.relPosition.offsetZ + 1.5 > itemView.upperOffset )
+               || ( structureElement.relPosition.offsetZ + 1.5 < itemView.lowerOffset)))
       {
-        DEBUG_LOG (m_logger) << "Participant id=" << participantData.participantId()
-                              << " pos.z=" << participantData.pos().z()
+        DEBUG_LOG (m_logger) << "Participant id=" << participantData.participantId
+                              << " pos.z=" << participantData.pos.z
                               << " not between upperOffset =" << itemView.upperOffset
                               << " and lowerOffset=" << itemView.lowerOffset
                               << "\nreturn false";
@@ -763,15 +763,15 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
   DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeStruct)
-                      << " participantId=" << participantData.participantId();
+                      << " participantId=" << participantData.participantId;
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId
                       << " equipNo = " << equipNo
                       << " aesItemId =" << itemView.aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if (participantData.participantId() != 0 && equipNo <= 0)
+  if (participantData.participantId != 0 && equipNo <= 0)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
@@ -779,17 +779,17 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
 
   int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0);
 
-  const TrainingAreaBase::TabPosition pos(participantData.pos(),
+  const TrainingAreaBase::TabPosition pos(participantData.pos,
                                           Core::PositionReportingSource::Gps, // irrelevant
-                                          participantData.buildingId(),
-                                          participantData.roomId());
+                                          participantData.buildingId,
+                                          participantData.roomId);
   const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
 
   const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                        // equipmentNumber
-    participantData.participantId(), // participantId
-    itemView.chargeStruct.chargeTypeId(),                   // chargeTypeId
+    participantData.participantId, // participantId
+    itemView.chargeStruct.chargeTypeId,                   // chargeTypeId
     itemView.aesItemId,             // aesId
     originatorEquipNo,              // originatorEquipmentNumber
     remaining,                      // remainEffectPercent ( no protection outside Building )
@@ -799,8 +799,8 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
     itemView.partyId,               // originPartyId
     mineFieldBitIndex
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
-                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId
+                      << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId;
 
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
@@ -826,23 +826,23 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
 
   int32_t legacyChargeTypeId = 0;
   int32_t partyId = 0;
-  if ( aesItem.partyId.is_set())
+  if ( aesItem.partyId.has_value())
     partyId = aesItem.partyId.get();
-  legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(aesItem.chargeStruct());
+  legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(aesItem.chargeStruct);
   DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
-                      << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(aesItem.chargeStruct())
-                      << " participantId=" << participantData.participantId()
+                      << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(aesItem.chargeStruct)
+                      << " participantId=" << participantData.participantId
                       << " partyId=" << partyId
                       << " effectType=" << static_cast<int>(effectType)
                       << " remaining=" << remaining;
 
-  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
+  const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId);
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId
                       << " equipNo = " << equipmentNumber << " aesItemId =" << aesItemId;
 
   // participantPosition.participantPosition == 0 -> send to all
-  if (participantData.participantId() != 0 && equipmentNumber <= 0)
+  if (participantData.participantId != 0 && equipmentNumber <= 0)
   {
     DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
@@ -852,7 +852,7 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
   else if (effectType ==  CES_NBC::EffectType::NContaminationEnterArea1)
   {
     DEBUG_LOG(m_logger) << "NContaminationEnterArea1";
-    if (participantData.buildingId() > 0)
+    if (participantData.buildingId > 0)
     {
       DEBUG_LOG(m_logger) << "NContaminationEnterArea1 Protection by buildings"
                            << " remaining vorher=" << remaining
@@ -879,15 +879,15 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
   int32_t originatorParticipantId = m_aesItemId2partIdMap.value(aesItemId, 0);
   const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
   const TrainingAreaBase::TabPosition pos(
-    participantData.pos(), Core::PositionReportingSource::Gps, participantData.buildingId(),
-    participantData.roomId()
+    participantData.pos, Core::PositionReportingSource::Gps, participantData.buildingId,
+    participantData.roomId
   );
   const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
   TrainingAreaBase::SendCesHitRequest requestTab(
-    equipmentNumber, participantData.participantId(), legacyChargeTypeId, aesItemId, originatorEquipmentNumber,
+    equipmentNumber, participantData.participantId, legacyChargeTypeId, aesItemId, originatorEquipmentNumber,
     remaining, pos, effectTime, eventType, partyId, mineFieldBitIndex
   );
-  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId() << " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId << " chargeTypeId=" << aesItem.chargeStruct.chargeTypeId
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
@@ -902,7 +902,7 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
                                       const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
                                       const ProjectDataManagement::PdmEventType eventType)
 {
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId);
   // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar)
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -911,21 +911,21 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
       typeClass == ParticipantManagement::TypeClass::Vessel ||
       typeClass == ParticipantManagement::TypeClass::Unknown)
   {
-    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId
                         << " has invalid typeClass: " << typeClass
                         << " eventType: " << eventType;
     return;
   }
 
-  if (!eventMustBeSend(aesItemId, participantData.participantId(), eventType))
+  if (!eventMustBeSend(aesItemId, participantData.participantId, eventType))
   {
-    if ( m_isInContaminatedRoom.contains(participantData.participantId()) && participantData.roomId() == 0) // Tln leaves Building
+    if ( m_isInContaminatedRoom.contains(participantData.participantId) && participantData.roomId == 0) // Tln leaves Building
     {
       DEBUG_LOG(m_logger) << "Sending Event because Participant leaves Building";
     }
     else
     {
-      DEBUG_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId()
+      DEBUG_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId
                           << " and aes " << aesItemId << " - already sent";
       return;
     }
@@ -939,56 +939,56 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
       || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine
       || eventType == ProjectDataManagement::PdmEventType::EventType_HitN)
   {
-    DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantData.participantId();
+    DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantData.participantId;
     return;
   }
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId);
   if (equipmentNumber <= 0)
   {
-    WARNING_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId()
+    WARNING_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantData.participantId
                           << " - participant has no equipment number";
     return;
   }
 
   DEBUG_LOG(m_logger) << "sendParticipantEvent" << eventType
-                      << " participantId=" << participantData.participantId()
+                      << " participantId=" << participantData.participantId
                       << " AesItemId=" << aesItemId;
 
   CentralEffectSimulation::ParticipantEvent pe;
-  pe.id(m_ddsHandler->getParticipantEventId());
+  pe.id = m_ddsHandler->getParticipantEventId();
 
-  pe.eventTypeId(eventType.underlying());
-  pe.participantId(participantData.participantId());
-  pe.eventTime(participantData.sampleTime());
-  pe.aesItemId(aesItemId);
-  pe.partyId(participantData.partyId());
+  pe.eventTypeId = eventType;
+  pe.participantId = participantData.participantId;
+  pe.eventTime = participantData.sampleTime;
+  pe.aesItemId = aesItemId;
+  pe.partyId = participantData.partyId;
 
   if (eventType == ProjectDataManagement::PdmEventType::EventType_BCContamination)
   {
     const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(aesItemId);
-    pe.aesName(bc.name());
+    pe.aesName = bc.name;
   }
   else if (eventType == ProjectDataManagement::PdmEventType::EventType_DangerArea)
   {
     const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(aesItemId);
-    pe.aesName(da.name());
+    pe.aesName = da.name;
   }
   else if (eventType == ProjectDataManagement::PdmEventType::EventType_NContamination)
   {
     const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(aesItemId);
-    pe.aesName(nc.name());
+    pe.aesName = nc.name;
   }
 
-  pe.equipmentNumber(equipmentNumber);
-  pe.vulnerability(participantData.vulnerabilityState.underlying());
-  pe.position(participantData.pos());
+  pe.equipmentNumber = equipmentNumber;
+  pe.vulnerability = static_cast<int>(participantData.vulnerabilityState);
+  pe.position = participantData.pos;
 
   AreaEffectSimulation::AesItem aesItem;
   m_ddsHandler->dtcAes()->aesItemFromId(aesItemId, aesItem);
 
   // Criterion for friendly Fire:
-  if (aesItem.partyId() != -1
+  if (aesItem.partyId != -1
       && ((eventType == ProjectDataManagement::PdmEventType::EventType_EnterMineArea
            || eventType == ProjectDataManagement::PdmEventType::EventType_EnterNuclear
            || eventType == ProjectDataManagement::PdmEventType::EventType_HitB
@@ -997,17 +997,17 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
            || eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation
            || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine
            || eventType == ProjectDataManagement::PdmEventType::EventType_HitN)
-          && aesItem.partyId() == participantData.partyId()))
-    pe.friendlyFire(true);
+          && aesItem.partyId == participantData.partyId))
+    pe.friendlyFire = true;
   else
-    pe.friendlyFire(false);
+    pe.friendlyFire = false;
 
   INFO_LOG(m_logger) << "sendParticipantEvent: " << pe
                      << ", currentMSecsSinceEpoch = " << QDateTime::currentMSecsSinceEpoch()
-                     << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime();
+                     << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime;
   m_ddsHandler->dtsCes()->publish(pe);
 
-  const auto id = pe.id();
+  const auto id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
@@ -1019,18 +1019,18 @@ void HandlerNBC::sendEffectTypeEvent(const int aesItemId,
   int mineFieldBitIndex = 0;
 
   if (!effectTypeMustBeSend(aesItemId,
-                            participantData.participantId(),
+                            participantData.participantId,
                             effectType))
   {
     DEBUG_LOG(m_logger) << "Not sending EffectType event " << toString(effectType)
-                        << ", participant: " << participantData.participantId()
+                        << ", participant: " << participantData.participantId
                         << ", aesItemId: " << aesItemId
                         << " - already sent";
     return;
   }
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
   DEBUG_LOG(m_logger) << "Sending EffectType event " << toString(effectType)
-                      << ", participant: " << participantData.participantId()
+                      << ", participant: " << participantData.participantId
                       << ", aesItemId: " << aesItemId
                       << ", ctasEffectType: " << ctasEffectType;
   sendCesHitRequest(aesItemId,
@@ -1059,7 +1059,7 @@ bool HandlerNBC::eventMustBeSend(int aesItemId,
   activeEvents.insert(eventType);
 
   // - remove opposite events (e.g remove Enter event when we leave the area)
-  switch (eventType.underlying())
+  switch (eventType)
   {
   case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
     activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
@@ -1199,7 +1199,7 @@ bool HandlerNBC::inCircle(const QPointF &centerUtm, const double radius, const Q
 
 ProjectDataManagement::PdmEventType HandlerNBC::leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
 {
-  switch (aesTypeId.underlying())
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtDangerArea:
     return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
@@ -1215,7 +1215,7 @@ ProjectDataManagement::PdmEventType HandlerNBC::leaveEventTypeForAesType(AreaEff
 
 EffectType HandlerNBC::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
 {
-  switch (aesTypeId.underlying())
+  switch (aesTypeId)
   {
   case AreaEffectSimulation::AesType::AtBCContamination:
     return EffectType::BCContaminationLeave;
@@ -1233,7 +1233,7 @@ EffectType HandlerNBC::effectTypeForNContaminationArea(const CentralEffectSimula
                                                        const bool isIndoor)
 {
   const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(itemView.aesItemId);
-  auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(nc.impactPosition().lon(), nc.impactPosition().lat(), itemView.zone);
+  auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(nc.impactPosition.lon, nc.impactPosition.lat, itemView.zone);
   QPointF impactPositionUtm = QPointF(utm.x, utm.y);
   DEBUG_LOG(m_logger) << "HandlerNBC::effectTypeForNContaminationArea itemView.radials.size()=" << itemView.radials.size();
   if (itemView.radials.size() != 3)
@@ -1298,7 +1298,7 @@ EffectType HandlerNBC::effectTypeForBCContaminationArea(const CentralEffectSimul
     return EffectType::BCContaminationEnterFloating;
 // use real start point for non floating!
   const auto &bcItem = m_ddsHandler->dtcAes()->bCContamination(itemView.aesItemId);
-  const auto utmImpcat = CentralEffectSimulation::geographic2Utm(bcItem.impactPosition(), itemView.zone);
+  const auto utmImpcat = CentralEffectSimulation::geographic2Utm(bcItem.impactPosition, itemView.zone);
   const double squareDist = CentralEffectSimulation::getSquareDistance(utmImpcat, participantPosUtmPoint);
   if (squareDist <= pow(itemView.radials.at(0), 2))
   {
@@ -1361,19 +1361,19 @@ int HandlerNBC::getContaminationFromBuildingRoom(const int buildingId, const int
                       << " roomId=" << roomId;
 
   Buildings::BuildingState buildingState = m_ddsHandler->dtcBld()->buildingState(buildingId);
-  if (buildingState.contaminationStates().size() == 0 )
+  if (buildingState.contaminationStates.size() == 0 )
     return 0;
 
 
-  if (buildingState.contaminationStates().size() == 0)
+  if (buildingState.contaminationStates.size() == 0)
     return 0;
 
-  for (unsigned int i = 0; i < buildingState.contaminationStates().size(); i++)
+  for (unsigned int i = 0; i < buildingState.contaminationStates.size(); i++)
   {
-    for (unsigned int j = 0; j < buildingState.contaminationStates()[i].rooms().size(); j++)
+    for (unsigned int j = 0; j < buildingState.contaminationStates[i].rooms.size(); j++)
     {
-      if (buildingState.contaminationStates()[i].rooms()[j] ==  roomId)
-        return buildingState.contaminationStates()[i].aesId();
+      if (buildingState.contaminationStates[i].rooms[j] ==  roomId)
+        return buildingState.contaminationStates[i].aesId;
     }
   }
   return 0;
@@ -1386,9 +1386,9 @@ void HandlerNBC::onBuildingStateChanged(const Buildings::BuildingState &data, Da
     return;
   }
 
-  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
-                      << ", aesId = " << data.aesId()
-                      << ", data.contaminationStates().size()=" << data.contaminationStates().size();
+  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId
+                      << ", aesId = " << data.aesId
+                      << ", data.contaminationStates().size()=" << data.contaminationStates.size();
   // Check each participant
   const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> participantsMap = m_handlerParticipant->positions();
 
@@ -1397,14 +1397,14 @@ void HandlerNBC::onBuildingStateChanged(const Buildings::BuildingState &data, Da
     if (m_handlerParticipant->isOutdated(participantPos))
       continue;
 
-    if (participantPos.buildingId() == 0)
+    if (participantPos.buildingId == 0)
       continue;
 
-    int aesId = getContaminationFromBuildingRoom(participantPos.buildingId(), participantPos.roomId());
+    int aesId = getContaminationFromBuildingRoom(participantPos.buildingId, participantPos.roomId);
     const CentralEffectSimulation::AesItemViewUtm itemView = m_aesItemViews.value(aesId);
-    QHash<int, bool> aesIds = m_participantAes.value(participantPos.participantId());
+    QHash<int, bool> aesIds = m_participantAes.value(participantPos.participantId);
     aesIds.insert(aesId, true);
-    m_participantAes.insert(participantPos.participantId(), aesIds);
+    m_participantAes.insert(participantPos.participantId, aesIds);
     onNewIndoorParticipantPosition(participantPos);
   }
 
@@ -1413,26 +1413,26 @@ void HandlerNBC::onBuildingStateChanged(const Buildings::BuildingState &data, Da
 void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
   bool enterBuilding  = false;
-  if (  m_lastRoomId.value(participantData.participantId()) == 0)
+  if (  m_lastRoomId.value(participantData.participantId) == 0)
   {
-    DEBUG_LOG(m_logger) << "m_lastRoomId Enter Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId()
-                        << " roomId=" << participantData.roomId()
+    DEBUG_LOG(m_logger) << "m_lastRoomId Enter Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId
+                        << " roomId=" << participantData.roomId
                          << " m_isInContaminatedRoom. \nremove!!!!";
-    m_isInContaminatedRoom.remove(participantData.participantId());
-    m_lastRoomId.insert(participantData.participantId(), participantData.roomId());
+    m_isInContaminatedRoom.remove(participantData.participantId);
+    m_lastRoomId.insert(participantData.participantId, participantData.roomId);
     enterBuilding = true;
   }
   else
   {
-    DEBUG_LOG(m_logger) << "m_lastRoomId.contains(" << m_lastRoomId.contains(participantData.participantId())
-                        << " roomId=" << m_lastRoomId.value(participantData.participantId());
+    DEBUG_LOG(m_logger) << "m_lastRoomId.contains(" << m_lastRoomId.contains(participantData.participantId)
+                        << " roomId=" << m_lastRoomId.value(participantData.participantId);
   }
 
-  int aesId = getContaminationFromBuildingRoom(participantData.buildingId(), participantData.roomId());
-  DEBUG_LOG(m_logger) << "++++++++ onNewIndoorParticipantPosition participantId="  << participantData.participantId()
-                      << " buildingId=" << participantData.buildingId()
-                      << " roomId=" << participantData.roomId()
-                      << " reportingSource=" << participantData.reportingSource()
+  int aesId = getContaminationFromBuildingRoom(participantData.buildingId, participantData.roomId);
+  DEBUG_LOG(m_logger) << "++++++++ onNewIndoorParticipantPosition participantId="  << participantData.participantId
+                      << " buildingId=" << participantData.buildingId
+                      << " roomId=" << participantData.roomId
+                      << " reportingSource=" << participantData.reportingSource
                       << " Raum ist Kontaminiert: aesId=" << aesId;
   if ( aesId == 0)
   {
@@ -1444,9 +1444,9 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
   if (enterBuilding)
   {
     QHash<int, QSet<EffectType>> effectTypeHash = m_effectTypeStates.value(aesId);
-    if ( effectTypeHash.contains(participantData.participantId()))
+    if ( effectTypeHash.contains(participantData.participantId))
     {
-      effectTypeHash.remove(participantData.participantId());
+      effectTypeHash.remove(participantData.participantId);
     }
     m_effectTypeStates.insert(aesId, effectTypeHash);
   }
@@ -1456,9 +1456,9 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
 
   if (aesId > 0 && !m_aesItemViews.contains(aesId))
   {
-    DEBUG_LOG(m_logger) << "m_isInContaminatedRoom insert participantId=" << participantData.participantId()
+    DEBUG_LOG(m_logger) << "m_isInContaminatedRoom insert participantId=" << participantData.participantId
                         << " aesId=" << aesId;
-    m_isInContaminatedRoom.insert(participantData.participantId(), aesId);
+    m_isInContaminatedRoom.insert(participantData.participantId, aesId);
   }
 
   if (aesId > 0)
@@ -1466,16 +1466,16 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
     AreaEffectSimulation::AesItemView aesItemView;
     m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesId,AreaEffectSimulation::AesType::AtUnknown, aesItemView );
 
-    AreaEffectSimulation::AesType aesTypeId =  aesItemView.aesTypeId();
+    AreaEffectSimulation::AesType aesTypeId =  aesItemView.aesTypeId;
 
     DEBUG_LOG(m_logger) << "onNewIndoorParticipantPosition sendEnterEvent aesTypeId=" << aesTypeId;
     sendEnterEvent(aesId,aesTypeId,  participantData, true);
   }
   else
   {
-    if (m_participantAes.contains(participantData.participantId()))
+    if (m_participantAes.contains(participantData.participantId))
     {
-      QHash<int, bool> aesIds = m_participantAes.value(participantData.participantId());
+      QHash<int, bool> aesIds = m_participantAes.value(participantData.participantId);
       // leave aesArea
       QHashIterator<int, bool> i(aesIds);
       while (i.hasNext())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp
index bef5ba234..b0218c0cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp
@@ -55,14 +55,14 @@ void HandlerBlockedAreas::onSendParticipantBlockedAreaReply(const Core::Function
 
 void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
-  const int participantId = partPos.participantId();
+  const int participantId = partPos.participantId;
   int damagePercentBlockedAreas = 90; // From the percentage damage, blocked area applies Todo Config Value
   DEBUG_LOG(m_logger) << "HandlerBlockedAreas onParticipantPositionChanged participantId=" << participantId;
 
   TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
-  pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(partPos.participantId()));
-  pba.participantId(partPos.participantId());
-//  if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
+  pba.equipmentNumber = m_ddsHandler->participantId2EquipNo(partPos.participantId);
+  pba.participantId = partPos.participantId;
+//  if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
 //    m_blockedAreas.remove(participantId);
 
   if (!partPos.insideBuilding())
@@ -70,8 +70,8 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
     auto it = m_blockedAreas.find(participantId);
     if (it != m_blockedAreas.end())
     {
-      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
-      pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
+      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber;
+      pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
       m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
       m_blockedAreas.erase(it);
     }
@@ -81,10 +81,10 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
   {
     // check leave
     if (m_blockedAreas.contains(participantId) &&
-        (m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId())  < damagePercentBlockedAreas))
+        (m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId)  < damagePercentBlockedAreas))
     {
-      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
-      pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
+      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber;
+      pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
       m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
       m_blockedAreas.remove(participantId);
       return;
@@ -92,23 +92,23 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
   }
 
 
-  DEBUG_LOG(m_logger) << "Room ="  << partPos.roomId()
-                      << " DamagePercentRoom=" << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId());
-  DEBUG_LOG(m_logger) << "1: " << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId())
+  DEBUG_LOG(m_logger) << "Room ="  << partPos.roomId
+                      << " DamagePercentRoom=" << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId);
+  DEBUG_LOG(m_logger) << "1: " << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId)
                       << " damagePercentBlockedAreas= " << damagePercentBlockedAreas << "\n"
-                      << " getDamagePercentFromBuilding=" << m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId()) << "\n"
+                      << " getDamagePercentFromBuilding=" << m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId) << "\n"
                       << "m_blockedAreas.contains(participantId) = " << m_blockedAreas.contains(participantId) ;
 
 
 
-  if ((m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId()) >= damagePercentBlockedAreas
-       ||  m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId()) == 100)
+  if ((m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId) >= damagePercentBlockedAreas
+       ||  m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId) == 100)
       && !m_blockedAreas.contains(participantId))
   {
     DEBUG_LOG(m_logger) << "Send Enter Blocked Area to Participant:" << participantId;
-    pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Enter);
+    pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Enter;
     m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
-    m_blockedAreas.insert(participantId, partPos.roomId());
+    m_blockedAreas.insert(participantId, partPos.roomId);
   }
 
 } // end of onParticipantPositionChanged()
@@ -126,9 +126,9 @@ void HandlerBlockedAreas::onBuildingStateChanged(const int32_t buildingId)
       {
         DEBUG_LOG(m_logger) << "remove participantId: " << participantId;
         TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
-        pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(participantId));
-        pba.participantId(participantId);
-        pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
+        pba.equipmentNumber = m_ddsHandler->participantId2EquipNo(participantId);
+        pba.participantId = participantId;
+        pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
         m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
         m_blockedAreas.remove(participantId);
       }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp
index 02e74d75a..cdb1768f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp
@@ -65,7 +65,7 @@ int HandlerParticipantBuilding::getDamagePercentFromBuilding(const int buildingI
 {
   DEBUG_LOG(m_logger) << "getDamagePercentFromBuilding buildingId=" << buildingId;
   auto it = m_buildingStates.find(buildingId);
-  return it != m_buildingStates.end() ? it.value().damagePercent() : 0;
+  return it != m_buildingStates.end() ? it.value().damagePercent : 0;
 }
 
 int HandlerParticipantBuilding::getDamagePercentFromRoom(const int roomId) const
@@ -110,21 +110,21 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
 {
   if (modType == DataModification::eRemoved)
   {
-    m_buildingStates.remove(data.id());
+    m_buildingStates.remove(data.id);
     return;
   }
 
-  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
-                      << ", aesId = " << data.aesId()
-                      << ", chargeTypeId = " << data.chargeTypeId()
-                      << ", sampleTime = " << data.sampleTime()
-                      << ", CountRooms =" << data.roomStates().size()
-                      << ", structureElementId=" << data.structureElementId()
-                      << ", assetId=" << data.assetId()
-                      << ", roomStates.size=" << data.roomStates().size()
-                      << ", damagePercent" << data.damagePercent();
+  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId
+                      << ", aesId = " << data.aesId
+                      << ", chargeTypeId = " << data.chargeTypeId
+                      << ", sampleTime = " << data.sampleTime
+                      << ", CountRooms =" << data.roomStates.size()
+                      << ", structureElementId=" << data.structureElementId
+                      << ", assetId=" << data.assetId
+                      << ", roomStates.size=" << data.roomStates.size()
+                      << ", damagePercent" << data.damagePercent;
 
-  if ( (data.originatorParticipantId() == 0) && (data.aesId() == 0) && (data.chargeTypeId()==0))
+  if ( (data.originatorParticipantId == 0) && (data.aesId == 0) && (data.chargeTypeId==0))
   {
     DEBUG_LOG(m_logger) << "Not valid return ";
     return;
@@ -132,28 +132,28 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
 
   // fill m_roomIdDamageState
   RoomState rs;
-  rs.buildingId = data.id();
-  m_buildingStates.insert(data.id(), data);
-  DEBUG_LOG(m_logger) << "m_buildingStates.insert id=" << data.id()
-                      << " aesId=" << data.aesId()
-                      << " name=" << data.name();
+  rs.buildingId = data.id;
+  m_buildingStates.insert(data.id, data);
+  DEBUG_LOG(m_logger) << "m_buildingStates.insert id=" << data.id
+                      << " aesId=" << data.aesId
+                      << " name=" << data.name;
 
-  for (const Buildings::RoomState &roomState : data.roomStates())
+  for (const Buildings::RoomState &roomState : data.roomStates)
   {
-    rs.damagePercent = roomState.damagePercent();
-    m_roomIdDamageState.insert(roomState.id(), rs);
+    rs.damagePercent = roomState.damagePercent;
+    m_roomIdDamageState.insert(roomState.id, rs);
     DEBUG_LOG(m_logger) << "m_roomIdDamageState.insert"
-                        << " RoomId = " << roomState.id()
-                        << ", BuildingId = " << data.id()
-                        << ", destruction = " << roomState.damagePercent();
+                        << " RoomId = " << roomState.id
+                        << ", BuildingId = " << data.id
+                        << ", destruction = " << roomState.damagePercent;
   }
   // init: remove all rooms from Map
-  if (data.damagePercent() == 0)
+  if (data.damagePercent == 0)
   {
     auto it = m_roomIdDamageState.begin();
     while (it != m_roomIdDamageState.end())
     {
-      if (it.value().buildingId == data.id())
+      if (it.value().buildingId == data.id)
         it = m_roomIdDamageState.erase(it);
       else
         ++it;
@@ -162,27 +162,27 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
   }
 
   const auto participantsMap = m_handlerParticipant->positions();
-  for (const Buildings::RoomState &roomState : data.roomStates())
+  for (const Buildings::RoomState &roomState : data.roomStates)
   {
-    if (roomState.damagePercent() <= 0)
+    if (roomState.damagePercent <= 0)
       continue;
     // no effect should not burden the radio
-    if (roomState.remainingEffectPercent() == 0)
+    if (roomState.remainingEffectPercent == 0)
       continue;
 
-    DEBUG_LOG(m_logger) << "    RoomId[" << roomState.id() << "]:"
-                        << " remainingEffectPercent = " << roomState.remainingEffectPercent()
-                        << " roomState.damagePercent()=" << roomState.damagePercent()
-                        << " roomState.remainingEffectPercent()=" << roomState.remainingEffectPercent();
+    DEBUG_LOG(m_logger) << "    RoomId[" << roomState.id << "]:"
+                        << " remainingEffectPercent = " << roomState.remainingEffectPercent
+                        << " roomState.damagePercent()=" << roomState.damagePercent
+                        << " roomState.remainingEffectPercent()=" << roomState.remainingEffectPercent;
     // search for participants in each room:
     // if participant in room sendCESHit to TAB
 
     for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
     {
-      const int participantId = participantPos.participantId();
-      if (participantPos.roomId() != roomState.id())
+      const int participantId = participantPos.participantId;
+      if (participantPos.roomId != roomState.id)
         continue;
-      if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+      if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
         continue;
       const int equipNo = m_ddsHandler->participantId2EquipNo(participantId);
       if (equipNo <= 0)
@@ -191,22 +191,22 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
         continue;
 
       DEBUG_LOG(m_logger) << " participantId = " << participantId
-                          << " roomId = " << participantPos.roomId()
-                          << " roomState.id=" << roomState.id()
+                          << " roomId = " << participantPos.roomId
+                          << " roomState.id=" << roomState.id
                           << " participantPos.vulnerabilityState=" << participantPos.vulnerabilityState
                           << " equipNo=" << m_ddsHandler->participantId2EquipNo(participantId)
                           << " isOutdated=" << m_handlerParticipant->isOutdated(participantPos);
 
       DEBUG_LOG(m_logger) << "sendCesHitToParticipant";
-      sendCesHitToParticipant(data, participantId, roomState.remainingEffectPercent());
+      sendCesHitToParticipant(data, participantId, roomState.remainingEffectPercent);
     }
   }
 
-  m_buildingStates.insert(data.id(), data);
+  m_buildingStates.insert(data.id, data);
   if (!m_timer->isActive() && !m_requestMap.isEmpty())
     m_timer->start(1000);
 
-  emit  newBuildingState(data.id());
+  emit  newBuildingState(data.id);
 }
 
 void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::BuildingState &data,
@@ -215,7 +215,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 {
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantId);
   const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> participantsMap = m_handlerParticipant->positions();
-  const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(data.originatorParticipantId());
+  const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(data.originatorParticipantId);
 
 
 
@@ -226,36 +226,36 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 
 
 
-  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(data.aesId(), aesItem);
+  bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(data.aesId, aesItem);
   if (itemAvailable)
-    DEBUG_LOG(m_logger) << "partyId=" << aesItem.partyId()
-                         << " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
-                         << " duration=" << aesItem.effectDuration();
+    DEBUG_LOG(m_logger) << "partyId=" << aesItem.partyId
+                         << " chargeTypeId=" << aesItem.chargeStruct.chargeTypeId
+                         << " duration=" << aesItem.effectDuration;
 
   // mineFieldBitIndex wird als reserve1 uegertragen und hier wird die Wirkdauer uebertragen.
-  const int duration = aesItem.effectDuration() / 1000;
+  const int duration = aesItem.effectDuration / 1000;
 
   //int32_t legacyChargeTypeId = 0;
   //const ProjectDataManagement::FuseType fuseType = m_ddsHandler->dtcAes()->explosionCluster(aesItem.id()).fuseType();
-  const int chargeTypeId = itemAvailable ? aesItem.chargeStruct().chargeTypeId() : data.chargeTypeId();
+  const int chargeTypeId = itemAvailable ? aesItem.chargeStruct.chargeTypeId : data.chargeTypeId;
 
  // legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(chargeTypeId, fuseType);
   // NOTE: igniterTypeId/IgniterFunction = 0 as long as BuildingState does not contain values
-  AreaEffectSimulation::ChargeStruct chargeStruct = { data.chargeTypeId(),0,0};
-  if (itemAvailable) chargeStruct = aesItem.chargeStruct();
+  AreaEffectSimulation::ChargeStruct chargeStruct = { data.chargeTypeId,0,0};
+  if (itemAvailable) chargeStruct = aesItem.chargeStruct;
   int remainTasCodeIndirect = m_ddsHandler->remainingTasCode(chargeStruct);
 
   DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant equipNo = " << equipNo
                       << " participantId=" << participantId
-                      << " chargeTypeId=" << data.chargeTypeId()
+                      << " chargeTypeId=" << data.chargeTypeId
                       << " originatorEquipNo=" << originatorEquipNo
                       << " remainingEffectPercent=" << remainingEffectPercent
                       << " remainTasCodeIndirect=" << remainTasCodeIndirect
                       << " eventType=" << eventType;
-  const TrainingAreaBase::TabPosition pos(participantPos.pos(),
-                                          participantPos.reportingSource(),
-                                          participantPos.buildingId(),
-                                          participantPos.roomId());
+  const TrainingAreaBase::TabPosition pos(participantPos.pos,
+                                          participantPos.reportingSource,
+                                          participantPos.buildingId,
+                                          participantPos.roomId);
 
 
   // Bei Nebel soll die Weste nur einmal piepen und nicht regelmaessig. Das wird mit Wirkung = 3 uebertragen
@@ -270,20 +270,20 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 
   TrainingAreaBase::SendCesHitRequest requestTab;
 
-  requestTab.aesId(data.aesId());
+  requestTab.aesId = data.aesId;
   //requestTab.chargeTypeId(legacyChargeTypeId > 0 ? legacyChargeTypeId : chargeTypeId);
-  requestTab.chargeTypeId(chargeTypeId);
-  requestTab.effectTime(data.sampleTime());
-  requestTab.equipmentNumber(equipNo);
-  requestTab.eventType(eventType);
-  requestTab.mineId(duration);
-  requestTab.originatorEquipmentNumber(originatorEquipNo);
-  requestTab.participantId(participantId);
+  requestTab.chargeTypeId = chargeTypeId;
+  requestTab.effectTime = data.sampleTime;
+  requestTab.equipmentNumber = equipNo;
+  requestTab.pdmEventType = eventType;
+  requestTab.mineId = duration;
+  requestTab.originatorEquipmentNumber = originatorEquipNo;
+  requestTab.participantId = participantId;
   int32_t partyId = 0;
-  if ( aesItem.partyId.is_set())
+  if ( aesItem.partyId.has_value())
     partyId = aesItem.partyId.get();
-  requestTab.partyId(partyId);
-  requestTab.position(pos);
+  requestTab.partyId = partyId;
+  requestTab.position = pos;
 
 // Same like direct Hit
 //  if (aesItem.id() > 0)
@@ -294,7 +294,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 //  else
   {
     DEBUG_LOG(m_logger) << "direkter Beschuss remainEffectPercent=" << remainingEffectPercent;
-    requestTab.remainEffectPercent(remainingEffectPercent);
+    requestTab.remainEffectPercent = remainingEffectPercent;
   }
 
   m_requestMap.insert(participantId, requestTab);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp
index 0862dd569..4fad94f41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp
@@ -95,7 +95,7 @@ void DdsHandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Pa
   if (modType == DataModification::eRemoved)
     m_partId2EquipNoMap.remove(data.id());
   else
-    m_partId2EquipNoMap[data.id()] = data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0;
+    m_partId2EquipNoMap[data.id()] = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
 
   if (m_logger.isTraceEnabled())
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
index 237d25e25..c2cd91a24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
@@ -469,21 +469,21 @@ void HandlerTargetAreas::on_preWarningIntervalFinished(int participantId, int ta
   uint8_t countBlink = 1;
   int32_t effectPercent = 0;
 
-  switch (shootbackTarget.targetInformation.prewarningEffect().underlying())
+  switch (shootbackTarget.targetInformation.prewarningEffect())
   {
-  case ProjectDataManagement::VulnerabilityState::NoChange:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange:
     countBlink = 1;
     effectPercent = 0;
     break;
-  case ProjectDataManagement::VulnerabilityState::MobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
     effectPercent = 30;
     countBlink = 2;
     break;
-  case ProjectDataManagement::VulnerabilityState::NearMiss:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
     countBlink = 3;
     effectPercent = 60;
     break;
-  case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
     countBlink = 4;
     effectPercent = 100;
     break;
@@ -518,13 +518,13 @@ void HandlerTargetAreas::on_TimeToEffectFinished(int participantId, int targetPa
                       << " takedownEffect=" << shootbackTarget.targetInformation.takedownEffect();
 
 
-  switch (shootbackTarget.targetInformation.takedownEffect().underlying())
+  switch (shootbackTarget.targetInformation.takedownEffect())
   {
-  case ProjectDataManagement::VulnerabilityState::MobilityKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
     effectPercent = 50;
     countBlink = 5;
     break;
-  case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
+  case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
     countBlink = 6;
     effectPercent = 100;
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
index 405e00cbf..a8ed33b38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
@@ -42,7 +42,7 @@ public:
 
   struct ParticipantPosition : public ParticipantManagement::ParticipantPosition
   {
-    ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady;
+    ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
     Core::GeoPosition lastGeoPosition;
     bool positionValid = false;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
index effcde26d..f38f75fa3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
@@ -84,30 +84,30 @@ bool HandlerParticipantBoobyTrap::init()
 
 void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
 {
-  if (data.isDeleted()
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
-      || (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired && !data.triggered())
-      || !data.isCentral()
+  if (data.isDeleted
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved
+      || (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired && !data.triggered)
+      || !data.isCentral
       || modType == DataModification::eRemoved)
   {
-    m_boobyTraps.remove(data.id());
-    m_boobyTrapItems.remove(data.id());
-    m_boobyTrapItemsSecondary.remove(data.id());
+    m_boobyTraps.remove(data.id);
+    m_boobyTrapItems.remove(data.id);
+    m_boobyTrapItemsSecondary.remove(data.id);
     return;
   }
   INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
-                     << " data.sampleTime=" << data.sampleTime()
+                     << " data.sampleTime=" << data.sampleTime
                      << " m_ddsHandler->currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
-                     << " diff=" << m_ddsHandler->currentPartitionTime() - data.sampleTime();
-  if ((m_ddsHandler->currentPartitionTime() - data.sampleTime()) > 2000)
+                     << " diff=" << m_ddsHandler->currentPartitionTime() - data.sampleTime;
+  if ((m_ddsHandler->currentPartitionTime() - data.sampleTime) > 2000)
   {
     INFO_LOG(m_logger) << "onBoobyTrap outdated";
     return;
   }
-  m_boobyTraps.insert(data.id(), data);
+  m_boobyTraps.insert(data.id, data);
 
 
-  if (!data.triggered())
+  if (!data.triggered)
     return;
 
 
@@ -129,73 +129,73 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation:
   {
     if (m_handlerParticipant->isOutdated(participantPos))
     {
-      TRACE_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId() << " continue";
+      TRACE_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId << " continue";
       continue;
     }
-    DEBUG_LOG(m_logger) << "Check each actuell participant participantId=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "Check each actuell participant participantId=" << participantPos.participantId;
     if (participantPos.insideBuilding())
     {
-      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId << " continue";
       continue;
     }
     if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     {
-      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId << " continue";
       continue;
     }
-    DEBUG_LOG(m_logger) << "pos participantId=" << participantPos.participantId()
-                        << " buildingId=" << participantPos.buildingId()
+    DEBUG_LOG(m_logger) << "pos participantId=" << participantPos.participantId
+                        << " buildingId=" << participantPos.buildingId
                         << " insideBuilding=" << participantPos.insideBuilding()
                         << " positionValid=" << participantPos.positionValid;
-    const CentralEffectSimulation::AesItemViewUtm aesItemView = m_boobyTrapItemsSecondary.value(data.id());
+    const CentralEffectSimulation::AesItemViewUtm aesItemView = m_boobyTrapItemsSecondary.value(data.id);
     calculateBoobyTrapParticipant(aesItemView, participantPos);
   }
-  m_boobyTraps.remove(data.id());
-  m_boobyTrapItems.remove(data.id());
-  m_boobyTrapItemsSecondary.remove(data.id());
+  m_boobyTraps.remove(data.id);
+  m_boobyTrapItems.remove(data.id);
+  m_boobyTrapItemsSecondary.remove(data.id);
 }
 
 void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
   INFO_LOG(m_logger) << "---------------------------------------------------------------------------";
   INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onAesItemViewChanged"
-                     << " aesTypeId=" << data.aesTypeId()
-                     << " data.effectStateId()=" << data.effectStateId();
+                     << " aesTypeId=" << data.aesTypeId
+                     << " data.effectStateId()=" << data.effectStateId;
 
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
+  if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved
       || modType == DataModification::eRemoved)
   {
-    if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+    if (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
     {
-      m_boobyTraps.remove(data.id());
-      m_boobyTrapItems.remove(data.id());
-      m_boobyTrapItemsSecondary.remove(data.id());
-      m_triggeredMineParticipant.remove(data.id());
+      m_boobyTraps.remove(data.id);
+      m_boobyTrapItems.remove(data.id);
+      m_boobyTrapItemsSecondary.remove(data.id);
+      m_triggeredMineParticipant.remove(data.id);
 
-      DEBUG_LOG(m_logger) << "onBoobyTrapChanged remove aesId=" << data.id()
-                          << " m_triggeredMineParticipant.remove(" << data.id() ;
+      DEBUG_LOG(m_logger) << "onBoobyTrapChanged remove aesId=" << data.id
+                          << " m_triggeredMineParticipant.remove(" << data.id ;
     }
     return;
   }
 
   //
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBoobyTrap
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtBoobyTrap
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
     return;
 
-  const int aesItemId = data.aesItemId();
+  const int aesItemId = data.aesItemId;
   DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
-                      << ", type: " << data.aesTypeId()
-                      << ", effectState: " << data.effectStateId()
+                      << ", type: " << data.aesTypeId
+                      << ", effectState: " << data.effectStateId
                       << ", modType: " << modType;
 
   if (modType == DataModification::eAdded
       || modType == DataModification::eModified)
   {
 
-    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-    switch (effectState.underlying())
+    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+    switch (effectState)
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
@@ -204,12 +204,12 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
       prevData.aesItemId = 0;
 
       const CentralEffectSimulation::AesItemViewUtm boobyTrapUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius);
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrap)
-        m_boobyTrapItems.insert(data.aesItemId(), boobyTrapUtm);
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
-        m_boobyTrapItemsSecondary.insert(data.aesItemId(), boobyTrapUtm);
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrap)
+        m_boobyTrapItems.insert(data.aesItemId, boobyTrapUtm);
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)
+        m_boobyTrapItemsSecondary.insert(data.aesItemId, boobyTrapUtm);
       DEBUG_LOG(m_logger) << "Check each participant"
-                          << " aesTypeId=" << data.aesTypeId();
+                          << " aesTypeId=" << data.aesTypeId;
       // Check each participant
 //      const auto partPosMap = m_handlerParticipant->positions();
 //      for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
@@ -268,7 +268,7 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantsSecondary(int ae
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
-    if (participantPos.participantId() == participantId)
+    if (participantPos.participantId == participantId)
     {
       DEBUG_LOG(m_logger) << "is already handled participantId=" << participantId;
       continue;
@@ -280,12 +280,12 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantsSecondary(int ae
     }
     if (participantPos.insideBuilding())
     {
-      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId << " continue";
       continue;
     }
     if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     {
-      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId << " continue";
       continue;
     }
     const CentralEffectSimulation::AesItemViewUtm aesItemView = m_boobyTrapItemsSecondary.value(aesItemId);
@@ -331,12 +331,12 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C
 {
   bool result;
   const AreaEffectSimulation::BoobyTrap boobyTrap = m_ddsHandler->dtcAes()->boobyTrap(aesItemView.aesItemId);
-  const QPointF partPosGeo = QPointF(participantPos.pos().lon(), participantPos.pos().lat());
-  const QPointF impactPosGeo = QPointF(boobyTrap.impactPosition().lon(), boobyTrap.impactPosition().lat());
+  const QPointF partPosGeo = QPointF(participantPos.pos.lon, participantPos.pos.lat);
+  const QPointF impactPosGeo = QPointF(boobyTrap.impactPosition.lon, boobyTrap.impactPosition.lat);
 
 
   DEBUG_LOG(m_logger) << "calculateBoobyTrapParticipantSecondary itemView.id=" << aesItemView.aesItemId
-                      << " participantId=" << participantPos.participantId();
+                      << " participantId=" << participantPos.participantId;
 
   DEBUG_LOG(m_logger) << "BoobyTrap id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
@@ -352,21 +352,21 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C
       //dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel);
   if ( buildingIds.size() > 0)
   {
-    DEBUG_LOG(m_logger) << "Gebaeude verdeckt den Minentreffer participantId=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "Gebaeude verdeckt den Minentreffer participantId=" << participantPos.participantId;
     return;
   }
 
 
   if (!aesItemView.boundingBox.containsPoint(partPosGeo, Qt::OddEvenFill))
-    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId;
   else
-    DEBUG_LOG(m_logger) << "in boundingBox" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "in boundingBox" << participantPos.participantId;
   // const QPolygonF utmStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), aesItemView.zone);
 
 
   result = insideSecondaryArea(aesItemView.form, partPosGeo);
   DEBUG_LOG(m_logger) << "insideSecondaryArea : "
-                      << " participantId=" << participantPos.participantId()
+                      << " participantId=" << participantPos.participantId
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
@@ -414,14 +414,14 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
 {
 
   DEBUG_LOG(m_logger) << "calculateBoobyTrapParticipant itemView.id=" << aesItemView.aesItemId
-                      << " participantId=" << participantPos.participantId();
+                      << " participantId=" << participantPos.participantId;
 
   // Check coverage by a building
   const AreaEffectSimulation::BoobyTrap boobyTrap = m_ddsHandler->dtcAes()->boobyTrap(aesItemView.aesItemId);
   //const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(participantPos.pos(), aesItemView.zone);
   //const QPointF impactPosGeo = CentralEffectSimulation::geographic2Utm(boobyTrap.impactPosition(), aesItemView.zone);
-  const QPointF partPosGeo = QPointF(participantPos.pos().lon(), participantPos.pos().lat());
-  const QPointF impactPosGeo = QPointF(boobyTrap.impactPosition().lon(), boobyTrap.impactPosition().lat());
+  const QPointF partPosGeo = QPointF(participantPos.pos.lon, participantPos.pos.lat);
+  const QPointF impactPosGeo = QPointF(boobyTrap.impactPosition.lon, boobyTrap.impactPosition.lat);
   bool completeEnclosed = false;
   bool isGroundLevel = true;
   int exerciseId = m_ddsHandler->getExerciseId();
@@ -437,25 +437,25 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
     return false;
   }
 
-  const QPointF partPosUtm = CentralEffectSimulation::geographic2Utm(participantPos.pos(), -1);
+  const QPointF partPosUtm = CentralEffectSimulation::geographic2Utm(participantPos.pos, -1);
   DEBUG_LOG(m_logger) << "BoobyTrap id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(aesItemView.boundingBoxTopRight)
                       << " participantPos=" << partPosUtm.x() << "/" << partPosUtm.y();
   if (!aesItemView.boundingBox.containsPoint(partPosUtm, Qt::OddEvenFill))
   {
-    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId();
-    bool intersectsBoundingBox = intersectsBoundingBoxCheck(aesItemView, participantPos.participantId());
+    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId;
+    bool intersectsBoundingBox = intersectsBoundingBoxCheck(aesItemView, participantPos.participantId);
     if (!intersectsBoundingBox)
     {
       DEBUG_LOG(m_logger) << "Continue nach Bounding BoxCheck itemView: " << aesItemView.aesItemId << ", "
-                          << " paricipantId=" << participantPos.participantId();
+                          << " paricipantId=" << participantPos.participantId;
       return false;
     }
   }
   else
-    DEBUG_LOG(m_logger) << "in boundingBox participantId=" << participantPos.participantId();
-  const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), aesItemView.zone);
+    DEBUG_LOG(m_logger) << "in boundingBox participantId=" << participantPos.participantId;
+  const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId, aesItemView.zone);
 
 
   if (posStepPoly.size() < 2)
@@ -463,7 +463,7 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
 
   const bool result = enteredOrCrossedArea(aesItemView.form, posStepPoly);
   DEBUG_LOG(m_logger) << "enteredOrCrossedArea : "
-                      << " participantId=" << participantPos.participantId()
+                      << " participantId=" << participantPos.participantId
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
@@ -485,10 +485,10 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
 {
   // Bounding Box von der Linie
   DEBUG_LOG(m_logger) << "ParicipantPos "
-                      << " participantId=" << partPos.participantId()
-                      << " participantTypeId=" << partPos.participantTypeId()
-                      << " participantPos: lat=" << partPos.pos().lat()
-                      << " lon=" << partPos.pos().lon()
+                      << " participantId=" << partPos.participantId
+                      << " participantTypeId=" << partPos.participantTypeId
+                      << " participantPos: lat=" << partPos.pos.lat
+                      << " lon=" << partPos.pos.lon
                       << " Anzahl BoobyTraps=" << m_boobyTrapItems.size();
 
   if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
@@ -497,7 +497,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
     return;
   }
 
-  if (m_handlerParticipant->getEquipmentNumber(partPos.participantId()) == 0)
+  if (m_handlerParticipant->getEquipmentNumber(partPos.participantId) == 0)
   {
     DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
@@ -512,7 +512,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
                         << ", Box bottomLeft = " << CentralEffectSimulation::debug(boobyTrap.boundingBoxBottomLeft)
                         << ", topRight = " << CentralEffectSimulation::debug(boobyTrap.boundingBoxTopRight);
 
-    const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId(), boobyTrap.zone);
+    const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId, boobyTrap.zone);
 
     if (posStepPoly.size() < 2)
       return;
@@ -537,18 +537,18 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
                                                        const ProjectDataManagement::PdmEventType eventType)
 {
   DEBUG_LOG(m_logger) << "sendParticipantEvent aesItemId=" << boobyTrapItem.aesItemId
-                      << " participantId=" << participantPosition.participantId();
+                      << " participantId=" << participantPosition.participantId;
 
   if ((m_triggeredMineParticipant.contains(boobyTrapItem.aesItemId))
-      && (m_triggeredMineParticipant.value(boobyTrapItem.aesItemId) == participantPosition.participantId()))
+      && (m_triggeredMineParticipant.value(boobyTrapItem.aesItemId) == participantPosition.participantId))
   {
     DEBUG_LOG(m_logger) << "m_triggeredMineParticipant already sent "
                         << " aesItemId=" << boobyTrapItem.aesItemId
-                        << " participantId=" << participantPosition.participantId();
+                        << " participantId=" << participantPosition.participantId;
     return;
   }
-  m_triggeredMineParticipant.insert(boobyTrapItem.aesItemId, participantPosition.participantId());
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
+  m_triggeredMineParticipant.insert(boobyTrapItem.aesItemId, participantPosition.participantId);
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
 
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -556,7 +556,7 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
       typeClass == ParticipantManagement::TypeClass::Unknown)
     return;
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   if (equipmentNumber <= 0)
     return;
 
@@ -566,35 +566,35 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
     INFO_LOG(m_logger) << "BoobyTrap Position found";
     AreaEffectSimulation::BoobyTrap boobyTrap = m_boobyTraps.value(boobyTrapItem.aesItemId);
 
-    pe.position().lat(boobyTrap.impactPosition().lat());
-    pe.position().lon(boobyTrap.impactPosition().lon());
+    pe.position.lat = boobyTrap.impactPosition.lat;
+    pe.position.lon = boobyTrap.impactPosition.lon;
   }
   else
   {
     INFO_LOG(m_logger) << "No BoobyTrap Position found";
-    pe.position(participantPosition.pos());
+    pe.position = participantPosition.pos;
   }
 
   const AreaEffectSimulation::BoobyTrap &bt = m_ddsHandler->dtcAes()->boobyTrap(boobyTrapItem.aesItemId);
 
 
-  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
-                      << " lat= " << participantPosition.pos().lat()
-                      << " lon= " << participantPosition.pos().lon()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId
+                      << " lat= " << participantPosition.pos.lat
+                      << " lon= " << participantPosition.pos.lon
                       << " equipmentNumber=" << equipmentNumber
                       << " eventType=" << eventType;
-  pe.id(m_ddsHandler->getParticipantEventId());
-  pe.eventTypeId(eventType);
-  pe.participantId(participantPosition.participantId());
-  pe.eventTime(participantPosition.sampleTime());
-  pe.aesItemId(boobyTrapItem.aesItemId);
-  pe.partyId(participantPosition.partyId());
-  pe.aesName(bt.name());
-  pe.equipmentNumber(equipmentNumber);
-  pe.friendlyFire(boobyTrapItem.partyId == participantPosition.partyId());
+  pe.id = m_ddsHandler->getParticipantEventId();
+  pe.eventTypeId = eventType;
+  pe.participantId = participantPosition.participantId;
+  pe.eventTime = participantPosition.sampleTime;
+  pe.aesItemId = boobyTrapItem.aesItemId;
+  pe.partyId = participantPosition.partyId;
+  pe.aesName = bt.name;
+  pe.equipmentNumber = equipmentNumber;
+  pe.friendlyFire = boobyTrapItem.partyId == participantPosition.partyId;
 
   m_ddsHandler->dtsCes()->publish(pe);
-  qint64 id = pe.id();
+  qint64 id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
@@ -604,8 +604,8 @@ void HandlerParticipantBoobyTrap::sendParticipantHit(const CentralEffectSimulati
 {
   // Q_UNUSED(eventType);  // not used - no alarm for this
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  const int participantId = participantPosition.participantId();
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
+  const int participantId = participantPosition.participantId;
   const int originatorEquipNo = 0;
 
   if ( equipNo == 0)
@@ -614,24 +614,24 @@ void HandlerParticipantBoobyTrap::sendParticipantHit(const CentralEffectSimulati
   Core::GeoPosition position;
   // TODO: Hier wird die Mitte der Bounding-Box genommen und nicht die Position vom Participant
 
-  position.lat(participantPosition.pos().lat());
-  position.lon(participantPosition.pos().lon());
+  position.lat = participantPosition.pos.lat;
+  position.lon = participantPosition.pos.lon;
 
-  const TrainingAreaBase::TabPosition pos(position, participantPosition.reportingSource(), 0, 0);
+  const TrainingAreaBase::TabPosition pos(position, participantPosition.reportingSource, 0, 0);
   int remainTasCodeIndirect = m_ddsHandler->remainingTasCode(boobyTrap.chargeStruct);
   //pos.position(position);
   //pos.reportingSource(participantPosition.reportingSource());
 
   DEBUG_LOG(m_logger) << "sendParticipantHit participantId=" << participantId
                       << " equipmentNumber=" <<  equipNo
-                      << " chargeTypeId=" << boobyTrap.chargeStruct.chargeTypeId()
+                      << " chargeTypeId=" << boobyTrap.chargeStruct.chargeTypeId
                       << " eventType=" << eventType
                       << " remainTasCodeIndirect=" << remainTasCodeIndirect;
 
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                          // equipmentNumber
     participantId,                    // participantId
-    boobyTrap.chargeStruct.chargeTypeId(), // chargeTypeId
+    boobyTrap.chargeStruct.chargeTypeId, // chargeTypeId
     boobyTrap.aesItemId,              // aesId
     originatorEquipNo,                // originatorEquipmentNumber
     remainTasCodeIndirect,            // IED heavy
@@ -667,8 +667,8 @@ void HandlerParticipantBoobyTrap::sendFtcBoobyTrapTrigger(int aesItemId)
 {
   auto ftcAes = m_ddsHandler->ftcAes();
   AreaEffectSimulation::BoobyTrapTriggerRequest hr;
-  hr.id(aesItemId);
-  hr.triggered(true);
+  hr.id = aesItemId;
+  hr.triggered = true;
   DEBUG_LOG(m_logger)  << "sendFtcAesRemoveBoobyTrap: id=" << hr;
   ftcAes->boobyTrapTriggerRequest(hr, this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
index e68b6ac37..3c848c27a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
@@ -84,47 +84,47 @@ bool HandlerParticipantOffRouteMine::init()
 
 void HandlerParticipantOffRouteMine::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
 {
-  if (data.isDeleted()
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
+  if (data.isDeleted
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved
       || modType == DataModification::eRemoved)
   {
-    m_offRouteMines.remove(data.id());
-    m_offRouteMineItems.remove(data.id());
-    m_offRouteMineItemsSecondary.remove(data.id());
+    m_offRouteMines.remove(data.id);
+    m_offRouteMineItems.remove(data.id);
+    m_offRouteMineItemsSecondary.remove(data.id);
     return;
   }
   INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::onOffRouteMineChanged";
-  m_offRouteMines.insert(data.id(), data);
+  m_offRouteMines.insert(data.id, data);
 }
 
 void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
   INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::onAesItemViewChanged";
-  if (   data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired
-      || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
+  if (   data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired
+      || data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved
       || modType == DataModification::eRemoved)
   {
     return;
   }
 
   //
-  if (data.aesTypeId() != AreaEffectSimulation::AesType::AtOffRouteMine
-      && data.aesTypeId() != AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+  if (data.aesTypeId != AreaEffectSimulation::AesType::AtOffRouteMine
+      && data.aesTypeId != AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
     return;
 
-  const int aesItemId = data.aesItemId();
+  const int aesItemId = data.aesItemId;
   DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
-                      << ", type: " << data.aesTypeId()
-                      << ", effectState: " << data.effectStateId()
+                      << ", type: " << data.aesTypeId
+                      << ", effectState: " << data.effectStateId
                       << ", modType: " << modType;
 
   if (modType == DataModification::eAdded
       || modType == DataModification::eModified)
   {
 
-    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
-    switch (effectState.underlying())
+    const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId;
+    switch (effectState)
     {
     case AreaEffectSimulation::AesEffectState::EsActivated:
     {
@@ -133,10 +133,10 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula
       prevData.aesItemId = 0;
 
       const CentralEffectSimulation::AesItemViewUtm aesItemViewUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius);
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMine)
-        m_offRouteMineItems.insert(data.aesItemId(), aesItemViewUtm);
-      if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
-        m_offRouteMineItemsSecondary.insert(data.aesItemId(), aesItemViewUtm);
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtOffRouteMine)
+        m_offRouteMineItems.insert(data.aesItemId, aesItemViewUtm);
+      if (data.aesTypeId == AreaEffectSimulation::AesType::AtOffRouteMineSecondary)
+        m_offRouteMineItemsSecondary.insert(data.aesItemId, aesItemViewUtm);
 //      DEBUG_LOG(m_logger) << "Check each participant";
 //      // Check each participant
 //      const auto partPosMap = m_handlerParticipant->positions();
@@ -237,10 +237,10 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c
                                                                                const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos)
 {
   bool result;
-  const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(participantPos.pos(), aesItemView.zone);
+  const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(participantPos.pos, aesItemView.zone);
 
   DEBUG_LOG(m_logger) << "calculateOffRouteMineParticipantSecondary itemView.id=" << aesItemView.aesItemId
-                      << " participantId=" << participantPos.participantId();
+                      << " participantId=" << participantPos.participantId;
 
   DEBUG_LOG(m_logger) << "OffRouteMine id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
@@ -264,7 +264,7 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c
 
   result = insideSecondaryArea(aesItemView.form, partPosGeo);
   DEBUG_LOG(m_logger) << "insideSecondaryArea : "
-                      << " participantId=" << participantPos.participantId()
+                      << " participantId=" << participantPos.participantId
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
@@ -284,20 +284,20 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent
 {
 
   DEBUG_LOG(m_logger) << "calculateOffRouteMineParticipant itemView.id=" << aesItemView.aesItemId
-                      << " participantId=" << participantPos.participantId();
+                      << " participantId=" << participantPos.participantId;
 
   DEBUG_LOG(m_logger) << "OffRouteMine id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(aesItemView.boundingBoxTopRight);
 
-  const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), m_zone);
+  const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId, m_zone);
 
   if (posStepPoly.size() < 2)
     return;
 
   const bool result = enteredOrCrossedArea(aesItemView.form, posStepPoly);
   DEBUG_LOG(m_logger) << "enteredOrCrossedArea : "
-                      << " participantId=" << participantPos.participantId()
+                      << " participantId=" << participantPos.participantId
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
@@ -316,15 +316,15 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent
 
 void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(partPos.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(partPos.participantTypeId);
 
   // Bounding Box von der Linie
   DEBUG_LOG(m_logger) << "ParicipantPos "
-                      << " participantId=" << partPos.participantId()
-                      << " participantTypeId=" << partPos.participantTypeId()
+                      << " participantId=" << partPos.participantId
+                      << " participantTypeId=" << partPos.participantTypeId
                       << " typeClass=" << typeClass
-                      << " participantPos: lat=" << partPos.pos().lat()
-                      << " lon=" << partPos.pos().lon()
+                      << " participantPos: lat=" << partPos.pos.lat
+                      << " lon=" << partPos.pos.lon
                       << " Anzahl OffRouteMines=" << m_offRouteMineItems.size();
 
   if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
@@ -341,7 +341,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
     return;
   }
 
-  if (m_handlerParticipant->getEquipmentNumber(partPos.participantId()) == 0)
+  if (m_handlerParticipant->getEquipmentNumber(partPos.participantId) == 0)
   {
     DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
@@ -366,7 +366,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
                                             });
     // if (!boundingBoxOffRouteMine.containsPoint(partPosGeo, Qt::OddEvenFill))
     //  continue;
-    const QVector<QPointF> utmStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId(), m_zone);
+    const QVector<QPointF> utmStepPoly = m_handlerParticipant->getParticipantStep(partPos.participantId, m_zone);
 
 
     QPolygonF posStepPoly;
@@ -394,7 +394,7 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
                                                           const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
                                                           const ProjectDataManagement::PdmEventType eventType)
 {
-  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
+  ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId);
 
   if (typeClass == ParticipantManagement::TypeClass::Unit ||
       typeClass == ParticipantManagement::TypeClass::SupportUnit ||
@@ -402,7 +402,7 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
       typeClass == ParticipantManagement::TypeClass::Unknown)
     return;
 
-  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
+  int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
   if (equipmentNumber <= 0)
     return;
 
@@ -412,35 +412,35 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
     INFO_LOG(m_logger) << "OffRouteMine Position found";
     AreaEffectSimulation::OffRouteMine offRouteMine = m_offRouteMines.value(offRouteItem.aesItemId);
 
-    pe.position().lat(offRouteMine.area().cornerBottomLeft().lat());
-    pe.position().lon(offRouteMine.area().cornerBottomLeft().lon());
+    pe.position.lat = offRouteMine.area.cornerBottomLeft.lat;
+    pe.position.lon = offRouteMine.area.cornerBottomLeft.lon;
   }
   else
   {
     INFO_LOG(m_logger) << "No OffRouteMine Position found";
-    pe.position(participantPosition.pos());
+    pe.position = participantPosition.pos;
   }
 
   const AreaEffectSimulation::OffRouteMine &of = m_ddsHandler->dtcAes()->offRouteMine(offRouteItem.aesItemId);
 
-  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
-                      << " lat= " << participantPosition.pos().lat()
-                      << " lon= " << participantPosition.pos().lon()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId
+                      << " lat= " << participantPosition.pos.lat
+                      << " lon= " << participantPosition.pos.lon
                       << " equipmentNumber=" << equipmentNumber
                       << " eventType=" << eventType
-                      << " Name=" << of.name();
-  pe.id(m_ddsHandler->getParticipantEventId());
-  pe.eventTypeId(eventType);
-  pe.participantId(participantPosition.participantId());
-  pe.eventTime(participantPosition.sampleTime());
-  pe.aesItemId(offRouteItem.aesItemId);
-  pe.partyId(participantPosition.partyId());
-  pe.aesName(of.name());
-  pe.equipmentNumber(equipmentNumber);
-  pe.friendlyFire(offRouteItem.partyId == participantPosition.partyId());
+                      << " Name=" << of.name;
+  pe.id = m_ddsHandler->getParticipantEventId();
+  pe.eventTypeId = eventType;
+  pe.participantId = participantPosition.participantId;
+  pe.eventTime = participantPosition.sampleTime;
+  pe.aesItemId = offRouteItem.aesItemId;
+  pe.partyId = participantPosition.partyId;
+  pe.aesName = of.name;
+  pe.equipmentNumber = equipmentNumber;
+  pe.friendlyFire = offRouteItem.partyId == participantPosition.partyId;
 
   m_ddsHandler->dtsCes()->publish(pe);
-  qint64 id = pe.id();
+  qint64 id = pe.id;
   QTimer::singleShot(1 * 60 * 1000, this, [id, this]() { m_ddsHandler->dtsCes()->removeParticipantEventByKey(id); });
 }
 
@@ -449,8 +449,8 @@ void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimul
                                                         const ProjectDataManagement::PdmEventType eventType)
 {
 
-  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  const int participantId = participantPosition.participantId();
+  const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId);
+  const int participantId = participantPosition.participantId;
   const int originatorEquipNo = 0;
 
   DEBUG_LOG(m_logger) << "sendParticipantHit participantId=" << participantId
@@ -459,10 +459,10 @@ void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimul
   Core::GeoPosition position;
   // TODO: Hier wird die Mitte der Bounding-Box genommen und nicht die Position vom Participant
 
-  position.lat(participantPosition.pos().lat());
-  position.lon(participantPosition.pos().lon());
+  position.lat = participantPosition.pos.lat;
+  position.lon = participantPosition.pos.lon;
 
-  const TrainingAreaBase::TabPosition pos(position, participantPosition.reportingSource(), 0, 0);
+  const TrainingAreaBase::TabPosition pos(position, participantPosition.reportingSource, 0, 0);
   //pos.position(position);
   //pos.reportingSource(participantPosition.reportingSource());
 
@@ -474,7 +474,7 @@ void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimul
   TrainingAreaBase::SendCesHitRequest requestTab(
     equipNo,                        // equipmentNumber
     participantId,                  // participantId
-    offRouteMine.chargeStruct.chargeTypeId(),      // chargeTypeId
+    offRouteMine.chargeStruct.chargeTypeId,      // chargeTypeId
     offRouteMine.aesItemId,         // aesId
     originatorEquipNo,              // originatorEquipmentNumber
     remainTasCodeIndirect,          // IED heavy
@@ -510,8 +510,8 @@ void HandlerParticipantOffRouteMine::sendFtcOffRouteMineTrigger(int aesItemId)
 {
   auto ftcAes = m_ddsHandler->ftcAes();
   AreaEffectSimulation::OffRouteMineTriggerRequest hr;
-  hr.id(aesItemId);
-  hr.triggered(true);
+  hr.id = aesItemId;
+  hr.triggered = true;
   DEBUG_LOG(m_logger)  << "send  OffRouteMineTriggerRequest: id=" << hr;
   ftcAes->offRouteMineTriggerRequest(hr, this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp
index 4b5d87481..0d0b8ae76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp
@@ -29,7 +29,7 @@ AesItemViewUtm AesItemViewUtm::create(const AreaEffectSimulation::AesItemView &a
   //ret.zone;
   ret.aesItemId = aiv.aesItemId;
   ret.chargeStruct = aiv.chargeStruct;
-  ret.partyId = aiv.partyId.is_set() ? aiv.partyId.get() : -1;
+  ret.partyId = aiv.partyId.has_value() ? aiv.partyId.get() : -1;
   ret.dusMineId = -1;
   ret.isSupplyTruck = isSupplyTruck;
   ret.aesTypeId = aiv.aesTypeId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
index 8ffb33f28..4a40d8ec6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
@@ -126,7 +126,7 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
       return;
 
     // [GUEZE-3102] Aufgesessene Teilnehmer bekommen den Schaden vom Fahrzeug, auf dem sie aufgesessen sind.
-    if (data.mountedOn.is_set())
+    if (data.mountedOn.has_value())
       return;
     int floorId = m_handlerBuildingData->getFloorIdFromRoomId(data.roomId);
     int lastFloorId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
index 924d47c3d..1410d3414 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
@@ -59,7 +59,7 @@ bool HandlerFiringExplosion::init()
 //=============================================================================
 void HandlerFiringExplosion::setFiringClearanceDuration()
 {
-  if (m_firingExplosionEntity.firingClearanceTime.is_set())
+  if (m_firingExplosionEntity.firingClearanceTime.has_value())
   {
     qint64 pre = m_firingExplosionEntity.firingClearanceTime.get();
     qint64 post = pre;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
index 47648ba16..fc0f225ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
@@ -52,7 +52,7 @@ bool HandlerFiringSmoke::init()
 //=============================================================================
 void HandlerFiringSmoke::setFiringClearanceDuration()
 {
-  if (m_firingSmokeEntity.firingClearanceTime.is_set())
+  if (m_firingSmokeEntity.firingClearanceTime.has_value())
   {
     qint64 pre = m_firingSmokeEntity.firingClearanceTime.get();
     qint64 post = pre;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
index 62675465d..2cd655f76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
@@ -67,7 +67,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
 
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_effectCluster.id;
@@ -142,7 +142,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
     esmEffectShow.duration          = m_effectCluster.effectDuration;
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_effectCluster.id;
@@ -170,7 +170,7 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
 
   DEBUG_LOG(m_logger) << "update EffectSHow for  (" << data.id << ")";
   data.nameAreaEfffectSimulation = QString::fromStdString(m_effectCluster.name);
-  data.startTime        = m_effectCluster.effectStart.is_set() ? m_effectCluster.effectStart.get() : 0;
+  data.startTime        = m_effectCluster.effectStart.has_value() ? m_effectCluster.effectStart.get() : 0;
 
 
   DEBUG_LOG(m_logger) << "Recalc effectDuration ";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp
index 7ec09c930..890da4576 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp
@@ -62,7 +62,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
     esmEffectShow.duration          = m_explosionArea.effectDuration;
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
@@ -106,7 +106,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
     esmEffectShow.duration          = m_explosionArea.effectDuration;
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_explosionArea.id;
@@ -132,7 +132,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
 void EffectShowExplosionArea::updateEffectShow(Database::EsmEffectShow &data)
 {
   data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionArea.name);
-  data.startTime        = m_explosionArea.effectStart.is_set() ? m_explosionArea.effectStart.get() : 0;
+  data.startTime        = m_explosionArea.effectStart.has_value() ? m_explosionArea.effectStart.get() : 0;
   data.duration         = m_explosionArea.effectDuration;
 
   if (data.shotsPerVolley > 48)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp
index f052980ad..0552f8a0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp
@@ -62,7 +62,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
     esmEffectShow.duration          = m_explosionCluster.effectDuration;
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_explosionCluster.id;
@@ -106,7 +106,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
 
     esmEffectShow.id                = 0;
     esmEffectShow.name              = QStringLiteral("EXP");
-    esmEffectShow.startTime         = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
+    esmEffectShow.startTime         = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
     esmEffectShow.duration          = m_explosionCluster.effectDuration;
     esmEffectShow.centerPosition    = centerPosRotated.geographic();
     esmEffectShow.idAreaEffectSimulation = m_explosionCluster.id;
@@ -134,7 +134,7 @@ void EffectShowExplosionCluster::updateEffectShow(Database::EsmEffectShow &data)
 
   DEBUG_LOG(m_logger) << "update EffectSHow for  (" << data.id << ")";
   data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionCluster.name);
-  data.startTime        = m_explosionCluster.effectStart.is_set() ? m_explosionCluster.effectStart.get() : 0;
+  data.startTime        = m_explosionCluster.effectStart.has_value() ? m_explosionCluster.effectStart.get() : 0;
   data.duration         = m_explosionCluster.effectDuration;
 
   if (data.shotsPerVolley > 48)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
index 15590f4fc..40a78d288 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
@@ -28,7 +28,7 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
   Database::EsmEffectShow esmEffectShow;
   esmEffectShow.id                = 0;
   esmEffectShow.name              = QLatin1String("MIN");
-  esmEffectShow.startTime         = m_mineArea.effectStart.is_set() ? m_mineArea.effectStart.get() : 0;
+  esmEffectShow.startTime         = m_mineArea.effectStart.has_value() ? m_mineArea.effectStart.get() : 0;
   esmEffectShow.duration          = m_mineArea.effectDuration;
   esmEffectShow.centerPosition    = m_centerPos.geographic();
   esmEffectShow.idAreaEffectSimulation = m_mineArea.id;
@@ -59,7 +59,7 @@ void EffectShowMineArea::updateEffectShow(Database::EsmEffectShow &data)
   data.duration         = m_mineArea.effectDuration / 10;
   if (data.duration > (3600 * 1000))
     data.duration = 3600 * 1000;
-  if (m_mineArea.effectStart.is_set())
+  if (m_mineArea.effectStart.has_value())
     data.startTime = m_mineArea.effectStart.get() + m_mineArea.effectDuration - data.duration;
   else
     data.startTime = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp
index e8e2fa154..e790c21f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp
@@ -80,7 +80,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
     auto m_ppmDtc = m_mainHandler->dds()->dtcPpm();
     ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(data.typeId).typeClass;
     DEBUG_LOG(m_logger) << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
-                        << " / " << data.equipmentNumber.is_set() << ", typeId: " << data.typeId
+                        << " / " << data.equipmentNumber.has_value() << ", typeId: " << data.typeId
                         << ", cnt: " << m_ppmDtc->types().size();
 
     if (typeClass != ParticipantManagement::TypeClass::SupportEntity)
@@ -91,7 +91,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
     else
     {
       // does not exists or has no longer an equipment number -> remove
-      if (!data.equipmentNumber.is_set())
+      if (!data.equipmentNumber.has_value())
         modType = DataModification::eRemoved;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
index 78b07eb62..8bccc8094 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
@@ -43,7 +43,7 @@ public:
     Participant_t() = default;
     explicit Participant_t(const ParticipantManagement::Participant &data)
       : id(data.id)
-      , equipmentNumber(data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0)
+      , equipmentNumber(data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0)
       , name(QString::fromStdString(data.name))
     {}
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
index 7bfb03a32..6ba5cb135 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
@@ -107,7 +107,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
   res.rotationAngle  = data.area.rotation;
   res.depth          = data.area.height;
   res.width          = data.area.width;
-  res.effectStart    = data.effectStart.is_set() ? data.effectStart.get() : 0;
+  res.effectStart    = data.effectStart.has_value() ? data.effectStart.get() : 0;
   res.effectDuration = data.effectDuration;
   res.chargeTypeId   = data.chargeStruct.chargeTypeId;
   res.volley         = data.cannonCount * data.cannonRounds;
@@ -123,7 +123,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
   res.rotationAngle  = data.area.rotation;
   res.depth          = data.area.height;
   res.width          = data.area.width;
-  res.effectStart    = data.effectStart.is_set() ? data.effectStart.get() : 0;
+  res.effectStart    = data.effectStart.has_value() ? data.effectStart.get() : 0;
   res.effectDuration = data.effectDuration;
   res.chargeTypeId   = data.chargeStruct.chargeTypeId;
   res.volley         = data.impactCount; //cannonCount() * data.cannonRounds();
@@ -140,7 +140,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Eff
   res.rotationAngle  = data.area.rotation;
   res.depth          = data.area.height;
   res.width          = data.area.width;
-  res.effectStart    = data.effectStart.is_set() ? data.effectStart.get() : 0;
+  res.effectStart    = data.effectStart.has_value() ? data.effectStart.get() : 0;
   res.effectDuration = data.effectDuration;
   res.chargeTypeId   = data.chargeStruct.chargeTypeId;
   res.volley = 0;
@@ -167,7 +167,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Min
   res.effectStateId  = static_cast<qint32>(data.effectStateId);
   res.position       = QPointF(segment.positionStart.lon, segment.positionStart.lat);
   res.depth          = data.width;
-  res.effectStart    = data.effectStart.is_set() ? data.effectStart.get() : 0;
+  res.effectStart    = data.effectStart.has_value() ? data.effectStart.get() : 0;
   res.effectDuration = data.effectDuration;
   res.chargeTypeId   = data.chargeStruct.chargeTypeId;
   res.volley         = 18;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp
index df0e7975d..3a242f966 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp
@@ -101,7 +101,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
 
   m_data.id                     = data.id;
   m_data.name                   = QString::fromStdString(data.name);
-  m_data.startTime              = data.startTime.is_set() ? data.startTime.get() : 0;
+  m_data.startTime              = data.startTime.has_value() ? data.startTime.get() : 0;
   m_data.duration               = data.duration;
   m_data.idAreaEffectSimulation = data.idAreaEffectSimulation;
   m_data.nameAreaEfffectSimulation = QString::fromStdString(data.nameAreaEffectSimulation);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.cpp
index 63cff6ede..0f94c815a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.cpp
@@ -98,7 +98,7 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
   data.ts = QDateTime::fromMSecsSinceEpoch(request.ts);
   data.senderOperatorId = request.senderOperatorId;
 
-  if (request.receiverOperatorId.is_set())
+  if (request.receiverOperatorId.has_value())
     data.receiverOperatorId = request.receiverOperatorId.get();
 
   data.text = QString::fromStdString(request.text);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.cpp
index 264e1f79a..135fdf2ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.cpp
@@ -153,11 +153,11 @@ void HandlerCriterium::onEvlElementModifyRequest(const rti::core::SampleIdentity
   data.phaseId      = request.phaseId;
   data.rating       = request.rating;
   data.time         = request.timestamp;
-  if (request.audioContent.is_set())
+  if (request.audioContent.has_value())
     data.audioContent = QString::fromStdString(request.audioContent.get());
-  if (request.videoContent.is_set())
+  if (request.videoContent.has_value())
     data.videoContent = QString::fromStdString(request.videoContent.get());
-  if (request.situationContent.is_set())
+  if (request.situationContent.has_value())
     data.situationContent = QString::fromStdString(request.situationContent.get());
 
   if (data.id <= 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
index 82eae48c1..1123b8427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
@@ -327,7 +327,7 @@ void EemTests::trySendBuildingState()
   //  bState.aesId(1);
   //  bState.assetId(10);
   //  bState.chargeTypeId(44);
-  //  bState.originatorType(ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation);
+  //  bState.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation);
   //  bState.originatorParticipantId(6);
 
   if (!m_bldDts->publish(bState))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
index 412ace7e4..e53bc7505 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
@@ -190,7 +190,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
   if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
   {
     ParticipantManagement::Participant originData = m_partMap.value(stateInfo.originatorId);
-    if (originData.equipmentNumber.is_set())
+    if (originData.equipmentNumber.has_value())
       obj[QStringLiteral("OriginatorEquipmentNumber")] = originData.equipmentNumber.get();
 
     if (originData.partyId == eData.partyId)
@@ -271,7 +271,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
   Database::EemEvent eData;
   eData.participantId   = data.participantId;
-  eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1;
+  eData.equipmentNumber = pData.equipmentNumber.has_value() ? pData.equipmentNumber.get() : -1;
   eData.partyId         = pData.partyId;
   eData.sampleTime      = data.sampleTime;
   eData.eventTypeId     = ProjectDataManagement::PdmEventType::EventType_Unknown;
@@ -375,7 +375,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
   Database::EemEvent eData;
   eData.id = 0;
   eData.participantId   = data.participantId;
-  eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1;
+  eData.equipmentNumber = pData.equipmentNumber.has_value() ? pData.equipmentNumber.get() : -1;
   eData.partyId         = pData.partyId;
   eData.sampleTime      = data.sampleTime;
   eData.eventTypeId     = ProjectDataManagement::PdmEventType::EventType_FireEvent;
@@ -510,7 +510,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
   if (data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
   {
     ParticipantManagement::Participant originData = m_partMap.value(data.originatorParticipantId);
-    if (originData.equipmentNumber.is_set())
+    if (originData.equipmentNumber.has_value())
       obj[QStringLiteral("OriginatorEquipmentNumber")] = originData.equipmentNumber.get();
   }
   if (data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
index cd22c6b75..70caa2abb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
@@ -90,7 +90,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
   Database::EemEvent eData = m_aesMap[data.id];
   eData.sampleTime = data.effectStart;
 
-  if (data.partyId.is_set())
+  if (data.partyId.has_value())
     eData.partyId = data.partyId.get();
 
   switch(modType)
@@ -242,13 +242,13 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
 {
 
   Database::EemEvent eData = m_aesMap[data.id];
-  if ( !data.effectStart.is_set())
+  if ( !data.effectStart.has_value())
   {
     return;
   }
   eData.sampleTime = data.effectStart.get();
 
-  if (data.partyId.is_set())
+  if (data.partyId.has_value())
     eData.partyId = data.partyId.get();
 
   switch(modType)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
index b1d335957..eef72b77a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
@@ -191,6 +191,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExerciseManagement
   ngltools
   ProjectConfig
   Qt6::Core
+  $<IF:$<TARGET_EXISTS:Qt6::StateMachine>,Qt6::StateMachine,>
   svcCoreClient
   svcExmCommon
   svcExmServer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/CMakeLists.txt
index b1593bc21..2012d6794 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/CMakeLists.txt
@@ -51,6 +51,7 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
     ngltools
     Qt6::Core
     Qt6::Test
+    $<IF:$<TARGET_EXISTS:Qt6::StateMachine>,Qt6::StateMachine,>
     svcCoreClient
     svcExmCommon
     svcExmServer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
index b7e49b7ae..b2799dc30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
@@ -106,7 +106,7 @@ void StateMachineTest::initTestCase()
 void StateMachineTest::staticTests()
 {
   // newly created, nothing set -> Status should be ExerciseState::Created
-  QCOMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Created);
+  QCOMPARE(m_exmObject->exerciseState(), ExerciseState::Created);
 }
 
 void StateMachineTest::dynamicTests()
@@ -116,35 +116,35 @@ void StateMachineTest::dynamicTests()
   // Switch to STARTED
   m_exmObject->switchToState(ExerciseState::Started, 0, 0);
 
-  QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Started);
+  QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Started);
   QCOMPARE(spy.count(), 1); // Started
   spy.clear();
 
   // => PAUSED
   m_exmObject->switchToState(ExerciseState::Paused, 99, 10);
 
-  QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Paused);
+  QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Paused);
   QCOMPARE(spy.count(), 1); // PAUSED
   spy.clear();
 
   // Try to (re)start
   m_exmObject->switchToState(ExerciseState::Started, 99, 10);
 
-  QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Started);
+  QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Started);
   QCOMPARE(spy.count(), 1); // Started (Resumed)
   spy.clear();
 
   // => Stopped
   m_exmObject->switchToState(ExerciseState::Stopped, 99, 10);
 
-  QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Stopped);
+  QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Stopped);
   QCOMPARE(spy.count(), 1); // Stopped
   spy.clear();
 
   // => Terminated
   m_exmObject->switchToState(ExerciseState::Terminated, 99, 10);
 
-  QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Terminated);
+  QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Terminated);
   QCOMPARE(spy.count(), 1); // Terminated
   spy.clear();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.cpp
index efedefd48..56381757b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.cpp
@@ -74,7 +74,7 @@ namespace ExerciseManagement
         return tr("TERMINATED");
     }
 
-    return tr("Unknown State: (%1)").arg(state);
+    return tr("Unknown State: (%1)").arg(static_cast<int>(state));
   }
 
   void ExerciseStateManager::setStateInternal(ExerciseManagement::ExerciseState state)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
index 797810035..4a30aa866 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
@@ -175,7 +175,7 @@ static Database::ExmExercise copyBaseData(const T &in)
   newData.startTime        = QDateTime::fromMSecsSinceEpoch(in.startTime);
   newData.stopTime         = QDateTime::fromMSecsSinceEpoch(in.stopTime);
   newData.trainingAreaId   = in.trainingAreaId;
-  if (in.radioGroupId.is_set())
+  if (in.radioGroupId.has_value())
     newData.radioGroupId     = in.radioGroupId.get();
   newData.symbolFillTypeId = in.symbolFillTypeId;
   newData.linkedExerciseId = in.linkedExerciseId;
@@ -693,7 +693,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
 
     const auto cb = [&eqNoForEx](const ParticipantManagement::Participant &data) -> void
     {
-      if (data.equipmentNumber.is_set())
+      if (data.equipmentNumber.has_value())
         eqNoForEx.insert(data.equipmentNumber.get());
     };
     ppmDtcForEx->participants(cb);
@@ -793,7 +793,7 @@ QStringList HandlerExercise::doubleChannels(int exerciseAId, int exerciseBId) co
 
   for (auto it = cnrConfigs.constBegin(); it != cnrConfigs.constEnd(); ++it)
   {
-    int cnrExerciseId = it.value().exerciseId.is_set() ? it.value().exerciseId.get() : 0;
+    int cnrExerciseId = it.value().exerciseId.has_value() ? it.value().exerciseId.get() : 0;
 
     if (cnrExerciseId == exerciseAId)
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
index 5fbcf3908..82a90301e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
@@ -293,7 +293,7 @@ Core::FunctionReplyObject ObjectExercise::switchToState(const ExerciseState &new
   bool ok = m_stateMachine->switchToState(newExerciseState);
   if (!ok)
   {
-    ret = Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error switching to state %1")).arg(newExerciseState.underlying());
+    ret = Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error switching to state %1")).arg(static_cast<int>(newExerciseState));
   }
   NOTICE_LOG(m_logger) << "-------------- after switch: currentState" << m_stateMachine->getCurrentState();
   NOTICE_LOG(m_logger) << "-> OperatorId: " << m_data.operatorId << ", workstationId: " << m_data.workstationId;
@@ -304,7 +304,7 @@ static int s_requestId = 0;
 bool ObjectExercise::sendStateToServiceManagement(ExerciseState state)
 {
   Core::ServiceGroupType sgt = Core::ServiceGroupType::Core;  // invalid here
-  switch (state.underlying())
+  switch (state)
   {
   case ExerciseState::Created:
     sgt = Core::ServiceGroupType::ExercisePreparation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
index 5948f737b..dd6123f34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
@@ -431,10 +431,10 @@ void FlmTests::tryModifyFileContent()
 
     data.id = flc.id;
     data.name = flc.name;
-    if (flc.exerciseId.is_set())
+    if (flc.exerciseId.has_value())
     {
       data.exerciseId = flc.exerciseId.get();
-      if (flc.phaseId.is_set())
+      if (flc.phaseId.has_value())
         data.phaseId = flc.phaseId.get();
     }
     data.fileCategory = flc.fileCategory;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
index 1a7f8e1a1..168bed2eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
@@ -177,9 +177,9 @@ int DtcImplCustom::getFileId(const FileType &fileType, const QString &fileName,
   {
     const FileContent &content = fc.data();
     bool cond = (content.fileType == fileType && content.name == strFileName);
-    if (content.exerciseId.is_set())
+    if (content.exerciseId.has_value())
       cond &= (content.exerciseId == exerciseId);
-    if (content.phaseId.is_set())
+    if (content.phaseId.has_value())
       cond &= (content.phaseId == phaseId);
 
     if (cond)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_qmetatypes.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_qmetatypes.h
new file mode 100644
index 000000000..e2adfcf00
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_qmetatypes.h
@@ -0,0 +1,18 @@
+#pragma once
+
+// Registers the Qt metatype for the FileManagement::Folder DDS type when it is used
+// as a QVariant value in GUI code.
+//
+// Declared in a single, guarded location so the QMetaTypeId<T> specialization is
+// defined before any Q_OBJECT slot/signal QtMocHelpers::SlotData instantiates the
+// primary QMetaTypeId<T> template. Qt6 rejects a class-template specialization that
+// follows the primary template's implicit instantiation ("specialization of
+// QMetaTypeId<T> after instantiation"), which Qt5 tolerated, so the declaration must
+// precede the first such SlotData in a translation unit.
+#include <FileManagement/flm_dtc.h>
+#include <QMetaType>
+
+#ifndef Q_DECLARE_METATYPE_FileManagement_Folder
+#define Q_DECLARE_METATYPE_FileManagement_Folder
+Q_DECLARE_METATYPE(FileManagement::Folder)
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.cpp
index efc357ad9..6e13639ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.cpp
@@ -232,10 +232,10 @@ Database::FlmFileContent ObjectFileContent::toDbData(const FileContent &ddsData)
   dbData.folderId       = ddsData.folderId;
   dbData.fileTypeId     = ddsData.fileType;
   dbData.operatorId     = ddsData.operatorId;
-  if (ddsData.exerciseId.is_set())
+  if (ddsData.exerciseId.has_value())
   {
     dbData.exerciseId     = ddsData.exerciseId.get();
-    if (ddsData.phaseId.is_set())
+    if (ddsData.phaseId.has_value())
       dbData.phaseId     = ddsData.phaseId.get();
   }
   dbData.fileStatusId   = ddsData.fileStatus;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
index 49d2244d8..4dc92b7a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
@@ -15,7 +15,11 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-Q_DECLARE_METATYPE(wirkfeld_minensperre_rt)
+// wirkfeld_minensperre_rt is already a registered metatype in this TU: the
+// sendeWirkfeld(const wirkfeld_minensperre_rt&, int) signal on ZSSI_WI_Minenfeld_Interpreter
+// auto-registers it via its moc meta-object code (Qt6), so a Q_DECLARE_METATYPE here
+// would be a redefinition of the already-instantiated QMetaTypeId specialization.
+// (Qt5 tolerated the duplicate; Qt6 rejects it.) Keep the other metatype decls below.
 Q_DECLARE_METATYPE(ausstossart_et)
 Q_DECLARE_METATYPE(Segment_rt)
 typedef QPair<int, int> Coordinate;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
index a25843be2..75e9b2480 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
@@ -91,7 +91,7 @@ void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::Sp
   if (data.operationalState != MV_VERLEGEN &&
       data.operationalState != WMV_VERLEGEN)
     return;
-  if (!data.position.is_set())
+  if (!data.position.has_value())
     return;
   {
     // convert TrainingAreaBase::LaneData back to sondersensorik_fahrspur_rt
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
index d95f849c0..a3c41c956 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
@@ -755,11 +755,11 @@ public:
   QString positionString() const { return value(QLatin1String("p")); }
 };
 
-static bool parsePositionString(const QStringRef &positionString,
+static bool parsePositionString(const QString &positionString,
                                 Core::GeoPosition &pos,
                                 double &rotationDegree)
 {
-  QVector<QStringRef> parts = positionString.split(QLatin1Char(','));
+  QStringList parts = positionString.split(QLatin1Char(','));
   if (parts.size() != 4)
     return false;
   bool bOk;
@@ -888,7 +888,7 @@ int main(int argc, char **argv)
       {
         InfrastructureManagement::IsmImportBuildings::ImportData data;
         const QString ps = options.positionString();
-        if (!parsePositionString(QStringRef(&ps), data.geoPos, data.angleDegree))
+        if (!parsePositionString(ps, data.geoPos, data.angleDegree))
         {
           ERROR_LOG(app.baseLogger()) << "Error parsing position string! str='" << ps << "'" ;
           std::cerr << "Error parsing position string! str='" << ps << "'" << std::endl;
@@ -950,18 +950,18 @@ int main(int argc, char **argv)
           }
 
           // xmlFile
-          data.xmlFileName = parts.at(cfi.idxXmlFile).toString();
+          data.xmlFileName = parts.at(cfi.idxXmlFile);
 
           // vulnerabilityFile
-          data.vulFileName = parts.at(cfi.idxVulnerabilityFile).toString();
+          data.vulFileName = parts.at(cfi.idxVulnerabilityFile);
 
           // position
           if (!parsePositionString(parts.at(cfi.idxPosition), data.geoPos, data.angleDegree))
           {
             ERROR_LOG(app.baseLogger()) << "Can not parse position string of line = '" << line << "'";
             std::cerr << "Can not parse position string of line = '" << line << "'" << std::endl;
-            ERROR_LOG(app.baseLogger()) << "Can not parse position string: '" << parts.at(cfi.idxPosition).toString() << "'";
-            std::cerr << "Can not parse position string: '" << parts.at(cfi.idxPosition).toString() << "'" << std::endl;
+            ERROR_LOG(app.baseLogger()) << "Can not parse position string: '" << parts.at(cfi.idxPosition) << "'";
+            std::cerr << "Can not parse position string: '" << parts.at(cfi.idxPosition) << "'" << std::endl;
             return -5;
           }
 
@@ -970,7 +970,7 @@ int main(int argc, char **argv)
           //
           // egcuToRoomFile
           if ((cfi.idxEgcuToRoomFile>=0) && (parts.size() > cfi.idxEgcuToRoomFile))
-            data.egcuToRoomFileName = parts.at(cfi.idxEgcuToRoomFile).toString();
+            data.egcuToRoomFileName = parts.at(cfi.idxEgcuToRoomFile);
 
           // externalWlsId
           data.externalWlsId = 0;
@@ -979,7 +979,7 @@ int main(int argc, char **argv)
 
           // bauabschnitt
           // Normally '-1', but Steve and Iuliana use '0' as default.
-          data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup;
+          data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::UnknownGroup);
           if ((cfi.idxBauabschnitt>=0) && (parts.size() > cfi.idxBauabschnitt))
           {
             // postprocessing uses  ba0 -> 0 , ba1 -> 1 ...
@@ -987,25 +987,25 @@ int main(int argc, char **argv)
             const int ba = parts.at(cfi.idxBauabschnitt).toInt();
             switch (ba) {
             case 0:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section0;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section0);
               break;
             case 1:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section1;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section1);
               break;
             case 2:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section2;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section2);
               break;
             case 3:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section3;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section3);
               break;
             case 4:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section4;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section4);
               break;
             case 5:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::Salchau;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Salchau);
               break;
             default:
-              data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup;
+              data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::UnknownGroup);
               break;
             }
           }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
index f94cf6eb5..1ce271ebe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
@@ -52,7 +52,7 @@ int determineFloorNumber(ObjectStructureElement *floor)
     return 0;
 
   bool   ok = false;
-  int    floorNumber = name.midRef(FLOOR_PATTERN.size()).toInt(&ok);
+  int    floorNumber = name.mid(FLOOR_PATTERN.size()).toInt(&ok);
   if (!ok)
     return 0;
 
@@ -233,7 +233,7 @@ DataManager::EinruestEssentials DataManager::getEssentials(const QString &uuid)
       mountingPointData.position3d.x = currentElement->getRelativePosition().offsetX;
       mountingPointData.position3d.y = currentElement->getRelativePosition().offsetY;
       mountingPointData.position3d.z = currentElement->getRelativePosition().offsetZ;
-      mountingPointData.supportedAssetTypIds.append(currentElement->getData().mountingPointTypeId);
+      mountingPointData.supportedAssetTypIds.append(static_cast<int>(currentElement->getData().mountingPointTypeId));
       mountingPointData.assetId      = getMountedAssetId(currentElement->getId());
 
       result.mountingPoints.append(MountingPointMessage(mountingPointData, uuid));
@@ -244,7 +244,7 @@ DataManager::EinruestEssentials DataManager::getEssentials(const QString &uuid)
 
   // No BuildingNetworkSwitch and no AnnouncementUnit (see GUEZE-1548/1459)
   AssetTypeMessage::AssetTypeData assetTypeData;
-  for (int i = MountingPointType::Unknown; i <= static_cast<int>(MountingPointType::EffectGenerationControlUnit); ++i)
+  for (int i = static_cast<int>(MountingPointType::Unknown); i <= static_cast<int>(MountingPointType::EffectGenerationControlUnit); ++i)
   {
     if (i == static_cast<int>(MountingPointType::AnnouncementUnit))
       continue;
@@ -320,7 +320,7 @@ LtsWebSocket::ReplyMessage *DataManager::getObjectMounting(int plannedMountingId
     errorData.errorMessage  = QObject::tr("Building id is invalid", "DataManager");
     errorData.uuid          = uuid;
 
-    WARNING_LOG(m_logger) << errorData.errorMessage << " - " << (buildingEle ? buildingEle->getStructureElementTypeId() : -1)
+    WARNING_LOG(m_logger) << errorData.errorMessage << " - " << (buildingEle ? static_cast<int>(buildingEle->getStructureElementTypeId()) : -1)
                           << ", " << plannedMountingId << ", " << objectId;
     LtsWebSocket::ReplyMessage *reply = new LtsWebSocket::ErrorMessage(errorData);
     return reply;
@@ -831,7 +831,7 @@ LtsWebSocket::ReplyMessage *DataManager::getAssets(const QSet<int> &assetTypeIds
   QVector<AssetData> assets;
   for (const ObjectInstrumentationAsset *asset : m)
   {
-    if (assetTypeIds.contains(asset->getData().mountingPointTypeId))
+    if (assetTypeIds.contains(static_cast<int>(asset->getData().mountingPointTypeId)))
       assets += assetData(asset);
   }
 
@@ -1196,7 +1196,7 @@ Messages::AssetData DataManager::assetData(const ObjectInstrumentationAsset *ass
   }
 
   result.id               = asset->getId();
-  result.assetTypeId      = asset->getData().mountingPointTypeId;
+  result.assetTypeId      = static_cast<int>(asset->getData().mountingPointTypeId);
   result.assetTag         = QString::fromStdString(asset->getData().barcode);
   result.designation      = QString::fromStdString(asset->getData().name);
   result.hostname         = QString::fromStdString(asset->getData().hostname);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
index 8f018ada8..e61b2d70e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
@@ -94,8 +94,13 @@ bool HandlerMainStructureElement::init()
   }
 
   // add structure elements to global map for lookup (e.g. in 'add Footprints to MSE objects')
+  // Qt6: QMap::unite removed -> merge manually (unite semantics: overwrite existing keys)
   for (ObjectMainStructureElement *objMse : std::as_const(m_objectMainStructureElementMap))
-    m_objectStructureElementMap.unite(objMse->getStructureElements());
+  {
+    const auto &seMap = objMse->getStructureElements();
+    for (auto it = seMap.constBegin(); it != seMap.constEnd(); ++it)
+      m_objectStructureElementMap.insert(it.key(), it.value());
+  }
 
   // add Footprints to MSE objects
   // read all FP from database
@@ -656,14 +661,14 @@ void HandlerMainStructureElement::udpatePropertiesForRelayOverride(const int rel
       continue;
 
     if (state != InfrastructureManagement::EffectOverride::Automatic)
-      arrRelays[i] = QJsonObject({qMakePair<QString, QJsonValue>(keyStr, static_cast<int>(state))});
+      arrRelays[i] = QJsonObject({QPair<QString, QJsonValue>(keyStr, static_cast<int>(state))});
     else
       arrRelays.removeAt(i);
     containsRelay = true;
     break;
   }
   if (!containsRelay && state != InfrastructureManagement::EffectOverride::Automatic)
-    arrRelays.append(QJsonObject({qMakePair<QString, QJsonValue>(QString::number(relay), static_cast<int>(state))}));
+    arrRelays.append(QJsonObject({QPair<QString, QJsonValue>(QString::number(relay), static_cast<int>(state))}));
 
   if (arrRelays.isEmpty())
     overridesObj.remove(QStringLiteral("relays"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
index be655ae80..9479f755c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
@@ -290,15 +290,15 @@ Database::IsmMountingPointSchedule ObjectMainSchedule::toDbData(const MainSchedu
   dbData.name = QString::fromStdString(ddsData.name);
   dbData.timeCreated = QDateTime::fromMSecsSinceEpoch(ddsData.timeCreated);
   dbData.statusId = ddsData.statusId;
-  if (ddsData.timeStart.is_set() && ddsData.timeStart.get() > 0)
+  if (ddsData.timeStart.has_value() && ddsData.timeStart.get() > 0)
     dbData.timeStart = QDateTime::fromMSecsSinceEpoch(ddsData.timeStart.get());
   else
     dbData.timeStart = QDateTime();
-  if (ddsData.timeEnd.is_set() && ddsData.timeEnd.get() > 0)
+  if (ddsData.timeEnd.has_value() && ddsData.timeEnd.get() > 0)
     dbData.timeEnd = QDateTime::fromMSecsSinceEpoch(ddsData.timeEnd.get());
   else
     dbData.timeEnd = QDateTime();
-  if (ddsData.exerciseId.is_set() && ddsData.exerciseId.get() > 0)
+  if (ddsData.exerciseId.has_value() && ddsData.exerciseId.get() > 0)
     dbData.exerciseId = ddsData.exerciseId.get();
 
   return dbData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
index 964fa3c78..77cd68c3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
@@ -229,7 +229,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::createObject(const MainStr
   m_footprint.id = m_data.id;  // = buildingId, important for remove etc.
   m_footprint.structureElementId = objStructureElementBuilding->getId();
   m_footprint.name = m_data.name; // footprint name = building name
-  if (request.footprint.is_set())
+  if (request.footprint.has_value())
   {
     const auto &fp = request.footprint.get();
     for (size_t i = 0; i < fp.size(); ++i)
@@ -358,7 +358,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::updateObject(const MainStr
 
   MainFootprint mfData(m_footprint);
   bool bUpdateFootprintNeeded = false;
-  if (request.footprint.is_set())
+  if (request.footprint.has_value())
   {
     const auto &fpReq = request.footprint.get();
     bUpdateFootprintNeeded = fpReq.size() != mfData.elements.size();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.cpp
index fc1c29fa9..35c8bf254 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.cpp
@@ -58,7 +58,7 @@ namespace InfrastructureManagement
 
   QString ScheduleStatusManager::toString(InfrastructureManagement::ScheduleStatus state)
   {
-    switch (state.underlying())
+    switch (state)
     {
       case ScheduleStatus::Unknown:
         return tr("UNKNOWN");
@@ -74,7 +74,7 @@ namespace InfrastructureManagement
         return tr("REMOVED");
     }
 
-    return tr("Unknown State: (%1)").arg(state.underlying());
+    return tr("Unknown State: (%1)").arg(state);
   }
 
   void ScheduleStatusManager::setStateInternal(InfrastructureManagement::ScheduleStatus state)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp
index 3dd4e8ad3..c6203b884 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp
@@ -89,7 +89,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
   newMsg.message = QString::fromStdString(request.message);
   newMsg.senderType = request.senderType;
 
-  INFO_LOG(m_logger) << "newMsg.senderType.underlying()=" <<  newMsg.senderType;
+  INFO_LOG(m_logger) << "newMsg.senderType=" <<  newMsg.senderType;
   newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId);
   newMsg.recipientType = request.recipientType;
   newMsg.exerciseId = request.exerciseId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp
index 9d5209ecb..1780bd3c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp
@@ -275,14 +275,14 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
   case OcSituation::TelegramId::SituationData:
   case OcSituation::TelegramId::SituationDataInitial:
   {
-    if (m_centerEquipmentId > 0 || m_position.is_set()) // is the situation still requested
+    if (m_centerEquipmentId > 0 || m_position.has_value()) // is the situation still requested
       m_handlerOcSituationData->process(payload, telegramId == OcSituation::TelegramId::SituationDataInitial);
     break;
   }
   case OcSituation::TelegramId::CentralAesData:
   case OcSituation::TelegramId::CentralAesDataInitial:
   {
-    if (m_centerEquipmentId > 0 || m_position.is_set())
+    if (m_centerEquipmentId > 0 || m_position.has_value())
       m_handlerOcCentralAesData->process(payload, telegramId == OcSituation::TelegramId::CentralAesDataInitial);
     break;
   }
@@ -330,9 +330,9 @@ void HandlerOcData::onOwnPosition(const TrainingAreaBaseOC::OwnPosition &data, D
   TrainingAreaBase::EquipmentPosition out;
   out.sampleTime = data.timeStamp;
   out.position.position = Core::GeoPosition(data.position.lon, data.position.lat, 0);
-  if (data.moutObjectId.is_set())
+  if (data.moutObjectId.has_value())
     out.position.moutObjectId.set(data.moutObjectId.get());
-  if (data.moutRoomId.is_set())
+  if (data.moutRoomId.has_value())
     out.position.moutRoomId.set(data.moutRoomId.get());
   out.equipmentNumber = m_tabocDtc->specificsEquipment(1).equipmentNumber;
 
@@ -364,7 +364,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
     else
     {
       const auto participantEqNo = m_ppmDtc->participant(data.recipientId).equipmentNumber;
-      if (!participantEqNo.is_set())
+      if (!participantEqNo.has_value())
       {
         WARNING_LOG(m_logger) << "Recipient with id " << data.recipientId << " has no equipment number set - can not send message";
         return;
@@ -422,7 +422,7 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
   {
     DEBUG_LOG(m_logger) << "User " << m_user.name << " logged out.";
 
-    if (m_centerEquipmentId > 0 || m_position.is_set())
+    if (m_centerEquipmentId > 0 || m_position.has_value())
     {
       DEBUG_LOG(m_logger) << "Stopping situation requests.";
 
@@ -454,7 +454,7 @@ void HandlerOcData::onSendEvaluationRequest(const rti::core::SampleIdentity &coo
   LtsUtils::set1Byte(OcSituation::TelegramId::Evaluation, payload);
   LtsUtils::set2Byte(request.schemaId, payload);
   LtsUtils::set4Byte(request.senderOperatorId, payload);
-  if (request.receiverOperatorId.is_set())
+  if (request.receiverOperatorId.has_value())
     LtsUtils::set4Byte(request.receiverOperatorId.get(), payload);
   else
     LtsUtils::set4Byte(0, payload);
@@ -564,7 +564,7 @@ void HandlerOcData::demandSituation(bool initial)
     return;
   }
 
-  if (m_centerEquipmentId == 0 && !m_position.is_set())
+  if (m_centerEquipmentId == 0 && !m_position.has_value())
   {
     m_centerEquipmentId = -1;
     m_handlerOcSituationData->removeAllPositions();
@@ -583,14 +583,14 @@ void HandlerOcData::demandSituation(bool initial)
   if (m_centerEquipmentId > 0)
     INFO_LOG(m_logger) << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
                        << " radius: " << m_radius;
-  else if (m_position.is_set())
+  else if (m_position.has_value())
     INFO_LOG(m_logger) << "Demand OC situation around position: " << m_position.get()
                        << " radius: " << m_radius;
 
   QByteArray payload;
 
   LtsUtils::set1Byte(OcSituation::TelegramId::DemandSituation, payload);
-  if (m_position.is_set())
+  if (m_position.has_value())
   {
     LtsUtils::set1Byte(OcSituation::SituationCenterType::Position, payload);
     LtsUtils::set8Byte(m_position.get().lon, payload);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp
index 0f4af938e..db9023fec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp
@@ -301,7 +301,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
       m_participantData.insert(participantId, participantData);
       DEBUG_LOG(m_logger) << "Adding ParticipantData to internal map: " << participantData;
 
-      if (participantData.equipmentNumber.is_set())
+      if (participantData.equipmentNumber.has_value())
         m_participantId2EqId[participantId] = participantData.equipmentNumber.get();
       else
         m_participantId2EqId[participantId] = 0;  // so the positions can be removed, see e.g. removeAllPositions()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp
index 39ce60b99..c3ac1d0f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_builder.cpp
@@ -26,14 +26,14 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::EffectCluster &effec
   addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster); // we send EffectCluster as ExplosionCluster
   addAesItemId(byteStream, effectCluster.id);
   addName(byteStream, effectCluster.name);
-  addEffectStart(byteStream, effectCluster.effectStart.is_set() ? effectCluster.effectStart.get() : -1);
+  addEffectStart(byteStream, effectCluster.effectStart.has_value() ? effectCluster.effectStart.get() : -1);
   addEffectDuration(byteStream, effectCluster.effectDuration);
   addArea(byteStream, effectCluster.area);
   addMhpCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
   addMhpRotation(byteStream, effectCluster.effectors.size() ? effectCluster.effectors[0].mhpRotation : 1);
   addImpactCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
   addChargeTypeId(byteStream, effectCluster.chargeStruct.chargeTypeId);
-  addPartyId(byteStream, effectCluster.partyId.is_set() ? effectCluster.partyId.get() : -1);
+  addPartyId(byteStream, effectCluster.partyId.has_value() ? effectCluster.partyId.get() : -1);
 
   return byteStream;
 }
@@ -47,7 +47,7 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::NContamination &nCon
   addAesType(byteStream, AreaEffectSimulation::AesType::AtNContamination);
   addAesItemId(byteStream, nContamination.id);
   addName(byteStream, nContamination.name);
-  addEffectStart(byteStream, nContamination.effectStart.is_set() ? nContamination.effectStart.get() : -1);
+  addEffectStart(byteStream, nContamination.effectStart.has_value() ? nContamination.effectStart.get() : -1);
   addEffectDuration(byteStream, nContamination.effectDuration);
   addChargeTypeId(byteStream, nContamination.chargeStruct.chargeTypeId);
   addImpactPosition(byteStream, nContamination.impactPosition);
@@ -57,7 +57,7 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::NContamination &nCon
   addSpanAngle(byteStream, nContamination.spanAngle);
   addRotationAngle(byteStream, nContamination.rotationAngle);
   addDetonationValue(byteStream, nContamination.detonationValue);
-  addPartyId(byteStream, nContamination.partyId.is_set() ? nContamination.partyId.get() : -1);
+  addPartyId(byteStream, nContamination.partyId.has_value() ? nContamination.partyId.get() : -1);
 
   return byteStream;
 }
@@ -71,12 +71,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BCContamination &bCC
   addAesType(byteStream, AreaEffectSimulation::AesType::AtBCContamination);
   addAesItemId(byteStream, bCContamination.id);
   addName(byteStream, bCContamination.name);
-  addEffectStart(byteStream, bCContamination.effectStart.is_set() ? bCContamination.effectStart.get() : -1);
+  addEffectStart(byteStream, bCContamination.effectStart.has_value() ? bCContamination.effectStart.get() : -1);
   addEffectDuration(byteStream, bCContamination.effectDuration);
   addChargeTypeId(byteStream, bCContamination.chargeStruct.chargeTypeId);
   addImpactPosition(byteStream, bCContamination.impactPosition);
   addImpactRadius(byteStream, bCContamination.impactRadius);
-  addPartyId(byteStream, bCContamination.partyId.is_set() ? bCContamination.partyId.get() : -1);
+  addPartyId(byteStream, bCContamination.partyId.has_value() ? bCContamination.partyId.get() : -1);
   addPropagationDirection(byteStream, bCContamination.propagationDirection);
   addWindSpeed(byteStream, bCContamination.windSpeed);
 
@@ -92,11 +92,11 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionArea &explo
   addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionArea);
   addAesItemId(byteStream, explosionArea.id);
   addName(byteStream, explosionArea.name);
-  addEffectStart(byteStream, explosionArea.effectStart.is_set() ? explosionArea.effectStart.get() : -1);
+  addEffectStart(byteStream, explosionArea.effectStart.has_value() ? explosionArea.effectStart.get() : -1);
   addEffectDuration(byteStream, explosionArea.effectDuration);
   addChargeTypeId(byteStream, explosionArea.chargeStruct.chargeTypeId);
   addArea(byteStream, explosionArea.area);
-  addPartyId(byteStream, explosionArea.partyId.is_set() ? explosionArea.partyId.get() : -1);
+  addPartyId(byteStream, explosionArea.partyId.has_value() ? explosionArea.partyId.get() : -1);
   addCannonCount(byteStream, explosionArea.cannonCount);
   addCannonRounds(byteStream, explosionArea.cannonRounds);
   addFireRequestTime(byteStream, explosionArea.fireRequestTime);
@@ -115,10 +115,10 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionSingle &exp
   addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionSingle);
   addAesItemId(byteStream, explosionSingle.id);
   addName(byteStream, explosionSingle.name);
-  addEffectStart(byteStream, explosionSingle.effectStart.is_set() ? explosionSingle.effectStart.get() : -1);
+  addEffectStart(byteStream, explosionSingle.effectStart.has_value() ? explosionSingle.effectStart.get() : -1);
   addChargeTypeId(byteStream, explosionSingle.chargeStruct.chargeTypeId);
   addImpactPosition(byteStream, explosionSingle.impactPosition);
-  addPartyId(byteStream, explosionSingle.partyId.is_set() ? explosionSingle.partyId.get() : -1);
+  addPartyId(byteStream, explosionSingle.partyId.has_value() ? explosionSingle.partyId.get() : -1);
   addFireRequestTime(byteStream, explosionSingle.fireRequestTime);
   addAltitude(byteStream, explosionSingle.altitude);
   addPurpose(byteStream, explosionSingle.purpose);
@@ -135,12 +135,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::MineArea &mineArea,
   addAesType(byteStream, AreaEffectSimulation::AesType::AtMineArea);
   addAesItemId(byteStream, mineArea.id);
   addName(byteStream, mineArea.name);
-  addEffectStart(byteStream, mineArea.effectStart.is_set() ? mineArea.effectStart.get() : -1);
+  addEffectStart(byteStream, mineArea.effectStart.has_value() ? mineArea.effectStart.get() : -1);
   addEffectDuration(byteStream, mineArea.effectDuration);
   addDensity(byteStream, mineArea.density);
   addWidth(byteStream, mineArea.width);
   addChargeTypeId(byteStream, mineArea.chargeStruct.chargeTypeId);
-  addPartyId(byteStream, mineArea.partyId.is_set() ? mineArea.partyId.get() : -1);
+  addPartyId(byteStream, mineArea.partyId.has_value() ? mineArea.partyId.get() : -1);
   addAesMaLayingProcedureType(byteStream, mineArea.layingProcedureType);
   addIsLayedHidden(byteStream, mineArea.isLaidHidden);
   addIsCenterLine(byteStream, mineArea.isCenterLine);
@@ -158,12 +158,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::FunctionalArea &func
   addAesType(byteStream, AreaEffectSimulation::AesType::AtFunctionalArea);
   addAesItemId(byteStream, functionalArea.id);
   addName(byteStream, functionalArea.name);
-  addEffectStart(byteStream, functionalArea.effectStart.is_set() ? functionalArea.effectStart.get() : -1);
+  addEffectStart(byteStream, functionalArea.effectStart.has_value() ? functionalArea.effectStart.get() : -1);
   addEffectDuration(byteStream, functionalArea.effectDuration);
   addChargeTypeId(byteStream, functionalArea.chargeStruct.chargeTypeId);
   addArea(byteStream, functionalArea.area);
-  addPartyId(byteStream, functionalArea.partyId.is_set() ? functionalArea.partyId.get() : -1);
-  addPointSymbol(byteStream, functionalArea.pointSymbol.is_set() ? functionalArea.pointSymbol.get() : std::string());
+  addPartyId(byteStream, functionalArea.partyId.has_value() ? functionalArea.partyId.get() : -1);
+  addPointSymbol(byteStream, functionalArea.pointSymbol.has_value() ? functionalArea.pointSymbol.get() : std::string());
   addFunctionalAreaTypeId(byteStream, functionalArea.functionalAreaTypeId);
   addDeconMode(byteStream, functionalArea.deconMode);
   addDeconTime(byteStream, functionalArea.deconTime);
@@ -189,10 +189,10 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BoobyTrap &boobyTrap
   addImpactPosition(byteStream, boobyTrap.impactPosition);
   addImpactRadius(byteStream, boobyTrap.impactRadius);
   addTriggerRadius(byteStream, boobyTrap.triggerRadius);
-  addRotationAngle(byteStream, boobyTrap.rotationAngle.is_set() ? boobyTrap.rotationAngle.get() : -1);
-  addCentralAngle(byteStream, boobyTrap.centralAngle.is_set() ? boobyTrap.centralAngle.get() : -1);
-  addEffectStart(byteStream, boobyTrap.effectStart.is_set() ? boobyTrap.effectStart.get() : -1);
-  addPartyId(byteStream, boobyTrap.partyId.is_set() ? boobyTrap.partyId.get() : -1);
+  addRotationAngle(byteStream, boobyTrap.rotationAngle.has_value() ? boobyTrap.rotationAngle.get() : -1);
+  addCentralAngle(byteStream, boobyTrap.centralAngle.has_value() ? boobyTrap.centralAngle.get() : -1);
+  addEffectStart(byteStream, boobyTrap.effectStart.has_value() ? boobyTrap.effectStart.get() : -1);
+  addPartyId(byteStream, boobyTrap.partyId.has_value() ? boobyTrap.partyId.get() : -1);
 
   return byteStream;
 }
@@ -209,9 +209,9 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::OffRouteMine &offRou
   addEffectDuration(byteStream, offRouteMine.effectDuration);
   addChargeTypeId(byteStream, offRouteMine.chargeStruct.chargeTypeId);
   addArea(byteStream, offRouteMine.area);
-  addImpactRadius(byteStream, offRouteMine.impactRadius.is_set() ? offRouteMine.impactRadius.get() : -1);
-  addEffectStart(byteStream, offRouteMine.effectStart.is_set() ? offRouteMine.effectStart.get() : -1);
-  addPartyId(byteStream, offRouteMine.partyId.is_set() ? offRouteMine.partyId.get() : -1);
+  addImpactRadius(byteStream, offRouteMine.impactRadius.has_value() ? offRouteMine.impactRadius.get() : -1);
+  addEffectStart(byteStream, offRouteMine.effectStart.has_value() ? offRouteMine.effectStart.get() : -1);
+  addPartyId(byteStream, offRouteMine.partyId.has_value() ? offRouteMine.partyId.get() : -1);
 
   return byteStream;
 }
@@ -223,14 +223,14 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionCluster &ex
   addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster);
   addAesItemId(byteStream, explosionCluster.id);
   addName(byteStream, explosionCluster.name);
-  addEffectStart(byteStream, explosionCluster.effectStart.is_set() ? explosionCluster.effectStart.get() : -1);
+  addEffectStart(byteStream, explosionCluster.effectStart.has_value() ? explosionCluster.effectStart.get() : -1);
   addEffectDuration(byteStream, explosionCluster.effectDuration);
   addArea(byteStream, explosionCluster.area);
   addMhpCount(byteStream, static_cast<int32_t>(explosionCluster.mhPoints.size()));
   addMhpRotation(byteStream, explosionCluster.mhpRotation);
   addImpactCount(byteStream, explosionCluster.impactCount);
   addChargeTypeId(byteStream, explosionCluster.chargeStruct.chargeTypeId);
-  addPartyId(byteStream, explosionCluster.partyId.is_set() ? explosionCluster.partyId.get() : -1);
+  addPartyId(byteStream, explosionCluster.partyId.has_value() ? explosionCluster.partyId.get() : -1);
 
   isPrioritized = explosionCluster.impactCount == 1;  // we prioritize every single fire
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
index 21e39a5d5..c2049bed9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
@@ -282,7 +282,7 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
       QByteArray name(QByteArray::fromStdString(dangerArea.name));
       name.resize(8);
       data.append(name);
-      if (dangerArea.effectStart.is_set())
+      if (dangerArea.effectStart.has_value())
         LtsUtils::set4Byte(dangerArea.effectStart.get() / 1000, data);
       else
         LtsUtils::set4Byte(0, data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
index 943c3d0fa..e46daf478 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
@@ -605,7 +605,7 @@ void HandlerOcData::handleEquipmentRegistration(const QByteArray &data)
 
   ParticipantManagement::Participant part = m_ppmDtc->participant(participantId);
 
-  if (part.equipmentNumber.is_set() && equipmentNumber > 0)
+  if (part.equipmentNumber.has_value() && equipmentNumber > 0)
   {
     // we need a deregistration first!
     ParticipantManagement::RegisterParticipantRequest dereq;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp
index 6afb64e7e..3710b6ab3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp
@@ -186,7 +186,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
       ParticipantManagement::Participant centerParticipant;
       for (const auto &participant : std::as_const(m_allParticipants))
       {
-        if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == m_centerEquipmentId)
+        if (participant.equipmentNumber.has_value() && participant.equipmentNumber.get() == m_centerEquipmentId)
         {
           centerParticipant = participant;
           break;
@@ -420,7 +420,7 @@ void HandlerOcSituationData::onAesItemViewChanged(const AreaEffectSimulation::Ae
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    if (data.partyId.is_set())
+    if (data.partyId.has_value())
       m_aesId2PartyId[data.id] = data.partyId.get();
     else
       m_aesId2PartyId.remove(data.id);
@@ -534,7 +534,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
     if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime)) // only if position is not outdated
     {
       ParticipantManagement::Participant participant = m_allParticipants.value(position.participantId);
-      if (!participant.equipmentNumber.is_set() || participant.partyId == 0)
+      if (!participant.equipmentNumber.has_value() || participant.partyId == 0)
         continue; // no units and participants without equipmentnumber or party: pool
       if (m_filterActive)
       {
@@ -603,7 +603,7 @@ void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Part
   TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << LOGFUNCTION;
 
   int participantId = participant.id;
-  if (participant.equipmentNumber.is_set())
+  if (participant.equipmentNumber.has_value())
     m_participantId2EqId[participantId] = participant.equipmentNumber.get();
   else
     m_participantId2EqId.remove(participantId);
@@ -944,7 +944,7 @@ void HandlerOcSituationData::addStructure(QByteArray &buf, const ParticipantMana
 {
   if (!bAdd)
     return;
-  LtsUtils::set2Byte(data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0, buf);
+  LtsUtils::set2Byte(data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0, buf);
   LtsUtils::set2Byte(data.typeId, buf);
   LtsUtils::set2Byte(data.partyId, buf);
 #ifndef GUEZ_MODE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp
index 5a8ef0655..f84158a9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp
@@ -142,7 +142,7 @@ void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdenti
 {
   DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
   Core::FunctionReplyObject ret = changeMembership(request);
-  if (request.operatorId.is_set() && request.rolePresetId.is_set())
+  if (request.operatorId.has_value() && request.rolePresetId.has_value())
     updateRolePresetId(request.operatorId.get(), request.rolePresetId.get());
   if (ret.error())
     WARNING_LOG(m_logger) << ret();
@@ -160,10 +160,10 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
   }
   group.description = QString::fromStdString(request.description);
   group.typeId = request.type;
-  group.isHidden = request.isHidden.is_set() ? request.isHidden.get() : false;
+  group.isHidden = request.isHidden.has_value() ? request.isHidden.get() : false;
 
   ObjectGroup *ifs(new ObjectGroup(m_mainHandler));
-  Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships.is_set() ? request.memberships.get() : std::vector<int32_t>());
+  Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships.has_value() ? request.memberships.get() : std::vector<int32_t>());
   if (ret.error())
   {
     delete ifs;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
index 3b04257b0..a96b1cfab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
@@ -186,7 +186,7 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
 {
   Core::FunctionReplyObject ret;
   DEBUG_LOG(m_logger) << "onOperatorCreateModifyRequest()";
-  if (!request.id.is_set())
+  if (!request.id.has_value())
     ret = operatorCreateRequest(request);
   else
     ret = operatorModifyRequest(request);
@@ -198,8 +198,8 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
 
 Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorCreateModifyRequest &request)
 {
-  if (!request.name.is_set() ||
-      !request.password.is_set())
+  if (!request.name.has_value() ||
+      !request.password.has_value())
     return Core::FunctionReplyObject(tr_lts("dds", "Can not create operator - name or password is empty."));
 
   // Group anlegen
@@ -215,7 +215,7 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
   // Operator anlegen
   Database::OpmOperator op;
   op.name = QString::fromStdString(request.name.get());
-  if (request.description.is_set())
+  if (request.description.has_value())
     op.description = QString::fromStdString(request.description.get());
 
 
@@ -225,22 +225,22 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
 
   op.password = enteredPassword;
   op.primaryGroupId = groupRet.id();
-  if (request.image.is_set())
+  if (request.image.has_value())
     op.image = LtsUtils::toQByteArray(request.image.get());
   const auto vpbe = request.visiblePartiesByExercise;
   for (const auto &pbe : vpbe)
   {
-    if (!pbe.visibleParties.is_set() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
+    if (!pbe.visibleParties.has_value() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
       continue;
 
     op.visibleParties = LtsUtils::IntArray(pbe.visibleParties.get());
   }
-  if (request.rolePresetId.is_set())
+  if (request.rolePresetId.has_value())
   {
     op.rolePresetId = request.rolePresetId.get();
   }
-  op.projectionPriority = request.projectionPriority.is_set() ? request.projectionPriority.get() : 1;
-  op.audioChannelPriority = request.audioChannelPriority.is_set() ? request.audioChannelPriority.get() : 1;
+  op.projectionPriority = request.projectionPriority.has_value() ? request.projectionPriority.get() : 1;
+  op.audioChannelPriority = request.audioChannelPriority.has_value() ? request.audioChannelPriority.get() : 1;
 
   ObjectOperator *ifs(new ObjectOperator(m_mainHandler));
   const Core::FunctionReplyObject ret = ifs->createObject(op, {});
@@ -251,10 +251,10 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
     delete ifs;
     return ret;
   }
-  if (request.visibleExercises.is_set())
+  if (request.visibleExercises.has_value())
     ifs->updateExercises(request.visibleExercises.get());
 
-  if (request.operatorRights.is_set())
+  if (request.operatorRights.has_value())
   {
     GroupChangeMembersRequest grChReq;
     grChReq.id = op.primaryGroupId;
@@ -287,7 +287,7 @@ void HandlerOperator::operatorModifyRolePresetId( int operatorId, int rolePreset
 
 Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorCreateModifyRequest &request)
 {
-  if (request.password.is_set())
+  if (request.password.has_value())
     return Core::FunctionReplyObject(tr_lts("dds", "Can not modify operator password with this function."));
 
   ObjectOperator *ifs = m_operatorObjMap.value(request.id.get());
@@ -296,7 +296,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
 
   Database::OpmOperator op = ifs->data();  
 
-  if (request.name.is_set())
+  if (request.name.has_value())
   {
     op.name = QString::fromStdString(request.name.get());
 
@@ -309,30 +309,30 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
     }
   }
 
-  if (request.description.is_set())
+  if (request.description.has_value())
     op.description = QString::fromStdString(request.description.get());
-  if (request.image.is_set())
+  if (request.image.has_value())
     op.image = LtsUtils::toQByteArray(request.image.get());
   const auto vpbe = request.visiblePartiesByExercise;
   for (const auto &pbe : vpbe)
   {
     // only ex0 updated
-    if (!pbe.visibleParties.is_set() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
+    if (!pbe.visibleParties.has_value() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
       continue;
 
     op.visibleParties = LtsUtils::IntArray(pbe.visibleParties.get());
   }
 
-  if (request.rolePresetId.is_set())
+  if (request.rolePresetId.has_value())
   {
     op.rolePresetId = request.rolePresetId.get();
   }
 
-  if (request.visibleExercises.is_set())
+  if (request.visibleExercises.has_value())
     ifs->updateExercises(request.visibleExercises.get());
-  if (request.projectionPriority.is_set())
+  if (request.projectionPriority.has_value())
     op.projectionPriority = request.projectionPriority.get();
-  if (request.audioChannelPriority.is_set())
+  if (request.audioChannelPriority.has_value())
     op.audioChannelPriority = request.audioChannelPriority.get();
   op.properties = QString::fromStdString(request.properties);
 
@@ -526,7 +526,7 @@ void HandlerOperator::onOperatorGetSetSettingsRequest(const rti::core::SampleIde
   ObjectOperator *ifs = m_operatorObjMap.value(request.id);
   if (ifs)
   {
-    if (request.settings.is_set())
+    if (request.settings.has_value())
     {
       const auto &data = request.settings.get();
       const QByteArray settings(QByteArray(reinterpret_cast<const char*>(&data[0]), data.size()));
@@ -608,9 +608,9 @@ Core::FunctionReplyObject HandlerOperator::operatorUpdateVisiblePartiesByExercis
   opEx.operatorId = request.id;
   opEx.exerciseId = request.exerciseId;
   std::vector<int> hiddenParties;
-  if (request.hiddenParties.is_set())
+  if (request.hiddenParties.has_value())
     opEx.hiddenParties = LtsUtils::IntArray(request.hiddenParties.get());
-  if (request.visibleParties.is_set())
+  if (request.visibleParties.has_value())
       opEx.visibleParties = LtsUtils::IntArray(request.visibleParties.get());
 
   opEx.properties = QString::fromStdString(request.properties);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
index 91019686a..b2f6bd7cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
@@ -66,13 +66,13 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
                                                        const CallBiteRequest &request)
 {
   TrainingAreaBase::DemandBiteRequest req;
-  req.equipmentNumbers().reserve(request.participantIds().size());
-  req.withSelfTest(request.withSelfTest());
+  req.equipmentNumbers.reserve(request.participantIds.size());
+  req.withSelfTest = request.withSelfTest;
 
   bool bOneFound = false;
   bool bAlreadyDemandedFound = false;
   QSet<int> currentDemandedParticipants;
-  for (const int participantId : request.participantIds())
+  for (const int participantId : request.participantIds)
   {
     if (m_demandedBiteParticipants.contains(participantId))
     {
@@ -98,25 +98,25 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
     m_demandedBiteParticipants.insert(participant->id());
     currentDemandedParticipants.insert(participant->id());
 
-    req.equipmentNumbers().push_back(participant->equipmentNumber());
+    req.equipmentNumbers.push_back(participant->equipmentNumber());
   }
 
-  if (req.equipmentNumbers().size() == 0 && bAlreadyDemandedFound)
-    return Core::FunctionReplyObject(req.requestId());
+  if (req.equipmentNumbers.size() == 0 && bAlreadyDemandedFound)
+    return Core::FunctionReplyObject(req.requestId);
 
-  if (req.equipmentNumbers().size() != 0)
+  if (req.equipmentNumbers.size() != 0)
   {
     static int s_requestId = 1;
-    req.requestId(s_requestId++);
+    req.requestId = s_requestId++;
 
     if (!m_mainHandler->tabFtc()->demandBiteRequest(req, this))
-      return Core::FunctionReplyObject(req.requestId(),
+      return Core::FunctionReplyObject(req.requestId,
                                        tr_lts("dds", "Error passing the BITE request to the proxy"));
 
     QTimer *timeoutTimer = new QTimer(this);
     timeoutTimer->setSingleShot(true);
     timeoutTimer->setInterval(5000);
-    const int requestId = req.requestId();
+    const int requestId = req.requestId;
     m_demandedBiteParticipantRequests.insert(requestId, {currentDemandedParticipants, cookie, timeoutTimer});
 
     auto cb = [this, requestId]()
@@ -129,7 +129,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
   // at least one found but this was already requested and we're waiting for answer -> don't answer with error
   if (bOneFound)
     return Core::FunctionReplyObject();
-  return Core::FunctionReplyObject(req.requestId(),
+  return Core::FunctionReplyObject(req.requestId,
                                    tr_lts("dds", "Got no valid participants for BITE request"));
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
index 99bd6f667..afa7f5a2a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
@@ -50,14 +50,14 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
 
   QString stmt = QStringLiteral(" SELECT rec_id, equipment_number, sample_time, position_lon, position_lat, position_z, equipment_function_id, sub_device_id,"
                                " unique_device_id, device_specific_event_code, event_data"
-                               " FROM rec_equipment_system_event WHERE sample_time > ") + QString::number(request.startTime()) + QStringLiteral(" AND "
-                               " sample_time <= ") + QString::number(request.endTime());
-  if (request.equipmentFunctionId() > -1)
-    stmt += QStringLiteral(" AND equipment_function_id=") + QString::number(request.equipmentFunctionId());
-  if (request.subDeviceId() > -1)
-    stmt += QStringLiteral(" AND sub_device_id=") + QString::number(request.subDeviceId());
-  if (request.deviceSpecificEventCode() > -1)
-    stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode());
+                               " FROM rec_equipment_system_event WHERE sample_time > ") + QString::number(request.startTime) + QStringLiteral(" AND "
+                               " sample_time <= ") + QString::number(request.endTime);
+  if (request.equipmentFunctionId > -1)
+    stmt += QStringLiteral(" AND equipment_function_id=") + QString::number(request.equipmentFunctionId);
+  if (request.subDeviceId > -1)
+    stmt += QStringLiteral(" AND sub_device_id=") + QString::number(request.subDeviceId);
+  if (request.deviceSpecificEventCode > -1)
+    stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode);
 
   INFO_LOG(m_logger) << "stmt: " << stmt;
 
@@ -87,22 +87,22 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
     id |= q.value(i++).toInt();
     keys += id;
 
-    data.id(id);
+    data.id = id;
 
-    data.equipmentNumber(q.value(i++).toInt());
-    data.timeStamp(q.value(i++).toLongLong());
+    data.equipmentNumber = q.value(i++).toInt();
+    data.timeStamp = q.value(i++).toLongLong();
     double pos_lon = q.value(i++).toDouble();
     double pos_lat = q.value(i++).toDouble();
     double pos_z = q.value(i++).toDouble();
-    data.position(Core::GeoPosition(pos_lon, pos_lat, pos_z));
-    data.equipmentFunctionId(q.value(i++).toInt());
-    data.subDeviceId(q.value(i++).toInt());
-    data.uniqueDeviceId(q.value(i++).toInt());
-    data.deviceSpecificEventCode(q.value(i++).toInt());
+    data.position = Core::GeoPosition(pos_lon, pos_lat, pos_z);
+    data.equipmentFunctionId = q.value(i++).toInt();
+    data.subDeviceId = q.value(i++).toInt();
+    data.uniqueDeviceId = q.value(i++).toInt();
+    data.deviceSpecificEventCode = q.value(i++).toInt();
     QByteArray evtData(q.value(i++).toByteArray());
     if (evtData.size() != 0)
-      data.eventData(LtsUtils::convert<std::vector<uint8_t>>(evtData));
-    data.filterId(m_filterId);
+      data.eventData = LtsUtils::convert<std::vector<uint8_t>>(evtData);
+    data.filterId = m_filterId;
 
     m_mainHandler->dts()->publish(data);
   }
@@ -118,22 +118,22 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
 
   ParticipantManagement::EquipmentSystemEvent event;
 
-  event.id(data.equipmentNumber());
-  event.equipmentNumber(data.equipmentNumber());
-  event.sampleTime(data.sampleTime());
-  if (!std::isnan(event.position().lon()) && !std::isnan(event.position().lat()))
-    event.position(Core::GeoPosition(data.position().lon(), data.position().lat(), 0.0));
+  event.id = data.equipmentNumber;
+  event.equipmentNumber = data.equipmentNumber;
+  event.sampleTime = data.sampleTime;
+  if (!std::isnan(event.position.lon) && !std::isnan(event.position.lat))
+    event.position = Core::GeoPosition(data.position.lon, data.position.lat, 0.0);
   else
-    event.position(m_mainHandler->participantHandler()->participantByEquipmentNumber(data.equipmentNumber())->position().pos());
-  event.equipmentFunctionId(data.source().equipmentFunctionId());
-  event.subDeviceId(data.source().subDeviceId());
-  event.uniqueDeviceId(data.source().unqiueId());
-  event.deviceSpecificEventCode(data.code());
-  event.eventData(data.data());
+    event.position = m_mainHandler->participantHandler()->participantByEquipmentNumber(data.equipmentNumber)->position().pos;
+  event.equipmentFunctionId = data.source.equipmentFunctionId;
+  event.subDeviceId = data.source.subDeviceId;
+  event.uniqueDeviceId = data.source.unqiueId;
+  event.deviceSpecificEventCode = data.code;
+  event.eventData = data.data;
 
   if (!m_mainHandler->dts()->publish(event))
   {
-    ERROR_LOG(m_logger) << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber() ;
+    ERROR_LOG(m_logger) << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber ;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.cpp
index db826fc56..49dd9c67d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.cpp
@@ -36,10 +36,10 @@ Core::FunctionReplyObject FiringUnitValidator::firingUnitError(const QHash<int,
 
   for (const ParticipantData &currentData : participantData)
   {
-    if (!m_typeHandler->isFiringUnitType(currentData.typeId()))
+    if (!m_typeHandler->isFiringUnitType(currentData.typeId))
       continue;
 
-    int unitModId = currentData.modId();
+    int unitModId = currentData.modId;
 
     error = getError(modIdToParticipantId, participantData, unitModId);
 
@@ -61,7 +61,7 @@ QString FiringUnitValidator::getError(const QHash<int, int> &modIdToParticipantI
 
   for (const ParticipantData &currentData : participantData)
   {
-    if (currentData.superiorModId() != unitModId)
+    if (currentData.superiorModId != unitModId)
       continue;
 
     // capacity error
@@ -71,16 +71,16 @@ QString FiringUnitValidator::getError(const QHash<int, int> &modIdToParticipantI
       return tr("There are only %1 participants allowed per firing unit.").arg(maxParticipantsPerFiringUnit);
 
     // false type error
-    hasFalseTypeError = !m_typeHandler->isArtilleryParticipantType(currentData.typeId());
+    hasFalseTypeError = !m_typeHandler->isArtilleryParticipantType(currentData.typeId);
 
     if (hasFalseTypeError)
       return tr("There are only artillery participants allowed in firing units.");
 
     // mixed type error
     if (typeId == -1)
-      typeId = currentData.typeId();
+      typeId = currentData.typeId;
 
-    hasMixedTypeError = currentData.typeId() != typeId;
+    hasMixedTypeError = currentData.typeId != typeId;
 
     if (hasMixedTypeError)
       return tr("There are no mixed types allowed in firing units.");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.cpp
index f3f56323b..4e871802c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.cpp
@@ -39,7 +39,7 @@ void GetParticipants::onGetParticipantsRequest(const rti::core::SampleIdentity &
   recordReplay.initDtc(nullptr, m_mainHandler->exerciseId());
 
   NSqlQuery q(m_mainHandler->db()->database());
-  recordReplay.readParticipantAt(q, request.timeStamp());
+  recordReplay.readParticipantAt(q, request.timeStamp);
 
   // key is sampleTime -> multiMap
   auto participantsMmap = recordReplay.getParticipantMap();
@@ -49,23 +49,23 @@ void GetParticipants::onGetParticipantsRequest(const rti::core::SampleIdentity &
   for (auto it = participantsMmap.begin(); it != participantsMmap.end(); ++it)
   {
     Participant &p = it.value();
-    if (p.isDeleted())
-      participants.remove(p.id());
+    if (p.isDeleted)
+      participants.remove(p.id);
     else
-      participants[p.id()] = std::move(p);
+      participants[p.id] = std::move(p);
   }
 
   DEBUG_LOG(m_logger) << "Starting to read participant from record replay. Size: "
                       << participants.size();
 
   GetParticipantsReply reply;
-  reply.requestId(request.requestId());
+  reply.requestId = request.requestId;
 
-  auto &vecPart = reply.participants();
+  auto &vecPart = reply.participants;
   vecPart.reserve(participants.size());
   for (auto it = participants.begin(); it != participants.end(); ++it)
   {
-    if (request.partyId() >= 0 && it.value().partyId() != request.partyId())
+    if (request.partyId >= 0 && it.value().partyId != request.partyId)
       continue;
     vecPart.push_back(it.value());
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
index b40a860ea..86015ba7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
@@ -37,9 +37,9 @@ Participant::Participant(ParticipantHandler *participantHandler,
   , m_bPublishPosition(!participantHandler->isUnitType(data.typeId))
   , m_logger(getLogger(loggerName))
 {
-  m_participantData.sampleTime(0);
-  m_dynamicData.sampleTime(0);
-  m_dynamicData.participantId(m_participantData.id());
+  m_participantData.sampleTime = 0;
+  m_dynamicData.sampleTime = 0;
+  m_dynamicData.participantId = m_participantData.id;
 
   m_participantHandler->setEquipmentNumberForParticipant(0, equipmentNumber(), id());
   m_unitPosCalculator->onSuperiorChanged(id(), superiorId());
@@ -67,25 +67,25 @@ void Participant::removeFromDds()
 
 void Participant::markAsDeleted()
 {
-  m_participantData.isDeleted(true);
-  m_participantData.superiorId(0);
-  m_participantData.inferiorIds().clear();
-  m_participantData.hierarchyNumber(0);
+  m_participantData.isDeleted = true;
+  m_participantData.superiorId = 0;
+  m_participantData.inferiorIds.clear();
+  m_participantData.hierarchyNumber = 0;
 
   m_unitPosCalculator->onParticipantDeleted(id());
 }
 
 bool Participant::isValidPosition(qint64 sampleTime, const Core::GeoPosition &pos, Core::PositionReportingSource repSource) const
 {
-  if (sampleTime < m_positionToPublish.sampleTime())
+  if (sampleTime < m_positionToPublish.sampleTime)
     return false;
 
   // an operator can set an invalid position (so the participant is not displayed on the map)
   if (repSource == Core::PositionReportingSource::SetByOperator)
     return true;
 
-  if (std::isnan(pos.lon()) ||
-      std::isnan(pos.lat()))
+  if (std::isnan(pos.lon) ||
+      std::isnan(pos.lat))
     return false;
 
   return true;
@@ -93,28 +93,28 @@ bool Participant::isValidPosition(qint64 sampleTime, const Core::GeoPosition &po
 
 bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosition)
 {
-  if (!isValidPosition(newPosition.sampleTime(), newPosition.position().position(), newPosition.position().reportingSource()))
+  if (!isValidPosition(newPosition.sampleTime, newPosition.position.position, newPosition.position.reportingSource))
     return false;
 
-  m_unitPosCalculator->onPositionChanged(id(), newPosition.sampleTime(), newPosition.position().position());
+  m_unitPosCalculator->onPositionChanged(id(), newPosition.sampleTime, newPosition.position.position);
 
   m_mutex.lock();
-  m_positionToPublish.reportingSource(newPosition.position().reportingSource());
-  m_positionToPublish.pos(newPosition.position().position());
-  m_positionToPublish.buildingId(newPosition.position().moutObjectId().is_set() ? newPosition.position().moutObjectId().get() : 0);
-  m_positionToPublish.roomId(newPosition.position().moutRoomId().is_set() ? newPosition.position().moutRoomId().get() : 0);
-  m_positionToPublish.sampleTime(newPosition.sampleTime());
-  m_positionToPublish.mountedOn().reset();
+  m_positionToPublish.reportingSource = newPosition.position.reportingSource;
+  m_positionToPublish.pos = newPosition.position.position;
+  m_positionToPublish.buildingId = newPosition.position.moutObjectId.has_value() ? newPosition.position.moutObjectId.get() : 0;
+  m_positionToPublish.roomId = newPosition.position.moutRoomId.has_value() ? newPosition.position.moutRoomId.get() : 0;
+  m_positionToPublish.sampleTime = newPosition.sampleTime;
+  m_positionToPublish.mountedOn.reset();
   m_mutex.unlock();
 
   // When a participant can have mounted participants, then there is always mountedParticipants set, can be empty
-  if (newPosition.mountedParticipants.is_set())
+  if (newPosition.mountedParticipants.has_value())
   {
     // list of new mounted participants
     std::vector<int32_t> newMountedParticipantIds;
     // list of already mounted participants
     std::vector<int32_t> currentMountedParticipantIds;
-    if (m_positionPublished.mountedParticipants.is_set())
+    if (m_positionPublished.mountedParticipants.has_value())
       currentMountedParticipantIds = m_positionPublished.mountedParticipants.get();
 
     // set new position for all mounted participants
@@ -152,9 +152,9 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
     }
     m_mutex.lock();
     if (newMountedParticipantIds.size() == 0)
-      m_positionToPublish.mountedParticipants().reset();
+      m_positionToPublish.mountedParticipants.reset();
     else
-      m_positionToPublish.mountedParticipants(newMountedParticipantIds);
+      m_positionToPublish.mountedParticipants = newMountedParticipantIds;
     m_mutex.unlock();
   }
   return true;
@@ -162,14 +162,14 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
 
 bool Participant::setPosition(const ParticipantPosition &newPosition, bool bForce)
 {
-  if (!bForce && !isValidPosition(newPosition.sampleTime(), newPosition.pos(), newPosition.reportingSource()))
+  if (!bForce && !isValidPosition(newPosition.sampleTime, newPosition.pos, newPosition.reportingSource))
   {
-    WARNING_LOG(m_logger) << "position for participant " << m_participantData.id()
+    WARNING_LOG(m_logger) << "position for participant " << m_participantData.id
                           << " is outdated: " << newPosition
-                          << " , cur pos sample time: " << m_positionPublished.sampleTime();
+                          << " , cur pos sample time: " << m_positionPublished.sampleTime;
     return false;
   }
-  m_unitPosCalculator->onPositionChanged(id(), newPosition.sampleTime(), newPosition.pos());
+  m_unitPosCalculator->onPositionChanged(id(), newPosition.sampleTime, newPosition.pos);
   m_mutex.lock();
   m_positionToPublish = newPosition;
   m_mutex.unlock();
@@ -178,9 +178,9 @@ bool Participant::setPosition(const ParticipantPosition &newPosition, bool bForc
 
 bool Participant::setCalculatedPosition(const Core::GeoPosition &pos, int64_t positionTime)
 {
-  const bool bNewer = m_positionToPublish.sampleTime() < positionTime;
-  m_positionToPublish.pos(pos);
-  m_positionToPublish.sampleTime(positionTime);
+  const bool bNewer = m_positionToPublish.sampleTime < positionTime;
+  m_positionToPublish.pos = pos;
+  m_positionToPublish.sampleTime = positionTime;
   return bNewer;
 }
 
@@ -192,16 +192,16 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
     return false;
   }
   TrainingAreaBase::EquipmentPosition mountedPosition = newPosition;
-  mountedPosition.mountedParticipants().reset();
+  mountedPosition.mountedParticipants.reset();
 
   // set position if (new mounted position) or (unmounting and participant is still mounted)
   if ((mountedToId > 0) ||
-      (mountedToId <= 0 && m_positionPublished.mountedOn.is_set()))
+      (mountedToId <= 0 && m_positionPublished.mountedOn.has_value()))
     setPosition(mountedPosition);
 
-  m_positionToPublish.reportingSource(newPosition.position().reportingSource());
+  m_positionToPublish.reportingSource = newPosition.position.reportingSource;
   if (mountedToId > 0)
-    m_positionToPublish.mountedOn(dds::core::optional<int32_t>(mountedToId));
+    m_positionToPublish.mountedOn = dds::core::optional<int32_t>(mountedToId);
 
   return true;
 }
@@ -219,20 +219,20 @@ void Participant::unmountParticipantById(const TrainingAreaBase::EquipmentPositi
 
 bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int originatorId)
 {
-  auto &stateHistory = m_dynamicData.stateHistory();
+  auto &stateHistory = m_dynamicData.stateHistory;
 
   // search for CombatReady state, ignore newState if it is older
   for (const auto &s : stateHistory)
   {
-    if (s.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady &&
-        s.stateTime() > newState.sampleTime())
+    if (s.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady &&
+        s.stateTime > newState.sampleTime)
     {
       return false;
     }
   }
 
-  std::bitset<sizeof(newState.vulnerabilityBits()) * 8> bits(newState.vulnerabilityBits());
-  bits.set(static_cast<int>(newState.vulnerabilityState().underlying()));
+  std::bitset<sizeof(newState.vulnerabilityBits) * 8> bits(newState.vulnerabilityBits);
+  bits.set(static_cast<int>(newState.vulnerabilityState));
 
   QStringList bitsList;
   for (int i = (int)ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; i > 0; --i)
@@ -243,10 +243,10 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
 
   bool vulnIgnored = true;
   // find current main state
-  ProjectDataManagement::VulnerabilityState mainVulState = newState.vulnerabilityState();
-  if (newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance &&
-      newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss &&
-      newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
+  ProjectDataManagement::VulnerabilityState mainVulState = newState.vulnerabilityState;
+  if (newState.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance &&
+      newState.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss &&
+      newState.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
   {
     vulnIgnored = false;
 
@@ -269,19 +269,19 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
   if (mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged)
     WARNING_LOG(m_logger) << "Sending a BC (VBG12) if the last vuln is CR (VBG0) is not allowed! Something went wrong on the sender side (TNE?)";
 
-  DEBUG_LOG(m_logger) << "setState for eqid: " << newState.equipmentNumber()
-                      << "\nvuln was: " << (int)newState.vulnerabilityState().underlying()
-                      << "\nvuln now: " << (int)mainVulState.underlying()
-                      << "\nbits (DEC): " << newState.vulnerabilityBits()
+  DEBUG_LOG(m_logger) << "setState for eqid: " << newState.equipmentNumber
+                      << "\nvuln was: " << (int)newState.vulnerabilityState
+                      << "\nvuln now: " << (int)mainVulState
+                      << "\nbits (DEC): " << newState.vulnerabilityBits
                       << "\nbits: " << (bitsList.isEmpty() ? QStringLiteral("<empty>") : bitsList.join(QStringLiteral(",")))
                       << "\nvuln ignored? " << vulnIgnored
                          ;
 
   // some old system or ddsview/LogView sent us an equipmentState with no vulnerability bits -> set at least the current one
-  auto vulnerabilityBits = newState.vulnerabilityBits();
+  auto vulnerabilityBits = newState.vulnerabilityBits;
   if (vulnerabilityBits == 0)
   {
-    const int idx = static_cast<int>(mainVulState.underlying());
+    const int idx = static_cast<int>(mainVulState);
     vulnerabilityBits = (1 << idx);
     WARNING_LOG(m_logger) << "Missing vulnerabilityBits! bailing by supplementing by adding this vuln state to the bits";
   }
@@ -292,7 +292,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
     std::vector<ParticipantManagement::StateInformation> currentStates;
     for (const auto &s : stateHistory)
     {
-      if (s.stateTime() > newState.sampleTime())
+      if (s.stateTime > newState.sampleTime)
         currentStates.push_back(s);
     }
     m_mutex.lock();
@@ -302,7 +302,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
   auto sanResult = SanitationResult::Unhandled;
   auto sanEvaluation = SanitationEvaluation::NotApplicable;
 #ifdef GUEZ_MODE
-  if(newState.originatorType() == ProjectDataManagement::StateChangeOriginator::MedicalTimeout)
+  if(newState.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout)
   {
     /*!
      * \brief originatorId
@@ -312,16 +312,16 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
      *          For more precise info: ICD52
      */
     // Only watch lower byte!
-    quint8 originatorId = newState.originatorId();
+    quint8 originatorId = newState.originatorId;
     // If Player Unit has wrong Software, it sends its own equipment number. If so, just take the following values:
 
-    if (newState.originatorId() > 255)
+    if (newState.originatorId > 255)
     {
 
       WARNING_LOG(m_logger) << "Participant with EqNo "
-                            << m_participantData.equipmentNumber()
+                            << m_participantData.equipmentNumber
                             << " sent wrong Enum Values (Sanitation Eval / ~ Result): "
-                            << newState.originatorId()
+                            << newState.originatorId
                             << ". Defaulting to Eval = Okay, Result = Unhandled.";
       originatorId = 1; // Evaluation = Okay, Result = Unhandled.
     }
@@ -344,35 +344,35 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
 #endif
 
   //new state Temp Vis Damage
-  if(newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
-     newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss ||
-     newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
+  if(newState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
+     newState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss ||
+     newState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect)
   {
     //Get last state in history and use that result
     const ParticipantManagement::StateInformation lastState = ParticipantManagement::youngestStateInformation(stateHistory, false, false); //Don't Skip Sanitation!
-    sanResult = lastState.sanitationResult().underlying();
-    sanEvaluation = lastState.sanitationEvaluation().underlying();
+    sanResult = lastState.sanitationResult;
+    sanEvaluation = lastState.sanitationEvaluation;
   }
 
 
   if(mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ||
-     newState.originatorType() == ProjectDataManagement::StateChangeOriginator::FunctionalArea)
+     newState.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea)
     sanResult = SanitationResult::NoEffect;
 
   // [GUEZE-3313] Kontaminierter Teilnehmer trotz Dekontamination weiterhin nicht Vitalität von 100%
   // ICD 52 Kapitel 3.3.2.6.72 VBA / Vitalitaet / Anzeigeindex
-  int32_t vitality = newState.vitality();
+  int32_t vitality = newState.vitality;
 
   if(mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
     vitality = 100;
 
   ParticipantManagement::StateInformation state(mainVulState,
                                                 vulnerabilityBits,
-                                                newState.vulnerabilityKindId(),
+                                                newState.vulnerabilityKindId,
                                                 originatorId,
-                                                newState.originatorType(),
-                                                newState.originatorChargeTypeId(),
-                                                newState.sampleTime(),
+                                                newState.originatorType,
+                                                newState.originatorChargeTypeId,
+                                                newState.sampleTime,
                                                 vitality,
                                                 0,
                                                 sanResult,
@@ -396,11 +396,11 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
 
 bool Participant::setSpecialSensorData(const TrainingAreaBase::SpecialSensorData &data)
 {
-  if (m_lastSpecialSensorData > data.sampleTime())
+  if (m_lastSpecialSensorData > data.sampleTime)
     return false;
   m_mutex.lock();
-  m_lastSpecialSensorData = data.sampleTime();
-  m_dynamicData.specialSensorDataState(data.operationalState());
+  m_lastSpecialSensorData = data.sampleTime;
+  m_dynamicData.specialSensorDataState = data.operationalState;
   m_mutex.unlock();
   return true;
 }
@@ -410,52 +410,52 @@ bool Participant::setGear(const TrainingAreaBase::EquipmentGearAssignment &gearA
 {
   DEBUG_LOG(m_logger) << "Gear Assignment";
   // outdated?
-  if (m_lastGearUsage > gearAssignment.sampleTime())
+  if (m_lastGearUsage > gearAssignment.sampleTime)
     return false;
-  m_lastGearUsage = gearAssignment.sampleTime();
+  m_lastGearUsage = gearAssignment.sampleTime;
 
   // remember the old gears and readd the charges if the gear is still there in the new gear assignment
-  auto &gearVec = m_dynamicData.gear();
+  auto &gearVec = m_dynamicData.gear;
   std::vector<GearInformation> oldGearData;
   std::swap(gearVec, oldGearData);
-  gearVec.reserve(gearAssignment.gears().size());
+  gearVec.reserve(gearAssignment.gears.size());
   QSet<int> newGearIds;
-  newGearIds.reserve(gearAssignment.gears().size());
+  newGearIds.reserve(gearAssignment.gears.size());
 
-  for (const TrainingAreaBase::Gear &gear : gearAssignment.gears())
+  for (const TrainingAreaBase::Gear &gear : gearAssignment.gears)
   {
-    if (gear.gearId() == 0)
+    if (gear.gearId == 0)
     {
       WARNING_LOG(m_logger) << "Got a gear assignment but gear id is 0 - old Saab AGDUS? - ignoring";
       continue;
     }
-    newGearIds += gear.gearId();
-    gearVec.emplace_back(gear.gearId(),
-                         gear.gearTypeId(),
+    newGearIds += gear.gearId;
+    gearVec.emplace_back(gear.gearId,
+                         gear.gearTypeId,
                          -1,
                          -1,
-                         gearAssignment.sampleTime(),
-                         gear.chargeCounting());
+                         gearAssignment.sampleTime,
+                         gear.chargeCounting);
   }
-  auto it = m_dynamicData.designations().begin();
-  while (it != m_dynamicData.designations().end())
+  auto it = m_dynamicData.designations.begin();
+  while (it != m_dynamicData.designations.end())
   {
-    if (newGearIds.contains(it->gearId()))
+    if (newGearIds.contains(it->gearId))
       ++it;
     else
     {
-      DEBUG_LOG(m_logger) << "Gear Assignment: Removing Designation with gearId: " << it->gearId();
-      it = m_dynamicData.designations().erase(it);
+      DEBUG_LOG(m_logger) << "Gear Assignment: Removing Designation with gearId: " << it->gearId;
+      it = m_dynamicData.designations.erase(it);
     }
   }
 
   // readd old charges if gear is still there
   for (GearInformation &gi : oldGearData)
   {
-    if (!newGearIds.contains(gi.gearId()))
+    if (!newGearIds.contains(gi.gearId))
       continue;
     // to not be ignored
-    gi.lastUpdate(gearAssignment.sampleTime());
+    gi.lastUpdate = gearAssignment.sampleTime;
     setGearCharge(gi);
   }
   return true;
@@ -476,23 +476,23 @@ bool Participant::setSanitationMaterial(int materialCount, const std::vector<int
     newStock.emplace_back(i + 1, materialStock.at(i));
   }
   //as we don't change the amount during an exercise we can override directly
-  m_dynamicData.sanitationMaterialStock(newStock);
-  m_dynamicData.sanitationUniqueId(abgSn);
-  m_dynamicData.qualification(qualif);
-  m_dynamicData.sanitationOriginatorEquipNo(eqNo);
+  m_dynamicData.sanitationMaterialStock = newStock;
+  m_dynamicData.sanitationUniqueId = abgSn;
+  m_dynamicData.qualification = qualif;
+  m_dynamicData.sanitationOriginatorEquipNo = eqNo;
   m_mutex.unlock();
   return true;
 }
 
 bool Participant::setSanitation(qint64 sanitationProceduresTaken, TrainingAreaBase::SanitationResult sanitationResult, TrainingAreaBase::SanitationEvaluation sanitationEvaluation, int originatorId, TrainingAreaBase::Qualification qualification, qint64 sampleTime)
 {
-  auto &stateHistory = m_dynamicData.stateHistory();
+  auto &stateHistory = m_dynamicData.stateHistory;
   ParticipantManagement::StateInformation lastState;
 
   // search for CombatReady state, ignore newState if it is older
   for (const auto &s : stateHistory)
   {
-    if (s.stateTime() > lastState.stateTime())
+    if (s.stateTime > lastState.stateTime)
       lastState = s;
   }
 
@@ -502,17 +502,17 @@ bool Participant::setSanitation(qint64 sanitationProceduresTaken, TrainingAreaBa
   }
 
   ParticipantManagement::StateInformation state;
-  state.originatorId(originatorId);
-  state.originatorChargeTypeId(qualification.underlying());
-  state.originatorType(ProjectDataManagement::StateChangeOriginator::Sanitation);
-  state.vitality(lastState.vitality());
-  state.vulnerabilityBits(lastState.vulnerabilityBits());
-  state.vulnerabilityKindId(lastState.vulnerabilityKindId());
-  state.vulnerabilityState(lastState.vulnerabilityState());
-  state.sanitationProceduresTaken(sanitationProceduresTaken);
-  state.sanitationResult(static_cast<ParticipantManagement::SanitationResult>(sanitationResult.underlying()));
-  state.sanitationEvaluation(static_cast<ParticipantManagement::SanitationEvaluation>(sanitationEvaluation.underlying()));
-  state.stateTime(sampleTime);
+  state.originatorId = originatorId;
+  state.originatorChargeTypeId = static_cast<int>(qualification);
+  state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation;
+  state.vitality = lastState.vitality;
+  state.vulnerabilityBits = lastState.vulnerabilityBits;
+  state.vulnerabilityKindId = lastState.vulnerabilityKindId;
+  state.vulnerabilityState = lastState.vulnerabilityState;
+  state.sanitationProceduresTaken = sanitationProceduresTaken;
+  state.sanitationResult = static_cast<ParticipantManagement::SanitationResult>(sanitationResult);
+  state.sanitationEvaluation = static_cast<ParticipantManagement::SanitationEvaluation>(sanitationEvaluation);
+  state.stateTime = sampleTime;
 
   m_mutex.lock();
   stateHistory.push_back(std::move(state));
@@ -522,29 +522,29 @@ bool Participant::setSanitation(qint64 sanitationProceduresTaken, TrainingAreaBa
 
 bool Participant::setOperatorAction(int action, int originatorId, qint64 sampleTime)
 {
-  auto &stateHistory = m_dynamicData.stateHistory();
+  auto &stateHistory = m_dynamicData.stateHistory;
   ParticipantManagement::StateInformation lastState;
 
   // search for CombatReady state, ignore newState if it is older
   for (const auto &s : stateHistory)
   {
-    if (s.stateTime() > lastState.stateTime())
+    if (s.stateTime > lastState.stateTime)
       lastState = s;
   }
 
   ParticipantManagement::StateInformation state;
-  state.originatorId(originatorId);
-  state.originatorChargeTypeId(action);
-  state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
-  state.vitality(lastState.vitality());
-  state.vulnerabilityBits(lastState.vulnerabilityBits());
-  state.vulnerabilityKindId(lastState.vulnerabilityKindId());
-  state.vulnerabilityState(lastState.vulnerabilityState());
+  state.originatorId = originatorId;
+  state.originatorChargeTypeId = action;
+  state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController;
+  state.vitality = lastState.vitality;
+  state.vulnerabilityBits = lastState.vulnerabilityBits;
+  state.vulnerabilityKindId = lastState.vulnerabilityKindId;
+  state.vulnerabilityState = lastState.vulnerabilityState;
   // 08: Wound paused
   // 35: Wound Continued
-  state.sanitationResult(ParticipantManagement::SanitationResult::NoEffect);
-  state.sanitationEvaluation(ParticipantManagement::SanitationEvaluation::NotApplicable);
-  state.stateTime(sampleTime);
+  state.sanitationResult = ParticipantManagement::SanitationResult::NoEffect;
+  state.sanitationEvaluation = ParticipantManagement::SanitationEvaluation::NotApplicable;
+  state.stateTime = sampleTime;
 
   m_mutex.lock();
   stateHistory.push_back(std::move(state));
@@ -555,26 +555,26 @@ bool Participant::setOperatorAction(int action, int originatorId, qint64 sampleT
 bool Participant::setEquipmentEvent(int event, qint64 sampleTime)
 {
 
-  auto &stateHistory = m_dynamicData.stateHistory();
+  auto &stateHistory = m_dynamicData.stateHistory;
   ParticipantManagement::StateInformation lastState;
 
   // search for CombatReady state, ignore newState if it is older
   for (const auto &s : stateHistory)
   {
-    if (s.stateTime() > lastState.stateTime())
+    if (s.stateTime > lastState.stateTime)
       lastState = s;
   }
 
   ParticipantManagement::StateInformation state;
-  state.originatorId(lastState.originatorId());
-  state.originatorChargeTypeId(event);
-  state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
-  state.vitality(lastState.vitality());
-  state.sanitationResult(lastState.sanitationResult());
-  state.vulnerabilityBits(lastState.vulnerabilityBits());
-  state.vulnerabilityKindId(lastState.vulnerabilityKindId());
-  state.vulnerabilityState(lastState.vulnerabilityState());
-  state.stateTime(sampleTime);
+  state.originatorId = lastState.originatorId;
+  state.originatorChargeTypeId = event;
+  state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController;
+  state.vitality = lastState.vitality;
+  state.sanitationResult = lastState.sanitationResult;
+  state.vulnerabilityBits = lastState.vulnerabilityBits;
+  state.vulnerabilityKindId = lastState.vulnerabilityKindId;
+  state.vulnerabilityState = lastState.vulnerabilityState;
+  state.stateTime = sampleTime;
 
   m_mutex.lock();
   stateHistory.push_back(std::move(state));
@@ -589,50 +589,50 @@ bool Participant::setGearCharge(const TrainingAreaBase::GearCharge &charge, qint
   if (m_lastGearUsage - 2 * 1000 > sampleTime)
     return false;
   GearInformation gearInfo;
-  gearInfo.gearId(charge.gearId());
-  gearInfo.gearTypeId(charge.gearTypeId());
-  gearInfo.chargeTypeId(charge.chargeTypeId());
-  gearInfo.remain(charge.remain());
-  gearInfo.lastUpdate(sampleTime);
+  gearInfo.gearId = charge.gearId;
+  gearInfo.gearTypeId = charge.gearTypeId;
+  gearInfo.chargeTypeId = charge.chargeTypeId;
+  gearInfo.remain = charge.remain;
+  gearInfo.lastUpdate = sampleTime;
 
   //set chargeCounting if needed
   bool count = false;
-  for (const auto gi : m_dynamicData.gear())
+  for (const auto gi : m_dynamicData.gear)
   {
-    if (gi.gearTypeId() == gearInfo.gearTypeId() && gi.chargeCounting())
+    if (gi.gearTypeId == gearInfo.gearTypeId && gi.chargeCounting)
       count = true;
   }
-  gearInfo.chargeCounting(count);
+  gearInfo.chargeCounting = count;
 
   return setGearCharge(gearInfo);
 }
 
 bool Participant::setGearCharge(const GearInformation &gearInfo)
 {
-  if (gearInfo.remain() < 0)
+  if (gearInfo.remain < 0)
     return true;
 
   // check if charge.chargeType is already known
-  int index = indexByGearAndChargeId(gearInfo.gearId(), gearInfo.chargeTypeId());
+  int index = indexByGearAndChargeId(gearInfo.gearId, gearInfo.chargeTypeId);
   int index_wanne=0;
   // Hack for old systems which neither send gearTasCode/gearType nor gearSerialNumber/gearId
   // 1 = Wanne, 2 = Turm, see TAB::send_to_dds.cpp
-  if (index < 0 && gearInfo.gearId() == 0)  // no location info in EquipmentGearEvent
+  if (index < 0 && gearInfo.gearId == 0)  // no location info in EquipmentGearEvent
   {
-    index = indexByGearAndChargeId(2, gearInfo.chargeTypeId()); // EquipmentGearEvent can only come from turret
-    index_wanne = indexByGearAndChargeId(1, gearInfo.chargeTypeId());
+    index = indexByGearAndChargeId(2, gearInfo.chargeTypeId); // EquipmentGearEvent can only come from turret
+    index_wanne = indexByGearAndChargeId(1, gearInfo.chargeTypeId);
   }
-  else if (index < 0 && gearInfo.gearId() == 2)
-    index = indexByGearAndChargeId(0, gearInfo.chargeTypeId());
+  else if (index < 0 && gearInfo.gearId == 2)
+    index = indexByGearAndChargeId(0, gearInfo.chargeTypeId);
 
   if (index < 0)  // not known but maybe a gear assignment (no charge info available yet)
-    index = indexByGearAndChargeId(gearInfo.gearId());
+    index = indexByGearAndChargeId(gearInfo.gearId);
 
   bool bRet = false;
   if (index < 0)
   {
     m_mutex.lock();
-    m_dynamicData.gear().push_back(gearInfo); // new gear/charge combo - append
+    m_dynamicData.gear.push_back(gearInfo); // new gear/charge combo - append
     m_mutex.unlock();
     bRet = true;
   }
@@ -640,25 +640,25 @@ bool Participant::setGearCharge(const GearInformation &gearInfo)
   {
     // already known, check for new data and update
     m_mutex.lock();
-    auto &gi = m_dynamicData.gear()[index];
-    if (gi.lastUpdate() <= gearInfo.lastUpdate())
+    auto &gi = m_dynamicData.gear[index];
+    if (gi.lastUpdate <= gearInfo.lastUpdate)
     {
-      const bool chargeCounting = gi.chargeCounting();
-      const bool bAdjustTurretInfo = (gearInfo.gearId() == 0 && gi.gearId() == 2);
+      const bool chargeCounting = gi.chargeCounting;
+      const bool bAdjustTurretInfo = (gearInfo.gearId == 0 && gi.gearId == 2);
       gi = gearInfo;
       if (bAdjustTurretInfo)
       {
-        int substr = m_dynamicData.gear()[index_wanne].remain();
+        int substr = m_dynamicData.gear[index_wanne].remain;
         INFO_LOG(m_logger) << "Adjust Turret - substracting index wanne " << substr;
-        if (gi.remain() >= substr)
-          gi.remain() = gi.remain() - m_dynamicData.gear()[index_wanne].remain();
-        INFO_LOG(m_logger) << "Turret remain " << gi.remain();
-        gi.gearId(2);
+        if (gi.remain >= substr)
+          gi.remain = gi.remain - m_dynamicData.gear[index_wanne].remain;
+        INFO_LOG(m_logger) << "Turret remain " << gi.remain;
+        gi.gearId = 2;
       }
-      if (gearInfo.chargeCounting())
-        gi.chargeCounting(gearInfo.chargeCounting());
+      if (gearInfo.chargeCounting)
+        gi.chargeCounting = gearInfo.chargeCounting;
       else
-        gi.chargeCounting(chargeCounting);
+        gi.chargeCounting = chargeCounting;
       bRet = true;
     }
     m_mutex.unlock();
@@ -671,17 +671,17 @@ void Participant::setDynamicData(const DynamicParticipantData &data)
   m_mutex.lock();
   m_dynamicData = data;
 
-  m_lastGearUsage = m_dynamicData.sampleTime();
-  for (const auto &g : m_dynamicData.gear())
-    m_lastGearUsage = std::min(m_lastGearUsage, g.lastUpdate());
+  m_lastGearUsage = m_dynamicData.sampleTime;
+  for (const auto &g : m_dynamicData.gear)
+    m_lastGearUsage = std::min(m_lastGearUsage, static_cast<qint64>(g.lastUpdate));
 
-  m_lastManipulationReset = m_dynamicData.sampleTime();
-  for (const auto &m : m_dynamicData.manipulation())
-    m_lastManipulationReset = std::min(m_lastManipulationReset, m.manipulationTime());
+  m_lastManipulationReset = m_dynamicData.sampleTime;
+  for (const auto &m : m_dynamicData.manipulation)
+    m_lastManipulationReset = std::min(m_lastManipulationReset, static_cast<qint64>(m.manipulationTime));
   m_lastNbcState = m_lastManipulationReset;
 
-  m_lastSpecialSensorData = m_dynamicData.sampleTime();
-  m_dynamicData.sampleTime(0);  // for publishing, see publishDynamicData
+  m_lastSpecialSensorData = m_dynamicData.sampleTime;
+  m_dynamicData.sampleTime = 0;  // for publishing, see publishDynamicData
   m_mutex.unlock();
 }
 
@@ -690,17 +690,17 @@ void Participant::setMode(const ParticipantMode &data)
   m_mutex.lock();
   m_participantMode = data;
 
-  m_participantMode.sampleTime(0);  // for publishing, see publishDynamicData
+  m_participantMode.sampleTime = 0;  // for publishing, see publishDynamicData
   m_mutex.unlock();
 }
 
 bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignState, int32_t equipmentNumber) const
 {
-  const auto oldAssignState = m_participantData.assignState();
-  if (oldAssignState == newAssignState && m_participantData.equipmentNumber() == equipmentNumber)
+  const auto oldAssignState = m_participantData.assignState;
+  if (oldAssignState == newAssignState && m_participantData.equipmentNumber == equipmentNumber)
     return true;
 
-  switch (newAssignState.underlying())
+  switch (newAssignState)
   {
   case ParticipantAssignState::NotAssigned:
     if (equipmentNumber)
@@ -755,7 +755,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
   case ParticipantAssignState::ExconWmsOverruled:
     // special case: warehouse doesn't like the equipment number set (ICD23, State C2)
     if (oldAssignState == ParticipantAssignState::HandoutExcon &&
-        equipmentNumber == m_participantData.equipmentNumber())
+        equipmentNumber == m_participantData.equipmentNumber)
       return true;
     if (oldAssignState != ParticipantAssignState::AssignedWms &&
         oldAssignState != ParticipantAssignState::ExconWmsOverruled &&
@@ -775,14 +775,14 @@ bool Participant::hasToBeChanged(const ParticipantManagement::Participant &data)
 {
   const ParticipantBase &baseData = data;
   bool bRet = hasToBeChanged(baseData);
-  if (hasNewSuperiorId(data.superiorId()))
+  if (hasNewSuperiorId(data.superiorId))
     bRet = true;
-  if (hasNewInferiorStructure(data.inferiorIds()))
+  if (hasNewInferiorStructure(data.inferiorIds))
     bRet = true;
-  if (data.identification() != m_participantData.identification())
+  if (data.identification != m_participantData.identification)
   {
     bRet = true;
-    m_participantData.identification(data.identification());
+    m_participantData.identification = data.identification;
   }
   return bRet;
 }
@@ -793,26 +793,26 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
   ParticipantManagement::ParticipantBase &curData = m_participantData;
   bool hasChanges = (curData != data);
 
-  auto assignState = m_participantData.assignState();
-  if (assignState != data.assignState())
+  auto assignState = m_participantData.assignState;
+  if (assignState != data.assignState)
   {
-    assignState = data.assignState();
+    assignState = data.assignState;
     hasChanges = true;
   }
 
   int newEquipmentNumber = 0;
   // don't know why this is needed though
-  if (m_participantData.equipmentNumber.is_set())
+  if (m_participantData.equipmentNumber.has_value())
     newEquipmentNumber = m_participantData.equipmentNumber.get();
 
-  if (data.equipmentNumber.is_set() && m_participantData.equipmentNumber() != data.equipmentNumber())
+  if (data.equipmentNumber.has_value() && m_participantData.equipmentNumber != data.equipmentNumber)
   {
     newEquipmentNumber = data.equipmentNumber.get();
     hasChanges = true;
   }
 
   // = Reserved for excon
-  if (!data.equipmentNumber.is_set() &&
+  if (!data.equipmentNumber.has_value() &&
       assignState == ParticipantManagement::ParticipantAssignState::HandoutExcon)
   {
     newEquipmentNumber = 0;
@@ -824,7 +824,7 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
   if (assignState == ParticipantManagement::ParticipantAssignState::NotAssigned ||
       assignState == ParticipantManagement::ParticipantAssignState::ExconWmsOverruled)
   {
-    if (m_participantData.equipmentNumber() != 0)
+    if (m_participantData.equipmentNumber != 0)
     {
       newEquipmentNumber = 0;
       hasChanges = true;
@@ -833,17 +833,17 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
 
   if (hasChanges)
   {
-    if (curData.typeId() != data.typeId())
-      m_bPublishPosition = !m_participantHandler->isUnitType(data.typeId());
+    if (curData.typeId != data.typeId)
+      m_bPublishPosition = !m_participantHandler->isUnitType(data.typeId);
 
-    const int oldEquipNo = curData.equipmentNumber.is_set() ? curData.equipmentNumber.get() : 0;
+    const int oldEquipNo = curData.equipmentNumber.has_value() ? curData.equipmentNumber.get() : 0;
 
     curData = data;
 
     if (!updateEquipmentExerciseMapping(oldEquipNo, newEquipmentNumber))
     {
-      curData.equipmentNumber().reset();
-      curData.assignState(ParticipantAssignState::NotAssigned);
+      curData.equipmentNumber.reset();
+      curData.assignState = ParticipantAssignState::NotAssigned;
     }
   }
 
@@ -852,8 +852,8 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
 
 bool Participant::hasNewSuperiorId(int32_t superiorId)
 {
-  bool result = m_participantData.superiorId() != superiorId;
-  m_participantData.superiorId(superiorId);
+  bool result = m_participantData.superiorId != superiorId;
+  m_participantData.superiorId = superiorId;
 
   if (result)
     m_unitPosCalculator->onSuperiorChanged(id(), superiorId);
@@ -866,10 +866,10 @@ bool Participant::hasNewInferiorStructure(std::vector<int32_t> inferiorIds)
   // no need to sort m_inferiorIds - they're sorted since they are always filled with this function
   std::sort(inferiorIds.begin(), inferiorIds.end());
 
-  if (m_participantData.inferiorIds() != inferiorIds)
+  if (m_participantData.inferiorIds != inferiorIds)
   {
-    m_participantData.inferiorIds(inferiorIds);
-    m_unitPosCalculator->onInferiorChanged(id(), m_participantData.inferiorIds());
+    m_participantData.inferiorIds = inferiorIds;
+    m_unitPosCalculator->onInferiorChanged(id(), m_participantData.inferiorIds);
     return true;
   }
 
@@ -880,35 +880,35 @@ bool Participant::setOperationalState(const TrainingAreaBase::EquipmentOperation
 {
   m_mutex.lock();
   bool bRet = false;
-  if (operationalState.isManipulation().is_set())
+  if (operationalState.isManipulation.has_value())
   {
-    if (operationalState.equipmentFunctionId.is_set() &&
-        operationalState.isManipulation().get() &&
-        operationalState.sampleTime() > m_lastManipulationReset) // add if there is a new manipulation which is not outdated
+    if (operationalState.equipmentFunctionId.has_value() &&
+        operationalState.isManipulation.get() &&
+        operationalState.sampleTime > m_lastManipulationReset) // add if there is a new manipulation which is not outdated
     {
       removeManipulation(operationalState.equipmentFunctionId.get()); // precautionary
-      m_dynamicData.manipulation().emplace_back(operationalState.equipmentFunctionId.get(),
-                                                operationalState.sampleTime());
+      m_dynamicData.manipulation.emplace_back(operationalState.equipmentFunctionId.get(),
+                                                operationalState.sampleTime);
       bRet = true;
     }
-    else if (!operationalState.isManipulation().get()) // if manipulation is set to false, clean manipulations
+    else if (!operationalState.isManipulation.get()) // if manipulation is set to false, clean manipulations
     {
-      if (m_lastManipulationReset < operationalState.sampleTime())
+      if (m_lastManipulationReset < operationalState.sampleTime)
       {
-        m_lastManipulationReset = operationalState.sampleTime();
+        m_lastManipulationReset = operationalState.sampleTime;
         cleanManipulations();
         bRet = true;
       }
     }
   }
 
-  if (operationalState.nbcProtectionActive().is_set() &&
-      m_lastNbcState < operationalState.sampleTime())
+  if (operationalState.nbcProtectionActive.has_value() &&
+      m_lastNbcState < operationalState.sampleTime)
   {
-    m_dynamicData.hasNbcProtectionActive(operationalState.nbcProtectionActive().get());
-    m_dynamicData.hasNbcProtectionConfigured(operationalState.nbcProtectionActive().get());
+    m_dynamicData.hasNbcProtectionActive = operationalState.nbcProtectionActive.get();
+    m_dynamicData.hasNbcProtectionConfigured = operationalState.nbcProtectionActive.get();
 
-    m_lastNbcState = operationalState.sampleTime();
+    m_lastNbcState = operationalState.sampleTime;
     bRet = true;
   }
   m_mutex.unlock();
@@ -920,8 +920,8 @@ RegisterParticipantRequest Participant::toRegisterParticipantRequest() const
   return RegisterParticipantRequest(id(),
                                     equipmentNumber(),
                                     assignState(),
-                                    m_participantData.identification(),
-                                    m_participantData.info());
+                                    m_participantData.identification,
+                                    m_participantData.info);
 }
 
 bool Participant::publishPosition()
@@ -930,9 +930,9 @@ bool Participant::publishPosition()
     return true;
 
   m_mutex.lock();
-  m_positionToPublish.participantId(id());
-  m_positionToPublish.participantTypeId(typeId());
-  m_positionToPublish.partyId(partyId());
+  m_positionToPublish.participantId = id();
+  m_positionToPublish.participantTypeId = typeId();
+  m_positionToPublish.partyId = partyId();
   m_mutex.unlock();
 
   if (m_positionToPublish == m_positionPublished)
@@ -950,17 +950,17 @@ bool Participant::publishPosition()
 bool Participant::publishDynamicData()
 {
   m_mutex.lock();
-  m_dynamicDataPublished.sampleTime(0);  // for comparision
+  m_dynamicDataPublished.sampleTime = 0;  // for comparision
   m_mutex.unlock();
   if (m_dynamicData == m_dynamicDataPublished)
   {
-    if ( m_dynamicData.designations().size() == m_dynamicDataPublished.designations().size() )
+    if ( m_dynamicData.designations.size() == m_dynamicDataPublished.designations.size() )
     {
       int i = 0;
       bool equal = true;
-      for (LaserDesignation &laserDesignation : m_dynamicData.designations())
+      for (LaserDesignation &laserDesignation : m_dynamicData.designations)
       {
-        if (laserDesignation != m_dynamicDataPublished.designations().at(i))
+        if (laserDesignation != m_dynamicDataPublished.designations.at(i))
         {
           equal = false;
           break;
@@ -973,7 +973,7 @@ bool Participant::publishDynamicData()
   }
   m_mutex.lock();
   m_dynamicDataPublished = m_dynamicData;
-  m_dynamicDataPublished.sampleTime(QDateTime::currentMSecsSinceEpoch());
+  m_dynamicDataPublished.sampleTime = QDateTime::currentMSecsSinceEpoch();
   auto copy = m_dynamicDataPublished;
   m_mutex.unlock();
 
@@ -983,13 +983,13 @@ bool Participant::publishDynamicData()
 bool Participant::publishMode()
 {
   m_mutex.lock();
-  m_participantMode.sampleTime(0);  // for comparision
+  m_participantMode.sampleTime = 0;  // for comparision
   m_mutex.unlock();
   if (m_participantMode == m_participantModePublished)
     return true;
   m_mutex.lock();
   m_participantModePublished = m_participantMode;
-  m_participantModePublished.sampleTime(QDateTime::currentMSecsSinceEpoch());
+  m_participantModePublished.sampleTime = QDateTime::currentMSecsSinceEpoch();
   auto copy = m_participantModePublished;
   m_mutex.unlock();
 
@@ -999,13 +999,13 @@ bool Participant::publishMode()
 bool Participant::publishParticipant()
 {
   m_mutex.lock();
-  m_participantPublished.sampleTime(0);  // for comparision
+  m_participantPublished.sampleTime = 0;  // for comparision
   m_mutex.unlock();
   if (m_participantData == m_participantPublished)
     return true;
   m_mutex.lock();
   m_participantPublished = m_participantData; // no swap!
-  m_participantPublished.sampleTime(QDateTime::currentMSecsSinceEpoch());
+  m_participantPublished.sampleTime = QDateTime::currentMSecsSinceEpoch();
   auto copy = m_participantPublished;
   m_mutex.unlock();
 
@@ -1017,26 +1017,26 @@ ParticipantManagement::Participant Participant::toDdsParticipant(const Database:
 {
   ParticipantManagement::Participant ret;
 
-  ret.id(data.id);
-  ret.partyId(data.partyId);
-  ret.hierarchyNumber(data.hierarchyNumber);
+  ret.id = data.id;
+  ret.partyId = data.partyId;
+  ret.hierarchyNumber = data.hierarchyNumber;
   if (data.equipmentNumber)
-    ret.equipmentNumber(data.equipmentNumber);
-  ret.typeId(data.typeId);
-  ret.externalId(data.externalId);
-  ret.symbol(data.symbol.toStdString());
-  ret.name(data.name.toStdString());
-  ret.designator(data.designator.toStdString());
-  ret.tacticalIdentifier(data.tacticalIdentifier.toStdString());
-  ret.info(data.info.toStdString());
-  ret.assignState(data.assignState);
-  ret.isSimulated(data.isSimulated);
-  ret.isDeleted(data.isDeleted);
+    ret.equipmentNumber = data.equipmentNumber;
+  ret.typeId = data.typeId;
+  ret.externalId = data.externalId;
+  ret.symbol = data.symbol.toStdString();
+  ret.name = data.name.toStdString();
+  ret.designator = data.designator.toStdString();
+  ret.tacticalIdentifier = data.tacticalIdentifier.toStdString();
+  ret.info = data.info.toStdString();
+  ret.assignState = data.assignState;
+  ret.isSimulated = data.isSimulated;
+  ret.isDeleted = data.isDeleted;
   //ret.sampleTime();
-  ret.superiorId(data.superiorId);
+  ret.superiorId = data.superiorId;
   //ret.inferiorIds();
-  ret.identification(data.identification.toStdString());
-  ret.properties(data.properties.toStdString());
+  ret.identification = data.identification.toStdString();
+  ret.properties = data.properties.toStdString();
 
   return ret;
 }
@@ -1044,23 +1044,23 @@ ParticipantManagement::Participant Participant::toDdsParticipant(const Database:
 Database::PpmParticipant Participant::toDbParticipant() const
 {
   Database::PpmParticipant ret;
-  ret.id = m_participantData.id();
-  ret.assignState = m_participantData.assignState();
-  ret.partyId = m_participantData.partyId();
-  ret.typeId = m_participantData.typeId();
-  ret.externalId = m_participantData.externalId();
-  ret.designator = QString::fromStdString(m_participantData.designator());
+  ret.id = m_participantData.id;
+  ret.assignState = m_participantData.assignState;
+  ret.partyId = m_participantData.partyId;
+  ret.typeId = m_participantData.typeId;
+  ret.externalId = m_participantData.externalId;
+  ret.designator = QString::fromStdString(m_participantData.designator);
   ret.equipmentNumber = equipmentNumber();
-  ret.hierarchyNumber = m_participantData.hierarchyNumber();
-  ret.identification = QString::fromStdString(m_participantData.identification());
-  ret.info = QString::fromStdString(m_participantData.info());
-  ret.isDeleted = m_participantData.isDeleted();
-  ret.isSimulated = m_participantData.isSimulated();
-  ret.name = QString::fromStdString(m_participantData.name());
-  ret.superiorId = m_participantData.superiorId();
-  ret.symbol = QString::fromStdString(m_participantData.symbol());
-  ret.tacticalIdentifier = QString::fromStdString(m_participantData.tacticalIdentifier());
-  ret.properties = QString::fromStdString(m_participantData.properties());
+  ret.hierarchyNumber = m_participantData.hierarchyNumber;
+  ret.identification = QString::fromStdString(m_participantData.identification);
+  ret.info = QString::fromStdString(m_participantData.info);
+  ret.isDeleted = m_participantData.isDeleted;
+  ret.isSimulated = m_participantData.isSimulated;
+  ret.name = QString::fromStdString(m_participantData.name);
+  ret.superiorId = m_participantData.superiorId;
+  ret.symbol = QString::fromStdString(m_participantData.symbol);
+  ret.tacticalIdentifier = QString::fromStdString(m_participantData.tacticalIdentifier);
+  ret.properties = QString::fromStdString(m_participantData.properties);
 
   return ret;
 }
@@ -1069,10 +1069,10 @@ Database::PpmParticipant Participant::toDbParticipant() const
 void Participant::removeManipulation(int32_t equipmentFunctionId)
 {
   size_t i = 0;
-  auto &manipulation = m_dynamicData.manipulation();
+  auto &manipulation = m_dynamicData.manipulation;
   for (; i < manipulation.size(); ++i)
   {
-    if (manipulation.at(i).equipmentFunctionId() == equipmentFunctionId)
+    if (manipulation.at(i).equipmentFunctionId == equipmentFunctionId)
       break;
   }
   if (i >= manipulation.size()) // not found
@@ -1086,22 +1086,22 @@ void Participant::removeManipulation(int32_t equipmentFunctionId)
 void Participant::cleanManipulations()
 {
   std::vector<ManipulationInformation> currentManipulations;
-  currentManipulations.reserve(m_dynamicData.manipulation().size());
+  currentManipulations.reserve(m_dynamicData.manipulation.size());
 
-  for (const ManipulationInformation &info : m_dynamicData.manipulation())
+  for (const ManipulationInformation &info : m_dynamicData.manipulation)
   {
-    if (info.manipulationTime() >= m_lastManipulationReset)
+    if (info.manipulationTime >= m_lastManipulationReset)
       currentManipulations.push_back(info);
   }
-  m_dynamicData.manipulation(currentManipulations);
+  m_dynamicData.manipulation = currentManipulations;
 }
 
 bool Participant::gearHasCharge(int32_t gearId) const
 {
-  for (const GearInformation &gearInfo : m_dynamicData.gear())
+  for (const GearInformation &gearInfo : m_dynamicData.gear)
   {
-    if (gearInfo.gearId() == gearId)
-      return gearInfo.chargeTypeId() != -1; // -1 indicates, that there was no charge associated
+    if (gearInfo.gearId == gearId)
+      return gearInfo.chargeTypeId != -1; // -1 indicates, that there was no charge associated
   }
 
   return false;
@@ -1109,17 +1109,17 @@ bool Participant::gearHasCharge(int32_t gearId) const
 
 int32_t Participant::indexByGearAndChargeId(int32_t gearId, int32_t chargeTypeId) const
 {
-  const auto &gears = m_dynamicData.gear();
+  const auto &gears = m_dynamicData.gear;
   for (size_t i = 0; i < gears.size(); ++i)
   {
     const auto &gear = gears.at(i);
-    if (gear.gearId() == gearId)
+    if (gear.gearId == gearId)
     {
       // search for gear with empty charge
-      if (chargeTypeId == -1 && gear.chargeTypeId() == -1)
+      if (chargeTypeId == -1 && gear.chargeTypeId == -1)
         return i;
       // search for gear with specific charge
-      if (gear.chargeTypeId() == chargeTypeId)
+      if (gear.chargeTypeId == chargeTypeId)
         return i;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
index 5887586d6..887eb0c6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
@@ -35,15 +35,15 @@ public:
 
   virtual ~Participant();
 
-  int32_t id() const { return m_participantData.id(); }
-  int32_t typeId() const { return m_participantData.typeId(); }
-  int32_t superiorId() const { return m_participantData.superiorId(); }
+  int32_t id() const { return m_participantData.id; }
+  int32_t typeId() const { return m_participantData.typeId; }
+  int32_t superiorId() const { return m_participantData.superiorId; }
   // return optional?
-  int32_t equipmentNumber() const { return m_participantData.equipmentNumber.is_set() ? m_participantData.equipmentNumber.get() : 0; }
-  int32_t partyId() const { return m_participantData.partyId(); }
-  bool isDeleted() const { return m_participantData.isDeleted(); }
-  ParticipantAssignState assignState() const { return m_participantData.assignState(); }
-  const std::vector<int32_t> &inferiors() const { return m_participantData.inferiorIds(); }
+  int32_t equipmentNumber() const { return m_participantData.equipmentNumber.has_value() ? m_participantData.equipmentNumber.get() : 0; }
+  int32_t partyId() const { return m_participantData.partyId; }
+  bool isDeleted() const { return m_participantData.isDeleted; }
+  ParticipantAssignState assignState() const { return m_participantData.assignState; }
+  const std::vector<int32_t> &inferiors() const { return m_participantData.inferiorIds; }
   ParticipantPosition position() const { return m_positionPublished; }
   const DynamicParticipantData &dynamicParticipantData() const { return m_dynamicData; }
   const ParticipantManagement::Participant &participantData() const { return m_participantData; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_for_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_for_exercise.cpp
index 98905fc80..ab1b1b40e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_for_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_for_exercise.cpp
@@ -52,8 +52,8 @@ bool ParticipantForExercise::applyEquipmentExerciseMapping(int newEqId)
                       << ", " << dbEem.exerciseId;
   if (!m_mainHandler->dbEx0()->insert(dbEem))
   {
-    m_participantData.equipmentNumber().reset();
-    m_participantData.assignState(ParticipantAssignState::NotAssigned);
+    m_participantData.equipmentNumber.reset();
+    m_participantData.assignState = ParticipantAssignState::NotAssigned;
     publishParticipant();
     return false;
   }
@@ -104,15 +104,15 @@ void ParticipantForExercise::removeFromDds()  // only called on shutdown
 
 void ParticipantForExercise::registerInfoFromFt(const RegisterParticipantRequest &request)
 {
-  m_participantData.info(request.info());
-  m_participantData.identification(request.identification());
+  m_participantData.info = request.info;
+  m_participantData.identification = request.identification;
 }
 
 bool ParticipantForExercise::registerFromFt(const RegisterParticipantRequest &request)
 {
-  int newEquipmentNumber = request.equipmentNumber();
+  int newEquipmentNumber = request.equipmentNumber;
   // just to be sure ...
-  if (request.assignState() == ParticipantAssignState::NotAssigned)
+  if (request.assignState == ParticipantAssignState::NotAssigned)
     newEquipmentNumber = 0;
 
   if (!updateEquipmentExerciseMapping(equipmentNumber(), newEquipmentNumber))
@@ -122,17 +122,17 @@ bool ParticipantForExercise::registerFromFt(const RegisterParticipantRequest &re
                                                         id());
 
   INFO_LOG(m_logger) << "Set assign state for participant " << id() << " from "
-                     << assignState() << " to " << request.assignState()
+                     << assignState() << " to " << request.assignState
                      << ", old eqid: " << equipmentNumber() << ", new eqid: "
                      << newEquipmentNumber;
 
   if (newEquipmentNumber)
-    m_participantData.equipmentNumber(newEquipmentNumber);
+    m_participantData.equipmentNumber = newEquipmentNumber;
   else
-    m_participantData.equipmentNumber().reset();
-  m_participantData.assignState(request.assignState());
-  m_participantData.info(request.info());
-  m_participantData.identification(request.identification());
+    m_participantData.equipmentNumber.reset();
+  m_participantData.assignState = request.assignState;
+  m_participantData.info = request.info;
+  m_participantData.identification = request.identification;
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp
index d2bc4acc2..763257a6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp
@@ -41,7 +41,7 @@ void ParticipantHandler::clearParticipants()
 {
   // clear maps
   for (auto it = m_hitLineInfoMap.cbegin(); it != m_hitLineInfoMap.cend(); ++it)
-    dts()->removeHitLineInfoByKey(it.value().id());
+    dts()->removeHitLineInfoByKey(it.value().id);
   m_hitLineInfoMap.clear();
 
   for (auto p : std::as_const(m_participants))
@@ -97,49 +97,49 @@ void ParticipantHandler::onNewGearEvent(const TrainingAreaBase::EquipmentGearEve
 {
   if (isTelegramInFuture(gearEvent))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentGearEvent which has a timestamp in the future: " << gearEvent.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentGearEvent which has a timestamp in the future: " << gearEvent.sampleTime;
     return;
   }
 
   // NOTE: gearEvent.chargeAmount() is not used because there is no usecase for this value ... atm
 
-  Participant *participantToBeChanged = participantByEquipmentNumber(gearEvent.equipmentNumber());
+  Participant *participantToBeChanged = participantByEquipmentNumber(gearEvent.equipmentNumber);
   if (!participantToBeChanged)
   {
-    WARNING_LOG(m_logger) << "Got gear charge state for unknown equipment number " << gearEvent.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got gear charge state for unknown equipment number " << gearEvent.equipmentNumber;
     return;
   }
 
-  participantToBeChanged->setGearCharge(gearEvent.charge(), gearEvent.sampleTime());
+  participantToBeChanged->setGearCharge(gearEvent.charge, gearEvent.sampleTime);
   participantToBeChanged->publishDynamicData();
 
   // publish gear event
   dts()->publish(
       ParticipantGearEvent(participantToBeChanged->id(),
-                           gearEvent.sampleTime(),
-                           gearEvent.chargeAmount(),
-                           GearCharge(gearEvent.charge().gearId(), gearEvent.charge().gearTypeId(), gearEvent.charge().chargeTypeId(), gearEvent.charge().remain())));
+                           gearEvent.sampleTime,
+                           gearEvent.chargeAmount,
+                           GearCharge(gearEvent.charge.gearId, gearEvent.charge.gearTypeId, gearEvent.charge.chargeTypeId, gearEvent.charge.remain)));
 }
 
 void ParticipantHandler::onNewGearChargeStateFromProxy(const TrainingAreaBase::EquipmentGearChargeState &chargeState)
 {
   if (isTelegramInFuture(chargeState))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentGearChargeState which has a timestamp in the future: " << chargeState.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentGearChargeState which has a timestamp in the future: " << chargeState.sampleTime;
     return;
   }
 
-  const int equipNo = chargeState.equipmentNumber();
+  const int equipNo = chargeState.equipmentNumber;
   Participant *participantToBeChanged = equipNo < 0 ? participantById(-equipNo) : participantByEquipmentNumber(equipNo);
 
   if (!participantToBeChanged)
   {
-    WARNING_LOG(m_logger) << "Got gear charge state for unknown equipment number " << chargeState.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got gear charge state for unknown equipment number " << chargeState.equipmentNumber;
     return;
   }
 
-  for (const TrainingAreaBase::GearCharge &charge : chargeState.charge())
-    participantToBeChanged->setGearCharge(charge, chargeState.sampleTime());
+  for (const TrainingAreaBase::GearCharge &charge : chargeState.charge)
+    participantToBeChanged->setGearCharge(charge, chargeState.sampleTime);
   participantToBeChanged->publishDynamicData();
 
   emit gearChargeChanged(participantToBeChanged->id(), participantToBeChanged->partyId());
@@ -149,13 +149,13 @@ void ParticipantHandler::onNewGearAssignmentFromProxy(const TrainingAreaBase::Eq
 {
   if (isTelegramInFuture(gearAssignment))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentGearAssignment which has a timestamp in the future: " << gearAssignment.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentGearAssignment which has a timestamp in the future: " << gearAssignment.sampleTime;
     return;
   }
-  Participant *participantToBeChanged = participantByEquipmentNumber(gearAssignment.equipmentNumber());
+  Participant *participantToBeChanged = participantByEquipmentNumber(gearAssignment.equipmentNumber);
   if (!participantToBeChanged)
   {
-    WARNING_LOG(m_logger) << "Got gear assignment for unknown equipment number " << gearAssignment.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got gear assignment for unknown equipment number " << gearAssignment.equipmentNumber;
     return;
   }
 
@@ -167,34 +167,34 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
 {
   if (isTelegramInFuture(data))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentState which has a timestamp in the future: " << data.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentState which has a timestamp in the future: " << data.sampleTime;
     return;
   }
 
   // 1. handle included EquipmentPosition:
   TrainingAreaBase::EquipmentPosition pos;
-  pos.equipmentNumber(data.equipmentNumber());
-  pos.sampleTime(data.sampleTime());
-  if (data.position.is_set())
+  pos.equipmentNumber = data.equipmentNumber;
+  pos.sampleTime = data.sampleTime;
+  if (data.position.has_value())
   {
-    pos.position(data.position.get());
+    pos.position = data.position.get();
     onNewPositionFromProxy(pos);
   }
 
   // 2. handle EquipmentState
-  Participant *participantToBeChanged = participantByEquipmentNumber(data.equipmentNumber());
+  Participant *participantToBeChanged = participantByEquipmentNumber(data.equipmentNumber);
   if (!participantToBeChanged)
   {
-    WARNING_LOG(m_logger) << "Got equipment state for unknown equipment number " << data.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got equipment state for unknown equipment number " << data.equipmentNumber;
     return;
   }
 
   // convert eqNo to participantId if originator was a participant and data.originatorId() is an equipment number
-  int originatorId = data.originatorId();
+  int originatorId = data.originatorId;
   Participant *originParticipant = nullptr;
-  if (data.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant)
+  if (data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
   {
-    originParticipant = participantByEquipmentNumber(data.originatorId());
+    originParticipant = participantByEquipmentNumber(data.originatorId);
     if (originParticipant)
       originatorId = originParticipant->id();
     else
@@ -203,20 +203,20 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
 
   // Make Laser Designations to Laser Designations
   auto dtcPdm = m_bdp->pdmDtc();
-  if (dtcPdm && dtcPdm->getChargeTypeSpecialProperty(data.originatorChargeTypeId(), 0, 0) == ProjectDataManagement::ChargeTypeProperty::LTD && originParticipant)
+  if (dtcPdm && dtcPdm->getChargeTypeSpecialProperty(data.originatorChargeTypeId, 0, 0) == ProjectDataManagement::ChargeTypeProperty::LTD && originParticipant)
   {
     QSet<int> ldGearTypes{1043}; // Need Property for LTD...
     DynamicParticipantData dpd = originParticipant->dynamicParticipantData();
-    auto it = std::find_if(dpd.gear().cbegin(), dpd.gear().cend(), [ldGearTypes](const GearInformation &gi) { return ldGearTypes.contains(gi.gearTypeId()); });
-    if (it != dpd.gear().cend())
+    auto it = std::find_if(dpd.gear.cbegin(), dpd.gear.cend(), [ldGearTypes](const GearInformation &gi) { return ldGearTypes.contains(gi.gearTypeId); });
+    if (it != dpd.gear.cend())
     {
-      for (auto &ld : dpd.designations())
+      for (auto &ld : dpd.designations)
       {
-        if (ld.gearId() != it->gearId())
+        if (ld.gearId != it->gearId)
           continue;
 
-        ld.spotLocation() = pos.position().position();
-        ld.outputPower() = 1.0;
+        ld.spotLocation = pos.position.position;
+        ld.outputPower = 1.0;
         originParticipant->setDynamicData(dpd);
         originParticipant->publishDynamicData();
         break;
@@ -229,7 +229,7 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
 
   participantToBeChanged->publishDynamicData();
 
-  createHitlineInfo(originatorId, originParticipant, participantToBeChanged, pos, data.originatorChargeTypeId(), data.sampleTime());
+  createHitlineInfo(originatorId, originParticipant, participantToBeChanged, pos, data.originatorChargeTypeId, data.sampleTime);
 }
 
 void ParticipantHandler::createHitlineInfo(int, Participant *, Participant *, const TrainingAreaBase::EquipmentPosition &, int, qint64)
@@ -242,17 +242,17 @@ void ParticipantHandler::onNewPositionFromProxy(const TrainingAreaBase::Equipmen
 {
   if (isTelegramInFuture(position))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentPosition which has a timestamp in the future: " << position.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentPosition which has a timestamp in the future: " << position.sampleTime;
     return;
   }
-  if (isTelegramOutdated(position) && position.position().reportingSource() != Core::PositionReportingSource::SetByOperator)
+  if (isTelegramOutdated(position) && position.position.reportingSource != Core::PositionReportingSource::SetByOperator)
   {
     INFO_LOG(m_logger) << "position is outdated: " << position;
     return;
   }
   DEBUG_LOG(m_logger) << "Got new position from proxy: " << position;
 
-  const int equipNo = position.equipmentNumber();
+  const int equipNo = position.equipmentNumber;
   // negative - treat as participantId
   Participant *participantWithNewPosition = equipNo < 0 ? participantById(-equipNo) : participantByEquipmentNumber(equipNo);
 
@@ -270,11 +270,11 @@ void ParticipantHandler::onNewEquipmentOperationalStateFromProxy(const TrainingA
 {
   if (isTelegramInFuture(operationalState))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentOperationalState which has a timestamp in the future: " << operationalState.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentOperationalState which has a timestamp in the future: " << operationalState.sampleTime;
     return;
   }
 
-  Participant *participantToUpdate = participantByEquipmentNumber(operationalState.equipmentNumber());
+  Participant *participantToUpdate = participantByEquipmentNumber(operationalState.equipmentNumber);
   if (!participantToUpdate)
   {
     WARNING_LOG(m_logger) << "Got EquipmentOperationalState for unknown equipment number: " << operationalState;
@@ -289,30 +289,30 @@ void ParticipantHandler::onNewBiteFromProxy(const TrainingAreaBase::EquipmentBit
 {
   if (isTelegramInFuture(bite))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentBite which has a timestamp in the future: " << bite.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentBite which has a timestamp in the future: " << bite.sampleTime;
     return;
   }
   if (isTelegramOutdated(bite))
   {
-    WARNING_LOG(m_logger) << "Got an EquipmentBite which has a timestamp in the past: " << bite.sampleTime();
+    WARNING_LOG(m_logger) << "Got an EquipmentBite which has a timestamp in the past: " << bite.sampleTime;
     return;
   }
 
   Bite biteData;
 
-  Participant *p = participantByEquipmentNumber(bite.equipmentNumber());
-  biteData.participantId(p ? p->id() : -1);
-  biteData.equipmentNumber(bite.equipmentNumber());
-  biteData.sampleTime(bite.sampleTime());
-  biteData.registerType(bite.registerType());
-  biteData.biteState(bite.biteState());
-  biteData.configState(bite.configState());
-  biteData.batteryState(bite.batteryState());
-  biteData.configError(bite.configError());
+  Participant *p = participantByEquipmentNumber(bite.equipmentNumber);
+  biteData.participantId = p ? p->id() : -1;
+  biteData.equipmentNumber = bite.equipmentNumber;
+  biteData.sampleTime = bite.sampleTime;
+  biteData.registerType = bite.registerType;
+  biteData.biteState = bite.biteState;
+  biteData.configState = bite.configState;
+  biteData.batteryState = bite.batteryState;
+  biteData.configError = bite.configError;
 
-  biteData.biteErrors().reserve(bite.biteErrors().size());
-  for (const TrainingAreaBase::EquipmentBiteError &error : bite.biteErrors())
-    biteData.biteErrors().emplace_back(error.errorNumber(), error.canDeviceNumber(), error.subdeviceNumber(), error.uniqueId());
+  biteData.biteErrors.reserve(bite.biteErrors.size());
+  for (const TrainingAreaBase::EquipmentBiteError &error : bite.biteErrors)
+    biteData.biteErrors.emplace_back(error.errorNumber, error.canDeviceNumber, error.subdeviceNumber, error.uniqueId);
 
   dts()->publish(biteData);
 }
@@ -321,11 +321,11 @@ void ParticipantHandler::onNewCtaDataErrorFromProxy(const TrainingAreaBase::CtaD
 {
   CtaError ctasErrorData;
 
-  ctasErrorData.equipmentNumber(error.equipmentNumber());
-  ctasErrorData.timeReceipt(currentTimeMSec());
-  ctasErrorData.timePlayerUnit(error.sampleTime());
-  ctasErrorData.errorReason(error.reason());
-  ctasErrorData.telegramId(error.originTelegramId());
+  ctasErrorData.equipmentNumber = error.equipmentNumber;
+  ctasErrorData.timeReceipt = currentTimeMSec();
+  ctasErrorData.timePlayerUnit = error.sampleTime;
+  ctasErrorData.errorReason = error.reason;
+  ctasErrorData.telegramId = error.originTelegramId;
 
   dts()->publish(ctasErrorData);
 }
@@ -334,39 +334,39 @@ void ParticipantHandler::onNewParticipantModeReport(const TrainingAreaBase::Part
 {
   if (isTelegramInFuture(report))
   {
-    WARNING_LOG(m_logger) << "Got a ParticipantModeReport which has a timestamp in the future: " << report.sampleTime();
+    WARNING_LOG(m_logger) << "Got a ParticipantModeReport which has a timestamp in the future: " << report.sampleTime;
     return;
   }
   if (isTelegramOutdated(report))
   {
-    WARNING_LOG(m_logger) << "Got a ParticipantModeReport which has a timestamp in the past: " << report.sampleTime();
+    WARNING_LOG(m_logger) << "Got a ParticipantModeReport which has a timestamp in the past: " << report.sampleTime;
     return;
   }
 
-  Participant *participant = participantByEquipmentNumber(report.equipmentNumber());
+  Participant *participant = participantByEquipmentNumber(report.equipmentNumber);
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << report.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << report.equipmentNumber;
     return;
   }
 
   ParticipantMode ddsData;
 
-  ddsData.participantId(participant->id());
-  ddsData.language(report.language());
-  ddsData.opMode(report.operationMode());
-  ddsData.reactivationDecontamination(report.reactivationDetoxication());
-  ddsData.reactivationMaintenance(report.reactivationMaintenance());
-  ddsData.reactivationMedic(report.reactivationMedic());
-  ddsData.modeVest(report.protectionModeVest());
-  ddsData.modeHelmet(report.protectionModeHelmet());
-  ddsData.modePersonalProtection(report.personellProtectionMode());
-  ddsData.protectionLevel(report.protectionLevel());
-  ddsData.handgrenadeSearchMode(report.handgrenadeSearchMode());
-  ddsData.internationalMode(report.internationalMode());
-  ddsData.abcProtectionMode(report.abcProtectionMode());
+  ddsData.participantId = participant->id();
+  ddsData.language = report.language;
+  ddsData.opMode = report.operationMode;
+  ddsData.reactivationDecontamination = report.reactivationDetoxication;
+  ddsData.reactivationMaintenance = report.reactivationMaintenance;
+  ddsData.reactivationMedic = report.reactivationMedic;
+  ddsData.modeVest = report.protectionModeVest;
+  ddsData.modeHelmet = report.protectionModeHelmet;
+  ddsData.modePersonalProtection = report.personellProtectionMode;
+  ddsData.protectionLevel = report.protectionLevel;
+  ddsData.handgrenadeSearchMode = report.handgrenadeSearchMode;
+  ddsData.internationalMode = report.internationalMode;
+  ddsData.abcProtectionMode = report.abcProtectionMode;
 
-  ddsData.sampleTime(report.sampleTime());
+  ddsData.sampleTime = report.sampleTime;
   participant->setMode(ddsData);
   participant->publishMode();
 }
@@ -375,30 +375,30 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
 {
   if (isTelegramInFuture(data))
   {
-    WARNING_LOG(m_logger) << "Got a SpecialSensorData which has a timestamp in the future: " << data.sampleTime();
+    WARNING_LOG(m_logger) << "Got a SpecialSensorData which has a timestamp in the future: " << data.sampleTime;
     return;
   }
   if (isTelegramOutdated(data))
   {
-    WARNING_LOG(m_logger) << "Got a SpecialSensorData which has a timestamp in the past: " << data.sampleTime();
+    WARNING_LOG(m_logger) << "Got a SpecialSensorData which has a timestamp in the past: " << data.sampleTime;
     return;
   }
 
-  Participant *participant = data.equipmentNumber() < 0 ? participantById(-data.equipmentNumber()) : participantByEquipmentNumber(data.equipmentNumber());
+  Participant *participant = data.equipmentNumber < 0 ? participantById(-data.equipmentNumber) : participantByEquipmentNumber(data.equipmentNumber);
 
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
 
   TrainingAreaBase::EquipmentPosition pos;
-  pos.equipmentNumber(data.equipmentNumber());
-  pos.sampleTime(data.sampleTime());
-  if (data.position.is_set())
+  pos.equipmentNumber = data.equipmentNumber;
+  pos.sampleTime = data.sampleTime;
+  if (data.position.has_value())
   {
-    Core::GeoPosition geoPos(data.position.get().lon(), data.position.get().lat(), 0);
-    pos.position().position(geoPos);
+    Core::GeoPosition geoPos(data.position.get().lon, data.position.get().lat, 0);
+    pos.position.position = geoPos;
     if (participant->setPosition(pos))
       participant->publishPosition();
   }
@@ -410,13 +410,13 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
 void ParticipantHandler::onNewLaserDesignation(const TrainingAreaBase::LaserDesignation &data)
 {
   DEBUG_LOG(m_logger) << "New Laser Designation: "
-                      << "Code: " << data.code() << ", GearID: " << data.gearId() << ", EqNo: " << data.equipmentNumber() << ", Lon: " << data.spotLocation().lon()
-                      << ", Lat: " << data.spotLocation().lat() << ", Power: " << data.outputPower();
-  Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
+                      << "Code: " << data.code << ", GearID: " << data.gearId << ", EqNo: " << data.equipmentNumber << ", Lon: " << data.spotLocation.lon
+                      << ", Lat: " << data.spotLocation.lat << ", Power: " << data.outputPower;
+  Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
 
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
 
@@ -457,17 +457,17 @@ void ParticipantHandler::onLaserDesignationRemoved(int equipmentNumber, int gear
 void ParticipantHandler::onBuildingHitLineInfo(const Buildings::BuildingHitLineInfo &data)
 {
   DEBUG_LOG(m_logger) << "onBuildingHitLineInfo "
-                      << "BuildingId=" << data.buildingId() << " originatorParticipantId=" << data.originatorParticipantId();
+                      << "BuildingId=" << data.buildingId << " originatorParticipantId=" << data.originatorParticipantId;
   auto dtcPdm = m_bdp->pdmDtc();
   // NOTE: igniterTypeId/IgniterFunction = 0 as long as BuildingHitLineInfo does not contain values
-  if (dtcPdm->getChargeTypeSpecialProperty(data.chargeTypeId(), 0, 0) != ProjectDataManagement::ChargeTypeProperty::LTD)
+  if (dtcPdm->getChargeTypeSpecialProperty(data.chargeTypeId, 0, 0) != ProjectDataManagement::ChargeTypeProperty::LTD)
     return;
 
-  Participant *participant = participantById(data.originatorParticipantId());
+  Participant *participant = participantById(data.originatorParticipantId);
 
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with participantId: " << data.originatorParticipantId();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with participantId: " << data.originatorParticipantId;
     return;
   }
 
@@ -480,68 +480,68 @@ void ParticipantHandler::onBuildingHitLineInfo(const Buildings::BuildingHitLineI
   DEBUG_LOG(m_logger) << "setDynamicData";
   participant->setDynamicData(dpd);
   DEBUG_LOG(m_logger) << "publishDynamicData"
-                      << " dpd.designations().size()=" << dpd.designations().size();
+                      << " dpd.designations().size()=" << dpd.designations.size();
   participant->publishDynamicData();
 }
 
 void ParticipantHandler::onSanitaryMaterialStockReport(const TrainingAreaBase::ParticipantSanitaryMaterialStockReport &data)
 {
   DEBUG_LOG(m_logger) << "onSanitaryMaterialStockReport";
-  Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
+  Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
-  if (data.qualification() == TrainingAreaBase::Qualification::NotDefined)
+  if (data.qualification == TrainingAreaBase::Qualification::NotDefined)
   {
-    DEBUG_LOG(m_logger) << "!!! Clear Materials : equipment number " << data.equipmentNumber();
-    DEBUG_LOG(m_logger) << "!!! Clear Materials : sample time " << data.sampleTime();
+    DEBUG_LOG(m_logger) << "!!! Clear Materials : equipment number " << data.equipmentNumber;
+    DEBUG_LOG(m_logger) << "!!! Clear Materials : sample time " << data.sampleTime;
     participant->setSanitationMaterial(0,
                                        std::vector<int>(),
-                                       data.uniqueId(),
-                                       data.sampleTime(),
+                                       data.uniqueId,
+                                       data.sampleTime,
                                        Qualification::NotAssigned,
-                                       data.originatorEquipmentNumber()); // this is a deassociation so clear material
+                                       data.originatorEquipmentNumber); // this is a deassociation so clear material
   }
   else
   {
-    DEBUG_LOG(m_logger) << "!!! Set Materials : equipment number " << data.equipmentNumber();
-    DEBUG_LOG(m_logger) << "!!! Set Materials : sample time " << data.sampleTime();
-    participant->setSanitationMaterial(data.sanitaryMaterialCount(),
-                                       data.sanitaryMaterialStock(),
-                                       data.uniqueId(),
-                                       data.sampleTime(),
-                                       static_cast<ParticipantManagement::Qualification>(data.qualification().underlying()),
-                                       data.originatorEquipmentNumber());
+    DEBUG_LOG(m_logger) << "!!! Set Materials : equipment number " << data.equipmentNumber;
+    DEBUG_LOG(m_logger) << "!!! Set Materials : sample time " << data.sampleTime;
+    participant->setSanitationMaterial(data.sanitaryMaterialCount,
+                                       data.sanitaryMaterialStock,
+                                       data.uniqueId,
+                                       data.sampleTime,
+                                       static_cast<ParticipantManagement::Qualification>(data.qualification),
+                                       data.originatorEquipmentNumber);
   }
   participant->publishDynamicData();
 }
 
 void ParticipantHandler::onParticipantSanitation(const TrainingAreaBase::ParticipantSanitation &data)
 {
-  Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
-  Participant *participantOrig = participantByEquipmentNumber(data.originatorEquipmentNumber());
+  Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
+  Participant *participantOrig = participantByEquipmentNumber(data.originatorEquipmentNumber);
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
-  int participantOrigId = data.originatorEquipmentNumber();
+  int participantOrigId = data.originatorEquipmentNumber;
   if (participantOrig)
     participantOrigId = participantOrig->id();
 
-  if (data.qualification() == TrainingAreaBase::Qualification::NotDefined && data.proceduresTaken() == 0)
+  if (data.qualification == TrainingAreaBase::Qualification::NotDefined && data.proceduresTaken == 0)
   {
-    DEBUG_LOG(m_logger) << "!!! Clear Sanitation = " << data.sampleTime();
-    DEBUG_LOG(m_logger) << "!!! Clear Sanitation: equipNo = " << data.equipmentNumber();
-    participant->setSanitationMaterial(0, std::vector<int>(), 0, data.sampleTime(), Qualification::NotAssigned, 0); // this is a deassociation so clear material
+    DEBUG_LOG(m_logger) << "!!! Clear Sanitation = " << data.sampleTime;
+    DEBUG_LOG(m_logger) << "!!! Clear Sanitation: equipNo = " << data.equipmentNumber;
+    participant->setSanitationMaterial(0, std::vector<int>(), 0, data.sampleTime, Qualification::NotAssigned, 0); // this is a deassociation so clear material
   }
   else
   {
-    DEBUG_LOG(m_logger) << "!!! SetSanitation: sample time = " << data.sampleTime();
-    DEBUG_LOG(m_logger) << "!!! SetSanitation: equipNo = " << data.equipmentNumber();
-    participant->setSanitation(data.proceduresTaken(), data.sanitationResult(), data.sanitationEvaluation(), participantOrigId, data.qualification(), data.sampleTime());
+    DEBUG_LOG(m_logger) << "!!! SetSanitation: sample time = " << data.sampleTime;
+    DEBUG_LOG(m_logger) << "!!! SetSanitation: equipNo = " << data.equipmentNumber;
+    participant->setSanitation(data.proceduresTaken, data.sanitationResult, data.sanitationEvaluation, participantOrigId, data.qualification, data.sampleTime);
   }
   participant->publishDynamicData();
 }
@@ -549,67 +549,67 @@ void ParticipantHandler::onParticipantSanitation(const TrainingAreaBase::Partici
 void ParticipantHandler::onOperatorAction(const TrainingAreaBase::OperatorAction &data)
 {
   // maybe use other commands later?!
-  if (data.action() != 8 && data.action() != 35)
+  if (data.action != 8 && data.action != 35)
     return;
 
-  Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
+  Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
 
-  if (participant->setOperatorAction(data.action(), data.operatorId(), data.sampleTime()))
+  if (participant->setOperatorAction(data.action, data.operatorId, data.sampleTime))
     participant->publishDynamicData();
 }
 
 void ParticipantHandler::onEquipmentEvent(const TrainingAreaBase::EquipmentEvent &data)
 {
   // maybe use other commands later?!
-  if (data.source().subDeviceId() != 14 || data.source().equipmentFunctionId() != 5)
+  if (data.source.subDeviceId != 14 || data.source.equipmentFunctionId != 5)
     return;
 
-  if (data.code() == 1 || data.code() == 2) // 1: 9Liner  2: Transport
+  if (data.code == 1 || data.code == 2) // 1: 9Liner  2: Transport
   {
-    Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
+    Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
     if (!participant)
       return;
 
-    if (participant->setEquipmentEvent(data.code(), data.sampleTime()))
+    if (participant->setEquipmentEvent(data.code, data.sampleTime))
       participant->publishDynamicData();
   }
 }
 
 void ParticipantHandler::onNewFunctionalAreaEntryChanged(const TrainingAreaBase::FunctionalAreaEntry &data)
 {
-  Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
+  Participant *participant = participantByEquipmentNumber(data.equipmentNumber);
 
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with equipment number " << data.equipmentNumber;
     return;
   }
 
   TrainingAreaBase::EquipmentPosition pos;
-  pos.equipmentNumber(data.equipmentNumber());
-  pos.sampleTime(data.sampleTime());
-  Core::GeoPosition geoPos(data.position().lon(), data.position().lat(), 0);
-  pos.position().position(geoPos);
+  pos.equipmentNumber = data.equipmentNumber;
+  pos.sampleTime = data.sampleTime;
+  Core::GeoPosition geoPos(data.position.lon, data.position.lat, 0);
+  pos.position.position = geoPos;
   if (participant->setPosition(pos))
     participant->publishPosition();
 
-  StateInformation oldState = youngestStateInformation(participant->dynamicParticipantData().stateHistory(), false);
+  StateInformation oldState = youngestStateInformation(participant->dynamicParticipantData().stateHistory, false);
   TrainingAreaBase::EquipmentState state;
-  state.equipmentNumber(data.equipmentNumber());
-  state.originatorId(data.aesItemId());
-  state.originatorType(ProjectDataManagement::StateChangeOriginator::FunctionalArea);
-  state.sampleTime(data.sampleTime());
-  state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect); // no effect - it's an entry into a functional area
-  state.vulnerabilityBits(oldState.vulnerabilityBits());
-  state.vulnerabilityKindId(oldState.vulnerabilityKindId());
-  state.vitality(oldState.vitality());
+  state.equipmentNumber = data.equipmentNumber;
+  state.originatorId = data.aesItemId;
+  state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea;
+  state.sampleTime = data.sampleTime;
+  state.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect; // no effect - it's an entry into a functional area
+  state.vulnerabilityBits = oldState.vulnerabilityBits;
+  state.vulnerabilityKindId = oldState.vulnerabilityKindId;
+  state.vitality = oldState.vitality;
 
-  participant->setState(state, data.aesItemId());
+  participant->setState(state, data.aesItemId);
   participant->publishDynamicData();
 }
 
@@ -626,9 +626,9 @@ void ParticipantHandler::onHitLineInfoTimeout()
   auto it = m_hitLineInfoMap.begin();
   while (it != m_hitLineInfoMap.end())
   {
-    if (!isOutdated(tNow, it.value().sampleTime()))
+    if (!isOutdated(tNow, it.value().sampleTime))
       break;
-    dts()->removeHitLineInfoByKey(it.value().id());
+    dts()->removeHitLineInfoByKey(it.value().id);
 
     it = m_hitLineInfoMap.erase(it);
   }
@@ -636,11 +636,11 @@ void ParticipantHandler::onHitLineInfoTimeout()
 
 void ParticipantHandler::setPosition(const ParticipantManagement::ParticipantPosition &data)
 {
-  Participant *participant = participantById(data.participantId());
+  Participant *participant = participantById(data.participantId);
 
   if (!participant)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with id " << data.participantId();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Could not find participant with id " << data.participantId;
     return;
   }
 
@@ -651,7 +651,7 @@ void ParticipantHandler::setHitlineInfoFromReplay(const HitLineInfo &data)
 {
   if (!dts()->publish(data))
     return;
-  m_hitLineInfoMap.insert(data.id(), data);
+  m_hitLineInfoMap.insert(data.id, data);
 }
 
 void ParticipantHandler::setUASFromReplay(const UAS &data)
@@ -687,43 +687,43 @@ void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &data, co
   LOGGER_T m_logger = getLogger("ParticipantHandler.Laser");
   DEBUG_LOG(m_logger) << "-Update Laser Designation - Start ";
 
-  for (LaserDesignation &laserDesignation : data.designations())
+  for (LaserDesignation &laserDesignation : data.designations)
   {
-    if (laserDesignation.gearId() != newLaserDesignation.gearId())
+    if (laserDesignation.gearId != newLaserDesignation.gearId)
       continue;
 
-    DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << laserDesignation.gearId() << " found in designations";
-    laserDesignation.code(newLaserDesignation.code());
+    DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << laserDesignation.gearId << " found in designations";
+    laserDesignation.code = newLaserDesignation.code;
 
-    if (!qFuzzyIsNull(laserDesignation.outputPower()) && !qFuzzyIsNull(newLaserDesignation.spotLocation().lat())
-        && !qFuzzyIsNull(newLaserDesignation.spotLocation().lon()))
-      laserDesignation.spotLocation(Core::GeoPosition(newLaserDesignation.spotLocation().lon(), newLaserDesignation.spotLocation().lat(), 0.0));
+    if (!qFuzzyIsNull(laserDesignation.outputPower) && !qFuzzyIsNull(newLaserDesignation.spotLocation.lat)
+        && !qFuzzyIsNull(newLaserDesignation.spotLocation.lon))
+      laserDesignation.spotLocation = Core::GeoPosition(newLaserDesignation.spotLocation.lon, newLaserDesignation.spotLocation.lat, 0.0);
 
     // If Laser was on before and now is turned off, we have to reset spot Location
-    if (!qFuzzyIsNull(laserDesignation.outputPower()) && qFuzzyIsNull(newLaserDesignation.outputPower()))
-      laserDesignation.spotLocation(Core::GeoPosition(0.0, 0.0, 0.0));
+    if (!qFuzzyIsNull(laserDesignation.outputPower) && qFuzzyIsNull(newLaserDesignation.outputPower))
+      laserDesignation.spotLocation = Core::GeoPosition(0.0, 0.0, 0.0);
 
-    laserDesignation.outputPower(newLaserDesignation.outputPower());
+    laserDesignation.outputPower = newLaserDesignation.outputPower;
     DEBUG_LOG(m_logger) << "-Update Laser Designation - Data updated, returning";
     return;
   }
 
-  DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId() << " NOT found in designations";
+  DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId << " NOT found in designations";
 
-  int gearId = newLaserDesignation.gearId();
-  auto it = std::find_if(data.gear().cbegin(), data.gear().cend(), [gearId](const GearInformation &gi) { return gearId == gi.gearId(); });
-  if (it == data.gear().cend()) // No gear, no designation...
+  int gearId = newLaserDesignation.gearId;
+  auto it = std::find_if(data.gear.cbegin(), data.gear.cend(), [gearId](const GearInformation &gi) { return gearId == gi.gearId; });
+  if (it == data.gear.cend()) // No gear, no designation...
   {
-    DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId() << " NOT found in Gears";
+    DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId << " NOT found in Gears";
     return;
   }
 
-  DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId() << " found in Gears";
+  DEBUG_LOG(m_logger) << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId << " found in Gears";
   DEBUG_LOG(m_logger) << "-Update Laser Designation - Adding new designation";
-  data.designations().emplace_back(newLaserDesignation.gearId(),
-                                   Core::GeoPosition(newLaserDesignation.spotLocation().lon(), newLaserDesignation.spotLocation().lat(), 0.0),
-                                   newLaserDesignation.code(),
-                                   newLaserDesignation.outputPower());
+  data.designations.emplace_back(newLaserDesignation.gearId,
+                                   Core::GeoPosition(newLaserDesignation.spotLocation.lon, newLaserDesignation.spotLocation.lat, 0.0),
+                                   newLaserDesignation.code,
+                                   newLaserDesignation.outputPower);
 }
 
 void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &dataInOut, const Buildings::BuildingHitLineInfo &newLaserDesignation)
@@ -733,28 +733,28 @@ void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &dataInOu
   // Mehrere Designatoren pro Teilnehmer werden nicht unterstützt.
   DEBUG_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info";
 
-  for (LaserDesignation &laserDesignation : dataInOut.designations())
+  for (LaserDesignation &laserDesignation : dataInOut.designations)
   {
-    DEBUG_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - Updating (first) Designation with GearId " << laserDesignation.gearId();
-    laserDesignation.outputPower(1.0);
-    laserDesignation.spotLocation(newLaserDesignation.buildingPos());
+    DEBUG_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - Updating (first) Designation with GearId " << laserDesignation.gearId;
+    laserDesignation.outputPower = 1.0;
+    laserDesignation.spotLocation = newLaserDesignation.buildingPos;
     return;
   }
 
   QSet<int> ldGearTypes{1043}; // Need Property for LTD...
-  auto it = std::find_if(dataInOut.gear().cbegin(), dataInOut.gear().cend(), [ldGearTypes](const GearInformation &gi) { return ldGearTypes.contains(gi.gearTypeId()); });
-  if (it != dataInOut.gear().cend())
+  auto it = std::find_if(dataInOut.gear.cbegin(), dataInOut.gear.cend(), [ldGearTypes](const GearInformation &gi) { return ldGearTypes.contains(gi.gearTypeId); });
+  if (it != dataInOut.gear.cend())
   {
     LaserDesignation ld;
-    ld.gearId() = it->gearId();
-    ld.code() = 0;
-    ld.spotLocation() = newLaserDesignation.buildingPos();
-    ld.outputPower(1.0);
-    dataInOut.designations().emplace_back(ld);
+    ld.gearId = it->gearId;
+    ld.code = 0;
+    ld.spotLocation = newLaserDesignation.buildingPos;
+    ld.outputPower = 1.0;
+    dataInOut.designations.emplace_back(ld);
     ERROR_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - Added Designation";
   }
   ERROR_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - No laserDesignation available participantId="
-                      << newLaserDesignation.originatorParticipantId();
+                      << newLaserDesignation.originatorParticipantId;
 }
 
 void ParticipantHandler::removeLaserDesignation(DynamicParticipantData &data, qint32 gearId)
@@ -762,17 +762,17 @@ void ParticipantHandler::removeLaserDesignation(DynamicParticipantData &data, qi
   LOGGER_T m_logger = getLogger("ParticipantHandler.Laser");
 
   DEBUG_LOG(m_logger) << "-Remove Laser Designation: Start";
-  auto validationFunction = [gearId](ParticipantManagement::LaserDesignation laserDesignation) { return laserDesignation.gearId() == gearId; };
-  auto eraseIterator = std::find_if(data.designations().begin(), data.designations().end(), validationFunction);
+  auto validationFunction = [gearId](ParticipantManagement::LaserDesignation laserDesignation) { return laserDesignation.gearId == gearId; };
+  auto eraseIterator = std::find_if(data.designations.begin(), data.designations.end(), validationFunction);
 
-  if (eraseIterator == data.designations().end())
+  if (eraseIterator == data.designations.end())
   {
     DEBUG_LOG(m_logger) << "-Remove Laser Designation: GearId NOT found";
     return;
   }
 
   DEBUG_LOG(m_logger) << "-Remove Laser Designation: Removing Designation";
-  data.designations().erase(eraseIterator);
+  data.designations.erase(eraseIterator);
 }
 
 } // namespace ParticipantHandling
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.h
index 23bc6983a..2ffba2427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.h
@@ -151,10 +151,10 @@ class ParticipantHandler
 
   static bool isSupportTypeClass(const TypeClass &typeClass);
   // t - 11min <= sampleTime
-  template <typename T> inline bool isTelegramOutdated(const T &tele) const { return isSampleTimeOutdated(tele.sampleTime()); }
+  template <typename T> inline bool isTelegramOutdated(const T &tele) const { return isSampleTimeOutdated(tele.sampleTime); }
   virtual bool isSampleTimeOutdated(qint64 sampleTime) const;
   // sampleTime > t + 1min
-  template <typename T> inline bool isTelegramInFuture(const T &tele) const { return isSampleTimeInFuture(tele.sampleTime()); }
+  template <typename T> inline bool isTelegramInFuture(const T &tele) const { return isSampleTimeInFuture(tele.sampleTime); }
   virtual bool isSampleTimeInFuture(qint64 sampleTime) const;
 
   protected:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
index 2d6cb83d3..2aab86d2e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
@@ -41,23 +41,23 @@ static inline Database::PpmParticipant toDbParticipant(const ParticipantData &cu
   Database::PpmParticipant newDbParticipant;
 
   if (withId)
-    newDbParticipant.id = currentData.id();
-  newDbParticipant.partyId = currentData.partyId();
-  newDbParticipant.typeId = currentData.typeId();
-  newDbParticipant.externalId = currentData.externalId();
-  newDbParticipant.name = QString::fromStdString(currentData.name());
-  newDbParticipant.identification = QString::fromStdString(currentData.identification());
-  newDbParticipant.symbol = QString::fromStdString(currentData.symbol());
-  newDbParticipant.info = QString::fromStdString(currentData.info());
-  newDbParticipant.designator = QString::fromStdString(currentData.designator());
-  newDbParticipant.tacticalIdentifier = QString::fromStdString(currentData.tacticalIdentifier());
-  newDbParticipant.isDeleted = currentData.isDeleted();
-  newDbParticipant.isSimulated = currentData.isSimulated();
-  newDbParticipant.assignState = currentData.assignState();
-  if (currentData.equipmentNumber.is_set())
+    newDbParticipant.id = currentData.id;
+  newDbParticipant.partyId = currentData.partyId;
+  newDbParticipant.typeId = currentData.typeId;
+  newDbParticipant.externalId = currentData.externalId;
+  newDbParticipant.name = QString::fromStdString(currentData.name);
+  newDbParticipant.identification = QString::fromStdString(currentData.identification);
+  newDbParticipant.symbol = QString::fromStdString(currentData.symbol);
+  newDbParticipant.info = QString::fromStdString(currentData.info);
+  newDbParticipant.designator = QString::fromStdString(currentData.designator);
+  newDbParticipant.tacticalIdentifier = QString::fromStdString(currentData.tacticalIdentifier);
+  newDbParticipant.isDeleted = currentData.isDeleted;
+  newDbParticipant.isSimulated = currentData.isSimulated;
+  newDbParticipant.assignState = currentData.assignState;
+  if (currentData.equipmentNumber.has_value())
     newDbParticipant.equipmentNumber = currentData.equipmentNumber.get();
-  newDbParticipant.hierarchyNumber = currentData.hierarchyNumber();
-  newDbParticipant.properties = QString::fromStdString(currentData.properties());
+  newDbParticipant.hierarchyNumber = currentData.hierarchyNumber;
+  newDbParticipant.properties = QString::fromStdString(currentData.properties);
 
   return newDbParticipant;
 }
@@ -66,11 +66,11 @@ static inline ParticipantOrganisationEx toDds(const Database::PpmParticipantOrga
 {
   ParticipantOrganisationEx ret;
   ret.dbId = db.id;
-  ret.participantId(db.participantId);
-  ret.originPartyId(db.originPartyId);
-  ret.currentPartyId(db.currentPartyId);
-  ret.isAttached(db.isAttached);
-  ret.isCooperate(db.isCooperate);
+  ret.participantId = db.participantId;
+  ret.originPartyId = db.originPartyId;
+  ret.currentPartyId = db.currentPartyId;
+  ret.isAttached = db.isAttached;
+  ret.isCooperate = db.isCooperate;
   return ret;
 }
 
@@ -78,11 +78,11 @@ static inline Database::PpmParticipantOrganisation toDb(const ParticipantOrganis
 {
   Database::PpmParticipantOrganisation ret;
   ret.id = dds.dbId;
-  ret.participantId = dds.participantId();
-  ret.originPartyId = dds.originPartyId();
-  ret.currentPartyId = dds.currentPartyId();
-  ret.isAttached = dds.isAttached();
-  ret.isCooperate = dds.isCooperate();
+  ret.participantId = dds.participantId;
+  ret.originPartyId = dds.originPartyId;
+  ret.currentPartyId = dds.currentPartyId;
+  ret.isAttached = dds.isAttached;
+  ret.isCooperate = dds.isCooperate;
   return ret;
 }
 
@@ -209,21 +209,21 @@ bool ParticipantHandlerForExercise::init()
       ModifyParticipantDataRequest ownPositionParticipant;
       std::vector<ParticipantData> dataArray;
       ParticipantData data;
-      data.assignState(ParticipantAssignState::HandoutExcon);
-      data.partyId(1);
-      data.hierarchyNumber(1);
-      data.equipmentNumber(1);
+      data.assignState = ParticipantAssignState::HandoutExcon;
+      data.partyId = 1;
+      data.hierarchyNumber = 1;
+      data.equipmentNumber = 1;
       // data.info(QString(QStringLiteral("")).toStdString());              // a string is empty be default!
       // data.identification(QString(QStringLiteral("")).toStdString());    // a string is empty be default!
-      data.typeId(60);
-      data.symbol(QString(QStringLiteral("NONE|CVLX|227")).toStdString());
-      data.designator(QString(QStringLiteral("OC")).toStdString());
-      data.isSimulated(false);
-      data.isDeleted(false);
-      data.superiorModId(-1);
+      data.typeId = 60;
+      data.symbol = QString(QStringLiteral("NONE|CVLX|227")).toStdString();
+      data.designator = QString(QStringLiteral("OC")).toStdString();
+      data.isSimulated = false;
+      data.isDeleted = false;
+      data.superiorModId = -1;
       dataArray.push_back(data);
-      ownPositionParticipant.data(dataArray);
-      ownPositionParticipant.forceAddWithId(false);
+      ownPositionParticipant.data = dataArray;
+      ownPositionParticipant.forceAddWithId = false;
       modifyParticipantDataRequest(ownPositionParticipant);
     }
   }
@@ -244,14 +244,14 @@ bool ParticipantHandlerForExercise::init()
 
     for (const auto &pos : latestPositions)
     {
-      Participant *currentParticipant = m_participants.value(pos.participantId());
+      Participant *currentParticipant = m_participants.value(pos.participantId);
       if (currentParticipant == nullptr)
       {
-        INFO_LOG(m_logger) << "Got position for non existing participantId: " << pos.participantId();
+        INFO_LOG(m_logger) << "Got position for non existing participantId: " << pos.participantId;
         continue;
       }
 
-      DEBUG_LOG(m_logger) << "Setting position for participantId " << pos.participantId() << ": " << pos;
+      DEBUG_LOG(m_logger) << "Setting position for participantId " << pos.participantId << ": " << pos;
       currentParticipant->setPosition(pos, true);
       currentParticipant->publishPosition();
     }
@@ -264,14 +264,14 @@ bool ParticipantHandlerForExercise::init()
 
     for (const auto &dynData : latestStates)
     {
-      Participant *currentParticipant = m_participants.value(dynData.participantId());
+      Participant *currentParticipant = m_participants.value(dynData.participantId);
       if (currentParticipant == nullptr)
       {
-        INFO_LOG(m_logger) << "Got dynamic data for non existing participantId: " << dynData.participantId();
+        INFO_LOG(m_logger) << "Got dynamic data for non existing participantId: " << dynData.participantId;
         continue;
       }
 
-      DEBUG_LOG(m_logger) << "Dynamic data for participantId " << dynData.participantId() << ": " << dynData;
+      DEBUG_LOG(m_logger) << "Dynamic data for participantId " << dynData.participantId << ": " << dynData;
       currentParticipant->setDynamicData(dynData);
       currentParticipant->publishDynamicData();
     }
@@ -284,14 +284,14 @@ bool ParticipantHandlerForExercise::init()
 
     for (const auto &mode : latestModes)
     {
-      Participant *currentParticipant = m_participants.value(mode.participantId());
+      Participant *currentParticipant = m_participants.value(mode.participantId);
       if (currentParticipant == nullptr)
       {
-        INFO_LOG(m_logger) << "Got mode data for non existing participantId: " << mode.participantId();
+        INFO_LOG(m_logger) << "Got mode data for non existing participantId: " << mode.participantId;
         continue;
       }
 
-      DEBUG_LOG(m_logger) << "Mode data for participantId " << mode.participantId() << ": " << mode;
+      DEBUG_LOG(m_logger) << "Mode data for participantId " << mode.participantId << ": " << mode;
       currentParticipant->setMode(mode);
       currentParticipant->publishMode();
     }
@@ -388,22 +388,22 @@ void ParticipantHandlerForExercise::createHitlineInfo(int originatorId,
 
   // publish HitLineInfo
   HitLineInfo hli;
-  hli.originatorParticipantId(originatorId);
-  hli.originatorPartyId(originParticipant->partyId());
-  hli.originatorPos(originParticipant->position().pos());
-  hli.originatorBuildingId(originParticipant->position().buildingId());
-  hli.originatorRoomId(originParticipant->position().roomId());
-  hli.id(m_hitLineId);
-  hli.injuryParticipantId(participantToBeChanged->id());
-  hli.injuryPos(pos.position().position());
-  hli.chargeTypeId(originatorChargeTypeId);
-  hli.sampleTime(sampleTime);
-  hli.injuryBuildingId(pos.position().moutObjectId().is_set() ? pos.position().moutObjectId().get() : 0);
-  hli.injuryRoomId(pos.position().moutRoomId().is_set() ? pos.position().moutRoomId().get() : 0);
+  hli.originatorParticipantId = originatorId;
+  hli.originatorPartyId = originParticipant->partyId();
+  hli.originatorPos = originParticipant->position().pos;
+  hli.originatorBuildingId = originParticipant->position().buildingId;
+  hli.originatorRoomId = originParticipant->position().roomId;
+  hli.id = m_hitLineId;
+  hli.injuryParticipantId = participantToBeChanged->id();
+  hli.injuryPos = pos.position.position;
+  hli.chargeTypeId = originatorChargeTypeId;
+  hli.sampleTime = sampleTime;
+  hli.injuryBuildingId = pos.position.moutObjectId.has_value() ? pos.position.moutObjectId.get() : 0;
+  hli.injuryRoomId = pos.position.moutRoomId.has_value() ? pos.position.moutRoomId.get() : 0;
   if (!dts()->publish(hli))
     return;
 
-  m_hitLineInfoMap.insert(hli.id(), hli);
+  m_hitLineInfoMap.insert(hli.id, hli);
   m_hitLineId++;
 }
 
@@ -426,29 +426,29 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   QSet<int> partiesUsed;
   QSet<int> partiesWithDeletedOrMovedOutParticipants;
 
-  validateData.forceAddWithId = request.forceAddWithId();
+  validateData.forceAddWithId = request.forceAddWithId;
 
-  validateData.participantsToBeCreatedOrModified.reserve(request.data().size());
+  validateData.participantsToBeCreatedOrModified.reserve(request.data.size());
 
   bool permanentRemoveParticipants
-      = !m_mainHandler->exerciseId() || m_exmDtc->exercise(m_mainHandler->exerciseId()).state() == ExerciseManagement::ExerciseState::Created;
+      = !m_mainHandler->exerciseId() || m_exmDtc->exercise(m_mainHandler->exerciseId()).state == ExerciseManagement::ExerciseState::Created;
 
   // check assign state - we can't remove participants handled by warehouse
-  for (const ParticipantData &currentParticipant : request.data())
+  for (const ParticipantData &currentParticipant : request.data)
   {
-    if (!currentParticipant.isDeleted())
+    if (!currentParticipant.isDeleted)
     {
       validateData.participantsToBeCreatedOrModified.append(currentParticipant);
       continue;
     }
-    if (currentParticipant.id() == 0)
-      return Core::FunctionReplyObject(request.requestId(),
+    if (currentParticipant.id == 0)
+      return Core::FunctionReplyObject(request.requestId,
                                        tr_lts("dds", "Not possible to remove participantData with modId %1, because it does not have participantId set"))
-          .arg(currentParticipant.modId());
-    auto ret = checkDeleteParticipant(currentParticipant.id());
+          .arg(currentParticipant.modId);
+    auto ret = checkDeleteParticipant(currentParticipant.id);
     if (ret.error())
     {
-      ret.setId(request.requestId());
+      ret.setId(request.requestId);
       return ret;
     }
   }
@@ -460,7 +460,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
     auto ret = validateParticipantData(validateData, currentParticipant);
     if (ret.error())
     {
-      ret.setId(request.requestId());
+      ret.setId(request.requestId);
       return ret;
     }
   }
@@ -472,7 +472,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
 
     if (ret.error())
     {
-      ret.setId(request.requestId());
+      ret.setId(request.requestId);
       return ret;
     }
 
@@ -485,25 +485,25 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
 
   // first sort out participants to be marked as deleted
   DBTransaction removeTransaction(m_mainHandler->db()->database());
-  for (const ParticipantData &currentParticipant : request.data())
+  for (const ParticipantData &currentParticipant : request.data)
   {
-    if (currentParticipant.isDeleted())
+    if (currentParticipant.isDeleted)
     {
-      if (currentParticipant.id() == 0)
-        return Core::FunctionReplyObject(request.requestId(),
+      if (currentParticipant.id == 0)
+        return Core::FunctionReplyObject(request.requestId,
                                          tr_lts("dds", "Not possible to remove participantData with modId %1, because it does not have participantId set"))
-            .arg(currentParticipant.modId());
+            .arg(currentParticipant.modId);
 
-      auto ret = deleteParticipant(currentParticipant.id(), permanentRemoveParticipants, true);
+      auto ret = deleteParticipant(currentParticipant.id, permanentRemoveParticipants, true);
 
       // only a real error if the participant exists (deleting an already deleted participant is fine
-      if (ret.error() && m_participants.contains(currentParticipant.id()))
+      if (ret.error() && m_participants.contains(currentParticipant.id))
       {
-        ret.setId(request.requestId());
+        ret.setId(request.requestId);
         return ret;
       }
 
-      partiesWithDeletedOrMovedOutParticipants.insert(currentParticipant.partyId());
+      partiesWithDeletedOrMovedOutParticipants.insert(currentParticipant.partyId);
     }
   }
   removeTransaction.commit();
@@ -515,10 +515,10 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
     ParticipantData &pd = validateData.participantsToBeCreatedOrModified[i];
     for (int j = 0; j < validateData.participantsToResetEquipmentNumber.size(); ++j)
     {
-      if (pd.modId() == validateData.participantsToResetEquipmentNumber.at(j))
+      if (pd.modId == validateData.participantsToResetEquipmentNumber.at(j))
       {
-        pd.equipmentNumber().reset();
-        pd.assignState(ParticipantAssignState::NotAssigned);
+        pd.equipmentNumber.reset();
+        pd.assignState = ParticipantAssignState::NotAssigned;
         validateData.participantsToResetEquipmentNumber.removeAt(j);
         break;
       }
@@ -535,16 +535,16 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   for (int i = 0; i < validateData.participantsToBeCreatedOrModified.size(); ++i)
   {
     const ParticipantData &currentData = validateData.participantsToBeCreatedOrModified.at(i);
-    auto modIdIt = validateData.modIdToParticipantId.constFind(currentData.modId());
+    auto modIdIt = validateData.modIdToParticipantId.constFind(currentData.modId);
     if (modIdIt == validateData.modIdToParticipantId.constEnd())
     {
-      auto part = toDbParticipant(currentData, request.forceAddWithId());
+      auto part = toDbParticipant(currentData, request.forceAddWithId);
       if (Settings::markVehiclesAsReservedFromExcon())
       {
         if (part.assignState == ParticipantAssignState::NotAssigned && part.equipmentNumber == 0 && !isUnitType(part.typeId))
         {
           const auto *type = m_mainHandler->typeHandler()->typeById(part.typeId);
-          if (type && type->typeClass() != TypeClass::Human)
+          if (type && type->typeClass != TypeClass::Human)
           {
             // reserve participants for excon since otherwise the guez warehouse will automatically
             // assign an equipment number for this participant... *argh*
@@ -590,7 +590,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
                                    participantsWithChanges);
   if (ret.error())
   {
-    ret.setId(request.requestId());
+    ret.setId(request.requestId);
     return ret;
   }
 
@@ -599,10 +599,10 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   // build hierarchy
   for (const ParticipantData &currentData : std::as_const(validateData.participantsToBeCreatedOrModified)) // first set superiorIds
   {
-    Participant *participantToUpdate = participantById(validateData.modIdToParticipantId.value(currentData.modId()));
-    if (currentData.superiorModId() >= 0) // superiorModId < 0 -> no change in superior
+    Participant *participantToUpdate = participantById(validateData.modIdToParticipantId.value(currentData.modId));
+    if (currentData.superiorModId >= 0) // superiorModId < 0 -> no change in superior
     {
-      const int superiorId = validateData.modIdToParticipantId.value(currentData.superiorModId());
+      const int superiorId = validateData.modIdToParticipantId.value(currentData.superiorModId);
 
       if (participantToUpdate->hasNewSuperiorId(superiorId))
         participantsWithChanges.insert(participantToUpdate);
@@ -643,7 +643,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   }
 
   if (!m_mainHandler->db()->update(dbParticipantsToUpdate))
-    return Core::FunctionReplyObject(request.requestId(), tr_lts("dds", "Could not update participant data in database, participant data may be inconsistent"));
+    return Core::FunctionReplyObject(request.requestId, tr_lts("dds", "Could not update participant data in database, participant data may be inconsistent"));
 
   trans.commit();
   checkLongActionBreak();
@@ -654,21 +654,21 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   ChangePartyUsedStateRequest req;
   for (int partyId : std::as_const(partiesUsed))
   {
-    req.partyId(partyId);
-    req.isUsedBy(true);
+    req.partyId = partyId;
+    req.isUsedBy = true;
     m_mainHandler->partyHandler()->changePartyUsedStateRequest(req);
   }
   for (int partyId : std::as_const(partiesWithDeletedOrMovedOutParticipants))
   {
-    req.partyId(partyId);
-    req.isUsedBy(false);
+    req.partyId = partyId;
+    req.isUsedBy = false;
     m_mainHandler->partyHandler()->changePartyUsedStateRequest(req);
   }
 
-  if (request.data().size() == 1 && request.data().at(0).isDeleted())
+  if (request.data.size() == 1 && request.data.at(0).isDeleted)
   {
     // make sure to not save a participant orga for this participant
-    const int removedParticipantId = request.data().at(0).id();
+    const int removedParticipantId = request.data.at(0).id;
     auto it = m_participantOrganisations.find(removedParticipantId);
     if (it != m_participantOrganisations.end())
     {
@@ -678,15 +678,15 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
       m_participantOrganisations.erase(it);
     }
   }
-  if (request.participantOrganisation.is_set())
+  if (request.participantOrganisation.has_value())
   {
     const ParticipantOrganisation &newOrga = request.participantOrganisation.get();
-    auto it = m_participantOrganisations.find(newOrga.participantId());
+    auto it = m_participantOrganisations.find(newOrga.participantId);
 
-    const int originPartyId = (it == m_participantOrganisations.end() ? -1 : it.value().originPartyId());
+    const int originPartyId = (it == m_participantOrganisations.end() ? -1 : it.value().originPartyId);
 
     // same party? -> returned to 'home' -> we can remove this
-    if (newOrga.currentPartyId() == originPartyId)
+    if (newOrga.currentPartyId == originPartyId)
     {
       if (it == m_participantOrganisations.end())
         WARNING_LOG(m_logger) << "Could suprious party organisation - ignoring: " << newOrga;
@@ -694,7 +694,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
       {
         const int dbId = it.value().dbId;
         m_mainHandler->db()->removePpmParticipantOrganisation(dbId);
-        dts()->removeParticipantOrganisationByKey(newOrga.participantId());
+        dts()->removeParticipantOrganisationByKey(newOrga.participantId);
         m_participantOrganisations.erase(it);
       }
     }
@@ -708,7 +708,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
         Database::PpmParticipantOrganisation dbOrga(toDb(orga));
         m_mainHandler->db()->insert(dbOrga);
         orga.dbId = dbOrga.id;
-        m_participantOrganisations.insert(orga.participantId(), orga);
+        m_participantOrganisations.insert(orga.participantId, orga);
       }
       else
       {
@@ -716,7 +716,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
         orga.dbId = it.value().dbId;
         // the origin party id must not be overwritten
         // (but is unknown in some usecases on the client - therefore overwrite here)
-        orga.originPartyId(originPartyId);
+        orga.originPartyId = originPartyId;
         m_mainHandler->db()->update(toDb(orga));
         *it = orga;
       }
@@ -744,7 +744,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
   const char *errStr = "";
   const std::vector<std::string> errArgs = {};
   const char *additionalInfo = bytes.constData();
-  return Core::FunctionReplyObject(request.requestId(), errStr, errArgs, additionalInfo);
+  return Core::FunctionReplyObject(request.requestId, errStr, errArgs, additionalInfo);
 }
 
 void ParticipantHandlerForExercise::onModifyStateRequest(const rti::core::SampleIdentity &cookie, const ParticipantManagement::ModifyStateRequest &request)
@@ -765,13 +765,13 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyStateRequest(cons
   TrainingAreaBase::DemandVulnerabilityStateChangeRequest req;
 
   int failedParticipantId = 0;
-  if (!participantIds2EquipmentNumbers(request.participantIds(), req.equipmentNumbers(), &failedParticipantId))
+  if (!participantIds2EquipmentNumbers(request.participantIds, req.equipmentNumbers, &failedParticipantId))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Got invalid participant id %1 in modify state request")).arg(failedParticipantId);
-  req.requestId(s_tabRequestId++);
-  req.workstationId(request.workstationId());
-  req.vulnerabilityState(request.vulnerabilityState());
-  req.vulnerabilityKind(request.vulnerabilityKind()); // Pv San
-  req.vitality(request.vitality());                   // Pv San
+  req.requestId = s_tabRequestId++;
+  req.workstationId = request.workstationId;
+  req.vulnerabilityState = request.vulnerabilityState;
+  req.vulnerabilityKind = request.vulnerabilityKind; // Pv San
+  req.vitality = request.vitality;                   // Pv San
 
   return m_proxyListener->demandVulnerabilityStateChange(cookie, req);
 }
@@ -793,15 +793,15 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::initParticipantRequest(
 {
   TrainingAreaBase::DemandInitRequest req;
   int failedParticipantId = 0;
-  if (!participantIds2EquipmentNumbers(request.participantIds(), req.equipmentNumbers(), &failedParticipantId))
+  if (!participantIds2EquipmentNumbers(request.participantIds, req.equipmentNumbers, &failedParticipantId))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Got invalid participant id %1 in init request")).arg(failedParticipantId);
 
-  req.requestId(s_tabRequestId++);
-  req.workstationId(request.workstationId());
-  req.restockCharges(request.restockCharges());
-  req.resetManipulation(request.resetManipulation());
-  req.resetVulnerabilityState(request.resetVulnerabilityState());
-  req.restockSanitationMaterial(request.restockSanitationMaterial());
+  req.requestId = s_tabRequestId++;
+  req.workstationId = request.workstationId;
+  req.restockCharges = request.restockCharges;
+  req.resetManipulation = request.resetManipulation;
+  req.resetVulnerabilityState = request.resetVulnerabilityState;
+  req.restockSanitationMaterial = request.restockSanitationMaterial;
 
   return m_proxyListener->demandInitRequest(cookie, req);
 }
@@ -821,27 +821,27 @@ void ParticipantHandlerForExercise::onSetParticipantModeRequest(const rti::core:
 Core::FunctionReplyObject ParticipantHandlerForExercise::setParticipantModeRequest(const rti::core::SampleIdentity &cookie,
                                                                                    const ParticipantManagement::SetParticipantModeRequest &request)
 {
-  const Participant *participant = request.participantId() ? participantById(request.participantId()) : nullptr;
-  if (participant == nullptr && request.participantId() != 0)
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Got SetParticipantModeRequest for unknown participant id %1")).arg(request.participantId());
+  const Participant *participant = request.participantId ? participantById(request.participantId) : nullptr;
+  if (participant == nullptr && request.participantId != 0)
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Got SetParticipantModeRequest for unknown participant id %1")).arg(request.participantId);
 
   TrainingAreaBase::SendParticipantModeRequest tabRequest;
 
-  tabRequest.requestId(s_tabRequestId++);
-  tabRequest.equipmentNumber(participant ? participant->equipmentNumber() : 0);
-  tabRequest.participantId(request.participantId());
-  tabRequest.language(request.language());
-  tabRequest.operationMode(request.opMode());
-  tabRequest.reactivationDetoxication(request.reactivationDecontamination());
-  tabRequest.reactivationMaintenance(request.reactivationMaintenance());
-  tabRequest.reactivationMedic(request.reactivationMedic());
-  tabRequest.protectionModeVest(request.modeVest());
-  tabRequest.protectionModeHelmet(request.modeHelmet());
-  tabRequest.personellProtection(request.modePersonalProtection());
-  tabRequest.protectionLevel(request.protectionLevel());
-  tabRequest.handgrenadeSearchMode(request.handgrenadeSearchMode());
-  tabRequest.internationalMode(request.internationalMode());
-  tabRequest.abcProtectionMode(request.abcProtectionMode());
+  tabRequest.requestId = s_tabRequestId++;
+  tabRequest.equipmentNumber = participant ? participant->equipmentNumber() : 0;
+  tabRequest.participantId = request.participantId;
+  tabRequest.language = request.language;
+  tabRequest.operationMode = request.opMode;
+  tabRequest.reactivationDetoxication = request.reactivationDecontamination;
+  tabRequest.reactivationMaintenance = request.reactivationMaintenance;
+  tabRequest.reactivationMedic = request.reactivationMedic;
+  tabRequest.protectionModeVest = request.modeVest;
+  tabRequest.protectionModeHelmet = request.modeHelmet;
+  tabRequest.personellProtection = request.modePersonalProtection;
+  tabRequest.protectionLevel = request.protectionLevel;
+  tabRequest.handgrenadeSearchMode = request.handgrenadeSearchMode;
+  tabRequest.internationalMode = request.internationalMode;
+  tabRequest.abcProtectionMode = request.abcProtectionMode;
 
   return m_proxyListener->sendParticipantModeRequest(cookie, tabRequest);
 }
@@ -864,11 +864,11 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::sendMessageRequest(cons
   TrainingAreaBase::SendEquipmentMessageRequest req;
 
   int failedParticipantId = 0;
-  if (!participantIds2EquipmentNumbers(request.participantIds(), req.equipmentNumbers(), &failedParticipantId))
+  if (!participantIds2EquipmentNumbers(request.participantIds, req.equipmentNumbers, &failedParticipantId))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Got invalid participant id %1 in send message request")).arg(failedParticipantId);
 
-  req.requestId(s_tabRequestId++);
-  req.message().set(request.message());
+  req.requestId = s_tabRequestId++;
+  req.message.set(request.message);
 
   return m_proxyListener->sendEquipmentMessage(cookie, req);
 }
@@ -882,59 +882,59 @@ void ParticipantHandlerForExercise::onRegisterParticipantRequest(const rti::core
   if (ret.error())
     WARNING_LOG(m_logger) << ret();
 
-  RegisterReply rRep(request.participantId(), ret.str(), ret.args(), ret.additionalInfo(), retVal, m_mainHandler->exerciseId());
+  RegisterReply rRep(request.participantId, ret.str(), ret.args(), ret.additionalInfo(), retVal, m_mainHandler->exerciseId());
   m_mainHandler->fts()->registerParticipantReply(cookie, rRep);
 }
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::registerParticipantRequest(const RegisterParticipantRequest &request_, RegisterReturnValue &retVal)
 {
   RegisterParticipantRequest request(request_);
-  Participant *participantToRegister = m_participants.value(request.participantId(), nullptr);
+  Participant *participantToRegister = m_participants.value(request.participantId, nullptr);
 
   if (participantToRegister == nullptr) // check if participant exists
   {
     retVal = RegisterReturnValue::PlayerNotFound;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - participant id %1 is invalid"))
-        .arg(request.participantId());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - participant id %1 is invalid"))
+        .arg(request.participantId);
   }
 
   const EquipmentType *equipmentType = m_mainHandler->typeHandler()->equipmentTypeByTypeId(participantToRegister->typeId());
   if (equipmentType == nullptr) // check if the participant has a valid equipment type
   {
     retVal = RegisterReturnValue::PlayerNotFound;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - participant with id %1 has invalid equipmentType"))
-        .arg(request.participantId());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - participant with id %1 has invalid equipmentType"))
+        .arg(request.participantId);
   }
 
   // special case: warehouse doesn't like the equipment number set (ICD23, State C2)
   // but we want to use this equipment number -> set ExconOverrule
   if (participantToRegister->equipmentNumber() != 0 && participantToRegister->assignState() == ParticipantAssignState::HandoutExcon
-      && request.assignState() == ParticipantAssignState::AssignedWms && request.equipmentNumber() == -1)
+      && request.assignState == ParticipantAssignState::AssignedWms && request.equipmentNumber == -1)
   {
     NOTICE_LOG(m_logger) << "WMS doesn't know equipment number " << participantToRegister->equipmentNumber() << " - we have to override the assignment";
-    request.assignState(ParticipantAssignState::ExconWmsOverruled);
-    request.equipmentNumber(participantToRegister->equipmentNumber());
+    request.assignState = ParticipantAssignState::ExconWmsOverruled;
+    request.equipmentNumber = participantToRegister->equipmentNumber();
   }
 
-  if (!participantToRegister->isNewAssignStateValid(request.assignState(), request.equipmentNumber())) // check if assign state is valid
+  if (!participantToRegister->isNewAssignStateValid(request.assignState, request.equipmentNumber)) // check if assign state is valid
   {
     retVal = RegisterReturnValue::AssignmentIncorrect;
-    return Core::FunctionReplyObject(request.participantId(),
+    return Core::FunctionReplyObject(request.participantId,
                                      tr_lts("dds", "Could not register participant - combination of equipment number and assign state is invalid"));
   }
 
   if (participantToRegister->isDeleted()) // check if participant is marked as deleted
   {
     // the warehouse is allowed to set to NotAssigned (== free the equipment number) even when the participant is already deleted
-    if (request.assignState() != ParticipantAssignState::NotAssigned)
+    if (request.assignState != ParticipantAssignState::NotAssigned)
     {
       retVal = RegisterReturnValue::PlayerDeleted;
-      return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - participant is deleted"));
+      return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - participant is deleted"));
     }
   }
 
   // only identification and info has changed
-  if (participantToRegister->equipmentNumber() == request.equipmentNumber() && participantToRegister->assignState() == request.assignState())
+  if (participantToRegister->equipmentNumber() == request.equipmentNumber && participantToRegister->assignState() == request.assignState)
   {
     RegisterParticipantRequest oldData = participantToRegister->toRegisterParticipantRequest();
     auto *pfe = static_cast<ParticipantForExercise *>(participantToRegister);
@@ -946,49 +946,49 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::registerParticipantRequ
       pfe->registerFromFt(oldData);
 
       retVal = RegisterReturnValue::RegistrationFailed;
-      return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - failed to update info/identification in database"));
+      return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - failed to update info/identification in database"));
     }
 
     participantToRegister->publishParticipant();
     retVal = RegisterReturnValue::RegistrationOk;
 
-    return Core::FunctionReplyObject(request.participantId());
+    return Core::FunctionReplyObject(request.participantId);
   }
 
-  if (participantByEquipmentNumber(request.equipmentNumber()) != nullptr && participantByEquipmentNumber(request.equipmentNumber()) != participantToRegister
-      && request.equipmentNumber() > 0) // check if equipment number is already in use
+  if (participantByEquipmentNumber(request.equipmentNumber) != nullptr && participantByEquipmentNumber(request.equipmentNumber) != participantToRegister
+      && request.equipmentNumber > 0) // check if equipment number is already in use
   {
     retVal = RegisterReturnValue::EquipNoAlreadyAssigned;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - equipment number %1 is already assigned"))
-        .arg(request.equipmentNumber());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - equipment number %1 is already assigned"))
+        .arg(request.equipmentNumber);
   }
 
-  const bool hasToCheckEquipmentNumber = request.assignState() != ParticipantAssignState::HandoutWms && request.assignState() != ParticipantAssignState::ExconWmsOverruled
-                                         && request.assignState() != ParticipantAssignState::NotAssigned;
+  const bool hasToCheckEquipmentNumber = request.assignState != ParticipantAssignState::HandoutWms && request.assignState != ParticipantAssignState::ExconWmsOverruled
+                                         && request.assignState != ParticipantAssignState::NotAssigned;
   if (participantToRegister->equipmentNumber() > 0 && hasToCheckEquipmentNumber) // check if the participant already has an equipment number
   {
     retVal = RegisterReturnValue::AssignmentIncorrect;
-    return Core::FunctionReplyObject(request.participantId(),
+    return Core::FunctionReplyObject(request.participantId,
                                      tr_lts("dds", "Could not register participant - participant with id %1 has already an assigned equipment number %2"))
-        .arg(request.participantId())
-        .arg(request.equipmentNumber());
+        .arg(request.participantId)
+        .arg(request.equipmentNumber);
   }
 
-  if ((request.equipmentNumber() > equipmentType->maxEquipNo() || request.equipmentNumber() < equipmentType->minEquipNo()) && request.equipmentNumber() > 0)
+  if ((request.equipmentNumber > equipmentType->maxEquipNo || request.equipmentNumber < equipmentType->minEquipNo) && request.equipmentNumber > 0)
   {
     // check if the equipment number is in range for the associated equipment type
     retVal = RegisterReturnValue::AssignmentIncorrect;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - Equipment number %1 is not in range (%2 - %3)"))
-        .arg(request.equipmentNumber())
-        .arg(equipmentType->minEquipNo())
-        .arg(equipmentType->maxEquipNo());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - Equipment number %1 is not in range (%2 - %3)"))
+        .arg(request.equipmentNumber)
+        .arg(equipmentType->minEquipNo)
+        .arg(equipmentType->maxEquipNo);
   }
 
   const Type *type = typeById(participantToRegister->typeId());
   if (type == nullptr)
   {
     retVal = RegisterReturnValue::RegistrationFailed;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - participant has invalid type id"));
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - participant has invalid type id"));
   }
 
   RegisterParticipantRequest oldData = participantToRegister->toRegisterParticipantRequest();
@@ -996,8 +996,8 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::registerParticipantRequ
   if (!pfe->registerFromFt(request))
   {
     retVal = RegisterReturnValue::EquipNoAlreadyAssigned;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - equipment number %1 is already assigned"))
-        .arg(request.equipmentNumber());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - equipment number %1 is already assigned"))
+        .arg(request.equipmentNumber);
   }
 
   if (!m_mainHandler->db()->update(participantToRegister->toDbParticipant()))
@@ -1006,13 +1006,13 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::registerParticipantRequ
     pfe->registerFromFt(oldData);
 
     retVal = RegisterReturnValue::RegistrationFailed;
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not register participant - failed to update in database"));
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not register participant - failed to update in database"));
   }
 
   participantToRegister->publishParticipant();
   retVal = RegisterReturnValue::RegistrationOk;
 
-  return Core::FunctionReplyObject(request.participantId());
+  return Core::FunctionReplyObject(request.participantId);
 }
 
 void ParticipantHandlerForExercise::onSetSimulatedPositionRequest(const rti::core::SampleIdentity &cookie, const SetSimulatedPosition &request)
@@ -1032,15 +1032,15 @@ void ParticipantHandlerForExercise::setSimulatedPosition(Participant *participan
   ERROR_LOG(m_logger) << "setSimulatedPosition start.. ";
 
   static const qint64 outDated = 10 * 60 * 1000; // 10 min
-  const qint64 oldTime = request.onlyOutdatedParticipants() ? (participant->position().sampleTime() + outDated) : 0;
+  const qint64 oldTime = request.onlyOutdatedParticipants ? (participant->position().sampleTime + outDated) : 0;
   const qint64 curTime = QDateTime::currentMSecsSinceEpoch();
   if (oldTime < curTime)
   {
     TrainingAreaBase::EquipmentPosition pos;
-    pos.equipmentNumber(-participant->id());
-    pos.sampleTime(request.onlyOutdatedParticipants() ? participant->position().sampleTime() + 1 : curTime);
-    pos.position().position(request.position());
-    pos.position().reportingSource(Core::PositionReportingSource::SetByOperator);
+    pos.equipmentNumber = -participant->id();
+    pos.sampleTime = request.onlyOutdatedParticipants ? participant->position().sampleTime + 1 : curTime;
+    pos.position.position = request.position;
+    pos.position.reportingSource = Core::PositionReportingSource::SetByOperator;
 
     if (!m_dtsTab)
     {
@@ -1065,17 +1065,17 @@ void ParticipantHandlerForExercise::onSetSimulatedPositionRelativeRequest(const
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedPositionRelativeRequest(const SetSimulatedPositionRelative &request)
 {
-  if (request.participantId() <= 0)
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId());
+  if (request.participantId <= 0)
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId);
 
-  Participant *participant = m_participants.value(request.participantId(), nullptr);
+  Participant *participant = m_participants.value(request.participantId, nullptr);
 
   if (participant == nullptr)
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId);
 
   setSimulatedPositionRelative(participant, request);
 
-  return Core::FunctionReplyObject(request.participantId());
+  return Core::FunctionReplyObject(request.participantId);
 }
 
 void ParticipantHandlerForExercise::updateParticipantFormation(Participant *participant, const Core::GeoPosition &position, const QPointF &offset)
@@ -1086,7 +1086,7 @@ void ParticipantHandlerForExercise::updateParticipantFormation(Participant *part
   DEBUG_LOG(m_logger) << LOGFUNCTION << " id = " << participant->id();
 
   Core::GeoPosition tempPos;
-  if (qFuzzyIsNull(position.lon()) || qFuzzyIsNull(position.lat()))
+  if (qFuzzyIsNull(position.lon) || qFuzzyIsNull(position.lat))
   {
     // typical for units:
     DEBUG_LOG(m_logger) << LOGFUNCTION << " participantId=" << participant->id() << ", skip due to position isFuzzyNull =" << position;
@@ -1094,19 +1094,19 @@ void ParticipantHandlerForExercise::updateParticipantFormation(Participant *part
   else
   {
     // add offset in meter:
-    const LtsCoordTrans::UtmCoordinate partCoord = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(position.lon(), position.lat()));
+    const LtsCoordTrans::UtmCoordinate partCoord = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(position.lon, position.lat));
     const QPointF coordinate = partCoord.geographic(QPointF(offset.x(), offset.y())); // offet in meter
     DEBUG_LOG(m_logger) << "coordinate=" << coordinate.x() << " - " << coordinate.y() << " offset(" << offset.x() << ";" << offset.y() << ")";
 
-    tempPos.lon(coordinate.x());
-    tempPos.lat(coordinate.y());
+    tempPos.lon = coordinate.x();
+    tempPos.lat = coordinate.y();
 
     TrainingAreaBase::EquipmentPosition pos;
-    pos.equipmentNumber(-participant->id());
+    pos.equipmentNumber = -participant->id();
     const qint64 curTime = QDateTime::currentMSecsSinceEpoch();
-    pos.sampleTime(curTime);
-    pos.position().position(tempPos);
-    pos.position().reportingSource(Core::PositionReportingSource::SetByOperator);
+    pos.sampleTime = curTime;
+    pos.position.position = tempPos;
+    pos.position.reportingSource = Core::PositionReportingSource::SetByOperator;
 
     if (!m_dtsTab)
     {
@@ -1126,13 +1126,13 @@ void ParticipantHandlerForExercise::setFormationAsLine(Participant *participant,
   if (!participant)
     return;
 
-  DEBUG_LOG(m_logger) << " participant Name: " << participant->participantData().name() << " inferiorCount: " << participant->inferiors().size();
+  DEBUG_LOG(m_logger) << " participant Name: " << participant->participantData().name << " inferiorCount: " << participant->inferiors().size();
   const std::vector<int> &inferiors = participant->inferiors();
   if (inferiors.empty())
     return;
   else if (inferiors.size() == 1) // in case only one pp
   {
-    const SetSimulatedPosition simPosReq(participant->id(), request.position(), false);
+    const SetSimulatedPosition simPosReq(participant->id(), request.position, false);
     setSimulatedPosition(participant, simPosReq);
     return;
   }
@@ -1158,7 +1158,7 @@ void ParticipantHandlerForExercise::setFormationAsLine(Participant *participant,
   ppPoints = transform.rotate(rotationAngle).map(ppPoints);
 
   for (int index = 0; index < (int)inferiors.size(); ++index)
-    updateParticipantFormation(m_participants.value(inferiors[index]), request.position(), ppPoints.at(index));
+    updateParticipantFormation(m_participants.value(inferiors[index]), request.position, ppPoints.at(index));
 }
 
 void ParticipantHandlerForExercise::setSimulatedPositionRelative(Participant *participant, const SetSimulatedPositionRelative &request)
@@ -1168,9 +1168,9 @@ void ParticipantHandlerForExercise::setSimulatedPositionRelative(Participant *pa
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " id = " << participant->id();
 
-  Core::GeoPosition tempPos = participant->position().pos();
+  Core::GeoPosition tempPos = participant->position().pos;
 
-  if (qFuzzyIsNull(tempPos.lon()) || qFuzzyIsNull(tempPos.lat()))
+  if (qFuzzyIsNull(tempPos.lon) || qFuzzyIsNull(tempPos.lat))
   {
     // typical for units:
     DEBUG_LOG(m_logger) << LOGFUNCTION << " participantId=" << participant->id() << ", skip due to position isFuzzyNull =" << tempPos;
@@ -1178,19 +1178,19 @@ void ParticipantHandlerForExercise::setSimulatedPositionRelative(Participant *pa
   else
   {
     // add offset in meter:
-    LtsCoordTrans::UtmCoordinate partCoord = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(tempPos.lon(), tempPos.lat()));
-    QPointF posWithOffset = partCoord.geographic(QPointF(request.positionOffsetX(), request.positionOffsetY())); // offet in meter
+    LtsCoordTrans::UtmCoordinate partCoord = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(tempPos.lon, tempPos.lat));
+    QPointF posWithOffset = partCoord.geographic(QPointF(request.positionOffsetX, request.positionOffsetY)); // offet in meter
     DEBUG_LOG(m_logger) << LOGFUNCTION << " posWithOffset=" << posWithOffset.x() << " - " << posWithOffset.y();
 
-    tempPos.lon(posWithOffset.x());
-    tempPos.lat(posWithOffset.y());
+    tempPos.lon = posWithOffset.x();
+    tempPos.lat = posWithOffset.y();
 
     TrainingAreaBase::EquipmentPosition pos;
-    pos.equipmentNumber(-participant->id());
+    pos.equipmentNumber = -participant->id();
     const qint64 curTime = QDateTime::currentMSecsSinceEpoch();
-    pos.sampleTime(curTime);
-    pos.position().position(tempPos);
-    pos.position().reportingSource(Core::PositionReportingSource::SetByOperator);
+    pos.sampleTime = curTime;
+    pos.position.position = tempPos;
+    pos.position.reportingSource = Core::PositionReportingSource::SetByOperator;
 
     if (!m_dtsTab)
     {
@@ -1215,15 +1215,15 @@ void ParticipantHandlerForExercise::onSetSimulatedParticipantFormationRequest(co
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedParticipantFormationRequest(const SetSimulatedParticipantFormation &request)
 {
-  if (request.participantId() <= 0)
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId());
+  if (request.participantId <= 0)
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId);
 
-  Participant *participant = m_participants.value(request.participantId(), nullptr);
+  Participant *participant = m_participants.value(request.participantId, nullptr);
 
   if (participant == nullptr)
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId());
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not move participant - participant id %1 is invalid")).arg(request.participantId);
 
-  const ParticipantFormationStruct formation(QString::fromStdString(request.formation()));
+  const ParticipantFormationStruct formation(QString::fromStdString(request.formation));
   if (formation.hasFormationData())
   {
     DEBUG_LOG(m_logger) << "setSimulatedParticipantFormation type: " << formation.geometry << " | distance: " << formation.distance << " | angle: " << formation.angle;
@@ -1232,11 +1232,11 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedParticipant
   else
   {
     DEBUG_LOG(m_logger) << "setSimulatedPositionRelative WITHOUT FORMATION";
-    SetSimulatedPositionRelative relSimRequest(request.participantId(), request.positionOffsetX(), request.positionOffsetY());
+    SetSimulatedPositionRelative relSimRequest(request.participantId, request.positionOffsetX, request.positionOffsetY);
     setSimulatedPositionRelative(participant, relSimRequest);
   }
 
-  return Core::FunctionReplyObject(request.participantId());
+  return Core::FunctionReplyObject(request.participantId);
 }
 
 void ParticipantHandlerForExercise::onSetSanitationRequest(const rti::core::SampleIdentity &cookie, const SetSanitationRequest &request)
@@ -1251,17 +1251,17 @@ void ParticipantHandlerForExercise::onSetSanitationRequest(const rti::core::Samp
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::setSanitationRequest(const rti::core::SampleIdentity &cookie, const SetSanitationRequest &request)
 {
-  Participant *participant = m_participants.value(request.id(), nullptr);
+  Participant *participant = m_participants.value(request.id, nullptr);
 
   if (participant == nullptr)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.id());
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.id);
 
   TrainingAreaBase::SendSetSanitationRequest tabRequest;
-  tabRequest.equipmentNumber(participant->equipmentNumber());
-  tabRequest.originatorEquipmentNumber(request.data().originatorEquipmentNumber());
-  tabRequest.participantId(request.id());
-  tabRequest.qualification(static_cast<TrainingAreaBase::Qualification>(request.data().qualification().underlying()));
-  tabRequest.sanitationProceduresTaken(request.data().sanitationProceduresTaken());
+  tabRequest.equipmentNumber = participant->equipmentNumber();
+  tabRequest.originatorEquipmentNumber = request.data.originatorEquipmentNumber;
+  tabRequest.participantId = request.id;
+  tabRequest.qualification = static_cast<TrainingAreaBase::Qualification>(request.data.qualification);
+  tabRequest.sanitationProceduresTaken = request.data.sanitationProceduresTaken;
 
   return m_proxyListener->sendSetSanitationRequest(cookie, tabRequest);
 }
@@ -1279,29 +1279,29 @@ void ParticipantHandlerForExercise::onSelectiveReammunitionRequest(const rti::co
 Core::FunctionReplyObject ParticipantHandlerForExercise::selectiveReammunitionRequest(const rti::core::SampleIdentity &cookie,
                                                                                       const SelectiveReammunitionRequest &request)
 {
-  Participant *participant = m_participants.value(request.id(), nullptr);
+  Participant *participant = m_participants.value(request.id, nullptr);
 
   INFO_LOG(m_logger) << "ParticipantHandlerForExercise::selectiveReammunitionRequest: ";
 
   if (participant == nullptr)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.id());
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.id);
 
-  INFO_LOG(m_logger) << "Participant id = " << request.id();
+  INFO_LOG(m_logger) << "Participant id = " << request.id;
 
   TrainingAreaBase::SendSelectiveReammunitionRequest tabRequest;
-  tabRequest.equipmentNumber(participant->equipmentNumber());
-  tabRequest.participantId(request.id());
-  tabRequest.gearId(request.gearId());
-  INFO_LOG(m_logger) << "Gear id = " << request.gearId();
-  for (const Reammunition ra : std::as_const(request.reammunition()))
+  tabRequest.equipmentNumber = participant->equipmentNumber();
+  tabRequest.participantId = request.id;
+  tabRequest.gearId = request.gearId;
+  INFO_LOG(m_logger) << "Gear id = " << request.gearId;
+  for (const Reammunition ra : std::as_const(request.reammunition))
   {
     TrainingAreaBase::Reammunition tabRa;
-    tabRa.chargeTypeId(ra.chargeTypeId());
-    tabRa.newDefaultStock(ra.newDefaultStock());
-    tabRa.newStock(ra.newStock());
-    tabRa.tracerRatio(ra.tracerRatio());
-    INFO_LOG(m_logger) << "Charge type id = " << ra.chargeTypeId();
-    tabRequest.reammunition().push_back(tabRa);
+    tabRa.chargeTypeId = ra.chargeTypeId;
+    tabRa.newDefaultStock = ra.newDefaultStock;
+    tabRa.newStock = ra.newStock;
+    tabRa.tracerRatio = ra.tracerRatio;
+    INFO_LOG(m_logger) << "Charge type id = " << ra.chargeTypeId;
+    tabRequest.reammunition.push_back(tabRa);
   }
 
   return m_proxyListener->selectiveReammunitionRequest(cookie, tabRequest);
@@ -1321,21 +1321,21 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::setAsSimulatedRequest(c
 {
   DEBUG_LOG(m_logger) << "setAsSimulatedRequest: " << request;
 
-  ParticipantManagement::Participant participant = m_ppmDtc->participant(request.participantId());
-  participant.isSimulated(request.setSimulated());
+  ParticipantManagement::Participant participant = m_ppmDtc->participant(request.participantId);
+  participant.isSimulated = request.setSimulated;
   const ParticipantManagement::ParticipantData &data = m_ppmDtc->convertParticipantToParticipantData(participant);
 
-  Database::PpmParticipant dbParticipant = toDbParticipant(data, request.participantId());
-  dbParticipant.superiorId = participant.superiorId();
+  Database::PpmParticipant dbParticipant = toDbParticipant(data, request.participantId);
+  dbParticipant.superiorId = participant.superiorId;
   DEBUG_LOG(m_logger) << "PpmParticipant setted  supId: " << dbParticipant.tacticalIdentifier << " superiorId: " << dbParticipant.superiorId;
 
   // db update in ppm_participant
   if (!m_mainHandler->db()->update(dbParticipant))
-    return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not update participant data in database, participant data may be inconsistent"));
+    return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not update participant data in database, participant data may be inconsistent"));
 
   // publishing participant data
   dts()->publish(participant);
-  return Core::FunctionReplyObject(request.participantId());
+  return Core::FunctionReplyObject(request.participantId);
 }
 
 void ParticipantHandlerForExercise::onOcCommandRequest(const rti::core::SampleIdentity &cookie, const ParticipantManagement::OcCommandRequest &request)
@@ -1355,18 +1355,18 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::ocCommandRequest(const
   TrainingAreaBase::SendOcCommandRequest req;
 
   int failedParticipantId = 0;
-  if (!participantIds2EquipmentNumbers(request.participantIds(), req.equipmentNumbers(), &failedParticipantId))
+  if (!participantIds2EquipmentNumbers(request.participantIds, req.equipmentNumbers, &failedParticipantId))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Got invalid participant id %1 in init request")).arg(failedParticipantId);
 
-  req.requestId(s_tabRequestId++);
-  req.action(request.action());
+  req.requestId = s_tabRequestId++;
+  req.action = request.action;
 
   return m_proxyListener->sendOcCommandRequest(cookie, req);
 }
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedPositionRequest(const SetSimulatedPosition &request)
 {
-  if (request.participantId() <= 0)
+  if (request.participantId <= 0)
   {
     for (Participant *participant : std::as_const(m_participants))
     {
@@ -1377,15 +1377,15 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::setSimulatedPositionReq
   }
   else
   {
-    Participant *participant = m_participants.value(request.participantId(), nullptr);
+    Participant *participant = m_participants.value(request.participantId, nullptr);
 
     if (participant == nullptr)
-      return Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.participantId());
+      return Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Could not set participant - participant id %1 is invalid")).arg(request.participantId);
 
     setSimulatedPosition(participant, request);
   }
 
-  return Core::FunctionReplyObject(request.participantId());
+  return Core::FunctionReplyObject(request.participantId);
 }
 
 Core::FunctionReplyObject ParticipantHandlerForExercise::createNewParticipants(std::vector<Database::PpmParticipant> &dbParticipantsToBeCreated,
@@ -1407,7 +1407,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::createNewParticipants(s
     m_participants.insert(newParticipant->id(), newParticipant);
 
     // map mod id
-    modIdToParticipantId.insert(ddsParticipant.modId(), newParticipant->id());
+    modIdToParticipantId.insert(ddsParticipant.modId, newParticipant->id());
 
     // register to publish changes
     participantsWithChanges.insert(newParticipant);
@@ -1420,37 +1420,37 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
                                                                                  const ParticipantManagement::ParticipantData &participantToValidate)
 {
   DEBUG_LOG(m_logger) << "checking party id";
-  if (m_mainHandler->partyHandler()->partyById(participantToValidate.partyId()) == nullptr)
+  if (m_mainHandler->partyHandler()->partyById(participantToValidate.partyId) == nullptr)
   {
 
-    return Core::FunctionReplyObject(tr_lts("dds", "Got invalid party id %1")).arg(participantToValidate.partyId());
+    return Core::FunctionReplyObject(tr_lts("dds", "Got invalid party id %1")).arg(participantToValidate.partyId);
   }
-  if (isSupportType(participantToValidate.typeId()))
+  if (isSupportType(participantToValidate.typeId))
   {
-    if (participantToValidate.partyId() != 1)
+    if (participantToValidate.partyId != 1)
     {
 
       return Core::FunctionReplyObject(tr_lts("dds", "Got party id %1 for a support participant. Support participants have to be in party 1"))
-          .arg(participantToValidate.partyId());
+          .arg(participantToValidate.partyId);
     }
   }
-  else if (participantToValidate.partyId() == 1)
+  else if (participantToValidate.partyId == 1)
 
     return Core::FunctionReplyObject(tr_lts("dds", "Not possible to add a non support participant to party with id 1"));
   DEBUG_LOG(m_logger) << "... ok";
 
-  const int partId = participantToValidate.id();
+  const int partId = participantToValidate.id;
   auto *existingParticipant = participantById(partId);
   // participant id valid?
-  if (participantToValidate.id() != 0 && (existingParticipant != nullptr)) // got participantData with Id and participant already exits
+  if (participantToValidate.id != 0 && (existingParticipant != nullptr)) // got participantData with Id and participant already exits
   {
     // assign state valid?
     DEBUG_LOG(m_logger) << "checking assign state";
     int32_t equipmentNumber = 0;
-    if (participantToValidate.equipmentNumber.is_set())
+    if (participantToValidate.equipmentNumber.has_value())
       equipmentNumber = participantToValidate.equipmentNumber.get();
 
-    bool isAssignStateValid = existingParticipant->isNewAssignStateValid(participantToValidate.assignState(), equipmentNumber);
+    bool isAssignStateValid = existingParticipant->isNewAssignStateValid(participantToValidate.assignState, equipmentNumber);
     if (!isAssignStateValid)
     {
       return Core::FunctionReplyObject(partId, tr_lts("dds", "The combination of equipment number and assign state for particpant '%1' is invalid"))
@@ -1463,14 +1463,14 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
     {
       // type id same when participantId is set?
       DEBUG_LOG(m_logger) << "checking if typeId is not modified";
-      if (existingParticipant->typeId() != participantToValidate.typeId())
+      if (existingParticipant->typeId() != participantToValidate.typeId)
       {
 
         return Core::FunctionReplyObject(partId, tr_lts("dds", "It is not allowed to change the type of a participant (%1)")).arg(participantInfosFromId(partId));
       }
       DEBUG_LOG(m_logger) << "... ok";
     }
-    data.modIdToParticipantId.insert(participantToValidate.modId(), existingParticipant->id()); /* register participant to indicate that this participant
+    data.modIdToParticipantId.insert(participantToValidate.modId, existingParticipant->id()); /* register participant to indicate that this participant
                                                                                     should just be modified and not newly created */
   }
   else
@@ -1478,7 +1478,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
     DEBUG_LOG(m_logger) << "New participant to be added: " << participantToValidate;
 
     DEBUG_LOG(m_logger) << "checking participant id " << partId;
-    if (participantToValidate.id() != 0 && !data.forceAddWithId)
+    if (participantToValidate.id != 0 && !data.forceAddWithId)
     {
 
       return Core::FunctionReplyObject(partId, tr_lts("dds", "An invalid participant '%1' was given")).arg(participantInfosFromId(partId));
@@ -1486,31 +1486,31 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
     DEBUG_LOG(m_logger) << "... ok";
 
     // new participant
-    if (participantToValidate.equipmentNumber.is_set())
+    if (participantToValidate.equipmentNumber.has_value())
     {
-      if (participantToValidate.assignState() != ParticipantAssignState::HandoutExcon)
+      if (participantToValidate.assignState != ParticipantAssignState::HandoutExcon)
 
-        return Core::FunctionReplyObject(participantToValidate.modId(),
+        return Core::FunctionReplyObject(participantToValidate.modId,
                                          tr_lts("dds", "Got a new participant with an equipment number (%1) but assign state is not HandoutExcon"))
             .arg(participantToValidate.equipmentNumber.get());
     }
     else
     {
-      if (participantToValidate.assignState() != ParticipantAssignState::NotAssigned)
-        return Core::FunctionReplyObject(participantToValidate.modId(),
+      if (participantToValidate.assignState != ParticipantAssignState::NotAssigned)
+        return Core::FunctionReplyObject(participantToValidate.modId,
                                          tr_lts("dds", "Got a new participant with no equipment number set but assign state != NotAssigned"));
     }
   }
 
   // superior ids valid?
-  if (participantToValidate.superiorModId() > 0)
+  if (participantToValidate.superiorModId > 0)
   {
     DEBUG_LOG(m_logger) << "checking superiorIds";
     // superior exists?
     bool isExistingSuperiorId = false;
     for (const ParticipantData &dat : std::as_const(data.participantsToBeCreatedOrModified))
     {
-      if (participantToValidate.superiorModId() == dat.modId())
+      if (participantToValidate.superiorModId == dat.modId)
       {
         isExistingSuperiorId = true;
         break; // for (const ParticipantData &dat : data.dataVec)
@@ -1520,12 +1520,12 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
     if (!isExistingSuperiorId)
     {
       return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - the data set with modId %1 has an invalid superiorModId %2"))
-          .arg(participantToValidate.modId())
-          .arg(participantToValidate.superiorModId());
+          .arg(participantToValidate.modId)
+          .arg(participantToValidate.superiorModId);
     }
     DEBUG_LOG(m_logger) << "... ok";
 
-    if (participantToValidate.hierarchyNumber() <= 0)
+    if (participantToValidate.hierarchyNumber <= 0)
       return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - the data has a superior but no valid hierarchyNumber"));
 
     // all hierarchy numbers with same superior unique?
@@ -1533,25 +1533,25 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
     for (const ParticipantData &dat : std::as_const(data.participantsToBeCreatedOrModified))
     {
       // operator==() on optionals returns false if not set ...
-      if (dat.modId() != participantToValidate.modId() && dat.superiorModId() == participantToValidate.superiorModId()
-          && dat.hierarchyNumber() == participantToValidate.hierarchyNumber())
+      if (dat.modId != participantToValidate.modId && dat.superiorModId == participantToValidate.superiorModId
+          && dat.hierarchyNumber == participantToValidate.hierarchyNumber)
       {
         return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - superiorModId %1 hierarchyNumber %2 is not unique"))
-            .arg(dat.superiorModId())
-            .arg(dat.hierarchyNumber());
+            .arg(dat.superiorModId)
+            .arg(dat.hierarchyNumber);
       }
     }
     DEBUG_LOG(m_logger) << "... ok";
   }
   else
   {
-    const Participant *curParticipant = m_participants.value(participantToValidate.id());
+    const Participant *curParticipant = m_participants.value(participantToValidate.id);
     bool bOk = curParticipant != nullptr;
     // superiorModId == 0 -> root knot (can be new because of participant organisation)
-    if (curParticipant && participantToValidate.superiorModId() != 0)
+    if (curParticipant && participantToValidate.superiorModId != 0)
     {
       // an update of an existing participant, the hierarchy number must not change
-      if (participantToValidate.hierarchyNumber() != curParticipant->toDbParticipant().hierarchyNumber)
+      if (participantToValidate.hierarchyNumber != curParticipant->toDbParticipant().hierarchyNumber)
       {
         WARNING_LOG(m_logger) << "participant: " << curParticipant->toDdsParticipant(curParticipant->toDbParticipant());
         bOk = false;
@@ -1559,43 +1559,43 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
       // anything else to check here?
     }
     else
-      bOk = (participantToValidate.hierarchyNumber() == 1); // root know of a participant tree - the hierarchy number must be 1
+      bOk = (participantToValidate.hierarchyNumber == 1); // root know of a participant tree - the hierarchy number must be 1
 
     if (!bOk)
     {
       WARNING_LOG(m_logger) << "participantToValidate: " << participantToValidate;
-      return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - the root participant (%1) must have a hierarchy number of '1'")).arg(participantToValidate.id());
+      return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - the root participant (%1) must have a hierarchy number of '1'")).arg(participantToValidate.id);
     }
   }
 
   // typeId valid?
   DEBUG_LOG(m_logger) << "checking typeId";
-  const Type *type = typeById(participantToValidate.typeId());
+  const Type *type = typeById(participantToValidate.typeId);
   if (type == nullptr) // type invalid
     return Core::FunctionReplyObject(tr_lts("dds", "Internal Error - data with modId %1 has invalid typeId %2"))
-        .arg(participantToValidate.modId())
-        .arg(participantToValidate.typeId());
+        .arg(participantToValidate.modId)
+        .arg(participantToValidate.typeId);
 
   DEBUG_LOG(m_logger) << "... ok";
 
   DEBUG_LOG(m_logger) << "Check if type is allowed in ex_" << m_mainHandler->exerciseId();
-  if (m_mainHandler->exerciseId() < 1 && !isSupportTypeClass(type->typeClass())) // only support types allowed
+  if (m_mainHandler->exerciseId() < 1 && !isSupportTypeClass(type->typeClass)) // only support types allowed
     return Core::FunctionReplyObject(tr_lts("dds", "Internal Error -  got non support participant data in ex_0 --> not allowed"));
 
   DEBUG_LOG(m_logger) << "... ok";
 
-  if (participantToValidate.equipmentNumber.is_set())
+  if (participantToValidate.equipmentNumber.has_value())
   {
     const int equipNo = participantToValidate.equipmentNumber.get();
-    const int participantId = participantToValidate.id();
+    const int participantId = participantToValidate.id;
     DEBUG_LOG(m_logger) << "Check if equipment number is globally unique " << equipNo;
     int partIdLookup = m_equipNumber2ParticipantId.value(equipNo);
     if (partIdLookup != 0 && partIdLookup != participantId)
     {
-      if (participantToValidate.partyId() == 0) // in pool, participant was moved from template to pool (otherwise the equipment number could not be twice)
+      if (participantToValidate.partyId == 0) // in pool, participant was moved from template to pool (otherwise the equipment number could not be twice)
       {
         // mod id since it can be new (in fact it must be new here)
-        data.participantsToResetEquipmentNumber += participantToValidate.modId();
+        data.participantsToResetEquipmentNumber += participantToValidate.modId;
         INFO_LOG(m_logger) << "Moved a participant from template to pool with an equipment number which already exists - remove equipment number: " << equipNo;
       }
       else
@@ -1608,7 +1608,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
       auto it = m_equipmentExerciseMappings.find(equipNo);
       if (it != m_equipmentExerciseMappings.end())
       {
-        if (it.value().exerciseId != m_mainHandler->exerciseId() || it.value().participantId != participantToValidate.id())
+        if (it.value().exerciseId != m_mainHandler->exerciseId() || it.value().participantId != participantToValidate.id)
           return Core::FunctionReplyObject(tr_lts("dds", "The equipment number %1 is already used by another participant in another exercise (%2)"))
               .arg(equipNo)
               .arg(participantInfosFromId(participantId));
@@ -1643,7 +1643,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::checkDeleteParticipant(
   if (eqIdToReset != 0)
   {
     // when we are not 'owner' of the equipment number, we are not allowed to remove this participant
-    switch (participant->assignState().underlying())
+    switch (participant->assignState())
     {
       case ParticipantAssignState::NotAssigned:
       case ParticipantAssignState::HandoutExcon:
@@ -1688,11 +1688,11 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::deleteParticipant(int32
     return Core::FunctionReplyObject(id, tr_lts("dds", "Can not remove participant with equipment number %1 - handled by warehouse")).arg(eqIdToReset);
 
   if (m_mainHandler->ddsHandler()->dtc()->isTypeUas(participant->typeId())
-      && m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participant->id(), m_mainHandler->exerciseId()).id() > 0)
+      && m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participant->id(), m_mainHandler->exerciseId()).id > 0)
   {
     // is in use
     return Core::FunctionReplyObject(id, tr_lts("dds", "Can not remove participant assigned to UAS: %1"))
-        .arg(m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participant->id(), m_mainHandler->exerciseId()).deviceIdentifier());
+        .arg(m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participant->id(), m_mainHandler->exerciseId()).deviceIdentifier);
   }
   if (permanentRemove)
   {
@@ -1713,8 +1713,8 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::deleteParticipant(int32
     if (eqIdToReset != 0)
     {
       auto ftData = participant->toRegisterParticipantRequest();
-      ftData.equipmentNumber(0);
-      ftData.assignState(ParticipantAssignState::NotAssigned);
+      ftData.equipmentNumber = 0;
+      ftData.assignState = ParticipantAssignState::NotAssigned;
       auto *pfe = static_cast<ParticipantForExercise *>(participant);
       pfe->registerFromFt(ftData);
     }
@@ -1806,18 +1806,18 @@ void ParticipantHandlerForExercise::onEquipmentExerciseMappingChanged(const Equi
       QSet<int> oldEqIds;
       for (const auto &db : std::as_const(m_equipmentExerciseMappings))
       {
-        if (db.exerciseId != data.exerciseId())
+        if (db.exerciseId != data.exerciseId)
           continue;
         oldEqIds.insert(db.equipmentNumber);
       }
       Database::EquipmentExerciseMapping eem;
-      eem.exerciseId = data.exerciseId();
-      for (const Equipment2ParticipantId &e2p : data.mapping())
+      eem.exerciseId = data.exerciseId;
+      for (const Equipment2ParticipantId &e2p : data.mapping)
       {
-        eem.equipmentNumber = e2p.equipmentNumber();
-        eem.participantId = e2p.participantId();
+        eem.equipmentNumber = e2p.equipmentNumber;
+        eem.participantId = e2p.participantId;
         oldEqIds.remove(eem.equipmentNumber);
-        m_equipmentExerciseMappings[e2p.equipmentNumber()] = eem;
+        m_equipmentExerciseMappings[e2p.equipmentNumber] = eem;
       }
       for (int oldEqId : oldEqIds)
       {
@@ -1825,7 +1825,7 @@ void ParticipantHandlerForExercise::onEquipmentExerciseMappingChanged(const Equi
         if (it == m_equipmentExerciseMappings.end())
           continue;
         Database::EquipmentExerciseMapping &eemOld = it.value();
-        if (eemOld.exerciseId != data.exerciseId())
+        if (eemOld.exerciseId != data.exerciseId)
           continue;
         m_equipmentExerciseMappings.erase(it);
       }
@@ -1833,22 +1833,22 @@ void ParticipantHandlerForExercise::onEquipmentExerciseMappingChanged(const Equi
     }
     case DataModification::eRemoved:
       // exercise stopped or shut down
-      if (data.exerciseId() == m_mainHandler->exerciseId())
+      if (data.exerciseId == m_mainHandler->exerciseId())
         return;
-      for (const Equipment2ParticipantId &e2p : data.mapping())
-        m_equipmentExerciseMappings.remove(e2p.equipmentNumber());
+      for (const Equipment2ParticipantId &e2p : data.mapping)
+        m_equipmentExerciseMappings.remove(e2p.equipmentNumber);
       break;
   }
 }
 
 void ParticipantHandlerForExercise::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification mod)
 {
-  if (data.id() != m_mainHandler->exerciseId())
+  if (data.id != m_mainHandler->exerciseId())
     return;
 
   bool bPublishNow = false;
-  if (mod == DataModification::eRemoved || data.state() == ExerciseManagement::ExerciseState::Created || data.state() == ExerciseManagement::ExerciseState::Stopped
-      || data.state() == ExerciseManagement::ExerciseState::Terminated)
+  if (mod == DataModification::eRemoved || data.state == ExerciseManagement::ExerciseState::Created || data.state == ExerciseManagement::ExerciseState::Stopped
+      || data.state == ExerciseManagement::ExerciseState::Terminated)
     bPublishNow = false;
   else
     bPublishNow = true;
@@ -1862,21 +1862,21 @@ void ParticipantHandlerForExercise::onExerciseChanged(const ExerciseManagement::
 void ParticipantHandlerForExercise::publishEquipmentExerciseMapping()
 {
   EquipmentExerciseMapping eem;
-  eem.exerciseId(m_mainHandler->exerciseId());
+  eem.exerciseId = m_mainHandler->exerciseId();
   if (!m_publishEquipmentExerciseMappings)
   {
     m_mainHandler->exAnyDts()->publish(eem); // empty
     return;
   }
-  eem.mapping().reserve(m_equipNumber2ParticipantId.size());
+  eem.mapping.reserve(m_equipNumber2ParticipantId.size());
   for (auto it = m_equipNumber2ParticipantId.cbegin(); it != m_equipNumber2ParticipantId.cend(); ++it)
-    eem.mapping().emplace_back(it.key(), it.value());
+    eem.mapping.emplace_back(it.key(), it.value());
   m_mainHandler->exAnyDts()->publish(eem);
 }
 
 bool ParticipantHandlerForExercise::isCurrentExerciseActive() const
 {
-  const auto exState = m_exmDtc->exercise(m_mainHandler->exerciseId()).state();
+  const auto exState = m_exmDtc->exercise(m_mainHandler->exerciseId()).state;
   return (exState == ExerciseManagement::ExerciseState::Started || exState == ExerciseManagement::ExerciseState::Paused);
 }
 
@@ -1890,7 +1890,7 @@ QString ParticipantHandlerForExercise::lookUpHierachy(int participantId) const
   if (!participant)
     return QString();
 
-  QString ret = QString::fromStdString(participant->participantData().designator());
+  QString ret = QString::fromStdString(participant->participantData().designator);
   // First separator is "./"
   if (participant->superiorId() <= 0)
     return (ret + QLatin1String("./"));
@@ -1917,18 +1917,18 @@ void ParticipantHandlerForExercise::customedSetGearCharges(Participant *particip
 {
   const auto ppType = m_mainHandler->typeHandler()->typeById(participant->typeId());
 
-  if (!ppType || ppType->typeClass() == TypeClass::Unknown || ppType->properties().empty())
+  if (!ppType || ppType->typeClass == TypeClass::Unknown || ppType->properties.empty())
     return;
-  const QJsonObject &typObj = QJsonDocument::fromJson(QByteArray::fromStdString(ppType->properties())).object();
+  const QJsonObject &typObj = QJsonDocument::fromJson(QByteArray::fromStdString(ppType->properties)).object();
   if (typObj.isEmpty())
     return;
 
   const bool isArtillery = typObj[QStringLiteral("isArtillery")].toBool(false);
   const int gearClassId = typObj[QStringLiteral("gearClassId")].toInt(0);
   const ProjectDataManagement::GearClass gearClass = static_cast<ProjectDataManagement::GearClass>(gearClassId);
-  static QVector<ProjectDataManagement::GearClass> validGearTypes{ProjectDataManagement::GearClass::Mortar,
-                                                                            ProjectDataManagement::GearClass::Rocket,
-                                                                            ProjectDataManagement::GearClass::Artillery};
+  static QVector<ProjectDataManagement::GearClass> validGearTypes{ProjectDataManagement::GearClass::GearClass_Mortar,
+                                                                            ProjectDataManagement::GearClass::GearClass_Rocket,
+                                                                            ProjectDataManagement::GearClass::GearClass_Artillery};
   if (!isArtillery || !validGearTypes.contains(gearClass))
     return;
 
@@ -1943,15 +1943,15 @@ void ParticipantHandlerForExercise::customedSetGearCharges(Participant *particip
   const auto &gtCts = m_pdmDtc->gearTypeChargeTypes();
   for (const auto &gt : gearTypes)
   {
-    if (gt.gearClassId() != gearClass)
+    if (gt.gearClassId != gearClass)
       continue;
 
     for (const auto &gtc : gtCts)
     {
-      if (gtc.gearTypeId() != gt.id())
+      if (gtc.gearTypeId != gt.id)
         continue;
-      DEBUG_LOG(m_logger) << " >>> dataid: " << participant->id() << " gTypeId: " << gtc.gearTypeId() << " chargeType: " << gtc.chargeTypeId();
-      GearInformation gearInfo(gtc.gearTypeId(), gtc.gearTypeId(), gtc.chargeTypeId(), 0, QDateTime::currentMSecsSinceEpoch(), false);
+      DEBUG_LOG(m_logger) << " >>> dataid: " << participant->id() << " gTypeId: " << gtc.gearTypeId << " chargeType: " << gtc.chargeTypeId;
+      GearInformation gearInfo(gtc.gearTypeId, gtc.gearTypeId, gtc.chargeTypeId, 0, QDateTime::currentMSecsSinceEpoch(), false);
       participant->setGearCharge(gearInfo);
     } // for
     participant->publishDynamicData();
@@ -1970,18 +1970,18 @@ void ParticipantHandlerForExercise::onModifyUasStateRequest(const rti::core::Sam
 Core::FunctionReplyObject ParticipantHandlerForExercise::modifyUasStateRequest(const rti::core::SampleIdentity &cookie,
                                                                                const ParticipantManagement::ModifyUasStateRequest &request)
 {
-  DEBUG_LOG(m_logger) << "-- onModifyUasStateRequest: uasId:" << request.uasId() << " // EquipmentNumber: " << request.equipmentNumber()
-                      << " // State: " << request.uasState();
-  if (request.uasId() <= 0 || request.equipmentNumber() <= 0)
-    return Core::FunctionReplyObject(request.uasId(), tr_lts("dds", "uas id ( %1 ) or equipmentNumber ( %2 ) not found!"))
-        .arg(request.uasId())
-        .arg(request.equipmentNumber());
+  DEBUG_LOG(m_logger) << "-- onModifyUasStateRequest: uasId:" << request.uasId << " // EquipmentNumber: " << request.equipmentNumber
+                      << " // State: " << request.uasState;
+  if (request.uasId <= 0 || request.equipmentNumber <= 0)
+    return Core::FunctionReplyObject(request.uasId, tr_lts("dds", "uas id ( %1 ) or equipmentNumber ( %2 ) not found!"))
+        .arg(request.uasId)
+        .arg(request.equipmentNumber);
 
   TrainingAreaBase::SendModifyUasStateRequest req;
-  req.requestId(s_tabRequestId++);
-  req.uasId(request.uasId());
-  req.uasState(request.uasState());
-  req.equipmentNumber(request.equipmentNumber());
+  req.requestId = s_tabRequestId++;
+  req.uasId = request.uasId;
+  req.uasState = request.uasState;
+  req.equipmentNumber = request.equipmentNumber;
   return m_proxyListener->sendModifyUasStateRequest(cookie, req);
 }
 
@@ -1998,8 +1998,8 @@ void ParticipantHandlerForExercise::onGearChargeChanged(int participantId, int p
     if (!m_ppmDtc->isAdlerType(part->typeId()) || part->partyId() != partyId)
       continue;
 
-    for (const GearInformation &gi : part->dynamicParticipantData().gear())
-      chargeTypeGearData[gi.chargeTypeId()] += gi.remain();
+    for (const GearInformation &gi : part->dynamicParticipantData().gear)
+      chargeTypeGearData[gi.chargeTypeId] += gi.remain;
   }
 
   DEBUG_LOG(m_logger) << "chargeTypeGearData size: " << chargeTypeGearData.size();
@@ -2013,11 +2013,11 @@ void ParticipantHandlerForExercise::onGearChargeChanged(int participantId, int p
       continue;
 
     AreaEffectSimulation::ChargeAdministrationModifyRequest request;
-    request.chargeTypeId(it.key());
-    request.amount(it.value());
-    request.partyId(partyId);
-    request.effectSourceId(ProjectDataManagement::EffectSource::ES_ADLER);
-    request.amountChangedByOperator(false);
+    request.chargeTypeId = it.key();
+    request.amount = it.value();
+    request.partyId = partyId;
+    request.effectSourceId = ProjectDataManagement::EffectSource::ES_ADLER;
+    request.amountChangedByOperator = false;
 
     m_mainHandler->aesFtc()->chargeAdministrationModifyRequest(request);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/proxy_listener.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/proxy_listener.cpp
index 649540f62..dade8ad72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/proxy_listener.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/proxy_listener.cpp
@@ -217,7 +217,7 @@ void ProxyListener::onLaserDesignationChanged(const TrainingAreaBase::LaserDesig
   if (modType == DataModification::eRemoved)
   {
     DEBUG_LOG(m_logger) << "Got no laser designation data: " << data;
-    emit laserDesignationRemoved(data.equipmentNumber(), data.gearId());
+    emit laserDesignationRemoved(data.equipmentNumber, data.gearId);
     return;
   }
 
@@ -264,25 +264,25 @@ void ProxyListener::onUASStatusChanged(const TrainingAreaBase::UASStatus &data,
 
 
   m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataParticipant(3000);
-  int participantId = m_mainHandler->ddsHandler()->dtc()->participantIdByEquipmentNumber(data.equipmentNumber());
+  int participantId = m_mainHandler->ddsHandler()->dtc()->participantIdByEquipmentNumber(data.equipmentNumber);
 
   if (participantId <= 0)
     return;
   const auto uas = m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participantId, m_mainHandler->exerciseId());
 
-  if (uas.id() <= 0)
+  if (uas.id <= 0)
     return;
   //new PPM Telegram
   UASRadioLinkConnectionStatus newState;
-  newState.id(uas.id());
-  newState.uasState(data.uasState());
+  newState.id = uas.id;
+  newState.uasState = data.uasState;
   DEBUG_LOG(m_logger) << "Publish new UAS State " << newState;
   m_mainHandler->ddsHandler()->exAnyDts()->publish(newState);
 }
 
 void ProxyListener::onUASMissionStatusChanged(const TrainingAreaBase::UASMissionStatus &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "currentTask = " << (int)data.currentTask().underlying() << ", currentMissionName = " << data.currentMissionName() << ", name of ended mission: " << data.missionEnded();
+  DEBUG_LOG(m_logger) << "currentTask = " << (int)data.currentTask << ", currentMissionName = " << data.currentMissionName << ", name of ended mission: " << data.missionEnded;
   /*
   was wenn random mehrfach hintereinander loiter gesendet wird??
   dann überspringt er eine action! der tab darf also nur senden wenn wirklich ein state change kam
@@ -295,25 +295,25 @@ void ProxyListener::onUASMissionStatusChanged(const TrainingAreaBase::UASMission
     return;
   }
 
-  if (!data.currentMissionName().empty() || data.currentTask().underlying() != ProjectDataManagement::UasActionTask::Loiter || data.missionEnded().empty())
+  if (!data.currentMissionName.empty() || data.currentTask != ProjectDataManagement::UasActionTask::Loiter || data.missionEnded.empty())
   {
     //DEBUG As this will happen a lot
-    DEBUG_LOG(m_logger) << "not fulfilling current mission ("<<data.currentMissionName()<<") action because either a mission is still active or current task ("<<(int)data.currentTask().underlying()<<") is not Loiter or mission not ended ("<< data.missionEnded() << (data.missionEnded().empty() ? " [NOT ENDED]" : " [  ENDED  ]")<<")";
+    DEBUG_LOG(m_logger) << "not fulfilling current mission ("<<data.currentMissionName<<") action because either a mission is still active or current task ("<<(int)data.currentTask<<") is not Loiter or mission not ended ("<< data.missionEnded << (data.missionEnded.empty() ? " [NOT ENDED]" : " [  ENDED  ]")<<")";
     return;
   }
 
   m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataParticipant(3000);
-  const int participantId = m_mainHandler->ddsHandler()->dtc()->participantIdByEquipmentNumber(data.equipmentNumber());
+  const int participantId = m_mainHandler->ddsHandler()->dtc()->participantIdByEquipmentNumber(data.equipmentNumber);
   if (participantId <= 0)
   {
-    ERROR_LOG(m_logger) << "participant for eqid " << data.equipmentNumber() << " not found - unable to fulfill current mission action";
+    ERROR_LOG(m_logger) << "participant for eqid " << data.equipmentNumber << " not found - unable to fulfill current mission action";
     return;
   }
 
   QTimer::singleShot(1000, [this, participantId, data]() // give tab plugin time to clean stuff up before sending new missions (by marking an action as fulfilled)
   {
     // mission empty & task = loiter? mission done, run next mission (by setting current mission's current action as fulfilled, which will trigger the next action automatically (see ces))
-    if (!m_mainHandler->missionPlanHandler()->setCurrentMissionActionFulfilled(participantId, QString::fromStdString(data.missionEnded())))
+    if (!m_mainHandler->missionPlanHandler()->setCurrentMissionActionFulfilled(participantId, QString::fromStdString(data.missionEnded)))
     {
       ERROR_LOG(m_logger) << "setCurrentMissionActionFulfilled didn't work out";
       return;
@@ -351,13 +351,13 @@ Core::FunctionReplyObject ProxyListener::demandVulnerabilityStateChange(const rt
   if (!m_mainHandler->tabFtc()->demandVulnerabilityStateChangeRequest(req, this))
     return Core::FunctionReplyObject(tr_lts("dds", "Error passing the Vulnerability state change request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "VulnerabilityStateChange timeout for " << requestId;
     onDemandVulnerabilityStateChangeReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
   return Core::FunctionReplyObject();
 }
@@ -374,17 +374,17 @@ void ProxyListener::onDemandVulnerabilityStateChangeReply(const Core::FunctionRe
 Core::FunctionReplyObject ProxyListener::sendModifyUasStateRequest(const rti::core::SampleIdentity &cookie,
                                                                    const TrainingAreaBase::SendModifyUasStateRequest &req)
 {
-  DEBUG_LOG(m_logger) << " -- [ProxyListener] sendModifyUasStateRequest uasId: " << req.uasId();
+  DEBUG_LOG(m_logger) << " -- [ProxyListener] sendModifyUasStateRequest uasId: " << req.uasId;
   if (!m_mainHandler->tabFtc()->sendModifyUasStateRequest(req, this))
     return Core::FunctionReplyObject(tr_lts("dds", "Error passing the UAS state change request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "ModifyUasState timeout for " << requestId;
     onSendModifyUasStateReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
   return Core::FunctionReplyObject();
 }
@@ -404,13 +404,13 @@ Core::FunctionReplyObject ProxyListener::demandInitRequest(const rti::core::Samp
   if (!m_mainHandler->tabFtc()->demandInitRequest(req, this))
     return Core::FunctionReplyObject(tr_lts("dds", "Error passing the INIT request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "DemandInit timeout for " << requestId;
     onDemandInitReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
   return Core::FunctionReplyObject();
 }
@@ -431,13 +431,13 @@ Core::FunctionReplyObject ProxyListener::sendEquipmentMessage(const rti::core::S
   if (!m_mainHandler->tabFtc()->sendEquipmentMessageRequest(req, this))
     return Core::FunctionReplyObject(tr_lts("dds", "Error passing SendMessage request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "SendMessage timeout for " << requestId;
     onSendEquipmentMessageReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
   return Core::FunctionReplyObject();
 }
@@ -456,17 +456,17 @@ Core::FunctionReplyObject ProxyListener::sendParticipantModeRequest(const rti::c
                                                                     const TrainingAreaBase::SendParticipantModeRequest &req)
 {
   if (!m_mainHandler->tabFtc()->sendParticipantModeRequest(req, this))
-    return Core::FunctionReplyObject(req.participantId(), tr_lts("dds", "Error passing the INIT request to the proxy"));
+    return Core::FunctionReplyObject(req.participantId, tr_lts("dds", "Error passing the INIT request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "SendParticipantMode timeout for " << requestId;
     onSendParticipantModeReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
-  return Core::FunctionReplyObject(req.participantId());
+  return Core::FunctionReplyObject(req.participantId);
 }
 
 void ProxyListener::onSendParticipantModeReply(const Core::FunctionReplyObject &replyObject)
@@ -481,15 +481,15 @@ void ProxyListener::onSendParticipantModeReply(const Core::FunctionReplyObject &
 Core::FunctionReplyObject ProxyListener::sendSetSanitationRequest(const rti::core::SampleIdentity &cookie, const TrainingAreaBase::SendSetSanitationRequest &req)
 {
   if (!m_mainHandler->tabFtc()->sendSetSanitationRequest(req, this))
-    return Core::FunctionReplyObject(req.participantId(), tr_lts("dds", "Error passing the SetSanitation request to the proxy"));
-  const int requestId = req.requestId();
+    return Core::FunctionReplyObject(req.participantId, tr_lts("dds", "Error passing the SetSanitation request to the proxy"));
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "sendSetSanitationRequest timeout for " << requestId;
     onSendSetSanitationReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
-  return Core::FunctionReplyObject(req.participantId());
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
+  return Core::FunctionReplyObject(req.participantId);
 }
 
 void ProxyListener::onSendSetSanitationReply(const Core::FunctionReplyObject &replyObject)
@@ -504,15 +504,15 @@ void ProxyListener::onSendSetSanitationReply(const Core::FunctionReplyObject &re
 Core::FunctionReplyObject ProxyListener::selectiveReammunitionRequest(const rti::core::SampleIdentity &cookie, const TrainingAreaBase::SendSelectiveReammunitionRequest &req)
 {
   if (!m_mainHandler->tabFtc()->sendSelectiveReammunitionRequest(req, this))
-    return Core::FunctionReplyObject(req.participantId(), tr_lts("dds", "Error passing the SendSelectiveReammunition request to the proxy"));
-  const int requestId = req.requestId();
+    return Core::FunctionReplyObject(req.participantId, tr_lts("dds", "Error passing the SendSelectiveReammunition request to the proxy"));
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "selectiveReammunitionRequest timeout for " << requestId;
     onSendSelectiveReammunitionReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
-  return Core::FunctionReplyObject(req.participantId());
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
+  return Core::FunctionReplyObject(req.participantId);
 }
 
 void ProxyListener::onSendSelectiveReammunitionReply(const Core::FunctionReplyObject &replyObject)
@@ -531,13 +531,13 @@ Core::FunctionReplyObject ProxyListener::sendOcCommandRequest(const rti::core::S
   if (!m_mainHandler->tabFtc()->sendOcCommandRequest(req, this))
     return Core::FunctionReplyObject(tr_lts("dds", "Error passing the OcCommand request to the proxy"));
 
-  const int requestId = req.requestId();
+  const int requestId = req.requestId;
   auto cb = [this, requestId]()
   {
     INFO_LOG(m_logger) << "SendOcCommand timeout for " << requestId;
     onSendOcCommandReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
   };
-  addToTrainingAreaRequests(cb, req.requestId(), cookie);
+  addToTrainingAreaRequests(cb, req.requestId, cookie);
 
   return Core::FunctionReplyObject();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
index e33da4185..45afbf1a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
@@ -80,13 +80,13 @@ void UnitPositionCalculator::onPositionChanged(int participantId, int64_t positi
   DEBUG_LOG(m_logger) << "Position for participant " << participantId << " changed to "
                       << pos << " (" << positionTime / 1000 << "s)";
   CalculatedUnitPosition &data = getParticipant(participantId);
-  if (data.sampleTimeLeader() >= positionTime)
+  if (data.sampleTimeLeader >= positionTime)
     return;
 
-  data.sampleTimeCenter(positionTime);
-  data.sampleTimeLeader(positionTime);
-  data.positionCenter(pos);
-  data.positionLeader(pos);
+  data.sampleTimeCenter = positionTime;
+  data.sampleTimeLeader = positionTime;
+  data.positionCenter = pos;
+  data.positionLeader = pos;
   m_bSomethingChangedSinceLastCalculation = true;
 }
 
@@ -122,10 +122,10 @@ UnitPositionCalculator::CalculatedUnitPosition &UnitPositionCalculator::getParti
     DEBUG_LOG(m_logger) << "No information for participant " << participantId << " - creating dummy data";
 
     CalculatedUnitPosition data;
-    data.participantId(participantId);
+    data.participantId = participantId;
     static const Core::GeoPosition s_invalidPos(std::nan(""), std::nan(""), std::nan(""));
-    data.positionCenter(s_invalidPos);
-    data.positionLeader(s_invalidPos);
+    data.positionCenter = s_invalidPos;
+    data.positionLeader = s_invalidPos;
     it = m_participantData.insert({participantId, std::move(data)}).first;
   }
   return it->second;
@@ -174,12 +174,12 @@ UnitPositionCalculator::Result UnitPositionCalculator::doCalculation(std::unorde
   for (const auto &data : participantData)
   {
     const int superiorId = data.second.superiorId;
-    const int participantId = data.second.participantId();
+    const int participantId = data.second.participantId;
     DEBUG_LOG(logger) << "Participant " << participantId << " has superior " << superiorId;
     if (superiorId == 0 || participantData.find(superiorId) == participantData.end())
     {
       DEBUG_LOG(logger) << "Participant " << participantId << " is a toplevel participant";
-      topLevelIds.push_back(data.second.participantId());
+      topLevelIds.push_back(data.second.participantId);
     }
   }
   // TODO: check for correct (non-cyclic) hierarchy?
@@ -214,13 +214,13 @@ void UnitPositionCalculator::calculatePosition(int participantId,
   if (data.inferiorIds.size() == 0)
   {
     DEBUG_LOG(logger) << dbgLvlSpaces << "Participant " << participantId
-                      << " is a leaf: " << data.positionCenter()
-                      << " (" << data.sampleTimeCenter() / 1000 << "s)";
+                      << " is a leaf: " << data.positionCenter
+                      << " (" << data.sampleTimeCenter / 1000 << "s)";
     return;
   }
 
-  data.positionCenter(s_invalidPos);
-  data.positionLeader(s_invalidPos);
+  data.positionCenter = s_invalidPos;
+  data.positionLeader = s_invalidPos;
 
   // calculate position for inferiors
   DEBUG_LOG(logger) << dbgLvlSpaces << "Participant " << participantId << ": Start calculating child positions";
@@ -249,15 +249,15 @@ void UnitPositionCalculator::calculatePosition(int participantId,
 
     const CalculatedUnitPosition &child = itChild->second;
     // older than 10 minutes -> ignore
-    if (LtsUtils::isPositionTimeOutdated(currentTime, child.sampleTimeCenter()))
+    if (LtsUtils::isPositionTimeOutdated(currentTime, child.sampleTimeCenter))
     {
       DEBUG_LOG(logger) << dbgLvlSpaces << "Child " << inferiorId << ": position out-of-date - ignoring";
       continue;
     }
 
     // invalid position -> ignore
-    if (std::isnan(child.positionCenter().lon()) ||
-        std::isnan(child.positionCenter().lat()))
+    if (std::isnan(child.positionCenter.lon) ||
+        std::isnan(child.positionCenter.lat))
     {
       DEBUG_LOG(logger) << dbgLvlSpaces << "Child " << inferiorId << ": has invalid position - ignoring";
       continue;
@@ -266,36 +266,36 @@ void UnitPositionCalculator::calculatePosition(int participantId,
     if (bFirst)
     {
       bFirst = false;
-      data.positionLeader(child.positionLeader());
-      data.sampleTimeLeader(child.sampleTimeLeader());
+      data.positionLeader = child.positionLeader;
+      data.sampleTimeLeader = child.sampleTimeLeader;
     }
 
-    const auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(child.positionCenter().lon(),
-                                                                  child.positionCenter().lat(),
+    const auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(child.positionCenter.lon,
+                                                                  child.positionCenter.lat,
                                                                   utmZone);
     if (utmZone == -1)
       utmZone = utm.zone;
 
-    pos += LtsUtils::QPoint3D(utm.x, utm.y, child.positionCenter().z());
-    if (child.sampleTimeCenter() > childPositionTime)
-      childPositionTime = child.sampleTimeCenter();
+    pos += LtsUtils::QPoint3D(utm.x, utm.y, child.positionCenter.z);
+    if (child.sampleTimeCenter > childPositionTime)
+      childPositionTime = child.sampleTimeCenter;
 
     ++childCount;
   }
 
-  data.sampleTimeCenter(childPositionTime);
+  data.sampleTimeCenter = childPositionTime;
   if (childCount > 0)
   {
     pos /= childCount;
     const LtsCoordTrans::UtmCoordinate utm(utmZone, pos.x(), pos.y(),true);
     const QPointF lonLat = utm.geographic();
-    data.positionCenter(Core::GeoPosition(lonLat.x(), lonLat.y(), pos.z()));
+    data.positionCenter = Core::GeoPosition(lonLat.x(), lonLat.y(), pos.z());
   }
   DEBUG_LOG(logger) << dbgLvlSpaces
                     << "Participant " << participantId
-                    << ": Mean position: " << data.positionCenter()
+                    << ": Mean position: " << data.positionCenter
                     << " #relavant children: " << childCount
-                    << " (" << data.sampleTimeCenter() / 1000 << "s)";
+                    << " (" << data.sampleTimeCenter / 1000 << "s)";
 
   result.push_back(std::move(data));
 }
@@ -307,7 +307,7 @@ void UnitPositionCalculator::onCalculationDone()
   auto dts = m_participantHandler->dts();
   for (const auto &pos : calculatedPositions)
   {
-    auto it = m_publishedPositionData.find(pos.participantId());
+    auto it = m_publishedPositionData.find(pos.participantId);
     if (it != m_publishedPositionData.end())
     {
       ParticipantManagement::UnitPosition &up = it->second;
@@ -315,13 +315,13 @@ void UnitPositionCalculator::onCalculationDone()
       if (up == pos)
         continue;
       // nan == nan is always false, have to check it on our own
-      if (std::isnan(up.positionCenter().lat()) && std::isnan(pos.positionCenter().lat()))
+      if (std::isnan(up.positionCenter.lat) && std::isnan(pos.positionCenter.lat))
         continue;
       up = pos;
     }
     else
     {
-      m_publishedPositionData.insert(std::make_pair(pos.participantId(), pos));
+      m_publishedPositionData.insert(std::make_pair(pos.participantId, pos));
     }
     dts->publish(pos);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp
index 17c7ae080..a499eaafe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp
@@ -11,26 +11,26 @@
 bool ParticipantManagement::PartyHandling::Party::hasChanges(const ParticipantManagement::Party &request,
                                                              const bool bIgnoreIsUsedBy)
 {
-  const QString requestProperties = QString::fromStdString(request.properties());
-  bool hasChanges = request.color() != m_data.color
-      || request.fadingColor() != m_data.fadingColor
-      || request.name() != m_data.name.toStdString()
-      || request.hlaForceIdentifier().underlying() != m_data.hlaForceIdentifier
-      || request.role() != m_data.roleId
+  const QString requestProperties = QString::fromStdString(request.properties);
+  bool hasChanges = request.color != m_data.color
+      || request.fadingColor != m_data.fadingColor
+      || request.name != m_data.name.toStdString()
+      || static_cast<int>(request.hlaForceIdentifier) != m_data.hlaForceIdentifier
+      || request.role != m_data.roleId
       || requestProperties != m_data.properties;
   if (!bIgnoreIsUsedBy && !hasChanges)
-    hasChanges = request.isUsedBy() != m_data.isUsedBy;
+    hasChanges = request.isUsedBy != m_data.isUsedBy;
 
   if (hasChanges)
   {
-    m_data.color = request.color();
-    m_data.fadingColor = request.fadingColor();
-    m_data.name = QString::fromStdString(request.name());
-    m_data.roleId = request.role();
-    m_data.hlaForceIdentifier = request.hlaForceIdentifier().underlying();
+    m_data.color = request.color;
+    m_data.fadingColor = request.fadingColor;
+    m_data.name = QString::fromStdString(request.name);
+    m_data.roleId = request.role;
+    m_data.hlaForceIdentifier = static_cast<int>(request.hlaForceIdentifier);
     m_data.properties = requestProperties;
     if (!bIgnoreIsUsedBy)
-      m_data.isUsedBy = request.isUsedBy();
+      m_data.isUsedBy = request.isUsedBy;
   }
 
   return hasChanges;
@@ -45,15 +45,15 @@ ParticipantManagement::Party ParticipantManagement::PartyHandling::Party::toDdsP
 {
   ParticipantManagement::Party result;
 
-  result.id(id());
-  result.color(m_data.color);
-  result.fadingColor(m_data.fadingColor);
-  result.name(m_data.name.toStdString());
-  result.role(m_data.roleId);
-  result.hlaForceIdentifier(static_cast<HlaForceIdentifierEnum>(m_data.hlaForceIdentifier));
-  result.isUsedBy(m_data.isUsedBy);
-  result.sampleTime(QDateTime::currentMSecsSinceEpoch());
-  result.properties(m_data.properties.toStdString());
+  result.id = id();
+  result.color = m_data.color;
+  result.fadingColor = m_data.fadingColor;
+  result.name = m_data.name.toStdString();
+  result.role = m_data.roleId;
+  result.hlaForceIdentifier = static_cast<HlaForceIdentifierEnum>(m_data.hlaForceIdentifier);
+  result.isUsedBy = m_data.isUsedBy;
+  result.sampleTime = QDateTime::currentMSecsSinceEpoch();
+  result.properties = m_data.properties.toStdString();
 
   return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp
index bf6094a83..18d783775 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp
@@ -93,7 +93,7 @@ void PartyHandling::PartyHandler::resetAdlerProperties( QString &properties, con
  if (connectState != ParticipantManagement::ConnectState::Disconnected)
    {
      QJsonObject propAdler = obj[QStringLiteral("Adler")].toObject();
-     propAdler[QStringLiteral("saaConnectedState")] = ParticipantManagement::ConnectState::Disconnected;
+     propAdler[QStringLiteral("saaConnectedState")] = static_cast<int>(ParticipantManagement::ConnectState::Disconnected);
      obj[QStringLiteral("Adler")] = propAdler;
      const QByteArray propertiesStr = QJsonDocument(obj).toJson(QJsonDocument::Compact);
      properties = QString::fromStdString(propertiesStr.data());
@@ -149,11 +149,11 @@ void PartyHandling::PartyHandler::onModifyPartyDataRequest(const rti::core::Samp
 Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(const ParticipantManagement::Party &request)
 {
   DEBUG_LOG(m_logger) << "onModifyPartyDataRequest: " << request;
-  Party *partyToPublish = m_parties.value(request.id());
+  Party *partyToPublish = m_parties.value(request.id);
 
-  if (!partyToPublish && request.id() >= 0)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
-        .arg(request.id());
+  if (!partyToPublish && request.id >= 0)
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
+        .arg(request.id);
 
   if (!partyToPublish) // create new party
   {
@@ -162,19 +162,19 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
     // insert into database
     Database::PpmParty newDbParty;
 
-    newDbParty.color = request.color();
-    newDbParty.fadingColor = request.fadingColor();
-    newDbParty.name = QString::fromStdString(request.name());
-    newDbParty.roleId = request.role();
-    newDbParty.isUsedBy = request.isUsedBy();
-    newDbParty.hlaForceIdentifier = request.hlaForceIdentifier().underlying();
-    newDbParty.properties =  QString::fromStdString(request.properties());
+    newDbParty.color = request.color;
+    newDbParty.fadingColor = request.fadingColor;
+    newDbParty.name = QString::fromStdString(request.name);
+    newDbParty.roleId = request.role;
+    newDbParty.isUsedBy = request.isUsedBy;
+    newDbParty.hlaForceIdentifier = static_cast<int>(request.hlaForceIdentifier);
+    newDbParty.properties =  QString::fromStdString(request.properties);
 
     if (!m_mainHandler->db()->insert(newDbParty))
     {
       QString errText = m_mainHandler->db()->getLastError().databaseText();
       ERROR_LOG(m_logger) << "Error inserting Party into database: " << errText;
-      return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Error inserting new party to database: %1")).arg(errText);
+      return Core::FunctionReplyObject(request.id, tr_lts("dds", "Error inserting new party to database: %1")).arg(errText);
     }
 
     partyToPublish = new Party(newDbParty);
@@ -189,7 +189,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
     else // update in database
     {
       if (!m_mainHandler->db()->update(partyToPublish->toDbParty()))
-        return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Error updating party in database"));
+        return Core::FunctionReplyObject(request.id, tr_lts("dds", "Error updating party in database"));
     }
   }
   if (partyToPublish)
@@ -197,7 +197,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
     auto party = partyToPublish->toDdsParty();
     m_mainHandler->dts()->publish(party);
   }
-  return Core::FunctionReplyObject(request.id());
+  return Core::FunctionReplyObject(request.id);
 }
 
 //------------------------------------------------------------------------------------------
@@ -217,18 +217,18 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::removePartyRequest(const
 {
   DEBUG_LOG(m_logger) << "onRemovePartyRequest " << request;
 
-  if (request.partyId() < 0)
+  if (request.partyId < 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete a party, but no valid party id to delete"));
 
-  Party *partyToDelete = m_parties.value(request.partyId());
+  Party *partyToDelete = m_parties.value(request.partyId);
   if (!partyToDelete)
     return Core::FunctionReplyObject(tr_lts("dds", "Could not delete party with id %1, because no party with that id exists"))
-        .arg(request.partyId());
+        .arg(request.partyId);
 
   if (partyToDelete->isUsedBy() == true)
     return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a party in use"));
 
-  DEBUG_LOG(m_logger) << "Removing party with ID " << request.partyId();
+  DEBUG_LOG(m_logger) << "Removing party with ID " << request.partyId;
 
   return removeParty(partyToDelete);
 }
@@ -299,17 +299,17 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
       if (hasChanges)
       {
         ParticipantManagement::Party req;
-        req.id(partyId);
+        req.id = partyId;
 
         // taking new properties from ex_0
-        req.color(partyEx0.color);
-        req.fadingColor(partyEx0.fadingColor);
-        req.name(partyEx0.name.toStdString());
-        req.role(partyEx0.roleId);
-        req.hlaForceIdentifier(static_cast<HlaForceIdentifierEnum>(partyEx0.hlaForceIdentifier));
+        req.color = partyEx0.color;
+        req.fadingColor = partyEx0.fadingColor;
+        req.name = partyEx0.name.toStdString();
+        req.role = partyEx0.roleId;
+        req.hlaForceIdentifier = static_cast<HlaForceIdentifierEnum>(partyEx0.hlaForceIdentifier);
 
         // this remains as it is
-        req.isUsedBy(partyEx->isUsedBy());
+        req.isUsedBy = partyEx->isUsedBy();
 
         auto ret = modifyPartyDataRequest(req);
         if (ret.error())
@@ -363,22 +363,22 @@ void PartyHandling::PartyHandler::onChangePartyUsedStateRequest(const rti::core:
 //------------------------------------------------------------------------------------------
 Core::FunctionReplyObject PartyHandling::PartyHandler::changePartyUsedStateRequest(const ParticipantManagement::ChangePartyUsedStateRequest &request)
 {
-  Party *party = m_parties.value(request.partyId());
+  Party *party = m_parties.value(request.partyId);
   if (!party)
-    return Core::FunctionReplyObject(request.partyId(), tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
-        .arg(request.partyId());
+    return Core::FunctionReplyObject(request.partyId, tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
+        .arg(request.partyId);
 
   ParticipantManagement::Party ddsParty = party->toDdsParty();
-  ddsParty.isUsedBy(request.isUsedBy());
+  ddsParty.isUsedBy = request.isUsedBy;
   if (party->hasChanges(ddsParty, false))
   {
     if (!m_mainHandler->db()->update(party->toDbParty()))
-      return Core::FunctionReplyObject(request.partyId(), tr_lts("dds", "Error updating party used state in database"));
+      return Core::FunctionReplyObject(request.partyId, tr_lts("dds", "Error updating party used state in database"));
 
     DEBUG_LOG(m_logger) << "Change used state for party " << party->id() << " to " << party->isUsedBy();
     m_mainHandler->dts()->publish(party->toDdsParty());
   }
-  return Core::FunctionReplyObject(request.partyId());
+  return Core::FunctionReplyObject(request.partyId);
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp
index 4793d68ef..b6975439e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/participant_handler_for_replay.cpp
@@ -27,36 +27,36 @@ ParticipantHandlerForReplay::ParticipantHandlerForReplay(RecordReplayPluginCusto
 static inline Database::PpmParticipant toDb(const ParticipantManagement::Participant &ddsPart)
 {
   Database::PpmParticipant db;
-  db.id = ddsPart.id();
-  db.assignState = ddsPart.assignState();
-  db.partyId = ddsPart.partyId();
-  db.typeId = ddsPart.typeId();
-  db.externalId = ddsPart.externalId();
-  db.designator = QString::fromStdString(ddsPart.designator());
-  db.equipmentNumber = ddsPart.equipmentNumber.is_set() ? ddsPart.equipmentNumber.get() : 0;
-  db.hierarchyNumber = ddsPart.hierarchyNumber();
-  db.identification = QString::fromStdString(ddsPart.identification());
-  db.info = QString::fromStdString(ddsPart.info());
-  db.isDeleted = ddsPart.isDeleted();
-  db.isSimulated = ddsPart.isSimulated();
-  db.name = QString::fromStdString(ddsPart.name());
-  db.superiorId = ddsPart.superiorId();
-  db.symbol = QString::fromStdString(ddsPart.symbol());
-  db.tacticalIdentifier = QString::fromStdString(ddsPart.tacticalIdentifier());
-  db.properties = QString::fromStdString(ddsPart.properties());
+  db.id = ddsPart.id;
+  db.assignState = ddsPart.assignState;
+  db.partyId = ddsPart.partyId;
+  db.typeId = ddsPart.typeId;
+  db.externalId = ddsPart.externalId;
+  db.designator = QString::fromStdString(ddsPart.designator);
+  db.equipmentNumber = ddsPart.equipmentNumber.has_value() ? ddsPart.equipmentNumber.get() : 0;
+  db.hierarchyNumber = ddsPart.hierarchyNumber;
+  db.identification = QString::fromStdString(ddsPart.identification);
+  db.info = QString::fromStdString(ddsPart.info);
+  db.isDeleted = ddsPart.isDeleted;
+  db.isSimulated = ddsPart.isSimulated;
+  db.name = QString::fromStdString(ddsPart.name);
+  db.superiorId = ddsPart.superiorId;
+  db.symbol = QString::fromStdString(ddsPart.symbol);
+  db.tacticalIdentifier = QString::fromStdString(ddsPart.tacticalIdentifier);
+  db.properties = QString::fromStdString(ddsPart.properties);
 
   return db;
 }
 
 void ParticipantHandlerForReplay::createUpdateParticipant(const ParticipantManagement::Participant &ddsPart)
 {
-  auto *p = m_participants.value(ddsPart.id());
+  auto *p = m_participants.value(ddsPart.id);
   if (!p)
   {
     p = new ParticipantForReplay(this,
                                  m_unitPositionCalculator.get(),
                                  toDb(ddsPart));
-    m_participants.insert(ddsPart.id(), p);
+    m_participants.insert(ddsPart.id, p);
   }
   else
   {
@@ -68,7 +68,7 @@ void ParticipantHandlerForReplay::removeParticipant(const ParticipantManagement:
 {
   // maybe clear m_hitLineInfoMap for this participant also but is this a real-world problem?
 
-  auto *p = m_participants.take(ddsPart.id());
+  auto *p = m_participants.take(ddsPart.id);
   if (p)
   {
     p->removeFromDds();
@@ -79,9 +79,9 @@ void ParticipantHandlerForReplay::removeParticipant(const ParticipantManagement:
 
 void ParticipantHandlerForReplay::setDynamicParticipantData(const ParticipantManagement::DynamicParticipantData &dynPart)
 {
-  auto *p = m_participants.value(dynPart.participantId());
+  auto *p = m_participants.value(dynPart.participantId);
   if (!p) {
-    WARNING_LOG(m_logger) << "Got dynamic participant data for unknown participant with id " << dynPart.participantId();
+    WARNING_LOG(m_logger) << "Got dynamic participant data for unknown participant with id " << dynPart.participantId;
     return;
   }
   p->setDynamicData(dynPart);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp
index 48b029328..b0a72dcac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.cpp
@@ -88,7 +88,7 @@ void RecordReplayPluginCustom::removeOld(QMultiMap<long long, T> &map, qint64 de
     for (const auto &inner : map.values(item))
     {
       // Remove delted ones
-      if (inner.isDeleted())
+      if (inner.isDeleted)
       {
         map.remove(item, inner);
       }
@@ -125,7 +125,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
   // {
   //   for (const auto &p : m_participantMap)
   //   {
-  //     if (p.equipmentNumber.is_set())
+  //     if (p.equipmentNumber.has_value())
   //       m_equipmentNumbers.insert(p.equipmentNumber.get());
   //   }
   //   DEBUG_LOG(m_logger) << "setReplayStartTime-m_equipmentNumbers after" << m_equipmentNumbers.count();
@@ -144,7 +144,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
       const auto &inner = backup.values(key);
       for (const auto &value : inner)
       {
-        if (m_participantKeys.find(value.participantId()) == m_participantKeys.end())
+        if (m_participantKeys.find(value.participantId) == m_participantKeys.end())
           m_dynamicParticipantDataMap.remove(key, value);
       }
     }
@@ -334,7 +334,7 @@ QVector<QFuture<void>> RecordReplayPluginCustom::makeConcurrent(T &content, qint
       for (auto it = contentIndex.begin(); it != contentIndex.end(); ++it)
       {
         // following is relavant to a) OPTIMZE = true; // GUEZE-3521 and b) E01562-183 "Prüfung Replay"
-        if (m_equipmentNumbers.isEmpty() ||  m_equipmentNumbers.contains(abs(it->equipmentNumber())))
+        if (m_equipmentNumbers.isEmpty() ||  m_equipmentNumbers.contains(abs(it->equipmentNumber)))
           m_participantHandler->newData(*it);
       }
     }));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.cpp
index 686dad776..7c9800757 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.cpp
@@ -80,7 +80,7 @@ void HandlerTargetInformation::onModifyTargetInformationRequest(const rti::core:
 Core::FunctionReplyObject HandlerTargetInformation::targetInformationModifyRequest(const ModifyTargetInformationRequest &request)
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  const int requestId = request.targetInfo().id();
+  const int requestId = request.targetInfo.id;
   // modify
   if (requestId > 0)
   {
@@ -88,12 +88,12 @@ Core::FunctionReplyObject HandlerTargetInformation::targetInformationModifyReque
     if (!ifs)
       return Core::FunctionReplyObject(requestId, tr_lts("dds", "TargetInformation with id %1 not found")).arg(requestId);
 
-    auto ret = ifs->updateObject(request.targetInfo());
+    auto ret = ifs->updateObject(request.targetInfo);
     return ret;
   }
   // create
   ObjectTargetInformation *ifs(new ObjectTargetInformation(m_mainHandler));
-  auto ret = ifs->createObject(request.targetInfo());
+  auto ret = ifs->createObject(request.targetInfo);
   if (ret.error())
   {
     delete ifs;
@@ -112,11 +112,11 @@ void HandlerTargetInformation::onRemoveTargetInformationRequest(const rti::core:
   TRACE_LOG(m_logger)  << LOGFUNCTION << " request=" << request;
 
   Core::FunctionReplyObject ret;
-  ObjectTargetInformation *ifs = m_objectMap.value(request.id());
+  ObjectTargetInformation *ifs = m_objectMap.value(request.id);
 
   if (ifs == nullptr)
   {
-    ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id());
+    ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id);
     m_mainHandler->fts()->removeTargetInformationReply(cookie, ret);
     return;
   }
@@ -128,7 +128,7 @@ void HandlerTargetInformation::onRemoveTargetInformationRequest(const rti::core:
   {
     // delete Object
     delete ifs;
-    m_objectMap.remove(request.id());
+    m_objectMap.remove(request.id);
   }
 
   m_mainHandler->fts()->removeTargetInformationReply(cookie, ret);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
index a9e5c69f9..f2073b587 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
@@ -25,19 +25,19 @@ Core::GeoPosition2D posFromJson(const QJsonValue &val)
   Core::GeoPosition2D element;
   {
     const QJsonValue valLon(objElement.value(QStringLiteral("lon")));
-    element.lon(valLon.toDouble());
+    element.lon = valLon.toDouble();
   }
   {
     const QJsonValue valLat(objElement.value(QStringLiteral("lat")));
-    element.lat(valLat.toDouble());
+    element.lat = valLat.toDouble();
   }
   return element;
 }
 QJsonObject toJson(const Core::GeoPosition2D &element)
 {
   QJsonObject obj;
-  obj[QStringLiteral("lon")] = element.lon();
-  obj[QStringLiteral("lat")] = element.lat();
+  obj[QStringLiteral("lon")] = element.lon;
+  obj[QStringLiteral("lat")] = element.lat;
   return obj;
 }
 
@@ -47,15 +47,15 @@ ShootbackArea areaFromJson(const QJsonValue &val)
 {
   ShootbackArea area;
   // use val.toObject().value instead val[key] introduced with qt5.10
-  area.identifier(val.toObject().value(QStringLiteral("identifier")).toString().toStdString());
+  area.identifier = val.toObject().value(QStringLiteral("identifier")).toString().toStdString();
 
   if (val.toObject().value(QStringLiteral("coords")).isArray())
   {
     const QJsonArray &arr = val.toObject().value(QStringLiteral("coords")).toArray();
-    if (arr.size() > 0)      area.coord1( posFromJson(arr.at(0)) );
-    if (arr.size() > 1)      area.coord2( posFromJson(arr.at(1)) );
-    if (arr.size() > 2)      area.coord3( posFromJson(arr.at(2)) );
-    if (arr.size() > 3)      area.coord4( posFromJson(arr.at(3)) );
+    if (arr.size() > 0)      area.coord1 = posFromJson(arr.at(0));
+    if (arr.size() > 1)      area.coord2 = posFromJson(arr.at(1));
+    if (arr.size() > 2)      area.coord3 = posFromJson(arr.at(2));
+    if (arr.size() > 3)      area.coord4 = posFromJson(arr.at(3));
   }
   return area;
 }
@@ -63,13 +63,13 @@ ShootbackArea areaFromJson(const QJsonValue &val)
 QJsonObject toJson(const ShootbackArea &area)
 {
   QJsonObject obj;
-  obj.insert(QStringLiteral("identifier"), QString::fromStdString(area.identifier()));
+  obj.insert(QStringLiteral("identifier"), QString::fromStdString(area.identifier));
 
   QJsonArray arr;
-  arr.push_back(toJson(area.coord1()));
-  arr.push_back(toJson(area.coord2()));
-  arr.push_back(toJson(area.coord3()));
-  arr.push_back(toJson(area.coord4()));
+  arr.push_back(toJson(area.coord1));
+  arr.push_back(toJson(area.coord2));
+  arr.push_back(toJson(area.coord3));
+  arr.push_back(toJson(area.coord4));
   obj.insert(QStringLiteral("coords"), arr);
   return obj;
 }
@@ -121,14 +121,14 @@ ObjectTargetInformation::~ObjectTargetInformation()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isValid())
-    m_mainHandler->dts()->removeTargetInformationByKey(m_data.id());
+    m_mainHandler->dts()->removeTargetInformationByKey(m_data.id);
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
 //------------------------------------------------------------------------------
 bool ObjectTargetInformation::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
@@ -137,14 +137,14 @@ Core::FunctionReplyObject ObjectTargetInformation::createObject(const TargetInfo
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   m_data = data;
 
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
   {
     Database::PpmTargetInformation dbData(toDbData(data));
 
     if (!m_mainHandler->db()->insert(dbData))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetInformation-data into database"));
 
-    m_data.id(dbData.id);
+    m_data.id = dbData.id;
     DEBUG_LOG(m_logger) << "New PpmTargetInformation: " /*<< m_data.id()*/;
   }
 
@@ -152,29 +152,29 @@ Core::FunctionReplyObject ObjectTargetInformation::createObject(const TargetInfo
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetInformation::updateObject(const TargetInformation &data)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START, participantId=" << data.participantId()
-                      << " size =" << data.shootbackAreas().size();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, participantId=" << data.participantId
+                      << " size =" << data.shootbackAreas.size();
   Database::PpmTargetInformation dbData;
   dbData = toDbData(data);
 
   if (!m_mainHandler->db()->update(dbData))
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating TargetInformation-data into database"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating TargetInformation-data into database"));
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for TargetInformation: " << m_data.participantId();
+  DEBUG_LOG(m_logger) << "Data changed for TargetInformation: " << m_data.participantId;
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id()
-                      << " size =" << data.shootbackAreas().size();
-  return Core::FunctionReplyObject(m_data.id());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id
+                      << " size =" << data.shootbackAreas.size();
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -182,21 +182,21 @@ Core::FunctionReplyObject ObjectTargetInformation::removeObject()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
 
-  if (!m_mainHandler->db()->removePpmTargetInformation(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetInformation with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removePpmTargetInformation(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TargetInformation with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dts()->removeTargetInformationByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetInformation with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dts()->removeTargetInformationByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TargetInformation with id %1 can not be removed from DDS")).arg(m_data.id);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 
 //------------------------------------------------------------------------------
 void ObjectTargetInformation::onPublishData()
 {
-  TRACE_LOG(m_logger) << "Publish TargetInformation-data to dds (" << m_data.id() << ") ...";
+  TRACE_LOG(m_logger) << "Publish TargetInformation-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dts()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing TargetInformation-data to dds";
@@ -211,15 +211,15 @@ Database::PpmTargetInformation ObjectTargetInformation::toDbData(const TargetInf
 {
   Database::PpmTargetInformation dbData;
 
-  dbData.id                   = ddsData.id();
-  dbData.participantId        = ddsData.participantId();
+  dbData.id                   = ddsData.id;
+  dbData.participantId        = ddsData.participantId;
 
-  dbData.preWarningInterval          = ddsData.prewarningInterval();
-  dbData.preWarningEffect            = static_cast<int>(ddsData.prewarningEffect().underlying());
-  dbData.takeDownInterval            = ddsData.takedownInterval();
-  dbData.takeDownEffect              = static_cast<int>(ddsData.takedownEffect().underlying());
+  dbData.preWarningInterval          = ddsData.prewarningInterval;
+  dbData.preWarningEffect            = static_cast<int>(ddsData.prewarningEffect);
+  dbData.takeDownInterval            = ddsData.takedownInterval;
+  dbData.takeDownEffect              = static_cast<int>(ddsData.takedownEffect);
 
-  const std::vector<ParticipantManagement::ShootbackArea>& shootback_areas = ddsData.shootbackAreas();
+  const std::vector<ParticipantManagement::ShootbackArea>& shootback_areas = ddsData.shootbackAreas;
 
   const QJsonObject &obj = toJson(shootback_areas);
   dbData.properties = QString::fromStdString( QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString() );
@@ -233,13 +233,13 @@ TargetInformation ObjectTargetInformation::toDdsData(const Database::PpmTargetIn
 {
   TargetInformation ddsData;
 
-  ddsData.id(dbData.id);
-  ddsData.participantId(dbData.participantId);
+  ddsData.id = dbData.id;
+  ddsData.participantId = dbData.participantId;
 
-  ddsData.prewarningInterval(dbData.preWarningInterval);
-  ddsData.prewarningEffect(static_cast<ProjectDataManagement::VulnerabilityState>(dbData.preWarningEffect));
-  ddsData.takedownInterval(dbData.takeDownInterval);
-  ddsData.takedownEffect(static_cast<ProjectDataManagement::VulnerabilityState>(dbData.takeDownEffect));
+  ddsData.prewarningInterval = dbData.preWarningInterval;
+  ddsData.prewarningEffect = static_cast<ProjectDataManagement::VulnerabilityState>(dbData.preWarningEffect);
+  ddsData.takedownInterval = dbData.takeDownInterval;
+  ddsData.takedownEffect = static_cast<ProjectDataManagement::VulnerabilityState>(dbData.takeDownEffect);
 
   const QByteArray &propertiesBa = dbData.properties.toUtf8();
   QJsonParseError parserError;
@@ -252,7 +252,7 @@ TargetInformation ObjectTargetInformation::toDdsData(const Database::PpmTargetIn
 
   QJsonObject obj(doc.object());
   const std::vector<ShootbackArea> &sbAreas = vecfromJson(obj);
-  ddsData.shootbackAreas(sbAreas);
+  ddsData.shootbackAreas = sbAreas;
 
   return ddsData;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h
index 17789106b..3f680331f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h
@@ -35,8 +35,8 @@ public:
   Core::FunctionReplyObject updateObject(const TargetInformation &data);
   Core::FunctionReplyObject removeObject();
 
-  qint32 getId() const { return m_data.id(); }
-  qint32 getParticipantId() const { return m_data.participantId(); }
+  qint32 getId() const { return m_data.id; }
+  qint32 getParticipantId() const { return m_data.participantId; }
   const TargetInformation &getData() const { return m_data; }
 
   bool isValid() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template.cpp
index 31026d1d1..e51e70e81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template.cpp
@@ -11,18 +11,18 @@ ParticipantManagement::TemplateParticipant ParticipantManagement::TemplateHandli
 {
   TemplateParticipant result;
 
-  result.templateId(id());
-  result.typeId(typeId());
-  result.name(m_data.name.toStdString());
-  result.designator(m_data.designator.toStdString());
-  result.info(m_data.info.toStdString());
-  result.symbol(m_data.symbol.toStdString());
-  result.tacticalIdentifier(m_data.tacticalIdentifier.toStdString());
-  result.hierarchyNumber(m_data.hierarchyNumber);
-  result.superiorTemplateId(superiorId());
-  result.equipmentNumber(m_data.equipmentNumber);
+  result.templateId = id();
+  result.typeId = typeId();
+  result.name = m_data.name.toStdString();
+  result.designator = m_data.designator.toStdString();
+  result.info = m_data.info.toStdString();
+  result.symbol = m_data.symbol.toStdString();
+  result.tacticalIdentifier = m_data.tacticalIdentifier.toStdString();
+  result.hierarchyNumber = m_data.hierarchyNumber;
+  result.superiorTemplateId = superiorId();
+  result.equipmentNumber = m_data.equipmentNumber;
   if (!m_inferiorIds.empty())
-    result.inferiorIds().set(m_inferiorIds);
+    result.inferiorIds.set(m_inferiorIds);
 
   return result;
 }
@@ -30,25 +30,25 @@ ParticipantManagement::TemplateParticipant ParticipantManagement::TemplateHandli
 bool ParticipantManagement::TemplateHandling::Template::hasToBeChanged(const ParticipantManagement::TemplateData &newData)
 {
   bool hasNoChanges =
-    m_data.typeId == newData.typeId() &&
-    m_data.hierarchyNumber == newData.hierarchyNumber() &&
-    m_data.equipmentNumber == newData.equipmentNumber() &&
-    m_data.name == QString::fromStdString(newData.name()) &&
-    m_data.symbol == QString::fromStdString(newData.symbol()) &&
-    m_data.info == QString::fromStdString(newData.info()) &&
-    m_data.designator == QString::fromStdString(newData.designator()) &&
-    m_data.tacticalIdentifier == QString::fromStdString(newData.tacticalIdentifier());
+    m_data.typeId == newData.typeId &&
+    m_data.hierarchyNumber == newData.hierarchyNumber &&
+    m_data.equipmentNumber == newData.equipmentNumber &&
+    m_data.name == QString::fromStdString(newData.name) &&
+    m_data.symbol == QString::fromStdString(newData.symbol) &&
+    m_data.info == QString::fromStdString(newData.info) &&
+    m_data.designator == QString::fromStdString(newData.designator) &&
+    m_data.tacticalIdentifier == QString::fromStdString(newData.tacticalIdentifier);
 
   if (!hasNoChanges)
   {
-    m_data.typeId             = newData.typeId();
-    m_data.hierarchyNumber    = newData.hierarchyNumber();
-    m_data.name               = QString::fromStdString(newData.name());
-    m_data.symbol             = QString::fromStdString(newData.symbol());
-    m_data.info               = QString::fromStdString(newData.info());
-    m_data.designator         = QString::fromStdString(newData.designator());
-    m_data.tacticalIdentifier = QString::fromStdString(newData.tacticalIdentifier());
-    m_data.equipmentNumber    = newData.equipmentNumber();
+    m_data.typeId             = newData.typeId;
+    m_data.hierarchyNumber    = newData.hierarchyNumber;
+    m_data.name               = QString::fromStdString(newData.name);
+    m_data.symbol             = QString::fromStdString(newData.symbol);
+    m_data.info               = QString::fromStdString(newData.info);
+    m_data.designator         = QString::fromStdString(newData.designator);
+    m_data.tacticalIdentifier = QString::fromStdString(newData.tacticalIdentifier);
+    m_data.equipmentNumber    = newData.equipmentNumber;
   }
 
   return !hasNoChanges;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp
index f606c393b..36e8dbdf7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TemplateHandling/template_handler.cpp
@@ -72,19 +72,19 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
   QHash<int32_t, int32_t> modIdToTemplateId; // <modId, templateId>
   QVector<ParticipantManagement::TemplateData> templatesToBeCreatedOrModified;
 
-  templatesToBeCreatedOrModified.reserve(request.data().size());
+  templatesToBeCreatedOrModified.reserve(request.data.size());
 
   DBTransaction removeTransaction(m_mainHandler->db()->database());
   // first remove templates which are marked to be removed
-  for (const TemplateData &currentTemplate : request.data())
+  for (const TemplateData &currentTemplate : request.data)
   {
-    if (currentTemplate.isDeleted())
+    if (currentTemplate.isDeleted)
     {
-      if (currentTemplate.templateId() <= 0)
+      if (currentTemplate.templateId <= 0)
         return Core::FunctionReplyObject(tr_lts("dds",
                                                 "Internal error - Not possible to remove templateData with modId %1, because it does not have templateId set"))
-            .arg(currentTemplate.modId());
-      const auto ret = deleteTemplateById(currentTemplate.templateId(), true);
+            .arg(currentTemplate.modId);
+      const auto ret = deleteTemplateById(currentTemplate.templateId, true);
       if (ret.error())
         return ret;
     }
@@ -106,12 +106,10 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
     futureVec.reserve(vecSize);
     for (int startIndex = 0; startIndex < templatesToBeCreatedOrModified.size(); startIndex += range)
     {
-      QFuture<Core::FunctionReplyObject> fut = QtConcurrent::run(this,
-                                                                 &TemplateHandler::validateTemplateData,
-                                                                 templatesToBeCreatedOrModified,
-                                                                 modIdToTemplateId,
-                                                                 startIndex,
-                                                                 range);
+      QFuture<Core::FunctionReplyObject> fut = QtConcurrent::run(
+          [this, templatesToBeCreatedOrModified, modIdToTemplateId, startIndex, range]() mutable -> Core::FunctionReplyObject {
+            return validateTemplateData(templatesToBeCreatedOrModified, modIdToTemplateId, startIndex, range);
+          });
       futureVec += fut;
     }
 
@@ -142,7 +140,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
 
   for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified))
   {
-    Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId()));
+    Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId));
     if (!templateToUpdate)
     {
       DEBUG_LOG(m_logger) << "Creating new template: " << currentData;
@@ -167,8 +165,8 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
   // build hierarchy
   for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified)) // first set superiorIds
   {
-    Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId()), nullptr);
-    const int superiorId = modIdToTemplateId.value(currentData.superiorModId());
+    Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId), nullptr);
+    const int superiorId = modIdToTemplateId.value(currentData.superiorModId);
     if (!templateToUpdate->hasNewSuperiorId(superiorId) ||
         templatesWithChanges.contains(templateToUpdate))
       continue;
@@ -223,15 +221,15 @@ Core::FunctionReplyObject TemplateHandler::createNewTemplate(const ParticipantMa
   // create new template
   Database::PpmTemplate newDbTemplate;
 
-  newDbTemplate.typeId             = currentData.typeId();
-  newDbTemplate.name               = QString::fromStdString(currentData.name());
-  newDbTemplate.symbol             = QString::fromStdString(currentData.symbol());
-  newDbTemplate.info               = QString::fromStdString(currentData.info());
-  newDbTemplate.designator         = QString::fromStdString(currentData.designator());
-  newDbTemplate.tacticalIdentifier = QString::fromStdString(currentData.tacticalIdentifier());
-  newDbTemplate.superiorId         = modIdToTemplateId.value(currentData.superiorModId(), 0);
-  newDbTemplate.hierarchyNumber    = currentData.hierarchyNumber();
-  newDbTemplate.equipmentNumber    = currentData.equipmentNumber();
+  newDbTemplate.typeId             = currentData.typeId;
+  newDbTemplate.name               = QString::fromStdString(currentData.name);
+  newDbTemplate.symbol             = QString::fromStdString(currentData.symbol);
+  newDbTemplate.info               = QString::fromStdString(currentData.info);
+  newDbTemplate.designator         = QString::fromStdString(currentData.designator);
+  newDbTemplate.tacticalIdentifier = QString::fromStdString(currentData.tacticalIdentifier);
+  newDbTemplate.superiorId         = modIdToTemplateId.value(currentData.superiorModId, 0);
+  newDbTemplate.hierarchyNumber    = currentData.hierarchyNumber;
+  newDbTemplate.equipmentNumber    = currentData.equipmentNumber;
 
   // creating db entry
   if (!m_mainHandler->db()->insert(newDbTemplate))
@@ -242,7 +240,7 @@ Core::FunctionReplyObject TemplateHandler::createNewTemplate(const ParticipantMa
   Template *newTemplate = new Template(newDbTemplate);
 
   m_templates.insert(newTemplate->id(), newTemplate);
-  modIdToTemplateId.insert(currentData.modId(), newTemplate->id());
+  modIdToTemplateId.insert(currentData.modId, newTemplate->id());
   if (!templatesWithChanges.contains(newTemplate))
     templatesWithChanges.append(newTemplate);
 
@@ -253,32 +251,32 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
                                                                 QHash<int32_t, int32_t> &modIdToTemplateId,
                                                                 const ParticipantManagement::TemplateData &templateToValidate)
 {
-  if (templateToValidate.templateId() != 0)
+  if (templateToValidate.templateId != 0)
   {
     DEBUG_LOG(m_logger) << "Checking template id";
-    Template *existingTemplate = m_templates.value(templateToValidate.templateId(), nullptr);
+    Template *existingTemplate = m_templates.value(templateToValidate.templateId, nullptr);
     if (existingTemplate == nullptr)
       return Core::FunctionReplyObject(tr_lts("dds",
                                               "Could not execute ModifyTemplateDataRequest, because an invalid template ID (%1) was given"))
-          .arg(templateToValidate.templateId());
+          .arg(templateToValidate.templateId);
 
     DEBUG_LOG(m_logger) << "... ok";
     {
       QMutexLocker l(&m_mutex);
-      modIdToTemplateId.insert(templateToValidate.modId(), existingTemplate->id()); /* register template to indicate that this template
+      modIdToTemplateId.insert(templateToValidate.modId, existingTemplate->id()); /* register template to indicate that this template
                                                                                       should just be modified and not newly created */
     }
   }
 
   // superior ids valid?
-  if (templateToValidate.superiorModId() > 0)
+  if (templateToValidate.superiorModId > 0)
   {
     DEBUG_LOG(m_logger) << "checking superiorIds";
     // superior exists?
     bool isExistingSuperiorId = false;
     for (const TemplateData &dat : dataVec)
     {
-      if (templateToValidate.superiorModId() == dat.modId())
+      if (templateToValidate.superiorModId == dat.modId)
       {
         isExistingSuperiorId = true;
         break; // for (const TemplateData &dat : dataVec)
@@ -287,12 +285,12 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
     if (!isExistingSuperiorId)
       return Core::FunctionReplyObject(tr_lts("dds",
                                               "Could not execute ModifyTemplateDataRequest, the data set with modId %1 has an invalid superiorModId %2"))
-          .arg(templateToValidate.modId())
-          .arg(templateToValidate.superiorModId());
+          .arg(templateToValidate.modId)
+          .arg(templateToValidate.superiorModId);
 
     DEBUG_LOG(m_logger) << "... ok";
 
-    if (templateToValidate.hierarchyNumber() <= 0)
+    if (templateToValidate.hierarchyNumber <= 0)
       return Core::FunctionReplyObject(tr_lts("dds",
                                               "Could not execute ModifyTemplateDataRequest, because a data set has a superior but no hierarchyNumber set"));
 
@@ -301,24 +299,24 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
     for (const TemplateData &dat : dataVec)
     {
       // operator==() on optionals returns false if not set ...
-      if (dat.modId() != templateToValidate.modId() &&
-          dat.superiorModId() == templateToValidate.superiorModId() &&
-          dat.hierarchyNumber() == templateToValidate.hierarchyNumber())
+      if (dat.modId != templateToValidate.modId &&
+          dat.superiorModId == templateToValidate.superiorModId &&
+          dat.hierarchyNumber == templateToValidate.hierarchyNumber)
         return Core::FunctionReplyObject(tr_lts("dds",
                                                 "Could not execute ModifyTemplateDataRequest, because for superiorModId %1 hierarchyNumber %2 is not unique"))
-            .arg(dat.superiorModId())
-            .arg(dat.hierarchyNumber());
+            .arg(dat.superiorModId)
+            .arg(dat.hierarchyNumber);
     }
     DEBUG_LOG(m_logger) << "... ok";
   }
 
   // typeId valid?
   DEBUG_LOG(m_logger) << "Checking typeId";
-  if (m_mainHandler->typeHandler()->typeById(templateToValidate.typeId()) == nullptr)
+  if (m_mainHandler->typeHandler()->typeById(templateToValidate.typeId) == nullptr)
     return Core::FunctionReplyObject(tr_lts("dds",
                                             "Could not execute ModifyTemplateDataRequest, because data set with modId %1 has invalid typeId %2"))
-        .arg(templateToValidate.modId())
-        .arg(templateToValidate.typeId());
+        .arg(templateToValidate.modId)
+        .arg(templateToValidate.typeId);
 
   DEBUG_LOG(m_logger) << "... ok";
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
index de843fdd8..15bba687d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
@@ -42,7 +42,7 @@ bool TypeHandler::isSupportType(int typeId) const
   if (!type)
     return false;
 
-  switch (type->typeClass().underlying())
+  switch (type->typeClass)
   {
   case TypeClass::SupportEntity:
   case TypeClass::SupportUnit:
@@ -66,7 +66,7 @@ bool TypeHandler::isParticipantType(int typeId) const
   if (!type)
     return false;
 
-  switch (type->typeClass().underlying())
+  switch (type->typeClass)
   {
   case TypeClass::SupportEntity:
   case TypeClass::SupportUnit:
@@ -90,7 +90,7 @@ bool TypeHandler::isUnitType(int typeId) const
   if (!type)
     return false;
 
-  switch (type->typeClass().underlying())
+  switch (type->typeClass)
   {
   case TypeClass::Unit:
   case TypeClass::SupportUnit:
@@ -120,7 +120,7 @@ bool TypeHandler::isArtilleryParticipantType(int typeId) const
 const ParticipantManagement::EquipmentType *TypeHandler::equipmentTypeByTypeId(int32_t typeId)
 {
   const Type *type = typeById(typeId);
-  return type ? m_equipmentTypes.value(type->equipmentTypeId()) : nullptr;
+  return type ? m_equipmentTypes.value(type->equipmentTypeId) : nullptr;
 }
 
 std::shared_ptr<TypeHandler> TypeHandler::createInstance(MainHandler *mainHandler, NGL::INGLLogger &logger)
@@ -143,7 +143,7 @@ bool TypeHandler::isArtilleryType(int typeId) const
   if (!type)
     return false;
 
-  QJsonDocument typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type->properties()));
+  QJsonDocument typeProperties = QJsonDocument::fromJson(QByteArray::fromStdString(type->properties));
   QJsonObject typePropertiesObject = typeProperties.object();
 
   return typePropertiesObject.value(QStringLiteral("isArtillery")).toBool();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.cpp
index 14558d3eb..7b5de1deb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.cpp
@@ -60,7 +60,7 @@ bool TypeHandling::TypeHandlerExercise::init()
 
 void TypeHandling::TypeHandlerExercise::onTypeChanged(const ParticipantManagement::Type &data)
 {
-  Type *changedType = m_types.value(data.id());
+  Type *changedType = m_types.value(data.id);
   if (changedType)
   {
     *changedType = data;
@@ -68,13 +68,13 @@ void TypeHandling::TypeHandlerExercise::onTypeChanged(const ParticipantManagemen
   else
   {
     changedType = new Type(data);
-    m_types.insert(changedType->id(), changedType);
+    m_types.insert(changedType->id, changedType);
   }
 }
 
 void TypeHandling::TypeHandlerExercise::onEquipmentTypeChanged(const ParticipantManagement::EquipmentType &data)
 {
-  EquipmentType *changedEquipmentType = m_equipmentTypes.value(data.id());
+  EquipmentType *changedEquipmentType = m_equipmentTypes.value(data.id);
   if (changedEquipmentType)
   {
     *changedEquipmentType = data;
@@ -82,7 +82,7 @@ void TypeHandling::TypeHandlerExercise::onEquipmentTypeChanged(const Participant
   else
   {
     changedEquipmentType = new EquipmentType(data);
-    m_equipmentTypes.insert(changedEquipmentType->id(), changedEquipmentType);
+    m_equipmentTypes.insert(changedEquipmentType->id, changedEquipmentType);
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_global.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_global.cpp
index a202ec629..441e880b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_global.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_global.cpp
@@ -20,14 +20,14 @@ namespace ParticipantManagement
 static Database::PpmEquipmentType toDb(const EquipmentType &et)
 {
   Database::PpmEquipmentType db;
-  db.id = et.id();
-  db.name = QString::fromStdString(et.name());
-  db.minEquipNo = et.minEquipNo();
-  db.maxEquipNo = et.maxEquipNo();
-  db.traVulnerabilityModelId = et.traVulnerabilityModelId();
-  db.traPlayerTypeId = et.traPlayerTypeId();
-  db.wmsTypeClassId = et.wmsTypeClass();
-  db.deletedInWms = et.deletedInWms();
+  db.id = et.id;
+  db.name = QString::fromStdString(et.name);
+  db.minEquipNo = et.minEquipNo;
+  db.maxEquipNo = et.maxEquipNo;
+  db.traVulnerabilityModelId = et.traVulnerabilityModelId;
+  db.traPlayerTypeId = et.traPlayerTypeId;
+  db.wmsTypeClassId = et.wmsTypeClass;
+  db.deletedInWms = et.deletedInWms;
 
   return db;
 }
@@ -36,21 +36,21 @@ Database::PpmType toDb(const ParticipantManagement::Type &data)
 {
   Database::PpmType ret;
 
-  ret.id              = data.id();
-  ret.typeClassId     = data.typeClass();
-  if (data.equipmentTypeId() != 0)
-    ret.equipmentTypeId = data.equipmentTypeId(); // QVariant
-  ret.name            = QString::fromStdString(data.name());
-  ret.symbol          = QString::fromStdString(data.symbol());
-  ret.radioCount      = data.radioCount();
-  ret.hierarchyLevel  = data.hierarchyLevel();
-  ret.isDeleted       = data.isDeleted();
+  ret.id              = data.id;
+  ret.typeClassId     = data.typeClass;
+  if (data.equipmentTypeId != 0)
+    ret.equipmentTypeId = data.equipmentTypeId; // QVariant
+  ret.name            = QString::fromStdString(data.name);
+  ret.symbol          = QString::fromStdString(data.symbol);
+  ret.radioCount      = data.radioCount;
+  ret.hierarchyLevel  = data.hierarchyLevel;
+  ret.isDeleted       = data.isDeleted;
 #ifdef Q_OS_WIN
   ret.disEntities     = LtsUtils::BigintArray(data.disEntities());
 #else
-  ret.disEntities     = LtsUtils::BigintArray(LtsUtils::convert<std::vector<int64_t>>(data.disEntities()));
+  ret.disEntities     = LtsUtils::BigintArray(data.disEntities);
 #endif
-  ret.properties      = QString::fromStdString(data.properties());
+  ret.properties      = QString::fromStdString(data.properties);
 
   return ret;
 }
@@ -94,7 +94,7 @@ bool TypeHandling::TypeHandlerGlobal::init()
   auto cbEt = [this] (const Database::PpmEquipmentType &dbEquipmentType)
   {
     EquipmentType *newEquipmentType = new EquipmentType(convert(dbEquipmentType));
-    m_equipmentTypes.insert(newEquipmentType->id(), newEquipmentType);
+    m_equipmentTypes.insert(newEquipmentType->id, newEquipmentType);
     m_mainHandler->exAnyDts()->publish(*newEquipmentType);
   };
   m_mainHandler->db()->select(cbEt);
@@ -104,7 +104,7 @@ bool TypeHandling::TypeHandlerGlobal::init()
   auto cbT = [this] (const Database::PpmType &dbType)
   {
     Type *newType = new Type(convert(dbType));
-    m_types.insert(newType->id(), newType);
+    m_types.insert(newType->id, newType);
     m_mainHandler->exAnyDts()->publish(*newType);
   };
   m_mainHandler->db()->select(cbT);
@@ -116,7 +116,7 @@ void TypeHandling::TypeHandlerGlobal::onModifyTypeRequest(const rti::core::Sampl
                                                           const ParticipantManagement::Type &request)
 {
   DEBUG_LOG(m_logger) << "onModifyTypeRequest" << request;
-  auto ret = (request.id() > 0 ? modifyTypeRequest(request) : createTypeRequest(request));
+  auto ret = (request.id > 0 ? modifyTypeRequest(request) : createTypeRequest(request));
   if (ret.error())
     WARNING_LOG(m_logger) << ret();
   m_mainHandler->exAnyFts()->modifyTypeReply(cookie, ret);
@@ -124,17 +124,17 @@ void TypeHandling::TypeHandlerGlobal::onModifyTypeRequest(const rti::core::Sampl
 
 Core::FunctionReplyObject TypeHandling::TypeHandlerGlobal::createTypeRequest(const ParticipantManagement::Type &request)
 {
-  if (request.equipmentTypeId() != 0 && !m_equipmentTypes.contains(request.equipmentTypeId()))
-    return Core::FunctionReplyObject(-1, tr_lts("dds", "Could not add new Type - equipmentTypeId %1 invalid")).arg(request.equipmentTypeId());
+  if (request.equipmentTypeId != 0 && !m_equipmentTypes.contains(request.equipmentTypeId))
+    return Core::FunctionReplyObject(-1, tr_lts("dds", "Could not add new Type - equipmentTypeId %1 invalid")).arg(request.equipmentTypeId);
 
   Database::PpmType newPpmType(toDb(request));
   if (!m_mainHandler->db()->insert(newPpmType))
     return Core::FunctionReplyObject(-1, tr_lts("dds", "Could not add new Type - insert statement failed"));
 
   Type *newType = new Type(request);
-  newType->id(newPpmType.id);
+  newType->id = newPpmType.id;
   // insert into map
-  m_types.insert(newType->id(), newType);
+  m_types.insert(newType->id, newType);
 
   // publish to dds
   m_mainHandler->exAnyDts()->publish(*newType);
@@ -146,15 +146,15 @@ Core::FunctionReplyObject TypeHandling::TypeHandlerGlobal::createTypeRequest(con
 
 Core::FunctionReplyObject TypeHandling::TypeHandlerGlobal::modifyTypeRequest(const ParticipantManagement::Type &request)
 {
-  Type *typeToBeModified = m_types.value(request.id());
+  Type *typeToBeModified = m_types.value(request.id);
   if (!typeToBeModified)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not add new Type - Type with id %1 not available")).arg(request.id());
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not add new Type - Type with id %1 not available")).arg(request.id);
 
-  if (typeToBeModified->equipmentTypeId() != request.equipmentTypeId())
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "It is not allowed to modify the Equipment Type of a Type"));
+  if (typeToBeModified->equipmentTypeId != request.equipmentTypeId)
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "It is not allowed to modify the Equipment Type of a Type"));
 
   if (!m_mainHandler->db()->update(toDb(request)))
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not modify Type in database"));
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not modify Type in database"));
 
   DEBUG_LOG(m_logger) << "Old Type data:\n"
                       << *typeToBeModified
@@ -163,7 +163,7 @@ Core::FunctionReplyObject TypeHandling::TypeHandlerGlobal::modifyTypeRequest(con
   *typeToBeModified = request;
   m_mainHandler->exAnyDts()->publish(*typeToBeModified);
 
-  return Core::FunctionReplyObject(request.id());
+  return Core::FunctionReplyObject(request.id);
 }
 
 void TypeHandling::TypeHandlerGlobal::onRemoveTypeRequest(const rti::core::SampleIdentity &cookie,
@@ -171,24 +171,24 @@ void TypeHandling::TypeHandlerGlobal::onRemoveTypeRequest(const rti::core::Sampl
 {
   DEBUG_LOG(m_logger) << "onRemoveTypeRequest " << request;
 
-  Core::FunctionReplyObject rep(request.typeId());
-  Type *typeToBeRemoved = m_types.value(request.typeId());  
+  Core::FunctionReplyObject rep(request.typeId);
+  Type *typeToBeRemoved = m_types.value(request.typeId);  
   if (typeToBeRemoved)
   {
-    if (isTypeUsed(typeToBeRemoved->id()))
-      rep = Core::FunctionReplyObject(request.typeId(), tr_lts("dds", "Type '%1' with type id %2 cannot be removed, type is used")).arg(typeToBeRemoved->name()).arg(request.typeId());
+    if (isTypeUsed(typeToBeRemoved->id))
+      rep = Core::FunctionReplyObject(request.typeId, tr_lts("dds", "Type '%1' with type id %2 cannot be removed, type is used")).arg(typeToBeRemoved->name).arg(request.typeId);
     else
     {
-      typeToBeRemoved->isDeleted(true);
+      typeToBeRemoved->isDeleted = true;
 
       if (!m_mainHandler->db()->update(toDb(*typeToBeRemoved)))
-        rep = Core::FunctionReplyObject(request.typeId(), tr_lts("dds", "Could not mark type with id %1 as deleted in database")).arg(request.typeId());
+        rep = Core::FunctionReplyObject(request.typeId, tr_lts("dds", "Could not mark type with id %1 as deleted in database")).arg(request.typeId);
 
       m_mainHandler->exAnyDts()->publish(*typeToBeRemoved);
     }
   }
   else
-    rep = Core::FunctionReplyObject(request.typeId(), tr_lts("dds", "RemoveTypeRequest for non existing type with id %1")).arg(request.typeId());
+    rep = Core::FunctionReplyObject(request.typeId, tr_lts("dds", "RemoveTypeRequest for non existing type with id %1")).arg(request.typeId);
 
   if (rep.error())
     WARNING_LOG(m_logger) << rep();
@@ -201,18 +201,18 @@ void TypeHandling::TypeHandlerGlobal::onModifyEquipmentTypeDataRequest(const rti
 {
   Core::FunctionReplyObject rep;
 
-  INFO_LOG(m_logger) << "Got " << request.data().size() << " equipment types to modify";
+  INFO_LOG(m_logger) << "Got " << request.data.size() << " equipment types to modify";
 
   QSet<int> activeIds;
-  activeIds.reserve(request.data().size());
+  activeIds.reserve(request.data.size());
 
-  for (const EquipmentType &currentData : request.data())
+  for (const EquipmentType &currentData : request.data)
   {
     bool bPublishData = false;
-    EquipmentType *existingEquipmentType = m_equipmentTypes.value(currentData.id(), nullptr);
+    EquipmentType *existingEquipmentType = m_equipmentTypes.value(currentData.id, nullptr);
     if (existingEquipmentType) // update existing equipment type
     {
-      activeIds += currentData.id();
+      activeIds += currentData.id;
 
       if (*existingEquipmentType != currentData)
       {
@@ -220,7 +220,7 @@ void TypeHandling::TypeHandlerGlobal::onModifyEquipmentTypeDataRequest(const rti
         *existingEquipmentType = currentData;
         if (!m_mainHandler->db()->update(toDb(currentData)))
         {
-          rep = Core::FunctionReplyObject(currentData.id(), tr_lts("dds", "Error updating equipment type with %1 data in database")).arg(currentData.id());
+          rep = Core::FunctionReplyObject(currentData.id, tr_lts("dds", "Error updating equipment type with %1 data in database")).arg(currentData.id);
           break;
         }
       }
@@ -230,54 +230,54 @@ void TypeHandling::TypeHandlerGlobal::onModifyEquipmentTypeDataRequest(const rti
       Database::PpmEquipmentType dbEquipmentType(toDb(currentData));
       if (!m_mainHandler->db()->insert(dbEquipmentType))
       {
-        rep = Core::FunctionReplyObject(currentData.id(), tr_lts("dds", "Error inserting equipment type with %1 data in database")).arg(currentData.id());
+        rep = Core::FunctionReplyObject(currentData.id, tr_lts("dds", "Error inserting equipment type with %1 data in database")).arg(currentData.id);
         break;
       }
 
       existingEquipmentType = new EquipmentType(currentData);
-      existingEquipmentType->id(dbEquipmentType.id);
-      m_equipmentTypes.insert(existingEquipmentType->id(), existingEquipmentType);
-      activeIds += existingEquipmentType->id();
+      existingEquipmentType->id = dbEquipmentType.id;
+      m_equipmentTypes.insert(existingEquipmentType->id, existingEquipmentType);
+      activeIds += existingEquipmentType->id;
       bPublishData = true;
     }
 
-    INFO_LOG(m_logger) << "Modified EquipmentType with id " << existingEquipmentType->id() << " ?: " << bPublishData;
+    INFO_LOG(m_logger) << "Modified EquipmentType with id " << existingEquipmentType->id << " ?: " << bPublishData;
     if (bPublishData)
     {
       if (!m_mainHandler->exAnyDts()->publish(*existingEquipmentType))
       {
-        rep = Core::FunctionReplyObject(currentData.id(), tr_lts("dds", "Error publishing equipment type %1 to DDS")).arg(currentData.id());
+        rep = Core::FunctionReplyObject(currentData.id, tr_lts("dds", "Error publishing equipment type %1 to DDS")).arg(currentData.id);
         break;
       }
     }
   }
 
-  if (request.deleteAll())
+  if (request.deleteAll)
   {
     QHashIterator<int32_t,EquipmentType*> it(m_equipmentTypes);
     while (it.hasNext())
     {
       EquipmentType* et = it.next().value();
-      if (activeIds.contains(et->id()))
+      if (activeIds.contains(et->id))
         continue;
 
-      INFO_LOG(m_logger) << "Deleted in WHG " << et->id() << ", already marked as deleted?: " << et->deletedInWms();
+      INFO_LOG(m_logger) << "Deleted in WHG " << et->id << ", already marked as deleted?: " << et->deletedInWms;
 
       // alle, die nicht behandelt wurden -> deletedInWms
       // über alle iterieren
-      if (et->deletedInWms())
+      if (et->deletedInWms)
         continue;
 
-      et->deletedInWms(true);
+      et->deletedInWms = true;
       if (!m_mainHandler->db()->update(toDb(*et)))
       {
-        rep = Core::FunctionReplyObject(et->id(), tr_lts("dds", "Error updating equipment type with %1 data in database")).arg(et->id());
+        rep = Core::FunctionReplyObject(et->id, tr_lts("dds", "Error updating equipment type with %1 data in database")).arg(et->id);
         break;
       }
 
       if (!m_mainHandler->exAnyDts()->publish(*et))
       {
-        rep = Core::FunctionReplyObject(et->id(), tr_lts("dds", "Error publishing equipment type %1 to DDS")).arg(et->id());
+        rep = Core::FunctionReplyObject(et->id, tr_lts("dds", "Error publishing equipment type %1 to DDS")).arg(et->id);
         break;
       }
     }
@@ -301,7 +301,7 @@ bool TypeHandling::TypeHandlerGlobal::isTypeUsed(int typeId) const
   const auto exercises = m_exmDtc->exercises();
   for (const ExerciseManagement::Exercise &ex : exercises)
   {
-    const QString tblName = DBCommon::getExerciseTableName(QStringLiteral("ppm_participant"), ex.id());
+    const QString tblName = DBCommon::getExerciseTableName(QStringLiteral("ppm_participant"), ex.id);
     //const QString stmt(QStringLiteral("SELECT count(*) FROM %1 WHERE type_id = %2").arg(tblName, QString::number(typeId)));
 
     // Error occured => same as if type exists
@@ -310,7 +310,7 @@ bool TypeHandling::TypeHandlerGlobal::isTypeUsed(int typeId) const
 
     int count = q.value(0).toInt();
 
-    DEBUG_LOG(m_logger) << "exercise: " << ex.id() << ", count: " << count;
+    DEBUG_LOG(m_logger) << "exercise: " << ex.id << ", count: " << count;
     if (count > 0)
       return true;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp
index 60b2cdbee..3631d2043 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp
@@ -46,14 +46,14 @@ bool MissionPlanHandler::init()
 
 void MissionPlanHandler::onModifyMissionPlanRequest(const rti::core::SampleIdentity &cookie, const ModifyMissionPlanRequest &request)
 {
-  Core::FunctionReplyObject reply = request.id() == 0 ? createMissionPlanRequest(request)
+  Core::FunctionReplyObject reply = request.id == 0 ? createMissionPlanRequest(request)
                                                       : modifyMissionPlanRequest(request);
   m_mainHandler->fts()->modifyMissionPlanReply(cookie, reply);
 }
 
 void MissionPlanHandler::onRemoveMissionPlanRequest(const rti::core::SampleIdentity &cookie, const RemoveMissionPlanRequest &request)
 {
-  Core::FunctionReplyObject reply = removeMissionPlanRequest(request.id());
+  Core::FunctionReplyObject reply = removeMissionPlanRequest(request.id);
 
   m_mainHandler->ddsHandler()->fts()->removeMissionPlanReply(cookie, reply);
 }
@@ -94,12 +94,12 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
   for (const ParticipantManagement::Database::PpmMissionPlan &data : std::as_const(missionPlanVec))
   {
     ParticipantManagement::MissionPlan missionPlan;
-    missionPlan.id(data.id);
-    missionPlan.name(data.name.toStdString());
-    missionPlan.participantId(data.participantId);
-    missionPlan.missionStart(data.missionStart.toMSecsSinceEpoch());
-    missionPlan.repeat(data.repeat);
-    missionPlan.jumpToStart(data.jumpToStart);
+    missionPlan.id = data.id;
+    missionPlan.name = data.name.toStdString();
+    missionPlan.participantId = data.participantId;
+    missionPlan.missionStart = data.missionStart.toMSecsSinceEpoch();
+    missionPlan.repeat = data.repeat;
+    missionPlan.jumpToStart = data.jumpToStart;
 
 
     QMap <int, ParticipantManagement::Database::PpmMissionItem> itemsDbMap; // QMap to get it sorted
@@ -120,14 +120,14 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
     }
 
 
-    missionPlan.items().reserve(itemsDbMap.size());
+    missionPlan.items.reserve(itemsDbMap.size());
     for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(itemsDbMap))
     {
       ParticipantManagement::MissionItem msi;
-      msi.actions().reserve(actionsDbMap.size());
-      msi.name(item.name.toStdString());
-      msi.location(Core::GeoPosition(item.location.x(), item.location.y(), item.location.z()));
-      msi.itemNumber(item.elementNumber);
+      msi.actions.reserve(actionsDbMap.size());
+      msi.name = item.name.toStdString();
+      msi.location = Core::GeoPosition(item.location.x(), item.location.y(), item.location.z());
+      msi.itemNumber = item.elementNumber;
       int actionsFulfilled = 0;
       int64_t latestFulfilled = 0;
       for (const auto &action : actionsDbMap)
@@ -135,36 +135,36 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
         if (action.missionItemId == item.id)
         {
           ParticipantManagement::MissionAction msa;
-          msa.planId(missionPlan.id());
-          msa.actionType(action.missionActionTypeId);
-          msa.duration(action.duration);
-          msa.fulfilled(action.fulfilled.toMSecsSinceEpoch());
-          msa.properties(action.properties.toStdString());
-          msa.name(action.name.toStdString());
-          msa.actionNumber(action.elementNumber);
-          msa.itemNumber(msi.itemNumber());
-          msi.actions().push_back(msa);
+          msa.planId = missionPlan.id;
+          msa.actionType = action.missionActionTypeId;
+          msa.duration = action.duration;
+          msa.fulfilled = action.fulfilled.toMSecsSinceEpoch();
+          msa.properties = action.properties.toStdString();
+          msa.name = action.name.toStdString();
+          msa.actionNumber = action.elementNumber;
+          msa.itemNumber = msi.itemNumber;
+          msi.actions.push_back(msa);
 
-          if (msa.fulfilled() > 0)
+          if (msa.fulfilled > 0)
             actionsFulfilled++;
 
-          if (latestFulfilled < msa.fulfilled())
-            latestFulfilled = msa.fulfilled();
+          if (latestFulfilled < msa.fulfilled)
+            latestFulfilled = msa.fulfilled;
 
         }
       }
 
-      msi.actionsFulfilled(actionsFulfilled);
-      msi.fulfilled(latestFulfilled);
+      msi.actionsFulfilled = actionsFulfilled;
+      msi.fulfilled = latestFulfilled;
 
-      missionPlan.items().push_back(msi);
+      missionPlan.items.push_back(msi);
     }
 
     setLatestFulfilledItem(missionPlan); // update mission plan fulfillment count & fulfillemnt latest time
 
     ObjectMissionPlan *obj = new ObjectMissionPlan(m_mainHandler->ddsHandler(), m_mainHandler->db(), missionPlan);
     obj->setDbMissionItems(itemsDbMap, actionsDbMap);
-    m_objMissionPlans.insert(missionPlan.id(), obj);
+    m_objMissionPlans.insert(missionPlan.id, obj);
 
     // publish mission plan data
     m_mainHandler->ddsHandler()->dts()->publish(missionPlan);
@@ -179,15 +179,15 @@ bool MissionPlanHandler::isUasInAutoMode(int participantId)
   m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataUAS(3000);
   const auto uas = m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participantId, m_mainHandler->exerciseId());
 
-  if (uas.id() < 1)
+  if (uas.id < 1)
   {
     ERROR_LOG(m_logger) << "no uas for pid " << participantId;
     return false;
   }
 
-  DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState().underlying();
+  DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState;
 
-  return (uas.uasState() == ProjectDataManagement::UasState::UasState_Auto);
+  return (uas.uasState == ProjectDataManagement::UasState::UasState_Auto);
 }
 
 // stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
@@ -196,53 +196,53 @@ bool MissionPlanHandler::isUasCombatReady(int participantId)
   m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataDynamicParticipantData(3000);
   const auto data = m_mainHandler->ddsHandler()->dtc()->dynamicParticipantData(participantId);
 
-  if (data.participantId() == 0)
+  if (data.participantId == 0)
   {
     return false;
   }
 
   //Current State
-  if (data.stateHistory().empty())
+  if (data.stateHistory.empty())
   {
     return false;
   }
 
-  const auto &history = data.stateHistory();
+  const auto &history = data.stateHistory;
 
   //LasState is the last "real" state, that has a VBG <=8 (Castastrophic)
   //It's not the last state received, as there can be other state changes like Sanitation, or NearMiss
   auto lastState = m_mainHandler->ddsHandler()->dtc()->youngestStateInformation(history/*, true*/ /* debug */);
   decltype(lastState) youngestState;
-  youngestState.stateTime(0);
+  youngestState.stateTime = 0;
   for (const auto &si : history)
   {
     DEBUG_LOG(m_logger) << "StateInformation "
-                         << " time=" << si.stateTime()
-                         << " vulnerabilityBits=" << si.vulnerabilityBits()
-                         << " vulnerabilityKindId=" << si.vulnerabilityKindId();
-    if (youngestState.stateTime() < si.stateTime())
+                         << " time=" << si.stateTime
+                         << " vulnerabilityBits=" << si.vulnerabilityBits
+                         << " vulnerabilityKindId=" << si.vulnerabilityKindId;
+    if (youngestState.stateTime < si.stateTime)
       youngestState = si;
   }
 
-  return (youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+  return (youngestState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
 }
 
 Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const ModifyMissionPlanRequest &request)
 {
   DEBUG_LOG(m_logger) <<" >> -- createMissionPlanRequest -- ";
-  if (request.participantId() > 0 && !isUasParticipant(request.participantId()))
+  if (request.participantId > 0 && !isUasParticipant(request.participantId))
   {
-    return Core::FunctionReplyObject(tr_lts("dds", "Participant with id %1 is not a Uas participant.")).arg(request.participantId());
+    return Core::FunctionReplyObject(tr_lts("dds", "Participant with id %1 is not a Uas participant.")).arg(request.participantId);
   }
 
-  if (!isUasInAutoMode(request.participantId()))
+  if (!isUasInAutoMode(request.participantId))
   {
-    return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 is not in auto mode - maybe the safety tablet is currently engaged.")).arg(request.participantId());
+    return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 is not in auto mode - maybe the safety tablet is currently engaged.")).arg(request.participantId);
   }
 
-  if (!isUasCombatReady(request.participantId()))
+  if (!isUasCombatReady(request.participantId))
   {
-    return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 ------ not combat ready.")).arg(request.participantId());
+    return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 ------ not combat ready.")).arg(request.participantId);
   }
 
   /// 1- insert in DB Mission plan
@@ -254,7 +254,7 @@ Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const Mod
   const MissionPlan missionPlan =  ObjectMissionPlan::fillMissionPlanData(request);
 
   ObjectMissionPlan *obj = new ObjectMissionPlan(m_mainHandler->ddsHandler(), m_mainHandler->db(), missionPlan);
-  Core::FunctionReplyObject ret = obj->createMissionPlan(dbMissionPlan, request.items());
+  Core::FunctionReplyObject ret = obj->createMissionPlan(dbMissionPlan, request.items);
   if (ret.error())
   {
     delete obj;
@@ -273,13 +273,13 @@ Core::FunctionReplyObject MissionPlanHandler::modifyMissionPlanRequest(const Mod
   /// 2- remove first all mission items and their actions
   /// 3- add New mission items
   /// 4- add new mission actions
-  ObjectMissionPlan *obj = m_objMissionPlans.value(request.id());
-  if (!obj || request.id() < 0)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Couldn't remove Mission plan with id %1")).arg(request.id());
+  ObjectMissionPlan *obj = m_objMissionPlans.value(request.id);
+  if (!obj || request.id < 0)
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Couldn't remove Mission plan with id %1")).arg(request.id);
 
   const Database::PpmMissionPlan &dbMissionPlan = ObjectMissionPlan::toDbMissionPlan(request);
 
-  auto ret = obj->updateMissionPlan(dbMissionPlan, request.items());
+  auto ret = obj->updateMissionPlan(dbMissionPlan, request.items);
   publishMissionPlan(obj->getMissionPlanData()); // publish mission plan
   return ret;
 }
@@ -308,19 +308,19 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
   bool found = false;
   for (const auto &missionPlan : m_objMissionPlans.values())
   {
-    if (missionPlan->missionPlan().participantId() == participantId && missionPlan->missionPlan().missionStart() <= m_mainHandler->currentTimeMSec())
+    if (missionPlan->missionPlan().participantId == participantId && missionPlan->missionPlan().missionStart <= m_mainHandler->currentTimeMSec())
     {
       // get current action (stolen from Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp)
-      const std::vector< ParticipantManagement::MissionItem > items = missionPlan->missionPlan().items(); // copy !!
+      const std::vector< ParticipantManagement::MissionItem > items = missionPlan->missionPlan().items; // copy !!
       for (const auto &item : items)
       {
-        for (auto &msa : item.actions())
+        for (auto &msa : item.actions)
         {
-          const QString thisMissionName(QStringLiteral("%1_%2_%3").arg(missionPlan->missionPlan().id()).arg(QString::fromStdString(missionPlan->missionPlan().name()), QString::fromStdString(item.name())));
+          const QString thisMissionName(QStringLiteral("%1_%2_%3").arg(missionPlan->missionPlan().id).arg(QString::fromStdString(missionPlan->missionPlan().name), QString::fromStdString(item.name)));
 
-          INFO_LOG(m_logger) << ">> mission item: this mission name: " << thisMissionName << ", fulfilled: " << msa.fulfilled();
+          INFO_LOG(m_logger) << ">> mission item: this mission name: " << thisMissionName << ", fulfilled: " << msa.fulfilled;
 
-          if (msa.fulfilled() > 0)
+          if (msa.fulfilled > 0)
           {
             continue;
           }
@@ -330,12 +330,12 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
             continue;
           }
 
-          DEBUG_LOG(m_logger) << ">> ######### setMissionActionFulfilledRequest !!! item = " << item.itemNumber() << ", name = " << item.name() << ", missionPlan = " << missionPlan->missionPlan().id();
+          DEBUG_LOG(m_logger) << ">> ######### setMissionActionFulfilledRequest !!! item = " << item.itemNumber << ", name = " << item.name << ", missionPlan = " << missionPlan->missionPlan().id;
           SetMissionActionFulfilledRequest req;
-          req.actionNumber(msa.actionNumber());
-          req.fulfilled(true);
-          req.missionId(missionPlan->missionPlan().id());
-          req.itemNumber(item.itemNumber());
+          req.actionNumber = msa.actionNumber;
+          req.fulfilled = true;
+          req.missionId = missionPlan->missionPlan().id;
+          req.itemNumber = item.itemNumber;
           const auto res = setMissionActionFulfilledRequest(req);
           if (res.error())
           {
@@ -371,9 +371,9 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
 
 Core::FunctionReplyObject MissionPlanHandler::setMissionActionFulfilledRequest(const SetMissionActionFulfilledRequest &request)
 {
-  DEBUG_LOG(m_logger)<<" -- [setMissionActionFulfilledRequest] req.missionId: "<<request.missionId();
+  DEBUG_LOG(m_logger)<<" -- [setMissionActionFulfilledRequest] req.missionId: "<<request.missionId;
   Core::FunctionReplyObject ret;
-  ObjectMissionPlan *obj = m_objMissionPlans.value(request.missionId(), nullptr);
+  ObjectMissionPlan *obj = m_objMissionPlans.value(request.missionId, nullptr);
   if (!obj)
     return ret;
   ret = obj->setMissionActionFulfilled(request, m_mainHandler->currentTimeMSec());
@@ -403,9 +403,9 @@ bool MissionPlanHandler::isUasParticipant(int participantId) const
 int MissionPlanHandler::getNumberOfActionFulfilled(const MissionItem &msi) const
 {
   int count = 0;
-  for (auto action : msi.actions())
+  for (auto action : msi.actions)
   {
-    if (action.fulfilled() > 0)
+    if (action.fulfilled > 0)
       count++;
   }
   return count;
@@ -415,26 +415,26 @@ void MissionPlanHandler::setLatestFulfilledItem(MissionPlan &missionPlan)
 {
   int count = 0;
   int64_t latestTime = 0;
-  for (auto item : missionPlan.items())
+  for (auto item : missionPlan.items)
   {
-    if (item.actionsFulfilled() > 0)
+    if (item.actionsFulfilled > 0)
       count++;
 
-    if (latestTime < item.fulfilled())
-      latestTime = item.fulfilled();
+    if (latestTime < item.fulfilled)
+      latestTime = item.fulfilled;
 
-    missionPlan.itemsFulfilled(count);
-    missionPlan.fulfilled(latestTime);
+    missionPlan.itemsFulfilled = count;
+    missionPlan.fulfilled = latestTime;
   }
 }
 
 int64_t MissionPlanHandler::getLastestFulfilledAction(const MissionItem &msi) const
 {
   int64_t latestTime = 0;
-  for (auto action : msi.actions())
+  for (auto action : msi.actions)
   {
-    if (action.fulfilled() > latestTime)
-      latestTime = action.fulfilled();
+    if (action.fulfilled > latestTime)
+      latestTime = action.fulfilled;
   }
 
   return latestTime;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.cpp
index 458f87c37..832c0f721 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.cpp
@@ -25,29 +25,29 @@ ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandl
   , m_missionplan(missionPlan)
   , m_logger(getLogger("ObjectMissionPlan"))
 {
-  DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
+  DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id;
 
 }
 
 int32_t ObjectMissionPlan::id() const
 {
-  return m_missionplan.id();
+  return m_missionplan.id;
 }
 
 int32_t ObjectMissionPlan::participantId() const
 {
-  return m_missionplan.participantId();
+  return m_missionplan.participantId;
 }
 
 Database::PpmMissionPlan ObjectMissionPlan::toDbMissionPlan(const ModifyMissionPlanRequest &mp)
 {
   Database::PpmMissionPlan result;
-  result.id = mp.id();
-  result.name = QString::fromStdString(mp.name());
-  result.missionStart = QDateTime::fromMSecsSinceEpoch(mp.missionStart());
-  result.repeat = mp.repeat();
-  result.jumpToStart = mp.jumpToStart();
-  result.participantId = mp.participantId();
+  result.id = mp.id;
+  result.name = QString::fromStdString(mp.name);
+  result.missionStart = QDateTime::fromMSecsSinceEpoch(mp.missionStart);
+  result.repeat = mp.repeat;
+  result.jumpToStart = mp.jumpToStart;
+  result.participantId = mp.participantId;
 
   return result;
 }
@@ -56,14 +56,14 @@ Database::PpmMissionPlan ObjectMissionPlan::toDbMissionPlan(const ModifyMissionP
 MissionPlan ObjectMissionPlan::fillMissionPlanData(const ModifyMissionPlanRequest &in)
 {
   MissionPlan out;
-  out.id(in.id());
-  out.name(in.name());
-  out.missionStart(in.missionStart());
-  out.properties(in.properties());
-  out.items(in.items());
-  out.participantId(in.participantId());
-  out.jumpToStart(in.jumpToStart());
-  out.repeat(in.repeat());
+  out.id = in.id;
+  out.name = in.name;
+  out.missionStart = in.missionStart;
+  out.properties = in.properties;
+  out.items = in.items;
+  out.participantId = in.participantId;
+  out.jumpToStart = in.jumpToStart;
+  out.repeat = in.repeat;
 
   return out;
 }
@@ -74,7 +74,7 @@ MissionPlan ObjectMissionPlan::getMissionPlanData() const
 }
 
 void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement::Database::PpmMissionItem> &dbItems,
-                                          const QMap<int, Database::PpmMissionAction> &dbActions)
+                                          const QMultiMap<int, Database::PpmMissionAction> &dbActions)
 {
   m_mapMissionItems.clear();
   m_dbMissionActions.clear();
@@ -82,24 +82,24 @@ void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement:
   for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(dbItems))
   {
     ParticipantManagement::MissionItem msi;
-    msi.actions().reserve(dbActions.size());
-    msi.name(item.name.toStdString());
-    msi.location(Core::GeoPosition(item.location.x(), item.location.y(), item.location.z()));
-    msi.itemNumber(item.elementNumber);
+    msi.actions.reserve(dbActions.size());
+    msi.name = item.name.toStdString();
+    msi.location = Core::GeoPosition(item.location.x(), item.location.y(), item.location.z());
+    msi.itemNumber = item.elementNumber;
     std::vector<Database::PpmMissionAction> actionsVec;
     for (const auto &action : dbActions)
     {
       if (action.missionItemId == item.id)
       {
         ParticipantManagement::MissionAction msa;
-        msa.actionType(action.missionActionTypeId);
-        msa.duration(action.duration);
-        msa.fulfilled(action.fulfilled.toMSecsSinceEpoch());
-        msa.properties(action.properties.toStdString());
-        msa.name(action.name.toStdString());
-        msa.actionNumber(action.elementNumber);
-        msa.planId(item.missionPlanId);
-        msi.actions().push_back(msa);
+        msa.actionType = action.missionActionTypeId;
+        msa.duration = action.duration;
+        msa.fulfilled = action.fulfilled.toMSecsSinceEpoch();
+        msa.properties = action.properties.toStdString();
+        msa.name = action.name.toStdString();
+        msa.actionNumber = action.elementNumber;
+        msa.planId = item.missionPlanId;
+        msi.actions.push_back(msa);
         actionsVec.push_back(action);
       }
     }
@@ -140,26 +140,26 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
   {
     Database::PpmMissionItem dbItem;
     dbItem.missionPlanId = newMissionPlan.id;
-    dbItem.name = QString::fromStdString(item.name());
-    dbItem.elementNumber = item.itemNumber();
-    dbItem.location = LtsUtils::QPoint3D(item.location().lon(),item.location().lat(), item.location().z());
+    dbItem.name = QString::fromStdString(item.name);
+    dbItem.elementNumber = item.itemNumber;
+    dbItem.location = LtsUtils::QPoint3D(item.location.lon,item.location.lat, item.location.z);
 
     if (!m_db->insert(dbItem))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Item' to database"));
 
     std::vector<Database::PpmMissionAction> actionsVec;
-    actionsVec.reserve(item.actions().size());
-    for (auto &action : item.actions())
+    actionsVec.reserve(item.actions.size());
+    for (auto &action : item.actions)
     {
-      action.planId(newMissionPlan.id);
+      action.planId = newMissionPlan.id;
       Database::PpmMissionAction dbAction;
-      dbAction.missionActionTypeId = action.actionType();
+      dbAction.missionActionTypeId = action.actionType;
       dbAction.missionItemId = dbItem.id;
-      dbAction.duration = action.duration();
-      dbAction.name = QString::fromStdString(action.name());
-      dbAction.properties = QString::fromStdString(action.properties());
-      dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled());
-      dbAction.elementNumber = action.actionNumber();
+      dbAction.duration = action.duration;
+      dbAction.name = QString::fromStdString(action.name);
+      dbAction.properties = QString::fromStdString(action.properties);
+      dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled);
+      dbAction.elementNumber = action.actionNumber;
       if (!m_db->insert(dbAction))
         return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Action' to database"));
 
@@ -169,21 +169,21 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
     m_dbMissionActions.push_back(actionsVec); // [elNumber][actionNumber]
   }//loop mission items
 
-  m_missionplan.id(newMissionPlan.id);
-  m_missionplan.name(newMissionPlan.name.toStdString());
-  m_missionplan.missionStart(newMissionPlan.missionStart.toMSecsSinceEpoch());
-  m_missionplan.participantId(newMissionPlan.participantId);
-  m_missionplan.jumpToStart(newMissionPlan.jumpToStart);
-  m_missionplan.repeat(newMissionPlan.repeat);
-  m_missionplan.items(itemVec);
-  m_missionplan.fulfilled(0);
-  m_missionplan.itemsFulfilled(0);
+  m_missionplan.id = newMissionPlan.id;
+  m_missionplan.name = newMissionPlan.name.toStdString();
+  m_missionplan.missionStart = newMissionPlan.missionStart.toMSecsSinceEpoch();
+  m_missionplan.participantId = newMissionPlan.participantId;
+  m_missionplan.jumpToStart = newMissionPlan.jumpToStart;
+  m_missionplan.repeat = newMissionPlan.repeat;
+  m_missionplan.items = itemVec;
+  m_missionplan.fulfilled = 0;
+  m_missionplan.itemsFulfilled = 0;
 
-  for (auto &item : m_missionplan.items())
+  for (auto &item : m_missionplan.items)
   {
-    for (auto &action : item.actions())
-      DEBUG_LOG(m_logger)<<"[CREATE] itemIdx: "<<item.itemNumber()
-                         <<" act.Num: "<<action.actionNumber()<<" act.ItemNum: "<<action.itemNumber()<<" itemFul:"<<action.fulfilled();
+    for (auto &action : item.actions)
+      DEBUG_LOG(m_logger)<<"[CREATE] itemIdx: "<<item.itemNumber
+                         <<" act.Num: "<<action.actionNumber<<" act.ItemNum: "<<action.itemNumber<<" itemFul:"<<action.fulfilled;
   }
   trans.commit();
   DEBUG_LOG(m_logger)<< ">> [NEW] mission plan with id( "<<newMissionPlan.id<<" ) inserted !!";
@@ -231,25 +231,25 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
   {
     Database::PpmMissionItem dbItem;
     dbItem.missionPlanId = newMissionPlan.id;
-    dbItem.name = QString::fromStdString(item.name());
-    dbItem.elementNumber = item.itemNumber();
-    dbItem.location = LtsUtils::QPoint3D(item.location().lon(),item.location().lat(), item.location().z());
+    dbItem.name = QString::fromStdString(item.name);
+    dbItem.elementNumber = item.itemNumber;
+    dbItem.location = LtsUtils::QPoint3D(item.location.lon,item.location.lat, item.location.z);
     if (!m_db->insert(dbItem))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Item' to database"));
 
     std::vector<Database::PpmMissionAction> actionsVec;
-    actionsVec.reserve(item.actions().size());
-    for (auto &action : item.actions())
+    actionsVec.reserve(item.actions.size());
+    for (auto &action : item.actions)
     {
-      action.planId(newMissionPlan.id);
+      action.planId = newMissionPlan.id;
       Database::PpmMissionAction dbAction;
-      dbAction.missionActionTypeId = action.actionType();
+      dbAction.missionActionTypeId = action.actionType;
       dbAction.missionItemId = dbItem.id;
-      dbAction.duration = action.duration();
-      dbAction.name = QString::fromStdString(action.name());
-      dbAction.properties = QString::fromStdString(action.properties());
-      dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled());
-      dbAction.elementNumber = action.actionNumber();
+      dbAction.duration = action.duration;
+      dbAction.name = QString::fromStdString(action.name);
+      dbAction.properties = QString::fromStdString(action.properties);
+      dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled);
+      dbAction.elementNumber = action.actionNumber;
       if (!m_db->insert(dbAction))
         return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Action' to database"));
 
@@ -260,19 +260,19 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
   }//loop mission items
 
   trans.commit();
-  m_missionplan.id(newMissionPlan.id);
-  m_missionplan.name(newMissionPlan.name.toStdString());
-  m_missionplan.missionStart(newMissionPlan.missionStart.toMSecsSinceEpoch());
-  m_missionplan.participantId(newMissionPlan.participantId);
-  m_missionplan.jumpToStart(newMissionPlan.jumpToStart);
-  m_missionplan.repeat(newMissionPlan.repeat);
-  m_missionplan.items(itemVec);
-  m_missionplan.itemsFulfilled(0); // on update items and action entries will be cleared
-  m_missionplan.fulfilled(0);
+  m_missionplan.id = newMissionPlan.id;
+  m_missionplan.name = newMissionPlan.name.toStdString();
+  m_missionplan.missionStart = newMissionPlan.missionStart.toMSecsSinceEpoch();
+  m_missionplan.participantId = newMissionPlan.participantId;
+  m_missionplan.jumpToStart = newMissionPlan.jumpToStart;
+  m_missionplan.repeat = newMissionPlan.repeat;
+  m_missionplan.items = itemVec;
+  m_missionplan.itemsFulfilled = 0; // on update items and action entries will be cleared
+  m_missionplan.fulfilled = 0;
 
-  DEBUG_LOG(m_logger)<< ">> [UPDATE] mission plan with id( "<<m_missionplan.id()<<" ) Updated !!";
+  DEBUG_LOG(m_logger)<< ">> [UPDATE] mission plan with id( "<<m_missionplan.id<<" ) Updated !!";
 
-  return Core::FunctionReplyObject(m_missionplan.id());
+  return Core::FunctionReplyObject(m_missionplan.id);
 }
 
 Core::FunctionReplyObject ObjectMissionPlan::removeMissionPlan(int id)
@@ -305,33 +305,33 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
     return Core::FunctionReplyObject("");
   }
 
-  if (req.missionId() != m_missionplan.id())
+  if (req.missionId != m_missionplan.id)
   {
-    QString error = QStringLiteral("Wrong missionPlan Object caught Request: %1 / currPlanId: %2").arg(req.missionId()).arg(m_missionplan.id());
+    QString error = QStringLiteral("Wrong missionPlan Object caught Request: %1 / currPlanId: %2").arg(req.missionId).arg(m_missionplan.id);
     ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
   // Abort in case itemNumb=-1 && actionNumb=-1
-  if (req.actionNumber() < 0 && req.itemNumber() < 0)
+  if (req.actionNumber < 0 && req.itemNumber < 0)
   {
-    m_missionplan.aborted(true);
+    m_missionplan.aborted = true;
     return setMissionPlanAborted(true);
   }
 
-  auto &dbActions  = m_dbMissionActions[req.itemNumber()]; //[elemNum][actionNum]
+  auto &dbActions  = m_dbMissionActions[req.itemNumber]; //[elemNum][actionNum]
 
   if (dbActions.empty()
-      || req.actionNumber() >= static_cast<int>(dbActions.size())
-      || req.actionNumber() < 0
-      || req.itemNumber()   < 0) // actionNumber start by 0
+      || req.actionNumber >= static_cast<int>(dbActions.size())
+      || req.actionNumber < 0
+      || req.itemNumber   < 0) // actionNumber start by 0
   {
-    QString error = QStringLiteral("Could not set mission action with id: %1 ! ").arg(req.actionNumber());
+    QString error = QStringLiteral("Could not set mission action with id: %1 ! ").arg(req.actionNumber);
     ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
-  Database::PpmMissionAction &dbAction = dbActions[req.actionNumber()];
+  Database::PpmMissionAction &dbAction = dbActions[req.actionNumber];
   dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(currentTimeMSec);
 
   if (!m_db->update(dbAction))
@@ -348,11 +348,11 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
   //4- if yes update missioPlan & missionItem fulfilled
 
   MissionItem &msi    = m_mapMissionItems[dbAction.missionItemId];
-  msi.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
-  msi.actionsFulfilled(msi.actionsFulfilled() + 1);
-  MissionAction &msa  = m_mapMissionItems[dbAction.missionItemId].actions()[dbAction.elementNumber];
-  msa.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
-  m_missionplan.items()[req.itemNumber()] = m_mapMissionItems[dbAction.missionItemId]; // item in MissionPlan updated through elementNumber
+  msi.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
+  msi.actionsFulfilled = msi.actionsFulfilled + 1;
+  MissionAction &msa  = m_mapMissionItems[dbAction.missionItemId].actions[dbAction.elementNumber];
+  msa.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
+  m_missionplan.items[req.itemNumber] = m_mapMissionItems[dbAction.missionItemId]; // item in MissionPlan updated through elementNumber
 
   /// update fulfilled time for items and mission plan
   /// update fulfilled items count
@@ -360,27 +360,27 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
   int numbItemFulfilled   = 0;
   for(const auto &item : m_mapMissionItems)
   {
-    if (item.actionsFulfilled() == static_cast<int>(item.actions().size()))
+    if (item.actionsFulfilled == static_cast<int>(item.actions.size()))
       numbItemFulfilled++;
   }
-  m_missionplan.itemsFulfilled(numbItemFulfilled);
-  m_missionplan.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
+  m_missionplan.itemsFulfilled = numbItemFulfilled;
+  m_missionplan.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
 
 
-  return Core::FunctionReplyObject(m_missionplan.id());
+  return Core::FunctionReplyObject(m_missionplan.id);
 }
 
 Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
 {
-  DEBUG_LOG(m_logger)<<" -- [setMissionPlanAborted] abort mission plan: "<<m_missionplan.id();
+  DEBUG_LOG(m_logger)<<" -- [setMissionPlanAborted] abort mission plan: "<<m_missionplan.id;
   Database::PpmMissionPlan dbMissionPlan;
   // m_db->selectPpmMissionPlan(m_missionplan.id(),dbMissionPlan);
-  dbMissionPlan.missionStart = QDateTime::fromMSecsSinceEpoch(m_missionplan.missionStart());
-  dbMissionPlan.jumpToStart = m_missionplan.jumpToStart();
-  dbMissionPlan.id = m_missionplan.id();
-  dbMissionPlan.name = QString::fromStdString(m_missionplan.name());
-  dbMissionPlan.participantId = m_missionplan.participantId();
-  dbMissionPlan.repeat = m_missionplan.repeat();
+  dbMissionPlan.missionStart = QDateTime::fromMSecsSinceEpoch(m_missionplan.missionStart);
+  dbMissionPlan.jumpToStart = m_missionplan.jumpToStart;
+  dbMissionPlan.id = m_missionplan.id;
+  dbMissionPlan.name = QString::fromStdString(m_missionplan.name);
+  dbMissionPlan.participantId = m_missionplan.participantId;
+  dbMissionPlan.repeat = m_missionplan.repeat;
   dbMissionPlan.aborted = state;
 
 
@@ -392,7 +392,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
-  return Core::FunctionReplyObject(m_missionplan.id());
+  return Core::FunctionReplyObject(m_missionplan.id);
 }
 
 } // namespace UasHandling
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
index 02f9580ee..41f132a2c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
@@ -36,7 +36,7 @@ public:
   static MissionPlan fillMissionPlanData(const ModifyMissionPlanRequest &in);
   MissionPlan getMissionPlanData() const;
   void setDbMissionItems( const QMap <int, ParticipantManagement::Database::PpmMissionItem>   &dbItems,
-                          const QMap <int, ParticipantManagement::Database::PpmMissionAction> &dbActions);
+                          const QMultiMap <int, ParticipantManagement::Database::PpmMissionAction> &dbActions);
   const ParticipantManagement::MissionPlan &missionPlan() const;
   Core::FunctionReplyObject createMissionPlan(Database::PpmMissionPlan newMissionPlan, const std::vector<MissionItem> &missionItems);
   Core::FunctionReplyObject updateMissionPlan(Database::PpmMissionPlan newMissionPlan, const std::vector<MissionItem> &missionItems);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp
index a84047326..8678b884b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp
@@ -15,21 +15,21 @@ namespace UasHandling
 
 bool Uas::hasChanges(const CreateModifyUasRequest &request)
 {
-  bool hasChanges = request.deviceIdentifier() != m_data.deviceIdentifier.toStdString() ||
-                    request.participantId() != m_data.participantId ||                    
-                    request.exerciseId() != m_data.exerciseId ||
-                    request.hostname() != m_data.hostname.toStdString() ||
-                    request.hostport() != m_data.hostport ||
-                    request.useTcp() != m_data.useTcp;
+  bool hasChanges = request.deviceIdentifier != m_data.deviceIdentifier.toStdString() ||
+                    request.participantId != m_data.participantId ||                    
+                    request.exerciseId != m_data.exerciseId ||
+                    request.hostname != m_data.hostname.toStdString() ||
+                    request.hostport != m_data.hostport ||
+                    request.useTcp != m_data.useTcp;
 
   if (hasChanges)
   {
-    m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
-    m_data.participantId = request.participantId();    
-    m_data.exerciseId = request.exerciseId();
-    m_data.hostname = QString::fromStdString(request.hostname());
-    m_data.hostport = request.hostport();
-    m_data.useTcp = request.useTcp();
+    m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
+    m_data.participantId = request.participantId;    
+    m_data.exerciseId = request.exerciseId;
+    m_data.hostname = QString::fromStdString(request.hostname);
+    m_data.hostport = request.hostport;
+    m_data.useTcp = request.useTcp;
   }
 
   return hasChanges;
@@ -53,7 +53,7 @@ void Uas::unlinkUas()
 
 void Uas::setState(const ProjectDataManagement::UasState &newState)
 {
-  m_data.uasStateId = newState.underlying();
+  m_data.uasStateId = static_cast<int>(newState);
 }
 int32_t Uas::id() const
 {
@@ -74,15 +74,15 @@ UAS Uas::toDdsUas() const
 {
   ParticipantManagement::UAS result;
 
-  result.id(m_data.id);
-  result.deviceIdentifier(m_data.deviceIdentifier.toStdString());
-  result.uasState(static_cast<ProjectDataManagement::UasState>(m_data.uasStateId));
-  result.participantId(m_data.participantId);  
-  result.exerciseId(m_data.exerciseId);
-  result.hostname(m_data.hostname.toStdString());
-  result.hostport(m_data.hostport);  
-  result.sampleTime(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
-  result.useTcp(m_data.useTcp);
+  result.id = m_data.id;
+  result.deviceIdentifier = m_data.deviceIdentifier.toStdString();
+  result.uasState = static_cast<ProjectDataManagement::UasState>(m_data.uasStateId);
+  result.participantId = m_data.participantId;  
+  result.exerciseId = m_data.exerciseId;
+  result.hostname = m_data.hostname.toStdString();
+  result.hostport = m_data.hostport;  
+  result.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
+  result.useTcp = m_data.useTcp;
 
   return result;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
index 39dd0437d..abcf65986 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
@@ -83,7 +83,7 @@ bool UasHandler::init()
 //------------------------------------------------------------------------------------------
 void UasHandler::onCreateModifyUasRequest(const rti::core::SampleIdentity &cookie, const CreateModifyUasRequest &request)
 {
-  Core::FunctionReplyObject reply = request.id() == 0 ? createUas(request) : modifyUas(request);
+  Core::FunctionReplyObject reply = request.id == 0 ? createUas(request) : modifyUas(request);
 
   m_mainHandler->exAnyFts()->createModifyUasReply(cookie, reply);
 }
@@ -101,18 +101,18 @@ Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
 {
   DEBUG_LOG(m_logger) << "onRemoveUasRequest " << request;
 
-  if (request.id() < 0)
+  if (request.id < 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete an UAS, but no valid UAS id to delete"));
 
-  UasHandling::Uas *uasToDelete = m_uass.value(request.id());
+  UasHandling::Uas *uasToDelete = m_uass.value(request.id);
   if (!uasToDelete)
     return Core::FunctionReplyObject(tr_lts("dds", "Could not delete UAS with id %1, because no UAS with that id exists"))
-        .arg(request.id());
+        .arg(request.id);
 
   if (uasToDelete->participantId() > 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a UAS in use"));
 
-  DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id();
+  DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id;
 
   return removeUas(uasToDelete);
 }
@@ -153,13 +153,13 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
 
   Database::PpmUas dbUas;
 
-  dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
-  dbUas.uasStateId = ProjectDataManagement::UasState::UasState_Undefined;
-  dbUas.participantId = request.participantId();  
-  dbUas.exerciseId = request.exerciseId();
-  dbUas.hostname = QString::fromStdString(request.hostname());
-  dbUas.hostport = request.hostport();
-  dbUas.useTcp = request.useTcp();
+  dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
+  dbUas.uasStateId = static_cast<int>(ProjectDataManagement::UasState::UasState_Undefined);
+  dbUas.participantId = request.participantId;  
+  dbUas.exerciseId = request.exerciseId;
+  dbUas.hostname = QString::fromStdString(request.hostname);
+  dbUas.hostport = request.hostport;
+  dbUas.useTcp = request.useTcp;
 
   if (hostNameHostPortExists(dbUas.hostname, dbUas.hostport, -1))
     return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
@@ -185,21 +185,21 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
 //------------------------------------------------------------------------------------------
 Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &request)
 {
-  if (!m_uass.contains(request.id()))
+  if (!m_uass.contains(request.id))
   {
-    QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id());
+    QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id);
 
     ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
-  Uas *uas = m_uass.value(request.id());
+  Uas *uas = m_uass.value(request.id);
 
   // Check if Hostname and Hostport already existing
-  if (hostNameHostPortExists(QString::fromStdString(request.hostname()), request.hostport(), uas->id()))
+  if (hostNameHostPortExists(QString::fromStdString(request.hostname), request.hostport, uas->id()))
     return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
-        .arg(request.hostname()).arg(request.hostport());
+        .arg(request.hostname).arg(request.hostport);
 
   if (!uas->hasChanges(request))
   {
@@ -248,16 +248,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
 {
   Q_UNUSED(mod)
 
-  if (data.state() != ExerciseManagement::ExerciseState::Stopped &&
-      data.state() != ExerciseManagement::ExerciseState::Terminated &&
-      data.state() != ExerciseManagement::ExerciseState::Unknown  )
+  if (data.state != ExerciseManagement::ExerciseState::Stopped &&
+      data.state != ExerciseManagement::ExerciseState::Terminated &&
+      data.state != ExerciseManagement::ExerciseState::Unknown  )
     return;
 
   //Unlink
   for (auto uas : m_uass)
   {
     auto uasData = uas->toDdsUas();
-    if (uasData.exerciseId() != data.id())
+    if (uasData.exerciseId != data.id)
       continue;
 
     uas->unlinkUas();
@@ -268,16 +268,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
 
 void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnectionStatus &data, DataModification mod)
 {
-  if (data.id() <= 0)
+  if (data.id <= 0)
     return;
-  if (!m_uass.contains(data.id()))
+  if (!m_uass.contains(data.id))
     return;
 
-  auto uas = m_uass.value(data.id());
+  auto uas = m_uass.value(data.id);
   if (mod == DataModification::eRemoved)
     uas->setState(ProjectDataManagement::UasState::UasState_Undefined);
   else
-    uas->setState(data.uasState());
+    uas->setState(data.uasState);
   m_mainHandler->exAnyDts()->publish(uas->toDdsUas());
   m_mainHandler->db()->update(uas->toDbUas());
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/data_manager.cpp
index 225607764..757806446 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/data_manager.cpp
@@ -52,12 +52,12 @@ LtsWebSocket::ReplyMessage *DataManager::ocPositionData(int equipmentNr, const Q
   }
   ParticipantPosition pos = m_ppmDtc->participantPosition(m_ppmDtc->participantIdByEquipmentNumber(equipmentNr));
   QJsonObject obj;
-  obj[QStringLiteral("participantId")]   = pos.participantId();
-  obj[QStringLiteral("lat")]             = pos.pos().lat();
-  obj[QStringLiteral("lon")]             = pos.pos().lon();
-  obj[QStringLiteral("height")]          = pos.pos().z();
-  obj[QStringLiteral("roomId")]           = pos.roomId();
-  obj[QStringLiteral("buildingId")]      = pos.buildingId();
+  obj[QStringLiteral("participantId")]   = pos.participantId;
+  obj[QStringLiteral("lat")]             = pos.pos.lat;
+  obj[QStringLiteral("lon")]             = pos.pos.lon;
+  obj[QStringLiteral("height")]          = pos.pos.z;
+  obj[QStringLiteral("roomId")]           = pos.roomId;
+  obj[QStringLiteral("buildingId")]      = pos.buildingId;
 
   return new ParticipantManagement::WebSocketInterface::Messages::OcPositionData(obj, uuid);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h
index a8c8dcc83..7f69165bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h
@@ -20,36 +20,36 @@ inline Type convert(const PpmType &data)
 {
   Type ddsData;
 
-  ddsData.id(data.id);
-  ddsData.typeClass(data.typeClassId);
-  ddsData.equipmentTypeId(data.equipmentTypeId.isNull() ? 0 : data.equipmentTypeId.toInt());
-  ddsData.name(data.name.toStdString());
-  ddsData.symbol(data.symbol.toStdString());
-  ddsData.radioCount(data.radioCount);
-  ddsData.hierarchyLevel(data.hierarchyLevel);
-  ddsData.isDeleted(data.isDeleted);
+  ddsData.id = data.id;
+  ddsData.typeClass = data.typeClassId;
+  ddsData.equipmentTypeId = data.equipmentTypeId.isNull() ? 0 : data.equipmentTypeId.toInt();
+  ddsData.name = data.name.toStdString();
+  ddsData.symbol = data.symbol.toStdString();
+  ddsData.radioCount = data.radioCount;
+  ddsData.hierarchyLevel = data.hierarchyLevel;
+  ddsData.isDeleted = data.isDeleted;
 #ifdef Q_OS_WIN
-  ddsData.disEntities(data.disEntities());
+  ddsData.disEntities = data.disEntities();
 #else
-  ddsData.disEntities(LtsUtils::convert<std::vector<rti::core::int64>>(data.disEntities()));
+  ddsData.disEntities = data.disEntities();
 #endif
-  ddsData.properties(data.properties.toStdString());
+  ddsData.properties = data.properties.toStdString();
 
   return ddsData;
 }
 inline EquipmentType convert(const PpmEquipmentType &db)
 {
   EquipmentType et;
-  et.id(db.id);
-  et.name(db.name.toStdString());
+  et.id = db.id;
+  et.name = db.name.toStdString();
   { // equipment value are save in the db as int, but in dds unsigned short is used.
-    et.minEquipNo(db.minEquipNo < USHRT_MAX ? db.minEquipNo : USHRT_MAX);
-    et.maxEquipNo(db.maxEquipNo < USHRT_MAX ? db.maxEquipNo : USHRT_MAX);
+    et.minEquipNo = db.minEquipNo < USHRT_MAX ? db.minEquipNo : USHRT_MAX;
+    et.maxEquipNo = db.maxEquipNo < USHRT_MAX ? db.maxEquipNo : USHRT_MAX;
   }
-  et.traVulnerabilityModelId(db.traVulnerabilityModelId);
-  et.traPlayerTypeId(db.traPlayerTypeId);
-  et.wmsTypeClass(db.wmsTypeClassId);
-  et.deletedInWms(db.deletedInWms);
+  et.traVulnerabilityModelId = db.traVulnerabilityModelId;
+  et.traPlayerTypeId = db.traPlayerTypeId;
+  et.wmsTypeClass = db.wmsTypeClassId;
+  et.deletedInWms = db.deletedInWms;
   return et;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
index 5ac930209..30ff24344 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
@@ -40,9 +40,9 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
 //  for (const ParticipantManagement::StateInformation &si : std::as_const(stateList))
 //  {
 //    if (si.originatorId() == 0
-//        && si.originatorType() == ProjectDataManagement::StateChangeOriginator::ExerciseControl
-//        && (si.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill
-//            || si.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady)
+//        && si.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl
+//        && (si.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
+//            || si.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
 //        )
 //      readyToDebug = true;
 //  }
@@ -66,7 +66,7 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
 //      if (readyToDebug)
 //        debug = true;
 
-//      qWarning() << "WARNING: StateInformation with state" << (int)left.vulnerabilityState().underlying() << "has the same stateTime as StateInformation with state" << (int)right.vulnerabilityState().underlying();
+//      qWarning() << "WARNING: StateInformation with state" << (int)left.vulnerabilityState() << "has the same stateTime as StateInformation with state" << (int)right.vulnerabilityState();
 
       // sort by state if time is the same (higher state = winner)
       return (left.vulnerabilityState > right.vulnerabilityState);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
index 25d77d3fe..7288ee1b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
@@ -194,7 +194,7 @@ int DtcImplCustom::participantIdByEquipmentNumber(int equipmentNumber) const
 
   for (const auto &sample : m_dtcParticipant->readAlive())
   {
-    if (sample.data().equipmentNumber.is_set() && sample.data().equipmentNumber.get() == equipmentNumber)
+    if (sample.data().equipmentNumber.has_value() && sample.data().equipmentNumber.get() == equipmentNumber)
       return sample.data().id;
   }
 
@@ -210,7 +210,7 @@ int DtcImplCustom::equipmentNumberByParticipantId(int participantId) const
   {
     if (sample.data().id == participantId)
     {
-      if (sample.data().equipmentNumber.is_set())
+      if (sample.data().equipmentNumber.has_value())
         return sample.data().equipmentNumber.get();
     }
   }
@@ -477,7 +477,7 @@ QVector<TemplateParticipant> DtcImplCustom::inferiorTemplates(int templateId)
   const TemplateParticipant participant = templateParticipant(templateId);
   retVector.append(participant);
 
-  if (participant.inferiorIds.is_set())
+  if (participant.inferiorIds.has_value())
   {
     retVector.reserve(participant.inferiorIds.get().size() + retVector.size());
     for (int inferiorId : participant.inferiorIds.get())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
index f5893e5cd..e6aa20dcc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
@@ -62,11 +62,11 @@ bool WebSocketHandler::init(const QPair<quint16, quint16> &portRange)
 bool WebSocketHandler::sendTelegramInternal(const ParticipantPosition &pos, int eqNo) const
 {
   QJsonObject obj;
-  obj[QStringLiteral("participantId")]   = pos.participantId();
+  obj[QStringLiteral("participantId")]   = pos.participantId;
   obj[QStringLiteral("equipmentNumber")] = eqNo;
-  obj[QStringLiteral("lat")]             = pos.pos().lat();
-  obj[QStringLiteral("lon")]             = pos.pos().lon();
-  obj[QStringLiteral("height")]          = pos.pos().z();
+  obj[QStringLiteral("lat")]             = pos.pos.lat;
+  obj[QStringLiteral("lon")]             = pos.pos.lon;
+  obj[QStringLiteral("height")]          = pos.pos.z;
 
   const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
index e83a6db56..ceb26f686 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
@@ -182,7 +182,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
                         << ", data.pos: " << data.pos;
 
     //TransportInitiated (mounted on vehicle)
-    if (data.mountedOn.is_set())
+    if (data.mountedOn.has_value())
     {
       DEBUG_LOG(m_logger) << "Mounted on : " << data.mountedOn.get();
 
@@ -309,7 +309,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
   // Report Unit Power
   Database::RepUnitPowerData upData;
 
-  if (pData.equipmentNumber.is_set())
+  if (pData.equipmentNumber.has_value())
     upData.equipmentNumber = pData.equipmentNumber.get();
   else
     upData.equipmentNumber = -1;
@@ -491,9 +491,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       DEBUG_LOG(m_logger) << "Found indirect fire from AES id = " << stateInfo.originatorId << ", charge type = " << stateInfo.originatorChargeTypeId;
       if (aesItemView.id > 0)
       {
-        if (aesItemView.partyId.is_set())
+        if (aesItemView.partyId.has_value())
           airSupData.aesPartyId = aesItemView.partyId.get();
-        if (aesItemView.partyId.is_set() && aesItemView.partyId.get() == pData.partyId && vulnState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
+        if (aesItemView.partyId.has_value() && aesItemView.partyId.get() == pData.partyId && vulnState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
         {
           fData.hit = 0;
           fData.hitFriendlyFire = 1;
@@ -590,13 +590,13 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
         AreaEffectSimulation::AesType aesType = aesItemView.aesTypeId;
         DEBUG_LOG(m_logger) << "AesType: " << aesType;
 
-        if (aesItemView.partyId.is_set())
+        if (aesItemView.partyId.has_value())
           mbData.mineAreaPartyId = aesItemView.partyId.get();
         if (mbData.mineAreaPartyId == mbData.partyId)
           mbData.hitFriendlyFire = 1;
 
         // Save only, if vulnerabilityState changed
-        if (checkVulnerabilityStateChange(vulnState, data.participantId)) // TODO: can this check moved out of if (data.stateHistory().at(data.stateHistory().size()-1).originEffectSimulationId().is_set()) ?
+        if (checkVulnerabilityStateChange(vulnState, data.participantId)) // TODO: can this check moved out of if (data.stateHistory().at(data.stateHistory().size()-1).originEffectSimulationId().has_value()) ?
         {
           if (aesType == AreaEffectSimulation::AesType::AtMineArea ||
               aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
@@ -1001,7 +1001,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
   // Report AirSupport
   Database::RepAirSupportData airSupData;
   auto aiv = getAesItemView(data.aesId);
-  if (aiv.partyId.is_set())
+  if (aiv.partyId.has_value())
     airSupData.aesPartyId = aiv.partyId.get();
 
   airSupData.buildingId = data.structureElementId;
@@ -1027,7 +1027,7 @@ void HandlerDynamicParticipantData::onAesEffectsChanged(const AreaEffectSimulati
   impData.aesId = data.aesItemId;
   AreaEffectSimulation::AesItemView aiv = getAesItemView(data.aesItemId);
   impData.chargeTypeId = aiv.chargeStruct.chargeTypeId;
-  if (aiv.partyId.is_set())
+  if (aiv.partyId.has_value())
     impData.partyId = aiv.partyId.get();
   //impData.aesName = getAesName(data.aesItemId());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
index 80ecc468a..e3caade76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
@@ -89,7 +89,7 @@ bool HandlerReportData::generateMaintenanceResult(const CreateModifyReportReques
     qInsert.bindValue(QStringLiteral(":pTypeId"),            vrData.participantTypeId);
     qInsert.bindValue(QStringLiteral(":participantId"),      vrData.participantId);
     qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(vrData.participantId));
-    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
+    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
                         participant.equipmentNumber.get() : 0);
 
     qInsert.bindValue(QStringLiteral(":time_event"),         vrData.time_event);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
index 46b4fe926..d27e66e62 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
@@ -151,7 +151,7 @@ bool HandlerReportData::generateParticipantDistanceResult(const CreateModifyRepo
       qInsert.bindValue(QStringLiteral(":pTypeId"),       typeId);
       qInsert.bindValue(QStringLiteral(":participantId"), partId);
       qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(partId));
-      qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
+      qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
                           participant.equipmentNumber.get() : 0);
 
 //      double dist = static_cast<double>(static_cast<int>(itt.value()*100+0.5))/100.0; // round to 2 decimals
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
index f1196eaf7..351df055b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
@@ -135,7 +135,7 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest
     qInsert.bindValue(QStringLiteral(":pTypeId"),            tData.participantTypeId);
     qInsert.bindValue(QStringLiteral(":participantId"),      tData.participantId);
     qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(tData.participantId));
-    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
+    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
                         participant.equipmentNumber.get() : 0);
     qInsert.bindValue(QStringLiteral(":vitality"),           tData.vitality);
     qInsert.bindValue(QStringLiteral(":vulnerability"),      tData.vulnerability);
@@ -187,9 +187,9 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest
     DEBUG_LOG(m_logger) << "Initial Time enter area = " << tData.time_enter_area;
     DEBUG_LOG(m_logger) << "Initial Time 9 liner = " << tData.time_nine_liner;
 
-    //if (tData.time_treatment > 0 && participant.equipmentNumber.is_set())
+    //if (tData.time_treatment > 0 && participant.equipmentNumber.has_value())
     // get FunctionalArea for participants with vulnerabilityState > 0, too
-    if (participant.equipmentNumber.is_set())
+    if (participant.equipmentNumber.has_value())
     {
       // re-calculate time enter in Functional Area
       QPair<int, qint64> fa = getNextFunctionalAreaEntry(participant.equipmentNumber.get(), tData.time_vulnerability);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
index 6d8f43302..ef8c4b1d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
@@ -110,7 +110,7 @@ bool HandlerReportData::generateTreatmentTimelineResult(const CreateModifyReport
     qInsert.bindValue(QStringLiteral(":pTypeId"),            tData.participantTypeId);
     qInsert.bindValue(QStringLiteral(":participantId"),      tData.participantId);
     qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(tData.participantId));
-    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
+    qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
                         participant.equipmentNumber.get() : 0);
     qInsert.bindValue(QStringLiteral(":vitality"),           tData.vitality);
     qInsert.bindValue(QStringLiteral(":vulnerability"),      tData.vulnerability);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.cpp
index deb997c4e..dfd48be93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.cpp
@@ -54,7 +54,7 @@ ServicePortsInformationMessage::ServicePortsInformationMessage(const QVector<Exe
     QJsonObject obj({{EXERCISE_ID(), exercise.exerciseId},
                      {SERVICES(), services}
                     });
-    if (exercise.replayPartitionId.is_set())
+    if (exercise.replayPartitionId.has_value())
       obj.insert(REPLAY_PARTITION_ID(), exercise.replayPartitionId.get());
 
     exercises.append(obj);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
index 1cf90a505..15f8db4ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
@@ -51,7 +51,7 @@ LtsWebSocket::ReplyMessage *DataManager::servicesInformation(const QString &uuid
 
     for (ServiceProcess *service : serviceProcs)
     {
-      if (service->ports().is_set())
+      if (service->ports().has_value())
       {
         ServicePortsInformationMessage::ServiceInformation serviceInfo;
         serviceInfo.name = service->serviceName();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
index e821ac303..ec8668eae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
@@ -252,7 +252,7 @@ void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::Cur
   m_ports = data.ports;
 
   std::string es;
-  if (data.errorString.is_set())
+  if (data.errorString.has_value())
     es = data.errorString.get();
 
   ServiceInformation info(m_serviceProcessId,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
index 77eea6c49..d0e1df4e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
@@ -87,7 +87,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
   newData.replayPartitionId = m_partitionId;
   newData.beginTime         = request.beginTime;
   newData.endTime           = request.endTime;
-  newData.pace              = request.pace.is_set() ? request.pace.get() : 1;
+  newData.pace              = request.pace.has_value() ? request.pace.get() : 1;
 
   // round to sec
   newData.beginTime = (newData.beginTime / 1000) * 1000;
@@ -132,13 +132,13 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
       return Core::FunctionReplyObject(request.id,tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id).arg(m_objSrp->getId());
   }
 
-  if (request.pace.is_set())
+  if (request.pace.has_value())
     m_objSrp->setPace(request.pace.get());
 
   switch (request.state)
   {
   case SrpState::Unknown:
-    if (request.pace.is_set())
+    if (request.pace.has_value())
       return Core::FunctionReplyObject(request.id);
     return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not handle command 'Unknown' in changeReplayStateRequest"));
   case SrpState::Started:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
index 3e616ad06..eb2ff7c60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
@@ -170,11 +170,11 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr<Infrastr
       // DEDÖÖM we need rooms and floors and every thing else!
       //if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
       //  continue;
-      mseDds.elements().push_back(InfrastructureManagement::Database::convert(se));
-      seId2mseId[se.id] = mseDds.id();
+      mseDds.elements.push_back(InfrastructureManagement::Database::convert(se));
+      seId2mseId[se.id] = mseDds.id;
      // break;
     }
-    if (mseDds.elements().size() > 0)
+    if (mseDds.elements.size() > 0)
       m_ismMainStructureElement->write(mseDds);
   }
 
@@ -198,18 +198,18 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr<Infrastr
     if (!mainStructureElementId)
       continue;
 
-    mf.id(mainStructureElementId);
-    mf.structureElementId(structureElementId);
-    mf.name(mainStructureElements.value(mainStructureElementId).name.toStdString());
-    mf.elements().clear();
-    mf.elements().reserve(cont.size());
+    mf.id = mainStructureElementId;
+    mf.structureElementId = structureElementId;
+    mf.name = mainStructureElements.value(mainStructureElementId).name.toStdString();
+    mf.elements.clear();
+    mf.elements.reserve(cont.size());
     for (const auto &pos : cont)
     {
-      elem.id(pos.id);
-      elem.relPosition(Core::RelativePosition(pos.relPosition.x(),
+      elem.id = pos.id;
+      elem.relPosition = Core::RelativePosition(pos.relPosition.x(),
                                               pos.relPosition.y(),
-                                              pos.relPosition.z()));
-      mf.elements().push_back(elem);
+                                              pos.relPosition.z());
+      mf.elements.push_back(elem);
     }
     m_ismMainFootprint->write(mf);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp
index dabf97ab4..b47006ab6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp
@@ -84,7 +84,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   {
     auto cb = [this](const ParticipantManagement::Participant & participant)
     {
-      if (participant.equipmentNumber.is_set())
+      if (participant.equipmentNumber.has_value())
       {
         m_partId2EquipNoMap.insert(participant.id, participant.equipmentNumber.get());
         m_equipNo2partIdMap.insert(participant.equipmentNumber.get(), participant.id);
@@ -127,8 +127,8 @@ void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &
     m_partId2EquipNoMap.remove(data.id);
   else
   {
-    m_partId2EquipNoMap[data.id] = data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0;
-    if (data.equipmentNumber.is_set())
+    m_partId2EquipNoMap[data.id] = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
+    if (data.equipmentNumber.has_value())
       m_equipNo2partIdMap.insert(data.equipmentNumber.get(), data.id);
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.cpp
index 38434731f..f0121fb0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.cpp
@@ -93,11 +93,11 @@ Core::FunctionReplyObject HandlerShootbackArea::shootbackAreaModifyRequest(const
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   // modify
-  if (request.id() > 0)
+  if (request.id > 0)
   {
-    ObjectShootbackArea *ifs = m_objectMap.value(request.id());
+    ObjectShootbackArea *ifs = m_objectMap.value(request.id);
     if (!ifs)
-      return Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id());
+      return Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id);
     return ifs->updateObject(request);
   }
   // create
@@ -121,11 +121,11 @@ void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleI
   TRACE_LOG(m_logger)  << LOGFUNCTION << " request=" << request;
 
   Core::FunctionReplyObject ret;
-  ObjectShootbackArea *ifs = m_objectMap.value(request.id());
+  ObjectShootbackArea *ifs = m_objectMap.value(request.id);
 
   if (ifs == nullptr)
   {
-    ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id());
+    ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id);
     m_mainHandler->dds()->ftsTgt()->shootbackAreaRemoveReply(cookie, ret);
     return;
   }
@@ -155,14 +155,14 @@ void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleI
   {
     // delete Object
     delete ifs;
-    m_objectMap.remove(request.id());
+    m_objectMap.remove(request.id);
   }
 
   m_mainHandler->dds()->ftsTgt()->shootbackAreaRemoveReply(cookie, ret);
 
   // For ShootbackController
   if (!ret.error())
-    emit objectChanged(request.id(), true);
+    emit objectChanged(request.id, true);
 
   return;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp
index 417ccd7e8..2587c6ed4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.cpp
@@ -106,16 +106,16 @@ Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(c
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   // modify
-  if (request.id() > 0)
+  if (request.id > 0)
   {
-    ObjectShootbackTarget *ifs = m_objectMap.value(request.id());
+    ObjectShootbackTarget *ifs = m_objectMap.value(request.id);
     if (!ifs)
-      return Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id());
+      return Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id);
 
     // since the attribute 'visibleParticipants' is *not* part of the db,
     // ignore request.visibleParticipants and use the value of the current memory:
     ShootbackTarget copy = request;
-    copy.visibleParticipants(ifs->getData().visibleParticipants());
+    copy.visibleParticipants = ifs->getData().visibleParticipants;
     return ifs->updateObject(copy);
   }
   // create
@@ -139,11 +139,11 @@ void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::Sam
   TRACE_LOG(m_logger)  << LOGFUNCTION << " request=" << request;
 
   Core::FunctionReplyObject ret;
-  ObjectShootbackTarget *ifs = m_objectMap.value(request.id());
+  ObjectShootbackTarget *ifs = m_objectMap.value(request.id);
 
   if (ifs == nullptr)
   {
-    ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id());
+    ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackTarget with id %1 not found")).arg(request.id);
     m_mainHandler->dds()->ftsTgt()->shootbackTargetRemoveReply(cookie, ret);
     return;
   }
@@ -172,14 +172,14 @@ void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::Sam
   {
     // delete Object
     delete ifs;
-    m_objectMap.remove(request.id());
+    m_objectMap.remove(request.id);
   }
 
   m_mainHandler->dds()->ftsTgt()->shootbackTargetRemoveReply(cookie, ret);
 
   // For ShootbackController
   if (!ret.error())
-    emit objectChanged(request.id(), true);
+    emit objectChanged(request.id, true);
 
   return;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp
index 259e42d76..da359ac0f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.cpp
@@ -69,7 +69,7 @@ bool HandlerTargetAreaAssignment::init()
 bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId)
 {
   for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap))
-    if (sample && (sample->getData().areaId() == areaId))
+    if (sample && (sample->getData().areaId == areaId))
       return true;
   return false;
 }
@@ -77,7 +77,7 @@ bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId)
 bool HandlerTargetAreaAssignment::isTargetDataIdUsedInAny(int targetDataId)
 {
   for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap))
-    if (sample && (sample->getData().targetParticipantId() == targetDataId))
+    if (sample && (sample->getData().targetParticipantId == targetDataId))
       return true;
   return false;
 }
@@ -100,11 +100,11 @@ Core::FunctionReplyObject HandlerTargetAreaAssignment::TargetAreaAssignmentModif
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   // modify
-  if (request.id() > 0)
+  if (request.id > 0)
   {
-    ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id());
+    ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id);
     if (!ifs)
-      return Core::FunctionReplyObject(request.id(), tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id());
+      return Core::FunctionReplyObject(request.id, tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id);
     return ifs->updateObject(request);
   }
   // create
@@ -128,11 +128,11 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti:
   TRACE_LOG(m_logger)  << LOGFUNCTION << " request=" << request;
 
   Core::FunctionReplyObject ret;
-  ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id());
+  ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id);
 
   if (ifs == nullptr)
   {
-    ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id());
+    ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id);
     m_mainHandler->dds()->ftsTgt()->targetAreaAssignmentRemoveReply(cookie, ret);
     return;
   }
@@ -152,14 +152,14 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti:
   {
     // delete Object
     delete ifs;
-    m_objectMap.remove(request.id());
+    m_objectMap.remove(request.id);
   }
 
   m_mainHandler->dds()->ftsTgt()->targetAreaAssignmentRemoveReply(cookie, ret);
 
   // For ShootbackController
   if (!ret.error())
-    emit objectChanged(request.id(), true);
+    emit objectChanged(request.id, true);
 
   return;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp
index 48456983f..683618beb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp
@@ -81,7 +81,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   tgt.equipmentNumber = m_ddsHandler->participantId2EquipNo(participantId);
   tgt.participantId = request.participantId;
 
-  tgt.payload.push_back(request.tgtCommand);
+  tgt.payload.push_back(static_cast<unsigned char>(request.tgtCommand));
 
   switch (request.tgtCommand)
   {
@@ -100,18 +100,18 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   }
   case TargetManagement::TgtCommand::SetMode:
   {
-    if (!request.mode.is_set())
+    if (!request.mode.has_value())
     {
       ERROR_LOG(m_logger) << "Set mode requested, but mode ist not set";
       m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Set mode requested, but mode is not set")));
       return;
     }
-    tgt.payload.push_back(request.mode.get());
+    tgt.payload.push_back(static_cast<unsigned char>(request.mode.get()));
     break;
   }
   case TargetManagement::TgtCommand::SetWeapon:
   {
-    if (!request.weapon.is_set())
+    if (!request.weapon.has_value())
     {
       ERROR_LOG(m_logger) << "Set weapon requested, but weapon ist not set";
       m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Set weapon requested, but weapon is not set")));
@@ -122,7 +122,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   }
   case TargetManagement::TgtCommand::SetParameter:
   {
-    if (!request.parameterSet.is_set())
+    if (!request.parameterSet.has_value())
     {
       ERROR_LOG(m_logger) << "Set parameterset requested, but parameterset ist not set";
       m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId, tr_lts("dds", "Set parameterset requested, but parameterset is not set")));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.cpp
index 479d472cc..58901fe79 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.cpp
@@ -26,20 +26,20 @@ ObjectShootbackArea::~ObjectShootbackArea()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isValid())
-    m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id());
+    m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id);
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
 //------------------------------------------------------------------------------
 bool ObjectShootbackArea::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
 bool ObjectShootbackArea::isUsed() const
 {
-  return m_data.isUsed();
+  return m_data.isUsed;
 }
 
 //------------------------------------------------------------------------------
@@ -48,24 +48,24 @@ Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   m_data = data;
 
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
   {
-    m_data.isUsed(false);
+    m_data.isUsed = false;
 
     Database::TgtShootbackArea dbData(toDbData(data));
 
     if (!m_mainHandler->db()->insert(dbData))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackArea-data into database"));
 
-    m_data.id(dbData.id);
-    DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << m_data.id();
+    m_data.id = dbData.id;
+    DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << m_data.id;
   }
 
   // Publish Data via DTS
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -73,36 +73,36 @@ Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (!isValid())
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
 
   Database::TgtShootbackArea dbData;
   dbData = toDbData(data);
 
   if (!m_mainHandler->db()->update(dbData))
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackArea-data into database"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating ShootbackArea-data into database"));
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for ShootbackAreaId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for ShootbackAreaId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackArea::setUsed(bool isUsed)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed ShootbackArea object"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed ShootbackArea object"));
 
-  m_data.isUsed(isUsed);
+  m_data.isUsed = isUsed;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -110,22 +110,22 @@ Core::FunctionReplyObject ObjectShootbackArea::removeObject()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isUsed())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea still in use"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea still in use"));
 
-  if (!m_mainHandler->db()->removeTgtShootbackArea(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removeTgtShootbackArea(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea with id %1 can not be removed from DDS")).arg(m_data.id);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 void ObjectShootbackArea::onPublishData()
 {
-  TRACE_LOG(m_logger) << "Publish ShootbackArea-data to dds (" << m_data.id() << ") ...";
+  TRACE_LOG(m_logger) << "Publish ShootbackArea-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing ShootbackArea-data to dds";
@@ -140,11 +140,11 @@ Database::TgtShootbackArea ObjectShootbackArea::toDbData(const ShootbackArea &dd
 {
   Database::TgtShootbackArea dbData;
 
-  dbData.id           = ddsData.id();
-  dbData.name         = QString::fromStdString(ddsData.name());
-  dbData.position     = QPointF(ddsData.position().lon(), ddsData.position().lat());
-  dbData.width        = ddsData.width();
-  dbData.height       = ddsData.height();
+  dbData.id           = ddsData.id;
+  dbData.name         = QString::fromStdString(ddsData.name);
+  dbData.position     = QPointF(ddsData.position.lon, ddsData.position.lat);
+  dbData.width        = ddsData.width;
+  dbData.height       = ddsData.height;
 
   return dbData;
 }
@@ -155,15 +155,15 @@ ShootbackArea ObjectShootbackArea::toDdsData(const Database::TgtShootbackArea &d
 {
   ShootbackArea ddsData;
 
-  ddsData.id(dbData.id);
-  ddsData.name(dbData.name.toStdString());
-  ddsData.position(Core::GeoPosition2D(dbData.position.x(), dbData.position.y()));
-  ddsData.width(dbData.width);
-  ddsData.height(dbData.height);
+  ddsData.id = dbData.id;
+  ddsData.name = dbData.name.toStdString();
+  ddsData.position = Core::GeoPosition2D(dbData.position.x(), dbData.position.y());
+  ddsData.width = dbData.width;
+  ddsData.height = dbData.height;
 
   // init data not in db
-  ddsData.isDeleted(false);
-  ddsData.isUsed(false);
+  ddsData.isDeleted = false;
+  ddsData.isUsed = false;
 
   return ddsData;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h
index bd7c071c6..17d281595 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h
@@ -35,8 +35,8 @@ public:
   Core::FunctionReplyObject updateObject(const ShootbackArea &data);
   Core::FunctionReplyObject removeObject();
 
-  qint32 getId() const { return m_data.id(); }
-  QString getName() const { return QString::fromStdString(m_data.name()); }
+  qint32 getId() const { return m_data.id; }
+  QString getName() const { return QString::fromStdString(m_data.name); }
   const ShootbackArea &getData() const { return m_data; }
 
   bool isValid() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.cpp
index 27dbb68a2..b1a364249 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.cpp
@@ -26,20 +26,20 @@ ObjectShootbackTarget::~ObjectShootbackTarget()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isValid())
-    m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id());
+    m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id);
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
 //------------------------------------------------------------------------------
 bool ObjectShootbackTarget::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
 bool ObjectShootbackTarget::isUsed() const
 {
-  return m_data.isUsed();
+  return m_data.isUsed;
 }
 
 //------------------------------------------------------------------------------
@@ -48,33 +48,33 @@ Core::FunctionReplyObject ObjectShootbackTarget::createObject(const ShootbackTar
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   m_data = data;
 
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
   {
-    m_data.isUsed(false);
+    m_data.isUsed = false;
 
     Database::TgtShootbackTarget dbData(toDbData(data));
 
     if (!m_mainHandler->db()->insert(dbData))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackTarget-data into database"));
 
-    m_data.id(dbData.id);
-    DEBUG_LOG(m_logger) << "New TgtShootbackTarget: " << m_data.id();
+    m_data.id = dbData.id;
+    DEBUG_LOG(m_logger) << "New TgtShootbackTarget: " << m_data.id;
   }
 
   // Publish Data via DTS
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTarget &data)
 {
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START, id=" << data.id()
-                      << " size =" << data.visibleParticipants().size();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, id=" << data.id
+                      << " size =" << data.visibleParticipants.size();
   if (!isValid())
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
 
   Database::TgtShootbackTarget dbData;
   dbData = toDbData(data);
@@ -82,32 +82,32 @@ Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTar
   if (isDifferent(dbData))
   {
     if (!m_mainHandler->db()->update(dbData))
-      return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackTarget-data into database"));
+      return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating ShootbackTarget-data into database"));
   }
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for ShootbackTargetId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for ShootbackTargetId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id()
-                      << " size =" << data.visibleParticipants().size();
-  return Core::FunctionReplyObject(m_data.id());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id
+                      << " size =" << data.visibleParticipants.size();
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackTarget::setUsed(bool isUsed)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed ShootbackTarget object"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed ShootbackTarget object"));
 
-  m_data.isUsed(isUsed);
+  m_data.isUsed = isUsed;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -115,21 +115,21 @@ Core::FunctionReplyObject ObjectShootbackTarget::removeObject()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isUsed())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget still in use"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget still in use"));
 
-  if (!m_mainHandler->db()->removeTgtShootbackTarget(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removeTgtShootbackTarget(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DDS")).arg(m_data.id);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 void ObjectShootbackTarget::updateVolatileData(const std::vector<int32_t> &visibleParticipant)
 {
-  m_data.visibleParticipants(visibleParticipant);
+  m_data.visibleParticipants = visibleParticipant;
 
   // Publish Data via DTS
   onPublishData();
@@ -137,7 +137,7 @@ void ObjectShootbackTarget::updateVolatileData(const std::vector<int32_t> &visib
 
 void ObjectShootbackTarget::updateVolatileData(const Core::GeoPosition &position)
 {
-  m_data.position(position);
+  m_data.position = position;
 
   // Publish Data via DTS
   onPublishData();
@@ -146,7 +146,7 @@ void ObjectShootbackTarget::updateVolatileData(const Core::GeoPosition &position
 //------------------------------------------------------------------------------
 void ObjectShootbackTarget::onPublishData()
 {
-  TRACE_LOG(m_logger) << "Publish ShootbackTarget-data to dds (" << m_data.id() << ") ...";
+  TRACE_LOG(m_logger) << "Publish ShootbackTarget-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing ShootbackTarget-data to dds";
@@ -161,15 +161,15 @@ Database::TgtShootbackTarget ObjectShootbackTarget::toDbData(const ShootbackTarg
 {
   Database::TgtShootbackTarget dbData;
 
-  dbData.id                   = ddsData.id();
-  dbData.targetParticipantId  = ddsData.targetParticipantId();
-  dbData.name                 = QString::fromStdString(ddsData.name());
+  dbData.id                   = ddsData.id;
+  dbData.targetParticipantId  = ddsData.targetParticipantId;
+  dbData.name                 = QString::fromStdString(ddsData.name);
 
-  dbData.activateLaserDesignation = ddsData.activateLaserDesignation();
-  dbData.activateLights           = ddsData.activateLights();
-  dbData.activatePopupAutomatic   = ddsData.activatePopupAutomatic();
-  dbData.hitsToKill               = ddsData.hitsToKill();
-  dbData.permanentInstalledTarget = ddsData.permanentInstalledTarget();
+  dbData.activateLaserDesignation = ddsData.activateLaserDesignation;
+  dbData.activateLights           = ddsData.activateLights;
+  dbData.activatePopupAutomatic   = ddsData.activatePopupAutomatic;
+  dbData.hitsToKill               = ddsData.hitsToKill;
+  dbData.permanentInstalledTarget = ddsData.permanentInstalledTarget;
 
   return dbData;
 }
@@ -180,19 +180,19 @@ ShootbackTarget ObjectShootbackTarget::toDdsData(const Database::TgtShootbackTar
 {
   ShootbackTarget ddsData;
 
-  ddsData.id(dbData.id);
-  ddsData.targetParticipantId(dbData.targetParticipantId);
-  ddsData.name(dbData.name.toStdString());
+  ddsData.id = dbData.id;
+  ddsData.targetParticipantId = dbData.targetParticipantId;
+  ddsData.name = dbData.name.toStdString();
 
-  ddsData.activateLaserDesignation(dbData.activateLaserDesignation);
-  ddsData.activateLights(dbData.activateLights);
-  ddsData.activatePopupAutomatic(dbData.activatePopupAutomatic);
-  ddsData.hitsToKill(dbData.hitsToKill);
-  ddsData.permanentInstalledTarget(dbData.permanentInstalledTarget);
+  ddsData.activateLaserDesignation = dbData.activateLaserDesignation;
+  ddsData.activateLights = dbData.activateLights;
+  ddsData.activatePopupAutomatic = dbData.activatePopupAutomatic;
+  ddsData.hitsToKill = dbData.hitsToKill;
+  ddsData.permanentInstalledTarget = dbData.permanentInstalledTarget;
 
   // init data not in db
-  ddsData.isDeleted(false);
-  ddsData.isUsed(false);
+  ddsData.isDeleted = false;
+  ddsData.isUsed = false;
 
   return ddsData;
 }
@@ -200,15 +200,15 @@ ShootbackTarget ObjectShootbackTarget::toDdsData(const Database::TgtShootbackTar
 bool ObjectShootbackTarget::isDifferent(const Database::TgtShootbackTarget &dbData)
 {
   return (
-        dbData.id != m_data.id() ||
-      dbData.targetParticipantId != m_data.targetParticipantId() ||
-      dbData.name.toStdString() != m_data.name() ||
+        dbData.id != m_data.id ||
+      dbData.targetParticipantId != m_data.targetParticipantId ||
+      dbData.name.toStdString() != m_data.name ||
 
-      dbData.activateLaserDesignation != m_data.activateLaserDesignation() ||
-      dbData.activateLights != m_data.activateLights() ||
-      dbData.activatePopupAutomatic != m_data.activatePopupAutomatic() ||
-      dbData.hitsToKill != m_data.hitsToKill() ||
-      dbData.permanentInstalledTarget != m_data.permanentInstalledTarget()
+      dbData.activateLaserDesignation != m_data.activateLaserDesignation ||
+      dbData.activateLights != m_data.activateLights ||
+      dbData.activatePopupAutomatic != m_data.activatePopupAutomatic ||
+      dbData.hitsToKill != m_data.hitsToKill ||
+      dbData.permanentInstalledTarget != m_data.permanentInstalledTarget
       );
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h
index 09397dc63..4562afadb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h
@@ -39,9 +39,9 @@ public:
   void updateVolatileData(const Core::GeoPosition &position);
 
 
-  qint32 getId() const { return m_data.id(); }
-  QString getName() const { return QString::fromStdString(m_data.name()); }
-  qint32 getTargetParticipantId() const { return m_data.targetParticipantId(); }
+  qint32 getId() const { return m_data.id; }
+  QString getName() const { return QString::fromStdString(m_data.name); }
+  qint32 getTargetParticipantId() const { return m_data.targetParticipantId; }
   const ShootbackTarget &getData() const { return m_data; }
 
   bool isValid() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.cpp
index d72861186..20c2fdf9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.cpp
@@ -26,20 +26,20 @@ ObjectTargetAreaAssignment::~ObjectTargetAreaAssignment()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isValid())
-    m_mainHandler->dds()->dtsTgt()->removeTargetAreaAssignmentByKey(m_data.id());
+    m_mainHandler->dds()->dtsTgt()->removeTargetAreaAssignmentByKey(m_data.id);
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }
 
 //------------------------------------------------------------------------------
 bool ObjectTargetAreaAssignment::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
 bool ObjectTargetAreaAssignment::isUsed() const
 {
-  return m_data.isUsed();
+  return m_data.isUsed;
 }
 
 //------------------------------------------------------------------------------
@@ -48,9 +48,9 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::createObject(const TargetA
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   m_data = data;
 
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
   {
-    m_data.isUsed(false);
+    m_data.isUsed = false;
 
     Database::TgtTargetAreaAssignment dbData(toDbData(data));
 
@@ -59,20 +59,20 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::createObject(const TargetA
       QString errText = m_mainHandler->db()->getLastError().nativeErrorCode();
       ERROR_LOG(m_logger) << "Error inserting TargetAreaAssignment into database: " << m_mainHandler->db()->getLastError().text();
       if (errText.contains(QStringLiteral("23505")))
-        return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetAreaAssignment into database: unique key violation for '%1'")).arg(m_data.name());
+        return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetAreaAssignment into database: unique key violation for '%1'")).arg(m_data.name);
       else
-        return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetAreaAssignment with name %1 into database: %2")).arg(m_data.name()).arg(errText);
+        return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetAreaAssignment with name %1 into database: %2")).arg(m_data.name).arg(errText);
     }
 
-    m_data.id(dbData.id);
-    DEBUG_LOG(m_logger) << "New TgtTargetAreaAssignment: " << m_data.id();
+    m_data.id = dbData.id;
+    DEBUG_LOG(m_logger) << "New TgtTargetAreaAssignment: " << m_data.id;
   }
 
   // Publish Data via DTS
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -80,36 +80,36 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::updateObject(const TargetA
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (!isValid())
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
 
   Database::TgtTargetAreaAssignment dbData;
   dbData = toDbData(data);
 
   if (!m_mainHandler->db()->update(dbData))
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating TargetAreaAssignment-data into database"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating TargetAreaAssignment-data into database"));
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for TargetAreaAssignmentId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for TargetAreaAssignmentId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetAreaAssignment::setUsed(bool isUsed)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed TargetAreaAssignment object"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed TargetAreaAssignment object"));
 
-  m_data.isUsed(isUsed);
+  m_data.isUsed = isUsed;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
@@ -117,22 +117,22 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::removeObject()
 {
   TRACE_LOG(m_logger) << LOGFUNCTION << " START";
   if (isUsed())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetAreaAssignment still in use"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TargetAreaAssignment still in use"));
 
-  if (!m_mainHandler->db()->removeTgtTargetAreaAssignment(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetAreaAssignment with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removeTgtTargetAreaAssignment(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TargetAreaAssignment with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dds()->dtsTgt()->removeTargetAreaAssignmentByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetAreaAssignment with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dds()->dtsTgt()->removeTargetAreaAssignmentByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TargetAreaAssignment with id %1 can not be removed from DDS")).arg(m_data.id);
 
   TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 void ObjectTargetAreaAssignment::onPublishData()
 {
-  TRACE_LOG(m_logger) << "Publish TargetAreaAssignment-data to dds (" << m_data.id() << ") ...";
+  TRACE_LOG(m_logger) << "Publish TargetAreaAssignment-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing TargetAreaAssignment-data to dds";
@@ -147,19 +147,19 @@ Database::TgtTargetAreaAssignment ObjectTargetAreaAssignment::toDbData(const Tar
 {
   Database::TgtTargetAreaAssignment dbData;
 
-  dbData.id           = ddsData.id();
-  dbData.name         = QString::fromStdString(ddsData.name());
-  dbData.areaId       = ddsData.areaId();
-  dbData.targetParticipantId = ddsData.targetParticipantId();
-  dbData.isActive     = ddsData.isActive();
+  dbData.id           = ddsData.id;
+  dbData.name         = QString::fromStdString(ddsData.name);
+  dbData.areaId       = ddsData.areaId;
+  dbData.targetParticipantId = ddsData.targetParticipantId;
+  dbData.isActive     = ddsData.isActive;
 
-  dbData.interval1    = ddsData.configuration().interval1();
-  dbData.effect1      = ddsData.configuration().effect1();
-  dbData.flash1       = ddsData.configuration().flash1();
+  dbData.interval1    = ddsData.configuration.interval1;
+  dbData.effect1      = ddsData.configuration.effect1;
+  dbData.flash1       = ddsData.configuration.flash1;
 
-  dbData.interval2    = ddsData.configuration().interval2();
-  dbData.effect2      = ddsData.configuration().effect2();
-  dbData.flash2       = ddsData.configuration().flash2();
+  dbData.interval2    = ddsData.configuration.interval2;
+  dbData.effect2      = ddsData.configuration.effect2;
+  dbData.flash2       = ddsData.configuration.flash2;
 
   return dbData;
 }
@@ -170,24 +170,24 @@ TargetAreaAssignment ObjectTargetAreaAssignment::toDdsData(const Database::TgtTa
 {
   TargetAreaAssignment ddsData;
 
-  ddsData.id(dbData.id);
-  ddsData.name(dbData.name.toStdString());
-  ddsData.areaId(dbData.areaId);
-  ddsData.targetParticipantId(dbData.targetParticipantId);
-  ddsData.isActive(dbData.isActive);
+  ddsData.id = dbData.id;
+  ddsData.name = dbData.name.toStdString();
+  ddsData.areaId = dbData.areaId;
+  ddsData.targetParticipantId = dbData.targetParticipantId;
+  ddsData.isActive = dbData.isActive;
 
   ShootbackConfiguration conf;
-  conf.interval1(dbData.interval1);
-  conf.effect1(dbData.effect1);
-  conf.flash1(dbData.flash1);
-  conf.interval2(dbData.interval2);
-  conf.effect2(dbData.effect2);
-  conf.flash2(dbData.flash2);
-  ddsData.configuration(conf);
+  conf.interval1 = dbData.interval1;
+  conf.effect1 = dbData.effect1;
+  conf.flash1 = dbData.flash1;
+  conf.interval2 = dbData.interval2;
+  conf.effect2 = dbData.effect2;
+  conf.flash2 = dbData.flash2;
+  ddsData.configuration = conf;
 
   // init data not in db
-  ddsData.isDeleted(false);
-  ddsData.isUsed(false);
+  ddsData.isDeleted = false;
+  ddsData.isUsed = false;
 
   return ddsData;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h
index 4251788b7..9abd5ab2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h
@@ -35,8 +35,8 @@ public:
   Core::FunctionReplyObject updateObject(const TargetAreaAssignment &data);
   Core::FunctionReplyObject removeObject();
 
-  qint32 getId() const { return m_data.id(); }
-  QString getName() const { return QString::fromStdString(m_data.name()); }
+  qint32 getId() const { return m_data.id; }
+  QString getName() const { return QString::fromStdString(m_data.name); }
   const TargetAreaAssignment &getData() const { return m_data; }
 
   bool isValid() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
index 37a4d704e..d4cb50e2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
@@ -245,7 +245,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
     return;
   }
 
-  const int participantId = posData.participantId();
+  const int participantId = posData.participantId;
 
   bool bIsTarget = false;
   if (isTarget(participantId, bIsTarget) && bIsTarget)
@@ -258,7 +258,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
       ERROR_LOG(m_logger) << LOGFUNCTION << " ObjectShootbackTarget not found for participantId=" << participantId;
       return;
     }
-    osbTarget->updateVolatileData(posData.pos());
+    osbTarget->updateVolatileData(posData.pos);
   }
 
   INFO_LOG(m_logger) << LOGFUNCTION << " participantId=" << participantId << ", isTarget=" << bIsTarget;
@@ -310,9 +310,9 @@ bool ShootbackController::participantPositionTopicIsValid(const ParticipantManag
   // (!LtsUtils::isPositionTimeOutdated(ddsHandler->currentPartitionTime(), sampleTime)) &&
   // participantTypeId                                   // maybe check: typeId -> typeClassId...
 
-  return ((posData.participantId() > 0) &&
-          (posData.partyId() >= 2)      &&                           // 0->POOLS ; 1 -> O/C Service ; 2 RED...
-          (!LtsUtils::isPositionTimeOutdated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(), posData.sampleTime()))
+  return ((posData.participantId > 0) &&
+          (posData.partyId >= 2)      &&                           // 0->POOLS ; 1 -> O/C Service ; 2 RED...
+          (!LtsUtils::isPositionTimeOutdated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(), posData.sampleTime))
          );
 }
 
@@ -328,20 +328,20 @@ bool ShootbackController::isTarget(qint32 participantId, bool &bIsTarget) const
   }
 
   const ParticipantManagement::Participant &participant = dtcPpm->participant(participantId);
-  if (participant.id() != participantId)
+  if (participant.id != participantId)
     return false;
 
-  const int typeId = participant.typeId();
+  const int typeId = participant.typeId;
   const ParticipantManagement::Type &type = dtcPpm->type(typeId);
-  if (type.id() != typeId)
+  if (type.id != typeId)
     return false;
 
-  const int equipmentTypeId = type.equipmentTypeId();
+  const int equipmentTypeId = type.equipmentTypeId;
   const ParticipantManagement::EquipmentType &eqType = dtcPpm->equipmentType(equipmentTypeId);
-  if (eqType.id() != equipmentTypeId)
+  if (eqType.id != equipmentTypeId)
     return false;
 
-  switch (eqType.wmsTypeClass().underlying())
+  switch (eqType.wmsTypeClass)
   {
   case ParticipantManagement::WmsTypeClass::None:
   case ParticipantManagement::WmsTypeClass::Building:
@@ -366,7 +366,7 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
                                                             const ParticipantManagement::ParticipantPosition &posData)
 {
   const int areaId = area.getId();
-  const int participantId = posData.participantId();
+  const int participantId = posData.participantId;
 
   bool contains = areaContainsPosition(area, posData);
 
@@ -378,7 +378,7 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
   DEBUG_LOG(m_logger) << LOGFUNCTION << " "
                       << " shootbackAreaId=" << areaId
                       << " shootbackAreaName=" << area.getName()
-                      << " area.position=" << area.getData().position()
+                      << " area.position=" << area.getData().position
                       << " participantId=" << participantId
                       << " ParticipantPosition=" << posData
                       << " contains=" << contains
@@ -406,15 +406,15 @@ bool ShootbackController::areaContainsPosition(const TargetManagement::ObjectSho
 {
   const ShootbackArea &sbArea = area.getData();
   const LtsCoordTrans::UtmCoordinate &utmCoordCenter =
-    LtsCoordTrans::UtmCoordinate::fromGeographic(sbArea.position().lon(), sbArea.position().lat());
+    LtsCoordTrans::UtmCoordinate::fromGeographic(sbArea.position.lon, sbArea.position.lat);
 
-  double xMin = utmCoordCenter.x - (sbArea.width() / 2.0);
-  double xMax = utmCoordCenter.x + (sbArea.width() / 2.0);
-  double yMin = utmCoordCenter.y - (sbArea.height() / 2.0);
-  double yMax = utmCoordCenter.y + (sbArea.height() / 2.0);
+  double xMin = utmCoordCenter.x - (sbArea.width / 2.0);
+  double xMax = utmCoordCenter.x + (sbArea.width / 2.0);
+  double yMin = utmCoordCenter.y - (sbArea.height / 2.0);
+  double yMax = utmCoordCenter.y + (sbArea.height / 2.0);
 
   const LtsCoordTrans::UtmCoordinate &utmCoordParticipant =
-    LtsCoordTrans::UtmCoordinate::fromGeographic(posData.pos().lon(), posData.pos().lat());
+    LtsCoordTrans::UtmCoordinate::fromGeographic(posData.pos.lon, posData.pos.lat);
 
   if (
     (xMin <= utmCoordParticipant.x) && (utmCoordParticipant.x <= xMax) &&
@@ -464,7 +464,7 @@ QSet<int> ShootbackController::assignmentsWithTargetParticipantId(qint32 targetP
     if (!targetAreaAssignment)
       continue;
 
-    if (targetAreaAssignment->getData().targetParticipantId() == targetParticipantId)
+    if (targetAreaAssignment->getData().targetParticipantId == targetParticipantId)
       ret += targetAreaAssignment->getId();
   } // for
 
@@ -513,7 +513,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     const TargetAreaAssignment &assignmentData = assignment->getData();
 
     // 2. check changingAreaIds
-    const int areaId = assignmentData.areaId();
+    const int areaId = assignmentData.areaId;
     if (!idIsRelevantHelper(changingAreaIds, areaId))
     {
       DEBUG_LOG(m_logger) << LOGFUNCTION << " continue, curAssignment " << assignment->getId();
@@ -521,7 +521,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     }
 
     // 3. check changingTartgetIds
-    const int targetParticpantId = assignmentData.targetParticipantId();
+    const int targetParticpantId = assignmentData.targetParticipantId;
     const int targetDataId = m_handlerShootbackTarget->targetDataIdForTargetParticipantId(targetParticpantId);
     if (!idIsRelevantHelper(changingTartgetIds, targetDataId))
     {
@@ -572,8 +572,8 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
 
 
   const TargetAreaAssignment &assignmentData = assignment->getData();
-  const int areaId       = assignmentData.areaId();
-  const int targetParticipantId = assignmentData.targetParticipantId();
+  const int areaId       = assignmentData.areaId;
+  const int targetParticipantId = assignmentData.targetParticipantId;
 
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START, assignmentId=" << assignmentId
                       << ", areaId = " << areaId
@@ -612,18 +612,18 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
 
       // 1 targetGeoPos
       ShootbackTarget sbTarget = target->getData();
-      const Core::GeoPosition &sbTargetGeoPos = sbTarget.position();
+      const Core::GeoPosition &sbTargetGeoPos = sbTarget.position;
 
       // 2 participantId -> geoPos:
       const ParticipantManagement::ParticipantPosition &participantPos =
         m_mainHandler->dds()->dtcPpm()->participantPosition(participantId);
 
-      if (participantPos.participantId() != participantId)
+      if (participantPos.participantId != participantId)
       {
         ERROR_LOG(m_logger) << LOGFUNCTION << " no position for participantId=" << participantId;
         return false;
       }
-      const Core::GeoPosition &participantGeoPos = participantPos.pos();
+      const Core::GeoPosition &participantGeoPos = participantPos.pos;
 
       bool visi = lineOfSight(sbTargetGeoPos, participantGeoPos);
       DEBUG_LOG(m_logger) << LOGFUNCTION << " current targetId = " << target->getId() << " visi = " << visi;
@@ -687,11 +687,11 @@ void ShootbackController::syncExternal()
 
 
     const ShootbackTarget &sbTarget = target->getData();
-    if (visiPartPerTargetStd != sbTarget.visibleParticipants())
+    if (visiPartPerTargetStd != sbTarget.visibleParticipants)
     {
       // data has changed
       INFO_LOG(m_logger) << LOGFUNCTION << " targetId differ -> updateObject..";
-      INFO_LOG(m_logger) << LOGFUNCTION << " visiOld =" << toString(sbTarget.visibleParticipants());
+      INFO_LOG(m_logger) << LOGFUNCTION << " visiOld =" << toString(sbTarget.visibleParticipants);
       INFO_LOG(m_logger) << LOGFUNCTION << " visiNew =" << toString(visiPartPerTargetStd);
       target->updateVolatileData(visiPartPerTargetStd);     // update and publish
     }
@@ -713,8 +713,8 @@ bool ShootbackController::lineOfSight(const Core::GeoPosition &observerPos, cons
     return false;
   }
 
-  SituationMap::ObserverTargetData observerTarget(Point3D(observerPos.lon(), observerPos.lat(), observerPos.z() + 2.0), // 2.0m als Augenhöhe
-                                                  Point3D(targetPos.lon(), targetPos.lat(), observerPos.z() + 2.0)      // 2.0m als Augenhöhe
+  SituationMap::ObserverTargetData observerTarget(Point3D(observerPos.lon, observerPos.lat, observerPos.z + 2.0), // 2.0m als Augenhöhe
+                                                  Point3D(targetPos.lon, targetPos.lat, observerPos.z + 2.0)      // 2.0m als Augenhöhe
                                                  );
 
   bool success = m_losCalculation->calculate(observerTarget);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
index f97b61345..3f617efc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
@@ -90,7 +90,7 @@ void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::P
 {
   INFO_LOG(m_logger) << "onParticipantChanged() participantId:" << data.id;
 
-  if (modType != DataModification::eRemoved && data.equipmentNumber.is_set())
+  if (modType != DataModification::eRemoved && data.equipmentNumber.has_value())
     m_partId2EquipNoMap.insert(data.id, data.equipmentNumber.get());
   else
     m_partId2EquipNoMap.remove(data.id);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp
index 0e22e75d1..01d983aab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp
@@ -20,7 +20,7 @@ Server::Server()
   : QObject(nullptr)
   , m_server(new QWebSocketServer(QString(), QWebSocketServer::NonSecureMode, this))
 {
-  QRandomGenerator::global()->seed();
+  // (legacy: qsrand(time(nullptr));) — Qt6's QRandomGenerator::global() is auto-seeded; ->seed() on the global aborts in Qt 6.10.
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/custom_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/custom_widget.cpp
index 8f8512ade..4ac9bcc15 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/custom_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/custom_widget.cpp
@@ -19,14 +19,14 @@ CustomWidget::~CustomWidget()
 
 void CustomWidget::onPositionChanged(const Core::GeoPosition &position, int participantId)
 {
-  if (participantId == 0 || std::isnan(position.lon()) || std::isnan(position.lat()))
+  if (participantId == 0 || std::isnan(position.lon) || std::isnan(position.lat))
     m_ui->lblPos->setText(tr("Invalid Position"));
   else
   {
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
 
-    if (!qFuzzyIsNull(position.z()))
-      mgrs += QStringLiteral(" | ") + QString::number(position.z(), 'f', 2);
+    if (!qFuzzyIsNull(position.z))
+      mgrs += QStringLiteral(" | ") + QString::number(position.z, 'f', 2);
 
     m_ui->lblPos->setText(mgrs);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/gui_element_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/gui_element_plugin.cpp
index 7dbb5429b..0ecaf6d79 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/gui_element_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/gui_element_plugin.cpp
@@ -26,9 +26,9 @@ QWidget *GuiElementPlugin::createGuiElement(QWidget *parent)
   connect(m_customWidget, &CustomWidget::finOnMapClicked, this, &GuiElementPlugin::onFindOnMap);
   connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged,
           m_customWidget, [=](const ParticipantManagement::ParticipantPosition &ppPos){
-        m_customWidget->onPositionChanged(ppPos.pos(), m_participantId);
+        m_customWidget->onPositionChanged(ppPos.pos, m_participantId);
   }, Qt::UniqueConnection);
-  m_customWidget->onPositionChanged(m_ppmDtc->participantPosition(m_participantId).pos(), m_participantId);
+  m_customWidget->onPositionChanged(m_ppmDtc->participantPosition(m_participantId).pos, m_participantId);
   return m_customWidget;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/main_handler.cpp
index 4a0efda72..dfae56c7d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/main_handler.cpp
@@ -30,7 +30,8 @@ ParticipantDataGenerator::MainHandler::MainHandler(QObject *parent)
   , m_participantCreationTimer(new QElapsedTimer())
   , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PDG.MainHandler"))
 {
-  QRandomGenerator::global()->seed(QDateTime::currentMSecsSinceEpoch());
+  // (legacy: qsrand(QDateTime::currentMSecsSinceEpoch());) — Qt6's QRandomGenerator::global() is
+  // auto-seeded non-deterministically; ->seed() on the global/system generator aborts in Qt 6.10.
 }
 
 ParticipantDataGenerator::MainHandler::~MainHandler()
@@ -269,7 +270,7 @@ ParticipantManagement::Type ParticipantDataGenerator::MainHandler::randomType()
 
 int32_t ParticipantDataGenerator::MainHandler::randomSuperiorModId(int32_t upperBound)
 {
-  QRandomGenerator::global()->seed(QDateTime::currentMSecsSinceEpoch());
+  // (legacy: qsrand(...) re-seeded per call) — Qt6 global generator is auto-seeded; ->seed() aborts in Qt 6.10.
   auto ret = QRandomGenerator::global()->bounded(upperBound + 1);
   return ret == 0 ? ret + 1 : ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/CMakeLists.txt
index c25fac07c..9a82c07cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/Test/CMakeLists.txt
@@ -37,6 +37,11 @@ NGL_TARGET_INCLUDE_DIRECTORIES(test_qledline
 NGL_WRAP_UI(test_qledline_SRCS ${test_qledline_UICS})
 
 NGL_ADD_EXECUTABLE(WS NO_TRANSLATION test_qledline ${test_qledline_SRCS} ${test_qledline_HDRS} ${test_qledline_UICS})
+# The .ui files live in the ui/ subdir. The explicit NGL_WRAP_UI (qt6_wrap_ui) above
+# processes them with their ui/ paths; Qt6's strict AUTOUIC auto-scan instead looks for
+# the bare basenames in the source root and fails. Disable the auto-scan (explicit wrap
+# still generates the ui_*.h headers).
+set_target_properties(test_qledline PROPERTIES AUTOUIC OFF)
 
 NGL_TARGET_LINK_LIBRARIES(test_qledline
   qledline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/TopicDiscover/topic_discoverer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/TopicDiscover/topic_discoverer.cpp
index 0c945d491..7d14d0e47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/TopicDiscover/topic_discoverer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/TopicDiscover/topic_discoverer.cpp
@@ -39,7 +39,7 @@ void BuiltinAnyListener::on_data_available(dds::sub::DataReader<S> &reader)
       continue;
 
     dds::core::optional<dds::core::xtypes::DynamicType> dynamicType = sampleIt->data()->type();
-    if (!dynamicType.is_set() || dynamicType.get().kind() != dds::core::xtypes::TypeKind::STRUCTURE_TYPE)
+    if (!dynamicType.has_value() || dynamicType.get().kind() != dds::core::xtypes::TypeKind::STRUCTURE_TYPE)
       continue;
 
     const dds::core::xtypes::StructType &structType = static_cast<dds::core::xtypes::StructType&>(dynamicType.get());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp
index 5e9badb4f..124325894 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp
@@ -5,6 +5,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 #include <QtCore/QElapsedTimer>
+#include <QtCore/QRandomGenerator>
 #include "proxy_emulator.h"
 
 #include <QtCore/QTimer>
@@ -90,10 +91,11 @@ void VulnerabilityStateGenerator::MainHandler::quit()
 
 ProjectDataManagement::VulnerabilityState VulnerabilityStateGenerator::MainHandler::randomVulnerabilityState()
 {
-  qsrand(QDateTime::currentMSecsSinceEpoch());
+  // (legacy: qsrand(QDateTime::currentMSecsSinceEpoch()); re-seeded per call) — Qt6's QRandomGenerator::global()
+  // is auto-seeded; ->seed() on the global/system generator aborts in Qt 6.10.
   unsigned int index = 0;
   if (m_vsMap.size() > 0)
-    index = qrand() % m_vsMap.size();
+    index = QRandomGenerator::global()->bounded(m_vsMap.size());
 
 
   return m_vsMap.value(index);
@@ -104,23 +106,23 @@ void VulnerabilityStateGenerator::MainHandler::setNewState()
 {
   for (auto it = m_partMap.begin(); it != m_partMap.end(); ++it)
   {
-    if (it.value().m_equipmentNumber().is_set() && it.value().m_equipmentNumber().get() > 0)
+    if (it.value().equipmentNumber.has_value() && it.value().equipmentNumber.value() > 0)
       m_proxyEmulator->publishNewState(randomVulnerabilityState(), it.value());
   }
 }
 
 void VulnerabilityStateGenerator::MainHandler::fillMapFromEnum()
 {
-  m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::CombatReady);
-  m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::LightDamage);
-  m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::MediumDamage);
-  m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::HeavyDamage);
-  m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::MobilityKill);
-  m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
-  m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
-  m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
-  m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::CatastrophicKill);
-  m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::TemporarySeverance);
-  m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::NearMiss);
-  m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::HitWithNoEffect);
+  m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
+  m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
+  m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage);
+  m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage);
+  m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill);
+  m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill);
+  m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage);
+  m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage);
+  m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
+  m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance);
+  m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss);
+  m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp
index 68503be38..d7949e13b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp
@@ -46,14 +46,14 @@ void VulnerabilityStateGenerator::ProxyEmulator::giveInitState(const QMap<qint32
   {
     const ParticipantManagement::Participant &currentParticipant = it.value();
 
-    if (currentParticipant.m_equipmentNumber().is_set())
+    if (currentParticipant.equipmentNumber.has_value())
     {
       ++participantsWithEquipmentNumber;
       TrainingAreaBase::EquipmentState state;
 
-      state.m_equipmentNumber(currentParticipant.m_equipmentNumber().get());
-      state.sampleTime(QDateTime::currentMSecsSinceEpoch());
-      state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
+      state.equipmentNumber = currentParticipant.equipmentNumber.value();
+      state.sampleTime = QDateTime::currentMSecsSinceEpoch();
+      state.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 
       m_tabDts->publish(state);
     }
@@ -76,11 +76,11 @@ void VulnerabilityStateGenerator::ProxyEmulator::publishNewState(ProjectDataMana
 {
   TrainingAreaBase::EquipmentState state;
 
-  state.m_equipmentNumber(participant.m_equipmentNumber().get());
-  state.sampleTime(QDateTime::currentMSecsSinceEpoch());
-  state.vulnerabilityState(newState);
+  state.equipmentNumber = participant.equipmentNumber.value();
+  state.sampleTime = QDateTime::currentMSecsSinceEpoch();
+  state.vulnerabilityState = newState;
 
-  DEBUG_LOG(m_logger) << "participantId: " << participant.m_id() << ", state: " << newState << ", equipNo: " << participant.m_equipmentNumber().get();
+  DEBUG_LOG(m_logger) << "participantId: " << participant.id << ", state: " << newState << ", equipNo: " << participant.equipmentNumber.value();
   m_tabDts->publish(state);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.cpp
index a6f52a2fd..05da38343 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.cpp
@@ -53,7 +53,12 @@ void LtsColumnsSettingWidget::onResetClicked()
  */
 void LtsColumnsSettingWidget::onApplyClicked()
 {
-  QVector<LtsDataView::ColumnOrganiserInfo> colInfoVec;
+  // Unqualified: we are already inside namespace LtsDataView, and the unity build
+  // concatenates lts_data_view.cpp (which declares class LtsDataView in this same
+  // namespace) into this TU, so "LtsDataView::ColumnOrganiserInfo" would resolve to
+  // the class (which has no such member) instead of the namespace. Matches the
+  // unqualified ColumnOrganiserInfo used everywhere else in this file.
+  QVector<ColumnOrganiserInfo> colInfoVec;
   const int rowCount = m_ui->tableView->model()->rowCount();
   colInfoVec.reserve(rowCount);
   for(int row = 0; row < rowCount; ++row)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.h
index f853fa708..71b5b7685 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.h
@@ -78,5 +78,5 @@ protected:
 } // namespace
 
 // -------------------------------------------------------------------------------------
-Q_DECLARE_METATYPE(FileManagement::Folder)
+#include <FileManagement/flm_qmetatypes.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog.h
index 6be592f56..545e9e773 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <FileManagement/flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog_widget.h
index ab3bcc540..be4cf422f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog_widget.h
@@ -13,7 +13,7 @@
 #include "lts_file_dialog.h"
 
 #include <LtsFileDialog/ltsfiledialog_export.h>
-#include <FileManagement/flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_dtc.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsReportDisplay/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsReportDisplay/CMakeLists.txt
index 9fb4055cc..0785fc2f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsReportDisplay/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsReportDisplay/CMakeLists.txt
@@ -16,8 +16,11 @@ endif()
 
 
 FIND_PACKAGE(KDReports)
-IF (NOT KDReports_FOUND OR NOT BUILD_CODIFICATION)
-  MESSAGE(WARNING "KDReports not found or BUILD_CODIFICATION disabled; skipping LtsReportDisplay")
+# Decoupled from BUILD_CODIFICATION: ltswidgetsplugin.cpp unconditionally includes
+# <LtsReportDisplay/lts_report_display_widget.h> (legacy-identical), so the LtsReportDisplay
+# export header must be generated whenever KDReports is available.
+IF (NOT KDReports_FOUND)
+  MESSAGE(WARNING "KDReports not found; skipping LtsReportDisplay")
   RETURN()
 ENDIF()
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/CMakeLists.txt
new file mode 100755
index 000000000..d856f41bb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/CMakeLists.txt
@@ -0,0 +1,15 @@
+#
+# @RDE_HEADER@
+# Small hack to provide the missing smybol to 'typeinfo for std::bad_array_new_length@Qt_5'
+# $Id$
+# $HeadURL$
+# $Author$
+#
+
+IF(UNIX)
+  NGL_ADD_LIBRARY(WS SV AAR ArcGISQt5Hack SHARED arcgisqt5hack.cpp arcgisqt5hack.version) # SV,AAR for CES - expand polygon
+  NGL_TARGET_LINK_LIBRARIES(ArcGISQt5Hack PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/arcgisqt5hack.version")
+ELSE()
+  NGL_ADD_LIBRARY(WS SV AAR ArcGISQt5Hack STATIC arcgisqt5hack.cpp) # SV,AAR for CES - expand polygon
+ENDIF()
+NGL_INSTALL_TARGET(ArcGISQt5Hack)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.cpp
new file mode 100755
index 000000000..5d0c7516e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.cpp
@@ -0,0 +1,21 @@
+/**
+ * @RDE_HEADER@
+ * Small hack to provide the missing smybol to 'typeinfo for std::bad_array_new_length@Qt_5'
+ * $Id$
+ * $HeadURL$
+ * $Author$
+ */
+#ifdef WIN32
+__declspec(dllexport) int foo42(int) { return 42;} // just a dummy to get windows build running
+#else
+#include <new>
+
+extern "C++"
+{
+__attribute__((visibility("default"))) void operator delete(void* ptr, std::size_t) noexcept
+{
+  ::operator delete(ptr);
+}
+}
+
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.version b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.version
new file mode 100755
index 000000000..069dfeeca
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ArcGISQt5Hack/arcgisqt5hack.version
@@ -0,0 +1,3 @@
+Qt_5 {
+ *;
+};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/CMakeLists.txt
index 60b39164a..9d7a9410b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/CMakeLists.txt
@@ -1,36 +1,556 @@
 #
 # $Id$
+# $HeadURL$
 # $Author$
 #
-# Minimal CMakeLists.txt for Qt6 migration - only Symbology subdirectory
-# Full migration pending
+# Qt6 + ArcGIS 300 migration.
+#
+# The full situationMap map-layer target is restored here from the legacy
+# CMakeLists (Map / MapImpl / MapObjects / GraphicalObjects / LayerAggregation
+# / Rubberbands / Utils / MathUtils source groups), adapted Qt5->Qt6 and gated
+# on BUILD_ARCGIS to match the migrated Symbology convention: the top-level
+# CMakeLists does FIND_PACKAGE(ArcGIS REQUIRED) under IF(BUILD_ARCGIS), so
+# ArcGIS::ArcGIS only exists there. The subdir targets that are themselves
+# ArcGIS-dependent (MapObjectsImpl / FunctionDialog / Portal / SymbologyGui)
+# gate their own library on BUILD_ARCGIS; the non-ArcGIS subdirs (Common,
+# ElevationMap, Symbology, SymbologyXML, ArcGISQt5Hack, SideBar, GeometryModel)
+# build unconditionally.
+#
+# The unit-test subdirs (Tests / EvalApps / UnitTests / UnitTestsGeoModel /
+# ModuleTests) and the test-only situationMap_static variant are intentionally
+# not restored: they are not linked by the app and are not needed for the
+# Situation view to load.
 
-# Only migrate Symbology for now
+# During development: (instead top CMakeLists.txt"
+IF(NOT MSVC)
+  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wextra")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+ENDIF()
+OPTION(BUILD_SITMAP_UNIT_TESTS "Build situation map unit tests" ON)
+
+
+SET(GraphicalObjects_SRCS
+  GraphicalObjects/abstract_graphical_object.cpp
+  GraphicalObjects/ellipse_parameters.cpp
+  GraphicalObjects/graphical_object_attributes.h
+  GraphicalObjects/graphical_object_attributes.cpp
+  GraphicalObjects/graphical_object_ellipse.cpp
+  GraphicalObjects/graphical_object_multi_path.cpp
+  GraphicalObjects/graphical_object_path.cpp
+  GraphicalObjects/graphical_object_picture_marker.cpp
+  GraphicalObjects/graphical_object_range.cpp
+  GraphicalObjects/graphical_object_text.cpp
+  GraphicalObjects/tactical_appearance.cpp
+  GraphicalObjects/graphical_object_cube.cpp
+
+  GraphicalObjects/graphical_object_scene_marker.cpp
+  GraphicalObjects/graphical_object_model_scene_marker.cpp
+  GraphicalObjects/graphical_object_renderer_attributes.cpp
+)
+SET(GraphicalObjects_HDRS
+  GraphicalObjects/abstract_graphical_object.h
+  GraphicalObjects/ellipse_parameters.h
+  GraphicalObjects/graphical_object_ellipse.h
+  GraphicalObjects/graphical_object_multi_path.h
+  GraphicalObjects/graphical_object_picture_marker.h
+  GraphicalObjects/graphical_object_path.h
+  GraphicalObjects/graphical_object_range.h
+  GraphicalObjects/graphical_object_text.h
+  GraphicalObjects/stub_graphical_object.h
+  GraphicalObjects/tactical_appearance.h
+  GraphicalObjects/graphical_object_cube.h
+
+  GraphicalObjects/graphical_object_scene_marker.h
+  GraphicalObjects/graphical_object_model_scene_marker.h
+  GraphicalObjects/graphical_object_renderer_attributes.cpp
+)
+
+QT6_ADD_RESOURCES(GraphicalObjects_SRCS Resources/situation_map.qrc)
+
+SET(Map_SRCS
+  Map/bounding_box.cpp
+  Map/fill_style.cpp
+  Map/line_style.cpp
+  Map/map.cpp
+  Map/map_notifier.cpp
+  Map/map_settings.cpp
+  Map/map_initializer.cpp
+  Map/object_container.cpp
+  Map/object_factory.cpp
+  Map/operator_map_settings.cpp
+#  Map/point3D.cpp
+  Map/party_id_to_color_functor.cpp
+#  Map/scene_marker_data.cpp
+  Map/situation_map_utils.cpp
+  Map/terrain_profile_parameter.cpp
+  Map/text_style.cpp
+  Map/geometry_model_renderer.cpp
+  Map/viewshed_parameter.cpp
+)
+
+SET(Map_HDRS
+  Map/situation_map_ahtc.ini
+  Map/situation_map_defaults.ini
+  Map/situation_map_guez.ini
+  Map/situation_map_qatar.ini
+  Map/situation_map_guez_tablet.ini
+  Map/situation_map_ahtc_tablet.ini
+  Map/abstract_effect_simulation.h
+  Map/abstract_map_object.h
+  Map/bounding_box.h
+  Map/camera.h
+  Map/camera.cpp
+  Map/coord_translation_functor.h
+#  Map/drop_event_manager.h
+  Map/fill_style.h
+  Map/generic_object_factory.h
+  Map/grid.h
+  Map/map.h
+  Map/map_notifier.h
+  Map/map_settings.h
+  Map/map_initializer.h
+  Map/measurement.h
+  Map/layer_factory.h
+  Map/layer_parameter.h
+  Map/layer_parameter.cpp
+  Map/location_display.h
+  Map/line_style.h
+  Map/object_container.h
+  Map/object_factory.h
+  Map/object_indicator.h
+  Map/operator_map_settings.h
+  Map/overview_map_handler.h
+  Map/party_id_to_color_functor.h
+  Map/pixel_based_textbox_handler.h
+  Map/point3D.h
+#  Map/scene_marker_data.cpp
+  Map/sidc_symbol.h
+  Map/sight_fan.h
+  Map/situation_map_utils.h
+  Map/situation_map_types.h
+  Map/terrain_profile_parameter.h
+  Map/terrain_profile.h
+  Map/text_style.h
+  Map/viewpoint2D.h
+  Map/viewpoint2D.cpp
+  Map/viewshed_parameter.h
+  Map/viewshed.h
+  Map/camera.h
+  Map/camera.cpp
+
+  Map/overlay_handler.h
+  Map/geometry_model_renderer.h
+)
+
+SET(MapImpl_SRCS
+  MapImpl/abstract_effect_simulation_impl.cpp
+  MapImpl/abstract_effect_simulation_impl.h
+  MapImpl/abstract_map_object_impl.cpp
+  MapImpl/abstract_map_object_impl.h
+  MapImpl/coordinate_translation.cpp
+  MapImpl/coordinate_translation_thread.cpp
+  MapImpl/grid_impl.cpp
+  MapImpl/jump_point_model.cpp
+  MapImpl/jump_point_custom_view.cpp
+  MapImpl/jump_point_widget.cpp
+  MapImpl/logical_layer.cpp
+  MapImpl/layer_factory_impl.cpp
+  MapImpl/layer_control_widget.cpp
+  MapImpl/screen_location_elevation_helper_base.cpp
+  MapImpl/location_display_impl.cpp
+  MapImpl/location_to_elevation_helper.cpp
+  MapImpl/location_to_elevation_bulk.cpp
+  MapImpl/map_impl.cpp
+  MapImpl/map_layer.cpp
+  MapImpl/measurement_impl.cpp
+  MapImpl/object_container_impl.cpp
+  MapImpl/object_indicator_impl.cpp
+  MapImpl/overview_map_handler_impl.cpp
+  MapImpl/pixel_based_textbox_handler_impl.cpp
+  MapImpl/screen_to_location_helper.cpp
+  MapImpl/sidc_symbol_impl.cpp
+  MapImpl/sight_fan_impl.cpp
+  MapImpl/terrain_profile_impl.cpp
+  MapImpl/terrain_profile_processor.cpp
+#  MapImpl/tms_layer.cpp
+  MapImpl/viewshed_base.cpp
+  MapImpl/viewshed_analysis.cpp
+  MapImpl/viewshed_geo_processing.cpp
+  MapImpl/viewshed_base.cpp
+  MapImpl/viewshed_impl.cpp
+  MapImpl/jump_point_namer.cpp
+
+
+  MapImpl/geometry_model_renderer_esri.cpp
+  MapImpl/overlay_handler_impl.cpp
+)
+
+SET(MapImpl_HDRS
+  MapImpl/abstract_effect_simulation_impl.h
+  MapImpl/abstract_map_object_impl.h
+  MapImpl/coordinate_translation.h
+  MapImpl/coordinate_translation_thread.h
+  MapImpl/coord_translation_functor_impl.h
+  MapImpl/geometry_model_renderer_esri.h
+  MapImpl/grid_impl.cpp
+  MapImpl/grid_impl.h
+  MapImpl/jump_point_model.h
+  MapImpl/jump_point_custom_view.h
+  MapImpl/jump_point_widget.h
+  MapImpl/logical_layer.h
+  MapImpl/layer_control_widget.h
+  MapImpl/layer_factory_impl.h
+  MapImpl/screen_location_elevation_helper_base.h
+  MapImpl/location_display_impl.h
+  MapImpl/location_to_elevation_helper.h
+  MapImpl/location_to_elevation_bulk.h
+  MapImpl/map_impl.h
+  MapImpl/map_layer.h
+  MapImpl/measurement_impl.h
+  MapImpl/object_container_impl.h
+  MapImpl/object_indicator_impl.h
+  MapImpl/overview_map_handler_impl.h
+  MapImpl/overlay_handler_impl.h
+  MapImpl/pixel_based_textbox_handler_impl.h
+  MapImpl/screen_to_location_helper.h
+  MapImpl/sidc_symbol_impl.h
+  MapImpl/sight_fan_impl.h
+  MapImpl/terrain_profile_impl.h
+  MapImpl/terrain_profile_processor.h
+#  MapImpl/tms_layer.h
+  MapImpl/viewshed_base.h
+  MapImpl/viewshed_analysis.h
+  MapImpl/viewshed_geo_processing.h
+  MapImpl/viewshed_impl.h
+  MapImpl/jump_point_namer.h
+)
+
+
+
+SET(MapObj_SRCS
+  MapObjects/geometry.cpp
+)
+
+SET(MapObj_HDRS
+  MapObjects/abstract_multi_point_map_object.h
+  MapObjects/abstract_single_point_map_object.h
+  MapObjects/air_support.h
+  MapObjects/area_fire.h
+  MapObjects/biological_agent.h
+  MapObjects/building_outline.h
+  MapObjects/chemical_agent.h
+  MapObjects/cube.h
+  MapObjects/danger_area.h
+  MapObjects/functional_area.h
+  MapObjects/geo_image.h
+  MapObjects/geometry.h
+  MapObjects/hit_line.h
+  MapObjects/line_of_sight.h
+  MapObjects/map_object_attributes.h
+  MapObjects/map_object_indicator.h
+  MapObjects/mine.h
+  MapObjects/mine_field.h
+  MapObjects/nuclear_agent.h
+  MapObjects/participant.h
+  MapObjects/polygon.h
+  MapObjects/polyline.h
+  MapObjects/single_fire.h
+#  MapObjects/single_fire_central.h
+  MapObjects/sound_area.h
+  MapObjects/text.h
+  MapObjects/virtual_mine.h
+  #situation_map_objects_export.h
+)
+
+
+SET (LayerAggregation_SRCS
+  LayerAggregation/layer_aggregation_widget.cpp
+  LayerAggregation/participant_aggregation_dialog.cpp
+)
+
+SET (LayerAggregation_HDRS
+  LayerAggregation/layer_aggregation_widget.h
+  LayerAggregation/participant_aggregation_dialog.h
+)
+
+
+SET(Rubberbands_SRCS
+  Rubberbands/abstract_event_dispatcher.cpp
+  Rubberbands/drawable_ellipse.cpp
+  Rubberbands/drawable_line.cpp
+  Rubberbands/drawable_painter_path.cpp
+  Rubberbands/drawable_smooth_path.cpp
+  Rubberbands/event_delegater.cpp
+  Rubberbands/event_dispatcher.cpp
+  Rubberbands/event_mouse_navigator.cpp
+  Rubberbands/gestures.cpp
+  Rubberbands/rubberband_base.cpp
+  Rubberbands/rubberband.cpp
+  Rubberbands/rubberband_3d.cpp
+  Rubberbands/rubberband_arrow.cpp
+  Rubberbands/rubberband_corridor.cpp
+  Rubberbands/rubberband_drawable.cpp
+  Rubberbands/rubberband_factory.cpp
+  Rubberbands/rubberband_frame_handle.cpp
+  Rubberbands/rubberband_free_hand.cpp
+  Rubberbands/rubberband_ellipse.cpp
+  Rubberbands/rubberband_ellipse_handle.cpp
+  Rubberbands/rubberband_handle.cpp
+  Rubberbands/rubberband_handle_proxy.cpp
+  Rubberbands/rubberband_internal.cpp
+  Rubberbands/rubberband_line_handle.cpp
+  Rubberbands/rubberband_multi_point_feature.cpp
+  Rubberbands/rubberband_multi_ellipse_feature.cpp
+  Rubberbands/rubberband_multi_point_feature_3d.cpp
+  Rubberbands/rubberband_point_handle.cpp
+  Rubberbands/rubberband_point_cluster.cpp
+  Rubberbands/rubberband_point_feature.cpp
+  Rubberbands/rubberband_point_feature_3d.cpp
+  Rubberbands/rubberband_polyline_width.cpp
+  Rubberbands/rubberband_rectangle.cpp
+  Rubberbands/rubberband_smooth_line.cpp
+  Rubberbands/rubberband_state_select.cpp
+  Rubberbands/rubberband_transform.cpp
+  Rubberbands/rubberband_transform_move.cpp
+  Rubberbands/rubberband_transform_rotate.cpp
+  Rubberbands/rubberband_transform_scale.cpp
+  Rubberbands/transient_tactical_symbol.cpp
+)
+
+SET(Rubberbands_HDRS
+  Rubberbands/abstract_event_dispatcher.h
+  Rubberbands/drawable_ellipse.h
+  Rubberbands/drawable_line.h
+  Rubberbands/drawable_painter_path.h
+  Rubberbands/drawable_smooth_path.h
+  Rubberbands/event_delegater.h
+  Rubberbands/event_dispatcher.h
+  Rubberbands/event_mouse_navigator.h
+  Rubberbands/gestures.h
+  Rubberbands/rubberband_free_hand.h
+  Rubberbands/rubberband_base.h
+  Rubberbands/rubberband_base_internal.h
+  Rubberbands/rubberband.h
+  Rubberbands/rubberband_3d.h
+  Rubberbands/rubberband_arrow.h
+  Rubberbands/rubberband_corridor.h
+  Rubberbands/rubberband_drawable.h
+  Rubberbands/rubberband_ellipse.h
+  Rubberbands/rubberband_ellipse_handle.h
+  Rubberbands/rubberband_factory.h
+  Rubberbands/rubberband_frame_handle.h
+  Rubberbands/rubberband_handle.h
+  Rubberbands/rubberband_handle_proxy.h
+  Rubberbands/rubberband_internal.h
+  Rubberbands/rubberband_line_handle.h
+  Rubberbands/rubberband_multi_point_feature.h
+  Rubberbands/rubberband_multi_ellipse_feature.h
+  Rubberbands/rubberband_multi_point_feature_3d.h
+  Rubberbands/rubberband_point_cluster.h
+  Rubberbands/rubberband_point_feature.h
+  Rubberbands/rubberband_point_feature_3d.h
+  Rubberbands/rubberband_point_handle.h
+  Rubberbands/rubberband_polyline_width.h
+  Rubberbands/rubberband_rectangle.h
+  Rubberbands/rubberband_smooth_line.h
+  Rubberbands/rubberband_state_select.h
+  Rubberbands/rubberband_transform.h
+  Rubberbands/rubberband_transform_move.h
+  Rubberbands/rubberband_transform_rotate.h
+  Rubberbands/rubberband_transform_scale.h
+  Rubberbands/transient_tactical_symbol.h
+)
+
+SET(Utils_SRCS
+  situation_map_export.h
+  Utils/movement_track.cpp
+  Utils/movement_track_manager.cpp
+  Utils/terrain_profile_dialog.cpp
+)
+
+SET(Utils_HDRS
+  Utils/movement_track.h
+  Utils/movement_track_manager.h
+  Utils/terrain_profile_dialog.h
+)
+
+
+
+SET(MathUtils_SRCS
+  MathUtils/clipper.cpp
+  MathUtils/curve.cpp
+  MathUtils/geometry_engine.cpp
+  MathUtils/matrix2d.cpp
+  MathUtils/path_rasterer.cpp
+  MathUtils/simple_helper.cpp
+)
+
+SET(MathUtils_HDRS
+  MathUtils/clipper.hpp
+  MathUtils/curve.h
+  MathUtils/geometry_engine.h
+  MathUtils/matrix2d.h
+  MathUtils/math_const.h
+  MathUtils/path_rasterer.h
+  MathUtils/simple_helper.h
+)
+
+NGL_WRAP_UI(Utils_HDRS
+  MapImpl/jump_point_custom_view.ui
+  Utils/terrain_profile_dialog.ui
+)
+
+NGL_WRAP_UI(MapImpl_SRCS
+  MapImpl/jump_point_namer.ui
+)
+
+
+SOURCE_GROUP(GraphicalObjects   FILES ${GraphicalObjects_SRCS} ${GraphicalObjects_HDRS})
+SOURCE_GROUP(Map                FILES ${Map_SRCS} ${Map_HDRS} ${MapImpl_SRCS} ${MapImpl_HDRS})
+SOURCE_GROUP(MapObjects         FILES ${MapObj_HDRS})
+SOURCE_GROUP(LayerAggregation   FILES ${LayerAggregation_SRCS} ${LayerAggregation_HDRS})
+SOURCE_GROUP(Rubberband         FILES ${Rubberbands_SRCS} ${Rubberbands_HDRS})
+SOURCE_GROUP(Utils              FILES ${Utils_SRCS} ${Utils_HDRS})
+SOURCE_GROUP(MathUtils          FILES ${MathUtils_SRCS} ${MathUtils_HDRS})
+SOURCE_GROUP(SideBar            FILES ${SideBar_SRCS} ${SideBar_HDRS})
+
+
+IF(BUILD_ARCGIS)
+NGL_ADD_LIBRARY(WS situationMap SHARED
+#                                       ${FunctionDialog_SRCS}
+                                       ${Map_SRCS} ${Map_HDRS} ${MapImpl_SRCS}
+                                       ${MapObj_SRCS} ${MapObj_HDRS}
+                                       ${GraphicalObjects_SRCS} ${GraphicalObjects_HDRS}
+                                       ${LayerAggregation_SRCS} ${LayerAggregation_HDRS}
+                                       ${Rubberbands_SRCS}
+                                       ${Utils_SRCS} ${Utils_HDRS}
+                                       ${MathUtils_SRCS} ${MathUtils_HDRS}
+)
+
+NGL_TARGET_INCLUDE_DIRECTORIES(situationMap
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+
+NGL_TARGET_LINK_LIBRARIES(situationMap
+  PRIVATE
+    NGLLogger
+    ArcGIS::ArcGIS
+    Qt6::Concurrent
+    Qt6::Network
+    Qt6::PrintSupport
+    Qt6::OpenGL           # Qt6: ArcGIS SDK MapGraphicsView/SceneGraphicsView use QOpenGLPaintDevice
+    Qt6::OpenGLWidgets    # Qt6: ArcGIS SDK uses QOpenGLWidget (separate lib in Qt6)
+    LtsCoordTrans
+    ArcGISQt5Hack
+  PUBLIC
+    Qt6::Core
+    Qt6::Widgets
+    LtsUtilsCoreHeaderOnly  # QPoint3D
+    LtsWidgets
+    LtsDataView
+    situationMapCommon
+    situationMapElevationMap
+    situationMapSideBar
+    advancedSymbology
+    situationMapGeometryModel
+    ngltools
+)
+
+# Copy on LIBchanges:
+IF(TARGET situationMap)
+  SET(SYMBOLE_CSV symbole2.csv)
+  ADD_CUSTOM_COMMAND(TARGET situationMap POST_BUILD
+                     COMMAND ${CMAKE_COMMAND}
+                        ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/FunctionDialog/${SYMBOLE_CSV} $<TARGET_FILE_DIR:situationMap>/${SYMBOLE_CSV}
+  )
+
+
+
+
+  # copy ini to build-dir/share/Lts/situation_map/:
+  SET(INI_DEST_DIR ${CMAKE_BINARY_DIR}/share/Lts/situation_map)
+
+  SET(SITUATIONMAPSETTINGS_INI situation_map_defaults.ini)
+  SET(SITUATIONMAPSETTINGS_INI_PATH Map/${SITUATIONMAPSETTINGS_INI})
+  ADD_CUSTOM_COMMAND(TARGET situationMap POST_BUILD
+                     COMMAND ${CMAKE_COMMAND}
+                        ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${SITUATIONMAPSETTINGS_INI_PATH} ${INI_DEST_DIR}/${SITUATIONMAPSETTINGS_INI}
+  )
+
+  SET(SITUATIONMAPSETTINGS_INI situation_map_defaults.ini)
+  SET(SITUATIONMAPSETTINGS_INI_PATH Map/${SITUATIONMAPSETTINGS_INI})
+
+  #check if we need to change it
+  IF(BUILD_RPM AND DEFINED _pname)
+
+    IF(UNIX AND "${_pname}" STREQUAL "guez")
+     MESSAGE("Install situationmap ini for GUEZ")
+     SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_guez.ini)
+
+     SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_guez_tablet.ini)
+
+    ElseIF(UNIX AND "${_pname}" STREQUAL "ahtc")
+     MESSAGE("Install situationmap ini for AHTC")
+     SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_ahtc.ini)
+
+     SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_ahtc_tablet.ini)
+
+    ElseIF(UNIX AND "${_pname}" STREQUAL "l400p2")
+     MESSAGE("Install situationmap ini for L400P2")
+     SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_land400.ini)
+
+     SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_l400p2_tablet.ini)
+
+    ElseIF(UNIX AND "${_pname}" STREQUAL "qatar")
+     MESSAGE("Install situationmap ini for Qatar")
+     SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_qatar.ini)
+
+     SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_qatar_tablet.ini)
+
+    ElseIF(UNIX AND "${_pname}" STREQUAL "qatarmout")
+     MESSAGE("Install situationmap ini for Qatar Mout")
+     SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_qatarmout.ini)
+
+     SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_qatar_tablet.ini)
+
+    ElseIF(UNIX AND "${_pname}" STREQUAL "commaster")
+      MESSAGE("Install situationmap ini for ComMaster/Luxemburg")
+      SET(SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_luxemburg.ini)
+
+      SET(TABLET_SITUATIONMAPSETTINGS_INI_PATH Map/situation_map_luxemburg_tablet.ini)
+
+
+    ENDIF()
+
+
+  ENDIF()
+
+#now that we set the situation map ini if neccecsary we install it depending of the tablet build or not
+IF(TABLET_MODE)
+    NGL_INSTALL(WS FILES ${TABLET_SITUATIONMAPSETTINGS_INI_PATH} DESTINATION "./share/Lts/situation_map" RENAME ${SITUATIONMAPSETTINGS_INI})
+ELSE()
+    NGL_INSTALL(WS FILES ${SITUATIONMAPSETTINGS_INI_PATH} DESTINATION "./share/Lts/situation_map" RENAME ${SITUATIONMAPSETTINGS_INI})
+ENDIF()
+
+ENDIF()
+
+NGL_INSTALL_TARGET(situationMap)
+ENDIF() # BUILD_ARCGIS
+
+# Choose logical order instead of alphabetical.
+# UnitTest should be performed BEFORE ModuleTest
+ADD_SUBDIRECTORY(ArcGISQt5Hack)
 ADD_SUBDIRECTORY(Common)
-ADD_SUBDIRECTORY(SymbologyXML)
-ADD_SUBDIRECTORY(Symbology)
-# ElevationMapManager compatibility stub (src/ + include/ scaffolding) needed by LtsElevation
 ADD_SUBDIRECTORY(ElevationMap)
+ADD_SUBDIRECTORY(Symbology)
+ADD_SUBDIRECTORY(SymbologyGui)
+ADD_SUBDIRECTORY(SymbologyXML)
+ADD_SUBDIRECTORY(MapObjectsImpl)
+#ADD_SUBDIRECTORY(LocalSrv)
 
-# Remaining subdirectories not yet migrated:
-# ADD_SUBDIRECTORY(SymbologyGui)
-# ADD_SUBDIRECTORY(SymbologyXML)
-# ADD_SUBDIRECTORY(MapObjectsImpl)
-# ADD_SUBDIRECTORY(SideBar)
-# ADD_SUBDIRECTORY(FunctionDialog)
-# ADD_SUBDIRECTORY(GeometryModel)
-# ADD_SUBDIRECTORY(Portal)
-# ADD_SUBDIRECTORY(GraphicalObjects)
-# ADD_SUBDIRECTORY(Map)
-# ADD_SUBDIRECTORY(MapImpl)
-# ADD_SUBDIRECTORY(MapObjects)
-# ADD_SUBDIRECTORY(Rubberbands)
-# ADD_SUBDIRECTORY(Utils)
-# ADD_SUBDIRECTORY(MathUtils)
-# ADD_SUBDIRECTORY(LayerAggregation)
-# ADD_SUBDIRECTORY(LocalSrv)
-# ADD_SUBDIRECTORY(Tests)
-# ADD_SUBDIRECTORY(EvalApps)
-# ADD_SUBDIRECTORY(UnitTests)
-# ADD_SUBDIRECTORY(UnitTestsGeoModel)
-# ADD_SUBDIRECTORY(ModuleTests)
+ADD_SUBDIRECTORY(SideBar)
+ADD_SUBDIRECTORY(FunctionDialog)
+ADD_SUBDIRECTORY(GeometryModel)
+ADD_SUBDIRECTORY(Portal)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/CMakeLists.txt
index d17e3cb0b..1bfb2e5bb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/CMakeLists.txt
@@ -4,34 +4,41 @@
 # $Author$
 #
 
-# The GDAL-based ElevationMap module is not yet migrated to Qt6 (see the
-# commented-out entries in ../CMakeLists.txt). LtsElevation still needs an
-# ElevationMapManager, so build the compatibility stub that lives in the
-# src/ + include/ scaffolding (same API as the Qt5 class, no GDAL).
-NGL_ADD_LIBRARY(WS AAR HLA SV situationMapElevationMap SHARED
-  ${CMAKE_SOURCE_DIR}/src/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp
-  # The header lives in include/Viewer/SituationMap/ElevationMap, apart from
-  # the cpp. AUTOMOC only mocs headers that are target sources (or sit next
-  # to one); MOC_INCLUDES merely feeds moc's own -I flags, not header
-  # discovery. Listed explicitly, otherwise the vtable/staticMetaObject are
-  # undefined and the link of libsituationMapElevationMap.so fails.
-  ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
+# ElevationMap module. The legacy module is GDAL-backed; GDAL is not part of the
+# Qt6 / ArcGIS-300 toolchain. Per the established no-GDAL decision, elevation_map.cpp
+# is a no-GDAL stand-in (public API preserved; no DEM data loaded) while the rest of
+# the module (ElevationMapManager, line_of_sight_calculation) is the real, GDAL-free
+# Qt code. This lets the SituationMap layer (MapImpl/SightFanImpl/ElevationMapManager)
+# compile and link against the elevation API.
+
+SET(Elevation_SRCS
+  elevation_map.cpp
+  elevation_map.h
+  elevation_map_helper.h
+  elevation_map_manager.cpp
+  elevation_map_manager.h
+  line_of_sight_calculation.cpp
+  line_of_sight_calculation.h
 )
 
-# The stub's ElevationMapManager is a Q_OBJECT class; without AUTOMOC the
-# moc symbols (staticMetaObject/vtable) are missing and the link of
-# libsituationMapElevationMap.so fails, cascading to every target that
-# links it (same pattern as LtsSessionDataDds).
+NGL_ADD_LIBRARY2(AAR SV WS HLA situationMapElevationMap SHARED ${Elevation_SRCS})
 set_target_properties(situationMapElevationMap PROPERTIES AUTOMOC ON)
-
 NGL_TARGET_INCLUDE_DIRECTORIES(situationMapElevationMap
   PUBLIC
-    # The stub cpp does #include "elevation_map_manager.h" - it lives in
-    # include/Viewer/SituationMap/ElevationMap/, not next to the source.
-    ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap
-    ${CMAKE_SOURCE_DIR}/include
+    # Consumers include <ElevationMap/elevation_map.h> and the NGL-generated
+    # <ElevationMap/situationmapelevationmap_export.h>; the parent source/binary
+    # dirs put the ElevationMap/ subfolder (and the generated export header) on the path.
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 NGL_TARGET_LINK_LIBRARIES(situationMapElevationMap
+  PRIVATE
+    situationMapCommon
+    Qt6::Concurrent
+    Qt6::Gui
+    NGLLogger
+    LtsCoordTrans
   PUBLIC
     Qt6::Core
+    LtsUtilsCoreHeaderOnly
 )
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.cpp
new file mode 100755
index 000000000..623397412
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.cpp
@@ -0,0 +1,137 @@
+/**
+  * @RDE_HEADER@
+  * adapting GeISiR source to SituationMap
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#include "elevation_map.h"
+
+#include <QFileInfo>
+#include <QPolygonF>
+#include <QGuiApplication>
+
+#include <limits>
+
+namespace SituationMap
+{
+
+// GDAL is not part of the Qt6/ArcGIS-300 build (no GDAL in the toolchain;
+// see the no-GDAL ElevationMap stub decision). This translation unit is the
+// no-GDAL stand-in for the legacy GDAL-backed reader: the public API is
+// preserved (header unchanged) so consumers (MapImpl, ElevationMapManager,
+// SightFanImpl) compile and link; elevation data is simply not loaded, so
+// queries return defaults / no-coverage. Everything else in the module
+// (ElevationMapManager, line_of_sight_calculation) is real, GDAL-free Qt code.
+struct ElevationMap::Internal
+{
+};
+
+ElevationMap::ElevationMap(const QFileInfo &fileInfo)
+  : m_internal(new Internal())
+  , m_fileName(fileInfo.absoluteFilePath())
+  , m_aproximation(false)
+  , m_valid(false)
+  , m_logger(getLogger("ElevationMap"))
+{
+  readFromFile();
+}
+
+ElevationMap::~ElevationMap()
+{
+  delete m_internal;
+}
+
+bool ElevationMap::waitForInitialization()
+{
+  // No asynchronous GDAL read is started, so initialization is already done.
+  return true;
+}
+
+bool ElevationMap::isValid() const
+{
+  return m_valid;
+}
+
+QString ElevationMap::filename() const
+{
+  return m_fileName;
+}
+
+QRectF ElevationMap::extent() const
+{
+  return QRectF();
+}
+
+QPair<double, double> ElevationMap::elexelSize() const
+{
+  return qMakePair(0.0, 0.0);
+}
+
+double ElevationMap::elevation(double, double) const
+{
+  return std::numeric_limits<double>::quiet_NaN();
+}
+
+double ElevationMap::distance(const QPointF &start, const QPointF &end) const
+{
+  return (end - start).manhattanLength();
+}
+
+double ElevationMap::profileDistance(const QPointF &start, const QPointF &end) const
+{
+  return (end - start).manhattanLength();
+}
+
+unsigned int ElevationMap::elevationProfile(const QPointF &, const QPointF &, Vec3dVector &) const
+{
+  return 0;
+}
+
+bool ElevationMap::contains(const QPointF &) const
+{
+  return false;
+}
+
+bool ElevationMap::intersects(const QPolygonF &) const
+{
+  return false;
+}
+
+void ElevationMap::LOSProfile(const QPointF &, const QPointF &, LOSVector &)
+{
+}
+
+int ElevationMap::getElevation(int, int) const
+{
+  return std::numeric_limits<int>::min();
+}
+
+double ElevationMap::getElevation(double, double) const
+{
+  return std::numeric_limits<double>::quiet_NaN();
+}
+
+double ElevationMap::getOrSubstituteElevation(int, int, double substitute) const
+{
+  return substitute;
+}
+
+void ElevationMap::getSamplePoints(const QPointF &, const QPointF &, Vec3dVector &) const
+{
+}
+
+int ElevationMap::clipp2Map(const QPointF &, const QPointF &, QPointF &, QPointF &) const
+{
+  return 0;
+}
+
+bool ElevationMap::readFromFile()
+{
+  // No GDAL: no DEM is read.
+  m_valid = false;
+  return false;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.h
new file mode 100755
index 000000000..239f7f7f1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map.h
@@ -0,0 +1,168 @@
+/**
+  * @RDE_HEADER@
+  * adapting GeISiR source to SituationMap
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "elevation_map_helper.h"
+#include <ElevationMap/situationmapelevationmap_export.h>
+
+#include <LtsUtilsCore/qpoint3d.h>
+
+#include <Common/situation_map_logging.h>
+
+#include <QFutureWatcher>
+#include <QPointF>
+#include <QRectF>
+#include <QVector>
+
+class QFileInfo;
+namespace SituationMap
+{
+
+
+//------------------------------------------------------------------------------------------------------------
+// ElevationMap
+//------------------------------------------------------------------------------------------------------------
+
+class SITUATIONMAPELEVATIONMAP_EXPORT ElevationMap final
+{
+
+  friend class ElevationMapManager;
+
+public:
+  ElevationMap()                                  = delete;
+  ElevationMap(const ElevationMap &)              = delete;
+  ElevationMap &operator = (const ElevationMap &) = delete;
+
+  explicit ElevationMap(const QFileInfo &fileInfo);
+
+  ~ElevationMap();
+
+  bool waitForInitialization();
+
+  bool isValid() const;
+
+  QString filename() const;
+
+  QRectF extent() const;
+
+  QPair<double, double> elexelSize() const;
+
+  double elevation(double lon, double lat) const; // rad
+
+  double distance(const QPointF &start, const QPointF &end) const;
+
+  double profileDistance(const QPointF &start, const QPointF &end) const;
+
+  unsigned int elevationProfile(const QPointF &start, const QPointF &end, Vec3dVector &elevProfile) const;
+
+  void interpolation(bool on)  { m_aproximation = on;   }
+  bool interpolation() const    { return m_aproximation; }
+
+  bool contains(const QPointF &point) const;
+  bool intersects(const QPolygonF &polygon) const;
+
+  // Line of Sight Profile: berücksichtigt Erdkrümmung und WGS84 Erdellipsoid
+  void LOSProfile(const QPointF &start, const QPointF &end, LOSVector &losProfile);
+
+protected:
+
+  int    getElevation(int column, int row) const;
+  double getElevation(double lon, double lat) const;
+
+  double getOrSubstituteElevation(int column, int row, double substitute) const;
+
+  // getSamplePoints rastert den Vector( start, end) in Lat/Lon entsprechend dem Höhenraster
+  void getSamplePoints(const QPointF &start, const QPointF &end, Vec3dVector &sPnts) const;
+
+  int clipp2Map(const QPointF &start, const QPointF &end, QPointF &cStart, QPointF &cEnd) const;
+
+  bool readFromFile();
+
+  struct Internal;
+
+  Internal *m_internal;
+  QString   m_fileName;
+  bool      m_aproximation;
+  bool      m_valid;
+  QFutureWatcher<bool> m_gdalReadWatcher;
+  LOGGER_T  m_logger;      ///< Interface of the Logging-Facility
+}; // ElevationMap
+
+
+} // SituationMap
+
+
+
+/* -----------------------------------------------------------------------------------------------
+** CVS-Id/Release ...: $Header$
+** -----------------------------------------------------------------------------------------------
+**
+** Historie:
+**
+**    $Log: not supported by cvs2svn $
+**    Revision 1.20  2006/09/26 07:51:12  Jörg
+**    Syntax Fehler unter Suse Linux 10.1 behoben.
+**
+**    Revision 1.19  2006/03/24 09:05:24  klaus
+**    Elevationprofile: Begrenzung auf  Kartengröße aufgehoben ( Clipping)
+**
+**    Revision 1.18  2005/11/09 11:12:27  klaus
+**    Anpassung an Linux: Kommentar hinter #endif mit "//" versehen
+**
+**    Revision 1.17  2005/08/22 14:15:02  joerg
+**    typeId()
+**
+**    Revision 1.16  2005/08/12 09:37:44  joerg
+**    Koordinaten-Umprojezieren bei Wechsel der Projektion
+**
+**    Revision 1.15  2005/04/15 13:04:35  joerg
+**    Resource Control
+**
+**    Revision 1.14  2005/03/04 14:29:13  klaus
+**    Elevationmap mit CachedTileList versehen und automatischem Entladen von Tiles
+**
+**    Revision 1.13  2005/03/03 12:37:14  klaus
+**    dynamischen Laden und Entladen der ElevationTiles für Reliefmap
+**
+**    Revision 1.12  2005/03/01 12:33:12  klaus
+**    Reliefmap eingeführt, aus Elevationmap entfernt
+**
+**    Revision 1.11  2005/02/25 15:26:41  klaus
+**    Ergänzung um Reliefkarte
+**
+**    Revision 1.10  2005/02/10 14:13:21  klaus
+**    Bias in Basisklasse MapObject überführt
+**
+**    Revision 1.9  2005/02/10 13:51:01  klaus
+**    Bias für SightFans eingeführt
+**
+**    Revision 1.8  2005/02/09 16:53:06  klaus
+**    1. Version der SightFans
+**
+**    Revision 1.7  2005/01/26 12:25:41  klaus
+**    todos bearbeitet, Fehlerrückmeldnugen
+**
+**    Revision 1.6  2004/12/14 09:43:25  klaus
+**    7. Erweiterung für Höhenkarten
+**
+**    Revision 1.5  2004/12/07 11:07:20  klaus
+**    5. Erweiterung für Höhenkarten
+**
+**    Revision 1.4  2004/12/03 16:24:12  klaus
+**    4. Erweiterung für Höhenkarten
+**
+**    Revision 1.3  2004/11/30 13:15:28  klaus
+**    3. Erweiterung für Höhenkarten
+**
+**    Revision 1.2  2004/11/23 14:36:14  klaus
+**    2. Erweiterung für Höhenkarten
+**
+**
+** ----------------------------------------------------------------------------------------------- */
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_helper.h
new file mode 100755
index 000000000..75655f15b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_helper.h
@@ -0,0 +1,88 @@
+/**
+  * @RDE_HEADER@
+  * Some functions and struct for ElevationMap/LineOfSight (LOS)
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include <LtsUtilsCore/qpoint3d.h>
+
+#include <math.h>
+#include <MathUtils/math_const.h>
+
+
+#include <QPointF>
+#include <QVector>
+
+namespace SituationMap
+{
+
+inline bool isInIntervall(double x, double x1, double x2)
+{
+  return (((x > x1) && (x < x2)) || (((x > x2) && (x < x1))));
+} // inline bool isInIntervall(double x, double x1, double x2)
+
+
+inline double radiusWGS84(double lat)
+{
+  double sinLAT = sin(lat);
+  return (MathConst::WGS84_Major_a * sqrt(1.0 - MathConst::WGS84_SQR_EXC * sinLAT * sinLAT));
+} // inline double radiusWGS84(double lat)
+
+
+inline QPointF distance_in_meter_WGS84(const QPointF &start, const QPointF &end) // start, end in LonLat
+{
+  // todo: prüfen ob Distanz zu groß, dann verbesserte Berechnung !!
+  double lat = (end.y() + start.y()) / 2.0;
+  double faktorLon = MathConst::WGS84_Major_a * cos(lat); // radiusWGS84(lat) * 2.0 * PI;
+  double faktorLat = MathConst::WGS84_Minor_b;
+
+  return QPointF(faktorLon * (end.x() - start.x()), faktorLat * (end.y() - start.y()));
+
+} // QPointF distance_in_meter_WGS84(const QPointF &start, const QPointF &end)
+
+
+inline double squareLength(const QPointF &v)
+{
+  return v.x() * v.x() + v.y() * v.y();
+} // inline double squareLength(const QPoint & v)
+
+
+inline double length(const QPointF &v)
+{
+  return sqrt(squareLength(v));
+} // inline double length(const QPoint & v)
+
+
+struct LOSentry  // Defines 1 Entry for Line of Sight
+{
+  LOSentry() = default;
+  LOSentry(double dist, double height) : _dist(dist), _height(height) { ; }
+
+  double &dist() { return _dist; }
+  double &height() { return _height; }
+
+  double   dist()    const { return _dist; }
+  double   height()  const { return _height; }
+
+  bool isUndefined() const { return std::isnan(_height); }
+
+private:
+
+  double _dist = 0;  // Distance from Start
+  double _height = -NAN;
+
+}; /* LOSentry */
+
+
+using Point3D = LtsUtils::QPoint3D;  ///< x = lon ; y = lat , z = elevation/altitude in meters
+using LOSVector = QVector<LOSentry>;
+using Vec2dVector = QVector<QPointF>;
+using Vec3dVector = QVector<Point3D>;
+
+
+} // SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp
new file mode 100755
index 000000000..f18884fa7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp
@@ -0,0 +1,531 @@
+/**
+  * @RDE_HEADER@
+  * Manage and combine several ElevationMap
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+#include "elevation_map_manager.h"
+#include "elevation_map.h"
+
+// Qt
+#include <QPointer>
+#include <QFileInfo>
+#include <QRectF>
+#include <QPolygonF>
+
+// system
+#include <vector>
+
+namespace SituationMap
+{
+
+static long s_counter{0};
+
+//------------------------------------------------------------------------------------------------------------
+// ElevationMapManager::Private
+//------------------------------------------------------------------------------------------------------------
+
+class ElevationMapManager::Private
+{
+public:
+  // fine to rough
+  std::vector<ElevationMap *> m_elevationMapCont;
+  QRectF                      m_simpleExtent;
+};
+
+
+//------------------------------------------------------------------------------------------------------------
+// ElevationMapManager
+//------------------------------------------------------------------------------------------------------------
+ElevationMapManager::ElevationMapManager()
+  : BaseClass()
+  , d(new Private())
+  , m_logger(getLogger("ElevationMapManager"))
+{
+  ++s_counter;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
+}
+
+ElevationMapManager::~ElevationMapManager()
+{
+  --s_counter;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
+  cleanupCurrentContent();
+  delete d;
+  d = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
+}
+int ElevationMapManager::init(const QStringList &filePaths_rough_to_fine)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " START" << " filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(" ; "));
+
+  cleanupCurrentContent();
+
+  d->m_elevationMapCont.reserve(filePaths_rough_to_fine.size());
+  int cnt = 0;
+  for (const QString &filePath : filePaths_rough_to_fine)
+  {
+    QFileInfo fileInfo(filePath);
+
+    const QString &fileName = fileInfo.absoluteFilePath();
+
+    if (!fileInfo.exists())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " elevation data file \'" << fileName << "\' doesn't exists.";
+      continue;
+    }
+
+    if (!fileInfo.isReadable())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " elevation data file \'" << fileName << "\' isn't readable.";
+      continue;
+    }
+
+    // ctor will spawn thread via QtConcurrent and read file async:
+    d->m_elevationMapCont.insert(d->m_elevationMapCont.begin(), new ElevationMap(fileInfo));
+    ++cnt;
+  } // for
+
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " END" << " filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(" ; "))
+                       << ", following number of files are going to be loaded: " << cnt;
+  return cnt;
+}
+
+void ElevationMapManager::cleanupCurrentContent()
+{
+  qDeleteAll(d->m_elevationMapCont);
+  d->m_elevationMapCont.clear();
+}
+
+
+
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+
+
+bool ElevationMapManager::waitForInitialization()
+{
+  for (ElevationMap *elevationMap : d->m_elevationMapCont)
+    elevationMap->waitForInitialization();
+  return isValid();
+}
+
+bool ElevationMapManager::isValid() const
+{
+  bool allAreValid = true;
+  for (const ElevationMap *elevationMap : d->m_elevationMapCont)
+    allAreValid = allAreValid && elevationMap->isValid();
+
+//  FATAL_LOG(m_logger) << LOGFUNCTION << " allAreValid = " << allAreValid;
+  return allAreValid;
+}
+
+double ElevationMapManager::elevation(double lon_rad, double lat_rad, bool *bIsCovered) const
+{
+  // assume, that all children are ready
+  for (const ElevationMap *elevationMap : d->m_elevationMapCont)
+  {
+//    qCritical() << " EMM::elevation:  "
+//                << " lon_rad=" << lon_rad
+//                << " lat_rad=" << lat_rad
+//                << " (try: " << elevationMap->filename() << ")...";
+
+    double singleResult = elevationMap->elevation(lon_rad, lat_rad);
+
+    if (singleResult > -300) // -300 -> ausserhalb der Höhenkarte !!
+    {
+      // qCritical() << " EMM::elevation: elevation= " << singleResult << " (taken from: " << elevationMap->filename() << ")";
+      if (bIsCovered)
+        *bIsCovered = true;
+      return singleResult;
+    }
+  }
+
+//  DEBUG_LOG(m_logger) << LOGFUNCTION << " invalid= "
+//                      << " lon_rad=" << lon_rad
+//                      << " lat_rad=" << lat_rad;
+  if (bIsCovered)
+    *bIsCovered = false;
+  return std::numeric_limits<double>::min();
+}
+
+double ElevationMapManager::elevation(double lon_rad, double lat_rad, double defaultValue, bool *bIsCovered) const
+{
+  bool bIsCoveredLocal = false;
+  const double elevationValue = elevation(lon_rad, lat_rad, &bIsCoveredLocal);
+
+  // in any case: if provided, transfer isCovered back to caller
+  if (bIsCovered)
+    *bIsCovered = bIsCoveredLocal;
+
+  // which value to be returned?
+  if (!bIsCoveredLocal)
+    return defaultValue;
+
+  return elevationValue;
+}
+
+
+QRectF ElevationMapManager::simpleUnitedExtent() const
+{
+  if (d->m_simpleExtent.isNull())
+  {
+    bool bFirst = true;
+    for (const ElevationMap *elevationMap : d->m_elevationMapCont)
+    {
+      const QRectF &singleExtent = elevationMap->extent();
+      if (bFirst)
+      {
+        bFirst = false;
+        d->m_simpleExtent = singleExtent;
+//        qCritical() << " bFirst.left " << singleExtent.left() << " bFirst.right " << singleExtent.right();
+//        qCritical() << " bFirst.top " << singleExtent.top() << " bFirst.bottom " << singleExtent.bottom();
+
+      } else {
+        // prefer following instead QRectF::united (top vs. bottom):
+//        qCritical() << " next.left " << singleExtent.left() << " secnextright " << singleExtent.right();
+//        qCritical() << " next.top " << singleExtent.top()   << " next.bottom " << singleExtent.bottom();
+        d->m_simpleExtent.setLeft  (std::min(d->m_simpleExtent.left(),   singleExtent.left()));
+        d->m_simpleExtent.setTop   (std::max(d->m_simpleExtent.top(),    singleExtent.top()));        // top - >use max !!!
+        d->m_simpleExtent.setBottom(std::min(d->m_simpleExtent.bottom(), singleExtent.bottom()));     // bottom -> use min
+        d->m_simpleExtent.setRight (std::max(d->m_simpleExtent.right(),  singleExtent.right()));
+      }
+    } // for
+  }
+
+  return d->m_simpleExtent;
+}
+
+bool ElevationMapManager::contains(const QPointF &point) const
+{
+  for (const ElevationMap *elevationMap : d->m_elevationMapCont)
+  {
+    if (elevationMap->contains(point))
+      return true;
+  }
+  return false;
+}
+
+void ElevationMapManager::LOSProfile(const QPointF &start, const QPointF &end, LOSVector &losProfile)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_elevationMapCont.empty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no elevationMap";
+    return;
+  }
+
+  waitForInitialization();
+
+  QRectF simpleExtentLocal = simpleUnitedExtent();
+
+//  qCritical() << " simpleExtent.left " << simpleExtentLocal.left() << " simpleExtent.right " << simpleExtentLocal.right();
+//  qCritical() << " simpleExtent.top " << simpleExtentLocal.top() << " simpleExtent.bottom " << simpleExtentLocal.bottom();
+
+  if (!simpleExtentLocal.contains(start))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " start coordinate not within area"
+                        << ", start: x=" << start.x() << " ; y=" << start.y()
+                        << ", area: "
+                        << " left " << simpleExtentLocal.left() << ", right " << simpleExtentLocal.right()
+                        << " top " << simpleExtentLocal.top() << ", bottom " << simpleExtentLocal.bottom()
+                           ;
+    return;  // ausserhalb der Höhenkarte !!
+  }
+
+  bool clipped = false;
+  double totalLng;
+  QPointF startG = start;
+  QPointF endG = end;
+
+  if (!simpleExtentLocal.contains(end))  // Clippen
+  {
+    clipped = true;
+    totalLng = length(endG - startG);
+    if (endG.x() < simpleExtentLocal.left())
+    {
+      double m = (endG.y() - startG.y()) / (endG.x() - startG.x());
+      double x = simpleExtentLocal.left();
+      endG.setX(x);
+      endG.setY(startG.y() + m * (x - startG.x()));
+    }
+    else if (endG.x() > simpleExtentLocal.right())
+    {
+      double m = (endG.y() - startG.y()) / (endG.x() - startG.x());
+      double x = simpleExtentLocal.right();
+      endG.setX(x);
+      endG.setY(startG.y() + m * (x - startG.x()));
+    }
+    if (endG.y() < simpleExtentLocal.bottom())
+    {
+      double m = (endG.x() - startG.x()) / (endG.y() - startG.y());
+      double y = simpleExtentLocal.bottom();
+      endG.setY(y);
+      endG.setX(startG.x() + m * (y - startG.y()));
+    }
+    else if (endG.y() > simpleExtentLocal.top())
+    {
+      double m = (endG.x() - startG.x()) / (endG.y() - startG.y());
+      double y = simpleExtentLocal.top();
+      endG.setY(y);
+      endG.setX(startG.x() + m * (y - startG.y()));
+    }
+  }
+
+
+  // Korrektursteigung aufgrund WGS84 Erdellipsoid, Lineare Approximation, Fehler bis 200 km: < 1.0m
+  double startRadius = radiusWGS84(startG.y());
+  double corrM = (radiusWGS84(endG.y()) - startRadius) / length(endG - startG);
+
+  //
+  // getSamplePoints(start, end, elevProfile);
+  // find best elevationMap for equested path {startG, endG}
+  //
+
+  // 1st find maps covering the desired pathG:
+  const QPolygonF pathG( QVector<QPointF>{startG, endG} );
+
+  std::vector<ElevationMap *> coveredElevationMaps;
+  coveredElevationMaps.reserve(d->m_elevationMapCont.size());
+  for (auto curItem : qAsConst(d->m_elevationMapCont))
+  {
+    if (curItem && curItem->intersects(pathG))
+      coveredElevationMaps.push_back(curItem);
+  } // for
+
+  if (m_logger.isDebugEnabled())
+  {
+    DEBUG_LOG(m_logger) << " coveredElevationMap.size() = " << coveredElevationMaps.size();
+    for (auto curItem : qAsConst(coveredElevationMaps))
+      DEBUG_LOG(m_logger) << " coveredElevationMap = " << curItem->filename();
+  }
+
+  // if no maps covers the desired path, stay on old approach: use most bottom elevation map:
+  if (coveredElevationMaps.empty())
+    coveredElevationMaps = d->m_elevationMapCont;
+
+  // 2nd: find elevation map with highest resolution to achieve best results:
+  using ELE_VEC_IT = std::vector<ElevationMap*>::iterator;
+  ELE_VEC_IT eleIt = coveredElevationMaps.begin();
+  for (ELE_VEC_IT curItem = coveredElevationMaps.begin()+1; curItem != coveredElevationMaps.end(); ++curItem)
+  {
+    ElevationMap *elePtr = *curItem;
+    if (!elePtr)
+      continue;
+
+    if (elePtr->elexelSize().first < (*eleIt)->elexelSize().first)
+      eleIt = curItem;
+  } // for
+
+  Q_ASSERT_X((*eleIt), "ElevationMapManager::LOSProfile", "eleIt failed");
+
+  Vec3dVector elevProfile;
+  (*eleIt)->getSamplePoints(start, end, elevProfile);
+
+  INFO_LOG(m_logger) << "Using ElevationMap '" << (*eleIt)->filename() << "'"
+                     << " (of size = " << d->m_elevationMapCont.size() << ")"
+                     << " with_elexelSize " << (*eleIt)->elexelSize().first
+                     << " -> # SamplePoints = " << elevProfile.size();
+
+  for (Vec3dVector::iterator itr = elevProfile.begin(); itr != elevProfile.end(); ++itr)
+  {
+    double dist  = length(distance_in_meter_WGS84(start, itr->toPointF()));
+    double height = elevation(itr->x(), itr->y());                   // use elevation over all seperate elevationMaps
+    height += corrM * dist; // WGS84 Erdellipsoid Korrektur
+    height -= (startRadius * (1 - cos(atan(dist / startRadius))));        // Einbeziehen der Erdkruemmung
+    // alternativ als Naeherung: height -= ( dist * dist) / (startRadius * 2.0);
+    losProfile.push_back(LOSentry(dist, height));
+  }
+
+  if (clipped)
+    losProfile.push_back(LOSentry(totalLng, -NAN));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ElevationMapManager::LineOfSight ElevationMapManager::lineOfSightCalculation(const LOSVector &losProfile,
+                                                                             double centerHat,
+                                                                             double objHat) const
+{
+  // Analog zu SightFanImpl::calculateSightBeam
+
+
+  if (losProfile.size() < 2) // Startpunkt undefiniert oder ausserhalb der Karte
+  {
+    return LineOfSight::LOS_ERROR;
+  }
+
+  LOSVector::const_iterator itr = losProfile.begin();
+  const double centerHeight = itr->height() + centerHat;
+
+  double d1 = 0.0;
+  double height1 = itr->height();
+
+//  // überspringen bis _innerRadius erreicht ist !
+//  while( ++itr != losProfile.end())
+//  {
+//    double  d2 = itr->dist(); // *EarthRadius;
+//    double  height2 = itr->height();
+//    if( d2 >= m_internal->m_innerRadius)
+//    {
+//      height1 = height1 + (m_internal->m_innerRadius - d1) * ( height2 - height1)/(d2 - d1);
+//      d1 = m_internal->m_innerRadius;
+//      --itr;
+//      break;
+//    }
+//    d1 = d2;
+//    height1 = height2;
+//  }
+
+//    bool visible = true;
+//  SightMode mode = START;
+
+  d1 = itr->dist();
+  double curM = (height1 - centerHeight ) / d1;     // bestimmende Steigung
+
+//  sBeam.add( SightEntry( d1, START) );
+
+  while (++itr != losProfile.end())
+  {
+    double  d2      = itr->dist(); // *EarthRadius;
+    double  height2 = itr->height();
+
+    if (std::isnan(height2)) // Undefined
+    {
+      return LineOfSight::LOS_UNDEFINED;
+    }
+
+    double hObj = (height2 + objHat - centerHeight );
+    double objM =  hObj / d2;          // Steigung bezogen auf Objekte( Objekte verdecken nicht !)
+
+    LineOfSight newMode = ((objM >= curM)) ? LineOfSight::LOS_VISIBLE : LineOfSight::LOS_INVISIBLE;
+
+    if (newMode == LineOfSight::LOS_INVISIBLE)
+      return LineOfSight::LOS_INVISIBLE;
+
+
+//    if (newMode != mode)
+//    {
+//      if ( (mode != LineOfSight::LOS_UNDEFINED) && (d2 != d1) )
+//      {
+//        // Korrekturwert für Distanz berechnen, unter Berücksichtigung der Objekthoehe !!
+//        double localM = (height2 - height1) /(d2 - d1);
+//        // localM == curM kann nicht auftreten, da newMode != mode
+//        double dCorr = (hObj - (curM * d2)) / (localM - curM);
+
+//        if (dCorr < 0.0)
+//          dCorr = 0.0;
+//        dCorr = d2 - dCorr;
+//        if (dCorr < d1)
+//          dCorr = d1;
+
+//        sBeam.add( SightEntry( dCorr, mode) );
+//      }
+//      mode = newMode;
+//    }
+
+    double terrM = (height2 - centerHeight) / d2;      // Steigung bezogen auf Gelaende
+    if (terrM >= curM)
+    {
+      curM = terrM;  // neue bestimmende Steigung
+    }
+
+//    height1 = height2;
+//    d1 = d2;
+  } // while
+
+  return LineOfSight::LOS_VISIBLE;
+}
+
+ElevationMapManager::LineOfSight ElevationMapManager::lineOfSightCalculation(const LtsUtils::QPoint3D &startPointGeo_absZ,
+                                                                             const LtsUtils::QPoint3D &endPointGeo_absZ)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", startPointGeo_absZ = " << startPointGeo_absZ << ", endPointGeo_absZ = " << endPointGeo_absZ;
+
+  if (!isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, LtsElevationManager not valid";
+    return LineOfSight::LOS_ERROR;
+  }
+
+  // 1st: a) centerHat / startHat:
+  const double startHat = startPointGeo_absZ.z() - this->elevation(startPointGeo_absZ.x(), startPointGeo_absZ.y(), -10000);
+  if (startHat < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, startHat is negativ";
+    return LineOfSight::LOS_ERROR;
+  }
+  // 1st: b) endHat / objHat:
+  const double endHat = endPointGeo_absZ.z() - this->elevation(endPointGeo_absZ.x(), endPointGeo_absZ.y(), -10000);
+  if (endHat < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, objHat is negativ"
+                        << ", startPointGeo_absZ=" << startPointGeo_absZ
+                        << ", endPointGeo_absZ=" << endPointGeo_absZ;
+    return LineOfSight::LOS_ERROR;
+  }
+
+  SituationMap::ElevationMapManager::LineOfSight eleMapMgrResult = lineOfSightCalculation(startPointGeo_absZ.toPointF(), startHat,
+                                                                                          endPointGeo_absZ.toPointF(), endHat);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ
+                      << " -> LineOfSight " << static_cast<int>(eleMapMgrResult);
+  return eleMapMgrResult;
+}
+
+ElevationMapManager::LineOfSight ElevationMapManager::lineOfSightCalculation(const QPointF &startPointGeo, double startHat,
+                                                                             const QPointF &endPointGeo, double endHat)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat
+                      << ", endPointGeo = " << endPointGeo << ", endHat = " << endHat ;
+  if (!isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, LtsElevationManager not valid";
+    return LineOfSight::LOS_ERROR;
+  }
+
+  if (startHat < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, startHat is negativ";
+    return LineOfSight::LOS_ERROR;
+  }
+  if (endHat < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, endHat is negativ";
+    return LineOfSight::LOS_ERROR;
+  }
+
+  // 1st: create LOSVector:
+  SituationMap::LOSVector losProfile;
+  LOSProfile(startPointGeo, endPointGeo, losProfile);
+  if (losProfile.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Error, losProfile not valid"
+                        << ", losProfile.size = " << losProfile.size();
+    return LineOfSight::LOS_ERROR;
+  }
+
+  // 2nd: lineOfSightCalculation
+  SituationMap::ElevationMapManager::LineOfSight eleMapMgrResult = this->lineOfSightCalculation(losProfile, startHat, endHat);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat
+                      << ", endPointGeo = " << endPointGeo << ", endPointHat = " << endHat
+                      << " -> LineOfSight " << static_cast<int>(eleMapMgrResult);
+  return eleMapMgrResult;
+}
+
+
+
+
+} // SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
new file mode 100755
index 000000000..10b38a4ce
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
@@ -0,0 +1,84 @@
+/**
+  * @RDE_HEADER@
+  * Manage and combine several ElevationMap
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "elevation_map_helper.h"
+#include <ElevationMap/situationmapelevationmap_export.h>
+#include <Common/situation_map_logging.h>
+
+#include <QObject>
+
+namespace SituationMap
+{
+
+// forward:
+class ElevationMap;
+
+//------------------------------------------------------------------------------------------------------------
+// ElevationMapManager
+//------------------------------------------------------------------------------------------------------------
+class SITUATIONMAPELEVATIONMAP_EXPORT ElevationMapManager final : public QObject
+{
+  using BaseClass = QObject;
+
+public:
+  ElevationMapManager();
+  ElevationMapManager(const ElevationMapManager &)              = delete;
+  ElevationMapManager &operator = (const ElevationMapManager &) = delete;
+  ~ElevationMapManager();
+
+  int init(const QStringList &filePaths_rough_to_fine);
+  void cleanupCurrentContent();
+
+  bool waitForInitialization();
+  bool isValid() const;
+
+
+  double elevation(double lon_rad, double lat_rad, bool *bIsCovered = nullptr) const;
+  double elevation(double lon_rad, double lat_rad, double defaultValue, bool *bIsCovered = nullptr) const;
+
+  // united extent of seperate files:
+  QRectF simpleUnitedExtent() const;
+
+  bool contains(const QPointF &point) const;
+
+  // Line of Sight Profile: berücksichtigt Erdkrümmung und WGS84 Erdellipsoid
+  void LOSProfile(const QPointF &start, const QPointF &end, LOSVector &losProfile);
+
+  /*! \name Line of Sight */
+  //@{
+  enum class LineOfSight { LOS_UNDEFINED,
+                           LOS_ERROR,
+                           LOS_VISIBLE,
+                           LOS_INVISIBLE };
+
+  LineOfSight lineOfSightCalculation(const LOSVector &losProfile,
+                                     double centerHat,
+                                     double objHat) const;
+
+  LineOfSight lineOfSightCalculation(const LtsUtils::QPoint3D &startPointGeo_absZ,
+                                     const LtsUtils::QPoint3D &endPointGeo_absZ);
+
+  LineOfSight lineOfSightCalculation(const QPointF &startPointGeo, double startHat,
+                                     const QPointF &endPointGeo, double endHat);
+
+  //@}
+
+protected:
+
+  class Private;
+
+  Private  *d;
+  LOGGER_T  m_logger;      ///< Interface of the Logging-Facility
+}; // ElevationMapManager
+
+
+} // SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.cpp
new file mode 100755
index 000000000..65a6a5805
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.cpp
@@ -0,0 +1,229 @@
+/**
+ * @RDE_HEADER@
+ * LineOfSightCalculation (L400)
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by N. Thoden, NLE, 06.04.2020
+  */
+
+#include "line_of_sight_calculation.h"
+#include "elevation_map.h"
+
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+//
+// ESRI / ARCGIS
+// if you link libEsriCommonQt, you propably have to add ArcGISQt5Hack AND: # make sure it's loaded *before* libEsriCommonQt.so
+// this may effect all executables linking situationMapElevationMap. CHECK!
+//
+
+
+// Qt
+#include <QTimer>
+#include <QElapsedTimer>
+
+
+// some helper functions
+inline Q_CONSTEXPR double pi()      { return M_PI; }
+inline Q_CONSTEXPR double deg2rad() { return pi() / 180.; }
+inline Q_CONSTEXPR double rad2deg() { return 1. / deg2rad(); }
+
+
+namespace SituationMap
+{
+
+LineOfSightCalculation::LineOfSightCalculation(ElevationMap *elevationMap)
+  : m_logger(getLogger("LineOfSightCalculation"))
+  , m_elevationMap(elevationMap)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+LineOfSightCalculation::~LineOfSightCalculation()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LineOfSightCalculation::calculate(ObserverTargetData &observerTarget, unsigned int sampleIntervallMeter)
+{
+  // same checks:
+  if (!m_elevationMap || !m_elevationMap->isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no elevationMap configured or not valid";
+    observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Undefined);
+    return false;
+  }
+
+  if (!observerTarget.isObserverAndTargetValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " observer and/or target not valid";
+    observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Undefined);
+    return false;
+  }
+
+  if (observerTarget.observer().toPointF() == observerTarget.target().toPointF())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " observer and target are identical regarding x and y";
+    observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Undefined);
+    return false;
+  }
+
+  bool success = true;
+
+  QElapsedTimer timer;
+  if (m_logger.isInfoEnabled())
+    timer.start();
+
+  //
+  //
+  // consider using ElevationMap::LOSProfile
+  //
+  //
+
+  // determine how many iterations we need:
+  double distanceInMeter = distanceMeter(observerTarget.observer(),
+                                         observerTarget.target());
+  //ERROR_LOG(m_logger) << LOGFUNCTION << " distanceMeter = " << distanceInMeter;
+
+  int maxNumberOfIterations = distanceInMeter / sampleIntervallMeter;  // check visibility every ~5m
+  // maxNumberOfIterations = 1000000;
+
+  if (maxNumberOfIterations<=0)
+    maxNumberOfIterations = 5;
+
+
+  double distanceFromObserverToTargetAsFraction = 0;
+  int i = 0;
+  while (i<maxNumberOfIterations)
+  {
+    ++i;
+
+    /*
+
+            z-axis (Elevation)     pCandidate
+            |----------           /
+            |          ----------
+            |                    ----------
+            |                              ----------
+            |                                        ----------
+            |------------------------------------------------------------ xy-axis
+               ^  ^  ^  ^  ^  ^  ^  ^  samples (every ~5meters)
+            ^                                                            ^
+            ObserverPosition                                             TargetPosition
+
+            On every sample position, check if directLineElevation (maximum) is
+            obstructed by elevationMapElevation (real value)
+            if (elevationMapElevation>directLineElevation) -> obstructed/break
+      */
+
+    distanceFromObserverToTargetAsFraction = (double)i/maxNumberOfIterations;
+
+
+    const Point3D &pCandidate = movePoint(observerTarget.observer(),
+                                          observerTarget.target(),
+                                          distanceFromObserverToTargetAsFraction);
+
+    //      {
+    //        static Point3D oldCandidate;
+    //        double distanceInMeter = distanceMeter(pCandidate, oldCandidate);
+    //        ERROR_LOG(m_logger) << LOGFUNCTION << " distanceMeter = " << distanceInMeter;
+    //        oldCandidate = pCandidate;
+    //      }
+
+
+    // z is the elevation of a *direct* line:
+    const double directLineElevation   = pCandidate.z();
+    const double elevationMapElevation = m_elevationMap->elevation(pCandidate.x(), pCandidate.y());
+
+    // Coord covered by elevationMap?
+    if (elevationMapElevation <= std::numeric_limits<int>::min())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Error, coordinate not covered be elevationData. Finish this LineOfSightCalculation."
+                          << " i=" << i
+                          << ", pCandidate = " << pCandidate;
+
+      // write back data
+      observerTarget.setObstacle(pCandidate);
+      observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Undefined);
+
+      // finish the loop:
+      success = false;
+      break;
+    }
+
+    // analyze / check visibility:
+    if (elevationMapElevation>directLineElevation)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " i=" << i
+                          << " break - pCandidate = " << pCandidate
+                          << " -> directLineElevation = " << directLineElevation
+                          << " -> elevationMapElevation = " << elevationMapElevation;
+
+      // write result
+      observerTarget.setObstacle(pCandidate);
+      observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Obstructed);
+
+      // finish the loop:
+      break;
+    } else {
+      observerTarget.setLineOfSightVisibility(LineOfSightVisibility::Visible);
+    }
+
+  } // while
+
+
+  if (m_logger.isInfoEnabled())
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " END"
+                       << ", success = " << success
+                       << ", " << i << " of "<< maxNumberOfIterations << " iterations"
+                       << ", distanceFromObserverToTargetAsFraction = " << distanceFromObserverToTargetAsFraction
+                       << ", pCandidate=" << observerTarget.obstacle()
+                       << ", lineOfSightVisibility=" << static_cast<int>(observerTarget.lineOfSightVisibility())
+                       << ", took [ms] " << timer.elapsed();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", success = " << success;
+  return success;
+}
+
+Point3D LineOfSightCalculation::movePoint(const Point3D &oberserver, const Point3D &target, double distanceFromObserverToTargetAsFraction) // 0.0 ... 1.0
+{
+  // positions are lon/lat @ rad.
+  // for evaluation we do that very simple:
+
+  // strange, but: using Point3D seems to be faster then using QPointF
+  const Point3D &dist  = target - oberserver;
+  const Point3D &point = oberserver + (dist * distanceFromObserverToTargetAsFraction);
+
+  return point;
+}
+
+double LineOfSightCalculation::distanceMeter(const Point3D &oberserver, const Point3D &target)
+{
+  // Try to avoid the dependency to ESRI (keep ArcGISQt5Hack in mind)
+  // And good accuracy is not required here
+  // use LtsCoordTrans::distance
+
+//  Esri::ArcGISRuntime::Point geom1(oberserver.x()*rad2deg(), oberserver.y()*rad2deg(), oberserver.z(), Esri::ArcGISRuntime::SpatialReference::wgs84());
+//  Esri::ArcGISRuntime::Point geom2(target.x()    *rad2deg(), target.y()    *rad2deg(), target.z()    , Esri::ArcGISRuntime::SpatialReference::wgs84());
+
+//  Esri::ArcGISRuntime::GeometryEngine *gEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+//  Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
+//                                                                                                 Esri::ArcGISRuntime::LinearUnitId::Meters,
+//                                                                                                 Esri::ArcGISRuntime::AngularUnitId::Degrees,
+//                                                                                                 Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+//  double distance = geodeticDistanceResult.distance();
+
+
+  double distance = LtsCoordTrans::distance(oberserver.toPointF(), target.toPointF());
+
+  return distance;
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.h
new file mode 100755
index 000000000..75f83426e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/line_of_sight_calculation.h
@@ -0,0 +1,92 @@
+/**
+  * @RDE_HEADER@
+  * LineOfSightCalculation (L400)
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by N. Thoden, NLE, 06.04.2020
+  */
+
+#pragma once
+
+#include <ElevationMap/situationmapelevationmap_export.h>
+#include <Common/situation_map_logging.h>
+
+#include <LtsUtilsCore/qpoint3d.h>
+using Point3D = LtsUtils::QPoint3D;  ///< x = lon ; y = lat , z = elevation/altitude in meters
+
+
+namespace SituationMap
+{
+
+// forward
+class ElevationMap;
+
+//----------------------------------------------------------------------------
+/*!
+  \brief Define visibility.
+ */
+enum class LineOfSightVisibility
+{
+  Undefined,        /*!< no data at that location? */
+  Visible,
+  Obstructed
+};
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+class SITUATIONMAPELEVATIONMAP_EXPORT ObserverTargetData
+{
+public:
+  explicit ObserverTargetData(const Point3D &oberserver = Point3D(),   // z-value: incl. observerHeight
+                              const Point3D &target     = Point3D())   // z-value: incl. targetHeight
+    : m_oberserver(oberserver)
+    , m_target(target)
+  {}
+
+  const Point3D &observer() const             { return m_oberserver;           }
+  const Point3D &target() const               { return m_target;               }
+
+  const Point3D &obstacle() const             { return m_obstacle;             }
+  void setObstacle(const Point3D &obstacle)   { m_obstacle = obstacle;         }
+
+  LineOfSightVisibility lineOfSightVisibility() const                   { return m_visible;               }
+  void setLineOfSightVisibility(const LineOfSightVisibility &visible)   { m_visible = visible;            }
+
+  bool isObserverAndTargetValid() const       { return (!m_oberserver.isNull()) && (!m_target.isNull());  }
+
+private:
+  Point3D m_oberserver;
+  Point3D m_target;
+
+  Point3D m_obstacle;
+  LineOfSightVisibility m_visible = LineOfSightVisibility::Undefined;
+};
+//----------------------------------------------------------------------------
+
+class SITUATIONMAPELEVATIONMAP_EXPORT LineOfSightCalculation
+{
+public:
+  explicit LineOfSightCalculation(ElevationMap *elevationMap);
+  ~LineOfSightCalculation();
+
+  bool calculate(ObserverTargetData &observerTarget, unsigned int sampleIntervallMeter = 5);
+
+protected:
+  static Point3D movePoint(const Point3D &oberserver,
+                           const Point3D &target,
+                           double distanceFromObserverToTargetAsFraction);
+
+  static double distanceMeter(const Point3D &oberserver,
+                              const Point3D &target);
+
+
+private:
+  LOGGER_T      m_logger;      ///< Interface of the Logging-Facility
+  ElevationMap *m_elevationMap = nullptr;
+
+  ObserverTargetData m_observerTarget;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/CMakeLists.txt
new file mode 100755
index 000000000..5c6ae4da9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/CMakeLists.txt
@@ -0,0 +1,49 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+# Qt6 + ArcGIS 300 migration: Qt5::->Qt6:: and gated on BUILD_ARCGIS (ArcGIS
+# dependent) to match the migrated Symbology convention.
+#
+# LIBRARY
+SET(FunctionDialog_SRCS
+  function_dialog.cpp
+  simple_esri_layer.cpp
+)
+
+SET(FunctionDialog_HDRS
+  function_dialog_export.h
+  function_dialog.h
+  simple_esri_layer.h
+)
+
+SET(FunctionDialog_ICONS
+  state_icon_b.xpm
+  state_icon_a.xpm
+  state_icon_c.xpm
+)
+
+SOURCE_GROUP(FunctionDialog FILES ${FunctionDialog_SRCS} ${FunctionDialog_HDRS})
+IF(BUILD_ARCGIS)
+NGL_ADD_LIBRARY(WS situationMapFunctionDialog SHARED ${FunctionDialog_SRCS} ${FunctionDialog_HDRS})
+
+NGL_TARGET_LINK_LIBRARIES(situationMapFunctionDialog
+  PRIVATE
+    NGLLogger
+    LtsCoordTrans
+    LtsWidgets
+    advancedSymbologyGui
+    Qt6::OpenGL           # Qt6: ArcGIS SDK OpenGLGraphicsDevice uses QOpenGLPaintDevice (libQt6OpenGL)
+    Qt6::OpenGLWidgets    # Qt6: ArcGIS SDK uses QOpenGLWidget (separate lib in Qt6)
+  PUBLIC
+    ArcGIS::ArcGIS
+    situationMap
+    situationMapObjects
+    situationMapPortal
+    Qt6::Core
+    Qt6::Widgets
+)
+
+NGL_INSTALL_TARGET(situationMapFunctionDialog)
+ENDIF() # BUILD_ARCGIS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.cpp
new file mode 100755
index 000000000..a2ab8482e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.cpp
@@ -0,0 +1,8926 @@
+/**
+  * @RDE_HEADER@
+  * FunctionDialog
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "function_dialog.h"
+#include "simple_esri_layer.h"
+#include <Map/map_notifier.h>
+#include <Map/location_display.h>
+#include <Map/measurement.h>
+#include <Map/viewshed.h>
+#include <Map/coord_translation_functor.h>
+#include <MapImpl/layer_control_widget.h>
+#include <MapImpl/map_impl.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <MapImpl/grid_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <Map/situation_map_utils.h>
+#include <Symbology/symbol_dictionary.h>
+#include <Symbology/symbol_properties.h>
+#include <Symbology/sidc_codec.h>
+#include <SymbologyGui/base_symbol_lookup_dialog.h>
+#include <Symbology/sidc_builder_base.h>
+
+#include <Map/object_factory.h>
+#include <Map/bounding_box.h>
+#include <Map/overview_map_handler.h>
+
+#include <Map/object_indicator.h>
+#include <Map/viewshed.h>
+#include <Map/sight_fan.h>
+
+#include <MathUtils/math_const.h>
+#include <MathUtils/geometry_engine.h>
+
+#include <Map/overlay_handler.h>
+#include <Map/abstract_map_object.h>   // 300 build: RefPointer<AbstractMapObject> needs the complete type
+#include <MapObjects/map_object_indicator.h>
+#include <MapObjects/polygon.h>
+#include <MapObjects/polyline.h>
+#include <MapObjects/text.h>
+#include <MapObjects/geometry.h>
+
+#include <MapObjects/participant.h>
+#include <MapObjects/area_fire.h>
+#include <MapObjects/building_outline.h>
+#include <MapObjects/biological_agent.h>
+#include <MapObjects/chemical_agent.h>
+#include <MapObjects/cube.h>
+#include <MapObjects/danger_area.h>
+#include <MapObjects/functional_area.h>
+#include <MapObjects/geo_image.h>
+#include <MapObjects/hit_line.h>
+#include <MapObjects/line_of_sight.h>
+#include <MapObjects/mine.h>
+#include <MapObjects/mine_field.h>
+#include <MapObjects/nuclear_agent.h>
+#include <MapObjects/single_fire.h>
+#include <MapObjects/sound_area.h>
+#include <MathUtils/simple_helper.h>
+#include <Rubberbands/rubberband_factory.h>
+
+#include <SituationMap/Common/resource_path.h>
+
+
+// Portal
+#include <Portal/portal.h>
+
+#include <LtsCoordTrans/lts_coord_trans.h>
+#include <LtsWidgets/lts_drag_icon.h>
+#include <assert.h>
+
+// RME LocalServer
+#ifdef USE_LOCAL_SERVER
+#  include <LocalSrv/local_server.h>
+#endif // USE_LOCAL_SERVER
+
+
+// ESRI
+#include <Map.h>
+//#include <ArcGISRuntime.h>
+#include <Envelope.h>
+#include <MapGraphicsView.h>
+#include <SceneGraphicsView.h>
+//#include <CoordinateConversion.h>
+#include <GraphicsOverlay.h>
+#include <TextSymbol.h>
+#include <SimpleMarkerSymbol.h>
+#include <SimpleFillSymbol.h>
+#include <PictureMarkerSymbol.h>
+#include <Point.h>
+#include <PolylineBuilder.h>
+#include <PolygonBuilder.h>
+//#include <MultiPath.h>
+#include <GeometryEngine.h>
+#include <SimpleRenderer.h>
+#include <UniqueValueRenderer.h>
+
+#include <Raster.h>
+#include <RasterLayer.h>
+#include <AnalysisOverlay.h>
+#include <ExploratoryLocationViewshed.h>  // 300: LocationViewshed renamed to ExploratoryLocationViewshed
+
+// 300: defining headers for types only fwd-declared by the parent SDK headers
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <Viewpoint.h>
+#include <LayerSceneProperties.h>
+#include <RendererSceneProperties.h>
+#include <Polygon.h>
+#include <UniqueValue.h>
+#include <SimpleLineSymbol.h>
+#include <SymbolTypes.h>                  // 300: SimpleFillSymbolStyle/SimpleMarkerSymbolStyle/SceneSymbolAnchorPosition/SimpleLineSymbolStyle enums
+#include <LinearUnit.h>
+#include <GeodesicEllipseParameters.h>
+#include <Part.h>
+#include <ImmutablePointCollection.h>
+#include <ImmutablePartCollection.h>
+#include <ImmutablePart.h>
+#include <PartCollection.h>
+#include <AttributeListModel.h>
+
+// 3D
+#include <SimpleMarkerSceneSymbol.h>
+#include <ModelSceneSymbol.h>
+
+
+
+// Qt
+#include <QCoreApplication>
+#include <QDir>
+#include <QTimer>
+#include <QDialog>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QTabWidget>
+#include <QMessageBox>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QPainter>
+#include <QProgressDialog>
+#include <QTreeView>
+#include <QDial>
+#include <QRect>
+#include <QMap>
+#include <QGraphicsProxyWidget>
+#include <QThread>
+#include <QFileDialog>
+#include <QElapsedTimer>
+
+#include <iostream>
+
+
+void appendQPointF(SituationMap::PositionCont &posCont, const QPointF &point)
+{
+  posCont.append(SituationMap::Point3D::fromQPointF(point));
+}
+
+
+void drawEllipse(Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                 const Esri::ArcGISRuntime::Point &mapPoint,
+                 const double &semiAxis1Length,
+                 const double &semiAxis2Length,
+                 const double &maxSegmentLength,
+                 const QColor &color)
+{
+  Esri::ArcGISRuntime::GeodesicEllipseParameters ePara;
+  ePara.setGeometryType(Esri::ArcGISRuntime::GeometryType::Polygon);
+
+  // 1
+  ePara.setMaxSegmentLength(maxSegmentLength);
+
+  // 2
+  // 300: normalizeCentralMeridian() returns Geometry (was Point); wrap for setCenter(const Point&)
+  Esri::ArcGISRuntime::Point normalizedPt =
+    Esri::ArcGISRuntime::Point(Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint));
+  ePara.setCenter(normalizedPt);
+
+  // 3, 4
+  ePara.setSemiAxis1Length(semiAxis1Length);
+  ePara.setSemiAxis2Length(semiAxis2Length);
+
+  // 5
+  ePara.setAxisDirection(/*axisDirection*/90);
+
+  // Unit???????
+
+  Esri::ArcGISRuntime::Geometry ellipseGeometry = Esri::ArcGISRuntime::GeometryEngine::ellipseGeodesic(ePara);
+
+  if (ellipseGeometry.isEmpty())
+    qWarning() << " There was an error computing the geodesic ellipse. Try a different segment length.";
+  else
+  {
+    Esri::ArcGISRuntime::Polygon polygon(ellipseGeometry);
+
+    QColor fillColor = color;
+    fillColor.setAlpha(150);
+
+    Esri::ArcGISRuntime::Graphic *ellipseGraphic = new Esri::ArcGISRuntime::Graphic();
+    ellipseGraphic->setGeometry(polygon);
+    Esri::ArcGISRuntime::SimpleFillSymbol ellipseSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, fillColor);
+    ellipseGraphic->setSymbol(&ellipseSymbol);
+    graphicsLayer->graphics()->append(ellipseGraphic);
+
+//    for (int count = 0; count < ellipse.pointCount(); count++)
+//    {
+//      EsriRuntimeQt::Graphic *pointGraphic =
+//        new EsriRuntimeQt::Graphic(ellipse.point(count), EsriRuntimeQt::SimpleMarkerSymbol(color, 3));
+//      graphicsLayer->graphics()->append(pointGraphic);
+//    }
+  }
+
+}
+
+
+namespace SituationMap
+{
+static LtsCoordTrans::UtmCoordinate s_basePoint;
+
+static OperatorMapSettings &  s_operatorMapSettings()
+{
+  static OperatorMapSettings operatorMapSettings;
+  return operatorMapSettings;
+}
+
+
+class FunctionDialog::Private
+{
+public:
+  static QHash<Map *, FunctionDialog *> s_activeFunctionDialogMap;
+  static void cleanupActiveFunctionDialogMap()
+  {
+    s_activeFunctionDialogMap.clear();
+  }
+
+  Private()  = default;
+  ~Private() = default;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::Map                   *m_esriMap           = nullptr;
+  Esri::ArcGISRuntime::GeoView               *m_mapGeoView   = nullptr;
+  Esri::ArcGISRuntime::GraphicsOverlay       *m_graphicsLayer     = nullptr;
+  Esri::ArcGISRuntime::GraphicsOverlay       *m_graphicsLayerDict = nullptr;
+
+  // OWN data:
+  RenderingMode                               m_renderMode = RenderingMode::Dynamic;
+  SituationMap::Map                          *m_mapInterface      = nullptr;
+  SituationMap::MapImpl                      *m_mapImpl           = nullptr;
+  QLabel                                     *m_lbMapPosition     = nullptr;
+  QLabel                                     *m_lbPixelSize       = nullptr;
+
+  QPushButton                                *m_pbDump            = nullptr;
+  QPushButton                                *m_pbGrid            = nullptr;
+  QPushButton                                *m_pbVisibility      = nullptr;
+  QPushButton                                *m_pbVisibilityTechn = nullptr;
+  QPushButton                                *m_pbVisibilityTact  = nullptr;
+
+  QPushButton                                *m_pbSelected        = nullptr;
+
+  QPushButton                                *m_pbPicking         = nullptr;
+  QList<UniqueMapId>                        m_objectsWithBoundingBox;
+
+  QPushButton                                *m_pbBoundingBox     = nullptr;
+
+  QPushButton                                *m_pbBB2             = nullptr;
+
+  QPushButton                                *m_pbPickByArea      = nullptr;
+
+  QDial                                      *m_dialMapRotation        = nullptr;
+  float                                       getMapRotation()
+  {
+    float rotationAngle = 1.0;
+    if (m_dialMapRotation)
+      rotationAngle = m_dialMapRotation->value();
+    return rotationAngle;
+  }
+
+
+  QSlider                                    *m_slSymbolSize        = nullptr;
+  float                                       getScale()
+  {
+    float scale = 1.0f;
+    if (m_slSymbolSize)
+      scale = m_slSymbolSize->value() / 100.0f;
+    return scale;
+  }
+
+  QSlider                                    *m_slSymbolOpacity        = nullptr;
+  float                                       getSymbolOpacity()
+  {
+    float opac = 1.0f;
+    if (m_slSymbolOpacity)
+      opac = m_slSymbolOpacity->value() / 100.0f;
+    return opac;
+  }
+
+
+  QSlider                                    *m_slDrawOrder       = nullptr;
+  int                                         getDrawOrder()
+  {
+    int drawOrder = 1;
+    if (m_slDrawOrder)
+      drawOrder = m_slDrawOrder->value();
+    return drawOrder;
+  }
+
+  QPushButton                                *m_pbOverviewMap     = nullptr;
+  QPushButton                                *m_pbBackupOms       = nullptr;
+  QPushButton                                *m_pbRestoreOms      = nullptr;
+
+  QPushButton                                *m_pbRemove          = nullptr;
+  QPushButton                                *m_pbRemoveAll       = nullptr;
+  QPushButton                                *m_pbClose           = nullptr;
+
+  QTabWidget                                 *m_tabwidget         = nullptr;
+
+  SimpleEsriLayer                            *m_simpleEsriLayer      = nullptr;
+  int                                         m_simpleEsriLayerIndex = -1;
+
+  LayerControlWidget                         *m_layerControlWidget = nullptr;
+  int                                         m_layerControlIndex  =  -1;
+
+
+  // Performance:
+  QLineEdit                                  *m_layerPerf_leLayer  = nullptr;
+  QLineEdit                                  *m_layerPerf_leObject = nullptr;
+  QLineEdit                                  *m_layerPerf_leRadius = nullptr;
+  QCheckBox                                  *m_layerPerf_cbText   = nullptr;
+
+
+  // Tools/Viewshed
+  QLineEdit                                  *m_viewshedDistance       = nullptr;
+
+  QLineEdit                                  *m_sightFanObserverHeight = nullptr;
+  QLineEdit                                  *m_sightFanTargetHeight   = nullptr;
+
+
+  bool                                        m_visibility        = true;
+  bool                                        m_visibilityTechn   = true;
+  bool                                        m_visibilityTact    = true;
+
+  bool                                        m_selected          = false;
+
+  bool                                        m_pickable           = true;
+
+  QLineEdit                                  *m_leSidc            = nullptr;
+
+
+  QComboBox                                  *m_cbMultiPointSidc         = nullptr;
+  Esri::ArcGISRuntime::TextSymbol            *m_textSymbolMultiPointSidc = nullptr;
+  Esri::ArcGISRuntime::Graphic               *m_tsGraphicMultiPointSidc  = nullptr;
+
+
+  QComboBox                                  *m_cbRubSidc         = nullptr;
+
+  QPointF                                     m_objectBasePoint   = QPointF(0, 0);
+
+  // Graphics3D
+  struct object3D_data
+  {
+    std::shared_ptr<Esri::ArcGISRuntime::Graphic> m_graphic;
+    Esri::ArcGISRuntime::Point   m_position;
+  };
+  QVector<object3D_data>                      m_impactCircleSphere;
+  QVector<object3D_data>                      m_impactCone;
+  QVector<object3D_data>                      m_3dModel;
+  QVector<object3D_data>                      m_impactConeViaUniqueValueRenderer;
+
+
+
+  //
+  static void clearMapObjectPtr(RefPointer<SituationMap::AbstractMapObject> mapObj)
+  {
+    if (mapObj)
+      mapObj->removeMySelf();
+  }
+
+  RefPointer<SituationMap::Polygon>           m_polygon;
+  RefPointer<SituationMap::Polyline>          m_polyline;
+  RefPointer<SituationMap::Text>              m_text;
+
+  //
+  RefPointer<SituationMap::Participant>       m_participant;
+
+  RefPointer<SituationMap::AreaFire>          m_areaFire;
+  RefPointer<SituationMap::BuildingOutline>   m_building;
+  RefPointer<SituationMap::BiologicalAgent>   m_bAgent;
+  RefPointer<SituationMap::ChemicalAgent>     m_cAgent;
+  RefPointer<SituationMap::Cube>              m_cube;
+  RefPointer<SituationMap::DangerArea>        m_dangerArea;
+  RefPointer<SituationMap::FunctionalArea>    m_functionalArea;
+  RefPointer<SituationMap::GeoImage>          m_geoImage;
+  RefPointer<SituationMap::SoundArea>         m_soundArea;
+  RefPointer<SituationMap::HitLine>           m_hitLine;
+  RefPointer<SituationMap::LineOfSight>       m_lineOfSight;
+  RefPointer<SituationMap::Mine>              m_mine;
+  RefPointer<SituationMap::MineField>         m_mineField;
+  RefPointer<SituationMap::NuclearAgent>      m_nuclearAgent;
+  RefPointer<SituationMap::NuclearAgent>      m_virtualSingleMineAgent;
+  RefPointer<SituationMap::SingleFire>        m_singleFire;
+
+  RefPointer<SituationMap::Polyline>          m_basePoint;
+
+  const QList< RefPointer<AbstractMapObject> >      getObjList()
+  {
+    QList<RefPointer<AbstractMapObject> > objList =
+      m_mapInterface->objectFactory().getAllObjects();
+    return objList;
+  }
+
+
+}; // class FunctionDialog::Private
+QHash<Map *, FunctionDialog *> FunctionDialog::Private::s_activeFunctionDialogMap;
+//-----------------------------------------------------------------------------
+
+FunctionDialog::FunctionDialog(Esri::ArcGISRuntime::Map             *esriMap,
+                               Esri::ArcGISRuntime::MapGraphicsView *esriView,
+                               QWidget                              *parent)
+  : QWidget(parent)
+  , d(new Private)
+{
+  qDebug() << LOGFUNCTION << " BEGIN";
+  this->setObjectName(QLatin1String("SituationMapFunctionDialog"));
+  d->m_esriMap         = esriMap;
+  d->m_mapGeoView      = esriView;
+
+  qDebug() << LOGFUNCTION << " BEGIN";
+
+  init();
+}
+
+FunctionDialog::FunctionDialog(Map *map)
+  : QWidget(nullptr)
+  , d(new Private)
+{
+  qDebug() << LOGFUNCTION << " BEGIN";
+  this->setObjectName(QLatin1String("SituationMapFunctionDialog"));
+  d->m_mapInterface = map;
+  d->m_mapImpl      = dynamic_cast<MapImpl *>(d->m_mapInterface);
+
+  if (d->m_mapImpl)
+  {
+    d->m_esriMap    = d->m_mapImpl->getEsriMap();
+    d->m_mapGeoView = d->m_mapImpl->getEsriGeoView();
+
+    // define
+    QLatin1String layerName("FunctionDialog");
+    d->m_renderMode = RenderingMode::Dynamic;
+
+    // prepare
+    LayerFactoryImpl &layerFactory = d->m_mapImpl->layerFactoryImpl();
+    layerFactory.addOperationalLayer(layerName, layerName, d->m_renderMode);
+
+    // create corresponding layer:
+    d->m_graphicsLayer      = layerFactory.getGraphicsLayer(layerName);
+    d->m_graphicsLayerDict  = layerFactory.getGraphicsLayerDict(layerName);
+  }
+
+  init();
+
+  connect(map, &Map::beginDestroy, this, &FunctionDialog::onDestroyed);
+
+  FunctionDialog::Private::s_activeFunctionDialogMap[d->m_mapInterface] = this;
+
+  qAddPostRoutine(FunctionDialog::Private::cleanupActiveFunctionDialogMap);
+
+}
+
+FunctionDialog::~FunctionDialog()
+{
+  qDebug() << LOGFUNCTION << " END";
+  FunctionDialog::Private::s_activeFunctionDialogMap.remove(d->m_mapInterface);
+  delete d;
+}
+
+
+void FunctionDialog::onDestroyed()
+{
+  qDebug() << LOGFUNCTION << " commit suicide";
+  delete this;
+}
+
+
+void FunctionDialog::addButtonToMap(Map *map, bool isVisible)
+{
+  if (!map || !map->getQGraphicsView())
+  {
+    qWarning() << LOGFUNCTION << " no map!!!";
+    std::cerr << LOGFUNCTION << " no map!!!" << std::endl;
+    return;
+  }
+
+  // create button:
+  QPushButton *pbFunctionDialog = new QPushButton(QLatin1String("FunctionDialog"));
+  pbFunctionDialog->setObjectName(QLatin1String("QPushButton-FunctionDialog"));
+  pbFunctionDialog->setAttribute(Qt::WA_AcceptTouchEvents);
+  // add button
+//  MapImpl *mapImpl = static_cast<MapImpl*>();
+//  EsriRuntimeQt::MapGraphicsView *mapGraphicsView = mapImpl->getEsriMapGraphicsView();
+
+  // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+  // Adding a widget will let the application crash
+  // Workaround: 'proxy->setOpacity(0.99);'
+  QGraphicsProxyWidget *proxy = map->getQGraphicsView()->scene()->addWidget(pbFunctionDialog);
+  proxy->setOpacity(0.99);
+
+  // enable/disable button
+  pbFunctionDialog->setStyleSheet(QLatin1String("QPushButton {background-color: red;}"));
+  pbFunctionDialog->setEnabled(false);
+
+  QPointer<MapNotifier> mapNotifier = map->createMapNotifier();
+  if (mapNotifier)
+  {
+    connect(mapNotifier.data(), &MapNotifier::mapReadyAndSymbolDictionaryLoaded, map, [pbFunctionDialog] ()
+    {
+      pbFunctionDialog->setStyleSheet(QLatin1String("QPushButton {background-color: gray;}"));
+      pbFunctionDialog->setEnabled(true);
+    });
+    mapNotifier->run();
+  }
+
+  pbFunctionDialog->setVisible(isVisible);
+
+
+  // add action to button
+  // c++11 -> lambda :-)
+  connect(pbFunctionDialog, &QPushButton::clicked, map, [map]()
+  {
+
+    // Keep multiple MapWidget in mind!
+    if (!FunctionDialog::Private::s_activeFunctionDialogMap.contains(map))
+      FunctionDialog::Private::s_activeFunctionDialogMap[map] = new SituationMap::FunctionDialog(map);
+
+    SituationMap::FunctionDialog *functionDialog = FunctionDialog::Private::s_activeFunctionDialogMap[map];
+
+// //     map->getQGraphicsView()->scene()->addWidget(functionDialog);  // just for testing
+
+    functionDialog->raise();
+    functionDialog->show();
+    functionDialog->move(100, 100);
+  }, Qt::QueuedConnection);
+
+}
+
+void FunctionDialog::init()
+{
+  setAttribute(Qt::WA_DeleteOnClose);
+
+  s_basePoint = LtsCoordTrans::UtmCoordinate::fromMgrs(QLatin1String("32UMD000000000000"));  // Bremen  32UMD000000000000
+//  s_basePoint = LtsCoordTrans::UtmCoordinate::fromMgrs(QLatin1String("32TNT000000000000"));  //
+//  s_basePoint = LtsCoordTrans::UtmCoordinate::fromMgrs(QLatin1String("32UPD000000000000"));  // Salchau 32UPD000000000000
+  qWarning() << " s_basePoint: "
+             << " x=" << s_basePoint.x
+             << " y=" << s_basePoint.y;
+
+  qint64 myPid = QCoreApplication::applicationPid();
+  QString symType(QLatin1String("noSymType"));
+  if (d->m_mapImpl)
+    symType = toString(d->m_mapImpl->symbologyType());
+
+  QString title = QStringLiteral("FunctionDialog (symType=%1) (Rendering=%2) (pid=%3)")
+                  .arg(symType, toString(d->m_renderMode))
+                  .arg(myPid);
+
+  setWindowTitle(title);
+
+  QHBoxLayout *layout = new QHBoxLayout(this);
+
+  QVBoxLayout *leftLayout = new QVBoxLayout();
+  layout->addLayout(leftLayout);
+
+
+  QPushButton *pbToBremen = new QPushButton(QLatin1String("Center to Bremen"), this);
+  leftLayout->addWidget(pbToBremen);
+  connect(pbToBremen, &QPushButton::clicked, this, [this]()
+  {
+    if (d->m_mapImpl->isReady())
+      d->m_mapImpl->setCenterPoint(QPointF(0.155, 0.925));
+  });
+
+
+  QComboBox *cbCenterTo = new QComboBox(this);
+  leftLayout->addWidget(cbCenterTo);
+
+  QVariant data;
+  data.setValue(QPointF(0.155, 0.925));
+  cbCenterTo->addItem(QStringLiteral("Bremen"), data);
+
+  data.setValue(QPointF(0.158, 0.928));
+  cbCenterTo->addItem(QStringLiteral("Schnoeggersburg"), data);
+
+  data.setValue(QPointF(0.155, 0.925));
+  cbCenterTo->addItem(QStringLiteral("AHTC"), data);
+
+  connect(cbCenterTo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this, cbCenterTo](int)
+  {
+    if (!d->m_mapImpl->isReady())
+      return;
+    QPointF p = cbCenterTo->currentData().toPointF();
+    d->m_mapImpl->setCenterPoint(p);
+  });
+
+
+
+  d->m_lbMapPosition = new QLabel;
+  leftLayout->addWidget(d->m_lbMapPosition);
+
+  d->m_lbPixelSize = new QLabel;
+  leftLayout->addWidget(d->m_lbPixelSize);
+
+
+  d->m_tabwidget = new QTabWidget();
+  leftLayout->addWidget(d->m_tabwidget);
+
+  // make connection to receive mouse position signals
+
+  connect(d->m_mapInterface, &Map::mouseWindowPositionChanged, this, &FunctionDialog::onMouseWindowPositionChanged);
+  connect(d->m_mapInterface, &Map::mouseMapPositionChanged   , this, &FunctionDialog::onMouseMapPositionChanged);
+  connect(d->m_mapInterface, &Map::mouseGeoPositionChanged   , this, &FunctionDialog::onMouseGeoPositionChanged);
+
+  connect(d->m_mapInterface, &Map::extentChanged, this, &FunctionDialog::onExtendChanged, Qt::QueuedConnection);
+
+  //-----------------------------------
+  // Visibility
+  //-----------------------------------
+  QVBoxLayout *vBoxLayout = new QVBoxLayout();
+  layout->addLayout(vBoxLayout);
+
+  if (d->m_mapImpl)
+  {
+    d->m_pbGrid = new QPushButton(QLatin1String("Grid"));
+    if (d->m_mapImpl->grid().isVisible())
+      d->m_pbGrid->setText(QLatin1String("Grid is ON "));
+    else
+      d->m_pbGrid->setText(QLatin1String("Grid is OFF"));
+    vBoxLayout->addWidget(d->m_pbGrid);
+    connect(d->m_pbGrid, &QPushButton::clicked, this, &FunctionDialog::onToggleGrid);
+  }
+
+  d->m_pbVisibility = new QPushButton(QLatin1String("Visibility"));
+  if (d->m_visibility)
+    d->m_pbVisibility->setText(QLatin1String("Visibility is ON "));
+  else
+    d->m_pbVisibility->setText(QLatin1String("Visibility is OFF"));
+  vBoxLayout->addWidget(d->m_pbVisibility);
+  connect(d->m_pbVisibility, &QPushButton::clicked, this, &FunctionDialog::onToggleVisibility);
+
+  d->m_pbVisibilityTechn = new QPushButton(QLatin1String("VisiTechn."));
+  if (d->m_visibilityTechn)
+    d->m_pbVisibilityTechn->setText(QLatin1String("VisiTechn is ON "));
+  else
+    d->m_pbVisibilityTechn->setText(QLatin1String("Visibility is OFF"));
+  vBoxLayout->addWidget(d->m_pbVisibilityTechn);
+  connect(d->m_pbVisibilityTechn, &QPushButton::clicked, this, &FunctionDialog::onToggleVisibilityTechn);
+
+  d->m_pbVisibilityTact = new QPushButton(QLatin1String("VisiTact."));
+  if (d->m_visibilityTact)
+    d->m_pbVisibilityTact->setText(QLatin1String("VisiTact is ON "));
+  else
+    d->m_pbVisibilityTact->setText(QLatin1String("VisiTact is OFF"));
+  vBoxLayout->addWidget(d->m_pbVisibilityTact);
+  connect(d->m_pbVisibilityTact, &QPushButton::clicked, this, &FunctionDialog::onToggleVisibilityTact);
+
+
+  d->m_pbSelected = new QPushButton(QLatin1String("Selection"));
+  if (d->m_selected)
+    d->m_pbSelected->setText(QLatin1String("Selection is ON "));
+  else
+    d->m_pbSelected->setText(QLatin1String("Selection is OFF"));
+  vBoxLayout->addWidget(d->m_pbSelected);
+  connect(d->m_pbSelected, &QPushButton::clicked, this, &FunctionDialog::onToggleSelection);
+
+  d->m_pbPicking = new QPushButton(QLatin1String("Picking"));
+  if (d->m_pickable)
+    d->m_pbPicking->setText(QLatin1String("Picking is ON "));
+  else
+    d->m_pbPicking->setText(QLatin1String("Picking is OFF"));
+  vBoxLayout->addWidget(d->m_pbPicking);
+  connect(d->m_pbPicking, &QPushButton::clicked, this, &FunctionDialog::onTogglePicking);
+
+
+  d->m_pbBoundingBox = new QPushButton(QLatin1String("BoundingBox is ON "));
+  if (d->m_objectsWithBoundingBox.isEmpty())
+    d->m_pbBoundingBox->setText(QLatin1String("BoundingBox is OFF"));
+  else
+    d->m_pbBoundingBox->setText(QLatin1String("BoundingBox is ON"));
+  vBoxLayout->addWidget(d->m_pbBoundingBox);
+  connect(d->m_pbBoundingBox, &QPushButton::clicked, this, &FunctionDialog::onToggleBoundingBox);
+
+
+  d->m_pbBB2 = new QPushButton(QLatin1String("BB2"));
+  vBoxLayout->addWidget(d->m_pbBB2);
+  connect(d->m_pbBB2, &QPushButton::clicked, this, &FunctionDialog::onToggleBB2);
+
+
+  d->m_pbPickByArea = new QPushButton(QLatin1String("pick by area"));
+  vBoxLayout->addWidget(d->m_pbPickByArea);
+  connect(d->m_pbPickByArea, &QPushButton::clicked, this, [this]()
+  {
+    d->m_mapInterface->pickMapObjectsArea();
+  });
+
+
+  // picking:
+  connect(d->m_mapInterface, &Map::mapObjectsPickedByArea, this, [](const SituationMap::Map::RefPointerMapObjectList & mapObjList)
+  {
+    qCritical() << " GUI is not available anymore, moved to AdapterDds.";
+
+    QList<UniqueMapId> uniqueMapIds;
+    uniqueMapIds.reserve(mapObjList.size());
+
+    for (RefPointer<AbstractMapObject> mapObj : mapObjList)
+    {
+      uniqueMapIds.append(mapObj->uniqueMapId());
+
+      qCritical() << " mapObjectsPickedByArea: " << mapObj->uniqueMapId()
+                  << " , mapObj->debugInfo: " << mapObj->debugInfo();
+    }
+
+  });
+
+
+  vBoxLayout->addWidget(new QLabel(QLatin1String("MapRotation:")));
+
+  QPushButton *pbMapRotation = new QPushButton(QLatin1String("MapRotation to 0"));
+  pbMapRotation->setToolTip(QLatin1String("reset rotation"));
+  vBoxLayout->addWidget(pbMapRotation);
+
+  d->m_dialMapRotation = new QDial();
+  d->m_dialMapRotation->setMinimum(-180);
+  d->m_dialMapRotation->setMaximum(180);
+  d->m_dialMapRotation->setValue(0);
+
+//  d->m_dialMapRotation->setTickInterval(10);
+  d->m_dialMapRotation->setSingleStep(10);
+
+  vBoxLayout->addWidget(d->m_dialMapRotation);
+  connect(d->m_dialMapRotation, &QSlider::valueChanged, this, &FunctionDialog::onMapRotationChanged);
+
+  // enable 'reset'
+  connect(pbMapRotation, &QPushButton::pressed, this, [this]()
+  {
+    d->m_dialMapRotation->setValue(0);  // reset
+  });
+
+
+
+  QLabel *lbSymScale = new QLabel(QLatin1String("SymSize:"));
+  vBoxLayout->addWidget(lbSymScale);
+
+  d->m_slSymbolSize = new QSlider(Qt::Horizontal);
+  d->m_slSymbolSize->setMinimum(5);
+  d->m_slSymbolSize->setMaximum(500);
+  d->m_slSymbolSize->setValue(100);
+
+  d->m_slSymbolSize->setTickInterval(50);
+  d->m_slSymbolSize->setSingleStep(1);
+
+  vBoxLayout->addWidget(d->m_slSymbolSize);
+  connect(d->m_slSymbolSize, &QSlider::valueChanged, this, &FunctionDialog::onSymbolSizeChanged);
+
+
+  QLabel *lbSymOpacity = new QLabel(QLatin1String("SymOpacity:"));
+  vBoxLayout->addWidget(lbSymOpacity);
+
+  d->m_slSymbolOpacity = new QSlider(Qt::Horizontal);
+  d->m_slSymbolOpacity->setMinimum(10);
+  d->m_slSymbolOpacity->setMaximum(90);
+  d->m_slSymbolOpacity->setValue(50);
+
+  d->m_slSymbolOpacity->setTickInterval(10);
+  d->m_slSymbolOpacity->setSingleStep(10);
+
+  vBoxLayout->addWidget(d->m_slSymbolOpacity);
+  connect(d->m_slSymbolOpacity, &QSlider::valueChanged, this, &FunctionDialog::onSymbolOpacityChanged);
+
+
+  QLabel *lbDrawOrder = new QLabel(QLatin1String("DrawOrder:"));
+  vBoxLayout->addWidget(lbDrawOrder);
+
+  d->m_slDrawOrder = new QSlider(Qt::Horizontal);
+  d->m_slDrawOrder->setMinimum(-100);
+  d->m_slDrawOrder->setMaximum(100);
+  d->m_slDrawOrder->setValue(0);
+
+  d->m_slDrawOrder->setTickInterval(1);
+  d->m_slDrawOrder->setSingleStep(1);
+
+  vBoxLayout->addWidget(d->m_slDrawOrder);
+  connect(d->m_slDrawOrder, &QSlider::valueChanged, this, &FunctionDialog::onDrawOrderChanged);
+
+
+  //-----------------------------------
+  vBoxLayout->addStretch();
+
+  d->m_pbOverviewMap = new QPushButton(QLatin1String("OverviewMap on/off"));
+  vBoxLayout->addWidget(d->m_pbOverviewMap);
+  connect(d->m_pbOverviewMap, &QPushButton::clicked, this, &FunctionDialog::onOverviewMap);
+
+
+  //-----------------------------------
+  // Operator Map Settings
+  //-----------------------------------
+  d->m_pbBackupOms = new QPushButton(QLatin1String("backup Operator Map Settings"));
+  vBoxLayout->addWidget(d->m_pbBackupOms);
+  connect(d->m_pbBackupOms, &QPushButton::clicked, this, &FunctionDialog::onBackupOms);
+
+  d->m_pbRestoreOms = new QPushButton(QLatin1String("restore Operator Map Settings"));
+  vBoxLayout->addWidget(d->m_pbRestoreOms);
+  connect(d->m_pbRestoreOms, &QPushButton::clicked, this, &FunctionDialog::onRestoreOms);
+
+
+  //-----------------------------------
+  // Remove
+  //-----------------------------------
+  d->m_pbRemove = new QPushButton(QLatin1String("Remove couple"));
+  vBoxLayout->addWidget(d->m_pbRemove);
+  connect(d->m_pbRemove, &QPushButton::clicked, this, &FunctionDialog::onRemove);
+
+  d->m_pbRemoveAll = new QPushButton(QLatin1String("Remove ALL"));
+  vBoxLayout->addWidget(d->m_pbRemoveAll);
+  connect(d->m_pbRemoveAll, &QPushButton::clicked, this, &FunctionDialog::onRemoveAll);
+
+
+  //-----------------------------------
+  // Dump
+  //-----------------------------------
+  d->m_pbDump = new QPushButton(QLatin1String("Dump (ESRI)"));
+  vBoxLayout->addWidget(d->m_pbDump);
+  connect(d->m_pbDump, &QPushButton::clicked, this, &FunctionDialog::onDump);
+
+  // Screenshot
+  QPushButton *pbScreenshot = new QPushButton(QLatin1String("Screenshot - grab()"));
+  vBoxLayout->addWidget(pbScreenshot);
+  connect(pbScreenshot, &QPushButton::clicked, this, []()
+  {
+    QString imageName = QDir::tempPath() + QLatin1String("/sitMapScreenshot.png");
+    qWarning() << " save to '" << imageName << "'... ToDo.";
+  });
+
+
+  // toPdf
+  QPushButton *pbToPdf = new QPushButton(QLatin1String("toPdf"));
+  vBoxLayout->addWidget(pbToPdf);
+  connect(pbToPdf, &QPushButton::clicked, this, &FunctionDialog::onToPdf);
+
+
+
+  //-----------------------------------
+  // Quit
+  //-----------------------------------
+  d->m_pbClose = new QPushButton(QLatin1String("Close"));
+  vBoxLayout->addWidget(d->m_pbClose, 2);
+  // c++11 -> lambda :-)
+  connect(d->m_pbClose, &QPushButton::clicked, this, &FunctionDialog::close);
+
+
+  //-----------------------------------
+  // Tabs
+  //-----------------------------------
+  this->addSimpleLayerTab();
+  this->addLogicalLayerTab();
+  this->addLayerPerformanceTab();
+  this->addGraphicsTab();
+  this->addGraphics3DTab();
+  this->addMessageTab();
+  this->addMapObjectTab();
+  this->addRubberbandTab();
+  this->addRubberband3DTab();
+  this->addToolsTab();
+  this->addViewshedTab();
+  this->addOverlayPlanTab();
+  this->addIconRenderTab();
+  this->addPortalTab();
+  this->addMovePointLuxemburgTab();
+  //  this->addYourTab();
+
+  // c++11 -> lambda :-)
+  connect(d->m_tabwidget, &QTabWidget::currentChanged, this, [this]()
+  {
+    int curIdx = d->m_tabwidget->currentIndex();
+    if (curIdx == d->m_simpleEsriLayerIndex)
+      d->m_simpleEsriLayer->updatePanel();
+    else if (curIdx == d->m_layerControlIndex)
+      d->m_layerControlWidget->updatePanel();
+  });
+
+  d->m_tabwidget->setCurrentIndex(7);
+
+
+  // Access symbolDictionary to create the dictionary at beginning
+  if (d->m_mapImpl)
+    d->m_mapImpl->symbolDictionary();
+}
+
+
+void FunctionDialog::setGraphicsLayer(Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer)
+{
+  d->m_graphicsLayer = graphicsLayer;
+}
+
+
+void FunctionDialog::setMapPositionString(const QString &mapPosition)
+{
+  if (d->m_lbMapPosition)
+    d->m_lbMapPosition->setText(mapPosition);
+}
+
+void FunctionDialog::setPixelSizeString(const QString &text)
+{
+  if (d->m_lbPixelSize)
+    d->m_lbPixelSize->setText(text);
+}
+
+void FunctionDialog::addMapPositionString(const QString &mapPosition)
+{
+  if (d->m_lbMapPosition)
+    d->m_lbMapPosition->setText(d->m_lbMapPosition->text() + mapPosition);
+}
+
+void FunctionDialog::addSimpleLayerTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  if (!d->m_simpleEsriLayer)
+  {
+    Esri::ArcGISRuntime::MapGraphicsView *mapGraphicsView =
+      dynamic_cast<Esri::ArcGISRuntime::MapGraphicsView *>(d->m_mapGeoView);
+    if (mapGraphicsView)
+      d->m_simpleEsriLayer = new SimpleEsriLayer(this, mapGraphicsView);
+  }
+  mainLayout->addWidget(d->m_simpleEsriLayer);
+  mainLayout->addStretch();
+
+  d->m_simpleEsriLayerIndex = d->m_tabwidget->addTab(w, QLatin1String("SimpleLayer"));
+
+
+}
+
+void FunctionDialog::addLogicalLayerTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  if (!d->m_layerControlWidget)
+  {
+    d->m_layerControlWidget = new LayerControlWidget(this, d->m_mapInterface,
+                                                     true,   // enableLayer
+                                                     true,    // enableBaseMap
+                                                     QLatin1String("LC-FunctionDialog"));
+  }
+  mainLayout->addWidget(d->m_layerControlWidget);
+  mainLayout->addStretch();
+
+  d->m_layerControlIndex = d->m_tabwidget->addTab(w, QLatin1String("LogicalLayer"));
+}
+
+void FunctionDialog::addLayerPerformanceTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+
+  d->m_tabwidget->addTab(w, QLatin1String("LayerPerf."));
+
+  QLabel *lb;
+
+  //
+  lb = new QLabel(QLatin1String("# of Layer"));
+  layout->addWidget(lb, 0, 0);
+
+  d->m_layerPerf_leLayer = new QLineEdit(QLatin1String("1"));
+  d->m_layerPerf_leLayer->setPlaceholderText(QLatin1String("# of Layer"));
+  d->m_layerPerf_leLayer->setToolTip(d->m_layerPerf_leLayer->placeholderText());
+  layout->addWidget(d->m_layerPerf_leLayer, 1, 0);
+
+  //
+  lb = new QLabel(QLatin1String("# of Objects (total)"));
+  layout->addWidget(lb, 0, 1);
+
+  d->m_layerPerf_leObject = new QLineEdit(QLatin1String("1000"));
+  d->m_layerPerf_leObject->setPlaceholderText(QLatin1String("# of Objects"));
+  d->m_layerPerf_leObject->setToolTip(d->m_layerPerf_leObject->placeholderText());
+  layout->addWidget(d->m_layerPerf_leObject, 1, 1);
+
+
+  //
+  lb = new QLabel(QLatin1String("radius"));
+  layout->addWidget(lb, 0, 2);
+
+  d->m_layerPerf_leRadius = new QLineEdit(QLatin1String("100"));
+  d->m_layerPerf_leRadius->setPlaceholderText(QLatin1String("radius"));
+  d->m_layerPerf_leRadius->setToolTip(d->m_layerPerf_leRadius->placeholderText());
+  layout->addWidget(d->m_layerPerf_leRadius, 1, 2);
+
+  //
+  lb = new QLabel(QLatin1String("with Text"));
+  layout->addWidget(lb, 0, 3);
+
+  d->m_layerPerf_cbText = new QCheckBox;
+  d->m_layerPerf_cbText->setToolTip(QLatin1String("with Text"));
+  layout->addWidget(d->m_layerPerf_cbText, 1, 3);
+
+
+  QPushButton *pbStart = new QPushButton(QLatin1String("generate Layer"));
+  layout->addWidget(pbStart);
+  connect(pbStart, &QPushButton::clicked, this, &FunctionDialog::onLayerPerfCreateLayer);
+
+}
+
+
+void FunctionDialog::addGraphicsTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Graphics"));
+
+  QPushButton *pbGraphics = new QPushButton(QLatin1String("generate Graphics"));
+  layout->addWidget(pbGraphics);
+  connect(pbGraphics, &QPushButton::clicked, this, &FunctionDialog::onGenerateGraphics);
+
+  QPushButton *pbGenerateCube = new QPushButton(QLatin1String("generate/destroy Cube"));
+  layout->addWidget(pbGenerateCube);
+  connect(pbGenerateCube, &QPushButton::clicked, this, &FunctionDialog::onGenerateCube);
+
+  QPushButton *pbGenerateCubeArray = new QPushButton(QLatin1String("generate/destroy CubeArray"));
+  layout->addWidget(pbGenerateCubeArray);
+  connect(pbGenerateCubeArray, &QPushButton::clicked, this, &FunctionDialog::onGenerateCubeArray);
+
+  QPushButton *pbGenerateStackedCubes = new QPushButton(QLatin1String("generate stacked Cubes"));
+  layout->addWidget(pbGenerateStackedCubes);
+  connect(pbGenerateStackedCubes, &QPushButton::clicked, this, &FunctionDialog::onGenerateStackedCubes);
+
+  QPushButton *pbGraphicsKristenStrandford = new QPushButton(QLatin1String("generate Graphics - KristenStrandford"));
+  layout->addWidget(pbGraphicsKristenStrandford);
+  connect(pbGraphicsKristenStrandford, &QPushButton::clicked, this, &FunctionDialog::onGenerateGraphicsKristenStrandford);
+}
+
+void FunctionDialog::addGraphics3DTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Graphics 3D"));
+
+  //
+  // Sphere (Kugel) - RENDERER
+  {
+    QPushButton *pbGraphics = new QPushButton(QLatin1String("generate 3D-Graphic Sphere RENDERER"));
+    layout->addWidget(pbGraphics);
+    connect(pbGraphics, &QPushButton::clicked, this, &FunctionDialog::onGenerate3DGraphicSphereRENDERER);
+
+    QSlider *slOpcacity = new QSlider(Qt::Horizontal);
+    slOpcacity->setMinimum(0);
+    slOpcacity->setMaximum(100);
+    layout->addWidget(slOpcacity);
+    connect(slOpcacity, &QSlider::valueChanged, this, &FunctionDialog::onSphereOpacityChangedRENDERER);
+
+    QSlider *slZValue = new QSlider(Qt::Horizontal);
+    slZValue->setMinimum(-150);
+    slZValue->setMaximum(150);
+    layout->addWidget(slZValue);
+    connect(slZValue, &QSlider::valueChanged, this, &FunctionDialog::onSphereZValueChanged);
+  }
+
+
+  //
+  // Sphere (Kugel)
+  {
+    QPushButton *pbGraphics = new QPushButton(QLatin1String("generate 3D-Graphic Sphere"));
+    layout->addWidget(pbGraphics);
+    connect(pbGraphics, &QPushButton::clicked, this, &FunctionDialog::onGenerate3DGraphicSphere);
+
+    QSlider *slOpcacity = new QSlider(Qt::Horizontal);
+    slOpcacity->setMinimum(0);
+    slOpcacity->setMaximum(100);
+    layout->addWidget(slOpcacity);
+    connect(slOpcacity, &QSlider::valueChanged, this, &FunctionDialog::onSphereOpacityChanged);
+
+    QSlider *slZValue = new QSlider(Qt::Horizontal);
+    slZValue->setMinimum(-150);
+    slZValue->setMaximum(150);
+    layout->addWidget(slZValue);
+    connect(slZValue, &QSlider::valueChanged, this, &FunctionDialog::onSphereZValueChanged);
+  }
+
+
+  //
+  // Cone (Kegel)
+  {
+    QPushButton *pbCone = new QPushButton(QLatin1String("generate 3D-Graphic Cone"));
+    layout->addWidget(pbCone);
+    connect(pbCone, &QPushButton::clicked, this, &FunctionDialog::onGenerate3DGraphicCone);
+
+    QSlider *slOpcacity = new QSlider(Qt::Horizontal);
+    slOpcacity->setMinimum(0);
+    slOpcacity->setMaximum(100);
+    layout->addWidget(slOpcacity);
+    connect(slOpcacity, &QSlider::valueChanged, this, &FunctionDialog::onConeOpacityChanged);
+
+    QSlider *slZValue = new QSlider(Qt::Horizontal);
+    slZValue->setMinimum(-150);
+    slZValue->setMaximum(150);
+    layout->addWidget(slZValue);
+    connect(slZValue, &QSlider::valueChanged, this, &FunctionDialog::onConeZValueChanged);
+
+    QSlider *slHeading = new QSlider(Qt::Horizontal);
+    slHeading->setMinimum(-180);
+    slHeading->setMaximum(180);
+    layout->addWidget(slHeading);
+    connect(slHeading, &QSlider::valueChanged, this, &FunctionDialog::onConeHeadingChanged);
+
+    QSlider *slRoll = new QSlider(Qt::Horizontal);
+    slRoll->setMinimum(-180);
+    slRoll->setMaximum(180);
+    layout->addWidget(slRoll);
+    connect(slRoll, &QSlider::valueChanged, this, &FunctionDialog::onConeRollChanged);
+
+    QSlider *slPitch = new QSlider(Qt::Horizontal);
+    slPitch->setMinimum(-180);
+    slPitch->setMaximum(180);
+    layout->addWidget(slPitch);
+    connect(slPitch, &QSlider::valueChanged, this, &FunctionDialog::onConePitchChanged);
+  }
+
+  //
+  // 3D Model
+  {
+    QPushButton *pbGraphics = new QPushButton(QLatin1String("place 3D model (symbol and graphic)"));
+    layout->addWidget(pbGraphics);
+    connect(pbGraphics, &QPushButton::clicked, this, &FunctionDialog::on3dModel);
+
+//    QSlider *slOpcacity = new QSlider(Qt::Horizontal);
+//    slOpcacity->setMinimum(0);
+//    slOpcacity->setMaximum(100);
+//    layout->addWidget(slOpcacity);
+//    connect(slOpcacity, &QSlider::valueChanged, this, &FunctionDialog::onSphereOpacityChangedRENDERER);
+
+    QSlider *slZValue = new QSlider(Qt::Horizontal);
+    slZValue->setMinimum(-150);
+    slZValue->setMaximum(150);
+    layout->addWidget(slZValue);
+    connect(slZValue, &QSlider::valueChanged, this, &FunctionDialog::on3dModelZValueChanged);
+  }
+
+  //
+  // Cones via UniqueValueRenderer
+  {
+    QPushButton *pbGraphics = new QPushButton(QStringLiteral("Cones via UniqueValueRenderer"));
+    layout->addWidget(pbGraphics);
+    connect(pbGraphics, &QPushButton::clicked, this, &FunctionDialog::onGenerate3DGraphicConeUniqueValueRenderer);
+
+//    QSlider *slOpcacity = new QSlider(Qt::Horizontal);
+//    slOpcacity->setMinimum(0);
+//    slOpcacity->setMaximum(100);
+//    layout->addWidget(slOpcacity);
+//    connect(slOpcacity, &QSlider::valueChanged, this, &FunctionDialog::onSphereOpacityChangedRENDERER);
+
+//    QSlider *slZValue = new QSlider(Qt::Horizontal);
+//    slZValue->setMinimum(-150);
+//    slZValue->setMaximum(150);
+//    layout->addWidget(slZValue);
+//    connect(slZValue, &QSlider::valueChanged, this, &FunctionDialog::on3dModelZValueChanged);
+  }
+
+
+}
+
+
+QSet<QString> listOfPointSidcs_Internal()
+{
+  QSet<QString> sidcs;
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10011500002102000000"); // mine_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002108000000"); // single_fire_impl
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002707050000"); // 25270705 -> Protection Areas : Minefield : Dummy
+
+
+  // SymbolSet 01 == air
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10030100001101000000"); // differs in APP6(D)
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10030100001201000000");
+
+  // SymbolSet 10 == Land Unit
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001100000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001101000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001102000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001103000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001104000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001105000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031000001106000000");
+
+  // SymbolSet 15 == Land Equipment
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001110000000"); // baseSymbolCode = 15 111000 Missle Launcher
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001100000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001101000000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001101010000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001101020000");
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001101030000");
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10011000001213030000"); // Movement and Maneuver : Reconnaissance     10 121303  (FULL_FRAME, but no real MainIcon)
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10031500001202000000"); // Vehicle : Tank 15 120200
+
+
+  // Guez-IEDs
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10011500002104000000"); // LAND MINE - IED
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10013500001202000000"); // Weapon - IED
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10014000001103000000"); // IED SUICIDE BOMBER (OHNE ZickZack)
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10014000001103010000"); // IED SUICIDE BOMBER (MIT ZickZack)
+  //                                                                          ^
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10014000001103040000"); // IED suicide bomber
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10014000001101110000"); // BOOBY TRAP (replaced by 'IED suicide bomber')
+
+  return sidcs;
+}
+
+QSet<QString> listOfLineSidcs_Internal()
+{
+  QSet<QString> sidcs;
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10032500001406030000"); // hit_line_impl
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500001402000000"); // 25140200_6 == "Maneuver Lines : Line of Contact" (no key8-Entry)
+
+#ifdef SYM_PROTECTION_AREAS_BECOMES_LINE
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002711000000"); // Control Measure: Protection Areas :
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002713000000"); // Control Measure: Protection Areas : Assult Crossing (former GeometryType::area, now GeometryType::Line)
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002714000000"); // Control Measure: Protection Areas : Bridge
+#endif // SYM_PROTECTION_AREAS_BECOMES_LINE
+
+  return sidcs;
+}
+
+QSet<QString> listOfAreaSidcs_Internal()
+{
+  QSet<QString> sidcs;
+
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002408010000"); // area_fire_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002717000000"); // biological_agent_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10042500002701000000"); // building_outline_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002718000000"); // chemical_agent_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500001511000000"); // danger_area_impl
+//  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D,"10012500002707010000"); // MineField
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002707060000"); // mine_field_impl
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002719000000"); // nuclear_agent_impl
+
+#ifndef SYM_PROTECTION_AREAS_BECOMES_LINE
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002711000000"); // Control Measure: Protection Areas :
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002713000000"); // Control Measure: Protection Areas : Assult Crossing (former GeometryType::area, now GeometryType::Line)
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::APP6D, "10012500002714000000"); // Control Measure: Protection Areas : Bridge
+#endif // SYM_PROTECTION_AREAS_BECOMES_LINE
+
+  return sidcs;
+}
+
+QSet<QString> listOfPlanEditorSidcs_Internal()
+{
+  QSet<QString> sidcs;
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25342300");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25140500");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25152100");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25141400");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25141700");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25290500");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25270503");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25341900");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25270504");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25230100");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25271100");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25341500");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25241202");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25241602");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25340800");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25270502");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25342201");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25271204");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25240103");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25240802");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25270501");
+  sidcs += AdvancedSymbology::SidcCodec::encodeBaseSymbolCode(AdvancedSymbology::SymbologyType::APP6D, "25271600");
+
+  return sidcs;
+}
+
+
+
+void FunctionDialog::addMessageTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Message"));
+
+  //-----------------------------------
+  QPushButton *pbAddCivilSymbols = new QPushButton(QLatin1String("add civil symbols"));
+  layout->addWidget(pbAddCivilSymbols);
+  connect(pbAddCivilSymbols, &QPushButton::clicked, this, &FunctionDialog::onAddCivilSymbols);
+
+  //-----------------------------------
+  QPushButton *pbMessage = new QPushButton(QLatin1String("generate Message"));
+  layout->addWidget(pbMessage);
+  connect(pbMessage, &QPushButton::clicked, this, &FunctionDialog::onMessage);
+
+  //-----------------------------------
+  QPushButton *pbSelectMessage = new QPushButton(QLatin1String("select Message"));
+  layout->addWidget(pbSelectMessage);
+  connect(pbSelectMessage, &QPushButton::clicked, this, &FunctionDialog::onMessageSelect);
+
+  //-----------------------------------
+  QPushButton *pbSymbolOverview = new QPushButton(QLatin1String("overviewESRI - wait!!!"));
+  layout->addWidget(pbSymbolOverview);
+
+  // c++11 -> lambda :-)
+  connect(pbSymbolOverview, &QPushButton::clicked, this, []()
+  {
+    AdvancedSymbology::Gui::BaseSymbolLookupDialog *bslDlg =
+        AdvancedSymbology::Gui::BaseSymbolLookupDialog::showInstance();
+
+    QSet<QString> sidcs;
+    sidcs += listOfPointSidcs_Internal();
+    sidcs += listOfLineSidcs_Internal();
+    sidcs += listOfAreaSidcs_Internal();
+    sidcs += listOfPlanEditorSidcs_Internal();
+
+    QSet<QString> baseSidcs;
+    baseSidcs.reserve(sidcs.size());
+    for(const auto &item : qAsConst(sidcs))
+    {
+      QString res = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(item);
+      if (res.isEmpty())
+        baseSidcs.insert(item);
+      else
+        baseSidcs.insert(res);
+    } // for
+    bslDlg->setValidBaseSymbolCodes(baseSidcs);
+
+    bslDlg->show();
+  });
+
+  //-----------------------------------
+  QPushButton *pbAddSymbol = new QPushButton(QLatin1String("add symbol from File"));
+  layout->addWidget(pbAddSymbol);
+  connect(pbAddSymbol, &QPushButton::clicked, this, &FunctionDialog::onAddSymbol);
+
+
+  //-----------------------------------
+  QGridLayout *someParticipantLayout = new QGridLayout();
+  someParticipantLayout->setObjectName(QLatin1String("SomeParticipantsLayout"));
+  layout->addLayout(someParticipantLayout, layout->rowCount(), 0);
+
+  QPushButton *pbSomeParticipants = new QPushButton(QLatin1String("Aggregation-Participants"));
+  someParticipantLayout->addWidget(pbSomeParticipants, 0, 0);
+  connect(pbSomeParticipants, &QPushButton::clicked, this, &FunctionDialog::onSomeParticipants);
+
+  QSlider *slAggregationModifier = new QSlider(Qt::Horizontal);
+
+  slAggregationModifier->setTickInterval(10);
+  slAggregationModifier->setSingleStep(10);
+
+  someParticipantLayout->addWidget(slAggregationModifier, 0, 1);
+
+  connect(slAggregationModifier, &QSlider::valueChanged, this, [this, slAggregationModifier]()
+  {
+    const int counter = 6;
+    int scaleMin = 80000;
+    int scaleMax =   500;
+
+    int interval = (scaleMin - scaleMax) / counter;
+
+
+    LayerFactory &layerFac = d->m_mapInterface->layerFactory();
+    int newVal = 0;
+    for (int i = 1; i <= counter; ++i)
+    {
+      const QString &layername = QStringLiteral("Participants_%1").arg(i);
+      LayerParameter layerPara = layerFac.layerParameter(layername);
+
+      // double    minScale = 0;     ///< big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001 ; '0' without function
+      // double    maxScale = 0;     ///< small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001     ; '0' without function
+
+      layerPara.maxScale = newVal;
+
+      newVal = scaleMax + interval * i;
+      double userVal = slAggregationModifier->value() / 100.0;
+      newVal += interval * userVal;
+      newVal = std::min(newVal, scaleMin);
+      newVal = std::max(newVal, scaleMax);
+
+      layerPara.minScale = newVal;
+
+      if (i == counter)
+        layerPara.minScale = 0;
+
+      qWarning() << LOGFUNCTION << " layer: " << layername << " -> "
+                 << " userVal=" << userVal
+                 << " max=" << layerPara.maxScale
+                 << " min=" << layerPara.minScale;
+
+      layerFac.setLayerParameter(layername, layerPara);
+
+
+    } // for
+
+  });
+
+  slAggregationModifier->setMinimum(-200);
+  slAggregationModifier->setMaximum(200);
+  slAggregationModifier->setValue(0);
+
+
+  //-----------------------------------
+  // createParticipantButton
+  //-----------------------------------
+  QGridLayout *participantLayout = new QGridLayout();
+  participantLayout->setObjectName(QLatin1String("participantLayout"));
+  layout->addLayout(participantLayout, layout->rowCount(), 0);
+
+  d->m_leSidc = new QLineEdit();
+
+  switch (d->m_mapInterface->symbologyType())
+  {
+  case AdvancedSymbology::SymbologyType::None:
+    d->m_leSidc->setText(AdvancedSymbology::SidcCodec::encodeCivilEts("StelleBerRaum"));
+    d->m_leSidc->setToolTip(QStringLiteral("<html> <p><b> symbols added \?\? </b></p></html>"));
+    d->m_leSidc->setToolTipDuration(1000);
+    break;
+  case AdvancedSymbology::SymbologyType::APP6B:
+  case AdvancedSymbology::SymbologyType::MIL2525C:
+    d->m_leSidc->setText( AdvancedSymbology::SidcCodec::encodeComplete( d->m_mapInterface->symbologyType(), "SFGPUCD---D-") );
+    break;
+  case AdvancedSymbology::SymbologyType::APP6D:
+  case AdvancedSymbology::SymbologyType::MIL2525D:
+    d->m_leSidc->setText(AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::MIL2525D, "10011501001202000000")); // 10015000001202000000 -> 15 120200 LandEquip, Tank
+    d->m_leSidc->setText(AdvancedSymbology::SidcCodec::encodeComplete(AdvancedSymbology::SymbologyType::MIL2525D, "10011001001110000000")); // 10031000001110000000 -> 10 111000 LandUnits, CommandAndControl Signal
+    d->m_leSidc->setText(AdvancedSymbology::SidcCodec::encodeCivilEts("Pers_FW_BerFue"));
+//    d->m_leSidc->setText(AdvancedSymbology::SidcCodec::encodeCivilEts("ETS_PersFueAllg"));
+    break;
+  }
+
+  d->m_leSidc->setObjectName(QLatin1String("SIDC"));
+  QFont f = d->m_leSidc->font();
+  f.setPixelSize(20);
+  d->m_leSidc->setFont(f);
+  participantLayout->addWidget(d->m_leSidc, 0, 0);
+  connect(d->m_leSidc, &QLineEdit::textChanged, this, [this]()
+  {
+    if (d->m_leSidc->text().length() > 20)
+      d->m_leSidc->setStyleSheet(QLatin1String("QLineEdit#SIDC { background-color: red; color: #000; }"));
+    else
+      d->m_leSidc->setStyleSheet(QLatin1String("QLineEdit#SIDC { background-color: white; color: #000; }"));
+  });
+
+  QPushButton *pbCreatePart = new QPushButton(QLatin1String("createParticipant!! \n symbols added?"));
+  pbCreatePart->setToolTip(d->m_leSidc->toolTip());
+  participantLayout->addWidget(pbCreatePart, 0, 1);
+
+  connect(pbCreatePart, &QPushButton::clicked, this, &FunctionDialog::onParticipantCreate);
+} /* FunctionDialog::addMessageTab */
+
+
+void FunctionDialog::addMapObjectTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Map Objects (Factory)"));
+
+  //-----------------------------------
+  // createPolygonButton
+  //-----------------------------------
+  QPushButton *pbPolygon = new QPushButton(QLatin1String("create Polygon"));
+  layout->addWidget(pbPolygon);
+  connect(pbPolygon, &QPushButton::clicked,
+          this, &FunctionDialog::onPolygonCreate);
+
+
+  //-----------------------------------
+  // createPolylineButton
+  //-----------------------------------
+  QPushButton *pbPolyline = new QPushButton(QLatin1String("create Polyline"));
+  layout->addWidget(pbPolyline);
+  connect(pbPolyline, &QPushButton::clicked,
+          this, &FunctionDialog::onPolylineCreate);
+
+  //-----------------------------------
+  // createTextButton
+  //-----------------------------------
+  QPushButton *pbText = new QPushButton(QLatin1String("create Text"));
+  layout->addWidget(pbText);
+  connect(pbText, &QPushButton::clicked,
+          this, &FunctionDialog::onTextCreate);
+
+
+  //-----------------------------------
+  // createMapObjectIndicatorButton
+  //-----------------------------------
+  QPushButton *pbMapObjectIndicator = new QPushButton(QLatin1String("create MapObjectIndicator"));
+  layout->addWidget(pbMapObjectIndicator);
+  connect(pbMapObjectIndicator, &QPushButton::clicked,
+          this, &FunctionDialog::onMapObjectIndicatorCreate);
+
+
+  //-----------------------------------
+  // createBuildingOutlineButton
+  //-----------------------------------
+  QPushButton *pbCreateBuilding = new QPushButton(QLatin1String("create Building"));
+  layout->addWidget(pbCreateBuilding);
+  connect(pbCreateBuilding, &QPushButton::clicked,
+          this, &FunctionDialog::onBuildingCreate);
+
+  //-----------------------------------
+  // createBAgentButton
+  //-----------------------------------
+  QPushButton *pbCreateBAgent = new QPushButton(QLatin1String("create B-Agent"));
+  layout->addWidget(pbCreateBAgent);
+  connect(pbCreateBAgent, &QPushButton::clicked,
+          this, &FunctionDialog::onBiologicalAgentCreate);
+
+  //-----------------------------------
+  // createCAgentButton
+  //-----------------------------------
+  QPushButton *pbCreateCAgent = new QPushButton(QLatin1String("create C-Agent"));
+  layout->addWidget(pbCreateCAgent);
+  connect(pbCreateCAgent, &QPushButton::clicked,
+          this, &FunctionDialog::onChemicalAgentCreate);
+
+
+  //-----------------------------------
+  // createDangerAreaButton
+  //-----------------------------------
+  QPushButton *createDangerAreaButton = new QPushButton(QLatin1String("create DangerArea"));
+  layout->addWidget(createDangerAreaButton);
+  connect(createDangerAreaButton, &QPushButton::clicked,
+          this, &FunctionDialog::onDangerAreaCreate);
+
+  //-----------------------------------
+  // createDangerAreaButton
+  //-----------------------------------
+  QPushButton *createFunctionalAreaButton = new QPushButton(QLatin1String("create FunctionalArea"));
+  layout->addWidget(createFunctionalAreaButton);
+  connect(createFunctionalAreaButton, &QPushButton::clicked,
+          this, &FunctionDialog::onFunctionalAreaCreate);
+
+  //-----------------------------------
+  // createAreaFireButton
+  //-----------------------------------
+  QPushButton *createAreaFireButton = new QPushButton(QLatin1String("create AreaFire"));
+  layout->addWidget(createAreaFireButton);
+  connect(createAreaFireButton, &QPushButton::clicked,
+          this, &FunctionDialog::onAreaFireCreate);
+
+  //-----------------------------------
+  // createSingleFireButton
+  //-----------------------------------
+  QPushButton *createSingleFireButton = new QPushButton(QLatin1String("create SingleFire"));
+  layout->addWidget(createSingleFireButton);
+  connect(createSingleFireButton, &QPushButton::clicked,
+          this, &FunctionDialog::onSingleFireCreate);
+
+  //-----------------------------------
+  // createChargeEffectButton
+  //-----------------------------------
+  QPushButton *createChargeEffectButton = new QPushButton(QLatin1String("create Charge Effect"));
+  layout->addWidget(createChargeEffectButton);
+  connect(createChargeEffectButton, &QPushButton::clicked,
+          this, &FunctionDialog::onChargeEffectCreate);
+
+  //-----------------------------------
+  // createMineButton
+  //-----------------------------------
+  QPushButton *createMineButton = new QPushButton(QLatin1String("create Mine"));
+  layout->addWidget(createMineButton);
+  connect(createMineButton, &QPushButton::clicked,
+          this, &FunctionDialog::onMineCreate);
+
+  //-----------------------------------
+  // createMineButton
+  //-----------------------------------
+  QPushButton *createMineFieldButton = new QPushButton(QLatin1String("create MineField"));
+  layout->addWidget(createMineFieldButton);
+  connect(createMineFieldButton, &QPushButton::clicked,
+          this, &FunctionDialog::onMineFieldCreate);
+
+  //-----------------------------------
+  // createNuclearButton
+  //-----------------------------------
+  QPushButton *createNuclearButton = new QPushButton(QLatin1String("create Nuclear"));
+  layout->addWidget(createNuclearButton);
+  connect(createNuclearButton, &QPushButton::clicked,
+          this, &FunctionDialog::onNuclearCreate);
+
+  //-----------------------------------
+  // createVirtualSingleMineButton
+  //-----------------------------------
+  QPushButton *createVirtualSingleMineButton = new QPushButton(QLatin1String("create Virtual Single Mine"));
+  layout->addWidget(createVirtualSingleMineButton);
+  connect(createVirtualSingleMineButton, &QPushButton::clicked,
+          this, &FunctionDialog::onBoobyTrapCreate);
+
+
+  //-----------------------------------
+  // createHitLineButton
+  //-----------------------------------
+  QHBoxLayout *hBox = new QHBoxLayout();
+  layout->addLayout(hBox, 99, 0);
+
+  QPushButton *createHitLineButton = new QPushButton(QLatin1String("create HitLine"));
+  hBox->addWidget(createHitLineButton);
+  connect(createHitLineButton, &QPushButton::clicked,
+          this, &FunctionDialog::onHitLineCreate);
+
+  QPushButton *hitLineRotate = new QPushButton(QLatin1String("rotate HitLine"));
+  hBox->addWidget(hitLineRotate);
+  connect(hitLineRotate, &QPushButton::clicked, this, [this]()
+  {
+    if (d->m_hitLine)
+    {
+      static int i = 0;
+      const QPointF &start = d->m_hitLine->startPoint().toPointF();
+      QPointF end          = d->m_hitLine->endPoint().toPointF();
+      MathUtils::rotatePoint(end, start, 10);
+
+      Point3D start3D = Point3D::fromQPointF(start);
+      Point3D end3D   = Point3D::fromQPointF(end);
+      end3D.rz() += i*10;
+
+      i++;
+      qCritical() << " Hitline: z = " << end3D.z();
+
+      d->m_hitLine->setStartAndEndPoint(start3D,
+                                        end3D);
+      d->m_hitLine->updateView();
+    }
+  });
+
+  //-----------------------------------
+  // createLineOfSightLine
+  //-----------------------------------
+  QPushButton *createLosLineButton = new QPushButton(QLatin1String("create LineOfSightLinge"));
+  layout->addWidget(createLosLineButton);
+  connect(createLosLineButton, &QPushButton::clicked,
+          this, &FunctionDialog::onLineOfSightLineCreate);
+
+
+  //-----------------------------------
+  // createGeoImage
+  //-----------------------------------
+  QPushButton *createGeoImageButton = new QPushButton(QLatin1String("create GeoImage \n(handled on signal 'mapObjectsClicked'?)"));
+  layout->addWidget(createGeoImageButton);
+  connect(createGeoImageButton, &QPushButton::clicked,
+          this, &FunctionDialog::onGeoImageCreate);
+
+  // similar to the application:
+  connect(d->m_mapInterface, &SituationMap::Map::mapObjectsClicked,
+          this, &FunctionDialog::onMapObjectClicked);
+
+
+  //-----------------------------------
+  // createSoundArea
+  //-----------------------------------
+  QPushButton *createSoundAreaButton = new QPushButton(QLatin1String("create SoundArea"));
+  layout->addWidget(createSoundAreaButton);
+  connect(createSoundAreaButton, &QPushButton::clicked,
+          this, &FunctionDialog::onSoundAreaCreate);
+
+  //-----------------------------------
+  // createMapObjectIndicatorButton
+  //-----------------------------------
+  QPushButton *pbCube = new QPushButton(QLatin1String("create cube"));
+  layout->addWidget(pbCube);
+  connect(pbCube, &QPushButton::clicked,
+          this, &FunctionDialog::onCubeCreate);
+
+  //-----------------------------------
+  // ???
+  //-----------------------------------
+
+
+  //-----------------------------------
+  // createShowBasePoint
+  //-----------------------------------
+  QPushButton *createShowBasePointButton = new QPushButton(QLatin1String("ShowBasePoint"));
+  layout->addWidget(createShowBasePointButton);
+  connect(createShowBasePointButton, &QPushButton::clicked,
+          this, &FunctionDialog::onShowBasePoint);
+
+
+  //-----------------------------------
+  // createPolizeiButton
+  //-----------------------------------
+  QPushButton *createPolizeiButton = new QPushButton(QLatin1String("create Polizei"));
+  layout->addWidget(createPolizeiButton);
+  connect(createPolizeiButton, &QPushButton::clicked,
+          this, &FunctionDialog::onShowPolizei);
+
+}
+
+
+void FunctionDialog::addRubberband3DTab()
+{
+  QWidget      *w      = new QWidget();
+  QGridLayout  *layout = new QGridLayout(w);
+
+  d->m_tabwidget->addTab(w, QLatin1String("Rubberband3D"));
+
+
+  QPushButton *pbPointFtRubberband = new QPushButton(QLatin1String("Point Feature Rubberband"), w);
+  pbPointFtRubberband->setToolTip(QString());
+
+  layout->addWidget(pbPointFtRubberband, 0, 0);
+
+  connect(pbPointFtRubberband, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandPointFeature3D *rubberband = d->m_mapInterface->rubberbandFactory().create3D<RB::RubberbandPointFeature3D>();
+
+    if (nullptr != rubberband)
+    {
+      rubberband->setAutoDelete(true);
+
+      QObject::connect(rubberband, &RB::RubberbandBase::apply, this, &FunctionDialog::onRubberband3DApply);
+      QObject::connect(rubberband, &RB::RubberbandBase::abort, this, &FunctionDialog::onRubberband3DAbort);
+    }
+    else
+      qWarning() << "Creating rubberband failed.";
+
+  });
+
+  QPushButton *pbMultiPointFtRubberband = new QPushButton(QLatin1String("Multi Point Feature Rubberband - Polyline"), w);
+  pbMultiPointFtRubberband->setToolTip(QStringLiteral("Create 3D polyline rubberband"));
+
+  layout->addWidget(pbMultiPointFtRubberband, 1, 0);
+
+  connect(pbMultiPointFtRubberband, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiPointFeature3D *rubberband = d->m_mapInterface->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>();
+
+    if (nullptr != rubberband)
+    {
+      rubberband->setAutoDelete(true);
+
+      QObject::connect(rubberband, &RB::RubberbandBase::apply, this, &FunctionDialog::onRubberband3DApply);
+      QObject::connect(rubberband, &RB::RubberbandBase::abort, this, &FunctionDialog::onRubberband3DAbort);
+    }
+    else qWarning() << "Creating rubberband failed.";
+
+  });
+
+  QPushButton *pbMultiPointFtClosedRubberband = new QPushButton(QLatin1String("Multi Point Feature Rubberband - Polygon"), w);
+  pbMultiPointFtClosedRubberband->setToolTip(QStringLiteral("Create 3D polygon rubberband"));
+
+  layout->addWidget(pbMultiPointFtClosedRubberband, 2, 0);
+
+  connect(pbMultiPointFtClosedRubberband, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiPointFeature3D *rubberband = d->m_mapInterface->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>();
+
+    if (nullptr != rubberband)
+    {
+      rubberband->setAutoDelete(true);
+      rubberband->enableClosed(true);
+
+      QObject::connect(rubberband, &RB::RubberbandBase::apply, this, &FunctionDialog::onRubberband3DApply);
+      QObject::connect(rubberband, &RB::RubberbandBase::abort, this, &FunctionDialog::onRubberband3DAbort);
+    }
+    else qWarning() << "Creating rubberband failed.";
+
+  });
+
+  QPushButton *pbMultiPointFtCircleRubberband = new QPushButton(QLatin1String("Multi Point Feature Rubberband - Circle"), w);
+  pbMultiPointFtCircleRubberband->setToolTip(QStringLiteral("Create 3D circle rubberband"));
+
+  layout->addWidget(pbMultiPointFtCircleRubberband, 3, 0);
+
+  connect(pbMultiPointFtCircleRubberband, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiPointFeature3D *rubberband = d->m_mapInterface->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>();
+
+    if (nullptr != rubberband)
+    {
+      rubberband->setAutoDelete(true);
+      rubberband->enableCircular(true);
+
+      QObject::connect(rubberband, &RB::RubberbandBase::apply, this, &FunctionDialog::onRubberband3DApply);
+      QObject::connect(rubberband, &RB::RubberbandBase::abort, this, &FunctionDialog::onRubberband3DAbort);
+    }
+    else qWarning() << "Creating rubberband failed.";
+
+  });
+} // void FunctionDialog::addRubberband3DTab()
+
+
+void FunctionDialog::onRubberband3DApply(RB::RubberbandBase *)
+{
+  qDebug() << LOGFUNCTION;
+} // void FunctionDialog::onRubberband3DApply(RB::RubberbandBase *)
+
+
+void FunctionDialog::onRubberband3DAbort(RB::RubberbandBase *)
+{
+  qDebug() << LOGFUNCTION;
+} // void FunctionDialog::onRubberband3DAbort(RB::RubberbandBase *)
+
+
+void inline getSectorStartEnd(double angle, double rotation, double &aStartRad, double &aEndRad)
+{
+  const double rotationMath = SituationMap::MathUtils::getAngleDegree2Math(rotation);//rotation < 90. ? std::fabs(rotation - 90) : std::fabs(360 - rotation + 90) ; // 12uhr ist 0° | rotation Math counter clockwise
+  // angle sectorStart
+  {
+    double val = rotationMath - angle / 2.;
+    aStartRad = val > 0 ? val : val + 360; // return the positive angle of the value
+    aStartRad = (aStartRad > 360. ? std::fmod(aStartRad, 360) : aStartRad) *  LtsCoordTrans::deg2rad(); // convert to rad
+  }
+   // angle sectorEnd
+  {
+    aEndRad = rotationMath + angle / 2.;
+    aEndRad = (aEndRad > 360. ? std::fmod(aEndRad, 360) : aEndRad) *  LtsCoordTrans::deg2rad();
+  }
+}
+
+void FunctionDialog::addRubberbandTab()
+{
+  QWidget      *w      = new QWidget();
+  QGridLayout *layout = new QGridLayout(w);
+
+  d->m_tabwidget->addTab(w, QLatin1String("Rubberband"));
+
+  //-----------------------------------
+  // create symbol type edit line
+  //-----------------------------------
+  QGridLayout *rubberbandLayout = new QGridLayout();
+  rubberbandLayout->setObjectName(QLatin1String("rubberbandLayout"));
+  layout->addLayout(rubberbandLayout, layout->rowCount(), 0);
+
+  d->m_cbRubSidc  = new QComboBox(w);
+  d->m_cbRubSidc -> setObjectName(QLatin1String("SIDC Rubberband"));
+
+  AdvancedSymbology::SymbolDictionary &dict = d->m_mapImpl->symbolDictionary();
+
+
+  switch (d->m_mapImpl->symbologyType())
+  {
+  case AdvancedSymbology::SymbologyType::MIL2525D:
+  {
+
+    // following works, but uses lambda.
+    // Therefore switch to SymbolResultWatcherComboxBox...
+    //    QString sidc = QLatin1String("10051000001213030000"); // 01011000001213030000 -> LandUnits, Observer, Motorized
+    //    AdvancedSymbology::SymbolResultWatcher *watcher = new AdvancedSymbology::SymbolResultWatcher(d->m_cbRubSidc);
+    //    connect(watcher, &AdvancedSymbology::SymbolResultWatcher::resultReady, [this, watcher]()
+    //    {
+    //      qWarning() << " lamdbadYYYYYYY" << watcher;
+    //      QSharedPointer<AdvancedSymbology::SymbolResult> symResult = watcher->symbolResult();
+    //      if (! symResult)
+    //        return;  // should NEVER happen! (Which object should have triggered the signal???)
+    //      int idx = d->m_cbRubSidc->findData( QVariant::fromValue(watcher) );
+    //      const SymbolImage &symImage = symResult->symbolImage();
+    //      d->m_cbRubSidc->setItemIcon(idx, QPixmap::fromImage(symImage.image()) );
+    //    });
+    //    d->m_cbRubSidc->addItem(sidc, QVariant::fromValue(watcher) );
+    //    watcher->setResult(dict.findSymbol(sidc));
+
+
+    QStringList sidcs;
+    sidcs += AdvancedSymbology::SidcCodec::encodeCivilEts("Pers_FW_BerFue"); // ETS
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10051000001213030000"); // 01011000001213030000 -> LandUnits, Observer, Motorized
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500001202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500001110000000"); // 10031500001110000000 -> 15 111000 Missle Launcher
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500002701000000"); // 25270100
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500002718000000"); // 25271800
+
+    // For Hanna :
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011500001101000000"); // 15 110100 Soldier (rifle)
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011500001102000000"); // Soldier MG
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011500001202000000"); // Tank
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011500131202000000"); // Tank BT
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011500001408000000"); // Utility Vehicle CROSS-COUNTRY
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011000131211000000"); // Infantry
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10011000131215000000"); // Sniper
+
+
+
+    // : For Hanna
+
+
+    // FLOT
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10012500001401010000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10012500001401020000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10012500001401030000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10012500001401040000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500001401010000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500001401020000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500001401030000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10032500001401040000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401010000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401020000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401030000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401040000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10062500001401010000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10062500001401020000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401030000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+    sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10042500001401040000"); // 10032500001401030000 -> 24 140103 Maneuver Lines Direction of Attack
+
+    for (const auto &sidc : qAsConst(sidcs))
+    {
+      QSharedPointer<AdvancedSymbology::SymbolResultWatcherComboxBox> srwCb(new AdvancedSymbology::SymbolResultWatcherComboxBox(d->m_cbRubSidc));
+      d->m_cbRubSidc->addItem(sidc, QVariant::fromValue(srwCb));
+      //AdvancedSymbology::SymbolResultWatcherComboxBox *srwCb;
+      //d->m_cbRubSidc->addItem(sidc, QVariant::fromValue(srwCb = new AdvancedSymbology::SymbolResultWatcherComboxBox(d->m_cbRubSidc)));
+      srwCb->setSymbolResult(dict.fetchSymbol(sidc));
+    }
+  }
+  break;
+
+  case AdvancedSymbology::SymbologyType::MIL2525C:
+  {
+    // Check Quartz
+    // Point Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("SFGPUCD---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("SUGPEWSM--"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFGPGPWA--"), 64)), sidc);
+
+    d->m_cbRubSidc->insertSeparator(d->m_cbRubSidc->maxCount());
+
+    // Line Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFGPOLAA--"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOGL---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOWCT--"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOWU---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOADC--"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOEB---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFGPSLA---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFGPOLKGM-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFMPOFG---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHGPOLAGM-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHMPBDI---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHMPBCR---"), 64)), sidc);
+
+    d->m_cbRubSidc->insertSeparator(d->m_cbRubSidc->maxCount());
+
+    // Area Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFGPPM----"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHMPOFA---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHMPOGF---"), 64)), sidc);
+  } break;
+
+  case AdvancedSymbology::SymbologyType::APP6B:
+  {
+    // Point Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("SFGPUCD---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("SUGPEWSM--"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFOPID----"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("SNGPUCRH--"), 64)), sidc);
+
+    d->m_cbRubSidc->insertSeparator(d->m_cbRubSidc->maxCount());
+
+    // Line Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMOLAM-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMOLDS-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMOLDM-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GHCPMOLI--"), 64)), sidc);
+
+    d->m_cbRubSidc->insertSeparator(d->m_cbRubSidc->maxCount());
+
+    // Area Feature
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMGASF-"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMDM---"), 64)), sidc);
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("GFCPMDN---"), 64)), sidc);
+
+  } break;
+
+  case AdvancedSymbology::SymbologyType::APP6D:
+    // empty
+    break;
+
+
+  case AdvancedSymbology::SymbologyType::None:
+    // try civil (ETS_xxx
+//    d->m_cbRubSidc -> addItem(QPixmap::fromImage(dict.symbolImageBySidc(sidc = QLatin1String("ETS_StelleBerRaum"), 64)), sidc);
+    break;
+
+  } // switch (d->m_map->symbologyType())
+
+  QFont f = d->m_cbRubSidc->font();
+  f.setPixelSize(16);
+  d->m_cbRubSidc->setFont(f);
+  d->m_cbRubSidc->setIconSize(QSize(32, 32));
+  d->m_cbRubSidc->setEditable(true);
+
+//  connect(d->m_cbRubSidc, &QComboBox::editTextChanged, [=](const QString & text)
+//  {
+//    QVariant decoration = this->d->m_cbRubSidc->currentData( Qt::DecorationRole );
+
+//    AdvancedSymbology::SymbolDictionary & dict = this->d->m_mapImpl->symbolDictionary();
+//    if (dict.contains(text))
+//    {
+//      const QPixmap & icon = QPixmap::fromImage(dict.symbolImageBySidc(text,64));
+//      // why isn't there write excess to currentData??
+//    }
+////    else; // why isn't there write excess to currentData??
+
+//  } );
+
+  rubberbandLayout->addWidget(d->m_cbRubSidc, 0, 0, 2, 2);
+  connect(d->m_cbRubSidc, &QComboBox::currentTextChanged, this, [this]()
+  {
+    if (d->m_cbRubSidc->currentText().length() > 15)
+      d->m_cbRubSidc->setStyleSheet(QLatin1String("QLineEdit#SIDC { background-color: red; color: #000; }"));
+    else
+      d->m_cbRubSidc->setStyleSheet(QLatin1String("QLineEdit#SIDC { background-color: white; color: #000; }"));
+  }); /* connect */
+
+
+  QPushButton *pbCreatePointSymbol = new QPushButton(QLatin1String("Create Point Symbol"), w);
+  pbCreatePointSymbol->setToolTip(d->m_leSidc->toolTip());
+
+  rubberbandLayout->addWidget(pbCreatePointSymbol, 0, 2);
+
+  connect(pbCreatePointSymbol, &QPushButton::clicked,
+          this               , &FunctionDialog::onParticipantGetPosition);
+
+  QPushButton *pbCreateRubberband = new QPushButton(QLatin1String("Create Rubberband"), w);
+  pbCreateRubberband->setToolTip(d->m_leSidc->toolTip());
+
+  rubberbandLayout->addWidget(pbCreateRubberband, 1, 2);
+
+  connect(pbCreateRubberband, &QPushButton::clicked, this, [this]()
+  {
+    RB::Rubberband *rubberband = d->m_mapInterface->rubberbandFactory().createSymbol(d->m_cbRubSidc->currentText());
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband failed, may be wrong sidc (" << d->m_cbRubSidc->currentText() << ")";
+    else
+    {
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+
+  unsigned int rubberbandTests = 2;
+
+  QPushButton *pbTestPointClusterRubber = new QPushButton(QLatin1String("Test PointCluster Rubberband"), w);
+  rubberbandLayout->addWidget(pbTestPointClusterRubber, rubberbandTests++, 0);
+
+  connect(pbTestPointClusterRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandPointCluster *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandPointCluster>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband point cluster failed";
+    else
+    {
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  //--------------------------------------
+  QPushButton *pbTestMultiPointRubber = new QPushButton(QLatin1String("Multipoint RB"), w);
+  rubberbandLayout->addWidget(pbTestMultiPointRubber, rubberbandTests++, 0);
+
+  connect(pbTestMultiPointRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiPointFeature *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiPointFeature>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband multi points feature failed";
+    else
+    {
+      rubberband -> enableClosed(false);
+      rubberband -> minimumPointCount(3);
+      rubberband -> maximumPointCount(6);
+      rubberband -> maximumLength(20000);           // will not be checked for closed lines
+      rubberband -> maximumSegmentLength(5000);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  //--------------------------------------
+  QPushButton *pbTestMultiEllipseRubber = new QPushButton(QLatin1String("MultiEllipse RB (BoobyTrap) from Scratch"), w);
+  rubberbandLayout->addWidget(pbTestMultiEllipseRubber, rubberbandTests++, 0);
+  connect(pbTestMultiEllipseRubber, &QPushButton::clicked, this, [this]()
+  {
+
+    // FIRST RubberbandMultiEllipseFeature
+    RB::RubberbandMultiEllipseFeature *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiEllipseFeature>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband multi CIRCLE feature failed";
+    else
+    {
+      rubberband->minimumRadiusCount(2);
+      rubberband->maximumRadiusCount(2);
+
+      using RWC = RB::RubberbandMultiEllipseFeature::RadiusWithContraints;
+      RWC radiusWithContraints1(0,  750, 1250);
+      RWC radiusWithContraints2(0, 1750, 2250);
+      rubberband->prepareFixedNumberOfRadiiWithConstraints({radiusWithContraints1, radiusWithContraints2});
+
+#define CIRCLE_CONTRAINT
+#ifdef CIRCLE_CONTRAINT
+      rubberband->constrainQuadratic(true);
+#endif
+      //rubberband -> maximumLength(20000);           // will not be checked for closed lines
+      //rubberband -> maximumSegmentLength(5000);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  //--------------------------------------
+  QPushButton *pbTestMultiEllipseRubberPreDefined = new QPushButton(QLatin1String("MultiEllipse RB (BoobyTrap) predefined Start"), w);
+  rubberbandLayout->addWidget(pbTestMultiEllipseRubberPreDefined, rubberbandTests++, 0);
+  connect(pbTestMultiEllipseRubberPreDefined, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiEllipseFeature *rubberbandForPreperation = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiEllipseFeature>();
+
+    if (rubberbandForPreperation == nullptr)
+      qWarning() << "Creating rubberband multi CIRCLE feature failed";
+    else
+    {
+      // start with GUEZ-typical BoobyTrap:
+
+      QPointF centerOfMapView = d->m_mapInterface->centerPoint();
+      Q_UNUSED(centerOfMapView);
+
+      //const QVector<QPointF> radii( { {1000, 1000}, {1500, 1500} } );
+//      rubberband->setCenterAndRadii(centerOfMapView, RB::CoordinateSystem::Geo, radii);
+//      rubberbandForPreperation->prepareFixedNumberOfRadii(radii);
+
+
+      RB::RubberbandMultiEllipseFeature::RadiusWithContraints radiusWithContraints1(1000,  1000, 1000);
+      RB::RubberbandMultiEllipseFeature::RadiusWithContraints radiusWithContraints2(3000, 2750, 3250);
+
+      rubberbandForPreperation->prepareFixedNumberOfRadiiWithConstraints({radiusWithContraints1, radiusWithContraints2});
+
+
+
+
+      rubberbandForPreperation->constrainQuadratic(true);
+
+      rubberbandForPreperation->enableSector(true);
+      double aStartRad=0, aEndRad=0;
+      double angle = 90;
+      double rot = 0;
+      getSectorStartEnd(angle, rot, aStartRad, aEndRad);
+
+      rubberbandForPreperation->setSectorStart(std::sin(aStartRad), std::cos(aStartRad));
+      rubberbandForPreperation->setSectorEnd(std::sin(aEndRad), std::cos(aEndRad));
+      rubberbandForPreperation->setSectorAngleFixed(true);
+
+      QObject::connect(rubberbandForPreperation, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberbandForPreperation, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+
+
+  QPushButton *pbTestMultiPointFillRubber = new QPushButton(QLatin1String("Filled Multipoint RB"), w);
+  rubberbandLayout->addWidget(pbTestMultiPointFillRubber, rubberbandTests++, 0);
+
+  connect(pbTestMultiPointFillRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandMultiPointFeature *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiPointFeature>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating filled rubberband multi points feature failed";
+    else
+    {
+      rubberband -> enableClosed(true);
+      rubberband -> setFillColor(QColor(QLatin1String("teal")));
+      rubberband -> maximumLength(20000);         // will not be checked for closed lines
+      rubberband -> maximumSegmentLength(5000);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestSmoothLineRubber = new QPushButton(QLatin1String("Smooth Line RB"), w);
+  rubberbandLayout->addWidget(pbTestSmoothLineRubber, rubberbandTests++, 0);
+
+  connect(pbTestSmoothLineRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandSmoothLine *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandSmoothLine>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband smooth line failed";
+    else
+    {
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+
+  QPushButton *pbTestSmoothFillRubber = new QPushButton(QLatin1String("Filled Smooth Line RB"), w);
+  rubberbandLayout->addWidget(pbTestSmoothFillRubber, rubberbandTests++, 0);
+
+  connect(pbTestSmoothFillRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandSmoothLine *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandSmoothLine>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating filled rubberband smooth line failed";
+    else
+    {
+      rubberband->enableClosed(true);
+      rubberband->setFillColor(QColor(QLatin1String("olive")));
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestCorridorRubber = new QPushButton(QLatin1String("Corridor RB(Boundary)"), w);
+  rubberbandLayout->addWidget(pbTestCorridorRubber, rubberbandTests++, 0);
+
+  connect(pbTestCorridorRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandCorridor *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandCorridor>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband corridors failed";
+    else
+    {
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  pbTestCorridorRubber = new QPushButton(QLatin1String("Corridor RB (Centerl., W = 50000)"), w);
+  rubberbandLayout->addWidget(pbTestCorridorRubber, rubberbandTests++, 0);
+
+  connect(pbTestCorridorRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandCorridor *rubberband = d->m_mapInterface->rubberbandFactory().create(RB::RubberbandCorridor::InputMode::InputCenterLine, 50000);
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband corridors failed";
+    else
+    {
+      rubberband->setCorridorFillColor(QColor(QLatin1String("orange")));
+
+      rubberband -> minimumPointCount(3);
+      rubberband -> maximumPointCount(6);
+      rubberband -> minimumCorridorWidth(400);
+      rubberband -> maximumCorridorWidth(1000);
+      rubberband -> maximumLength(7000);
+      rubberband -> maximumSegmentLength(2000);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestSquareRubber = new QPushButton(QLatin1String("Square RB"), w);
+  rubberbandLayout->addWidget(pbTestSquareRubber, rubberbandTests++, 0);
+
+  connect(pbTestSquareRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandRectangle *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandRectangle>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband rectangle failed";
+    else
+    {
+      rubberband->constrainQuadratic(true);
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestRectangleRubber = new QPushButton(QLatin1String("Rectangle RB"), w);
+  rubberbandLayout->addWidget(pbTestRectangleRubber, rubberbandTests++, 0);
+
+  connect(pbTestRectangleRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandRectangle *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandRectangle>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband rectangle failed";
+    else
+    {
+      rubberband->minWidth(5000);
+      rubberband->maxWidth(2000000);
+      rubberband->minHeight(5000);
+      rubberband->maxHeight(1000000);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestRectangleOrthoRubber = new QPushButton(QLatin1String("Rectangle Ortho RB"), w);
+  rubberbandLayout->addWidget(pbTestRectangleOrthoRubber, rubberbandTests++, 0);
+
+  connect(pbTestRectangleOrthoRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandRectangle *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandRectangle>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband rectangle failed";
+    else
+    {
+      rubberband->constrainOrthogonal(true);
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+
+  QPushButton *pbTestRectangleParameter = new QPushButton(QLatin1String("Rectangle Parameter"), w);
+  rubberbandLayout->addWidget(pbTestRectangleParameter, rubberbandTests++, 0);
+
+  connect(pbTestRectangleParameter, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandRectangle *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandRectangle>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband rectangle failed";
+    else
+    {
+      SituationMap::CoordTranslationFunctor *cf = d->m_mapInterface->coordTranslationFunctor();
+
+
+      QPointF bottomLeft = d->m_mapInterface->centerPoint();
+      if (cf) bottomLeft = cf->geographicToMap(bottomLeft);
+      rubberband->buildRectangleRelativeToBottomLeftCorner(bottomLeft, 3000, 1500, QPoint(-1, 0), SituationMap::RB::CoordinateSystem::Map);
+
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+  });
+
+  QPushButton *pbTestEllipseRubber = new QPushButton(QLatin1String("Ellipse RB"), w);
+  rubberbandLayout->addWidget(pbTestEllipseRubber, rubberbandTests++, 0);
+
+  connect(pbTestEllipseRubber, &QPushButton::clicked, this, [this]()
+  {
+    d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(true);
+
+    RB::RubberbandEllipse *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandEllipse>();
+
+    d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(false);
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband ellipse failed";
+    else
+    {
+      if (rubberband->rubberbandIsAlive())
+      {
+        QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+        QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+      }
+      else
+      {
+        qWarning() << "Creating rubberband ellipse is not alive";
+        rubberband->deleteMySelf();
+      }
+    }
+  });
+
+  QPushButton *pbTestArrowRubber = new QPushButton(QLatin1String("Arrow RB"), w);
+  rubberbandLayout->addWidget(pbTestArrowRubber, rubberbandTests++, 0);
+
+  connect(pbTestArrowRubber, &QPushButton::clicked, this, [this]()
+  {
+
+    d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(true);
+
+    RB::RubberbandArrow *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandArrow>();
+
+    d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(false);
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband arrow failed";
+    else
+    {
+      if (rubberband->rubberbandIsAlive())
+      {
+        QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+        QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+      }
+      else
+      {
+        qWarning() << "Creating rubberband arrow is not alive";
+        rubberband->deleteMySelf();
+      }
+    }
+  });
+
+  QPushButton *pbTestFreeHdRubber = new QPushButton(QLatin1String("Freehand RB"), w);
+  rubberbandLayout->addWidget(pbTestFreeHdRubber, rubberbandTests++, 0);
+
+  connect(pbTestFreeHdRubber, &QPushButton::clicked, this, [this]()
+  {
+    RB::RubberbandFreeHand *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandFreeHand>();
+
+    if (rubberband == nullptr)
+      qWarning() << "Creating rubberband freehand failed";
+    else
+    {
+      rubberband->setFillColor(QColor(0, 0, 0, 0));
+      if (rubberband->rubberbandIsAlive())
+      {
+        QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+        QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+      }
+      else
+      {
+        qWarning() << "Creating rubberband freehand is not alive";
+        rubberband->deleteMySelf();
+      }
+    }
+  });
+
+  rubberbandTests = 2;
+  QPushButton *pbTestRubberDefineArrow = new QPushButton(QLatin1String("Define Arrow"), w);
+  rubberbandLayout->addWidget(pbTestRubberDefineArrow, rubberbandTests++, 1);
+
+  connect(pbTestRubberDefineArrow, &QPushButton::clicked, this, &FunctionDialog::onRubberbandDefineArrow);
+
+  QPushButton *pbTestRubberDefineEllipse = new QPushButton(QLatin1String("Define Ellipse"), w);
+  rubberbandLayout->addWidget(pbTestRubberDefineEllipse, rubberbandTests++, 1);
+
+  connect(pbTestRubberDefineEllipse, &QPushButton::clicked, this, &FunctionDialog::onRubberbandDefineEllipse);
+
+  QPushButton *pbTestRubberCoordinates = new QPushButton(QLatin1String("RB Coordinates"), w);
+  rubberbandLayout->addWidget(pbTestRubberCoordinates, rubberbandTests++, 1);
+
+  connect(pbTestRubberCoordinates, &QPushButton::clicked, this, &FunctionDialog::onRubberbandCheckCoordinates);
+
+  QPushButton *pbTestRectCoordinates = new QPushButton(QLatin1String("Rectangle Coord."), w);
+  rubberbandLayout->addWidget(pbTestRectCoordinates, rubberbandTests++, 1);
+
+  connect(pbTestRectCoordinates, &QPushButton::clicked, this, &FunctionDialog::onRectCheckCoordinates);
+
+  QPushButton *pbTestRubberStateSelect = new QPushButton(QLatin1String("State Select RB"), w);
+  rubberbandLayout->addWidget(pbTestRubberStateSelect, rubberbandTests++, 1);
+
+  connect(pbTestRubberStateSelect, &QPushButton::clicked, this, &FunctionDialog::onRubberbandStateSelect);
+
+  QPushButton *pbTestRubberDefineBoobyTrap = new QPushButton(QLatin1String("BoobyTrap Sector RB"), w);
+  rubberbandLayout->addWidget(pbTestRubberDefineBoobyTrap, rubberbandTests++, 1);
+
+  connect(pbTestRubberDefineBoobyTrap, &QPushButton::clicked, this, &FunctionDialog::onRubberbandBoobyTrapSector);
+
+
+
+  rubberbandTests = 2;
+  QPushButton *pbTestTowInOneRubberband = new QPushButton(QLatin1String("TwoInOne"), w);
+  rubberbandLayout->addWidget(pbTestTowInOneRubberband, rubberbandTests++, 3);
+  connect(pbTestTowInOneRubberband, &QPushButton::clicked, this, &FunctionDialog::onRubberbandTwoInOne);
+
+} /* FunctionDialog::addRubberbandTab */
+
+void FunctionDialog::onRubberbandApply(RB::RubberbandBase *rubberband)
+{
+  qCritical() << LOGFUNCTION  << " rubberband = " << rubberband;
+
+  RB::RubberbandPointFeature       *rubberbandPoint    = dynamic_cast<RB::RubberbandPointFeature *>(rubberband);
+  RB::RubberbandPointCluster       *rubberbandClust    = dynamic_cast<RB::RubberbandPointCluster *>(rubberband);
+  RB::RubberbandRectangle          *rubberbandRect     = dynamic_cast<RB::RubberbandRectangle *>(rubberband);
+  RB::RubberbandEllipse            *rubberbandElli     = dynamic_cast<RB::RubberbandEllipse *>(rubberband);
+  RB::RubberbandMultiPointFeature *rubberbandMFeat    = dynamic_cast<RB::RubberbandMultiPointFeature *>(rubberband);
+  RB::RubberbandMultiEllipseFeature *rubberbandMEllipseFeat    = dynamic_cast<RB::RubberbandMultiEllipseFeature *>(rubberband);
+  RB::RubberbandCorridor           *rubberbandCorr     = dynamic_cast<RB::RubberbandCorridor *>(rubberband);
+  RB::RubberbandSmoothLine         *rubberbandSmooth   = dynamic_cast<RB::RubberbandSmoothLine *>(rubberband);
+  RB::RubberbandArrow              *rubberbandArrow    = dynamic_cast<RB::RubberbandArrow *>(rubberband);
+  RB::RubberbandFreeHand           *rubberbandFreehand = dynamic_cast<RB::RubberbandFreeHand *>(rubberband);
+
+  if (rubberbandPoint)    qCritical()  << LOGFUNCTION  << "point feature rubberband";
+  if (rubberbandClust)    qCritical()  << LOGFUNCTION  << "point cluster rubberband";
+  if (rubberbandRect)     qCritical()  << LOGFUNCTION  << "rectangle rubberband";
+  if (rubberbandElli)     qCritical()  << LOGFUNCTION  << "ellipse rubberband";
+  if (rubberbandFreehand) qCritical()  << LOGFUNCTION  << "freehand rubberband";
+  if (rubberbandMEllipseFeat) qCritical()  << LOGFUNCTION  << "multiCircle rubberband";
+
+  if (rubberbandMFeat)
+  {
+    if (rubberbandCorr)         qDebug()  << LOGFUNCTION  << "corridor rubberband";
+    else if (rubberbandSmooth)  qDebug()  << LOGFUNCTION  << "smooth line rubberband";
+    else                        qDebug()  << LOGFUNCTION  << "multi point feature rubberband";
+  }
+
+  qCritical() << LOGFUNCTION  << " Count of Coordinates " << rubberband->coordinateCount();
+
+  if (rubberbandMEllipseFeat)
+  {
+    QPointF centerCoord = rubberbandMEllipseFeat->centerCoordinate(RB::CoordinateSystem::Map);
+    const QVector<QPointF> &radii = rubberbandMEllipseFeat->radii();
+
+    qCritical() << LOGFUNCTION  << " FIRST centerCoord " << centerCoord << ", radii = " << radii;
+    qCritical() << LOGFUNCTION  << " FIRST Sector sectorStart " << rubberbandMEllipseFeat->sectorStart();
+    qCritical() << LOGFUNCTION  << " FIRST Sector sectorEnd   "   << rubberbandMEllipseFeat->sectorEnd();
+
+    qCritical() << LOGFUNCTION  << " FIRST Sector sectorStartDegMath " << rubberbandMEllipseFeat->sectorStartDegMath();
+    qCritical() << LOGFUNCTION  << " FIRST Sector sectorEndDegMath   "   << rubberbandMEllipseFeat->sectorEndDegMath();
+
+
+
+    RB::RubberbandMultiEllipseFeature *rubberbandReCreate = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiEllipseFeature>();
+
+    if (!rubberbandReCreate)
+      qWarning() << "Creating rubberband multi CIRCLE feature failed";
+    else
+    {
+      rubberbandReCreate->setAutoDelete(true);
+#ifdef CIRCLE_CONTRAINT
+      rubberbandReCreate->constrainQuadratic(true);
+#endif
+      QVector<RB::RubberbandMultiEllipseFeature::RadiusWithContraints> radiiWithConstraints;
+      radiiWithConstraints.reserve(2);
+      for (const QPointF &item: qAsConst(radii))
+      {
+        RB::RubberbandMultiEllipseFeature::RadiusWithContraints radiusWC;
+        radiusWC.m_radius    = item.x();
+        radiusWC.m_minRadius = radiusWC.m_radius-250;
+        radiusWC.m_maxRadius = radiusWC.m_radius+250;
+
+        radiiWithConstraints.append(radiusWC);
+      }
+      rubberbandReCreate->setCenterAndRadii2(centerCoord, RB::CoordinateSystem::Map,
+                                     radiiWithConstraints);
+
+
+      QList<double> rotation = {0, 45, 90, -45, 180, 270, 315, 360};
+      double angle = 90; // oeffnungsWinkel
+      double rot = rotation.at(0); // clockwise
+      double aStartRad=0, aEndRad=0;
+      getSectorStartEnd(angle, rot, aStartRad, aEndRad);
+//      qCritical()<< "[FORWARD] rotation: " << rot
+//                 << ", angle start: "<< aStartRad << "[rad] (" << (aStartRad*LtsCoordTrans::rad2deg()) << "[deg])"
+//                 << ", angle end: "<< aEndRad << "[rad] (" << (aEndRad*LtsCoordTrans::rad2deg()) << "[deg])";
+
+      rubberbandReCreate->setSectorStart(std::sin(aStartRad), std::cos(aStartRad));
+      rubberbandReCreate->setSectorEnd(std::sin(aEndRad), std::cos(aEndRad));
+
+      rubberbandReCreate->setSectorAngleFixed(true);
+
+      QObject::connect(rubberbandReCreate, &RB::Rubberband::apply, this, [](RB::RubberbandBase *rubberband)
+      {
+        RB::RubberbandMultiEllipseFeature *rubberbandMCircleFeat = dynamic_cast<RB::RubberbandMultiEllipseFeature *>(rubberband);
+        if (!rubberbandMCircleFeat)
+          return;
+        QPointF centerCoord = rubberbandMCircleFeat->centerCoordinate(RB::CoordinateSystem::Map);
+        const QVector<QPointF> &radii = rubberbandMCircleFeat->radii();
+
+        qCritical() << LOGFUNCTION  << " SECOND centerCoord " << centerCoord << ", radii = " << radii;
+        qCritical() << LOGFUNCTION  << " SECOND Sector sectorStart " << rubberbandMCircleFeat->sectorStart();
+        qCritical() << LOGFUNCTION  << " SECOND Sector sectorEnd   "   << rubberbandMCircleFeat->sectorEnd();
+
+      });
+
+////      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+////      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+
+  }
+
+
+  QVector<QPointF> vertexList  = rubberband->coordinateVector();
+  bool             constrainQuad  = false;
+  bool             constrainOrtho = false;
+  if (rubberbandRect)
+  {
+    constrainQuad  = rubberbandRect->constrainQuadratic();
+    constrainOrtho = rubberbandRect->constrainOrthogonal();
+    QPointF geoPoint = rubberband->singleCoordinate(0, RB::CoordinateSystem::Geo);
+    qDebug() << LOGFUNCTION << "Rectangle center : geo coordinate " << geoPoint;
+    qDebug() << LOGFUNCTION << "Vertexlist sim coordinates " << vertexList;
+    d->m_mapInterface->geoCoordinateToViewPortWindowPoint(geoPoint);
+  }
+  else
+  {
+    for (unsigned int i = 0; i < rubberband->coordinateCount(); ++i)
+    {
+      QPointF geoPoint = rubberband->singleCoordinate(i, RB::CoordinateSystem::Geo);
+      qDebug() << LOGFUNCTION << " " << i << " geo coordinate " << geoPoint;
+    }
+  }
+
+  if (rubberbandFreehand)
+  {
+    rubberband->deleteMySelf();
+    return;
+  }
+
+  if (rubberbandCorr)
+  {
+    QVector<QPointF> bufferVertexList;
+
+    if (rubberbandCorr->bufferPolygon(bufferVertexList, RB::CoordinateSystem::Map))
+    {
+      static SituationMap::RefPointer<SituationMap::Polygon>  bufferPolygon;
+      if (bufferPolygon.valid()) bufferPolygon->removeMySelf();
+
+      bufferPolygon = d->m_mapInterface->objectFactory().create<SituationMap::Polygon>(QStringLiteral("FunctionDialog"), QStringLiteral("BufferPolygon"));
+
+      if (bufferPolygon.valid())
+      {
+
+        bufferPolygon->setIdentifier(QLatin1String("BufferPolygon"));
+        bufferPolygon->setVisibility(true);
+
+        QColor magenta(Qt::magenta);
+        QColor magentaAlpha(Qt::magenta);
+
+        magentaAlpha.setAlpha(100);
+
+        bufferPolygon->setLineStyle(LineStyle(magenta, 2, LinePattern::Solid));
+        bufferPolygon->setFillStyle(FillStyle(magentaAlpha, FillPattern::Solid));
+
+        SituationMap::PositionCont posCont;
+        posCont.reserve(bufferVertexList.size());
+        for (const auto &bufferPoint : qAsConst(bufferVertexList))
+        {
+          posCont << Point3D::fromQPointF(bufferPoint);
+          qDebug() << LOGFUNCTION << "buffer coordinate : " << bufferPoint ;   // Qt6: fixed/qSetRealNumberPrecision removed
+        }
+
+        bufferPolygon->setPositionsTranslated(posCont); // use map coordinates to print the coordinate values
+        bufferPolygon->updateView();
+
+
+        QTimer::singleShot(10000, this, [this]()
+        {
+          if (bufferPolygon.valid()) bufferPolygon->removeMySelf();
+          bufferPolygon = nullptr;
+
+          this->update();
+        });
+      }
+      else qDebug() << LOGFUNCTION << " creating polygon to visualize buffer polygon failed";
+    }
+    else qWarning() << LOGFUNCTION  << "RubberbandCorridor::bufferPolygon failed";
+  }
+
+  static QString rubberTypeLabel;
+
+  auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+  {
+    qDebug()  << LOGFUNCTION  << "end of " << rubberTypeLabel << " rubberband";
+
+    qDebug() << LOGFUNCTION << "Vertexlist sim coordinates " << rubberband->coordinateVector();
+
+    for (unsigned int i = 0; i < rubberband->coordinateCount(); ++i)
+    {
+      QPointF simPoint = rubberband->singleCoordinate(i, RB::CoordinateSystem::Geo);
+      qDebug() << LOGFUNCTION << " " << i << " sim coordinate " << simPoint;
+    }
+    rubberband->deleteMySelf();
+  };
+
+  if (rubberbandRect)
+  {
+    if (rubberbandElli)
+    {
+      rubberTypeLabel = QLatin1String("ellpise");
+      if (rubberbandElli->hasSector())
+      {
+        double rotation=0;
+        double openAngle = 0;
+        getRotationAndAngle(rubberbandElli->sectorStart(),rubberbandElli->sectorEnd(), rotation, openAngle);
+      }
+
+      rubberbandRect = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandEllipse>();
+    }
+    else
+    {
+      rubberTypeLabel = QLatin1String("rectangle");
+      rubberbandRect = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandRectangle>();
+    }
+    if (rubberbandRect == nullptr)
+      qWarning() << "Creating rubberband " << rubberTypeLabel << " failed";
+    else
+    {
+      rubberbandRect -> setCoordinateVector(vertexList);
+      rubberbandRect -> constrainQuadratic(constrainQuad);
+      rubberbandRect -> constrainOrthogonal(constrainOrtho);
+      rubberbandRect -> setDrawColor(QColor(QLatin1String("blue")));
+
+      connect(rubberbandRect, &RB::Rubberband::apply, slotFunc);
+      connect(rubberbandRect, &RB::Rubberband::abort, slotFunc);
+    }
+  }
+
+  bool mRbands = d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands();
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(true);
+  {
+    if (rubberbandMFeat)
+    {
+      RB::RubberbandMultiPointFeature *rbandMPF = nullptr;
+      if (rubberbandCorr)
+      {
+        RB::RubberbandCorridor *rbandCorr = d->m_mapInterface->rubberbandFactory().create(rubberbandCorr->isEnabledInputBoundary() ? RB::RubberbandCorridor::InputMode::InputBoundary
+                                                                                          : RB::RubberbandCorridor::InputMode::InputCenterLine);
+        if (rbandCorr != nullptr)
+        {
+          if (rubberbandCorr->isEnabledInputBoundary())
+          {
+            rbandCorr->setCoordinateVector(vertexList);
+//            rbandCorr->setDrawColor(QColor(QLatin1String("blue")));
+//            rbandCorr->setCorridorFillColor(QColor(QLatin1String("aqua")));
+          }
+          else
+          {
+            rbandCorr->setCoordinateVectorWidth(vertexList, rubberbandCorr->corridorWidth());
+//            rbandCorr->setDrawColor(QColor(QLatin1String("blue")));
+//            rbandCorr->setCorridorFillColor(QColor(QLatin1String("red")));
+          }
+
+          rubberTypeLabel = QLatin1String("corridor");
+
+          connect(rbandCorr, &RB::Rubberband::apply, slotFunc);
+          connect(rbandCorr, &RB::Rubberband::abort, slotFunc);
+        }
+        else qWarning() << "Creating rubberband corridor failed";
+      }
+      else if (rubberbandSmooth)
+      {
+        RB::RubberbandSmoothLine *rbandSmooth = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandSmoothLine>();
+
+        if (rbandSmooth != nullptr)
+        {
+          rbandMPF = rbandSmooth;
+          rubberTypeLabel = QLatin1String("smooth line");
+        }
+        else qWarning() << "Creating rubberband smooth line failed";
+      }
+      else if (rubberbandArrow)
+      {
+        RB::RubberbandArrow *rbandArrow = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandArrow>();
+
+        if (rbandArrow != nullptr)
+        {
+          rbandArrow->setCoordinateVectorArrow(vertexList, rubberbandArrow->arrowHalfWidth(), rubberbandArrow->arrowLength());
+          rbandArrow->setDrawColor(QColor(QLatin1String("purple")));
+
+          rubberTypeLabel = QLatin1String("arrow");
+
+          connect(rbandArrow, &RB::Rubberband::apply, slotFunc);
+          connect(rbandArrow, &RB::Rubberband::abort, slotFunc);
+        }
+        else qWarning() << "Creating rubberband arrow failed";
+      }
+      else
+      {
+        rbandMPF = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiPointFeature>();
+
+        rubberTypeLabel = QLatin1String("multi point feature");
+        if (rbandMPF == nullptr)
+          qWarning() << "Creating rubberband multi point feature failed";
+      }
+
+      if (rbandMPF != nullptr)
+      {
+        rbandMPF -> setCoordinateVector(vertexList);
+        rbandMPF -> enableClosed(rubberbandMFeat->isClosedEnabled());
+        rbandMPF -> setDrawColor(QColor(QLatin1String("maroon")));
+        rbandMPF -> setFillColor(QColor(QLatin1String("lime")));
+        rbandMPF -> setPreviewSidc(rubberbandMFeat->previewSidc());
+
+        connect(rbandMPF, &RB::Rubberband::apply, slotFunc);
+        connect(rbandMPF, &RB::Rubberband::abort, slotFunc);
+      }
+    }
+    if (rubberbandClust)
+    {
+      RB::RubberbandPointCluster   *rbandClust = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandPointCluster>();
+
+      if (rbandClust == nullptr)
+        qWarning() << "Creating rubberband point cluster failed";
+      else
+      {
+        rbandClust -> setCoordinateVector(vertexList);
+        rbandClust -> setPreviewSidc(rubberbandClust->previewSidc());
+
+        rubberTypeLabel = QLatin1String("point cluster");
+
+        connect(rbandClust, &RB::Rubberband::apply, slotFunc);
+        connect(rbandClust, &RB::Rubberband::abort, slotFunc);
+      }
+    }
+  }
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(mRbands);
+
+  rubberband->deleteMySelf();
+} // FunctionDialog::onRubberbandApply
+
+
+void FunctionDialog::onRubberbandAbort(RB::RubberbandBase *rubberband)
+{
+  qDebug() << LOGFUNCTION;
+  rubberband->deleteMySelf();
+} // FunctionDialog::onRubberbandAbort
+
+
+void FunctionDialog::onRubberbandDefineEllipse()
+{
+  static QVector<QPointF> vertexList;
+
+  if (vertexList.isEmpty())
+  {
+    vertexList << s_basePoint.geographic(d->m_objectBasePoint + QPointF(36042.4, 38162.5))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(302120, -46643.1))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(244876, -224735))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-21201.4, -139929));
+  }
+
+  SituationMap::RB::RubberbandEllipse *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandEllipse>();
+
+  if (rubberband == nullptr)
+    qWarning() << LOGFUNCTION << "Creating rubberband failed";
+  else
+  {
+    rubberband->setCoordinateVector(vertexList);
+
+    auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+    {
+      rubberband->deleteMySelf();
+    };
+
+    connect(rubberband, &RB::Rubberband::apply, slotFunc);
+    connect(rubberband, &RB::Rubberband::abort, slotFunc);
+  }
+}
+
+void FunctionDialog::getRotationAndAngle(const QPointF &sectStart, const QPointF &sectEnd, double &rotationDegOut, double &openAngleDegOut)
+{
+  double startAngle = SituationMap::MathUtils::getMathAngle(sectStart) * LtsCoordTrans::rad2deg();
+  double endAngle   = SituationMap::MathUtils::getMathAngle(sectEnd) * LtsCoordTrans::rad2deg();
+  // get start angle value in deg
+  {
+    startAngle = startAngle > 0   ? startAngle : (360 - startAngle);
+    startAngle = startAngle < 360 ? startAngle : std::fmod(startAngle,360.);
+  }
+
+  // get end angle value in deg
+  {
+    endAngle   = endAngle > 0 ? endAngle : (360 - endAngle);
+  }
+
+  // get angle value in deg
+  {
+    if ( startAngle > endAngle)
+      openAngleDegOut = 360 + (endAngle - startAngle);
+    else
+      openAngleDegOut = endAngle - startAngle;
+  }
+
+  // get rotation angle north (in deg) orientated 0° North(12h)
+  {
+    rotationDegOut = SituationMap::MathUtils::getAngleDegree2North((startAngle + (openAngleDegOut/2.)));
+  }
+
+  //qCritical()<<" sDeg:"<<startAngle<<"°, eDeg:"<<endAngle<<"°, rotationDeg:"<<rotationDeg<<"°, angleDeg:["<<openAngleDeg<<"°]";
+}
+
+void FunctionDialog::onRubberbandBoobyTrapSector()
+{
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(true);
+
+  RB::RubberbandEllipse *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandEllipse>();
+
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(false);
+
+  if (rubberband == nullptr)
+    qWarning() << "Creating rubberband BoobyTrap failed";
+  else
+  {
+    if (rubberband->rubberbandIsAlive())
+    {
+      rubberband->constrainQuadratic(true);
+      rubberband->enableSector(true);
+
+      QList<double> rotation =  QList<double>()<<0<<45<<90<<-45<<180<<270<<315<<360;
+      double angle = 90;
+      double rot = rotation.at(0);
+      double aStartRad=0, aEndRad=0;
+      getSectorStartEnd(angle, rot, aStartRad, aEndRad);
+//      qCritical()<<"[FORWARD] rotation: "<<rot<<" angle start: "<<aStartRad<<" angle end: "<<aEndRad
+//                <<"[deg] s : "<<(aStartRad*LtsCoordTrans::rad2deg())<<" e: "<<(aEndRad*LtsCoordTrans::rad2deg());
+
+      rubberband->setSectorStart(std::sin(aStartRad), std::cos(aStartRad));
+      rubberband->setSectorEnd(std::sin(aEndRad), std::cos(aEndRad));
+
+      QObject::connect(rubberband, &RB::Rubberband::apply, this, &FunctionDialog::onRubberbandApply);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+    else
+    {
+      qWarning() << "Creating rubberband BoobyTrap is not alive";
+      rubberband->deleteMySelf();
+    }
+  }
+
+
+} /* FunctionDialog::onRubberbandDefineEllipse */
+
+
+void FunctionDialog::onRubberbandDefineArrow()
+{
+  static QVector<QPointF> vertexList;
+
+  if (vertexList.isEmpty())
+  {
+    vertexList << s_basePoint.geographic(d->m_objectBasePoint + QPointF(36042.4, 38162.5))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(302120, -46643.1))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(244876, -224735))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-21201.4, -139929));
+  }
+
+  SituationMap::RB::RubberbandArrow *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandArrow>();
+
+  if (rubberband == nullptr)
+    qWarning() << LOGFUNCTION << "Creating rubberband failed";
+  else
+  {
+    rubberband->setCoordinateVector(vertexList);
+
+    auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+    {
+      rubberband->deleteMySelf();
+    };
+
+    connect(rubberband, &RB::Rubberband::apply, slotFunc);
+    connect(rubberband, &RB::Rubberband::abort, slotFunc);
+  }
+} /* FunctionDialog::onRubberbandDefineEllipse */
+
+
+void FunctionDialog::onRubberbandCheckCoordinates()
+{
+  static QVector<QPointF> vertexList;
+
+  if (vertexList.isEmpty())
+  {
+    vertexList << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, -71025))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, -71025))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(36042.4, 38162.5))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(302120, -46643.1))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(244876, -224735))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-21201.4, -139929));
+  }
+
+  if (d->m_mapImpl->coordTranslationFunctor())
+  {
+    bool ok = true;
+    for (const QPointF &p : qAsConst(vertexList))
+    {
+      const QPointF p1(d->m_mapImpl->coordTranslationFunctor()->geographicToMap(p));
+      const QPointF p2(d->m_mapImpl->coordTranslationFunctor()->mapToGeographic(p1));
+      if ((fabs(p2.x() - p.x()) > 1) || (fabs(p2.y() - p.y()) > 1))
+      {
+        ok = false;
+#ifdef LTS_DEBUG
+        assert(false);
+#endif
+      }
+    }
+    if (!ok)
+      qWarning() << LOGFUNCTION << "CoordTranslationFunctor is to inaccurate.";
+  }
+
+
+  auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+  {
+    bool ok = true;
+
+    if (((unsigned int)vertexList.size()) == rubberband->coordinateCount())
+    {
+      for (unsigned int i = 0; i < rubberband->coordinateCount(); ++i)
+      {
+        QPointF simPoint = rubberband->singleCoordinate(i);
+        QPointF p        = vertexList[i];
+
+        if ((fabs(simPoint.x() - p.x()) > d->m_mapImpl->pixelSizeMeter()) || (fabs(simPoint.y() - p.y()) > d->m_mapImpl->pixelSizeMeter()))
+        {
+          ok = false;
+#ifdef LTS_DEBUG
+          assert(false);
+#endif
+        }
+      }
+    }
+    else qWarning() << LOGFUNCTION << "Rubberband coordinates are modified by user, skip coordinate test.";
+    rubberband->deleteMySelf();
+
+    if (!ok)
+      qWarning() << LOGFUNCTION << "Rubberband coordinates may be changed without editing.";
+  };
+
+  RB::RubberbandMultiPointFeature   *rband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiPointFeature>();
+
+  if (rband == nullptr)
+    qWarning() << "Creating rubberband multi point failed";
+  else
+  {
+    rband->setCoordinateVector(vertexList);
+
+    connect(rband, &RB::Rubberband::apply, slotFunc);
+    connect(rband, &RB::Rubberband::abort, slotFunc);
+  }
+} /* FunctionDialog::onRubberbandCheckCoordinates */
+
+
+
+
+#include "state_icon_a.xpm"
+#include "state_icon_b.xpm"
+#include "state_icon_c.xpm"
+
+void FunctionDialog::onRubberbandStateSelect()
+{
+  static QVector<QPointF> vertexList;
+
+  if (vertexList.isEmpty())
+  {
+    vertexList << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, -71025))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, -71025))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(36042.4, 38162.5))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(302120, -46643.1))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(244876, -224735))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-21201.4, -139929));
+  }
+
+  RB::RubberbandStateSelect   *rband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandStateSelect>();
+
+  if (rband)
+  {
+    rband -> setHandleFillColor(QColor(0, 0, 0,  0));
+    rband -> setHandleSelectionColor(QColor(255, 0, 0, 100));
+
+    QVector<RB::RubberbandStateSelect::State>      stateVector;
+    QVector<RB::RubberbandStateSelect::StateItem>  itemVector;
+
+    stateVector << RB::RubberbandStateSelect::State('A', QLatin1String("Test State A"), QPixmap(stateIconA_xpm))
+                << RB::RubberbandStateSelect::State('B', QLatin1String("Test State B"), QPixmap(stateIconB_xpm))
+                << RB::RubberbandStateSelect::State('C', QLatin1String("Test State C"), QPixmap(stateIconC_xpm));
+
+    quint32 id = 815;
+    itemVector.reserve(vertexList.size());
+    for (const QPointF &p : qAsConst(vertexList))
+    {
+      itemVector << RB::RubberbandStateSelect::StateItem(id, QStringLiteral("Item %1").arg(id), p, 'A');
+      ++id;
+    }
+
+    if (rband->setStateItems(stateVector, itemVector))
+    {
+      auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+      {
+        rubberband->deleteMySelf();
+      };
+      connect(rband, &RB::Rubberband::apply, slotFunc);
+      connect(rband, &RB::Rubberband::abort, slotFunc);
+    }
+    else
+    {
+      rband->deleteMySelf();
+      qWarning() << "Setting item states to rubberband state select failed.";
+    }
+  }
+  else
+    qWarning() << "Creating rubberband state select";
+
+} /* FunctionDialog::onRubberbandStateSelect */
+
+
+void FunctionDialog::onRubberbandTwoInOne()
+{
+  qCritical() << " onRubberbandTwoInOne...";
+
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(false);
+
+  static QVector<QPointF> s_vertexList;
+  s_vertexList.clear();
+
+
+  const auto onApply2 = [](RB::RubberbandBase *rubberband) -> void
+  {
+    qCritical() << " onRubberbandTwoInOne onApply 2 ";
+
+    RB::RubberbandEllipse *rubberbandElli = dynamic_cast<RB::RubberbandEllipse *>(rubberband);
+    if (!rubberband)
+    {
+      qCritical() << " onRubberbandTwoInOne dynamic_cast failed";
+      return;
+    }
+
+    if (!rubberbandElli)
+    {
+      qCritical() << " onRubberbandTwoInOne no Rubberband!";
+      return;
+    }
+
+    QVector<QPointF> coordinateVector = rubberbandElli->coordinateVector();
+    qCritical() << " onRubberbandTwoInOne coordinateVector = " << coordinateVector;
+
+    QVector<QPointF> data = rubberbandElli->rectangleVerticies();
+    const LtsCoordTrans::UtmCoordinate p0(LtsCoordTrans::UtmCoordinate::fromGeographic(data.at(0)));
+    const LtsCoordTrans::UtmCoordinate p1(LtsCoordTrans::UtmCoordinate::fromGeographic(data.at(2), p0.zone));
+    const double radius = fabs((p0.x - p1.x) / 2);
+    qCritical() << " onRubberbandTwoInOne radius 2 = " << radius;
+
+  }; // onApply2
+
+
+
+  const auto onApply1 = [this, onApply2](RB::RubberbandBase *rubberband) -> void
+  {
+    qCritical() << " onRubberbandTwoInOne onApply 1 ";
+
+    RB::RubberbandMultiEllipseFeature *rubberbandElli = dynamic_cast<RB::RubberbandMultiEllipseFeature *>(rubberband);
+    if (!rubberband)
+    {
+      qCritical() << " onRubberbandTwoInOne dynamic_cast failed";
+      return;
+    }
+
+    QPointF centerCoord = rubberbandElli->centerCoordinate(RB::CoordinateSystem::Map);
+    const QVector<QPointF> &radii = rubberbandElli->radii();
+
+    qCritical() << LOGFUNCTION  << " FRIST centerCoord " << centerCoord
+                << " - radii = " << radii;
+
+    double radiusMax = radii.last().x();
+
+    // 'save' for following rubberband:
+    s_vertexList = rubberbandElli->coordinateVector();
+
+
+    //
+    // create SECOND RB
+
+    //
+    QTimer::singleShot(250, this, [this, onApply2, radiusMax]
+    {
+      RB::RubberbandEllipse *rubberband2 = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandEllipse>();
+      if (rubberband2->rubberbandIsAlive())
+      {
+        QObject::connect(rubberband2, &RB::Rubberband::apply, onApply2);
+        QObject::connect(rubberband2, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+      }
+      else
+      {
+        qWarning() << "Creating rubberband 2 ellipse is not alive";
+        rubberband2->deleteMySelf();
+      }
+
+      rubberband2->setAutoDelete(true);
+
+      rubberband2->buildFromRectangleParamter(s_vertexList.first(),
+                                              radiusMax * 2, radiusMax * 2,
+                                              QPointF(1, 0));
+//      rubberband2->setCoordinateVector(s_vertexList);
+
+      rubberband2->minWidth(2*radiusMax);
+      rubberband2->maxWidth(2*radiusMax);
+      rubberband2->minHeight(2*radiusMax);
+      rubberband2->maxHeight(2*radiusMax);
+
+      rubberband2->enableSector(true);
+      rubberband2->setSectorAngleFixed(true);
+      rubberband2->setSectorStart(0.75,0.75);
+      rubberband2->setSectorEnd(0.75,-0.75);
+      rubberband2->constrainQuadratic(true);
+//      rubberband2->constrainOrthogonal(true);
+
+      rubberband2->setLineHandleWidth(2);
+
+    });
+  }; // onApply1
+
+  //
+  // 'main'
+  //
+  RB::RubberbandMultiEllipseFeature *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandMultiEllipseFeature>();
+
+  d->m_mapInterface->rubberbandFactory().allowMultipleRubberbands(true);
+
+  if (!rubberband)
+    qWarning() << "Creating rubberband ellipse failed";
+  else
+  {
+    rubberband->setAutoDelete(true);
+    rubberband->minimumRadiusCount(2);
+    rubberband->maximumRadiusCount(2);
+    rubberband->constrainQuadratic(true);
+
+    if (rubberband->rubberbandIsAlive())
+    {
+      QObject::connect(rubberband, &RB::Rubberband::apply, onApply1);
+      QObject::connect(rubberband, &RB::Rubberband::abort, this, &FunctionDialog::onRubberbandAbort);
+    }
+    else
+    {
+      qWarning() << "Creating rubberband 1 ellipse is not alive";
+      rubberband->deleteMySelf();
+    }
+  }
+
+
+}
+
+
+void FunctionDialog::onRectCheckCoordinates()
+{
+  static QVector<QPointF> vertexList;
+
+  if (vertexList.isEmpty())
+  {
+    vertexList << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, 168551))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(154770, -71025))
+               << s_basePoint.geographic(d->m_objectBasePoint + QPointF(-338163, -71025));
+  }
+
+  auto slotFunc = [ = ](RB::RubberbandBase * rubberband)
+  {
+    bool ok = true;
+    RB::RubberbandRectangle *rband = dynamic_cast<RB::RubberbandRectangle *>(rubberband);
+
+    if (rband == nullptr) return;
+
+    QVector<QPointF> rectangleCoords = rband->rectangleVerticies();
+    for (int i = 0; i < rectangleCoords.size(); ++i)
+    {
+      const QPointF &simPoint = rectangleCoords[i];
+      const QPointF &p        = vertexList[i];
+
+      if ((fabs(simPoint.x() - p.x()) > d->m_mapImpl->pixelSizeMeter()) || (fabs(simPoint.y() - p.y()) > d->m_mapImpl->pixelSizeMeter()))
+        ok = false;
+    }
+
+    if (!rband->rectangleIsValid())
+      qWarning() << LOGFUNCTION << "Rectangle rubberband has been initialized with invalid coordinates";
+    else
+    {
+      if (!ok) qWarning() << LOGFUNCTION << "Rubberband coordinates changed without editing.";
+    }
+
+    rubberband->deleteMySelf();
+  }; // slotFunc
+
+  RB::RubberbandRectangle   *rband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandRectangle>();
+
+  if (rband == nullptr)
+    qWarning() << "Creating rubberband rectangle failed";
+  else
+  {
+    rband->setCoordinateVector(vertexList);
+
+    connect(rband, &RB::Rubberband::apply, slotFunc);
+    connect(rband, &RB::Rubberband::abort, slotFunc);
+  }
+} /* FunctionDialog::onRectCheckCoordinates */
+
+
+
+
+void FunctionDialog::addToolsTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Tools - ObjIndicator, measure, Location"));
+
+  //-----------------------------------
+  // createObjectIndicator
+  //-----------------------------------
+  QPushButton *pbObjectIndicator = new QPushButton(QLatin1String("Object Indicator"));
+  layout->addWidget(pbObjectIndicator);
+  connect(pbObjectIndicator, &QPushButton::clicked,
+          this, &FunctionDialog::onObjectIndicator);
+
+
+  //-----------------------------------
+  // createMeasurementButton
+  //-----------------------------------
+  QPushButton *pbCreateMeasurement = new QPushButton(QLatin1String("measure length"));
+  layout->addWidget(pbCreateMeasurement);
+  connect(pbCreateMeasurement, &QPushButton::clicked,
+          this, &FunctionDialog::onMeasureLength);
+
+
+  //-----------------------------------
+  // LocationDisplay
+  //-----------------------------------
+  QGridLayout *locationDisplayLayout = new QGridLayout();
+  locationDisplayLayout->setObjectName(QLatin1String("LocationDisplayLayout"));
+  layout->addLayout(locationDisplayLayout, layout->rowCount(), 0);
+
+  //-----------------------------------
+  // startLocationDisplay
+  //-----------------------------------
+  QPushButton *pbstartLocationDisplay = new QPushButton(QLatin1String("start LocationDisplay"));
+  locationDisplayLayout->addWidget(pbstartLocationDisplay, 0, 0);
+  connect(pbstartLocationDisplay, &QPushButton::clicked,
+          this, &FunctionDialog::onStartLocationDisplay);
+  //-----------------------------------
+  // stopLocationDisplay
+  //-----------------------------------
+  QPushButton *pbstopLocationDisplay = new QPushButton(QLatin1String("stop LocationDisplay"));
+  locationDisplayLayout->addWidget(pbstopLocationDisplay, 0, 1);
+  connect(pbstopLocationDisplay, &QPushButton::clicked,
+          this, &FunctionDialog::onStopLocationDisplay);
+}
+
+void FunctionDialog::addViewshedTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Tool Viewshed"));
+
+  //-----------------------------------
+  // createViewshedButtons
+  //-----------------------------------
+  QPushButton *pbLoadFile = new QPushButton(QLatin1String(" pbLoadFile"));
+  layout->addWidget(pbLoadFile);
+  connect(pbLoadFile, &QPushButton::clicked,
+          this, &FunctionDialog::onLoadFile);
+
+#ifdef USE_LOCAL_SERVER
+  {
+    QPushButton *pbStartLocalService = new QPushButton(QLatin1String(" Start LocalService"));
+    layout->addWidget(pbStartLocalService);
+    connect(pbStartLocalService, &QPushButton::clicked,
+            this, &FunctionDialog::onStartLocalService);
+    pbStartLocalService->setStyleSheet(QLatin1String("QPushButton {background-color: gray;}"));
+
+    QPushButton *pbStopLocalService = new QPushButton(QLatin1String(" Stop LocalService"));
+    layout->addWidget(pbStopLocalService);
+    connect(pbStopLocalService, &QPushButton::clicked,
+            this, &FunctionDialog::onStopLocalService);
+
+    QPushButton *pbStartViewshedSvc = new QPushButton(QLatin1String(" Start ViewshedSvc"));
+    layout->addWidget(pbStartViewshedSvc);
+    connect(pbStartViewshedSvc, &QPushButton::clicked,
+            this, &FunctionDialog::onStartViewshedSvc);
+    pbStartViewshedSvc->setStyleSheet(QLatin1String("QPushButton {background-color: gray;}"));
+
+    QPushButton *pbStopViewshedSvc = new QPushButton(QLatin1String(" Stop ViewshedSvc"));
+    layout->addWidget(pbStopViewshedSvc);
+    connect(pbStopViewshedSvc, &QPushButton::clicked,
+            this, &FunctionDialog::onStopViewshedSvc);
+  }
+
+
+  if (!d->m_viewshedDistance)
+  {
+    d->m_viewshedDistance = new QLineEdit(this);
+    layout->addWidget(d->m_viewshedDistance);
+    d->m_viewshedDistance->setText(QLatin1String("5123"));
+  }
+
+  QPushButton *pbCreateViewshedIF = new QPushButton(QLatin1String("create viewshed interactive - at Interface"));
+  layout->addWidget(pbCreateViewshedIF);
+  connect(pbCreateViewshedIF, &QPushButton::clicked,
+          this, &FunctionDialog::onViewshedInteractive);
+
+  QPushButton *pbCreateViewshedEsri = new QPushButton(QLatin1String("create viewshed - ESRI"));
+  layout->addWidget(pbCreateViewshedEsri);
+  connect(pbCreateViewshedEsri, &QPushButton::clicked,
+          this, &FunctionDialog::onViewshed);
+#endif // USE_LOCAL_SERVER
+
+  QPushButton *pbCreateViewshed = new QPushButton(QLatin1String("create viewshed - SightFan"));
+  layout->addWidget(pbCreateViewshed);
+  connect(pbCreateViewshed, &QPushButton::clicked,
+    this, &FunctionDialog::onViewshedSightFan);
+
+  QFormLayout * sightFanLayout = new QFormLayout();
+
+  mainLayout->addLayout(sightFanLayout);
+  if (!d->m_sightFanObserverHeight)
+  {
+    d->m_sightFanObserverHeight = new QLineEdit(this);
+    d->m_sightFanTargetHeight   = new QLineEdit(this);
+
+    d->m_sightFanObserverHeight->setValidator(new QDoubleValidator(d->m_sightFanObserverHeight));
+    d->m_sightFanTargetHeight->setValidator(new QDoubleValidator(d->m_sightFanTargetHeight));
+
+    d->m_sightFanObserverHeight->setText(QStringLiteral("2.0"));
+    d->m_sightFanTargetHeight->setText(QStringLiteral("2.0"));
+
+    QPushButton *pbCreateSightFan = new QPushButton(QStringLiteral("Create Sight Fan"), this);
+
+    connect(pbCreateSightFan, &QPushButton::clicked, this, &FunctionDialog::onSightFan );
+
+    sightFanLayout->addRow(QStringLiteral("Target Height"), d->m_sightFanObserverHeight);
+    sightFanLayout->addRow(QStringLiteral("Observer Height"), d->m_sightFanTargetHeight);
+    sightFanLayout->addWidget(pbCreateSightFan);
+
+  }
+}
+
+void SituationMap::FunctionDialog::addOverlayPlanTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Overlay/Plan"));
+
+
+  const auto slOverlays = {
+    QLatin1String("myplan"),
+    QLatin1String("myplan2")
+  };
+
+  int row = 0;
+  int key = 4711;
+//  layout->addWidget(new QLabel(QLatin1String("onOff")), row, 0);
+//  layout->addWidget(new QLabel(QLatin1String("load plan")), row, 1);
+//  layout->addWidget(new QLabel(QLatin1String("remove plan")), row, 2);
+  for (const auto &overlayName : slOverlays)
+  {
+    ++key;
+    ++row;
+    int col = 0;
+    QCheckBox *cbPlan = new QCheckBox(overlayName);
+    cbPlan->setProperty("key", key);
+    layout->addWidget(cbPlan, row, col);
+    connect(cbPlan, &QPushButton::clicked,
+            this, &FunctionDialog::onOverlayVisiChanged);
+
+    ++col;
+    QPushButton *pbLoadPlan = new QPushButton(QLatin1String("load ") + overlayName);
+    pbLoadPlan->setProperty("name", overlayName);
+    pbLoadPlan->setProperty("key", key);
+    layout->addWidget(pbLoadPlan, row, 1);
+    connect(pbLoadPlan, &QPushButton::clicked,
+            this, &FunctionDialog::onLoadPlan);
+
+    ++col;
+    QPushButton *pbRemovePlan = new QPushButton(QLatin1String("remove ") + overlayName);
+    pbRemovePlan->setProperty("key", key);
+    layout->addWidget(pbRemovePlan, row, 2);
+    connect(pbRemovePlan, &QPushButton::clicked,
+            this, &FunctionDialog::onRemovePlan);
+  } // Q_FOREACH
+
+  // Remove all
+  ++row;
+  QPushButton *pbRemoveAll = new QPushButton(QLatin1String("Remove all overlays"));
+  layout->addWidget(pbRemoveAll, row, 0);
+  connect(pbRemoveAll, &QPushButton::clicked,
+          this, &FunctionDialog::onRemoveAllPlans);
+}
+
+void FunctionDialog::addIconRenderTab()
+{
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Icon Demo"));
+
+  //-----------------------------------
+  // create button
+  //-----------------------------------
+  LtsWidgets::LtsDragIcon *dummyIcon = new LtsWidgets::LtsDragIcon(this);
+  layout->addWidget(dummyIcon);
+
+  dummyIcon->setText(QLatin1String("dummyIcon"));
+
+  QImage dummyImage(100, 100, QImage::Format_ARGB32);
+  {
+    dummyImage.fill(Qt::transparent);
+    QPainter painter(&dummyImage);
+    painter.setBrush(QBrush(Qt::gray));
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(dummyImage.rect());
+    painter.setPen(QPen(Qt::red));
+    painter.drawText(dummyImage.rect(), Qt::AlignCenter, QLatin1String("dummyIcon"));
+    painter.end();
+  }
+
+  dummyIcon->setIcon(QIcon(QPixmap::fromImage(dummyImage)));
+
+  // show template-based approach :
+  // (is executed by FunctionDialog::addIconRenderTab() )
+  {
+//    AdvancedSymbology::SymbolResultWatcherQWidgetBase *dummyIconSibling =
+//      new AdvancedSymbology::SymbolResultWatcherQWidget<LtsWidgets::LtsDragIcon>(dummyIcon);
+    QSharedPointer<AdvancedSymbology::SymbolResultWatcherQWidgetBase> dummyIconSibling (new AdvancedSymbology::SymbolResultWatcherQWidget<LtsWidgets::LtsDragIcon>(dummyIcon));
+
+    AdvancedSymbology::SymbolDictionary &dict = d->m_mapImpl->symbolDictionary();
+    const QString sidc(AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10051000001213030000"));
+
+    // option a
+    // dummyIconSibling->setSymbolResult(dict.findPreview(sidc));
+
+    // option b
+    AdvancedSymbology::SymbolDataToRender symDataToRender(sidc);
+    symDataToRender.injury = AdvancedSymbology::Injury::TotalKill;
+    symDataToRender.injuryColor = Qt::blue;
+    dummyIconSibling->setSymbolResult(dict.findImage(symDataToRender));
+
+    // option c
+    // dummyIconSibling->setSymbolResult(dict.findBaseSymbol(sidc));
+  }
+  // : show template-based approach
+}
+
+void FunctionDialog::addPortalTab()
+{
+  qDebug() << LOGFUNCTION ;
+
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("Portal"));
+
+  //-----------------------------------
+  // create button
+  //-----------------------------------
+  QPushButton *pbLoadPortal = new QPushButton(QLatin1String("load Portal"));
+  layout->addWidget(pbLoadPortal);
+  connect(pbLoadPortal, &QPushButton::clicked, this, &FunctionDialog::onPortal);
+
+}
+
+void FunctionDialog::addMovePointLuxemburgTab()
+{
+  qDebug() << LOGFUNCTION ;
+
+  QWidget *w = new QWidget();
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(w);
+  QGridLayout *layout = new QGridLayout();
+  mainLayout->addLayout(layout);
+  mainLayout->addStretch();
+
+  d->m_tabwidget->addTab(w, QLatin1String("MovePoint"));
+
+  //-----------------------------------
+  // create button
+  //-----------------------------------
+  QPushButton *pbMovePoint = new QPushButton(QLatin1String("MovePoint"));
+  layout->addWidget(pbMovePoint);
+  connect(pbMovePoint, &QPushButton::clicked, this, &FunctionDialog::onMovePoint);
+}
+
+void FunctionDialog::onPortal()
+{
+  Portal *portal = new Portal(this);
+
+  bool init = portal->init();
+  qCritical() << " portal.init = " << init;
+
+  //  bool fetchData = portal->fetchData();
+  //  qCritical() << " portal.fetchData = " << fetchData;
+}
+
+void FunctionDialog::onMovePoint()
+{
+  const int incrementX = 1000;
+  qCritical() << " move marker from Center to left (arcording UTM), incrementX [m]:" << incrementX;
+
+  const QPointF centerGeo = d->m_mapImpl->centerPoint();
+  const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerGeo);
+
+  qCritical() << "center " << centerGeo
+              << " # utm " << centerUtm.x << " ; " << centerUtm.y<< " # utm " << centerUtm.mgrs();
+
+
+  PositionCont posContIncrement;
+  posContIncrement.reserve(10);
+
+  for (int i=0; i< 10; ++i)
+  {
+    LtsCoordTrans::UtmCoordinate movedCoord = centerUtm;
+    movedCoord.x -= i*incrementX;
+
+    qCritical() << qSetRealNumberPrecision(8) << " # UTM " << movedCoord.x << " ; " << movedCoord.y << " # utm " << movedCoord.mgrs();
+
+    {
+      LtsCoordTrans::UtmCoordinate reverse = LtsCoordTrans::UtmCoordinate::fromGeographic(movedCoord.geographic());
+      qCritical() << qSetRealNumberPrecision(8) << " # rev " << reverse.x << " ; " << reverse.y << " # utm " << reverse.mgrs();
+
+      // diff zw. movedCoord & reverse:
+      QPointF diff = movedCoord.geographic() - reverse.geographic();
+      qCritical() << qSetRealNumberPrecision(8) << "    diff " << diff;
+    }
+
+    appendQPointF(posContIncrement, movedCoord.geographic());
+  }
+
+  qCritical() << "  reCreate Coord every step  **********+";
+
+  // reCreate Coord every step
+  PositionCont posContRelative;
+  posContRelative.reserve(10);
+
+  LtsCoordTrans::UtmCoordinate incrementedCoord = centerUtm;
+
+  QPointF geo = incrementedCoord.geographic();
+
+  for (int i=0; i< 10; ++i)
+  {
+    LtsCoordTrans::UtmCoordinate coord = LtsCoordTrans::UtmCoordinate::fromGeographic(geo);
+
+    qCritical() << qSetRealNumberPrecision(8) << " # UTM " << coord.x << " ; " << coord.y << " # utm " << coord.mgrs();
+    appendQPointF(posContRelative, geo);
+
+    coord.x -= incrementX;
+    geo = coord.geographic();
+  }
+
+  {
+    RefPointer<SituationMap::Polyline> polyline;
+
+    polyline = d->m_mapInterface->objectFactory().
+        create<SituationMap::Polyline>(QLatin1String("AES"), QLatin1String("PolyLINE_Lux1Increment"));
+    if (!polyline)
+    {
+      qDebug() << LOGFUNCTION << " no object";
+      return;
+    }
+
+    polyline->setIdentifier(QLatin1String("Polyline-Luxemburg"));
+    LineStyle lineStyle(Qt::red, 5, LinePattern::Solid);
+    polyline->setLineStyle(lineStyle);
+    polyline->setPositions(posContIncrement);
+    bool success = polyline->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+
+  {
+    RefPointer<SituationMap::Polyline> polyline;
+
+    polyline = d->m_mapInterface->objectFactory().
+        create<SituationMap::Polyline>(QLatin1String("AES"), QLatin1String("PolyLINE_Lux2Relative"));
+    if (!polyline)
+    {
+      qDebug() << LOGFUNCTION << " no object";
+      return;
+    }
+
+    polyline->setIdentifier(QLatin1String("Polyline-Luxemburg"));
+    LineStyle lineStyle(Qt::blue, 2, LinePattern::Dash);
+    polyline->setLineStyle(lineStyle);
+    polyline->setPositions(posContRelative);
+    bool success = polyline->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+}
+
+
+void FunctionDialog::onPolygonCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_polygon));
+
+  d->m_polygon = d->m_mapInterface->objectFactory().
+                 create<SituationMap::Polygon>(QLatin1String("AES"), QLatin1String("PolyGON_Id"));
+
+  if (!d->m_polygon)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_polygon->setIdentifier(QLatin1String("Polygon-NotOutLined"));
+
+  d->m_polygon->setVisibility(d->m_visibility);
+  d->m_polygon->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_polygon->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_polygon->setSelected(d->m_selected);
+
+  TextStyle textStyle(Qt::magenta);
+  LineStyle lineStyle(Qt::blue, 2, LinePattern::Solid);
+  FillStyle fillStyle(Qt::red, FillPattern::ForwardDiagonal);
+
+  d->m_polygon->setTextStyle(textStyle);
+  d->m_polygon->setLineStyle(lineStyle);
+  d->m_polygon->setFillStyle(fillStyle);
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(90000, 150000);
+
+  int extent = 100000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,           0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,           0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-extent / 2,  extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,  extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_polygon->setPositions(posCont);
+
+  bool success = d->m_polygon->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_polygon->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " Polygon success = " << success << std::endl;
+  std::cout << " Polygon dump: " << (*d->m_polygon) << std::endl;
+
+
+//  QTimer* timer = new QTimer(this);
+//  connect(timer, &QTimer::timeout, this, &FunctionDialog::onDangerAreaUpdate);
+//  timer->setSingleShot(true);
+//  timer->start(2000);
+
+}
+
+void FunctionDialog::onPolylineCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_polyline));
+
+  d->m_polyline = d->m_mapInterface->objectFactory().
+                  create<SituationMap::Polyline>(QLatin1String("AES"), QLatin1String("PolyLINE_Id"));
+
+  if (!d->m_polyline)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_polyline->setIdentifier(QLatin1String("Polyline-NotOutLined"));
+
+  d->m_polyline->setVisibility(d->m_visibility);
+  d->m_polyline->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_polyline->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_polyline->setSelected(d->m_selected);
+
+  TextStyle textStyle(Qt::darkGreen);
+  LineStyle lineStyle(Qt::red, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::DiagonalCross);
+
+  d->m_polyline->setTextStyle(textStyle);
+  d->m_polyline->setLineStyle(lineStyle);
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(100000, 150000);
+
+  int extent = 100000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0, extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,      0)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_polyline->setPositions(posCont);
+
+  bool success = d->m_polyline->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_polyline->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " Polyline success = " << success << std::endl;
+  std::cout << " Polyline dump: " << (*d->m_polyline) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onPolylineUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onPolylineUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_polyline)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_polyline->setArrowHeadStart(true);
+  d->m_polyline->setArrowHeadEnd(true);
+
+  bool success = d->m_polyline->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onTextCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_text));
+
+  d->m_text = d->m_mapInterface->objectFactory().
+              create<SituationMap::Text>(QLatin1String("AES"), QLatin1String("TextId"));
+
+  if (!d->m_text)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_text->setIdentifier(QLatin1String("Text-NotOutLined\nNewLineForPatrick"));
+
+  d->m_text->setVisibility(d->m_visibility);
+//  d->m_polyline->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+//  d->m_polyline->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_text->setSelected(d->m_selected);
+
+  TextStyle textStyle(Qt::darkRed);
+
+  d->m_text->setTextStyle(textStyle);
+
+
+  // set additional values:
+  QPointF origin = d->m_objectBasePoint + QPointF(90000, 120000);
+
+  std::cout << " origin=" <<  origin << std::endl;
+
+  origin = s_basePoint.geographic(origin);
+  d->m_text->setOrigin(Point3D::fromQPointF(origin));
+
+  bool success = d->m_text->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_text->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " Text success = " << success << std::endl;
+  std::cout << " Text dump: " << (*d->m_text) << std::endl;
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onTextUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+
+}
+
+void FunctionDialog::onTextUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_text)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_text->rTextStyle().setFontFamily(QLatin1String("Palatino"));  // which values are valid?????????
+  d->m_text->rTextStyle().setHorizontalAlignment(HorizontalAlignment::Left);
+  std::cout << " Text dump: " << (*d->m_text) << std::endl;
+
+  bool success = d->m_text->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onMapObjectIndicatorCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  static SituationMap::UniqueMapId uniqueId = SituationMap::INVALID_MAP_ID;
+
+  if (uniqueId == SituationMap::INVALID_MAP_ID)
+  {
+    qDebug() << LOGFUNCTION << " create......";
+
+    // create and set debugInfo for debugging:
+    RefPointer<SituationMap::MapObjectIndicator> moIndi
+      = d->m_mapInterface->objectFactory().
+        create<SituationMap::MapObjectIndicator>(QLatin1String("Participants"), QLatin1String("MapObjectIndicatorId"));
+
+    if (!moIndi)
+    {
+      qDebug() << LOGFUNCTION << " no object";
+      return;
+    }
+    uniqueId = moIndi->uniqueMapId();
+
+    moIndi->setIdentifier(QLatin1String("MapObjectIndicator"));
+
+    moIndi->setVisibility(true);        // was maybe invisible...
+    moIndi->setMapObjectToPointTo(1);
+
+    bool success = moIndi->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+
+    success = moIndi->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+
+  }
+  else
+  {
+    qDebug() << LOGFUNCTION << " remove...... (uId=" << uniqueId << ")";
+
+    RefPointer<SituationMap::MapObjectIndicator> moIndi =
+      d->m_mapInterface->objectFactory().get<SituationMap::MapObjectIndicator>(uniqueId);
+    if (moIndi.valid())
+    {
+      qDebug() << LOGFUNCTION << " removeMySelf: " << uniqueId;
+      moIndi->removeMySelf();
+    }
+  }
+
+}
+
+
+void FunctionDialog::onLayerPerfCreateLayer()
+{
+  qDebug() << LOGFUNCTION ;
+
+  int layerCount    = d->m_layerPerf_leLayer->text().toInt();
+  int objCount      = d->m_layerPerf_leObject->text().toInt();
+  int objPerLayer   = objCount / layerCount;
+  int radius        = d->m_layerPerf_leRadius->text().toInt();
+  bool withText     = d->m_layerPerf_cbText->isChecked();
+
+  qDebug() << LOGFUNCTION << " LayerCount  =" << layerCount;
+  qDebug() << LOGFUNCTION << " objCount    =" << objCount;
+  qDebug() << LOGFUNCTION << " -> ObjPerLayer =" << objPerLayer;
+  qDebug() << LOGFUNCTION << " radius      =" << radius;
+  qDebug() << LOGFUNCTION << " withText    =" << withText;
+
+
+  QStringList layerNames;
+  LayerFactory &layerFac = d->m_mapImpl->layerFactory();
+
+  //
+  // create operational layer:
+  //
+  layerNames.reserve(layerCount - 1);
+  for (int i = 1; i <= layerCount; ++i)
+    layerNames << QStringLiteral("LayerPerformance_%1").arg(i);
+
+  for (const auto &layerName : qAsConst(layerNames))
+    layerFac.addOperationalLayer(layerName, layerName);
+
+  //
+  // force creation of techn. Layer:
+  // create on object per layer:
+  //
+
+  qDebug() << LOGFUNCTION << " Create ...";
+
+  // B-Agent -> GraphicsLayer only
+  for (int i = 0; i < layerCount; ++i)
+  {
+    QString layername = layerNames[i];
+
+    for (int j = 0; j < objPerLayer; ++j)
+    {
+      QString debugIdStr = QStringLiteral("DebugId_L%1_Obj%2").arg(i).arg(j);
+
+      if (j % 100 == 0)
+        std::cerr << LOGFUNCTION
+                  << " Layer = " << i
+                  << " Obj = " << j << std::endl;
+
+
+
+#define BAGENT
+#ifdef BAGENT
+      RefPointer<SituationMap::BiologicalAgent> bAgent
+        = d->m_mapInterface->objectFactory().
+          create<SituationMap::BiologicalAgent>(layername, debugIdStr);
+
+      if (!bAgent)
+      {
+        qDebug() << LOGFUNCTION << " no object";
+        abort();
+        // return;
+      }
+//      QPointF center = d->m_objectBasePoint + QPointF(10 * j, 10 * i);
+      QPointF center = d->m_mapImpl->centerPoint();
+
+      bAgent->setOrigin(Point3D::fromQPointF(center));
+      bAgent->setRadius(radius);
+
+      bAgent->setVisibility(d->m_visibility);
+      bAgent->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+      bAgent->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+      //      if ( ( j%10 == 0) || ( (i==(layerCount-1)) && (j==(objPerLayer-1)) ) )
+      {
+        if (withText)
+          bAgent->setIdentifier(debugIdStr);
+      }
+
+      bAgent->updateView();
+#else
+      RefPointer<SituationMap::Participant> part
+        = d->m_mapInterface->objectFactory().
+          create<SituationMap::Participant>(layername, debugIdStr);
+
+      if (!part)
+      {
+        qDebug() << LOGFUNCTION << " no object";
+        abort();
+        return;
+      }
+      QPointF center = d->m_objectBasePoint + QPointF(1000 * j, 1000 * i);
+
+      SituationMap::SymbolData symData;
+      symData.m_sidc = "SFGPUCD---";
+      part->setSymbol(symData);
+
+      part->setOrigin(center);
+
+//      if ( ( j%10 == 0) || ( (i==(layerCount-1)) && (j==(objPerLayer-1)) ) )
+      {
+        if (withText)
+          part->setIdentifier(debugIdStr);
+      }
+
+      part->updateView();
+
+#endif
+
+
+    }
+  } // for
+
+  std::cerr << LOGFUNCTION << " Create ... DONE" << std::endl;
+
+  std::cerr << LOGFUNCTION << " LayerCount  =" << layerCount << std::endl;
+  std::cerr << LOGFUNCTION << " objCount    =" << objCount << std::endl;
+  std::cerr << LOGFUNCTION << " -> ObjPerLayer =" << objPerLayer << std::endl;
+  std::cerr << LOGFUNCTION << " radius      =" << radius << std::endl;
+  std::cerr << LOGFUNCTION << " withText    =" << withText << std::endl;
+
+
+
+} /* FunctionDialog::onLayerPerfCreateLayer */
+
+
+
+void FunctionDialog::onGenerateGraphics()
+{
+
+  //
+  //
+  // Pay Attention to the current RenderingMode!!!!!!!!!!!!!!!!!!
+  //
+  //
+  static bool done = false;
+  if (done)
+  {
+    qWarning() << "already done";
+    return;
+  }
+  else
+    done = true;
+
+
+  if (d->m_graphicsLayer)
+  {
+    qWarning() << "generate graphics";
+
+    // SurfacePlacement::Draped is default on V100.0
+    //d->m_graphicsLayer->setSceneProperties(Esri::ArcGISRuntime::LayerSceneProperties(Esri::ArcGISRuntime::SurfacePlacement::Draped));
+
+    const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+#define TEXT_WKT
+#ifdef TEXT_WKT
+    {
+      double i = 1000000;  // Meter
+
+      QString wkText = QLatin1String("GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137,298.257223563]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]]");
+      /*
+      "PROJCS[\"WGS_1984_Web_Mercator_Auxiliary_Sphere\",\
+          GEOGCS[\"GCS_WGS_1984\",\
+          DATUM[\"D_WGS_1984\",\
+          SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],\
+          PRIMEM[\"Greenwich\",0.0],\
+          UNIT[\"Degree\",0.0174532925199433]],\
+          PROJECTION[\"Mercator_Auxiliary_Sphere\"],\
+          PARAMETER[\"False_Easting\",0.0],\
+          PARAMETER[\"False_Northing\",0.0],\
+          PARAMETER[\"Central_Meridian\",0.0],\
+          PARAMETER[\"Standard_Parallel_1\",0.0],\
+          PARAMETER[\"Auxiliary_Sphere_Type\",0.0],\
+          UNIT[\"Meter\",1.0]]\"");
+
+          */
+
+      const Esri::ArcGISRuntime::SpatialReference wgs84(wkText);
+
+
+//      \brief Projects the given point from EPSG:4326 (WGS-84) to the output spatial reference.
+//      \param[in] x The x coordinate of the point.
+//      \param[in] y The y coordinate of the point.
+//      \param[in] sr The spatial reference to which to project the point.
+//      \return The projected point.
+      const Esri::ArcGISRuntime::Viewpoint &vp =
+        d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+      const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+      const Esri::ArcGISRuntime::Point &bremenPoint = mapCenter;
+//      bremenPoint = Esri::ArcGISRuntime::GeometryEngine::project( Esri::ArcGISRuntime::Point(8.897803, 53.054957, Esri::ArcGISRuntime::SpatialReference(4326)), sr);
+
+      // myWKT :
+      QLatin1String myWkt(
+        "PROJCS[\"WGS_1984_Web_Mercator_Auxiliary_Sphere\",\
+          GEOGCS[\"GCS_WGS_1984\",\
+          DATUM[\"D_WGS_1984\",\
+          SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],\
+          PRIMEM[\"Greenwich\",0.0],\
+          UNIT[\"Degree\",0.0174532925199433]],\
+          PROJECTION[\"Mercator_Auxiliary_Sphere\"],\
+          PARAMETER[\"False_Easting\",1000000.0],\
+          PARAMETER[\"False_Northing\",1000000.0],\
+          PARAMETER[\"Central_Meridian\",0.0],\
+          PARAMETER[\"Standard_Parallel_1\",0.0],\
+          PARAMETER[\"Auxiliary_Sphere_Type\",0.0],\
+          UNIT[\"Meter\",1.0]]\"");
+
+      Esri::ArcGISRuntime::Point myPoint(i, i, Esri::ArcGISRuntime::SpatialReference(myWkt));
+//      bremenPoint = EsriRuntimeQt::GeometryEngine::project(myPoint, sr);
+      // : myWKT
+
+      // Esri::ArcGISRuntime::Point(lon, lat)
+      Esri::ArcGISRuntime::Point marseille(5.371113, 43.283954, 0, sr);
+      Esri::ArcGISRuntime::Point nullPoint(0, 0, 0, sr);
+
+//      nullPoint = marseille;
+
+
+      Esri::ArcGISRuntime::SimpleMarkerSymbol redCircle(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, Qt::red, 20);
+      Esri::ArcGISRuntime::Graphic *graphic1 = new Esri::ArcGISRuntime::Graphic(nullPoint, &redCircle);
+      d->m_graphicsLayer->graphics()->append(graphic1);
+
+      Esri::ArcGISRuntime::SimpleMarkerSymbol blueCircle(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, Qt::blue, 10);
+      Esri::ArcGISRuntime::Graphic *myGraphic = new Esri::ArcGISRuntime::Graphic(bremenPoint, &blueCircle);
+      d->m_graphicsLayer->graphics()->append(myGraphic);
+
+      Esri::ArcGISRuntime::PolylineBuilder builder(sr);
+      builder.addPoint(nullPoint);
+      builder.addPoint(Esri::ArcGISRuntime::Point(bremenPoint.x(), bremenPoint.y(), 100, bremenPoint.spatialReference()));
+
+      Esri::ArcGISRuntime::SimpleLineSymbol lineSym(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid, QColor("green"), 5);
+
+      Esri::ArcGISRuntime::Graphic *graphicPolyline = new Esri::ArcGISRuntime::Graphic(builder.toGeometry(), &lineSym);
+      d->m_graphicsLayer->graphics()->append(graphicPolyline);
+
+    }
+#else // WKT
+    {
+      //-----------------------------------
+      // LINE
+      //-----------------------------------
+      EsriRuntimeQt::Point point11(0, 0, sr);
+      EsriRuntimeQt::Point point12(i, i, sr);
+
+      EsriRuntimeQt::SimpleMarkerSymbol blueCircle(Qt::blue, 8, EsriRuntimeQt::SimpleMarkerSymbolStyle::Circle);
+      EsriRuntimeQt::Graphic *graphic1 = new EsriRuntimeQt::Graphic(point12, blueCircle);
+      d->m_graphicsLayer->addGraphic(graphic1);
+
+      EsriRuntimeQt::LIST_OF_POINTS lop;
+      lop.append(point11);
+      lop.append(point12);
+      EsriRuntimeQt::Polyline polyline(QList<EsriRuntimeQt::LIST_OF_POINTS>() << lop);
+
+      EsriRuntimeQt::SimpleLineSymbol lineSym;
+
+      EsriRuntimeQt::Graphic *graphicPolyline = new EsriRuntimeQt::Graphic(polyline, lineSym);
+      d->m_graphicsLayer->addGraphic(graphicPolyline);
+
+      //-----------------------------------
+      // CIRCLE
+      //-----------------------------------
+      int radius = sqrt(2.0 * pow(i, 2));  // Meter
+      drawEllipse(d->m_graphicsLayer, point11, radius, radius, 5000.0, QColor(230, 139, 200));
+
+
+      // MOVE (GeometryEngine::geodesicMovePoints)
+      QList<EsriRuntimeQt::Point> plIN, plOUT;
+      plIN << point11;
+      int wkid = sr.wkid();
+      EsriRuntimeQt::Unit *unit = EsriRuntimeQt::Unit::create(wkid);
+      qWarning() << "geodesicMovePoints"
+                 << " wkid=" << wkid
+                 //                   << " unit = " << unit->name()
+                 ;
+
+      plOUT = EsriRuntimeQt::GeometryEngine::geodesicMovePoints(plIN,
+                                                                sqrt(2.0 * pow(i, 2)),
+                                                                45.0,
+                                                                // nullptr
+                                                                unit
+                                                               );
+      EsriRuntimeQt::SimpleMarkerSymbol greenDot(Qt::green, 20, EsriRuntimeQt::SimpleMarkerSymbolStyle::Triangle);
+      greenDot.setAngle(10);
+      EsriRuntimeQt::Graphic *graphicMoved = new EsriRuntimeQt::Graphic(plOUT.at(0), greenDot);
+      d->m_graphicsLayer->addGraphic(graphicMoved);
+
+      //-----------------------------------
+      // CIRCLE II
+      //-----------------------------------
+      {
+        int radius = 10400; // Meter
+        drawEllipse(d->m_graphicsLayer, point12, radius, radius, radius / 20, Qt::yellow);
+      }
+
+
+      //-----------------------------------
+      // IMAGE
+      //-----------------------------------
+      int widthPixel = 100;
+      QImage image(widthPixel, widthPixel, QImage::Format_ARGB32);
+      image.fill(qRgba(0, 0, 0, 0));
+
+      QPainter p;
+      QPen pen(Qt::yellow);
+      pen.setWidth(5);
+
+      p.begin(&image);
+      p.setPen(pen);
+      p.drawLine(QPointF(0, 0), QPointF(100, 100));
+      p.end();
+
+      bool success = image.save(QLatin1String("/tmp/dummy.png"));
+      qWarning() << " success = " << success;
+
+      EsriRuntimeQt::PictureMarkerSymbol pms(image);
+      EsriRuntimeQt::Point origin(20000, 20000, d->m_graphicsLayer->spatialReference());
+      EsriRuntimeQt::Graphic *graphic = new EsriRuntimeQt::Graphic(origin, pms);
+
+      qint64 gid = d->m_graphicsLayer->addGraphic(graphic);
+      qWarning() << " gid = " << gid;
+
+
+
+      //-----------------------------------
+      // TEXT
+      //-----------------------------------
+      EsriRuntimeQt::TextSymbol textSymbol;
+
+      textSymbol.setText(QLatin1String("Mein Langer Text"));
+
+      textSymbol.setTextColor(QColor(255, 0, 0));
+      textSymbol.setSize(20.0);
+      textSymbol.setTextOutlineWidth(1.0);
+      textSymbol.setTextOutlineColor(QColor(255, 0, 0));
+      textSymbol.setHorizontalAlignment(EsriRuntimeQt::HorizontalAlignment::Left);
+      textSymbol.setVerticalAlignment(EsriRuntimeQt::VerticalAlignment::Middle);
+
+      // 2. Graphic
+      EsriRuntimeQt::Geometry originGeometry(point11);
+      EsriRuntimeQt::Graphic *textGraphic = new EsriRuntimeQt::Graphic(originGeometry,
+                                                                       textSymbol);
+      // 3. add graphic
+      qint64 gidText = d->m_graphicsLayer->addGraphic(textGraphic);
+      qWarning() << " gidText = " << gidText;
+    }
+#endif // WKT
+  }
+  else
+  {
+    qWarning() << "no m_graphicsLayer";
+    QMessageBox msgBox;
+    msgBox.setText(QLatin1String("no m_graphicsLayer"));
+    msgBox.exec();
+  }
+}
+
+Esri::ArcGISRuntime::Graphic *FunctionDialog::createCube(const PositionCont &mapPosCont,
+                                                         int baseHeight,
+                                                         double objHeight,
+                                                         const QString &partyNameValue)
+{
+  if (!d->m_graphicsLayer)
+  {
+    qCritical() << " no m_graphicsLayer";
+    return nullptr;
+  }
+
+  const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+  Esri::ArcGISRuntime::PolygonBuilder builder(sr, this);
+
+  for (const auto &coord : mapPosCont)
+  {
+    Esri::ArcGISRuntime::Point pnt (coord.x(), coord.y(), baseHeight);
+    builder.addPoint(pnt);
+    qCritical() << " coord=" << pnt;
+  }
+
+  Esri::ArcGISRuntime::Polygon poly(builder.toGeometry());
+
+  const int maxSegmentLength = 100;
+  Esri::ArcGISRuntime::Geometry geometry =  Esri::ArcGISRuntime::GeometryEngine::densifyGeodetic(poly,
+                                                                                             maxSegmentLength,
+                                                                                             Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                                                             Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+
+
+  Esri::ArcGISRuntime::Graphic *graphic = new Esri::ArcGISRuntime::Graphic(this);
+  graphic->setGeometry(geometry);
+  QVariantMap att = graphic->attributes()->attributesMap();
+  att[QLatin1String("height")] = QString::number(objHeight);
+  qCritical() << " height=" << att[QLatin1String("height")];
+  if (!partyNameValue.isEmpty())
+    att[QLatin1String("PartyName")] = partyNameValue;
+  graphic->attributes()->setAttributesMap(att);
+
+  return graphic;
+}
+
+
+void FunctionDialog::onGenerateCube()
+{
+  static Esri::ArcGISRuntime::Graphic *s_graphic = nullptr;
+  if (s_graphic)
+  {
+    qWarning() << "removing...";
+    if (d->m_graphicsLayer && d->m_graphicsLayer->graphics())
+    d->m_graphicsLayer->graphics()->removeOne(s_graphic);
+    s_graphic->deleteLater();
+    s_graphic = nullptr;
+    return;
+  }
+
+  d->m_graphicsLayer->setSceneProperties(Esri::ArcGISRuntime::LayerSceneProperties(Esri::ArcGISRuntime::SurfacePlacement::Relative));
+
+  // Renderer
+  QColor col = Qt::red;
+  col.setAlphaF(0.5);
+  Esri::ArcGISRuntime::SimpleFillSymbol *sls =
+    new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, col, this);
+
+  qCritical() << " USE RENDERER";
+  Esri::ArcGISRuntime::SimpleRenderer *renderer = new Esri::ArcGISRuntime::SimpleRenderer(sls, this);
+  Esri::ArcGISRuntime::RendererSceneProperties props = renderer->sceneProperties();
+  props.setExtrusionMode(Esri::ArcGISRuntime::ExtrusionMode::BaseHeight);
+  props.setExtrusionExpression(QLatin1String("[height]"));
+  renderer->setSceneProperties(props);
+
+  d->m_graphicsLayer->setRenderer(renderer);
+
+//  Esri::ArcGISRuntime::GraphicsOverlay *gOverlay = d->m_mapImpl->getGraphicsLayer3DExtrusion(QLatin1String("AES"));
+//  qCritical() << " USE RENDERER gOverlay " << gOverlay;
+//  gOverlay->setRenderer(renderer);
+
+  qCritical() << " USE RENDERER" << (int) props.extrusionMode();
+
+  // Geometry
+  int sizeX = 1500;
+  int sizeY = 50;
+
+  SituationMap::PositionCont posCont;
+
+  LtsCoordTrans::UtmCoordinate local_basePoint;
+
+  // local_basePoint = LtsCoordTrans::UtmCoordinate::fromMgrs(QLatin1String("32UNE000000000000"));  // Bremen  32UMD000000000000
+  local_basePoint = s_basePoint;
+
+  QPointF offset = d->m_objectBasePoint    + QPointF(91000, 77000);
+  appendQPointF(posCont, local_basePoint.geographic(offset + QPointF(-sizeX, -sizeY)));  // ul
+  appendQPointF(posCont, local_basePoint.geographic(offset + QPointF(-sizeX,  sizeY)));
+  appendQPointF(posCont,  local_basePoint.geographic(offset + QPointF( sizeX,  sizeY)));
+  appendQPointF(posCont,  local_basePoint.geographic(offset + QPointF( sizeX, -sizeY)));
+
+  SituationMap::PositionsTranslated posTrans;
+  posTrans.setCoordTransFunctor(d->m_mapImpl->coordTranslationFunctor());
+  posTrans.setPositions(posCont);
+  SituationMap::PositionCont posContTrans = posTrans.positionsTranslated();
+
+  s_graphic = createCube(posContTrans, 10, 50);
+
+  d->m_graphicsLayer->graphics()->append(s_graphic);
+}
+
+void FunctionDialog::onGenerateCubeArray()
+{
+  if (!d->m_graphicsLayer)
+  {
+    qCritical() << " no m_graphicsLayer";
+    return;
+  }
+  if (d->m_mapImpl->mode() != Mode::Mode_3D)
+    return;
+
+  d->m_graphicsLayer->setSceneProperties(Esri::ArcGISRuntime::LayerSceneProperties(Esri::ArcGISRuntime::SurfacePlacement::Relative));
+
+  // Renderer
+  {
+    QColor col = Qt::red;
+    col.setAlphaF(0.25);
+    Esri::ArcGISRuntime::SimpleFillSymbol *sls =
+      new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, col, this);
+
+    qCritical() << " USE RENDERER";
+    Esri::ArcGISRuntime::SimpleRenderer *renderer = new Esri::ArcGISRuntime::SimpleRenderer(sls, this);
+    Esri::ArcGISRuntime::RendererSceneProperties props = renderer->sceneProperties();
+    props.setExtrusionMode(Esri::ArcGISRuntime::ExtrusionMode::BaseHeight);
+    props.setExtrusionExpression(QLatin1String("[height]"));
+    renderer->setSceneProperties(props);
+
+    d->m_graphicsLayer->setRenderer(renderer);
+  }
+
+  const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+  const Esri::ArcGISRuntime::Viewpoint &vp =
+    d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+  const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+
+  Esri::ArcGISRuntime::Graphic *clipGraphic = nullptr;
+  {
+    const double clipOffset = 0.0085;
+    Esri::ArcGISRuntime::PolygonBuilder builder(sr, this);
+    builder.addPoint(mapCenter.x(), mapCenter.y());
+    builder.addPoint(mapCenter.x()-clipOffset, mapCenter.y() + clipOffset);
+    builder.addPoint(mapCenter.x()+clipOffset, mapCenter.y() + clipOffset);
+    clipGraphic = new Esri::ArcGISRuntime::Graphic(builder.toGeometry(), this);
+//    Esri::ArcGISRuntime::SimpleLineSymbol *sls =
+//        new Esri::ArcGISRuntime::SimpleLineSymbol(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid, Qt::yellow, 5, this);
+//    clipGraphic->setSymbol(sls);
+
+
+    QVariantMap att = clipGraphic->attributes()->attributesMap();
+    att[QLatin1String("height")] = QString::number(2);
+    clipGraphic->attributes()->setAttributesMap(att);
+
+
+    d->m_graphicsLayer->graphics()->append(clipGraphic);
+  }
+
+
+  QElapsedTimer elapsedTimer;
+  elapsedTimer.start();
+
+
+  const int maxRow = 10;
+  const int maxColumn = 10;
+  const double offsetSize = 0.001;
+
+  Esri::ArcGISRuntime::PartCollection partCollection(sr);
+
+  for (int row=0; row<maxRow; ++row)
+  {
+    for (int col=0; col<maxColumn; ++col)
+    {
+      double offsetRow = row * offsetSize;
+      double offsetCol = col * offsetSize;
+
+      Esri::ArcGISRuntime::Point bottomLeft(mapCenter.x() + offsetRow,
+                                            mapCenter.y() + offsetCol);
+
+      Esri::ArcGISRuntime::PolygonBuilder polylineBuilder(sr, this);
+      polylineBuilder.addPoint(bottomLeft.x() +          0, bottomLeft.y() +          0);
+      polylineBuilder.addPoint(bottomLeft.x() + offsetSize, bottomLeft.y() +          0);
+      polylineBuilder.addPoint(bottomLeft.x() + offsetSize, bottomLeft.y() + offsetSize);
+      polylineBuilder.addPoint(bottomLeft.x() +          0, bottomLeft.y() + offsetSize);
+
+//      Esri::ArcGISRuntime::Graphic *graphic = new Esri::ArcGISRuntime::Graphic(polylineBuilder.toGeometry(), this);
+
+//      QVariantMap att = graphic->attributes()->attributesMap();
+//      att[QLatin1String("height")] = QString::number(10);
+//      graphic->attributes()->setAttributesMap(att);
+
+//      d->m_graphicsLayer->graphics()->append(graphic);
+
+      Esri::ArcGISRuntime::Geometry clippedGeometry = Esri::ArcGISRuntime::GeometryEngine::intersection(polylineBuilder.toPolygon(),
+                                                                                                        clipGraphic->geometry());
+//      qCritical() << " cg" << clippedGeometry.toJson();
+
+      if (!clippedGeometry.isEmpty())
+      {
+        Esri::ArcGISRuntime::Polygon poly(clippedGeometry);
+        const Esri::ArcGISRuntime::ImmutablePointCollection pc = poly.parts().part(0).points();
+
+        Esri::ArcGISRuntime::Part part(sr);
+        for (const Esri::ArcGISRuntime::Point &pnt : pc)
+          part.addPoint(pnt);
+
+  //      part.addPoint(bottomLeft.x() +          0, bottomLeft.y() +          0);
+  //      part.addPoint(bottomLeft.x() + offsetSize, bottomLeft.y() +          0);
+  //      part.addPoint(bottomLeft.x() + offsetSize, bottomLeft.y() + offsetSize);
+  //      part.addPoint(bottomLeft.x() +          0, bottomLeft.y() + offsetSize);
+
+        partCollection.addPart(&part);
+      }
+
+    } // for
+  } // for
+
+  Esri::ArcGISRuntime::Graphic *multiPartGraphic = new Esri::ArcGISRuntime::Graphic(this);
+
+  Esri::ArcGISRuntime::PolygonBuilder builder(sr, this);
+  builder.setParts(&partCollection);
+
+  const Esri::ArcGISRuntime::Polygon &multipartPolygon = builder.toPolygon();
+  multiPartGraphic->setGeometry(multipartPolygon);
+
+  int msec = elapsedTimer.elapsed();
+  qCritical() << " XYZ took [msec]: " << msec;
+
+
+  QVariantMap att = multiPartGraphic->attributes()->attributesMap();
+  att[QLatin1String("height")] = QString::number(10);
+  multiPartGraphic->attributes()->setAttributesMap(att);
+  d->m_graphicsLayer->graphics()->append(multiPartGraphic);
+
+//  Esri::ArcGISRuntime::SimpleLineSymbol *sls =
+//    new Esri::ArcGISRuntime::SimpleLineSymbol(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid, Qt::green, 5, this);
+//  graphic->setSymbol(sls);
+}
+
+void FunctionDialog::onGenerateStackedCubes()
+{
+  if (!d->m_graphicsLayer)
+  {
+    qCritical() << " no m_graphicsLayer";
+    return;
+  }
+
+  d->m_graphicsLayer->setSceneProperties(Esri::ArcGISRuntime::LayerSceneProperties(Esri::ArcGISRuntime::SurfacePlacement::DrapedFlat)); // 100.x Draped -> 300 DrapedFlat (flat drape-on-surface)
+
+  // RenderingMode::Dynamic: ok, for V100.0 ; V100.1
+  // RenderingMode::Static:  no Height in V100.1
+
+  // Renderer
+  qCritical() << " USE UniqueValueRenderer";
+  Esri::ArcGISRuntime::SimpleFillSymbol *sls;
+
+  const QVector<QString> partyList = {
+    QLatin1String("red"),
+    QLatin1String("blue"),
+    QLatin1String("green")
+  };
+  QList<Esri::ArcGISRuntime::UniqueValue*> uvList;
+
+  for (const auto &party : partyList)
+  {
+    QColor col(party);
+    //    col.setAlphaF(0.3);  // ---> set opacity of complete layer!!!???!!!
+    sls = new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, col, this);
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(party,
+                                             QStringLiteral("Party '%1'").arg(party),
+                                             QVariantList() << party, sls, this);
+    uvList.append(uv);
+  } // Q_FOREACH
+
+  sls = new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, Qt::white, this);
+
+  Esri::ArcGISRuntime::UniqueValueRenderer* uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QLatin1String("UnknownParty"),
+                                                   sls,  // default
+                                                   QStringList() << QLatin1String("PartyName"),
+                                                   uvList, this);
+
+  Esri::ArcGISRuntime::RendererSceneProperties props = uniqueRenderer->sceneProperties();
+  props.setExtrusionMode(Esri::ArcGISRuntime::ExtrusionMode::BaseHeight);
+  props.setExtrusionExpression(QLatin1String("[height]"));
+  uniqueRenderer->setSceneProperties(props);
+  d->m_graphicsLayer->setRenderer(uniqueRenderer);
+
+
+  // Geometry
+  const auto centerPoints = {
+    d->m_objectBasePoint + QPointF(92400, 78600),
+    d->m_objectBasePoint + QPointF(92450, 78600),
+    d->m_objectBasePoint + QPointF(92450, 78675),
+    d->m_objectBasePoint + QPointF(93069, 78331)
+  };
+
+  SituationMap::PositionCont posCont;
+  for (const QPointF &centerPoint : centerPoints)
+  {
+    double sizeX = 10;
+    double sizeY = sizeX;
+
+    for (int i=0; i<3; ++i)
+    {
+      sizeX -= 0.01;
+      sizeY -= 0.01;
+
+      posCont.clear();
+      posCont.reserve(4);
+      appendQPointF(posCont, s_basePoint.geographic(centerPoint + QPointF(-sizeX, -sizeY)));  // ul
+      appendQPointF(posCont, s_basePoint.geographic(centerPoint + QPointF(-sizeX,  sizeY)));
+      appendQPointF(posCont, s_basePoint.geographic(centerPoint + QPointF( sizeX,  sizeY)));
+      appendQPointF(posCont, s_basePoint.geographic(centerPoint + QPointF( sizeX, -sizeY)));
+
+      SituationMap::PositionsTranslated posTrans;
+      posTrans.setCoordTransFunctor(d->m_mapImpl->coordTranslationFunctor());
+      posTrans.setPositions(posCont);
+      SituationMap::PositionCont posContTrans = posTrans.positionsTranslated();
+      const QString &partyNameValue = partyList[i];
+      Esri::ArcGISRuntime::Graphic *graphic = createCube(posContTrans, 1000, 1+i, partyNameValue);
+
+      d->m_graphicsLayer->graphics()->append(graphic);
+    } // for
+  } // Q_FOREACH
+}
+
+void FunctionDialog::onGenerateGraphicsKristenStrandford()
+{
+  static bool done = false;
+  if (done)
+  {
+    qWarning() << "already done";
+    return;
+  }
+  else
+    done = true;
+
+  if (d->m_graphicsLayer)
+  {
+    qWarning() << "onGenerateGraphicsKristenStrandford";
+
+    // SurfacePlacement::Draped is default on V100.0
+    d->m_graphicsLayer->setSceneProperties(Esri::ArcGISRuntime::LayerSceneProperties(Esri::ArcGISRuntime::SurfacePlacement::Absolute));
+
+    const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+    const Esri::ArcGISRuntime::Viewpoint &vp =
+      d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+    const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+    Esri::ArcGISRuntime::Point myLocation  = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y(), 1000, sr);
+    Esri::ArcGISRuntime::Point skyLocation = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y(), 99999, sr);
+
+    qCritical() << " myLocation=" << myLocation.toJson() << " z=" << myLocation.z();;
+    qCritical() << " skyLocation=" << skyLocation.toJson() << " z=" << skyLocation.z();
+
+    Esri::ArcGISRuntime::PolygonBuilder polylineBuilder(sr, this);
+    polylineBuilder.addPoint(myLocation);
+    polylineBuilder.addPoint(skyLocation);
+
+    Esri::ArcGISRuntime::SimpleLineSymbol *sls =
+      new Esri::ArcGISRuntime::SimpleLineSymbol(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid, Qt::red, 5, this);
+
+    Esri::ArcGISRuntime::Graphic *lineGraphic = new Esri::ArcGISRuntime::Graphic(polylineBuilder.toGeometry(), this);
+
+//#define USE_RENDERER
+#ifdef USE_RENDERER
+    qCritical() << " USE RENDERER";
+    d->m_graphicsLayer->setRenderer(new Esri::ArcGISRuntime::SimpleRenderer(sls, this));
+#else
+    qCritical() << " USE no RENDERER";
+    lineGraphic->setSymbol(sls);
+#endif // USE_RENDERER
+
+    d->m_graphicsLayer->graphics()->append(lineGraphic);
+  }
+}
+
+void FunctionDialog::onGenerateUniqueVaueRendererMountingPoints()
+{
+  qCritical() << " onGenerateUniqueVaueRendererMountingPoints";
+
+  static QString s_prefix(QStringLiteral("MyXXXXXXXXXXXXXXXXXXXX_VeryLongPrefix_"));
+
+  qCritical() << " USE UniqueValueRenderer";
+  Esri::ArcGISRuntime::SimpleMarkerSymbol *sms;
+
+  const QVector<QString> partyList = {
+    QStringLiteral("red"),
+    QStringLiteral("blue"),
+    QStringLiteral("blue"),
+    QStringLiteral("green")
+  };
+  QList<Esri::ArcGISRuntime::UniqueValue*> uvList;
+
+  for (const auto &party : partyList)
+  {
+    QColor col(party);
+    sms = new Esri::ArcGISRuntime::SimpleMarkerSymbol(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Diamond, col, 20, this);
+
+//    QString value = party;
+    QString value = s_prefix+party;
+
+    qCritical() << " XXXXXX value '" <<  value << "'";
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(party,
+                                             QStringLiteral("Party '%1'").arg(party),
+                                             QVariantList() << value, sms, this);
+    uvList.append(uv);
+  } // Q_FOREACH
+
+  // default:
+  sms = new Esri::ArcGISRuntime::SimpleMarkerSymbol(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::X, Qt::white, 15, this);
+
+  Esri::ArcGISRuntime::UniqueValueRenderer* uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QStringLiteral("UnknownParty"),
+                                                   sms,  // default
+                                                   QStringList() << QStringLiteral("MountingPointFieldName"),
+                                                   uvList, this);
+  uniqueRenderer->setObjectName(QStringLiteral("UniqueValueRenderer_onGenerateUniqueVaueRendererMountingPoints"));
+  d->m_graphicsLayer->setRenderer(uniqueRenderer);
+
+  const auto centerPoints = {
+    d->m_objectBasePoint + QPointF(91400, 78600),
+    d->m_objectBasePoint + QPointF(92450, 78600),
+    d->m_objectBasePoint + QPointF(92450, 78675),
+    d->m_objectBasePoint + QPointF(93069, 78331)
+  };
+
+  for (const QPointF &pppp : centerPoints)
+  {
+    QPointF originSim = d->m_objectBasePoint + pppp;
+    QPointF originGeo = s_basePoint.geographic(originSim);
+
+    SituationMap::PositionCont posCont;
+    posCont.append(Point3D::fromQPointF(originGeo));
+
+    SituationMap::PositionsTranslated posTrans;
+    posTrans.setCoordTransFunctor(d->m_mapImpl->coordTranslationFunctor());
+    posTrans.setPositions(posCont);
+    SituationMap::PositionCont posContTrans = posTrans.positionsTranslated();
+
+    Point3D p3D = posContTrans.first();
+
+    Esri::ArcGISRuntime::Point newPnt(p3D.x(),
+                                      p3D.y(),
+                                      p3D.z());
+
+    Esri::ArcGISRuntime::Graphic *graphic = new Esri::ArcGISRuntime::Graphic();
+    graphic->setGeometry(newPnt);
+    d->m_graphicsLayer->graphics()->append(graphic);
+
+    QVariantMap rawAttributes = graphic->attributes()->attributesMap();
+    rawAttributes[QStringLiteral("MountingPointFieldName")] = QString(s_prefix+QStringLiteral("blue"));
+    graphic->attributes()->setAttributesMap(rawAttributes);
+
+    qCritical() << " XXXXX set rawAttributes " << rawAttributes;
+
+  }
+  return;
+}
+
+void FunctionDialog::onGenerate3DGraphicSphereRENDERER()
+{
+  int instances = 1000;
+  qCritical() << " onGenerate3DGraphicSphereRENDERER, instances=" << instances;
+
+  // setup Renderer
+  // Renderer
+  QColor col = Qt::green;
+  col.setAlphaF(0.5);
+  Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym =
+      Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::sphere(col, 25, Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center);
+  Q_UNUSED(sym);
+
+  // symbol
+  static QString resourcePath = SituationMap::getResourcePath() + QDir::separator() + QStringLiteral("3Dmodels") + QDir::separator();
+  QUrl url = QUrl(resourcePath + QString(QStringLiteral("SPD/buildings/Bruecke_20m/Bruecke_20m.dae"))); // modelled horizontal
+
+//  QUrl url(QStringLiteral("/tmp/Halbkugel.fbx"));
+
+  const float scale = 4.0;
+  Esri::ArcGISRuntime::ModelSceneSymbol *modelSceneSymbol =
+      new Esri::ArcGISRuntime::ModelSceneSymbol(url, scale); // url, scale
+
+  modelSceneSymbol->setHeading(45);
+  modelSceneSymbol->setRoll(115);
+  modelSceneSymbol->setPitch(75);
+
+  modelSceneSymbol->setColor(Qt::red);
+
+
+
+//  Esri::ArcGISRuntime::Symbol* symbol = sym;
+  Esri::ArcGISRuntime::Symbol* symbol = modelSceneSymbol;
+
+  qCritical() << " USE RENDERER";
+  Esri::ArcGISRuntime::SimpleRenderer *renderer = new Esri::ArcGISRuntime::SimpleRenderer(symbol, this);
+  d->m_graphicsLayer->setRenderer(renderer);
+
+  //-----------------------------------------------------
+  //-----------------------------------------------------
+  //-----------------------------------------------------
+
+  const Esri::ArcGISRuntime::Viewpoint &vp =
+    d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+  const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+  MEMORY_LOG() << " START";
+
+  if (!d->m_impactCircleSphere.isEmpty())
+  {
+    qCritical() << " onGenerate3DGraphicSphereRENDERER DESTROY " << instances;
+    for (Private::object3D_data &data : d->m_impactCircleSphere)
+      d->m_graphicsLayer->graphics()->removeOne(data.m_graphic.get());
+    d->m_impactCircleSphere.clear();
+  }
+  else
+  {
+    if (d->m_mapImpl->mode() != Mode::Mode_3D)
+      return;
+
+    int i = 0;
+    d->m_impactCircleSphere.resize(instances);
+    for (Private::object3D_data &data : d->m_impactCircleSphere)
+    {
+      data.m_position = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y()+ (0.001 * i));
+      ++i;
+
+      data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+//        static int myGraphicCnt  = 0; connect(data.m_graphic.get(), &QObject::destroyed, [] () { qCritical() << " myGraphic destroyed cnt=" << ++myGraphicCnt; });
+
+      d->m_graphicsLayer->graphics()->append(data.m_graphic.get());
+    } // for
+  }
+  MEMORY_LOG() << " END";
+
+}
+
+void FunctionDialog::onSphereOpacityChangedRENDERER(int opacityValue)
+{
+  // update Renderer:
+  Esri::ArcGISRuntime::Renderer* myRenderer = d->m_graphicsLayer->renderer();
+  if (!myRenderer)
+    return;
+
+  Esri::ArcGISRuntime::SimpleRenderer *simpleRenderer = dynamic_cast<Esri::ArcGISRuntime::SimpleRenderer *>(myRenderer);
+  if (!simpleRenderer)
+    return;
+
+  // Symbol
+  Esri::ArcGISRuntime::Symbol* mySymbol = simpleRenderer->symbol();
+  if (!mySymbol)
+    return;
+
+  Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *>(mySymbol);
+  if (!sym)
+    return;
+
+  QColor col = Qt::green;
+  col.setAlphaF(opacityValue/100.0);
+  sym->setColor(col);
+
+//  Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym =
+//      Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::sphere(col, 10, Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center);
+
+//  simpleRenderer->setSymbol(sym);
+}
+
+void FunctionDialog::onGenerate3DGraphicSphere()
+{
+  int instances = 1000;
+  qCritical() << " onGenerate3DGraphicSphere, instances=" << instances;
+
+  const Esri::ArcGISRuntime::Viewpoint &vp =
+    d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+  const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+  MEMORY_LOG() << " START";
+
+  if (!d->m_impactCircleSphere.isEmpty())
+  {
+    qCritical() << " onGenerate3DGraphicSphere DESTROY " << instances;
+    for (Private::object3D_data &data : d->m_impactCircleSphere)
+      d->m_graphicsLayer->graphics()->removeOne(data.m_graphic.get());
+    d->m_impactCircleSphere.clear();
+    return;
+  }
+  else
+  {
+    d->m_impactCircleSphere.resize(instances);
+
+    int i = 0;
+    for (Private::object3D_data &data : d->m_impactCircleSphere)
+    {
+      data.m_position = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y()+ (0.00001 * i));
+      ++i;
+
+      if (d->m_mapImpl->mode() == Mode::Mode_2D)
+      {
+        data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+        Esri::ArcGISRuntime::SimpleMarkerSymbol redCircle(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, Qt::red, 10);
+        data.m_graphic->setSymbol(&redCircle);
+        d->m_graphicsLayer->graphics()->append(data.m_graphic.get());
+      }
+      else if (d->m_mapImpl->mode() == Mode::Mode_3D)
+      {
+        // SimpleMarkerSceneSymbol(SimpleMarkerSceneSymbolStyle style, const QColor& color, double height, double width, double depth, SceneSymbolAnchorPosition anchorPosition, QObject* parent = nullptr);
+
+        QColor col = Qt::red;
+        col.setAlphaF(0.5);
+
+        data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+//        static int myGraphicCnt  = 0; connect(data.m_graphic.get(), &QObject::destroyed, [] () { qCritical() << " myGraphic destroyed cnt=" << ++myGraphicCnt; });
+
+        Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym =
+            Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::sphere(col, 25, Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center, data.m_graphic.get());
+//        static int mySymbolCnt  = 0; connect(sym, &QObject::destroyed, [] () { qCritical() << " sphere destroyed cnt=" << ++mySymbolCnt; });
+
+        data.m_graphic->setSymbol(sym);
+
+        d->m_graphicsLayer->graphics()->append(data.m_graphic.get());
+      }
+    } // for
+  }
+  MEMORY_LOG() << " END";
+}
+
+void FunctionDialog::onSphereOpacityChanged(int opacityValue)
+{
+  for (Private::object3D_data &data : d->m_impactCircleSphere)
+  {
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol*>(data.m_graphic->symbol());
+    if (!sym)
+      return;
+
+    QColor col = sym->color();
+    col.setAlphaF(opacityValue/100.0);
+    sym->setColor(col);
+
+    data.m_graphic->setSymbol(sym);
+  } // for
+}
+
+void FunctionDialog::onSphereZValueChanged(int ZValue)
+{
+  qCritical() << " onSphereZValueChanged -> " << ZValue;
+
+  for (Private::object3D_data &data : d->m_impactCircleSphere)
+  {
+    Esri::ArcGISRuntime::Point newPnt(data.m_position.x(),
+                                      data.m_position.y(),
+                                      data.m_position.z()+ZValue);
+    data.m_graphic->setGeometry(newPnt);
+  } // for
+}
+
+//
+// 3DGraphic Cone
+//
+void FunctionDialog::onGenerate3DGraphicCone()
+{
+  int instances = 1000;
+  qCritical() << " onGenerate3DGraphicCone, instances=" << instances;
+
+  const Esri::ArcGISRuntime::Viewpoint &vp =
+    d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+  const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+  MEMORY_LOG() << " START";
+
+  if (!d->m_impactCone.isEmpty())
+  {
+    qCritical() << " onGenerate3DGraphicCone DESTROY " << instances;
+    for (Private::object3D_data &data : d->m_impactCone)
+      d->m_graphicsLayer->graphics()->removeOne(data.m_graphic.get());
+    d->m_impactCone.clear();
+  }
+  else
+  {
+    d->m_impactCone.resize(instances);
+
+    int i = 0;
+    for (Private::object3D_data &data : d->m_impactCone)
+    {
+      data.m_position = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y()+ (0.001 * i));
+      ++i;
+
+      if (d->m_mapImpl->mode() == Mode::Mode_2D)
+      {
+        Esri::ArcGISRuntime::SimpleMarkerSymbol redCircle(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, Qt::red, 10);
+        Esri::ArcGISRuntime::Graphic *myGraphic = new Esri::ArcGISRuntime::Graphic(data.m_position, &redCircle);
+        d->m_graphicsLayer->graphics()->append(myGraphic);
+      }
+      else if (d->m_mapImpl->mode() == Mode::Mode_3D)
+      {
+        // SimpleMarkerSceneSymbol(SimpleMarkerSceneSymbolStyle style, const QColor& color, double height, double width, double depth, SceneSymbolAnchorPosition anchorPosition, QObject* parent = nullptr);
+
+        QColor col = Qt::red;
+        col.setAlphaF(0.5);
+
+        if (!data.m_graphic)
+        {
+          data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+
+          Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym =
+              Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::cone(col, 2, 1.0, data.m_graphic.get()); // color, diameter, height
+
+          data.m_graphic->setSymbol(sym);
+
+          d->m_graphicsLayer->graphics()->append(data.m_graphic.get());
+        }
+        // update values:
+        data.m_graphic->setGeometry(data.m_position);
+      }
+    } // for
+  }
+
+  MEMORY_LOG() << " END";
+}
+
+void FunctionDialog::onConeOpacityChanged(int opacityValue)
+{
+  for (Private::object3D_data &data : d->m_impactCone)
+  {
+    if (!data.m_graphic)
+      return;
+
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol*>(data.m_graphic->symbol());
+    if (!sym)
+      return;
+
+    QColor col = sym->color();
+    col.setAlphaF(opacityValue/100.0);
+    sym->setColor(col);
+
+    data.m_graphic->setSymbol(sym);
+  } // for
+}
+
+void FunctionDialog::onConeZValueChanged(int ZValue)
+{
+  qCritical() << " onConeZValueChanged -> " << ZValue;
+
+  for (Private::object3D_data &data : d->m_impactCone)
+  {
+    if (!data.m_graphic)
+      return;
+
+    Esri::ArcGISRuntime::Point newPnt(data.m_position.x(),
+                                      data.m_position.y(),
+                                      data.m_position.z()+ZValue);
+    data.m_graphic->setGeometry(newPnt);
+  }
+}
+
+void FunctionDialog::onConeHeadingChanged(float angle)
+{
+  qCritical() << " onConeHeadingChanged -> " << angle;
+
+  for (Private::object3D_data &data : d->m_impactCone)
+  {
+    if (!data.m_graphic)
+      return;
+
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol*>(data.m_graphic->symbol());
+    if (!sym)
+      return;
+
+    sym->setHeading(angle);
+    data.m_graphic->setSymbol(sym);
+  } // for
+}
+
+void FunctionDialog::onConeRollChanged(float angle)
+{
+  qCritical() << " onConeRollChanged -> " << angle;
+
+  for (Private::object3D_data &data : d->m_impactCone)
+  {
+    if (!data.m_graphic)
+      return;
+
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol*>(data.m_graphic->symbol());
+    if (!sym)
+      return;
+
+    sym->setRoll(angle);
+    data.m_graphic->setSymbol(sym);
+  } // for
+}
+
+void FunctionDialog::onConePitchChanged(float angle)
+{
+  qCritical() << " onConePitchChanged -> " << angle;
+
+  for (Private::object3D_data &data : d->m_impactCone)
+  {
+
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *sym = dynamic_cast<Esri::ArcGISRuntime::SimpleMarkerSceneSymbol*>(data.m_graphic->symbol());
+    if (!sym)
+      return;
+
+    sym->setPitch(angle);
+    data.m_graphic->setSymbol(sym);
+  } // for
+}
+
+void FunctionDialog::on3dModel()
+{
+  int instances = 100;
+
+  // Graphic:
+  const Esri::ArcGISRuntime::Viewpoint &vp =
+    d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+  const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+  MEMORY_LOG() << " START";
+
+  // symbol
+  static QString resourcePath = SituationMap::getResourcePath() + QDir::separator() + QStringLiteral("3Dmodels") + QDir::separator();
+  QUrl url = QUrl(resourcePath + QString(QStringLiteral("SPD/buildings/Bruecke_20m/Bruecke_20m.dae"))); // modelled horizontal
+
+  const float scale = 2.0;
+  Esri::ArcGISRuntime::ModelSceneSymbol *modelSceneSymbol =
+      new Esri::ArcGISRuntime::ModelSceneSymbol(url, scale); // url, scale
+
+
+  if (!d->m_3dModel.isEmpty())
+  {
+    qCritical() << " on3dModel DESTROY " << instances;
+    for (Private::object3D_data &data : d->m_3dModel)
+      d->m_graphicsLayer->graphics()->removeOne(data.m_graphic.get());
+    d->m_3dModel.clear();
+  }
+  else
+  {
+    d->m_3dModel.resize(instances);
+
+    int i = 0;
+    for (Private::object3D_data &data : d->m_3dModel)
+    {
+      if (d->m_mapImpl->mode() != Mode::Mode_3D)
+        return;
+
+      data.m_position = Esri::ArcGISRuntime::Point(mapCenter.x(), mapCenter.y()+ (0.001 * i));
+      ++i;
+
+      if (!data.m_graphic)
+      {
+        data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+        data.m_graphic->setSymbol(modelSceneSymbol);
+        d->m_graphicsLayer->graphics()->append(data.m_graphic.get());
+      }
+      // update values:
+      data.m_graphic->setGeometry(data.m_position);
+    } // for
+  }
+  MEMORY_LOG() << " END";
+}
+
+void FunctionDialog::on3dModelZValueChanged(int ZValue)
+{
+  qCritical() << " on3dModelZValueChanged -> " << ZValue;
+
+  for (Private::object3D_data &data : d->m_3dModel)
+  {
+    if (!data.m_graphic)
+      return;
+
+    Esri::ArcGISRuntime::Point newPnt(data.m_position.x(),
+                                      data.m_position.y(),
+                                      data.m_position.z()+ZValue);
+    data.m_graphic->setGeometry(newPnt);
+  }
+}
+
+void FunctionDialog::onGenerate3DGraphicConeUniqueValueRenderer()
+{
+  qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer";
+
+  MEMORY_LOG() << " START";
+
+  const QString layernameAES(QStringLiteral("AES"));
+
+  LayerFactoryImpl &layerFactory = d->m_mapImpl->layerFactoryImpl();
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = layerFactory.getGraphicsLayer(layernameAES);
+
+  if (!d->m_impactConeViaUniqueValueRenderer.isEmpty())
+  {
+    qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer DESTROY " << d->m_impactConeViaUniqueValueRenderer.size();
+    for (Private::object3D_data &data : d->m_impactConeViaUniqueValueRenderer)
+      graphicsLayer->graphics()->removeOne(data.m_graphic.get());
+    d->m_impactConeViaUniqueValueRenderer.clear();
+    MEMORY_LOG() << " START";
+    return;
+  }
+
+  QVector<LayerFactory::UniqueValueDataAesCentral::TYPE> typeVec;
+  typeVec << LayerFactory::UniqueValueDataAesCentral::TYPE::CONE;
+  typeVec << LayerFactory::UniqueValueDataAesCentral::TYPE::SPHERE;
+
+  QVector<QColor> colVec;
+  colVec << Qt::darkMagenta << Qt::darkGreen;
+
+  QVector<float> radiuss;
+  radiuss << 10 << 1 << 2.5 << 5 << 10 << 20;
+
+  colVec.first().setAlpha(128);
+
+  // init
+  // Assume that typically the layer does not have a renderer:
+
+
+  if (graphicsLayer->renderer())
+  {
+    qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer, there is already a renderer assigned: " << graphicsLayer->renderer()->objectName();
+  } else {
+    QVector<LayerFactory::UniqueValueDataAesCentral> uvCont;
+
+    for (const LayerFactory::UniqueValueDataAesCentral::TYPE &type : qAsConst(typeVec))
+    {
+      for (const QColor &col : qAsConst(colVec))
+      {
+        for (float radius : qAsConst(radiuss))
+        {
+          LayerFactory::UniqueValueDataAesCentral uvd;
+          QString singleVal;
+
+          // V100.8: order seems to be relevant. Keep alphabetical;
+          singleVal = QString(QStringLiteral("Impact_Color_%1")).arg(col.name());
+          uvd.values.append(singleVal);
+          singleVal = QString(QStringLiteral("Impact_Radius_%1")).arg(radius);
+          uvd.values.append(singleVal);
+          singleVal = QString(QStringLiteral("Impact_Type_%1")).arg(LayerFactory::toString(type));
+          uvd.values.append(singleVal);
+
+          uvd.type = type;
+          uvd.col = col;
+          uvd.radius = radius;
+          uvd.height = uvd.radius;
+
+          uvCont.append(uvd);
+        } // for
+      } // for
+    } // for
+
+
+    QStringList fieldnames;
+    // V100.8: order seems to be relevant. keep alphabetical
+    fieldnames.append(QString(QStringLiteral("IMPACT_COLOR")));
+    fieldnames.append(QString(QStringLiteral("IMPACT_RADIUS")));
+    fieldnames.append(QString(QStringLiteral("IMPACT_TYPE")));
+
+    bool success =
+        d->m_mapInterface->layerFactory().assignUniqueValueRendererAesCentral(layernameAES,
+                                                                              fieldnames,
+                                                                              uvCont);
+    qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer, success=" << success;
+  }
+
+  // create graphics:
+  {
+    qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer, setup Instances...";
+
+    // Graphic:
+    const Esri::ArcGISRuntime::Viewpoint &vp =
+        d->m_mapGeoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+    const Esri::ArcGISRuntime::Point &mapCenter = static_cast<Esri::ArcGISRuntime::Point>(vp.targetGeometry());
+
+    d->m_impactConeViaUniqueValueRenderer.clear();
+
+
+    int n = 0;
+    while (++n < 500)
+      radiuss.append(20);
+
+    int k = 0;
+    for (const QColor &col : qAsConst(colVec))
+    {
+      int i = 0;
+      for (float radius : qAsConst(radiuss))
+      {
+        Private::object3D_data data;
+        data.m_position = Esri::ArcGISRuntime::Point(mapCenter.x() + (0.001 * k), mapCenter.y() + (0.001 * i));
+        data.m_graphic = std::shared_ptr<Esri::ArcGISRuntime::Graphic>(new Esri::ArcGISRuntime::Graphic(data.m_position));
+
+        QVariantMap attribMap;
+        QString attribValue;
+
+        attribValue = QString(QStringLiteral("Impact_Color_%1")).arg(col.name());
+        attribMap.insert(QStringLiteral("IMPACT_COLOR"), attribValue);
+
+        attribValue = QString(QStringLiteral("Impact_Radius_%1")).arg(radius);
+        attribMap.insert(QStringLiteral("IMPACT_RADIUS"), attribValue);
+
+        LayerFactory::UniqueValueDataAesCentral::TYPE type{LayerFactory::UniqueValueDataAesCentral::TYPE::CONE};
+        if (i%2)
+          type = LayerFactory::UniqueValueDataAesCentral::TYPE::SPHERE;
+
+        attribValue = QString(QStringLiteral("Impact_Type_%1")).arg(LayerFactory::toString(type));
+        attribMap.insert(QStringLiteral("IMPACT_TYPE"), attribValue);
+
+        // SceneProperties: HEADING, PITCH, ROLL
+        attribMap.insert(QStringLiteral("HEADING"), ((10*i)%360) );
+        attribMap.insert(QStringLiteral("PITCH"), ((30*i)%360));
+        attribMap.insert(QStringLiteral("ROLL"), ((30*i)%360));
+
+        // qCritical() << " attribMap " << attribMap;
+        data.m_graphic->attributes()->setAttributesMap(attribMap);
+
+        graphicsLayer->graphics()->append(data.m_graphic.get());
+        d->m_impactConeViaUniqueValueRenderer.append(data);
+
+        ++i;
+      } // for
+
+      ++k;
+    } // for
+
+    qCritical() << " onGenerate3DGraphicConeUniqueValueRenderer, setup Instances..." << d->m_impactConeViaUniqueValueRenderer.size();
+
+  }
+
+  MEMORY_LOG() << " END";
+}
+
+void FunctionDialog::onAddCivilSymbols()
+{
+  AdvancedSymbology::SymbolDictionary &dict = d->m_mapImpl->symbolDictionary();
+  int files = dict.addEtsSymbols(QLatin1String(":/advancedSymbology/CivilSymbols"));
+  qWarning() << LOGFUNCTION << " dict.addCivilSymbols() = " << files;
+
+  AdvancedSymbology::SymbolProperties symProps;
+  dict.insertXmlTestSymbol(symProps);
+  qWarning() << LOGFUNCTION << " dict.insertXmlTestSymbol (sidc=" << symProps.sidc() << ")";
+}
+
+
+
+void FunctionDialog::onMessage()
+{
+  /*
+  QString messageId = QLatin1String("mySpecialId");
+
+    if (d->m_messageGroupLayer)
+    {
+      EsriRuntimeQt::SpatialReference sr = d->m_esriMap->spatialReference();
+
+      //create and process message, adding it to the map
+      EsriRuntimeQt::Message message;
+      message.setProperty(QLatin1String("_id"), messageId);
+
+      message.setProperty(QLatin1String("_type"), QLatin1String("position_report"));
+      message.setProperty(QLatin1String("_action"), QLatin1String("update"));
+
+      EsriRuntimeQt::Point mapPoint(0, 0, sr);
+      QString ctrlPoints = QString::number(mapPoint.x(), 'f') + QLatin1Char(',') +  QString::number(mapPoint.y(), 'f');
+      message.setProperty(QLatin1String("_control_points"), ctrlPoints);
+
+      //                          123456789012345
+      //    message.setProperty(QLatin1String("sic"), "SFGPUSAC-------");
+      message.setProperty(QLatin1String("sic"), QLatin1String("GFGPOPP-------X"));
+
+      message.setProperty(QLatin1String("_wkid"), QString::number(d->m_esriMap->spatialReference().wkid()));
+      message.setProperty(QLatin1String("uniquedesignation"), QLatin1String("MySymbolName"));
+
+      qDebug() << "message = " << message.toString();
+
+      if (d->m_messageGroupLayer->messageProcessor()->processMessage(message))
+      {
+        qDebug() << "message processed OK" ;
+        qDebug() << "message = '" << message.toString() << "'";
+        messageId = message.messageId();
+      }
+      else
+        qWarning() << "message processed NOT OK" ;
+
+      QList<EsriRuntimeQt::Layer *> layerList = d->m_messageGroupLayer->getLayers();
+
+      foreach (auto layer, layerList)
+        qDebug() << "MessageGroupLayer consists of layer " << static_cast<int>(layer->type());
+
+    }
+    else
+    {
+      qWarning() << "no messageGroupLayer";
+      QMessageBox msgBox;
+      msgBox.setText(QLatin1String("no messageGroupLayer"));
+      msgBox.exec();
+    }
+  */
+}
+
+void FunctionDialog::onMessageSelect()
+{
+  /*
+  QString messageId = QLatin1String("mySpecialId");
+
+    if (d->m_messageGroupLayer)
+    {
+      static bool select = true;
+
+      EsriRuntimeQt::Message message;
+
+      // arcGIS 10.2.6: createSelectMessage generates a wrong message
+      // -> wrong  : .. {_action,highlight}...
+      // -> correct: .. {_action,select}...
+  //    message = EsriRuntimeQt::MessageHelper::createSelectMessage(EsriRuntimeQt::SymbolDictionaryType::Mil2525C,
+  //                                                                messageId,
+  //                                                                QLatin1String("position_report"),
+  //                                                                true);
+      message.setMessageId(messageId);
+      message.setProperty(QLatin1String("_type"), QLatin1String("position_report"));
+      if (select)
+        message.setProperty(QLatin1String("_action"), QLatin1String("select"));
+      else
+        message.setProperty(QLatin1String("_action"), QLatin1String("un-select"));
+
+      // toggle
+      select = ! select;
+
+      qDebug() << "message = " << message.toString();
+
+      if (d->m_messageGroupLayer->messageProcessor()->processMessage(message))
+        qDebug() << "createSelectMessage processed OK" ;
+      else
+        qWarning() << "createSelectMessage processed NOT OK" ;
+
+
+    }
+    else
+    {
+      qWarning() << "no messageGroupLayer or messageId.isEmpty";
+      QMessageBox msgBox;
+      msgBox.setText(QLatin1String("no messageGroupLayer"));
+      msgBox.exec();
+    }
+  */
+}
+
+void FunctionDialog::onAddSymbol()
+{
+  QString fileNameAndPath = QFileDialog::getOpenFileName(this, tr("Add Symbol"),
+                                                  QLatin1String("/tmp"),
+                                                  tr("Images (*.png)"));
+
+  QImage symImg(fileNameAndPath);
+
+  QFileInfo fi(fileNameAndPath);
+
+  const QString &baseName = fi.baseName();
+
+  AdvancedSymbology::SymbolProperties symProps;
+  symProps.setName(baseName);
+  symProps.setKey(baseName);
+
+  if ( d->m_mapImpl->symbolDictionary().setEtsSymbol(4711, baseName, symProps, symImg) )
+    qDebug() << " insertExtraSymbol ok";
+  else
+    qCritical() << " insertExtraSymbol failed";
+
+}
+
+void FunctionDialog::onSomeParticipants()
+{
+
+  //
+  // place participants
+  //
+
+  QStringList sidcs;
+  //  1=Team/Crew, 2=Squad, 3=Section, 4=Platoon, 5=Company, 6=Battalion
+  //                      12345678||
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500111202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500121202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500131202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500141202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500151202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+  sidcs += AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500161202000000"); // 01015000001202000000 -> 15 120200 LandEquip, Tank
+
+  int counter = 0;
+  for (const QString &sidc : qAsConst(sidcs))
+  {
+    ++counter;
+    const QString &layername = QStringLiteral("Participants_%1").arg(counter);
+
+    // set additional values:
+    SituationMap::SymbolData symData;
+    symData.sidc = sidc;
+
+    // create and set debugInfo for debugging:
+    const QString &debugInfo = layername;
+    RefPointer<SituationMap::Participant> participant =
+      d->m_mapInterface->objectFactory().
+      create<SituationMap::Participant>(layername, debugInfo);
+
+    if (!participant)
+    {
+      qDebug() << LOGFUNCTION << " no object";
+      return;
+    }
+
+    symData.color = Qt::red; // Will be overwritten via partyId.
+    symData.size  = 2;
+
+    participant->setSymbol(symData);
+    participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation, layername.right(1));
+
+    // QPointF(92750, 80525) -> Rennplatz - Bremen
+
+    const QPointF &origin = s_basePoint.geographic(QPointF(90000 + counter * 100, 80000 + counter * 100));
+    participant->setOrigin(Point3D::fromQPointF(origin));
+
+    participant->updateView();
+  }
+
+}
+
+void FunctionDialog::onParticipantGetPosition()
+{
+  qWarning() <<  LOGFUNCTION << "XXXXXXXXXX";
+
+  if (d->m_participant)
+  {
+    d->m_participant->removeMySelf();
+    d->m_participant.reset();
+  }
+
+//  if (d->m_mapGeoView)
+  {
+//    AdvancedSymbology::SymbolDictionary &dict = d->m_mapImpl->symbolDictionary();
+    QString sidc(AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525C, "SFGPUCD---MR"));
+
+    if ((d->m_cbRubSidc)
+//      && (d->m_cbRubSidc->currentText().length() <= 15)  // civil symbols:
+       )
+      sidc = d->m_cbRubSidc->currentText();
+
+//    if (!dict.contains(sidc))
+//    {
+//      qWarning() << "sidc not found";
+//      return;
+//    }
+
+//    const QImage &symbolImage = dict.symbolImageBySidc(sidc, 32);
+//    if (symbolImage.isNull())
+//    {
+//      qWarning() << "symbolImageBySidc failed";
+//      return;
+//    }
+
+    RB::RubberbandPointFeature *rubberband = d->m_mapInterface->rubberbandFactory().create<RB::RubberbandPointFeature>();
+    if (!rubberband)
+    {
+      qWarning() << "Creating rubberband to get participant position failed";
+      return;
+    }
+    rubberband->maximumPointCount(1);   // rubberband will finish after first mouse click
+    //    rubberband->connectPreviewPixmap(QPixmap::fromImage(symbolImage));
+
+    rubberband->setUserData(new QString(sidc));
+    rubberband->setPreviewSidc(sidc);
+
+    connect(rubberband, &RB::RubberbandPointFeature::apply, this,  &FunctionDialog::onParticipantGetPositionApplied);
+    connect(rubberband, &RB::RubberbandPointFeature::abort, rubberband, &RB::Rubberband::deleteMySelf);
+  }
+} /*  FunctionDialog::onParticipantGetPosition */
+
+
+void FunctionDialog::onParticipantGetPositionApplied(RB::RubberbandBase *rubberband)
+{
+  qDebug() << LOGFUNCTION;
+
+  if (! rubberband)
+  {
+    qWarning() << LOGFUNCTION << " no rubberband anymore!!!";
+    return;
+  }
+
+  const QPointF &rubberCoord = rubberband->singleCoordinate();
+
+
+  QString *p_sidc = reinterpret_cast<QString *>(rubberband->userData());
+  if (! p_sidc)
+  {
+    qWarning() << LOGFUNCTION << " no sidc anymore!!!";
+    return;
+  }
+
+  if (! this->createParticipant(Point3D::fromQPointF(rubberCoord),
+                                QLatin1String("ParticipantRubberbandTab"))
+     )
+    qWarning() << LOGFUNCTION << " createParticipant (ParticipantRubberbandTab) failed";
+
+
+  SymbolData symData;
+  symData.sidc = *p_sidc;
+  d->m_participant->setSymbol(symData);
+  bool success = d->m_participant->updateView();
+  qWarning() << LOGFUNCTION  << " success (setMovementTrack) =" << success;
+
+  // cleanup
+  delete p_sidc;
+
+  rubberband->setUserData(nullptr);
+  rubberband -> deleteMySelf();
+}
+
+
+bool FunctionDialog::createParticipant(const Point3D &origin,
+                                       const QString &debugInfo)
+{
+  qDebug() << LOGFUNCTION << " debugInfo='" << debugInfo << "'";
+
+  if (d->m_participant)
+  {
+    d->m_participant->removeMySelf();
+    d->m_participant.reset();
+  }
+
+  // create and set debugInfo for debugging:
+  d->m_participant = d->m_mapInterface->objectFactory().
+                     create<SituationMap::Participant>(QLatin1String("Participants"), debugInfo);
+
+  if (!d->m_participant)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return false;
+  }
+
+  d->m_participant->setOrigin(origin);
+
+  return true;
+}
+
+
+void FunctionDialog::onParticipantCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (d->m_participant)
+  {
+    d->m_participant->removeMySelf();
+    d->m_participant.reset();
+  }
+
+//  QPointF origin = d->m_objectBasePoint + QPointF( -150000, -150000 );
+  QPointF originSim = d->m_objectBasePoint + QPointF(88000, 76000);
+  QPointF originGeo = s_basePoint.geographic(originSim);
+
+  QString sidc;
+
+  if (d->m_leSidc)
+  {
+    QString text = d->m_leSidc->text();
+    // if (text.length() <= 15)            // do not check regarding civil symbols
+    sidc = text;
+  }
+
+  qWarning() << LOGFUNCTION << " sidc=" << sidc;
+
+
+
+  bool success = this->createParticipant(Point3D::fromQPointF(originGeo),
+                                         QLatin1String("ParticipantMessageTab"));
+
+  d->m_participant->setTextModifier(Participant::TextModifier::EF_ReinforcedReduced, QLatin1String("EF_ReinforcedReduced"));
+  d->m_participant->setTextModifier(Participant::TextModifier::M_HigherFormation,    QLatin1String("M_HigherFormation"));
+  d->m_participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation,  QLatin1String("T_UniqueDesignation"));
+  d->m_participant->setTextModifier(Participant::TextModifier::W_DateTimeGroup,      QLatin1String("W_DateTimeGroup"));
+
+  d->m_participant->setVisibility(d->m_visibility);
+//  d->m_participant->setVisibility(SituationMap::ObjectAppearance::Technical, false); // no sense
+
+
+  SymbolData symData;
+  symData.sidc  = sidc;
+  symData.color = Qt::cyan; // Will be overwritten via partyId.
+//  symData.size  = 0.5;
+
+  d->m_participant->setSymbol(symData);
+  d->m_participant->setPartyId(4);
+  d->m_participant->setScale(d->getScale());
+
+//  d->m_participant->setInjury(Injury::MobilityKill, QColor(Qt::red) ); // QColor() to use the correct signature!
+//  d->m_participant->setInjury(Injury::TotalKill, 3);
+
+//  d->m_participant->setManipulation(true);
+//  d->m_participant->setBiteError(true);
+//  d->m_participant->setUseLightColor(true);
+//  d->m_participant->setNbcProtection(true);
+
+//  d->m_participant->setMarked(true);
+
+//  d->m_participant->setRanges(QVector<int>() << 8000 << 10000);
+
+
+  if (! success)
+  {
+    qWarning() << LOGFUNCTION << " createParticipant (ParticipantMessageTab) failed";
+    return;
+  }
+
+  // MovementTrack:
+  d->m_participant->setMovementTrackEnabled(true);
+//  d->m_participant->setMovementTrackVisibility(true); // visible = true = default
+
+  PositionCont intialMovementTrack;
+  Point3D ppp;
+
+  ppp = Point3D::fromQPointF(s_basePoint.geographic(originSim + QPointF(-500, -500)));
+  ppp.setZ(100);
+  qCritical() << " ppp=" << ppp.x() << " ; " << ppp.y() << " ; "<< ppp.z();
+  intialMovementTrack << ppp;
+
+  ppp = Point3D::fromQPointF(s_basePoint.geographic(originSim + QPointF(-500, 500)));
+  ppp.setZ(50);
+  qCritical() << " ppp=" << ppp.x() << " ; " << ppp.y() << " ; "<< ppp.z();
+  intialMovementTrack << ppp;
+
+
+  d->m_participant->setMovementTrack(intialMovementTrack);
+
+
+
+  // DirectionIndicator:
+  {
+    Participant::DirectionIndicatorData directionIndicatorData ;
+    directionIndicatorData.color = Qt::black;
+
+    directionIndicatorData.directionDegree = 22;
+    directionIndicatorData.lineStyle = Qt::SolidLine;
+    directionIndicatorData.lineWidth = 1;
+    d->m_participant->setDirectionIndicator(0, directionIndicatorData);
+
+    directionIndicatorData.directionDegree = 45;
+    directionIndicatorData.lineStyle = Qt::DashLine;
+    directionIndicatorData.lineWidth = 2;
+    d->m_participant->setDirectionIndicator(1, directionIndicatorData);
+
+    directionIndicatorData.directionDegree = 90;
+    directionIndicatorData.lineStyle = Qt::DashDotDotLine;
+    directionIndicatorData.lineWidth = 3;
+    d->m_participant->setDirectionIndicator(2, directionIndicatorData);
+  }
+
+
+  // Designation:
+  {
+    Participant::DesignationData designationData;
+    designationData.spotLocation.rx() = 0.155; //spotLocation.lon();
+    designationData.spotLocation.ry() = 0.926; //spotLocation.lat();
+    designationData.code = 123;
+
+    d->m_participant->setDesignations({designationData});
+  }
+
+
+  success = d->m_participant->updateView();
+
+  qWarning() << LOGFUNCTION  << " success =" << success;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onParticipantUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onParticipantUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_participant)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  // move
+  QPointF origin = s_basePoint.geographic(QPointF(93064, 78331));
+  d->m_participant->setOrigin(Point3D(origin.x(), origin.y(), 100.2345));
+
+  d->m_participant->setRanges(QVector<int>() << 50 << 150 << 350 << 500 << 1000 << 1800);
+  d->m_participant->setRangesVisibility(true);
+
+
+  d->m_participant->setInjury(Injury::TotalKill, QColor(Qt::blue));
+
+  d->m_participant->setAdditionalSymbol(SituationMap::AdditionalSymbolType::NbcProtection, true);
+  d->m_participant->setAdditionalSymbol(SituationMap::AdditionalSymbolType::Manipulation, true);
+  d->m_participant->setAdditionalSymbol(SituationMap::AdditionalSymbolType::NoPosition, true);
+  d->m_participant->setAdditionalSymbol(SituationMap::AdditionalSymbolType::BiteError, true);
+
+  d->m_participant->setTextModifier(Participant::TextModifier::EF_ReinforcedReduced, QLatin1String("+     "));
+
+  SymbolData symData = d->m_participant->symbol();
+  symData.color = Qt::magenta;   // Will be overwritten via partyId (if partyId != -1)
+  symData.size  = 1.0;
+  d->m_participant->setSymbol(symData);
+
+  d->m_participant->setPartyId(4);
+
+  d->m_participant->setMarked(true);
+
+  // Designation:
+  {
+    Participant::DesignationData designationData;
+    designationData.spotLocation.rx() = 0; //spotLocation.lon();
+    designationData.spotLocation.ry() = 0; //spotLocation.lat();
+    designationData.code = 123;
+    d->m_participant->setDesignations({designationData});
+  }
+
+
+  bool success = d->m_participant->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_participant->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+
+//  //-----------------------------------
+//  // second participant near to the first one:
+//  //-----------------------------------
+//  Participant* secondPart = d->m_mapImpl->createParticipant();
+//
+//  if (!secondPart)
+//  {
+//    qDebug() << LOGFUNCTION << " no object";
+//    return;
+//  }
+//
+//  // Set objId for debugging:
+//  secondPart->setObjId("secondParticipant");
+//
+//  secondPart->setSymbol(d->m_participant->symbol());
+//  secondPart->setOrigin( d->m_participant->origin() + QPointF(1000, 1000) );
+//
+//  // update view
+//  success = secondPart->updateView() && success;
+//
+//  if (success)
+//    qDebug() << LOGFUNCTION << " secondParticipant updateView OK" ;
+//  else
+//    qDebug() << LOGFUNCTION << " secondParticipant updateView NOT OK" ;
+
+
+}
+
+void FunctionDialog::onBuildingCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_building));
+
+  d->m_building = d->m_mapInterface->objectFactory().
+                  create<SituationMap::BuildingOutline>(QLatin1String("AES"), QLatin1String("BuildingOutlineId2"));
+
+  if (!d->m_building)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_building->setIdentifier(QLatin1String("Building"));
+
+  d->m_building->setVisibility(d->m_visibility);
+  d->m_building->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_building->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_building->setSelected(d->m_selected);
+
+  d->m_building->rTextStyle().setTextColor(Qt::magenta);
+  d->m_building->rTextStyle().setSize(30);
+//  d->m_building->rTextStyle().setAngle(-90); // -90 -> north
+  d->m_building->rTextStyle().setAntiAliased(true);
+
+
+  d->m_building->rTextStyle().setItalic(true);
+  d->m_building->rTextStyle().setHorizontalAlignment(HorizontalAlignment::Justify);
+  d->m_building->rTextStyle().setVerticalAlignment(VerticalAlignment::BaseLine);
+
+  d->m_building->rFillStyle().setFillColor(QColor(Qt::darkGray));
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+//  QPointF offset = d->m_objectBasePoint + QPointF(50000, 50000);
+
+//  int extent = 30000;
+//  posCont << offset - QPointF(0,      0);
+//  posCont << offset - QPointF(extent,      0);
+//  posCont << offset - QPointF(extent, extent);
+//  posCont << offset - QPointF(0, extent);
+
+  if (true)
+  {
+    // Bt56
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93064  , 78331)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93069.9, 78337.8)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93076.8, 78331.8)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93070.9, 78325)));
+  }
+  else
+  {
+    // Salchau
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(75000.0  , 13000)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(75000.0  , 13100)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(75100.0  , 13100)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(75100.0  , 13000)));
+  }
+
+  std::cout << " posCont=" <<  posCont << std::endl;
+
+  d->m_building->setPositions(posCont);
+
+
+  d->m_building->setMarker(posCont[0]);
+
+
+  // update view
+  bool success = d->m_building->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_building->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " building dump: " << (*d->m_building) << std::endl;
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onBuildingUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onBuildingUpdate()
+{
+
+  if (!d->m_building)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  qDebug() << LOGFUNCTION << " update Values.." ;
+
+  d->m_building->setIdentifier(d->m_building->identifier() + QLatin1String("Update"));
+  d->m_building->rTextStyle().setAngle(-45); // -45 -> north/east
+
+  d->m_building->setMarker(Point3D());
+
+
+  // Bt56
+  SituationMap::PositionCont posCont;
+  appendQPointF(posCont, s_basePoint.geographic(QPointF(93064  , 78331)));
+  appendQPointF(posCont, s_basePoint.geographic(QPointF(93069.9, 78337.8)));
+  appendQPointF(posCont, s_basePoint.geographic(QPointF(93076.8, 78331.8)));
+
+  appendQPointF(posCont, s_basePoint.geographic(QPointF(93100.9, 78300)));
+
+  appendQPointF(posCont, s_basePoint.geographic(QPointF(93070.9, 78325)));
+
+  d->m_building->setPositions(posCont);
+
+  d->m_building->rLineStyle().setLineColor(Qt::red);
+  d->m_building->rLineStyle().setLineWidth(6);
+  d->m_building->rLineStyle().setLinePattern(LinePattern::DashDotDot);
+
+  d->m_building->rFillStyle().setFillColor(Qt::yellow);
+  d->m_building->rFillStyle().setFillPattern(FillPattern::DiagonalCross);
+
+  bool success = d->m_building->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_building->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onBiologicalAgentCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_bAgent));
+
+  d->m_bAgent = d->m_mapInterface->objectFactory().
+                create<SituationMap::BiologicalAgent>(QLatin1String("AES"), QLatin1String("B-AgentId"));
+
+  if (!d->m_bAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_bAgent->setIdentifier(QLatin1String("My BiologicalAgent\nNext Line-OutLined"));
+
+  d->m_bAgent->setVisibility(d->m_visibility);
+  d->m_bAgent->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_bAgent->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_bAgent->setSelected(d->m_selected);
+
+  d->m_bAgent->rTextStyle().setTextColor(Qt::magenta);
+  d->m_bAgent->rTextStyle().setSize(30);
+  d->m_bAgent->rTextStyle().setBold(true);
+  d->m_bAgent->rTextStyle().setHorizontalAlignment(HorizontalAlignment::Left);
+  d->m_bAgent->rTextStyle().setHorizontalAlignment(HorizontalAlignment::Justify);
+  d->m_bAgent->rTextStyle().setVerticalAlignment(VerticalAlignment::Top);
+
+
+  LineStyle lineStyle(Qt::cyan, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::Solid);
+
+  d->m_bAgent->setLineStyle(lineStyle);
+  d->m_bAgent->setFillStyle(fillStyle);
+
+  d->m_bAgent->setPartyId(3);                          // Will overwrite line/fillcolor
+  d->m_bAgent->setAesState(AesEffectState::Unknown);   // != Unknown will overwrite fillPattern
+
+
+//  QPointF center = d->m_objectBasePoint + QPointF(100000, 100000);
+  QPointF center = d->m_mapImpl->centerPoint();
+  qWarning() << LOGFUNCTION  << " xxxxxxxxxx center=" << center;
+
+//  center = s_basePoint.geographic(center);
+  d->m_bAgent->setOrigin(Point3D::fromQPointF(center));
+
+  d->m_bAgent->setRadius(10000);
+
+
+  // Extrusion
+  d->m_bAgent->setExtrusionHeight(5);
+
+  // if setExtrusionColorName is not set, the partyId is used as fallback
+  // see -> AbstractMapObjectImpl::updateGraphicalObjectExtrusion()
+  //
+
+  //  d->m_bAgent->setExtrusionColorName( QColor(Qt::green).name() );
+
+
+  bool success = d->m_bAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_bAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " B-Agent dump: " << (*d->m_bAgent) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onBiologicalAgentUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onBiologicalAgentUpdate()
+{
+  if (!d->m_bAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  if (d->m_mapImpl->mode() == Mode::Mode_2D)
+    d->m_bAgent->setIdentifier(d->m_bAgent->identifier() + QLatin1String("Upd"));
+
+  // modify geometry:
+  //  d->m_bAgent->setOrigin(d->m_bAgent->origin() + Point3D(500, 500, .0));
+  d->m_bAgent->setRadius(d->m_bAgent->radius() + 50);
+
+  LineStyle lineStyle(Qt::red, 6, LinePattern::DashDotDot);
+  FillStyle fillStyle(Qt::magenta, FillPattern::DiagonalCross);
+  d->m_bAgent->setLineStyle(lineStyle);
+  d->m_bAgent->setFillStyle(fillStyle);
+
+  d->m_bAgent->setPartyId(4);                          // Will overwrite line/fillcolor
+  d->m_bAgent->setAesState(AesEffectState::Prepared);  // != Unknown will overwrite fillPattern
+
+
+  SymbolData symData = d->m_bAgent->symbol();
+
+  switch (d->m_mapImpl->symbologyType())
+  {
+  case AdvancedSymbology::SymbologyType::APP6D:
+  case AdvancedSymbology::SymbologyType::MIL2525D:
+    break;
+  case AdvancedSymbology::SymbologyType::MIL2525C:
+    symData.sidc = QLatin1String("GUMPNB----");  // only to test modify of sidc
+    break;
+  case AdvancedSymbology::SymbologyType::APP6B:
+    symData.sidc = QLatin1String("GUCPBWC---");  // only to test modify of sidc
+    break;
+  case AdvancedSymbology::SymbologyType::None:
+    // empty
+    break;
+  } // switch
+
+  d->m_bAgent->setSymbol(symData);
+
+  bool success = d->m_bAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_bAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onChemicalAgentCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_cAgent));
+
+  d->m_cAgent = d->m_mapInterface->objectFactory().
+                create<SituationMap::ChemicalAgent>(QLatin1String("AES"), QLatin1String("C-AgentId"));
+
+  if (!d->m_cAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_cAgent->setIdentifier(QLatin1String("My ChemicalAgent-OutLined"));
+
+  d->m_cAgent->setVisibility(d->m_visibility);
+  d->m_cAgent->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_cAgent->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_cAgent->setSelected(d->m_selected);
+
+  LineStyle lineStyle(Qt::cyan, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::Null);
+  d->m_cAgent->setLineStyle(lineStyle);
+  d->m_cAgent->setFillStyle(fillStyle);
+
+  d->m_cAgent->setPartyId(4);                          // Will overwrite line/fillcolor
+  d->m_cAgent->setAesState(AesEffectState::Unknown);   // != Unknown will overwrite fillPattern
+
+  QPointF center = d->m_objectBasePoint + QPointF(90000, 100100);
+
+  center = s_basePoint.geographic(center);
+  d->m_cAgent->setOrigin(Point3D::fromQPointF(center));
+  d->m_cAgent->setRadius(1000);
+
+  bool success = d->m_cAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_cAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " C-Agent dump: " << (*d->m_cAgent) << std::endl;
+}
+
+void FunctionDialog::onCubeCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_cube));
+
+  const QString &layernameForCubes = d->m_mapInterface->layerFactory().layernameForCubes();
+
+  d->m_cube = d->m_mapInterface->objectFactory().
+                    create<SituationMap::Cube>(layernameForCubes, QLatin1String("CubeID"));
+
+  if (!d->m_cube)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(92500, 79000);
+
+  int extent = 1000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,      0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,      0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent, extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0, extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_cube->setPositions(posCont);
+
+  d->m_cube->setHeight(123456);
+  d->m_cube->setPartyId(1);
+
+  d->m_cube->setDrawOrder(234);
+
+  bool success = d->m_cube->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_cube->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+
+void FunctionDialog::onDangerAreaCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_dangerArea));
+
+  d->m_dangerArea = d->m_mapInterface->objectFactory().
+                    create<SituationMap::DangerArea>(QLatin1String("AES"), QLatin1String("DangerAreaId"));
+
+  if (!d->m_dangerArea)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_dangerArea->setIdentifier(QLatin1String("DangerArea-NotOutLined"));
+
+  d->m_dangerArea->setVisibility(d->m_visibility);
+  d->m_dangerArea->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_dangerArea->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_dangerArea->setSelected(d->m_selected);
+
+  TextStyle textStyle(Qt::yellow);
+  textStyle.setTextOutlineColor(Qt::white);
+  textStyle.setTextOutlineWidth(0.5);
+  LineStyle lineStyle(Qt::yellow, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::DiagonalCross);
+
+  d->m_dangerArea->setTextStyle(textStyle);
+  d->m_dangerArea->setLineStyle(lineStyle);
+  d->m_dangerArea->setFillStyle(fillStyle);
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(150000, 150000);
+
+  int extent = 100000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,              0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,              0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,         extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,         extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_dangerArea->setPositions(posCont);
+
+  bool success = d->m_dangerArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_dangerArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " DangerArea success = " << success << std::endl;
+  std::cout << " DangerArea dump: " << (*d->m_dangerArea) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onDangerAreaUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onDangerAreaUpdate()
+{
+  if (!d->m_dangerArea)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_dangerArea->setIdentifier(d->m_dangerArea->identifier() + QLatin1String("Update"));
+
+  d->m_dangerArea->rLineStyle().setLineWidth(4);
+  d->m_dangerArea->rFillStyle().setFillPattern(FillPattern::Null);
+
+  d->m_dangerArea->setPartyId(2);  // Will overwrite line/fillcolor
+
+  // move
+  QPointF offset(d->m_dangerArea->positions().value(0).toPointF() + QPointF(10000, 10000));
+
+  qDebug() << LOGFUNCTION << " update Values.." ;
+
+  SituationMap::PositionCont posCont;
+
+  int extent = 150000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,      0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,      0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent * 2, extent)));
+//  appendQPointF(posCont, s_basePoint.geographic( offset + QPointF(extent/2, extent/2)) ;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,     extent)));
+
+  d->m_dangerArea->setPositions(posCont);
+
+  bool success = d->m_dangerArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_dangerArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onFunctionalAreaCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_functionalArea));
+
+  d->m_functionalArea = d->m_mapInterface->objectFactory().
+                        create<SituationMap::FunctionalArea>(QLatin1String("AES"), QLatin1String("FunctionalAreaId"));
+
+  if (!d->m_functionalArea)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_functionalArea->setIdentifier(QLatin1String("FunctionalArea-OutLined"));
+
+  d->m_functionalArea->setVisibility(d->m_visibility);
+  d->m_functionalArea->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_functionalArea->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_functionalArea->setSelected(d->m_selected);
+
+  LineStyle lineStyle(Qt::red, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::ForwardDiagonal);
+
+  d->m_functionalArea->setLineStyle(lineStyle);
+  d->m_functionalArea->setFillStyle(fillStyle);
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = QPointF(93550, 78550);
+
+  int extent = 1000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,       0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,       0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,     extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,     extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_functionalArea->setPositions(posCont);
+
+
+  // pointSymbol :
+  QPointF psOrg = s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2));
+  d->m_functionalArea->setPointSymbolOrigin(Point3D::fromQPointF(psOrg));
+
+  // !!! use only POINT symbols !!!
+  // DoDo: find adequate sidc
+  d->m_functionalArea->setPointSymbolSidc(AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10012500002108000000"));  // Maritime Points : Impact Point
+  d->m_functionalArea->setPointSymbolSidc(AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500001102030000"));  // Weapon/Weapon System
+  d->m_functionalArea->setPointSymbolSidc(AdvancedSymbology::SidcCodec::encodeComplete( AdvancedSymbology::SymbologyType::MIL2525D, "10031500001202000000"));  // Vehicle : Tank
+//  d->m_functionalArea->setPointSymbolSidc(AdvancedSymbology::SidcCodec::encodeCivil("ETS_Pers_FW_BerFue"));    // Color Replacement not working yet
+
+  d->m_functionalArea->setPartyId(2);
+  // : pointSymbol
+
+  bool success = d->m_functionalArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_functionalArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " FunctionalArea dump: " << (*d->m_functionalArea) << std::endl;
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onFunctionalAreaUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onFunctionalAreaUpdate()
+{
+  if (!d->m_functionalArea)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_functionalArea->rLineStyle().setLineWidth(2);
+  d->m_functionalArea->rFillStyle().setFillPattern(FillPattern::Null);
+
+  d->m_functionalArea->setIdentifier(d->m_functionalArea->identifier() + QLatin1String("Update"));
+
+  // move
+  QPointF offset = QPointF(93550, 78550) + QPointF(100, 100);
+
+  qDebug() << LOGFUNCTION << " update Values..";
+
+  SituationMap::PositionCont posCont;
+
+  int extent = 1000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,        0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,        0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent * 2,   extent)));
+//  appendQPointF(posCont, s_basePoint.geographic( offset + QPointF(extent/2, extent/2) ));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,   extent)));
+
+  d->m_functionalArea->setPositions(posCont);
+
+  // pointSymbol :
+  QPointF pSymOrg = s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2));
+  d->m_functionalArea->setPointSymbolOrigin(Point3D::fromQPointF(pSymOrg));
+  d->m_functionalArea->setPartyId(3);
+  // : pointSymbol
+
+  bool success = d->m_functionalArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_functionalArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onGeoImageCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_geoImage));
+
+  d->m_geoImage = d->m_mapInterface->objectFactory().
+                  create<SituationMap::GeoImage>(QLatin1String("AES"), QLatin1String("GeoImageId"));
+
+  if (!d->m_geoImage)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_geoImage->setIdentifier(QLatin1String("GeoImageIdent"));  // maybe empty!?
+
+  {
+    //  d->m_geoImage->setProxyImage();  // no proxyImage -> use defaultMarker
+    QImage mainImage(100, 100, QImage::Format_ARGB32);
+    mainImage.fill(qRgba(0, 0, 0, 0));
+
+    QPainter painter(&mainImage);
+    painter.setBrush(QBrush(Qt::gray));
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(mainImage.rect());
+
+    painter.setPen(QPen(Qt::red));
+    painter.drawText(mainImage.rect(), Qt::AlignCenter, QLatin1String("GeoImg"));
+
+    painter.end();
+    d->m_geoImage->setMainImage(mainImage);
+    d->m_geoImage->setDescription(QLatin1String("desc"));
+
+//    d->m_geoImage->setProxyImage(mainImage, QSize(20, 20));
+
+  }
+
+
+  d->m_geoImage->setVisibility(d->m_visibility);
+  d->m_geoImage->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_geoImage->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_geoImage->setSelected(d->m_selected);
+
+  QPointF origin = s_basePoint.geographic(d->m_objectBasePoint + QPointF(90500, 80500));
+  d->m_geoImage->setOrigin(Point3D::fromQPointF(origin));
+
+  bool success = d->m_geoImage->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_geoImage->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " GeoImage dump: " << (*d->m_geoImage) << std::endl;
+}
+
+void FunctionDialog::onMapObjectClicked(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
+                                        const QPointF &viewportPosition)
+{
+  qDebug() << LOGFUNCTION ;
+
+  // Keep in mind: It´s likely that the application has also such a slot.
+
+  for (auto mapObj : mapObjList)
+  {
+    qDebug() << LOGFUNCTION << " id=" << mapObj->uniqueMapId()
+             << "object-debugInfo="   << mapObj->debugInfo()
+             << "object-identifier="  << mapObj->identifier();
+
+    // GeoImage:
+    SituationMap::RefPointer<SituationMap::GeoImage> geoImage(mapObj);
+    if (geoImage.valid())
+    {
+      qDebug() << LOGFUNCTION << " geoImage found, id=" << mapObj->uniqueMapId()
+               << "object-debugInfo="   << mapObj->debugInfo()
+               << "object-identifier="  << mapObj->identifier();
+
+      QWidget *geoImageWidget = geoImage->createWidget();
+
+      if (!geoImageWidget)
+      {
+        qDebug() << LOGFUNCTION << " geoImage found, id=" << mapObj->uniqueMapId()
+                 << "object-debugInfo="   << mapObj->debugInfo()
+                 << "object-identifier="  << mapObj->identifier()
+                 << " no mainImage provided!?";
+        return;
+      }
+
+      // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+      // Adding a widget will let the application crash
+      // Workaround: 'proxy->setOpacity(0.99);'
+      QGraphicsProxyWidget *proxyWidget = d->m_mapInterface->getQGraphicsView()->scene()->addWidget(geoImageWidget);
+      proxyWidget->setOpacity(0.99);
+      proxyWidget->setPos(viewportPosition + QPointF(10, 10));
+
+      return; // to do it for just one GeoImage
+    }
+  } // for
+}
+
+void FunctionDialog::onSoundAreaCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_soundArea));
+
+  d->m_soundArea = d->m_mapInterface->objectFactory().
+                  create<SituationMap::SoundArea>(QLatin1String("AES"), QLatin1String("SoundAreaId"));
+
+  if (!d->m_soundArea)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_soundArea->setIdentifier(QLatin1String("SoundAreaIdent"));  // maybe empty!?
+
+  SituationMap::PositionCont posCont;
+  QPointF offset = QPointF(93000, 78000);
+
+  int extent = 1123;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,              0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,              0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,         extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,         extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_soundArea->setPositions(posCont);
+
+  {
+    QImage img(100, 100, QImage::Format_ARGB32);
+    img.fill(qRgba(0, 0, 0, 0));
+
+    QPainter painter(&img);
+    painter.setBrush(QBrush(Qt::red));
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(img.rect());
+    painter.setPen(QPen(Qt::black));
+    painter.drawText(img.rect(), Qt::AlignCenter, QLatin1String("Img"));
+    painter.end();
+
+    d->m_soundArea->setMarkerData(MarkerData(img, QSize(40, 40)));   // image in high resolution and small (default) size
+    d->m_soundArea->setMarkerOrigin(posCont[3]);
+  }
+
+
+  d->m_soundArea->setVisibility(d->m_visibility);
+  d->m_soundArea->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_soundArea->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_soundArea->setSelected(d->m_selected);
+
+
+  bool success = d->m_soundArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_soundArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+
+  std::cout << " GeoImage dump: " << (*d->m_soundArea) << std::endl;
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onSoundAreaUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onSoundAreaUpdate()
+{
+  if (!d->m_soundArea)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  {
+    // changed pos
+    SituationMap::PositionCont posCont = d->m_soundArea->positions();
+    d->m_soundArea->setMarkerOrigin(posCont[2]);
+  }
+
+  {
+    // changed img to marker
+    d->m_soundArea->setMarkerData(MarkerData(MarkerSymbolType::Cross, 20, Qt::cyan));
+  }
+
+  bool success = d->m_soundArea->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+
+void FunctionDialog::onHitLineCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_hitLine));
+
+  d->m_hitLine = d->m_mapInterface->objectFactory().
+                 create<SituationMap::HitLine>(QLatin1String("AES"), QLatin1String("HitLineId"));
+
+  if (!d->m_hitLine)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_hitLine->setIdentifier(QLatin1String("HitLine-OutLined"));
+
+  d->m_hitLine->setVisibility(d->m_visibility);
+  d->m_hitLine->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_hitLine->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_hitLine->setSelected(d->m_selected);
+
+  d->m_hitLine->rLineStyle().setLineColor(Qt::blue);
+  d->m_hitLine->rLineStyle().setLineWidth(3);
+
+
+  // set additional values:
+  QPointF offset = QPointF(80000, 80000);
+
+  Point3D start = Point3D::fromQPointF(s_basePoint.geographic(offset + QPointF()));
+  Point3D end   = Point3D::fromQPointF(s_basePoint.geographic(offset + QPointF(1230, 1560)));
+
+  d->m_hitLine->setStartAndEndPoint(start, end);
+
+  bool success = d->m_hitLine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_hitLine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " HitLine dump: " << (*d->m_hitLine) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onHitLineUpdate);
+  timer->setSingleShot(true);
+//  timer->start(2000);
+}
+
+void FunctionDialog::onHitLineUpdate()
+{
+  if (!d->m_hitLine)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_hitLine->setIdentifier(d->m_hitLine->identifier() + QLatin1String("Update"));
+
+  d->m_hitLine->setPartyId(4);  // Will overwrite line/fillcolor
+
+  // set additional values:
+  Point3D start = d->m_hitLine->startPoint();
+  Point3D end   = d->m_hitLine->endPoint();
+
+  // modify:
+  end.rx() += 0.001;
+
+  d->m_hitLine->setStartAndEndPoint(start, end);
+
+  bool success = d->m_hitLine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_hitLine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onLineOfSightLineCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_lineOfSight));
+
+  d->m_lineOfSight = d->m_mapInterface->objectFactory().
+      create<SituationMap::LineOfSight>(QLatin1String("MountingPoints"), QLatin1String("LineOfSight")); // SurcfacePlacementMode (<Draped|Absolute|Relative>)
+
+  d->m_lineOfSight->setPoints(Point3D(0.155, 0.926, 100) // observer
+                              , Point3D(0.156, 0.926,  50) // obstacle
+                              , Point3D(0.157, 0.926,   0) // target
+//                              , Qt::cyan,                   // visibleColor
+//                              , Qt::magenta
+                              );               // obstructedColor
+
+  d->m_lineOfSight->setVisibility(d->m_visibility);
+  d->m_lineOfSight->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_lineOfSight->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_lineOfSight->setSelected(d->m_selected);
+
+
+  bool success = d->m_lineOfSight->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_lineOfSight->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " LineOfSight dump: " << (*d->m_lineOfSight) << std::endl;
+}
+
+
+void FunctionDialog::onMineCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_mine));
+
+  d->m_mine = d->m_mapInterface->objectFactory().
+              create<SituationMap::Mine>(QLatin1String("AES"), QLatin1String("MineId"));
+
+  if (!d->m_mine)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_mine->setIdentifier(QLatin1String("Mine-OutLined"));
+
+  d->m_mine->setVisibility(d->m_visibility);
+  d->m_mine->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_mine->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_mine->setSelected(d->m_selected);
+
+  d->m_mine->setPartyId(3);  // Will overwrite line/fillcolor
+
+
+  // set additional values:
+  QPointF origin = s_basePoint.geographic(d->m_objectBasePoint + QPointF(91500, 81500));
+  d->m_mine->setOrigin(Point3D::fromQPointF(origin));
+
+  bool success = d->m_mine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_mine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " Mine dump: " << (*d->m_mine) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onMineUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onMineUpdate()
+{
+  if (!d->m_mine)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_mine->setState(true);
+
+  bool success = d->m_mine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_mine->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onMineFieldCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_mineField));
+
+  d->m_mineField = d->m_mapInterface->objectFactory().
+                   create<SituationMap::MineField>(QLatin1String("AES"), QLatin1String("MineFieldId"));
+
+  if (!d->m_mineField)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_mineField->setIdentifier(QLatin1String("MineField-OutLined"));
+
+  d->m_mineField->setVisibility(d->m_visibility);
+  d->m_mineField->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_mineField->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_mineField->setSelected(d->m_selected);
+
+  d->m_mineField->setAesState(AesEffectState::Unknown);   // != Unknown will overwrite fillPattern
+
+  d->m_mineField->rLineStyle().setLineColor(Qt::green);
+  d->m_mineField->rLineStyle().setLineWidth(2);
+  d->m_mineField->rFillStyle().setFillColor(Qt::blue);
+  d->m_mineField->rFillStyle().setFillPattern(FillPattern::DiagonalCross);
+
+//  d->m_mineField->setPartyId(5);  // Will overwrite line/fillcolor
+
+
+
+  // set paths:
+  SituationMap::PositionCont posContSeg1;
+  QPointF offsetSeg1 = d->m_objectBasePoint + QPointF(150000, 150000);
+
+  int extent = 40000;
+  appendQPointF(posContSeg1, s_basePoint.geographic(offsetSeg1 + QPointF(     0,          0)));
+  appendQPointF(posContSeg1, s_basePoint.geographic(offsetSeg1 + QPointF(extent,          0)));
+  appendQPointF(posContSeg1, s_basePoint.geographic(offsetSeg1 + QPointF(extent, 2 * extent)));
+  appendQPointF(posContSeg1, s_basePoint.geographic(offsetSeg1 + QPointF(     0, 2 * extent)));
+  d->m_mineField->setSegment(1, posContSeg1);
+
+  PositionCont posContSeg2;
+  QPointF offsetSeg2 = d->m_objectBasePoint + QPointF(200000, 150000);
+  appendQPointF(posContSeg2, s_basePoint.geographic(offsetSeg2 + QPointF(         0,      0)));
+  appendQPointF(posContSeg2, s_basePoint.geographic(offsetSeg2 + QPointF(2 * extent,      0)));
+  appendQPointF(posContSeg2, s_basePoint.geographic(offsetSeg2 + QPointF(2 * extent, extent)));
+  appendQPointF(posContSeg2, s_basePoint.geographic(offsetSeg2 + QPointF(         0, extent)));
+  d->m_mineField->setSegment(2, posContSeg2);
+
+//  PositionCont posContSeg3;
+//  QPointF offsetSeg3 = d->m_objectBasePoint + QPointF(300000, 150000);
+//  posContSeg3 << offsetSeg3 + QPointF(0,      0);
+//  posContSeg3 << offsetSeg3 + QPointF(2 * extent,      0);
+//  posContSeg3 << offsetSeg3 + QPointF(2 * extent, extent);
+//  posContSeg3 << offsetSeg3 + QPointF(0, extent);
+//  d->m_mineField->setSegment(3, posContSeg3);
+  PositionCont posContSeg3;
+  QPointF offsetSeg3 = d->m_objectBasePoint + QPointF(300000, 150000);
+  appendQPointF(posContSeg3, s_basePoint.geographic(offsetSeg3 + QPointF(         0,      0)));
+  appendQPointF(posContSeg3, s_basePoint.geographic(offsetSeg3 + QPointF(2 * extent,      0)));
+  appendQPointF(posContSeg3, s_basePoint.geographic(offsetSeg3 + QPointF(2 * extent, extent)));
+  appendQPointF(posContSeg3, s_basePoint.geographic(offsetSeg3 + QPointF(         0, extent)));
+  d->m_mineField->setSegment(3, posContSeg3);
+
+
+//  PositionCont posContComplete;
+//  QPolygonF polyComplete;
+//  QPolygonF polySeg1;
+//  Q_FOREACH(const QPointF &item, posContSeg1)
+//    polySeg1.append(item);
+
+//  QPolygonF polySeg2;
+//  Q_FOREACH(const QPointF &item, posContSeg2)
+//    polySeg2.append(item);
+//  polyComplete = polySeg1.united(polySeg2);
+
+//  qWarning() << "polyComplete.size()=" << polyComplete.size();
+//  qWarning() << "polyComplete=" << polyComplete;
+
+//  Q_FOREACH(const QPointF &item, polyComplete)
+//    posContComplete.append(item);
+
+//  posContComplete
+//      << posContSeg1[0]
+//      << posContSeg1[3]
+//      << posContSeg1[2]
+//      << posContSeg3[2]
+//      << posContSeg3[1];
+
+
+  d->m_mineField->setPositions(posContSeg1);
+
+  PositionCont minePosCont;
+  appendQPointF(minePosCont, s_basePoint.geographic(offsetSeg1));
+  appendQPointF(minePosCont, s_basePoint.geographic(offsetSeg1 + QPointF(1000,   100)));
+  appendQPointF(minePosCont, s_basePoint.geographic(offsetSeg1 + QPointF(12000, 12000)));
+  appendQPointF(minePosCont, s_basePoint.geographic(offsetSeg1 + QPointF(12000, 13000)));
+
+  d->m_mineField->setPositionsMine(MineField::MineState::Activated, minePosCont);
+
+  PositionCont minePosContDeActive;
+  appendQPointF(minePosContDeActive, s_basePoint.geographic(offsetSeg1 + QPointF(0, 100)));
+  d->m_mineField->setPositionsMine(MineField::MineState::DeActivated, minePosContDeActive);
+
+  bool success = d->m_mineField->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_mineField->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " MineField dump: " << (*d->m_mineField) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onMineFieldUpdate);
+  timer->setSingleShot(true);
+  timer->start(5000);
+}
+
+void FunctionDialog::onMineFieldUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_mineField)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_mineField->setDrawOrder(10);
+
+  d->m_mineField->setMineVisibility(MineField::MineState::Activated, false);
+
+  d->m_mineField->updateView();
+
+  // remove some mines:
+  PositionCont empty;
+  d->m_mineField->setPositionsMine(MineField::MineState::DeActivated, empty);
+
+  // remove segment:
+  d->m_mineField->removeSegment(2);
+
+  d->m_mineField->setAesState(AesEffectState::Created);   // != Unknown will overwrite fillPattern
+
+  d->m_mineField->setPartyId(5);  // Will overwrite line/fillcolor
+
+
+  bool success = d->m_mineField->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_mineField->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onNuclearCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_nuclearAgent));
+
+  d->m_nuclearAgent = d->m_mapInterface->objectFactory().
+                      create<SituationMap::NuclearAgent>(QLatin1String("AES"), QLatin1String("NuclearAgentId"));
+
+  if (!d->m_nuclearAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_nuclearAgent->setIdentifier(QLatin1String("NuclearAgent-OutLined"));
+
+  d->m_nuclearAgent->setVisibility(d->m_visibility);
+  d->m_nuclearAgent->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_nuclearAgent->setVisibility(SituationMap::ObjectAppearance::Tactical,  false);
+
+  d->m_nuclearAgent->setSelected(d->m_selected);
+
+  d->m_nuclearAgent->setPartyId(4);  // Will overwrite line/fillcolor
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(90000, 80000);
+
+  int extent = 1000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, 1 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-2 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(2 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(1 * extent, 1 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(1 * extent,          0)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_nuclearAgent->setPositions(posCont);
+
+  d->m_nuclearAgent->setAesState(AesEffectState::Paused);
+
+
+  SituationMap::PositionCont subLine1;
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(-1 * extent, 1 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(+1 * extent, 1 * extent)));
+
+  d->m_nuclearAgent->setSubsidiaryLine(0, subLine1);
+
+  SituationMap::PositionCont subLine2;
+  appendQPointF(subLine2, s_basePoint.geographic(offset + QPointF(-1.7 * extent, 2 * extent)));
+  appendQPointF(subLine2, s_basePoint.geographic(offset + QPointF(+1.7 * extent, 2 * extent)));
+
+  d->m_nuclearAgent->
+  setSubsidiaryLine(1, subLine2);
+
+
+  bool success = d->m_nuclearAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_nuclearAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " NuclearAgent dump: " << (*d->m_nuclearAgent) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onNuclearUpdate);
+  timer->setSingleShot(true);
+//  timer->start(2000);
+}
+
+void FunctionDialog::onNuclearUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_nuclearAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  // move
+  QPointF offset(d->m_nuclearAgent->positions().value(0).toPointF() + QPointF(10000, 10000));
+
+  qDebug() << LOGFUNCTION << " update values.." ;
+
+  SituationMap::PositionCont posCont;
+
+  int extent = 10000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, 1 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-2 * extent, 4 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(+2 * extent, 4 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(+1 * extent, 1 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(+1 * extent,          0)));
+
+  d->m_nuclearAgent->setPositions(posCont);
+
+  d->m_nuclearAgent->removeSubsidiaryLines();
+
+  d->m_nuclearAgent->setAesState(AesEffectState::Activated);
+
+  d->m_nuclearAgent->setPartyId(5);  // Will overwrite line/fillcolor
+
+
+  bool success = d->m_nuclearAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_nuclearAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+}
+
+void FunctionDialog::onChargeEffectCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_singleFire));
+
+  d->m_singleFire = d->m_mapInterface->objectFactory().
+                    create<SituationMap::SingleFire>(QLatin1String("AES"), QLatin1String("SingleFireId"));
+
+  if (!d->m_singleFire)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_singleFire->setIdentifier(QLatin1String("ChargeEffect-OutLined"));
+
+  d->m_singleFire->setVisibility(d->m_visibility);
+  d->m_singleFire->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_singleFire->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_singleFire->setSelected(d->m_selected);
+
+  d->m_singleFire->setPartyId(3);  // Will overwrite line/fillcolor
+
+
+  // set additional values:
+
+  QPointF offset = QPointF(84000, 77000);
+  Point3D origin = Point3D::fromQPointF(s_basePoint.geographic(offset + QPointF()));
+  qWarning() << LOGFUNCTION <<" origin "<< origin.toPointF();
+  //QPointF origin = s_basePoint.geographic(d->m_objectBasePoint + QPointF(155000, 155000));
+
+  d->m_singleFire->setOrigin(/*Point3D::fromQPointF*/(origin));
+  d->m_singleFire->setRadius(300);
+
+  d->m_singleFire->setImpactOrigin(d->m_singleFire->origin());
+
+  d->m_singleFire->setAesState(AesEffectState::Created);
+
+  bool success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " SingleFire dump: " << (*d->m_singleFire) << std::endl;
+
+
+  // QTimer *timer = new QTimer(this);
+  // connect(timer, &QTimer::timeout, this, &FunctionDialog::onChargeEffectUpdate);
+  // timer->setSingleShot(true);
+  // timer->start(2000);
+}
+
+void FunctionDialog::onChargeEffectUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_singleFire)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  // move
+  //QPointF offset = QPointF(80000, 80000);
+  //Point3D origin = Point3D::fromQPointF(s_basePoint.geographic(offset + QPointF()));
+  //QPointF origin = s_basePoint.geographic(d->m_singleFire->origin().toPointF() + QPointF(50, 50));
+
+  //d->m_singleFire->setOrigin(origin);
+  d->m_singleFire->setRadius(500);
+  d->m_singleFire->setImpactOrigin(d->m_singleFire->origin());
+
+  d->m_singleFire->setPartyId(4);  // Will overwrite line/fillcolor
+  d->m_singleFire->setAesState(AesEffectState::Activated); // created, Prepared, Activated
+
+  bool success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+}
+
+void FunctionDialog::onBoobyTrapCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_virtualSingleMineAgent));
+
+  d->m_virtualSingleMineAgent = d->m_mapInterface->objectFactory().
+                      create<SituationMap::NuclearAgent>(QLatin1String("AES"), QLatin1String("NuclearAgentId"));
+
+  if (!d->m_virtualSingleMineAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_virtualSingleMineAgent->setIdentifier(QLatin1String("virtualSingleMine-OutLined"));
+
+  d->m_virtualSingleMineAgent->setVisibility(d->m_visibility);
+  d->m_virtualSingleMineAgent->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_virtualSingleMineAgent->setVisibility(SituationMap::ObjectAppearance::Tactical,  false);
+
+  d->m_virtualSingleMineAgent->setSelected(d->m_selected);
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(90000, 80000);
+
+  int extent = 1000;
+
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(3 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(3 * extent, -3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, -3 * extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_virtualSingleMineAgent->setPositions(posCont);
+
+  d->m_virtualSingleMineAgent->setAesState(AesEffectState::Paused);
+
+  const SituationMap::PartyIdToColorFunctor::PartyData pData1(QStringLiteral("P1"),
+                                                             AdvancedSymbology::Role::HostileFaker,
+                                                             Qt::blue, Qt::blue);
+  d->m_mapInterface->partyIdToColorFunctor().setParty(1, pData1);
+
+  SituationMap::PositionCont subLine1;
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(1 * extent, -1 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(1 * extent, -3 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(+5 * extent, -3 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(+5 * extent, -1 * extent)));
+
+
+  NuclearAgent::OptionalData optData;
+  optData.closed = true;
+  optData.lineStyle = QSharedPointer<LineStyle>(new LineStyle(Qt::red, 5, LinePattern::DashDot));
+  optData.fillStyle = QSharedPointer<FillStyle>(new FillStyle(Qt::red, FillPattern::DiagonalCross));
+  d->m_virtualSingleMineAgent->setSubsidiaryLine(0, subLine1, optData);
+
+//  SituationMap::PositionCont subLine2;
+//  appendQPointF(subLine2, s_basePoint.geographic(offset + QPointF(-1.7 * extent, 2 * extent)));
+//  appendQPointF(subLine2, s_basePoint.geographic(offset + QPointF(+1.7 * extent, 2 * extent)));
+//  d->m_virtualSingleMineAgent->setSubsidiaryLine(1, subLine2, false);
+
+
+  bool success = d->m_virtualSingleMineAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_virtualSingleMineAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " Virtual Single Mine dump: " << (*d->m_virtualSingleMineAgent) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onBoobyTrapUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+
+}
+
+void FunctionDialog::onBoobyTrapUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_virtualSingleMineAgent)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  // move
+  //QPointF offset(d->m_virtualSingleMineAgent->positions().value(0).toPointF() + QPointF(1000, 1000));
+
+  QPointF offset = d->m_objectBasePoint + QPointF(90000, 80000);
+  qDebug() << LOGFUNCTION << " update values.." ;
+
+  SituationMap::PositionCont posCont;
+
+  int extent = 1000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(3 * extent, 3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(3 * extent, -3 * extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(-1 * extent, -3 * extent)));
+
+
+  d->m_virtualSingleMineAgent->setPositions(posCont);
+
+  d->m_virtualSingleMineAgent->removeSubsidiaryLines();
+
+  d->m_virtualSingleMineAgent->setAesState(AesEffectState::Activated);
+
+  //d->m_virtualSingleMineAgent->setPartyId(5);  // Will overwrite line/fillcolor
+
+  const SituationMap::PartyIdToColorFunctor::PartyData pData1(QStringLiteral("P1"),
+                                                             AdvancedSymbology::Role::HostileFaker,
+                                                             Qt::blue, Qt::blue);
+  d->m_mapInterface->partyIdToColorFunctor().setParty(3, pData1);
+
+  SituationMap::PositionCont subLine1;
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(1 * extent, -1 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(1 * extent, -3 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(+5 * extent, -3 * extent)));
+  appendQPointF(subLine1, s_basePoint.geographic(offset + QPointF(+5 * extent, -1 * extent)));
+
+
+  NuclearAgent::OptionalData optData;
+  optData.closed = true;
+  d->m_virtualSingleMineAgent->setSubsidiaryLine(0, subLine1, optData);
+
+  bool success = d->m_virtualSingleMineAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_virtualSingleMineAgent->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+
+void FunctionDialog::onSingleFireCreate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_singleFire));
+
+  d->m_singleFire = d->m_mapInterface->objectFactory().
+                    create<SituationMap::SingleFire>(QLatin1String("AES"), QLatin1String("SingleFireId"));
+
+  if (!d->m_singleFire)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_singleFire->setIdentifier(QLatin1String("SingleFire-OutLined"));
+
+  d->m_singleFire->setVisibility(d->m_visibility);
+  d->m_singleFire->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_singleFire->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_singleFire->setSelected(d->m_selected);
+
+  d->m_singleFire->setPartyId(3);  // Will overwrite line/fillcolor
+
+
+  // set additional values:
+  QPointF origin = s_basePoint.geographic(d->m_objectBasePoint + QPointF(155000, 155000));
+
+  d->m_singleFire->setOrigin(Point3D::fromQPointF(origin));
+  d->m_singleFire->setRadius(100);
+
+  d->m_singleFire->setImpactOrigin(d->m_singleFire->origin());
+
+  d->m_singleFire->setAesState(AesEffectState::Paused);
+
+  bool success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " SingleFire dump: " << (*d->m_singleFire) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onSingleFireUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+}
+
+void FunctionDialog::onSingleFireUpdate()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (!d->m_singleFire)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  // move
+  QPointF origin = s_basePoint.geographic(d->m_singleFire->origin().toPointF() + QPointF(50, 50));
+
+  d->m_singleFire->setOrigin(Point3D::fromQPointF(origin));
+  d->m_singleFire->setRadius(250);
+  d->m_singleFire->setImpactOrigin(d->m_singleFire->origin());
+
+//  d->m_singleFire->setPartyId(4);  // Will overwrite line/fillcolor
+  d->m_singleFire->setAesState(AesEffectState::Activated); // created, Prepared, Activated
+
+  bool success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_singleFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+}
+
+void FunctionDialog::onShowBasePoint()
+{
+  qDebug() << LOGFUNCTION ;
+
+  if (d->m_basePoint)
+  {
+    qDebug() << LOGFUNCTION << " already exists";
+    return;
+  }
+
+  // create and set debugInfo for debugging:
+  d->m_basePoint = d->m_mapInterface->objectFactory().
+                   create<SituationMap::Polyline>(QLatin1String("AES"), QLatin1String("BasePointPolygon"));
+
+  if (!d->m_basePoint)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+
+  d->m_basePoint->setIdentifier(QLatin1String("BasePoint\n SimCoord = 0,0"));
+
+  d->m_basePoint->rLineStyle().setLineColor(Qt::red);
+  d->m_basePoint->rLineStyle().setLineWidth(8);
+
+  PositionCont posCont;
+  appendQPointF(posCont, QPointF(0, 0));
+  appendQPointF(posCont, d->m_mapImpl->centerPoint());
+
+  d->m_basePoint->setPositions(posCont);
+
+  bool success = d->m_basePoint->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+
+  std::cout << " m_basePoint dump: " << (*d->m_basePoint) << std::endl;
+}
+
+void FunctionDialog::onShowPolizei()
+{
+  onRemoveAll();
+
+  QString layername = d->m_mapInterface->layerFactory().basemapLayernamePrefix();
+  layername += QLatin1String("0");
+
+  LayerParameter lp = d->m_mapInterface->layerFactory().layerParameter(layername);
+  lp.opacity = 20;
+  d->m_mapInterface->layerFactory().setLayerParameter(layername, lp);
+
+
+  // Bld
+  {
+    RefPointer<SituationMap::BuildingOutline> building;
+
+    building = d->m_mapInterface->objectFactory().
+        create<SituationMap::BuildingOutline>(QLatin1String("AES"), QLatin1String("BuildingOutlineId2"));
+
+    if (!building)  { qDebug() << LOGFUNCTION << " no object"; return; }
+
+    building->setIdentifier(QLatin1String("Building"));
+
+    building->setVisibility(true);
+    building->setVisibility(SituationMap::ObjectAppearance::Technical, true);
+    building->setVisibility(SituationMap::ObjectAppearance::Tactical,  true);
+
+
+    building->rTextStyle().setTextColor(Qt::magenta);
+    building->rTextStyle().setSize(30);
+    building->rTextStyle().setAntiAliased(true);
+    building->rTextStyle().setHorizontalAlignment(HorizontalAlignment::Left);
+    building->rTextStyle().setVerticalAlignment(VerticalAlignment::BaseLine);
+    building->rTextStyle().setTextOutlineWidth(0);
+
+
+    // set additional values:
+    SituationMap::PositionCont posCont;
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93076.8, 78331.8)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93070.9, 78325.0)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93064.0, 78331.0)));
+    appendQPointF(posCont, s_basePoint.geographic(QPointF(93069.9, 78337.8)));
+
+    building->setPositions(posCont);
+
+    bool success = building->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+
+  }
+
+
+  static bool single = true;
+  single = !single;
+
+  const QColor participantColor(41, 76, 56);
+
+  QPointF shooterOrigin = s_basePoint.geographic(QPointF(93072, 78344));
+  QPointF targetOrigin  = s_basePoint.geographic(QPointF(92927, 78333));
+
+  // part0 - shooter
+  {
+    RefPointer<SituationMap::Participant> participant = d->m_mapInterface->objectFactory().
+        create<SituationMap::Participant>(QLatin1String("Participants"), QLatin1String("ParticipantShooter"));
+
+    participant->setOrigin(Point3D::fromQPointF(shooterOrigin));
+
+    participant->setTextModifier(Participant::TextModifier::M_HigherFormation,    QLatin1String("Amok"));
+    participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation,  QLatin1String(""));
+
+    SymbolData symData;
+    symData.sidc  = QStringLiteral("ETS_Zivil_Person");
+    symData.color = Qt::cyan; // Will be overwritten via partyId.
+
+    participant->setSymbol(symData);
+    participant->setPartyId(3);
+    participant->forcePartyColor(Qt::gray);
+    participant->setScale(1.0);
+
+    bool success = participant->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+
+  // part1 - target
+  {
+    RefPointer<SituationMap::Participant> participant = d->m_mapInterface->objectFactory().
+        create<SituationMap::Participant>(QLatin1String("Participants"), QLatin1String("ParticipantPolizei111"));
+
+    participant->setOrigin(Point3D::fromQPointF(targetOrigin));
+
+    participant->setTextModifier(Participant::TextModifier::M_HigherFormation,    QLatin1String("Schupo"));
+    participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation,  QLatin1String("FuStw.1"));
+
+    SymbolData symData;
+    if (single)
+      symData.sidc  = QStringLiteral("ETS_Polizei_PKW");
+    else
+      symData.sidc  = QStringLiteral("ETS_Polizei_FueKraft");
+    symData.color = Qt::cyan; // Will be overwritten via partyId.
+
+    participant->setSymbol(symData);
+    participant->setPartyId(3);
+    participant->forcePartyColor(participantColor);
+    if (single)
+      participant->setScale(1.0);
+    else
+      participant->setScale(2.0);
+
+    bool success = participant->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+
+  if (single)
+  {
+    // part2
+    {
+      RefPointer<SituationMap::Participant> participant = d->m_mapInterface->objectFactory().
+          create<SituationMap::Participant>(QLatin1String("Participants"), QLatin1String("ParticipantPolizei222"));
+
+      QPointF origin =  s_basePoint.geographic(QPointF(92936, 78368));
+      participant->setOrigin(Point3D::fromQPointF(origin));
+
+      participant->setTextModifier(Participant::TextModifier::M_HigherFormation,    QLatin1String("Schupo"));
+      participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation,  QLatin1String("Wm.1"));
+
+      SymbolData symData;
+      symData.sidc  = QStringLiteral("ETS_Polizei_Person");
+      symData.color = Qt::cyan; // Will be overwritten via partyId.
+      symData.size  = 1.0;
+
+      participant->setSymbol(symData);
+      participant->setPartyId(3);
+      participant->forcePartyColor(participantColor);
+      participant->setScale(1.0);
+
+      bool success = participant->updateView();
+      qWarning() << LOGFUNCTION  << " success=" << success;
+    }
+
+    // part3
+    {
+      RefPointer<SituationMap::Participant> participant = d->m_mapInterface->objectFactory().
+          create<SituationMap::Participant>(QLatin1String("Participants"), QLatin1String("ParticipantPolizei222"));
+
+      QPointF origin =  s_basePoint.geographic(QPointF(92944, 78393));
+      participant->setOrigin(Point3D::fromQPointF(origin));
+
+      participant->setTextModifier(Participant::TextModifier::M_HigherFormation,    QLatin1String("Schupo"));
+      participant->setTextModifier(Participant::TextModifier::T_UniqueDesignation,  QLatin1String("Wm.2"));
+
+      SymbolData symData;
+      symData.sidc  = QStringLiteral("ETS_Polizei_Person");
+      symData.color = Qt::cyan; // Will be overwritten via partyId.
+      symData.size  = 1.0;
+
+      participant->setSymbol(symData);
+      participant->setPartyId(3);
+      participant->forcePartyColor(participantColor);
+      participant->setScale(1.0);
+
+      bool success = participant->updateView();
+      qWarning() << LOGFUNCTION  << " success=" << success;
+    }
+  }
+
+  // hitline
+  {
+    RefPointer<SituationMap::HitLine> hitLine;
+    hitLine = d->m_mapInterface->objectFactory().
+              create<SituationMap::HitLine>(QLatin1String("Participants"), QLatin1String("HitLineId"));
+
+    if (!hitLine) { qDebug() << LOGFUNCTION << " no object"; return; }
+
+    hitLine->setDrawOrder(11);
+    hitLine->setVisibility(SituationMap::ObjectAppearance::Technical, true);
+    hitLine->setVisibility(SituationMap::ObjectAppearance::Tactical, false);
+
+    hitLine->setIdentifier(QLatin1String("M16"));
+
+    hitLine->rLineStyle().setLineColor(Qt::green);
+    hitLine->rLineStyle().setLineWidth(3);
+
+    hitLine->setStartAndEndPoint(Point3D::fromQPointF(shooterOrigin),
+                                 Point3D::fromQPointF(targetOrigin));
+
+    bool success = hitLine->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+
+  // Area
+  {
+    RefPointer<FunctionalArea> functionalArea = d->m_mapInterface->objectFactory().
+        create<SituationMap::FunctionalArea>(QLatin1String("AES"), QLatin1String("FunctionalAreaId"));
+
+    if (!functionalArea) { qDebug() << LOGFUNCTION << " no object"; return; }
+
+    functionalArea->setIdentifier(QLatin1String("Medical"));
+    functionalArea->rTextStyle().setTextColor(Qt::red);
+    functionalArea->rTextStyle().setTextOutlineWidth(0);
+
+    functionalArea->setVisibility(d->m_visibility);
+    functionalArea->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+    functionalArea->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+    functionalArea->setLineStyle(LineStyle(Qt::red, 2, LinePattern::Solid));
+    functionalArea->setFillStyle(FillStyle(Qt::red, FillPattern::ForwardDiagonal));
+
+    SituationMap::PositionCont posCont;
+    QPointF offset(92850, 78250);
+
+    int extent = 25;
+    appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,      0)));
+    appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent, extent)));
+    appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,      extent)));
+    appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(0,           0)));
+
+    functionalArea->setPositions(posCont);
+
+    bool success = functionalArea->updateView();
+    qWarning() << LOGFUNCTION  << " success=" << success;
+  }
+
+}
+
+void FunctionDialog::onObjectIndicator()
+{
+  qCritical() << LOGFUNCTION << " START";
+
+  d->m_mapInterface->objectIndicator().setMapObjectToPointTo(0);
+}
+
+void FunctionDialog::onMeasureLength()
+{
+  qDebug() << LOGFUNCTION ;
+  d->m_mapInterface->measurement().measureLength();
+}
+
+void FunctionDialog::onStartLocationDisplay()
+{
+  qCritical() << LOGFUNCTION ;
+  QPointF center = d->m_mapInterface->centerPoint();
+  d->m_mapInterface->locationDisplay().setCurrentLocation(Point3D::fromQPointF(center));
+  d->m_mapInterface->locationDisplay().start();
+}
+
+void FunctionDialog::onStopLocationDisplay()
+{
+  d->m_mapInterface->locationDisplay().stop();
+}
+
+void FunctionDialog::onLoadFile()
+{
+  qCritical() << LOGFUNCTION << " AAAAAAAAAA";
+
+  {
+    QString filePath(QLatin1String("/tmp/Observer1Reference.tif"));
+
+    Esri::ArcGISRuntime::Raster *isr = new Esri::ArcGISRuntime::Raster(filePath, this);
+    if (!isr)
+    {
+      qCritical() << LOGFUNCTION << " isr failed";
+      return;
+    }
+
+    Esri::ArcGISRuntime::RasterLayer *rl = new Esri::ArcGISRuntime::RasterLayer(isr, this);
+    if (!rl)
+    {
+      qCritical() << LOGFUNCTION << " rl failed";
+      return;
+    }
+
+
+    connect(rl, &Esri::ArcGISRuntime::RasterLayer::errorOccurred, this, [] (const Esri::ArcGISRuntime::Error &error) {
+      qCritical() << LOGFUNCTION << " EsriError occured: " << toString(error);
+    });
+
+    qCritical() << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << d->m_mapImpl->getEsriMap()->operationalLayers()->size();
+    d->m_mapImpl->getEsriMap()->operationalLayers()->append(rl);
+    qCritical() << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << d->m_mapImpl->getEsriMap()->operationalLayers()->size();
+
+
+    connect(rl, &Esri::ArcGISRuntime::RasterLayer::loadStatusChanged,  this, [] (Esri::ArcGISRuntime::LoadStatus loadStatus) {
+      qCritical() << LOGFUNCTION << " loadStatus=" << (int)loadStatus;
+    });
+
+
+    rl->load();
+  }
+}
+
+#ifdef USE_LOCAL_SERVER
+void FunctionDialog::onStartLocalService()
+{
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (!pb)
+    return;
+
+
+
+  SituationMap::LocalServer *localServer = SituationMap::LocalServer::instance();
+
+  connect(localServer, &LocalServer::localServerStatusChanged, pb, [localServer, pb] () {
+    if (localServer->isLocalServerStarted())
+      pb->setStyleSheet(QLatin1String("QPushButton {background-color: green;}"));
+    else if (localServer->isLocalServerStopped())
+      pb->setStyleSheet(QLatin1String("QPushButton {background-color: gray;}"));
+  });
+
+  connect(localServer, &LocalServer::localGeoprocessingServiceStarted, this, [this] (const QString &serviceName, const LocalServiceData &svcData) {
+    qCritical() << LOGFUNCTION
+                << " :-) service started: '" << serviceName << "'"
+                << " url: '" << svcData.svcUrl().toString() << "'"
+                << " sync: " << svcData.isSync();
+    d->m_mapImpl->viewshed().setViewshedUrl(svcData.svcUrl().toString());
+  });
+
+
+  // starts LocalServer (and pending GPSsvc, which are none yet.)
+  localServer->start();
+}
+
+void FunctionDialog::onStopLocalService()
+{
+  SituationMap::LocalServer *localServer = SituationMap::LocalServer::instance();
+  localServer->stop();
+}
+
+void FunctionDialog::onStartViewshedSvc()
+{
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (!pb)
+    return;
+
+  SituationMap::LocalServer *localServer = SituationMap::LocalServer::instance();
+  const QString viewshedSvcName(QLatin1String("Viewshed"));
+  localServer->setLocalGeoprocessingService(viewshedSvcName,
+                                            QLatin1String("/shd/CTC/TOOLS/arcgis/EsriJebu/LegatusBremen201803151510.gpk"),
+                                            QLatin1String("Viewshed2Feature"),
+                                            true);
+  localServer->startLocalGeoprocessingService(viewshedSvcName);
+
+  connect(localServer, &LocalServer::localGeoprocessingServiceStatusChanged, this, [localServer, pb] (const QString &serviceName) {
+    if (localServer->isLocalGeoprocessingServiceStarted(serviceName))
+      pb->setStyleSheet(QLatin1String("QPushButton {background-color: green;}"));
+    else if (localServer->isLocalGeoprocessingServiceStopped(serviceName))
+      pb->setStyleSheet(QLatin1String("QPushButton {background-color: gray;}"));
+  });
+}
+
+void FunctionDialog::onStopViewshedSvc()
+{
+  SituationMap::LocalServer *localServer = SituationMap::LocalServer::instance();
+  const QString viewshedSvcName(QLatin1String("Viewshed"));
+  localServer->stopLocalGeoprocessingService(viewshedSvcName);
+}
+
+
+void FunctionDialog::onViewshedInteractive()
+{
+  d->m_mapInterface->viewshed().create();
+}
+
+void FunctionDialog::onViewshed()
+{
+  static long viewshedId = -1;
+
+  if (viewshedId >= 0)
+    d->m_mapInterface->viewshed().remove(viewshedId);
+
+  // GP-based:
+  QPointF viewshedPoint = d->m_mapInterface->centerPoint();
+  int distance = 523;  //meter
+
+
+  if (d->m_viewshedDistance)
+  {
+    bool ok = false;
+    int localDis = d->m_viewshedDistance->text().toInt(&ok);
+    if (ok)
+      distance= localDis;
+  }
+
+  ViewshedParameter viewshedParameter;
+  viewshedParameter.viewshedOrigin_latLon = viewshedPoint;
+  viewshedParameter.outerRadius = distance;
+  viewshedParameter.observerHeight = 15;
+
+  viewshedId = d->m_mapInterface->viewshed().create(viewshedParameter);
+  qDebug() << LOGFUNCTION
+//           << " viewshedParameter =" << viewshedParameter;
+           << " center =" << viewshedPoint
+           << " distance =" << distance;
+}
+
+#endif // USE_LOCAL_SERVER
+
+void FunctionDialog::onSightFan()
+{
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapInterface);
+
+  SituationMap::RB::RubberbandEllipse *rubberband = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandEllipse>(this);
+  if (rubberband)
+  {
+    rubberband->setAutoDelete(true);
+    rubberband->constrainQuadratic(true);
+    rubberband->constrainOrthogonal(true);
+    rubberband->enableSector(true);
+
+    static SituationMap::RefPointer<SituationMap::SightFan> sightFan;
+    static QString                                          toolLayerName;
+
+    if (toolLayerName.isEmpty())
+    {
+      toolLayerName = d->m_mapImpl->layerFactory().toolLayer();
+    }
+
+    if (nullptr == sightFan.get())
+    {
+      connect( d->m_sightFanObserverHeight, &QLineEdit::textEdited, this, [this](const QString&)
+      {
+        if (nullptr == sightFan.get()) return;
+        sightFan->setCenterHat(d->m_sightFanObserverHeight->text().toDouble());
+        sightFan->show();
+      });
+
+      connect(d->m_sightFanTargetHeight, &QLineEdit::textEdited, this, [this](const QString&)
+      {
+        if (nullptr == sightFan.get()) return;
+        sightFan->setObjectHat(d->m_sightFanTargetHeight->text().toDouble());
+        sightFan->show();
+      });
+    }
+
+
+    std::function<bool(SituationMap::RB::RubberbandBase*)> updateSightFan = [this](SituationMap::RB::RubberbandBase* rbBase) -> bool
+    {
+      SituationMap::RB::RubberbandEllipse *rubberElli = dynamic_cast<SituationMap::RB::RubberbandEllipse*>(rbBase);
+      if (rubberElli)
+      {
+        QPointF      center;
+        double       diameter;
+        double       dummy;
+        QPointF      direction;
+        double       observerHeight = d->m_sightFanObserverHeight->text().toDouble();
+        double       targetHeight   = d->m_sightFanTargetHeight->text().toDouble();
+
+        rubberElli->rectangleParameter(center, diameter, dummy, direction);
+
+        if (diameter > 0.0)
+        {
+          double       startAngle = 0.0;
+          double       dAngle     = 2.0 / 180.0*MathConst::pi;
+          unsigned int noBeams    = 180;
+          double       radius     = diameter * 0.5;
+
+          if (rubberElli->hasSector())
+          {
+            startAngle = SituationMap::MathUtils::getMathAngle(rubberElli->sectorStart());
+            double endAngle = SituationMap::MathUtils::getMathAngle(rubberElli->sectorEnd());
+
+            noBeams = ceil(((startAngle > endAngle) ? (endAngle - startAngle + MathConst::pi_two) :(endAngle - startAngle)) / dAngle);
+          }
+
+          if (nullptr == sightFan.get())
+          {
+            SituationMap::ObjectFactory  &objFac = d->m_mapInterface->objectFactory();
+
+            sightFan = objFac.create<SituationMap::SightFan>(toolLayerName);
+            if (sightFan)
+            {
+              sightFan->initFan(center, observerHeight, targetHeight, radius, radius / 1000.0, startAngle, dAngle, noBeams, 1.0);
+            }
+          }
+          else
+          {
+            sightFan->setInnerRadius(radius / 1000.0);
+            sightFan->setRadius(radius);
+            sightFan->setStartAngle(startAngle);
+            sightFan->setNoOfFans(noBeams);
+            sightFan->move(center);
+          }
+        }
+      }
+      return true;
+    }; // std::function<bool(SituationMap::RB::RubberbandBase*)>
+
+    rubberband->installExternalUpdate(updateSightFan);
+
+    QObject::connect(rubberband, &SituationMap::RB::Rubberband::apply, this, [this](SituationMap::RB::RubberbandBase *rubberband)
+    {
+      if (nullptr != sightFan.get())
+      {
+        sightFan->removeMySelf();
+        sightFan = nullptr;
+      }
+
+      SituationMap::RB::RubberbandEllipse *rubberElli = dynamic_cast<SituationMap::RB::RubberbandEllipse*>(rubberband);
+      if (rubberElli)
+      {
+        SituationMap::ObjectFactory  &objFac = d->m_mapInterface->objectFactory();
+
+        sightFan = objFac.create<SituationMap::SightFan>(toolLayerName);
+
+        if (sightFan)
+        {
+          QPointF      center = rubberElli->centerPoint();
+          double       diameter;
+          double       dummy;
+          QPointF      direction;
+          double       startAngle = 0.0;
+          double       dAngle = 2.0 / 180.0*MathConst::pi;
+          unsigned int noBeams = 180;
+
+          double       observerHeight = d->m_sightFanObserverHeight->text().toDouble();
+          double       targetHeight = d->m_sightFanTargetHeight->text().toDouble();
+
+          rubberElli->rectangleParameter(center, diameter, dummy, direction);
+
+          if (rubberElli->hasSector())
+          {
+            startAngle = SituationMap::MathUtils::getMathAngle(rubberElli->sectorStart());
+            double endAngle = SituationMap::MathUtils::getMathAngle(rubberElli->sectorEnd());
+
+            noBeams = floor((endAngle - startAngle) / dAngle);
+          }
+
+          double radius = diameter * 0.5;
+
+          sightFan->initFan(center, observerHeight, targetHeight, radius, radius / 1000.0, startAngle, dAngle, noBeams, 1.0);
+
+          SituationMap::RB::RubberbandPointFeature *moveRB = d->m_mapInterface->rubberbandFactory().create<SituationMap::RB::RubberbandPointFeature>(this);
+          if (moveRB)
+          {
+            moveRB->setAutoDelete(true);
+            moveRB->enableModificationState();
+            moveRB->setCoordinateVector( QVector<QPointF>() << sightFan->center() );
+
+            std::function<bool(SituationMap::RB::RubberbandBase*)> moveSightFan = [](SituationMap::RB::RubberbandBase* rbBase) -> bool
+            {
+              SituationMap::RB::RubberbandPointFeature *rubberPFeat = dynamic_cast<SituationMap::RB::RubberbandPointFeature*>(rbBase);
+              if (rubberPFeat && sightFan)
+              {
+                const QPointF & loc = rubberPFeat->singleCoordinate();
+                sightFan->move(loc);
+              }
+              return true;
+            };
+
+            moveRB->installExternalUpdate(moveSightFan);
+          }
+        }
+      }
+    });
+
+    QObject::connect(rubberband, &SituationMap::RB::Rubberband::abort, this, [this](SituationMap::RB::RubberbandBase *rubberband)
+    {
+      if (nullptr != sightFan.get())
+      {
+        sightFan->removeMySelf();
+        sightFan = nullptr;
+      }
+
+      onRubberbandAbort(rubberband);
+    });
+  }
+} // void FunctionDialog::onSightFan()
+
+
+void FunctionDialog::onViewshedSightFan()
+{
+  static long sightFanId = -1;
+
+  if (sightFanId >= 0)
+  {
+    d->m_mapInterface->viewshed().remove(sightFanId);
+  }
+
+  Viewshed &viewshed = d->m_mapInterface->viewshed();
+  sightFanId = viewshed.create(100.0, 1.8, 1.8, 2.5, 1.0);
+
+} // void FunctionDialog::onViewshedSightFan()
+
+
+void FunctionDialog::onLoadPlan()
+{
+  qDebug() << LOGFUNCTION ;
+
+  OverlayHandler &overlayHandler = d->m_mapInterface->overlayHandler();
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  QString name = pb->property("name").toString();
+
+  if (name.isEmpty())
+  {
+    qWarning() << LOGFUNCTION << " no name";
+    return;
+  }
+
+  QFile file(QStringLiteral("/tmp/") + name);
+  if (!file.open((QIODevice::ReadOnly | QIODevice::Text)))
+  {
+    qWarning() << LOGFUNCTION << " file open failed";
+    return;
+  }
+  const QByteArray overlayContent = file.readAll();
+
+  qWarning() << LOGFUNCTION << " overlayContent.size()='" << overlayContent.size() << "'";
+  qWarning() << LOGFUNCTION << " overlayContent='" << overlayContent << "'";
+
+  int key = pb->property("key").toInt();
+  overlayHandler.setOverlay(key, QStringLiteral("OverlayDisplayname"), overlayContent);
+  overlayHandler.setMinScale(key, 500000);   // limiting zoomOut
+  overlayHandler.setMaxScale(key,  20000);   // limiting zoomIn
+
+}
+
+void FunctionDialog::onOverlayVisiChanged(bool checked)
+{
+  qDebug() << LOGFUNCTION;
+
+  QCheckBox *cb = qobject_cast<QCheckBox *>(sender());
+  if (! cb)
+  {
+    qWarning() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  int key = cb->property("key").toInt();
+  OverlayHandler &overlayHandler = d->m_mapInterface->overlayHandler();
+  overlayHandler.setOverlayVisibility(key, checked);
+}
+
+void FunctionDialog::onRemovePlan()
+{
+  qDebug() << LOGFUNCTION;
+
+  OverlayHandler &overlayHandler = d->m_mapInterface->overlayHandler();
+
+  QString filename;
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  filename = pb->text();
+
+  if (filename.isEmpty())
+  {
+    qWarning() << LOGFUNCTION << " no filename";
+    return;
+  }
+
+  int key = pb->property("key").toInt();
+  overlayHandler.removeOverlay(key);
+}
+
+void FunctionDialog::onRemoveAllPlans()
+{
+  qDebug() << LOGFUNCTION;
+
+  OverlayHandler &overlayHandler = d->m_mapInterface->overlayHandler();
+
+  qWarning() << LOGFUNCTION << " overlayCount =" << overlayHandler.overlayCount();
+  int nummberRemoved = overlayHandler.removeAllOverlays();
+  qWarning() << LOGFUNCTION << " removed =" << nummberRemoved;
+  qWarning() << LOGFUNCTION << " overlayCount =" << overlayHandler.overlayCount();
+}
+
+void FunctionDialog::onToPdf()
+{
+  qDebug() << LOGFUNCTION;
+
+  QString fileName = QDir::tempPath() + QLatin1String("/sitMap.pdf");
+
+  d->m_mapInterface->toPdf(fileName,
+                           QLatin1String("ScreenshotTitle"),
+                           QLatin1String("Uebung: Test"),
+                           QLatin1String("Benutzer: Norbert"),
+                           QLatin1String("2016-01-01 - 10:11:12"));
+
+  qWarning() << LOGFUNCTION << " pdf written to '" << fileName << "'";
+
+}
+
+
+void FunctionDialog::onAreaFireCreate()
+{
+  qDebug() << LOGFUNCTION ;
+  // create and set debugInfo for debugging:
+  d->clearMapObjectPtr(RefPointer<AbstractMapObject>(d->m_areaFire));
+
+  d->m_areaFire = d->m_mapInterface->objectFactory().
+                  create<SituationMap::AreaFire>(QLatin1String("AES"), QLatin1String("AreaFireId"));
+
+  if (!d->m_areaFire)
+  {
+    qDebug() << LOGFUNCTION << " no object";
+    return;
+  }
+
+  d->m_areaFire->setIdentifier(QLatin1String("AreaFire-OutLined"));
+
+  d->m_areaFire->setVisibility(d->m_visibility);
+  d->m_areaFire->setVisibility(SituationMap::ObjectAppearance::Technical, d->m_visibilityTechn);
+  d->m_areaFire->setVisibility(SituationMap::ObjectAppearance::Tactical,  d->m_visibilityTact);
+
+  d->m_areaFire->setSelected(d->m_selected);
+
+  LineStyle lineStyle(Qt::red, 5, LinePattern::Solid);
+  FillStyle fillStyle(Qt::blue, FillPattern::Null);
+
+  d->m_areaFire->setLineStyle(lineStyle);
+  d->m_areaFire->setFillStyle(fillStyle);
+
+  d->m_areaFire->setPartyId(3);                          // Will overwrite line/fillcolor
+  d->m_areaFire->setAesState(AesEffectState::Unknown);   // != Unknown will overwrite fillPattern
+
+
+  // set additional values:
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(170000, 170000);
+
+  int extent = 100000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,     extent)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent / 2, extent / 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,     extent)));
+
+  std::cout << " posCont=" <<  posCont.size() << std::endl;
+
+  d->m_areaFire->setPositions(posCont);
+
+
+  posCont.removeAt(3);
+  d->m_areaFire->setImpacts(posCont);
+
+  bool success = d->m_areaFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_areaFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  std::cout << " AreaFire dump: " << (*d->m_areaFire) << std::endl;
+
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, &QTimer::timeout, this, &FunctionDialog::onAreaFireUpdate);
+  timer->setSingleShot(true);
+  timer->start(2000);
+
+}
+
+void FunctionDialog::onAreaFireUpdate()
+{
+  if (!d->m_areaFire)
+  {
+    qDebug() << LOGFUNCTION << " no object anymore";
+    return;
+  }
+
+  d->m_areaFire->setIdentifier(d->m_areaFire->identifier() + QLatin1String("Update"));
+
+  d->m_areaFire->setPartyId(4);  // Will overwrite line/fillcolor
+  d->m_areaFire->setAesState(AesEffectState::Activated);   // != Unknown will overwrite fillPattern
+
+
+  SituationMap::PositionCont posCont;
+  QPointF offset = d->m_objectBasePoint + QPointF(170000, 170000);
+
+  int extent = 100000;
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent,          0)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(extent, extent * 2)));
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,     extent)));
+
+  appendQPointF(posCont, s_basePoint.geographic(offset + QPointF(     0,          0)));
+
+  d->m_areaFire->setPositions(posCont);
+
+  posCont.removeAt(1);
+  posCont.removeAt(3);
+  d->m_areaFire->setImpacts(posCont);
+
+  d->m_areaFire->setDrawOrder(10);
+
+  bool success = d->m_areaFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+  success = d->m_areaFire->updateView();
+  qWarning() << LOGFUNCTION  << " success=" << success;
+
+}
+
+
+void FunctionDialog::onDump()
+{
+  const QString &dump = d->m_mapImpl->toDumpString();
+  std::cout << dump << std::endl;
+
+  LtsCoordTrans::dumpConversionCounter();
+
+//  std::stringstream myLines;
+//  myLines.str(dump.toStdString());
+
+//  std::string line;
+//  {
+//    while(std::getline(myLines,line,'\n')){
+//      qCritical() << QString::fromStdString(line);
+//    }
+//  }
+}
+
+void FunctionDialog::onOverviewMap()
+{
+  OverviewMapHandler &omHdl = d->m_mapInterface->overviewMapHandler();
+
+  if (omHdl.builtInOverviewMapWidget())
+    omHdl.removeBuiltInOverviewMap();
+  else
+    omHdl.createBuiltInOverviewMap();
+}
+
+void FunctionDialog::onBackupOms()
+{
+  qDebug() << LOGFUNCTION << " START";
+  s_operatorMapSettings() = d->m_mapInterface->operatorMapSettings();
+
+  // json
+  QFile saveFile(QStringLiteral("/tmp/oms.json"));
+  if (!saveFile.open(QIODevice::WriteOnly)) {
+    qWarning("Couldn't open oms file.");
+    return;
+  }
+
+  saveFile.write(s_operatorMapSettings().toJson());
+  qCritical() << "wrote " << QFileInfo(saveFile).absoluteFilePath();
+  qCritical() << "oms.toJson()=" << s_operatorMapSettings().toJson();
+}
+
+void FunctionDialog::onRestoreOms()
+{
+  qDebug() << LOGFUNCTION << " START";
+
+//  bool success = d->m_mapInterface->restoreOperatorMapSettings(s_operatorMapSettings);
+//  qDebug() << LOGFUNCTION << " success=" << success;
+
+
+  // json
+  QFile loadFile(QStringLiteral("/tmp/oms.json"));
+  if (!loadFile.open(QIODevice::ReadOnly)) {
+    qWarning("Couldn't open oms file.");
+    return;
+  }
+
+  const QByteArray &ba = loadFile.readAll();
+  SituationMap::OperatorMapSettings oms;
+  if (oms.fromJson(ba))
+    qWarning("fromJson ok");
+  else
+    qWarning("fromJson failed");
+
+
+  bool success = d->m_mapInterface->restoreOperatorMapSettings(oms);
+  qDebug() << LOGFUNCTION << " success=" << success;
+
+}
+
+void FunctionDialog::onRemove()
+{
+  qDebug() << LOGFUNCTION << " START XXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+
+  if (d->m_polygon)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_polygon->debugInfo();
+    d->m_polygon->removeMySelf();
+    d->m_polygon.reset();
+  }
+  if (d->m_polyline)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_polyline->debugInfo();
+    d->m_polyline->removeMySelf();
+    d->m_polyline.reset();
+  }
+  if (d->m_text)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_text->debugInfo();
+    d->m_text->removeMySelf();
+    d->m_text.reset();
+  }
+//  if (d->m_mapObjectIndicator)
+//  {
+//    qDebug() << LOGFUNCTION << " " << d->m_mapObjectIndicator->debugInfo();
+//    d->m_mapObjectIndicator->removeMySelf();
+//    d->m_mapObjectIndicator.reset();
+//  }
+
+
+  if (d->m_participant)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_participant->debugInfo();
+    d->m_participant->removeMySelf();
+    d->m_participant.reset();
+  }
+
+  if (d->m_building)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_building->debugInfo();
+    d->m_building->removeMySelf();
+    d->m_building.reset();
+  }
+
+  if (d->m_bAgent)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_bAgent->debugInfo();
+    d->m_bAgent->removeMySelf();
+    d->m_bAgent.reset();
+  }
+
+  if (d->m_cAgent)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_cAgent->debugInfo();
+    d->m_cAgent->removeMySelf();
+    d->m_cAgent.reset();
+  }
+
+  if (d->m_dangerArea)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_dangerArea->debugInfo();
+    d->m_dangerArea->removeMySelf();
+    d->m_dangerArea.reset();
+  }
+
+  if (d->m_functionalArea)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_functionalArea->debugInfo();
+    d->m_functionalArea->removeMySelf();
+    d->m_functionalArea.reset();
+  }
+
+  if (d->m_geoImage)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_geoImage->debugInfo();
+    d->m_geoImage->removeMySelf();
+    d->m_geoImage.reset();
+  }
+
+  if (d->m_areaFire)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_areaFire->debugInfo();
+    d->m_areaFire->removeMySelf();
+    d->m_areaFire.reset();
+  }
+
+  if (d->m_soundArea)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_soundArea->debugInfo();
+    d->m_soundArea->removeMySelf();
+    d->m_soundArea.reset();
+  }
+
+  if (d->m_hitLine)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_hitLine->debugInfo();
+    d->m_hitLine->removeMySelf();
+    d->m_hitLine.reset();
+  }
+
+  if (d->m_mine)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_mine->debugInfo();
+    d->m_mine->removeMySelf();
+    d->m_mine.reset();
+  }
+
+  if (d->m_mineField)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_mineField->debugInfo();
+    d->m_mineField->removeMySelf();
+    d->m_mineField.reset();
+  }
+
+  if (d->m_nuclearAgent)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_nuclearAgent->debugInfo();
+    d->m_nuclearAgent->removeMySelf();
+    d->m_nuclearAgent.reset();
+  }
+
+  if (d->m_singleFire)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_singleFire->debugInfo();
+    d->m_singleFire->removeMySelf();
+    d->m_singleFire.reset();
+  }
+
+  if (d->m_cube)
+  {
+    qDebug() << LOGFUNCTION << " " << d->m_cube->debugInfo();
+    d->m_cube->removeMySelf();
+    d->m_cube.reset();
+  }
+
+  qDebug() << LOGFUNCTION << " END   XXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+}
+
+void FunctionDialog::onRemoveAll()
+{
+  qDebug() << LOGFUNCTION << " START XXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+
+  onRemove();
+
+  qDebug() << LOGFUNCTION << " clear ObjectFactory";
+  d->m_mapImpl->objectFactory().clearObjects();
+
+  qDebug() << LOGFUNCTION << " END   XXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+}
+
+void FunctionDialog::onToggleGrid()
+{
+  bool gridOnOff = d->m_mapImpl->grid().isVisible();
+  d->m_mapImpl->grid().setVisible(!gridOnOff);
+
+  if (d->m_mapImpl->grid().isVisible())
+    d->m_pbGrid->setText(QLatin1String("Grid is ON "));
+  else
+    d->m_pbGrid->setText(QLatin1String("Grid is OFF"));
+}
+
+void FunctionDialog::onToggleVisibility()
+{
+  d->m_visibility = !d->m_visibility;
+  qDebug() << LOGFUNCTION << " visibility -> " << d->m_visibility;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_visibility)
+    pb->setText(QLatin1String("Visibility is ON "));
+  else
+    pb->setText(QLatin1String("Visibility is OFF"));
+
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+      mObj->setVisibility(d->m_visibility);
+      mObj->updateView();
+    }
+  }
+
+}
+
+void FunctionDialog::onToggleVisibilityTechn()
+{
+  d->m_visibilityTechn = !d->m_visibilityTechn;
+  qDebug() << LOGFUNCTION << " m_visibilityTechn -> " << d->m_visibilityTechn;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_visibilityTechn)
+    pb->setText(QLatin1String("VisiTechn is ON "));
+  else
+    pb->setText(QLatin1String("VisiTechn is OFF"));
+
+  ObjectAppearance oa = SituationMap::ObjectAppearance::Technical;
+  bool localVisi = d->m_visibilityTechn;
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+      mObj->setVisibility(oa, localVisi);
+      mObj->updateView();
+    }
+  }
+
+}
+
+void FunctionDialog::onToggleVisibilityTact()
+{
+  d->m_visibilityTact = !d->m_visibilityTact;
+  qDebug() << LOGFUNCTION << " m_visibilityTact -> " << d->m_visibilityTact;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_visibilityTact)
+    pb->setText(QLatin1String("VisiTact is ON "));
+  else
+    pb->setText(QLatin1String("VisiTact is OFF"));
+
+  ObjectAppearance oa = SituationMap::ObjectAppearance::Tactical;
+  bool localVisi = d->m_visibilityTact;
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+      mObj->setVisibility(oa, localVisi);
+      mObj->updateView();
+    }
+  }
+
+}
+
+void FunctionDialog::onToggleSelection()
+{
+  d->m_selected = !d->m_selected;
+  qDebug() << LOGFUNCTION << " m_selected -> " << d->m_selected;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_selected)
+    pb->setText(QLatin1String("Selection is ON "));
+  else
+    pb->setText(QLatin1String("Selection is OFF"));
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+      mObj->setSelected(d->m_selected);
+      mObj->updateView();
+    }
+  }
+
+}
+
+void FunctionDialog::onTogglePicking()
+{
+  d->m_pickable = !d->m_pickable;
+  qDebug() << LOGFUNCTION << " m_pickable -> " << d->m_pickable;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_pickable)
+    pb->setText(QLatin1String("Picking is ON "));
+  else
+    pb->setText(QLatin1String("Picking is OFF"));
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+      mObj->setPickable(d->m_pickable);
+      mObj->updateView();
+    }
+  }
+
+}
+
+void FunctionDialog::onToggleBoundingBox()
+{
+  qDebug() << LOGFUNCTION << " m_objectsWithBoundingBox=" << d->m_objectsWithBoundingBox;
+
+  QPushButton *pb = qobject_cast<QPushButton *>(sender());
+  if (! pb)
+    return;
+
+  if (d->m_objectsWithBoundingBox.isEmpty())
+    pb->setText(QLatin1String("BoundingBox is ON "));
+  else
+    pb->setText(QLatin1String("BoundingBox is OFF"));
+
+  // create or destroy?
+  if (d->m_objectsWithBoundingBox.isEmpty())
+  {
+    // create:
+
+    const auto objList = d->getObjList();
+    for (RefPointer<AbstractMapObject> mObj : objList)
+    {
+      if (mObj)
+      {
+        qDebug() << LOGFUNCTION << " " << mObj->debugInfo();
+        SituationMap::BoundingBox bbox;
+        mObj->boundingBox(bbox);
+
+        if (!bbox.isValid())
+        {
+          qWarning() << LOGFUNCTION << " bbox invalid, debugInfo=" << mObj->debugInfo()
+                     << " bbox=" << bbox.toString();
+          continue;
+        }
+
+        qDebug() << LOGFUNCTION
+                 << " debugInfo =" << mObj->debugInfo()
+                 << " bbox =" << bbox.toString();
+
+        RefPointer<SituationMap::Polygon> moPoly
+          = d->m_mapInterface->objectFactory().
+            create<SituationMap::Polygon>(QLatin1String("AES"),
+                                          QStringLiteral("BoundingBoxPrimitiveOf(%1)").arg(mObj->debugInfo()));
+
+        d->m_objectsWithBoundingBox.append(moPoly->uniqueMapId());
+
+        switch (bbox.extentType())
+        {
+        case SituationMap::BoundingBox::ExtentType::Sim:
+          moPoly->setPositions(bbox.positions());
+          break;
+        case SituationMap::BoundingBox::ExtentType::Pixel:
+        {
+          const QPointF pCenter = d->m_mapImpl->geoCoordinateToViewPortWindowPoint(bbox.center().toPointF());  // ToDo Check
+          SituationMap::BoundingBox pixelBox(SituationMap::BoundingBox::ExtentType::Pixel,
+                                             Point3D::fromQPointF(pCenter), bbox.width(), bbox.height());
+
+          const QList<QPointF> points({d->m_mapImpl->viewPortWindowPointToGeoCoordinate(pixelBox.topLeft().toPointF()),    // ToDo Check
+                                       d->m_mapImpl->viewPortWindowPointToGeoCoordinate(pixelBox.topRight().toPointF()),  // ToDo Check
+                                       d->m_mapImpl->viewPortWindowPointToGeoCoordinate(pixelBox.bottomRight().toPointF()),  // ToDo Check
+                                       d->m_mapImpl->viewPortWindowPointToGeoCoordinate(pixelBox.bottomLeft().toPointF())  // ToDo Check
+                                      });
+          SituationMap::PositionCont posContForCurrentScale = convert2D3D(points);
+
+          moPoly->setPositions(posContForCurrentScale);
+        }
+        break;
+        case SituationMap::BoundingBox::ExtentType::Undefined:
+        {
+          qWarning() << LOGFUNCTION << " bbox has no ExtentType, bbox=" << bbox.toString();
+        }
+
+        } //switch
+
+        moPoly->rLineStyle().setLineColor(Qt::magenta);
+        moPoly->updateView();
+      }
+    }
+
+  }
+  else
+  {
+    // destroy:
+
+    qDebug() << LOGFUNCTION << " m_objectsWithBoundingBox=" << d->m_objectsWithBoundingBox;
+    for (UniqueMapId id : qAsConst(d->m_objectsWithBoundingBox))
+    {
+      RefPointer<SituationMap::AbstractMapObject> moPoly
+        = d->m_mapInterface->objectFactory().get(id);
+      moPoly->removeMySelf();
+    }
+    d->m_objectsWithBoundingBox.clear();
+  }
+
+
+}
+
+void FunctionDialog::onToggleBB2()
+{
+  SituationMap::PositionCont posCont;
+  for (RefPointer<AbstractMapObject> mObj : d->getObjList())
+  {
+    if (!mObj)
+      continue;
+    qCritical() << LOGFUNCTION << " debugInfo" << mObj->debugInfo();
+
+    const QVector<Point3D> resultVec = MathUtils::GeometryEngine::buffer(mObj.get(), 100);
+
+
+    posCont.clear();
+    posCont.reserve(resultVec.size());
+    for (const Point3D &p : resultVec)
+      posCont.append(d->m_mapImpl->coordTranslationFunctor()->mapToGeographic(p));
+
+    RefPointer<SituationMap::Polygon> bb2Poly
+        = d->m_mapInterface->objectFactory().
+        create<SituationMap::Polygon>(QLatin1String("AES"),
+                                      QStringLiteral("BB2PrimitiveOf(%1)").arg(mObj->debugInfo()));
+
+    bb2Poly->setPositions(posCont);
+
+    bb2Poly->rLineStyle().setLineColor(Qt::magenta);
+    bb2Poly->updateView();
+  }
+}
+
+void FunctionDialog::onMapRotationChanged()
+{
+  float mapRotationDegree = d->getMapRotation();
+
+  double currrentRotation = d->m_mapImpl->rotation();
+
+  qDebug() << LOGFUNCTION
+           << " change from " << currrentRotation
+           << " to new " << mapRotationDegree;
+
+  d->m_mapImpl->setRotation(mapRotationDegree);
+}
+
+void FunctionDialog::onSymbolSizeChanged()
+{
+  float newScale = d->getScale();
+  qDebug() << LOGFUNCTION << " newScale " << newScale << " START";
+
+  QSlider *sl = qobject_cast<QSlider *>(sender());
+  if (! sl)
+    return;
+
+  sl->setToolTip(QStringLiteral("%1%").arg(newScale * 100));
+
+
+  d->m_mapInterface->setSymbolScale(newScale);
+
+//  Q_FOREACH (RefPointer<AbstractMapObject> mObj, d->getObjList())
+//  {
+//    if (mObj)
+//    {
+//      qDebug() << LOGFUNCTION  << " " << mObj->debugInfo();
+//      mObj->setScale(newScale);
+//      mObj->updateView();
+//    }
+//  }
+
+  qDebug() << LOGFUNCTION << " newScale " << newScale << " END";
+
+}
+
+void FunctionDialog::onSymbolOpacityChanged()
+{
+  float newOpacity = d->getSymbolOpacity();
+  qDebug() << LOGFUNCTION << " newOpacity " << newOpacity << " START";
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION  << " " << mObj->debugInfo();
+
+      Participant *part = dynamic_cast<Participant *>(mObj.get());
+
+      if (part)
+      {
+        part->setUserSymbolOpacity(newOpacity);
+        part->updateView();
+      }
+    }
+  }
+
+}
+
+void FunctionDialog::onDrawOrderChanged()
+{
+  int drawOrder = d->getDrawOrder();
+  qDebug() << LOGFUNCTION << " newDrawOrder " << drawOrder << " START";
+
+  std::cerr << LOGFUNCTION << " drawOrder = " << drawOrder << std::endl;
+
+  const auto objList = d->getObjList();
+  for (RefPointer<AbstractMapObject> mObj : objList)
+  {
+    if (mObj)
+    {
+      qDebug() << LOGFUNCTION  << " " << mObj->debugInfo();
+      mObj->setDrawOrder(drawOrder);
+      mObj->updateView();
+    }
+  }
+
+
+}
+
+
+void FunctionDialog::onMouseWindowPositionChanged(int x, int y)
+{
+  QString strWindow(QLatin1String("Screen: X = "));
+  strWindow.append(QString::number(x));
+  strWindow.append(QLatin1String(", Y = "));
+  strWindow.append(QString::number(y));
+
+  setMapPositionString(strWindow);
+
+} /* FunctionDialog::onMouseWindowPositionChanged */
+
+
+void FunctionDialog::onMouseMapPositionChanged(const Point3D &mapPos, bool isValid)
+{
+  QString strMap(QLatin1String("\nMap Coord: X = "));
+
+  strMap.append(QString::number(mapPos.x(), 'f', -1));
+  strMap.append(QLatin1String(", Y = "));
+  strMap.append(QString::number(mapPos.y(), 'f', -1));
+  strMap.append(QLatin1String(", z = "));
+  strMap.append(QString::number(mapPos.z(), 'f', -1));
+  if (isValid)
+    strMap.append(QLatin1String(" (valid)"));
+  else
+    strMap.append(QLatin1String(" (invalid)"));
+
+  QString strLatLon(QLatin1String("\nLon(x) - Lat(y) Coord: "));
+
+//  Esri::ArcGISRuntime::Point normalPt =
+//    Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(Esri::ArcGISRuntime::Point(mapPos.x(), mapPos.y(), d->m_mapImpl->getEsriSpatialReference()));
+
+  const CoordTranslationFunctor *ctFunctor = d->m_mapImpl->coordTranslationFunctor();
+  if (ctFunctor)
+  {
+    Point3D geoPos = ctFunctor->mapToGeographic(mapPos);
+    strLatLon.append(QString::number(geoPos.x(), 'f', 10));
+    strLatLon.append(QLatin1String(" - "));
+    strLatLon.append(QString::number(geoPos.y(), 'f', 10));
+    strLatLon.append(QLatin1String(" - "));
+    strLatLon.append(QString::number(geoPos.z(), 'f', -1));
+  }
+
+  QString strUTM(QLatin1String("\nUTM Mgrs Coord: "));
+//  strUTM.append(EsriRuntimeQt::CoordinateConversion::PointToMgrs(normalPt
+//                , EsriRuntimeQt::MgrsConversionMode::Automatic
+//                , 5
+//                , true
+//                , true));
+  strUTM.append(d->m_mapImpl->mapToMgrsString(mapPos.toPointF()));
+  addMapPositionString(strMap);
+  addMapPositionString(strLatLon);
+  addMapPositionString(strUTM);
+
+
+} /* FunctionDialog::onMouseMapPositionChanged */
+
+
+void FunctionDialog::onMouseGeoPositionChanged(const Point3D &geoPos, bool isValid)
+{
+  QString strSim(QLatin1String("\nGeo Coord: X = "));
+
+  strSim.append(QString::number(geoPos.x(), 'f', -1));
+  strSim.append(QLatin1String(", Y = "));
+  strSim.append(QString::number(geoPos.y(), 'f', -1));
+  strSim.append(QLatin1String(", z = "));
+  strSim.append(QString::number(geoPos.z(), 'f', -1));
+  if (isValid)
+    strSim.append(QLatin1String(" (valid)"));
+  else
+    strSim.append(QLatin1String(" (invalid)"));
+
+  addMapPositionString(strSim);
+
+  onExtendChanged();
+}
+
+void FunctionDialog::onExtendChanged()
+{
+  double pixelSize = d->m_mapInterface->pixelSizeMeter();
+  double scale = d->m_mapInterface->scale();
+  setPixelSizeString(QStringLiteral("PixelSize=%1 - Scale=%2").arg(pixelSize).arg(scale));
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.h
new file mode 100755
index 000000000..2eda55397
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.h
@@ -0,0 +1,290 @@
+/**
+  * @RDE_HEADER@
+  * FunctionDialog
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "function_dialog_export.h"
+#include <Map/map.h>
+#include <Map/abstract_map_object.h>   // 300 build: RefPointerMapObjectList = QList<RefPointer<AbstractMapObject>> needs the complete type (also for the MOC)
+#include <QWidget>
+#include <Symbology/symbol_dictionary.h>
+
+
+// ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <GraphicsOverlay.h>
+
+// #define USE_LOCAL_SERVER
+
+
+class QStandardItemModel;
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+namespace RB
+{
+class RubberbandBase;
+}
+
+class Map;
+
+// TODO: nur fuer Tests exportiert
+class FUNCTIONDIALOG_EXPORT FunctionDialog : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit FunctionDialog(Esri::ArcGISRuntime::Map             *esriMap,
+                          Esri::ArcGISRuntime::MapGraphicsView *esriView,
+                          QWidget                              *parent);
+  explicit FunctionDialog(SituationMap::Map *map);
+  virtual ~FunctionDialog();
+
+  static void addButtonToMap(SituationMap::Map *map, bool isVisible = true);
+
+
+  void init();
+
+  void setGraphicsLayer(Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer);
+
+  void setMapPositionString(const QString &mapPosition);
+  void setPixelSizeString(const QString &text);
+  void addMapPositionString(const QString &mapPosition);
+
+  FunctionDialog(const FunctionDialog &other)           = delete;  // No copy
+  FunctionDialog &operator=(const FunctionDialog &other) = delete; // No copy
+
+
+
+protected:
+  void addSimpleLayerTab();
+  void addLogicalLayerTab();
+  void addLayerPerformanceTab();
+  void addGraphicsTab();
+  void addGraphics3DTab();
+  void addMessageTab();
+  void addMapObjectTab();
+  void addRubberbandTab();
+  void addRubberband3DTab();
+  void addToolsTab();
+  void addViewshedTab();
+  void addOverlayPlanTab();
+  void addIconRenderTab();
+  void addPortalTab();
+  void addMovePointLuxemburgTab();
+
+
+  void getRotationAndAngle(const QPointF &sectStart, const QPointF &sectEnd, double &rotationDegOut, double &openAngleDegOut);
+  //  void addYourTab();
+
+
+  Esri::ArcGISRuntime::Graphic *createCube(const SituationMap::PositionCont &mapPosCont,
+                                           int baseHeight,
+                                           double objHeight,
+                                           const QString &partyNameValue = QString());
+
+
+public Q_SLOTS:
+  void onDestroyed();
+
+  void onLayerPerfCreateLayer();
+
+
+  void onGenerateGraphics();
+  void onGenerateCube();
+  void onGenerateCubeArray();
+  void onGenerateStackedCubes();
+  void onGenerateGraphicsKristenStrandford();
+  void onGenerateUniqueVaueRendererMountingPoints();
+
+  void onGenerate3DGraphicSphereRENDERER();
+  void onSphereOpacityChangedRENDERER(int opacityValue);
+
+  void onGenerate3DGraphicSphere();
+  void onSphereOpacityChanged(int opacityValue);
+  void onSphereZValueChanged(int ZValue);
+
+  void onGenerate3DGraphicCone();
+  void onConeOpacityChanged(int opacityValue);
+  void onConeZValueChanged(int ZValue);
+  void onConeHeadingChanged(float angle);
+  void onConeRollChanged(float angle);
+  void onConePitchChanged(float angle);
+
+  void on3dModel();
+  void on3dModelZValueChanged(int ZValue);
+
+  void onGenerate3DGraphicConeUniqueValueRenderer();
+
+
+
+  void onAddCivilSymbols();
+  void onMessage();
+  void onMessageSelect();
+  void onAddSymbol();
+  void onSomeParticipants();
+
+  void onRubberbandApply(RB::RubberbandBase *);
+  void onRubberbandAbort(RB::RubberbandBase *);
+  void onRubberband3DApply(RB::RubberbandBase *);
+  void onRubberband3DAbort(RB::RubberbandBase *);
+  void onRubberbandDefineArrow();
+  void onRubberbandDefineEllipse();
+  void onRubberbandBoobyTrapSector();
+  void onRubberbandCheckCoordinates();
+  void onRubberbandStateSelect();
+  void onRubberbandTwoInOne();
+  void onRectCheckCoordinates();
+
+  void onPolygonCreate();
+  void onPolylineCreate();
+  void onPolylineUpdate();
+  void onTextCreate();
+  void onTextUpdate();
+  void onMapObjectIndicatorCreate();
+
+
+  void onParticipantGetPosition();
+  void onParticipantGetPositionApplied(RB::RubberbandBase *rubberband = nullptr);
+  bool createParticipant(const Point3D &origin,
+                         const QString &debugInfo);
+  void onParticipantCreate();
+  void onParticipantUpdate();
+
+  void onAreaFireCreate();
+  void onAreaFireUpdate();
+
+  void onBuildingCreate();
+  void onBuildingUpdate();
+
+  void onBiologicalAgentCreate();
+  void onBiologicalAgentUpdate();
+
+  void onChemicalAgentCreate();
+
+  void onCubeCreate();
+
+  void onDangerAreaCreate();
+  void onDangerAreaUpdate();
+
+  void onFunctionalAreaCreate();
+  void onFunctionalAreaUpdate();
+
+  void onGeoImageCreate();
+  void onMapObjectClicked(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
+                          const QPointF &viewportPosition);
+
+  void onSoundAreaCreate();
+  void onSoundAreaUpdate();
+
+  void onHitLineCreate();
+  void onHitLineUpdate();
+
+  void onLineOfSightLineCreate();
+
+
+  void onMineCreate();
+  void onMineUpdate();
+
+  void onMineFieldCreate();
+  void onMineFieldUpdate();
+
+  void onNuclearCreate();
+  void onNuclearUpdate();
+
+  void onChargeEffectCreate();
+  void onChargeEffectUpdate();
+
+  void onBoobyTrapCreate();
+  void onBoobyTrapUpdate();
+
+  void onSingleFireCreate();
+  void onSingleFireUpdate();
+
+  void onShowBasePoint();
+
+  void onShowPolizei();
+
+  void onObjectIndicator();
+
+  void onMeasureLength();
+
+  void onStartLocationDisplay();
+  void onStopLocationDisplay();
+
+  void onLoadFile();
+
+  void onPortal();
+
+  void onMovePoint();
+
+#ifdef USE_LOCAL_SERVER
+  void onStartLocalService();
+  void onStopLocalService();
+  void onStartViewshedSvc();
+  void onStopViewshedSvc();
+
+  void onViewshedInteractive();
+  void onViewshed();
+#endif // USE_LOCAL_SERVER
+
+  void onSightFan();
+  void onViewshedSightFan();
+
+  void onLoadPlan();
+  void onOverlayVisiChanged(bool checked);
+  void onRemovePlan();
+  void onRemoveAllPlans();
+
+  void onToPdf();
+
+  void onDump();
+
+  void onOverviewMap();
+
+  void onBackupOms();
+  void onRestoreOms();
+
+  void onRemove();
+  void onRemoveAll();
+  void onToggleGrid();
+  void onToggleVisibility();
+  void onToggleVisibilityTechn();
+  void onToggleVisibilityTact();
+  void onToggleSelection();
+  void onTogglePicking();
+  void onToggleBoundingBox();
+  void onToggleBB2();
+  void onMapRotationChanged();
+  void onSymbolSizeChanged();
+  void onSymbolOpacityChanged();
+  void onDrawOrderChanged();
+
+
+  //void onBuildingPERFORMANCE();
+
+  void onMouseWindowPositionChanged(int x, int y);
+  void onMouseMapPositionChanged(const Point3D &mapPos, bool isValid);
+  void onMouseGeoPositionChanged(const Point3D &geoPos, bool isValid);
+
+  void onExtendChanged();
+
+private:
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog_export.h
new file mode 100755
index 000000000..c4d4f2535
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog_export.h
@@ -0,0 +1,21 @@
+/**
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef FUNCTIONDIALOG_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define FUNCTIONDIALOG_EXPORT
+# else
+#  if defined(MAKE_SITUATIONMAPFUNCTIONDIALOG_LIB)
+#   define FUNCTIONDIALOG_EXPORT Q_DECL_EXPORT
+#  else
+#   define FUNCTIONDIALOG_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.cpp
new file mode 100755
index 000000000..cccf9fadd
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.cpp
@@ -0,0 +1,380 @@
+/**
+  * @RDE_HEADER@
+  * FunctionDialog
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#include "simple_esri_layer.h"
+
+#include <Map.h>
+
+#include <MapImpl/map_impl.h>
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <LayerListModel.h>
+#include <ArcGISTiledLayer.h>
+#include <Basemap.h>                  // 300: basemap() returns Basemap* (fwd-declared only)
+#include <GraphicsOverlayListModel.h> // 300: Map::graphicsOverlays() model (fwd-declared only)
+
+
+// for overview
+#include <QDebug>
+#include <QDialog>
+#include <QLabel>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QSlider>
+#include <QGridLayout>
+#include <QStandardItemModel>
+
+
+namespace SituationMap
+{
+
+Esri::ArcGISRuntime::Layer *getEsriBasemap_Layer(Esri::ArcGISRuntime::Map *map,
+                                                 const QString &layername)
+{
+  if (!(map &&
+        map->basemap() &&
+        map->basemap()->baseLayers())
+     )
+    return nullptr;
+
+  Esri::ArcGISRuntime::Layer *layerFound = nullptr;
+
+  const Esri::ArcGISRuntime::LayerListModel *model = map->basemap()->baseLayers();
+  for (int i = 0; i < model->size(); ++i)
+  {
+    const Esri::ArcGISRuntime::Layer *curLayer = model->at(i);
+    const QString &curName = curLayer->name();
+    if (QString::compare(layername, curName) == 0)
+    {
+      layerFound = model->at(i);
+      break;
+    }
+  } // for
+  return layerFound;
+}
+
+
+Esri::ArcGISRuntime::ArcGISTiledLayer *getEsriBasemap_ArcGISTiledLayer(Esri::ArcGISRuntime::Map *map,
+                                                                       const QString &layername)
+{
+  Esri::ArcGISRuntime::Layer *layerFound = getEsriBasemap_Layer(map, layername);
+  if (! layerFound)
+    return nullptr;
+
+  if (layerFound->layerType() == Esri::ArcGISRuntime::LayerType::ArcGISTiledLayer)
+  {
+    Esri::ArcGISRuntime::ArcGISTiledLayer *layer2 =
+      static_cast<Esri::ArcGISRuntime::ArcGISTiledLayer *>(layerFound);
+    return layer2;
+  }
+  return nullptr;
+}
+
+
+
+class SimpleEsriLayer::Private
+{
+
+public:
+  Private()
+  {
+  }
+
+  ~Private()
+  {
+  }
+
+  // ESRI data:
+  Esri::ArcGISRuntime::Map             *m_map     = nullptr;
+  Esri::ArcGISRuntime::MapGraphicsView *m_mapView = nullptr;
+
+  // OWN data:
+  QGridLayout                          *m_layout = nullptr;
+
+
+}; // class SimpleEsriLayer::Private
+//-----------------------------------------------------------------------------
+
+
+
+SimpleEsriLayer::SimpleEsriLayer(QWidget *parent, Esri::ArcGISRuntime::MapGraphicsView *mapView)
+  : QWidget(parent)
+  , d(new Private)
+{
+  d->m_mapView = mapView;
+  if (d->m_mapView)
+    d->m_map = d->m_mapView->map();
+
+  d->m_layout = new QGridLayout(this);
+
+  updatePanel();
+}
+
+SimpleEsriLayer::~SimpleEsriLayer()
+{
+  delete d;
+}
+
+bool SimpleEsriLayer::updatePanel()
+{
+
+  for (int row = 0; row < d->m_layout->rowCount(); ++row)
+  {
+    for (int col = 0; col < d->m_layout->columnCount(); ++col)
+    {
+      QLayoutItem *item = d->m_layout->itemAtPosition(row, col);
+      if (item)
+      {
+        QWidget *w = item->widget();
+        delete w;
+      }
+    }
+  }
+
+  delete d->m_layout;
+  d->m_layout = new QGridLayout(this);
+
+
+  if (d->m_map)
+  {
+    // Header
+    int row = 0;
+    int col = 0;
+    for (const char *name : { "OnOff", "Opac", "Brightness", "Contrast", "Gamma" })
+      d->m_layout->addWidget(new QLabel(QString::fromLatin1(name)), row, col++);
+
+
+    row = d->m_layout->rowCount();
+
+    // GraphicalOverlay
+    Esri::ArcGISRuntime::GraphicsOverlayListModel *graphicsOverlayListModel = d->m_mapView->graphicsOverlays();
+    if (graphicsOverlayListModel)
+    {
+      int graphicsOverlaySize = graphicsOverlayListModel->size();
+//      qDebug() << LOGFUNCTION << " graphicsOverlayListModel -> size=" << graphicsOverlaySize;
+
+      row += graphicsOverlaySize;
+
+      for (int i = 0; i < graphicsOverlaySize; ++i)
+      {
+        --row;
+        col = 0;
+//        qDebug() << LOGFUNCTION << " graphicsOverlayListModel handle layer i='" << i;
+
+        Esri::ArcGISRuntime::GraphicsOverlay *gOverlay = graphicsOverlayListModel->at(i);
+        if (! gOverlay)
+        {
+          qWarning() << LOGFUNCTION << " gOverlay is nil";
+          return false;
+        }
+
+        const QString &layername = gOverlay->objectName();
+
+        QCheckBox *cbOnOff = new QCheckBox(layername);
+        cbOnOff->setChecked(gOverlay->isVisible());
+
+        connect(cbOnOff, &QCheckBox::stateChanged, this, &SimpleEsriLayer::layerOnOff);
+        d->m_layout->addWidget(cbOnOff, row, col++);
+
+        SimpleEsriLayerSlider *sl_opac = new SimpleEsriLayerSlider(layername, 0, 100);
+        sl_opac->setValue(gOverlay->opacity() * 100);
+        connect(sl_opac, &SimpleEsriLayerSlider::valueChanged, this, &SimpleEsriLayer::opacity);
+        d->m_layout->addWidget(sl_opac, row, col++);
+
+      } // for
+    } // if (graphicsOverlayListModel)
+
+
+
+    // BasemapLayer
+    row = d->m_layout->rowCount();
+
+    Esri::ArcGISRuntime::LayerListModel *baseLayerModel = d->m_map->basemap()->baseLayers();
+    if (baseLayerModel)
+    {
+      int baseLayerModelSize = baseLayerModel->size();
+      qWarning() << LOGFUNCTION << " baseLayerModel -> size=" << baseLayerModelSize;
+
+      row += baseLayerModelSize;
+
+      for (int i = 0; i < baseLayerModelSize; ++i)
+      {
+        col = 0;
+        --row;
+        qWarning() << LOGFUNCTION << " baseLayerModel handle layer i=" << i;
+        Esri::ArcGISRuntime::Layer *layer = baseLayerModel->at(i);
+        if (! layer)
+        {
+          qWarning() << LOGFUNCTION << " layer is nil";
+          return false;
+        }
+
+        const QString &layername = layer->name();
+
+        QCheckBox *cbOnOff = new QCheckBox(layername);
+        cbOnOff->setChecked(layer->isVisible());
+
+        //      QString tooltip = layer->url();
+        //      if (!l->serviceDescription().isEmpty())
+        //        tooltip += QLatin1String(" ; ") % l->serviceDescription();
+        //      if (!tooltip.isEmpty())
+        //        cbOnOff->setToolTip(tooltip);
+
+        connect(cbOnOff, &QCheckBox::stateChanged, this, &SimpleEsriLayer::layerOnOff);
+        d->m_layout->addWidget(cbOnOff, row, col++);
+
+        SimpleEsriLayerSlider *sl_opac = new SimpleEsriLayerSlider(layername, 0, 100);
+        sl_opac->setValue(layer->opacity() * 100);
+        connect(sl_opac, &SimpleEsriLayerSlider::valueChanged, this, &SimpleEsriLayer::opacity);
+        d->m_layout->addWidget(sl_opac, row, col++);
+
+
+        if (layer->layerType() == Esri::ArcGISRuntime::LayerType::ArcGISTiledLayer
+            //          || layer->type() == EsriRuntimeQt::LayerType::ArcGISTiledMapService
+           )
+        {
+
+          Esri::ArcGISRuntime::ArcGISTiledLayer *realLayer =
+            dynamic_cast<Esri::ArcGISRuntime::ArcGISTiledLayer *>(layer);
+          if (realLayer)
+          {
+            float brightness  = realLayer->brightness();
+            float contrast    = realLayer->contrast();
+            float gamma       = realLayer->gamma();
+
+            qWarning() << " brightness=" << brightness;  // QuartzBeta1 -> not supported
+            qWarning() << " contrast=" << contrast;      // QuartzBeta1 -> not supported
+            qWarning() << " gamma=" << gamma;            // QuartzBeta1 -> not supported
+
+            SimpleEsriLayerSlider *sl_brightness = new SimpleEsriLayerSlider(layername, -100, 100);
+            sl_brightness->setValue(brightness * 100);
+            connect(sl_brightness, &SimpleEsriLayerSlider::valueChanged, this, &SimpleEsriLayer::brightness);
+            d->m_layout->addWidget(sl_brightness, row, col++);
+
+            SimpleEsriLayerSlider *sl_contrast = new SimpleEsriLayerSlider(layername, -100, 100);
+            sl_contrast->setValue(contrast * 100);
+            connect(sl_contrast, &SimpleEsriLayerSlider::valueChanged, this, &SimpleEsriLayer::contrast);
+            d->m_layout->addWidget(sl_contrast, row, col++);
+
+            SimpleEsriLayerSlider *sl_gamma = new SimpleEsriLayerSlider(layername, -100, 100);
+            sl_gamma->setValue(gamma * 100);
+            connect(sl_gamma, &SimpleEsriLayerSlider::valueChanged, this, &SimpleEsriLayer::gamma);
+            d->m_layout->addWidget(sl_gamma, row, col++);
+          } // ir (realLayer)
+
+        } // if (layer->type() == Es
+      } // for
+    } // if (baseLayerModel)
+
+
+    QPushButton *pbMaximizeExtent = new QPushButton(QLatin1String("maximize scale of 1st basemap"));
+    d->m_layout->addWidget(pbMaximizeExtent, 9999, 0);
+    connect(pbMaximizeExtent, &QPushButton::clicked, this, [this]()
+    {
+      if (d->m_map)
+      {
+        d->m_map->setMinScale(500000000); // 5e+08
+        d->m_map->setMaxScale(100);
+      }
+    });
+
+  }
+  else
+    qWarning() << LOGFUNCTION << " no map !!! ";
+
+  return true;
+}
+
+
+void SimpleEsriLayer::layerOnOff()
+{
+  QCheckBox *cb = qobject_cast<QCheckBox *>(sender());
+  if (!cb)
+    return;
+
+  QString layername = cb->text();
+  qDebug() << LOGFUNCTION << " layername=" << layername;
+
+  Esri::ArcGISRuntime::Layer *l = getEsriBasemap_Layer(d->m_map, layername);
+  if (l)
+    l->setVisible(cb->isChecked());
+  else
+    qDebug() << LOGFUNCTION << " no layer!!!, layername=" << layername;
+}
+
+void SimpleEsriLayer::opacity(int)
+{
+  SimpleEsriLayerSlider *sl = qobject_cast<SimpleEsriLayerSlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+  double value = sl->value() / 100.0;
+
+  Esri::ArcGISRuntime::Layer *l = getEsriBasemap_Layer(d->m_map, layername);
+  if (l)
+  {
+    qDebug() << LOGFUNCTION << " layername=" << layername << " set to val=" << value;
+    l->setOpacity(value);
+  }
+  else
+    qWarning() << LOGFUNCTION << " no layer!!!, layername=" << layername;
+}
+
+void SimpleEsriLayer::brightness(int)
+{
+  SimpleEsriLayerSlider *sl = qobject_cast<SimpleEsriLayerSlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+  Esri::ArcGISRuntime::ArcGISTiledLayer *l = getEsriBasemap_ArcGISTiledLayer(d->m_map, layername);
+
+  double value = sl->value() / 100.0;
+//  double value = sl->value();
+
+  qDebug() << LOGFUNCTION << " layername=" << layername << " set to val=" << value;
+
+  l->setBrightness(value);
+}
+
+void SimpleEsriLayer::contrast(int)
+{
+  SimpleEsriLayerSlider *sl = qobject_cast<SimpleEsriLayerSlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+  Esri::ArcGISRuntime::ArcGISTiledLayer *l = getEsriBasemap_ArcGISTiledLayer(d->m_map, layername);
+
+  double value = sl->value() / 100.0;
+//  double value = sl->value();
+
+  qDebug() << LOGFUNCTION << " layername=" << layername << " set to val=" << value;
+
+  l->setContrast(value);
+}
+
+void SimpleEsriLayer::gamma(int)
+{
+  SimpleEsriLayerSlider *sl = qobject_cast<SimpleEsriLayerSlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+  Esri::ArcGISRuntime::ArcGISTiledLayer *l = getEsriBasemap_ArcGISTiledLayer(d->m_map, layername);
+
+  double value = sl->value() / 100.0;
+//  double value = sl->value();
+
+  qDebug() << LOGFUNCTION << " layername=" << layername << " set to val=" << value;
+
+  l->setGamma(value);
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.h
new file mode 100755
index 000000000..82ec611cb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/simple_esri_layer.h
@@ -0,0 +1,79 @@
+/**
+  * @RDE_HEADER@
+  * FunctionDialog
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include <QObject>
+#include <QSlider>
+
+
+// ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <GraphicsOverlay.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SimpleEsriLayerSlider : public QSlider
+{
+  Q_OBJECT
+
+public:
+  SimpleEsriLayerSlider(const QString &layername, int min, int max)
+    : QSlider(), m_layername(layername)
+  {
+    this->setOrientation(Qt::Horizontal);
+    setMinimum(min);
+    setMaximum(max);
+  }
+
+public:
+  QString m_layername;
+};
+
+
+class SimpleEsriLayer : public QWidget
+{
+  Q_OBJECT
+
+public:
+
+  SimpleEsriLayer(QWidget *parent, Esri::ArcGISRuntime::MapGraphicsView *mapView);
+  virtual ~SimpleEsriLayer();
+
+  SimpleEsriLayer(const SimpleEsriLayer &other) = delete;            // No copy
+  SimpleEsriLayer &operator=(const SimpleEsriLayer &other) = delete; // No copy
+
+  bool updatePanel();
+private slots:
+  void layerOnOff();
+  void opacity(int);
+  void brightness(int);
+  void contrast(int);
+  void gamma(int);
+
+private :
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
+// Q_DECLARE_METATYPE(SituationMap::GeometryType);
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_a.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_a.xpm
new file mode 100755
index 000000000..f56427fa1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_a.xpm
@@ -0,0 +1,156 @@
+/* XPM */
+static const char * stateIconA_xpm[] = {
+"24 24 129 2",
+"  	c None",
+". 	c #4CE146",
+"+ 	c #9E8E3A",
+"@ 	c #4CE045",
+"# 	c #BDAB46",
+"$ 	c #A3912F",
+"% 	c #4BDF44",
+"& 	c #32942E",
+"* 	c #B8C14A",
+"= 	c #CABF35",
+"- 	c #4ADE43",
+"; 	c #F2DA55",
+"> 	c #A7973C",
+", 	c #CDC74E",
+"' 	c #E1D132",
+") 	c #347D25",
+"! 	c #48DD42",
+"~ 	c #E7CF4C",
+"{ 	c #F7D519",
+"] 	c #F8DB3E",
+"^ 	c #9D8E38",
+"/ 	c #E3CC50",
+"( 	c #F6D629",
+"_ 	c #56821F",
+": 	c #37AA32",
+"< 	c #47DB41",
+"[ 	c #DAC54B",
+"} 	c #F6D51F",
+"| 	c #F5D210",
+"1 	c #F5D211",
+"2 	c #F5DA3F",
+"3 	c #819D38",
+"4 	c #E8D14F",
+"5 	c #F6D522",
+"6 	c #A48D0C",
+"7 	c #46DA40",
+"8 	c #C3B445",
+"9 	c #F4D425",
+"0 	c #F3D00E",
+"a 	c #C9BF13",
+"b 	c #F3D00F",
+"c 	c #F2D840",
+"d 	c #8FAA3D",
+"e 	c #E7D54D",
+"f 	c #F4D31B",
+"g 	c #D4B50C",
+"h 	c #45D93E",
+"i 	c #AC9B3C",
+"j 	c #F3D52C",
+"k 	c #EBCC0D",
+"l 	c #7D9516",
+"m 	c #CCAE0A",
+"n 	c #F1CE0C",
+"o 	c #F1CE0E",
+"p 	c #F4D738",
+"q 	c #F1D015",
+"r 	c #DFC70E",
+"s 	c #43D73D",
+"t 	c #8E7F31",
+"u 	c #F0D434",
+"v 	c #DBC50D",
+"w 	c #588019",
+"x 	c #D6B709",
+"y 	c #EFCC0A",
+"z 	c #EDCB0A",
+"A 	c #5B8F1F",
+"B 	c #42D63B",
+"C 	c #ECD23C",
+"D 	c #C9BA0D",
+"E 	c #3A7F1F",
+"F 	c #DEBD07",
+"G 	c #EDCA08",
+"H 	c #A39309",
+"I 	c #2E972A",
+"J 	c #40D43A",
+"K 	c #E7CF41",
+"L 	c #C2A60A",
+"M 	c #27701E",
+"N 	c #33A92E",
+"O 	c #C1A405",
+"P 	c #38BB32",
+"Q 	c #DCC543",
+"R 	c #9D8709",
+"S 	c #37B931",
+"T 	c #3FD338",
+"U 	c #24711E",
+"V 	c #C2B33F",
+"W 	c #3DD137",
+"X 	c #C8B54A",
+"Y 	c #83A134",
+"Z 	c #3D6517",
+"` 	c #3CD036",
+" .	c #E4CA37",
+"..	c #EDD035",
+"+.	c #29731E",
+"@.	c #F6D726",
+"#.	c #F9D821",
+"$.	c #3ACF34",
+"%.	c #39CD33",
+"&.	c #8F8132",
+"*.	c #F6D414",
+"=.	c #F6D311",
+"-.	c #AD9B39",
+";.	c #38CC32",
+">.	c #C9B337",
+",.	c #D9BF33",
+"'.	c #37CB30",
+").	c #E9CB29",
+"!.	c #F1CD0C",
+"~.	c #EFD022",
+"{.	c #36CA2F",
+"].	c #EFCD12",
+"^.	c #EECB09",
+"/.	c #EECC0C",
+"(.	c #8C7E2F",
+"_.	c #35C92E",
+":.	c #B29F34",
+"<.	c #EBC806",
+"[.	c #C4AD31",
+"}.	c #D7BD29",
+"|.	c #E8C503",
+"1.	c #E4C722",
+"2.	c #E8C714",
+"3.	c #E7C402",
+"4.	c #E8C508",
+"5.	c #97872E",
+"6.	c #E5C201",
+"7.	c #E5C200",
+"8.	c #B8A330",
+"                                                ",
+"                . . . . . . . .           +     ",
+"            @ @                 @ @     # $     ",
+"          %                         & * =       ",
+"        -           ; >             , ' )       ",
+"      !           ~ { ] ^         / ( _ :       ",
+"    <           [ } | 1 2 3     4 5 6     <     ",
+"    7         8 9 0 a 0 b c d e f g       7     ",
+"  h         i j k l   m n o p q r           h   ",
+"  s       t u v w       x y y z A           s   ",
+"  B       C D E           F G H I           B   ",
+"  J     K L M N             O               J   ",
+"  P   Q R   S                               T   ",
+"  U V         W       # X       W           W   ",
+"  Y Z         `        ...      `           `   ",
+"  +.                  @.#.    $.            $.  ",
+"    %.              &.*.=.-.              %.    ",
+"    ;.              >.0 0 ,.              ;.    ",
+"      '.            ).!.!.~.            '.      ",
+"        {.          ].^.^./.(.        {.        ",
+"          _.      :.<.<.<.<.[.      _.          ",
+"                  }.|.|.|.|.1.                  ",
+"                  2.3.3.3.3.4.                  ",
+"                5.6.7.7.7.7.7.8.                "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_b.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_b.xpm
new file mode 100755
index 000000000..52c1f0db9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_b.xpm
@@ -0,0 +1,216 @@
+/* XPM */
+static const char * stateIconB_xpm[] = {
+"24 24 189 2",
+"  	c None",
+". 	c #4A8448",
+"+ 	c #69BC66",
+"@ 	c #75D272",
+"# 	c #7ADA76",
+"$ 	c #77D673",
+"% 	c #6CC269",
+"& 	c #508E4D",
+"* 	c #61AE5E",
+"= 	c #7EE57A",
+"- 	c #73E76E",
+"; 	c #64E55F",
+"> 	c #5BE355",
+", 	c #57E351",
+"' 	c #59E353",
+") 	c #62E55D",
+"! 	c #71E76C",
+"~ 	c #7EE779",
+"{ 	c #68BB65",
+"] 	c #7BE076",
+"^ 	c #69E563",
+"/ 	c #50E149",
+"( 	c #46CE40",
+"_ 	c #34982E",
+": 	c #44C93E",
+"< 	c #4EE047",
+"[ 	c #65E45F",
+"} 	c #7CE377",
+"| 	c #4A8447",
+"1 	c #51934E",
+"2 	c #75E56F",
+"3 	c #51E04B",
+"4 	c #48D541",
+"5 	c #46D140",
+"6 	c #4FE048",
+"7 	c #71E56B",
+"8 	c #59A056",
+"9 	c #6EE368",
+"0 	c #4BDE44",
+"a 	c #42C73C",
+"b 	c #40BF3A",
+"c 	c #6AE364",
+"d 	c #4C894A",
+"e 	c #6EDF69",
+"f 	c #49DD43",
+"g 	c #40C63B",
+"h 	c #3FC13A",
+"i 	c #6CE068",
+"j 	c #66BD62",
+"k 	c #4BDC45",
+"l 	c #44D03E",
+"m 	c #5EAB5B",
+"n 	c #75D571",
+"o 	c #42CD3D",
+"p 	c #65C062",
+"q 	c #5CDE57",
+"r 	c #46DA40",
+"s 	c #74D670",
+"t 	c #64E05F",
+"u 	c #52DC4C",
+"v 	c #44CF3E",
+"w 	c #5BDD56",
+"x 	c #5AA956",
+"y 	c #46D93F",
+"z 	c #3EC438",
+"A 	c #6DD168",
+"B 	c #4FDB49",
+"C 	c #3CBC36",
+"D 	c #6DD268",
+"E 	c #58A954",
+"F 	c #57C352",
+"G 	c #43D73D",
+"H 	c #389234",
+"I 	c #569F53",
+"J 	c #50DA4A",
+"K 	c #3ABA35",
+"L 	c #3ABB35",
+"M 	c #4FDA49",
+"N 	c #5BA758",
+"O 	c #58C553",
+"P 	c #50D04B",
+"Q 	c #42D63B",
+"R 	c #5CCA57",
+"S 	c #5BCE56",
+"T 	c #50D049",
+"U 	c #46D240",
+"V 	c #40D43A",
+"W 	c #4CD146",
+"X 	c #3ECE38",
+"Y 	c #3DCB38",
+"Z 	c #4AD545",
+"` 	c #41CF3A",
+" .	c #3FD338",
+"..	c #42CF3B",
+"+.	c #43D03C",
+"@.	c #45CF3E",
+"#.	c #40D139",
+"$.	c #41CE3A",
+"%.	c #3EC738",
+"&.	c #3DD137",
+"*.	c #3ABC35",
+"=.	c #41D23B",
+"-.	c #BDAB46",
+";.	c #C8B54A",
+">.	c #42D23C",
+",.	c #3ABF35",
+"'.	c #3BB136",
+").	c #3CD036",
+"!.	c #53A74F",
+"~.	c #2F812B",
+"{.	c #64CF60",
+"].	c #E4CA37",
+"^.	c #EDD035",
+"/.	c #66CF62",
+"(.	c #30852C",
+"_.	c #51A44D",
+":.	c #3DB637",
+"<.	c #338530",
+"[.	c #3ACF34",
+"}.	c #55CF51",
+"|.	c #33B72E",
+"1.	c #42CF3D",
+"2.	c #F6D726",
+"3.	c #F9D821",
+"4.	c #3A6E37",
+"5.	c #44D13E",
+"6.	c #35BD2F",
+"7.	c #55CC51",
+"8.	c #348930",
+"9.	c #38CA32",
+"0.	c #3FCF39",
+"a.	c #57A654",
+"b.	c #278723",
+"c.	c #8F8132",
+"d.	c #F6D414",
+"e.	c #F6D311",
+"f.	c #AD9B39",
+"g.	c #2EA72A",
+"h.	c #519A4E",
+"i.	c #42CF3C",
+"j.	c #2C9928",
+"k.	c #38CC32",
+"l.	c #56D351",
+"m.	c #C9B337",
+"n.	c #F3D00E",
+"o.	c #D9BF33",
+"p.	c #5AD256",
+"q.	c #2E9F2A",
+"r.	c #34C02D",
+"s.	c #38CB31",
+"t.	c #62D25D",
+"u.	c #E9CB29",
+"v.	c #F1CD0C",
+"w.	c #EFD022",
+"x.	c #64CD5F",
+"y.	c #3ACC33",
+"z.	c #34BF2D",
+"A.	c #35C62E",
+"B.	c #3BCB34",
+"C.	c #67D261",
+"D.	c #EFCD12",
+"E.	c #EECB09",
+"F.	c #EECC0C",
+"G.	c #8C7E2F",
+"H.	c #6ACF65",
+"I.	c #3FCC39",
+"J.	c #34C42D",
+"K.	c #39CA32",
+"L.	c #5BC656",
+"M.	c #B29F34",
+"N.	c #EBC806",
+"O.	c #C4AD31",
+"P.	c #63CD5E",
+"Q.	c #3ECB37",
+"R.	c #34C52D",
+"S.	c #30B82A",
+"T.	c #2B8327",
+"U.	c #D7BD29",
+"V.	c #E8C503",
+"W.	c #E4C722",
+"X.	c #2D9428",
+"Y.	c #2FB72A",
+"Z.	c #E8C714",
+"`.	c #E7C402",
+" +	c #E8C508",
+".+	c #97872E",
+"++	c #E5C201",
+"@+	c #E5C200",
+"#+	c #B8A330",
+"                . + @ # # $ % &                 ",
+"            * = - ; > , , ' ) ! ~ {             ",
+"          ] ^ / ( _           : < [ } |         ",
+"      1 2 3 4                     5 6 7 8       ",
+"      9 0 a                         b 0 c d     ",
+"    e f g                             h f i     ",
+"  j k l           m n = = n m           o k p   ",
+"  q r           s t u v v u t s           r w   ",
+"x y z         A B C         C B D         z y E ",
+"F G H       I J K             L M N       H G O ",
+"P Q         R Q                 Q S         Q T ",
+"U V         W X                 Y Z         V U ",
+"`  .        ..+.                @.#.         .$.",
+"%.&.        *.=.      -.;.      >.,.        &.%.",
+"'.).!.      ~.).{.    ].^.    /.).(.      _.).:.",
+"<.[.}.        |.1.    2.3.  4.5.6.        7.[.8.",
+"  9.0.a.        b.  c.d.e.f.  g.        h.i.9.  ",
+"  j.k.l.            m.n.n.o.            p.k.q.  ",
+"    r.s.t.          u.v.v.w.          x.y.z.    ",
+"      A.B.C.        D.E.E.F.G.      H.I.A.      ",
+"        J.K.L.    M.N.N.N.N.O.    P.Q.R.        ",
+"          S.T.    U.V.V.V.V.W.    X.Y.          ",
+"                  Z.`.`.`.`. +                  ",
+"                .+++@+@+@+@+@+#+                "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_c.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_c.xpm
new file mode 100755
index 000000000..edbc31ba5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/state_icon_c.xpm
@@ -0,0 +1,110 @@
+/* XPM */
+static const char * stateIconC_xpm[] = {
+"24 24 83 1",
+" 	c None",
+".	c #7FBD7C",
+"+	c #8BCF88",
+"@	c #84C582",
+"#	c #588456",
+"$	c #63BE5F",
+"%	c #57B953",
+"&	c #73BF70",
+"*	c #56B752",
+"=	c #499B45",
+"-	c #699F66",
+";	c #59B755",
+">	c #54B550",
+",	c #52B14E",
+"'	c #6ABC67",
+")	c #52B34E",
+"!	c #377334",
+"~	c #6FAF6C",
+"{	c #50B24C",
+"]	c #4FB14B",
+"^	c #48A144",
+"/	c #4C734A",
+"(	c #5DB559",
+"_	c #4DAE49",
+":	c #4CAD48",
+"<	c #6BB569",
+"[	c #4AAC46",
+"}	c #377F35",
+"|	c #5E915C",
+"1	c #50AD4C",
+"2	c #48A944",
+"3	c #44A040",
+"4	c #61B05E",
+"5	c #45A641",
+"6	c #527F50",
+"7	c #7BBF78",
+"8	c #78BA75",
+"9	c #639C60",
+"0	c #46A542",
+"a	c #42A33E",
+"b	c #368633",
+"c	c #389035",
+"d	c #3FA13B",
+"e	c #43A33F",
+"f	c #619B5E",
+"g	c #56AC53",
+"h	c #3D9D39",
+"i	c #3B9C37",
+"j	c #3C9E38",
+"k	c #54A951",
+"l	c #64A761",
+"m	c #3D9E39",
+"n	c #2A6B26",
+"o	c #3A9B35",
+"p	c #3B9B36",
+"q	c #62A55F",
+"r	c #4B7749",
+"s	c #48A243",
+"t	c #33892F",
+"u	c #328B2F",
+"v	c #379833",
+"w	c #459F41",
+"x	c #4F7E4D",
+"y	c #5CA659",
+"z	c #369632",
+"A	c #349530",
+"B	c #349630",
+"C	c #59A955",
+"D	c #3A9936",
+"E	c #276C25",
+"F	c #256C22",
+"G	c #32932E",
+"H	c #2F892B",
+"I	c #2C8728",
+"J	c #2F912B",
+"K	c #2F902B",
+"L	c #2D8E29",
+"M	c #2D8F29",
+"N	c #257322",
+"O	c #226E1F",
+"P	c #2B8D27",
+"Q	c #298826",
+"R	c #288424",
+"                        ",
+"                        ",
+"                 .+++@  ",
+"                #$%%%   ",
+"                &***=   ",
+"               -;>>,    ",
+"               ')))!    ",
+"              ~{]]^     ",
+"             /(__:      ",
+"             <[[[}      ",
+"            |1223       ",
+"            4555        ",
+" 67778     90aab        ",
+"  cddef    gddh         ",
+"   ijjk   lmjj          ",
+"   noopq rsoot          ",
+"    uvvwxyvvz           ",
+"     ABBCDBBE           ",
+"     FGGGGGH            ",
+"      IJJJK             ",
+"       LMMN             ",
+"       OPQ              ",
+"        R               ",
+"                        "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/symbole2.csv b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/symbole2.csv
new file mode 100755
index 000000000..8f85c38d7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/symbole2.csv
@@ -0,0 +1,445 @@
+"id";"name";"sym_klassifiz_id";"name";"symbol_id_code";"id";"name";"def_symbol_id"
+"611";"ADMINISTRATIVE FINANCE";"331";"FINANCE";"S*G*USAF--*****";"(null)";"(null)";"(null)"
+"609";"ADMINISTRATIVE JUDGE ADVOCATE GENERAL (JAG)";"325";"JUDGEADVOCATEGENERAL(JAG)";"S*G*USAJ--*****";"(null)";"(null)";"(null)"
+"606";"ADMINISTRATIVE LABOUR";"355";"LABOUR";"S*G*USAL--*****";"(null)";"(null)";"(null)"
+"607";"ADMINISTRATIVE MORAL, WELFARE, RECREATION (MWR)";"358";"MORAL,WELFARE,RECREATION(MWR)";"S*G*USAW--*****";"(null)";"(null)";"(null)"
+"613";"ADMINISTRATIVE MORTUARY/GRAVE REGISTRY";"337";"MORTUARY/GRAVESREGISTRY";"S*G*USAM--*****";"(null)";"(null)";"(null)"
+"612";"ADMINISTRATIVE PERSONNEL SERVICES";"334";"PERSONNELSERVICES";"S*G*USAS--*****";"(null)";"(null)";"(null)"
+"610";"ADMINISTRATIVE POSTAL";"328";"POSTAL";"S*G*USAO--*****";"(null)";"(null)";"(null)"
+"615";"ADMINISTRATIVE PUPLIC AFFAIRS";"343";"PUBLICAFFAIRS";"S*G*USAP--*****";"(null)";"(null)";"(null)"
+"608";"ADMINISTRATIVE QUARTERMASTER (";"361";"QUARTERMASTER(SUPPLY)";"S*G*USAQ--*****";"(null)";"(null)";"(null)"
+"614";"ADMINISTRATIVE RELIGIOUS/CHAPLAIN";"340";"RELIGIOUS/CHAPLAIN";"S*G*USAR--*****";"(null)";"(null)";"(null)"
+"605";"ADMINISTRATIVE REPLACEMENT HOLDING UNIT (RHV)";"352";"REPLACEMENTHOLDINGUNIT(RHU)";"S*G*USAX--*****";"(null)";"(null)";"(null)"
+"364";"AIR DEFENCE";"79";"AIRDEFENCE";"S*G*UCD---*****";"(null)";"(null)";"(null)"
+"664";"AIR DEFENCE (AD) MISSILE LAUNC";"471";"AIRDEFENCE(AD)MISSILELAUNCH";"S*G*EWMA--*****";"(null)";"(null)";"(null)"
+"379";"AIR DEFENCE COMPOSITE";"90";"COMPOSITE";"S*G*UCDC--*****";"(null)";"(null)";"(null)"
+"367";"Air Defence COY";"79";"AIRDEFENCE";"S*G*UCD---*****";"(null)";"(null)";"(null)"
+"683";"AIR DEFENCE GUN";"527";"AIRDEFENCEGUN";"S*G*EWA---*****";"(null)";"(null)";"(null)"
+"686";"AIR DEFENCE GUN HEAVY";"530";"AIRDEFENCEGUNHEAVY";"S*G*EWAH--*****";"(null)";"(null)";"(null)"
+"684";"AIR DEFENCE GUN LIGHT";"528";"AIRDEFENCEGUNLIGHT";"S*G*EWAL--*****";"(null)";"(null)";"(null)"
+"685";"AIR DEFENCE GUN MEDIUM";"529";"AIRDEFENCEGUNMEDIUM";"S*G*EWAM--*****";"44";"Soldier Air Defence";"685"
+"378";"AIR DEFENCE GUN UNIT";"89";"GUNUNIT";"S*G*UCDG--*****";"(null)";"(null)";"(null)"
+"377";"AIR DEFENCE H/MAD";"88";"H/MAD";"S*G*UCDH--*****";"(null)";"(null)";"(null)"
+"372";"AIR DEFENCE MISSILE";"83";"AIRDEFENCEMISSILE";"S*G*UCDM--*****";"(null)";"(null)";"(null)"
+"376";"AIR DEFENCE MISSILE HEAVY";"87";"AIRDEFENCEMISSILEHEAVY";"S*G*UCDMH-*****";"(null)";"(null)";"(null)"
+"373";"AIR DEFENCE MISSILE LIGHT";"84";"AIRDEFENCEMISSILELIGHT";"S*G*UCDML-*****";"229";"Legatus Wiesel";"373"
+"375";"AIR DEFENCE MISSILE MEDIUM";"86";"AIRDEFENCEMISSILEMEDIUM";"S*G*UCDMM-*****";"(null)";"(null)";"(null)"
+"374";"AIR DEFENCE MISSILE MOTORIZED";"85";"AIRDEFENCEMISSILEMOTORIZED";"S*G*UCDMLA*****";"(null)";"(null)";"(null)"
+"369";"AIR DEFENCE SHORT RANGE";"80";"SHORTRANGE";"S*G*UCDS--*****";"(null)";"(null)";"(null)"
+"371";"AIR DEFENCE SHORT RANGE GUN";"82";"GUN";"S*G*UCDS--*****";"(null)";"(null)";"(null)"
+"370";"AIR DEFENCE SHORT RANGE MISSILE";"81";"MISSILE";"S*G*UCDS--*****";"(null)";"(null)";"(null)"
+"380";"AIR DEFENCE TARGETING UNIT";"91";"TARGETINGUNIT";"S*G*UCDT--*****";"(null)";"(null)";"(null)"
+"381";"AIR DEFENCE THEATRE  MISSILE DEFENCE UNIT";"92";"THEATREMISSILEDEFENCEUNIT";"S*G*UCDO--*****";"(null)";"(null)";"(null)"
+"781";"AIRPORT/AIRBASE";"605";"AIRPORT/AIRBASE";"S*G*IBA---H****";"(null)";"(null)";"(null)"
+"342";"AIR TRACK";"6";"AIRTRACK";"S*A*------*****";"(null)";"(null)";"(null)"
+"777";"AMMUNITION AND EXPLOSIVES PRODUCTION";"595";"AMMUNITIONANDEXPLOSIVESPRODUCTION";"S*G*IME---H****";"(null)";"(null)";"(null)"
+"788";"AMPHIBIOUS WARFARE SHIP";"620";"AMPHIBIOUSWARFARESHIP";"S*S*CA----*****";"(null)";"(null)";"(null)"
+"414";"ANTI ARMOUR";"110";"ANTIARMOUR";"S*G*UCAA--*****";"(null)";"(null)";"(null)"
+"422";"ANTI ARMOUR AIR ASSAULT";"114";"ANTIARMOURAIRASSAULT";"S*G*UCAAS-*****";"(null)";"(null)";"(null)"
+"421";"ANTI ARMOUR AIRBORNE";"113";"ANTIARMOURAIRBORNE";"S*G*UCAAM-*****";"(null)";"(null)";"(null)"
+"424";"ANTI ARMOUR ARMOURED";"117";"ANTIARMOURARMOURED";"S*G*UCAAA-*****";"(null)";"(null)";"(null)"
+"427";"ANTI ARMOUR ARMOURED AIR ASSAU";"120";"ANTIARMOURARMOUREDAIRASSAULT";"S*G*UCAAAS*****";"(null)";"(null)";"(null)"
+"425";"ANTI ARMOUR ARMOURED TRACKED";"118";"ANTIARMOURARMOUREDTRACKED";"S*G*UCAAAT*****";"(null)";"(null)";"(null)"
+"426";"ANTI ARMOUR ARMOURED WHEELED";"119";"ANTIARMOURARMOUREDWHEELED";"S*G*UCAAAW*****";"(null)";"(null)";"(null)"
+"419";"ANTI ARMOUR DISMOUNTED";"111";"ANTIARMOURDISMOUNTED";"S*G*UCAAD-*****";"(null)";"(null)";"(null)"
+"420";"ANTI ARMOUR LIGHT";"112";"ANTIARMOURLIGHT";"S*G*UCAAL-*****";"(null)";"(null)";"(null)"
+"428";"ANTI ARMOUR MOTORIZED";"121";"ANTIARMOURMOTORIZED";"S*G*UCAAO-*****";"(null)";"(null)";"(null)"
+"429";"ANTI ARMOUR MOTORIZED AIR ASSA";"122";"ANTIARMOURMOTORIZEDAIRASSAULT";"S*G*UCAAOS*****";"(null)";"(null)";"(null)"
+"423";"ANTI ARMOUR MOUNTAIN";"115";"ANTIARMOURMOUNTAIN";"S*G*UCAAU-*****";"(null)";"(null)";"(null)"
+"718";"ANTITANK GUN";"515";"ANTITANKGUN";"S*G*EWG---*****";"130";"Soldier AT (RPG7)";"718"
+"722";"ANTITANK GUN HEAVY";"519";"ANTITANKGUNHEAVY";"S*G*EWGH--*****";"(null)";"(null)";"(null)"
+"720";"ANTITANK GUN LIGHT";"517";"ANTITANKGUNLIGHT";"S*G*EWGL--*****";"(null)";"(null)";"(null)"
+"721";"ANTITANK GUN MEDIUM";"518";"ANTITANKGUNMEDIUM";"S*G*EWGM--*****";"(null)";"(null)";"(null)"
+"719";"ANTITANK GUN RECOILLESS";"516";"ANTITANKGUNRECOILLESS";"S*G*EWGR--*****";"(null)";"(null)";"(null)"
+"695";"ANTITANK ROCKET LAUNCHER";"492";"ANTITANKROCKETLAUNCHER";"S*G*EWT---*****";"(null)";"(null)";"(null)"
+"698";"ANTITANK ROCKET LAUNCHER HEAVY";"495";"ANTITANKROCKETLAUNCHERHEAVY";"S*G*EWTH--*****";"(null)";"(null)";"(null)"
+"696";"ANTITANK ROCKET LAUNCHER LIGHT";"493";"ANTITANKROCKETLAUNCHERLIGHT";"S*G*EWTL--*****";"(null)";"(null)";"(null)"
+"697";"ANTITANK ROCKET LAUNCHER MEDIU";"494";"ANTITANKROCKETLAUNCHERMEDIUM";"S*G*EWTM--*****";"(null)";"(null)";"(null)"
+"392";"ARMOUR";"93";"ARMOUR";"S*G*UCA---*****";"(null)";"(null)";"(null)"
+"752";"ARMOURED CARRIER WITH SCATTERA";"561";"ARMOUREDCARRIERWITHSCATTERABLEMINES";"S*G*EVEMSM*****";"(null)";"(null)";"(null)"
+"734";"ARMOURED INFANTRY";"542";"ARMOUREDINFANTRY";"S*G*EVAI--*****";"(null)";"(null)";"(null)"
+"732";"ARMOURED PERSONNEL CARRIER";"540";"ARMOUREDPERSONNELCARRIER";"S*G*EVAA--*****";"(null)";"(null)";"(null)"
+"733";"ARMOURED PERSONNEL CARRIER REC";"541";"ARMOUREDPERSONNELCARRIERRECOVERY";"S*G*EVAAR-*****";"(null)";"(null)";"(null)"
+"724";"ARMOURED VEHICLE";"532";"ARMOUREDVEHICLE";"S*G*EVA---*****";"231";"Marder";"724"
+"750";"ARMOURED VEHICLE MOUNTED";"558";"ARMOUREDVEHICLEMOUNTED";"S*G*EVEMA-*****";"(null)";"(null)";"(null)"
+"397";"ARMOUR TRACK";"94";"ARMOURTRACK";"S*G*UCAT--*****";"(null)";"(null)";"(null)"
+"398";"ARMOUR TRACK AIRBORNE";"95";"ARMOURTRACKAIRBORNE";"S*G*UCATA-*****";"(null)";"(null)";"(null)"
+"399";"ARMOUR TRACK AMPHIBIOUS";"96";"ARMOURTRACKAMPHIBIOUS";"S*G*UCATW-*****";"(null)";"(null)";"(null)"
+"400";"ARMOUR TRACK AMPHIBIOUS RECOVE";"97";"ARMOURTRACKAMPHIBIOUSRECOVERY";"S*G*UCATWR*****";"(null)";"(null)";"(null)"
+"403";"ARMOUR TRACK HEAVY";"100";"ARMOURTRACK,HEAVY";"S*G*UCATH-*****";"(null)";"(null)";"(null)"
+"401";"ARMOUR TRACK LIGHT";"98";"ARMOURTRACK,LIGHT";"S*G*UCATL-*****";"(null)";"(null)";"(null)"
+"402";"ARMOUR TRACK MEDIUM";"99";"ARMOURTRACK,MEDIUM";"S*G*UCATM-*****";"(null)";"(null)";"(null)"
+"404";"ARMOUR TRACK RECOVERY";"101";"ARMOURTRACK,RECOVERY";"S*G*UCATR-*****";"(null)";"(null)";"(null)"
+"405";"ARMOUR WHEELED";"102";"ARMOUR,WHEELED";"S*G*UCAW--*****";"(null)";"(null)";"(null)"
+"406";"ARMOUR WHEELED AIR ASSAULT";"103";"ARMOUR,WHEELEDAIRASSAULT";"S*G*UCAWS-*****";"(null)";"(null)";"(null)"
+"407";"ARMOUR WHEELED AIRBORNE";"104";"ARMOUR,WHEELEDAIRBORNE";"S*G*UCAWA-*****";"227";"BMP3 IFV";"407"
+"408";"ARMOUR WHEELED AMPHIBIOUS";"105";"ARMOUR,WHEELEDAMPHIBIOUS";"S*G*UCAWA-*****";"(null)";"(null)";"(null)"
+"409";"ARMOUR WHEELED AMPHIBIOUS RECO";"1325";"ARMOURWHEELEDAMPHIBIOUSRECOVERY";"S*G*UCAWWR*****";"(null)";"(null)";"(null)"
+"412";"ARMOUR WHEELED HEAVY";"108";"ARMOUR,WHEELEDHEAVY";"S*G*UCAWH-*****";"(null)";"(null)";"(null)"
+"410";"ARMOUR WHEELED LIGHT";"106";"ARMOUR,WHEELEDLIGHT";"S*G*UCAWL-*****";"(null)";"(null)";"(null)"
+"411";"ARMOUR WHEELED MEDIUM";"107";"ARMOUR,WHEELEDMEDIUM";"S*G*UCAWM-*****";"(null)";"(null)";"(null)"
+"413";"ARMOUR WHEELED RECOVERY";"109";"ARMOUR,WHEELEDRECOVERY";"S*G*UCAWR-*****";"10";"Armored Recovery Vehicle";"413"
+"789";"ASSAULT VESSEL";"621";"ASSAULTVESSEL";"S*S*CALA--*****";"(null)";"(null)";"(null)"
+"776";"ATOMIC ENERGY PRODUCTION";"593";"ATOMICENERGYPRODUCTION";"S*G*IMF---H****";"(null)";"(null)";"(null)"
+"430";"AVIATION";"123";"AVIATION";"S*G*UCV---*****";"(null)";"(null)";"(null)"
+"431";"AVIATION FIXED WING";"124";"FIXEDWING";"S*G*UCVF--*****";"(null)";"(null)";"(null)"
+"433";"AVIATION FIXED WING ATTACK";"126";"ATTACKFIXEDWING";"S*G*UCVFA-*****";"(null)";"(null)";"(null)"
+"436";"AVIATION FIXED WING RECON";"129";"RECONFIXEDWING";"S*G*UCVFR-*****";"(null)";"(null)";"(null)"
+"432";"AVIATION FIXED WING UTILITY";"125";"UTILITYFIXEDWING";"S*G*UCVFU-*****";"(null)";"(null)";"(null)"
+"435";"AVIATION FORWARD AIR CONTROLLER (FAC)";"128";"FORWARDAIRCONTROLLER(FAC)";"S*G*UCVUFC*****";"(null)";"(null)";"(null)"
+"437";"AVIATION ROTARY WING";"130";"ROTARYWING";"S*G*UCVR--*****";"(null)";"(null)";"(null)"
+"440";"AVIATION ROTARY WING C2";"138";"C2ROTARYWING";"S*G*UCVRUC*****";"(null)";"(null)";"(null)"
+"441";"AVIATION ROTARY WING MEDEVAC";"139";"MEDEVACROTARYWING";"S*G*UCVRUE*****";"(null)";"(null)";"(null)"
+"439";"AVIATION ROTARY WING UTILITY";"134";"UTILITYROTARYWING";"S*G*UCVRU-*****";"(null)";"(null)";"(null)"
+"434";"AVIATION TACTICAL AIR CONTROL";"127";"TACTICALAIRCONTROLPARTY(TACP)";"S*G*UCVUTP*****";"(null)";"(null)";"(null)"
+"445";"AVIATION UAV CONTROL";"1326";"AVIATIONUAVCONTROL";"S*G*UCVU--*****";"(null)";"(null)";"(null)"
+"446";"AVIATION UAV LAUNCHER";"1327";"AVIATIONUAVLAUNCHER";"S*G*UCVU--*****";"(null)";"(null)";"(null)"
+"447";"AVIATION UAV RECOVERY";"1337";"AVIATIONUAVRECOVERY";"S*G*UCVU--*****";"(null)";"(null)";"(null)"
+"444";"AVIATION UNMANNED AERIAL VEHIC";"145";"UNMANNEDAERIALVEHICLEFIXEDWING";"S*G*UCVUF-*****";"(null)";"(null)";"(null)"
+"448";"AVIATION UNMANNED AERIAL VEHICLE ROTARY WING";"146";"UNMANNEDAERIALVEHICLEROTARYWING";"S*G*UCVUR-*****";"(null)";"(null)";"(null)"
+"443";"AVIATION UNMANNED AVIATION VEH";"144";"UNMANNEDAERIALVEHICLE";"S*G*UCVU--*****";"(null)";"(null)";"(null)"
+"442";"AVIATION VERTICAL/SHORT TAKEOF";"143";"VERTICAL/SHORTTAKEOFFANDLANDING(V/STOL)";"S*G*UCVV--*****";"(null)";"(null)";"(null)"
+"769";"BIOLOGICAL";"581";"BIOLOGICAL";"S*G*IRNB--H****";"(null)";"(null)";"(null)"
+"745";"BRIDGE";"553";"BRIDGE";"S*G*EVEB--*****";"(null)";"(null)";"(null)"
+"778";"BRIDGE";"599";"BRIDGE";"S*G*IMNB--H****";"(null)";"(null)";"(null)"
+"739";"BUS";"547";"BUS";"S*G*EVUB--*****";"(null)";"(null)";"(null)"
+"735";"C2V/ACV";"543";"C2V/ACV";"S*G*EVAC--*****";"(null)";"(null)";"(null)"
+"548";"CBRN";"256";"COMBATSUPPORTCBRN";"S*G*UUA---*****";"(null)";"(null)";"(null)"
+"768";"CBRN";"580";"CBRN";"S*G*IRN---H****";"(null)";"(null)";"(null)"
+"560";"CBRN BIOLOGICAL";"268";"BIOLOGICAL";"S*G*UUAB--*****";"(null)";"(null)";"(null)"
+"561";"CBRN BIOLOGICAL RECON EQUIPPED";"269";"RECONEQUIPPED";"S*G*UUABR-*****";"(null)";"(null)";"(null)"
+"549";"CBRN CHEMICAL";"257";"CHEMICAL";"S*G*UUAC--*****";"(null)";"(null)";"(null)"
+"556";"CBRN CHEMICAL RECON";"264";"CHEMICALRECON";"S*G*UUACR-*****";"(null)";"(null)";"(null)"
+"553";"CBRN CHEMICAL SMOKE";"261";"SMOKE";"S*G*UUACS-*****";"(null)";"(null)";"(null)"
+"555";"CBRN CHEMICAL SMOKE ARMOUR";"263";"ARMOURSMOKE";"S*G*UUACSA*****";"(null)";"(null)";"(null)"
+"550";"CBRN CHEMICAL SMOKE/DECON";"258";"SMOKE/DECON";"S*G*UUACC-*****";"(null)";"(null)";"(null)"
+"551";"CBRN CHEMICAL SMOKE/DECON MECHANIZED";"259";"MECHANIZEDSMOKE/DECON";"S*G*UUACCK*****";"(null)";"(null)";"(null)"
+"552";"CBRN CHEMICAL SMOKE/DECON MOTO";"260";"MOTORIZEDSMOKE/DECON";"S*G*UUACCM*****";"(null)";"(null)";"(null)"
+"554";"CBRN CHEMICAL SMOKE MOTORIZED";"262";"MOTORIZEDSMOKE";"S*G*UUACSM*****";"(null)";"(null)";"(null)"
+"557";"CBRN CHEMICAL WHEELED ARMOURED VEHICLE";"265";"CHEMICALWHEELEDARMOUREDVEHICLE";"S*G*UUACRW*****";"(null)";"(null)";"(null)"
+"558";"CBRN CHEMICAL WHEELED ARMOURED VEHICLE RECONNAISAN";"266";"CHEMICALWHEELEDARMOUREDVEHICLERECONNAISSANCESURVEI";"S*G*UUACRS*****";"(null)";"(null)";"(null)"
+"562";"CBRN DECON";"270";"DECONTAMINATION";"S*G*UUAD--*****";"(null)";"(null)";"(null)"
+"564";"CBRN DECON EQUIPMENT";"1330";"CBRNDECONEQUIPMENT";"S*G*UUADE-*****";"(null)";"(null)";"(null)"
+"565";"CBRN DECON EQUIPMENT/TROOP";"1331";"CBRNDECONEQUIPMENT/TROOP";"S*G*UUADET*****";"(null)";"(null)";"(null)"
+"563";"CBRN DECON TROOP";"1329";"CBRNDECONTROOP";"S*G*UUADT-*****";"(null)";"(null)";"(null)"
+"760";"CBRN EQUIPMENT";"571";"CBRNEQUIPMENT";"S*G*EXN---*****";"(null)";"(null)";"(null)"
+"566";"CBRN LABORATORY";"1332";"CBRNLABORATORY";"S*G*UUAL--*****";"(null)";"(null)";"(null)"
+"559";"CBRN NUCLEAR";"267";"NUCLEAR";"S*G*UUAN--*****";"(null)";"(null)";"(null)"
+"770";"CHEMICAL";"582";"CHEMICAL";"S*G*IRNC--H****";"(null)";"(null)";"(null)"
+"356";"CIVIL FIXED WING";"73";"FIXEDWING";"S*A*CF----*****";"(null)";"(null)";"(null)"
+"755";"CIVILIAN VEHICLE";"565";"CIVILIANVEHICLE";"S*G*EVC---*****";"(null)";"(null)";"(null)"
+"357";"CIVIL ROTARY WING";"74";"ROTARYWING";"S*A*CH----*****";"(null)";"(null)";"(null)"
+"604";"COMBAT SERVICE SUPPORT";"321";"COMBATSERVICESUPPORT";"S*G*US----*****";"(null)";"(null)";"(null)"
+"736";"COMBAT SERVICE SUPPORT VEHICLE";"544";"COMBATSERVICESUPPORTVEHICLE";"S*G*EVAS--*****";"(null)";"(null)";"(null)"
+"547";"COMBAT SUPPORT";"255";"COMBATSUPPORT";"S*G*UU----*****";"(null)";"(null)";"(null)"
+"748";"CONSTRUCTION VEHICLE";"556";"CONSTRUCTIONVEHICLE";"S*G*EVEC--*****";"(null)";"(null)";"(null)"
+"742";"CROSS-COUNTRY TRUCK";"550";"CROSS-COUNTRYTRUCK";"S*G*EVUX--*****";"212";"TATRA Tanker Fuel";"742"
+"742";"CROSS-COUNTRY TRUCK";"550";"CROSS-COUNTRYTRUCK";"S*G*EVUX--*****";"50";"Truck 2t off-road";"742"
+"772";"DECON";"585";"DECON";"S*G*IPD---H****";"(null)";"(null)";"(null)"
+"676";"DIRECT FIRE GUN";"520";"DIRECTFIREGUN";"S*G*EWD---*****";"(null)";"(null)";"(null)"
+"681";"DIRECT FIRE GUN HEAVY";"525";"DIRECTFIREGUNHEAVY";"S*G*EWDH--*****";"(null)";"(null)";"(null)"
+"682";"DIRECT FIRE GUN HEAVY SELF-PRO";"526";"DIRECTFIREGUNHEAVYSELF-PROPELLED";"S*G*EWDHS-*****";"(null)";"(null)";"(null)"
+"677";"DIRECT FIRE GUN LIGHT";"521";"DIRECTFIREGUNLIGHT";"S*G*EWDL--*****";"(null)";"(null)";"(null)"
+"678";"DIRECT FIRE GUN LIGHT SELF PRO";"522";"DIRECTFIREGUNLIGHTSELF-PROPELLED";"S*G*EWDLS-*****";"(null)";"(null)";"(null)"
+"679";"DIRECT FIRE GUN MEDIUM";"523";"DIRECTFIREGUNMEDIUM";"S*G*EWDM--*****";"(null)";"(null)";"(null)"
+"680";"DIRECT FIRE GUN MEDIUM SELF-PR";"524";"DIRECTFIREGUNMEDIUMSELF-PROPELLED";"S*G*EWDMS-*****";"(null)";"(null)";"(null)"
+"753";"DOZER";"562";"DOZER";"S*G*EVED--*****";"215";"CAT Excavator";"753"
+"746";"EARTHMOVER";"554";"EARTHMOVER";"S*G*EVEE--*****";"(null)";"(null)";"(null)"
+"774";"ELCECTRIC POWER FACILITY";"590";"ELECTRICPOWERFACILITY";"S*G*IUE---H****";"(null)";"(null)";"(null)"
+"758";"EMPLACED SENSOR";"568";"EMPLACEDSENSOR";"S*G*ESE---*****";"(null)";"(null)";"(null)"
+"467";"ENGINEER";"159";"ENGINEER";"S*G*UCE---*****";"(null)";"(null)";"(null)"
+"472";"ENGINEER COMBAT";"160";"ENGINEERCOMBAT";"S*G*UCEC--*****";"(null)";"(null)";"(null)"
+"473";"ENGINEER COMBAT AIR ASSAULT";"161";"ENGINEERCOMBATAIRASSAULT";"S*G*UCECS-*****";"(null)";"(null)";"(null)"
+"478";"ENGINEER COMBAT AIRBORNE";"162";"ENGINEERCOMBATAIRBORNE";"S*G*UCECA-*****";"(null)";"(null)";"(null)"
+"475";"ENGINEER COMBAT BRIDGING";"171";"ENGINEERCOMBATBRIDGING";"S*G*UCEC--*****";"(null)";"(null)";"(null)"
+"481";"ENGINEER COMBAT HEAVY";"166";"ENGINEERCOMBATHEAVY";"S*G*UCECH-*****";"(null)";"(null)";"(null)"
+"479";"ENGINEER COMBAT LIGHT";"164";"ENGINEERCOMBATLIGHT";"S*G*UCECL-*****";"(null)";"(null)";"(null)"
+"482";"ENGINEER COMBAT MECH (TRACK)";"167";"ENGINEERCOMBATMECHANIZED(TRACK)";"S*G*UCECT-*****";"(null)";"(null)";"(null)"
+"480";"ENGINEER COMBAT MEDIUM";"165";"ENGINEERCOMBATMEDIUM";"S*G*UCECM-*****";"(null)";"(null)";"(null)"
+"476";"ENGINEER COMBAT MINE CLEARING";"172";"ENGINEERCOMBATMINECLEARING";"S*G*UCEC--*****";"(null)";"(null)";"(null)"
+"477";"ENGINEER COMBAT MINE LAYING";"173";"ENGINEERCOMBATMINELAYING";"S*G*UCEC--*****";"(null)";"(null)";"(null)"
+"483";"ENGINEER COMBAT MOTORIZED";"168";"ENGINEERCOMBATMOTORIZED";"S*G*UCECW-*****";"(null)";"(null)";"(null)"
+"484";"ENGINEER COMBAT MOUNTAIN";"169";"ENGINEERCOMBATMOUNTAIN";"S*G*UCECO-*****";"(null)";"(null)";"(null)"
+"474";"ENGINEER COMBAT RECON";"170";"ENGINEERCOMBATRECON";"S*G*UCECR-*****";"(null)";"(null)";"(null)"
+"485";"ENGINEER CONSTRUCTION";"175";"ENGINEERCONSTRUCTION";"S*G*UCEN--*****";"(null)";"(null)";"(null)"
+"744";"ENGINEER VEHICLE";"552";"ENGINEERVEHICLE";"S*G*EVE---*****";"(null)";"(null)";"(null)"
+"657";"ENVIRONMENTAL PROTECTION";"463";"ENVIRONMENTALPROTECTION";"S*G*USXEP-*****";"(null)";"(null)";"(null)"
+"576";"EW CORPS";"280";"CORPS";"S*G*UUMSEC*****";"(null)";"(null)";"(null)"
+"575";"EW THEATRE";"279";"THEATRE";"S*G*UUMSET*****";"(null)";"(null)";"(null)"
+"602";"EXPLOSIVE ORDNANCE DISPOSAL";"317";"EXPLOSIVEORDINANCEDISPOSAL";"S*G*UUE---*****";"(null)";"(null)";"(null)"
+"490";"FIELD ARTELLERY HOWITZER/GUN AIRBORNE";"181";"AIRBORNE";"S*G*UCFHA-*****";"(null)";"(null)";"(null)"
+"495";"FIELD ARTELLERY HOWITZER/GUN AMPHIBIOUS";"187";"AMPHIBIOUS";"S*G*UCFHX-*****";"(null)";"(null)";"(null)"
+"494";"FIELD ARTELLERY HOWITZER/GUN HEAVY";"186";"HEAVY";"S*G*UCFHH-*****";"(null)";"(null)";"(null)"
+"492";"FIELD ARTELLERY HOWITZER/GUN LIGHT";"184";"LIGHT";"S*G*UCFHL-*****";"(null)";"(null)";"(null)"
+"493";"FIELD ARTELLERY HOWITZER/GUN MEDIUM";"185";"MEDIUM";"S*G*UCFHM-*****";"(null)";"(null)";"(null)"
+"491";"FIELD ARTELLERY HOWITZER/GUN MOUNTAIN";"183";"MOUNTAIN";"S*G*UCFHO-*****";"(null)";"(null)";"(null)"
+"496";"FIELD ARTELLERY ROCKET";"188";"ROCKET";"S*G*UCFR--*****";"(null)";"(null)";"(null)"
+"498";"FIELD ARTILEERY ROCKET SINGLE";"190";"SINGLEROCKETSELFPROPELLED";"S*G*UCFRSS*****";"(null)";"(null)";"(null)"
+"486";"FIELD ARTILLERY";"177";"FIELDARTILLERY";"S*G*UCF---*****";"(null)";"(null)";"(null)"
+"521";"FIELD ARTILLERY ARTILLERY SURV";"214";"ARTILLERYSURVEY";"S*G*UCFS--*****";"(null)";"(null)";"(null)"
+"523";"FIELD ARTILLERY FIRE DIRECTION CENTRE";"224";"FIREDIRECTIONCENTRE";"S*G*UCF---*****";"(null)";"(null)";"(null)"
+"487";"FIELD ARTILLERY HOWITZER/GUN";"178";"HOWITZER/GUN";"S*G*UCFH--*****";"(null)";"(null)";"(null)"
+"489";"FIELD ARTILLERY HOWITZER/GUN AIR ASSAULT";"180";"AIRASSAULT";"S*G*UCFHS-*****";"(null)";"(null)";"(null)"
+"488";"FIELD ARTILLERY HOWITZER/GUN SELF-PROPELLED";"179";"SELFPROPELLED";"S*G*UCFHE-*****";"(null)";"(null)";"(null)"
+"522";"FIELD ARTILLERY METEOROLOGICAL";"219";"METEOROLOGICAL";"S*G*UCFO--*****";"(null)";"(null)";"(null)"
+"513";"FIELD ARTILLERY MORTAR";"205";"MORTAR";"S*G*UCFM--*****";"(null)";"(null)";"(null)"
+"514";"FIELD ARTILLERY MORTAR SP TRAC";"206";"SELFPROPELLED(SP)TRACKEDMORTAR";"S*G*UCFMS-*****";"(null)";"(null)";"(null)"
+"515";"FIELD ARTILLERY MORTAR SP WHEE";"207";"SPWHEELEDMORTAR";"S*G*UCFMSW*****";"(null)";"(null)";"(null)"
+"516";"FIELD ARTILLERY MORTAR TOWED";"208";"TOWEDMORTAR";"S*G*UCFMT-*****";"(null)";"(null)";"(null)"
+"518";"FIELD ARTILLERY MORTAR TOWED A";"210";"TOWEDAIRASSAULTMORTAR";"S*G*UCFMTS*****";"(null)";"(null)";"(null)"
+"517";"FIELD ARTILLERY MORTAR TOWED A";"209";"TOWEDAIRBORNEMORTAR";"S*G*UCFMTA*****";"(null)";"(null)";"(null)"
+"519";"FIELD ARTILLERY MORTAR TOWED M";"212";"TOWEDMOUNTAINMORTAR";"S*G*UCFMTO*****";"(null)";"(null)";"(null)"
+"524";"FIELD ARTILLERY OBERSERVER";"225";"OBERSERVER";"S*G*UCF---*****";"(null)";"(null)";"(null)"
+"502";"FIELD ARTILLERY ROCKET MULTI R";"194";"MULTIROCKETSELFPROPELLED";"S*G*UCFRMS*****";"(null)";"(null)";"(null)"
+"504";"FIELD ARTILLERY ROCKET MULTI ROCKET LAUNCER MULTI";"196";"MULTIROCKETTOWED";"S*G*UCFRMT*****";"(null)";"(null)";"(null)"
+"503";"FIELD ARTILLERY ROCKET MULTI ROCKET LAUNCER MULTI";"195";"MULTIROCKETTRUCK";"S*G*UCFRMR*****";"(null)";"(null)";"(null)"
+"501";"FIELD ARTILLERY ROCKET MULTI ROCKET LAUNCHER";"193";"MULTIROCKETLAUNCHER";"S*G*UCFRM-*****";"(null)";"(null)";"(null)"
+"497";"FIELD ARTILLERY ROCKET SINGLE";"189";"SINGLEROCKETLAUNCHER";"S*G*UCFRS-*****";"(null)";"(null)";"(null)"
+"499";"FIELD ARTILLERY ROCKET SINGLE ROCKET LAUNCHER SING";"191";"SINGLEROCKETTRUCK";"S*G*UCFRSR*****";"(null)";"(null)";"(null)"
+"500";"FIELD ARTILLERY ROCKET SINGLE ROCKET LAUNCHER SING";"192";"SINGLEROCKETTOWED";"S*G*UCFRST*****";"(null)";"(null)";"(null)"
+"506";"FIELD ARTILLERY TARGET ACQUISI";"198";"RADAR";"S*G*UCFTR-*****";"(null)";"(null)";"(null)"
+"505";"FIELD ARTILLERY TARGET ACQUISITION";"197";"TARGETACQUISITION";"S*G*UCFT--*****";"(null)";"(null)";"(null)"
+"510";"FIELD ARTILLERY TARGET ACQUISITION DISMOUNTED";"202";"TARGETACQUISITIONDISMOUNTED";"S*G*UCFTCD*****";"(null)";"(null)";"(null)"
+"508";"FIELD ARTILLERY TARGET ACQUISITION FLASH (OPTICAL)";"200";"FLASH(OPTICAL)";"S*G*UCFTF-*****";"(null)";"(null)";"(null)"
+"509";"FIELD ARTILLERY TARGET ACQUISITION MOUNTED";"201";"TARGETACQUISITIONMOUNTED";"S*G*UCFTC-*****";"(null)";"(null)";"(null)"
+"512";"FIELD ARTILLERY TARGET ACQUISITION NAVAL GUNFIRE";"204";"TARGETACQUISITIONNAVALGUNFIRE";"S*G*UCFTA-*****";"(null)";"(null)";"(null)"
+"507";"FIELD ARTILLERY TARGET ACQUISITION SOUND";"199";"SOUND";"S*G*UCFTS-*****";"(null)";"(null)";"(null)"
+"511";"FIELD ARTILLERY TARGET ACQUISITION TRACKED";"203";"TARGETACQUISITIONTRACKED";"S*G*UCFTCM*****";"(null)";"(null)";"(null)"
+"345";"FIXED WING DRONE (RPV/UAE)";"36";"DRONE(RPV/UAV)";"S*A*MFQ---*****";"(null)";"(null)";"(null)"
+"761";"FLAME THROWER";"572";"FLAMETHROWER";"S*G*EXF---*****";"(null)";"(null)";"(null)"
+"660";"GENERAL HEADQUATERS AND SERVICE";"466";"GENERALHEADQUARTERSANDSERVICE";"S*G*UH----*****";"(null)";"(null)";"(null)"
+"779";"GOVERNMENT LEADERSHIP";"603";"GOVERNMENTLEADERSHIP";"S*G*IG----H****";"(null)";"(null)";"(null)"
+"703";"GRENADE LAUNCHER";"500";"GRENADELAUNCHER";"S*G*EWZ---*****";"(null)";"(null)";"(null)"
+"706";"GRENADE LAUNCHER HEAVY";"503";"GRENADELAUNCHERHEAVY";"S*G*EWZH--*****";"(null)";"(null)";"(null)"
+"704";"GRENADE LAUNCHER LIGHT";"501";"GRENADELAUNCHERLIGHT";"S*G*EWZL--*****";"(null)";"(null)";"(null)"
+"705";"GRENADE LAUNCHER MEDIUM";"502";"GRENADELAUNCHERMEDIUM";"S*G*EWZM--*****";"(null)";"(null)";"(null)"
+"662";"GROUND TRACK EQUIPMENT";"468";"GROUNDTRACKEQUIPMENT";"S*G*E-----*****";"(null)";"(null)";"(null)"
+"358";"GROUND TRACK UNIT";"77";"UNIT";"S*G*U-----*****";"217";"Soldier (Role Player)";"358"
+"358";"GROUND TRACK UNIT";"77";"UNIT";"S*G*U-----*****";"106";"Soldier";"358"
+"363";"GROUND TRACK UNIT COMBAT";"78";"COMBAT";"S*G*UC----*****";"(null)";"(null)";"(null)"
+"520";"GROUND TRACK UNIT COMBAT FIELD ARTILLERY MORTAR AM";"213";"AMPHIBIOUSMORTAR";"S*G*UCFML-*****";"(null)";"(null)";"(null)"
+"659";"GROUND TRACK UNIT GENERAL HEADQUATERS";"465";"UNITGENERALHEADQUARTERS";"S*G*UH----*****";"(null)";"(null)";"(null)"
+"723";"GROUND VEHICLE";"531";"GROUNDVEHICLE";"S*G*EV----*****";"(null)";"(null)";"(null)"
+"702";"HEAVY MACHINE GUN";"499";"HEAVYMACHINEGUN";"S*G*EWRH--*****";"129";"Soldier HMG";"702"
+"785";"HOSPITAL";"609";"HOSPITAL";"S*G*IXH---H****";"(null)";"(null)";"(null)"
+"711";"HOWITZER";"508";"HOWITZER";"S*G*EWH---*****";"(null)";"(null)";"(null)"
+"716";"HOWITZER HEAVY";"513";"HOWITZERHEAVY";"S*G*EWHH--*****";"(null)";"(null)";"(null)"
+"717";"HOWITZER HEAVY SELF-PROPELLED";"514";"HOWITZERHEAVYSELF-PROPELLED";"S*G*EWHHS-*****";"(null)";"(null)";"(null)"
+"712";"HOWITZER LIGHT";"509";"HOWITZERLIGHT";"S*G*EWHL--*****";"(null)";"(null)";"(null)"
+"713";"HOWITZER LIGHT SELF-PROPELLED";"510";"HOWITZERLIGHTSELF-PROPELLED";"S*G*EWHLS-*****";"(null)";"(null)";"(null)"
+"714";"HOWITZER MEDIUM";"511";"HOWITZERMEDIUM";"S*G*EWHM--*****";"(null)";"(null)";"(null)"
+"715";"HOWITZER MEDIUM SELF-PROPELLED";"512";"HOWITZERMEDIUMSELF-PROPELLED";"S*G*EWHMS-*****";"(null)";"(null)";"(null)"
+"449";"INFANTRY";"149";"INFANTRY";"S*G*UCI---*****";"161";"TM";"449"
+"449";"INFANTRY";"149";"INFANTRY";"S*G*UCI---*****";"226";"TEST PLAYER";"449"
+"449";"INFANTRY";"149";"INFANTRY";"S*G*UCI---*****";"232";"0Soldier";"449"
+"449";"INFANTRY";"149";"INFANTRY";"S*G*UCI---*****";"128";"TM Leader";"449"
+"463";"INFANTRY AIR ASSAULT";"154";"INFANTRYAIRASSAULT";"S*G*UCIS--*****";"(null)";"(null)";"(null)"
+"462";"INFANTRY AIRBORNE";"153";"INFANTRYAIRBORNE";"S*G*UCIA--*****";"(null)";"(null)";"(null)"
+"466";"INFANTRY FIGHTING VEHICLE";"157";"INFANTRYFIGHTINGVEHICLE";"S*G*UCII--*****";"(null)";"(null)";"(null)"
+"454";"INFANTRY LIGHT";"150";"INFANTRYLIGHT";"S*G*UCIL--*****";"(null)";"(null)";"(null)"
+"464";"INFANTRY MECHANIZED";"155";"INFANTRYMECHANIZED";"S*G*UCIZ--*****";"(null)";"(null)";"(null)"
+"456";"INFANTRY MOTORIZED";"151";"INFANTRYMOTORIZED";"S*G*UCIM--*****";"(null)";"(null)";"(null)"
+"461";"INFANTRY MOUNTAIN";"152";"INFANTRYMOUNTAIN";"S*G*UCIO--*****";"(null)";"(null)";"(null)"
+"465";"INFANTRY NAVAL";"156";"INFANTRYNAVAL";"S*G*UCIN--*****";"(null)";"(null)";"(null)"
+"600";"INFORMATION OPERATIONS";"315";"INFORMATIONWARFAREUNIT";"S*G*UUI---*****";"(null)";"(null)";"(null)"
+"765";"INSTALLATION";"576";"INSTALLATION";"S*G*I-----H****";"225";"MEU";"765"
+"765";"INSTALLATION";"576";"INSTALLATION";"S*G*I-----H****";"224";"Building";"765"
+"666";"INTERMEDIATE RANGE AD MISSILE";"473";"INTERMEDIATERANGEADMISSILELAUNCH";"S*G*EWMAI-*****";"(null)";"(null)";"(null)"
+"670";"INTERMEDIATE RANGE SS MISSILE";"478";"INTERMEDIATERANGESSMISSILELAUNCH";"S*G*EWMSI-*****";"(null)";"(null)";"(null)"
+"382";"INTERNAL SECURITY FORCES";"246";"INTERNALSECURITYFORCES";"S*G*UCS---*****";"(null)";"(null)";"(null)"
+"390";"INTERNAL SECURITY FORCES AVIAT";"254";"AVIATION";"S*G*UCSA--*****";"(null)";"(null)";"(null)"
+"387";"INTERNAL SECURITY FORCES GROUN";"251";"MECHANIZEDGROUND";"S*G*UCSGA-*****";"(null)";"(null)";"(null)"
+"384";"INTERNAL SECURITY FORCES GROUND";"248";"GROUND";"S*G*UCSG--*****";"(null)";"(null)";"(null)"
+"385";"INTERNAL SECURITY FORCES GROUND DISMOUNTED";"249";"DISMOUNTEDGROUND";"S*G*UCSGD-*****";"(null)";"(null)";"(null)"
+"386";"INTERNAL SECURITY FORCES GROUND MOTORIZED";"250";"MOTORIZEDGROUND";"S*G*UCSGM-*****";"(null)";"(null)";"(null)"
+"389";"INTERNAL SECURITY FORCES RAILROAD";"253";"RAILROAD";"S*G*UCSR--*****";"(null)";"(null)";"(null)"
+"383";"INTERNAL SECURITY FORCES RIVERINE";"247";"RIVERINE";"S*G*UCSW--*****";"(null)";"(null)";"(null)"
+"388";"INTERNAL SECURITY FORCES WHEEL";"252";"WHEELEDMECHANIZED";"S*G*UCSM--*****";"(null)";"(null)";"(null)"
+"791";"LANDING CRAFT";"623";"LANDINGCRAFT";"S*S*CALC--*****";"(null)";"(null)";"(null)"
+"790";"LANDING SHIP";"622";"LANDINGSHIP";"S*S*CALS--*****";"(null)";"(null)";"(null)"
+"601";"LANDING SUPPORT";"316";"LANDINGSUPPORT";"S*G*UUX---*****";"(null)";"(null)";"(null)"
+"762";"LAND MINES";"573";"LANDMINES";"S*G*EXM---*****";"(null)";"(null)";"(null)"
+"763";"LAND MINES, LETHAL";"574";"LANDMINES,LETHAL";"S*G*EXMC--*****";"(null)";"(null)";"(null)"
+"759";"LASER";"570";"LASER";"S*G*EXL---*****";"(null)";"(null)";"(null)"
+"584";"LAW ENFORCEMENT UNIT";"292";"LAWENFORCEMENTUNIT";"S*G*UUL---*****";"(null)";"(null)";"(null)"
+"587";"LAW ENFORCEMENT UNIT CIVILIAN LAW ENFORCEMENT";"295";"CIVILIANLAWENFORCEMENT";"S*G*UULC--*****";"(null)";"(null)";"(null)"
+"588";"LAW ENFORCEMENT UNIT CRIMINAL INVESTIGATION DIVISI";"297";"CENTRALINTELLIGENCEDIVISION(CID)";"S*G*UULD--*****";"(null)";"(null)";"(null)"
+"586";"LAW ENFORCEMENT UNIT MILITARY POLICE";"294";"MILITARYPOLICE";"S*G*UULM--*****";"(null)";"(null)";"(null)"
+"585";"LAW ENFORCEMENT UNIT SHORE PATROL";"293";"SHOREPATROL";"S*G*UULS--*****";"(null)";"(null)";"(null)"
+"794";"LEISURE CRAFT";"665";"LEISURECRAFT";"S*S*XR----*****";"(null)";"(null)";"(null)"
+"764";"LESS THAN LETHAL";"575";"LESSTHANLETHAL";"S*G*EXML--*****";"(null)";"(null)";"(null)"
+"737";"LIGHT ARMOURED VEHICLE";"545";"LIGHTARMOUREDVEHICLE";"S*G*EVAL--*****";"(null)";"(null)";"(null)"
+"701";"LIGHT MACHINE GUN";"498";"LIGHTMACHINEGUN";"S*G*EWRL--*****";"131";"Soldier LMG";"701"
+"741";"LIMITED CROSS-COUNTRY TRUCK";"549";"LIMITEDCROSS-COUNTRYTRUCK";"S*G*EVUL--*****";"(null)";"(null)";"(null)"
+"667";"LONG RANGE AD MISSILE LAUNCH";"474";"LONGRANGEADMISSILELAUNCH";"S*G*EWMAL-*****";"(null)";"(null)";"(null)"
+"671";"LONG RANGE SS MISSILE LAUNCH";"479";"LONGRANGESSMISSILELAUNCH";"S*G*EWMSL-*****";"(null)";"(null)";"(null)"
+"648";"MAINTENANCE";"442";"MAINTENANCE";"S*G*USX---*****";"(null)";"(null)";"(null)"
+"654";"MAINTENANCE BATTLE DAMAGE REPA";"460";"BATTLEDAMAGEREPAIR";"S*G*USXBDR*****";"(null)";"(null)";"(null)"
+"653";"MAINTENANCE ELECTRO-OPTICAL";"457";"ELECTRO-OPTICAL";"S*G*USXE--*****";"(null)";"(null)";"(null)"
+"649";"MAINTENANCE HEAVY";"445";"MAINTENANCEHEAVY";"S*G*USXH--*****";"(null)";"(null)";"(null)"
+"651";"MAINTENANCE ORDINANCE";"451";"ORDINANCE";"S*G*USXO--*****";"(null)";"(null)";"(null)"
+"652";"MAINTENANCE ORDINANCE MISSILE";"454";"ORDINANCEMISSILE";"S*G*USXOM-*****";"(null)";"(null)";"(null)"
+"655";"MAINTENANCE PREVENTIVE MAINTEN";"461";"PREVENTIVEMAINTANANCE";"S*G*USXPM-*****";"(null)";"(null)";"(null)"
+"650";"MAINTENANCE RECOVERY";"448";"MAINTENANCERECOVERY";"S*G*USXR--*****";"(null)";"(null)";"(null)"
+"623";"MEDICAL DENTAL";"373";"MEDICALDENTAL";"S*G*USMD--*****";"(null)";"(null)";"(null)"
+"784";"MEDICAL FACILITY";"608";"MEDICALFACILITY";"S*G*IX----H****";"(null)";"(null)";"(null)"
+"624";"MEDICAL PSYCHOLOGICAL";"376";"MEDICALPSYCHOLOGICAL";"S*G*USMP--*****";"(null)";"(null)";"(null)"
+"621";"MEDICAL TREATMENT FACILITY";"367";"MEDICALTREATMENTFACILITY";"S*G*USMM--*****";"(null)";"(null)";"(null)"
+"622";"MEDICAL VETERINARY";"370";"MEDICALVETERINARY";"S*G*USMV--*****";"(null)";"(null)";"(null)"
+"343";"MILITARY";"7";"MILITARY";"S*A*M-----*****";"(null)";"(null)";"(null)"
+"780";"MILITARY BASE/FACILITY";"604";"MILITARYBASE/FACILITY";"S*G*IB----H****";"(null)";"(null)";"(null)"
+"344";"MILITARY FIXED WING";"8";"FIXEDWING";"S*A*MF----*****";"(null)";"(null)";"(null)"
+"567";"MILITARY INTELLIGENCE";"271";"MILITARYINTELLIGENCE";"S*G*UUM---*****";"(null)";"(null)";"(null)"
+"568";"MILITARY INTELLIGENCE AERIAL EXPLOITATION";"272";"AERIALEXPLOITATION";"S*G*UUMA--*****";"(null)";"(null)";"(null)"
+"577";"MILITARY INTELLIGENCE COUNTER INTELLIGENCE";"281";"COUNTERINTELLIGENCE";"S*G*UUMC--*****";"(null)";"(null)";"(null)"
+"573";"MILITARY INTELLIGENCE ELECTRON";"277";"INTERCEPT";"S*G*UUMSEI*****";"(null)";"(null)";"(null)"
+"572";"MILITARY INTELLIGENCE ELECTRON";"276";"DIRECTIONFINDING";"S*G*UUMSED*****";"(null)";"(null)";"(null)"
+"571";"MILITARY INTELLIGENCE ELECTRON";"275";"ARMOUREDWHEELEDVEHICLE";"S*G*UUMSEA*****";"(null)";"(null)";"(null)"
+"570";"MILITARY INTELLIGENCE ELECTRONIC WARFARE";"274";"ELECTRONICWARFARE";"S*G*UUMSE-*****";"(null)";"(null)";"(null)"
+"574";"MILITARY INTELLIGENCE ELECTRONIC WARFARE JAMMING";"278";"JAMMING";"S*G*UUMSEJ*****";"(null)";"(null)";"(null)"
+"582";"MILITARY INTELLIGENCE INTERROGATION";"290";"INTERROGATION";"S*G*UUMQ--*****";"(null)";"(null)";"(null)"
+"583";"MILITARY INTELLIGENCE JOINT INTELLIGENCE CENTRE";"291";"JOINTINTELLIGENCECENTRE";"S*G*UUMJ--*****";"(null)";"(null)";"(null)"
+"581";"MILITARY INTELLIGENCE OPERATIONS";"288";"OPERATIONS";"S*G*UUMO--*****";"(null)";"(null)";"(null)"
+"569";"MILITARY INTELLIGENCE SIGNALS";"273";"SIGNALINTELLIGENCE(SIGINT)";"S*G*UUMS--*****";"(null)";"(null)";"(null)"
+"579";"MILITARY INTELLIGENCE SURVEILL";"283";"GROUNDSURVEILLANCERADAR";"S*G*UUMRG-*****";"(null)";"(null)";"(null)"
+"578";"MILITARY INTELLIGENCE SURVEILLANCE";"282";"SURVEILLANCE";"S*G*UUMR--*****";"(null)";"(null)";"(null)"
+"580";"MILITARY INTELLIGENCE SURVEILLANCE SENSOR";"284";"SENSOR";"S*G*UUMRS-*****";"(null)";"(null)";"(null)"
+"346";"MILITARY ROTARY WING";"39";"ROTARYWING";"S*A*MH----*****";"195";"Apache";"346"
+"766";"MINE";"578";"MINE";"S*G*IRM---H****";"(null)";"(null)";"(null)"
+"749";"MINE LAYING VEHICLE";"557";"MINELAYINGVEHICLE";"S*G*EVEM--*****";"4";"Trailer, Minelaying";"749"
+"675";"MISSILE LAUNCHER AT HEAVY";"483";"MISSILELAUNCHERATHEAVY";"S*G*EWMTH-*****";"(null)";"(null)";"(null)"
+"674";"MISSILE LAUNCHER AT MEDIUM";"482";"MISSILELAUNCHERATMEDIUM";"S*G*EWMTM-*****";"(null)";"(null)";"(null)"
+"663";"MISSILE LAUNCHERS";"470";"MISSILELAUNCHERS";"S*G*EWM---*****";"(null)";"(null)";"(null)"
+"672";"MISSILE LAUNCHERS ANTI TANK (A";"480";"MISSILELAUNCHERSANTITANK(AT)";"S*G*EWMT--*****";"(null)";"(null)";"(null)"
+"673";"MISSILE LAUNCHERS AT LIGHT";"481";"MISSILELAUNCHERSATLIGHT";"S*G*EWMTL-*****";"(null)";"(null)";"(null)"
+"544";"MISSILE (SURF-SURF)";"243";"MISSILE(SURFACE-SURFACE)";"S*G*UCM---*****";"(null)";"(null)";"(null)"
+"546";"MISSILE (SURF-SURF) STRATEGIC";"245";"MISSILE(SURFACE-SURFACE)STRATEGIC";"S*G*UCMS--*****";"(null)";"(null)";"(null)"
+"545";"MISSILE (SURF-SURF) TACTICAL";"244";"MISSILE(SURFACE-SURFACE)TACTICAL";"S*G*UCMT--*****";"(null)";"(null)";"(null)"
+"707";"MORTAR";"504";"MORTAR";"S*G*EWO---*****";"209";"Soldier Mortar";"707"
+"710";"MORTAR HEAVY";"507";"MORTARHEAVY";"S*G*EWOH--*****";"(null)";"(null)";"(null)"
+"708";"MORTAR LIGHT";"505";"MORTARLIGHT";"S*G*EWOL--*****";"(null)";"(null)";"(null)"
+"709";"MORTAR MEDIUM";"506";"MORTARMEDIUM";"S*G*EWOM--*****";"(null)";"(null)";"(null)"
+"747";"MULTIFUNCTIONAL EARTHMOVER/DIG";"555";"MULTIFUNCTIONALEARTHMOVER/DIGGER";"S*G*EVEE--*****";"(null)";"(null)";"(null)"
+"691";"MULTIPLE ROCKET LAUNCHER";"488";"MULTIPLEROCKETLAUNCHER";"S*G*EWX---*****";"(null)";"(null)";"(null)"
+"694";"MULTIPLE ROCKET LAUNCHER HEAVY";"491";"MULTIPLEROCKETLAUNCHERHEAVY";"S*G*EWXH--*****";"(null)";"(null)";"(null)"
+"692";"MULTIPLE ROCKET LAUNCHER LIGHT";"489";"MULTIPLEROCKETLAUNCHERLIGHT";"S*G*EWXL--*****";"(null)";"(null)";"(null)"
+"693";"MULTIPLE ROCKET LAUNCHER MEDIU";"490";"MULTIPLEROCKETLAUNCHERMEDIUM";"S*G*EWXM--*****";"(null)";"(null)";"(null)"
+"771";"NUCLEAR";"583";"NUCLEAR";"S*G*IRNN--H****";"(null)";"(null)";"(null)"
+"188";"O/C Force";"5";"SPACESTATION";"S*P*T-----*****";"113";"O/C Staff";"188"
+"188";"O/C Force";"5";"SPACESTATION";"S*P*T-----*****";"180";"O/C TM";"188"
+"188";"O/C Force";"5";"SPACESTATION";"S*P*T-----*****";"114";"O/C Force";"188"
+"807";"O/C Force CE";"5";"SPACESTATION";"S*P*T-----*****";"(null)";"(null)";"(null)"
+"793";"OILER/TANKER";"655";"OILER/TANKER";"S*S*XMO---*****";"(null)";"(null)";"(null)"
+"792";"PATROL";"630";"PATROL";"S*S*CP----*****";"(null)";"(null)";"(null)"
+"767";"PETROLEUM/GAS/OIL";"579";"PETROLEUM/GAS/OIL";"S*G*IRP---H****";"(null)";"(null)";"(null)"
+"656";"PIPELINE";"462";"PIPELINE";"S*G*USXP--*****";"(null)";"(null)";"(null)"
+"775";"PUBLIC WATER SERVICES";"591";"PUBLICWATERSERVICES";"S*G*IUP---H****";"(null)";"(null)";"(null)"
+"757";"RADAR";"567";"RADAR";"S*G*ESR---*****";"(null)";"(null)";"(null)"
+"525";"RECONNAISSANCE";"226";"RECONNAISSANCE";"S*G*UCR---*****";"(null)";"(null)";"(null)"
+"535";"RECONNAISSANCE AIR ASSAULT";"234";"RECONNAISSANCEAIRASSAULT";"S*G*UCRS--*****";"(null)";"(null)";"(null)"
+"536";"RECONNAISSANCE AIRBORNE";"235";"RECONNAISSANCEAIRBORNE";"S*G*UCRA--*****";"(null)";"(null)";"(null)"
+"539";"RECONNAISSANCE AMPHIBIOUS";"238";"RECONNAISSANCEMARINE";"S*G*UCRR--*****";"(null)";"(null)";"(null)"
+"540";"RECONNAISSANCE AMPHIBIOUS DIVI";"239";"RECONNAISSANCEMARINEDIVISION";"S*G*UCRRD-*****";"(null)";"(null)";"(null)"
+"541";"RECONNAISSANCE AMPHIBIOUS FORC";"240";"RECONNAISSANCEMARINEFORCE";"S*G*UCRRF-*****";"(null)";"(null)";"(null)"
+"530";"RECONNAISSANCE CAVALRY";"228";"RECONNAISSANCECAVALRY";"S*G*UCRV--*****";"(null)";"(null)";"(null)"
+"534";"RECONNAISSANCE CAVALRY AIR";"232";"RECONNAISSANCECAVALRYAIR";"S*G*UCRVO-*****";"(null)";"(null)";"(null)"
+"531";"RECONNAISSANCE CAVALRY ARMOURE";"229";"RECONNAISSANCECAVALRYARMOURED";"S*G*UCRVA-*****";"(null)";"(null)";"(null)"
+"533";"RECONNAISSANCE CAVALRY GROUND";"231";"RECONNAISSANCECAVALRYGROUND";"S*G*UCRVG-*****";"(null)";"(null)";"(null)"
+"532";"RECONNAISSANCE CAVALRY MOTORIZ";"230";"RECONNAISSANCECAVALRYMOTORIZED";"S*G*UCRVM-*****";"(null)";"(null)";"(null)"
+"538";"RECONNAISSANCE LIGHT";"237";"RECONNAISSANCELIGHT";"S*G*UCRLL--*****";"(null)";"(null)";"(null)"
+"542";"RECONNAISSANCE MARINE LIGHT AR";"241";"RECONNAISSANCEMARINELIGHTARMOUREDRECONNAISSANCE(LA";"S*G*UCRRL-*****";"(null)";"(null)";"(null)"
+"537";"RECONNAISSANCE MOUNTAIN";"236";"RECONNAISSANCEMOUNTAIN";"S*G*UCRO--*****";"(null)";"(null)";"(null)"
+"543";"RECONNAISSANCE SURVEILLANCE LO";"242";"RECONNAISSANCELONGRANGESURVEILLANCE(LRS)";"S*G*UCRX--*****";"(null)";"(null)";"(null)"
+"700";"RIFLE";"497";"RIFLE";"S*G*EWRR--*****";"210";"Soldier Assault Rifle";"700"
+"699";"RIFLE/AUTOMATIC WEAPON";"496";"RIFLE/AUTOMATICWEAPON";"S*G*EWR---*****";"205";"Soldier Tgt";"699"
+"699";"RIFLE/AUTOMATIC WEAPON";"496";"RIFLE/AUTOMATICWEAPON";"S*G*EWR---*****";"216";"Soldier M203";"699"
+"699";"RIFLE/AUTOMATIC WEAPON";"496";"RIFLE/AUTOMATICWEAPON";"S*G*EWR---*****";"153";"Soldier MP";"699"
+"438";"ROTARY WING ATTACK";"131";"ATTACKROTARYWING";"S*G*UCVRA-*****";"(null)";"(null)";"(null)"
+"347";"ROTARY WING ATTACK";"40";"ATTACK";"S*A*MHA---*****";"(null)";"(null)";"(null)"
+"352";"ROTARY WING DRONE (RPV/UAV)";"49";"DRONE(RPV/UAV)";"S*A*MHQ---*****";"(null)";"(null)";"(null)"
+"348";"ROTARY WING MEDEVAC";"55";"MEDEVAC";"S*A*MHO---*****";"(null)";"(null)";"(null)"
+"351";"ROTARY WING RECCE";"48";"RECONNAISSANCE";"S*A*MHR---*****";"(null)";"(null)";"(null)"
+"349";"ROTARY WING SOF";"56";"SPECIALOPERATIONSFORCE(SOF)";"S*A*MHM---*****";"(null)";"(null)";"(null)"
+"350";"ROTARY WING UTILITY";"42";"UTILITY";"S*A*MHU---*****";"(null)";"(null)";"(null)"
+"782";"SEAPORT/NAVAL BASE";"606";"SEAPORT/NAVALBASE";"S*G*IBN---H****";"(null)";"(null)";"(null)"
+"786";"SEA SURFACE INSTALLATION, OIL RIG / PLATFORM";"611";"SEASURFACEINSTALLATION,OILRIG/PLATFORM";"S*G*IRR---H****";"(null)";"(null)";"(null)"
+"787";"SEA SURFACE TRACK";"612";"SEASURFACETRACK";"S*S*------*****";"(null)";"(null)";"(null)"
+"740";"SEMI";"548";"SEMI";"S*G*EVUS--*****";"(null)";"(null)";"(null)"
+"756";"SENSOR";"566";"SENSOR";"S*G*ES----*****";"(null)";"(null)";"(null)"
+"616";"SERVICE SUPPORT MEDICAL";"364";"MEDICAL";"S*G*USM---*****";"(null)";"(null)";"(null)"
+"641";"SERVICE SUPPORT TRANSPORTATION";"424";"TRANSPORTATION";"S*G*UST---*****";"53";"TATRA Logistics Carrier";"641"
+"665";"SHORT RANGE AD MISSILE LAUNCHE";"472";"SHORTRANGEADMISSILELAUNCHERS";"S*G*EWMAS-*****";"(null)";"(null)";"(null)"
+"669";"SHORT RANGE SS MISSILE LAUNCH";"477";"SHORTRANGESSMISSILELAUNCH";"S*G*EWMSS-*****";"(null)";"(null)";"(null)"
+"593";"SIGNALS UNIT FORWARD COMMUNICATIONS";"303";"FORWARDCOMMUNICATIONS";"S*G*UUSF--*****";"(null)";"(null)";"(null)"
+"597";"SIGNALS UNIT SIGNAL SUPPORT";"312";"SIGNALSUPPORT";"S*G*UUSS--*****";"(null)";"(null)";"(null)"
+"589";"SIGNAL UNIT";"298";"SIGNALUNIT";"S*G*UUS---*****";"(null)";"(null)";"(null)"
+"590";"SIGNAL UNIT AREA";"299";"AREA";"S*G*UUSA--*****";"(null)";"(null)";"(null)"
+"592";"SIGNAL UNIT COMMAND OPERATIONS";"302";"COMMANDOPERATIONS";"S*G*UUSO--*****";"(null)";"(null)";"(null)"
+"591";"SIGNAL UNIT COMMUNICATION CONF";"300";"COMMUNICATIONCONFIGUREDPACKAGE";"S*G*UUSC--*****";"(null)";"(null)";"(null)"
+"599";"SIGNAL UNIT ELECTRONIC RANGING";"314";"ELECTRONICRANGING";"S*G*UUSX--*****";"(null)";"(null)";"(null)"
+"594";"SIGNAL UNIT RADIO UNIT";"308";"RADIOUNIT";"S*G*UUSR--*****";"(null)";"(null)";"(null)"
+"596";"SIGNAL UNIT RADIO UNIT RELAY";"311";"RELAY";"S*G*UUSRW-*****";"(null)";"(null)";"(null)"
+"595";"SIGNAL UNIT RADIO UNIT TACTICA";"309";"TACTICALSATELLITE";"S*G*UUSRS-*****";"(null)";"(null)";"(null)"
+"598";"SIGNAL UNIT TELEPHONE SWITCH";"313";"TELEPHONESWITCH";"S*G*UUSW--*****";"(null)";"(null)";"(null)"
+"687";"SINGLE ROCKET LAUNCHER";"484";"SINGLEROCKETLAUNCHER";"S*G*EWS---*****";"(null)";"(null)";"(null)"
+"690";"SINGLE ROCKET LAUNCHER HEAVY";"487";"SINGLEROCKETLAUNCHERHEAVY";"S*G*EWSH--*****";"(null)";"(null)";"(null)"
+"688";"SINGLE ROCKET LAUNCHER LIGHT";"485";"SINGLEROCKETLAUNCHERLIGHT";"S*G*EWSL--*****";"(null)";"(null)";"(null)"
+"689";"SINGLE ROCKET LAUNCHER MEDIUM";"486";"SINGLEROCKETLAUNCHERMEDIUM";"S*G*EWSM--*****";"(null)";"(null)";"(null)"
+"796";"SOF AVIATION FIXED WING";"707";"SOFUNITFIXEDWING";"S*F*AF----*****";"(null)";"(null)";"(null)"
+"797";"SOF AVIATION FIXED WING ATTACK";"708";"SOFUNITATTACK";"S*F*AFA---*****";"(null)";"(null)";"(null)"
+"798";"SOF AVIATION FIXED WING UTILIT";"710";"SOFUNITUTILITY";"S*F*AFU---*****";"(null)";"(null)";"(null)"
+"799";"SOF AVIATION FIXED WING UTILIT";"711";"SOFUNITUTILITY(LIGHT)";"S*F*AFUL--*****";"(null)";"(null)";"(null)"
+"800";"SOF AVIATION ROTARY WING";"715";"SOFUNITROTARYWING";"S*F*AH----*****";"(null)";"(null)";"(null)"
+"803";"SOF UNIT GROUND";"727";"SOFUNITGROUND";"S*F*G-----*****";"(null)";"(null)";"(null)"
+"805";"SOF UNIT GROUND RANGER";"729";"SOFUNITRANGER";"S*F*GSR---*****";"(null)";"(null)";"(null)"
+"804";"SOF UNIT GROUND SPECIAL FORCES";"728";"SOFUNITSPECIALFORCES";"S*F*GS----*****";"(null)";"(null)";"(null)"
+"801";"SOF UNIT NAVAL";"722";"SOFUNITSOFUNITNAVAL";"S*F*SN----*****";"(null)";"(null)";"(null)"
+"802";"SOF UNIT NAVAL SPECIAL BOAT";"725";"SOFUNITSPECIALBOAT";"S*F*SNB---*****";"(null)";"(null)";"(null)"
+"806";"SOF UNIT PSYCHOLOGICAL OPERATI";"730";"SOFUNITPSYCHOLOGICALOPERATIONS(PSYOPS)";"S*F*GSP---*****";"(null)";"(null)";"(null)"
+"658";"SPECIAL C2 HEADQUATERS COMPONE";"464";"SPECIALC2HEADQUARTERSCOMPONENT";"S*G*UH----*****";"(null)";"(null)";"(null)"
+"795";"SPECIAL OPERATIONS FORCE (SOF)";"705";"SPECIALOPERATIONSFORCE(SOF)UNIT";"S*F*------*****";"(null)";"(null)";"(null)"
+"625";"SUPPLY";"379";"SUPPLY";"S*G*USS---*****";"(null)";"(null)";"(null)"
+"633";"SUPPLY CLASS I";"382";"SUPPLYCLASSI";"S*G*USS1--*****";"(null)";"(null)";"(null)"
+"634";"SUPPLY CLASS II";"385";"SUPPLYCLASSII";"S*G*USS2--*****";"(null)";"(null)";"(null)"
+"635";"SUPPLY CLASS III";"388";"SUPPLYCLASSIII";"S*G*USS3--*****";"(null)";"(null)";"(null)"
+"636";"SUPPLY CLASS III AVIATION";"391";"SUPPLYCLASSIIIAVIATION";"S*G*USS3A-*****";"(null)";"(null)";"(null)"
+"637";"SUPPLY CLASS IV";"394";"SUPPLYCLASSIV";"S*G*USS4--*****";"(null)";"(null)";"(null)"
+"627";"SUPPLY CLASS IX";"409";"SUPPLYCLASSIX";"S*G*USS9--*****";"(null)";"(null)";"(null)"
+"638";"SUPPLY CLASS V";"397";"SUPPLYCLASSV";"S*G*USS5--*****";"(null)";"(null)";"(null)"
+"639";"SUPPLY CLASS VI";"400";"SUPPLYCLASSVI";"S*G*USS6--*****";"(null)";"(null)";"(null)"
+"640";"SUPPLY CLASS VII";"403";"SUPPLYCLASSVII";"S*G*USS7--*****";"(null)";"(null)";"(null)"
+"626";"SUPPLY CLASS VIII";"406";"SUPPLYCLASSVIII";"S*G*USS8--*****";"(null)";"(null)";"(null)"
+"628";"SUPPLY CLASS X";"412";"SUPPLYCLASSX";"S*G*USSX--*****";"(null)";"(null)";"(null)"
+"629";"SUPPLY LAUNDRY/BATH";"415";"SUPPLYLAUNDRY/BATH";"S*G*USSL--*****";"(null)";"(null)";"(null)"
+"632";"SUPPLY MATERIEL (STOCK)";"1335";"SUPPLYMATERIEL(STOCK)";"S*G*US**--*****";"(null)";"(null)";"(null)"
+"630";"SUPPLY WATER";"418";"SUPPLYWATER";"S*G*USSW--*****";"(null)";"(null)";"(null)"
+"631";"SUPPLY WATER PURIFICATION";"421";"SUPPLYWATERPURIFICATION";"S*G*USSWP-*****";"(null)";"(null)";"(null)"
+"668";"SURFACE- SURFACE (SS) MISSILE";"476";"SURFACE-SURFACE(SS)MISSILELAUNCHER";"S*G*EWMS--*****";"(null)";"(null)";"(null)"
+"355";"SURFACE TO AIR MISSILE";"65";"SURFACETOAIRMISSILE(SAM)";"S*A*WMSA--*****";"(null)";"(null)";"(null)"
+"354";"SURFACE TO SURFACE MISSILE";"64";"SURFACETOSURFACEMISSILE(SSM)";"S*A*WMSS--*****";"(null)";"(null)";"(null)"
+"391";"SURVEILLANCE";"1334";"SURVEILLANCE";"S*G*F-S---*****";"(null)";"(null)";"(null)"
+"725";"TANK";"533";"TANK";"S*G*EVAT--*****";"233";"0Vehicle";"725"
+"725";"TANK";"533";"TANK";"S*G*EVAT--*****";"43";"MBT";"725"
+"725";"TANK";"533";"TANK";"S*G*EVAT--*****";"230";"LEOPARD 2A5";"725"
+"730";"TANK HEAVY";"538";"TANKHEAVY";"S*G*EVATH-*****";"(null)";"(null)";"(null)"
+"731";"TANK HEAVY RECOVERY";"539";"TANKHEAVYRECOVERY";"S*G*EVATY-*****";"(null)";"(null)";"(null)"
+"726";"TANK LIGHT";"534";"TANKLIGHT";"S*G*EVATL-*****";"(null)";"(null)";"(null)"
+"727";"TANK LIGHT RECOVERY";"535";"TANKLIGHTRECOVERY";"S*G*EVATW-*****";"110";"BMP3 Recovery";"727"
+"728";"TANK MEDIUM";"536";"TANKMEDIUM";"S*G*EVATM-*****";"(null)";"(null)";"(null)"
+"729";"TANK MEDIUM RECOVERY";"537";"TANKMEDIUMRECOVERY";"S*G*EVATX-*****";"(null)";"(null)";"(null)"
+"773";"TELECOMMUNICATIONS FACILITY";"589";"TELECOMMUNICATIONSFACILITY";"S*G*IUT---H****";"(null)";"(null)";"(null)"
+"603";"TOPOGRAPHIC";"318";"TOPOGRAPHIC";"S*G*UUT---*****";"(null)";"(null)";"(null)"
+"751";"TRAILER MOUNTED";"559";"TRAILERMOUNTED";"S*G*EVEMT-*****";"(null)";"(null)";"(null)"
+"754";"TRAIN LOCOMOTIVE";"564";"TRAINLOCOMOTIVE";"S*G*EVST--*****";"(null)";"(null)";"(null)"
+"645";"TRANSPORTATION APOD/APOE";"436";"APOD/APOE";"S*G*USTA--*****";"(null)";"(null)";"(null)"
+"647";"TRANSPORTATION INTERMODAL";"1328";"TRANSPORTATIONINTERMODAL";"S*G*UST---*****";"(null)";"(null)";"(null)"
+"646";"TRANSPORTATION MISSILE";"439";"MISSILE";"S*G*USTI--*****";"(null)";"(null)";"(null)"
+"642";"TRANSPORTATION MOVEMENT CONTRO";"427";"MOVEMENTCONTROLCENTRE(MCC)";"S*G*USTM--*****";"(null)";"(null)";"(null)"
+"643";"TRANSPORTATION RAILHEAD";"430";"RAILHEAD";"S*G*USTR--*****";"(null)";"(null)";"(null)"
+"644";"TRANSPORTATION SPOD/SPOE";"433";"SPOD/SPOE";"S*G*USTS--*****";"(null)";"(null)";"(null)"
+"783";"TRANSPORT FACILITY";"607";"TRANSPORTFACILITY";"S*G*IT----H****";"(null)";"(null)";"(null)"
+"661";"UNITS GENERAL LIAISON";"467";"UNITGENERALLIAISON";"S*G*UHGL--*****";"(null)";"(null)";"(null)"
+"738";"UTILITY VEHICLE";"546";"UTILITYVEHICLE";"S*G*EVU---*****";"54";"HMMWV Utility";"738"
+"738";"UTILITY VEHICLE";"546";"UTILITYVEHICLE";"S*G*EVU---*****";"221";"Vehicle Tgt";"738"
+"743";"WATER CRAFT";"551";"WATERCRAFT";"S*G*EVUR--*****";"213";"TATRA Tanker Water";"743"
+"353";"WEAPON";"61";"WEAPON";"S*A*W-----*****";"(null)";"(null)";"(null)"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/CMakeLists.txt
new file mode 100755
index 000000000..0113ced47
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/CMakeLists.txt
@@ -0,0 +1,42 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+
+# PlanModel
+SET(GeometryModel_SRCS
+  geometry_model.dtd
+  geometry_model.cpp
+  geometry_model.h
+  geometry_model_export.h
+  geometry_model_factory.cpp
+  geometry_model_factory.h
+  geometry_model_q_dom.cpp
+  geometry_model_q_dom.h
+  geometry_node_visitor.cpp
+  geometry_node_visitor.h
+  geometry_pixelTextBox.cpp
+)
+
+SOURCE_GROUP(GeometryModel FILES ${GeometryModel_SRCS})
+
+NGL_ADD_LIBRARY(WS situationMapGeometryModel SHARED ${GeometryModel_SRCS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES( situationMapGeometryModel
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+NGL_TARGET_LINK_LIBRARIES(situationMapGeometryModel
+  PRIVATE
+    NGLLogger
+  PUBLIC
+  situationMapCommon
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Xml
+)
+
+NGL_INSTALL_TARGET(situationMapGeometryModel)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.cpp
new file mode 100755
index 000000000..eb4c80970
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.cpp
@@ -0,0 +1,38 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModel to write and read PlanEditor plans.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   11.11.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "geometry_model.h"
+
+namespace SituationMap
+{
+
+  GeometryModel::GeometryModel(QObject *parent) : QObject(parent) {;}
+
+  GeometryModel::GeometryModel(const GeometryModel &) : QObject() {;}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.dtd b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.dtd
new file mode 100755
index 000000000..6ae4ce58b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.dtd
@@ -0,0 +1,400 @@
+<!--
+    DTD fuer Plan-Formate
+    (c)RDE 2009
+    Stephan Kuhagen
+-->
+
+
+<!--
+   The Top-Element of the Plan. Defines global variables in the Attributes.
+-->
+<!ELEMENT GeometryModelDocument (GeometryModel|MapSettings) >
+
+<!ELEMENT GeometryModel (dictionarySymbol|ellipse|line|polyline|rectangle|spline|symbol|text|node)>
+
+<!ELEMENT MapSettings EMPTY>
+
+<!--
+   utm_zone: UTM-zone and band (two digits, one char)
+   utm_grid: UTM-grid-Square (two chars)
+   utm_east: UTM-easting-value (int)
+   utm_north: UTM-northing-value (int)
+   pe_show_utm: bool to indicate, if the PE should display the UTM-grid
+   pe_map_saturation: saturation in % of the map in the PE
+   pe_map_brightness: brightness in % of the map in the PE
+   pe_map_zoom: zoom-value of the map in the PE
+   pe_map_rotation: The rotation of the map (double)
+   pe_map_type: The type of the map (Raster, Vector, Contour, Elevation, RasterElevation)
+   pe_map_centerx: center-x of the map in the PE
+   pe_map_centery: center-y of the map in the PE
+-->
+<!ATTLIST MapSettings
+          utm_zone           CDATA  #REQUIRED
+          utm_grid           CDATA  #REQUIRED
+          utm_east           CDATA  #REQUIRED
+          utm_north          CDATA  #REQUIRED
+          pe_show_utm        CDATA  #REQUIRED
+          pe_map_saturation  CDATA  #REQUIRED
+          pe_map_brightness  CDATA  #REQUIRED
+          pe_map_zoom        CDATA  #REQUIRED
+          pe_map_rotation    CDATA  #REQUIRED
+          pe_map_type        CDATA  #REQUIRED
+          pe_map_centerx     CDATA  #REQUIRED
+          pe_map_centery     CDATA  #REQUIRED
+          pe_symbol_transparency  CDATA  #IMPLIED
+          pe_symbol_fill_type     CDATA  #IMPLIED
+          pe_symbol_scale         CDATA  #IMPLIED>
+
+
+
+
+<!--
+   A node is a grouping element, which can hold any number of primitives or
+   other nodes, thus creating a tree.
+-->
+<!ELEMENT node (dictionarySymbol|ellipse|line|polyline|rectangle|spline|symbol|text|node)*>
+
+
+<!--
+   The symbology library provides a symbol dictionary. Each symbol is defined by a list of coordinates and one non-ambiguous SIDC code. The SIDC
+   is a string with 15 character. See symbology library for further details.
+-->
+<!ELEMENT dictionarySymbol (point+)>
+<!ATTLIST dictionarySymbol
+          GuiDisplayName CDATA #IMPLIED
+          SIDC           CDATA #REQUIRED
+          SIDC_Norm      CDATA #REQUIRED >      
+<!--
+   Defines ellipsis and circles. Can have start-angle and extent for sections of
+   circles/ellipsis. The point defines the center of the primitive. The
+   Attributes width and height define the metric dimensions, resulting in a
+   centered bounding box. The primitive can be rotated with attribute
+   rotate. Start-angle and extent are defined for the axis-parallel bounding-box
+   and are rotated with the box. Rotation is done around the center-point.
+   The optional text-tag is used for text directly assigned to this primitive.
+-->
+<!ELEMENT ellipse (point,text?)>
+
+
+<!--
+   width: The metric width of the ellipse.
+   height: The metric height of the ellipse.
+   rotate: The bounding rectangle, that defines the ellipse is rotated according
+           to the angle here (360° for full rotation). Double-Value.
+   start: Sets the start-angle of an open ellipse before (!) rotation. Double-Value.
+   extent: Sets the extent of the ellipse. For a full ellipse this must be
+           360. Double-Value.
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   linewidth: Line-width. Double-Value.
+   linestyle: An enum defining the line-style
+   fill: A bool, if true, the primitive should be filled with the given color and pattern.
+   fill_color: Fill-Color in 32-Bit hex RGBA (#RRGGBBAA)
+   fill_pattern: An enum defining the fill-pattern.
+   fill_style: An enum defining the style for a filles ellipse:
+               - "chord": A straight line between the start-point and end-point
+                 defines the inner region to be filled.
+               - "pieslice": A line from the start-point to the center and from the
+                 center to the end-point define the inner region to be filled.
+-->
+<!ATTLIST ellipse
+          GuiDisplayName      CDATA   #IMPLIED
+          rotate              CDATA   #IMPLIED
+          width               CDATA   #REQUIRED
+          height              CDATA   #REQUIRED
+          start               CDATA   #IMPLIED
+          extent              CDATA   #IMPLIED
+          color               CDATA   #REQUIRED
+          linewidth           CDATA   #REQUIRED
+          linestyle           (solid|dashed|dotted|dashed_dotted) #IMPLIED
+          fill                CDATA   #IMPLIED
+          fill_color          CDATA   #IMPLIED
+          fill_pattern        (none|dots|hor1|hor2|ver1|ver2|diag1|diag2|solid)  #IMPLIED
+          fill_style          (chord|pieslice) #IMPLIED>
+
+
+
+
+<!--
+   Defines a line with start- and endpoint.
+   The optional text-tag is used for text directly assigned to this primitive.
+-->
+<!ELEMENT line (point,point,text?)>
+
+
+<!--
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   arrows: Enum defining, if and where to add arrows to the line.
+   arrow_height: The height of the arrow from the arrow-head to the outer points,
+                 parallel to the middle axis of the arrow.
+   arrow_clamp_height: The height from the the arrow-neck to the outer points,
+                       parallel to the middle axis of the arrow.
+   arrow_width: The distance between the outer points of the arrow.
+   arrow_line_width: The line width of the line used to draw the arrow.
+   linewidth: Line-width. Double-Value.
+   linestyle: An enum defining the line-style
+-->
+<!ATTLIST line
+          GuiDisplayName      CDATA   #IMPLIED
+          color               CDATA   #REQUIRED
+          arrows              (none|start|end|both) #IMPLIED
+          arrow_height        CDATA   #IMPLIED
+          arrow_clamp_height  CDATA   #IMPLIED
+          arrow_width         CDATA   #IMPLIED
+          arrow_line_width    CDATA   #IMPLIED
+          linewidth           CDATA   #REQUIRED
+          linestyle           (solid|dashed|dotted|dashed_dotted) #IMPLIED>
+
+
+
+
+<!--
+   Defines a polyline with at least three points.
+   The optional text-tag is used for text directly assigned to this primitive.
+-->
+<!ELEMENT polyline (point,point,point+,text?)>
+
+
+<!--
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   linewidth: Line-width. Double-Value.
+   linestyle: An enum defining the line-style
+   arrows: Enum defining, if and where to add arrows to the line. If the
+           primitive is closed, no arrows should be drawn.
+   arrow_height: The height of the arrow from the arrow-head to the outer points,
+                 parallel to the middle axis of the arrow.
+   arrow_clamp_height: The height from the the arrow-neck to the outer points,
+                       parallel to the middle axis of the arrow.
+   arrow_width: The distance between the outer points of the arrow.
+   arrow_line_width: The line width of the line used to draw the arrow.
+   close: A bool. If true, connect the start- and end-point.
+   fill: A bool, if true, the primitive should be filled with the given color and pattern.
+   fill_color: Fill-Color in 32-Bit hex RGBA (#RRGGBBAA)
+   fill_pattern: An enum defining the fill-pattern.
+-->
+<!ATTLIST polyline
+          GuiDisplayName      CDATA   #IMPLIED
+          color               CDATA   #REQUIRED
+          linewidth           CDATA   #REQUIRED
+          linestyle           (solid|dashed|dotted|dashed_dotted) #IMPLIED
+          arrows              (none|start|end|both) #IMPLIED
+          arrow_height        CDATA   #IMPLIED
+          arrow_clamp_height  CDATA   #IMPLIED
+          arrow_width         CDATA   #IMPLIED
+          arrow_line_width    CDATA   #IMPLIED
+          close               CDATA   #REQUIRED
+          fill                CDATA   #IMPLIED
+          fill_color          CDATA   #IMPLIED
+          fill_pattern        (none|dots|hor1|hor2|ver1|ver2|diag1|diag2|solid)  #IMPLIED>
+
+
+
+
+<!--
+   Defines a rectangle with a center-point and width/height.
+   The optional text-tag is used for text directly assigned to this primitive.
+-->
+<!ELEMENT rectangle (point,text?)>
+
+
+<!--
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   width: The metric width of the rectangle.
+   height: The metric height of the rectangle.
+   rotate: The rectangle is rotated according to the angle here (360° for full
+           rotation). Double-Value.
+   linewidth: Line-width. Double-Value.
+   linestyle: An enum defining the line-style
+   rounding: A percentage-value (double) for round edges
+   fill: A bool, if true, the primitive should be filled with the given color and pattern.
+   fill_color: Fill-Color in 32-Bit hex RGBA (#RRGGBBAA)
+   fill_pattern: An enum defining the fill-pattern.
+-->
+<!ATTLIST rectangle
+          GuiDisplayName CDATA   #IMPLIED
+          color          CDATA   #REQUIRED
+          width          CDATA   #REQUIRED
+          height         CDATA   #REQUIRED
+          rotate         CDATA   #IMPLIED
+          linewidth      CDATA   #REQUIRED
+          linestyle      (solid|dashed|dotted|dashed_dotted) #IMPLIED
+          rounding       CDATA   #IMPLIED
+          fill           CDATA   #IMPLIED
+          fill_color     CDATA   #IMPLIED
+          fill_pattern   (none|dots|hor1|hor2|ver1|ver2|diag1|diag2|solid)  #IMPLIED>
+
+
+<!--
+   Defines a spline with at least three points. The first and the last point
+   define the endpoints, all other points define the curve between them.
+   The optional text-tag is used for text directly assigned to this primitive.
+-->
+<!ELEMENT spline (point,point,point+,text?)>
+
+
+<!--
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   linewidth: Line-width. Double-Value.
+   linestyle: An enum defining the line-style
+   arrows: Enum defining, if and where to add arrows to the line. If the
+           primitive is closed, no arrows should be drawn.
+   arrow_height: The height of the arrow from the arrow-head to the outer points,
+                 parallel to the middle axis of the arrow.
+   arrow_clamp_height: The height from the the arrow-neck to the outer points,
+                       parallel to the middle axis of the arrow.
+   arrow_width: The distance between the outer points of the arrow.
+   arrow_line_width: The line width of the line used to draw the arrow.
+   close: A bool. If true, connect the start- and end-point.
+   fill: A bool. If true, the primitive should be filled with the given color and
+         pattern. This also means, that the start-point is automatically
+         connected to the end-point to get a closed shape to fill.
+   fill_color: Fill-Color in 32-Bit hex RGBA (#RRGGBBAA)
+   fill_pattern: An enum defining the fill-pattern.
+-->
+<!ATTLIST spline
+          GuiDisplayName      CDATA   #IMPLIED
+          color               CDATA   #REQUIRED
+          linewidth           CDATA   #REQUIRED
+          linestyle           (solid|dashed|dotted|dashed_dotted) #IMPLIED
+          arrows              (none|start|end|both) #IMPLIED
+          arrow_height        CDATA   #IMPLIED
+          arrow_clamp_height  CDATA   #IMPLIED
+          arrow_width         CDATA   #IMPLIED
+          arrow_line_width    CDATA   #IMPLIED
+          close               CDATA   #REQUIRED
+          fill                CDATA   #IMPLIED
+          fill_color          CDATA   #IMPLIED
+          fill_pattern        (none|dots|hor1|hor2|ver1|ver2|diag1|diag2|solid)  #IMPLIED>
+
+
+<!--
+   A symbol to display in the plan.
+   position, offsetx (in Pixel), offsety (in Pixel), direction of movement
+-->
+<!ELEMENT symbol (point)>
+
+
+<!--
+   text_w: Text for symbols text-field w.
+   text_xy: Text for symbols text-field xy.
+   text_v: Text for symbols text-field v.
+   text_t: Text for symbols text-field t.
+   text_z: Text for symbols text-field z.
+   text_ef: Text for symbols text-field ef.
+   text_g: Text for symbols text-field g.
+   text_h: Text for symbols text-field h.
+   text_m: Text for symbols text-field m.
+   text_jklnp: Text for symbols text-field jklnp.
+   symbol_id: ID of the symbol (int).
+   force_id: Force-ID of the symbol (int).
+   abc_protection: Flag for abc_protection (bool).
+   affil: Enum for affiliation of the symbol.
+   mobility: Enum for the mobility of the symbol.
+   w_vbg_et: Enum for tactical state of the symbol. Corresponds to enum w_vbg_et
+             in zskssmal_teilnehmer.h.
+   rotate: The Symbol is rotated according
+           to the angle here (360° for full rotation). Double-Value.
+-->
+<!ATTLIST symbol
+          GuiDisplayName     CDATA   #IMPLIED
+          text_w             CDATA   #IMPLIED
+          text_xy            CDATA   #IMPLIED
+          text_v             CDATA   #IMPLIED
+          text_t             CDATA   #IMPLIED
+          text_z             CDATA   #IMPLIED
+          text_ef            CDATA   #IMPLIED
+          text_g             CDATA   #IMPLIED
+          text_h             CDATA   #IMPLIED
+          text_m             CDATA   #IMPLIED
+          text_jklnp         CDATA   #IMPLIED
+          symbol_id          CDATA   #IMPLIED
+          symbol_offsetX     CDATA   #IMPLIED
+          symbol_offsetY     CDATA   #IMPLIED
+          symbol_direction   CDATA   #IMPLIED
+          force_id           CDATA   #IMPLIED
+          symbol_state       CDATA   #IMPLIED
+          symbol_uncertainty CDATA   #IMPLIED
+          damage_force_id    CDATA   #IMPLIED
+          abc_protection     CDATA   #IMPLIED
+          affil              (unknown|friend|neutral|enemy)  #REQUIRED
+          mobility           (wheel|wheel_all_terrain|chain|chain_all_terrain|trailer|train)  #REQUIRED
+          w_vbg_et           (einsatzbereit|treffer_ohne_wirkung|annaehender_treffer|zeitlicher_ausfall|leichter_treffer|mittlerer_treffer|schwerer_treffer|bewegungsunfaehig|bewegungsunfaehig_sichtb|ausfall_waffenanlage|ausfall_waffenanlage_sichtb|totalausfall)  #REQUIRED
+          rotate             CDATA   #IMPLIED>
+
+
+<!--
+   A one-line or multiline-text with optional background and frame.
+   If used as a child to another primitive, the point position of the text is
+   ignored. The alignment attributes define the text-position in relation to the
+   primitive instead.
+-->
+<!ELEMENT text (point,text_data)>
+
+
+<!--
+   anchor_horizontal: Horizontal position of the text on its point
+   anchor_vertical: Vertical position of the text on its point
+   margin_horizontal: Horizontal margin in Pixels between the texts bounding box and the surrounding frame
+   margin_vertical: Vertical margin in Pixels between the texts bounding box and the surrounding frame
+   color: Color in 32-Bit hex RGBA (#RRGGBBAA)
+   font: Font-Type
+   font_size: Font-Size. Int.
+   font_italic: A bool. If true, the font should be italic.
+   font_bold: A bool. If true, the font should be bold.
+   box: A bool, if true, the primitive should be filled with the given color and pattern.
+   linewidth: Line-width for the box. Double-Value.
+   linestyle: An enum defining the line-style for the box.
+   linecolor: Color in 32-Bit hex RGBA (#RRGGBBAA) for the outline of the box.
+   fill: A bool, if true, the box should be filled with the given color and pattern.
+   fill_color: Fill-Color for the box in 32-Bit hex RGBA (#RRGGBBAA)
+   fill_pattern: An enum defining the fill-pattern for the box.
+   rotate: The bounding rectangle, that defines the ellipse is rotated according
+           to the angle here (360° for full rotation). Double-Value.
+-->
+<!ATTLIST text
+          GuiDisplayName     CDATA   #IMPLIED
+          anchor_horizontal  (left|center|right) #REQUIRED
+          anchor_vertical    (top|center|bottom) #REQUIRED
+          margin_horizontal  CDATA   #IMPLIED
+          margin_vertical    CDATA   #IMPLIED
+          color              CDATA   #REQUIRED
+          font               (SansSerif|Serif|Fixed|Decorative) #REQUIRED
+          font_size          CDATA   #REQUIRED
+          font_italic        CDATA   #IMPLIED
+          font_bold          CDATA   #IMPLIED
+          box                CDATA   #IMPLIED
+          linewidth          CDATA   #IMPLIED
+          linestyle          (solid|dashed|dotted|dashed_dotted) #IMPLIED
+          linecolor          CDATA   #IMPLIED
+          fill               CDATA   #IMPLIED
+          fill_color         CDATA   #IMPLIED
+          fill_pattern       (none|dots|hor1|hor2|ver1|ver2|diag1|diag2|solid)  #IMPLIED
+          rotate             CDATA   #IMPLIED>
+
+
+<!--
+   A tag that contains the actual text-data of a text-tag.
+-->
+<!ELEMENT text_data (#PCDATA)>
+
+
+<!--
+   alignment: If this text contains more than one line, this defines the
+              alignment of the text in the bounding box of all lines.
+-->
+<!ATTLIST text_data
+          alignment  (left|center|right) #REQUIRED>
+
+
+<!--
+   Defines a point with a double precision x and y-value.
+-->
+<!ELEMENT point EMPTY>
+
+
+<!--
+   x: The x-coordinate of the point.
+   y: The y-coordinate of the point.
+-->
+<!ATTLIST point
+          x  CDATA  #REQUIRED
+          y  CDATA  #REQUIRED>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.h
new file mode 100755
index 000000000..ad8926605
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model.h
@@ -0,0 +1,1028 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModel to write and read PlanEditor plans.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   11.11.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+// clazy:excludeall=const-signal-or-slot
+
+#pragma once
+
+#include <QtCore/QMultiMap>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QColor>
+#include <QMetaType>
+
+#include <Common/id_handler.h>
+
+#include "geometry_model_export.h"
+
+
+class QIODevice;
+class QTransform;
+
+namespace SituationMap
+{
+
+class Referenced;
+
+/**
+  Interface to Read/Write plan(s)
+*/
+class GEOMETRYMODEL_EXPORT GeometryModel : public QObject
+{
+  Q_OBJECT
+
+public:
+
+  class GEOMETRYMODEL_EXPORT Node
+  {
+  public:
+
+    class Implementation;
+
+    Node();
+    Node(const Implementation &other);    // do not use explicit here to avoid a lot of writing stuff to explicit casts
+
+    Node(const Node &other);
+
+    virtual ~Node();
+
+    Node &operator = (const Node &other);
+
+    Node &operator = (Node &&other);
+
+    const Implementation &get() const;
+    Implementation       &get();
+
+    bool                 isValid() const;
+    bool                 isRootNode() const;
+
+    Node                 parentNode() const;
+
+    bool                 hasChildNodes() const;
+
+    Node                 next() const;
+    Node                 firstChildNode() const;
+    Node                 firstChildNode(const QString &nodeName) const;
+
+    bool                 operator ==(const Node &) const;
+    bool                 operator !=(const Node &) const;
+
+
+    uint makeConnection(Referenced *) const;
+    bool unlinkConnection() const;
+    uint connectedId() const;
+
+    Referenced *connected() const;
+
+  private:
+
+    Implementation *_d;
+
+  }; // Node
+
+
+  explicit GeometryModel(QObject *parent = nullptr);
+
+  GeometryModel(const GeometryModel &); //!< Copy-Constructor
+  GeometryModel& operator = (const GeometryModel &) = delete; // copy allowed but no assigment?
+
+  /**
+    Converts the geometry model to its textual representation.
+    @{
+  */
+  virtual QByteArray toByteArray() const = 0;
+
+  /**
+    Converts the geometry model to QString by retaining userData.
+  */
+  virtual QByteArray toByteArrayDebug() const = 0;
+  /** @} */
+
+  /**
+    Converts textual representation of geometry model to binary representation.
+    @{
+  */
+  virtual bool fromByteArray(const QByteArray &content) = 0;
+  /** @} */
+
+  /**
+    Reads textual representation of geometry model from device and converts to binary representation.
+  */
+  virtual bool fromDevice(QIODevice *device) = 0;
+
+  /**
+    Converts textual representation of geometry model to binary representation by retaining userData.
+  */
+  virtual bool fromByteArrayDebug(const QByteArray &content) = 0;
+
+  /**
+    Check for existens of primitives.
+   */
+  virtual bool isEmpty() const = 0;
+
+  /**
+    Retrieve the root node to traverse the model.
+  */
+  virtual Node getRootNode() const = 0;
+
+  /**
+    Retrieve the node to store default map settings.
+  */
+  virtual Node getMapDefaultSettingsNode() const = 0;
+
+
+  using NodeList = QList<Node>;
+
+
+  //! Types of Primitives for \sa { addPrimitive(), getType() }
+  enum class PrimitiveType
+  {
+    DictionarySymbol
+    , ParticipantSymbol
+    , Ellipse
+    , Line
+    , Polyline
+    , Rectangle
+    , Spline
+    , Symbol
+    , Text
+    , Node
+    , RootNode
+    , MapDefaults
+    , Unknown
+  }; // PrimitiveType
+
+  //! Horizontal Alignment-Enum for Text
+  enum class HorizontalAlign
+  {
+    Left    = 0,
+    HCenter = 1,
+    Right   = 2
+  };
+
+  //! Vertical Alignment-Enum for Text
+  enum class VerticalAlign
+  {
+    Bottom  = 0,
+    VCenter = 1,
+    Top     = 2
+  };
+
+  //! Enum for positioning Arrows at (Poly)Lines
+  enum class Arrows {NoArrows, Start, End, Both};
+
+  //! Enum for Fill-Patterns
+  enum class FillPattern {None, Dots, Hor1, Hor2, Ver1, Ver2, Diag1, Diag2, Solid};
+
+  //! Enum for Fill-Style of Ellipsis
+  enum class FillStyle {Chord, Pieslice, Open};
+
+  //! Enum for Line-Styles
+  enum class LineStyle {LineSolid, Dashed, Dotted, DashedDotted};
+
+  //! Enum for Text-Fonts
+  enum class Font {SansSerif, Serif, Fixed, Decorative};
+
+  //! Enum for different types of maps - extends the types from GDW::MapType in
+  //! GDW/src/GDWUtils/LoadMapControl.h
+  enum class MapType {Raster, Vector, Contour, Elevation, RasterElevation, MapUnknown};
+
+  //! Enum for tactical state of a symbol: ts_* = tactical state...
+
+  enum class vbg_et
+  {
+    EINSATZBEREIT               =  0,
+    LEICHTER_TREFFER            =  1,
+    MITTLERER_TREFFER           =  2,
+    SCHWERER_TREFFER            =  3,
+    BEWEGUNGSUNFAEHIG           =  4,
+    BEWEGUNGSUNFAEHIG_SICHTB    =  5,
+    AUSFALL_WAFFENANLAGE        =  6,
+    AUSFALL_WAFFENANLAGE_SICHTB =  7,
+    TOTALAUSFALL                =  8,
+    ZEITLICHER_AUSFALL          =  9,
+    ANNAEHENDER_TREFFER         = 10,
+    TREFFER_OHNE_WIRKUNG        = 11,
+  };
+
+  using t_vbg_et = vbg_et;
+  /*
+  enum t_w_vbg_et {
+    ts_einsatzbereit, ts_treffer_ohne_wirkung, ts_annaehender_treffer,
+    ts_zeitlicher_ausfall, ts_leichter_treffer, ts_mittlerer_treffer,
+    ts_schwerer_treffer, ts_bewegungsunfaehig, ts_bewegungsunfaehig_sichtb,
+    ts_ausfall_waffenanlage, ts_ausfall_waffenanlage_sichtb, ts_totalausfall
+  };
+  */
+
+  //! Re-order Primitives
+  enum class PrimitivOrder { Lower, Raise };
+
+  //! Enum for all known attributes
+  enum class Attribute
+  {
+    None,                   // Only for changed signal, can not be set
+    AbcProtection,          // Available for: symbol - Type: bool
+    Affiliation,            // Available for: symbol - Type: Symbol::t_affil
+    Alignment,              // Available for: text_data - Type: HorizontalAlign
+    AnchorHorizontal,       // Available for: text - Type: HorizontalAlign
+    AnchorVertical,         // Available for: text - Type: t_valign
+    ArrowClampHeight,       // Available for: line polyline spline - Type: double
+    ArrowHeight,            // Available for: line polyline spline - Type: double
+    ArrowLineWidth,         // Available for: line polyline spline - Type: double
+    Arrows,                 // Available for: line polyline spline - Type: t_arrows
+    ArrowWidth,             // Available for: line polyline spline - Type: double
+    Box,                    // Available for: text - Type: bool
+    Center,                 // Available for: ellpise rectangle - Type QPointF
+    Close,                  // Available for: polyline spline - Type: bool
+    Color,                  // Available for: ellipse line polyline rectangle spline text - Type: QColor
+    Extent,                 // Available for: ellipse - Type: double
+    Fill,                   // Available for: ellipse polyline rectangle spline text - Type: bool
+    FillColor,              // Available for: ellipse polyline rectangle spline text - Type: QColor
+    FillPattern,            // Available for: ellipse polyline rectangle spline text - Type: t_fillPattern
+    FillStyle,              // Available for: ellipse - Type: t_fillStyle
+    Font,                   // Available for: text - Type: t_font
+    FontBold,               // Available for: text - Type: bool
+    FontItalic,             // Available for: text - Type: bool
+    FontSize,               // Available for: text - Type: int
+    Height,                 // Available for: ellipse rectangle - Type: double
+    Injury,                 // Available for: ParticipantSymbol - Type int
+    LineColor,              // Available for: text - Type: QColor
+    LineStyle,              // Available for: ellipse line polyline rectangle spline text - Type: t_lineStyle
+    LineWidth,              // Available for: ellipse line polyline rectangle spline text - Type: double
+    MarginHorizontal,       // Available for: text - Type: int
+    MarginVertical,         // Available for: text - Type: int
+    Mobility,               // Available for: symbol - Type: Symbol::t_mob
+    SIDC,                   // Available for: dictionary symbol - Type: QString
+    SIDC_Color,             // Available for: dictionary symbol - Type: QColor
+    SIDC_Attributes,        // Available for: dictionary symbol - Type: QString  AttributeName=AttributeValue;AttributeName....
+    SymbolId,               // Available for: symbol - Type: int
+    SymbolOffsetX,          // Available for: symbol - Type: int
+    SymbolOffsetY,          // Available for: symbol - Type: int
+    SymbolDirection,        // Available for: symbol - Type: double
+    ForceId,                // Available for: symbol - Type: int
+    SymbolState,            // Available for:  - Type: enum t_state (aus symbol_types.h)
+    SymbolUncertainty,      // Available for:  - Type: enum t_uncertainty (aus symbol_types.h)
+    SymbolExplicitScale,    // Available for:  symbol
+    DamageForceId,          // Available for: symbol - Type: int
+    PeMapBrightness,        // Available for: plan - Type: double
+    PeMapCenterX,           // Available for: plan - Type: int
+    PeMapCenterY,           // Available for: plan - Type: int
+    PeMapSaturation,        // Available for: plan - Type: double
+    PeMapRotation,          // Available for: plan - Type: double
+    PeMapType,              // Available for: plan - Type: t_mapType
+    PeMapZoom,              // Available for: plan - Type: double
+    PeShowUtm,              // Available for: plan - Type: bool
+
+    PeSymbolOpacity,        // Available for: plan - Type: double 0..1.0 (0=keine Deckkraft, 1.0 deckend)
+    PeSymbolFillType,       // Available for: plan - Type: Type: enum t_fillType (aus symbol_types.h)
+    PeSymbolScale,          // Available for: plan - Type: double 0..2.0
+
+    MetaDataTitle,
+    MetaDataAuthor,
+    MetaDataDate,
+    MetaDataDesciption,
+    MetaDataMinScale,
+    MetaDataMaxScale,
+
+    MetaPixelBasedTextBoxes,
+
+    Rotate,                 // Available for: ellipse rectangle text - Type: double
+    Rounding,               // Available for: rectangle - Type: double
+    Start,                  // Available for: ellipse - Type: double
+    Text_EF,                // Available for: symbol - Type: QString
+    Text_G,                 // Available for: symbol - Type: QString
+    Text_H,                 // Available for: symbol - Type: QString
+    Text_KLNPJ,             // Available for: symbol - Type: QString
+    Text_M,                 // Available for: symbol - Type: QString
+    Text_T,                 // Available for: symbol - Type: QString
+    Text_V,                 // Available for: symbol - Type: QString
+    Text_W,                 // Available for: symbol - Type: QString
+    Text_XY,                // Available for: symbol - Type: QString
+    Text_Z,                 // Available for: symbol - Type: QString
+    UtmEast,                // Available for: plan - Type: int
+    UtmGrid,                // Available for: plan - Type: QString
+    UtmNorth,               // Available for: plan - Type: int
+    UtmZone,                // Available for: plan - Type: QString
+    Width,                  // Available for: ellipse rectangle - Type: double
+    att_vbg_et,             // Available for: symbol - Type: t_w_vbg_et
+    MaxAttributes
+  }; // enum class Attribute
+
+
+  /**
+    Set a value for a global model-attribute. If the attribute does not exist in the
+    model or the given value is invalid, a setAttributeError()-signal is emitted.
+    Signal changed() ist emitted.
+    \sa { getModelAttribute(), setAttributeError(), hasAttribute(), attributeType() }
+    \param attribute: the attribute to set
+    \param value: the value of the attribute
+  */
+  virtual void setModelAttribute(Attribute attribute, const QVariant &value) = 0;
+
+
+  /**
+    Set a value for a plan-editor-attribute. If the attribute does not exist in
+    the plan-editor or the given value is invalid, a setAttributeError()-signal
+    is emitted.
+    Signal planEditorChanged() ist emitted.
+    \sa { getAttribute(), setAttributeError(), hasAttribute(), attributeType() }
+    \param attribute: the attribute to set
+    \param value: the value of the attribute
+  */
+  virtual void setModelEditorAttribute(Attribute attribute, const QVariant &value) = 0;
+
+
+  /**
+    Set a value for a primitive-attribute. If the attribute does not exist in
+    the primitive or the given value is invalid, a setAttributeError()-signal
+    is emitted.
+    Signal changed() ist emitted.
+    \sa { getAttribute(), setAttributeError(), hasAttribute(), attributeType() }
+    \param node: reference to the primitive-node
+    \param attribute: the attribute to set
+    \param value: the value of the attribute
+  */
+  virtual void setPrimitiveAttribute(const Node &node, Attribute attribute, const QVariant &value) = 0;
+
+
+  /**
+    Move a primitive or a group-node into another group-node. If the moved
+    primitive is already child of a group-node, it ist moved to the group
+    and removed from the previous one. If the target is not a group-node,
+    a typeError()-signal is emitted.
+    Signal changed() ist emitted.
+    \param primitive: the primitive or group-node to move into a group
+    \param target: the target group-node
+  */
+  virtual void movePrimitiveIntoGroup(const Node &primitive, const Node &target) = 0;
+
+
+  /**
+    Remove a group, but not its children. This means, that all children of the
+    given group are moved one level up the tree and then the group is deleted.
+    If group is not a group-node, a typeError()-signal is emitted.
+    Signal changed() ist emitted.
+    \param group: the group
+  */
+  virtual void releaseGroup(const Node &group) = 0;
+
+
+  /**
+    Remove a group AND all its children.
+    If group is not a group-node, a typeError()-signal is emitted.
+    Signal changed() ist emitted.
+    \param group: the group
+  */
+  virtual void deleteGroup(const Node &group) = 0;
+
+
+  /**
+    Remove and delete the given primitive from the plan (and possibly all of
+    its children).
+    Signal changed() ist emitted.
+    \param primitive: reference to the primitive-node
+  */
+  virtual void removePrimitive(const Node &primitive) = 0;
+
+
+  /**
+    Remove and delete all primitives from the plan (and possibly all of
+    their children), that match the userData in the given list.
+    Signal changed() ist emitted, after all primitves have been removed.
+    \param primitive: reference to the primitive-node
+  */
+  virtual void removePrimitivesByUserData(const QList<int> &userDataList) = 0;
+
+
+  /**
+    Remove Text from a primitive, if any.
+    Signal changed() ist emitted.
+
+    \param parent: The node where to remove the text from
+  */
+  virtual void removeText(Node &parent) = 0;
+
+
+  /**
+    Set the text-data of a text-node. If the given node is not a text-node,
+    a typeError()-signal is emitted.
+    Signal changed() ist emitted.
+    \sa{ addText(), getText(), getTextData() }
+
+    \param textNode: the text-node
+    \param data: the text-data
+    \param textAlign: the alignment of the text-data
+  */
+  virtual void setTextData(const Node &textNode, const QString &data, HorizontalAlign textAlign) = 0;
+
+
+  /**
+    Translate a group or primitive.
+    Signal changed() ist emitted.
+    \param node: reference to the primitive-node
+    \param x: translate horizontally by this value
+    \param y: translate vertically by this value
+  */
+  virtual void translateNode(const Node &node, double x, double y) = 0;
+
+
+  /**
+    Move a group or primitive to the given coordinates.
+    Signal changed() ist emitted.
+    \param node: reference to the primitive-node
+    \param x: move horizontally to this value
+    \param y: move vertically to this value
+  */
+  virtual void moveNode(const Node &node, double x, double y) = 0;
+
+
+  /**
+    Scale the group or primitive. A primitive is scaled around the center of
+    its bounding box. If a group is scaled, all children are scaled around
+    the center of the groups bounding box.
+    Signal changed() ist emitted.
+    \param node: reference to the primitive-node
+    \param scaleX: the x-scale-factor
+    \param scaleY: the y-scale-factor
+  */
+  virtual void scaleNode(const Node &node, double scaleX, double scaleY) = 0;
+
+
+  /**
+    Rotate a group or primitive. A primitive is rotated around the center of
+    its bounding box. If a group is rotated, all children are rotated around
+    the center of the groups bounding box.
+    Signal changed() ist emitted.
+    \param node: reference to the primitive or group
+    \param angle: the rotation angle (ccw, 360 degree)
+  */
+  virtual void rotateNode(const Node &node, double angle) = 0;
+
+
+  /**
+    Reorder Primitives in the plan.
+    Signal changed() ist emitted.
+    \param nodes: The primitives to reorder
+    \param order: Move primitives up (Raise) or down (Lower)
+  */
+  virtual void reorderPrimitives(const NodeList &nodes, PrimitivOrder order) = 0;
+
+
+  /**
+     Merge another Node into this one.
+     All Primitives and GroupNodes of other are copied and added (appended) to
+     this.
+     Signal changed() ist emitted.
+
+     \param other: the other plan or Node
+     \param skipUndo: if true, the undo-stack is not updated
+     \param intoNewGroup: If true, all merged primitives go into a new Group,
+                          while groups from the merged plan are removed.
+   */
+
+  virtual void merge(const Node &other, bool skipUndo = false, bool intoNewGroup = false) = 0;
+
+  /**
+    Merge another plan into this one.
+    All Primitives and GroupNodes of other are copied and added (appended) to
+    this.
+    Signal changed() ist emitted.
+
+    \param other: the other plan or Node
+    \param skipUndo: if true, the undo-stack is not updated
+    \param intoNewGroup: If true, all merged primitives go into a new Group,
+    while groups from the merged plan are removed.
+  */
+  virtual void merge(GeometryModel *other, bool skipUndo = false, bool intoNewGroup = false) = 0;
+
+
+  /**
+    Undo the last change on the undo()-stack. To check, if there are
+    undo()-steps available, check the size of the undo-stack with undoSteps()
+    If inside of an undo-block, the block is closed, even if nested.
+    Signal changed() ist emitted.
+    \param steps: Go this many steps back in undo-history. If less than 1, undo
+                  does nothing, if greater than undo-steps available, undo goes
+                  only back that many steps.
+  */
+  virtual void undo(unsigned int steps = 1) = 0;
+
+  /**
+    Redo the last change on redo-stack. To check, if there are
+    redo-steps available, check the size of the redo-stack with redoSteps()
+    \param steps: Go this many steps back in undo-history. If less than 1, redo
+    does nothing, if greater than redo-steps available, redo goes
+    only back that many steps.
+  */
+  virtual void redo(unsigned int steps = 1) = 0;
+
+
+  /**
+     Enable or disable undo(). While undo() is disabled, no new actions will be
+     recorded in the undo-stack.
+     \param enabled: Bool to enable/disable undo()
+   */
+  virtual void enableUndo(bool enable) = 0;
+
+
+  /**
+     Start a block of collected undo-steps. All modifications until endUndoBlock()
+     are collected into one undo-Step. Nested undoBlocks are not possible. If
+     already inside an undo-block, this method does nothing.
+     undo() ends an undo-block.
+   */
+  virtual void startUndoBlock() = 0;
+
+
+  /**
+     End a block of collected undo-steps. All collected modifications since the
+     startUndoBlock() are now pushed into one undo-Step. Nested undoBlocks are
+     not possible. If not inside an undo-block, this method does nothing.
+     undo() also ends an undo-block.
+     \param eventDescription: describe the last change. If == "", use last
+                              automatic entry.
+   */
+  virtual void endUndoBlock(const QString &eventDescription = QString()) = 0;
+
+  /**
+    Abort recording a block of collected undo-steps.
+  */
+  virtual void abortUndoBlock() = 0;
+
+  /**
+    Set the maximum number of undo-Steps. Default is 100.
+    \param max: number of undo-Steps
+  */
+  virtual void setMaxUndoSteps(unsigned int max) = 0;
+
+  /**
+    Return maximum number of undo-steps.
+  */
+  virtual unsigned int maxUndoSteps() const = 0;
+
+
+  /**
+    Counting modifications of the model.
+  */
+  virtual unsigned int modificationCounter() const = 0;
+
+
+  /**
+    Reset modification counter.
+  */
+  virtual void resetModificationCounter() = 0;
+
+
+  /**
+    Remove all User-Data-Values-Attributes and empty groups from the model.
+    ATTENTION: After this, many methods may return unexpected results.
+    This slot/method should only be used before the model is written to a file
+    or database.
+    For each cleaned Attribute the signal userDataCleanup() is emitted.
+  */
+  virtual void cleanModel() = 0;
+
+
+  /**
+    Clear the model. This deletes all primitives and groups.
+    Signal changed() is emitted.
+  */
+  virtual void clearModel() = 0;
+
+
+  /**
+    Add a primitive to the plan. If the given primitive-type does not exist,
+    a typeError()-signal is emitted.
+    Signal changed() ist emitted.
+
+    \sa { typeError() }
+    \param type: the type of a primitive
+    \param points: a list of points to define the position/geometry of the primitive
+    \param attributes: a list of attribute/value-pairs. If the list contains
+                       attributes, that are not supported by the primitive, or
+                       values, that do not fit into the attributes, a
+                       setAttributeError()-signal is emitted.
+    \param userData: An int for creating simIDs
+    \param textData: Add this text to the Primitive, if this is a text-Primitive
+    \param textAlign: the alignment of the text-data, only used for text-primitive
+    \return a reference to the new tree-element
+  */
+  virtual Node addPrimitive(PrimitiveType                              type
+                            , const QList<QPointF>                      &points
+                            , const QList<QPair<Attribute, QVariant> > &attributes
+                            , int                                        userData  = SituationMap::IdHandler::BadId
+                            , const QString                             &textData  = QString()
+                            , HorizontalAlign                            textAlign = HorizontalAlign::Left) = 0;
+
+
+  /**
+    Set the defining points of a primitive
+    If the number of points does not match the Primitives-definition, an
+    attributeError() is emitted.
+    \param node: reference to the primitive-node
+    \param points: a list of points to define the position/geometry of the primitive
+    \return true on success, false otherwise (i.e. wrong number of points)
+  */
+  virtual bool setPrimitivePoints(const Node &node, const QList<QPointF> &points) = 0;
+
+
+  /**
+    Add a text-primitive to another primitive. A typeError()-signal is emitted,
+    if the given parent-node can not have text. The returned node is a text-node.
+    Signal changed() ist emitted.
+
+    \sa { typeError(), addPrimitive(), setPrimitiveAttribute(), setTextData() }
+
+    \param parent: The node where to insert text
+    \param textData: Initial string for the text-element.
+    \param textAlign: Initial aligment of the text-data.
+    \param attributes: a list of attribute/value-pairs. If the list contains
+                       attributes, that are not supported by text-primitives, or
+                       values, that do not fit into the attributes, a
+                       setAttributeError()-signal is emitted.
+    \param userData: An int for creating simIDs
+    \return a reference to the new tree-element
+  */
+  virtual Node addText(const Node     &parent
+                       , const QString &textData
+                       , HorizontalAlign textAlign
+                       , const QList<QPair<Attribute, QVariant> > &attributes
+                       , int userData = SituationMap::IdHandler::BadId) = 0;
+
+
+  /**
+    Retrieve the text-element from a primitive, if any.
+    \param parent: the primitive where to get the text-node from
+    \return the text-node, or a null-node, if parent has no text.
+  */
+  virtual Node getText(const Node &parent) const = 0;
+
+
+  /**
+    Retrieve the text-data from a text-node. If the given node is not a
+    text-node, a typeError() is emitted and an empty string returned.
+    \sa{ getText() }
+
+    \param textNode: the text-node
+    \return a string with the text-data
+  */
+  virtual QString getTextData(const Node &textNode) const = 0;
+
+
+  /**
+    Retrieve the defining points of a primitive
+    If the primitive has no points, a signal planModelError() is emitted,
+    since the model does not contain points where the user believes it should.
+
+    \param node: reference to the primitive-node
+    \return QList containing the QPointF of the primitive
+  */
+  virtual QList<QPointF> getPrimitivePoints(const Node &node) const = 0;
+
+
+  /**
+    Return the bounding box of a primitive or group of primitives or the
+    whole plan. If the given node has no bounding box (i.e. not a primitive)
+    the resulting rect is not valid.
+    \sa {translateNode(), moveNode(), rotateNode(), scaleNode() QRectF::isValid()}
+    \param node: The primitive or group.
+  */
+  virtual QRectF getBoundingBox(const Node &node) const = 0;
+
+  /**
+    Set user defined name of node, that will be used in GUI to label nodes.
+    \param node The primitive or group
+    \param name The name string
+  */
+  virtual void setNodeDisplayName(const Node &node, const QString &name) = 0;
+
+  /**
+    Set user defined name of node, that will be used in GUI to label nodes.
+    \param node The primitive or group
+  */
+  virtual QString getNodeDisplayName(const Node &node) const = 0;
+
+
+  /**
+  Get a value for a global model-attribute. If the attribute does not exist in the
+  model a setAttributeError()-signal is emitted.
+  \sa { setModelAttribute(), setAttributeError(), hasAttribute(), attributeType() }
+  \param attribute: the attribute to get
+  */
+  virtual QVariant getModelAttribute(Attribute attribute) const = 0;
+
+
+  /**
+    Get the value of an attribute. If the attribute does not exist in the given
+    node, a setAttributeError()-signal is emitted.
+    \sa { setAttributeError(), hasAttribute(), attributeType() }
+    \param node: reference to the primitive-node
+    \param attribute: the attribute to get
+  */
+  virtual QVariant getAttribute(const Node &node, Attribute attribute) const = 0;
+
+  /**
+    Get the value of an attribute of class type T from geometry model of type GeometryModelType.
+    \see getAttribute
+  */
+  template <class T, class GeometryModelType> T getAttribute(const Node &node, Attribute attribute) const
+  {
+    const GeometryModelType *geoModelPtr = dynamic_cast<const GeometryModelType *>(this);
+    if (geoModelPtr)
+      return geoModelPtr->template getAttribute<T>(node, attribute);
+    return T();
+  } // template <class T, class GeometryModelType> T getAttribute( const Node & node, Attribute attribute ) const
+
+
+  /**
+    Check, if a given node has a specific attribute.
+    \sa { setPlanAttribute(), getAttribute(), setAttributeError(), attributeType() }
+    \param node: reference to the primitive-node
+    \param attribute: the attribute to check
+  */
+  virtual bool hasAttribute(const Node &node, Attribute attribute) const = 0;
+
+
+  /**
+    Get the type a an attribute. The type returned is a QVariant-type.
+    \sa { setPlanAttribute(), getAttribute(), setAttributeError(), hasAttribute() }
+    \param node: reference to the primitive-node
+    \param attribute: the attribute to check
+  */
+  virtual QVariant::Type attributeType(const Attribute &attribute) const = 0;
+
+
+  /**
+    Get a list of supported attributes from a primitive/node-type. If the given
+    type does not exist, a typeError()-signal is emitted.
+    \sa { setPlanAttribute(), getAttribute(), setAttributeError(), hasAttribute(), attributeType() }
+    \param type: the type of a primitive
+  */
+  virtual QList<Attribute> supportedAttributes(PrimitiveType type) const = 0;
+
+
+  /**
+    Create a group from a list of primitives.
+    Signal changed() ist emitted.
+    \sa{ addPrimitive() }
+    \param primitives: A list of Elements which build the new group. May be
+                       empty. Primitives can be added later to the group with
+                       movePrimitiveIntoGroup()
+    \return a reference to the new group
+  */
+  virtual Node createGroup(const NodeList &primitives) = 0;
+
+
+  /**
+    If the given Primitive is in a group, return the Group-Node, otherwise
+    return a Null-Node.
+    \param primitive: The primitive to look up.
+    \return A group-node or a Null-Node
+   */
+  virtual Node isInGroup(const Node &primitive) const = 0;
+
+
+  /**
+    Return all primitives inside this group. If the given Node isn't a group, a
+    typeError() is emitted.
+    \param node: A group-node
+    \return: List of primitives in this group, possibly empty.
+   */
+  virtual NodeList getGroupPrimitives(const Node &node) = 0;
+
+
+  /**
+    Find a primitive by its corresponding userData-int. If there is no
+    Primitive that corresponds to the userData, a Null-Node is returned.
+    \sa{ QDomNode::isNull() }
+    \param userData: An int for creating simIDs
+    \return pointer to primitive-node or NULL
+  */
+  virtual Node findPrimitive(int userData) const = 0;
+
+
+  /**
+     Return \c true in case of existing user data. Otherwise the return value is false.
+  */
+  virtual bool hasUserData(const Node &node) const = 0;
+
+  /**
+    Get the userData from its corresponding primitive if any.
+    If no userData is associated with this Primitive, 0 is
+    returned and a typeError()-signal is sent and the bool opinted to by
+    ok is set to false. Otherwise it is set to true.
+    \param node: the primitive-node
+    \return userData-int
+  */
+  virtual int getUserData(const Node &node, bool *ok = nullptr) const = 0;
+
+
+  /**
+    Set the userData of a primitive.
+    If this primitive can not have userData, a typeError()-signal is sent.
+    \param node: pointer to the primitive-node
+    \param userData: an int
+  */
+  virtual void setUserData(const Node &node, int userData) = 0;
+
+
+  /**
+     Create and return a MultiMap with all UserData as Keys and the Primitives,
+     that contain that data as values. Used for searching Primitives by their
+     UserData (for example Selection-Check in GDW)
+     \param node: Start search for UserData at this node. This is normally a
+     Null-Node to search the whole tree.
+     \return QMultiMap with UserData and corresponding Primitives
+   */
+  virtual QMultiMap<int, Node> userDataMap(const Node &node = Node()) = 0;
+
+
+  /**
+    Create a copy of a group or primitive and insert it into the tree. If a
+    group is copied, a deep copy including all its children is created.
+    Signal changed() ist emitted.
+    \param node: the group or primitive to copy.
+    \param userData: An int for creating simIDs
+    \return a reference to the new group (or NULL)
+  */
+  virtual Node copy(const Node &node, int userData = SituationMap::IdHandler::BadId) = 0;
+
+
+  /**
+    Return the type of the given primitive.
+    \param node: the primitive or group
+    \return the type
+  */
+  virtual PrimitiveType getType(const Node &node) const = 0;
+
+
+  /**
+    Return the number of undo-steps available.
+    \return number of undo-steps on the undo-stack
+  */
+  virtual unsigned int undoSteps() const = 0;
+
+
+  /**
+  Return the number of redo-steps available.
+  \return number of redo-steps on the redo-stack
+  */
+  virtual unsigned int redoSteps() const = 0;
+
+
+  /**
+    Return the undo history containing strings that describe the available
+    undo-steps
+    \return A list of strings
+  */
+  virtual QStringList undoHistory() const = 0;
+
+
+  /**
+  Return the redo history containing strings that describe the available
+  redo-steps
+  \return A list of strings
+  */
+  virtual QStringList redoHistory() const = 0;
+
+  /**
+     Clear the undo-stack
+   */
+  virtual void clearUndoStack() = 0;
+
+  /**
+  Clear the redo-stack
+  */
+  virtual void clearRedoStack() = 0;
+
+  /**
+    Return a attribute-name from the enum for signals and logging
+    \param attribute: enum-value of attribute
+    \return name of attribute as string
+  */
+  virtual QString attributeToString(const Attribute &attribute) const = 0;
+
+
+  /**
+    Parsing the attribute string of a dictionary symbol. The result is written to \c attrMap
+    \param sidcAttributes Attribute string
+    \param attrMap        Result of parsing process
+    \return               true in case of none errors, else false
+  */
+
+  virtual bool parseSymbolAttributeString(const QString &sidcAttributes, QMap<QString, QVariant> &attrMap) const = 0;
+
+  /**
+    Build attribute string to store at dictionary symbol.
+  */
+  virtual QString buildSymbolAttributeString(const QMap<QString, QVariant> &attrMap) const = 0;
+
+signals:
+  /**
+    A signal, that is emitted, when the plan changed. Only real changes are
+    signaled to reduce unnecessary updates.
+
+    \param node: the changed node (if this is a Null-Node, the Root-Node of
+                 the plan has changed)
+    \param att: The attribute, that changed. If att==MaxAttributes, then
+                multiple attributes are changed
+    \param coordsChanged: if true, the coordinated of the primitive are changed
+  */
+  void changed(const Node &node, GeometryModel::Attribute att, bool coordsChanged);
+
+
+  /**
+    A signal, that is emitted, when the settings of the plan-editor have
+    changed.
+    \param what: Short description of the change for logging
+  */
+  void modelChanged(const QString &what);
+
+
+  /**
+    A signal, that is emitted, when an invalid type-parameter was given
+    as argument.
+    \param error: Short description of the error for logging
+  */
+  void typeError(const QString &error);
+
+
+  /**
+    A signal, that is emitted, when an invalid attribute-parameter was given
+    as argument.
+    \param error: Short description of the error for logging
+  */
+  void attributeError(const QString &error);
+
+
+  /**
+    A signal, that is emitted, when a method detects an error or inconsistency
+    in the model.
+    \param error: Short description of the error for logging
+  */
+  void modelError(const QString &error);
+
+
+  /**
+    A signal, that is emitted, when a methode detects an error.
+  */
+  void criticalError(const QString &error);
+
+
+  /**
+     This signal is emitted for each userData, when cleanModel() is called.
+     \param userData: an int
+   */
+  void userDataCleanup(int userData);
+
+  /**
+    The signal is emitted when undo has been called.
+  */
+  void nodeCleanup(const Node &node);
+
+  /**
+    This signal is emitted for each connection created with \c Node::makeConnection() function, when cleanModel() is called.
+    \param connectedPtr: an IdHandler::AccessableId *
+  */
+  void connectionCleanup(Referenced *connectedPtr);
+
+  /**
+    This signal is emitted when the modification counter has been changed
+  */
+  void modificationCount(unsigned int);
+};
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_export.h
new file mode 100755
index 000000000..2f951b621
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_export.h
@@ -0,0 +1,21 @@
+/**
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef GEOMETRYMODEL_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define GEOMETRYMODEL_EXPORT
+# else
+#  if defined(MAKE_SITUATIONMAPGEOMETRYMODEL_LIB)
+#   define GEOMETRYMODEL_EXPORT Q_DECL_EXPORT
+#  else
+#   define GEOMETRYMODEL_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.cpp
new file mode 100755
index 000000000..18de4ac9f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.cpp
@@ -0,0 +1,58 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModelFactory to create geometry model
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   20.11.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#include "geometry_model_factory.h"
+#include "geometry_model_q_dom.h"
+
+namespace SituationMap
+{
+
+GeometryModelFactory *GeometryModelFactory::singleton()
+{
+  static GeometryModelFactory s_factory;
+  return &s_factory;
+} /* GeometryModelFactory::singleton() */
+
+
+GeometryModel *GeometryModelFactory::create()
+{
+  return new GeometryModelQDom();
+} // GeometryModelFactory::create()
+
+
+GeometryModel *GeometryModelFactory::clone(GeometryModel *geoModel)
+{
+  GeometryModelQDom * qdomModel = dynamic_cast<GeometryModelQDom*>(geoModel);
+  if (qdomModel)
+    return new GeometryModelQDom(*qdomModel);
+
+  return nullptr;
+} // GeometryModelFactory::clone()
+
+}  /* namespace SituationMap */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.h
new file mode 100755
index 000000000..7a66aaa4b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_factory.h
@@ -0,0 +1,59 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModelFactory to create geometry model
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   20.11.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "geometry_model_q_dom.h"
+
+
+namespace SituationMap
+{
+
+/**
+   @brief Factory class to create GeometryModels
+
+   @see GeometryModel GeometryModelQDom
+*/
+
+class GEOMETRYMODEL_EXPORT GeometryModelFactory
+{
+public:
+
+  static GeometryModelFactory *singleton();
+
+  GeometryModelFactory()  = default;
+  ~GeometryModelFactory() = default;
+  GeometryModelFactory(const GeometryModelFactory &)            = delete;
+  GeometryModelFactory operator =(const GeometryModelFactory &) = delete;
+
+  GeometryModel *create();
+  GeometryModel *clone( GeometryModel * );
+
+}; /* GeometryModelFactory */
+
+}  /* namespace SituationMap */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.cpp
new file mode 100755
index 000000000..4872f8c19
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.cpp
@@ -0,0 +1,2712 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModel implementation to write and read PlanEditor plans from/to XML and manipulate DOM-tree.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Stephan Kuhagen <kuhagen@rheinmetall-de.com>
+**                     Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   ??.??.200?, SK  : First edition for use with Qt4
+**   11.11.2015, JT  : Splitting interface and implementation
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "geometry_model_q_dom.h"
+
+#include <Common/id_handler.h>
+
+#include <QtGui/QFont>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QTransform>
+
+#include <QtXml/QDomNode>
+#include <QtXml/QDomElement>
+#include <QtCore/QIODevice>
+
+#include <QCoreApplication>
+#include <QDebug>
+
+#include <limits.h>
+#include <assert.h>
+
+
+template<class _Ty, class _Other = _Ty> inline _Ty doExchange(_Ty &_Val, _Other && _New_val)
+{
+  // assign _New_val to _Val, return previous _Val
+  _Ty _Old_val = std::move(_Val);
+  _Val = std::forward<_Other>(_New_val);
+  return (_Old_val);
+}
+
+namespace SituationMap
+{
+
+const int CoordinateDoublePrecision = 20;
+
+bool GeometryModelQDom::_staticInitDone = false;
+
+QMultiMap< GeometryModel::PrimitiveType                                 , GeometryModel::Attribute    > GeometryModelQDom::_primitiveSupportedAttributes;
+QMap     < QString                                                      , GeometryModel::PrimitiveType> GeometryModelQDom::_primitiveTagsTypes;
+QMap     < GeometryModel::PrimitiveType                                 , QString                     > GeometryModelQDom::_primitiveTagsStrings;
+QMap     < QPair<GeometryModel::PrimitiveType, GeometryModel::Attribute>, QString >                     GeometryModelQDom::_attributeDefaults;
+QMap     < GeometryModel::Attribute                                     , QVariant::Type              > GeometryModelQDom::_attributeTypes;
+
+
+static const QLatin1String mapSettingsName("MapSettings");
+static const QLatin1String rootNodeName("GeometryModel");
+static const QLatin1String connectionIdName("connectionId");
+static const QLatin1String userDataName("userData");
+
+
+// convert to QString (with non locale-aware conversions)
+QString GeometryModelQDom::variant2XmlString(const QVariant &v)
+{
+  switch (v.type())
+  {
+  case QVariant::Int       : return QString::fromLatin1(QByteArray::number(v.toInt()));            break;
+  case QVariant::UInt      : return QString::fromLatin1(QByteArray::number(v.toUInt()));           break;
+  case QVariant::LongLong  : return QString::fromLatin1(QByteArray::number(v.toLongLong()));       break;
+  case QVariant::ULongLong : return QString::fromLatin1(QByteArray::number(v.toULongLong()));      break;
+  case QVariant::Double    : return QString::fromLatin1(QByteArray::number(v.toDouble(), 'f', -1));  break;
+  case QVariant::PointF    :
+  {
+    const QPointF &point = v.toPointF();
+    return QString::number(point.x(), 'f', CoordinateDoublePrecision) + QLatin1Char(' ') + QString::number(point.y(), 'f', CoordinateDoublePrecision);
+  } break;
+
+  case QVariant::Color     :
+  {
+    const QColor &color = v.value<QColor>();
+
+    return  QStringLiteral("#%1%2%3%4")
+            .arg(color.red()  , 2, 16, QLatin1Char('0'))
+            .arg(color.green(), 2, 16, QLatin1Char('0'))
+            .arg(color.blue() , 2, 16, QLatin1Char('0'))
+            .arg(color.alpha(), 2, 16, QLatin1Char('0'));
+  } break;
+
+  default: break;
+  }
+
+  return v.toString();
+} // QString GeometryModelQDom::variant2XmlString( const QVariant & v )
+
+
+
+QColor GeometryModelQDom::colorFromString(const QString &attColor)
+{
+  QColor result = Qt::black; // in case of wrong attColor the default is black.
+
+  if (attColor.startsWith(QLatin1Char('#')) && attColor.length() == 9)
+  {
+    result.setNamedColor(attColor.left(7));
+    // Get Alpha-Channel
+    bool ok;
+    int alpha = attColor.right(2).toInt(&ok, 16);
+    if (ok) result.setAlpha(alpha);
+  }
+  else result.setNamedColor(attColor);
+
+  return result;
+} // QColor GeometryModelQDom::colorFromString( const QString & attColor )
+
+
+void GeometryModelQDom::valueFromVariant(const QVariant &v, QPointF &result) { result = GeometryModelQDom::pointFromString(v.toString()); }
+void GeometryModelQDom::valueFromVariant(const QVariant &v, QColor   &result) { result = GeometryModelQDom::colorFromString(v.toString()); }
+
+
+QPointF GeometryModelQDom::pointFromString(const QString &attPoint)
+{
+  QPointF     result;
+  const auto xyStrList = attPoint.split(QLatin1Char(' '));
+
+  if (xyStrList.size() == 2)
+  {
+    bool okX = false;
+    bool okY = false;
+
+    const double &x = xyStrList[0].toDouble(&okX);
+    const double &y = xyStrList[1].toDouble(&okY);
+
+    if (okX && okY)
+    {
+      result.setX(x);
+      result.setY(y);
+    }
+  }
+  return result;
+} // QPointF GeometryModelQDom::pointFromString( const QString & attPoint )
+
+
+#ifdef _WINDOWS
+#pragma warning ( disable : 4172 )
+#endif
+
+class GeometryModel::Node::Implementation
+{
+  mutable QDomNode  _domNode;
+
+  static SituationMap::IdHandler *_idHandler;
+
+  static SituationMap::IdHandler &idHandler()
+  {
+    if (!_idHandler)
+      _idHandler = new SituationMap::IdHandler();
+    return *_idHandler;
+  } // idHandler()
+
+
+public:
+
+  Implementation() : _domNode() {;}
+
+  Implementation(const QDomNode &domNode) : _domNode(domNode)
+  {
+    // The QDomNode is simply a smart pointer to internal QDom objects. For this the
+    // QDomNode handles the derived classes itself, so we don't habe to distinguish
+    // the different QDomNode classes, like QDomElement, QDomAttr ... Just use the copy
+    // ctor of QDomNode.
+  } // Implementation(const QDomNode & domNode)
+
+  Implementation(const QDomElement &domElement) : _domNode(domElement)               {;}
+
+  Implementation(const Implementation &other)     : Implementation(other._domNode)   {;}
+
+  ~Implementation() = default;
+
+  Implementation &operator = (const QDomNode &domNode)
+  {
+    _domNode = domNode;
+    return *this;
+  } // operator =
+
+  Implementation &operator = (const Implementation &other)
+  {
+    if (this != &other) _domNode = other._domNode;
+    return *this;
+  } // operator =
+
+
+  QDomNode        *operator ->()    const { return &_domNode; }
+
+  const QDomNode  &node()           const { return _domNode; }
+  QDomNode        &node()                 { return _domNode; }
+
+  bool             isValid()        const { return !_domNode.isNull();                    }
+  bool             isRootNode()     const { return (_domNode.nodeName() == rootNodeName); }
+  bool             hasChildNodes()  const { return _domNode.hasChildNodes();              }
+
+  Node             parentNode()                               const { return Node(Implementation(_domNode.parentNode())); }
+  Node             next()                                     const { return Node(Implementation(_domNode.nextSiblingElement())); }
+  Node             firstChildNode()                           const { return Node(Implementation(_domNode.firstChildElement())); }
+  Node             firstChildNode(const QString &nodeName)    const { return Node(Implementation(_domNode.firstChildElement(nodeName))); }
+
+  bool operator == (const Implementation &other) const { return (_domNode == other._domNode); }
+  bool operator != (const Implementation &other) const { return (_domNode != other._domNode); }
+
+
+  Referenced *connected() const
+  {
+    uint id = connectedId();
+    if (id != SituationMap::IdHandler::BadId)
+      return static_cast<Referenced *>(idHandler().accessId(id));
+    return nullptr;
+  } // connected() const
+
+
+  uint connectedId() const
+  {
+    if (isValid())
+    {
+      QDomElement e = _domNode.toElement();
+      if (e.hasAttribute(connectionIdName))
+      {
+        QString value = e.attribute(connectionIdName);
+        bool    ok    = false;
+        uint    id    = value.toUInt(&ok, 10);
+
+        if ((ok) && (idHandler().isIdInUse(id)))
+          return id;
+        e.removeAttribute(connectionIdName);
+      }
+    }
+    return SituationMap::IdHandler::BadId;
+  } // connectedId() const
+
+
+  uint makeConnection(Referenced *objPtr)
+  {
+    if (objPtr != nullptr)
+    {
+      uint id =  idHandler().createId(static_cast<IdHandler::AccessableId*>(objPtr));
+      if (id != SituationMap::IdHandler::BadId)
+      {
+        QDomElement e = _domNode.toElement();
+        e.setAttribute(connectionIdName, id);
+        return id;
+      }
+    }
+    return SituationMap::IdHandler::BadId;
+  } // makeConnection(SituationMap::IdHandler::AccessableId * objPtr)
+
+
+  bool unlinkConnection() const
+  {
+    uint id = connectedId();
+    if (id != SituationMap::IdHandler::BadId)
+    {
+      idHandler().freeId(id);
+      QDomElement e = _domNode.toElement();
+      e.removeAttribute(connectionIdName);
+      return true;
+    }
+    return false;
+  } // unlinkConnection()
+
+}; // GeometryModel::Node::Implementation
+
+
+SituationMap::IdHandler *GeometryModel::Node::Implementation::_idHandler = nullptr;
+
+
+#ifdef _WINDOWS
+#pragma warning ( default : 4172 )
+#endif
+
+
+GeometryModel::Node::Node()                             : _d(new Implementation())              {;}
+GeometryModel::Node::Node(const Node            &other) : _d(new Implementation(*(other._d)))   {;}
+GeometryModel::Node::Node(const Implementation &other)  : _d(new Implementation(other))         {;}
+
+GeometryModel::Node::~Node() { delete _d; }
+
+GeometryModel::Node &GeometryModel::Node::operator= (const Node &other)
+{
+  if (this != &other) // self-assignment check
+  {
+    delete _d;
+    _d = new Implementation(*(other._d));
+  }
+  return *this;
+}
+
+GeometryModel::Node &GeometryModel::Node::operator = (Node &&other)
+{
+  if (this != &other) // self-assignment check
+  {
+    delete _d;
+    _d = doExchange(other._d, nullptr);
+  }
+  return *this;
+}
+
+
+const GeometryModel::Node::Implementation  &GeometryModel::Node::get()                                 const { return *_d;                      }
+GeometryModel::Node::Implementation        &GeometryModel::Node::get()                                       { return *_d;                      }
+bool                                        GeometryModel::Node::isValid()                             const { return _d->isValid();            }
+bool                                        GeometryModel::Node::isRootNode()                          const { return _d->isRootNode();         }
+GeometryModel::Node                         GeometryModel::Node::parentNode()                          const { return _d->parentNode();         }
+bool                                        GeometryModel::Node::hasChildNodes()                       const { return _d->hasChildNodes();      }
+GeometryModel::Node                         GeometryModel::Node::next()                                const { return _d->next();               }
+GeometryModel::Node                         GeometryModel::Node::firstChildNode()                      const { return _d->firstChildNode();     }
+GeometryModel::Node                         GeometryModel::Node::firstChildNode(const QString &nodeName) const { return _d->firstChildNode(nodeName);    }
+bool                                        GeometryModel::Node::operator ==(const Node &other)        const { return ((*_d) == (*(other._d))); }
+bool                                        GeometryModel::Node::operator !=(const Node &other)        const { return ((*_d) != (*(other._d))); }
+
+uint                                        GeometryModel::Node::makeConnection(Referenced *objPtr)    const { return _d->makeConnection(objPtr); }
+bool                                        GeometryModel::Node::unlinkConnection()                    const { return _d->unlinkConnection();     }
+uint                                        GeometryModel::Node::connectedId()                         const { return _d->connectedId();          }
+Referenced                                 *GeometryModel::Node::connected()                           const { return _d->connected();            }
+
+
+GeometryModelQDom::GeometryModelQDom(QObject *parent)
+  : GeometryModel(parent)
+  , QDomDocument(QLatin1String(rootNodeName) + QLatin1String("Document"))
+  , _skipChangedSignal(false)
+  , _undoEnabled(true)
+  , _maxUndoSteps(100)
+  , _undoStack()
+  , _undoHistory()
+  , _redoStack()
+  , _redoHistory()
+  , _undoBlock()
+  , _undoHistoryBlock()
+  , _insideUndoBlock(false)
+  , _modificationCounter(0)
+{
+  init();
+
+  // OpenSuse13.2:
+  // Don´t really know why, but ModuleTest::checkOverlayHandler2/3 (dealing with GeometryModel)
+  // lead to SegFault at end of program, if 'cleanupStaticMember' is not added:
+  qAddPostRoutine(&GeometryModelQDom::cleanupStaticMember);
+
+} // GeometryModelQDom::GeometryModelQDom(QObject *parent)
+
+
+GeometryModelQDom::GeometryModelQDom(const GeometryModelQDom &other)
+  : GeometryModel(other)
+  , QDomDocument(other.cloneNode().toDocument())
+  , _skipChangedSignal(false)
+  , _undoEnabled(other._undoEnabled)
+  , _maxUndoSteps(other._maxUndoSteps)
+  , _undoStack()
+  , _undoHistory()
+  , _redoStack()
+  , _redoHistory()
+  , _undoBlock()
+  , _undoHistoryBlock()
+  , _insideUndoBlock(false)
+  , _modificationCounter(0)
+{
+} // GeometryModelQDom::GeometryModelQDom(const GeometryModelQDom &other)
+
+
+GeometryModelQDom::~GeometryModelQDom()
+{
+  cleanModel();
+}
+
+
+
+GeometryModelQDom & GeometryModelQDom::operator = (const GeometryModelQDom &other)
+{
+  fromByteArray(other.toByteArray());
+  _undoEnabled  = other._undoEnabled;
+  _maxUndoSteps = other._maxUndoSteps;
+  return *this;
+} // GeometryModelQDom & GeometryModelQDom::operator = (const GeometryModelQDom &other)
+
+
+/* ~~~~~~~~~~~~~~~~ create XML representation of GeometryModel ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+static void xmlContent( const QDomDocument & domDocument, QByteArray & xmlContent )
+{
+  xmlContent = domDocument.toByteArray(3);
+}
+
+template<class MemoryClass> MemoryClass xmlContent(GeometryModelQDom localCopy)
+{
+  MemoryClass xmlContentMem;
+
+  // 'clean' just localCopy, not the original
+  // cleanModel removes userData; in other words: unlink; remove uniqueMapIds
+  localCopy.cleanModel();
+
+  QDomElement rootNode = localCopy.firstChildElement(rootNodeName);
+
+  qDebug() << " xmlContent rootNode.isNull " << rootNode.isNull()
+           << ", rootNode.hasChildNodes " << rootNode.hasChildNodes()
+           << ", rootNode.hasAttributes " << rootNode.hasAttributes();
+
+  // rootNode may have ChildNodes and/or Attribute (like metaData)
+  // pay attention also to attributes
+  if ((rootNode.isNull()) || !(rootNode.hasChildNodes() || rootNode.hasAttributes()) )
+  {
+      qDebug() << " empty -> use constant default string";
+    // Don't return an empty string because file mamagement service will get an error when loading
+    // the empty file content.
+    xmlContentMem = MemoryClass::fromStdString(std::string("<!DOCTYPE GeometryModelDocument>\n<GeometryModel>\n</GeometryModel>"));
+  }
+  else
+    xmlContent( localCopy, xmlContentMem );
+
+  qDebug() << " xmlContentMem " << xmlContentMem;
+  return xmlContentMem;
+} // template<class MemoryClass> MemoryClass xmlString(GeometryModelQDom localCopy)
+
+
+QByteArray GeometryModelQDom::toByteArray() const
+{
+  return xmlContent<QByteArray>(*this);
+}
+
+//QString   GeometryModelQDom::toString() const
+//{
+//   return xmlContent<QString>(*this);
+//}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+QByteArray GeometryModelQDom::toByteArrayDebug() const { return QDomDocument::toByteArray(3); } // complete XML content for debug purposes
+
+
+/* ~~~~~~~~~~~~~~~~ restore GeometryModel from XML representation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+template<class ContentClass> bool parseXmlString(ContentClass content, GeometryModelQDom &geoModel)
+{
+  qDebug() << " parseXmlString 1";
+  geoModel.clearUndoStack();
+  geoModel.clearRedoStack();
+  geoModel.cleanModel();
+  bool ok = static_cast<bool>(geoModel.QDomDocument::setContent(content));
+
+  qDebug() << " parseXmlString geoModel.cleanModel() " << geoModel.toString();
+
+  geoModel.blockSignals(true);
+  {
+    geoModel.cleanModel();
+
+    qDebug() << " parseXmlString geoModel.cleanModel() " << geoModel.toString();;
+
+    QDomElement rootNode = geoModel.firstChildElement(rootNodeName);
+    if (rootNode.isNull())
+    {
+      QDomElement root = geoModel.createElement(rootNodeName);
+      geoModel.appendChild(root);
+    }
+   
+  }
+  geoModel.blockSignals(false);
+  qDebug() << " parseXmlString ok = " << ok;
+  return ok;
+} // template<class MemoryClass> bool parseXmlString(MemoryClass memory, GeometryModelQDom &geoModel)
+
+
+bool GeometryModelQDom::fromByteArray(const QByteArray &content)
+{ 
+  if (content.isEmpty()) // allow empty content
+  {
+    blockSignals(true);
+    clearModel();
+    blockSignals(false);
+    clearUndoStack();
+    clearRedoStack();
+    return true;
+  }
+  return parseXmlString(content,*this);
+} // bool GeometryModelQDom::fromByteArray(const QByteArray &content)
+
+
+bool GeometryModelQDom::fromDevice(QIODevice *device)  
+{
+  if (device->size() < 1) // allow empty content
+  {
+    blockSignals(true);
+    clearModel();
+    blockSignals(false);
+    clearUndoStack();
+    clearRedoStack();
+    return true;
+  }
+  return parseXmlString(device,*this);
+} // bool GeometryModelQDom::fromDevice   (QIODevice *device) 
+
+
+bool GeometryModelQDom::fromByteArrayDebug(const QByteArray &content)
+{
+  clearUndoStack();
+  clearRedoStack();
+  cleanModel();
+  return static_cast<bool>(QDomDocument::setContent(content));
+} // bool GeometryModelQDom::fromStringDebug(const QByteArray &content)
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+void GeometryModelQDom::setModelAttribute(Attribute attribute, const QVariant &value)
+{
+  QDomElement root = firstChildElement(rootNodeName);
+  qDebug() << "GeometryModelQDom  isNull = " << root.isNull();
+
+  //const bool bEnableUndoRedo = true; //attribute != Attribute::MetaPixelBasedTextBoxes;
+
+  pushUndo(QLatin1String("setModelAttribute"));
+
+  if (supportedAttributes(PrimitiveType::RootNode).contains(attribute))
+    root.setAttribute(attributeToString(attribute), variant2XmlString(value));
+  else
+  {
+    emit attributeError(tr("Unknown or unsupported attribute for model root node: %1").arg(attributeToString(attribute)));
+    popUndo();
+    return;
+  }
+  emitChangedSignal(Node(), attribute, false);
+} // void GeometryModelQDom::setModelAttribute(Attribute attribute, const QVariant &value)
+
+
+QVariant GeometryModelQDom::getModelAttribute(Attribute attribute) const
+{
+  QDomElement root = firstChildElement(rootNodeName);
+
+  if (supportedAttributes(PrimitiveType::RootNode).contains(attribute))
+    return getAttribute(root, attribute);
+  else
+    emit const_cast<GeometryModelQDom*>(this)->attributeError(tr("Unknown or unsupported attribute for model root node: %1").arg(attributeToString(attribute)));
+  return QVariant();
+} // QVariant GeometryModelQDom::getModelAttribute(Attribute attribute) const
+
+
+void GeometryModelQDom::setModelEditorAttribute(Attribute attribute, const QVariant &value)
+{
+  QDomElement root = firstChildElement(mapSettingsName);
+
+  switch (attribute)
+  {
+  case Attribute::PeMapBrightness:
+  case Attribute::PeMapCenterX:
+  case Attribute::PeMapCenterY:
+  case Attribute::PeMapSaturation:
+  case Attribute::PeMapZoom:
+  case Attribute::PeShowUtm:
+  case Attribute::PeSymbolOpacity:
+  case Attribute::PeSymbolFillType:
+  case Attribute::PeSymbolScale:
+  case Attribute::PeMapRotation:
+  case Attribute::PeMapType:
+    root.setAttribute(attributeToString(attribute), variant2XmlString(value));
+    break;
+
+  default:
+    emit attributeError(tr("Unknown or unsupported attribute for model-editor: %1").arg(attributeToString(attribute)));
+    return;
+  }
+  emitChangedSignal(Node(), attribute, false);
+} // void GeometryModelQDom::setModelEditorAttribute(Attribute attribute, const QVariant &value)
+
+
+void GeometryModelQDom::setPrimitiveAttribute(const Node &node, Attribute attribute, const QVariant &value)
+{
+  pushUndo(QLatin1String("setPrimitiveAttribute"));
+  // Check, if Attribute is supported by Primitive; if so, set it
+  if (hasAttribute(node, attribute))
+    node.get()->toElement().setAttribute(attributeToString(attribute), variant2XmlString(value));
+  else
+  {
+    emit attributeError(tr("Unknown or unsupported attribute for primitive: %1, Attribute: %2").arg(node.get()->nodeName(), attributeToString(attribute)));
+
+    popUndo();
+    return;
+  }
+  emitChangedSignal(node, attribute, false);
+} // void GeometryModelQDom::setPrimitiveAttribute(QDomNode node...)
+
+
+GeometryModel::Node GeometryModelQDom::addPrimitive( PrimitiveType                              type
+                                                   , const QList<QPointF>                      &points
+                                                   , const QList<QPair<Attribute, QVariant> >  &attributes
+                                                   , int                                        userData
+                                                   , const QString                             &textData
+                                                   , HorizontalAlign                            textAlign)
+{
+  QDomElement root = firstChildElement(rootNodeName);
+  bool undoEnabledRestore = _undoEnabled;
+  pushUndo(QLatin1String("addPrimitive"));
+  _undoEnabled = false;
+  // Create new node and set required attributes
+
+  QDomElement primitiveDom;
+
+  if (_primitiveTagsStrings.contains(type))
+    primitiveDom = createElement(_primitiveTagsStrings[type]);
+  else
+  {
+    emit typeError(tr("Unknown Primitive-Type %1").arg(static_cast<int>(type)));
+    _undoEnabled = undoEnabledRestore;
+    popUndo();
+    return Node();
+  }
+
+  Node primitiveNode(primitiveDom);
+
+  // No changed() inside this block
+  _skipChangedSignal = true;
+
+  if (setPrimitivePoints(Node(primitiveDom), points))
+  {
+    // Init Primitive with default-Values
+    using index = QPair<GeometryModelQDom::PrimitiveType, GeometryModelQDom::Attribute>;
+    QList<Attribute> primAttributes = supportedAttributes(type);
+    for (int i = 0; i < primAttributes.size(); ++i)
+    {
+      Attribute ap = primAttributes.at(i);
+      setPrimitiveAttribute(primitiveNode, ap, _attributeDefaults[index(type, ap)]);
+    }
+
+    // Set Attributes given as parameter
+    for (int i = 0; i < attributes.size(); ++i)
+      setPrimitiveAttribute(primitiveNode, (attributes.at(i)).first, (attributes.at(i)).second);
+
+    // Add textData, if any
+    if (! textData.isNull())
+      setTextData(primitiveNode, textData, textAlign);
+
+    // Insert userData as Attribute
+    if ((type != PrimitiveType::Node) && (type != PrimitiveType::RootNode))
+    {
+      if (SituationMap::IdHandler::isIdValid(userData))
+      {
+        QString userDataStr = QString::number(userData, 10);
+        primitiveDom.setAttribute(userDataName, userDataStr);
+      }
+    }
+
+    Node  result(root.appendChild(primitiveDom));
+    _skipChangedSignal = false;
+
+    emitChangedSignal(result, Attribute::MaxAttributes, true);
+
+    _undoEnabled = undoEnabledRestore;
+    return result;
+  }
+  else
+  {
+    _undoEnabled = undoEnabledRestore;
+    popUndo();
+    return Node();
+  }
+} // QDomNode GeometryModelQDom::addPrimitive(PrimitiveType type, ...)
+
+
+GeometryModel::Node  GeometryModelQDom::addText(const Node                                &parent
+                                                , const QString                             &textData
+                                                , HorizontalAlign                            textAlign
+                                                , const QList<QPair<Attribute, QVariant> > &attributes
+                                                , int                                        userData)
+{
+  pushUndo(QLatin1String("addText"));
+
+  // Check, if parent is of correct type
+  QString tag = parent.get()->nodeName();
+  PrimitiveType type = getType(parent);
+
+  // Get Position (center of bounding box)
+  // TODO: Position of text depends on Parent-Type
+  // TODO: on moveNode, translateNode,... transform text also
+  QRectF parentBox = getBoundingBox(parent);
+  QList<QPointF> pointList;
+
+  switch (type)
+  {
+  case PrimitiveType::Ellipse:
+  case PrimitiveType::Line:
+  case PrimitiveType::Polyline:
+  case PrimitiveType::Rectangle:
+  case PrimitiveType::Spline:
+    pointList.append(parentBox.topLeft());
+    break;
+
+  default:
+    emit typeError(tr("Can not add text to type %1").arg(tag));
+    popUndo();
+    return Node();
+  }
+
+  // Create Text-Node and reparent to parent
+  Node textNode(addPrimitive(PrimitiveType::Text, pointList, attributes, userData));
+  parent.get()->appendChild(textNode.get().node());
+
+  // Set textData and alignment
+  QDomElement textDataNode = (textNode.get()->appendChild(createElement(QLatin1String("text_data")))).toElement();
+  textDataNode.setAttribute(QLatin1String("alignment"), QString::number((int)textAlign, 10));
+  QDomCDATASection cdata = createCDATASection(textData);
+  emitChangedSignal(parent, Attribute::MaxAttributes, false);
+  return Node(Node::Implementation(textDataNode.appendChild(cdata)));
+} // QDomNode GeometryModelQDom::addText(QDomNode parent, const QString &textData,...
+
+
+GeometryModel::Node GeometryModelQDom::getRootNode() const { return Node(Node::Implementation(firstChildElement(rootNodeName))); }
+
+
+bool GeometryModelQDom::isEmpty() const
+{
+  QDomElement rootNode = firstChildElement(rootNodeName);
+  return (!rootNode.hasChildNodes());
+} // bool GeometryModelQDom::isEmpty() const
+
+
+GeometryModel::Node GeometryModelQDom::getText(const Node &parent) const
+{
+  // Check, if parent is of correct type
+  PrimitiveType type = getType(parent);
+
+  switch (type)
+  {
+  case PrimitiveType::Ellipse:
+  case PrimitiveType::Line:
+  case PrimitiveType::Polyline:
+  case PrimitiveType::Rectangle:
+  case PrimitiveType::Spline:
+    return Node(Node::Implementation(parent.get()->firstChildElement(QLatin1String("text"))));
+
+  default:
+    return Node();
+  }
+} // QDomNode GeometryModelQDom::getText(QDomNode parent)
+
+
+QString GeometryModelQDom::getTextData(const Node &node) const
+{
+  QString result;
+  // Check, if parent is of correct type
+  QString tag = node.get()->nodeName();
+  if (tag != QLatin1String("text"))
+    emit const_cast<GeometryModelQDom*>(this)->typeError(tr("Can not get text-data from %1").arg(tag));
+  else
+  {
+    QDomNode textData = node.get()->firstChildElement(QLatin1String("text_data"));
+    QDomNode data = textData.firstChild();
+    if (! data.isNull())
+      result = data.nodeValue();
+  }
+  return result;
+} // QString GeometryModelQDom::getTextData(QDomNode textNode)
+
+
+QList<QPointF> GeometryModelQDom::getPrimitivePoints(const Node &node) const { return getPrimitivePoints(node.get().node()); }
+
+
+QList<QPointF> GeometryModelQDom::getPrimitivePoints(const QDomNode &node) const
+{
+  const QString &tag  = node.nodeName();
+  PrimitiveType   type = getType(node);
+
+  // set the number of required points for this primitive...
+  QList<QPointF> result;
+  int minPoints = 0;
+  int maxPoints = 0;
+
+  switch (type)
+  {
+
+  case PrimitiveType::DictionarySymbol:
+  {
+    minPoints = 1;
+    maxPoints = INT_MAX;
+  } break;
+
+  case PrimitiveType::Ellipse:
+  case PrimitiveType::Rectangle:
+  {
+    minPoints = 4;
+    maxPoints = 4;
+  } break;
+
+  case PrimitiveType::ParticipantSymbol:
+  case PrimitiveType::Symbol:
+  case PrimitiveType::Text:
+  {
+    minPoints = 1;
+    maxPoints = 1;
+  } break;
+
+  case PrimitiveType::Line:
+  {
+    minPoints = 2;
+    maxPoints = 2;
+  } break;
+
+  case PrimitiveType::Polyline:
+  case PrimitiveType::Spline:
+  {
+    minPoints = 3;
+    maxPoints = INT_MAX;
+  } break;
+
+  default:
+  {
+    emit const_cast<GeometryModelQDom*>(this)->modelError(tr("No points in primitive of type %1").arg(tag));
+    return result;
+  }
+  } // switch
+
+  // ... and get the points
+  QDomNodeList nodes = node.childNodes();
+  if (nodes.isEmpty())
+    emit const_cast<GeometryModelQDom*>(this)->modelError(tr("No points found in primitive of type %1").arg(tag));
+  else
+  {
+    for (int i = 0; i < nodes.size(); ++i)
+    {
+      QDomElement p = nodes.at(i).toElement();
+      if (p.nodeName() != QLatin1String("point"))  continue;
+      if (!p.hasAttribute(QLatin1String("x")) || !p.hasAttribute(QLatin1String("y")))
+        emit const_cast<GeometryModelQDom*>(this)->modelError(tr("Invalid point in primitive of type %1").arg(tag));
+      else
+      {
+        bool okx, oky;
+        double x = p.toElement().attribute(QLatin1String("x")).toDouble(&okx);
+        double y = p.toElement().attribute(QLatin1String("y")).toDouble(&oky);
+        if (!(okx && oky))
+          emit const_cast<GeometryModelQDom*>(this)->modelError(tr("Invalid point in primitive of type %1").arg(tag));
+        else
+          result.append(QPointF(x, y));
+      }
+    }
+  }
+
+  // Check points
+  if ((result.size() < minPoints) || (result.size() > maxPoints))
+    emit const_cast<GeometryModelQDom*>(this)->attributeError(tr("Wrong number of points for new primitive %1").arg(_primitiveTagsStrings[type]));
+
+  return result;
+} // QList<QPointF> GeometryModelQDom::getPrimitivePoints(QDomNode node) const
+
+
+QRectF GeometryModelQDom::getBoundingBox(const Node &node)  const { return getBoundingBox(node.get().node()); }
+
+
+QRectF GeometryModelQDom::getBoundingBox(const QDomNode &node) const
+{
+  PrimitiveType type = getType(node);
+
+  QRectF result;
+  if ((type == PrimitiveType::Node) || (type == PrimitiveType::RootNode) || (node == *this))
+  {
+    // Recursive over all children
+    QRectF merge;
+    QDomNodeList children;
+    if ((type == PrimitiveType::Node) || (type == PrimitiveType::RootNode))
+    {
+      // Children of other Node
+      children = node.childNodes();
+    }
+    else
+      children = node.firstChildElement(rootNodeName).childNodes();
+    for (int i = 0; i < children.size(); ++i)
+    {
+      merge = getBoundingBox(children.at(i));
+      if (! merge.isNull())
+        result = result.isNull() ? merge : result.united(merge);
+    }
+
+  }
+  else
+  {
+    // TODO Add calculation for rotated Primitives
+
+    bool ok;
+    QList<QPointF> points = getPrimitivePoints(node);
+    double width, height;
+
+    switch (type)
+    {
+    case PrimitiveType::Ellipse:
+    case PrimitiveType::Rectangle:
+      width = getAttribute(node, Attribute::Width).toDouble(&ok);
+      height = getAttribute(node, Attribute::Height).toDouble(&ok);
+      if (ok && (points.size() == 1))
+      {
+        result.setRect(points[0].x(), points[0].y(), width, height);
+        result.moveCenter(points[0]);
+      }
+      break;
+
+    case PrimitiveType::Line:
+      if (points.size() == 2)
+        result = QRectF(points[0], points[1]).normalized();
+      break;
+
+    case PrimitiveType::DictionarySymbol:
+      if (points.size() > 2)
+      {
+        result = QRectF(points.at(0), points.at(1));
+        for (int i = 2; i < points.count(); ++i)
+          result = result.united(QRectF(points.at(0), points.at(i)));
+      }
+      else
+      {
+        result = QRectF(points[0].x(), points[0].y(), 1.0, 1.0);
+        result.moveCenter(points[0]);
+      }
+      break;
+
+    case PrimitiveType::Polyline:
+    case PrimitiveType::Spline:
+      if (points.size() > 2)
+      {
+        result = QRectF(points.at(0), points.at(1));
+        for (int i = 2; i < points.count(); ++i)
+          result = result.united(QRectF(points.at(0), points.at(i)));
+      }
+      break;
+
+    case PrimitiveType::ParticipantSymbol:
+    case PrimitiveType::Symbol:
+    case PrimitiveType::Text:
+      if (points.size() == 1)
+      {
+        // TODO Calculate real dimensions of Textbox and Symbol?
+        // Only possible with more information from GDW implementation, Map Scale etc.
+        result = QRectF(0, 0, 0, 0);
+        result.moveCenter(points[0]);
+      }
+      break;
+
+    default:
+      break;
+    }
+  } //   if ( type == Node ) {...} else...
+
+  return result;
+} // QRectF GeometryModelQDom::getBoundingBox(QDomNode node)
+
+
+
+void GeometryModelQDom::movePrimitiveIntoGroup(const Node &primitive, const Node &target)
+{
+  pushUndo(QLatin1String("movePrimitiveIntoGroup"));
+
+  QString tag = primitive.get()->nodeName();
+  if (target.get()->nodeName() != QLatin1String("node"))
+  {
+    emit typeError(tr("Can not move primitive into %1").arg(target.get()->nodeName()));
+    popUndo();
+    return;
+  }
+  if (_primitiveTagsTypes.contains(tag))
+  {
+    target.get()->appendChild(primitive.get().node());
+    emitChangedSignal(primitive, Attribute::MaxAttributes, false);
+  }
+} // void GeometryModelQDom::movePrimitiveIntoGroup(QDomNode primitive, QDomNode target)
+
+
+void GeometryModelQDom::releaseGroup(const Node &group)
+{
+  pushUndo(QLatin1String("releaseGroup"));
+
+  if (group.get()->nodeName() != QLatin1String("node"))
+  {
+    emit typeError(tr("Given node is not a group: %1").arg(group.get()->nodeName()));
+    popUndo();
+    return;
+  }
+
+  QDomNode parent = group.get()->parentNode();
+  while (group.get()->hasChildNodes())
+    parent.appendChild(group.get()->firstChild());
+  parent.removeChild(group.get().node());
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+
+} // void GeometryModelQDom::releaseGroup(QDomNode group)
+
+
+void GeometryModelQDom::deleteGroup(const Node   &group)
+{
+  if (!group.isValid()) return;
+
+  pushUndo(QLatin1String("deleteGroup"));
+
+  if (group.get()->nodeName() != QLatin1String("node"))
+  {
+    emit typeError(tr("Given node is not a group: %1").arg(group.get()->nodeName()));
+    popUndo();
+    return;
+  }
+
+  QDomNode parent = group.get()->parentNode();
+  parent.removeChild(group.get().node());
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+} // void GeometryModelQDom::deleteGroup(QDomNode group)
+
+
+void GeometryModelQDom::removePrimitive(const Node &primitive)
+{
+  _skipChangedSignal = true;
+  removePrimitive(primitive.get().node());
+  _skipChangedSignal = false;
+}
+
+
+void GeometryModelQDom::removePrimitive(const QDomNode &primitive)
+{
+  // could be a group node
+  while (primitive.hasChildNodes())
+  {
+    removePrimitive(primitive.firstChild());
+  }
+
+  // Remove userData
+  bool ok;
+  int userData = getUserData(primitive, &ok);
+  if (ok)
+  {
+    primitive.toElement().removeAttribute(userDataName);
+    emit userDataCleanup(userData);
+  }
+
+  // pushUndo() here, because we must not save the primitive with userData, since
+  // the GeISiR2-Primitive is removed from the Map
+  pushUndo(QLatin1String("removePrimitive"));
+  QDomNode parent = primitive.parentNode();
+  QDomNode oldChild = parent.removeChild(primitive);
+
+  if (! oldChild.isNull())
+    emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+  else popUndo();
+} // void GeometryModelQDom::removePrimitive(QDomNode primitive)
+
+
+void GeometryModelQDom::removePrimitivesByUserData(const QList<int> &userDataList)
+{
+  _skipChangedSignal = true;
+  int removed = 0;
+  // First delete userData, then make the undo-backup
+  QList<QDomNode> nodeList;
+
+  nodeList.reserve(userDataList.size());
+  for (int i = 0; i < userDataList.size(); ++i)
+  {
+    Node node = findPrimitive(userDataList.at(i));
+    node.get()->toElement().removeAttribute(userDataName);
+    nodeList.append(node.get().node());
+  }
+  startUndoBlock();
+  for (int i = 0; i < nodeList.size(); ++i)
+  {
+    removePrimitive(nodeList.at(i));
+    ++removed;
+  }
+  endUndoBlock(QLatin1String("removePrimitivesByUserData"));
+  _skipChangedSignal = false;
+
+  if (removed > 0)
+    emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+} // void GeometryModelQDom::removePrimitivesByUserData(QList<int> userDataList)
+
+
+void GeometryModelQDom::removeText(Node &parent)
+{
+  pushUndo(QLatin1String("removeText"));
+
+  // Check, if parent is of correct type
+  PrimitiveType type = getType(parent);
+
+  switch (type)
+  {
+  case PrimitiveType::Ellipse:
+  case PrimitiveType::Line:
+  case PrimitiveType::Polyline:
+  case PrimitiveType::Rectangle:
+  case PrimitiveType::Spline:
+    parent.get()->removeChild(parent.get()->firstChildElement(QLatin1String("text")));
+    emitChangedSignal(parent, Attribute::MaxAttributes, false);
+    break;
+
+  default:
+    popUndo();
+    return;
+  }
+} // void GeometryModelQDom::removeText(QDomNode parent)
+
+
+void GeometryModelQDom::setTextData(const Node &textNode, const QString &data, HorizontalAlign textAlign)
+{
+  pushUndo(QLatin1String("setTextData"));
+
+  // Check, if parent is of correct type
+  const QString &tag = textNode.get()->nodeName();
+  if (tag != QLatin1String("text"))
+  {
+    emit typeError(tr("Can not set text-data for %1").arg(tag));
+    popUndo();
+  }
+  else
+  {
+    QDomNode textData = textNode.get()->firstChildElement(QLatin1String("text_data"));
+    if (textData.isNull())
+      textData = (textNode.get()->appendChild(createElement(QLatin1String("text_data")))).toElement();
+    textData.toElement().setAttribute(QLatin1String("alignment"), QString::number((int)textAlign, 10));
+    textData.removeChild(textData.firstChild());
+    textData.appendChild(createCDATASection(data));
+
+    emitChangedSignal(textNode, Attribute::MaxAttributes, false);
+  }
+} // void GeometryModelQDom::setTextData(QDomNode textNode, const QString &data, HorizontalAlign textAlign)
+
+
+void GeometryModelQDom::clearModel()
+{
+  qDebug() << " GeometryModelQDom::clearModel()";
+
+  QDomElement root = firstChildElement(rootNodeName);
+  pushUndo(QLatin1String("clearPlan"));
+
+  bool oldSCS = _skipChangedSignal;
+  bool oldUE = _undoEnabled;
+  _skipChangedSignal = true;
+  _undoEnabled = false;
+  while (root.hasChildNodes())
+    removePrimitive(root.firstChild());
+  _skipChangedSignal = oldSCS;
+  _undoEnabled = oldUE;
+
+  const auto supportedAttribs = supportedAttributes(GeometryModel::PrimitiveType::RootNode);
+  for (const GeometryModel::Attribute &attr : supportedAttribs)
+  {
+    const QString & attrName = attributeToString(attr);
+    if (root.hasAttribute(attrName))
+    {
+      root.removeAttribute(attrName);
+    }
+  }
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+} // void GeometryModelQDom::clearModel()
+
+
+bool GeometryModelQDom::setPrimitivePoints(const Node &node, const QList<QPointF> &points)
+{
+  PrimitiveType type = getType(node);
+
+  // Check number of points and insert them
+  int minPoints = 0;
+  int maxPoints = 0;
+  switch (type)
+  {
+  case PrimitiveType::DictionarySymbol:
+  {
+    minPoints = 1;
+    maxPoints = INT_MAX;
+  } break;
+
+  case PrimitiveType::Ellipse:
+  case PrimitiveType::Rectangle:
+  {
+    minPoints = 4;
+    maxPoints = 4;
+  } break;
+
+  case PrimitiveType::ParticipantSymbol:
+  case PrimitiveType::Symbol:
+  case PrimitiveType::Text:
+  {
+    minPoints = 1;
+    maxPoints = 1;
+  } break;
+
+  case PrimitiveType::Line:
+  {
+    minPoints = 2;
+    maxPoints = 2;
+  } break;
+
+  case PrimitiveType::Polyline:
+  case PrimitiveType::Spline:
+  {
+    minPoints = 3;
+    maxPoints = INT_MAX;
+  } break;
+
+  case PrimitiveType::RootNode:
+  case PrimitiveType::Node:
+  {
+    if (points.isEmpty())  return true;
+  } break;
+
+  default: break;
+  }
+
+  if ((points.size() < minPoints) || (points.size() > maxPoints))
+  {
+    emit attributeError(tr("Wrong number of points for primitive %1").arg(_primitiveTagsStrings[type]));
+    return false;
+  }
+  else
+  {
+
+    pushUndo(QLatin1String("setPrimitivePoints"));
+
+    // Remove old Points before Adding
+    QDomElement p = node.get()->firstChildElement(QLatin1String("point"));
+    while (! p.isNull())
+    {
+      node.get()->removeChild(p);
+      p = node.get()->firstChildElement(QLatin1String("point"));
+    }
+
+    for (int i = 0; i < points.size(); ++i)
+    {
+      QDomElement point = (node.get()->appendChild(createElement(QLatin1String("point")))).toElement();
+      // QString::number() does NOT honor locale settings:
+      point.setAttribute(QLatin1String("x"), QString::number(points.at(i).x(), 'f', CoordinateDoublePrecision));    // to enforce "1.23" instead of "1,23"
+      point.setAttribute(QLatin1String("y"), QString::number(points.at(i).y(), 'f', CoordinateDoublePrecision));
+    }
+    emitChangedSignal(node, Attribute::None, true);
+  }
+  return true;
+} // bool GeometryModelQDom::setPrimitivePoints(QDomNode node, QList<QPointF> points)
+
+
+void GeometryModelQDom::translateNode(const Node &node, double x, double y) { translateNode(node.get().node(), x, y); }
+
+void GeometryModelQDom::translateNode(const QDomNode &node, double x, double y)
+{
+  pushUndo(QLatin1String("translateNode"));
+
+  QTransform t;
+  t = t.translate(x, y);
+
+  if (node == *this)
+  {
+    // translate complete plan
+    QDomElement root = node.firstChildElement(rootNodeName);
+    QDomNodeList children = root.childNodes();
+    // No changed() inside this block
+    _skipChangedSignal = true;
+    for (int i = 0; i < children.size(); ++i)
+      translateNode(children.at(i), x, y);
+    _skipChangedSignal = false;
+  }
+  else
+  {
+    QString tag = node.nodeName();
+    if (tag == QLatin1String("node"))
+    {
+      QDomNodeList children = node.childNodes();
+      for (int i = 0; i < children.size(); ++i)
+        translateNode(children.at(i), x, y);
+    }
+    else
+      transformNode(node, t);
+  }
+
+  emitChangedSignal(Node(Node::Implementation(node)), Attribute::None, true);
+} // void GeometryModelQDom::translateNode(QDomNode node, double x, double y)
+
+
+void GeometryModelQDom::moveNode(const Node &node, double x, double y)  { moveNode(node.get().node(), x, y);  }
+
+
+void GeometryModelQDom::moveNode(const QDomNode &node, double x, double y)
+{
+  pushUndo(QLatin1String("moveNode"));
+
+  // Move to (x,y)
+  QRectF bb = getBoundingBox(node);
+  QPointF center = bb.center();
+
+  translateNode(node, -center.x() + x, -center.y() + y);
+
+  emitChangedSignal(Node(Node::Implementation(node)), Attribute::None, true);
+} // void GeometryModelQDom::moveNode(QDomNode node, double x, double y)
+
+
+void GeometryModelQDom::scaleNode(const Node &node, double scaleX, double scaleY)  { scaleNode(node.get().node(), scaleX, scaleY); }
+
+
+void GeometryModelQDom::scaleNode(const QDomNode &node, double scaleX, double scaleY)
+{
+  pushUndo(QLatin1String("scaleNode"));
+
+  // Translate to (0.0, 0.0)
+  QRectF bb = getBoundingBox(node);
+  QPointF center = bb.center();
+  translateNode(node, -center.x(), -center.y());
+
+  // Scale
+  QTransform t;
+  t = t.scale(scaleX, scaleY);
+  QString tag = node.nodeName();
+  if (tag == QLatin1String("node"))
+  {
+    QDomNodeList children = node.childNodes();
+    for (int i = 0; i < children.size(); ++i)
+      transformNode(children.at(i), t);
+  }
+  else transformNode(node, t);
+
+
+  // Translate back
+  translateNode(node, center.x(), center.y());
+
+  emitChangedSignal(Node(Node::Implementation(node)), Attribute::None, true);
+} // void GeometryModelQDom::scaleNode(QDomNode node, double scaleX, double scaleY)
+
+
+void GeometryModelQDom::rotateNode(const Node &node, double angle)  { rotateNode(node.get().node(), angle); }
+
+void GeometryModelQDom::rotateNode(const QDomNode &node, double angle)
+{
+  pushUndo(QLatin1String("rotateNode"));
+
+  // Translate to (0.0, 0.0)
+  QRectF bb = getBoundingBox(node);
+  QPointF center = bb.center();
+  translateNode(node, -center.x(), -center.y());
+
+  // Rotate
+  QTransform t;
+  t = t.rotate(angle);
+  QString tag = node.nodeName();
+  if (tag == QLatin1String("node"))
+  {
+    QDomNodeList children = node.childNodes();
+    for (int i = 0; i < children.size(); ++i)
+      transformNode(children.at(i), t);
+  }
+  else transformNode(node, t);
+
+
+  // Translate back
+  translateNode(node, center.x(), center.y());
+
+  emitChangedSignal(Node(Node::Implementation(node)), Attribute::Rotate, true);
+
+} // void GeometryModelQDom::rotateNode(QDomNode node, double angle)
+
+
+void GeometryModelQDom::reorderPrimitives(const NodeList &nodes, PrimitivOrder order)
+{
+  QDomElement root = firstChildElement(rootNodeName);
+  if (nodes.length() > 0)
+  {
+    pushUndo(QLatin1String("reorderPrimitives"));
+
+    if (order == GeometryModelQDom::PrimitivOrder::Lower)
+    {
+      QDomNode before;
+      for (int i = nodes.length() - 1; i >= 0; --i)
+        before = root.insertBefore(nodes.at(i).get().node(), before);
+    }
+    else if (order == GeometryModelQDom::PrimitivOrder::Raise)
+    {
+      for (int i = 0; i < nodes.length(); ++i)
+        root.insertAfter(nodes.at(i).get().node(), QDomNode());
+    }
+
+    emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+  }
+} // void GeometryModelQDom::reorderPrimitives(const QList<QDomNode> &nodes, t_PrimOrder order)
+
+
+void GeometryModelQDom::merge(const Node &other, bool skipUndo, bool intoNewGroup) { merge(other.get().node(), skipUndo, intoNewGroup); }
+
+
+void GeometryModelQDom::merge(GeometryModel *other, bool skipUndo, bool intoNewGroup)
+{
+  const GeometryModelQDom *otherQDom = dynamic_cast<GeometryModelQDom *>(other);
+  merge(*otherQDom, skipUndo, intoNewGroup);
+
+} // void GeometryModelQDom::merge( GeometryModel * other, bool skipUndo, bool intoNewGroup )
+
+
+void GeometryModelQDom::merge(const QDomNode &other, bool skipUndo, bool intoNewGroup)
+{
+  if ((other == *this) || (other.ownerDocument() == *this))
+  {
+    // Do not merge with itself or own child
+    return;
+  }
+
+  if (! skipUndo)
+    pushUndo(QLatin1String("merge"));
+
+  QString tag = other.nodeName();
+  if (other.nodeType() == QDomNode::DocumentNode)
+  {
+    // Its a complete plan, add recursive
+    QDomElement root = other.firstChildElement(rootNodeName);
+    // No changed() inside this block
+    _skipChangedSignal = true;
+    if (intoNewGroup)
+    {
+      QList<QDomNode> nodeList;
+      QDomNodeList domNodeList = root.childNodes();
+      nodeList.reserve(domNodeList.size());
+      for (int i = 0; i < domNodeList.size(); ++i)
+        nodeList.append(domNodeList.at(i));
+      const QDomNode &group = createGroup(nodeList);
+      setNodeDisplayName(Node(group), tr("Imported Group"));
+    }
+    else
+    {
+      while (root.hasChildNodes())
+        merge(root.firstChild(), true);
+    }
+    _skipChangedSignal = false;
+  }
+  else if ((getType(other) == PrimitiveType::Unknown) || (getType(other) == PrimitiveType::MapDefaults))
+  {
+    // Unknown type error
+    emit typeError(tr("Can not merge with %1").arg(tag));
+    if (! skipUndo)
+      popUndo();
+    return;
+  }
+  else
+  {
+    // Insert
+    QDomElement docRoot = firstChildElement(rootNodeName);
+    docRoot.appendChild(other);
+  }
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+} // void PlanModel::merge(QDomNode other, bool skipUndo, bool intoNewGroup)
+
+
+unsigned int GeometryModelQDom::modificationCounter() const  { return _modificationCounter; }
+
+
+void GeometryModelQDom::resetModificationCounter() 
+{ 
+  _modificationCounter = 0;
+  emit modificationCount(_modificationCounter);
+} // void GeometryModelQDom::resetModificationCounter() 
+
+
+void GeometryModelQDom::undo(unsigned int steps)
+{
+  if (undoSteps() < 1) return;
+  if (steps < 1)     return;
+
+  if (_insideUndoBlock)
+    endUndoBlock();
+
+  emit nodeCleanup(Node(firstChildElement(rootNodeName)));
+  while ((steps > 0) && (undoSteps() > 0))
+  {
+    QDomNode root     = firstChildElement(rootNodeName);
+    QDomNode undoNode = _undoStack.pop();
+
+    _redoStack.push(root.cloneNode());
+    _redoHistory.push(_undoHistory.pop());
+
+    root  = replaceChild(undoNode, root);
+
+    if (root.isNull()) // was replaceChild successful?
+    {
+      emit criticalError(tr("Undo function failed."));
+      break;
+    }
+    else
+    {
+      --steps;
+    }
+    --_modificationCounter;
+    emit modificationCount(_modificationCounter);
+  }
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, true);
+
+} // void GeometryModelQDom::undo(unsigned int steps)
+
+
+void GeometryModelQDom::redo(unsigned int steps)
+{
+  if (redoSteps() < 1) return;
+  if (steps < 1)     return;
+
+  emit nodeCleanup(Node(firstChildElement(rootNodeName)));
+
+  while ((steps > 0) && (redoSteps() > 0))
+  {
+    QDomNode   root     = firstChildElement(rootNodeName);
+    QDomNode   redoNode = _redoStack.pop();
+
+    _undoStack.push(root.cloneNode());
+    _undoHistory.push(_redoHistory.pop());
+
+    root  = replaceChild(redoNode, root);
+
+    if (root.isNull()) // was replaceChild successful?
+    {
+      emit criticalError(tr("Redo function failed."));
+      break;
+    }
+    --steps;
+    ++_modificationCounter;
+    emit modificationCount(_modificationCounter);
+  }
+  emitChangedSignal(Node(), Attribute::MaxAttributes, true);
+
+} // void GeometryModelQDom::redo(unsigned int steps)
+
+
+void GeometryModelQDom::enableUndo(bool enable)
+{
+  _undoEnabled = enable;
+} // void GeometryModelQDom::enableUndo(bool enable)
+
+
+void GeometryModelQDom::startUndoBlock()
+{
+  if (! _insideUndoBlock)
+  {
+    QDomElement root = firstChildElement(rootNodeName);
+    _undoBlock = root.cloneNode();
+  }
+  _insideUndoBlock = true;
+} // void GeometryModelQDom::startUndoBlock()
+
+
+void GeometryModelQDom::abortUndoBlock()
+{
+  if (_insideUndoBlock)
+    _undoBlock.clear();
+} // void GeometryModelQDom::abortUndoBlock()
+
+
+void GeometryModelQDom::endUndoBlock(const QString &eventDescription)
+{
+  if (_insideUndoBlock)
+  {
+    if (_undoEnabled && (! _undoBlock.isNull()))
+    {
+      while (undoSteps() >= _maxUndoSteps)
+      {
+        // Size-limit reached, remove first element
+        _undoStack.erase(_undoStack.begin());
+        _undoHistory.erase(_undoHistory.begin());
+      }
+      _undoStack.push(_undoBlock);
+      _undoHistory.push((eventDescription.isEmpty() ? _undoHistoryBlock : eventDescription));
+      clearRedoStack();
+      ++_modificationCounter;
+      emit modificationCount(_modificationCounter);
+    }
+  }
+  _insideUndoBlock = false;
+} // void GeometryModelQDom::endUndoBlock(const QString &eventDescription)
+
+
+void GeometryModelQDom::setMaxUndoSteps(unsigned int max)
+{
+  _maxUndoSteps = (max < 1) ? 1 : max;
+
+  while (undoSteps() > _maxUndoSteps)
+  {
+    // shrink to max size, if needed.
+    _undoStack.erase(_undoStack.begin());
+    _undoHistory.erase(_undoHistory.begin());
+  }
+} // void  GeometryModelQDom::setMaxUndoSteps(int max)
+
+
+unsigned int GeometryModelQDom::maxUndoSteps() const
+{
+  return _maxUndoSteps;
+}
+
+
+void  GeometryModelQDom::cleanModel()
+{
+  qDebug() << " GeometryModelQDom::cleanModel()";
+
+  QMap<QString, GeometryModelQDom::PrimitiveType>::iterator it = _primitiveTagsTypes.begin();
+  while (it != _primitiveTagsTypes.end())
+  {
+    QDomNodeList nodes = elementsByTagName(it.key());
+    for (int i = 0; i < nodes.size(); ++i)
+    {
+      if ((_primitiveTagsTypes[it.key()] == PrimitiveType::Node) || (_primitiveTagsTypes[it.key()] == PrimitiveType::RootNode))
+      {
+        // Remove empty groups
+        QDomNode group = nodes.at(i);
+
+        if ( ! (group.hasChildNodes() || group.hasAttributes()) )
+        {
+          group.parentNode().removeChild(group);
+        }
+      }
+      else
+      {
+        // Remove userData
+        const QDomNode &node = nodes.at(i);
+        if (hasUserData(node))
+        {
+          bool ok;
+          int userData = getUserData(node, &ok);
+          if (ok)
+          {
+            nodes.at(i).toElement().removeAttribute(userDataName);
+            emit userDataCleanup(userData);
+          }
+        }
+      }
+
+      GeometryModel::Node::Implementation nodeImpl(nodes.at(i));
+      emit connectionCleanup(nodeImpl.connected());
+      nodeImpl.unlinkConnection();
+    }
+    ++it;
+  }
+    
+  resetModificationCounter();
+} // void GeometryModelQDom::cleanModel()
+
+
+void GeometryModelQDom::setNodeDisplayName(const Node &node, const QString &name)
+{
+  const QString    attName = QLatin1String("GuiDisplayName");
+  QDomElement      e       = node.get().node().toElement();
+
+  if (e.isNull())
+  {
+    qCritical() << " node not found";
+    return;
+  }
+
+  e.setAttribute(attName, name);
+
+  emitChangedSignal(node, Attribute::MaxAttributes, false);
+
+} // void GeometryModelQDom::setNodeDisplayName(const Node & node, const QString & name)
+
+
+QString GeometryModelQDom::getNodeDisplayName(const Node &node) const
+{
+  const QString    attName = QLatin1String("GuiDisplayName");
+  QDomElement      e       = node.get().node().toElement();
+
+  return (e.hasAttribute(attName)) ? e.attribute(attName) : QString();
+
+} // QString GeometryModelQDom::getNodeDisplayName(const Node & node) const
+
+
+QVariant GeometryModelQDom::getAttribute(const Node &node, Attribute attribute) const { return getAttribute(node.get().node(), attribute); }
+
+QVariant GeometryModelQDom::getAttribute(const QDomNode &node, Attribute attribute) const
+{
+  QString att = attributeToString(attribute);
+  QDomElement e = node.toElement();
+
+  if (e.hasAttribute(att))
+  {
+    QString value = e.attribute(att);
+
+    if (_attributeTypes[attribute] == QVariant::Color)
+    {
+      // Return Colors as QString and let the user convert it with static method
+      // PlanModel::colorFromString() - QVariant ignores alpha in Colors
+      return QVariant(colorFromString(value));
+    }
+    else if (_attributeTypes[attribute] == QVariant::PointF)
+      return QVariant(pointFromString(value));
+    else
+    {
+      if (_attributeTypes[attribute] == QVariant::UserType)
+      {
+        // Return PlanModel-Enums as String-Value
+        // TODO: Implement UserTypes?
+        return QVariant(value);
+      }
+      else
+      {
+        // Convert other values to their native type
+        QVariant result(_attributeTypes[attribute]);
+        result.setValue(value);
+        return result;
+      }
+    }
+  }
+  else
+  {
+    // Check for default
+    if (hasAttribute(node, attribute))
+    {
+      using index = QPair<GeometryModelQDom::PrimitiveType, GeometryModelQDom::Attribute>;
+      QVariant result(_attributeTypes[attribute]);
+      result.setValue(_attributeDefaults[index(PrimitiveType::Unknown, attribute)]);
+      return result;
+    }
+    else
+    {
+      emit const_cast<GeometryModelQDom*>(this)->attributeError(att + tr(": Attribute unknown in primitive %1").arg(node.nodeName()));
+      return QVariant(QVariant::Invalid);
+    }
+  }
+
+  return QVariant(QVariant::Invalid);
+} // QVariant GeometryModelQDom::getAttribute(QDomNode node, Attribute attribute)
+
+
+bool GeometryModelQDom::hasAttribute(const Node &node, Attribute attribute) const  { return hasAttribute(node.get().node(), attribute); }
+
+
+bool GeometryModelQDom::hasAttribute(const QDomNode &node, Attribute attribute) const
+{
+  QString tag = node.nodeName();
+  if (_primitiveTagsTypes.contains(tag))
+  {
+    PrimitiveType t = _primitiveTagsTypes[tag];
+    if (_primitiveSupportedAttributes.contains(t))
+      return supportedAttributes(t).contains(attribute);
+  }
+  return false;
+} // bool GeometryModelQDom::hasAttribute(QDomNode node, Attribute attribute) const
+
+
+QVariant::Type GeometryModelQDom::attributeType(const Attribute &attribute) const
+{
+  if (_attributeTypes.contains(attribute)) return _attributeTypes[attribute];
+  else                                       return QVariant::Invalid;
+} // QVariant::Type GeometryModelQDom::attributeType(Attribute attribute) const
+
+
+QList<GeometryModelQDom::Attribute> GeometryModelQDom::supportedAttributes(PrimitiveType type) const
+{
+  if (_primitiveSupportedAttributes.contains(type)) return _primitiveSupportedAttributes.values(type);
+  else                                              return QList<GeometryModelQDom::Attribute>();
+} // QList<GeometryModelQDom::Attribute> GeometryModelQDom::supportedAttributes(PrimitiveType  type) const
+
+
+GeometryModel::Node GeometryModelQDom::createGroup(const NodeList &primitives)
+{
+  pushUndo(QLatin1String("createGroup"));
+
+  QDomElement root = firstChildElement(rootNodeName);
+  QDomElement node = createElement(_primitiveTagsStrings[PrimitiveType::Node]);
+  QDomNode group = root.appendChild(node);
+  if (! group.isNull())
+  {
+    for (int i = 0; i < primitives.size(); ++i)
+    {
+      // For performance-reasons we use direct appendChild(), but
+      // normally you should use movePrimitiveIntoGroup(primitives.at(i), group);
+      group.appendChild(primitives.at(i).get().node());
+    }
+  }
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+
+  return Node(Node::Implementation(group));
+} // QDomNode PlanModel::createGroup(QList<QDomNode> primitives)
+
+
+QDomNode GeometryModelQDom::createGroup(const QList<QDomNode> &primitives)
+{
+  pushUndo(QLatin1String("createGroup"));
+
+  QDomElement root = firstChildElement(rootNodeName);
+  QDomElement node = createElement(_primitiveTagsStrings[PrimitiveType::Node]);
+  QDomNode group = root.appendChild(node);
+  if (! group.isNull())
+  {
+    for (int i = 0; i < primitives.size(); ++i)
+    {
+      // For performance-reasons we use direct appendChild(), but
+      // normally you should use movePrimitiveIntoGroup(primitives.at(i), group);
+      group.appendChild(primitives.at(i));
+    }
+  }
+
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+
+  return group;
+} // QDomNode PlanModel::createGroup(QList<QDomNode> primitives)
+
+
+GeometryModel::Node GeometryModelQDom::isInGroup(const Node &node) const
+{
+  QDomNode parent = node.get()->parentNode();
+  return Node(Node::Implementation((getType(parent) == PrimitiveType::Node) ? parent : QDomNode()));
+} // QDomNode GeometryModelQDom::isInGroup(QDomNode primitive) const
+
+
+GeometryModel::NodeList GeometryModelQDom::getGroupPrimitives(const Node &node)
+{
+  PrimitiveType myNodeType = getType(node);
+  if ((myNodeType !=  PrimitiveType::Node) && (myNodeType !=  PrimitiveType::RootNode))
+  {
+    emit typeError(tr("Given node is not a group: %1").arg(node.get()->nodeName()));
+    return NodeList();
+  }
+
+  const QDomNodeList       &domPrimitiveList = node.get()->childNodes();
+  GeometryModel::NodeList   primitiveList;
+
+  primitiveList.reserve(domPrimitiveList.size());
+  for (int i = 0; i < domPrimitiveList.size(); ++i)
+    primitiveList += Node(Node::Implementation(domPrimitiveList.at(i)));
+
+  return primitiveList;
+
+} // QDomNodeList GeometryModelQDom::getGroupPrimitives(QDomNode node) const
+
+
+GeometryModel::Node GeometryModelQDom::findPrimitive(int userData) const
+{
+  // TODO: This is inefficient!!! Search only for Att userData!
+  QString userDataString = QString::number(userData, 10);
+  QMap<QString, GeometryModelQDom::PrimitiveType>::iterator it = _primitiveTagsTypes.begin();
+  while (it != _primitiveTagsTypes.end())
+  {
+    QDomNodeList nodes = elementsByTagName(it.key());
+    for (int i = 0; i < nodes.size(); ++i)
+    {
+      QDomElement e = nodes.at(i).toElement();
+      if (e.hasAttribute(userDataName) && (e.attribute(userDataName) == userDataString))
+        return Node(Node::Implementation(nodes.at(i)));
+    }
+    ++it;
+  }
+
+  return Node();
+} // QDomNode GeometryModelQDom::findPrimitive(int userData) const
+
+
+bool GeometryModelQDom::hasUserData(const Node &node)           const { return hasUserData(node.get().node());     }
+int  GeometryModelQDom::getUserData(const Node &node, bool *ok) const { return getUserData(node.get().node(), ok); }
+
+
+bool GeometryModelQDom::hasUserData(const QDomNode &node)           const { return node.toElement().hasAttribute(userDataName); }
+
+
+int GeometryModelQDom::getUserData(const QDomNode &node, bool *okPtr) const
+{
+  if (okPtr) *okPtr = false; // if provided, initialize
+
+  int  result = 0;
+  bool ok     = false;
+
+  QDomElement e = node.toElement();
+  if (e.hasAttribute(userDataName))
+  {
+    QString value = e.attribute(userDataName);
+    result = value.toInt(&ok, 10);
+    if (!(ok))
+      emit const_cast<GeometryModelQDom*>(this)->modelError(tr("Can not convert value to int: %1").arg(value));
+  }
+  else
+  {
+    PrimitiveType type = getType(node);
+
+    if ((type != PrimitiveType::Node) && (type != PrimitiveType::RootNode) && (type != PrimitiveType::Unknown))
+    {
+      qWarning() << "Missing user data at node " << node.nodeName() << " connectedId=" << Node::Implementation(node).connectedId()
+                 << " [maybe m_internal->m_modelClipboard->clearModel()]";
+//      #ifdef LTS_DEBUG
+//        // *** To locate a bug stop program here and start debugger, should be removed for final release
+//        assert(false);
+//        // ***
+//      #endif
+      emit const_cast<GeometryModelQDom*>(this)->typeError(tr("No UserData in %1").arg(node.nodeName()));
+    }
+    return SituationMap::IdHandler::BadId;
+  }
+  if (okPtr) *okPtr = ok;
+  return result;
+} // void* GeometryModelQDom::getUserData(QDomNode node, bool *ok)
+
+
+void GeometryModelQDom::setUserData(const Node &node, int userData)
+{
+  PrimitiveType type = getType(node);
+
+  if ((type == PrimitiveType::Node) || (type == PrimitiveType::RootNode) || (type == PrimitiveType::Unknown))
+    emit typeError(tr("Can not set UserData in %1").arg(node.get()->nodeName()));
+  else
+  {
+    if (!SituationMap::IdHandler::isIdValid(userData))
+    {
+      QDomElement e = node.get()->toElement();
+      e.removeAttribute(userDataName);
+    }
+    else
+    {
+      QString userDataString = QString::number(userData, 10);
+      QDomElement e = node.get()->toElement();
+      e.setAttribute(userDataName, userDataString);
+    }
+    emitChangedSignal(node, Attribute::MaxAttributes, false);
+  }
+} // void GeometryModelQDom::setUserData(QDomNode node, int userData)
+
+
+QMultiMap<int, GeometryModel::Node> GeometryModelQDom::userDataMap(const Node &node)
+{
+  QMultiMap<int, QDomNode>            domResult = userDataMap(node.get().node());
+  QMultiMap<int, GeometryModel::Node> result;
+
+  QMultiMap<int, QDomNode>::const_iterator iter = domResult.constBegin();
+
+  for (; iter != domResult.constEnd(); ++iter)
+    result.insert(iter.key(), Node(Node::Implementation(iter.value())));
+
+  return result;
+} // QMultiMap<int, GeometryModel::Node> GeometryModelQDom::userDataMap(const Node & node)
+
+
+QMultiMap<int, QDomNode> GeometryModelQDom::userDataMap(const QDomNode &node) const
+{
+  QMultiMap<int, QDomNode> result;
+  if ((node.ownerDocument() != *this) && (! node.isNull()))
+  {
+    // Not a Node of this Document, ignore
+    return result;
+  }
+
+  QDomNodeList children;
+  if ((node == *this) || node.isNull())
+    children = firstChildElement(rootNodeName).childNodes();
+  else if ((getType(node) == PrimitiveType::Node) || (getType(node) == PrimitiveType::RootNode))
+    children = node.childNodes();
+
+  for (int i = 0; i < children.size(); ++i)
+  {
+    QDomNode curNode = children.at(i);
+    if (getType(curNode) == PrimitiveType::Node)
+    {
+      // If its a node, search deep and merge results...
+      QMultiMap<int, QDomNode> deepResult = userDataMap(curNode);
+      QMultiMap<int, QDomNode>::const_iterator it = deepResult.constBegin();
+      while (it != deepResult.constEnd())
+      {
+        int key = it.key();
+        QList<QDomNode> values = deepResult.values(key);
+        for (int k = 0; k < values.size(); ++k)
+          result.insert(key, values.at(k));
+        ++it;
+      }
+
+    }
+    else
+    {
+      // ...get UserData and append to result
+      bool ok;
+      int userData = getUserData(curNode, &ok);
+      if (ok)
+        result.insert(userData, curNode);
+    }
+  }
+  return result;
+} // QMultiMap<int, QDomNode> GeometryModelQDom::userDataMap(QDomNode node)
+
+
+static void resetUserData(const QDomNode &node)
+{
+  const QDomNodeList &childNodes = node.childNodes();
+  for (int i = 0; i < childNodes.size(); ++i)
+    resetUserData(childNodes.at(i));
+  node.toElement().removeAttribute(userDataName);
+  node.toElement().removeAttribute(connectionIdName);
+
+} // resetUserData (QDomNode & node)
+
+
+GeometryModel::Node GeometryModelQDom::copy(const Node &node, int)
+{
+  QDomElement root = firstChildElement(rootNodeName);
+  pushUndo(QLatin1String("copy"));
+
+  QDomNode clone = node.get()->cloneNode(true);
+
+  resetUserData(clone);
+
+  QDomNode result = root.appendChild(clone);
+  emitChangedSignal(Node(), Attribute::MaxAttributes, false);
+  return Node(Node::Implementation(result));
+} // GeometryModel::Node GeometryModelQDom::copy(Node node, int userData)
+
+
+GeometryModelQDom::PrimitiveType GeometryModelQDom::getType(const Node &node) const { return getType(node.get().node()); }
+
+
+GeometryModelQDom::PrimitiveType GeometryModelQDom::getType(const QDomNode &node) const
+{
+  QString tag = node.nodeName();
+  if (_primitiveTagsTypes.contains(tag)) return _primitiveTagsTypes[tag];
+  else                                     return PrimitiveType::Unknown;
+} // PrimitiveType GeometryModelQDom::getType(QDomNode node) const
+
+
+unsigned int GeometryModelQDom::redoSteps() const { return _redoStack.size(); }
+unsigned int GeometryModelQDom::undoSteps() const { return _undoStack.size(); }
+
+
+QString GeometryModelQDom::attributeToString(const Attribute &attribute) const
+{
+  switch (attribute)
+  {
+  case Attribute::AbcProtection:        return QLatin1String("abc_protection");
+  case Attribute::Affiliation:          return QLatin1String("affil");
+  case Attribute::Alignment:            return QLatin1String("alignment");
+  case Attribute::AnchorHorizontal:     return QLatin1String("anchor_horizontal");
+  case Attribute::AnchorVertical:       return QLatin1String("anchor_vertical");
+  case Attribute::ArrowClampHeight:     return QLatin1String("arrow_clamp_height");
+  case Attribute::ArrowHeight:          return QLatin1String("arrow_height");
+  case Attribute::ArrowLineWidth:       return QLatin1String("arrow_line_width");
+  case Attribute::Arrows:               return QLatin1String("arrows");
+  case Attribute::ArrowWidth:           return QLatin1String("arrow_width");
+  case Attribute::Box:                  return QLatin1String("box");
+  case Attribute::Center:               return QLatin1String("center_point");
+  case Attribute::Close:                return QLatin1String("close");
+  case Attribute::Color:                return QLatin1String("color");
+  case Attribute::Extent:               return QLatin1String("extent");
+  case Attribute::Fill:                 return QLatin1String("fill");
+  case Attribute::FillColor:            return QLatin1String("FillColor");
+  case Attribute::FillPattern:          return QLatin1String("FillPattern");
+  case Attribute::FillStyle:            return QLatin1String("FillStyle");
+  case Attribute::Font:                 return QLatin1String("font");
+  case Attribute::FontBold:             return QLatin1String("FontBold");
+  case Attribute::FontItalic:           return QLatin1String("FontItalic");
+  case Attribute::FontSize:             return QLatin1String("FontSize");
+  case Attribute::Height:               return QLatin1String("height");
+  case Attribute::LineColor:            return QLatin1String("linecolor");
+  case Attribute::LineStyle:            return QLatin1String("linestyle");
+  case Attribute::LineWidth:            return QLatin1String("linewidth");
+  case Attribute::MarginHorizontal:     return QLatin1String("margin_horizontal");
+  case Attribute::MarginVertical:       return QLatin1String("margin_vertical");
+  case Attribute::Mobility:             return QLatin1String("mobility");
+  case Attribute::SIDC:                 return QLatin1String("sidc");
+  case Attribute::SIDC_Color:           return QLatin1String("sidc_color");
+  case Attribute::SIDC_Attributes:      return QLatin1String("sidc_attributes");
+  case Attribute::SymbolId:             return QLatin1String("symbol_id");
+  case Attribute::SymbolOffsetX:        return QLatin1String("symbol_offsetX");
+  case Attribute::SymbolOffsetY:        return QLatin1String("symbol_offsetY");
+  case Attribute::SymbolDirection:      return QLatin1String("symbol_direction");
+  case Attribute::ForceId:              return QLatin1String("force_id");
+  case Attribute::SymbolState:          return QLatin1String("symbolState");
+  case Attribute::SymbolUncertainty:    return QLatin1String("symbolUncertainty");
+  case Attribute::SymbolExplicitScale:  return QLatin1String("explicitScale");
+  case Attribute::DamageForceId:        return QLatin1String("damage_force_id");
+  case Attribute::Injury:               return QLatin1String("injury");
+  case Attribute::PeMapBrightness:      return QLatin1String("pe_map_brightness");
+  case Attribute::PeMapCenterX:         return QLatin1String("pe_map_centerx");
+  case Attribute::PeMapCenterY:         return QLatin1String("pe_map_centery");
+  case Attribute::PeMapSaturation:      return QLatin1String("pe_map_saturation");
+  case Attribute::PeMapZoom:            return QLatin1String("pe_map_zoom");
+  case Attribute::PeMapRotation:        return QLatin1String("pe_map_rotation");
+  case Attribute::PeMapType:            return QLatin1String("pe_map_type");
+  case Attribute::PeShowUtm:            return QLatin1String("pe_show_utm");
+
+  case Attribute::PeSymbolOpacity:      return QLatin1String("symbol_opacity");
+  case Attribute::PeSymbolFillType:     return QLatin1String("pe_symbol_fill_type");
+  case Attribute::PeSymbolScale:        return QLatin1String("pe_symbol_scale");
+
+  case Attribute::MetaDataTitle:        return QLatin1String("meta_data_title");
+  case Attribute::MetaDataAuthor:       return QLatin1String("meta_data_author");
+  case Attribute::MetaDataDate:         return QLatin1String("meta_data_date");
+  case Attribute::MetaDataDesciption:   return QLatin1String("meta_data_description");
+  case Attribute::MetaDataMinScale:     return QLatin1String("meta_data_min_scale");
+  case Attribute::MetaDataMaxScale:     return QLatin1String("meta_data_max_scale");
+  case Attribute::MetaPixelBasedTextBoxes: return QLatin1String("meta_pixel_based_text_boxes");
+
+  case Attribute::Rotate:               return QLatin1String("rotate");
+  case Attribute::Rounding:             return QLatin1String("rounding");
+  case Attribute::Start:                return QLatin1String("start");
+  case Attribute::Text_EF:              return QLatin1String("text_ef");
+  case Attribute::Text_G:               return QLatin1String("text_g");
+  case Attribute::Text_H:               return QLatin1String("text_h");
+  case Attribute::Text_KLNPJ:           return QLatin1String("text_jklnp");
+  case Attribute::Text_M:               return QLatin1String("text_m");
+  case Attribute::Text_T:               return QLatin1String("text_t");
+  case Attribute::Text_V:               return QLatin1String("text_v");
+  case Attribute::Text_W:               return QLatin1String("text_w");
+  case Attribute::Text_XY:              return QLatin1String("text_xy");
+  case Attribute::Text_Z:               return QLatin1String("text_z");
+  case Attribute::UtmEast:              return QLatin1String("utm_east");
+  case Attribute::UtmGrid:              return QLatin1String("utm_grid");
+  case Attribute::UtmNorth:             return QLatin1String("utm_north");
+  case Attribute::UtmZone:              return QLatin1String("utm_zone");
+  case Attribute::Width:                return QLatin1String("width");
+  case Attribute::att_vbg_et:           return QLatin1String("w_vbg_et");
+  default:                              return QLatin1String("Unknown Attribute");
+  }
+} // QString GeometryModelQDom::attributeToString(Attribute attribute) const
+
+
+
+void GeometryModelQDom::init()
+{
+  using index = QPair<GeometryModelQDom::PrimitiveType, GeometryModelQDom::Attribute>;
+
+  // Only once
+  if (! _staticInitDone)
+  {
+    // Create mapping between primitive-types and their string/tag-name
+
+    _primitiveTagsTypes[QLatin1String("participantSymbol")] = PrimitiveType::ParticipantSymbol;
+    _primitiveTagsTypes[QLatin1String("dictionarySymbol")]  = PrimitiveType::DictionarySymbol;
+    _primitiveTagsTypes[QLatin1String("ellipse")]           = PrimitiveType::Ellipse;
+    _primitiveTagsTypes[QLatin1String("line")]              = PrimitiveType::Line;
+    _primitiveTagsTypes[QLatin1String("polyline")]          = PrimitiveType::Polyline;
+    _primitiveTagsTypes[QLatin1String("rectangle")]         = PrimitiveType::Rectangle;
+    _primitiveTagsTypes[QLatin1String("spline")]            = PrimitiveType::Spline;
+    _primitiveTagsTypes[QLatin1String("symbol")]            = PrimitiveType::Symbol;
+    _primitiveTagsTypes[QLatin1String("text")]              = PrimitiveType::Text;
+    _primitiveTagsTypes[QLatin1String("node")]              = PrimitiveType::Node;
+    _primitiveTagsTypes[rootNodeName]        = PrimitiveType::RootNode;
+
+    _primitiveTagsStrings[PrimitiveType::ParticipantSymbol] = QLatin1String("participantSymbol");
+    _primitiveTagsStrings[PrimitiveType::DictionarySymbol]  = QLatin1String("dictionarySymbol");
+    _primitiveTagsStrings[PrimitiveType::Ellipse]           = QLatin1String("ellipse");
+    _primitiveTagsStrings[PrimitiveType::Line]              = QLatin1String("line");
+    _primitiveTagsStrings[PrimitiveType::Polyline]          = QLatin1String("polyline");
+    _primitiveTagsStrings[PrimitiveType::Rectangle]         = QLatin1String("rectangle");
+    _primitiveTagsStrings[PrimitiveType::Spline]            = QLatin1String("spline");
+    _primitiveTagsStrings[PrimitiveType::Symbol]            = QLatin1String("symbol");
+    _primitiveTagsStrings[PrimitiveType::Text]              = QLatin1String("text");
+    _primitiveTagsStrings[PrimitiveType::Node]              = QLatin1String("node");
+
+
+    // Don't set
+    // _primitiveTagsStrings[PrimitiveType::RootNode]  = rootNodeName;
+    // because the root node can not be created from interface.
+
+    // Create mapping between node-types and supported attributes
+    // "Unknown" is used for plan-attributes
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataTitle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataAuthor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataDate);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataDesciption);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataMinScale);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaDataMaxScale);
+    _primitiveSupportedAttributes.insert(PrimitiveType::RootNode, Attribute::MetaPixelBasedTextBoxes);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapBrightness);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapCenterX);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapCenterY);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapSaturation);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapZoom);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapRotation);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeMapType);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeShowUtm);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeSymbolOpacity);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeSymbolFillType);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::PeSymbolScale);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::UtmEast);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::UtmGrid);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::UtmNorth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::MapDefaults, Attribute::UtmZone);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::DictionarySymbol, Attribute::SIDC);
+    _primitiveSupportedAttributes.insert(PrimitiveType::DictionarySymbol, Attribute::SIDC_Attributes);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::SIDC);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::SIDC_Attributes);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::ForceId);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::SymbolState);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::DamageForceId);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Injury);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_EF);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_G);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_H);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_KLNPJ);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_M);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_T);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_V);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_W);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_XY);
+    _primitiveSupportedAttributes.insert(PrimitiveType::ParticipantSymbol, Attribute::Text_Z);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Center);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Height);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Width);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Extent);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Fill);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::FillColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::FillPattern);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::FillStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::LineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Rotate);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Ellipse, Attribute::Start);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::ArrowClampHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::ArrowHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::ArrowLineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::Arrows);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::ArrowWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Line, Attribute::LineWidth);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::ArrowClampHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::ArrowHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::ArrowLineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::Arrows);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::ArrowWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::Close);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::Fill);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::FillColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::FillPattern);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Polyline, Attribute::LineWidth);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Center);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Height);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Width);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Fill);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::FillColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::FillPattern);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::LineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Rotate);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Rectangle, Attribute::Rounding);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::ArrowClampHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::ArrowHeight);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::ArrowLineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::Arrows);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::ArrowWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::Close);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::Fill);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::FillColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::FillPattern);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Spline, Attribute::LineWidth);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::AbcProtection);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Affiliation);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Mobility);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolId);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolOffsetX);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolOffsetY);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolDirection);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::ForceId);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolState);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolUncertainty);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::SymbolExplicitScale);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::DamageForceId);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_EF);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_G);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_H);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_KLNPJ);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_M);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_T);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_V);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_W);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_XY);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::Text_Z);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Symbol, Attribute::att_vbg_et);
+
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::AnchorHorizontal);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::AnchorVertical);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::Box);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::Color);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::Fill);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::FillColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::FillPattern);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::Font);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::FontBold);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::FontItalic);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::FontSize);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::LineColor);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::LineStyle);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::LineWidth);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::MarginHorizontal);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::MarginVertical);
+    _primitiveSupportedAttributes.insert(PrimitiveType::Text, Attribute::Rotate);
+
+    // Init all default-values for all required attributes
+    QFont defaultFont;
+    int fontSize = defaultFont.pixelSize();
+
+    // TODO: Find better defaults
+
+    // "Unknown" is used for plan-attributes
+    _attributeDefaults.insert(index(PrimitiveType::DictionarySymbol, Attribute::SIDC), QLatin1String("------------"));
+
+    _attributeDefaults.insert(index(PrimitiveType::ParticipantSymbol, Attribute::SIDC), QLatin1String("------------"));
+    _attributeDefaults.insert(index(PrimitiveType::ParticipantSymbol, Attribute::SIDC_Color), variant2XmlString(QColor(0, 0, 0, 0)));
+
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataTitle), QString());
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataAuthor), QString());
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataDate), QString());
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataDesciption), QString());
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataMinScale), QString());
+    _attributeDefaults.insert(index(PrimitiveType::RootNode, Attribute::MetaDataMaxScale), QString());
+
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Center), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Height), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Width), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Extent), QLatin1String("360"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Fill), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::FillColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::FillPattern), QLatin1String("none"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::FillStyle), QLatin1String("pieslice"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::LineWidth), QLatin1String("0.1"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Rotate), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Ellipse, Attribute::Start), QLatin1String("0"));
+
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::ArrowClampHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::ArrowHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::ArrowLineWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::Arrows), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::ArrowWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Line, Attribute::LineWidth), QLatin1String("0.1"));
+
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::ArrowClampHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::ArrowHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::ArrowLineWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::Arrows), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::ArrowWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::Close), QLatin1String("1"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::Fill), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::FillColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::FillPattern), QLatin1String("none"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Polyline, Attribute::LineWidth), QLatin1String("0.1"));
+
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Center), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Height), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Width), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Fill), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::FillColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::FillPattern), QLatin1String("none"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::LineWidth), QLatin1String("0.1"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Rotate), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Rectangle, Attribute::Rounding), QLatin1String("0.0"));
+
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::ArrowClampHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::ArrowHeight), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::ArrowLineWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::Arrows), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::ArrowWidth), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::Close), QLatin1String("1"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::Fill), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::FillColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::FillPattern), QLatin1String("none"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Spline, Attribute::LineWidth), QLatin1String("0.1"));
+
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::AbcProtection), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Affiliation), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Mobility), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolId), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolOffsetX), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolOffsetY), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolDirection), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::ForceId), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolState), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolUncertainty), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::SymbolExplicitScale), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::DamageForceId), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_EF), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_G), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_H), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_KLNPJ), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_M), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_T), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_V), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_W), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_XY), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::Text_Z), QString());
+    _attributeDefaults.insert(index(PrimitiveType::Symbol, Attribute::att_vbg_et), QString());
+
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::AnchorHorizontal), QLatin1String("center"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::AnchorVertical), QLatin1String("center"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::Box), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::Color), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::Fill), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::FillColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::FillPattern), QLatin1String("none"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::Font), defaultFont.key());
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::FontBold), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::FontItalic), QLatin1String("0"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::FontSize), QString::number(fontSize));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::LineColor), QColor().name());
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::LineStyle), QLatin1String("solid"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::LineWidth), QLatin1String("0.1"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::MarginHorizontal), QLatin1String("1"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::MarginVertical), QLatin1String("1"));
+    _attributeDefaults.insert(index(PrimitiveType::Text, Attribute::Rotate), QLatin1String("0"));
+
+    _attributeTypes[Attribute::AbcProtection] = QVariant::Bool;          // Type: bool
+    _attributeTypes[Attribute::Affiliation] = QVariant::UserType;        // Type: Symbol::t_affil
+    _attributeTypes[Attribute::Alignment] = QVariant::UserType;          // Type: HorizontalAlign
+    _attributeTypes[Attribute::AnchorHorizontal] = QVariant::UserType;   // Type: HorizontalAlign
+    _attributeTypes[Attribute::AnchorVertical] = QVariant::UserType;     // Type: t_valign
+    _attributeTypes[Attribute::ArrowClampHeight] = QVariant::Double;     // Type: double
+    _attributeTypes[Attribute::ArrowHeight] = QVariant::Double;          // Type: double
+    _attributeTypes[Attribute::ArrowLineWidth] = QVariant::Double;       // Type: double
+    _attributeTypes[Attribute::Arrows] = QVariant::UserType;             // Type: t_arrows
+    _attributeTypes[Attribute::ArrowWidth] = QVariant::Double;           // Type: double
+    _attributeTypes[Attribute::Box] = QVariant::Bool;                    // Type: bool
+    _attributeTypes[Attribute::Center] = QVariant::PointF;               // Type: PointF
+    _attributeTypes[Attribute::Close] = QVariant::Bool;                  // Type: bool
+    _attributeTypes[Attribute::Color] = QVariant::Color;                 // Type: QColor
+    _attributeTypes[Attribute::Extent] = QVariant::Double;               // Type: double
+    _attributeTypes[Attribute::Fill] = QVariant::Bool;                   // Type: bool
+    _attributeTypes[Attribute::FillColor] = QVariant::Color;             // Type: QColor
+    _attributeTypes[Attribute::FillPattern] = QVariant::UserType;        // Type: t_fillPattern
+    _attributeTypes[Attribute::FillStyle] = QVariant::UserType;          // Type: t_fillStyle
+    _attributeTypes[Attribute::Font] = QVariant::UserType;               // Type: t_font
+    _attributeTypes[Attribute::FontBold] = QVariant::Bool;               // Type: bool
+    _attributeTypes[Attribute::FontItalic] = QVariant::Bool;             // Type: bool
+    _attributeTypes[Attribute::FontSize] = QVariant::Double;             // Type: double
+    _attributeTypes[Attribute::LineColor] = QVariant::Color;             // Type: QColor
+    _attributeTypes[Attribute::LineStyle] = QVariant::UserType;          // Type: t_lineStyle
+    _attributeTypes[Attribute::LineWidth] = QVariant::Double;            // Type: double
+    _attributeTypes[Attribute::MarginHorizontal] = QVariant::UserType;   // Type: int
+    _attributeTypes[Attribute::MarginVertical] = QVariant::UserType;     // Type: int
+    _attributeTypes[Attribute::Mobility] = QVariant::UserType;           // Type: Symbol::t_mob
+    _attributeTypes[Attribute::SIDC] = QVariant::String;                 // Type: QString
+    _attributeTypes[Attribute::SIDC_Color] = QVariant::Color;            // Type: QColor
+    _attributeTypes[Attribute::SIDC_Attributes] = QVariant::String;      // Type: QString
+    _attributeTypes[Attribute::SymbolId] = QVariant::Int;                // Type: int
+    _attributeTypes[Attribute::SymbolOffsetX] = QVariant::Int;           // Type: int
+    _attributeTypes[Attribute::SymbolOffsetY] = QVariant::Int;           // Type: int
+    _attributeTypes[Attribute::SymbolDirection] = QVariant::Double;      // Type: double
+    _attributeTypes[Attribute::ForceId] = QVariant::Int;                 // Type: int
+    _attributeTypes[Attribute::SymbolState] = QVariant::UserType;        // Type: SymbolTypes::t_state
+    _attributeTypes[Attribute::SymbolUncertainty] = QVariant::UserType;  // Type: SymbolTypes::t_uncertainty
+    _attributeTypes[Attribute::SymbolExplicitScale] = QVariant::Double;  // Type: double
+    _attributeTypes[Attribute::DamageForceId] = QVariant::Int;           // Type: int
+    _attributeTypes[Attribute::Injury] = QVariant::Int;           // Type: int
+    _attributeTypes[Attribute::PeMapBrightness] = QVariant::Double;      // Type: double
+    _attributeTypes[Attribute::PeMapCenterX] = QVariant::Int;            // Type: int
+    _attributeTypes[Attribute::PeMapCenterY] = QVariant::Int;            // Type: int
+    _attributeTypes[Attribute::PeMapSaturation] = QVariant::Double;      // Type: double
+    _attributeTypes[Attribute::PeMapZoom] = QVariant::Double;            // Type: double
+    _attributeTypes[Attribute::PeMapRotation] = QVariant::Double;        // Type: double
+    _attributeTypes[Attribute::PeMapType] = QVariant::UserType;          // Type: t_mapType
+    _attributeTypes[Attribute::PeShowUtm] = QVariant::Bool;              // Type: bool
+
+    _attributeTypes[Attribute::PeSymbolOpacity] = QVariant::Double;      // Type: double
+    _attributeTypes[Attribute::PeSymbolFillType] = QVariant::UserType;   // Type: SymbolTypes::t_filltype
+    _attributeTypes[Attribute::PeSymbolScale] = QVariant::Bool;          // Type: bool
+
+    _attributeTypes[Attribute::MetaDataTitle] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::MetaDataAuthor] = QVariant::String;              // Type: QString
+    _attributeTypes[Attribute::MetaDataDate] = QVariant::DateTime;
+    _attributeTypes[Attribute::MetaDataDesciption] = QVariant::String;             // Type: QString
+    _attributeTypes[Attribute::MetaDataMinScale] = QVariant::Double;               // Type: double
+    _attributeTypes[Attribute::MetaDataMaxScale] = QVariant::Double;               // Type: double
+
+    _attributeTypes[Attribute::Rotate] = QVariant::Double;               // Type: double
+    _attributeTypes[Attribute::Rounding] = QVariant::Double;             // Type: double
+    _attributeTypes[Attribute::Start] = QVariant::Double;                // Type: double
+    _attributeTypes[Attribute::Text_EF] = QVariant::String;              // Type: QString
+    _attributeTypes[Attribute::Text_G] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_H] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_KLNPJ] = QVariant::String;           // Type: QString
+    _attributeTypes[Attribute::Text_M] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_T] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_V] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_W] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::Text_XY] = QVariant::String;              // Type: QString
+    _attributeTypes[Attribute::Text_Z] = QVariant::String;               // Type: QString
+    _attributeTypes[Attribute::UtmEast] = QVariant::Int;                 // Type: int
+    _attributeTypes[Attribute::UtmGrid] = QVariant::String;              // Type: QString
+    _attributeTypes[Attribute::UtmNorth] = QVariant::Int;                // Type: int
+    _attributeTypes[Attribute::UtmZone] = QVariant::String;              // Type: QString
+    _attributeTypes[Attribute::att_vbg_et] = QVariant::UserType;         // Type: t_w_vbg_et
+
+    _staticInitDone = true;
+  }
+
+  QDomElement root = createElement(rootNodeName);
+  appendChild(root);
+
+  clearUndoStack();
+} // void GeometryModelQDom::init()
+
+void GeometryModelQDom::cleanupStaticMember()
+{
+  _primitiveTagsTypes.clear();
+  _primitiveTagsStrings.clear();
+  _primitiveSupportedAttributes.clear();
+  _attributeDefaults.clear();
+  _attributeTypes.clear();
+}
+
+
+GeometryModel::Node GeometryModelQDom::getMapDefaultSettingsNode() const
+{
+  QDomElement mapSettings = firstChildElement(mapSettingsName);
+
+  if (mapSettings.isNull())
+  {
+    GeometryModelQDom *THIS = const_cast<GeometryModelQDom *>(this); // cast const away
+
+    mapSettings = THIS->createElement(mapSettingsName);
+
+    THIS->appendChild(mapSettings);
+
+    using index = QPair<GeometryModelQDom::PrimitiveType, GeometryModelQDom::Attribute>;
+
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapBrightness), QLatin1String("100"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapCenterX), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapCenterY), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapSaturation), QLatin1String("100"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapZoom), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapRotation), QLatin1String("0.0"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeMapType), QLatin1String("MapPrimitiveType::Unknown"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeShowUtm), QLatin1String("1"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::UtmEast), QLatin1String("10000"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::UtmGrid), QLatin1String("XY"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::UtmNorth), QLatin1String("10000"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::UtmZone), QLatin1String("00Z"));
+
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeSymbolOpacity), QLatin1String("1.0"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeSymbolFillType), QLatin1String("filled"));
+    _attributeDefaults.insert(index(PrimitiveType::MapDefaults, Attribute::PeSymbolScale), QLatin1String("1.0"));
+
+    // Create root-node and set required attributes
+
+
+    QList<Attribute> modelAttributes = supportedAttributes(PrimitiveType::MapDefaults);
+    for (int i = 0; i < modelAttributes.size(); ++i)
+    {
+      Attribute at = modelAttributes.at(i);
+      THIS->setModelEditorAttribute(at, _attributeDefaults[index(PrimitiveType::MapDefaults, at)]);
+    }
+  }
+
+  return Node(Node::Implementation(mapSettings));
+
+} // GeometryModelQDom::getMapDefaultSettingsNode
+
+
+void GeometryModelQDom::transformNode(const QDomNode &node, const QTransform &t)
+{
+  QString tag = node.nodeName();
+  if (!_primitiveTagsTypes.contains(tag))
+  {
+    emit modelError(tr("Can not translate node of type %1").arg(tag));
+    return;
+  }
+
+  QDomNodeList nodes = node.childNodes();
+  for (int i = 0; i < nodes.size(); ++i)
+  {
+    QDomElement p = nodes.at(i).toElement();
+    if (p.nodeName() != QLatin1String("point"))
+      continue;
+    if (!p.hasAttribute(QLatin1String("x")) || !p.hasAttribute(QLatin1String("y")))
+      emit modelError(tr("Invalid point in primitive of type %1").arg(tag));
+    else
+    {
+      bool okx, oky;
+      double oldx = p.toElement().attribute(QLatin1String("x")).toDouble(&okx);
+      double oldy = p.toElement().attribute(QLatin1String("y")).toDouble(&oky);
+      if (!(okx && oky))
+        emit modelError(tr("Invalid point in primitive of type %1").arg(tag));
+      else
+      {
+        QPointF point = t.map(QPointF(oldx, oldy));
+        p.setAttribute(QLatin1String("x"), QString::number(point.x(), 'f', CoordinateDoublePrecision));
+        p.setAttribute(QLatin1String("y"), QString::number(point.y(), 'f', CoordinateDoublePrecision));
+      }
+    }
+  }
+} // void GeometryModelQDom::transformNode(QDomNode node, QTransform t)
+
+
+void GeometryModelQDom::emitChangedSignal(const Node &node, Attribute att, bool coordsChanged)
+{
+  if (!_skipChangedSignal)
+    emit changed(node, att, coordsChanged);
+} // void GeometryModelQDom::emitChangedSignal(QDomNode node, Attribute att, bool coordsChanged)
+
+
+void GeometryModelQDom::pushUndo(const QString &eventDescription)
+{
+  if (_undoEnabled && (! _insideUndoBlock))
+  {
+    QDomElement root = firstChildElement(rootNodeName);
+    while (undoSteps() >= _maxUndoSteps)
+    {
+      // Size-limit reached, remove first element
+      _undoStack.erase(_undoStack.begin());
+      _undoHistory.erase(_undoHistory.begin());
+    }
+    _undoStack.push(root.cloneNode());
+    _undoHistory.push(eventDescription);
+  }
+  if (_insideUndoBlock)
+    _undoHistoryBlock = eventDescription;
+} // void GeometryModelQDom::pushUndo(const QString &eventDescription)
+
+
+GeometryModel::Node GeometryModelQDom::popUndo()
+{
+  if (_undoEnabled && (! _insideUndoBlock))
+  {
+    _undoHistory.pop();
+    return Node(Node::Implementation(_undoStack.pop()));
+  }
+  return Node();
+} // void GeometryModelQDom::pushUndo()
+
+
+
+bool GeometryModelQDom::parseSymbolAttributeString(const QString &sidcAttributes, QMap<QString, QVariant> &attrMap) const
+{
+  attrMap.clear();
+
+  if (sidcAttributes.isEmpty()) return true;
+
+  bool ok = true;
+  const QStringList sidcAttrList = sidcAttributes.split(QLatin1Char(';'));
+
+  for (const QString &attr : sidcAttrList)
+  {
+    const QStringList attrPair = attr.split(QLatin1Char('='));
+    if (attrPair.size() != 2)
+    {
+      ok = false;
+      QString errorString = tr("%1 Parsing symbol attribute list failed. %2").arg(QString::fromStdString(LOGFUNCTION), attr);
+      emit const_cast<GeometryModelQDom*>(this)->attributeError(errorString);
+      continue;
+    }
+    attrMap[attrPair.first()] = attrPair.last();
+  }
+  return ok;
+} // bool GeometryModelQDom::parseSymbolAttributeString( const QString & sidcAttributes, QMap<QString,QVariant> & attrMap ) const
+
+
+QString GeometryModelQDom::buildSymbolAttributeString(const QMap<QString, QVariant> &attrMap) const
+{
+  QString attributeString;
+
+  QMap<QString, QVariant>::const_iterator iter = attrMap.cbegin();
+  while (attrMap.cend() != iter)
+  {
+    const QString &key = iter.key();
+    const QString &val = iter.value().toString();
+
+    if (!val.isEmpty())
+    {
+      if (key.isEmpty())
+      {
+        QString errorString = tr("%1 Empty key found").arg(QString::fromStdString(LOGFUNCTION));
+        emit const_cast<GeometryModelQDom*>(this)->attributeError(errorString);
+        ++iter;
+        continue;
+      }
+
+      if (val.contains(QLatin1Char('=')) || val.contains(QLatin1Char(';')))
+      {
+        QString errorString = tr("%1 Attribute value has illegal characters <;=> :  %2").arg(QString::fromStdString(LOGFUNCTION), val);
+        emit const_cast<GeometryModelQDom*>(this)->attributeError(errorString);
+        ++iter;
+        continue;
+      }
+
+      if (!attributeString.isEmpty()) attributeString += QLatin1Char(';');
+      attributeString += QStringLiteral("%1=%2").arg(key, val);
+    }
+    ++iter;
+  }
+  return attributeString;
+} // QString GeometryModelQDom::buildSymbolAttributeString(const QMap<QString, QVariant> & attrMap) const
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.h
new file mode 100755
index 000000000..b9c3b2343
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_model_q_dom.h
@@ -0,0 +1,374 @@
+/**
+**
+** @RDE_HEADER@
+** GeometryModel implementation to write and read PlanEditor plans from/to XML and manipulate DOM-tree.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Stephan Kuhagen <kuhagen@rheinmetall-de.com>
+**                     Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   ??.??.200?, SK  : First edition for use with Qt4
+**   11.11.2015, JT  : Splitting interface and implementation
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+// clazy:excludeall=const-signal-or-slot
+
+#pragma once
+
+#include <QtGui/QColor>
+#include <QtXml/QDomDocument>
+#include <QtCore/QMultiMap>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QStack>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+#include "geometry_model.h"
+class QTransform;
+
+namespace SituationMap
+{
+
+// exported for unit test only
+class GEOMETRYMODEL_EXPORT GeometryModelQDom : public GeometryModel, public QDomDocument
+{
+
+  Q_OBJECT
+
+public:
+
+  explicit GeometryModelQDom(QObject *parent = nullptr);
+
+  //! Copy-Constructor
+  GeometryModelQDom(const GeometryModelQDom &other);
+
+  ~GeometryModelQDom();
+
+  GeometryModelQDom & operator = (const GeometryModelQDom &other);
+
+  QByteArray toByteArray() const override;
+  QByteArray toByteArrayDebug() const override;
+
+  bool fromByteArray(const QByteArray &content) override;
+  bool fromDevice(QIODevice *device) override;
+  bool fromByteArrayDebug(const QByteArray &content) override;
+
+  bool isEmpty() const override;
+
+  Node getRootNode() const override;
+
+  Node getMapDefaultSettingsNode() const override;
+
+  void setModelAttribute(GeometryModel::Attribute attribute, const QVariant &value) override;
+
+  void setModelEditorAttribute(GeometryModel::Attribute attribute, const QVariant &value) override;
+
+  void setPrimitiveAttribute(const GeometryModel::Node &node, GeometryModel::Attribute attribute, const QVariant &value) override;
+
+  void movePrimitiveIntoGroup(const GeometryModel::Node &primitive, const GeometryModel::Node &target) override;
+
+  void releaseGroup(const GeometryModel::Node &group) override;
+
+  void deleteGroup(const GeometryModel::Node &group) override;
+
+  void removePrimitive(const GeometryModel::Node &primitive) override;
+
+  void removePrimitivesByUserData(const QList<int> &userDataList) override;
+
+  void removeText(GeometryModel::Node &parent) override;
+
+  void setTextData(const GeometryModel::Node &textNode, const QString &data, GeometryModel::HorizontalAlign textAlign) override;
+
+  void clearModel() override;
+
+  void translateNode(const GeometryModel::Node &node, double x, double y) override;
+
+  void moveNode(const GeometryModel::Node &node, double x, double y) override;
+
+  void scaleNode(const GeometryModel::Node &node, double scaleX, double scaleY) override;
+
+
+  void rotateNode(const GeometryModel::Node &node, double angle) override;
+
+  void reorderPrimitives(const QList<GeometryModel::Node> &nodes, GeometryModel::PrimitivOrder order) override;
+
+  void merge(const GeometryModel::Node &other, bool skipUndo = false, bool intoNewGroup = false) override;
+
+  void merge(GeometryModel *other, bool skipUndo = false, bool intoNewGroup = false) override;
+
+  unsigned int modificationCounter() const override;
+
+  void resetModificationCounter() override;
+
+  void undo(unsigned int steps = 1) override;
+
+  void redo(unsigned int steps = 1) override;
+
+  void enableUndo(bool enable) override;
+
+  void startUndoBlock() override;
+
+  void endUndoBlock(const QString &eventDescription = QString()) override;
+
+  void abortUndoBlock() override;
+
+  void setMaxUndoSteps(unsigned int max) override;
+
+  unsigned int maxUndoSteps() const override;
+
+  void cleanModel() override;
+
+
+  GeometryModel::Node addPrimitive(GeometryModel::PrimitiveType                                type
+                                   , const QList<QPointF>                                     &points
+                                   , const QList<QPair<GeometryModel::Attribute, QVariant> >  &attributes
+                                   , int                                                       userData  = -1
+                                   , const QString                                            &textData  = QString()
+                                   , GeometryModel::HorizontalAlign                            textAlign = HorizontalAlign::Left) override;
+
+
+  bool setPrimitivePoints(const GeometryModel::Node &node, const QList<QPointF> &points) override;
+
+  GeometryModel::Node addText(const GeometryModel::Node                                  &parent
+                              , const QString                                            &textData
+                              , GeometryModel::HorizontalAlign                            textAlign
+                              , const QList<QPair<GeometryModel::Attribute, QVariant> >  &attributes
+                              , int                                                       userData) override;
+
+  GeometryModel::Node getText(const GeometryModel::Node &parent) const override;
+
+  QString getTextData(const GeometryModel::Node &textNode) const override;
+
+  QList<QPointF> getPrimitivePoints(const GeometryModel::Node &node) const override;
+
+  QRectF getBoundingBox(const GeometryModel::Node &node) const override;
+
+  void setNodeDisplayName(const Node &node, const QString &name) override;
+
+  QString getNodeDisplayName(const Node &node) const override;
+
+  QVariant getModelAttribute(Attribute attribute) const override;
+
+  QVariant getAttribute(const GeometryModel::Node &node, GeometryModel::Attribute attribute) const override;
+
+  template <class T> T getAttribute(const Node &node, Attribute attribute) const;
+
+  bool hasAttribute(const GeometryModel::Node &node, GeometryModel::Attribute attribute) const override;
+
+  QVariant::Type attributeType(const GeometryModel::Attribute &attribute) const override;
+
+  QList<GeometryModel::Attribute> supportedAttributes(GeometryModel::PrimitiveType type) const override;
+
+  GeometryModel::Node createGroup(const QList<GeometryModel::Node> &primitives) override;
+
+  GeometryModel::Node isInGroup(const GeometryModel::Node &primitive) const override;
+
+  GeometryModel::NodeList getGroupPrimitives(const GeometryModel::Node &node) override;
+
+  GeometryModel::Node findPrimitive(int userData) const override;
+
+  bool hasUserData(const Node &node) const override;
+
+  int getUserData(const GeometryModel::Node &node, bool *ok = nullptr) const override;
+
+  void setUserData(const GeometryModel::Node &node, int userData) override;
+
+  QMultiMap<int, GeometryModel::Node> userDataMap(const GeometryModel::Node &node = GeometryModel::Node()) override;
+
+  GeometryModel::Node copy(const GeometryModel::Node &node, int userData = 0) override;
+
+  GeometryModel::PrimitiveType getType(const GeometryModel::Node &node) const override;
+
+  unsigned int undoSteps() const override;
+
+  unsigned int redoSteps() const override;
+
+  QStringList undoHistory() const override { return _undoHistory.toList(); }
+
+  QStringList redoHistory() const override { return _redoHistory.toList(); }
+
+  void clearUndoStack() override
+  {
+    _undoStack.clear();
+    _undoHistory.clear();
+  } // clearUndoStack
+
+  void clearRedoStack() override
+  {
+    _redoStack.clear();
+    _redoHistory.clear();
+  } // clearRedoStack
+
+  QString attributeToString(const GeometryModel::Attribute &attribute) const override;
+
+  bool parseSymbolAttributeString(const QString &sidcAttributes, QMap<QString, QVariant> &attrMap) const override;
+
+  QString buildSymbolAttributeString(const QMap<QString, QVariant> &attrMap) const override;
+
+  static void cleanupStaticMember();
+
+private:
+
+  static void valueFromVariant(const QVariant &v, QPointF &result);
+  static void valueFromVariant(const QVariant &v, QColor   &result);
+
+  /**
+    convert to QString (with non locale-aware conversions)
+  */
+  static QString variant2XmlString(const QVariant &v);
+
+  /**
+    Create a QColor from an attribute-value with alpha-channel (QVariant
+    ignores Alpha)
+    \param attColor: The QString-QVariant from an attribute of Type QColor
+    \return QColor with alpha-channel or invalid QColor, if the value could be parsed.
+  */
+  static QColor colorFromString(const QString &attColor);
+
+  /**
+    Create a QPoint from an attribute-value
+    \param attPoint: The QString-QVariant from an attribute of Type QPointF
+    \return QPointF
+  */
+  static QPointF pointFromString(const QString &attPoint);
+
+  //! A mapping between all primitives and the attributes they support
+  static QMultiMap<GeometryModel::PrimitiveType, GeometryModel::Attribute> _primitiveSupportedAttributes;
+  //! Mappings between all primitive-types and their string/tag-name
+  static QMap<QString, GeometryModel::PrimitiveType> _primitiveTagsTypes;
+  static QMap<GeometryModel::PrimitiveType, QString> _primitiveTagsStrings;
+
+  //! Default-Values for all supported attributes
+  static QMap<QPair<GeometryModel::PrimitiveType, GeometryModel::Attribute>, QString> _attributeDefaults;
+
+  //! Mapping between Attributes and their QVariant-Type.
+  static QMap<GeometryModel::Attribute, QVariant::Type> _attributeTypes;
+
+  //! Bool to check, if static class variables have been initialized
+  static bool _staticInitDone;
+
+  /**
+    Init data of the object
+  */
+  void init();
+
+
+  /**
+    Transform the points of a primitive.
+    \sa {translateNode(), moveNode(), rotateNode(), scaleNode()}
+    \param node: The primitive to transform.
+    \param t: The transformation-matrix.
+  */
+  void transformNode(const QDomNode &node, const QTransform &t);
+
+
+  GeometryModel::PrimitiveType getType(const QDomNode &node) const;
+
+  bool hasUserData(const QDomNode &node) const;
+
+  int getUserData(const QDomNode &node, bool *okPtr) const;
+
+  QRectF getBoundingBox(const QDomNode &node) const;
+
+  QList<QPointF> getPrimitivePoints(const QDomNode &node) const;
+
+  bool hasAttribute(const QDomNode &node, GeometryModel::Attribute attribute) const;
+
+  QVariant getAttribute(const QDomNode &node, GeometryModel::Attribute attribute) const;
+
+  void removePrimitive(const QDomNode &primitive);
+
+  void translateNode(const QDomNode &node, double x, double y);
+
+  void moveNode(const QDomNode &node, double x, double y);
+
+  void scaleNode(const QDomNode &node, double scaleX, double scaleY);
+
+  void rotateNode(const QDomNode &node, double angle);
+
+  void merge(const QDomNode &other, bool skipUndo = false, bool intoNewGroup = false);
+
+  QDomNode createGroup(const QList<QDomNode> &primitives);
+
+  QMultiMap<int, QDomNode> userDataMap(const QDomNode &node) const;
+
+
+  /**
+    Wrapper for signal changed(), checks _skipChangedSignal
+
+    !!! ATTENTION: Do not use the signal changed directly.
+    Use emitChangedSignal() instead !!!
+
+    \param what: Short description of the change for logging
+    \param node: the changed node (if this is a Null-Node, the Root-Node of
+                 the plan has changed)
+    \param att: The attribute, that changed. If att==MaxAttributes, then
+                multiple attributes are changed
+    \param coordsChanged: if true, the coordinated of the primitive are changed
+  */
+  void emitChangedSignal(const Node &node, Attribute att, bool coordsChanged);
+
+
+  //! Lock for temporarily blocking changed()-Signals
+  bool _skipChangedSignal;
+
+  //! Undo-Stack
+  bool                        _undoEnabled;
+  unsigned int                _maxUndoSteps;
+  QStack<QDomNode>            _undoStack;
+  QStack<QString>             _undoHistory;
+  QStack<QDomNode>            _redoStack;
+  QStack<QString>             _redoHistory;
+
+  //! Undo-blocks
+  QDomNode                    _undoBlock;
+  QString                     _undoHistoryBlock;
+  bool                        _insideUndoBlock;
+  unsigned int                _modificationCounter;
+
+  //! Push/pop current state to undo-stack, if not locked
+  void pushUndo(const QString &eventDescription = QString());
+  GeometryModel::Node popUndo();
+}; // GeometryModelQDom
+
+
+template <class T> T GeometryModelQDom::getAttribute(const Node &node, Attribute attribute) const
+{
+  const QVariant &v = getAttribute(node, attribute);
+
+  switch (qMetaTypeId<T>())
+  {
+  case QMetaType::QPointF:
+  case QMetaType::QColor:
+  {
+    T result; valueFromVariant(v, result); return result;
+  } break;
+
+  default: break;
+  }
+  return v.value<T>();
+} // template <class T> T GeometryModelQDom::getAttribute( const Node & node, Attribute attribute ) const
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.cpp
new file mode 100755
index 000000000..f5b0d0944
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.cpp
@@ -0,0 +1,75 @@
+/**
+**
+** @RDE_HEADER@
+** Node visitor for GeometryModel.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.07.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "geometry_node_visitor.h"
+
+namespace SituationMap
+{
+GeometryNodeVisitor::GeometryNodeVisitor(GeometryModel *geoModel) : m_geometryModel(geoModel)  {;}
+
+bool GeometryNodeVisitor::traverse()
+{
+  if (!m_geometryModel)
+    return true;
+  return traverse(m_geometryModel->getRootNode());
+} // bool GeometryNodeVisitor::traverse()
+
+
+bool GeometryNodeVisitor::traverse(GeometryModel::Node node)
+{
+  if (!m_geometryModel)
+    return true;
+
+  if (node.isValid())
+  {
+    const GeometryModel::PrimitiveType primitiveType = m_geometryModel->getType(node);
+
+    if ((GeometryModel::PrimitiveType::RootNode == primitiveType) || (GeometryModel::PrimitiveType::Node == primitiveType))
+    {
+      if (node.hasChildNodes())
+      {
+        node = node.firstChildNode();
+        while (node.isValid())
+        {
+          if (!traverse(node))
+            return false;
+          node = node.next();
+        }
+      }
+    }
+
+    if (!apply(m_geometryModel, node, primitiveType))
+      return false;
+
+  } // if
+
+  return true;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.h
new file mode 100755
index 000000000..9dbcebbca
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_node_visitor.h
@@ -0,0 +1,75 @@
+/**
+**
+** @RDE_HEADER@
+** Node visitor for GeometryModel.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.07.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "geometry_model.h"
+
+namespace SituationMap
+{
+
+/**
+  GeometryNopdeVisitor implements visitor pattern to traverse geoemtry model tree. The apply function will be
+  called for each node in geometry model.
+*/
+class GEOMETRYMODEL_EXPORT GeometryNodeVisitor
+{
+public:
+
+  explicit GeometryNodeVisitor(GeometryModel *geoModel);
+  virtual ~GeometryNodeVisitor() = default;
+  GeometryNodeVisitor(const GeometryNodeVisitor &)              = delete;
+
+  /**
+    Traversing the complete geometry model
+  */
+  bool traverse();
+
+  /**
+    Traversing the sub-tree of node. Coming in deepth first.
+  */
+  bool traverse(GeometryModel::Node node);
+
+protected:
+
+  /**
+    For each node the apply function will be called. If apply returns false the traversal is aborted. In
+    other case if return value is true the traversel is continued.
+
+    @param geoModel  Pointer to geometry model
+    @param node      Node of geometry model
+    @param nodeType  Type of node
+    @return          false to abort traversael otherwise true
+  */
+  virtual bool apply(GeometryModel *geoModel, const GeometryModel::Node &node, GeometryModel::PrimitiveType nodeType) = 0;
+
+  GeometryModel *m_geometryModel;
+
+}; // GeometryNodeVisitor
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.cpp
new file mode 100755
index 000000000..daad5e93c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.cpp
@@ -0,0 +1,215 @@
+/**
+  * @RDE_HEADER@
+  * PixelTextBoxData as Addon to GeometryModel
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2023-04-27
+  */
+
+#include "geometry_pixelTextBox.h"
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonArray>
+
+#include <QDebug>
+
+namespace SituationMap
+{
+
+PixelTextBoxData::PixelTextBoxData(const QString &htmlText, const QColor &backgroundColor)
+  : m_htmlText(htmlText), m_backgroundColor(backgroundColor)
+{
+}
+
+void PixelTextBoxData::reset()
+{
+  m_htmlText.clear();
+  m_backgroundColor = QColor();
+  m_position = QPoint();
+  m_size = QSize();
+}
+
+bool PixelTextBoxData::isEmpty() const
+{
+  return m_htmlText.isEmpty();
+}
+
+QString PixelTextBoxData::toDebugString() const
+{
+  QJsonDocument jDoc(toJson());
+  return QString::fromStdString(jDoc.toJson(QJsonDocument::JsonFormat::Compact).toStdString());
+}
+
+bool PixelTextBoxData::operator==(const PixelTextBoxData &o) const
+{
+  return m_htmlText == o.m_htmlText &&
+      m_backgroundColor == o.m_backgroundColor &&
+      m_position == o.m_position &&
+      m_size == o.m_size;
+}
+
+
+QJsonObject PixelTextBoxData::toJson() const
+{
+  QJsonObject obj;
+  obj[QStringLiteral("text")]              = m_htmlText;
+  obj[QStringLiteral("backgroundColor")]   = m_backgroundColor.name();
+
+  obj[QStringLiteral("position")]          = QJsonObject({{QStringLiteral("x"), m_position.x()},
+                                                          {QStringLiteral("y"), m_position.y()},
+                                                         });
+
+  obj[QStringLiteral("size")]              = QJsonObject({{QStringLiteral("width"), m_size.width()},
+                                                          {QStringLiteral("height"), m_size.height()},
+                                                         });
+  return obj;
+}
+
+
+bool get(const QJsonObject &obj, const QString &key, int &val)
+{
+  const auto jVal = obj[key];
+  if (!jVal.isDouble())
+  {
+    qCritical() << " isDouble failed";
+  }
+  val = jVal.toInt();
+  return true;
+}
+
+
+PixelTextBoxData PixelTextBoxData::fromJson(const QJsonValue &json)
+{
+  if (json.isUndefined())
+    return {};
+  if (!json.isObject())
+    return {};
+
+  PixelTextBoxData ret;
+
+  // text
+  ret.m_htmlText = json[QStringLiteral("text")].toString();
+
+  // backgroundColor
+  QString temp = json[QStringLiteral("backgroundColor")].toString();
+  ret.m_backgroundColor.setNamedColor(temp);
+
+  // position:
+  {
+    const auto jVal = json[QStringLiteral("position")];
+    get(jVal.toObject(), QStringLiteral("x"), ret.m_position.rx());
+    get(jVal.toObject(), QStringLiteral("y"), ret.m_position.ry());
+  }
+
+  // size:
+  {
+    const auto jVal = json[QStringLiteral("size")];
+    get(jVal.toObject(), QStringLiteral("width"), ret.m_size.rwidth());
+    get(jVal.toObject(), QStringLiteral("height"), ret.m_size.rheight());
+  }
+
+  return ret;
+}
+
+QString PixelTextBoxData::toJsonStr(QJsonDocument::JsonFormat format) const
+{
+  QJsonObject obj = toJson();
+  QJsonDocument jDoc(obj);
+  return QString::fromStdString(jDoc.toJson(format).toStdString());
+}
+
+PixelTextBoxData PixelTextBoxData::fromJsonStr(const QString &jsonStr)
+{
+  if (jsonStr.isEmpty())
+    return {};
+
+  QJsonParseError parseError;
+  QJsonDocument jDoc(QJsonDocument::fromJson(jsonStr.toStdString().c_str(), &parseError));
+
+  if (parseError.error != QJsonParseError::NoError)
+  {
+    qCritical() << " QJsonParseError->errorString: '" << parseError.errorString() << "'"
+                << ", offset: " << parseError.offset;
+    return {};
+  }
+
+  QJsonObject jObj = jDoc.object();
+  if (jObj.isEmpty())
+    return {};
+
+  return PixelTextBoxData::fromJson(jObj);
+}
+
+//
+// Container
+//
+
+QJsonObject PixelTextBoxData::pixelTextBoxContainerToJson(const QVector<PixelTextBoxData> &ptbdCont)
+{
+  QJsonArray arr;
+  for (const PixelTextBoxData &item : qAsConst(ptbdCont))
+    arr.push_back(item.toJson());
+
+  QJsonObject jObj;
+  jObj[QStringLiteral("PixelTextBoxData")] = arr;
+  return jObj;
+}
+QVector<PixelTextBoxData> PixelTextBoxData::pixelTextBoxContainerFromJson(const QJsonValue &json)
+{
+  QVector<PixelTextBoxData> ret;
+
+  if (!json.isObject())
+    return ret;
+
+  const QJsonObject jObj = json.toObject();
+  if (!jObj.contains(QStringLiteral("PixelTextBoxData")))
+    return ret;
+
+  const QJsonArray &array = jObj[QStringLiteral("PixelTextBoxData")].toArray();
+  ret.reserve(array.size());
+  for(int i = 0; i < array.size(); ++i)
+    ret.push_back(PixelTextBoxData::fromJson(array.at(i)));
+  return ret;
+}
+
+QString PixelTextBoxData::pixelTextBoxContainerToJsonStr(const QVector<PixelTextBoxData> &ptbdCont, QJsonDocument::JsonFormat format)
+{
+  QJsonObject obj = pixelTextBoxContainerToJson(ptbdCont);
+  QJsonDocument jDoc(obj);
+  return QString::fromStdString(jDoc.toJson(format).toStdString());
+}
+QVector<PixelTextBoxData> PixelTextBoxData::pixelTextBoxContainerFromJsonStr(const QString &jsonStr)
+{
+  if (jsonStr.isEmpty())
+    return {};
+
+  QJsonParseError parseError;
+  QJsonDocument jDoc(QJsonDocument::fromJson(jsonStr.toStdString().c_str(), &parseError));
+
+  if (parseError.error != QJsonParseError::NoError)
+  {
+    qCritical() << " QJsonParseError->errorString: '" << parseError.errorString() << "'"
+                << ", offset: " << parseError.offset;
+    return {};
+  }
+
+  QJsonObject jObj = jDoc.object();
+  if (jObj.isEmpty())
+    return {};
+
+  return PixelTextBoxData::pixelTextBoxContainerFromJson(jObj);
+}
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+GEOMETRYMODEL_EXPORT std::ostream &operator<<(std::ostream &stream, const PixelTextBoxData &value)
+{
+  stream << value.toDebugString().toStdString().c_str();
+  return stream;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.h
new file mode 100755
index 000000000..897c74060
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GeometryModel/geometry_pixelTextBox.h
@@ -0,0 +1,70 @@
+/**
+  * @RDE_HEADER@
+  * PixelTextBoxData as Addon to GeometryModel
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2023-04-27
+  */
+
+#pragma once
+
+#include <ostream>
+#include <QString>
+#include <QColor>
+#include <QPoint>
+#include <QSize>
+#include <QJsonObject>
+#include <QJsonDocument>
+
+#include "geometry_model_export.h"
+
+namespace SituationMap
+{
+
+class GEOMETRYMODEL_EXPORT PixelTextBoxData
+{
+public:
+  PixelTextBoxData() = default;
+  explicit PixelTextBoxData(const QString &htmlText, const QColor &backgroundColor);
+
+  void reset();
+  bool isEmpty() const;
+
+  QString toDebugString() const;
+
+  QString m_htmlText;
+  QColor  m_backgroundColor;
+  QPoint  m_position;
+  QSize   m_size;
+
+  // operator
+  bool operator==(const PixelTextBoxData &o) const;
+
+
+  // Json:
+  QJsonObject toJson() const;
+  static PixelTextBoxData fromJson(const QJsonValue &json);
+
+  QString toJsonStr(QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented) const;
+  static PixelTextBoxData fromJsonStr(const QString &jsonStr);
+
+  static QJsonObject pixelTextBoxContainerToJson(const QVector<PixelTextBoxData> &ptbdCont);
+  static QVector<PixelTextBoxData> pixelTextBoxContainerFromJson(const QJsonValue &json);
+
+  static QString pixelTextBoxContainerToJsonStr(const QVector<PixelTextBoxData> &ptbdCont, QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented);
+  static QVector<PixelTextBoxData> pixelTextBoxContainerFromJsonStr(const QString &jsonStr);
+
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+GEOMETRYMODEL_EXPORT std::ostream &operator<< (std::ostream   &stream,
+                                               const PixelTextBoxData &value);
+
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp
new file mode 100755
index 000000000..7ab353305
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp
@@ -0,0 +1,564 @@
+/**
+  * @RDE_HEADER@
+  * AbstractGraphicalObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GeoView.h>
+#include <Graphic.h>
+#include <GraphicsOverlay.h>
+#include <Multipart.h>
+
+
+// Qt
+#include <QDebug>
+#include <QSharedPointer>
+#include <QApplication>
+#include <QThread>
+#include <QObject>
+#include <AttributeListModel.h>
+#include <GraphicListModel.h>
+#include <ImmutablePartCollection.h>
+#include <SpatialReference.h>
+#include <ImmutablePart.h>
+#include <SymbolTypes.h>
+#include <Geometry.h>
+
+
+namespace SituationMap
+{
+
+AbstractGraphicalObject::AbstractGraphicalObject(const Esri::ArcGISRuntime::GeoView     *geoView
+                                                 , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                 , const QString                        &debugInfo
+                                                 , const UniqueMapId                    &uniqueMapId)
+  : m_geoView(geoView)
+  , m_graphicsLayer(graphicsLayer)
+  , m_uniqueMapId(uniqueMapId)
+  , m_debugInfo(debugInfo)
+  , m_logger(getLogger("AbstractGraphicalObject"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'";
+
+  m_pickable = (m_uniqueMapId != INVALID_MAP_ID);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+AbstractGraphicalObject::~AbstractGraphicalObject()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << ", m_graphicsLayer-overlayId=" << (m_graphicsLayer ? m_graphicsLayer->overlayId() : QString(QStringLiteral("unknown")));
+
+#if ACRGIS_VERSION >= 0x640F00 // 100.15.0
+  // removeOne ist helpful to let ModuleTest succeed: 'situationMapModuleTest checkOverlayHandler3 none'
+  if (m_graphic && m_graphicsLayer && m_graphicsLayer->graphics())
+     m_graphicsLayer->graphics()->removeOne(m_graphic);
+  delete m_graphic;
+  m_graphic = nullptr;
+#else
+
+/*
+  // cleanup
+  // to make sure, the the graphic is removed from internal container BEFORE
+  // graphic is deleted, follow the documentation: use Layer::removeGraphic
+  // (instead 'delete m_graphic')
+  if (m_graphic && m_graphicsLayer && m_graphicsLayer->graphics())
+    m_graphicsLayer->graphics()->removeOne(m_graphic);
+
+  if (m_graphic)
+  {
+    delete m_graphic;
+    m_graphic = nullptr;
+  }
+*/
+
+  // Race condition between removeOne() and delete m_graphic :
+  // BUG-000116867 is for the deadlock
+  // BUG-000117464 is for the crash
+  // Use following workaround until ESRI will release the fix (with 100.5!?)
+  if (m_graphic && m_graphicsLayer && m_graphicsLayer->graphics())
+  {
+    const int idx = m_graphicsLayer->graphics()->indexOf(m_graphic);
+
+    if (idx < 0)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " indexOf failed, debugInfo='" << m_debugInfo << "'";
+
+    auto graphicCopy = m_graphic;
+
+    QObject::connect (m_graphicsLayer->graphics(), &Esri::ArcGISRuntime::GraphicListModel::itemRemoved,
+                      m_graphic, [idx, graphicCopy](int index)
+    {
+      if (idx == index)
+        delete graphicCopy;
+    });
+    m_graphicsLayer->graphics()->removeOne(m_graphic);
+  }
+  // : Race condition between removeOne() and delete m_graphic
+
+  // m_esriSimpleLineSymbol AND m_esriSimpleFillSymbol will be destroyed m_graphic
+
+#endif //  ACRGIS_VERSION >= 0x640F00
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+Esri::ArcGISRuntime::Graphic *AbstractGraphicalObject::graphic()
+{
+  return m_graphic;
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *AbstractGraphicalObject::graphicsLayer()
+{
+  return m_graphicsLayer;
+}
+
+Esri::ArcGISRuntime::Geometry AbstractGraphicalObject::getGraphicGeometry() const
+{
+  if (! m_graphic)
+    return Esri::ArcGISRuntime::Geometry();
+  return m_graphic->geometry();
+}
+
+bool AbstractGraphicalObject::updateView()
+{
+  if (!changed())
+    return true;
+
+  bool success = updateViewImpl();
+  resetChanged();
+  return success;
+}
+
+
+
+QString AbstractGraphicalObject::debugInfo() const
+{
+  return m_debugInfo;
+}
+void AbstractGraphicalObject::setDebugInfo(const QString &debugInfo)
+{
+  m_debugInfo = debugInfo;
+}
+
+int AbstractGraphicalObject::drawOrder() const
+{
+  return m_drawOrder.value();
+}
+void AbstractGraphicalObject::setDrawOrder(int drawOrder)
+{
+  m_drawOrder = drawOrder;
+  //  if (m_graphic)
+  //    m_graphic->setDrawOrder(m_drawOrder.value());
+}
+
+
+QString AbstractGraphicalObject::toString() const
+{
+  QString str;
+
+  if (!m_debugInfo.isEmpty())
+    str.append(QStringLiteral("debugInfo=%1").arg(m_debugInfo));
+  if (m_graphicsLayer)
+    str.append(QStringLiteral(" layer='%1'").arg(m_graphicsLayer->objectName()));
+
+  str.append(QStringLiteral(" m_drawOrder='%1'").arg(m_drawOrder.value()));
+
+  if (m_graphic)
+    str.append(QStringLiteral(" zIndex='%1'").arg(m_graphic->zIndex()));
+
+  str.append(QStringLiteral(" visibility='%1'").arg(m_visibility.value()));
+  str.append(QStringLiteral(" selected='%1'").arg(m_selected.value()));
+
+  str.append(QStringLiteral(" scale='%1'").arg(m_scale.value()));
+  str.append(QStringLiteral(" positions.count='%1'").arg(m_positions.value().count()));
+
+  return str;
+}
+
+UniqueMapId AbstractGraphicalObject::uniqueMapId() const
+{
+  return m_uniqueMapId;
+}
+
+void AbstractGraphicalObject::setUniqueMapId(UniqueMapId uniqueId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " uniqueMapId=" << uniqueId;
+
+  m_uniqueMapId = uniqueId;
+
+  // use attribute to store application obj id (SimWorld) at graphic
+  if (m_graphic)
+  {
+    // use attributeModel to store application obj id (SimWorld) at graphic
+    Esri::ArcGISRuntime::AttributeListModel *attListModel = m_graphic->attributes();
+    if (attListModel)
+      attListModel->insertAttribute(QLatin1String(SituationMap::UniqueMapIdAttribute), m_uniqueMapId);
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION <<  " no AttributeListModel, debugInfo='" << m_debugInfo << "'"
+                          << " uniqueMapId=" << m_uniqueMapId;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      << " uniqueMapId=" << uniqueId;
+}
+
+Point3D AbstractGraphicalObject::origin() const
+{
+  return m_positions.value().value(0); // value => if index is out of range -> default object
+}
+void AbstractGraphicalObject::setOrigin(const Point3D &origin)
+{
+  //  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+  //                      << " origin=" << origin;
+
+  if (m_positions.value().isEmpty())
+    m_positions.refValue().append(origin);
+  else
+  {
+    // https://stackoverflow.com/a/1573715/2352507
+    // Any comparison(except with "!=") with NaN returns false.
+    // NaN != NaN -> true!!!
+    if (m_positions.value().value(0) != origin)        // NaN != NaN -> true!!!
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " value(0) = " << m_positions.value().value(0) << " origin = " << origin;
+      m_positions.refValue().clear();
+      m_positions.refValue().append(origin);
+    }
+  }
+
+  //  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+  //                      << " origin=" << origin
+  //                      << " changed=" << m_positions.changed()
+  //                      << " SIZE=" << m_positions.value().size();
+}
+
+void AbstractGraphicalObject::setOrigin(const QPointF &origin)
+{
+  setOrigin(Point3D(origin.x(), origin.y(), .0));
+}
+
+PositionCont AbstractGraphicalObject::positions() const
+{
+  return m_positions.value();
+}
+void AbstractGraphicalObject::setPositions(const PositionCont &posCont)
+{
+  m_positions = posCont;
+
+  //  TRACE_LOG(m_logger) << LOGFUNCTION <<  " debugInfo='" << m_debugInfo << "'"
+  //                      <<  " changed=" << m_positions.changed();
+}
+
+
+bool AbstractGraphicalObject::isSinglePoint() const
+{
+  return m_positions.value().count() == 1;
+}
+bool AbstractGraphicalObject::isMultiPoint() const
+{
+  return m_positions.value().count() > 1;
+}
+bool AbstractGraphicalObject::isArea() const
+{
+  return m_positions.value().count() > 2;
+}
+
+LineStyle AbstractGraphicalObject::lineStyle() const
+{
+  return m_lineStyle.value();
+}
+LineStyle &AbstractGraphicalObject::rLineStyle()
+{
+  return m_lineStyle.refValue();
+}
+void AbstractGraphicalObject::setLineStyle(const LineStyle &lineStyle)
+{
+  m_lineStyle = lineStyle;
+}
+
+FillStyle AbstractGraphicalObject::fillStyle() const
+{
+  return m_fillStyle.value();
+}
+FillStyle &AbstractGraphicalObject::rFillStyle()
+{
+  return m_fillStyle.refValue();
+}
+void AbstractGraphicalObject::setFillStyle(const FillStyle &fillStyle)
+{
+  m_fillStyle = fillStyle;
+}
+
+
+bool AbstractGraphicalObject::visibility() const
+{
+  return m_visibility.value();
+}
+void AbstractGraphicalObject::setVisibility(bool visibility)
+{
+  m_visibility = visibility;
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " debugInfo='" << m_debugInfo << "'"
+                      <<  " visibility=" << m_visibility;
+}
+
+bool AbstractGraphicalObject::selected() const
+{
+  return m_selected.value();
+}
+void AbstractGraphicalObject::setSelected(bool selected)
+{
+  m_selected = selected;
+}
+
+
+bool AbstractGraphicalObject::pickable() const
+{
+  return m_pickable.value();
+}
+void AbstractGraphicalObject::setPickable(bool pickable)
+{
+  // allow pickable only if m_uniqueMapId is valid:
+  m_pickable = pickable && (m_uniqueMapId != INVALID_MAP_ID);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " debugInfo='" << m_debugInfo << "'"
+                      << " pickable=" << m_pickable;
+}
+
+
+float AbstractGraphicalObject::scale() const
+{
+  return m_scale.value();
+}
+void AbstractGraphicalObject::setScale(float scale)
+{
+  m_scale = scale;
+}
+
+
+bool AbstractGraphicalObject::addUpdateGraphic()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " updateGraphic";
+
+  bool successGraphic = true;
+
+  if (! m_graphic)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " no m_graphic -> return true";
+    return true;
+  }
+
+  // append just once :-)
+  if (! m_graphicsLayer->graphics()->contains(m_graphic))
+  {
+    m_graphicsLayer->graphics()->append(m_graphic);
+    successGraphic = m_graphicsLayer->graphics()->contains(m_graphic);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                      << " successGraphic=" << successGraphic;
+  return successGraphic;
+}
+
+
+bool AbstractGraphicalObject::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " uniqueMapId =" << m_uniqueMapId
+                      << " origin =" << this->origin()
+                      << " visibility=" << m_visibility;
+  bool success = true;
+
+  // some checks:
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " no graphicsLayer";
+    return false;
+  }
+
+  if (!m_graphic)
+  {
+    m_graphic = new Esri::ArcGISRuntime::Graphic();
+    m_graphic->setObjectName(m_debugInfo);
+    m_graphic->setZIndex(m_drawOrder.value());
+
+    // use attributeModel to store application obj id (SimWorld) at graphic
+    Esri::ArcGISRuntime::AttributeListModel *attLisModel = m_graphic->attributes();
+    if (attLisModel)
+      attLisModel->insertAttribute(QLatin1String(SituationMap::UniqueMapIdAttribute), m_uniqueMapId);
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION <<  " no AttributeListModel, debugInfo='" << m_debugInfo << "'"
+                          << " uniqueMapId=" << m_uniqueMapId;
+    }
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      << " success=" << success;
+  return success;
+}
+
+
+bool AbstractGraphicalObject::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " uniqueMapId=" << m_uniqueMapId
+                      << " origin=" << this->origin()
+                      << " visibility=" << m_visibility
+                      << " selected=" << m_selected
+                      << " drawOrder=" << m_drawOrder
+                      << " pickable=" << m_pickable
+                      << " pickableCHG=" << m_pickable.changed();
+
+  if (QApplication::instance()->thread()->currentThreadId() != QThread::currentThreadId())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION <<  " wrong Thread, debugInfo='" << m_debugInfo << "'"
+                        << " uniqueMapId=" << m_uniqueMapId;
+    abort();
+  }
+
+
+  if (m_graphic)
+  {
+    m_graphic->setZIndex(m_drawOrder.value());
+    m_graphic->setVisible(m_visibility.value());
+    m_graphic->setSelected(m_selected.value());
+
+    // Picking:
+    if (m_pickable.changed())
+    {
+      // use attributeModel to store m_pickable at graphic
+      Esri::ArcGISRuntime::AttributeListModel *attLisModel = m_graphic->attributes();
+      if (attLisModel)
+        attLisModel->insertAttribute(QLatin1String(SituationMap::IsPickableAttribute), m_pickable.value());
+      else
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION <<  " no AttributeListModel, debugInfo='" << m_debugInfo << "'"
+                            << " uniqueMapId=" << m_uniqueMapId;
+      }
+    }
+    m_pickable.reset();
+
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      << " uniqueMapId =" << m_uniqueMapId;
+  return true;
+}
+
+bool AbstractGraphicalObject::assignLineStyleToGraphic()
+{
+  if (!m_graphic)
+    return false;
+
+  const LineStyle &ls = m_lineStyle.value();
+
+  if (!m_esriSimpleLineSymbol)
+  {
+    m_esriSimpleLineSymbol =
+        new Esri::ArcGISRuntime::SimpleLineSymbol(convert(ls.linePattern()), ls.lineColor(), ls.lineWidth() * m_scale.value(), m_graphic);
+  } else {
+    m_esriSimpleLineSymbol->setStyle(convert(ls.linePattern()));
+    m_esriSimpleLineSymbol->setColor(ls.lineColor());
+    m_esriSimpleLineSymbol->setWidth(ls.lineWidth() * m_scale.value());
+  }
+  m_graphic->setSymbol(m_esriSimpleLineSymbol.data());
+
+  return true;
+}
+
+bool AbstractGraphicalObject::assignFillStyleToGraphic()
+{
+  if (!m_graphic)
+    return false;
+
+  const LineStyle &ls = m_lineStyle.value();
+  const FillStyle &fs = m_fillStyle.value();
+
+  // 1. the Line
+  if (!m_esriSimpleLineSymbol)
+  {
+    m_esriSimpleLineSymbol =
+        new Esri::ArcGISRuntime::SimpleLineSymbol(convert(ls.linePattern()), ls.lineColor(), ls.lineWidth() * m_scale.value(), m_graphic);
+  } else {
+    m_esriSimpleLineSymbol->setStyle(convert(ls.linePattern()));
+    m_esriSimpleLineSymbol->setColor(ls.lineColor());
+    m_esriSimpleLineSymbol->setWidth(ls.lineWidth() * m_scale.value());
+  }
+
+  // 1. the Fill
+  if (!m_esriSimpleFillSymbol)
+  {
+    m_esriSimpleFillSymbol =
+        new Esri::ArcGISRuntime::SimpleFillSymbol(convert(fs.fillPattern()), fs.fillColor(), m_esriSimpleLineSymbol, m_graphic);
+  } else {
+    m_esriSimpleFillSymbol->setStyle(convert(fs.fillPattern()));
+    m_esriSimpleFillSymbol->setColor(fs.fillColor());
+    m_esriSimpleFillSymbol->setOutline(m_esriSimpleLineSymbol);
+  }
+  m_graphic->setSymbol(m_esriSimpleFillSymbol.data());
+
+  return true;
+}
+
+Esri::ArcGISRuntime::SimpleLineSymbolStyle AbstractGraphicalObject::convert(const LinePattern linePattern)
+{
+  switch (linePattern)
+  {
+  case LinePattern::Dash:       return Esri::ArcGISRuntime::SimpleLineSymbolStyle::Dash;
+  case LinePattern::DashDot:    return Esri::ArcGISRuntime::SimpleLineSymbolStyle::DashDot;
+  case LinePattern::DashDotDot: return Esri::ArcGISRuntime::SimpleLineSymbolStyle::DashDotDot;
+  case LinePattern::Dot:        return Esri::ArcGISRuntime::SimpleLineSymbolStyle::Dot;
+  case LinePattern::Null:       return Esri::ArcGISRuntime::SimpleLineSymbolStyle::Null;
+  case LinePattern::Solid:      return Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid;
+  } // switch
+
+  return Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid;
+}
+
+
+Esri::ArcGISRuntime::SimpleFillSymbolStyle AbstractGraphicalObject::convert(const FillPattern fillPattern)
+{
+  switch (fillPattern)
+  {
+  case FillPattern::BackwardDiagonal: return Esri::ArcGISRuntime::SimpleFillSymbolStyle::BackwardDiagonal;
+  case FillPattern::Cross:            return Esri::ArcGISRuntime::SimpleFillSymbolStyle::Cross;
+  case FillPattern::DiagonalCross:    return Esri::ArcGISRuntime::SimpleFillSymbolStyle::DiagonalCross;
+  case FillPattern::ForwardDiagonal:  return Esri::ArcGISRuntime::SimpleFillSymbolStyle::ForwardDiagonal;
+  case FillPattern::Horizontal:       return Esri::ArcGISRuntime::SimpleFillSymbolStyle::Horizontal;
+  case FillPattern::Null:             return Esri::ArcGISRuntime::SimpleFillSymbolStyle::Null;
+  case FillPattern::Solid:            return Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid;
+  case FillPattern::Vertical:         return Esri::ArcGISRuntime::SimpleFillSymbolStyle::Vertical;
+  } // switch
+
+  return Esri::ArcGISRuntime::SimpleFillSymbolStyle::BackwardDiagonal;
+}
+
+int AbstractGraphicalObject::countOfPolygonFirstPart(const Esri::ArcGISRuntime::Geometry &polylinePolygon)
+{
+  const Esri::ArcGISRuntime::Multipart multipart(polylinePolygon);
+  if (multipart.isEmpty() ||  multipart.parts().isEmpty())
+    return -1;
+
+  return multipart.parts().part(0).pointCount();
+}
+
+
+const Esri::ArcGISRuntime::SpatialReference AbstractGraphicalObject::spatialReference() const
+{
+  return m_geoView->spatialReference();
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.h
new file mode 100755
index 000000000..aa52abc7c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.h
@@ -0,0 +1,214 @@
+/**
+  * @RDE_HEADER@
+  * AbstractGraphicalObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include <Map/line_style.h>
+#include <Map/fill_style.h>
+#include <Common/simple_value.h>
+
+#include <Common/situation_map_logging.h>
+
+// ESRI
+#include <SimpleLineSymbol.h>
+#include <SimpleFillSymbol.h>
+
+// Qt
+#include <QPointer>
+#include <Geometry.h>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class GeoView;
+class Graphic;
+class GraphicsOverlay;
+class Geometry;
+class Multipart;
+class SpatialReference;
+}
+}
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//forward
+class GraphicalObjectText;
+
+
+class SITUATIONMAP_EXPORT AbstractGraphicalObject
+{
+
+public:
+  AbstractGraphicalObject(const Esri::ArcGISRuntime::GeoView     *geoView
+                          , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                          , const QString                        &debugInfo
+                          , const UniqueMapId                    &uniqueMapId);
+
+  virtual ~AbstractGraphicalObject();
+
+  AbstractGraphicalObject(const AbstractGraphicalObject &other)      = delete;
+  AbstractGraphicalObject &operator=(AbstractGraphicalObject &other) = delete;
+
+  virtual Esri::ArcGISRuntime::Graphic *graphic();
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer();
+
+  virtual QString toString() const;
+
+  virtual UniqueMapId uniqueMapId() const;
+  virtual void setUniqueMapId(UniqueMapId uniqueId);
+
+  virtual QString debugInfo() const;
+  virtual void setDebugInfo(const QString &debugInfo);
+
+  virtual int drawOrder() const;
+  virtual void setDrawOrder(int drawOrder);
+
+  // Data access:
+
+  // for SinglePoint:
+  virtual Point3D origin() const;
+  virtual void setOrigin(const Point3D &origin);
+  virtual void setOrigin(const QPointF &origin);  // ToDO accept this??
+
+  // for MultiPoint:
+  virtual PositionCont positions() const;
+  virtual void setPositions(const PositionCont &posCont);
+
+  virtual bool isSinglePoint() const;
+  virtual bool isMultiPoint() const;
+  virtual bool isArea() const;
+
+  virtual LineStyle lineStyle() const;
+  virtual LineStyle &rLineStyle();
+  /**
+   * @brief setLineStyle (Font-)size is limited to 500.
+   * (High values can lead to coredump with 'SymbolDrawHelper::create_line_image FAILED, SkBitmap is NULL or empty')
+   * @param lineStyle to set.
+   */
+  virtual void setLineStyle(const LineStyle &lineStyle);
+
+  virtual FillStyle fillStyle() const;
+  virtual FillStyle &rFillStyle();
+  virtual void setFillStyle(const FillStyle &fillStyle);
+
+  // Scale :
+  virtual float scale() const;
+  virtual void setScale(float scale);
+  // : Scale
+
+
+  // Visibility :
+  virtual bool visibility() const;
+  virtual void setVisibility(bool visibility);
+  // : Visibility
+
+  // Selection, Picking :
+  bool selected() const;
+  void setSelected(bool selected);
+
+  bool pickable() const;
+  /**
+   * @brief setPickable The method allows pickable=true only if uniqueMapIdis valid.
+   * @param pickable new value.
+   */
+  void setPickable(bool pickable);
+  // : Selection, Picking
+
+
+  virtual Esri::ArcGISRuntime::Geometry getGraphicGeometry() const;
+
+  bool updateView();
+
+  bool addUpdateGraphic();
+
+  static Esri::ArcGISRuntime::SimpleLineSymbolStyle convert(const LinePattern linePattern);
+  static Esri::ArcGISRuntime::SimpleFillSymbolStyle convert(const FillPattern fillPattern);
+
+  bool assignLineStyleToGraphic();
+  bool assignFillStyleToGraphic();
+
+
+  static int countOfPolygonFirstPart(const Esri::ArcGISRuntime::Geometry &polylinePolygon);
+
+
+protected:
+  // Internal/Admin
+  const Esri::ArcGISRuntime::SpatialReference spatialReference() const;
+
+  virtual bool changed()
+  {
+    return m_drawOrder.changed()
+           || m_positions.changed()
+           || m_visibility.changed()
+           || m_selected.changed()
+           || m_pickable.changed()
+           || m_scale.changed()
+           || m_lineStyle.changed()
+           || m_fillStyle.changed();
+  }
+
+  virtual bool updateViewImpl() = 0;
+
+  virtual void resetChanged()
+  {
+    m_drawOrder.reset();
+    m_positions.reset();
+    m_visibility.reset();
+    m_selected.reset();
+    m_pickable.reset();
+    m_scale.reset();
+    m_lineStyle.reset();
+    m_fillStyle.reset();
+  }
+
+
+  virtual bool create() = 0;
+
+
+  const Esri::ArcGISRuntime::GeoView           *m_geoView              = nullptr;
+  Esri::ArcGISRuntime::GraphicsOverlay         *m_graphicsLayer        = nullptr;
+  Esri::ArcGISRuntime::Graphic                 *m_graphic              = nullptr;
+  SimpleValue<int>                              m_drawOrder            = 0;
+
+  // Data
+  UniqueMapId                                   m_uniqueMapId;
+
+
+  QString                                       m_debugInfo;      ///< for debugging
+
+  SimpleValue<PositionCont>                     m_positions;
+
+  SimpleValue<bool>                             m_visibility           = true;
+
+  SimpleValue<bool>                             m_selected             = false;
+  SimpleValue<bool>                             m_pickable             = true;
+
+  SimpleValue<float>                            m_scale                = 1.0;
+
+  SimpleValue<LineStyle>                        m_lineStyle;
+  SimpleValue<FillStyle>                        m_fillStyle;
+  QPointer<Esri::ArcGISRuntime::SimpleLineSymbol> m_esriSimpleLineSymbol = nullptr;
+  QPointer<Esri::ArcGISRuntime::SimpleFillSymbol> m_esriSimpleFillSymbol = nullptr;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.cpp
new file mode 100755
index 000000000..9b60d8462
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.cpp
@@ -0,0 +1,96 @@
+/**
+  * @RDE_HEADER@
+  * EllipseParameters
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "ellipse_parameters.h"
+
+
+// ESRI
+
+
+// Qt
+#include <QString>
+
+
+namespace SituationMap
+{
+
+float EllipseParameters::lengthX() const
+{
+  return m_lengthX;
+}
+
+void EllipseParameters::setLengthX(float lengthX)
+{
+  m_lengthX = lengthX;
+}
+float EllipseParameters::lengthY() const
+{
+  return m_lengthY;
+}
+
+void EllipseParameters::setLengthY(float lengthY)
+{
+  m_lengthY = lengthY;
+}
+float EllipseParameters::directionDegree() const
+{
+  return m_directionDegree;
+}
+
+void EllipseParameters::setDirectionDegree(float directionDegree)
+{
+  m_directionDegree = directionDegree;
+}
+int EllipseParameters::maxSegmentLength() const
+{
+  return m_maxSegmentLength;
+}
+
+void EllipseParameters::setMaxSegmentLength(int value)
+{
+  m_maxSegmentLength = value;
+}
+
+int EllipseParameters::maxPointCount() const
+{
+  return m_maxPointCount;
+}
+
+void EllipseParameters::setMaxPointCount(int maxPointCount)
+{
+  m_maxPointCount = maxPointCount;
+}
+
+
+bool EllipseParameters::isValid() const
+{
+  return ((m_lengthX > 0) && (m_lengthY > 0)) ;
+}
+
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<< (std::ostream   &stream,
+                          const EllipseParameters &value)
+{
+  QString str;
+  str.append(QStringLiteral(" lengthX=%1").arg(value.lengthX()));
+  str.append(QStringLiteral(" lengthY=%1").arg(value.lengthY()));
+  str.append(QStringLiteral(" directionDegree=%1").arg(value.directionDegree()));
+  str.append(QStringLiteral(" maxSegmentLength=%1").arg(value.maxSegmentLength()));
+
+  stream << str.toStdString();
+  return stream;
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.h
new file mode 100755
index 000000000..a8609a3a0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/ellipse_parameters.h
@@ -0,0 +1,95 @@
+/**
+  * @RDE_HEADER@
+  * EllipseParameters
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <situation_map_export.h>
+
+#include <ostream>
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+
+
+//----------------------------------------------------------------------------
+class SITUATIONMAP_EXPORT EllipseParameters
+{
+public:
+
+  static constexpr unsigned int MAX_POINT_COUNT_DEFAULT = 30;
+
+  EllipseParameters() = default;
+
+  float lengthX() const;
+  void setLengthX(float lengthX);
+
+  float lengthY() const;
+  void setLengthY(float lengthY);
+
+  float directionDegree() const;
+  void setDirectionDegree(float directionDegree);
+
+  int maxSegmentLength() const;
+  void setMaxSegmentLength(int value);
+
+  int maxPointCount() const;
+  void setMaxPointCount(int maxPointCount);
+
+  bool isValid() const;
+
+  /**
+   * @brief operator== Compare two objects
+   * @param other to be compared with
+   * @return true if identical, otherwise false.
+   */
+  bool operator==(const EllipseParameters &other) const
+  {
+    return ((this->m_lengthX           == other.m_lengthX) &&
+            (this->m_lengthY           == other.m_lengthY) &&
+            (this->m_directionDegree   == other.m_directionDegree) &&
+            (this->m_maxSegmentLength  == other.m_maxSegmentLength) &&
+            (this->m_maxPointCount     == other.m_maxPointCount)
+           );
+  }
+
+  /**
+   * @brief operator!= Compare two objects
+   * @param other to be compared with
+   * @return true if NOT identical, otherwise false.
+   */
+  bool operator!=(const EllipseParameters &other) const
+  {
+    return !(*this == other);
+  }
+
+
+
+private:
+  float                                         m_lengthX           = 0;
+  float                                         m_lengthY           = 0;
+  float                                         m_directionDegree   = 0;
+  int                                           m_maxSegmentLength  = 10; // meter
+  int                                           m_maxPointCount     = MAX_POINT_COUNT_DEFAULT;
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream   &stream,
+                                              const EllipseParameters &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp
new file mode 100755
index 000000000..2e1356611
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp
@@ -0,0 +1,194 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectAttributes
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_attributes.h"
+#include <MapImpl/map_impl.h>
+#include <Map/situation_map_utils.h> // operator<<
+#include <Common/simple_value.h>
+
+
+// ESRI
+#include <Map.h>
+#include <GraphicsOverlay.h>
+#include <Geometry.h>
+#include <Graphic.h>
+#include <Point.h>
+#include <AttributeListModel.h>
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+class GraphicalObjectAttributes::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  MapImpl                                    *m_mapImpl                 = nullptr;
+  QString                                     m_logicalLayerName;
+
+  // OWN data:
+  SimpleValue<QVariantMap>                    m_attributes;
+
+}; // class GraphicalObjectAttributes::Private
+//-----------------------------------------------------------------------------
+
+
+
+GraphicalObjectAttributes::GraphicalObjectAttributes(MapImpl           *mapImpl,
+                                                     Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                                     const QString     &debugInfo,
+                                                     const UniqueMapId &uniqueMapId)
+  : BaseClass(mapImpl->getEsriGeoView(), graphicsLayer, debugInfo, uniqueMapId),
+    m_logger(getLogger("GraphicalObjectAttributes")),
+    d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectAttributes::~GraphicalObjectAttributes()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+bool GraphicalObjectAttributes::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_visibility = " << m_visibility;
+
+  bool success = BaseClass::create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+  bool successGraphic = addUpdateGraphic(); // CHECK
+  if (!successGraphic)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION <<  " addUpdateGraphic failed, debugInfo='" << m_debugInfo << "'" << " uniqueMapId=" << m_uniqueMapId;
+    return false;
+  }
+
+  // real work:
+  // empty
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+  return success;
+}
+
+QVariantMap GraphicalObjectAttributes::attributes() const
+{
+  return d->m_attributes.value();
+}
+
+void GraphicalObjectAttributes::setAttributes(const QVariantMap &attributes)
+{
+  d->m_attributes = attributes;
+}
+
+bool GraphicalObjectAttributes::changed()
+{
+  return BaseClass::changed()
+         || d->m_attributes.changed();
+}
+void GraphicalObjectAttributes::resetChanged()
+{
+  BaseClass::resetChanged();
+  d->m_attributes.reset();
+}
+
+Esri::ArcGISRuntime::Geometry GraphicalObjectAttributes::getGraphicGeometry() const
+{
+  if (m_graphic)          return m_graphic->geometry();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << "Geometry is undefined";
+
+  return Esri::ArcGISRuntime::Geometry();
+} // Esri::ArcGISRuntime::Geometry GraphicalObjectAttributes::getGraphicGeometry() const
+
+
+bool GraphicalObjectAttributes::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " visibility=" << m_visibility
+                      << " selected=" << m_selected
+                      << " origin=" << this->origin()
+                      << " scale=" << m_scale.value();
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  if (!BaseClass::updateViewImpl())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+
+  // real work:
+  if (m_positions.changed())
+  {
+    const PositionCont &posCont = m_positions.value();
+    if (posCont.size() == 1)
+    {
+      const Point3D &origin = this->origin();
+      Esri::ArcGISRuntime::Point originGeometry(origin.x(),
+                                                origin.y(),
+                                                origin.z(),
+                                                spatialReference());
+      m_graphic->setGeometry(originGeometry);
+    }
+  }
+
+  if (d->m_attributes.changed())
+  {
+    QVariantMap rawAttributes = d->m_attributes.value();
+
+    // add basics:
+    rawAttributes[QLatin1String(SituationMap::UniqueMapIdAttribute)] = m_uniqueMapId;
+    rawAttributes[QLatin1String(SituationMap::IsPickableAttribute)]  = m_pickable.value();
+    m_graphic->attributes()->setAttributesMap(rawAttributes);
+
+    if (m_logger.isDebugEnabled())
+      qCritical() << " XXXXX set rawAttributes " << rawAttributes;
+  }
+
+  if (m_graphic)
+  {
+    m_graphic->setZIndex(m_drawOrder.value());
+    m_graphic->setVisible(m_visibility.value());
+    m_graphic->setSelected(m_selected.value());
+  }
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure, debugInfo='" << m_debugInfo << "'";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      << " visibility=" << m_visibility;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.h
new file mode 100755
index 000000000..56d84c23a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.h
@@ -0,0 +1,88 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectAttributes
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class MapImpl;
+
+
+/**
+ * @brief The GraphicalObjectAttributes class
+ */
+class SITUATIONMAP_EXPORT GraphicalObjectAttributes : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+
+  /**
+   * @brief GraphicalObjectAttributes
+   * @param mapImpl map to be used.
+   * @param logicalLayerName logical layer name to be used.
+   * @param debugInfo debugInfo to be used
+   * @param uniqueMapId uniqueMapId to be used. (Optional to fulfill rubberband requirements)
+   */
+  GraphicalObjectAttributes(MapImpl       *mapImpl,
+                            Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                            const QString &debugInfo,
+                            const UniqueMapId &uniqueMapId = INVALID_MAP_ID);
+
+  GraphicalObjectAttributes(const GraphicalObjectAttributes &other)      = delete;
+  GraphicalObjectAttributes &operator=(GraphicalObjectAttributes &other) = delete;
+
+  virtual ~GraphicalObjectAttributes();
+
+
+  QVariantMap attributes() const;
+  void setAttributes(const QVariantMap &attributes);
+
+  Esri::ArcGISRuntime::Geometry getGraphicGeometry() const override;
+
+protected:
+  // Internal/Admin
+  virtual bool create() override;
+
+  bool changed() override;
+  void resetChanged() override;
+
+  bool updateViewImpl() override;
+
+  // logical
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp
new file mode 100755
index 000000000..7f70d7804
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp
@@ -0,0 +1,166 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectCube
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_cube.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <PolygonBuilder.h>
+#include <Geometry.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <AttributeListModel.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+GraphicalObjectCube::GraphicalObjectCube(const Esri::ArcGISRuntime::GeoView           *geoView
+                                         , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                         , const QString                        &debugInfo
+                                         , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectCube"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectCube::~GraphicalObjectCube()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+bool GraphicalObjectCube::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = BaseClass::create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+  }
+
+  // real work:
+  // empty
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      // << " drawOrder = " << m_graphic->drawOrder()
+                      << " success = " << success;
+  return success;
+}
+
+
+bool GraphicalObjectCube::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  // some checks:
+  if (!this->isArea())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  if (!create())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  if (!BaseClass::updateViewImpl())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  // real work:
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'";
+
+
+  // Attribute 'height':
+  QVariantMap attMap = m_graphic->attributes()->attributesMap();
+
+  attMap[QStringLiteral("height")] = QVariant(m_height.value());
+  //
+  // Attribute 'PartyName' is replaced by Attribute 'Extrusion_Color' to be more flexible
+  //
+
+
+  // Attribute 'Extrusion_Color':
+  if (m_extrusionColorName.value().isEmpty())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " m_extrusionColorName is empty";
+    // -> time for the defaultSymbol of the Renderer
+    attMap[QStringLiteral("Extrusion_Color")] = QStringLiteral("DOES_NOT_EXIST");
+  }
+  else
+    attMap[QStringLiteral("Extrusion_Color")] = QVariant(m_extrusionColorName.value());
+
+  m_graphic->attributes()->setAttributesMap(attMap);
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " attributesMap[height]    ='" << attMap[QStringLiteral("height")].toDouble() << "'";
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " attributesMap[Extrusion_Color] ='" << attMap[QStringLiteral("Extrusion_Color")].toString() << "'";
+
+  // geometry:
+  Esri::ArcGISRuntime::PolygonBuilder builder(spatialReference());
+
+  const PositionCont &posCont = m_positions.value();
+  for (const Point3D &pos : posCont)
+  {
+    builder.addPoint(pos.x(), pos.y());
+  }
+
+  if (! builder.isSketchValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " builder -> sketch invalid";
+    return false;
+  }
+  m_graphic->setGeometry(builder.toGeometry());
+
+
+  // add
+  bool successGraphic = addUpdateGraphic();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " drawOrder = " << m_graphic->zIndex();
+  return successGraphic;
+}
+
+
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<<(std::ostream &stream,
+                         const GraphicalObjectCube &value)
+{
+  stream << value.toString();
+  return stream;
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.h
new file mode 100755
index 000000000..15866adb9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.h
@@ -0,0 +1,100 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectCube
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+  * @brief The GraphicalObjectCube class for 3D
+  *
+  */
+class SITUATIONMAP_EXPORT GraphicalObjectCube : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  explicit GraphicalObjectCube(const Esri::ArcGISRuntime::GeoView     *geoView
+                               , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                               , const QString                        &debugInfo
+                               , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectCube();
+
+  double height() const
+  {
+    return m_height.value();
+  }
+  void setHeight(double height)
+  {
+    m_height = height;
+  }
+
+  const QString &extrusionColorName() const
+  {
+    return m_extrusionColorName.value();
+  }
+  void setExtrusionColorName(const QString &extrusionColorName)
+  {
+    m_extrusionColorName = extrusionColorName;
+  }
+
+protected:
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_height.changed()
+           || m_extrusionColorName.changed();
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_height.reset();
+    m_extrusionColorName.reset();
+  }
+
+  bool updateViewImpl() override;
+
+
+  // Data
+  SimpleValue<double>                   m_height;
+  SimpleValue<QString>                  m_extrusionColorName;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream   &stream,
+                          const GraphicalObjectCube &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp
new file mode 100755
index 000000000..486a057ea
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp
@@ -0,0 +1,351 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectEllipse
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_ellipse.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <Polygon.h>
+#include <GeometryEngine.h>
+#include <SimpleLineSymbol.h>
+#include <SimpleFillSymbol.h>
+
+
+// Qt
+#include <QElapsedTimer>
+#include <GeodesicEllipseParameters.h>
+#include <Graphic.h>
+#include <Point.h>
+#include <SpatialReference.h>
+#include <Multipart.h>
+#include <ImmutablePart.h>
+#include <ImmutablePartCollection.h>
+
+
+namespace SituationMap
+{
+
+
+GraphicalObjectEllipse::GraphicalObjectEllipse(const Esri::ArcGISRuntime::GeoView     *geoView
+                                               , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                               , const QString                        &debugInfo
+                                               , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectEllipse"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectEllipse::~GraphicalObjectEllipse()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  delete m_internalParameters;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+bool GraphicalObjectEllipse::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = BaseClass::create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  // real work:
+  // empty
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      // << " drawOrder = " << m_graphic->drawOrder()
+                      << " success = " << success;
+  return success;
+}
+
+
+bool GraphicalObjectEllipse::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  // some checks:
+  if (!this->isSinglePoint())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  if (!create())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  if (!BaseClass::updateViewImpl())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  if (!m_ellipseParameters.value().isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " ellipseParameters not valid";
+    return false;
+  }
+
+
+  // real work:
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                      << " update geometry";
+
+  bool successEllipse = true;
+  if (m_ellipseParameters.changed() || m_positions.changed())
+  {
+    // apply attributes:
+    parameterToInternal();
+
+    Esri::ArcGISRuntime::Polygon ellipse;
+    successEllipse = createEllipse(ellipse);
+    if (successEllipse)
+      m_graphic->setGeometry(ellipse);
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " createEllipse failed";
+      return false;
+    }
+  }
+
+  assignFillStyleToGraphic();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'";
+
+  bool successGraphic = addUpdateGraphic();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " drawOrder = " << m_graphic->zIndex()
+                      << " successEllipse = " << successEllipse
+                      << " successGraphic = " << successGraphic;
+  return successEllipse && successGraphic;
+}
+
+void GraphicalObjectEllipse::parameterToInternal()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  if (!m_internalParameters)
+  {
+    m_internalParameters = new Esri::ArcGISRuntime::GeodesicEllipseParameters();
+    m_internalParameters->setGeometryType(Esri::ArcGISRuntime::GeometryType::Polygon);
+  }
+
+  // TODO !!??: set xy correct, calc maxSegLength...
+
+
+  const EllipseParameters &ellipseParameterRef = m_ellipseParameters.value();
+
+  // 1a, 1b
+  m_internalParameters->setMaxSegmentLength(ellipseParameterRef.maxSegmentLength());
+  m_internalParameters->setMaxPointCount(ellipseParameterRef.maxPointCount());
+
+  // 2
+  const Point3D &origin = this->origin();
+  Esri::ArcGISRuntime::Point mapPoint(origin.x(), origin.y(), origin.z(), spatialReference());  // center of ellipse
+
+  Esri::ArcGISRuntime::Point normalizedPt(
+    Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint));
+  m_internalParameters->setCenter(normalizedPt);
+  //  m_internalParameters->setCenter(mapPoint);
+
+  // 3, 4
+  m_internalParameters->setSemiAxis1Length(ellipseParameterRef.lengthX());
+  m_internalParameters->setSemiAxis2Length(ellipseParameterRef.lengthY());
+
+  // 5
+  m_internalParameters->setAxisDirection(ellipseParameterRef.directionDegree());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+bool GraphicalObjectEllipse::createEllipse(Esri::ArcGISRuntime::Polygon &ellipse)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = createEllipsePolygon(*m_internalParameters, ellipse);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+//                      << " pointCount = " << ellipse.pointCount()
+                      << " dimension = " << (int)ellipse.dimension();
+  return success;
+}
+
+bool GraphicalObjectEllipse::createEllipsePolygon(const Esri::ArcGISRuntime::GeodesicEllipseParameters &ellipseParameters,
+                                                  Esri::ArcGISRuntime::Polygon &polygon)
+{
+  LOGGER_T m_logger = getLogger("GraphicalObjectEllipse");
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QElapsedTimer timer;
+
+  if (m_logger.isInfoEnabled())
+    timer.start();
+
+
+  bool success = false;
+
+  Esri::ArcGISRuntime::Geometry ellipseGeometry =
+    Esri::ArcGISRuntime::GeometryEngine::ellipseGeodesic(ellipseParameters);
+  if (ellipseGeometry.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " There was an error computing the geodesic ellipse. Try a different segment length.";
+  }
+  else
+  {
+    polygon = Esri::ArcGISRuntime::Polygon(ellipseGeometry);
+    success = true;
+  }
+  int count = AbstractGraphicalObject::countOfPolygonFirstPart(polygon);
+  DEBUG_LOG(m_logger) << LOGFUNCTION
+                      << " count=" << count
+                      << " (semiAxis1Length=" << ellipseParameters.semiAxis1Length()
+                      << " , semiAxis2Length=" << ellipseParameters.semiAxis2Length()
+                      << " , maxPointCount=" << ellipseParameters.maxPointCount()
+                      << " , maxSegmentLength=" << ellipseParameters.maxSegmentLength()
+                      << " , dimension = " << (int)polygon.dimension()
+                      << ")";
+
+
+
+  if (m_logger.isDebugEnabled())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " took " << timer.elapsed() << "ms"
+                        << " (semiAxis1Length=" << ellipseParameters.semiAxis1Length()
+                        << " , semiAxis2Length=" << ellipseParameters.semiAxis2Length()
+                        << " , maxPointCount=" << ellipseParameters.maxPointCount()
+                        << " , maxSegmentLength=" << ellipseParameters.maxSegmentLength()
+                        << " , dimension = " << (int)polygon.dimension()
+                        << ")";
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " success = " << success;
+  return success;
+}
+
+bool GraphicalObjectEllipse::createCirclePolygon(const Esri::ArcGISRuntime::Point &originMap,
+                                                 float radius,
+                                                 unsigned int maxPointCount,
+                                                 Esri::ArcGISRuntime::Polygon &polygon)
+{
+  LOGGER_T m_logger = getLogger("GraphicalObjectEllipse");
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " origin=" << originMap.x() << " ; " << originMap.y() << " ; " << originMap.z()
+                      << " radius=" << radius;
+
+  Esri::ArcGISRuntime::GeodesicEllipseParameters ePara;
+  ePara.setGeometryType(Esri::ArcGISRuntime::GeometryType::Polygon);
+
+  // 1
+  ePara.setMaxSegmentLength(10);
+  if (maxPointCount == 0)
+    ePara.setMaxPointCount(EllipseParameters::MAX_POINT_COUNT_DEFAULT);
+  else
+    ePara.setMaxPointCount(maxPointCount);
+
+  // 2
+  const Esri::ArcGISRuntime::Point &mapPoint = originMap;  // center of ellipse
+
+  Esri::ArcGISRuntime::Point normalizedPt(
+    Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint));
+  ePara.setCenter(normalizedPt);
+
+  // 3, 4
+  ePara.setSemiAxis1Length(radius);
+  ePara.setSemiAxis2Length(radius);
+
+  // 5
+  ePara.setAxisDirection(0);
+
+  return createEllipsePolygon(ePara, polygon);
+}
+
+bool GraphicalObjectEllipse::createCirclePolygon(const Esri::ArcGISRuntime::Point &originMap,
+                                                 float radius,
+                                                 unsigned int maxPointCount,
+                                                 PositionCont &posCont)
+{
+  Esri::ArcGISRuntime::Polygon circle;
+  bool success = GraphicalObjectEllipse::createCirclePolygon(originMap,
+                                                             radius,
+                                                             maxPointCount,
+                                                             circle);
+
+  if (success && !circle.isEmpty())
+  {
+    posCont.clear();
+
+    const Esri::ArcGISRuntime::ImmutablePart &immutablePart = circle.parts().part(0);
+    const int size = immutablePart.pointCount();
+
+    for (int i = 0; i < size; ++i)
+    {
+      const Esri::ArcGISRuntime::Point &p = immutablePart.point(i);
+      posCont.append(Point3D(p.x(), p.y(), p.z()));
+    }
+  }
+  return success;
+}
+
+
+
+EllipseParameters GraphicalObjectEllipse::ellipseParameters() const
+{
+  return m_ellipseParameters.value();
+}
+
+EllipseParameters &GraphicalObjectEllipse::rEllipseParameters()
+{
+  return m_ellipseParameters.refValue();
+}
+
+void GraphicalObjectEllipse::setEllipseParameters(const EllipseParameters &ellipseParameters)
+{
+  m_ellipseParameters = ellipseParameters;
+}
+
+
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<<(std::ostream &stream,
+                         const GraphicalObjectEllipse &value)
+{
+  stream << value.toString();
+  return stream;
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.h
new file mode 100755
index 000000000..19b34ccf1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.h
@@ -0,0 +1,121 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectEllipse
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include "ellipse_parameters.h"
+
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Polygon;
+class Point;
+class GeodesicEllipseParameters;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectEllipse : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  GraphicalObjectEllipse(const Esri::ArcGISRuntime::GeoView     *geoView
+                         , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                         , const QString                        &debugInfo
+                         , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectEllipse();
+
+  EllipseParameters ellipseParameters() const;
+  EllipseParameters &rEllipseParameters();
+  void setEllipseParameters(const EllipseParameters &ellipseParameters);
+
+
+  static bool createEllipsePolygon(const Esri::ArcGISRuntime::GeodesicEllipseParameters &ellipseParameters,
+                                   Esri::ArcGISRuntime::Polygon &polygon);
+
+  static bool createCirclePolygon(const Esri::ArcGISRuntime::Point &originMap,
+                                  float radius,
+                                  unsigned int maxPointCount,
+                                  Esri::ArcGISRuntime::Polygon &polygon);
+
+  static bool createCirclePolygon(const Esri::ArcGISRuntime::Point &originMap,
+                                  float radius,
+                                  unsigned int maxPointCount,
+                                  PositionCont &posCont);
+
+
+protected:
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_ellipseParameters.changed();
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_ellipseParameters.reset();
+  }
+
+
+  bool updateViewImpl() override;
+
+
+  // Data
+  Esri::ArcGISRuntime::GeodesicEllipseParameters  *m_internalParameters = nullptr;
+  SimpleValue<EllipseParameters>                   m_ellipseParameters;
+
+  void parameterToInternal();
+  virtual bool createEllipse(Esri::ArcGISRuntime::Polygon &ellipse);
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object;
+  virtual PositionCont positions() const override
+  {
+    return PositionCont();
+  }
+  virtual void setPositions(const PositionCont &posCont) override
+  {
+    Q_UNUSED(posCont);
+  }
+
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<< (std::ostream   &stream,
+                          const GraphicalObjectEllipse &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp
new file mode 100755
index 000000000..d84b40c76
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp
@@ -0,0 +1,173 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectModelSceneMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_model_scene_marker.h"
+#include <Map/situation_map_utils.h> // operator<<
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <GraphicsOverlay.h>
+#include <ModelSceneSymbol.h>
+
+
+// Qt
+#include <QPainter>
+#include <QFile>
+#include <Graphic.h>
+#include <Point.h>
+#include <SpatialReference.h>
+
+namespace SituationMap
+{
+
+GraphicalObjectModelSceneMarker::GraphicalObjectModelSceneMarker(const Esri::ArcGISRuntime::GeoView     *geoView
+                                                                 , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                                 , const QString                        &debugInfo
+                                                                 , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectModelSceneMarker"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectModelSceneMarker::~GraphicalObjectModelSceneMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  delete m_modelSceneSymbol;
+  m_modelSceneSymbol = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectModelSceneMarker::setUrl(const QUrl &url)
+{
+  m_url = url;
+}
+
+QUrl GraphicalObjectModelSceneMarker::url() const
+{
+  return m_url.value();
+}
+
+void GraphicalObjectModelSceneMarker::setHeading(float heading)
+{
+  m_heading = heading;
+}
+
+float GraphicalObjectModelSceneMarker::heading() const
+{
+  return m_heading.value();
+}
+
+
+bool GraphicalObjectModelSceneMarker::create()
+{
+  return BaseClass::create();
+}
+
+bool GraphicalObjectModelSceneMarker::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " pickable=" << m_pickable
+                      << " pickable.changed=" << m_pickable.changed()
+                      << " selected=" << m_selected
+                      << " m_url = " << m_url.value().toString()
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_scale = " << m_scale.value()
+                      << " m_heading = " << m_heading.value();
+
+  // some checks:
+  if (!isSinglePoint())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  QFile fi(m_url.value().path());
+  if (!fi.exists())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " m_url does not exists: '" << fi.fileName() << "'";
+    m_url.reset();
+  }
+
+  if (m_url.value().isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " no url provided (or does not exist)";
+    return false;
+  }
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  const Point3D &origin = this->origin();
+  Esri::ArcGISRuntime::Point originGeometry(origin.x(),
+                                            origin.y(),
+                                            origin.z(),
+                                            spatialReference());
+  m_graphic->setGeometry(originGeometry);
+
+  // url changed?
+  if ( (m_modelSceneSymbol && (m_modelSceneSymbol->url() != m_url.value())) ||
+      m_scale.changed())
+  {
+    // force re-create ModelSceneSymbol:
+    delete m_modelSceneSymbol;
+    m_modelSceneSymbol = nullptr;
+  }
+
+  if (!m_modelSceneSymbol)
+  {
+    m_modelSceneSymbol = new Esri::ArcGISRuntime::ModelSceneSymbol(m_url.value(), m_scale.value()); // url, scale
+  }
+
+  m_modelSceneSymbol->setHeading(m_heading.value());  // degree, clockwise, 0 is north/12
+//  m_modelSceneSymbol->setAnchorPosition(Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Bottom);
+  m_graphic->setSymbol(m_modelSceneSymbol);
+
+
+
+  success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  success = addUpdateGraphic();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success=" << success
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_graphic->drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.h
new file mode 100755
index 000000000..e58fa84ee
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.h
@@ -0,0 +1,111 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectModelSceneMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/text_style.h>
+#include <Common/situation_map_logging.h>
+
+
+// Esri
+#include <SymbolTypes.h>
+
+
+// Qt
+#include <QImage>
+#include <QUrl>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class ModelSceneSymbol;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT GraphicalObjectModelSceneMarker : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  GraphicalObjectModelSceneMarker(const Esri::ArcGISRuntime::GeoView     *geoView
+                                  , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                  , const QString                        &debugInfo
+                                  , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectModelSceneMarker();
+
+  // Data access:
+  // to be cont.
+  void setUrl(const QUrl &url);
+  QUrl url() const;
+
+  // degree ; 0 is north/12
+  void setHeading(float heading);
+  float heading() const;
+
+
+protected:
+
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_url.changed()
+           || m_heading.changed()
+           ;
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_url.reset();
+    m_heading.reset();
+  }
+
+  bool updateViewImpl() override;
+
+  // used ModelSceneSymbol:
+  Esri::ArcGISRuntime::ModelSceneSymbol *m_modelSceneSymbol{nullptr};
+
+  SimpleValue<QUrl>                      m_url;           // e.g. /shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/Bristol/Collada/Bristol.dae
+  SimpleValue<float>                     m_heading{0.0};  // degree, clockwise, 0 is north/12
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object;
+  PositionCont positions() const override
+  {
+    return PositionCont();
+  }
+  void setPositions(const PositionCont &posCont) override
+  {
+    Q_UNUSED(posCont);
+    Q_ASSERT(false);
+  }
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp
new file mode 100755
index 000000000..69b0dcee7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp
@@ -0,0 +1,329 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPath
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_multi_path.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <PolygonBuilder.h>
+#include <PolylineBuilder.h>
+#include <SimpleLineSymbol.h>
+#include <SimpleFillSymbol.h>
+#include <GeoView.h>
+#include <GeometryEngine.h>
+#include <Graphic.h>
+#include <PartCollection.h>
+#include <Polygon.h>
+#include <Polyline.h>
+#include <SpatialReference.h>
+#include <Part.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+GraphicalObjectMultiPath::GraphicalObjectMultiPath(const GraphicalObjectPathType           type
+                                                   , const Esri::ArcGISRuntime::GeoView   *geoView
+                                                   , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                   , const QString                        &debugInfo
+                                                   , UniqueMapId                           uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_pathType(type)
+  , m_logger(getLogger("GraphicalObjectMultiPath"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+}
+
+GraphicalObjectMultiPath::~GraphicalObjectMultiPath()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+}
+
+PositionCont GraphicalObjectMultiPath::path(int pathIndex) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " pathIndex=" << pathIndex;
+  if (hasPosCont(pathIndex))
+    return getPosCont(pathIndex).value();
+  return {};
+}
+void GraphicalObjectMultiPath::setPath(int pathIndex, const PositionCont &positions)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " pathIndex=" << pathIndex
+                      << " positions=" << positions;
+  m_positionsCont[pathIndex] = positions;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectMultiPath::clearPath(int pathIndex)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " pathIndex=" << pathIndex;
+  if (pathIndex == -1)
+  {
+    m_positions.refValue().clear();
+    m_positionsCont.clear();
+  }
+  else
+  {
+    if (hasPosCont(pathIndex))
+    {
+      // Do not remove the whole entry to let changed() work
+      m_positionsCont[pathIndex].refValue().clear();
+    }
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectMultiPath::clearAllPaths()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  m_positions.refValue().clear();
+  m_positionsCont.clear();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectMultiPath::reduceTo(const QList<int> &remainingPathIndexes)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " remainingPathIndexes=" << remainingPathIndexes;
+  QList<int> keys = m_positionsCont.keys();
+  for (int key : qAsConst(keys))
+  {
+    if (!remainingPathIndexes.contains(key))
+    {
+      // Do not remove the whole entry to let chanded() work
+      m_positionsCont[key].refValue().clear();
+    }
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+QList<int> GraphicalObjectMultiPath::pathIndexInUse()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  QList<int> ret;
+/////  ret << 0; // pathIndex=0 -> m_positions
+
+  QMapIterator<int, SimpleValue<PositionCont> > mapIt(m_positionsCont);
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    const SimpleValue<PositionCont> &posData = mapIt.value();
+    const PositionCont &posCont = posData.value();
+    if (! posCont.isEmpty())
+      ret += mapIt.key();
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+  return ret;
+}
+
+
+bool GraphicalObjectMultiPath::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = BaseClass::create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+  return success;
+}
+
+
+bool GraphicalObjectMultiPath::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  success = updatePositions();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      << " drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+bool GraphicalObjectMultiPath::updatePositions()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = true;
+
+  int pathIdxToInsert = 0;
+  const int minPoints = this->pathType() == GraphicalObjectPathType::Polyline ? 2 : 3;
+
+  QSharedPointer<Esri::ArcGISRuntime::MultipartBuilder> builder;
+
+  // some preparations: ( do no check isMultiPoint / isArea: m_positions should typically be empty!!!
+  switch (m_pathType)
+  {
+  case GraphicalObjectPathType::Polyline:
+    builder = QSharedPointer<Esri::ArcGISRuntime::PolylineBuilder>(new Esri::ArcGISRuntime::PolylineBuilder(spatialReference()));
+
+    break;
+  case GraphicalObjectPathType::Polygon:
+    builder = QSharedPointer<Esri::ArcGISRuntime::PolygonBuilder>(new Esri::ArcGISRuntime::PolygonBuilder(spatialReference()));
+    break;
+  } // switch
+
+  QSharedPointer<Esri::ArcGISRuntime::PartCollection> partCollection =
+      QSharedPointer<Esri::ArcGISRuntime::PartCollection>(new Esri::ArcGISRuntime::PartCollection(builder->spatialReference()));
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << ", m_positionsCont.size() /#rings=" << m_positionsCont.size();
+
+  QMutableMapIterator<int, SimpleValue<PositionCont> > mapIt(m_positionsCont);
+  //
+  // LOOP PER SINGLE POLY
+  //
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    const int key = mapIt.key();
+
+    const SimpleValue<PositionCont> &posData = mapIt.value();
+    const PositionCont &posCont = posData.value();
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                        << ", key / #ring=" << key
+                        << ", rings.size()=" << posCont.size();
+
+    // maybe some pathIdx are cleared by clearPath() or similar:
+    if (posCont.isEmpty())
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION
+                          << " posCont empty, cleared? -> remove/cleanup"
+                          << " pathIdxToInsert = " << pathIdxToInsert
+                          << " mapIt.key() = " << key;
+      mapIt.remove();
+      continue;
+    }
+
+    if (posCont.count() < minPoints)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " incorrect number of positions"
+                          << " (" << posCont.count() << ")"
+                          << ", minPoints=" << minPoints
+                          << ", pathIdxToInsert = " << pathIdxToInsert
+                          << ", mapIt.key() = " << key
+                          << ", m_debugInfo = " << m_debugInfo;
+
+      success = false;
+    }
+    else
+    {
+      Esri::ArcGISRuntime::Part part(builder->spatialReference());
+
+      //
+      // LOOP PER POINT
+      //
+      for (auto pos : qAsConst(posCont))
+      {
+        part.addPoint(pos.x(), pos.y(), pos.z());
+        TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                            << ", key / #ring=" << key
+                            << ", addPoint=" << pos;
+
+      }
+
+      partCollection->addPart(&part);
+    } // if (posCont.count() < minPoints)
+
+  } // while
+
+  builder->setParts(partCollection.get());
+
+  //
+  // builder to geometry;
+  //
+  switch (m_pathType)
+  {
+  case GraphicalObjectPathType::Polyline:
+  {
+    const Esri::ArcGISRuntime::Polyline &multipartPolyline =
+        static_cast<Esri::ArcGISRuntime::PolylineBuilder *>(builder.data())->toPolyline();
+    m_graphic->setGeometry(multipartPolyline);
+    assignLineStyleToGraphic();
+  }
+    break;
+  case GraphicalObjectPathType::Polygon:
+  {
+    const Esri::ArcGISRuntime::Polygon &multipartPolygon =
+        static_cast<Esri::ArcGISRuntime::PolygonBuilder *>(builder.data())->toPolygon();
+    m_graphic->setGeometry(multipartPolygon);
+    //assignLineStyleToGraphic();
+    assignFillStyleToGraphic();
+  }
+  break;
+  } // switch
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'";
+  success = addUpdateGraphic();
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      << " drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+bool GraphicalObjectMultiPath::hasPosCont(int idx) const
+{
+  return m_positionsCont.contains(idx);
+}
+
+SimpleValue<PositionCont> &GraphicalObjectMultiPath::getPosCont(int idx)
+{
+  return m_positionsCont[idx];
+}
+
+const SimpleValue<PositionCont> GraphicalObjectMultiPath::getPosCont(int idx) const
+{
+  return m_positionsCont[idx];
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.h
new file mode 100755
index 000000000..94f2fa941
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.h
@@ -0,0 +1,105 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPath
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "graphical_object_path.h"
+
+
+// Esri
+
+
+// Qt
+#include <QMap>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectMultiPath : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+
+  GraphicalObjectMultiPath(const GraphicalObjectPathType           type
+                           , const Esri::ArcGISRuntime::GeoView   *geoView
+                           , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                           , const QString                        &debugInfo
+                           , UniqueMapId                           uniqueMapId);
+
+  ~GraphicalObjectMultiPath();
+
+  GraphicalObjectPathType pathType() const
+  {
+    return m_pathType;
+  }
+
+  virtual PositionCont path(int pathIndex) const;
+  virtual void setPath(int pathIndex, const PositionCont &positions);
+
+  /*! \name Subsidiary polyline/polygons */
+  //@{
+  virtual void clearPath(int pathIndex);
+  virtual void clearAllPaths();
+  virtual QList<int> pathIndexInUse();
+  virtual void reduceTo(const QList<int> &remainingPathIndexes);
+  //@}
+
+protected:
+  // Internal/Admin
+  bool updatePositions();
+  bool changed() override
+  {
+    bool baseClassChanged = BaseClass::changed();
+    if (baseClassChanged)
+      return true;
+
+    for (const SimpleValue<PositionCont> &posData : qAsConst(m_positionsCont))
+    {
+      if (posData.changed())
+        return true;
+    }
+    return false;
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+
+    for (SimpleValue<PositionCont> &posData : m_positionsCont)
+      posData.reset();
+  }
+
+  bool create() override;
+  bool updateViewImpl() override;
+
+  // logical
+  const GraphicalObjectPathType                 m_pathType;
+  //bool updatePositions();
+
+private:
+  // Attention: will contain 'positions' of idx == 1 and higher :
+  bool hasPosCont(int idx) const;
+  SimpleValue<PositionCont> &getPosCont(int idx);
+  const SimpleValue<PositionCont> getPosCont(int idx) const;
+
+  QMap<int, SimpleValue<PositionCont> > m_positionsCont;
+  // : Attention: will contain 'positions' of idx == 1 and higher
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp
new file mode 100755
index 000000000..12fe02672
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp
@@ -0,0 +1,265 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPath
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_path.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <PolygonBuilder.h>
+#include <PolylineBuilder.h>
+#include <SimpleLineSymbol.h>
+#include <SimpleFillSymbol.h>
+#include <GeoView.h>
+#include <GeometryEngine.h>
+#include <Graphic.h>
+#include <Polygon.h>
+#include <Polyline.h>
+#include <SpatialReference.h>
+#include <LinearUnit.h>
+
+// Qt
+
+
+namespace SituationMap
+{
+
+QLatin1String toString(const GraphicalObjectPathType subType)
+{
+  switch (subType)
+  {
+  case GraphicalObjectPathType::Polyline:
+    return QLatin1String("Polyline");
+    break;
+  case GraphicalObjectPathType::Polygon:
+    return QLatin1String("Polygon");
+    break;
+  } // switch
+  return QLatin1String("GraphicalObjectPathTypeERROR");
+}
+
+
+GraphicalObjectPath::GraphicalObjectPath(const GraphicalObjectPathType           type
+                                         , const Esri::ArcGISRuntime::GeoView   *geoView
+                                         , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                         , const QString                        &debugInfo
+                                         , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_pathType(type)
+  , m_logger(getLogger("GraphicalObjectPath"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+}
+
+GraphicalObjectPath::~GraphicalObjectPath()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " m_pathType=" << m_pathType;
+}
+
+bool GraphicalObjectPath::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  bool success = BaseClass::create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      // << " drawOrder = " << m_graphic->drawOrder()
+                      ;
+  return success;
+}
+
+
+bool GraphicalObjectPath::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_positions= " << m_positions.value()
+                      << ", m_maxSegmentLength=" << m_maxSegmentLength;
+
+  QSharedPointer<Esri::ArcGISRuntime::MultipartBuilder> builder;
+
+  // some checks:
+  switch (m_pathType)
+  {
+  case GraphicalObjectPathType::Polyline:
+    if (!this->isMultiPoint())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " incorrect number of positions"
+                          << " (" << this->positions().count() << ")";
+      return false;
+    }
+    builder = QSharedPointer<Esri::ArcGISRuntime::PolylineBuilder>(new Esri::ArcGISRuntime::PolylineBuilder(spatialReference()));
+
+    break;
+  case GraphicalObjectPathType::Polygon:
+    if (!this->isArea())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " incorrect number of positions"
+                          << " (" << this->positions().count() << ")";
+      return false;
+    }
+    builder = QSharedPointer<Esri::ArcGISRuntime::PolygonBuilder>(new Esri::ArcGISRuntime::PolygonBuilder(spatialReference()));
+    break;
+  } // switch
+
+
+  if (! builder)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " no builder";
+    return false;
+  }
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+
+  // real work:
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                      << " update geometry";
+
+
+  const PositionCont &posCont = m_positions.value();
+  for (const Point3D &pos : posCont)
+    builder->addPoint(pos.x(), pos.y(), pos.z());
+
+  if (! builder->isSketchValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " builder -> sketch invalid";
+    return false;
+  }
+
+  //
+  // apply attributes:
+  //
+
+  // N. Thoden, 13.02.2018
+  // Case #02062713 [BOS] BasicSceneView_lineNotComplete
+  // If a line has a line of ~10km (Borderline)
+  // the line may 'move' on the ground (3D, RenderMode::Dynamic, SurfarcePlacement::Draped)
+  // To avoid these kind of effect, the advice is to densify the geometry
+  // [similar: Case #02054233 [BOS] LineArtefacts in 3D ->
+  // BUG-000111565 : Lines created on the GraphicsOverlay with "Dynamic" Rendering mode on 3D doesn't render completely when zooming in]
+
+  //
+  // N. Thoden, 29.03.2018
+  // Consulting with Luke Smallwood / using the V100.2.1. debug libs:
+  // densify leads to an assert, so avoid densify
+  // (until now densify does not lead to an improvement..)
+
+  //
+  // N. Thoden, 19.04.2021
+  // [GUEZE-495]: 3D Lagedarstellung Trefferlinien
+  // Linie fehlt teilweise
+  // jetzt (typeweise) per m_maxSegmentLength aktivierbar
+
+  switch (m_pathType)
+  {
+  case GraphicalObjectPathType::Polyline:
+  {
+    const Esri::ArcGISRuntime::Polyline &polyline =
+        static_cast<Esri::ArcGISRuntime::PolylineBuilder *>(builder.data())->toPolyline();
+    if (m_maxSegmentLength > 0)
+    {
+      m_graphic->setGeometry(Esri::ArcGISRuntime::GeometryEngine::densifyGeodetic(polyline,
+                                                                                  m_maxSegmentLength,
+                                                                                  Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                                                  Esri::ArcGISRuntime::GeodeticCurveType::Geodesic));
+    } else {
+      m_graphic->setGeometry(polyline);
+    } // if (densify)
+    assignLineStyleToGraphic();
+  }
+    break;
+  case GraphicalObjectPathType::Polygon:
+  {
+    const Esri::ArcGISRuntime::Polygon &polygon =
+        static_cast<Esri::ArcGISRuntime::PolygonBuilder *>(builder.data())->toPolygon();
+
+    if (m_maxSegmentLength > 0)
+    {
+      m_graphic->setGeometry(Esri::ArcGISRuntime::GeometryEngine::densifyGeodetic(polygon,
+                                                                                  m_maxSegmentLength,
+                                                                                  Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                                                  Esri::ArcGISRuntime::GeodeticCurveType::Geodesic));
+    } else {
+      m_graphic->setGeometry(polygon);
+    }
+    assignFillStyleToGraphic();
+  }
+  break;
+  } // switch
+
+  const int count = AbstractGraphicalObject::countOfPolygonFirstPart(m_graphic->geometry());
+  if (count > 1000)
+    WARNING_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << ", huge amount of vertices, countOfPolygonFirstPart = " << count;
+  else
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << ", amount of vertices, countOfPolygonFirstPart = " << count;
+
+  success = addUpdateGraphic();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      << " drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+double GraphicalObjectPath::maxSegmentLength() const
+{
+  return m_maxSegmentLength;
+}
+
+void GraphicalObjectPath::setMaxSegmentLength(double maxSegmentLength)
+{
+  m_maxSegmentLength = maxSegmentLength;
+}
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<<(std::ostream &stream,
+                         const GraphicalObjectPathType &value)
+{
+  stream << toString(value).latin1();
+  return stream;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.h
new file mode 100755
index 000000000..5bf117ffc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.h
@@ -0,0 +1,78 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPath
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+enum class GraphicalObjectPathType {Polyline, Polygon};
+QLatin1String toString(const GraphicalObjectPathType subType);
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectPath : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+
+  explicit GraphicalObjectPath(const GraphicalObjectPathType           type
+                               , const Esri::ArcGISRuntime::GeoView   *geoView
+                               , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                               , const QString                        &debugInfo
+                               , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectPath();
+
+  GraphicalObjectPathType pathType() const
+  {
+    return m_pathType;
+  }
+
+
+  double maxSegmentLength() const;
+  void setMaxSegmentLength(double maxSegmentLength);
+
+protected:
+  // Internal/Admin
+  bool create() override;
+  bool updateViewImpl() override;
+
+  // logical
+  const GraphicalObjectPathType                 m_pathType;
+  double                                        m_maxSegmentLength{-1};
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream   &stream,
+                                              const GraphicalObjectPathType &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp
new file mode 100755
index 000000000..f681e644b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp
@@ -0,0 +1,578 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPictureMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_picture_marker.h"
+#include <Map/situation_map_utils.h> // operator<<
+#include <SymbologyImpl/symbol_extension_renderer.h>
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <GraphicsOverlay.h>
+#include <PictureMarkerSymbol.h>
+#include <SimpleMarkerSymbol.h>
+#include <MultipointBuilder.h>
+
+
+// Qt
+#include <QPainter>
+#include <QTimer>
+#include <Geometry.h>
+#include <Graphic.h>
+#include <PointCollection.h>
+#include <SpatialReference.h>
+#include <Point.h>
+
+
+namespace SituationMap
+{
+/**
+ * @brief getSimpleMarkerSymbolStyle
+ * @param markerSymbolType type to get
+ * @param filePath filePath of requested marker; if empty -> use return value, if !empty -> use filePath and get file out of qrc
+ * @param hotSpotPercent -0.5 to 0.5; e.g. x=center, y=bottom -> -0.5
+ * @return corrosponding Esri::ArcGISRuntime::SimpleMarkerSymbolStyle, see filePath
+ */
+Esri::ArcGISRuntime::SimpleMarkerSymbolStyle getSimpleMarkerSymbolStyle(MarkerSymbolType markerSymbolType,
+                                                                        QString &filePath,
+                                                                        QPointF *hotSpotPercent = nullptr)
+{
+  if (hotSpotPercent)
+    *hotSpotPercent = QPointF();
+
+  filePath.clear();
+
+  Esri::ArcGISRuntime::SimpleMarkerSymbolStyle esriSMSS =
+    Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle;
+
+  switch (markerSymbolType)
+  {
+  case SituationMap::MarkerSymbolType::Undefined:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle;
+    break;
+
+  case SituationMap::MarkerSymbolType::Circle:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle;
+    break;
+  case SituationMap::MarkerSymbolType::Cross:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Cross;
+    break;
+  case SituationMap::MarkerSymbolType::Diamond:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Diamond;
+    break;
+  case SituationMap::MarkerSymbolType::Square:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Square;
+    break;
+  case SituationMap::MarkerSymbolType::X:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::X;
+    break;
+  case SituationMap::MarkerSymbolType::Triangle:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Triangle;
+    break;
+
+  case SituationMap::MarkerSymbolType::PushPin2D:
+    esriSMSS = Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle;
+    filePath = QLatin1String(":/situationMap/pushPinRedClipArt.png");
+    if (hotSpotPercent)
+      *hotSpotPercent = QPointF(0, -0.5);
+
+    break;
+  } //switch
+
+  return esriSMSS;
+}
+
+GraphicalObjectPictureMarker::GraphicalObjectPictureMarker(const Esri::ArcGISRuntime::GeoView     *geoView
+                                                           , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                           , const QString                        &debugInfo
+                                                           , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectPictureMarker"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectPictureMarker::~GraphicalObjectPictureMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  resetPictureMarkerSymbol();
+  resetImage();
+  resetSimpleMarkerSymbol();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectPictureMarker::setImage(const QImage &image, const QSize &defaultSize)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " visibility=" << m_visibility
+                      << " image.size()=" << image.size()
+                      << " defaultSize=" << defaultSize
+                      << " m_imageDefaultSize=" << m_imageDefaultSize
+                      << " m_imageChanged=" << m_imageChanged
+                      << " m_imageDefaultSize.changed()=" << m_imageDefaultSize.changed();
+  resetSimpleMarkerSymbol();
+
+  if (m_image != image)
+  {
+    m_image = image;
+    m_imageChanged = true;
+  }
+
+  // store defautlSize (member shouldn´t be modified)
+  m_imageDefaultSize = defaultSize;
+  if (m_imageDefaultSize.changed())
+    m_imageChanged = true;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      << " visibility=" << m_visibility
+                      << " image.size()=" << image.size()
+                      << " defaultSize=" << defaultSize
+                      << " m_imageDefaultSize=" << m_imageDefaultSize
+                      << " m_imageChanged=" << m_imageChanged
+                      << " m_imageDefaultSize.changed()=" << m_imageDefaultSize.changed();
+}
+
+void GraphicalObjectPictureMarker::setPictureMarkerSymbol(Esri::ArcGISRuntime::PictureMarkerSymbol *pms, QSize defaultSize)
+{
+  resetSimpleMarkerSymbol();
+  resetImage();
+
+  if (m_isOwnPms)
+  {
+    delete m_pictureMarkerSymbol;
+    m_pictureMarkerSymbol = nullptr;
+  }
+
+  if (m_pictureMarkerSymbol == pms &&
+      m_imageDefaultSize.value() == defaultSize)
+    return;
+  m_isOwnPms = false;
+  m_pictureMarkerSymbol = pms;
+  m_imageDefaultSize = defaultSize;
+  m_imageChanged = true;
+}
+
+void GraphicalObjectPictureMarker::resetImage()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  m_image = QImage();
+  m_imageChanged = true;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectPictureMarker::resetPictureMarkerSymbol()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  if (m_isOwnPms)
+    delete m_pictureMarkerSymbol;
+  m_pictureMarkerSymbol = nullptr;
+  if (m_workaorundTimer)
+    m_workaorundTimer->stop();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectPictureMarker::resetSimpleMarkerSymbol()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  delete m_simpleMarkerSymbol;
+  m_simpleMarkerSymbol = nullptr;
+  m_markerSymbolType = MarkerSymbolType::Undefined;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+
+MarkerSymbolType GraphicalObjectPictureMarker::markerSymbolType()
+{
+  return m_markerSymbolType.value();
+}
+
+int GraphicalObjectPictureMarker::markerSymbolSize()
+{
+  return m_markerSize.value();
+}
+
+void GraphicalObjectPictureMarker::setMarkerSymbol(MarkerSymbolType markerSymbolType,
+                                                   int size, const QColor &color)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " color=" << color;
+
+  resetImage();
+
+  m_markerSymbolType = markerSymbolType;
+  m_markerSize       = size;
+  m_markerColor      = color;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+QSize GraphicalObjectPictureMarker::currentSize() const
+{
+  return m_currentSize;
+}
+
+bool GraphicalObjectPictureMarker::create()
+{
+  return BaseClass::create();
+}
+
+int GraphicalObjectPictureMarker::xOffset() const
+{
+  return m_externalOffset.value().x();
+}
+void GraphicalObjectPictureMarker::setXOffset(int xOffset)
+{
+  m_externalOffset.refValue().rx() = xOffset;
+}
+int GraphicalObjectPictureMarker::yOffset() const
+{
+  return m_externalOffset.value().y();
+}
+void GraphicalObjectPictureMarker::setYOffset(int yOffset)
+{
+  m_externalOffset.refValue().ry() = yOffset;
+}
+
+float GraphicalObjectPictureMarker::rotationAngle()
+{
+  return m_angle.value();
+}
+void GraphicalObjectPictureMarker::setRotationAngle(float angle)
+{
+  m_angle = angle;
+}
+
+
+bool GraphicalObjectPictureMarker::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " pickable=" << m_pickable
+                      << " pickable.changed=" << m_pickable.changed()
+                      << " selected=" << m_selected
+                      << " m_angle = " << m_angle.value()
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_image.size() = " << m_image.size()
+                      << " m_imageChanged = " << m_imageChanged
+                      << " m_imageDefaultSize=" << m_imageDefaultSize
+                      << " m_imageDefaultSize.changed()=" << m_imageDefaultSize.changed()
+                      << " m_scale = " << m_scale.value();
+
+  // some checks:
+  if (m_positions.value().size() < 1)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  //
+  // Image or Marker ???
+  //
+  QString filePath;
+  QPointF hotSpotPercent;
+  Esri::ArcGISRuntime::SimpleMarkerSymbolStyle esriSMSS =
+    getSimpleMarkerSymbolStyle(m_markerSymbolType.value(),
+                               filePath,
+                               &hotSpotPercent);
+  m_markerHotSpotPercent = hotSpotPercent;
+
+  if (m_markerSymbolType.value() != MarkerSymbolType::Undefined)
+  {
+    if (m_markerSize.changed() ||
+        m_markerSymbolType.changed() ||
+        m_markerColor.changed() ||
+        m_markerSymbolType.changed() ||
+        m_angle.changed() ||
+        m_markerHotSpotPercent.changed())
+    {
+      if (!reCreateSymbol(filePath, esriSMSS))
+        return false;
+    }
+  }
+  else
+  {
+    if (m_image.isNull() && (!m_isOwnPms && m_pictureMarkerSymbol == nullptr))
+    {
+      // in context of class 'TacticalAppearance' the PictureMarker exist always...
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " no image and m_markerSymbolType==Undefined -> nothing to do";
+      // -> nothing to do:
+      return true; // -> nothing to do:
+    }
+
+    if (m_scale.changed() ||
+        m_imageChanged ||
+        m_markerSymbolType.changed() ||
+        m_markerSize.changed() ||
+        m_angle.changed() ||
+        !m_pictureMarkerSymbol)
+    {
+      if (!reCreateSymbol(filePath, esriSMSS))
+        return false;
+    }
+  }
+
+  const PositionCont &posCont = m_positions.value();
+  if (posCont.size() == 1)
+  {
+    const Point3D &origin = this->origin();
+    Esri::ArcGISRuntime::Point originGeometry(origin.x(),
+                                              origin.y(),
+                                              origin.z(),
+                                              spatialReference());
+    m_graphic->setGeometry(originGeometry);
+  }
+  else
+  {
+    // Eception: Layer with name "AES2" should NOT have no renderer 8 to enable multipoint graphics
+    // [GUEZE-496] RPL Nr 770: 3D Lagedarstellung Einfrieren der SW Appl.
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " posCont.size() = " << posCont.size();
+    Esri::ArcGISRuntime::MultipointBuilder builder(spatialReference());
+    for (const Point3D &pos : posCont)
+      builder.points()->addPoint(pos.x(), pos.y(), pos.z());
+
+    if (! builder.isSketchValid())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " builder -> sketch invalid";
+      return false;
+    }
+    m_graphic->setGeometry(builder.toGeometry());
+  }
+
+  bool success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+
+  success = addUpdateGraphic();
+
+
+  QSize imgSize = m_image.size();
+  QSizeF pmSize;
+  if (m_pictureMarkerSymbol)
+    pmSize = QSizeF(m_pictureMarkerSymbol->width(), m_pictureMarkerSymbol->height());
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+//                      << " success=" << success
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_graphic->drawOrder = " << m_graphic->zIndex()
+                      << " m_image->size() = " << imgSize
+                      << " pictureMarkerSymbol->size() = " << pmSize;
+  return success;
+}
+
+bool GraphicalObjectPictureMarker::reCreateSymbol(const QString &filePath,
+                                                  const Esri::ArcGISRuntime::SimpleMarkerSymbolStyle esriSMSS)
+{
+  const bool imageRequired = !m_image.isNull() || !filePath.isEmpty();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " filePath = '" << filePath << "'"
+                      << " m_image->size() = " << m_image.size()
+                      << " m_imageChanged = " << m_imageChanged
+                      << " m_angle = " << m_angle.value()
+                      << " m_currentSize = " << m_currentSize
+                      << " m_imageDefaultSize = " << m_imageDefaultSize.value()
+                      << " m_imageDefaultSize.changed() = " << m_imageDefaultSize.changed();
+
+  //
+  // Now we know what to use: Image or Marker
+  //
+
+  if (!create())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  // what is used currently?
+  // image or m_simpleMarkerSymbol(esri)?
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                      << " imageRequired=" << imageRequired
+                      << " m_pictureMarkerSymbol=" << m_pictureMarkerSymbol
+                      << " m_simpleMarkerSymbol=" << m_simpleMarkerSymbol;
+
+  if (!filePath.isEmpty())
+  {
+    // e.g. case PushPin2D
+    QImage img;
+    if (img.load(filePath))
+    {
+      int iSize = qRound(m_markerSize.value() * m_scale.value());
+      m_currentSize = QSize(iSize, iSize);
+      img = img.scaledToHeight(iSize, Qt::SmoothTransformation);
+
+      QColor localColor = m_markerColor.value();
+
+      if (m_markerSymbolType.value() == MarkerSymbolType::PushPin2D && localColor.isValid())
+      {
+        QColor colorToBeReplaced(255, 0, 0);
+        AdvancedSymbology::ExtensionRenderer::replaceColor(img, colorToBeReplaced.rgba(), localColor.rgba());
+      }
+      setImage(img);
+    }
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " loading image failed, debugInfo='" << m_debugInfo << "'"
+                          << " path='" << filePath << "'";
+      return false;
+    }
+  }
+
+
+  //
+  // Transfer data to esriSymbols:
+  //
+
+  // Image:
+  if (!m_image.isNull() || (!m_isOwnPms && m_pictureMarkerSymbol))
+  {
+    resetSimpleMarkerSymbol();
+
+    QSize realImageSize;
+    if (!m_isOwnPms && m_pictureMarkerSymbol)
+    {
+      if (m_imageDefaultSize.value().isEmpty())
+        m_currentSize = m_image.size() * m_scale.value();
+        else
+      m_currentSize = m_imageDefaultSize.value() * m_scale.value();
+      realImageSize = m_currentSize;
+    }
+    else
+    {
+      // scale localImage by m_scale
+      QImage localImage;
+      if (!filePath.isEmpty())
+      {
+        // case PushPin2D -> already scaled by m_scale. So don´t scale again:
+        localImage = m_image;
+        m_currentSize = localImage.size();
+      }
+      else
+      {
+        if (m_imageDefaultSize.value().isEmpty())
+          m_currentSize = m_image.size() * m_scale.value();
+        else
+          m_currentSize = m_imageDefaultSize.value() * m_scale.value();
+
+        // scaled required?
+        if (m_image.size() != m_currentSize)
+        {
+          DEBUG_LOG(m_logger) << LOGFUNCTION << " SCALE FROM " << m_image.size() << " TO " << m_currentSize;
+          localImage = m_image.scaled(m_currentSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+          ++m_scaleCounter4Moduletest;
+        } else {
+          localImage = m_image;
+          m_currentSize = localImage.size();
+        }
+      }
+
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " m_scaleCounter4Moduletest = " << m_scaleCounter4Moduletest
+                          << ", localImage.size() = " << localImage.size();
+
+      delete m_pictureMarkerSymbol;
+      m_pictureMarkerSymbol = new Esri::ArcGISRuntime::PictureMarkerSymbol(localImage);
+      realImageSize = localImage.size();
+
+
+      // Workaround :
+      // Norbert Thoden, 11.06.2020:
+      // do some calls again to fix ESRI-Bug:
+      // Bug: new Image('localImage#) / pictureMarkerSymbol, but sometimes it will not be shown :-(
+      // Using try and error, we recognize that an additional call seems to fix that issue:
+      if (!m_workaorundTimer)
+      {
+        m_workaorundTimer = new QTimer(m_graphic);
+        m_workaorundTimer->setInterval(150);
+        m_workaorundTimer->setSingleShot(true);
+        QObject::connect(m_workaorundTimer, &QTimer::timeout, m_graphic, [this]() {
+          if (!m_graphic)
+            return;
+          m_graphic->setZIndex(m_drawOrder.value());
+          m_graphic->setVisible(m_visibility.value());
+          m_graphic->setSelected(m_selected.value());
+        });
+      }
+      m_workaorundTimer->start();
+      // : Workaround
+
+    }
+    m_imageChanged = false;
+
+    // set image to pms AND ALSO the Heigth and Width!!!
+
+    //    // !!! Important !!!
+    //    // Case #01713501 - PictureMarker-offset
+    //    // Esri::PictureMarkerSymbol:: setHeight/setWidth -> typographic points.
+    //    // 36pt -> 48pixel -> factor 0.75
+    //    double pixelToPointFactor = 0.71;
+    //    m_pictureMarkerSymbol->setHeight(m_image->size().height() * pixelToPointFactor);
+    //    m_pictureMarkerSymbol->setWidth (m_image->size().width()  * pixelToPointFactor);
+    //    // !!! Important !!!
+
+    QPointF markerHotSpot = QPointF(realImageSize.width()  / 2.0 * m_markerHotSpotPercent.value().x(),
+                                    realImageSize.height() / 2.0 * m_markerHotSpotPercent.value().y());
+
+    QPointF finalOffset = (markerHotSpot.toPoint() * -1) * 1.33 // 1.33; // try and error (48pixel / 36pt)
+                          +
+                          (m_externalOffset.value() * 0.75);    // 0.75; // try and error (36pt / 48pixel)
+
+    m_pictureMarkerSymbol->setOffsetX(finalOffset.x());
+    m_pictureMarkerSymbol->setOffsetY(finalOffset.y());
+
+    m_pictureMarkerSymbol->setAngle(m_angle.value());
+
+    m_graphic->setSymbol(m_pictureMarkerSymbol);
+  }
+  else
+  {
+    resetPictureMarkerSymbol();
+    resetImage();
+    if (!m_simpleMarkerSymbol)
+      m_simpleMarkerSymbol = new Esri::ArcGISRuntime::SimpleMarkerSymbol();
+
+    m_simpleMarkerSymbol->setSize(m_markerSize.value() * m_scale.value());
+    m_simpleMarkerSymbol->setStyle(esriSMSS);
+    m_simpleMarkerSymbol->setAngle(m_angle.value());
+
+    m_simpleMarkerSymbol->setOffsetX(m_externalOffset.value().x());
+    m_simpleMarkerSymbol->setOffsetY(m_externalOffset.value().y());
+
+    m_simpleMarkerSymbol->setColor(m_markerColor.value());
+
+    m_graphic->setSymbol(m_simpleMarkerSymbol);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " filePath = '" << filePath << "'"
+                      << " m_image->size() = " << m_image.size()
+                      << " m_imageChanged = " << m_imageChanged
+                      << " m_currentSize = " << m_currentSize
+                      << " m_imageDefaultSize = " << m_imageDefaultSize.value()
+                      << " m_imageDefaultSize.changed() = " << m_imageDefaultSize.changed();
+
+  return true;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.h
new file mode 100755
index 000000000..fc66b4f50
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.h
@@ -0,0 +1,153 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectPictureMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/text_style.h>
+#include <Common/situation_map_logging.h>
+
+
+// Esri
+#include <SymbolTypes.h>
+#include <DistanceCompositeSceneSymbol.h>
+
+
+// Qt
+#include <QImage>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class PictureMarkerSymbol;
+class SimpleMarkerSymbol;
+}
+}
+
+class QTimer;
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT GraphicalObjectPictureMarker : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  GraphicalObjectPictureMarker(const Esri::ArcGISRuntime::GeoView     *geoView
+                               , Esri::ArcGISRuntime::GraphicsOverlay  *graphicsLayer
+                               , const QString                        &debugInfo
+                               , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectPictureMarker();
+
+  // Data access:
+  const QImage &image() const { return m_image; }
+  QSize imageDefaultSize() const { return m_imageDefaultSize.value(); }
+  void setImage(const QImage &image, const QSize &defaultSize = QSize());
+
+  void setPictureMarkerSymbol(Esri::ArcGISRuntime::PictureMarkerSymbol *pms, QSize defaultSize);
+
+  virtual MarkerSymbolType markerSymbolType();
+  virtual int markerSymbolSize();
+  virtual void setMarkerSymbol(MarkerSymbolType markerSymbolType,
+                               int size,
+                               const QColor &color = QColor());
+
+  virtual QSize currentSize() const;
+
+  // Offset (x: to right ; y: to north)
+  virtual int  xOffset() const;
+  virtual void setXOffset(int xOffset);
+  virtual int  yOffset() const;
+  virtual void setYOffset(int yOffset);
+
+  // rotation / angle
+  virtual float rotationAngle();
+  virtual void setRotationAngle(float angle);
+
+protected:
+
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_markerSymbolType.changed()
+           || m_markerSize.changed()
+           || m_markerColor.changed()
+           || m_angle.changed()
+           || m_markerHotSpotPercent.changed()
+           || m_externalOffset.changed()
+           || m_imageChanged
+           ;
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_markerSymbolType.reset();
+    m_markerSize.reset();
+    m_markerColor.reset();
+    m_angle.reset();
+    m_markerHotSpotPercent.reset();
+    m_externalOffset.reset();
+    m_imageChanged = false;
+
+    m_imageDefaultSize.reset();
+  }
+
+  bool updateViewImpl() override;
+
+  void resetImage();
+  void resetPictureMarkerSymbol();
+  void resetSimpleMarkerSymbol();
+  bool reCreateSymbol(const QString &filePath,
+                      const Esri::ArcGISRuntime::SimpleMarkerSymbolStyle esriSMSS);
+
+  // used for image:
+  QImage                                     m_image;
+  SimpleValue<QSize>                         m_imageDefaultSize;
+  Esri::ArcGISRuntime::PictureMarkerSymbol  *m_pictureMarkerSymbol   = nullptr;
+  bool                                       m_imageChanged          = true;
+  bool                                       m_isOwnPms              = true;
+
+  // used marker:
+  Esri::ArcGISRuntime::SimpleMarkerSymbol   *m_simpleMarkerSymbol    = nullptr;
+  QTimer                                    *m_workaorundTimer       = nullptr; // for re-new of Esri::ArcGISRuntime::PictureMarkerSymbol
+
+  QSize                                      m_currentSize;
+  int                                        m_scaleCounter4Moduletest = 0;
+
+
+  SimpleValue<MarkerSymbolType>         m_markerSymbolType  = MarkerSymbolType::Undefined;
+  SimpleValue<int>                      m_markerSize        = 10;
+  SimpleValue<QColor>                   m_markerColor       = QColor(Qt::red);
+
+  SimpleValue<float>                    m_angle                 = 0;  ///
+  SimpleValue<QPointF>                  m_markerHotSpotPercent;       ///< Store marker-specific offset.
+  SimpleValue<QPoint>                   m_externalOffset;             ///< Stores external offset.
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp
new file mode 100755
index 000000000..fa50452e6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp
@@ -0,0 +1,170 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectRange
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_range.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <PolygonBuilder.h>
+#include <MultipartBuilder.h>
+#include <ImmutablePartCollection.h>
+#include <Graphic.h>
+#include <ImmutablePart.h>
+#include <PartCollection.h>
+#include <Point.h>
+#include <Polygon.h>
+#include <Part.h>
+#include <SpatialReference.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+GraphicalObjectRange::GraphicalObjectRange(const Esri::ArcGISRuntime::GeoView     *geoView
+                                           , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                           , const QString                        &debugInfo
+                                           , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectRange"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectRange::~GraphicalObjectRange()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+
+int GraphicalObjectRange::range() const
+{
+  return m_range.value();
+}
+
+float GraphicalObjectRange::angle() const
+{
+  return m_angleDegree.value();
+}
+
+void GraphicalObjectRange::setRange(int range, float angleDegree)
+{
+  m_angleDegree = angleDegree;
+  m_range       = range;
+}
+
+
+
+bool GraphicalObjectRange::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  EllipseParameters ellipsePara;
+  ellipsePara.setLengthX(m_range.value());
+  ellipsePara.setLengthY(m_range.value());
+  ellipsePara.setDirectionDegree(m_angleDegree.value()) ;
+  ellipsePara.setDirectionDegree((m_angleDegree.value() * -1) + 90);
+  ellipsePara.setMaxSegmentLength(10);
+  ellipsePara.setMaxPointCount(30);    // limit to 30 to reduce the number of vertices. If to high, keep performance impact to 3D in mind!!!
+
+  this->setEllipseParameters(ellipsePara);
+
+  bool success = BaseClass::updateViewImpl();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " drawOrder = " << m_graphic->zIndex()
+                      << " success = " << success;
+  return success;
+}
+
+
+bool GraphicalObjectRange::createEllipse(Esri::ArcGISRuntime::Polygon &ellipse)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " range=" << m_range
+                      << " angle=" << m_angleDegree;
+
+  bool success = BaseClass::createEllipse(ellipse);
+
+  if (success &&
+      !ellipse.isEmpty() &&
+      !ellipse.parts().isEmpty() &&
+      !ellipse.parts().part(0).isEmpty())
+  {
+    const Point3D &center = this->origin();
+
+    // 'modify' ellipe (by copying, adding and re-assigning):
+
+    // part 0 - ellipse
+    // we have to copy the point since the ellipse does not contain the z value anymore :-(
+    Esri::ArcGISRuntime::Part partCircle(ellipse.spatialReference());
+    const Esri::ArcGISRuntime::ImmutablePart &im = ellipse.parts().part(0);
+
+    for (int i = 0; i < im.pointCount(); ++i)
+    {
+      const Esri::ArcGISRuntime::Point &p = im.point(i);
+      partCircle.addPoint(Esri::ArcGISRuntime::Point(p.x(),
+                                                     p.y(),
+                                                     center.z() // p.z()
+                                                     ));
+    }
+
+    // part 1 - line to center
+    Esri::ArcGISRuntime::Part partLine(ellipse.spatialReference());
+    partLine.addPoint(im.startPoint().x(),
+                      im.startPoint().y(),
+                      center.z());
+    partLine.addPoint(center.x(),
+                      center.y(),
+                      center.z());
+    // a polyGON requiree to have at least 3 points:
+    partLine.addPoint(center.x(),
+                      center.y(),
+                      center.z()+0.01);
+
+    // combine them to a PartCollection:
+    Esri::ArcGISRuntime::PartCollection pc(ellipse.spatialReference());
+    pc.addPart(&partCircle);
+    pc.addPart(&partLine);
+
+    Esri::ArcGISRuntime::PolygonBuilder builder(ellipse.spatialReference());
+    builder.setParts(&pc);
+
+    ellipse = builder.toPolygon();
+
+    success = true;
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'";
+  return success;
+}
+
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<<(std::ostream &stream,
+                         const GraphicalObjectRange &value)
+{
+  stream << value.toString();
+  return stream;
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.h
new file mode 100755
index 000000000..5151ea224
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.h
@@ -0,0 +1,87 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectRange
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "graphical_object_ellipse.h"
+
+
+// Esri
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectRange : public GraphicalObjectEllipse
+{
+
+  using BaseClass = GraphicalObjectEllipse;
+
+public:
+  GraphicalObjectRange(const Esri::ArcGISRuntime::GeoView     *geoView
+                       , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                       , const QString                        &debugInfo
+                       , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectRange();
+
+  int range() const;
+  float angle() const;
+
+  void setRange(int range, float angleDegree);
+
+
+
+protected:
+  // Internal/Admin
+  //  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_angleDegree.changed()
+           || m_range.changed();
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_angleDegree.reset();
+    m_range.reset();
+  }
+
+
+  bool updateViewImpl() override;
+
+
+  bool createEllipse(Esri::ArcGISRuntime::Polygon &ellipse) override;
+
+
+private:
+  SimpleValue<float>    m_angleDegree = 0;
+  SimpleValue<int>      m_range       = 0;
+  LOGGER_T              m_logger;            ///< Interface of the Logging-Facility
+
+
+};
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<< (std::ostream   &stream,
+                          const GraphicalObjectRange &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp
new file mode 100755
index 000000000..6a8cd81e1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp
@@ -0,0 +1,144 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectRendererAttributes
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_renderer_attributes.h"
+#include <Map/situation_map_utils.h> // operator<<
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <GraphicsOverlay.h>
+#include <ModelSceneSymbol.h>
+
+
+// Qt
+#include <QPainter>
+#include <QFile>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <AttributeListModel.h>
+#include <Point.h>
+
+namespace SituationMap
+{
+
+GraphicalObjectRendererAttributes::GraphicalObjectRendererAttributes(const Esri::ArcGISRuntime::GeoView     *geoView
+                                                                     , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                                     , const QString                        &debugInfo
+                                                                     , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_logger(getLogger("GraphicalObjectRendererAttributes"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectRendererAttributes::~GraphicalObjectRendererAttributes()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectRendererAttributes::setAttributeMap(const QVariantMap &attribMap)
+{
+  m_attributeMap = attribMap;
+}
+
+QVariantMap GraphicalObjectRendererAttributes::attributeMap() const
+{
+  return m_attributeMap.value();
+}
+
+bool GraphicalObjectRendererAttributes::create()
+{
+  return BaseClass::create();
+}
+
+bool GraphicalObjectRendererAttributes::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " pickable=" << m_pickable
+                      << " pickable.changed=" << m_pickable.changed()
+                      << " selected=" << m_selected
+                      << " m_attributeMap = " << m_attributeMap.value().size()
+                      << " m_drawOrder = " << m_drawOrder;
+
+  // some checks:
+  if (!isSinglePoint())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  const Point3D &origin = this->origin();
+  m_graphic->setGeometry(Esri::ArcGISRuntime::Point(origin.x(),
+                                                    origin.y(),
+                                                    origin.z(),
+                                                    spatialReference()));
+
+  if (m_attributeMap.changed())
+  {
+    QVariantMap cur = m_graphic->attributes()->attributesMap();
+
+    if (m_logger.isDebugEnabled())
+      qCritical() <<  " debugInfo='" << m_debugInfo << "'" << ", QVariantMap before unite " << cur;
+
+    // Qt6: QMap::unite() removed; insert only the keys not already present (unite semantics).
+    const QVariantMap otherAttrs = m_attributeMap.value();
+    for (auto it = otherAttrs.constBegin(); it != otherAttrs.constEnd(); ++it)
+      if (!cur.contains(it.key()))
+        cur.insert(it.key(), it.value());
+
+    if (m_logger.isDebugEnabled())
+      qCritical() <<  " debugInfo='" << m_debugInfo << "'" << ", QVariantMap after  unite " << cur;
+
+    m_graphic->attributes()->setAttributesMap(cur);
+  }
+
+  // keep anchor like Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Bottom in mind.
+  // assigned during setup the Renderer (LayerFactory, AdapterDds...)
+
+  success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  success = addUpdateGraphic();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success=" << success
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_graphic->drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.h
new file mode 100755
index 000000000..47e07fcda
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.h
@@ -0,0 +1,102 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectRendererAttributes
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/text_style.h>
+#include <Common/situation_map_logging.h>
+
+
+// Esri
+#include <SymbolTypes.h>
+
+
+// Qt
+#include <QImage>
+#include <QVariantMap>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class ModelSceneSymbol;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT GraphicalObjectRendererAttributes : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  GraphicalObjectRendererAttributes(const Esri::ArcGISRuntime::GeoView     *geoView
+                                  , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                  , const QString                        &debugInfo
+                                  , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectRendererAttributes();
+
+  // Data access:
+  // to be cont.
+  void setAttributeMap(const QVariantMap &attribMap);
+  QVariantMap attributeMap() const;
+
+protected:
+
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_attributeMap.changed()
+           ;
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_attributeMap.reset();
+  }
+
+  bool updateViewImpl() override;
+
+  // no ModelSceneSymbol since Renderer-based
+
+  SimpleValue<QVariantMap>               m_attributeMap;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object;
+  PositionCont positions() const override
+  {
+    return PositionCont();
+  }
+  void setPositions(const PositionCont &posCont) override
+  {
+    Q_UNUSED(posCont);
+    Q_ASSERT(false);
+  }
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp
new file mode 100755
index 000000000..d5d30fade
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp
@@ -0,0 +1,209 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectSceneMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_scene_marker.h"
+#include <Map/situation_map_utils.h> // operator<<
+#include <MathUtils/simple_helper.h>
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <GraphicsOverlay.h>
+#include <SimpleMarkerSceneSymbol.h>
+
+
+// Qt
+#include <QPainter>
+#include <QTimer>
+#include <Graphic.h>
+#include <MapTypes.h>
+#include <Point.h>
+#include <SpatialReference.h>
+
+
+namespace SituationMap
+{
+
+GraphicalObjectSceneMarker::GraphicalObjectSceneMarker(SceneMarkerType                        type
+                                                       , const Esri::ArcGISRuntime::GeoView   *geoView
+                                                       , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                                       , const QString                        &debugInfo
+                                                       , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_type(type)
+  , m_logger(getLogger("GraphicalObjectSceneMarker"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectSceneMarker::~GraphicalObjectSceneMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  delete m_simpleMarkerSceneSymbol;
+  m_simpleMarkerSceneSymbol = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void GraphicalObjectSceneMarker::setDiameter(double diameter)
+{
+  m_diameter = diameter;
+}
+
+double GraphicalObjectSceneMarker::diameter() const
+{
+  return m_diameter.value();
+}
+
+bool GraphicalObjectSceneMarker::create()
+{
+  return BaseClass::create();
+}
+
+bool GraphicalObjectSceneMarker::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " pickable=" << m_pickable
+                      << " pickable.changed=" << m_pickable.changed()
+                      << " selected=" << m_selected
+                      << " m_diameter = " << m_diameter.value()
+                      << " m_heading = " << m_heading.value()
+                      << " m_pitch = " << m_pitch.value()
+                      << " m_roll = " << m_roll.value()
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_lineStyle = " << m_lineStyle.value()
+                      << " m_fillStyle = " << m_fillStyle.value()
+                      << " fillColor = "   << m_fillStyle.value().fillColor()
+                      << " m_scale = " << m_scale.value();
+
+  if (m_graphicsLayer->renderingMode() != Esri::ArcGISRuntime::GraphicsRenderingMode::Dynamic)
+    for (int i=0; i<10; ++i)
+      ERROR_LOG(m_logger) <<  " RenderingMode::Dynamic required!!! , debugInfo='" << m_debugInfo << "'";
+
+  // some checks:
+  if (!isSinglePoint())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  bool success = create();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  const double radiusHeight = m_diameter.value()/2.0;
+
+  Point3D origin = this->origin();
+
+  // Try to set AnchorPosition::Top, to let the cone rotate around top/tip.
+  // Using a cone, the anchor point does not work as expected, we have to move
+  if (m_type == SceneMarkerType::CONE)
+  {
+    //
+    // It´s a SCENE Marker. So we are per definition in 3D and origin is in degree.
+    //
+    // heading is in degree:m_heading.value()
+    // offset as vector:
+    QPointF offsetMeter(0, radiusHeight/2.0);
+    const int rotAngleDegree = (static_cast<int>(m_heading.value())-90)%360;
+    DEBUG_LOG(m_logger) << " offsetMeter = " << offsetMeter << ", m_heading = " << m_heading.value() << ", rotAngleDegree = " << rotAngleDegree;
+    MathUtils::rotatePoint(offsetMeter, QPointF(), rotAngleDegree);
+    // new temporary origin...
+    // -> rad
+    origin *= LtsCoordTrans::deg2rad();
+    LtsCoordTrans::UtmCoordinate newOrigin = LtsCoordTrans::UtmCoordinate::fromGeographic(origin.x(), origin.y());
+    DEBUG_LOG(m_logger) << " newOrigin = " << newOrigin.mgrs();
+
+    // add rotated offset to temporary origin:
+    const QPointF origin2D = newOrigin.geographic(offsetMeter) * LtsCoordTrans::rad2deg();
+    // -> deg
+    // write back; z-value stays untouched:
+    origin.rx() = origin2D.x();
+    origin.ry() = origin2D.y();
+  }
+
+  const Esri::ArcGISRuntime::Point originGeometry(origin.x(),
+                                                  origin.y(),
+                                                  origin.z(),
+                                                  spatialReference());
+  m_graphic->setGeometry(originGeometry);
+
+  if (!m_simpleMarkerSceneSymbol)
+  {
+    switch (m_type)
+    {
+    case SceneMarkerType::CONE:   // Kegel
+      m_simpleMarkerSceneSymbol =
+          Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::cone(
+            m_fillStyle.value().fillColor(),
+            radiusHeight, radiusHeight,                               // V100.8: cone: 'diameter' is interpreted as radius
+            Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center);  // V100.8: cone: Top does not work as aspected - grrr
+      break;
+    case SceneMarkerType::SPHERE: // Kugel
+      m_simpleMarkerSceneSymbol =
+          Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::sphere(
+            m_fillStyle.value().fillColor(),
+            radiusHeight*2.0,
+            Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center);
+      break;
+    } // switch
+  }
+  m_simpleMarkerSceneSymbol->setColor(m_fillStyle.value().fillColor());
+
+  if (m_type == SceneMarkerType::CONE)
+  {
+    m_simpleMarkerSceneSymbol->setWidth(radiusHeight);
+    m_simpleMarkerSceneSymbol->setHeight(radiusHeight);
+    m_simpleMarkerSceneSymbol->setDepth(radiusHeight);
+  } else {
+    m_simpleMarkerSceneSymbol->setWidth(m_diameter.value());
+    m_simpleMarkerSceneSymbol->setHeight(m_diameter.value());
+    m_simpleMarkerSceneSymbol->setDepth(m_diameter.value());
+  }
+
+  m_simpleMarkerSceneSymbol->setHeading(m_heading.value());
+  m_simpleMarkerSceneSymbol->setPitch(m_pitch.value());
+  m_simpleMarkerSceneSymbol->setRoll(m_roll.value());
+
+  m_graphic->setSymbol(m_simpleMarkerSceneSymbol);
+
+  success = BaseClass::updateViewImpl();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  success = addUpdateGraphic();
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " updateView failed";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success=" << success
+                      << " m_drawOrder = " << m_drawOrder
+                      << " m_graphic->drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.h
new file mode 100755
index 000000000..f42aebc71
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.h
@@ -0,0 +1,137 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectSceneMarker
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/text_style.h>
+#include <Common/situation_map_logging.h>
+
+
+// Esri
+#include <SymbolTypes.h>
+
+
+// Qt
+#include <QImage>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class SimpleMarkerSceneSymbol;
+}
+}
+
+class QTimer;
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//
+//
+//
+// !!! Layer with RenderingMode::Dynamic required !!!
+// !!! Layer with RenderingMode::Dynamic required !!!
+// !!! Layer with RenderingMode::Dynamic required !!!
+//
+//
+//
+
+enum class SceneMarkerType {CONE, SPHERE};
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectSceneMarker : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+
+public:
+  GraphicalObjectSceneMarker(SceneMarkerType type
+                             , const Esri::ArcGISRuntime::GeoView     *geoView
+                             , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                             , const QString                        &debugInfo
+                             , const UniqueMapId                    &uniqueMapId);
+
+  ~GraphicalObjectSceneMarker();
+
+  // Data access:
+  // to be cont. (type is sphere,  to support cube, cylinder etc)
+  void setDiameter(double diameter);
+  double diameter() const;
+
+  double heading() const                  { return m_heading.value();   }
+  void setHeading(double headingDegree)   { m_heading = headingDegree;  }
+  double pitch() const                    { return m_pitch.value();     }
+  void setPitch(double pitchDegree)       { m_pitch = pitchDegree;      }
+  double roll() const                     { return m_roll.value();      }
+  void setRoll(double rollDegree)         { m_roll = rollDegree;        }
+
+protected:
+
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+        || m_diameter.changed()
+        || m_heading.changed()
+        || m_pitch.changed()
+        || m_roll.changed()
+        ;
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_diameter.reset();
+    m_heading.reset();
+    m_pitch.reset();
+    m_roll.reset();
+  }
+
+  bool updateViewImpl() override;
+
+  // used marker:
+  Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *m_simpleMarkerSceneSymbol{nullptr};
+
+  SceneMarkerType                               m_type{SceneMarkerType::SPHERE};
+  SimpleValue<double>                           m_diameter{25};
+
+  SimpleValue<double>                           m_heading{0};  // degree
+  SimpleValue<double>                           m_pitch{0};    // degree
+  SimpleValue<double>                           m_roll{0};     // degree
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object;
+  PositionCont positions() const override
+  {
+    return PositionCont();
+  }
+  void setPositions(const PositionCont &posCont) override
+  {
+    Q_UNUSED(posCont);
+    Q_ASSERT(false);
+  }
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp
new file mode 100755
index 000000000..ad876156e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp
@@ -0,0 +1,344 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectText
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "graphical_object_text.h"
+#include <Map/situation_map_utils.h> // operator<<
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <TextSymbol.h>
+#include <PictureMarkerSymbol.h>
+
+// Qt
+#include <QString>
+
+#include <iostream>
+#include <algorithm>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Point.h>
+#include <SymbolTypes.h>
+
+namespace SituationMap
+{
+
+GraphicalObjectText::GraphicalObjectText(const Esri::ArcGISRuntime::GeoView     *geoView
+                                         , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                                         , const QString                        &debugInfo
+                                         , const UniqueMapId                    &uniqueMapId)
+  : BaseClass(geoView, graphicsLayer, debugInfo, uniqueMapId)
+  , m_textSymbol(nullptr)
+  , m_logger(getLogger("GraphicalObjectText"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+GraphicalObjectText::~GraphicalObjectText()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " text='" << m_text << "'";
+
+  delete m_textSymbol;
+  m_textSymbol = nullptr;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " text='" << m_text << "'";
+}
+
+QString GraphicalObjectText::toString() const
+{
+  QString str;
+  //  str.append( BaseClass::toString() );
+
+  if (!m_debugInfo.isEmpty())
+    str.append(QStringLiteral("debugInfo=%1").arg(m_debugInfo));
+
+  if (m_graphicsLayer)
+    str.append(QStringLiteral(" layer='%1'").arg(m_graphicsLayer->objectName()));
+
+  if (m_graphic)
+    str.append(QStringLiteral(" zIndex='%1'").arg(m_graphic->zIndex()));
+
+  std::ostringstream stream;
+  stream << this->origin();
+  str.append(QLatin1String(stream.str().c_str()));
+
+  if (!m_text.value().isEmpty())
+    str.append(QStringLiteral("text=%1").arg(m_text.value()));
+
+  return str;
+}
+
+QString GraphicalObjectText::text() const
+{
+  return m_text.value();
+}
+
+void GraphicalObjectText::setText(const QString &text)
+{
+  m_text = text;
+}
+
+TextStyle GraphicalObjectText::textStyle() const
+{
+  return m_textStyle.value();
+}
+TextStyle &GraphicalObjectText::rTextStyle()
+{
+  return m_textStyle.refValue();
+}
+void GraphicalObjectText::setTextStyle(const TextStyle &textStyle)
+{
+  m_textStyle = textStyle;
+}
+
+float GraphicalObjectText::xOffset() const
+{
+  return m_offset.value().x();
+}
+void GraphicalObjectText::setXOffset(float xOffset)
+{
+  QPointF temp = m_offset.value();
+  temp.rx() = xOffset;
+  m_offset = temp;
+}
+float GraphicalObjectText::yOffset() const
+{
+  return m_offset.value().y();
+}
+void GraphicalObjectText::setYOffset(float yOffset)
+{
+  QPointF temp = m_offset.value();
+  temp.ry() = yOffset;
+  m_offset = temp;
+}
+
+
+bool GraphicalObjectText::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " text='" << m_text << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility;
+  bool success = true;
+
+  // some checks:
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " no graphicsLayer";
+    return false;
+  }
+
+  BaseClass::create();
+
+  if (!m_textSymbol)
+    m_textSymbol = new Esri::ArcGISRuntime::TextSymbol();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      << " text='" << m_text << "'"
+                      << " success=" << success
+                      << " drawOrder = " << m_graphic->zIndex();
+  return success;
+}
+
+bool GraphicalObjectText::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " START, debugInfo='" << m_debugInfo << "'"
+                      << " text='" << m_text << "'"
+                      << " origin =" << this->origin() // .x() << " , " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " m_textStyle=" << m_textStyle
+                      << " offset=" << m_offset;
+
+  // some checks:
+  if (!this->isSinglePoint())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  bool success = true;
+  if (m_visibility.value())
+  {
+    success = create();  // create only if visible
+    if (!success)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " create failed";
+      return false;
+    }
+
+    if (! BaseClass::updateViewImpl())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " updateViewImpl failed";
+    }
+
+    //  FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+    //                      << " text='" << m_text << "'"
+    //                      << " changed1="  << m_text.changed()
+    //                      << " changed2="<< m_textStyle.changed();
+
+    bool assignTextSymbol = false;
+
+    //  || m_visibility.changed()) -> szenario: create invisible object and make it visible
+    if (m_text.changed() || m_visibility.changed())
+    {
+      m_textSymbol->setText(m_text.value());
+      assignTextSymbol = true;
+    }
+
+    // TextStyle to TextSymbol@ESRI :
+    if (m_textStyle.changed()
+        || m_scale.changed()
+        || m_visibility.changed() // -> szenario: create invisible object and make it visible
+       )
+    {
+      const TextStyle &textStyle = m_textStyle.value();
+      m_textSymbol->setColor(textStyle.textColor());
+
+      // High values can lead to coredump with 'SymbolDrawHelper::create_line_image FAILED, SkBitmap is NULL or empty' -> limit
+      m_textSymbol->setSize(std::min(500.0f, textStyle.size()  *  m_scale.value()));
+      m_textSymbol->setAngle(textStyle.angle());
+
+      m_textSymbol->setFontFamily(textStyle.fontFamily());
+
+      m_textSymbol->setFontWeight(textStyle.bold()   ? Esri::ArcGISRuntime::FontWeight::Bold  : Esri::ArcGISRuntime::FontWeight::Normal);
+      m_textSymbol->setFontStyle(textStyle.italic() ? Esri::ArcGISRuntime::FontStyle::Italic : Esri::ArcGISRuntime::FontStyle::Normal);
+
+      Esri::ArcGISRuntime::FontDecoration fd = Esri::ArcGISRuntime::FontDecoration::None;
+      if (textStyle.underline())
+        fd = Esri::ArcGISRuntime::FontDecoration::Underline;
+      if (textStyle.strikeThrough())
+        fd = Esri::ArcGISRuntime::FontDecoration::LineThrough;
+      m_textSymbol->setFontDecoration(fd);
+
+      float outlineWidth = 0;
+      if (textStyle.textOutlineWidth() > 0)
+        outlineWidth = textStyle.textOutlineWidth() * m_scale.value();
+      if (m_textSymbol->size() <= 15)          // small size -> outline reduces readability :-(
+        outlineWidth = 0.0;
+      m_textSymbol->setHaloWidth(outlineWidth);
+
+      if (textStyle.textOutlineColor().isValid())
+        m_textSymbol->setHaloColor(textStyle.textOutlineColor());
+
+//      qWarning() << " haloWidth = " << m_textSymbol->haloWidth();
+
+//      m_textSymbol->setHaloColor(Qt::white);
+//      m_textSymbol->setHaloWidth(outlineWidth);
+
+//      qWarning() << " fontSize " << textStyle.size()  *  m_scale.value()
+//                 <<" (textStyle.size() " << textStyle.size()
+//                << " m_scale.value() " << m_scale.value() << ")";
+
+//      qWarning() << " outlineWidth " << outlineWidth
+//                 <<" (textStyle.textOutlineWidth() " << textStyle.textOutlineWidth()
+//                << " m_scale.value() " << m_scale.value() << ")";
+
+//      if (textStyle.backgroundColor().isValid())
+      m_textSymbol->setBackgroundColor(textStyle.backgroundColor());
+
+//      m_textSymbol->setAntiAliased(textStyle.antiAliased());
+
+      m_textSymbol->setHorizontalAlignment(convert(textStyle.horizontalAlignment()));
+      m_textSymbol->setVerticalAlignment(convert(textStyle.verticalAlignment()));
+
+      assignTextSymbol = true;
+      // : TextStyle to TextSymbol@ESRI
+    }
+
+    //  || m_visibility.changed()) -> szenario: create invisible object and make it visible
+    if (m_offset.changed() || m_visibility.changed())
+    {
+      m_textSymbol->setOffsetX(m_offset.value().x());
+      m_textSymbol->setOffsetY(m_offset.value().y());
+      assignTextSymbol = true;
+    }
+
+    if (assignTextSymbol)
+      m_graphic->setSymbol(m_textSymbol);
+
+
+    // check ChangedFlags:
+    // Object is created and text is invisble due to scale (meterPerPixel)
+    // map is zoomed in -> text should arise, but on m_visibility is changed:
+    if (m_visibility.changed() || m_positions.changed())
+    {
+      const Point3D &origin = this->origin();
+      m_graphic->setGeometry(Esri::ArcGISRuntime::Point(origin.x(),
+                                                        origin.y(),
+                                                        origin.z(),
+                                                        spatialReference()));
+      success = addUpdateGraphic();
+    } // m_visibility.changed() || m_positions.changed()
+
+  }
+  else     // if visible
+  {
+    BaseClass::updateViewImpl();
+    success = addUpdateGraphic();
+  }
+
+  if (m_logger.isTraceEnabled())
+  {
+    int drawOrder = -1;
+    if (m_graphic)
+      drawOrder = m_graphic->zIndex();
+    TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                        << " text='" << m_text << "'"
+                        << " success=" << success
+                        << " drawOrder = " << drawOrder;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION <<  " END, debugInfo='" << m_debugInfo << "'"
+                      //  << " fontFamily='" << m_textSymbol->fontFamily() << "'"
+                      ;
+  return success;
+}
+
+
+
+Esri::ArcGISRuntime::HorizontalAlignment GraphicalObjectText::convert(const HorizontalAlignment horizontalAlignment)
+{
+  Esri::ArcGISRuntime::HorizontalAlignment esriAlignmenmt =
+    Esri::ArcGISRuntime::HorizontalAlignment::Left;
+  switch (horizontalAlignment)
+  {
+  case HorizontalAlignment::Left:     esriAlignmenmt = Esri::ArcGISRuntime::HorizontalAlignment::Left;    break;
+  case HorizontalAlignment::Center:   esriAlignmenmt = Esri::ArcGISRuntime::HorizontalAlignment::Center;  break;
+  case HorizontalAlignment::Right:    esriAlignmenmt = Esri::ArcGISRuntime::HorizontalAlignment::Right;   break;
+  case HorizontalAlignment::Justify:  esriAlignmenmt = Esri::ArcGISRuntime::HorizontalAlignment::Justify; break;
+  } // switch
+
+  return esriAlignmenmt;
+}
+
+Esri::ArcGISRuntime::VerticalAlignment GraphicalObjectText::convert(const VerticalAlignment verticalAlignment)
+{
+  Esri::ArcGISRuntime::VerticalAlignment esriAlignmenmt =
+    Esri::ArcGISRuntime::VerticalAlignment::Bottom;
+  switch (verticalAlignment)
+  {
+  case VerticalAlignment::Bottom:   esriAlignmenmt = Esri::ArcGISRuntime::VerticalAlignment::Bottom;    break;
+  case VerticalAlignment::Middle:   esriAlignmenmt = Esri::ArcGISRuntime::VerticalAlignment::Middle;    break;
+  case VerticalAlignment::Top:      esriAlignmenmt = Esri::ArcGISRuntime::VerticalAlignment::Top;       break;
+  case VerticalAlignment::BaseLine: esriAlignmenmt = Esri::ArcGISRuntime::VerticalAlignment::Baseline;  break;
+  } // switch
+  return esriAlignmenmt;
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.h
new file mode 100755
index 000000000..f649c2917
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.h
@@ -0,0 +1,125 @@
+/**
+  * @RDE_HEADER@
+  * GraphicalObjectText
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+#include <Map/text_style.h>
+#include <Map/situation_map_utils.h>
+#include <Common/simple_value.h>
+#include <Common/situation_map_logging.h>
+
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class PictureMarkerSymbol;
+class TextSymbol;
+
+enum class HorizontalAlignment;
+enum class VerticalAlignment;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SITUATIONMAP_EXPORT GraphicalObjectText  : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+  GraphicalObjectText(const Esri::ArcGISRuntime::GeoView     *geoView
+                      , Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer
+                      , const QString                        &debugInfo
+                      , const UniqueMapId                    &uniqueMapId
+                     );
+
+  ~GraphicalObjectText();
+
+  QString toString() const override; // specialized
+
+  // Data access:
+  QString text() const;
+  void setText(const QString &text);
+
+  TextStyle textStyle() const;
+  TextStyle &rTextStyle();
+  void setTextStyle(const TextStyle &textStyle);
+
+  // Offset
+  virtual float  xOffset() const;
+  virtual void setXOffset(float xOffset);
+  virtual float  yOffset() const;
+  virtual void setYOffset(float yOffset);
+
+  static Esri::ArcGISRuntime::HorizontalAlignment convert(const HorizontalAlignment horizontalAlignment);
+  static Esri::ArcGISRuntime::VerticalAlignment   convert(const VerticalAlignment verticalAlignment);
+
+
+protected:
+  // Internal/Admin
+  bool create() override;
+
+  bool changed() override
+  {
+    return BaseClass::changed()
+           || m_text.changed()
+           || m_textStyle.changed()
+           || m_offset.changed();
+  }
+
+  void resetChanged() override
+  {
+    BaseClass::resetChanged();
+    m_text.reset();
+    m_textStyle.reset();
+    m_offset.reset();
+  }
+
+  bool updateViewImpl() override;
+
+  Esri::ArcGISRuntime::TextSymbol              *m_textSymbol = nullptr;
+
+  SimpleValue<QString>                          m_text;         ///< to be displayed on map
+  SimpleValue<TextStyle>                        m_textStyle;
+  SimpleValue<QPointF>                          m_offset;       ///< Offset (pixel).
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object;
+  virtual PositionCont positions() const override
+  {
+    return PositionCont();
+  }
+  virtual void setPositions(const PositionCont &posCont) override
+  {
+    Q_UNUSED(posCont);
+  }
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/stub_graphical_object.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/stub_graphical_object.h
new file mode 100755
index 000000000..d19e3f43d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/stub_graphical_object.h
@@ -0,0 +1,69 @@
+/**
+  * @RDE_HEADER@
+  * StubGraphicalObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+
+#include <Map/situation_map_types.h>
+
+
+// Esri
+
+
+
+namespace SituationMap
+{
+
+
+
+/**
+     @class StubGraphicalObject stub_graphical_object.h
+     The class \c StubGraphicalObject is used as substitution for a graphical object. It does
+     nothing and the purpose is only to satisfy the interface of AbstractGraphicalObject.
+     @see AbstractGraphicalObject
+   */
+class StubGraphicalObject : public AbstractGraphicalObject
+{
+
+public:
+
+  explicit StubGraphicalObject()
+    : AbstractGraphicalObject(nullptr, nullptr, QString(), UniqueMapId())
+  {
+  }
+
+  ~StubGraphicalObject() = default;
+
+  StubGraphicalObject(const StubGraphicalObject &other)      = delete;
+  StubGraphicalObject &operator=(StubGraphicalObject &other) = delete;
+
+protected:
+
+  bool changed()        override
+  {
+    return false;
+  }
+
+  bool updateViewImpl() override
+  {
+    return true;
+  }
+
+  bool create()         override
+  {
+    return true;
+  }
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp
new file mode 100755
index 000000000..fdd7778ef
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp
@@ -0,0 +1,627 @@
+/**
+  * @RDE_HEADER@
+  * TacticalAppearance
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "tactical_appearance.h"
+#include <MapImpl/map_impl.h>
+#include <Symbology/symbol_dictionary.h>
+#include <Symbology/sidc_builder_base.h>
+#include <Symbology/sidc_codec.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <Map/situation_map_utils.h> // operator<<
+#include <Common/simple_value.h>
+
+
+// ESRI
+#include <Map.h>
+#include <GraphicsOverlay.h>
+#include <PolygonBuilder.h>
+#include <PolylineBuilder.h>
+#include <MultipointBuilder.h>
+
+// Qt
+#include <QElapsedTimer>
+#include <Geometry.h>
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <PointCollection.h>
+#include <AttributeListModel.h>
+
+
+namespace SituationMap
+{
+
+
+class TacticalAppearance::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  MapImpl                                    *m_mapImpl                 = nullptr;
+  QString                                     m_logicalLayerName;
+
+  Esri::ArcGISRuntime::GraphicsOverlay       *m_graphicOverlayTactical  = nullptr;
+  AdvancedSymbology::SymbolDictionary        *m_dictionary              = nullptr;
+  AdvancedSymbology::SymbolResultWatcher      m_symbolResultWatcher;
+
+  // OWN data:
+  SimpleValue<QString>                        m_uniqueDesignation;
+  SimpleValue<SymbolData>                     m_symbol;
+
+
+  AdvancedSymbology::SymbolDataToRender       m_symDataToRender;
+  GraphicalObjectPictureMarker               *m_pictureMarker           = nullptr;
+
+}; // class TacticalAppearance::Private
+//-----------------------------------------------------------------------------
+
+
+
+TacticalAppearance::TacticalAppearance(MapImpl           *mapImpl,
+                                       const QString     &logicalLayerName,
+                                       const QString     &debugInfo,
+                                       const UniqueMapId &uniqueMapId)
+  : BaseClass(mapImpl->getEsriGeoView(), nullptr, debugInfo, uniqueMapId),
+    m_logger(getLogger("TacticalAppearance")),
+    d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << ", logicalLayerName='" << logicalLayerName << "'";
+
+  d->m_symDataToRender.sizeL    = 100;
+  d->m_mapImpl                  = mapImpl;
+  d->m_logicalLayerName         = logicalLayerName;
+
+  if (!m_graphicsLayer && d->m_mapImpl)
+    m_graphicsLayer = d->m_mapImpl->getGraphicsLayer(d->m_logicalLayerName);
+
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " getGraphicsLayer failed";
+  }
+
+  if (d->m_mapImpl)
+    d->m_dictionary = &(d->m_mapImpl->symbolDictionary());
+
+
+  // lambda:
+  // m_symbolResultWatcher is canceled on destruction.
+  // So it`s safe that no signal will be fired afterwards.
+  // To avoid CLang warnings use m_symbolResultWatcher as context (3rd para), although it´s not intended.
+  // Better idea?
+  QObject::connect(&d->m_symbolResultWatcher, &AdvancedSymbology::SymbolResultWatcher::resultReady, &d->m_symbolResultWatcher, [this]()
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " resultReady...";
+
+    QSharedPointer<AdvancedSymbology::SymbolResult> symResult = d->m_symbolResultWatcher.symbolResult();
+    if (! symResult)
+      return;  // should NEVER happen! (Which object should have triggered the signal???)
+
+    if (d->m_pictureMarker)
+    {
+      d->m_pictureMarker->setImage(symResult->symbolImage().image());
+      d->m_pictureMarker->updateView();
+    }
+  });
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+TacticalAppearance::~TacticalAppearance()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+
+  // abort pending call to SymbolDictionary::findSymbol:
+  d->m_symbolResultWatcher.cancel();
+
+  delete d->m_pictureMarker;
+  d->m_pictureMarker = nullptr;
+
+  removeGraphicFromGraphicOverlayTactical();
+
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void TacticalAppearance::removeGraphicFromGraphicOverlayTactical()
+{
+  if (m_logger.isTraceEnabled())
+  {
+    if (m_graphic)
+    {
+      Esri::ArcGISRuntime::GraphicsOverlay *gOverlay = m_graphic->graphicsOverlay();
+      if (gOverlay)
+        TRACE_LOG(m_logger) << LOGFUNCTION << " START debugInfo='" << m_debugInfo << "'" << " name = '" << gOverlay->overlayId() << "'";
+    }
+  }
+
+  if (m_graphic && d->m_graphicOverlayTactical && d->m_graphicOverlayTactical->graphics())
+    d->m_graphicOverlayTactical->graphics()->removeOne(m_graphic);
+
+  delete m_graphic;
+  m_graphic = nullptr;
+}
+
+
+
+bool TacticalAppearance::useDictionaryRenderMode(const AdvancedSymbology::GeometryType &geomType) const
+{
+  bool usePictureMarker = isSinglePoint() && (AdvancedSymbology::GeometryType::Point == geomType || AdvancedSymbology::GeometryType::Undefined == geomType);
+  return !usePictureMarker || symbol().useAlwaysDictionaryRenderer;
+} // bool TacticalAppearance::useDictionaryRenderMode() const
+
+
+bool TacticalAppearance::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " m_visibility = " << m_visibility;
+
+  bool success = true;
+
+  //
+  // Prepare / create :
+  //
+  // a) singlePoint / exactly one coordinate -> use pictureMarker
+  // or
+  // b) multiPoint / more than one coordinate -> m_graphic / DictionaryRenderer
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * This assumption doesn't work any more because some polyline and polygon symbols will have only one
+   * anchor point and the real geometry is defined by additional attributes like radius, with, length ...
+   *
+   *                                                                                        JT 2016/12/20
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  if (m_graphicsLayer && m_visibility.value())
+  {
+    const SymbolData                           &symbolData_ref  = d->m_symbol.value();
+    const QString                              &baseSymbolCode  = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(symbolData_ref.sidc);
+    const AdvancedSymbology::SymbolProperties &symbolProperties = d->m_dictionary->symbolProperties(baseSymbolCode);
+    AdvancedSymbology::GeometryType            geomType         = symbolProperties.geometryType();
+
+    if (useDictionaryRenderMode(geomType))
+    {
+      if (!d->m_graphicOverlayTactical)
+        d->m_graphicOverlayTactical = d->m_mapImpl->getGraphicsLayerDict(d->m_logicalLayerName);
+
+      if (!d->m_graphicOverlayTactical)
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                            << " getGraphicsLayerDict failed";
+        return false;
+      }
+
+      if (!m_graphic)
+      {
+        m_graphic = new Esri::ArcGISRuntime::Graphic();
+        m_graphic->setObjectName(m_debugInfo);
+        m_graphic->setZIndex(m_drawOrder.value());
+
+        // use attributeModel to store application obj id (SimWorld) at graphic
+        Esri::ArcGISRuntime::AttributeListModel *attLisModel = m_graphic->attributes();
+        if (attLisModel)
+          attLisModel->insertAttribute(QLatin1String(SituationMap::UniqueMapIdAttribute), m_uniqueMapId);
+        else
+          ERROR_LOG(m_logger) << LOGFUNCTION <<  " no AttributeListModel, debugInfo='" << m_debugInfo << "'" << " uniqueMapId=" << m_uniqueMapId;
+
+        // Adding an empty graphic leads to Segmentation fault.
+        // (in Esri_runtimecore::Map_renderer::Dictionary_renderer::derive_geometry)
+
+        bool successGraphic = addUpdateGraphic(); // CHECK
+        if (!successGraphic)
+          ERROR_LOG(m_logger) << LOGFUNCTION <<  " addUpdateGraphic failed, debugInfo='" << m_debugInfo << "'" << " uniqueMapId=" << m_uniqueMapId;
+
+      } // if (!m_graphic)
+    }
+    else
+    {
+      // m_graphic is needless now:
+      removeGraphicFromGraphicOverlayTactical();
+    }
+
+  }
+
+  // : Prepare / create
+
+  bool positionsEmpty = m_positions.value().isEmpty();
+  if (positionsEmpty)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " positions empty";
+
+  success = success && !positionsEmpty;
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " create failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+  return success;
+}
+
+void TacticalAppearance::createPictureMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  if (!d->m_pictureMarker && d->m_mapImpl)
+  {
+    d->m_pictureMarker = new GraphicalObjectPictureMarker(d->m_mapImpl->getEsriGeoView()
+                                                          , m_graphicsLayer
+                                                          , m_debugInfo + QLatin1String("#PicMarkTacticalAppearance")
+                                                          , m_uniqueMapId);
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+void TacticalAppearance::removePictureMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'";
+  delete d->m_pictureMarker;
+  d->m_pictureMarker = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'";
+}
+
+QString TacticalAppearance::uniqueDesignation() const
+{
+  return d->m_uniqueDesignation.value();
+}
+void TacticalAppearance::setUniqueDesignation(const QString &uniqueDesignation)
+{
+  d->m_uniqueDesignation = uniqueDesignation;
+}
+
+SymbolImage TacticalAppearance::symbolImage() const
+{
+  SymbolImage symImage;
+  if (d->m_pictureMarker)
+  {
+    symImage.setImage(d->m_pictureMarker->image());
+    symImage.setValid(!symImage.image().isNull());
+  }
+  return symImage;
+}
+
+
+SymbolData TacticalAppearance::symbol() const
+{
+  return d->m_symbol.value();
+}
+
+void TacticalAppearance::setSymbol(const SymbolData &symbol)
+{
+  d->m_symbol = symbol;
+}
+
+bool TacticalAppearance::changed()
+{
+  return BaseClass::changed()
+         || d->m_uniqueDesignation.changed()
+         || d->m_symbol.changed();
+}
+void TacticalAppearance::resetChanged()
+{
+  BaseClass::resetChanged();
+  d->m_uniqueDesignation.reset();
+  d->m_symbol.reset();
+}
+
+Esri::ArcGISRuntime::Geometry TacticalAppearance::getGraphicGeometry() const
+{
+  if (d->m_pictureMarker) return d->m_pictureMarker->getGraphicGeometry();
+  if (m_graphic)          return m_graphic->geometry();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << "Geometry is undefined";
+
+  return Esri::ArcGISRuntime::Geometry();
+} // Esri::ArcGISRuntime::Geometry TacticalAppearance::getGraphicGeometry() const
+
+
+bool TacticalAppearance::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " symbol='" << d->m_symbol.value().sidc << "'"
+                      << " visibility=" << m_visibility
+                      << " selected=" << m_selected
+                      << " origin=" << this->origin()
+                      << " scale=" << m_scale.value();
+
+  const SymbolData                           &symbolData_ref  = d->m_symbol.value();
+  const QString                              &baseSymbolCode  = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(symbolData_ref.sidc);
+  const AdvancedSymbology::SymbolProperties &symbolProperties = d->m_dictionary->symbolProperties(baseSymbolCode);
+  AdvancedSymbology::GeometryType            geomType         = symbolProperties.geometryType();
+
+  if (geomType == AdvancedSymbology::GeometryType::Undefined)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " GeometryType::Undefined, symbolProperties failed!?!";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << ", geomType=" << geomType
+                      << ", useDictionaryRenderMode(geomType)=" << useDictionaryRenderMode(geomType);
+
+  bool success = create();
+
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " create failed";
+    return false;
+  }
+
+  if (useDictionaryRenderMode(geomType))
+  {
+    // real work:
+    if (m_positions.changed() || d->m_symbol.changed() || m_visibility.changed())
+    {
+      auto buildPointClusterGeometry = [this]() -> Esri::ArcGISRuntime::Geometry
+      {
+        QSharedPointer<Esri::ArcGISRuntime::MultipointBuilder> builder(new Esri::ArcGISRuntime::MultipointBuilder(spatialReference()));
+        Esri::ArcGISRuntime::PointCollection points(spatialReference());
+        const auto posCont = positions();
+        for (const auto &pos : posCont)
+        {
+          DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                              << "   addPoint:" << pos.x() << " - " << pos.y();
+          points.addPoint(pos.x(), pos.y());
+        }
+        builder->setPoints(&points);
+        return builder->toGeometry();
+      }; // buildPointClusterGeometry
+
+      Esri::ArcGISRuntime::Geometry geom;
+
+      switch (geomType)
+      {
+      case AdvancedSymbology::GeometryType::Undefined : break;
+
+      case AdvancedSymbology::GeometryType::Point     :
+      case AdvancedSymbology::GeometryType::Polyline  :
+      {
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << "   m_positions.count()=" << m_positions.value().count();
+        /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        *
+        * If a PolylineBuilder is used here to create symbol geometry the construction appropriate symbol standard (MIL2525C / MIL2525D / App6)
+        * will not be done and the symbol is always a simple polyline. Using MultipointBuilder to build symbol geometry the result is based on
+        * underlying symbol standard.
+        *                                                                                                                      2016/12/9 JT
+        * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+        geom = buildPointClusterGeometry();
+
+      } break;
+
+      case AdvancedSymbology::GeometryType::Polygon :
+      {
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << "   m_positions.count()=" << m_positions.value().count();
+        /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        *
+        * Some symbols have polygon geometry and could have only one or two positions. In case of less than 3 positions do the same as for
+        * polylines and use MultipointBuilder to create the symbol geometry. In other case use PolygonBuilder.
+        *                                                                                                                      2016/12/13 JT
+        * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+        if (positions().size() > 2)
+        {
+          QSharedPointer<Esri::ArcGISRuntime::PolygonBuilder> builder(new Esri::ArcGISRuntime::PolygonBuilder(spatialReference()));
+          const auto posCont = positions();
+          for (const auto &pos : posCont)
+          {
+            DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << "   addPoint:" << pos.x() << " - " << pos.y();
+            builder->addPoint(pos.x(), pos.y());
+          }
+          geom = builder->toGeometry();
+        }
+        else
+          geom = buildPointClusterGeometry();
+
+      } break;
+
+      } // switch
+
+      if (geom.isEmpty())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " Geometry NOT OK -> fallback symbol" << " (geometryType was " << geomType << ")";
+        createPictureMarker();
+        d->m_pictureMarker->setDebugInfo(m_debugInfo + QLatin1String("#fallback"));
+
+        int size = symbolData_ref.size;
+        if (size < 10)  size = 10;
+        if (size > 100) size = 100;
+
+        d->m_pictureMarker->setMarkerSymbol(MarkerSymbolType::Diamond, size, symbolData_ref.color);
+        d->m_pictureMarker->setOrigin(this->origin());
+        d->m_pictureMarker->setDrawOrder(m_drawOrder.value());
+        d->m_pictureMarker->updateView();
+        success = false;
+      }
+      else // geom is not empty
+      {
+        removePictureMarker();
+
+        if (m_graphic)
+        {
+          success = true;
+
+          // move to graphic:
+          m_graphic->setGeometry(geom);
+
+          // prepare rawAttributes for DictionaryRenderer:
+
+          QVariantMap rawAttributes = d->m_symbol.value().attributeMap;
+
+          // build from scratch to honor removed attributes:
+          // (Otherwise the will remain wrongly)
+
+          rawAttributes[QLatin1String(SituationMap::UniqueMapIdAttribute)] = m_uniqueMapId;
+          rawAttributes[QLatin1String(SituationMap::IsPickableAttribute)] = m_pickable.value(); // set pickable attribute JT 2016/12/21
+
+          rawAttributes[QLatin1String("_type")]   = QLatin1String("position_report");
+          rawAttributes[QLatin1String("_action")] = QLatin1String("update");
+          rawAttributes[QLatin1String("sidc")]    = AdvancedSymbology::SidcCodec::decodeRawSidc(d->m_symbol.value().sidc); // in case of MIL2525
+          rawAttributes[QLatin1String("sic")]     = AdvancedSymbology::SidcCodec::decodeRawSidc(d->m_symbol.value().sidc); // in case of APP6
+
+          Esri::ArcGISRuntime::AttributeListModel * attributeModel = m_graphic->attributes();
+          if (attributeModel)
+            attributeModel->setAttributesMap(rawAttributes);
+          else
+            ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " no AttributeListModel";
+
+
+
+//          // prepare rawAttributes for DictionaryRenderer:
+//          QVariantMap rawAttributes = d->m_symbol.value().attributeMap;
+
+//          rawAttributes[QLatin1String(SituationMap::IsPickableAttribute)] = m_pickable.value(); // set pickable attribute JT 2016/12/21
+
+//          rawAttributes[QLatin1String("_type")]   = QLatin1String("position_report");
+//          rawAttributes[QLatin1String("_action")] = QLatin1String("update");
+//          rawAttributes[QLatin1String("sidc")]    = AdvancedSymbology::SidcCodec::decodeRawSidc(d->m_symbol.value().sidc); // in case of MIL2525
+//          rawAttributes[QLatin1String("sic")]     = AdvancedSymbology::SidcCodec::decodeRawSidc(d->m_symbol.value().sidc); // in case of APP6
+//          // move to graphic:
+//          m_graphic->setGeometry(geom);
+
+//          /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//           * Replace:
+//           *             m_graphic->attributes()->setAttributesMap(rawAttributes);
+//           *
+//           * because it doesn't work anymore in ArcGISRuntime V100.2
+//           *                                                             JT, 2018/01/24
+//           * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+//          Esri::ArcGISRuntime::AttributeListModel * attributeModel = m_graphic->attributes();
+//          if (attributeModel)
+//          {
+//            if (!attributeModel->isEmpty())
+//            {
+//              for (auto it = rawAttributes.cbegin(); it != rawAttributes.cend(); ++it)
+//              {
+//                const QString &attrKey = it.key();
+//                if (attributeModel->containsAttribute(attrKey))
+//                {
+//                  attributeModel->replaceAttribute(attrKey, rawAttributes[attrKey]);
+//                  continue;
+//                }
+//                attributeModel->insertAttribute(attrKey, rawAttributes[attrKey]);
+//              }
+//            }
+//            else attributeModel->setAttributesMap(rawAttributes);
+//          }
+
+          // 2021-08, N. Thoden
+          // While switching back to the behaviour that one logical layer has
+          // 1st getGraphicsLayer and 2nd getGraphicsLayerDict [GUEZE-496],
+          // the tactical appereance of DangerArea and similar disappears.
+          // Reason: m_graphicsLayer and m_graphicOverlayTactical are different now!
+          // It seems like that in former versions (< V100.8) the graphic could
+          // be added to more than one Esri layer.
+          // Now (V100.8) adding to a second layer fails.
+          // But we can remove the m_graphic from the default m_graphicsLayer
+          // before adding the the desired one: m_graphicOverlayTactical
+          if (m_graphicsLayer->graphics()->contains(m_graphic))
+            m_graphicsLayer->graphics()->removeOne(m_graphic);
+
+          // add to graphicOverlayTactical:
+          if (! d->m_graphicOverlayTactical->graphics()->contains(m_graphic))
+            d->m_graphicOverlayTactical->graphics()->append(m_graphic);
+
+          bool successGraphic = d->m_graphicOverlayTactical->graphics()->contains(m_graphic);
+          if (!successGraphic)
+            ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                                << " m_graphic not added to m_graphicOverlayTactical";
+        }
+        else
+        {
+          DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                              << " no m_graphic";
+          // success = false;
+          success = true;  // if the DictionaryRenderer is used, m_graphic is null and that is ok.
+        }
+
+      } // if (geom.isEmpty())
+    }
+
+  }
+  else // !useDictionaryRenderMode(geomType)
+  {
+    createPictureMarker();
+    d->m_pictureMarker->setOrigin(this->origin());
+
+    // real work:
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                        << " update geometry";
+
+
+    if (d->m_symbol.changed() || m_scale.changed())
+    {
+      if (d->m_dictionary)
+      {
+        int widthPixel = SituationMap::SymbolSizeLdefault;
+        widthPixel *= symbolData_ref.size * m_scale.value();
+
+        d->m_symDataToRender.sidc      = symbolData_ref.sidc;
+        d->m_symDataToRender.fillColor = symbolData_ref.color;
+        d->m_symDataToRender.fillColorReplace = true;
+        d->m_symDataToRender.sizeL     = widthPixel;
+
+        if (d->m_pictureMarker->image().isNull())
+          d->m_pictureMarker->setImage(d->m_dictionary->temporaryImage(d->m_symDataToRender.sizeL));
+        d->m_symbolResultWatcher.setSymbolResult(d->m_dictionary->fetchSymbol(d->m_symDataToRender));
+        success = true;
+      }
+      else
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                            << " visibility=" << m_visibility
+                            << " no dictionary";
+      }
+
+    }
+
+    if (d->m_pictureMarker)
+    {
+      d->m_pictureMarker->setDrawOrder(m_drawOrder.value());
+      d->m_pictureMarker->setVisibility(m_visibility.value());
+      d->m_pictureMarker->setSelected(m_selected.value());
+      d->m_pictureMarker->setPickable(m_pickable.value());
+
+      success = success && d->m_pictureMarker->updateView();
+    }
+  } // else !useDictionaryRenderMode(geomType)
+
+
+  if (d->m_pictureMarker)
+  {
+    d->m_pictureMarker->setOrigin(this->origin());  // to avoid incorrect number of positions..
+    d->m_pictureMarker->setVisibility(m_visibility.value());
+    d->m_pictureMarker->setSelected(m_selected.value());
+    success = d->m_pictureMarker->updateView() && success;
+  }
+
+  // in case of no pictureMarker:
+  if (m_graphic)
+  {
+    m_graphic->setZIndex(m_drawOrder.value());
+    m_graphic->setVisible(m_visibility.value());
+    m_graphic->setSelected(m_selected.value());
+  }
+
+  // reset flags
+  d->m_symbol.reset();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure, debugInfo='" << m_debugInfo << "'";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " success = " << success
+                      << " visibility=" << m_visibility;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.h
new file mode 100755
index 000000000..d3e3a68c1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.h
@@ -0,0 +1,117 @@
+/**
+  * @RDE_HEADER@
+  * TacticalAppearance
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_graphical_object.h"
+
+// Esri
+
+
+// Qt
+
+
+// forward:
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class MapImpl;
+class GraphicalObjectPictureMarker;
+
+
+/**
+ * @brief The TacticalAppearance class displays sidcs.
+ * To do so, the number of coordinate lead to use
+ * - the GraphicalObjectPictureMarker (exactly one coordinate)
+ * or
+ * - the Message (more than one coordinate)
+ *
+ * Use cases:
+ * - Participant: sidc with #coords == 1, TacticalAppearance should get exactly one coordinate.
+ *   (GraphicalObjectPictureMarker on ESRI::GraphicsLayer is used)
+ * - Tactical display of a Building: sidc #coords >= 2, TacticalAppearance should get list of positions.
+ *   (Message on ESRI::MessageGroupLayer is used)
+ * - (Tactical) PreviewIcon of a Building: sidc #coords == 1, TacticalAppearance should get exactly one coordinate.
+ *   (GraphicalObjectPictureMarker on ESRI::GraphicsLayer is used)
+ * - Tactical symbols of plan editor
+ *
+ * In case of GraphicalObjectPictureMarker the image creation is done by AdvancedSymbology::SymbolDictionary::symbolImageBySidcExtended().
+ */
+class SITUATIONMAP_EXPORT TacticalAppearance : public AbstractGraphicalObject
+{
+
+  using BaseClass = AbstractGraphicalObject;
+
+public:
+
+  /**
+   * @brief TacticalAppearance
+   * @param mapImpl map to be used.
+   * @param logicalLayerName logical layer name to be used.
+   * @param debugInfo debugInfo to be used
+   * @param uniqueMapId uniqueMapId to be used. (Optional to fulfill rubberband requirements)
+   */
+  TacticalAppearance(MapImpl       *mapImpl,
+                     const QString &logicalLayerName,
+                     const QString &debugInfo,
+                     const UniqueMapId &uniqueMapId = INVALID_MAP_ID);
+
+  TacticalAppearance(const TacticalAppearance &other)     = delete;
+  TacticalAppearance &operator=(TacticalAppearance &other) = delete;
+
+  virtual ~TacticalAppearance();
+
+
+  SymbolData symbol() const;
+  void setSymbol(const SymbolData &symbol);
+
+  QString uniqueDesignation() const;
+  void setUniqueDesignation(const QString &uniqueDesignation);
+
+
+  SymbolImage symbolImage() const;
+
+  Esri::ArcGISRuntime::Geometry getGraphicGeometry() const override;
+
+protected:
+  // Internal/Admin
+  virtual bool create() override;
+  virtual void createPictureMarker();
+  virtual void removePictureMarker();
+
+  void removeGraphicFromGraphicOverlayTactical();
+
+  bool changed() override;
+  void resetChanged() override;
+
+
+  bool updateViewImpl() override;
+
+  bool useDictionaryRenderMode(const AdvancedSymbology::GeometryType &geomType) const;
+
+  // logical
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.cpp
new file mode 100755
index 000000000..6bc619a5d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.cpp
@@ -0,0 +1,603 @@
+/**
+**
+** @RDE_HEADER@
+** Handles aggregation of participant layer
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   16.08.2017, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "layer_aggregation_widget.h"
+
+#include <Map/map.h>
+
+#include <Map/layer_parameter.h>
+
+#include <LtsWidgets/lts_message_dialog.h>
+
+#include <Common/situation_map_logging.h>
+
+#include <QtCore/QMap>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+
+#include <cmath>
+
+
+using namespace SituationMap;
+
+
+struct AggregationData
+{
+  QString        layerName;
+  QString        displayName;
+  double         minScale      = LayerParameter::UNDEFINED_SCALE; // 0
+  double         maxScale      = LayerParameter::UNDEFINED_SCALE; // 0
+  bool           minScaleValid = false;
+  bool           maxScaleValid = false;
+
+}; // AggregationData
+
+
+struct AggregationWidgets
+{
+  QCheckBox   *cbMinScaleValid   = nullptr;
+  QPushButton *pbMinScale         = nullptr;
+  QPushButton *pbMinScaleTo       = nullptr;
+
+  QCheckBox   *cbMaxScaleValid   = nullptr;
+  QPushButton *pbMaxScale         = nullptr;
+  QPushButton *pbMaxScaleTo       = nullptr;
+
+  QPushButton *pbReset            = nullptr;
+  QPushButton *pbApply            = nullptr;
+};
+
+
+class LayerAggregationWidget::InternalData
+{
+public:
+
+  Map                               *m_map   = nullptr;
+  bool                               m_valid = false;
+
+  LayerType                          m_layerType;
+
+  QVector<AggregationData>           m_aggregationList;
+  QMap<QString, AggregationData>     m_aggregationReset;
+  QMap<QString, AggregationWidgets>  m_aggregationWidgets;
+
+  LOGGER_T                           m_logger;
+
+  explicit InternalData(Map *map,LayerType layerType)
+    : m_map(map)
+    , m_layerType(layerType)
+    , m_logger(getLogger("LayerAggregation"))
+  {}
+
+}; // LayerAggregationWidget::InternalData
+
+//------------------------------------------------------------------------------
+
+QString LayerAggregationWidget::scaleText(double scale)
+{
+  return (scale >= 1) ? QStringLiteral("1:%1").arg(int(scale)) : tr("undefined");
+} // QString LayerAggregationWidget::scaleText(double scale)
+
+
+void LayerAggregationWidget::setMinScaleLabel(QPushButton *btn, double scale)
+{
+  btn->setText(tr("Min. Scale from Map\n%1").arg(scaleText(scale)));
+} // void LayerAggregationWidget::setMinScaleLabel(QPushButton * btn, double scale)
+
+
+void LayerAggregationWidget::setMaxScaleLabel(QPushButton *btn, double scale)
+{
+  btn->setText(tr("Max. Scale from Map\n%1").arg(scaleText(scale)));
+} // void LayerAggregationWidget::setMaxScaleLabel(QPushButton * btn, double scale)
+
+
+LayerAggregationWidget::LayerAggregationWidget(Map *map, LayerType layerType, const QRegularExpression &nameCondition, QWidget *parent)
+  : QWidget(parent), m_internal(new InternalData(map,layerType))
+{
+  if (!nameCondition.isValid())
+  {
+    ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " Illegal regular expression in nameCondition.";
+    return;
+  }
+
+  if (map == nullptr)
+  {
+    ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " Invalid situation map, cannot initialize dialog";
+    return;
+  }
+
+  QGridLayout *layout = new QGridLayout(this);
+
+  layout->setSpacing(10);
+
+  const LayerFactory &layerFactory = map->layerFactory();
+
+  QIcon scaleToIcon(QStringLiteral("icon:search.svg"));
+
+  const auto ln = layerFactory.layernames(layerType);
+  for (const QString &layerName : ln)
+  {
+    if (nameCondition.match(layerName).hasMatch())
+    {
+      // get layer
+      AggregationData        data;
+      AggregationWidgets    &widgets    = m_internal->m_aggregationWidgets[layerName];
+      const LayerParameter  &layerPara  = layerFactory.layerParameter(layerName);
+
+      data.layerName      = layerName;
+      data.minScale       = layerPara.minScale;
+      data.maxScale       = layerPara.maxScale;
+      data.minScaleValid  = layerPara.minScaleValid();
+      data.maxScaleValid  = layerPara.maxScaleValid();
+      data.displayName    = layerPara.displayName;
+
+      int row = m_internal->m_aggregationList.size();
+
+      QLabel *laName    = new QLabel(layerPara.displayName.isEmpty() ? layerName : layerPara.displayName, this);
+      widgets.pbReset   = new QPushButton(this);
+      widgets.pbApply   = new QPushButton(this);
+
+      widgets.pbReset->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+      widgets.pbApply->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+
+      QHBoxLayout *minLayout = new QHBoxLayout();
+
+      minLayout->addSpacing(20);
+      minLayout->addWidget(widgets.cbMinScaleValid  = new QCheckBox(QString(), this));
+      minLayout->addWidget(widgets.pbMinScale       = new QPushButton(QString(), this));
+      minLayout->addWidget(widgets.pbMinScaleTo     = new QPushButton(scaleToIcon, QString(), this));
+      minLayout->addSpacing(20);
+      setMinScaleLabel(widgets.pbMinScale, layerPara.minScale);
+
+      QHBoxLayout *maxLayout = new QHBoxLayout();
+
+      maxLayout->addWidget(widgets.cbMaxScaleValid  = new QCheckBox(QString(), this));
+      maxLayout->addWidget(widgets.pbMaxScale       = new QPushButton(QString(), this));
+      maxLayout->addWidget(widgets.pbMaxScaleTo     = new QPushButton(scaleToIcon, QString(), this));
+
+      maxLayout->addSpacing(20);
+
+      setMaxScaleLabel(widgets.pbMaxScale, layerPara.maxScale);
+
+      widgets.pbMinScale->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+      widgets.pbMaxScale->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+
+      layout->addWidget(laName, row, 0);
+      layout->addLayout(minLayout, row, 1);
+      layout->addLayout(maxLayout, row, 2);
+      layout->addWidget(widgets.pbReset, row, 3);
+      layout->addWidget(widgets.pbApply, row, 4);
+
+      m_internal->m_aggregationList << data;
+      m_internal->m_aggregationReset[layerName] = data;
+
+      widgets.pbMinScale->setProperty("row", row);
+      widgets.pbMaxScale->setProperty("row", row);
+      widgets.cbMinScaleValid->setProperty("row", row);
+      widgets.cbMaxScaleValid->setProperty("row", row);
+      widgets.pbMinScaleTo->setProperty("row", row);
+      widgets.pbMaxScaleTo->setProperty("row", row);
+
+      widgets.pbReset->setProperty("row", row);
+      widgets.pbApply->setProperty("row", row);
+
+      connect(widgets.cbMinScaleValid, &QCheckBox::clicked, this, &LayerAggregationWidget::onSetValid);
+      connect(widgets.cbMaxScaleValid, &QCheckBox::clicked, this, &LayerAggregationWidget::onSetValid);
+      connect(widgets.pbMinScale, &QPushButton::clicked, this, &LayerAggregationWidget::onGetMinScale);
+      connect(widgets.pbMaxScale, &QPushButton::clicked, this, &LayerAggregationWidget::onGetMaxScale);
+      connect(widgets.pbMinScaleTo, &QPushButton::clicked, this, &LayerAggregationWidget::onZoomTo);
+      connect(widgets.pbMaxScaleTo, &QPushButton::clicked, this, &LayerAggregationWidget::onZoomTo);
+      connect(widgets.pbReset, &QPushButton::clicked, this, &LayerAggregationWidget::onReset);
+      connect(widgets.pbApply, &QPushButton::clicked, this, &LayerAggregationWidget::onApply);
+
+      widgets.cbMinScaleValid->setChecked(data.minScaleValid);
+      widgets.cbMinScaleValid->setEnabled(data.minScaleValid);
+      widgets.cbMaxScaleValid->setChecked(data.maxScaleValid);
+      widgets.cbMaxScaleValid->setEnabled(data.maxScaleValid);
+
+      widgets.pbMinScaleTo->setEnabled(data.minScaleValid);
+      widgets.pbMaxScaleTo->setEnabled(data.maxScaleValid);
+
+      widgets.pbReset->setEnabled(false);
+      widgets.pbApply->setEnabled(false);
+    }
+  }
+
+  retranslate();
+
+  if (m_internal->m_aggregationList.isEmpty())
+  {
+    QLabel *lbEmpty = new QLabel(tr("Can't find any layer"), this);
+    QPixmap  icon(QStringLiteral("icon:overlays.svg"));
+
+    lbEmpty->setWindowIcon(icon);
+    layout->addWidget(lbEmpty, 0, 0, Qt::AlignCenter);
+    return;
+  }
+} // LayerAggregation::LayerAggregation( Map * map, QObject * parent )
+
+
+void LayerAggregationWidget::retranslate()
+{
+  if (m_internal->m_map == nullptr)
+    return;
+
+  const LayerFactory &layerFactory = m_internal->m_map->layerFactory();
+  const auto ln = layerFactory.layernames(m_internal->m_layerType);
+  for (const QString &layerName : ln)
+  {
+    if (!m_internal->m_aggregationWidgets.contains(layerName)) continue;
+
+    AggregationWidgets &widgets = m_internal->m_aggregationWidgets[layerName];
+
+    widgets.pbReset->setText(tr("Reset"));
+    widgets.pbApply->setText(tr("Apply to Map"));
+
+    widgets.pbReset->setToolTip(tr("Restore initial scales of this level"));
+    widgets.pbApply->setToolTip(tr("Set scales to corresponding map layer temporarily"));
+
+    widgets.cbMinScaleValid->setToolTip(tr("Activate or deactivate this scale value"));
+    widgets.pbMinScale     ->setToolTip(tr("Get current map scale of map view"));
+    widgets.pbMinScaleTo   ->setToolTip(tr("Set this scale value to map view as current scale"));
+
+    widgets.cbMaxScaleValid->setToolTip(tr("Activate or deactivate this scale value"));
+    widgets.pbMaxScale     ->setToolTip(tr("Get current map scale of map view"));
+    widgets.pbMaxScaleTo   ->setToolTip(tr("Set this scale value to map view as current scale"));
+  }
+} // void LayerAggregationWidget::retranslate()
+
+
+LayerAggregationWidget::~LayerAggregationWidget()
+{
+  delete m_internal; m_internal = nullptr;
+} // LayerAggregationWidget::~LayerAggregationWidget()
+
+
+void LayerAggregationWidget::onZoomTo()
+{
+  QPushButton *senderButton = qobject_cast<QPushButton *>(sender());
+  if (nullptr == senderButton) return;
+
+  int row = senderButton->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  const AggregationData     &data    = m_internal->m_aggregationList[row];
+  const AggregationWidgets &widgets  = m_internal->m_aggregationWidgets[data.layerName];
+  double                     scale   = 0.0;
+
+  if ((widgets.pbMinScaleTo == senderButton) && (data.minScaleValid))
+    scale = data.minScale;
+
+  if ((widgets.pbMaxScaleTo == senderButton) && (data.maxScaleValid))
+    scale = data.maxScale;
+
+  if (scale < 1)
+    return;
+
+  m_internal->m_map->setScale(scale);
+
+} // void LayerAggregationWidget::onZoomTo()
+
+
+void LayerAggregationWidget::onGetMinScale()
+{
+  QPushButton *senderButton = qobject_cast<QPushButton *>(sender());
+  if (nullptr == senderButton) return;
+
+  int row = senderButton->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  double scale = m_internal->m_map->scale();
+
+  AggregationData &data = m_internal->m_aggregationList[row];
+
+  if (data.maxScaleValid && (data.maxScale >= scale))
+  {
+    const QString &msg = tr("Chosen scale is too small");
+    LtsWidgets::LtsMessageDialog::showMessage(this, msg, tr("Layer Aggregation"));
+    return;
+  }
+
+  data.minScale      = scale;
+  data.minScaleValid = true;
+
+  setMinScaleLabel(senderButton, data.minScale);
+
+  const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[data.layerName];
+  widgets.cbMinScaleValid->setChecked(true);
+  widgets.cbMinScaleValid->setEnabled(true);
+
+  widgets.pbMinScaleTo->setEnabled(true);
+
+  widgets.pbReset->setEnabled(true);
+  widgets.pbApply->setEnabled(true);
+
+  emit changesMade();
+} // void LayerAggregationWidget::onGetMinScale()
+
+
+void LayerAggregationWidget::onGetMaxScale()
+{
+  QPushButton *senderButton = qobject_cast<QPushButton *>(sender());
+  if (nullptr == senderButton) return;
+
+  int row = senderButton->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  double scale = m_internal->m_map->scale();
+
+  AggregationData &data = m_internal->m_aggregationList[row];
+
+  if (data.minScaleValid && (data.minScale <= scale))
+  {
+    const QString &msg = tr("Chosen scale is too large");
+    LtsWidgets::LtsMessageDialog::showMessage(this, msg, tr("Layer Aggregation"));
+    return;
+  }
+
+  data.maxScale      = scale;
+  data.maxScaleValid = true;
+
+  setMaxScaleLabel(senderButton, data.maxScale);
+
+  const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[data.layerName];
+  widgets.cbMaxScaleValid->setChecked(true);
+  widgets.cbMaxScaleValid->setEnabled(true);
+
+  widgets.pbMaxScaleTo->setEnabled(true);
+
+  widgets.pbReset->setEnabled(true);
+  widgets.pbApply->setEnabled(true);
+
+  emit changesMade();
+
+} // void LayerAggregationWidget::onGetMaxScale()
+
+
+void LayerAggregationWidget::onSetValid(bool value)
+{
+  QCheckBox *senderButton = qobject_cast<QCheckBox *>(sender());
+  if (nullptr == senderButton) return;
+
+  int row = senderButton->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  AggregationData           &data    = m_internal->m_aggregationList[row];
+  const AggregationWidgets &widgets  = m_internal->m_aggregationWidgets[data.layerName];
+
+  if (senderButton == widgets.cbMinScaleValid)
+  {
+    if (data.maxScaleValid && value && (data.maxScale >= data.minScale))
+    {
+      senderButton->setChecked(false);
+      const QString &msg = tr("Minimum scale is too small");
+      LtsWidgets::LtsMessageDialog::showMessage(this, msg, tr("Layer Aggregation"));
+      return;
+    }
+    data.minScaleValid = value;
+  }
+
+  if (senderButton == widgets.cbMaxScaleValid)
+  {
+    if (data.minScaleValid && value && (data.minScale <= data.maxScale))
+    {
+      senderButton->setChecked(false);
+      const QString &msg = tr("Maximum scale is too large");
+      LtsWidgets::LtsMessageDialog::showMessage(this, msg, tr("Layer Aggregation"));
+      return;
+    }
+    data.maxScaleValid = value;
+  }
+
+  widgets.pbMinScaleTo->setEnabled(data.minScaleValid);
+  widgets.pbMaxScaleTo->setEnabled(data.maxScaleValid);
+
+  widgets.pbReset->setEnabled(true);
+  widgets.pbApply->setEnabled(true);
+
+  emit changesMade();
+
+} // void LayerAggregationWidget::onSetValid(bool value)
+
+
+void LayerAggregationWidget::doReset(int row)
+{
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  AggregationData &data = m_internal->m_aggregationList[row];
+  data = m_internal->m_aggregationReset[data.layerName];
+
+  const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[data.layerName];
+
+  setMinScaleLabel(widgets.pbMinScale, data.minScale);
+  setMaxScaleLabel(widgets.pbMaxScale, data.maxScale);
+
+  widgets.cbMinScaleValid->setChecked(data.minScaleValid);
+  widgets.cbMinScaleValid->setEnabled(data.minScaleValid);
+
+  widgets.cbMaxScaleValid->setChecked(data.maxScaleValid);
+  widgets.cbMaxScaleValid->setEnabled(data.maxScaleValid);
+
+  widgets.pbMinScaleTo->setEnabled(data.minScaleValid);
+  widgets.pbMaxScaleTo->setEnabled(data.maxScaleValid);
+
+  widgets.pbReset->setEnabled(false);
+  widgets.pbApply->setEnabled(!widgets.pbApply->isEnabled());
+
+} // void doReset(SituationMap::Map * map, const AggregationData & data)
+
+
+void LayerAggregationWidget::onReset()
+{
+  QObject *senderObj = sender();
+  if (nullptr == senderObj) return;
+
+  int row = senderObj->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  doReset(row);
+
+} // void LayerAggregationWidget::onReset()
+
+
+static void doApply(SituationMap::Map *map, const AggregationData &data)
+{
+  LayerFactory    &layerFactory  = map->layerFactory();
+  LayerParameter   layerParamter = layerFactory.layerParameter(data.layerName);
+
+  layerParamter.minScale = data.minScaleValid ? data.minScale : LayerParameter::UNDEFINED_SCALE; // 0;
+  layerParamter.maxScale = data.maxScaleValid ? data.maxScale : LayerParameter::UNDEFINED_SCALE; // 0;
+
+  layerFactory.setLayerParameter(data.layerName, layerParamter);
+} // void doApply(SituationMap::Map * map, const AggregationData & data)
+
+
+void LayerAggregationWidget::onApply()
+{
+  QObject *senderObj = sender();
+  if (!senderObj)
+    return;
+
+  int row = senderObj->property("row").toInt();
+
+  if ((row < 0) || (row >= m_internal->m_aggregationList.size()))
+    return;
+
+  const AggregationData &data = m_internal->m_aggregationList[row];
+  doApply(m_internal->m_map, data);
+
+  const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[data.layerName];
+  widgets.pbApply->setEnabled(false);
+
+} // void LayerAggregationWidget::onApply()
+
+
+void LayerAggregationWidget::onApplyAll()
+{
+  for (const AggregationData &data : qAsConst(m_internal->m_aggregationList))
+  {
+    const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[data.layerName];
+    if (widgets.pbApply->isEnabled())
+    {
+      doApply(m_internal->m_map, data);
+      widgets.pbApply->setEnabled(false);
+    }
+  }
+} // void LayerAggregationWidget::onApplyAll()
+
+
+void LayerAggregationWidget::onResetAll()
+{
+  for (const auto &aggData : qAsConst(m_internal->m_aggregationList))
+  {
+    const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[aggData.layerName];
+
+    doReset(widgets.pbApply->property("row").toInt());
+    doApply(m_internal->m_map, aggData);
+    widgets.pbApply->setEnabled(false);
+  }
+} // void LayerAggregationWidget::onResetAll()
+
+
+void LayerAggregationWidget::onSetDefaultScales()
+{
+  if (m_internal->m_aggregationList.isEmpty())
+    return;
+
+  // Calculate scale defaults here ...
+
+  double mapMinScaleSQRT = sqrt(m_internal->m_map->minScale());
+  double mapMaxScaleSQRT = sqrt(m_internal->m_map->maxScale());
+
+  const int aggregationListCount = m_internal->m_aggregationList.size();
+  double stepScaleSQRT = (mapMinScaleSQRT - mapMaxScaleSQRT) / static_cast<double>(aggregationListCount);
+
+  unsigned int step = 0;
+
+  for (auto &aggData : m_internal->m_aggregationList)
+  {
+    double dScaleSQRT = mapMaxScaleSQRT + (step * stepScaleSQRT);
+    aggData.maxScaleValid = true;
+    aggData.maxScale      = dScaleSQRT * dScaleSQRT;
+
+    dScaleSQRT = mapMaxScaleSQRT + ((step + 1) * stepScaleSQRT);
+    aggData.minScaleValid = true;
+    aggData.minScale      = dScaleSQRT * dScaleSQRT;
+
+  } // for
+
+  // disable start and end
+  if (aggregationListCount > 0)
+  {
+    // front -> max
+    m_internal->m_aggregationList.front().maxScale = 0;
+    m_internal->m_aggregationList.front().maxScaleValid = false;
+    // back -> min
+    m_internal->m_aggregationList.back().minScale = 0;
+    m_internal->m_aggregationList.back().minScaleValid = false;
+  } // if
+
+  // update ui to m_aggregationList:
+  for (const auto &aggData : qAsConst(m_internal->m_aggregationList))
+  {
+    const AggregationWidgets &widgets = m_internal->m_aggregationWidgets[aggData.layerName];
+    widgets.cbMinScaleValid->setEnabled(aggData.minScaleValid);
+    widgets.cbMinScaleValid->setChecked(aggData.minScaleValid);
+    widgets.pbMinScaleTo->setEnabled(aggData.minScaleValid);
+
+    widgets.cbMaxScaleValid->setEnabled(aggData.maxScaleValid);
+    widgets.cbMaxScaleValid->setChecked(aggData.maxScaleValid);
+    widgets.pbMaxScaleTo->setEnabled(aggData.maxScaleValid);
+
+    widgets.pbApply->setEnabled(true);
+    widgets.pbReset->setEnabled(true);
+
+    setMinScaleLabel(widgets.pbMinScale, aggData.minScale);
+    setMaxScaleLabel(widgets.pbMaxScale, aggData.maxScale);
+  } // for
+
+  emit changesMade();
+
+} // void LayerAggregationWidget::onSetDefaultScales()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.h
new file mode 100755
index 000000000..12c4efa88
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/layer_aggregation_widget.h
@@ -0,0 +1,110 @@
+/**
+**
+** @RDE_HEADER@
+** Handles aggregation of participant layer
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   16.08.2017, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <Map/layer_factory.h>
+
+#include <situation_map_export.h>
+
+#include <QtWidgets/QWidget>
+
+
+class QPushButton;
+class QRegularExpression;
+
+namespace SituationMap
+{
+class Map;
+
+/**
+  @class LayerAggregationWidget layer_aggregation_widget.h
+  @brief Class to handle aggregation of participant layer
+*/
+
+class SITUATIONMAP_EXPORT LayerAggregationWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+
+  /**
+    Constructor to build gui widget for handling aggregation layers.
+
+    @param map           Map the layer are part of
+    @param layerType     Type of layer in general this will be LayerType::Operational
+    @param nameCondition If the nameCondition doesn't match with the layername the layer will be skipped and is not handled.
+                         Example of an expression "^Participant.+".
+    @param parent        Parent for Qt object hierarchy
+  */
+  explicit LayerAggregationWidget(Map *map, LayerType layerType, const QRegularExpression &nameCondition, QWidget *parent);
+
+  /**
+    Destructor to clean up memory.
+  */
+  ~LayerAggregationWidget();
+
+  void retranslate();
+
+public slots:
+
+  void onApplyAll();
+  void onResetAll();
+
+  void onSetDefaultScales();
+
+signals:
+
+  void changesMade();
+
+protected slots:
+
+  void onSetValid(bool value);
+
+  void onGetMinScale();
+  void onGetMaxScale();
+  void onZoomTo();
+  void onReset();
+  void onApply();
+
+private:
+
+  void doReset(int row);
+
+  static QString scaleText(double scale);
+
+  static void setMinScaleLabel(QPushButton *btn, double scale);
+  static void setMaxScaleLabel(QPushButton *btn, double scale);
+
+  class InternalData;
+
+  InternalData      *m_internal;
+
+}; // LayerAggregationWidget
+
+} /* namespace SituationMap */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.cpp
new file mode 100755
index 000000000..16b9e09ea
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.cpp
@@ -0,0 +1,105 @@
+/**
+**
+** @RDE_HEADER@
+** Dialog of aggregation of participant layer
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   18.08.2017, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "participant_aggregation_dialog.h"
+#include "layer_aggregation_widget.h"
+
+#include <Map/map.h>
+
+#include <QtWidgets/QVBoxLayout>
+
+
+using namespace SituationMap;
+
+
+ParticipantAggregationDialog::ParticipantAggregationDialog(Map *map, QWidget *parent)
+  : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+{
+  m_law = new LayerAggregationWidget(map, LayerType::Operational, QRegularExpression(QStringLiteral("^Participant.+"), QRegularExpression::CaseInsensitiveOption), this);
+
+  if (map)
+    connect(map, &Map::beginDestroy, this, &ParticipantAggregationDialog::onMapDestroyed, Qt::UniqueConnection);
+
+  QVBoxLayout  *layout = new QVBoxLayout(this);
+ 
+  layout->addWidget(m_law);
+  layout->addStretch(2);
+
+  LtsWidgets::DialogButton btnSetDefault = LtsWidgets::DialogButton::Print;
+
+  m_buttonBox->connectButton(btnSetDefault, m_law, &LayerAggregationWidget::onSetDefaultScales);
+  
+  m_buttonBox->setButtonEnabled(btnSetDefault, true);
+  m_buttonBox->setButtonVisible(btnSetDefault, true);
+
+  connect(this, &ParticipantAggregationDialog::canceled, m_law, &LayerAggregationWidget::onResetAll);
+  connect(this, &ParticipantAggregationDialog::applied, m_law, &LayerAggregationWidget::onApplyAll);
+
+  connect(m_law, &LayerAggregationWidget::changesMade, this, &ParticipantAggregationDialog::slotChangesMade);
+
+  retranslate();
+
+  setOnlineHelpFilename(QStringLiteral("Situation-Participant_Aggregation"));
+
+} // ParticipantAggregationDialog::ParticipantAggregationDialog( Map * map, QWidget * parent )
+
+
+void ParticipantAggregationDialog::retranslate()
+{
+  // lupdate doesn't like translate(tr("foo")) ...
+  const QString txt(tr("Participant Aggregation"));
+  translate(txt);
+
+  LtsWidgets::DialogButton btnSetDefault = LtsWidgets::DialogButton::Print;
+
+  m_buttonBox->setText(    btnSetDefault, tr("Set Scale Defaults"));
+  m_buttonBox->setToolTip( btnSetDefault, tr("Calculate scale values for each aggregation from map scale range"));
+
+  m_law->retranslate();
+
+} // void ParticipantAggregationDialog::retranslate()
+
+
+void ParticipantAggregationDialog::dialogCanceled()
+{
+  emit canceled();
+} // void ParticipantAggregationDialog::dialogCanceled()
+
+
+bool ParticipantAggregationDialog::apply() 
+{
+  emit applied(); 
+  return true;
+}
+
+void ParticipantAggregationDialog::onMapDestroyed()
+{
+  // commit suicide
+  delete this;
+} // bool ParticipantAggregationDialog::apply()
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.h
new file mode 100755
index 000000000..2521f3765
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LayerAggregation/participant_aggregation_dialog.h
@@ -0,0 +1,79 @@
+/**
+**
+** @RDE_HEADER@
+** Dialog of aggregation of participant layer
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   18.08.2017, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <LtsWidgets/lts_dialog.h>
+
+#include <situation_map_export.h>
+
+#include <QtWidgets/QWidget>
+
+
+namespace SituationMap
+{
+class Map;
+class LayerAggregationWidget;
+
+/**
+  @class ParticpantAggregation particpant_aggregation.h
+  @brief Class to handle aggregation of participant layer dialog
+*/
+
+class SITUATIONMAP_EXPORT ParticipantAggregationDialog : public LtsWidgets::LtsDialog
+{
+  Q_OBJECT
+
+public:
+
+  explicit ParticipantAggregationDialog(SituationMap::Map *map, QWidget *parent);
+  ~ParticipantAggregationDialog() = default;
+
+  void retranslate() override;
+
+  void dialogCanceled() override;
+
+protected:
+
+  bool apply() override;
+
+Q_SIGNALS:
+  void canceled();
+  void applied();
+
+protected Q_SLOTS:
+  void onMapDestroyed();
+
+private:
+
+  LayerAggregationWidget *m_law;
+
+}; // ParticipantAggregationDialog
+
+} /* namespace SituationMap */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/WorldMap2015-12-17.png b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/WorldMap2015-12-17.png
new file mode 100755
index 000000000..a83380c43
Binary files /dev/null and b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/WorldMap2015-12-17.png differ
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc.ini
new file mode 100755
index 000000000..d132e41cb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc.ini
@@ -0,0 +1,163 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000004959,none,7RC63PJPXJPH003AD234" ;# Bayanat Helpdesk, 21.07.2019
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "MIL2525D"                                         ;# None | MIL2525D | MIL2525C | APP6B
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+#For factory
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AlHamra_Aerial_1m00_32639/MapServer#-1:125"             ;# Since 2019-04-05
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AlHamra_Aerial_0m21_PreDelivery_32639/MapServer#-1:125" ;# Since 2019-05-08
+
+
+#For on-site
+#1\url = "http://EXCGEO02/arcgis/rest/services/AHTC/2019_06_17_AHTC_CTC_Topo_2016_32639/MapServer#-1:125"        ;# Since 2019-06
+#2\url = "http://EXCGEO02/arcgis/rest/services/AHTC/2019_06_17_AHTC_CTC_Aerial_2016_32639/MapServer#-1:125"      ;# Since 2019-06
+#3\url = "http://EXCGEO02/arcgis/rest/services/AHTC/AlHamra_Aerial_0m21_PreDelivery_32639/MapServer#-1:125"      ;# Since 2019-06
+
+#TileCacheFolder
+1\url = "file:TileCacheFolder/AHTC/AHTC_2019_06_17_AHTC_CTC_Topo_2016_32639/AHTC_CTC_Topogaphic#-1:125"
+2\url = "file:TileCacheFolder/AHTC/AHTC_2019_06_17_AHTC_CTC_Aerial_2016_32639/AHTC_CTC_Aerial#-1:125"
+3\url = "file:TileCacheFolder/AHTC/AHTC_AlHamra_Aerial_0m21_PreDelivery_32639/Al Hamra Aerial 0m21#-1:125"
+
+#For on-site - windows
+# todo
+
+size=3
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+#For factory
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AlHamra_Aerial_1m00_WebMerc/MapServer#-1:25"              ;# Since 2019-04-05
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AlHamra_Aerial_0m21_PreDelivery_WebMerc/MapServer#-1:25"  ;# Since 2019-05-08
+
+#For on-site
+#1\url = "http://EXCGEO02/arcgis/rest/services/AHTC/2019_06_17_AHTC_CTC_Topo_2016_WebMerc/MapServer#-1:125"      ;# Since 2019-06
+#2\url = "http://EXCGEO02/arcgis/rest/services/AHTC/2019_06_17_AHTC_CTC_Aerial_2016_WebMerc/MapServer#-1:125"    ;# Since 2019-06
+#3\url = "http://EXCGEO02/arcgis/rest/services/AHTC/AlHamra_Aerial_0m21_PreDelivery_WebMerc/MapServer#-1:125"    ;# Since 2019-06
+
+#For on-site - windows
+# todo
+
+#TileCacheFolder
+1\url = "file:TileCacheFolder/AHTC/AHTC_2019_06_17_AHTC_CTC_Topo_2016_WebMerc/AHTC_CTC_Topogaphic#-1:125"
+2\url = "file:TileCacheFolder/AHTC/AHTC_2019_06_17_AHTC_CTC_Aerial_2016_WebMerc/AHTC_CTC_Aerial#-1:125"
+3\url = "file:TileCacheFolder/AHTC/AHTC_AlHamra_Aerial_0m21_PreDelivery_WebMerc/Al Hamra Aerial 0m21#-1:125"
+4\url = "file:slpk/2022-05-23_AHTC-Bridges_ret_geotifcp-alex.tif#-1:125"                                               ;# according SPD-slpk with bridges
+size=4
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+1\url = "file:AHTC_LOW.slpk#0.5"
+size=1
+
+[elevationUrls]
+# LZW-Compression is ok for Esri-Scene & ElevationMap
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+
+#1\url = "file:alhamra-dtm-PreDelivery.tif"                                      ;# preDelivery - 2019-05-28
+
+1\url = "file:Elevation.tif"                                                    ;# BFE, ~30m
+2\url = "file:AHTC_utm_dgm_surface_wgs84.tif"                                   ;# Z&M, XY converted to WGS84 (ArcGIS Pro)
+size=2
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "39RXG4400060000"              ;# AHTC
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 30000                     ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc_tablet.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc_tablet.ini
new file mode 100755
index 000000000..ef90b0a29
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_ahtc_tablet.ini
@@ -0,0 +1,129 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000004959,none,7RC63PJPXJPH003AD234" ;# Bayanat Helpdesk, 21.07.2019
+
+1\extensionString = ""
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None | MIL2525D | MIL2525C | APP6B | APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+#For on-site - windows
+1\url = "file:AHTC_2019_06_17_AHTC_CTC_Topo_2016_32639/AHTC_CTC_Topogaphic#-1:125"
+1\name = "AHTC Topographic"
+2\url ="file:AHTC_2019_06_17_AHTC_CTC_Aerial_2016_32639/AHTC_CTC_Aerial#-1:125"
+2\name = "AHTC Aerial"
+3\url = "file:AHTC_AlHamra_Aerial_0m21_PreDelivery_32639/Al Hamra Aerial 0m21#-1:125"
+3\name = "AlHamra Aerial"
+size=3
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+#For on-site - windows
+1\url = "file:AHTC_2019_06_17_AHTC_CTC_Topo_2016_WebMerc/AHTC_CTC_Topogaphic#-1:125"
+1\name = "AHTC Topographic"
+2\url = "file:AHTC_2019_06_17_AHTC_CTC_Aerial_2016_WebMerc/AHTC_CTC_Aerial#-1:125"
+2\name = "AHTC Aerial"
+3\url = "file:AHTC_AlHamra_Aerial_0m21_PreDelivery_WebMerc/Al Hamra Aerial 0m21#-1:125"
+3\name = "AlHamra Aerial"
+4\url = "file:2022-05-23_AHTC-Bridges_ret_geotifcp-alex.tif#-1:125"                                               ;# according SPD-slpk with bridges
+4\name = "AlHamra Aerial NoBridges"
+size=4
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+1\url = "file:AHTC_LOW.slpk#0.5"
+size=1
+
+[elevationUrls]
+1\url = "file:Elevation.tif"                                                    ;# BFE, ~30m
+2\url = "file:AHTC_utm_dgm_surface_wgs84.tif"                                   ;# Z&M, XY converted to WGS84 (ArcGIS Pro)
+size=2
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+#center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+center = "32UPD7671618433"               ;#QPointF(76716, 18433) -> BT39 (Schulgebaeude2b) - Schnoeggersburg
+center = "39RXG4344459777"
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 4000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_defaults.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_defaults.ini
new file mode 100755
index 000000000..2166da844
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_defaults.ini
@@ -0,0 +1,177 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_32632/MapServer#-1:125"     ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_32632/MapServer"             ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenHemelingenAerialGeoAmt_32632/MapServer#-1:125" ;# Since 2017-12-12
+3\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenWerkAerialDrone_32632/MapServer#-1:125"        ;# Since 2017-12-12
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_32639/MapServer"
+
+#1\url = "http://EXCGEO01:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png"
+#2\url = "http://EXCGEO01:6080/arcgis/rest/services/HemelingenRDE/MapServer"
+#3\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau_overview@EPSG%3A32632@png"
+#4\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau@EPSG%3A32632@png"
+
+#3\url = "http://EXCGEO02/arcgis/rest/services/SampleWorldCities/MapServer" ;# 'SampleWorldCities' = EsriBuiltIn-Service (->ArcGISMapImageLayer)
+
+### arcgisonline
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+#2\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#3\url = "http://server.arcgisonline.com/arcgis/rest/services/Ocean_Basemap/MapServer"
+
+1\url = "file:TilePackage/Bremen/Norddeutschland_osm_32632.tpk#-1:125"
+size=1
+
+# Consulting:
+# http://192.168.133.88:6080/arcgis/rest/services/Norddeutschland_Osm/MapServer
+#                    ^^
+# http://192.168.133.90:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer
+#
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Topo_Bremen@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Aerial_Hemelingen@EPSG:32632@png
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_WebMerc/MapServer#0:125"  ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer#0:125"            ;# Since 2017-08-25
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_WebMerc_2/MapServer"
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#1\url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+
+1\url = "file:TilePackage/Bremen/Norddeutschland_osm_WebMerc17.tpk#0:125"
+size=1
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers"  ;# Brest/France
+#1\url = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France from Luke, no textures?
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT_56_11/SceneServer"
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                     ;# Since 2017-08-25
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=1
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:srtm_38_02.tif"                                                                                      ;# srtm_38_02.tif -> Bremen, 50m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+#center = "32UMD9275080525"              ;#QPointF(92750, 80525) -> Rennplatz - Bremen
+#center = "39RXG4400060000"              ;# AHTC
+#center = "30UUU8935659700"              ;# 30UUU9100060500 -> Brest, Chateau
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas.ini
new file mode 100755
index 000000000..cfdb788e9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas.ini
@@ -0,0 +1,155 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Finland/2025-03-04_Finland_Pohjankagas_Topo_1m_32634.tpk#-1:125"
+2\url = "file:TilePackage/Finland/2025-03-04_Finland_Pohjankagas_Aerial_0m5_32634.tpk#-1:125"
+size=2
+
+# Consulting:
+# http://192.168.133.88:6080/arcgis/rest/services/Norddeutschland_Osm/MapServer
+#                    ^^
+# http://192.168.133.90:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer
+#
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Topo_Bremen@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Aerial_Hemelingen@EPSG:32632@png
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"
+
+1\url = "file:TilePackage/Finland/2025-03-04_Finland_Pohjankagas_Topo_1m_WebMerc.tpk#-1:125"
+2\url = "file:TilePackage/Finland/2025-03-04_Finland_Pohjankagas_Aerial_0m5_WebMerc.tpk#-1:125"
+size=2
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers"  ;# Brest/France
+#1\url = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France from Luke, no textures?
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT_56_11/SceneServer"
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                     ;# Since 2017-08-25
+#1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+#1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2025-03-06_Finland-Pohjankagas_elevation.tif"
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+center = "34VEP7780067500"               ;#34 V EP 68500 55000 -> 2025 Finland Pohjankagas
+
+
+#center = "32UMD9275080525"              ;#QPointF(92750, 80525) -> Rennplatz - Bremen
+#center = "39RXG4400060000"              ;# AHTC
+#center = "30UUU8935659700"              ;# 30UUU9100060500 -> Brest, Chateau
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas_BW.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas_BW.ini
new file mode 100755
index 000000000..03c12889f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas_BW.ini
@@ -0,0 +1,158 @@
+# $Id: situation_map_finland_pohjankagas.ini 64630 2025-03-07 08:12:36Z thoden $
+# $HeadURL: svn://slssvn/TDS/branches/product/devel/trunk/Lts/Viewer/SituationMap/Map/situation_map_finland_pohjankagas.ini $
+# $Author: thoden $
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_overview_BW_Aerial_2m_32634.tpk#-1:125"
+2\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_BW_Topo_1m_32634.tpk#-1:125"
+3\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_BW_Aerial_1m_32634.tpk#-1:125"
+size=3
+
+
+# Consulting:
+# http://192.168.133.88:6080/arcgis/rest/services/Norddeutschland_Osm/MapServer
+#                    ^^
+# http://192.168.133.90:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer
+#
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Topo_Bremen@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Aerial_Hemelingen@EPSG:32632@png
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"
+
+1\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_overview_BW_Aerial_2m_WebMerc.tpk#-1:125"
+2\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_BW_Topo_1m_WebMerc.tpk#-1:125"
+3\url = "file:TilePackage/Finland/2025-04-04_Finland_Pohjankagas_BW_Aerial_1m_WebMerc.tpk#-1:125"
+size=3
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers"  ;# Brest/France
+#1\url = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France from Luke, no textures?
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT_56_11/SceneServer"
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                     ;# Since 2017-08-25
+#1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+#1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2025-03-06_Finland-Pohjankagas_elevation.tif"
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+center = "34VEP7780067500"               ;#34 V EP 68500 55000 -> 2025 Finland Pohjankagas
+
+
+#center = "32UMD9275080525"              ;#QPointF(92750, 80525) -> Rennplatz - Bremen
+#center = "39RXG4400060000"              ;# AHTC
+#center = "30UUU8935659700"              ;# 30UUU9100060500 -> Brest, Chateau
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez.ini
new file mode 100755
index 000000000..02cae28c9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez.ini
@@ -0,0 +1,160 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,A3C63PJPXMLDLMZ59123" ;# ESRI-BOS-Service, 05.11.2018
+
+1\extensionString = ""
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None | MIL2525D | MIL2525C | APP6B | APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+#For factory
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Norddeutschland/Norddeutschland_32632/MapServer#-1:125"                      ;# Since 2017-08-29
+#2\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/Hemelingen_TIF_32632/MapServer#-1:125"                                ;# Since 2017-08-29
+
+#For on-site
+1\url = "http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Topo_2m5_32632_2018/MapServer#-1:125"                         ;# Since 2019-09-24
+2\url = "http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Aerial_32632_2017/MapServer#-1:125"                           ;# Since 2019-09-24
+
+1\url = "file:TilePackage/Altmark/2020-07-13_Altmark_topographic2015_32632.tpk#-1:125"                ;# Since 2020-07-31
+2\url = "file:TilePackage/Altmark/2020-07-13_Altmark_aerial2017_32632.tpk#-1:125"                     ;# Since 2020-07-31
+3\url = "file:TilePackage/Altmark/2022-08-23_Altmark_Schnoeggersburg_Drone_32632_Lvl11.tpk#-1:125"    ;# Since 2022-08-23
+
+#For on-site - windows
+#1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#2\url = "file:///C:/EXTFW/resources/Guez_Aerial_32632_Guez_Aerial_32632/Guez Aerial#-1:125"
+size=3
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+#For factory
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Norddeutschland/Norddeutschland_WebMerc/MapServer"                   ;# Since 2017-08-29
+#2\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"                             ;# Since 2017-08-29
+
+#For on-site
+1\url = "http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Topo_2m5_WebMerc_2018/MapServer#0:125"                ;# Since 2019-09-24
+2\url = "http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Aerial_WebMerc_2017/MapServer#0:125"                  ;# Since 2019-09-24
+
+1\url = "file:TilePackage/Altmark/2020-07-13_Altmark_topographic2015_WebMerc.tpk#-1:125"                             ;# Since 2020-07-31
+2\url = "file:TilePackage/Altmark/2020-07-13_Altmark_aerial2017_WebMerc.tpk#-1:125"                                  ;# Since 2020-07-31
+3\url = "file:TilePackage/Altmark/2022-08-23_Altmark_Schnoeggersburg_Drone_WebMerc_Lvl21.tpk#-1:125"                 ;# Since 2022-08-23
+
+#For on-site - windows
+#1\url = "file:///C:/EXTFW/resources/Guez_Topo_WebMerc_Guez_Topo_WebMerc/Guez Topographic#-1:125"
+#2\url = "file:///C:/EXTFW/resources/Guez_Aerial_WebMerc_Guez_Aerial_WebMerc/Guez Aerial#-1:125"
+size=3
+
+
+[sceneObjectUrls]
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                                     ;# Since 2017-08-29 (not working yet)
+1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=1
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#Elevation (rough_to_fine)
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/BremenElevation/ImageServer"                                  ;# Since 2017-08-29
+#1\url = "file:srtm_38_02.tif"                                                                                       ;# srtm_38_02.tif -> Bremen, 50m
+#1\url = "file:n52_e011_1arc_v3.tif"                                                                                 ;# n52_e011_1arc_v3.tif -> Letzlingen, ??m
+1\url = "file:Altmark_dt1.tif"                                                                                       ;# Altmark.dt1 -> Letzlingen, ~15m (0.000138)
+2\url = "file:2022-08-02_Schnoeggersburg_3D-18-A317_DGM_EPSG4326_float32.tif"                                        ;# Since 2022-08, aus Drohnebefliegung
+size=2
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+#6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+6\operationalLayer = "AES:Static:Draped"                       ;# for SubLayer '.._3DExtrusion' SurfacePlaement::Relative is enforced
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+#center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+center = "32UPD7671618433"               ;#QPointF(76716, 18433) -> BT39 (Schulgebaeude2b) - Schnoeggersburg
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez_tablet.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez_tablet.ini
new file mode 100755
index 000000000..24e2ba8c3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_guez_tablet.ini
@@ -0,0 +1,136 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# V100.2.1, provided by Mr. Steinicke (ESRI), 23.03.2018
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+
+[mapUrls]
+#For on-site - windows
+1\url = "file:Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+1\name = "Guez Topographic"
+2\url = "file:Guez_Aerial_32632_Guez_Aerial_32632/Guez Aerial#-1:125"
+2\name = "Guez Aerial"
+3\url = "file:Guez_HotSpots_Salchau_Aerial_0m20_2017_32632#-1:125"
+3\name = "HotSpots Salchau Aerial"
+4\url = "file:Guez_HotSpots_Schnoeggersburg_Aerial_0m20_2017_32632#-1:125"
+4\name = "HotSpots Schnoeggersburg Aerial"
+size=4
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+
+#For on-site - windows
+1\url = "file:Guez_Topo_WebMerc_Guez_Topo_WebMerc/Guez Topographic#-1:125"
+1\name = "Guez Topographic"
+2\url = "file:Guez_Aerial_WebMerc_Guez_Aerial_WebMerc/Guez Aerial#-1:125"
+2\name = "Guez Aerial"
+3\url = "file:Guez_HotSpots_Salchau_Aerial_0m20_2017_WebMerc#-1:125"
+3\name = "HotSpots Salchau Aerial"
+4\url = "file:Guez_HotSpots_Schnoeggersburg_Aerial_0m20_2017_WebMerc#-1:125"
+4\name = "HotSpots Schnoeggersburg Aerial"
+size=4
+
+
+[sceneObjectUrls]
+1\url = "file:GUEZ_BA1_EPSG3857_20181106.slpk"
+size=1
+
+[elevationUrls]
+1\url = "file:Altmark_dt1.tif"                                                                                        ;# Altmark.dt1 -> Letzlingen, ??m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UPD7400013000"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
+
+
+
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_hungary_varpalota_preview.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_hungary_varpalota_preview.ini
new file mode 100755
index 000000000..04a167267
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_hungary_varpalota_preview.ini
@@ -0,0 +1,179 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_32632/MapServer#-1:125"     ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_32632/MapServer"             ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenHemelingenAerialGeoAmt_32632/MapServer#-1:125" ;# Since 2017-12-12
+3\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenWerkAerialDrone_32632/MapServer#-1:125"        ;# Since 2017-12-12
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_32639/MapServer"
+
+#1\url = "http://EXCGEO01:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png"
+#2\url = "http://EXCGEO01:6080/arcgis/rest/services/HemelingenRDE/MapServer"
+#3\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau_overview@EPSG%3A32632@png"
+#4\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau@EPSG%3A32632@png"
+
+#3\url = "http://EXCGEO02/arcgis/rest/services/SampleWorldCities/MapServer" ;# 'SampleWorldCities' = EsriBuiltIn-Service (->ArcGISMapImageLayer)
+
+### arcgisonline
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+#2\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#3\url = "http://server.arcgisonline.com/arcgis/rest/services/Ocean_Basemap/MapServer"
+
+1\url = "file:TilePackage/Hungary/2024-07-30_Hungary_Varpalota_topographic_32634.tpk#-1:125"
+2\url = "file:TilePackage/Hungary/2024-07-29_Hungary_Varpalota_aerial_32634.tpk#-1:125"
+size=2
+
+# Consulting:
+# http://192.168.133.88:6080/arcgis/rest/services/Norddeutschland_Osm/MapServer
+#                    ^^
+# http://192.168.133.90:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer
+#
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Topo_Bremen@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Aerial_Hemelingen@EPSG:32632@png
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_WebMerc/MapServer#0:125"  ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer#0:125"            ;# Since 2017-08-25
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_WebMerc_2/MapServer"
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#1\url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+
+1\url = "file:TilePackage/Hungary/2024-07-30_Hungary_Varpalota_topographic_WebMerc.tpk#-1:125"
+2\url = "file:TilePackage/Hungary/2024-07-29_Hungary_Varpalota_aerial_WebMerc.tpk#-1:125"
+size=2
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers"  ;# Brest/France
+#1\url = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France from Luke, no textures?
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT_56_11/SceneServer"
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                     ;# Since 2017-08-25
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2024-07-30_Hungary_Varpalota_DDM10_WGS84.tif"
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "34 TBT 74750 25500"            ;#QPointF(32000, 04000) -> Hungary, Varpalota
+#center = "32UMD9275080525"              ;#QPointF(92750, 80525) -> Rennplatz - Bremen
+#center = "39RXG4400060000"              ;# AHTC
+#center = "30UUU8935659700"              ;# 30UUU9100060500 -> Brest, Chateau
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 10000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_cultana.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_cultana.ini
new file mode 100755
index 000000000..7a4642e07
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_cultana.ini
@@ -0,0 +1,122 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimeadvanced,1000,rud000500932,none,5H7LMD17J12GEBZNR016"     ;# Mail David Eastman, 20.02.2019
+
+1\extensionString = "runtimeanalysis,1000,rud000500932,none,YYPH5AZAMAG0E3CPR073" ;# Mail David Eastman, 20.02.2019
+size=1
+
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+#extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/L400/2020-03-02_Cultana_aerial_0m50_32653.tpk"
+size=1
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+size=0
+
+
+[sceneObjectUrls]
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:L400/Cultana_e137s33_TFRM.dt2"                                                                                     ;# 2020-03-Cultana_e137s33_TFRM.dt2 -> 25m
+size=1
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "53HQD3500071000"
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 200000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_puckapunyal.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_puckapunyal.ini
new file mode 100755
index 000000000..76f3b5b41
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_puckapunyal.ini
@@ -0,0 +1,122 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimeadvanced,1000,rud000500932,none,5H7LMD17J12GEBZNR016"     ;# Mail David Eastman, 20.02.2019
+
+1\extensionString = "runtimeanalysis,1000,rud000500932,none,YYPH5AZAMAG0E3CPR073" ;# Mail David Eastman, 20.02.2019
+size=1
+
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+#extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/L400/2020-03-02_Puckapunyal_aerial_0m20_32655.tpk"
+size=1
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+size=0
+
+
+[sceneObjectUrls]
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:L400/2020-03-03_Puckapunyal.tif"                                                                                     ;# 2020-03-03_Puckapunyal.tif -> 25m
+size=1
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "55HCV2000012000"
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 200000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_swbta.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_swbta.ini
new file mode 100755
index 000000000..04f462b32
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_swbta.ini
@@ -0,0 +1,123 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimeadvanced,1000,rud000500932,none,5H7LMD17J12GEBZNR016"     ;# Mail David Eastman, 20.02.2019
+
+1\extensionString = "runtimeanalysis,1000,rud000500932,none,YYPH5AZAMAG0E3CPR073" ;# Mail David Eastman, 20.02.2019
+size=1
+
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+#extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/L400/2020-03-02_SWBTA_aerial_0m20_32656.tpk"
+size=1
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+size=0
+
+
+[sceneObjectUrls]
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:L400/SWBTA_e150s23_TFRM.dt2"                                                                                    ;# SWBTA_e150s23_TFRM.dt2 -> 25m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "56KKA2000000001"
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 200000
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_tfta.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_tfta.ini
new file mode 100755
index 000000000..1981da065
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_l400p2_tfta.ini
@@ -0,0 +1,122 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimeadvanced,1000,rud000500932,none,5H7LMD17J12GEBZNR016"     ;# Mail David Eastman, 20.02.2019
+
+1\extensionString = "runtimeanalysis,1000,rud000500932,none,YYPH5AZAMAG0E3CPR073" ;# Mail David Eastman, 20.02.2019
+size=1
+
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+#extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/L400/2020-03-02_TFTA_aerial_0m50_32655.tpk"
+size=1
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+size=0
+
+
+[sceneObjectUrls]
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:L400/TFTA_e146s20_TFRM.dt2"                                                                                     ;# 2020-03-TFTA_e146s20_TFRM.dt2 -> 25m
+size=1
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "55KDU3800034000"
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 200000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_land400.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_land400.ini
new file mode 100755
index 000000000..071e2b6da
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_land400.ini
@@ -0,0 +1,152 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimeadvanced,1000,rud000500932,none,5H7LMD17J12GEBZNR016"     ;# Mail David Eastman, 20.02.2019
+
+1\extensionString = "runtimeanalysis,1000,rud000500932,none,YYPH5AZAMAG0E3CPR073" ;# Mail David Eastman, 20.02.2019
+size=1
+
+[esriNetworkCache]
+enabled = 0                                               ;# enabled: 1=on ; 0 =off, since V100.7.0
+
+[symbology]
+type = "MIL2525D"                                         ;# None | MIL2525D | MIL2525C | APP6B
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+#For factory
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_32639/MapServer"
+
+#For on-site
+#1\url = "http://e-vm-geo-2.ahtc.live/arcgis/rest/services/UAE/UaeTopographic_32639/MapServer"     ;# Since 2017-11-30
+#2\url = "http://e-vm-geo-2.ahtc.live/arcgis/rest/services/UAE/UaeAerial_32639/MapServer"          ;# Since 2017-11-30
+
+#For on-site - windows
+# todo
+
+size=1
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+#For factory
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_WebMerc_2/MapServer"
+
+#For on-site
+#1\url = "http://e-vm-geo-2.ahtc.live/arcgis/rest/services/UAE/UaeTopographic_WebMerc/MapServer"   ;# Since 2017-11-30
+#2\url = "http://e-vm-geo-2.ahtc.live/arcgis/rest/services/UAE/UaeAerial_WebMerc/MapServer"        ;# Since 2017-11-30
+
+#For on-site - windows
+# todo
+
+size=1
+
+
+[sceneObjectUrls]
+#1\url = "http://e-vm-geo-2.ahtc.live/arcgis/rest/services/Hosted/AHTC_LOW_15_11_2017/SceneServer"  ;# Since 2017-11-30
+
+1\url = "file:///tmp/AHTC_2017-12-18_21_0_AHTC_LOW_2017_12_18_v7.slpk"
+#1\url = "file:///tmp/AHTC_2018-01-30/AHTC_2018_01_29_featureclass_per_building_gdb.slpk"
+#1\url = "file:///tmp/AHTC_2018-01-30/AHTC_2018_01_29_one_featureclass_gdb.slpk"
+1\url = "file:AHTC_0_AHTC_LOW_2018_10_17.slpk"
+1\url = "file:AHTC_LOW_2018_10_29.slpk"
+1\url = "file:AHTC_LOW_2018_10_30.slpk"
+1\url = "file:AHTC_LOW_2019_01_17.slpk"
+1\url = "file:AHTC_LOW.slpk"
+size=1
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/BremenElevation/ImageServer"                                  ;# Since 2017-08-29
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/ZM2/AHTC_UTM_dgm/ImageServer"                       ;# Z&M Testlauf03 ; 2018-02-14
+1\url = "file:AHTC_utm_dgm_surface.tif"                                                                              ;# Z&M
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "39RXG4400060000"              ;# AHTC
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 90000                     ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_litauen_rukla.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_litauen_rukla.ini
new file mode 100755
index 000000000..78fd68a9e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_litauen_rukla.ini
@@ -0,0 +1,177 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_32632/MapServer#-1:125"     ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_32632/MapServer"             ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenHemelingenAerialGeoAmt_32632/MapServer#-1:125" ;# Since 2017-12-12
+3\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenWerkAerialDrone_32632/MapServer#-1:125"        ;# Since 2017-12-12
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_32639/MapServer"
+
+#1\url = "http://EXCGEO01:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png"
+#2\url = "http://EXCGEO01:6080/arcgis/rest/services/HemelingenRDE/MapServer"
+#3\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau_overview@EPSG%3A32632@png"
+#4\url = "http://excgeo01:9090/geoserver/gwc/service/tms/1.0.0/Salchau%3ASalchau@EPSG%3A32632@png"
+
+#3\url = "http://EXCGEO02/arcgis/rest/services/SampleWorldCities/MapServer" ;# 'SampleWorldCities' = EsriBuiltIn-Service (->ArcGISMapImageLayer)
+
+### arcgisonline
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+#2\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#3\url = "http://server.arcgisonline.com/arcgis/rest/services/Ocean_Basemap/MapServer"
+
+1\url = "file:TilePackage/Lithuania_Rukla/2024-07-03-Lith_Rukla_aerial_0m5_32635.tpk#-1:125"
+size=1
+
+# Consulting:
+# http://192.168.133.88:6080/arcgis/rest/services/Norddeutschland_Osm/MapServer
+#                    ^^
+# http://192.168.133.90:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer
+#
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/workspace1:Norddeutschland_UTM@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Topo_Bremen@EPSG:32632@png
+# http://192.168.133.90:9090/geoserver/gwc/service/tms/1.0.0/Bremen:Aerial_Hemelingen@EPSG:32632@png
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"
+
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Norddeutschland/Norddeutschland_WebMerc/MapServer#0:125"  ;# Since 2017-08-25
+2\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer#0:125"            ;# Since 2017-08-25
+
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/AHTC/AHTC_WebMerc_2/MapServer"
+#1\url = "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
+#1\url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" ;# == Basemap::topographic
+
+1\url = "file:TilePackage/Lithuania_Rukla/2024-07-03-Lith_Rukla_aerial_0m5_WebMerc.tpk#-1:125"
+size=1
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France
+#1\url = "http://scene.arcgis.com/arcgis/rest/services/Hosted/Buildings_Brest/SceneServer/layers"  ;# Brest/France
+#1\url = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0"  ;# Brest/France from Luke, no textures?
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT_56_11/SceneServer"
+1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                     ;# Since 2017-08-25
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2024-07-03_Lith_Rukla_elevation.tif"                                                                  ;# 2024-07-03_Lith_Rukla_elevation.tif -> Litauen Rukla
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Draped"                ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget), draped for fillPattern
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "AESCentral:Dynamic:Draped"               ;# 3D-AreaEffectSimulation, draped, SubLayer 'GraphicsLayer_3D_Absolute' is absolute
+8\operationalLayer = "Participants:Dynamic:Relative"
+9\operationalLayer = "Participants_1:Dynamic:Relative"
+10\operationalLayer = "Participants_2:Dynamic:Relative"
+11\operationalLayer = "Participants_3:Dynamic:Relative"
+12\operationalLayer = "Participants_4:Dynamic:Relative"
+13\operationalLayer = "Participants_5:Dynamic:Relative"
+size=13
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "35 ULB 32000 04000"            ;#QPointF(32000, 04000) -> Rukla
+#center = "32UMD9275080525"              ;#QPointF(92750, 80525) -> Rennplatz - Bremen
+#center = "39RXG4400060000"              ;# AHTC
+#center = "30UUU8935659700"              ;# 30UUU9100060500 -> Brest, Chateau
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 28000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg.ini
new file mode 100755
index 000000000..d4061692e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg.ini
@@ -0,0 +1,130 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Luxemburg/2023-07-10_Luxemburg_Aerial_0m1_2169_Lvl_10.tpk#-1:125" ;# 16GB
+size=1
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+1\url = "file:Topographic.tpk#-1:125" ;# 7,8GB
+size=1
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2023-07-11_elevationLuxemburg.tif"
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UKV9284699203"              ;#QPointF(92846, 99203) -> Luxemburg
+center = "32UKA9000022000"              ;# -> complete Luxemburg
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 300000                     ;# 90000 -> Bremen ; 300000 -> Luxemburg
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg_tablet.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg_tablet.ini
new file mode 100755
index 000000000..d4061692e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_luxemburg_tablet.ini
@@ -0,0 +1,130 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Luxemburg/2023-07-10_Luxemburg_Aerial_0m1_2169_Lvl_10.tpk#-1:125" ;# 16GB
+size=1
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+1\url = "file:Topographic.tpk#-1:125" ;# 7,8GB
+size=1
+
+
+[sceneObjectUrls]
+#             1\url = "URL[#<altitudeOffset>]"
+#Example: >>> 1\url = "file:AHTC_LOW.slpk#0.3" <<<
+#Brest
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:2023-07-11_elevationLuxemburg.tif"
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "32UKV9284699203"              ;#QPointF(92846, 99203) -> Luxemburg
+center = "32UKA9000022000"              ;# -> complete Luxemburg
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 300000                     ;# 90000 -> Bremen ; 300000 -> Luxemburg
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatar.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatar.ini
new file mode 100755
index 000000000..f791b1ba6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatar.ini
@@ -0,0 +1,144 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Qatar/2022-06-23_Qatar_OSM_32639.vtpk#-1:125"                    ;# Since Since 2022
+
+2\url = "file:TilePackage/Qatar/Qatar_Aerial_32639.tpk#-1:125"                             ;# Since Since 2022
+3\url = "file:TilePackage/Qatar/Qatar_Aerial_Islands_32639.tpk#-1:125"                     ;# Since Since 2022
+
+4\url = "file:TilePackage/Qatar/2021-12-09_Qatar_Doha_Aerial_50cm_32639_Lvl8.tpk#-1:125"   ;# Since Since 2022
+5\url = "file:TilePackage/Qatar/Qatar_NSA_BarzanCamp_Aerial_32639.tpk#-1:125"              ;# Since Since 2022
+6\url = "file:TilePackage/Qatar/2021-12-16_Qatar_ABMMC_Aerial_50cm_32639_Lvl8.tpk#-1:125"  ;# Since Since 2022
+
+size=6
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+# !!! 2022-07: vtpk at 3d scene are support since 100.13!!!
+1\url = "file:TilePackage/Qatar/2022-07-12_Qatar_OSM_WebMercator_Raster_Lvl16.tpk#-1:125"     ;# Since Since 2022
+
+2\url = "file:TilePackage/Qatar/Qatar_Aerial_WebMerc.tpk#-1:125"                              ;# Since Since 2022
+3\url = "file:TilePackage/Qatar/Qatar_Aerial_Islands_WebMerc.tpk#-1:125"                      ;# Since Since 2022
+
+4\url = "file:TilePackage/Qatar/2021-12-09_Qatar_Doha_Aerial_50cm_WebMerc_Lvl18.tpk#-1:125"   ;# Since Since 2022
+5\url = "file:TilePackage/Qatar/Qatar_NSA_BarzanCamp_Aerial_WebMerc.tpk#-1:125"               ;# Since Since 2022
+6\url = "file:TilePackage/Qatar/2021-12-16_Qatar_ABMMC_Aerial_50cm_WebMerc_Lvl18.tpk#-1:125"  ;# Since Since 2022
+
+size=6
+
+
+[sceneObjectUrls]
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:srtm_38_02.tif"                                                                                      ;# srtm_38_02.tif -> Bremen, 50m
+1\url = "file:2022-07-12_Qatar_DEM_float32.tif"                                                                    ;# 2022-07-12_Qatar_DEM_float32.tif -> ~30m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "39RWJ3650000500"              ;#QPointF(36500, 15500) -> Qatar Bldg
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 750000                   ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 40000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatarmout.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatarmout.ini
new file mode 100755
index 000000000..f791b1ba6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_qatarmout.ini
@@ -0,0 +1,144 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,FAYRMD17J18S6HAZ4078" ;# 14.03.19, Fr. Jonischkeit: Aus 25er Pack für RME, bis Febr; also für Demo etc.
+
+1\extensionString = "Exten1"
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None  MIL2525D  MIL2525C  APP6B  APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+# EXCGEO01 (192.168.133.90) -> CCSAWS01
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+
+1\url = "file:TilePackage/Qatar/2022-06-23_Qatar_OSM_32639.vtpk#-1:125"                    ;# Since Since 2022
+
+2\url = "file:TilePackage/Qatar/Qatar_Aerial_32639.tpk#-1:125"                             ;# Since Since 2022
+3\url = "file:TilePackage/Qatar/Qatar_Aerial_Islands_32639.tpk#-1:125"                     ;# Since Since 2022
+
+4\url = "file:TilePackage/Qatar/2021-12-09_Qatar_Doha_Aerial_50cm_32639_Lvl8.tpk#-1:125"   ;# Since Since 2022
+5\url = "file:TilePackage/Qatar/Qatar_NSA_BarzanCamp_Aerial_32639.tpk#-1:125"              ;# Since Since 2022
+6\url = "file:TilePackage/Qatar/2021-12-16_Qatar_ABMMC_Aerial_50cm_32639_Lvl8.tpk#-1:125"  ;# Since Since 2022
+
+size=6
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk', 'Bremen_RME_32632.tpk')
+#localMapFile = "World_Topo_Map.tpk"
+# : For debugging only
+
+
+
+[sceneUrls]
+# !!! 2022-07: vtpk at 3d scene are support since 100.13!!!
+1\url = "file:TilePackage/Qatar/2022-07-12_Qatar_OSM_WebMercator_Raster_Lvl16.tpk#-1:125"     ;# Since Since 2022
+
+2\url = "file:TilePackage/Qatar/Qatar_Aerial_WebMerc.tpk#-1:125"                              ;# Since Since 2022
+3\url = "file:TilePackage/Qatar/Qatar_Aerial_Islands_WebMerc.tpk#-1:125"                      ;# Since Since 2022
+
+4\url = "file:TilePackage/Qatar/2021-12-09_Qatar_Doha_Aerial_50cm_WebMerc_Lvl18.tpk#-1:125"   ;# Since Since 2022
+5\url = "file:TilePackage/Qatar/Qatar_NSA_BarzanCamp_Aerial_WebMerc.tpk#-1:125"               ;# Since Since 2022
+6\url = "file:TilePackage/Qatar/2021-12-16_Qatar_ABMMC_Aerial_50cm_WebMerc_Lvl18.tpk#-1:125"  ;# Since Since 2022
+
+size=6
+
+
+[sceneObjectUrls]
+1\url = "file:BT_56_UTM_EPSG_25832.slpk"
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://excgeo21.sl.defence-elec.de/arcgis/rest/services/Bremen/BremenElevation/ImageServer"
+1\url = "file:srtm_38_02.tif"                                                                                      ;# srtm_38_02.tif -> Bremen, 50m
+1\url = "file:2022-07-12_Qatar_DEM_float32.tif"                                                                    ;# 2022-07-12_Qatar_DEM_float32.tif -> ~30m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Dynamic:Draped"
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+center = "39RWJ3650000500"              ;#QPointF(36500, 15500) -> Qatar Bldg
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 750000                   ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 40000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+#viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+viewshedUrl = "" ;# // SightFan -> not necessary
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
index 7a5ea8710..ca8ff818e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
@@ -303,15 +303,6 @@ struct SymbolData
  */
 using PositionCont = QVector<Point3D>;
 
-inline PositionCont convert2D3D(const QList<QPointF> &lst)
-{
-  PositionCont posCont;
-  posCont.reserve(lst.size());
-  for (auto i : std::as_const(lst) )
-    posCont.append(Point3D::fromQPointF(i));
-  return posCont;
-}
-
 inline PositionCont convert2D3D(const QVector<QPointF> &vec)
 {
   PositionCont posCont;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_unterluess.ini b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_unterluess.ini
new file mode 100755
index 000000000..a87f1a0f2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_unterluess.ini
@@ -0,0 +1,161 @@
+# $Id$
+# $HeadURL$
+# $Author$
+
+
+
+#-- bottom_left: 30 U WB 56700 58000 = lon, lat: -2.190721 , 51.070713 (-0.03823529444, 0.891352093191)
+#-- Salisbury England
+#INSERT INTO asm.asm_training_area(id, name, bottom_left_x, bottom_left_y, height, width)
+#  VALUES (XXX, 'Salisbury', -0.03823529444, 0.891352093191, 30000, 30000);
+
+#-- 2D
+#INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
+#  VALUES (XXX6, 'Salisbury (OSM)', 'Salisbury (OSM)',                                        30, 1, 1, 0, 'file:TilePackage/Salisbury/2021-09-01_Salisbury_32630.tpk', -1, 125);
+
+
+
+[license]
+licenseString = "runtimestandard,1000,rud000189203,none,A3C63PJPXMLDLMZ59123" ;# ESRI-BOS-Service, 05.11.2018
+
+1\extensionString = ""
+size=0
+
+[esriNetworkCache]
+enabled = 1                                               ;# enabled: 1=on ; 0=off, since V100.7.0
+
+[symbology]
+type = "APP6D"                                            ;# None | MIL2525D | MIL2525C | APP6B | APP6D
+extraSymbols = ":/advancedSymbology/CivilSymbols"         ;# ':/advancedSymbology/CivilSymbols'
+
+[mapUrls]
+#             1\url = "URL[#<minScale>:<maxScale>]"
+#Example: >>> 1\url = "http://HOSTNAME_FQDN/arcgis/rest/services/Folder/Svcname/MapServer#minScale:maxScale" <<<
+#
+#if the projection matches, tpk file and/or tile cache folder (win only) are supported:
+#1\url = "file:Topographic.tpk#-1:125"                                                                 ;# -> /usr/share/arcgis/resources/Topographic.tpk
+#2\url = "file:///usr/share/arcgis/resources/World_Topo_Map.tpk#-1:125"
+# WINDOWS 1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#
+#For factory
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Norddeutschland/Norddeutschland_32632/MapServer#-1:125"                      ;# Since 2017-08-29
+#2\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/Hemelingen_TIF_32632/MapServer#-1:125"                                ;# Since 2017-08-29
+
+#For on-site
+1\url = "file:TilePackage/Unterluess/2021-10-14_Unterluess_Aerial_32632.tpk"                                            ;# Since 2021-10-15
+
+#For on-site - windows
+#1\url = "file:///C:/EXTFW/resources/Guez_Topo_32632_guez_topo_32632/Guez Topographic#-1:125"
+#2\url = "file:///C:/EXTFW/resources/Guez_Aerial_32632_Guez_Aerial_32632/Guez Aerial#-1:125"
+size=1
+
+
+basemapLayernamePrefix = ""             ;# default: "ArcGISTiledLayer_URL_"
+
+# For debugging only:
+# an non-empty value will overwrite/skip the mapUrls:
+#localMapFile = "Topographic.tpk"                       ;# empty (if so, try 'Topographic.tpk')
+# : For debugging only
+
+
+
+[sceneUrls]
+#For factory
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Norddeutschland/Norddeutschland_WebMerc/MapServer"                   ;# Since 2017-08-29
+#2\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/Hemelingen_TIF_WebMerc/MapServer"                             ;# Since 2017-08-29
+
+#For on-site
+
+#For on-site - windows
+#1\url = "file:///C:/EXTFW/resources/Guez_Topo_WebMerc_Guez_Topo_WebMerc/Guez Topographic#-1:125"
+#2\url = "file:///C:/EXTFW/resources/Guez_Aerial_WebMerc_Guez_Aerial_WebMerc/Guez Aerial#-1:125"
+
+1\url = "file:Topographic.tpk#-1:125"
+size=1
+
+
+[sceneObjectUrls]
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Hosted/BT56_rev576/SceneServer"                                     ;# Since 2017-08-29 (not working yet)
+1\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+2\url = "file:GUEZ_EPSG3857.slpk"                                                                                   ;# Since 2019-03-26
+size=0
+
+[elevationUrls]
+#Example: >>> 1\url = "http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" <<<
+#Example: >>> 1\url = "file:srtm_38_02.tif" <<< -> /usr/share/arcgis/resources/elevation/srtm_38_02.tif
+#Example: >>> 1\url = "file:///shd/CTC/TOOLS/Bremen_Elevation/srtm_38_02.tif" <<<
+#1\url = "http://ecvmgeo02/arcgis/rest/services/Bremen/BremenElevation/ImageServer"                                  ;# Since 2017-08-29
+#1\url = "file:srtm_38_02.tif"                                                                                       ;# srtm_38_02.tif -> Bremen, 50m
+#1\url = "file:n52_e011_1arc_v3.tif"                                                                                ;# n52_e011_1arc_v3.tif -> Letzlingen, ??m
+1\url = "file:e010n52_TFRM.dt2"                                                                                        ;# e010n52_TFRM.dt2.dt1 -> Unterlüß/Unterluess, ??m
+size=1
+
+
+[operationalLayer]
+# "<Layername>:<Static|Dynamic>:<Draped|Absolute|Relative>"
+1\operationalLayer = "Buildings:Dynamic:Relative"              ;# Dynamic to avoid flicker at 3D if selection changes (MapObjectSelectionWidget)
+2\operationalLayer = "TechnicalAreas:Dynamic:Draped"           ;# TechnicalArea@AES (MOUTArea), TrainingArea, ShootBackArea
+3\operationalLayer = "MountingPoints:Dynamic:Absolute"
+4\operationalLayer = "IEDs:Dynamic:Relative"
+5\operationalLayer = "BuildingOwnership:Dynamic:Relative"      ;# keep ExtrusionMode (AbsoluteHeight) in mind
+6\operationalLayer = "AES:Static:Draped"                       ;# switch to Static (NLDEVCTRL-692 'Beheben des Speicher(-leck) Problems')
+7\operationalLayer = "Participants:Dynamic:Relative"
+8\operationalLayer = "Participants_1:Dynamic:Relative"
+9\operationalLayer = "Participants_2:Dynamic:Relative"
+10\operationalLayer = "Participants_3:Dynamic:Relative"
+11\operationalLayer = "Participants_4:Dynamic:Relative"
+12\operationalLayer = "Participants_5:Dynamic:Relative"
+size=12
+
+participantLayername = "Participants:Dynamic:Relative"         ;# default: "Participants:Dynamic:Relative"
+
+operationalLayerForCubes = "BuildingOwnership"                 ;# must match with an operationalLayer
+
+
+[map]
+
+# full mgrs coordinate
+# East;North
+#center = "32UMD9307078331"               ;#QPointF(93070, 78331) -> BT56 - Bremen
+center = "32UND 86500 58100"               ;#QPointF(86500, 58100) -> Unterlüß/Unterluess
+
+zoomFactorBase = 1.0015                 ;# to configure mouse wheel for zooming, only values greater 1 and lower 1.1 will be accepted
+
+initialScale = 40000                    ;# 90000 -> Bremen ; 7000000 -> NorthGermany
+
+# scaleMin and scaleMax (of map!) may be overwritten, if a layer is loaded manually -> to rethink
+scaleMin = -1                           ;# big value   (e.g. 10000000) limiting zoomOut  1:10000000 -> 0.0000001
+scaleMax = -1                           ;# small value (e.g. 1000)     limiting zoomIn   1:1000     -> 0.001
+
+scaleHasVisibility = 70000              ;# zoom out -> some objects disappear to not overload the map
+
+gridType = "MGRS"                       ;# Grid: NoType, MGRS, UTM, USGN, LatLon
+
+animationDuration = 0.5                 ;# default -> 0.5 (0< 0 -> off)
+rocketDuration = 2.0                    ;# default -> 2.0
+
+
+[widgets]
+addMapWidgets = 1
+addSideBar    = 1
+
+[viewshed]
+# // arcgisonline -> only demo (keep proxy in mind!)
+viewshedUrl = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed" ;# // only demo!!!
+
+
+[rubberband]
+drawColor         = "#00406e"           ;# Color settings of rubberband
+fillColor         = "#007eC0"
+handleDrawColor   = "#00406e"           ;# Outline color of handles
+handleFillColor   = "#00406e"           ;# fill color of handles
+selectionColor    = "red"               ;# fill or draw color if handle is selected
+frameColor        = "#00406e"           ;# outline color of frame handle (bounding box)
+frameFillColor    = "#5043b0e0"         ;# fill color of frame handle (bounding box)
+frameHandleMargin = 0                   ;# Margin of frame handle in pixel
+previewOffset     = @Point(32 32)       ;# Offset of preview icon to mouse position
+previewSize       = 32                  ;# Size of preview icon
+pickingRatio      = 8                   ;# Size of rubberband point handles
+lineHandleWidth   = 4                   ;# Size of rubberband line handles
+
+# to be continued
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
index 8cafdc71f..4d043e4ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
@@ -31,6 +31,9 @@
 #include <QtCore/QRect>
 
 #include <sstream>
+#include <Geometry.h>
+#include <Point.h>
+#include <Error.h>
 
 
 std::ostream &operator<< (std::ostream   &stream,
@@ -378,7 +381,7 @@ QString toString(const Error &value)
 {
   std::ostringstream stream;
   stream << "Esri::ArcGISRuntime::Error: "
-         << " code="                << value.code()
+         << " code="                << value.arcGISServerErrorCode().value_or(-1)
          << ", domain="             << (int)value.domain()
          << ", extendedErrorType="  << (int)value.extendedErrorType()
          << ", message='"           << value.message() << "'"
@@ -496,8 +499,6 @@ QString toString(const Esri::ArcGISRuntime::LayerType value)
     return QStringLiteral("FeatureLayer");
   case Esri::ArcGISRuntime::LayerType::KMLLayer:
     return QStringLiteral("KMLLayer");
-  case Esri::ArcGISRuntime::LayerType::BingMapLayer:
-    return QStringLiteral("BingMapLayer");
   case Esri::ArcGISRuntime::LayerType::RasterLayer:
     return QStringLiteral("RasterLayer");
   case Esri::ArcGISRuntime::LayerType::UnsupportedLayer:
@@ -643,8 +644,6 @@ QString toString(const Esri::ArcGISRuntime::ViewpointType value)
 {
   switch (value)
   {
-  case Esri::ArcGISRuntime::ViewpointType::Unknown:
-    return QStringLiteral("Unknown");
   case Esri::ArcGISRuntime::ViewpointType::CenterAndScale:
     return QStringLiteral("CenterAndScale");
   case Esri::ArcGISRuntime::ViewpointType::BoundingGeometry:
@@ -696,8 +695,8 @@ QString toString(Esri::ArcGISRuntime::SurfacePlacement value)
 {
   switch (value)
   {
-  case Esri::ArcGISRuntime::SurfacePlacement::Draped:
-    return QStringLiteral("Draped");
+  case Esri::ArcGISRuntime::SurfacePlacement::DrapedBillboarded:
+    return QStringLiteral("DrapedBillboarded");
   case Esri::ArcGISRuntime::SurfacePlacement::Absolute:
     return QStringLiteral("Absolute");
   case Esri::ArcGISRuntime::SurfacePlacement::Relative:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
index 2a5ef816b..c43d1c310 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
@@ -13,6 +13,7 @@
 
 
 // arcgis
+#include <arcgisversion.h>   // ACRGIS_VERSION (this file is created by RME, not ESRI)
 #include <SceneViewTypes.h> // SurfacePlacement
 #include <Error.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.cpp
new file mode 100755
index 000000000..589b3b9ed
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.cpp
@@ -0,0 +1,59 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractEffectSimulation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "abstract_effect_simulation_impl.h"
+#include "map_impl.h"
+
+
+// ESRI
+
+
+// Qt
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// Utils:
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+// class AbstractEffectSimulationImpl
+//-----------------------------------------------------------------------------
+AbstractEffectSimulationImpl::AbstractEffectSimulationImpl()
+  : BaseClass()     // Interface
+  , m_logger(getLogger("AbstractEffectSimulationImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AbstractEffectSimulationImpl::~AbstractEffectSimulationImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+
+QString AbstractEffectSimulationImpl::toString() const
+{
+  return QString();
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.h
new file mode 100755
index 000000000..ede3fd20f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_effect_simulation_impl.h
@@ -0,0 +1,52 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractEffectSimulation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_map_object_impl.h"
+#include <Map/abstract_effect_simulation.h> // Interface
+
+
+// ESRI
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAP_EXPORT AbstractEffectSimulationImpl : public virtual AbstractEffectSimulation
+{
+  using BaseClass = SituationMap::AbstractEffectSimulation;
+
+public:
+  AbstractEffectSimulationImpl();
+  virtual ~AbstractEffectSimulationImpl();
+
+  AbstractEffectSimulationImpl(const AbstractEffectSimulationImpl &other)     = delete;
+  AbstractEffectSimulationImpl &operator=(AbstractEffectSimulationImpl &other) = delete;
+
+  virtual QString toString() const;
+
+protected:
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.cpp
new file mode 100755
index 000000000..b202b9c4c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.cpp
@@ -0,0 +1,1206 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "abstract_map_object_impl.h"
+#include "map_impl.h"
+#include "object_container_impl.h"
+
+#include <Map/party_id_to_color_functor.h>
+
+#include <MathUtils/geometry_engine.h>
+
+#include <GraphicalObjects/abstract_graphical_object.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/graphical_object_cube.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/tactical_appearance.h>
+#include <Map/bounding_box.h>
+
+
+// ESRI
+#include <Graphic.h>
+#include <GraphicsOverlay.h>
+#include <LayerSceneProperties.h>
+#include <Geometry.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+struct ExtraData
+{
+  QVector<QByteArray> propertyNames;
+  QVector<QVariant>   propertyValues;
+};
+
+
+
+AbstractMapObjectImpl::AbstractMapObjectImpl(const QString &debugInfo)
+  : AbstractMapObject()
+  , m_uniqueMapId(SituationMap::INVALID_MAP_ID)
+  , m_logger(getLogger("AbstractMapObjectImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " debugInfo='" << debugInfo << "'";
+  m_debugInfo = debugInfo;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " debugInfo='" << debugInfo << "'";
+} // AbstractMapObjectImpl::AbstractMapObjectImpl
+
+
+AbstractMapObjectImpl::~AbstractMapObjectImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo
+                      << " uniqueMapId=" << m_uniqueMapId;
+  delete m_mapConnector;
+  m_mapConnector = nullptr;
+
+  resetPin();
+
+  delete m_tacticalAppearance;
+  m_tacticalAppearance = nullptr;
+
+  delete m_mainGraphicalObjectText;
+  m_mainGraphicalObjectText = nullptr;
+
+  resetGraphicalObjectExtrusion();
+
+  delete m_mainGraphicalObject;
+  m_mainGraphicalObject = nullptr;
+
+  delete m_extraData;
+  m_extraData = nullptr;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo
+                      << " uniqueMapId=" << m_uniqueMapId;
+
+} // AbstractMapObjectImpl::~AbstractMapObjectImpl
+
+
+void AbstractMapObjectImpl::removeMySelf()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+
+  // To avoid accessing already deleted variables make some local copies 2016/01/08 JT
+  QString                debugInfo       = m_debugInfo;
+  UniqueMapId            uid             = m_uniqueMapId;
+  SituationMap::LOGGER_T logger(m_logger);
+
+  if (m_mapImpl)
+  {
+    TRACE_LOG(m_logger) << "removeObject, uniqueMapId = " << m_uniqueMapId;
+    m_uniqueMapId = SituationMap::INVALID_MAP_ID;
+    m_mapImpl->objectContainer().removeObject(uid);
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl does not exist.";
+
+  // Attention CRASH here if AbstractMapObject is not been referenced by a RefPointer. In this case the this-object has been deleted immediately 2016/01/08 JT
+  TRACE_LOG(logger) << LOGFUNCTION << " END"
+                    << " debugInfo=" << debugInfo;
+}
+
+bool AbstractMapObjectImpl::setProperty(const char *name, const QVariant &value)
+{
+  // following setProperty/property approach is take from qt4.8.5:
+
+  if (!m_extraData)
+    m_extraData = new ExtraData;
+
+  const int idx = m_extraData->propertyNames.indexOf(name);
+
+  if (!value.isValid())
+  {
+    if (idx == -1)
+      return false;
+    m_extraData->propertyNames.removeAt(idx);
+    m_extraData->propertyValues.removeAt(idx);
+  }
+  else
+  {
+    if (idx == -1)
+    {
+      m_extraData->propertyNames.append(name);
+      m_extraData->propertyValues.append(value);
+    }
+    else
+      m_extraData->propertyValues[idx] = value;
+  }
+
+  return true;
+}
+
+QVariant AbstractMapObjectImpl::property(const char *name) const
+{
+  if (!m_extraData)
+    return QVariant();
+  const int i = m_extraData->propertyNames.indexOf(name);
+  return m_extraData->propertyValues.value(i);
+}
+
+
+UniqueMapId AbstractMapObjectImpl::uniqueMapId() const
+{
+  return m_uniqueMapId;
+}
+
+
+QString AbstractMapObjectImpl::debugInfo() const
+{
+  return m_debugInfo;
+}
+
+void AbstractMapObjectImpl::setDebugInfo(const QString &debugInfo)
+{
+  m_debugInfo = debugInfo;
+
+  if (m_mainGraphicalObject)
+    m_mainGraphicalObject->setDebugInfo(m_debugInfo + QLatin1String("#mainGO"));
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+
+  if (m_mainGraphicalObjectText)
+    m_mainGraphicalObjectText->setDebugInfo(m_debugInfo + QLatin1String("#Text"));
+
+  if (m_tacticalAppearance)
+    m_tacticalAppearance->setDebugInfo(m_debugInfo + QLatin1String("#TactApp"));
+
+}
+
+QString AbstractMapObjectImpl::toString() const
+{
+  QString str;
+
+  if (!m_debugInfo.isEmpty())
+    str.append(QStringLiteral("debugInfo='%1'").arg(m_debugInfo));
+
+  str.append(QStringLiteral("uniqueMapId='%1'").arg(m_uniqueMapId));
+
+  if ((m_mainGraphicalObjectText) &&
+      (! m_mainGraphicalObjectText->text().isEmpty())
+     )
+    str.append(QStringLiteral(" identifier='%1'").arg(m_mainGraphicalObjectText->text()));
+
+  if (!m_logicalLayerName.isEmpty())
+    str.append(QStringLiteral(" logicalLayerName='%1'").arg(m_logicalLayerName));
+
+  str.append(QStringLiteral(" partyId=%1").arg(m_party.partyId.value()));
+
+  str.append(QStringLiteral(" aesState=%1").arg(SituationMap::toString(m_aesState.value())));
+
+  if (m_mainGraphicalObject)
+    str.append(QStringLiteral(" scale='%1'").arg(m_mainGraphicalObject->scale()));
+
+  str.append(QStringLiteral(" visibility='%1'").arg(m_visibility));
+  str.append(QStringLiteral(" visibilityTech='%1'").arg(m_visibilityTechnical));
+  str.append(QStringLiteral(" visibilityTact='%1'").arg(m_visibilityTactical));
+  str.append(QStringLiteral(" visibilityTechGeo='%1'").arg(m_visibilityTechnicalGeometry));
+  str.append(QStringLiteral(" identiferVisible=%1").arg(m_identiferVisible.value()));
+  str.append(QStringLiteral(" selected='%1'").arg(m_selected));
+  str.append(QStringLiteral(" pickable='%1'").arg(m_pickable));
+
+  str.append(QStringLiteral(" majorColor='%1'").arg(this->majorColor().name(QColor::HexArgb)));
+
+  return str;
+}
+
+void AbstractMapObjectImpl::boundingBox(SituationMap::BoundingBox &) const
+{
+  // leave it empty and invalid. Method has to be overloaded if required.
+}
+
+
+void AbstractMapObjectImpl::setForceMajorColor(const QColor &majorColor)
+{
+  m_forcedMajorColor = majorColor;
+}
+QColor AbstractMapObjectImpl::majorColor() const
+{
+  if (m_forcedMajorColor.isValid())
+    return m_forcedMajorColor;
+
+  if (m_mainGraphicalObject)
+    return m_mainGraphicalObject->lineStyle().lineColor();
+
+  return QColor();
+}
+
+double AbstractMapObjectImpl::extrusionHeight() const
+{
+  return m_extrusionHeight;
+}
+void AbstractMapObjectImpl::setExtrusionHeight(double extrusionHeight)
+{
+  if (m_mapImpl->mode() != Mode::Mode_3D)
+    return;
+
+  m_extrusionHeight = extrusionHeight;
+
+  if (extrusionHeightValid())
+    createGraphicalObjectExtrusion();
+  else
+    resetGraphicalObjectExtrusion();
+}
+bool AbstractMapObjectImpl::extrusionHeightValid() const
+{
+  return !std::isnan(m_extrusionHeight);
+}
+
+const QString AbstractMapObjectImpl::extrusionColorName() const
+{
+  return m_extrusionColorName;
+}
+void AbstractMapObjectImpl::setExtrusionColorName(const QString &extrusionColorName)
+{
+  m_extrusionColorName = extrusionColorName;
+}
+
+
+QString AbstractMapObjectImpl::identifier() const
+{
+  if (m_mainGraphicalObjectText)
+    return m_mainGraphicalObjectText->text();
+
+//  else
+//    ERROR_LOG(m_logger) << LOGFUNCTION
+//                          << " debugInfo=" << m_debugInfo
+//                          << " no object"
+//                         ;
+
+  return QString();
+}
+
+void AbstractMapObjectImpl::createGraphicalObjectText()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+
+  if (!m_mainGraphicalObjectText)
+  {
+    m_mainGraphicalObjectText = new GraphicalObjectText(m_mapImpl->getEsriGeoView()
+                                                        , m_graphicsLayer
+                                                        , m_debugInfo + QLatin1String("#Text")
+                                                        , uniqueMapId());
+    // Set default text style for all MapObjects:
+    m_mainGraphicalObjectText->setTextStyle(defaultTextStyle());
+    m_mainGraphicalObjectText->setXOffset(10);  // use as initial default
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo;
+}
+
+void AbstractMapObjectImpl::createTacticalAppearance()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+  if (!m_tacticalAppearance)
+  {
+    m_tacticalAppearance = new TacticalAppearance(m_mapImpl,
+                                                  m_logicalLayerName,
+                                                  m_debugInfo + QStringLiteral("#TactApp"),
+                                                  m_uniqueMapId
+                                                 );
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo;
+}
+
+void AbstractMapObjectImpl::resetTacticalAppearanceDrawOrderOffset()
+{
+  m_tacticalAppearanceDrawOrderOffset = 0;
+}
+
+void AbstractMapObjectImpl::createPin()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+  if (!m_graphicalObjectPin)
+  {
+    m_graphicalObjectPin = new GraphicalObjectPath(SituationMap::GraphicalObjectPathType::Polyline,
+                                                   m_mapImpl->getEsriGeoView(),
+                                                   m_graphicsLayer,
+                                                   m_debugInfo + QStringLiteral("#Pin"),
+                                                   m_uniqueMapId
+                                                   );
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo;
+}
+
+void AbstractMapObjectImpl::resetPin()
+{
+  delete m_graphicalObjectPin;
+  m_graphicalObjectPin = nullptr;
+}
+
+void AbstractMapObjectImpl::setIdentifier(const QString &identifier)
+{
+  if (identifier.isEmpty())
+  {
+    delete m_mainGraphicalObjectText;
+    m_mainGraphicalObjectText = nullptr;
+  }
+  else
+  {
+    createGraphicalObjectText();
+    if (m_mainGraphicalObjectText)
+      m_mainGraphicalObjectText->setText(identifier);
+  }
+}
+
+bool AbstractMapObjectImpl::identifierVisible() const
+{
+  return m_identiferVisible.value();
+}
+
+void AbstractMapObjectImpl::setIdentifierVisible(bool identifierVisible)
+{
+  m_identiferVisible = identifierVisible;
+}
+
+int AbstractMapObjectImpl::partyId() const
+{
+  return m_party.partyId.value();
+}
+
+bool AbstractMapObjectImpl::isPartyIdValid() const
+{
+  return m_party.partyId.value() >= 0;
+}
+
+void AbstractMapObjectImpl::setPartyId(int partyId)
+{
+  m_party.partyId = partyId;
+}
+
+bool AbstractMapObjectImpl::setPartyIdChanged(int partyId)
+{
+  if ((partyId < 0) || (m_party.partyId.value() == partyId))
+  {
+    m_party.partyId.setChanged();
+    return true;
+  }
+  return false;
+}
+
+
+const QColor &AbstractMapObjectImpl::partyColor() const
+{
+  if (m_party.forcedPartyColor.value().isValid())
+    return m_party.forcedPartyColor.value();
+
+  if (m_party.partyId.changed() || m_party.useLightColor.changed() || !m_party.partyColor.isValid())
+  {
+    m_party.partyColor =
+      m_mapImpl->partyIdToColorFunctor().partyIdToColor(m_party.partyId.value(),
+                                                        m_party.useLightColor.value());
+  }
+  return m_party.partyColor;
+}
+
+QColor AbstractMapObjectImpl::partyColor(int partyId, bool useLightColor) const
+{
+  return m_mapImpl->partyIdToColorFunctor().partyIdToColor(partyId, useLightColor);
+}
+
+void AbstractMapObjectImpl::forcePartyColor(const QColor &partyColorToForce)
+{
+  m_party.forcedPartyColor = partyColorToForce;
+}
+
+bool AbstractMapObjectImpl::useLightColor() const
+{
+  return m_party.useLightColor.value();
+}
+void AbstractMapObjectImpl::setUseLightColor(bool useLightColor)
+{
+  m_party.useLightColor = useLightColor;
+}
+
+AdvancedSymbology::Role AbstractMapObjectImpl::partyRole(bool roleIdentityAssumed) const
+{
+  return m_mapImpl->partyIdToColorFunctor().partyIdToRole(m_party.partyId.value(), roleIdentityAssumed);
+}
+
+
+AesEffectState AbstractMapObjectImpl::aesState() const
+{
+  return m_aesState.value();
+}
+void AbstractMapObjectImpl::setAesState(AesEffectState aesState)
+{
+  m_aesState = aesState;
+}
+
+
+TextStyle AbstractMapObjectImpl::textStyle() const
+{
+  if (m_mainGraphicalObjectText)
+    return m_mainGraphicalObjectText->textStyle();
+  else
+    return TextStyle();
+}
+
+TextStyle &AbstractMapObjectImpl::rTextStyle()
+{
+  createGraphicalObjectText();
+  return m_mainGraphicalObjectText->rTextStyle();
+}
+
+void AbstractMapObjectImpl::setTextStyle(const TextStyle &textStyle)
+{
+  createGraphicalObjectText();
+  m_mainGraphicalObjectText->setTextStyle(textStyle);
+}
+
+
+LineStyle AbstractMapObjectImpl::lineStyle() const
+{
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->lineStyle() : LineStyle();
+}
+
+LineStyle &AbstractMapObjectImpl::rLineStyle()
+{
+  static LineStyle dummy;
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->rLineStyle() : dummy;
+}
+
+void AbstractMapObjectImpl::setLineStyle(const LineStyle &lineStyle)
+{
+  if (m_mainGraphicalObject) m_mainGraphicalObject->setLineStyle(lineStyle);
+}
+
+FillStyle AbstractMapObjectImpl::fillStyle() const
+{
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->fillStyle() : FillStyle();
+}
+
+FillStyle &AbstractMapObjectImpl::rFillStyle()
+{
+  static FillStyle dummy;
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->rFillStyle() : dummy;
+}
+
+void AbstractMapObjectImpl::setFillStyle(const FillStyle &fillStyle)
+{
+  if (m_mainGraphicalObject) m_mainGraphicalObject->setFillStyle(fillStyle);
+}
+
+
+QString AbstractMapObjectImpl::layer() const
+{
+  return logicalLayerName();
+}
+
+void AbstractMapObjectImpl::setDrawOrder(int drawOrder)
+{
+  m_drawOrder = drawOrder;
+  m_internalDrawOrder = m_drawOrder * 10;
+}
+int AbstractMapObjectImpl::drawOrder() const
+{
+  return m_drawOrder;
+}
+
+
+bool AbstractMapObjectImpl::visibility() const
+{
+  return m_visibility;
+}
+void AbstractMapObjectImpl::setVisibility(bool visibility)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo
+                      << " visi old=" << m_visibility;
+  m_visibility = visibility;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo
+                      << " visi new=" << m_visibility;
+}
+
+bool AbstractMapObjectImpl::visibility(ObjectAppearance appearance) const
+{
+  bool visi = true;
+  switch (appearance)
+  {
+  case SituationMap::ObjectAppearance::Technical:
+    visi = m_visibilityTechnical;
+    break;
+  case SituationMap::ObjectAppearance::Tactical:
+    visi = m_visibilityTactical;
+    break;
+  }
+  return visi;
+}
+
+void AbstractMapObjectImpl::setVisibility(ObjectAppearance appearance, bool visibility)
+{
+  switch (appearance)
+  {
+  case SituationMap::ObjectAppearance::Technical:
+    m_visibilityTechnical = visibility;
+    break;
+  case SituationMap::ObjectAppearance::Tactical:
+    m_visibilityTactical  = visibility;
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " ObjectAppearance not found";
+    break;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION
+                      << " debugInfo=" << m_debugInfo
+                      << " m_visibilityTechnical=" << m_visibilityTechnical
+                      << " m_visibilityTactical=" << m_visibilityTactical;
+}
+
+bool AbstractMapObjectImpl::visibilityOfGeometry() const
+{
+  return m_visibilityTechnicalGeometry;
+}
+
+void AbstractMapObjectImpl::setVisibilityOfGeometry(bool visiGeometry)
+{
+  m_visibilityTechnicalGeometry = visiGeometry;
+}
+
+bool AbstractMapObjectImpl::selected() const
+{
+  return m_selected;
+}
+void AbstractMapObjectImpl::setSelected(bool selected)
+{
+  m_selected = selected;
+}
+
+bool AbstractMapObjectImpl::pickable() const
+{
+  return m_pickable;
+}
+
+void AbstractMapObjectImpl::setPickable(bool pickable)
+{
+  m_pickable = pickable;
+}
+
+
+float AbstractMapObjectImpl::scale() const
+{
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->scale() : 0.0f;
+}
+
+void AbstractMapObjectImpl::setScale(float scale)
+{
+  if (!m_enableScale)
+    return;
+
+  // typically the mainGraphicalObject does NOT need any scale values,
+  // but keep it similar to identifier, textStyle, fillStyle etc.
+  // mainGraphicalObjectText will receive the value within ::updateView()
+  if (m_mainGraphicalObject) m_mainGraphicalObject->setScale(scale);
+}
+
+bool AbstractMapObjectImpl::isScaleEnabled() const
+{
+  return m_enableScale;
+}
+
+void AbstractMapObjectImpl::setScaleEnable(bool enabled)
+{
+  m_enableScale = enabled;
+}
+
+
+SymbolData AbstractMapObjectImpl::symbol() const
+{
+  return m_symbol.value();
+}
+void AbstractMapObjectImpl::setSymbol(const SymbolData &symbol)
+{
+  m_symbol = symbol;
+}
+
+void AbstractMapObjectImpl::reRenderSymbol()
+{
+  m_symbol.setChanged();
+}
+
+SymbolDataToRender AbstractMapObjectImpl::symbolDataToRender() const
+{
+  return m_symbol.value().getDefaultRenderData();
+}
+
+SymbolImage AbstractMapObjectImpl::symbolImage() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return m_symbolImage;
+}
+
+QImage AbstractMapObjectImpl::previewImage() const
+{
+  return previewImageTypical();
+}
+
+QImage AbstractMapObjectImpl::previewImageTypical() const
+{
+  return m_symbolImage.image();
+}
+
+QImage AbstractMapObjectImpl::previewImageSpecific() const
+{
+  return m_symbolImage.image();
+}
+
+TextStyle AbstractMapObjectImpl::defaultTextStyle()
+{
+  TextStyle ts;                       // Define default text style for all MapObjects
+  ts.setTextOutlineColor(Qt::white);  // Define default text style for all MapObjects
+  ts.setTextOutlineWidth(0.5);        // Define default text style for all MapObjects
+  return ts;
+}
+
+bool AbstractMapObjectImpl::updateTacticalAppearance()
+{
+  bool successTactAppearance = true;
+
+  if (m_tacticalAppearance)
+  {
+    m_tacticalAppearance->setUniqueDesignation(identifier());
+
+    m_tacticalAppearance->setDrawOrder(m_internalDrawOrder + m_tacticalAppearanceDrawOrderOffset); // m_tacticalAppearanceDrawOrderOffset == 2
+    m_tacticalAppearance->setVisibility(m_visibility && m_visibilityTactical);
+    m_tacticalAppearance->setSelected(m_selected);
+    m_tacticalAppearance->setPickable(m_pickable);
+
+    if (m_symbol.changed())
+      m_tacticalAppearance->setSymbol(m_symbol.value());
+
+    if (m_mainGraphicalObject)
+      m_tacticalAppearance->setScale(m_mainGraphicalObject->scale());
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " m_mainGraphicalObject missing!!!";
+
+    successTactAppearance = m_tacticalAppearance->updateView();
+  }
+  return successTactAppearance;
+}
+
+void AbstractMapObjectImpl::createGraphicalObjectExtrusion()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+
+  if (m_mapImpl->mode() != Mode::Mode_3D)
+    return;
+
+  if (!m_graphicalObjectExtrusion)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = m_mapImpl->getGraphicsLayer3DExtrusion(m_logicalLayerName);
+
+    if (!graphicsLayer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " getGraphicsLayer3DExtrusion failed";
+      return;
+    }
+
+    m_graphicalObjectExtrusion = new GraphicalObjectCube(m_mapImpl->getEsriGeoView(),
+                                                         graphicsLayer, // ESRI-Layer, not logical
+                                                         m_debugInfo + QStringLiteral("#GO3D"),
+                                                         m_uniqueMapId
+                                                         );
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo;
+}
+
+void AbstractMapObjectImpl::resetGraphicalObjectExtrusion()
+{
+  delete m_graphicalObjectExtrusion;
+  m_graphicalObjectExtrusion = nullptr;
+}
+
+bool AbstractMapObjectImpl::updateGraphicalObjectExtrusion()
+{
+  bool successGo3D = true;
+
+  if (m_graphicalObjectExtrusion)
+  {
+    m_graphicalObjectExtrusion->setUniqueMapId(m_uniqueMapId);
+
+    // geometry:
+    if (m_mainGraphicalObject)
+      m_graphicalObjectExtrusion->setPositions(m_mainGraphicalObject->positions()); // translated / maybe they are densified?
+
+    m_graphicalObjectExtrusion->setDrawOrder(m_internalDrawOrder);
+    m_graphicalObjectExtrusion->setVisibility(m_visibility && m_visibilityTechnical);
+    m_graphicalObjectExtrusion->setSelected(m_selected);
+    m_graphicalObjectExtrusion->setPickable(m_pickable);
+
+    if (m_extrusionColorName.isEmpty())
+    {
+      // Fallback
+      const QColor &partyColor = m_mapImpl->partyIdToColorFunctor().partyIdToColor(m_party.partyId.value());
+      m_graphicalObjectExtrusion->setExtrusionColorName(partyColor.name());
+    } else {
+      m_graphicalObjectExtrusion->setExtrusionColorName(m_extrusionColorName);
+    }
+    m_graphicalObjectExtrusion->setHeight(m_extrusionHeight);
+
+    // scale....??
+
+    successGo3D = m_graphicalObjectExtrusion->updateView();
+  }
+
+  return successGo3D;
+}
+
+bool AbstractMapObjectImpl::updatePin()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_debugInfo=" << m_debugInfo;
+
+  if (m_graphicalObjectPin)
+  {
+    m_graphicalObjectPin->setDrawOrder(m_internalDrawOrder + 5); // m_tacticalAppearanceDrawOrderOffset == 2
+    m_graphicalObjectPin->setVisibility(m_visibility);
+    m_graphicalObjectPin->setSelected(m_selected);
+    m_graphicalObjectPin->setPickable(m_pickable);
+
+    if (m_mainGraphicalObject)
+    {
+      m_graphicalObjectPin->setLineStyle(LineStyle(Qt::black, 3, LinePattern::DashDotDot));
+      m_graphicalObjectPin->setScale(m_mainGraphicalObject->scale());
+    }
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " m_mainGraphicalObject missing!!!";
+
+    //
+    // m_graphicalObjectPin->setPositions and updateView is called at GeoImageImpl::onMapExtentChanged()
+    //
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, m_debugInfo=" << m_debugInfo;
+  return true;
+}
+
+void AbstractMapObjectImpl::updateIdentifierPosition()
+{
+  m_identifierPositionCandidateTranslated = m_mainGraphicalObject->origin();
+}
+
+bool AbstractMapObjectImpl::updateViewImplPre()
+{
+  //
+  // createTacticalAppearance onDemand
+  //
+  if (!m_symbol.value().sidc.isEmpty())
+    createTacticalAppearance();
+
+  //
+  // partyId (and its resulting color) has priority to lineColor, fillColor:
+  //
+  if (isPartyIdValid() && partyChanged())
+  {
+    const QColor &partyCol = partyColor();
+
+    if (m_mainGraphicalObject)
+    {
+      if (m_lineColorFromParty)
+        m_mainGraphicalObject->rLineStyle().setLineColor(partyCol);
+      QColor fillColor(partyCol);
+      fillColor.setAlpha(m_fillColorAlpha);
+      m_mainGraphicalObject->rFillStyle().setFillColor(fillColor);
+    }
+
+    if (m_mainGraphicalObjectText)
+      m_mainGraphicalObjectText->rTextStyle().setTextColor(partyCol);
+
+    // maybe continued for TacticalAppearance
+
+  }
+
+  //
+  // if state!=Unknown -> its resulting pattern has priority to fillPattern:
+  //
+  if ((m_aesState.value() != AesEffectState::Unknown) && m_aesState.changed())
+  {
+    if (m_mainGraphicalObject)
+    {
+      FillPattern pattern = m_mapImpl->partyIdToColorFunctor().aesStateToPattern(m_aesState.value());
+      m_mainGraphicalObject->rFillStyle().setFillPattern(pattern);
+    }
+  }
+
+
+  return true;
+}
+
+inline bool isSurfacePlacementRelevant(Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer)
+{
+  if (!graphicsLayer)
+    return false;
+
+  // maybe also SurfacePlacement::RelativeToScene ???
+  return (graphicsLayer->sceneProperties().surfacePlacement() == Esri::ArcGISRuntime::SurfacePlacement::Relative);
+}
+
+
+bool AbstractMapObjectImpl::updateViewImpl()
+{
+  bool success                = true;
+  bool successTactAppearance  = true;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo =" << m_debugInfo
+                      << " uniqueMapId =" << m_uniqueMapId
+                      << " m_pickable=" << m_pickable;
+
+  // drawOrder :
+
+  // The LayerOrder could be added if required like...
+  // finalDrawOrder = m_mapImpl->layerFactory()-> indexOf(m_logicalLayerName);
+
+  if (m_mainGraphicalObjectText)
+  {
+    m_mainGraphicalObjectText->setDrawOrder(m_internalDrawOrder + 2);           // +2 to provide space for indicationCont (e.g. mines of MineField)
+    m_mainGraphicalObjectText->setScale(m_mainGraphicalObject->scale());
+  }
+
+  // : drawOrder
+
+  if (m_mainGraphicalObject)
+  {
+    m_mainGraphicalObject->setDrawOrder(m_internalDrawOrder);
+    m_mainGraphicalObject->setVisibility(m_visibility && m_visibilityTechnical && m_visibilityTechnicalGeometry);
+    m_mainGraphicalObject->setSelected(m_selected);
+    m_mainGraphicalObject->setPickable(m_pickable);
+
+    success = m_mainGraphicalObject->updateView();
+
+    if (m_mainGraphicalObjectText)
+    {
+      this->updateIdentifierPosition();
+
+      m_mainGraphicalObjectText->setScale(m_mainGraphicalObject->scale());
+      // m_mainGraphicalObjectText->setSelected(m_selected);  // Text should NEVER be selected
+      m_mainGraphicalObjectText->setPickable(m_pickable);
+
+      // mainGraphicalObjectText->updateView()  will be called within following 'onMapExtentChanged()':
+      // successGoText = m_mainGraphicalObjectText->updateView();
+    }
+  }
+
+  successTactAppearance = updateTacticalAppearance();
+
+  bool successGoExtrusion = true;
+  if (m_graphicalObjectExtrusion && (m_mapImpl->mode() == Mode::Mode_3D))
+  {
+    successGoExtrusion = updateGraphicalObjectExtrusion();
+    if (!successGoExtrusion)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " failure updateGraphicalObjectExtrusion " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+  }
+
+  bool successUpdatePin = true;
+  if (m_graphicalObjectPin && (this->mapImpl()->mode() == Mode::Mode_3D) && isSurfacePlacementRelevant(m_graphicsLayer))
+  {
+    successUpdatePin = updatePin();
+    if (!successUpdatePin)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " failure0 (updatePin) " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+  }
+
+  bool successMapExtendChanged = this->onMapExtentChanged();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure1 " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+  if (!successTactAppearance)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure2 " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+  if (!successGoExtrusion)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure3 " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+  if (!successMapExtendChanged)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure4 " << " debugInfo =" << m_debugInfo << " uniqueMapId =" << m_uniqueMapId;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo =" << m_debugInfo
+                      << " uniqueMapId =" << m_uniqueMapId;
+  return success && successTactAppearance && successGoExtrusion && successUpdatePin && successMapExtendChanged;
+}
+
+bool AbstractMapObjectImpl::updateViewImplPost()
+{
+  partyReset();
+  m_aesState.reset();
+  m_symbol.reset();
+  m_identiferVisible.reset();
+
+  if (m_updateObjectIndicator)
+  {
+    for (auto *ptr : qAsConst(m_originPositionChangedCb))
+      ptr->onOriginPositionChanged();
+  }
+  m_updateObjectIndicator = false;
+
+  return true;
+}
+
+int AbstractMapObjectImpl::numberOfValuesChanged()
+{
+  int count = 0;
+  if (m_party.changed())                { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; ++count; }
+  if (m_aesState.changed())             { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; ++count; }
+
+  if (m_symbol.changed())               { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; ++count; }
+
+  if (m_identiferVisible.changed())     { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; ++count; }
+
+  return count;
+}
+
+void AbstractMapObjectImpl::addChangedCallback(OriginPositionChangedCallback *cb)
+{
+  m_originPositionChangedCb.push_back(cb);
+}
+void AbstractMapObjectImpl::removeChangedCallback(OriginPositionChangedCallback *cb)
+{
+  m_originPositionChangedCb.removeAll(cb);
+}
+
+
+bool AbstractMapObjectImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo;
+  bool success = true;
+
+  if (mapImpl)
+    m_mapImpl = mapImpl;
+  else
+  {
+    success = false;
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo=" << m_debugInfo
+                        << " no mapImpl";
+  }
+
+  m_mapConnector = new SituationMap::MapConnector();
+  success = success && m_mapConnector->connectMapObject(m_mapImpl, this);
+  if (success)
+  {
+    success = this->setLogicalLayerName(logicalLayerName);
+    if (!success)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " debugInfo=" << m_debugInfo
+                          << " setLogicalLayerName failed"
+                          << ", logicalLayerName='" << logicalLayerName << "'";
+    }
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo=" << m_debugInfo
+                        << " MapConnector->connectObject failed";
+  }
+
+  // take static scaleHasVisibilityValue;
+  m_visibilityScaleRange.setInitial(s_scaleHasVisibilityValue); // static mamber of interface class.
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo
+                      << " success=" << success;
+  return success;
+}
+
+void AbstractMapObjectImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  m_uniqueMapId = uniqueId;
+
+  if (m_mainGraphicalObject)
+    m_mainGraphicalObject->setUniqueMapId(m_uniqueMapId);
+
+  if (m_mainGraphicalObjectText)
+    m_mainGraphicalObjectText->setUniqueMapId(m_uniqueMapId);
+
+  if (m_tacticalAppearance)
+    m_tacticalAppearance->setUniqueMapId(m_uniqueMapId);
+}
+
+bool AbstractMapObjectImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " debugInfo=" << m_debugInfo;
+
+  bool success = true;
+
+  // Some MapObjects like ParticipantImpl do NOT use m_mainGraphicalObjectText:
+  if (m_mainGraphicalObjectText && m_mapImpl)
+  {
+    // hide identifier on zoom out???
+
+    // old approach:
+    //    double meterPerPixel = -1.0;
+    //    if (m_mapImpl)
+    //      meterPerPixel = m_mapImpl->pixelSize();
+    //    bool textVisi = meterPerPixel < 3000;
+
+    // new approach:
+    //    double curScale = m_mapImpl->scale();
+    //    bool textVisi = m_visibilityScaleRange.scaleHasVisibility(curScale);
+    //    m_mainGraphicalObjectText->setVisibility(m_visibility && m_visibilityTechnical && textVisi);
+
+    //    TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+    //                        << " debugInfo=" << m_debugInfo << "'"
+    //                        << " meterPerPixel=" << m_mapImpl->pixelSize()
+    //                        << " newScale=" << m_mapImpl->scale()
+    //                        << " newExtent = " << SituationMap::toString(m_mapImpl->extent());
+    //    m_mainGraphicalObjectText->setVisibility(m_visibility && m_visibilityTechnical && textVisi);
+
+    // do NOT hide identifier on zoom out:
+    m_mainGraphicalObjectText->setVisibility(m_visibility && m_visibilityTechnical && m_identiferVisible.value());
+
+    m_mainGraphicalObjectText->setOrigin(m_identifierPositionCandidateTranslated);
+
+    success = m_mainGraphicalObjectText->updateView();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo << "'"
+                      << " success=" << success;
+  return true;
+}
+
+
+QString AbstractMapObjectImpl::logicalLayerName() const
+{
+  return m_logicalLayerName;
+}
+
+bool AbstractMapObjectImpl::setLogicalLayerName(const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << m_debugInfo << "'"
+                      << " logicalLayerName='" << logicalLayerName << "'";
+
+  m_logicalLayerName = logicalLayerName;
+
+  bool success = false;
+
+  m_graphicsLayer = m_mapImpl->getGraphicsLayer(logicalLayerName);
+
+  if (m_graphicsLayer)
+    success = true;
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo=" << m_debugInfo << "'"
+                        << ", no layer found";
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << m_debugInfo << "'"
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " success=" << success;
+  return success;
+}
+
+
+bool AbstractMapObjectImpl::geometryIntersect(const MathUtils::GeometryEngine::Geometry &intersector_polyline) const
+{
+  if (intersector_polyline.isEmpty())
+    return false;
+
+  if (m_mainGraphicalObject)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *esriLayer = m_mainGraphicalObject->graphicsLayer();
+    if ((esriLayer) && (esriLayer->isVisible()))
+    {
+      // former: if (m_mainGraphicalObject->visibility())
+      // MineField stores the ountline/boundary in m_mainGraphicalObject to transfer this to m_tacticalAppearance
+      // That m_mainGraphicalObject is NOT visible, because of that fillPattern.
+      // to 'find' that MineField, anaylze just m_visibility && m_visibilityTechnical, and not m_visibilityTechnicalGeometry
+      if (m_visibility && m_visibilityTechnical)
+      {
+        if (MathUtils::GeometryEngine::intersect(m_mainGraphicalObject->getGraphicGeometry(), intersector_polyline))
+          return true;
+      }
+    }
+  }
+  // m_mainGraphicalObjectText
+  if (m_tacticalAppearance)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *esriLayer = m_tacticalAppearance->graphicsLayer();
+    if ((esriLayer) && (esriLayer->isVisible()))
+    {
+      if (m_tacticalAppearance->visibility())
+      {
+        if (MathUtils::GeometryEngine::intersect(m_tacticalAppearance->getGraphicGeometry(), intersector_polyline))
+          return true;
+      }
+    }
+  }
+  return false;
+} // bool AbstractMapObjectImpl::geometryIntersect( const MathUtils::GeometryEngine::Geometry & geom )
+
+
+bool AbstractMapObjectImpl::geometryIsInHull(const MathUtils::GeometryEngine::Geometry &hull_polygon) const
+{
+  if (hull_polygon.isEmpty())
+    return false;
+
+  if (m_mainGraphicalObject)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *esriLayer = m_mainGraphicalObject->graphicsLayer();
+    if ((esriLayer) && (esriLayer->isVisible()))
+    {
+      // former: if (m_mainGraphicalObject->visibility())
+      // MineField stores the ountline/boundary in m_mainGraphicalObject to transfer this to m_tacticalAppearance
+      // That m_mainGraphicalObject is NOT visible, because of that fillPattern.
+      // to 'find' that MineField, anaylze just m_visibility && m_visibilityTechnical, and not m_visibilityTechnicalGeometry
+      if (m_visibility && m_visibilityTechnical)
+      {
+        if (MathUtils::GeometryEngine::contains(m_mainGraphicalObject->getGraphicGeometry(), hull_polygon))
+          return true;
+      }
+    }
+  }
+  // m_mainGraphicalObjectText
+  if (m_tacticalAppearance)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *esriLayer = m_tacticalAppearance->graphicsLayer();
+    if ((esriLayer) && (esriLayer->isVisible()))
+    {
+      if (m_tacticalAppearance->visibility())
+      {
+        if (MathUtils::GeometryEngine::contains(m_tacticalAppearance->getGraphicGeometry(), hull_polygon))
+          return true;
+      }
+    }
+  }
+  return false;
+}
+
+Esri::ArcGISRuntime::Geometry AbstractMapObjectImpl::getEsriGeometry() const
+{
+  if (!m_mainGraphicalObject)
+    return Esri::ArcGISRuntime::Geometry();
+  return m_mainGraphicalObject->getGraphicGeometry();
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.h
new file mode 100755
index 000000000..2310e940c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/abstract_map_object_impl.h
@@ -0,0 +1,443 @@
+/**
+  * @RDE_HEADER@
+  * Implementation of AbstractMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/abstract_map_object.h> // Interface
+#include <Map/abstract_effect_simulation.h> // for AesEffectState
+#include <Map/line_style.h>
+#include <Map/fill_style.h>
+
+#include <Common/simple_value.h>
+#include <Common/situation_map_logging.h>
+#include <Common/ref_pointer.h>
+
+
+// Qt
+#include <QString>
+#include <QColor>
+
+
+#include <limits>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+class GraphicsOverlay;
+class Geometry;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+struct ExtraData;
+class MapImpl;
+class MapConnector;
+class AbstractGraphicalObject;
+class GraphicalObjectText;
+class GraphicalObjectPath;
+class TacticalAppearance;
+class GraphicalObjectCube;
+
+
+//----------------------------------------------------------------------------
+class OriginPositionChangedCallback
+{
+public:
+  virtual ~OriginPositionChangedCallback() = default;
+  virtual void onOriginPositionChanged() = 0;
+};
+//----------------------------------------------------------------------------
+
+
+
+
+
+/**
+ * @brief The AbstractMapObjectImpl class is the main base class of all MapObject instances.
+ * Therefore it supports typical parameters/functionality and avoids redundant code.
+ * As consequence AbstractMapObjectImpl supports functionality, which is not used in every subclass.
+ * The typical parameters/functionality is:
+ * - UniqueMapId
+ * - debugInfo
+ * - partyId, partyColor
+ * - aesState (aes = AreaEffectSimulation)
+ * - drawOrder
+ * - (tact.) symbol
+ * - visibility (major|techn|tact.)
+ * - pickability
+ * - selected
+
+ * - mainGraphicalObject        (displaying the main techn. Appearance)
+ * - mainGraphicalObjectText    (displaying the text/name)
+ * - tacticalAppearance         (displaying the tact. Appearance)
+ * - m_graphicalObjectExtrusion (displaying the extrusion (3D))
+ * - mainGraphicalObjectPin     (displaying a pin/needle to the ground)
+ *
+ * After an parameter changes, the method updateView() hat to be called.
+ */
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAP_EXPORT AbstractMapObjectImpl : public virtual AbstractMapObject
+{
+public:
+  explicit AbstractMapObjectImpl(const QString &debugInfo = QString());
+  virtual ~AbstractMapObjectImpl();
+
+  void removeMySelf() override;
+
+  AbstractMapObjectImpl(const AbstractMapObjectImpl &other)     = delete;
+  AbstractMapObjectImpl &operator=(AbstractMapObjectImpl &other) = delete;
+
+
+  // emulate QObject::property :
+  bool setProperty(const char *name, const QVariant &value) override;
+  QVariant property(const char *name) const override;
+  // : emulate QObject::property
+
+
+  UniqueMapId uniqueMapId() const  override;
+
+  QString debugInfo() const override;
+  void setDebugInfo(const QString &debugInfo) override;
+
+  QString toString() const override;
+
+  // Data access:
+  void boundingBox(BoundingBox &bbox) const override;
+  QColor majorColor() const override;
+
+
+  QString identifier() const override;
+  void setIdentifier(const QString &identifier) override;
+
+  bool identifierVisible() const override;
+  void setIdentifierVisible(bool identifierVisible) override;
+
+
+  int partyId() const override;
+  bool isPartyIdValid() const override;
+  void setPartyId(int partyId) override;
+  bool setPartyIdChanged(int partyId = -1) override;
+  void forcePartyColor(const QColor &partyColorToForce) override;
+
+  bool useLightColor() const override;                 ///< Only for Participants
+  void setUseLightColor(bool useLightColor) override;  ///< Only for Participants
+
+  virtual AesEffectState aesState() const;
+  virtual void setAesState(AesEffectState aesState);
+
+
+  TextStyle textStyle() const override;
+  TextStyle &rTextStyle() override;
+  void setTextStyle(const TextStyle &textStyle) override;
+
+  virtual LineStyle lineStyle() const;
+  virtual LineStyle &rLineStyle();
+  virtual void setLineStyle(const LineStyle &lineStyle);
+
+  virtual FillStyle fillStyle() const;
+  virtual FillStyle &rFillStyle();
+  virtual void setFillStyle(const FillStyle &fillStyle);
+
+
+  // Scale :
+  float scale() const override;
+  void setScale(float scale) override;
+
+  bool isScaleEnabled() const override;
+  void setScaleEnable(bool enabled) override;
+  // : Scale
+
+
+  // Layer
+  QString layer() const override;
+
+  int drawOrder() const override;
+  /**
+   * @brief Set drawOrder.
+   * Caused by internal dependencies, the value MUST within -3000...+3000. (INT_MAX=+32767 / 10 = 3276 -> ~3000).
+   * \n Otherwise the internal graphics will be disordered.
+   * \internal Background: Due to missing relative drawOrder an absolute drawOrder has to be used.\n
+   * To create an absolute drawOrder the specified drawOrder is multiplied with 10.
+   * The components (usually GraphicalObjects) receive that multiplied valued added by s small offset.
+   * drawOrder() is not influenced by this and will return the value you set before.
+   * @param drawOrder new value.
+   */
+  void setDrawOrder(int drawOrder) override;
+
+
+
+  // Visibility :
+  //  Prio 1:
+  bool visibility() const override;
+  void setVisibility(bool visibility) override;
+
+  // Prio 2
+  bool visibility(ObjectAppearance appearance) const override;
+  void setVisibility(ObjectAppearance appearance, bool visibility) override;
+
+  bool visibilityOfGeometry() const;
+  void setVisibilityOfGeometry(bool visiGeometry);
+
+  // : Visibility
+
+
+  // Selection, Picking :
+  bool selected() const override;
+  void setSelected(bool selected) override;
+
+  bool pickable() const  override;
+  void setPickable(bool pickable)  override;
+
+  // : Selection, Picking
+
+
+  // Symbol :
+  SymbolData symbol() const override;
+  void setSymbol(const SymbolData &symbol) override;
+  void reRenderSymbol() override;
+  SymbolDataToRender symbolDataToRender() const override;
+  SymbolImage symbolImage() const override;
+
+  QImage previewImage() const override;
+  QImage previewImageTypical() const override;
+  QImage previewImageSpecific() const override;
+
+  void setForceMajorColor(const QColor &majorColor) override;
+
+  // : Symbol
+
+
+  /*! \name Some methods regarding extrusion (renderer approach) */
+  //@{
+  double extrusionHeight() const override;
+  void setExtrusionHeight(double extrusionHeight = std::nan("")) override;
+  bool extrusionHeightValid() const;
+
+  const QString extrusionColorName() const override;
+  void setExtrusionColorName(const QString &extrusionColorName) override;
+  //@}
+
+  // Geometry :
+  bool geometryIntersect(const MathUtils::GeometryEngine::Geometry &intersector_polyline) const override;
+  bool geometryIsInHull(const MathUtils::GeometryEngine::Geometry &hull_polygon) const override;
+
+  Esri::ArcGISRuntime::Geometry  getEsriGeometry() const;
+  // : Geometry
+
+
+  // Define default text style for all MapObjects:
+  static TextStyle defaultTextStyle();
+
+
+  /**
+     * @brief updateView
+     * transfer values to view
+     * @return true on success
+     */
+  bool updateView() override
+  {
+    return updateViewImplPre() && updateViewImpl() && updateViewImplPost();
+  }
+
+
+  virtual MapImpl *mapImpl()  { return m_mapImpl; }
+
+
+  int numberOfValuesChanged();     ///< For Unit/Module Test
+
+
+
+protected:
+  virtual bool updateViewImplPre();
+  virtual bool updateViewImpl() = 0;
+  virtual bool updateViewImplPost();
+
+
+  friend class ObjectFactory;
+
+  // deriving classes MUST overload init and create an GraphicalObject!!!
+  // (to use whose identifier, textStyle)
+  virtual bool init(MapImpl *mapImpl, const QString &logicalLayerName = QStringLiteral("GraphicsLayer"));
+  virtual void setUniqueId(const UniqueMapId &uniqueId);
+
+  QString logicalLayerName() const;
+  bool setLogicalLayerName(const QString &logicalLayerName);
+
+  // internal/admin
+  void createTacticalAppearance();
+  void resetTacticalAppearanceDrawOrderOffset();
+  virtual bool updateTacticalAppearance();
+
+  // Extrusion
+  void createGraphicalObjectExtrusion();
+  void resetGraphicalObjectExtrusion();
+  bool updateGraphicalObjectExtrusion();
+
+  // pin/needle
+  void createPin();
+  void resetPin();
+  bool updatePin();
+
+  virtual void updateIdentifierPosition();
+
+  friend class MapConnector;
+  virtual bool onMapExtentChanged();
+  MapConnector                   *m_mapConnector = nullptr;
+
+  class VisibilityScale
+  {
+  public:
+    VisibilityScale()
+    {
+      resetToInitial();
+    }
+
+    void resetToInitial()
+    {
+      scale_zoomOutCurrent = scale_zoomOutInitialized;
+    }
+
+    void resetToMax()
+    {
+      scale_zoomOutCurrent = std::numeric_limits<double>::max();
+    }
+
+    void setInitial(double newValue)
+    {
+      scale_zoomOutInitialized = newValue;
+      resetToInitial();
+    }
+
+    bool scaleHasVisibility(double curScale) const
+    {
+      if (scale_zoomOutCurrent <= 0)
+        return true;
+      return (curScale < scale_zoomOutCurrent);
+    }
+  private:
+    double scale_zoomOutCurrent     = 0;
+    double scale_zoomOutInitialized = 70000;
+  };
+  VisibilityScale                       m_visibilityScaleRange;  // static value 's_scaleHasVisibilityValue' is located in the interface
+
+
+  UniqueMapId                           m_uniqueMapId = SituationMap::INVALID_MAP_ID;    ///< for identification
+
+  QString                               m_debugInfo;      ///< for debugging
+
+  MapImpl                              *m_mapImpl              = nullptr;
+  QString                               m_logicalLayerName;
+  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer = nullptr;
+
+  // party :
+  struct party
+  {
+    SimpleValue<int>     partyId     = -1;
+    SimpleValue<bool>    useLightColor = false;  // useful for Participants
+
+    mutable QColor       partyColor;
+
+    SimpleValue<QColor>  forcedPartyColor;
+    bool changed() const { return partyId.changed() || useLightColor.changed() || forcedPartyColor.changed(); }
+    void reset()         {        partyId.reset();     useLightColor.reset();     forcedPartyColor.reset();   }
+  };
+  party                           m_party;
+
+  bool                            partyChanged() const { return m_party.changed(); }
+  void                            partyReset()         { m_party.reset(); }
+  virtual const QColor           &partyColor() const;
+  virtual QColor                  partyColor(int partyId, bool useLightColor) const;
+  virtual AdvancedSymbology::Role partyRole(bool roleIdentityAssumed = false) const;
+
+  // : party
+
+  // state :
+  SimpleValue<AesEffectState>     m_aesState{AesEffectState::Unknown};
+  // : state
+
+private:
+  int                             m_drawOrder{0};             // logical drawOrder
+protected:
+  int                             m_internalDrawOrder{0};
+
+  // m_mainGraphicalObject will store LineStyle (color/width/pattern), FillStyle (color/pattern):
+  AbstractGraphicalObject        *m_mainGraphicalObject{nullptr};
+  bool                            m_enableScale{true};
+
+  // m_mainGraphicalText will store TextStyle (color/width/size...)
+  GraphicalObjectText            *m_mainGraphicalObjectText{nullptr};
+  Point3D                         m_identifierPositionCandidateTranslated;
+  SimpleValue<bool>               m_identiferVisible{true};
+
+  TacticalAppearance             *m_tacticalAppearance{nullptr};
+  int                             m_tacticalAppearanceDrawOrderOffset{2};
+
+  // for 3D Extrusion:
+  GraphicalObjectCube            *m_graphicalObjectExtrusion{nullptr};
+  double                          m_extrusionHeight{std::nan("")};
+  QString                         m_extrusionColorName;
+
+  // For Pin
+  GraphicalObjectPath            *m_graphicalObjectPin{nullptr};
+  double                          m_defaultZValue{0};
+
+  SimpleValue<SymbolData>         m_symbol;
+  SymbolImage                     m_symbolImage;
+
+  QColor                          m_forcedMajorColor;
+
+  // Update ObjectIndicator :
+protected:
+  bool                            m_updateObjectIndicator{false};
+  QVector<OriginPositionChangedCallback *> m_originPositionChangedCb;
+public:
+  void addChangedCallback(OriginPositionChangedCallback *cb);
+  void removeChangedCallback(OriginPositionChangedCallback *cb);
+  // : Update ObjectIndicator
+
+
+protected:
+
+  bool                            m_visibility          = true;
+  bool                            m_visibilityTechnical = true;
+  bool                            m_visibilityTechnicalGeometry = true; // Special case
+  bool                            m_visibilityTactical  = true;
+
+  bool                            m_selected            = false;
+  bool                            m_pickable            = true;
+
+  bool                            m_editorMode          = false;
+  bool                            m_lineColorFromParty  = true;
+  int                             m_fillColorAlpha      = 255;
+
+private:
+  ExtraData                      *m_extraData                   = nullptr;
+
+  void createGraphicalObjectText();
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+QString toString(const AesEffectState value);
+
+std::ostream &operator<< (std::ostream   &stream,
+                          const AesEffectState &value);
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coord_translation_functor_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coord_translation_functor_impl.h
new file mode 100755
index 000000000..e54edac8c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coord_translation_functor_impl.h
@@ -0,0 +1,207 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Map
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+// Own
+#include <Map/coord_translation_functor.h>
+#include <Map/situation_map_utils.h>
+#include "map_impl.h"
+
+
+// ESRI
+#include <GeometryEngine.h>
+//#include <CoordinateConversion.h>
+
+
+// Qt
+#include <QPointF>
+#include <QMutex>
+#include <QMutexLocker>
+
+#include <cmath>
+#include <Point.h>
+
+
+namespace SituationMap
+{
+
+
+class CoordTranslationFunctorImpl final : public CoordTranslationFunctor
+{
+public:
+
+  explicit CoordTranslationFunctorImpl(const MapImpl *mapImpl)
+    : m_mapImpl(mapImpl)
+    , m_logger(getLogger("CoordTranslationFunctorImpl"))
+  {}
+
+  virtual ~CoordTranslationFunctorImpl() = default;
+
+  QPointF geographicToMap(const QPointF &coord) const override
+  {
+    return geographicToMap(coord.x(), coord.y());
+  }
+
+  QPointF mapToGeographic(const QPointF &coord) const override
+  {
+    return mapToGeographic(coord.x(), coord.y());
+  }
+
+  QPointF geographicToMap(const Esri::ArcGISRuntime::Point &coord) const override
+  {
+    return geographicToMap(coord.x(), coord.y());
+  }
+
+  QPointF mapToGeographic(const Esri::ArcGISRuntime::Point &coord) const override
+  {
+    return mapToGeographic(coord.x(), coord.y());
+  }
+
+  QPointF geographicToMap(const double lon, const double lat) const override
+  {
+    return convert(lon, lat, false);
+  }
+
+  QPointF mapToGeographic(const double x, const double y) const override
+  {
+    return convert(x, y, true);
+  }
+
+
+  Point3D geographicToMap(const Point3D &coord) const override
+  {
+    const QPointF &p = geographicToMap(coord.x(), coord.y());
+    return Point3D(p.x(), p.y(), coord.z());
+  }
+
+  Point3D mapToGeographic(const Point3D &coord) const override
+  {
+    const QPointF &p = mapToGeographic(coord.x(), coord.y());
+    return Point3D(p.x(), p.y(), coord.z());
+  }
+
+
+  bool mapIsGeographic() const override
+  {
+    return (m_mapImpl->getEsriSpatialReference().isGeographic());
+  } // bool mapIsGeographic() const override
+
+
+  void geographicToUtm(const double referenceLon, QList<QPointF> &points) const override
+  {
+    int                                         wkid(buildWkid(referenceLon));
+    const Esri::ArcGISRuntime::SpatialReference utmSR(wkid);
+
+    QMutexLocker lock(&m_mutex);
+
+    for(QList<QPointF>::iterator it = points.begin(); it != points.end(); ++it)
+    {
+      QPointF &pt = *it;
+      const Esri::ArcGISRuntime::Point utmPoint( Esri::ArcGISRuntime::GeometryEngine::project( Esri::ArcGISRuntime::Point(pt.x(), pt.y(), 0.0, m_wkSR), utmSR ));
+      
+      pt.setX(utmPoint.x());
+      pt.setY(utmPoint.y());
+    }
+  } // void geographicToUtm(const double referenceLon, QList<QPointF> &points) const override
+
+
+  void utmToGeographic(const double referenceLon, QList<QPointF> &points) const override
+  {
+    int                                         wkid(buildWkid(referenceLon));
+    const Esri::ArcGISRuntime::SpatialReference utmSR(wkid);
+
+    QMutexLocker lock(&m_mutex);
+
+    for (QList<QPointF>::iterator it = points.begin(); it != points.end(); ++it)
+    {
+      QPointF &pt = *it;
+      const Esri::ArcGISRuntime::Point geoPoint(Esri::ArcGISRuntime::GeometryEngine::project(Esri::ArcGISRuntime::Point(pt.x(), pt.y(), 0.0, utmSR), m_wkSR));
+      
+      pt.setX(geoPoint.x());
+      pt.setY(geoPoint.y());
+    }
+  } // void utmToGeographic(const double referenceLon, QList<QPointF> &points) const override
+
+
+  int projectionCounter() const override  { return m_projectionCounter; }
+  void resetProjectionCounter() override  { m_projectionCounter = 0;    }
+
+
+private:
+
+  static int buildWkid(const double referenceLon)
+  {
+    int utmZone = referenceLon / 6;
+    if (utmZone < 0) utmZone = 60 + utmZone;
+    utmZone += 31;
+    if (utmZone > 60) utmZone -= 60;
+    return 32600 + utmZone;
+  } // static int buildWkid(const double referenceLon)
+
+
+  QPointF convert(const double x, const double y, bool toGeographic) const
+  {
+    // if x,y are geographic (x=lon/y=lat), use radian
+    const char *directionString = toGeographic ? "mapToGeographic" : "geographicToMap";
+    if (!m_mapImpl)
+    {
+      ERROR_LOG(m_logger) << "Error converting " << directionString
+                          << " - no map!";
+      return QPointF();
+    }
+    const CoordTranslationFunctor *ctF = m_mapImpl->coordTranslationFunctor();
+    if (!ctF)
+    {
+      ERROR_LOG(m_logger) << "Error converting " << directionString
+                          << " - no coordinate translation function!";
+      return QPointF();
+    }
+
+    const Esri::ArcGISRuntime::SpatialReference sourceSR = toGeographic ? m_mapImpl->getEsriSpatialReference() : m_wkSR;
+    const Esri::ArcGISRuntime::SpatialReference destSR   = toGeographic ? m_wkSR : m_mapImpl->getEsriSpatialReference();
+    if (sourceSR.isEmpty() || destSR.isEmpty())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " SpatialReference empty"
+                          << " sourceSR.isEmpty()=" << sourceSR.isEmpty()
+                          << " destSR.isEmpty()=" << destSR.isEmpty();
+      return QPointF();
+    }
+    //  toGeographic: deg -> rad
+    // !toGeographic: rad -> deg (== from geographic)
+    const double factorSrc = toGeographic ? 1 : 180 / M_PI;
+    const double factorDst = toGeographic ? M_PI / 180 : 1;
+    QMutexLocker lock(&m_mutex);
+//    const double z = 12.34567;
+    const Esri::ArcGISRuntime::Point destPoint(Esri::ArcGISRuntime::GeometryEngine::project(Esri::ArcGISRuntime::Point(x * factorSrc,
+                                                                                                                       y * factorSrc,
+//                                                                                                                       z,
+                                                                                                                       sourceSR),
+                                                                                            destSR));
+
+//    qCritical() << " zOut= " << destPoint.z();
+
+    const QPointF ret(destPoint.x() * factorDst, destPoint.y() * factorDst);
+    ++m_projectionCounter;
+    return ret;
+  }
+
+  const MapImpl *m_mapImpl = nullptr;
+
+  const Esri::ArcGISRuntime::SpatialReference m_wkSR = Esri::ArcGISRuntime::SpatialReference(4326); // EPSG:4236 = WGS84
+
+  mutable QMutex m_mutex;
+
+  mutable int m_projectionCounter = 0;  // hmmm - really needed?
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.cpp
new file mode 100755
index 000000000..0dd7ed3c7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.cpp
@@ -0,0 +1,359 @@
+/**
+  * @RDE_HEADER@
+  * CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "coordinate_translation.h"
+#include <Map/coord_translation_functor.h>
+#include <MapImpl/map_impl.h>
+#include <MapImpl/abstract_map_object_impl.h>
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <Point.h>
+#include <GeometryEngine.h>
+
+
+// Qt
+#include <QMutexLocker>
+
+
+#include <iostream>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+void TranslatedBase::setCoordTransFunctor(CoordTranslationFunctor *functor)
+{
+  m_coordTransFunctor = functor;
+}
+
+void TranslatedBase::setMapObjectImpl(AbstractMapObjectImpl *mapObjectImpl)
+{
+  m_mapObjectImpl = mapObjectImpl;
+}
+
+
+
+
+OriginTranslated::OriginTranslated()
+#ifdef WITH_LOGGING
+  : m_logger(getLogger("OriginTranslated"))
+#endif
+{}
+
+Point3D OriginTranslated::origin() const
+{
+  return m_origin;
+}
+
+bool OriginTranslated::setOrigin(const Point3D &origin)
+{
+  bool changed = m_origin != origin;
+  if (changed)
+  {
+    m_origin = origin;
+    m_translated = false;
+  }
+  return changed;
+}
+
+
+const Point3D &OriginTranslated::originTranslated() const
+{
+#ifdef WITH_LOGGING
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_origin=" << m_origin
+                      ;
+#endif
+
+  if (!m_translated)
+  {
+    // m_coordTransFunctor has priority, otherwise use functor of mapImpl:
+
+    if (!m_coordTransFunctor)
+    {
+      if (m_mapObjectImpl && m_mapObjectImpl->mapImpl())
+      {
+        // if useful, a MapObjectType specific functor can be prefered here:
+        // like: if (m_mapObjectImpl->coordTranslationFunctor()) ctFunctor=m_mapObjectImpl->coordTranslationFunctor();
+        m_coordTransFunctor = m_mapObjectImpl->mapImpl()->coordTranslationFunctor();
+      }
+    }
+
+    if (m_coordTransFunctor)
+      m_originTranslated = m_coordTransFunctor->geographicToMap(m_origin);
+    else
+      m_originTranslated = Point3D();
+    m_translated = true;
+  }
+
+#ifdef WITH_LOGGING
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_originTranslated=" << m_originTranslated
+                      ;
+#endif
+  return m_originTranslated;
+}
+
+
+PositionsTranslated::PositionsTranslated()
+  : m_mutex()
+#ifdef WITH_LOGGING
+  , m_logger(getLogger("PositionsTranslated"))
+#endif
+{}
+
+PositionCont PositionsTranslated::positions() const
+{
+  QMutexLocker lock(&m_mutex);
+  return m_positions + m_singlePositions;
+}
+
+bool PositionsTranslated::setPositions(const PositionCont &posCont)
+{
+  QMutexLocker lock(&m_mutex);
+  bool changed = m_positions != posCont;
+  if (changed)
+  {
+    m_positions = posCont;
+    m_translated = false;
+  }
+  m_singlePositions.clear();
+  return changed;
+}
+
+void PositionsTranslated::addSinglePosition(const Point3D &singlePositions)
+{
+  QMutexLocker lock(&m_mutex);
+  m_singlePositions.append(singlePositions);
+}
+
+
+bool PositionsTranslated::setPositionsTranslated(const PositionCont &posCont)
+{
+  QMutexLocker lock(&m_mutex);
+
+  if ((m_translated) && (m_positionsTranslated == posCont))
+    return true;
+
+  m_positionsTranslated = posCont;
+  m_positions.clear();
+
+  if (!m_coordTransFunctor)
+  {
+    if (m_mapObjectImpl && m_mapObjectImpl->mapImpl())
+    {
+      // if useful, a MapObjectType specific functor can be prefered here:
+      // like: if (m_mapObjectImpl->coordTranslationFunctor()) ctFunctor=m_mapObjectImpl->coordTranslationFunctor();
+      m_coordTransFunctor = m_mapObjectImpl->mapImpl()->coordTranslationFunctor();
+    }
+  }
+
+  if (m_coordTransFunctor)
+  {
+    m_positions.reserve(m_positionsTranslated.size());
+    for (int i = 0; i < m_positionsTranslated.count(); ++i)
+      m_positions.push_back(m_coordTransFunctor->mapToGeographic(m_positionsTranslated.at(i))); // for
+  }
+  m_singlePositions.clear();
+  m_translated = true;
+  return false;
+} // PositionsTranslated::setPositionsTranslated( const PositionCont & posCont )
+
+
+int PositionsTranslated::size() const
+{
+  QMutexLocker lock(&m_mutex);
+  return m_positions.size() + m_singlePositions.size();
+}
+
+bool PositionsTranslated::isEmpty() const
+{
+  QMutexLocker lock(&m_mutex);
+  return m_positions.isEmpty() && m_singlePositions.isEmpty();
+}
+
+void PositionsTranslated::clear()
+{
+  QMutexLocker lock(&m_mutex);
+  m_positions.clear();
+  m_positionsTranslated.clear();
+  m_singlePositions.clear();
+  m_translated = false;
+}
+
+Point3D PositionsTranslated::first()
+{
+  if (isEmpty())
+    return Point3D();
+
+  if (! m_positions.isEmpty())
+    return m_positions.first();
+
+  return m_singlePositions.first();
+}
+
+Point3D PositionsTranslated::last()
+{
+  if (isEmpty())
+    return Point3D();
+
+  if (! m_singlePositions.isEmpty())
+    return m_singlePositions.last();
+
+  return m_positions.last();
+}
+
+const PositionCont &PositionsTranslated::positionsTranslated() const
+{
+#ifdef WITH_LOGGING
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_positions=" << m_positions;
+#endif
+
+  QMutexLocker lock(&m_mutex);
+
+  // !!! Important: consolidate !!!
+  consolidate();
+
+  if (!m_translated)
+  {
+    // translate:
+    m_positionsTranslated = geographicToMap(m_positions);
+
+    m_translated = true;
+  }
+
+#ifdef WITH_LOGGING
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_positionsTranslated=" << m_positionsTranslated;
+#endif
+  return m_positionsTranslated;
+}
+
+PositionCont PositionsTranslated::geographicToMap(const PositionCont &positions) const
+{
+  PositionCont ret;
+
+  // m_coordTransFunctor has priority, otherwise use functor of mapImpl:
+  if (!m_coordTransFunctor)
+  {
+    if (m_mapObjectImpl && m_mapObjectImpl->mapImpl())
+    {
+      // if useful, a MapObjectType specific functor can be prefered here:
+      // like: if (m_mapObjectImpl->coordTranslationFunctor()) ctFunctor=m_mapObjectImpl->coordTranslationFunctor();
+      m_coordTransFunctor = m_mapObjectImpl->mapImpl()->coordTranslationFunctor();
+    }
+  }
+
+  if (!m_coordTransFunctor)
+    return ret;
+
+  ret.reserve(positions.size());
+  for (int i = 0; i < positions.count(); ++i)
+  {
+    const Point3D &p = positions.at(i);
+    ret.push_back(m_coordTransFunctor->geographicToMap(p));
+  } // for
+  return ret;
+}
+
+
+const Point3D &PositionsTranslated::startPointTranslated() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  // make sure that positions are translated:
+  positionsTranslated();
+
+  return m_positionsTranslated.first();
+}
+
+const Point3D &PositionsTranslated::endPointTranslated() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  // make sure that positions are translated:
+  positionsTranslated();
+
+  return m_positionsTranslated.back();
+}
+
+
+
+double PositionsTranslated::angleOfStartSegment() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  positionsTranslated();
+  const int size = m_positionsTranslated.size();
+  if (size < 2)
+    return 0;
+  // rechtwinkliges Koordinatensystem benutzen
+  return MathUtils::getAngleDegreeNorth(m_positionsTranslated.at(0).toPointF(), m_positionsTranslated.at(1).toPointF());
+}
+
+double PositionsTranslated::angleOfEndSegment() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  positionsTranslated();
+  const int size = m_positionsTranslated.size();
+  if (size < 2)
+    return 0;
+  // rechtwinkliges Koordinatensystem benutzen
+  return MathUtils::getAngleDegreeNorth(m_positionsTranslated.at(size - 2).toPointF(), m_positionsTranslated.at(size - 1).toPointF());
+}
+
+double PositionsTranslated::angleOfClosingSegment() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  positionsTranslated();
+  const int size = m_positionsTranslated.size();
+  if (size < 2)
+    return 0;
+  // rechtwinkliges Koordinatensystem benutzen
+  return MathUtils::getAngleDegreeNorth(m_positionsTranslated.last().toPointF(), m_positionsTranslated.first().toPointF());
+}
+
+
+void PositionsTranslated::consolidate() const
+{
+  QMutexLocker lock(&m_mutex);
+
+  if (m_translated)
+  {
+    // ok, m_positions is already translated to m_positionsTranslated
+    // translate just the remaining m_singlePositions:
+
+    // To do so
+    // 1. add the m_singlePositions to m_positions
+    m_positions += m_singlePositions;
+
+    // 2. translate just the remaining m_singlePositions
+    // 3. add the now translated singlePositions to
+    m_positionsTranslated += geographicToMap(m_singlePositions);
+
+    // 4. cleanup m_singlePositions:
+    m_singlePositions.clear();
+  }
+  else
+  {
+    // move m_singlePositions to m_positions
+    m_positions += m_singlePositions;
+    m_singlePositions.clear();
+  }
+
+}
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.h
new file mode 100755
index 000000000..23fff0188
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation.h
@@ -0,0 +1,190 @@
+/**
+  * @RDE_HEADER@
+  * CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+
+// #define WITH_LOGGING
+#ifdef WITH_LOGGING
+#  include <Common/situation_map_logging.h>
+#endif // WITH_LOGGING
+
+// ESRI
+
+
+// Qt
+#include <QRecursiveMutex>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//forward:
+class CoordTranslationFunctor;
+class AbstractMapObjectImpl;
+
+
+class SITUATIONMAP_EXPORT TranslatedBase
+{
+public:
+  explicit TranslatedBase() = default;
+  virtual ~TranslatedBase() = default;
+
+  // use ONE of the following methods to set functor:
+  void setCoordTransFunctor(CoordTranslationFunctor *functor);  // set functor direct
+  void setMapObjectImpl(AbstractMapObjectImpl *mapObjectImpl);  // MapObject->Map->functor
+
+  bool isTranslated() const
+  {
+    return m_translated;
+  }
+
+  virtual bool isEmpty() const = 0;
+
+
+protected:
+  mutable CoordTranslationFunctor *m_coordTransFunctor    = nullptr;
+  AbstractMapObjectImpl           *m_mapObjectImpl        = nullptr;  ///< parent / host
+
+  mutable bool                     m_translated           = false;
+};
+
+
+
+
+class SITUATIONMAP_EXPORT OriginTranslated final : public TranslatedBase
+{
+public:
+  OriginTranslated();
+
+  Point3D origin() const;
+  bool setOrigin(const Point3D &origin);
+
+  const Point3D &originTranslated() const;
+
+  void clear()
+  {
+    m_origin = Point3D();
+  }
+
+  bool isEmpty() const
+  {
+    return m_origin.isNull();
+  }
+
+  /**
+   * @brief operator== Compare two objects
+   * @param other to be compared with
+   * @return True if identical, otherwise false.
+   */
+  bool operator==(const OriginTranslated &other) const
+  {
+    // m_positionsTranslated must be skipped!
+    return ((this->m_origin == other.m_origin));
+  }
+
+  /**
+   * @brief operator!= Compare two objects
+   * @param other to be compared with
+   * @return True if NOT identical, otherwise false.
+   */
+  bool operator!=(const OriginTranslated &other) const
+  {
+    return !(*this == other);
+  }
+
+
+private:
+#ifdef WITH_LOGGING
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+#endif
+  Point3D                  m_origin;
+  mutable Point3D          m_originTranslated;
+};
+
+
+/**
+ * @brief The PositionsTranslated class to translate positions of simulation world to map coordinate.
+ * A the translation is done using the CoordTranslationFunctor.
+ * (A copy of this object is not allowed since inner mutex can´t be copied.)
+ */
+class SITUATIONMAP_EXPORT PositionsTranslated : public TranslatedBase
+{
+public:
+  PositionsTranslated();
+  // disable copy
+  PositionsTranslated(const PositionsTranslated &)            = delete;
+  PositionsTranslated &operator=(const PositionsTranslated &) = delete;
+
+  PositionCont positions() const;
+  bool setPositions(const PositionCont &posCont);
+  void addSinglePosition(const Point3D &singlePositions);
+
+  bool setPositionsTranslated(const PositionCont &posCont);
+
+  int size() const;
+  bool isEmpty() const;
+  void clear();
+  Point3D first();
+  Point3D last();
+  bool isTranslated() const { return m_translated && m_singlePositions.isEmpty(); }
+
+  const PositionCont &positionsTranslated() const;
+
+
+  const Point3D &startPointTranslated() const;
+  const Point3D &endPointTranslated() const;
+  double angleOfStartSegment() const;
+  double angleOfEndSegment() const;
+
+  double angleOfClosingSegment() const;  ///< Angle between end and start
+
+
+  /**
+   * @brief operator== Compare two objects
+   * @param other to be compared with
+   * @return True if identical, otherwise false.
+   */
+  bool operator==(const PositionsTranslated &other) const
+  {
+    // m_positionsTranslated must be skipped!
+    return ((this->m_positions == other.m_positions));
+  }
+
+  /**
+   * @brief operator!= Compare two objects
+   * @param other to be compared with
+   * @return True if NOT identical, otherwise false.
+   */
+  bool operator!=(const PositionsTranslated &other) const
+  {
+    return !(*this == other);
+  }
+
+protected:
+  void consolidate() const;  // method is const
+
+private:
+#ifdef WITH_LOGGING
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+#endif
+
+  PositionCont geographicToMap(const PositionCont &positions) const;
+
+  mutable PositionCont  m_positions;              // mutable to enable consolidate
+  mutable PositionCont  m_singlePositions;        // mutable to enable consolidate
+  mutable PositionCont  m_positionsTranslated;    // mutable to enable positionsTranslated
+
+  mutable QRecursiveMutex        m_mutex;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.cpp
new file mode 100755
index 000000000..ce5fd6329
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.cpp
@@ -0,0 +1,82 @@
+/**
+  * @RDE_HEADER@
+  * CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "coordinate_translation_thread.h"
+#include <Map/coord_translation_functor.h>
+#include <MapImpl/map_impl.h>
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <Point.h>
+#include <GeometryEngine.h>
+
+
+// Qt
+
+long SituationMap::CoordTranslationThread::m_counter = 0;
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+CoordTranslationThread::CoordTranslationThread(const QString &debugInfo)
+  : BaseClass()
+  , m_logger(getLogger("CoordTranslationThread"))
+  , m_debugInfo(debugInfo)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      " counter=" << m_counter;
+  ++m_counter;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " counter=" << m_counter;
+}
+
+CoordTranslationThread::~CoordTranslationThread()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      " counter=" << m_counter;
+  --m_counter;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " counter=" << m_counter;
+}
+
+void CoordTranslationThread::run()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo='" << m_debugInfo << "'"
+                      << " userData=" << m_userData.toInt()
+                      << " counter=" << m_counter
+                      << " threadId: " << QThread::currentThreadId() ;
+
+  if (m_positions)
+    m_positions->positionsTranslated();
+
+  emit resultReady(m_userData);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo='" << m_debugInfo << "'"
+                      << " userData=" << m_userData.toInt()
+                      << " counter=" << m_counter
+                      << " threadId: " << QThread::currentThreadId();
+}
+
+QVariant CoordTranslationThread::userData() const
+{
+  return m_userData;
+}
+
+void CoordTranslationThread::setUserData(const QVariant &userData)
+{
+  m_userData = userData;
+}
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.h
new file mode 100755
index 000000000..03214d06c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/coordinate_translation_thread.h
@@ -0,0 +1,79 @@
+/**
+  * @RDE_HEADER@
+  * CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "coordinate_translation.h"
+#include <Common/situation_map_logging.h>
+#include <situation_map_export.h>
+
+
+// Qt
+#include <QObject>
+#include <QVariant>
+#include <QThread>
+
+
+// ESRI
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+
+
+
+class SITUATIONMAP_EXPORT CoordTranslationThread : public QThread
+{
+  Q_OBJECT
+
+  using BaseClass = QThread;
+
+public:
+  explicit CoordTranslationThread(const QString &debugInfo);
+  virtual ~CoordTranslationThread();
+
+  void setPositions(PositionsTranslated *positions)
+  {
+    m_positions = positions;
+  }
+
+  PositionsTranslated *positions() const
+  {
+    return m_positions;
+  }
+
+
+  QVariant userData() const;
+  void setUserData(const QVariant &userData);
+
+signals:
+  void resultReady(const QVariant &userData);
+
+protected:
+  void run() override;
+
+
+private :
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  PositionsTranslated *m_positions = nullptr;
+
+  QString  m_debugInfo;
+  QVariant m_userData;
+
+  static long m_counter;
+
+};
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.cpp
new file mode 100755
index 000000000..d497a6d36
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.cpp
@@ -0,0 +1,1197 @@
+/**
+  * @RDE_HEADER@
+  * PlanModel - Renderer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+#include "geometry_model_renderer_esri.h"
+
+#include <Common/id_handler.h>
+
+#include <QtCore/QFile>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+
+#include <QtGui/QFontDatabase>
+
+#include <GeometryModel/geometry_node_visitor.h>
+
+#include <Symbology/sidc_codec.h>
+#include <SymbologyXML/xml_symbol_codec.h>
+
+#include <Map/map.h>
+#include <Map/object_factory.h>
+#include <Map/sidc_symbol.h>
+#include <Map/situation_map_types.h>
+#include <Map/coord_translation_functor.h>
+#include <Map/party_id_to_color_functor.h>
+
+#include <MapObjects/text.h>
+#include <MapObjects/polygon.h>
+#include <MapObjects/polyline.h>
+#include <MapObjects/participant.h>
+
+#include <MathUtils/curve.h>
+#include <MathUtils/path_rasterer.h>
+
+namespace SituationMap
+{
+
+  GeometryModelRendererEsri::GeometryModelRendererEsri(Map *map, const QString &layerName, GeometryModel &geometryModel, QObject *parent)
+    : GeometryModelRenderer(map, layerName, geometryModel, parent)
+    , m_editorMode(false)
+    , m_delayedRenderTimer(new QTimer(this))
+    , m_delayedRenderIds()
+  {
+    m_delayedRenderTimer->setInterval(10);
+    m_delayedRenderTimer->setSingleShot(true);
+
+    connect(m_delayedRenderTimer, &QTimer::timeout, this, &GeometryModelRendererEsri::onDelayedRenderNodes);
+
+    connect(&geometryModel, &GeometryModel::nodeCleanup    , this, &GeometryModelRendererEsri::onCleanupMapObjects);
+    connect(&geometryModel, &GeometryModel::userDataCleanup, this, &GeometryModelRendererEsri::onRemoveMapObject);
+    connect(&geometryModel, &GeometryModel::changed        , this, &GeometryModelRendererEsri::onUpdate);
+
+  } // GeometryModelRendererEsri::GeometryModelRendererEsri
+
+
+  bool GeometryModelRendererEsri::editorMode() const     { return m_editorMode; }
+  void GeometryModelRendererEsri::setEditorMode(bool on) { m_editorMode = on;   }
+
+
+  class CleanUpMapObjectsVisitor : public GeometryNodeVisitor
+  {
+    SituationMap::Map *m_map;
+
+    public:
+
+      CleanUpMapObjectsVisitor(SituationMap::Map *map, SituationMap::GeometryModel *geoModel) : GeometryNodeVisitor(geoModel), m_map(map) { ; }
+      virtual ~CleanUpMapObjectsVisitor() = default;
+
+      bool apply(SituationMap::GeometryModel *geoModel, const SituationMap::GeometryModel::Node &node, SituationMap::GeometryModel::PrimitiveType primitiveType) override
+      {
+        switch (primitiveType)
+        {
+        case GeometryModel::PrimitiveType::RootNode:
+        case GeometryModel::PrimitiveType::Node:
+          break;
+
+        default:
+        {
+          if (geoModel->hasUserData(node))
+          {
+            bool ok = false;
+            int  uid = geoModel->getUserData(node, &ok);
+
+            if (ok)
+            {
+              SituationMap::AbstractMapObject *mapObj = m_map->objectFactory().idToMapObject(uid);
+              if (mapObj)
+                mapObj->removeMySelf();
+            }
+          }
+        } break;
+        }
+        return true;
+      } // bool apply(SituationMap::GeometryModel * geoModel, const SituationMap::GeometryModel::Node & node, SituationMap::GeometryModel::PrimitiveType primitiveType )
+
+  }; // CleanUpMapObjectsVisitor
+
+
+  void GeometryModelRendererEsri::onCleanupMapObjects(const SituationMap::GeometryModel::Node &node)
+  {
+    if (m_map)
+    {
+      GeometryModel::Node p = node;
+      if (!p.isValid())
+      {
+        p = m_geometryModel.getRootNode();
+      }
+      CleanUpMapObjectsVisitor visitor(m_map, &m_geometryModel);
+
+      visitor.traverse(p);
+    }
+  } // GeometryModelRendererEsri::onCleanupMapObjects
+
+
+  void GeometryModelRendererEsri::onRemoveMapObject(int uid)
+  {
+    if (m_map)
+    {
+      SituationMap::AbstractMapObject *mapObj = m_map->objectFactory().idToMapObject(uid);
+
+      // crash see comment in abstract_map_object_impl.cpp 2016/01/08 JT
+      // SituationMap::RefPointer<SituationMap::AbstractMapObject> mapObj( m_map->objectFactory().idToMapObject( uid ) );
+
+      if (mapObj != nullptr)
+      {
+        mapObj->removeMySelf();
+      }
+    }
+  } // GeometryModelRendererEsri::onRemoveMapObject
+
+
+  void GeometryModelRendererEsri::onUpdate(const SituationMap::GeometryModel::Node &node, SituationMap::GeometryModel::Attribute /*att*/, bool /*coordsChanged*/)
+  {
+    if (m_geometryModel.hasUserData(node))
+    {
+      SituationMap::AbstractMapObject *mapObj = nullptr;
+      bool                              ok     = false;
+      int                               uid    = m_geometryModel.getUserData(node, &ok);
+
+      if (ok)
+        mapObj = m_map->objectFactory().idToMapObject(uid);
+
+      if (mapObj)
+      {
+        // render node later
+        if (!m_delayedRenderIds.contains(uid))
+          m_delayedRenderIds += uid;
+        m_delayedRenderTimer->start();
+
+        return;
+      }
+    }
+    renderNode(node);
+  } // GeometryModelRendererEsri::onUpdate(const SituationMap::GeometryModel::Node & node, SituationMap::GeometryModel::Attribute att, bool coordsChanged)
+
+
+  void GeometryModelRendererEsri::onDelayedRenderNodes()
+  {
+    for (auto uid : qAsConst(m_delayedRenderIds))
+    {
+      SituationMap::AbstractMapObject *mapObj = m_map->objectFactory().idToMapObject(uid);
+      renderNode(getAssociatedNode(mapObj));
+    }
+    m_delayedRenderIds.clear();
+  } // GeometryModelRendererEsri::onDelayedRenderNodes()
+
+
+  bool GeometryModelRendererEsri::render(QPixmap &drawable)
+  {
+    Q_UNUSED(drawable);
+    return false;
+  } //  GeometryModelRendererEsri::render( QPixmap & drawable )
+
+
+  bool GeometryModelRendererEsri::render()  { return renderNode(m_geometryModel.getRootNode()); }
+
+
+  bool GeometryModelRendererEsri::renderNode(const GeometryModel::Node   &node)
+  {
+    bool ok = false;
+    if (!node.isValid())
+    {
+      const GeometryModel::Node   &root = m_geometryModel.getRootNode();
+      ok =  drawNodesRecursive(root);
+    }
+    else
+      ok = drawNodesRecursive(node);
+
+    return ok;
+  } // GeometryModelRendererEsri::renderNode( Map * map, const GeometryModel::Node  & node, const QString & layername )
+
+
+  template <class MapObjectClass> uint GeometryModelRendererEsri::setLineStyle(const GeometryModel::Node &p, MapObjectClass *objPtr) const
+
+  {
+    SituationMap::LineStyle &&objLineStyle = objPtr->lineStyle();
+
+    const QColor              &lineColor   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Color).value<QColor>();
+    uint                       lineWidth   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::LineWidth).toUInt();
+    GeometryModel::LineStyle   lineStyle   = GeometryModel::LineStyle((m_geometryModel.getAttribute(p, GeometryModel::Attribute::LineStyle).toInt()));
+
+    objLineStyle.setLineColor(lineColor);
+    objLineStyle.setLineWidth((lineWidth > 0) ? lineWidth : 1);
+
+    switch (lineStyle)
+    {
+    case GeometryModel::LineStyle::Dashed       : objLineStyle.setLinePattern(LinePattern::Dash); break;
+    case GeometryModel::LineStyle::DashedDotted : objLineStyle.setLinePattern(LinePattern::DashDot); break;
+    case GeometryModel::LineStyle::Dotted       : objLineStyle.setLinePattern(LinePattern::Dot); break;
+    case GeometryModel::LineStyle::LineSolid    : objLineStyle.setLinePattern(LinePattern::Solid); break;
+    default                                     : objLineStyle.setLinePattern(LinePattern::Solid); break;
+    }
+
+    objPtr->setLineStyle(objLineStyle);
+
+    return lineWidth;
+  } // template <class MapObjectClass> uint GeometryModelRendererEsri::setLineStyle( const GeometryModel::Node & p, MapObjectClass * objPtr ) const
+
+
+  template <class MapObjectClass> void GeometryModelRendererEsri::setFillStyle(const GeometryModel::Node &p, MapObjectClass *objPtr) const
+  {
+    SituationMap::FillStyle     &&objFillStyle = objPtr->fillStyle();
+    GeometryModel::FillPattern    fillPattern  = GeometryModel::FillPattern((m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillPattern).toInt()));
+    const QColor                 &fillColor    = m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillColor).value<QColor>();
+
+    objFillStyle.setFillColor(fillColor);
+    switch (fillPattern)
+    {
+    case GeometryModel::FillPattern::Diag1 : objFillStyle.setFillPattern(FillPattern::BackwardDiagonal);  break;
+    case GeometryModel::FillPattern::Diag2 : objFillStyle.setFillPattern(FillPattern::ForwardDiagonal);  break;
+    case GeometryModel::FillPattern::Hor1  : objFillStyle.setFillPattern(FillPattern::BackwardDiagonal);  break;
+    case GeometryModel::FillPattern::Hor2  : objFillStyle.setFillPattern(FillPattern::Horizontal);        break;
+    case GeometryModel::FillPattern::Solid : objFillStyle.setFillPattern(FillPattern::Solid);             break;
+    case GeometryModel::FillPattern::Ver1  :
+    case GeometryModel::FillPattern::Ver2  : objFillStyle.setFillPattern(FillPattern::Vertical);          break;
+    case GeometryModel::FillPattern::Dots  :
+    default                                : objFillStyle.setFillPattern(FillPattern::Null);              break;
+    }
+
+    objPtr->setFillStyle(objFillStyle);
+  } // template <class MapObjectClass> void GeometryModelRendererEsri::setFillStyle( const GeometryModel::Node & p, MapObjectClass * objPtr ) const
+
+
+  class RenderMapObjectsVisitor : public GeometryNodeVisitor
+  {
+    GeometryModelRendererEsri *m_gmr;
+
+  public:
+
+    RenderMapObjectsVisitor(GeometryModelRendererEsri *gmr, SituationMap::GeometryModel *geoModel) : GeometryNodeVisitor(geoModel), m_gmr(gmr) { ; }
+    virtual ~RenderMapObjectsVisitor() = default;
+
+    bool apply(SituationMap::GeometryModel *geoModel, const SituationMap::GeometryModel::Node &node, SituationMap::GeometryModel::PrimitiveType primitiveType) override
+    {
+      SituationMap::AbstractMapObject *mapObj = nullptr;
+
+      if (geoModel->hasUserData(node))
+      {
+        bool ok = false;
+        int  uid = geoModel->getUserData(node, &ok);
+
+        if (ok) mapObj = m_gmr->m_map->objectFactory().idToMapObject(uid);
+      }
+
+      switch (primitiveType)
+      {
+        case GeometryModel::PrimitiveType::ParticipantSymbol : m_gmr->drawParticipantSymbol( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::DictionarySymbol  : m_gmr->drawDictionarySymbol ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Ellipse           : m_gmr->drawEllipse          ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Line              : m_gmr->drawLine             ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Polyline          : m_gmr->drawPolyline         ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Rectangle         : m_gmr->drawRectangle        ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Spline            : m_gmr->drawSpline           ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Symbol            : m_gmr->drawSymbol           ( node, m_gmr->m_layerName, mapObj); break;
+        case GeometryModel::PrimitiveType::Text              : m_gmr->drawText             ( node, m_gmr->m_layerName, mapObj); break;
+
+        case GeometryModel::PrimitiveType::RootNode         : break;
+        case GeometryModel::PrimitiveType::Node             : break;
+        case GeometryModel::PrimitiveType::Unknown          : break;
+        default                                             : break;
+      }
+      return true;
+    } // bool apply(SituationMap::GeometryModel * geoModel, const SituationMap::GeometryModel::Node & node, SituationMap::GeometryModel::PrimitiveType primitiveType )
+
+  }; // RenderMapObjectsVisitor
+
+
+  bool GeometryModelRendererEsri::drawNodesRecursive(const GeometryModel::Node &p)
+  {
+    if (!p.isValid()) return false;
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+    ++m_stats.m_drawElementsRecursiveCount;
+
+    RenderMapObjectsVisitor visitor(this, &m_geometryModel);
+    visitor.traverse(p);
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+
+    return true;
+  } // void GeometryModelRendererEsri::drawNodesRecursive
+
+
+  UniqueMapId GeometryModelRendererEsri::getIdFromNode(const GeometryModel::Node &node) const
+  {
+    SituationMap::UniqueMapId mapId = SituationMap::INVALID_MAP_ID;
+
+    if (m_geometryModel.hasUserData(node))
+    {
+      bool ok;
+      int userData = m_geometryModel.getUserData(node, &ok);
+      if (!ok)
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " getUserData failed";
+      else mapId = userData;
+    }
+    return mapId;
+
+  } // UniqueMapId GeometryModelRendererEsri::getIdFromNode() const
+
+
+  GeometryModel::Node GeometryModelRendererEsri::getAssociatedNode(const AbstractMapObject *mapObject)
+  {
+    if (mapObject == nullptr) return GeometryModel::Node();
+    SituationMap::UniqueMapId mapId = mapObject->uniqueMapId();
+
+    if (mapId == SituationMap::INVALID_MAP_ID) return GeometryModel::Node();
+
+    return m_geometryModel.findPrimitive(mapId);
+  } // getAssociatedNode( const AbstractMapObject * mapObject )
+
+
+  bool GeometryModelRendererEsri::getNodesPickable() const { return m_nodesPickable; }
+
+
+  void GeometryModelRendererEsri::setNodesPickable(bool nodesPickable) { m_nodesPickable = nodesPickable; }
+
+
+  void GeometryModelRendererEsri::drawParticipantSymbol(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    QList<QPointF> points = m_geometryModel.getPrimitivePoints(p);
+    SituationMap::UniqueMapId mapId = getIdFromNode(p);
+
+    if (points.size() == 0)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Primitive Dictionary Symbol don't have any coordinates!"
+        << " (" << mapId << ")";
+      return;
+    }
+
+
+    bool ok;
+
+    const QString                & sidc           = m_geometryModel.getAttribute(p, GeometryModel::Attribute::SIDC).toString();
+    const QString                & sidcAttributes = m_geometryModel.getAttribute(p, GeometryModel::Attribute::SIDC_Attributes).toString();
+  
+    int                            symbolForceId  = m_geometryModel.getAttribute(p, GeometryModel::Attribute::ForceId).toInt(&ok);         if (!ok) symbolForceId  = -1;
+    int                            symbolInjuryId = m_geometryModel.getAttribute(p, GeometryModel::Attribute::DamageForceId).toInt(&ok);   if (!ok) symbolInjuryId = -1;
+    int                            symbolInjury   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Injury).toInt(&ok);          if (!ok) symbolInjury   = static_cast<int>(AdvancedSymbology::Injury::NoInjury);
+      
+    const QVector<int> &partyIds = m_map->partyIdToColorFunctor().partyIds();
+
+    if (!partyIds.contains(symbolForceId))  symbolForceId = -1;
+    if (!partyIds.contains(symbolInjuryId)) symbolInjuryId = -1;
+
+    SituationMap::ObjectFactory  & objFac         = m_map->objectFactory();
+    SituationMap::Participant    * objPtr         = dynamic_cast<SituationMap::Participant *>(mapObj);
+
+
+    if (objPtr == nullptr)
+    {
+      if (mapObj)
+        mapObj -> removeMySelf();
+      objPtr = objFac.create<SituationMap::Participant> (layer, QStringLiteral("Plan-ParticipantSymbol:sidc=%1").arg(sidc)).get();
+
+      if (objPtr == nullptr)
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " objFac.create failed";
+        return;
+      }
+    }
+
+    ++m_stats.m_drawDictionarySymbolCount;
+    m_stats.m_timer.restart();
+
+    SituationMap::SymbolData symbolData;
+
+    symbolData.sidc  = sidc;
+
+    objPtr->setVisibility(true);
+    objPtr->setPickable(m_nodesPickable);
+    objPtr->setOrigin(SituationMap::Point3D::fromQPointF(points.first()));
+    objPtr->setSymbol(symbolData);
+    objPtr->setPartyId(symbolForceId);
+    objPtr->setInjury(static_cast<AdvancedSymbology::Injury>(symbolInjury), symbolInjuryId );
+
+   
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::W_DateTimeGroup         , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_W).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::T_UniqueDesignation     , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_T).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::M_HigherFormation       , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_M).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::EF_ReinforcedReduced    , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_EF).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::XY_AltitudeLocation     , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_XY).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::V_Type                  , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_V).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::Z_Speed                 , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_Z).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::G_StaffComments         , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_G).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::H_AdditionalInformation , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_H).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::JKLNP                   , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_KLNPJ).toString());
+
+    QMap<QString, QVariant> attrMap;
+
+    m_geometryModel.parseSymbolAttributeString(sidcAttributes, attrMap);
+
+    const auto tm = Participant::textModifiers();
+    for (auto textModifier : tm)
+      objPtr->setTextModifierVisibility(textModifier, true);
+
+
+    bool success = objPtr->updateView();
+
+    if (!success) ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << objPtr->uniqueMapId();
+
+    // Store id in primitive
+    m_geometryModel.setUserData(p, objPtr->uniqueMapId());
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msDictionarySymbol    += ms;
+    m_stats.m_msDictionarySymbolMin  = std::min(ms, m_stats.m_msDictionarySymbolMin);
+    m_stats.m_msDictionarySymbolMax  = std::max(ms, m_stats.m_msDictionarySymbolMax);
+
+  } // void GeometryModelRendererEsri::drawParticipantSymbol(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+
+
+  void GeometryModelRendererEsri::drawDictionarySymbol(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    QList<QPointF> points = m_geometryModel.getPrimitivePoints(p);
+    SituationMap::UniqueMapId mapId = getIdFromNode(p);
+
+    if (points.size() == 0)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Primitive Dictionary Symbol don't have any coordinates!"
+                          << " (" << mapId << ")";
+      return;
+    }
+
+    const QString                & sidc           = m_geometryModel.getAttribute(p, GeometryModel::Attribute::SIDC).toString();
+    const QString                & sidcAttributes = m_geometryModel.getAttribute(p, GeometryModel::Attribute::SIDC_Attributes).toString();
+    SituationMap::ObjectFactory  & objFac         = m_map->objectFactory();
+    SituationMap::SidcSymbol     * objPtr         = dynamic_cast<SituationMap::SidcSymbol *>(mapObj);
+
+
+    if (objPtr == nullptr)
+    {
+      if (mapObj) mapObj -> removeMySelf();
+
+      objPtr = objFac.create<SituationMap::SidcSymbol> (layer, QStringLiteral("Plan-TacticalSymbol:sidc=%1").arg(sidc)).get();
+
+      if (objPtr == nullptr)
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " objFac.create failed";
+        return;
+      }
+    }
+
+    ++m_stats.m_drawDictionarySymbolCount;
+    m_stats.m_timer.restart();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << "TacticalAppearanceAttrList: " << sidcAttributes;
+
+    QMap<QString, QVariant> attrMap;
+
+    m_geometryModel.parseSymbolAttributeString(sidcAttributes, attrMap);
+
+    objPtr->setVisibility(true);
+    objPtr->setPickable(m_nodesPickable);
+    objPtr->defineSymbol(sidc, SituationMap::convert2D3D(points), attrMap );
+
+    bool success = objPtr->updateView();
+
+    if (!success) ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << objPtr->uniqueMapId();
+
+    // Store id in primitive
+    m_geometryModel.setUserData(p, objPtr->uniqueMapId());
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msDictionarySymbol    += ms;
+    m_stats.m_msDictionarySymbolMin  = std::min(ms, m_stats.m_msDictionarySymbolMin);
+    m_stats.m_msDictionarySymbolMax  = std::max(ms, m_stats.m_msDictionarySymbolMax);
+
+  } // GeometryModelRendererEsri::drawDictionarySymbol
+
+
+  void GeometryModelRendererEsri::drawEllipse(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    SituationMap::CoordTranslationFunctor *ctf = m_map->coordTranslationFunctor();
+
+    if (nullptr == ctf)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Map don't have defined any map projection! Can't render ellipse ...";
+      return;
+    }
+
+    QList<QPointF> points = m_geometryModel.getPrimitivePoints(p);
+
+    if (points.size() != 4)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Primitive Ellipse has wrong count of geo coordinates!";
+      return;
+    }
+
+    ++m_stats.m_drawEllipseCount;
+    m_stats.m_timer.restart();
+
+    double  radiusX = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Width).toDouble()  * 0.5;
+    double  radiusY = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Height).toDouble() * 0.5;
+    double  phi = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Rotate).toDouble() * (M_PI / 180.0);
+    double  start = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Start).toDouble();
+    double  extent = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Extent).toDouble();
+
+    bool fullCircle = (fabs(extent) > 359.5);
+
+    if (fullCircle)
+    {
+      start = 0.0;
+      extent = 360.0;
+    }
+
+    start *= (M_PI / 180.0);
+    extent *= (M_PI / 180.0);
+
+    QPointF centerPoint(points.first());
+    for (int i = 1; i < 4; ++i) centerPoint += points.at(i);
+    centerPoint /= 4;
+    centerPoint = ctf->geographicToMap(centerPoint);
+
+    points.clear();
+    
+    qreal referenceLon = 9999;
+    if (ctf->mapIsGeographic())
+    {
+      referenceLon = centerPoint.x();
+      points << centerPoint;
+      ctf->geographicToUtm( referenceLon, points);
+      centerPoint = points.first();
+      points.clear();
+    }
+
+    SituationMap::MathUtils::Ellipse                        ellipseCurve(centerPoint, radiusX, radiusY, phi, start, start + extent);
+    std::unique_ptr<SituationMap::MathUtils::PathRasterer>  pathRasterer(ellipseCurve.createPathRaster());
+
+    pathRasterer->epsilon(0.25 * m_map->pixelSizeMeter());
+    pathRasterer->maxVertexCount(1000);
+
+    pathRasterer->rasterize(ellipseCurve.minimumCurveParameter(), ellipseCurve.maximumCurveParameter(), points);
+
+    if (!fullCircle)
+    {
+      GeometryModel::FillStyle fillStyle = (GeometryModel::FillStyle)(m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillStyle).toInt());
+
+      switch (fillStyle)
+      {
+      case GeometryModel::FillStyle::Pieslice: points.append(centerPoint); break;
+      case GeometryModel::FillStyle::Chord:                             break;
+      case GeometryModel::FillStyle::Open:                             break;
+      }
+    }
+
+    if (ctf->mapIsGeographic())
+    {
+      ctf->utmToGeographic(referenceLon, points);
+    }
+
+    drawPolyline(p, layer, points, mapObj, false);
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msEllipse    += ms;
+    m_stats.m_msEllipseMin  = std::min(ms, m_stats.m_msEllipseMin);
+    m_stats.m_msEllipseMax  = std::max(ms, m_stats.m_msEllipseMax);
+
+  } // void GeometryModelRendererEsri::drawEllipse
+
+
+  void GeometryModelRendererEsri::drawLine(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    ++m_stats.m_drawLineCount;
+    m_stats.m_timer.restart();
+    drawPolyline(p, layer, mapObj);
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msLine += ms;
+    m_stats.m_msLineMin = std::min(ms, m_stats.m_msLineMin);
+    m_stats.m_msLineMax = std::max(ms, m_stats.m_msLineMax);
+  } // void GeometryModelRendererEsri::drawLine
+
+
+  void GeometryModelRendererEsri::drawPolyline(const GeometryModel::Node   &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+    ++m_stats.m_drawPolylineCount;
+    m_stats.m_timer.restart();
+
+    drawPolyline(p, layer, m_geometryModel.getPrimitivePoints(p), mapObj);
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msPolyline += ms;
+    m_stats.m_msPolylineMin = std::min(ms, m_stats.m_msPolylineMin);
+    m_stats.m_msPolylineMax = std::max(ms, m_stats.m_msPolylineMax);
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+
+  } /* GeometryModelRendererEsri::drawPolyline */
+
+
+  void GeometryModelRendererEsri::drawPolyline( const GeometryModel::Node        & p
+                                              , const QString                    & layer
+                                              , const QList<QPointF>             & points
+                                              , SituationMap::AbstractMapObject  * mapObj
+                                              , bool                               geoCoordinates )
+  {
+    bool isRectangle = (m_geometryModel.getType(p) == GeometryModel::PrimitiveType::Rectangle);
+    bool isEllipse   = (m_geometryModel.getType(p) == GeometryModel::PrimitiveType::Ellipse);
+    bool isFilled    = (points.size() > 2) && m_geometryModel.getAttribute(p, GeometryModel::Attribute::Fill).toBool();
+    bool isClosed    = ((isEllipse) || (isRectangle) || ((points.size() > 2) && m_geometryModel.getAttribute(p, GeometryModel::Attribute::Close).toBool()));
+
+
+    if ((points.size() > 2) || (isRectangle) || (isEllipse))
+    {
+      GeometryModel::FillPattern fillPattern = GeometryModel::FillPattern((m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillPattern).toInt()));
+
+      if (isEllipse)
+      {
+        double extent = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Extent).toDouble();
+
+        if (fabs(extent) <= 359.5)
+        {
+          GeometryModel::FillStyle fillStyle   = GeometryModel::FillStyle((m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillStyle).toInt()));
+          switch (fillStyle)
+          {
+            case GeometryModel::FillStyle::Chord    : isClosed = true;  break;
+            case GeometryModel::FillStyle::Pieslice : isClosed = true;  break;
+            case GeometryModel::FillStyle::Open     : isClosed = false; break;
+          }
+        }
+        else isClosed = true;
+      }
+
+      if (fillPattern == GeometryModel::FillPattern::None) isFilled = false;
+    }
+
+    SituationMap::RefPointer<SituationMap::AbstractMultiPointMapObject>    objPtr(mapObj);
+    SituationMap::ObjectFactory                                           &objFac           = m_map->objectFactory();
+    bool                                                                   createMapObj     = false;
+    bool                                                                   selectMapObj     = false;
+    SituationMap::UniqueMapId                                              removedUidMapObj = SituationMap::INVALID_MAP_ID;
+
+    if (mapObj)
+    {
+      objPtr = (SituationMap::AbstractMultiPointMapObject *) dynamic_cast<SituationMap::Polyline *>(mapObj);
+      if (objPtr.valid())
+      {
+        if (isClosed)
+        {
+          createMapObj     = true;
+          selectMapObj     = objPtr->selected();
+          removedUidMapObj = objPtr->uniqueMapId();
+
+          objPtr->removeMySelf();
+          objPtr = nullptr;
+        }
+      }
+      else
+      {
+        objPtr = (SituationMap::AbstractMultiPointMapObject *) dynamic_cast<SituationMap::Polygon *>(mapObj);
+        if (objPtr.valid())
+        {
+          if (!isClosed)
+          {
+            createMapObj     = true;
+            selectMapObj     = objPtr->selected();
+            removedUidMapObj = objPtr->uniqueMapId();
+
+            objPtr->removeMySelf();
+            objPtr = nullptr;
+          }
+        }
+        else
+        {
+          createMapObj     = true;
+          selectMapObj     = objPtr->selected();
+          removedUidMapObj = objPtr->uniqueMapId();
+
+          mapObj->removeMySelf();
+        }
+      }
+    }
+    else createMapObj = true;
+
+    if (createMapObj)
+    {
+      // re use the uid if the map object was removed before ...
+      if (isClosed) objPtr = (SituationMap::AbstractMultiPointMapObject *) objFac.create<SituationMap::Polygon> ( removedUidMapObj, layer, QLatin1String("PlanElement")).get();
+      else          objPtr = (SituationMap::AbstractMultiPointMapObject *) objFac.create<SituationMap::Polyline>( removedUidMapObj, layer, QLatin1String("PlanElement")).get();
+
+      if (!objPtr.valid())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " SituationMap::ObjectFactory.create() failed";
+        return;
+      }
+
+      objPtr->setSelected(selectMapObj);
+      objPtr->setScaleEnable(false); // disable scaling (setScale, most of the time done by user)
+    }
+
+    objPtr->setPickable(m_nodesPickable);
+
+    uint lineWidth = setLineStyle(p, objPtr.get());
+
+    Q_UNUSED(lineWidth);
+
+    if (!isFilled)
+    {
+      SituationMap::FillStyle &&objFillStyle = objPtr->fillStyle();
+      objFillStyle.setFillPattern(SituationMap::FillPattern::Null);
+      objPtr->setFillStyle(objFillStyle);
+    }
+    else setFillStyle(p, objPtr.get());
+
+    if ((!isClosed) && (!isEllipse))
+    {
+      SituationMap::Polyline *lineObj = dynamic_cast<SituationMap::Polyline *>(objPtr.get());
+
+      if (lineObj)
+      {
+        // adding arrows if defined
+
+        lineObj -> setArrowHeadStart(false);
+        lineObj -> setArrowHeadEnd(false);
+
+        GeometryModel::Arrows arrows = (GeometryModel::Arrows) m_geometryModel.getAttribute(p, GeometryModel::Attribute::Arrows).toInt();
+
+        switch (arrows)
+        {
+          case GeometryModel::Arrows::Both     : lineObj -> setArrowHeadEnd(true);
+                                                 Q_FALLTHROUGH();
+          case GeometryModel::Arrows::Start    : lineObj -> setArrowHeadStart(true); break;
+          case GeometryModel::Arrows::End      : lineObj -> setArrowHeadEnd(true);   break;
+          case GeometryModel::Arrows::NoArrows :
+          default                              : arrows = GeometryModel::Arrows::NoArrows; break;
+        }
+
+        if (arrows != GeometryModel::Arrows::NoArrows)
+        {
+  #ifdef NEVER
+          double scale = (lineWidth < 2) ? 1.0 : double(lineWidth) * 0.5;
+
+          double arrowWidth       = scale * (m_geometryModel.getAttribute(p, GeometryModel::Attribute::ArrowWidth).toDouble());
+          double arrowHeight      = scale * (m_geometryModel.getAttribute(p, GeometryModel::Attribute::ArrowHeight).toDouble());
+          double arrowClampHeight = scale * (m_geometryModel.getAttribute(p, GeometryModel::Attribute::ArrowClampHeight).toDouble());
+
+          Q_UNUSED(arrowWidth);
+          Q_UNUSED(arrowHeight);
+          Q_UNUSED(arrowClampHeight);
+  #endif
+        }
+      }
+    }
+
+    (geoCoordinates) ? objPtr->setPositions(SituationMap::convert2D3D(points)) : objPtr->setPositionsTranslated(SituationMap::convert2D3D(points));
+
+    bool success = objPtr->updateView();
+
+    if (!success) ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << objPtr->uniqueMapId();
+
+    // Store id in primitive
+    m_geometryModel.setUserData(p, objPtr->uniqueMapId());
+
+  } // void GeometryModelRendererEsri::drawPolyline
+
+
+  void GeometryModelRendererEsri::drawRectangle(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    QList<QPointF> points = m_geometryModel.getPrimitivePoints(p);
+    if (points.size() != 4)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Primitive Rectangle has wrong count of points!";
+      return;
+    }
+    ++m_stats.m_drawRectangleCount;
+    m_stats.m_timer.restart();
+
+    GeometryModelRendererEsri::drawPolyline(p, layer, points, mapObj);
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msRectangle += ms;
+    m_stats.m_msRectangleMin = std::min(ms, m_stats.m_msRectangleMin);
+    m_stats.m_msRectangleMax = std::max(ms, m_stats.m_msRectangleMax);
+  } // void GeometryModelRendererEsri::drawRectangle
+
+
+  void GeometryModelRendererEsri::drawSpline(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    SituationMap::CoordTranslationFunctor *ctf = m_map->coordTranslationFunctor();
+
+    if (nullptr == ctf)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << "Map doesn't have defined any map projection! Can't render spline ...";
+#if LTS_DEBUG
+      abort();
+#else
+      return;
+#endif // LTS_DEBUG
+    }
+
+    ++m_stats.m_drawSplineCount;
+    m_stats.m_timer.restart();
+
+    SituationMap::MathUtils::SmoothLine                     splineCurve;
+    std::unique_ptr<SituationMap::MathUtils::PathRasterer>  pathRasterer(splineCurve.createPathRaster());
+    bool                                                    isClosed(m_geometryModel.getAttribute(p, GeometryModel::Attribute::Close).toBool());
+
+    const auto & pointsMap = m_geometryModel.getPrimitivePoints(p);
+
+    if (pointsMap.size() < 2)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Too little count of occordiantes. Can't render spline ...";
+      return;
+    }
+
+    QList<QPointF> points;
+    points.reserve(pointsMap.size());
+
+    for (int i = 0; i < pointsMap.size(); ++i)
+    {
+      points.push_back(ctf->geographicToMap(pointsMap.at(i)));
+    }
+
+    qreal referenceLon = 9999;
+    if (ctf->mapIsGeographic())
+    {
+      // In case of geographic coordinate system do rasterization in UTM coordinate system to avoid 
+      // trouble with termination threshold.
+      referenceLon = points.first().x();
+      ctf->geographicToUtm( referenceLon, points );
+    }
+   
+    splineCurve.vertexVector(points.toVector(), isClosed);
+
+    pathRasterer -> epsilon(0.25 * m_map->pixelSizeMeter());
+    pathRasterer -> maxVertexCount(1000);
+
+    QList<QPointF>  rasterizedPoints;
+    pathRasterer -> rasterize(splineCurve.minimumCurveParameter(), splineCurve.maximumCurveParameter(), rasterizedPoints);
+
+    if (ctf->mapIsGeographic())
+      ctf->utmToGeographic( referenceLon, rasterizedPoints );
+
+    if (rasterizedPoints.size() <= 2)
+    {
+      NOTICE_LOG(m_logger) << LOGFUNCTION
+                          << "< pointsMap.size() " << pointsMap.size()
+                          << "< points.size() " << points.size()
+                          << "< splineCurve.minimumCurveParameter() " << splineCurve.minimumCurveParameter()
+                          << "< splineCurve.maximumCurveParameter() " << splineCurve.maximumCurveParameter()
+                          << "< rasterizedPoints.size() === " << rasterizedPoints.size()
+                          << "< m_map->pixelSizeMeter()=" << m_map->pixelSizeMeter();
+    }
+    drawPolyline(p, layer, rasterizedPoints, mapObj, false);
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msSpline += ms;
+    m_stats.m_msSplineMin = std::min(ms, m_stats.m_msSplineMin);
+    m_stats.m_msSplineMax = std::max(ms, m_stats.m_msSplineMax);
+
+  } // void GeometryModelRendererEsri::drawSpline
+
+
+
+  void GeometryModelRendererEsri::drawSymbol(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject *mapObj)
+  {
+    if (nullptr == m_map->coordTranslationFunctor())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION <<  "Map doesn't have defined any map projection! Can't render symbol ...";
+      return;
+    }
+
+    const QVector<int> &partyIds = m_map->partyIdToColorFunctor().partyIds();
+    if (partyIds.size() < 1)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Party colors are not defined. Can't render symbol ...";
+      return;
+    }
+
+    ++m_stats.m_drawSymbolCount;
+
+    const auto & pointsMap = m_geometryModel.getPrimitivePoints(p);
+
+    if (pointsMap.size() == 0)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Primitive Symbol has no points!";
+      return;
+    }
+    
+    const QPointF & point = pointsMap.at(0);
+
+    SituationMap::RefPointer<SituationMap::Participant>    objPtr;
+    SituationMap::ObjectFactory                           &objFac         = m_map->objectFactory();
+    bool                                                   createMapObj   = false;
+
+    if (mapObj)
+    {
+      objPtr = (SituationMap::Participant *) dynamic_cast<SituationMap::Participant *>(mapObj);
+      if (!objPtr.valid())
+      {
+        createMapObj = true;
+        mapObj->removeMySelf();
+      }
+    }
+    else createMapObj = true;
+
+    if (createMapObj)
+    {
+      objPtr = (SituationMap::Participant *) objFac.create<SituationMap::Participant> (layer, QLatin1String("PlanElement")).get();
+
+      if (!objPtr.valid())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " SituationMap::ObjectFactory.create() failed";
+        return;
+      }
+      objPtr->setScaleEnable(false); // disable scaling (setScale, most of the time done by user)
+    }
+
+    bool  ok;
+
+    SituationMap::GeometryModel::t_vbg_et    vbg         = SituationMap::GeometryModel::t_vbg_et(m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::att_vbg_et).toInt());
+    SymbologyXML::SymbolTypes::t_state       state       = SymbologyXML::SymbolTypes::t_state( m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolState).toInt() );
+    SymbologyXML::SymbolTypes::t_uncertainty uncertainty = SymbologyXML::SymbolTypes::t_uncertainty( m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolUncertainty).toInt() );
+    SymbologyXML::SymbolTypes::t_affil       affil       = SymbologyXML::SymbolTypes::t_affil(m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::Affiliation).toInt());
+    SymbologyXML::SymbolTypes::t_mob         mob         = SymbologyXML::SymbolTypes::t_mob(m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::Mobility).toInt());
+    // bool                                     abcProtect  = m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::AbcProtection).toBool();
+   
+    SymbolData symData;
+    
+    int symbolID = m_geometryModel.getAttribute(p, GeometryModel::Attribute::SymbolId).toInt();
+    if (symbolID < 0)
+    {
+       ERROR_LOG(m_logger) << LOGFUNCTION << "Primitive Symbol has undefinded symbol!";
+       return;
+    }
+
+    symData.sidc = AdvancedSymbology::SidcCodec::encodeCivilXmlSymbolId(uint(symbolID),state,uncertainty,affil,mob);
+
+    /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    int   symbolOffsetX   = m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolOffsetX).toInt(&ok);         if (!ok) symbolOffsetX   = 0;
+    int   symbolOffsetY   = m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolOffsetY).toInt(&ok);         if (!ok) symbolOffsetY   = 0;
+    int   symbolDirection = m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolDirection).toInt(&ok);       if (!ok) symbolDirection = 0;
+    * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+    float symbolScale     = m_geometryModel.getAttribute(p,SituationMap::GeometryModel::Attribute::SymbolExplicitScale).toFloat(&ok); if (!ok) symbolScale     = 1.0f;
+    int   symbolForceId   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::ForceId).toInt(&ok);                            if (!ok) symbolForceId   = -1;
+    int   symbolInjuryId  = m_geometryModel.getAttribute(p, GeometryModel::Attribute::DamageForceId).toInt(&ok);                      if (!ok) symbolInjuryId  = -1;
+
+    if (!partyIds.contains(symbolForceId))  symbolForceId = partyIds.first();
+    if (!partyIds.contains(symbolInjuryId)) symbolInjuryId = partyIds.first();
+
+    symData.size = (symbolScale > 0) ? symbolScale : 1.0;
+
+    objPtr->setOrigin( Point3D(point.x(),point.y(),0.0) );
+    objPtr->setPickable(m_nodesPickable);
+
+    objPtr->setSymbol(symData);
+    objPtr->setPartyId( symbolForceId );
+    
+    AdvancedSymbology::Injury injury = AdvancedSymbology::Injury::NoInjury;
+
+    switch (vbg)
+    {
+      case SituationMap::GeometryModel::t_vbg_et::ANNAEHENDER_TREFFER         :
+      case SituationMap::GeometryModel::t_vbg_et::TREFFER_OHNE_WIRKUNG        :
+      case SituationMap::GeometryModel::t_vbg_et::EINSATZBEREIT               : injury = AdvancedSymbology::Injury::NoInjury; break;
+
+      case SituationMap::GeometryModel::t_vbg_et::AUSFALL_WAFFENANLAGE        :
+      case SituationMap::GeometryModel::t_vbg_et::AUSFALL_WAFFENANLAGE_SICHTB : injury = AdvancedSymbology::Injury::WeaponKill; break;
+
+      case SituationMap::GeometryModel::t_vbg_et::BEWEGUNGSUNFAEHIG           :
+      case SituationMap::GeometryModel::t_vbg_et::BEWEGUNGSUNFAEHIG_SICHTB    : injury = AdvancedSymbology::Injury::MobilityKill;  break;
+
+      case SituationMap::GeometryModel::t_vbg_et::LEICHTER_TREFFER            :
+      case SituationMap::GeometryModel::t_vbg_et::MITTLERER_TREFFER           :
+      case SituationMap::GeometryModel::t_vbg_et::SCHWERER_TREFFER            : injury = AdvancedSymbology::Injury::Hit;        break;
+      case SituationMap::GeometryModel::t_vbg_et::TOTALAUSFALL                : injury = AdvancedSymbology::Injury::TotalKill;  break;
+      case SituationMap::GeometryModel::t_vbg_et::ZEITLICHER_AUSFALL          : injury = AdvancedSymbology::Injury::TotalKill;  break;
+    }
+
+    objPtr->setInjury( injury , symbolInjuryId );
+
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::W_DateTimeGroup        , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_W).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::T_UniqueDesignation    , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_T).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::M_HigherFormation      , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_M).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::EF_ReinforcedReduced   , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_EF).toString());
+
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::XY_AltitudeLocation    , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_XY).toString()); 
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::V_Type                 , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_V).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::Z_Speed                , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_Z).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::G_StaffComments        , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_G).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::H_AdditionalInformation, m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_H).toString());
+    objPtr->setTextModifier( SituationMap::Participant::TextModifier::JKLNP                  , m_geometryModel.getAttribute(p, GeometryModel::Attribute::Text_KLNPJ).toString());
+       
+   
+    /*
+    AdditionalSymbolType additionalSymbol;
+
+    AdditionalSymbolType::NbcProtection,     ///< Line at top left.
+    AdditionalSymbolType::Manipulation,      ///< Black and white dashed lines at bottom (1st of three)
+    AdditionalSymbolType::NoPosition,        ///< Red line at bottom                     (2nd of three)
+    AdditionalSymbolType::BiteError          ///< Yellow line at bottom.                 (3rd of three)
+
+    objPtr->setAdditionalSymbol(additionalSymbol);
+    */
+
+    bool success = objPtr->updateView();
+
+    if (!success) ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << objPtr->uniqueMapId();
+
+    // Store id in primitive
+    m_geometryModel.setUserData(p, objPtr->uniqueMapId());
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msSymbol    += ms;
+    m_stats.m_msSymbolMin  = std::min(ms, m_stats.m_msDictionarySymbolMin);
+    m_stats.m_msSymbolMax  = std::max(ms, m_stats.m_msDictionarySymbolMax);
+
+  } // void GeometryModelRendererEsri::drawSymbol
+
+
+  void GeometryModelRendererEsri::drawText(const GeometryModel::Node &p, const QString &layer, SituationMap::AbstractMapObject * /*mapObj*/)
+  {
+    QList<QPointF> points = m_geometryModel.getPrimitivePoints(p);
+
+    if (points.size() != 1)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << "Primitive TextBox doesn't have origin!";
+      return;
+    }
+
+    SituationMap::UniqueMapId                      mapId  = getIdFromNode(p);
+    SituationMap::ObjectFactory                   &objFac = m_map->objectFactory();
+    SituationMap::RefPointer<SituationMap::Text>   objPtr;
+
+    if (SituationMap::isUniqueMapIdValid(mapId))
+      objPtr = objFac.get<SituationMap::Text>(mapId).get();
+
+    if (!objPtr.valid())
+    {
+      objPtr = objFac.create<SituationMap::Text> (layer, QLatin1String("PlanElement")).get();
+
+      if (!objPtr.valid())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " objFac.create failed";
+        return;
+      }
+      objPtr->setScaleEnable(false); // disable scaling (setScale, most of the time done by user)
+    }
+
+    ++m_stats.m_drawTextCount;
+    m_stats.m_timer.restart();
+
+    double                            phi       = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Rotate).toDouble(); // *(M_PI/180.0);
+    const QString                   & text      = m_geometryModel.getTextData(p);
+    double                            fontSize  = m_geometryModel.getAttribute(p, GeometryModel::Attribute::FontSize).toDouble();
+    const QColor                    & textColor = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Color).value<QColor>();
+    const QColor                    & lineColor = m_geometryModel.getAttribute(p, GeometryModel::Attribute::LineColor).value<QColor>();
+    QColor                            fillColor = m_geometryModel.getAttribute(p, GeometryModel::Attribute::FillColor).value<QColor>();
+    int                               lineWidth = m_geometryModel.getAttribute(p, GeometryModel::Attribute::LineWidth).toInt();
+    bool                              fill      = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Fill).toBool();
+    bool                              bold      = m_geometryModel.getAttribute(p, GeometryModel::Attribute::FontBold).toBool();
+    bool                              italic    = m_geometryModel.getAttribute(p, GeometryModel::Attribute::FontItalic).toBool();
+    bool                              useBox    = m_geometryModel.getAttribute(p, GeometryModel::Attribute::Box).toBool();
+    GeometryModel::Font               pmFont    = (GeometryModel::Font)(m_geometryModel.getAttribute(p, GeometryModel::Attribute::Font).toInt());
+    const GeometryModel::Node       & td        = p.firstChildNode(QLatin1String("text_data"));
+    GeometryModel::HorizontalAlign    pmAlign   = (GeometryModel::HorizontalAlign)(m_geometryModel.getAttribute(td, GeometryModel::Attribute::Alignment).toInt());
+    GeometryModel::HorizontalAlign    anchorH   = (GeometryModel::HorizontalAlign)(m_geometryModel.getAttribute(p, GeometryModel::Attribute::AnchorHorizontal).toInt());
+    GeometryModel::VerticalAlign      anchorV   = (GeometryModel::VerticalAlign)(m_geometryModel.getAttribute(p, GeometryModel::Attribute::AnchorVertical).toInt());
+    int                               marginH   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::MarginHorizontal).toInt();
+    int                               marginV   = m_geometryModel.getAttribute(p, GeometryModel::Attribute::MarginVertical).toInt();
+
+    if (fontSize <= 0) fontSize = 14.0;
+
+    Q_UNUSED(useBox);
+    Q_UNUSED(marginH);
+    Q_UNUSED(marginV);
+
+    QString fontName;
+
+    switch (pmFont)
+    {
+      case GeometryModel::Font::SansSerif  : fontName =  QLatin1String("Arial");            break;
+      case GeometryModel::Font::Serif      : fontName =  QLatin1String("Times New Roman");  break;
+      case GeometryModel::Font::Fixed      : fontName =  QLatin1String("Courier New");      break;
+      case GeometryModel::Font::Decorative :
+      {
+        QStringList fontFamilies = QFontDatabase().families();
+
+        fontName.clear();
+        for (const QLatin1String &fontFamilyName : { QLatin1String("Freestyle Script"), QLatin1String("MV Boli"), QLatin1String("URW Chancery L")})
+        {
+          if (fontFamilies.contains(fontFamilyName))
+          {
+            fontName = fontFamilyName;
+            break;
+          }
+        }
+      } break;
+      default                              : fontName =  QLatin1String("Wingdings");        break;
+    }
+
+    SituationMap::HorizontalAlignment fontAlignm = SituationMap::HorizontalAlignment::Left;
+    SituationMap::HorizontalAlignment hAlignm    = SituationMap::HorizontalAlignment::Center;
+    SituationMap::VerticalAlignment   vAlignm    = SituationMap::VerticalAlignment::Middle;
+
+    switch (pmAlign)
+    {
+      case GeometryModel::HorizontalAlign::Left    : fontAlignm = SituationMap::HorizontalAlignment::Left;   break;
+      case GeometryModel::HorizontalAlign::HCenter : fontAlignm = SituationMap::HorizontalAlignment::Center; break;
+      case GeometryModel::HorizontalAlign::Right   : fontAlignm = SituationMap::HorizontalAlignment::Right;  break;
+    }
+
+    Q_UNUSED(fontAlignm);
+
+    switch (anchorV)
+    {
+      case GeometryModel::VerticalAlign::Bottom  : vAlignm = SituationMap::VerticalAlignment::Bottom; break;
+      case GeometryModel::VerticalAlign::VCenter : vAlignm = SituationMap::VerticalAlignment::Middle; break;
+      case GeometryModel::VerticalAlign::Top     : vAlignm = SituationMap::VerticalAlignment::Top;    break;
+    }
+
+    switch (anchorH)
+    {
+      case GeometryModel::HorizontalAlign::Left    : hAlignm = SituationMap::HorizontalAlignment::Left;   break;
+      case GeometryModel::HorizontalAlign::HCenter : hAlignm = SituationMap::HorizontalAlignment::Center; break;
+      case GeometryModel::HorizontalAlign::Right   : hAlignm = SituationMap::HorizontalAlignment::Right;  break;
+    }
+
+    // uint lineWidth = setLineStyle( p, objPtr.get() );
+
+    setFillStyle(p, objPtr.get());
+
+    SituationMap::TextStyle &textStyle = objPtr->rTextStyle();
+
+    if (!fill)  fillColor.setAlpha(0);
+
+    textStyle.setTextColor(textColor);
+    textStyle.setTextOutlineColor(lineColor);
+    textStyle.setBackgroundColor(fillColor);
+    textStyle.setTextOutlineWidth(lineWidth-1);
+    // textStyle.setTextOutlineWidth(0.0f);
+
+    textStyle.setFontFamily(fontName);
+    textStyle.setSize(fontSize);
+    textStyle.setAngle(phi);
+    textStyle.setBold(bold);
+    textStyle.setItalic(italic);
+    textStyle.setHorizontalAlignment(hAlignm);
+    textStyle.setVerticalAlignment(vAlignm);
+    
+
+    objPtr -> setIdentifier(text.isEmpty() ? QLatin1String("????????") : text);
+    objPtr -> setPickable(m_nodesPickable);
+    objPtr -> setOrigin(SituationMap::Point3D::fromQPointF(points.first()));
+    objPtr -> setShowAnchorMarker(m_editorMode);
+
+    bool success = objPtr->updateView();
+
+    if (!success) ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+
+    // Store id in primitive
+    m_geometryModel.setUserData(p, objPtr->uniqueMapId());
+
+    int ms = m_stats.m_timer.elapsed();
+    m_stats.m_msText += ms;
+    m_stats.m_msTextMin = std::min(ms, m_stats.m_msTextMin);
+    m_stats.m_msTextMax = std::max(ms, m_stats.m_msTextMax);
+
+  } // void GeometryModelRendererEsri::drawText
+
+} // namepace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.h
new file mode 100755
index 000000000..80b118677
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/geometry_model_renderer_esri.h
@@ -0,0 +1,95 @@
+/**
+  * @RDE_HEADER@
+  * GeometryModel - Renderer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/geometry_model_renderer.h>
+#include <Map/situation_map_types.h>
+#include <Common/situation_map_logging.h>
+#include "situation_map_export.h"
+
+// Qt
+#include <QtCore/qmap.h>
+
+
+namespace SituationMap
+{
+
+class Map;
+class AbstractMultiPointMapObject;
+class RenderMapObjectsVisitor;
+
+
+class SITUATIONMAP_EXPORT GeometryModelRendererEsri : public GeometryModelRenderer
+{
+  Q_OBJECT
+
+private:
+
+  friend class MapImpl;
+
+  explicit GeometryModelRendererEsri(Map *map, const QString &layerName, GeometryModel &geometryModel, QObject *parent = nullptr);
+  ~GeometryModelRendererEsri() = default;
+
+public:
+
+  bool render() override;
+
+  bool renderNode(const GeometryModel::Node &node) override;
+
+  bool render(QPixmap &drawable) override;
+
+  GeometryModel::Node getAssociatedNode(const AbstractMapObject *mapObject) override;
+
+  bool getNodesPickable() const override;
+  void setNodesPickable(bool nodesPickable) override;
+
+  bool editorMode() const override;
+  void setEditorMode(bool on) override;
+
+  UniqueMapId getIdFromNode(const GeometryModel::Node &node) const override;
+
+protected:
+
+  friend class RenderMapObjectsVisitor;
+
+  bool drawNodesRecursive(const GeometryModel::Node &);
+
+  void drawPolyline(const GeometryModel::Node &, const QString &layer, const QList<QPointF> &points, SituationMap::AbstractMapObject *mapObj, bool geoCoordinates = true);
+
+  void drawParticipantSymbol( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawDictionarySymbol ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawEllipse          ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawLine             ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawPolyline         ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawRectangle        ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawSpline           ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawSymbol           ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+  void drawText             ( const GeometryModel::Node &, const QString &layer, SituationMap::AbstractMapObject *mapObj );
+
+  template<class MapObjectClass> uint setLineStyle(const GeometryModel::Node &p, MapObjectClass *objPtr) const;
+  template<class MapObjectClass> void setFillStyle(const GeometryModel::Node &p, MapObjectClass *objPtr) const;
+
+  bool                  m_editorMode;
+  QTimer               *m_delayedRenderTimer;
+  QSet<UniqueMapId>     m_delayedRenderIds;
+
+protected slots:
+
+  void onDelayedRenderNodes();
+
+  void onCleanupMapObjects(const SituationMap::GeometryModel::Node &node);
+
+  void onRemoveMapObject(int uid);
+  void onUpdate(const SituationMap::GeometryModel::Node &node, SituationMap::GeometryModel::Attribute att, bool coordsChanged);
+
+}; // GeometryModelRendererEsri
+}
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.cpp
new file mode 100755
index 000000000..2cbf292f3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.cpp
@@ -0,0 +1,221 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Grid
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "grid_impl.h"
+#include "map_impl.h"
+
+
+// ESRI
+#include <arcgisversion.h>  // This file is created by RME, not ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <LatitudeLongitudeGrid.h>
+#include <MGRSGrid.h>
+#include <UTMGrid.h>
+#include <USNGGrid.h>
+#include <SimpleLineSymbol.h>
+#include <TextSymbol.h>
+#include <SymbolTypes.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+class GridImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::Grid       *m_esriGrid = nullptr;
+
+  // Own data:
+  SituationMap::MapImpl           *m_mapImpl   = nullptr;
+
+
+}; // class GridImpl::Private
+//-----------------------------------------------------------------------------
+
+
+GridImpl::GridImpl(SituationMap::MapImpl *mapImpl)
+  : m_logger(getLogger("GridImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_mapImpl = mapImpl;
+  if (d->m_mapImpl && d->m_mapImpl->getEsriMapGraphicsView())
+    d->m_esriGrid = d->m_mapImpl->getEsriMapGraphicsView()->grid();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+GridImpl::~GridImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+GridType GridImpl::gridType()
+{
+  GridType curType = GridType::NoType;
+
+  if (d->m_esriGrid)
+  {
+    Esri::ArcGISRuntime::GridType esriGridType = d->m_esriGrid->gridType();
+    switch (esriGridType)
+    {
+    case Esri::ArcGISRuntime::GridType::Unknown:
+      curType = GridType::NoType;
+      break;
+    case Esri::ArcGISRuntime::GridType::LatitudeLongitudeGrid:
+      curType = GridType::LatLon;
+      break;
+    case Esri::ArcGISRuntime::GridType::MGRSGrid:
+      curType = GridType::MGRS;
+      break;
+    case Esri::ArcGISRuntime::GridType::UTMGrid:
+      curType = GridType::UTM;
+      break;
+    case Esri::ArcGISRuntime::GridType::USNGGrid:
+      curType = GridType::USGN;
+      break;
+    } // switch
+
+  }
+  else
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " no object";
+
+  return curType;
+}
+
+void GridImpl::setGridType(GridType gridType)
+{
+  // change?
+  if (this->gridType() == gridType)
+    return;
+
+  if (d->m_esriGrid)
+    d->m_esriGrid->deleteLater();
+
+  if (! d->m_mapImpl->getEsriMapGraphicsView())
+    return;
+
+  QObject *parent = d->m_mapImpl->getEsriMapGraphicsView();
+
+  switch (gridType)
+  {
+  case GridType::NoType:
+    d->m_esriGrid = nullptr;
+    break;
+  case GridType::LatLon:
+    d->m_esriGrid = new Esri::ArcGISRuntime::LatitudeLongitudeGrid(parent);
+    break;
+  case GridType::MGRS:
+    d->m_esriGrid = new Esri::ArcGISRuntime::MGRSGrid(parent);
+    break;
+  case GridType::UTM:
+    d->m_esriGrid = new Esri::ArcGISRuntime::UTMGrid(parent);
+    break;
+  case GridType::USGN:
+    d->m_esriGrid = new Esri::ArcGISRuntime::USNGGrid(parent);
+    break;
+  } // switch
+
+  if (d->m_esriGrid)
+  {
+    d->m_esriGrid->setLabelPosition(Esri::ArcGISRuntime::GridLabelPosition::AllSides);
+
+    int levelCount = d->m_esriGrid->levelCount();
+    for (int i = 0; i < levelCount; ++i)
+    {
+      Esri::ArcGISRuntime::TextSymbol *gridLabel = static_cast<Esri::ArcGISRuntime::TextSymbol *>(d->m_esriGrid->textSymbol(i));
+      if (gridLabel)
+      {
+        gridLabel->setSize(10);
+        gridLabel->setHaloWidth(1.0);
+      }
+      const QColor col(0, 0, 0, 200);
+      Esri::ArcGISRuntime::SimpleLineSymbol sls(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid,
+                                                col,
+                                                1);
+      d->m_esriGrid->setLineSymbol(i, &sls);
+    } // for
+  }
+
+  // call setGrid even if d->m_esriGrid is nullptr !!!
+  d->m_mapImpl->getEsriMapGraphicsView()->setGrid(d->m_esriGrid);
+
+  d->m_mapImpl->emitVisualComponentChanged(VisualComponent::Grid);
+}
+
+
+void GridImpl::setVisible(bool visible)
+{
+  if (d->m_esriGrid)
+  {
+    if (d->m_esriGrid->isVisible() != visible)
+    {
+      d->m_esriGrid->setVisible(visible);
+      d->m_mapImpl->emitVisualComponentChanged(VisualComponent::Grid);
+    }
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+bool GridImpl::isVisible()
+{
+  if (d->m_esriGrid)
+    return d->m_esriGrid->isVisible();
+  else
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " no object";
+  return false;
+}
+
+int GridImpl::levelCount()
+{
+  if (d->m_esriGrid)
+    return d->m_esriGrid->levelCount();
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+  return -1;
+}
+
+bool GridImpl::isLabelVisible()
+{
+  if (d->m_esriGrid)
+    return d->m_esriGrid->isLabelsVisible();
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+  return false;
+}
+
+void GridImpl::setLabelVisible(bool visible)
+{
+  if (d->m_esriGrid)
+  {
+    if (d->m_esriGrid->isLabelsVisible() != visible)
+    {
+      d->m_esriGrid->setLabelsVisible(visible);
+      d->m_mapImpl->emitVisualComponentChanged(VisualComponent::Grid);
+    }
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.h
new file mode 100755
index 000000000..900a907d5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/grid_impl.h
@@ -0,0 +1,61 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Grid
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/grid.h> // Interface
+#include <Common/situation_map_logging.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+class GridImpl : public SituationMap::Grid
+{
+  using BaseClass = SituationMap::Grid;
+
+public:
+
+  explicit GridImpl(SituationMap::MapImpl *mapImpl);
+  virtual ~GridImpl();
+
+  GridImpl(const GridImpl &other)     = delete;
+  GridImpl &operator=(GridImpl &other) = delete;
+
+
+  virtual GridType gridType() override;
+  virtual void setGridType(GridType gridType) override;
+
+  virtual void setVisible(bool visible) override;
+  virtual bool isVisible() override;
+
+  virtual int levelCount() override;
+
+  virtual bool isLabelVisible() override;
+  virtual void setLabelVisible(bool visible) override;
+
+private :
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.cpp
new file mode 100755
index 000000000..32c7b9384
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.cpp
@@ -0,0 +1,76 @@
+/**
+  * @RDE_HEADER@
+  * CustomView for MapObjects
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2017-04-11
+  */
+
+// Own
+#include "jump_point_custom_view.h"
+#include "ui_jump_point_custom_view.h"
+#include "jump_point_model.h"
+#include <Map/map.h>
+
+
+// Ot
+#include <QMenu>
+#include <QBuffer>
+#include <QDataWidgetMapper>
+
+
+namespace SituationMap
+{
+
+
+JumpPointCustomView::JumpPointCustomView(QWidget *parent)
+  : BaseClass(parent)
+  , m_ui(new Ui::JumpPointCustomView)
+  , m_mapper(new QDataWidgetMapper(this))
+{
+  m_ui->setupUi(this);
+  m_ui->image->setMenuEnabled(false); // no menu !
+
+//  // to keep toolTip up-to-date:
+//  connect(m_ui->image, &LtsWidgets::LtsImageEditor::imageChanged,
+//          this, &JumpPointCustomView::initToolTip);
+}
+
+JumpPointCustomView::~JumpPointCustomView()
+{
+  delete m_ui;
+}
+
+bool JumpPointCustomView::init(const QModelIndex &idx)
+{
+  if (!idx.isValid())
+    return false;
+
+  if (idx.model() != m_mapper->model())
+  {
+    // create mapping;
+    m_mapper->setModel(const_cast<QAbstractItemModel *>(idx.model()));
+    m_mapper->addMapping(m_ui->lbDescription, JumpPointModel::Columns::NAME, "text");
+  //  m_mapper->addMapping(m_ui->image, JumpPointModel::Columns::ICON, "pixmap");
+  }
+
+  setRow(idx.row());
+  return true;
+}
+
+void JumpPointCustomView::setRow(int row)
+{
+  m_mapper->setCurrentIndex(row);
+
+  // assume for now, that the relation between row and uniqueMapId will not change:
+  if (m_mapper && m_mapper->model())
+  {
+    QAbstractItemModel *modelPtr = m_mapper->model();
+    m_name = modelPtr->data(modelPtr->index(row, JumpPointModel::Columns::NAME)).toString();
+    QImage img = modelPtr->data(modelPtr->index(row, JumpPointModel::Columns::ICON)).value<QImage>();
+    m_ui->image->setPixmap(QPixmap::fromImage(img));
+  }
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.h
new file mode 100755
index 000000000..37dd791b0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.h
@@ -0,0 +1,48 @@
+/**
+  * @RDE_HEADER@
+  * CustomView for MapObjects
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2017-04-11
+  */
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include <LtsDataView/abstract_display_widget.h>
+
+
+class QDataWidgetMapper;
+namespace Ui
+{
+class JumpPointCustomView;
+}
+
+
+namespace SituationMap
+{
+class Map;
+
+class JumpPointCustomView final : public LtsDataView::AbstractDisplayWidget
+{
+  Q_OBJECT
+
+  using BaseClass = AbstractDisplayWidget;
+
+public:
+  explicit JumpPointCustomView(QWidget *parent = nullptr);
+  ~JumpPointCustomView();
+  bool init(const QModelIndex &idx) override;
+
+protected:
+  void setRow(int row);
+
+private:
+  Ui::JumpPointCustomView *m_ui;
+  QDataWidgetMapper       *m_mapper       = nullptr;
+
+  QString                  m_name;
+};
+
+} // SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.ui b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.ui
new file mode 100755
index 000000000..67db1b88a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_custom_view.ui
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>JumpPointCustomView</class>
+ <widget class="QWidget" name="JumpPointCustomView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>62</width>
+    <height>82</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string notr="true"/>
+  </property>
+  <widget class="LtsWidgets::LtsImageEditor" name="image" native="true">
+   <property name="geometry">
+    <rect>
+     <x>6</x>
+     <y>6</y>
+     <width>50</width>
+     <height>50</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>50</width>
+     <height>50</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>50</width>
+     <height>50</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lbDescription">
+   <property name="geometry">
+    <rect>
+     <x>6</x>
+     <y>57</y>
+     <width>50</width>
+     <height>19</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string notr="true">&lt;Desc&gt;</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="textInteractionFlags">
+    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LtsWidgets::LtsImageEditor</class>
+   <extends>QWidget</extends>
+   <header>LtsWidgets/lts_image_editor.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.cpp
new file mode 100755
index 000000000..d61e11f1c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.cpp
@@ -0,0 +1,166 @@
+/**
+  * @RDE_HEADER@
+  * Interface for JumpPointWidget
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "jump_point_model.h"
+#include <Map/map.h>
+#include <Map/object_factory.h>
+#include <Map/situation_map_utils.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <MapImpl/coord_translation_functor_impl.h>
+
+
+// Qt
+#include <QBuffer>
+
+
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+// JumpPointModel
+//----------------------------------------------------------------------------
+
+JumpPointModel::JumpPointModel(QObject *parent)
+  : BaseClass( {tr("Name"), tr("OriginGeo"), tr("Origin"), tr("Scale"), tr("Icon")}, parent)
+{
+}
+
+void JumpPointModel::setMap(Map *map)
+{
+  m_map = map;
+}
+
+QVariant JumpPointModel::data(const QModelIndex &index, int role) const
+{
+  if ((role != Qt::DisplayRole && role != Qt::ToolTipRole && role != Qt::EditRole) || !indexIsValid(index))
+    return QVariant();
+
+  const JPData &data = m_vecData.at(index.row());
+
+  if (role==Qt::ToolTipRole)
+  {
+    QString tooltip;
+    tooltip.append(QStringLiteral("<html>"));
+
+    const QImage &img = data.m_image;
+
+    if (! img.isNull())
+    {
+      // without a temporary file:
+      QByteArray baData;
+      QBuffer buffer(&baData);
+      img.save(&buffer, "PNG", 100);
+      tooltip.append(QStringLiteral("<center><img src='data:image/png;base64,%1'></center>").arg(QString::fromLatin1(baData.toBase64()))); // how can i center the image?
+      tooltip.append(QLatin1String("<br />"));
+    }
+    tooltip.append(QStringLiteral("<p>name: %1</p>").arg(data.m_name));
+    tooltip.append(QStringLiteral("<p>origin: %1</p>").arg(m_map->geoToMgrsString(data.m_originGeo.toPointF())));
+    tooltip.append(QStringLiteral("<p>scale: %1</p>").arg(data.m_mapScale));
+    tooltip.append(QStringLiteral("</html>"));
+    return tooltip;
+  }
+
+  switch (index.column())
+  {
+  case NAME:
+    return data.m_name;
+  case ORIGIN_GEO:
+    return data.m_originGeo.toPointF();
+  case ORIGIN_MGRS:
+  {
+    if (m_map)
+      return m_map->geoToMgrsString(data.m_originGeo.toPointF());
+    return QString();
+  }
+  case SCALE:
+    return data.m_mapScale;
+  case ICON:
+    return data.m_image;
+  }
+
+  return QVariant();
+}
+
+void JumpPointModel::addUpdateItem(const JPData &jpData)
+{
+  int row = rowOfItem(jpData.m_name);
+  if (row >= 0)
+    setRowData(row, jpData);  // UPDATE
+  else
+    insertRow(jpData);        // APPEND
+}
+
+bool JumpPointModel::removeItem(const QString &name)
+{
+  int row = rowOfItem(name);
+  if (row < 0)
+    return false;
+  removeRow(row);
+  return true;
+}
+
+bool JumpPointModel::contains(const QString &name)
+{
+  return rowOfItem(name) >= 0;
+}
+
+int JumpPointModel::rowOfItem(const QString &name)
+{
+  int row = -1;
+  for (const JPData &item : qAsConst(m_vecData))
+  {
+    ++row;
+    if (item.m_name.compare(name) == 0)
+      return row;
+  }
+  return -1;
+}
+
+JPData *JumpPointModel::getItemPtr(const QModelIndex &index)
+{
+  if (!indexIsValid(index))
+    return nullptr;
+
+  int row = index.row();
+  if (row < 0 || row > m_vecData.size())
+    return nullptr;
+
+  return &m_vecData[row];
+}
+
+JPData *JumpPointModel::getItemPtr(const QString &name)
+{
+  int row = rowOfItem(name);
+  if (row < 0 || row > m_vecData.size())
+    return nullptr;
+  return &m_vecData[row];
+
+}
+
+QVector<JPData> JumpPointModel::jumpPoints()
+{
+  return m_vecData;
+}
+
+QStringList JumpPointModel::names()
+{
+  QStringList sl;
+  sl.reserve(m_vecData.size());
+
+  for (const JPData &item : qAsConst(m_vecData))
+    sl.append(item.m_name);
+  return sl;
+}
+
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.h
new file mode 100755
index 000000000..2f3d502dc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_model.h
@@ -0,0 +1,105 @@
+/**
+  * @RDE_HEADER@
+  * Interface
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "situation_map_export.h"
+#include <MapObjects/geo_image.h>
+#include <Common/ref_pointer.h>
+#include <Common/situation_map_logging.h>
+
+#include <LtsWidgets/lts_abstract_table_model.h>
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+// JPData
+//----------------------------------------------------------------------------
+class JPData
+{
+public:
+  JPData() = default;
+
+  explicit JPData(const QString &name, const Point3D &originGeo, double mapScale = 0.0)
+    : m_name(name), m_originGeo(originGeo), m_mapScale(mapScale)
+  {}
+
+  ~JPData()
+  {
+    if (m_marker)
+      m_marker->removeMySelf();
+  }
+
+  bool hasMarker() const
+  {
+    return m_marker.valid();
+  }
+
+  QString                                       m_name;
+  Point3D                                       m_originGeo;
+  double                                        m_mapScale = 0.0;
+
+  RefPointer<GeoImage>                          m_marker;
+  QImage                                        m_image;
+};
+
+
+//----------------------------------------------------------------------------
+// JumpPointModel
+//----------------------------------------------------------------------------
+
+class JumpPointModel: public LtsWidgets::LtsAbstractTableModel<JPData>
+{
+  Q_OBJECT
+  using BaseClass = LtsWidgets::LtsAbstractTableModel<JPData>;
+
+public:
+  enum Columns
+  {
+    NAME,
+    ORIGIN_GEO,
+    ORIGIN_MGRS,
+    SCALE,
+    ICON,
+  };
+
+  explicit JumpPointModel(QObject *parent = nullptr);
+  void setMap(Map *map);
+
+
+
+  QVariant data(const QModelIndex &index, int role) const override final;
+
+  void addUpdateItem(const JPData& jpData);
+  bool removeItem(const QString &name);
+
+  bool contains(const QString &name);
+  int rowOfItem(const QString &name);
+
+  JPData* getItemPtr(const QModelIndex &index);
+  JPData* getItemPtr(const QString &name);
+
+  QVector<JPData> jumpPoints();
+
+  QStringList names();
+
+private:
+  Map                      *m_map          = nullptr;
+
+};
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.cpp
new file mode 100755
index 000000000..012554eca
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.cpp
@@ -0,0 +1,41 @@
+/**
+  * @RDE_HEADER@
+  * Declaration/Definition
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#include "jump_point_namer.h"
+#include "ui_jump_point_namer.h"
+
+namespace SituationMap
+{
+
+JumpPointNamer::JumpPointNamer(int count, const QPointF &coordGeo, QWidget *parent)
+  : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
+  , m_ui(new Ui::JumpPointNamer)
+  , m_coord(coordGeo)
+{
+  m_ui->setupUi(this);
+  m_ui->leName->setText(QStringLiteral("JP_%1").arg(count));
+#ifdef TABLET_MODE
+  m_ui->leName->setFocusPolicy(Qt::ClickFocus);
+#endif
+  connect(m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Close), &QPushButton::clicked, this, &JumpPointNamer::close);
+  connect(m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Ok), &QPushButton::clicked, this, &JumpPointNamer::onOk);
+}
+
+JumpPointNamer::~JumpPointNamer()
+{
+  delete m_ui;
+}
+
+void JumpPointNamer::onOk()
+{
+  if (m_ui->leName->text().size() > 0)
+  {
+    emit newName(m_ui->leName->text(), m_coord);
+    close();
+  }
+}
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.h
new file mode 100755
index 000000000..120377b7a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.h
@@ -0,0 +1,39 @@
+/**
+  * @RDE_HEADER@
+  * Declaration/Definition
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+
+#include <LtsWidgets/lts_frameless_dialog.h>
+
+namespace Ui {
+class JumpPointNamer;
+}
+
+namespace SituationMap
+{
+
+class JumpPointNamer : public LtsWidgets::LtsFramelessDialog
+{
+  Q_OBJECT
+
+public:
+  explicit JumpPointNamer(int count, const QPointF &coordGeo, QWidget *parent = nullptr);
+  ~JumpPointNamer();
+
+signals:
+  void newName(const QString &name, const QPointF &coordGeo);
+
+private:
+   void onOk();
+
+private:
+  Ui::JumpPointNamer *m_ui;
+  QPointF m_coord;
+};
+
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.ui b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.ui
new file mode 100755
index 000000000..036153e12
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_namer.ui
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>JumpPointNamer</class>
+ <widget class="QWidget" name="JumpPointNamer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>224</width>
+    <height>82</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Set Jump Point Name</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="leName"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="LtsWidgets::LtsDialogButtonBox" name="ltsDialogButtonBox"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LtsWidgets::LtsDialogButtonBox</class>
+   <extends>QWidget</extends>
+   <header>LtsWidgets/lts_dialog_button_box.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.cpp
new file mode 100755
index 000000000..5cbc2547d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.cpp
@@ -0,0 +1,445 @@
+/**
+  * @RDE_HEADER@
+  * Interface for JumpPointWidget
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "jump_point_widget.h"
+#include "jump_point_custom_view.h"
+#include <Map/map.h>
+#include <Map/object_factory.h>
+#include <Map/situation_map_utils.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <MapImpl/jump_point_namer.h>
+#include <MapImpl/coord_translation_functor_impl.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <Rubberbands/rubberband_factory.h>
+
+#include <MapObjects/geo_image.h>
+
+#include <LtsDataView/lts_data_view.h>
+
+
+// Qt
+#include <QCoreApplication>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QMenu>
+#include <QAction>
+#include <QFocusEvent>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class JumpPointWidget::Private
+//-----------------------------------------------------------------------------
+class JumpPointWidget::Private
+{
+public:
+  Private() = default;
+
+  // OWN data:
+  SituationMap::Map              *m_map               = nullptr;  // Use INTERFACE
+  QString                         m_layername;
+  QString                         m_debugInfo;
+
+  RefPointer<GeoImage>            m_uniqueMarker;
+
+
+  QGridLayout                    *m_layout            = nullptr;
+
+  JumpPointModel                 *m_jumpPointModel    = nullptr;
+  LtsDataView::LtsDataView       *m_jumpPointView     = nullptr;
+
+  QMenu                          *m_actionMenu        = nullptr;
+  QAction                        *m_removeAction      = nullptr;
+  QModelIndex                     m_contextModelIndex;
+}; // class JumpPointWidget::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class JumpPointWidget
+//-----------------------------------------------------------------------------
+JumpPointWidget::JumpPointWidget(const QString &layername,
+                                 Map *map,
+                                 const QString &debugInfo)
+  : BaseClass()
+  , d(new Private)
+  , m_logger(getLogger("JumpPointWidget"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << debugInfo << "'";
+
+  d->m_jumpPointModel = new JumpPointModel(this);
+
+
+
+  if (map)
+  {
+    d->m_map        = map;
+    d->m_layername  = layername;
+    d->m_debugInfo  = debugInfo;
+
+    connect(d->m_map, &Map::beginDestroy, this, &JumpPointWidget::cleanup);
+
+    d->m_jumpPointModel->setMap(d->m_map);
+
+
+    QVBoxLayout *vBox = new QVBoxLayout();
+    this->setLayout(vBox);
+
+
+    QHBoxLayout *hBox = new QHBoxLayout();
+    vBox->addLayout(hBox);
+    hBox->addWidget(new QLabel(tr("Jump Points:")));
+    QPushButton *pbPosition = new QPushButton(QIcon(QLatin1String("icon:position.svg")), tr("Position"));
+    hBox->addWidget(pbPosition);
+    connect(pbPosition, &QPushButton::clicked, this, &JumpPointWidget::onGetPosition);
+
+    pbPosition->setEnabled(d->m_map->mode() == Mode::Mode_2D);
+
+
+    d->m_jumpPointView = new LtsDataView::LtsDataView(this);
+    vBox->addWidget(d->m_jumpPointView);
+    d->m_jumpPointView->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
+
+    d->m_jumpPointView->selectCustomView();
+    d->m_jumpPointView->seamless();
+    d->m_jumpPointView->setModel(d->m_jumpPointModel, [this]()
+    {
+      return new JumpPointCustomView(this);
+    });
+
+    // connect signals of TableView:
+    connect(d->m_jumpPointView, &LtsDataView::LtsDataView::signalEntered,   this, &JumpPointWidget::onTableViewClicked);
+    connect(d->m_jumpPointView, &LtsDataView::LtsDataView::clicked,         this, &JumpPointWidget::onTableViewSelectionChanged);
+
+    d->m_jumpPointView->hideColumn(JumpPointModel::Columns::ORIGIN_GEO); // do not "print"
+    d->m_jumpPointView->hideColumn(JumpPointModel::Columns::ICON); // do not "print"
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
+
+
+  // context menue:
+  d->m_jumpPointView->setContextMenuPolicyPerView(LtsDataView::LtsDataView::CUSTOM, Qt::CustomContextMenu);
+  connect(d->m_jumpPointView, &LtsDataView::LtsDataView::signalContextMenuRequested,
+          this, &JumpPointWidget::onCustomContextMenuRequested);
+
+  d->m_actionMenu = new QMenu(this);
+  d->m_removeAction = new QAction(tr("Remove Jump Point"), this);
+  d->m_actionMenu->addAction(d->m_removeAction);
+  connect(d->m_removeAction, &QAction::triggered, this, &JumpPointWidget::onRemoveAction);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+JumpPointWidget::~JumpPointWidget()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  this->cleanup();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  delete d;
+}
+
+QStringList JumpPointWidget::names()
+{
+  if (!d->m_jumpPointModel)
+    return QStringList();
+  return d->m_jumpPointModel->names();
+}
+
+QVector<JPData> JumpPointWidget::jumpPoints()
+{
+  if (!d->m_jumpPointModel)
+    return QVector<JPData>();
+  return d->m_jumpPointModel->jumpPoints();
+}
+
+int JumpPointWidget::count() const
+{
+  if (!d->m_jumpPointModel)
+    return 0;
+  return d->m_jumpPointModel->rowCount();
+}
+
+bool JumpPointWidget::contains(const QString &name)
+{
+  if (!d->m_jumpPointModel)
+    return false;
+  return d->m_jumpPointModel->contains(name);
+}
+
+bool JumpPointWidget::removeJumpPoint(const QString &name)
+{
+  return d->m_jumpPointModel->removeItem(name);
+}
+
+
+void JumpPointWidget::onGetPosition()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (!d->m_map)
+    return;
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Workaround to make sure that cursor setting of rubberband will work. Don't know why this
+   * is necessary. ToDo find the reason why changing cursor failed and fix the underlying cause.
+   *
+   *                                                                                 JT 2017/05/04
+   */
+  d->m_map->sideBar()->hide();
+  //  QCoreApplication::process Events();  // 2017.11.03, N.Thoden, not necessary
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  // remove any pending/active rubberbands of our map:
+  SituationMap::RB::Rubberband::deleteAllActiveRubberbands(d->m_map);
+
+  // create rb
+  RB::RubberbandPointFeature *rb = d->m_map->rubberbandFactory().create<RB::RubberbandPointFeature>(this);
+  if (!rb || !rb->rubberbandIsAlive())
+  {
+    if (rb)
+      rb->deleteMySelf();
+    FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " create Rubberband failed!";
+    return;
+  }
+  rb->setAutoDelete(true);
+  connect(rb, &RB::Rubberband::apply, this, &JumpPointWidget::onRubberbandApply);
+}
+
+void JumpPointWidget::onRubberbandApply(RB::RubberbandBase *rb)
+{
+  QPolygonF coordGeo = rb->coordinateVector();
+  if (coordGeo.size() != 1)
+    return;
+  connect(this, &JumpPointWidget::newName, this, &JumpPointWidget::onName);
+
+  askUserForName(coordGeo.front());
+}
+
+void JumpPointWidget::askUserForName(const QPointF &coordGeo)
+{
+  JumpPointNamer *namer = new JumpPointNamer(this->count(), coordGeo, this);
+  namer->setAttribute(Qt::WA_DeleteOnClose);
+  namer->connect(namer, &JumpPointNamer::newName, this, &JumpPointWidget::newName);
+  namer->show();
+}
+
+void JumpPointWidget::onName(const QString &name, const QPointF & coordGeo)
+{
+  disconnect(this, &JumpPointWidget::newName, this, &JumpPointWidget::onName);
+  const double scale = d->m_map->scale();
+  addJumpPoint(name, coordGeo, scale);
+}
+
+void JumpPointWidget::onJumpPointHovered(const QString &name, bool enter)
+{
+  setJumpPointSelected(name, enter);
+}
+
+void JumpPointWidget::onTableViewClicked(const QModelIndex &index)
+{
+  if (!d->m_jumpPointModel)
+    return;
+
+  JPData *jumpPoint = d->m_jumpPointModel->getItemPtr(index);
+  if (!jumpPoint)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found";
+    return;
+  }
+
+  removeJumpPointSelections();
+  onJumpPointHovered(jumpPoint->m_name, true);
+}
+
+void JumpPointWidget::onTableViewSelectionChanged(const QModelIndex &index)
+{
+  if (!d->m_jumpPointModel)
+    return;
+
+  JPData *jumpPoint = d->m_jumpPointModel->getItemPtr(index);
+  if (!jumpPoint)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found";
+    return;
+  }
+
+  centerMapToJumpPoint(jumpPoint->m_name);
+}
+
+bool JumpPointWidget::addJumpPoint(const QString &name, const QPointF &originGeo, double mapScale)
+{
+  return addJumpPoint(name, Point3D::fromQPointF(originGeo), mapScale);
+}
+
+bool JumpPointWidget::addJumpPoint(const QString &name, const Point3D &originGeo, double mapScale)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " name='" << name << "'"
+                      << " originGeo=" << originGeo
+                      << " mapScale=" << mapScale;
+
+  if (d->m_layername.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no layername";
+    return false;
+  }
+
+  {
+    JPData jpData(name, originGeo, mapScale);
+    jpData.m_image = QImage(QLatin1String(":/situationMap/pushPinRedClipArt.png")).scaled(30, 30, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    d->m_jumpPointModel->addUpdateItem(jpData);
+  }
+
+
+  JPData *jumpPoint  = d->m_jumpPointModel->getItemPtr(name);
+  if (!jumpPoint)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found";
+    return false;
+  }
+
+  if (! jumpPoint->hasMarker())
+  {
+    QString debugInfo = QStringLiteral("%1_JumpPoint(%2)").arg(d->m_debugInfo, name);
+
+    jumpPoint->m_marker = d->m_map->objectFactory().create<SituationMap::GeoImage>(d->m_layername, debugInfo);
+    if (! jumpPoint->m_marker.valid())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " create GeoImage failed, debugInfo='" << d->m_debugInfo << "'";
+      return false;
+    }
+    jumpPoint->m_marker->setProxyMarker(MarkerSymbolType::PushPin2D);
+    jumpPoint->m_marker->setPickable(false);
+  }
+  jumpPoint->m_mapScale  = mapScale;
+  jumpPoint->m_originGeo = originGeo;
+  jumpPoint->m_marker->setOrigin(originGeo);
+  jumpPoint->m_marker->setIdentifier(name);
+  this->setJumpPointSelected(name, false);
+
+  bool success = jumpPoint->m_marker->updateView();
+  if (! success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed, debugInfo='" << d->m_debugInfo << "'";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                      << " END"
+                      << " name='" << name << "'"
+                      << " originGeo=" << originGeo
+                      << " mapScale=" << mapScale;
+  return success;
+}
+
+bool JumpPointWidget::centerMapToJumpPoint(const QString &name)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " name='" << name << "'";
+
+  JPData *jumpPoint  = d->m_jumpPointModel->getItemPtr(name);
+  if (!jumpPoint)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found";
+    return false;
+  }
+
+  const Point3D &originGeo = jumpPoint->m_originGeo;
+  const double mapScale    = jumpPoint->m_mapScale;
+
+  d->m_map->setCenterPoint(originGeo.toPointF(), mapScale);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return true;
+}
+
+void JumpPointWidget::removeJumpPointSelections()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  if (!d->m_jumpPointModel)
+    return;
+
+  const QStringList &sl = d->m_jumpPointModel->names();
+  for (const auto &name : sl)
+    setJumpPointSelected(name, false);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+bool JumpPointWidget::setJumpPointSelected(const QString &name, bool selected)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " name='" << name << "'"
+                      << " selected='" << selected;
+
+  JPData *jumpPoint  = d->m_jumpPointModel->getItemPtr(name);
+  if (!jumpPoint)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found";
+    return false;
+  }
+  if (! jumpPoint->hasMarker())
+    return false;
+
+
+  // jumpPoint->m_marker->setSelected(selected);
+  // jumpPoint->m_marker->setScale((selected) ? 1.5 : 1.0);
+  jumpPoint->m_marker->setProxyMarkerSize((selected) ? 30 : 20);
+  jumpPoint->m_marker->setDrawOrder((selected) ? 2 : 1);             // selected should be above the other
+  jumpPoint->m_marker->rTextStyle().setSize((selected) ? 20 : 10);
+  bool success = jumpPoint->m_marker->updateView();
+  if (! success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed, debugInfo='" << d->m_debugInfo << "'";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END"
+                      << " name='" << name << "'"
+                      << " selected='" << selected;
+  return success;
+}
+
+void JumpPointWidget::onCustomContextMenuRequested(const QPoint &globalPos, const QModelIndex &indexSrc)
+{
+  d->m_contextModelIndex = indexSrc;
+  if (!d->m_contextModelIndex.isValid())
+    return;
+  d->m_actionMenu->exec(globalPos);
+}
+
+void JumpPointWidget::onRemoveAction()
+{
+  if (!d->m_contextModelIndex.isValid())
+    return;
+  d->m_jumpPointModel->removeRow(d->m_contextModelIndex.row());
+}
+
+void JumpPointWidget::cleanup()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  d->m_jumpPointModel->clear();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+bool JumpPointWidget::event(QEvent *event)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " type " << event->type();
+
+  if (event->type() == QEvent::Type::Hide)
+  {
+    TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                        << " hide Event -> removeJumpPointSelections...";
+    this->removeJumpPointSelections();
+  }
+  return BaseClass::event(event);
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.h
new file mode 100755
index 000000000..9918d612c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/jump_point_widget.h
@@ -0,0 +1,103 @@
+/**
+  * @RDE_HEADER@
+  * Interface
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "jump_point_model.h"
+#include "situation_map_export.h"
+#include <Common/ref_pointer.h>
+#include <Common/situation_map_logging.h>
+#include <Map/situation_map_types.h>
+
+//
+#include <MapObjects/geo_image.h>
+
+#include <LtsWidgets/lts_abstract_table_model.h>
+
+// Qt
+#include <QWidget>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//Forward:
+class Map;
+
+namespace RB
+{
+class RubberbandBase;
+}
+
+//----------------------------------------------------------------------------
+// JumpPointWidget
+//----------------------------------------------------------------------------
+class SITUATIONMAP_EXPORT JumpPointWidget : public QWidget
+{
+  Q_OBJECT
+
+  using BaseClass = QWidget;
+
+public:
+  explicit JumpPointWidget(const QString &layername,
+                           Map *map,
+                           const QString &debugInfo);
+  virtual ~JumpPointWidget();
+
+  QStringList names();
+  QVector<JPData> jumpPoints();
+
+  int count() const;
+  bool contains(const QString &name);
+signals:
+  void newName(const QString &name, const QPointF &coordGeo);
+
+public Q_SLOTS:
+  void onGetPosition();
+  void onRubberbandApply(RB::RubberbandBase *rb);
+  void askUserForName(const QPointF &coordGeo);
+
+  void onName(const QString &name, const QPointF & coordGeo);
+  void onJumpPointHovered(const QString &name, bool enter);
+
+  void onTableViewClicked(const QModelIndex &index);
+  void onTableViewSelectionChanged(const QModelIndex &index);
+
+  bool addJumpPoint(const QString &name, const Point3D &originGeo, double mapScale = -1);
+  bool addJumpPoint(const QString &name, const QPointF &originGeo, double mapScale = -1);
+  bool centerMapToJumpPoint(const QString &name);
+  bool removeJumpPoint(const QString &name);
+
+  void removeJumpPointSelections();
+  bool setJumpPointSelected(const QString &name, bool selected = true);
+
+  void onCustomContextMenuRequested(const QPoint &globalPos, const QModelIndex &indexSrc);
+  void onRemoveAction();
+
+  void cleanup();
+
+protected:
+  bool event(QEvent *event) override;
+
+
+private:
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.cpp
new file mode 100755
index 000000000..de7b2f912
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.cpp
@@ -0,0 +1,1134 @@
+/**
+  * @RDE_HEADER@
+  * Interface
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "layer_control_widget.h"
+#include <Map/map.h>
+#include <Map/layer_parameter.h>
+#include <Map/situation_map_utils.h>
+
+
+// Qt
+#include <QApplication>
+#include <QLabel>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QSlider>
+#include <QGridLayout>
+#include <QDrag>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QComboBox>
+#include <QTimer>
+#include <QBuffer>
+#include <QToolButton>
+#include <QSignalBlocker>
+#include <cmath>
+
+
+
+namespace SituationMap
+{
+
+const QLatin1String MIMETYPE("application/x-dndEsriLayerItemData");
+
+//----------------------------------------------------------------------------
+const char LayernameProperty[] = "layername";
+//----------------------------------------------------------------------------
+
+
+
+class DragableCheckBox : public QCheckBox
+{
+  Q_OBJECT
+  using BaseClass = QCheckBox;
+
+public:
+  DragableCheckBox()  = default;
+  explicit DragableCheckBox(const QString &text)
+    : QCheckBox(text)
+  {}
+
+  ~DragableCheckBox() = default;
+
+  void mousePressEvent(QMouseEvent *event) override;
+  void mouseMoveEvent(QMouseEvent *event) override;
+
+private:
+  QPoint m_dragStartPos;
+}; // class LayerControlWidget::Private
+//-----------------------------------------------------------------------------
+
+void DragableCheckBox::mousePressEvent(QMouseEvent *event)
+{
+//  qWarning() << LOGFUNCTION << " START";
+
+  if (event->button() == Qt::LeftButton)
+    m_dragStartPos = event->pos();
+
+  BaseClass::mousePressEvent(event);
+
+//  qWarning() << LOGFUNCTION << " END";
+}
+
+void DragableCheckBox::mouseMoveEvent(QMouseEvent *event)
+{
+//  qWarning() << LOGFUNCTION << " START";
+
+  if (!(event->buttons() & Qt::LeftButton))
+    return;
+  if ((event->pos() - m_dragStartPos).manhattanLength()
+      < QApplication::startDragDistance())
+    return;
+
+  QByteArray itemData;
+  QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+  dataStream << this->property(LayernameProperty).toString();  // == layername
+
+  QMimeData *mimeData = new QMimeData;
+  mimeData->setData(MIMETYPE, itemData);
+
+  QDrag *drag = new QDrag(this);
+  drag->setMimeData(mimeData);
+
+  drag->exec(Qt::MoveAction);
+
+//  qWarning() << LOGFUNCTION << " END";
+}
+//-----------------------------------------------------------------------------
+
+struct SliderStruct
+{
+  QCheckBox *cbOnOff        = nullptr;
+  QSlider   *sl_opacity     = nullptr;
+  QSlider   *sl_brightness  = nullptr;
+  QSlider   *sl_contrast    = nullptr;
+  QSlider   *sl_gamma       = nullptr;
+};
+
+class LayerControlWidget::Private
+{
+
+public:
+  Private() = default;
+
+  // OWN data:
+  SituationMap::Map              *m_map = nullptr;  // Use INTERFACE
+  QString                         m_debugInfo;
+
+  bool                            m_zoomRotScaleEnabled = true;
+  bool                            m_layerEnabled   = true;
+  bool                            m_basemapEnabled = true;
+
+
+  QVBoxLayout                    *m_layout          = nullptr;
+
+  // MapLayer:
+  QGridLayout                    *m_mapLayerLayout  = nullptr;
+
+  // BaseMapSelection:
+  QHBoxLayout                    *m_baseMapSelectLayout = nullptr;
+  QList<QToolButton *>            m_baseMapSelectIcons;
+  QLabel                         *m_lbBasemap           = nullptr;
+
+
+
+  QMap<QString, SliderStruct>     m_sliderMap;
+
+  // Zoom and rotation
+  QHBoxLayout                    *m_zoomLayout        = nullptr;  // will contain zoom and rotation elements
+  QSlider                        *m_zoomSlider        = nullptr;
+  QSlider                        *m_rotationSlider    = nullptr;
+  QSlider                        *m_symbolSizeSlider  = nullptr; // 10 ... 200
+  QTimer                         *m_symbolSizeTimer   = nullptr;
+
+}; // class LayerControlWidget::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class LayerControlWidget
+//-----------------------------------------------------------------------------
+LayerControlWidget::LayerControlWidget(QWidget *parent,
+                                       Map *map,
+                                       bool enableLayer,
+                                       bool enableBasemap,
+                                       const QString &debugInfo)
+  : QWidget(parent)
+  , d(new Private)
+  , m_logger(getLogger("LayerControlWidget"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << debugInfo << "'";
+
+  d->m_debugInfo      = debugInfo;
+  d->m_map            = map;
+  d->m_layerEnabled   = enableLayer;
+  d->m_basemapEnabled = enableBasemap;
+
+
+  d->m_layout     = new QVBoxLayout();
+  this->setLayout(d->m_layout);
+  setAcceptDrops(true);
+
+  // use QueuedConnect to let dropEvent (and destroying of QDrag object) finish
+  // BEFORE the panel is updated (and DragableCheckBox - parent of QDrag object - are deleted.)
+  connect(d->m_map, &Map::layerOrderChanged,      this, &LayerControlWidget::updatePanelLayer, Qt::ConnectionType::QueuedConnection);
+  connect(d->m_map, &Map::layerParameterChanged,  this, &LayerControlWidget::onLayerParamterChanged);
+  connect(d->m_map, &Map::mapReady,               this, &LayerControlWidget::onMapReady, Qt::ConnectionType::QueuedConnection);
+
+
+  updatePanel();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+LayerControlWidget::~LayerControlWidget()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  delete d;
+}
+
+
+bool LayerControlWidget::updatePanel()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  updatePanelZoomRotationScales();
+  updatePanelLayer();
+//  updatePanelBasemap();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return true;
+}
+
+bool LayerControlWidget::updatePanelZoomRotationScales()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (! d->m_zoomRotScaleEnabled)
+    return false;
+
+  if (d->m_zoomLayout)
+    return true;
+
+  d->m_zoomLayout = new QHBoxLayout();
+  d->m_layout->addLayout(d->m_zoomLayout);
+
+  d->m_zoomSlider = generateZoomSlider();
+  d->m_zoomLayout->addWidget(d->m_zoomSlider);
+
+  // problems around scale in 3D:
+  d->m_zoomSlider->setEnabled(d->m_map->mode() == Mode::Mode_2D);
+
+
+  QComboBox *cmbScale = new QComboBox();
+  d->m_zoomLayout->addWidget(cmbScale);
+
+  cmbScale->addItem(tr("Presets"));
+  cmbScale->insertSeparator(1);
+
+  using scaleDataTyp = QPair<QString, int>;
+  const auto scaleData = {
+    scaleDataTyp(QLatin1String(" 1:25000"), 400000),
+    scaleDataTyp(QLatin1String(" 1:50000"), 200000),
+    scaleDataTyp(QLatin1String("1:100000"), 100000)
+  };
+
+  for (const scaleDataTyp &item : scaleData)
+    cmbScale->addItem(item.first, QVariant(item.second));  // stored in Qt::UserRole
+
+  // c++11 -> lambda :-)
+  connect(cmbScale, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [this, cmbScale](int index)
+  {
+    if (index <= 1) return;  // 1 Damit 'Presets' + Separator ohne Auswirkung bleibt
+
+    int selectedScale = cmbScale->currentData().toInt();
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " cmbScale selectedScale=" << selectedScale;
+    d->m_map->setScale(selectedScale);
+
+    cmbScale->setCurrentIndex(0); // Textausgabe auf 'Presets' setzen
+  });
+
+
+  //
+  // Rotation:
+  //
+  if (! d->m_rotationSlider)
+  {
+    d->m_rotationSlider  = generateRotationSlider();
+    d->m_layout->addWidget(d->m_rotationSlider);
+  }
+
+  //
+  // SymbolSize:
+  //
+  if (! d->m_symbolSizeSlider)
+  {
+    d->m_symbolSizeSlider = generateSymbolSizeSlider();
+    d->m_layout->addWidget(d->m_symbolSizeSlider);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return true;
+}
+
+bool LayerControlWidget::updatePanelLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+
+  //
+  // Layer:
+  //
+
+  // reNew the part of mapLayer :
+  if (d->m_mapLayerLayout)
+  {
+    for (int row = 0; row < d->m_mapLayerLayout->rowCount(); ++row)
+    {
+      for (int col = 0; col < d->m_mapLayerLayout->columnCount(); ++col)
+      {
+        QLayoutItem *item = d->m_mapLayerLayout->itemAtPosition(row, col);
+        if (item)
+        {
+          QWidget *w = item->widget();
+          delete w;
+          // w->deleteLater() --> QCoreApplication::postEvent: Unexpected null receiver (ication/ngl_qt_msg_handler.inc:25)
+        }
+      }
+    }
+  }
+  delete d->m_mapLayerLayout;
+  d->m_mapLayerLayout = nullptr;
+  d->m_sliderMap.clear();
+
+
+
+  if (! d->m_layerEnabled)
+    return false;
+
+
+  d->m_mapLayerLayout = new QGridLayout();
+  d->m_layout->addLayout(d->m_mapLayerLayout);
+
+  int row = 0;
+
+  QCheckBox *cbExpand = new QCheckBox(tr("Expand"), this);
+  d->m_mapLayerLayout->addWidget(cbExpand, row++, 0);
+
+  cbExpand->setChecked(false);
+  connect(cbExpand, &QCheckBox::clicked, this, &LayerControlWidget::expandCollapse);
+
+
+  //
+  // Fill MapLayerLayout :
+  //
+  if (d->m_map)
+  {
+    int col = 0;
+
+    const auto header = {
+      tr("Layer"),
+      tr("Opacity"),
+      tr("Brightness"),
+      tr("Contrast"),
+      tr("Gamma")
+    };
+
+    for (const QString &name : header)
+      d->m_mapLayerLayout->addWidget(new QLabel(name), row, col++);
+
+    const QStringList sl = d->m_map->layerFactory().layernames();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " layers=" << sl.join(QLatin1Char(';'));
+
+    row += sl.count();
+
+    for (const QString &layername : sl)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " layerName=" << layername;
+      int col = 0;
+
+      const LayerParameter &lp   = d->m_map->layerFactory().layerParameter(layername);
+      const LayerType &layerType = d->m_map->layerFactory().layerType(layername);
+
+      DragableCheckBox *cbOnOff = new DragableCheckBox();
+      if (lp.displayName.isEmpty())
+        cbOnOff->setText(layername);
+      else
+        cbOnOff->setText(lp.displayName);
+      cbOnOff->setProperty(LayernameProperty, layername);
+      d->m_sliderMap[layername].cbOnOff = cbOnOff;
+      cbOnOff->setObjectName(QLatin1String("DragableCheckBox_") + layername);
+      cbOnOff->setChecked(lp.visible);
+
+
+      const QString &tooltip = generateToolTip(layername, lp);
+      if (!tooltip.isEmpty())
+        cbOnOff->setToolTip(tooltip);
+
+      connect(cbOnOff, &QCheckBox::stateChanged, this, &LayerControlWidget::layerOnOff);
+      d->m_mapLayerLayout->addWidget(cbOnOff, row, col++);
+
+
+      mySlider *sl_opac = new mySlider(layername, 0, 100);
+      d->m_sliderMap[layername].sl_opacity = sl_opac;
+      sl_opac->setObjectName(QLatin1String("sl_opac"));
+      sl_opac->setValue(lp.opacity);
+      connect(sl_opac, &mySlider::valueChanged, this, &LayerControlWidget::opacity);
+      d->m_mapLayerLayout->addWidget(sl_opac, row, col++);
+
+      if (layerType == SituationMap::LayerType::Basemap)
+      {
+        mySlider *sl_brightness = new mySlider(layername, -100, 100);
+        d->m_sliderMap[layername].sl_brightness = sl_brightness;
+        sl_brightness->setObjectName(QLatin1String("sl_brightness"));
+        sl_brightness->setValue(lp.brightness);
+        connect(sl_brightness, &mySlider::valueChanged, this, &LayerControlWidget::brightness);
+        d->m_mapLayerLayout->addWidget(sl_brightness, row, col++);
+
+        mySlider *sl_contrast = new mySlider(layername, -100, 100);
+        d->m_sliderMap[layername].sl_contrast = sl_contrast;
+        sl_contrast->setObjectName(QLatin1String("sl_contrast"));
+        sl_contrast->setValue(lp.contrast);
+        connect(sl_contrast, &mySlider::valueChanged, this, &LayerControlWidget::contrast);
+        d->m_mapLayerLayout->addWidget(sl_contrast, row, col++);
+
+        mySlider *sl_gamma = new mySlider(layername, -100, 100);
+        d->m_sliderMap[layername].sl_gamma = sl_gamma;
+        sl_gamma->setObjectName(QLatin1String("sl_gamma"));
+        sl_gamma->setValue(lp.gamma);
+        connect(sl_gamma, &mySlider::valueChanged, this, &LayerControlWidget::gamma);
+        d->m_mapLayerLayout->addWidget(sl_gamma, row, col++);
+      }
+
+      --row;
+    }
+
+#ifdef ONLY_FOR_TESTS
+    QPushButton *pbAddBasemapLayer = new QPushButton(QLatin1String("add BasemapLayer"));
+    d->m_mapLayerLayout->addWidget(pbAddBasemapLayer);
+
+    QLatin1String newBasemapName("basemapAddedByBtn");
+    QLatin1String newBasemapUrl("http://192.168.133.88:6080/arcgis/rest/services/BremenGeoTiff/MapServer");
+    // QLatin1String newBasemap("http://192.168.133.88:6080/arcgis/rest/services/BremenGeoTiffUTM/MapServer");
+    pbAddBasemapLayer->setToolTip(newBasemapUrl);
+
+    connect(pbAddBasemapLayer, &QPushButton::clicked, this, [this]()
+    {
+      bool success = d->m_map->layerFactory().addBasemap(newBasemapName, newBasemapUrl);
+      INFO_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " adding basemapLayer, success=" << success;
+    });
+
+    QPushButton *pbRemoveBasemapLayer = new QPushButton(QLatin1String("remove BasemapLayer"));
+    d->m_mapLayerLayout->addWidget(pbRemoveBasemapLayer);
+
+    pbRemoveBasemapLayer->setToolTip(newBasemapUrl);
+
+    connect(pbRemoveBasemapLayer, &QPushButton::clicked, this, [this]()
+    {
+      bool success = d->m_map->layerFactory().removeBasemap(newBasemapName);
+      INFO_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " removing basemapLayer, success=" << success;
+    });
+#endif
+
+    expandCollapse(cbExpand->isChecked());
+
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " no map !!!";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return true;
+}
+
+bool LayerControlWidget::updatePanelBasemap()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  // clear old widgets:
+  d->m_baseMapSelectIcons.clear();
+  if (d->m_baseMapSelectLayout)
+  {
+    QLayoutItem *item;
+    while ((item = d->m_baseMapSelectLayout->takeAt(0)))
+    {
+      QWidget *w = item->widget();
+      delete w;
+      delete item;
+    }
+  }
+  delete d->m_baseMapSelectLayout;
+  d->m_baseMapSelectLayout = nullptr;
+
+
+  if (! d->m_basemapEnabled)
+    return false;
+
+
+
+  // create from scratch:
+  if (! d->m_baseMapSelectLayout)
+  {
+    QVBoxLayout *vBox = new QVBoxLayout();
+
+    if (! d->m_lbBasemap)
+      d->m_lbBasemap = new QLabel(tr("Basemaps:"));
+
+    vBox->addWidget(d->m_lbBasemap);
+
+    d->m_baseMapSelectLayout = new QHBoxLayout();
+    vBox->addLayout(d->m_baseMapSelectLayout);
+
+    d->m_layout->addLayout(vBox);
+
+    LayerFactory &layFac = d->m_map->layerFactory();
+    const QStringList &basemapLayernames = layFac.layernames(LayerType::Basemap);
+
+    for (const QString &layername : basemapLayernames)
+    {
+      //      baseMapProxy->setStyleSheet(QLatin1String("QPushButton {background-color: transparent; border: 1px solid transparent;}"));
+      const LayerParameter &lp = d->m_map->layerFactory().layerParameter(layername);
+
+      QToolButton *baseMapProxy = new QToolButton(this);
+
+      baseMapProxy->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);  // eTextUnderIcon?
+      baseMapProxy->setText(lp.displayName);
+
+
+      baseMapProxy->setObjectName(d->m_debugInfo + layername);
+      baseMapProxy->setProperty(LayernameProperty, layername);
+
+      baseMapProxy->setIcon(QIcon(QPixmap::fromImage(lp.previewImage)));
+      baseMapProxy->setIconSize(QSize(40,40));
+
+      baseMapProxy->setCheckable(true);
+      baseMapProxy->setChecked(true);                           // Assume that all are enable by default
+
+      const QString &tooltip = generateToolTip(layername, lp);
+      if (!tooltip.isEmpty())
+        baseMapProxy->setToolTip(tooltip);
+
+      d->m_baseMapSelectLayout->addWidget(baseMapProxy);
+      d->m_baseMapSelectIcons.append(baseMapProxy);
+      connect(baseMapProxy, &QToolButton::clicked, this, &LayerControlWidget::onBaseMapSelection);
+    } // Q_FOREACH
+
+    d->m_baseMapSelectLayout->addStretch(42);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return true;
+}
+
+void LayerControlWidget::expandCollapse(bool expanded)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  for (int row = 1; row < d->m_mapLayerLayout->rowCount(); ++row)
+  {
+    for (int col = 2; col < d->m_mapLayerLayout->columnCount(); ++col)
+    {
+      QLayoutItem *item = d->m_mapLayerLayout->itemAtPosition(row, col);
+      if (item)
+      {
+        QWidget *w = item->widget();
+        if (w)
+          w->setVisible(expanded);
+      }
+    }
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+QString LayerControlWidget::generateToolTip(const QString &layername,
+                                            const LayerParameter &lp)
+{
+  QString tooltip;
+
+  tooltip.append(QStringLiteral("<html>"));
+
+  tooltip.append(QStringLiteral("<p><b>displayName=%1</b></p>").arg(lp.displayName));
+
+  if (! lp.previewImage.isNull())
+  {
+    // without a temporary file:
+    QByteArray data;
+    QBuffer buffer(&data);
+    lp.previewImage.save(&buffer, "PNG", 100);
+    QString html(QLatin1String("<br />"));
+    html.append(QStringLiteral("<img src='data:image/png;base64,%1'>").arg(QString::fromLatin1(data.toBase64())));
+    tooltip.append(html);
+  }
+
+  if (lp.basemapType != BasemapType::Undefined)
+    tooltip.append(QStringLiteral("<p>BasemapType=%1</p>").arg(toDisplayString(lp.basemapType)));
+
+
+  tooltip.append(QStringLiteral("<p>layername=%1</p>").arg(layername));
+  tooltip.append(QStringLiteral("<p>description=%1</p>").arg(lp.description));
+  tooltip.append(QStringLiteral("<p>svcDescription=%1</p>").arg(lp.svcDescription));
+  tooltip.append(QStringLiteral("<p>url=%1</p>").arg(lp.url.toString()));
+  tooltip.append(QStringLiteral("<p>minScale=%1 - maxScale=%2</p>").arg((int)lp.minScale).arg((int)lp.maxScale));
+  tooltip.append(QStringLiteral("</html>"));
+
+  return tooltip;
+}
+
+QSlider *LayerControlWidget::generateZoomSlider()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  QSlider *slider = new QSlider(Qt::Orientation::Horizontal);
+
+  // 1. Init
+  if (d->m_map->isReady())
+  {
+    // This branch is taken in case of FunctionDialog:
+    onZoomSliderInit(slider);
+  }
+
+  // 2. extentChanged
+  // Attention: use identical signal at any other zoom/scale-Slider!!!
+  connect(d->m_map, &Map::extentChangedDelayed, this, &LayerControlWidget::onMapExtentChanged);
+
+  // 3. valueChanged
+  connect(slider, &QSlider::valueChanged, this, &LayerControlWidget::onZoomSliderValueChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return slider;
+}
+
+
+
+QSlider *LayerControlWidget::generateRotationSlider()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  QSlider *slider = new QSlider();
+  slider->setToolTip(tr("Rotation"));
+  slider->setOrientation(Qt::Orientation::Horizontal);
+  slider->setTickPosition(QSlider::TicksBelow);
+  slider->setTickInterval(10);
+  slider->setSingleStep(10);
+  slider->setMinimum(0);
+  slider->setMaximum(359);
+  slider->setValue(0);
+
+  if (d->m_map->isReady())
+    slider->setValue(d->m_map->rotation());
+
+  connect(slider,   &QSlider::valueChanged, this, &LayerControlWidget::onRotationSliderValueChanged);
+  connect(d->m_map, &Map::rotationChanged,  this, &LayerControlWidget::onRotationOfMapChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return slider;
+}
+
+QSlider *LayerControlWidget::generateSymbolSizeSlider()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  QSlider *slider = new QSlider();
+  slider->setToolTip(tr("Symbol Size"));
+  slider->setOrientation(Qt::Orientation::Horizontal);
+  slider->setTickPosition(QSlider::TicksBelow);
+  slider->setTickInterval(10);              // 10%
+  slider->setMinimum(SituationMap::symbolScaleMinimum * 100); // 10%
+  slider->setMaximum(SituationMap::symbolScaleMaximum * 100); // 200%
+  slider->setSingleStep(10);                // 10%
+
+  if (d->m_map->isReady())
+    slider->setValue(d->m_map->symbolScale() * 100);
+
+  connect(slider,   &QSlider::valueChanged,   this, &LayerControlWidget::onSymbolSizeSliderValueChanged);
+  connect(d->m_map, &Map::symbolScaleChanged, this, &LayerControlWidget::onSymbolSizeOfMapChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return slider;
+}
+
+
+
+void LayerControlWidget::onZoomSliderInit(QSlider *slider)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (! slider)
+    return;
+
+  const QSignalBlocker blocker(slider);
+
+
+  slider->setToolTip(tr("Zoom"));
+  slider->setMinimum(sqrt(d->m_map->maxScale()));
+  slider->setMaximum(sqrt(d->m_map->minScale()));
+  onMapExtentChanged();
+
+  if (slider->minimum() == slider->maximum())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " min/max value are identical, debugInfo='" << d->m_debugInfo << "'"
+                          << " minimum=" << slider->minimum()
+                          << " maximum=" << slider->maximum()
+                          << " value=" << slider->value();
+
+    slider->setMinimum(sqrt(500));
+    slider->setMaximum(sqrt(100000));
+
+    WARNING_LOG(m_logger) << LOGFUNCTION << " min/max value are identical, debugInfo='" << d->m_debugInfo << "'"
+                          << " minimum=" << slider->minimum()
+                          << " maximum=" << slider->maximum()
+                          << " value=" << slider->value();
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                      << " minimum=" << slider->minimum()
+                      << " maximum=" << slider->maximum()
+                      << " value=" << slider->value();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onZoomSliderValueChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  QSlider *slider = qobject_cast<QSlider *>(sender());
+  if (! slider)
+    return;
+
+  if (d->m_map->isReady())
+    d->m_map->setScale(slider->value() * slider->value());
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                      << " new target value: " << slider->value() * slider->value();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onRotationSliderValueChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " rawValue = " << d->m_rotationSlider->value();
+
+  if (d->m_map->isReady()
+//      && slider->isSliderDown()
+     )
+  {
+//    ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " push new value "
+//                        << " slider= " << slider
+//                        << slider->value();
+    d->m_map->setRotation(d->m_rotationSlider->value());
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onRotationOfMapChanged(double rotation)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START" << " rotation " << rotation;
+
+  if (! d->m_rotationSlider)
+    return;
+
+  if (d->m_map->isReady() && !d->m_rotationSlider->isSliderDown())
+  {
+    const QSignalBlocker blocker(d->m_rotationSlider);
+    d->m_rotationSlider->setValue(rotation);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+
+
+
+void LayerControlWidget::onSymbolSizeSliderValueChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " rawValue = " << d->m_symbolSizeSlider->value();
+
+  if (!d->m_symbolSizeTimer)
+  {
+    d->m_symbolSizeTimer = new QTimer(this);
+    d->m_symbolSizeTimer->setSingleShot(true);
+    d->m_symbolSizeTimer->setInterval(500);   // msec
+    connect(d->m_symbolSizeTimer, &QTimer::timeout, this, &LayerControlWidget::onSymbolSizeSliderValueChangedTimeout);
+  }
+
+  d->m_symbolSizeTimer->start();  // start -> restart
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onSymbolSizeSliderValueChangedTimeout()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " rawValue = " << d->m_symbolSizeSlider->value();
+
+  double symSize = d->m_symbolSizeSlider->value() / 100.0;
+  d->m_map->setSymbolScale(symSize);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onSymbolSizeOfMapChanged(double symbolSize)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START" << " symbolSize " << symbolSize;
+
+  if (! d->m_symbolSizeSlider)
+    return;
+
+  int symSizeInt = symbolSize * 100;
+  const QSignalBlocker blocker(d->m_symbolSizeSlider);
+  d->m_symbolSizeSlider->setValue(symSizeInt);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+
+void LayerControlWidget::onBaseMapSelection()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  QObject *pb = qobject_cast<QObject *>(sender());
+  if (! pb)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " cast failed";
+    return;
+  }
+
+  // check/uncheck all:
+  for (auto widget : qAsConst(d->m_baseMapSelectIcons))
+    widget->setChecked(widget == pb);
+
+
+  LayerFactory &layFac = d->m_map->layerFactory();
+  const QStringList &basemapLayernames = layFac.layernames(LayerType::Basemap);
+
+  const QString &curName = pb->property(LayernameProperty).toString();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " sender=" << curName;
+  for (const QString &name : basemapLayernames)
+  {
+    bool isCur = name.compare(curName) == 0;
+    LayerParameter lp = layFac.layerParameter(name);
+    if (isCur)
+      lp.resetView();
+    lp.visible = isCur;
+    layFac.setLayerParameter(name, lp);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onMapReady()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  onZoomSliderInit(d->m_zoomSlider);
+  onRotationOfMapChanged(d->m_map->rotation());
+  onSymbolSizeOfMapChanged(d->m_map->symbolScale());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (d->m_zoomSlider && d->m_zoomSlider->isEnabled() && d->m_map->isReady() && (!d->m_zoomSlider->isSliderDown()))
+  {
+    const QSignalBlocker blocker(d->m_zoomSlider);
+
+    float newVal = sqrt(d->m_map->scale());
+    d->m_zoomSlider->setValue(newVal);
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                        << " d->m_map->scale(): " << d->m_map->scale()
+                        << "; newVal: " << newVal
+                        << "; value set to: " << d->m_zoomSlider->value();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+
+
+void LayerControlWidget::layerOnOff()
+{
+  QCheckBox *cb = qobject_cast<QCheckBox *>(sender());
+  if (!cb)
+    return;
+
+  QString layername = cb->property(LayernameProperty).toString();
+
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(layername);
+  lp.visible = cb->isChecked();
+  d->m_map->layerFactory().setLayerParameter(layername, lp);
+}
+
+void LayerControlWidget::opacity(int)
+{
+  mySlider *sl = qobject_cast<mySlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(layername);
+  lp.opacity = sl->value();
+  d->m_map->layerFactory().setLayerParameter(layername, lp);
+
+}
+
+void LayerControlWidget::brightness(int)
+{
+  mySlider *sl = qobject_cast<mySlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(layername);
+  lp.brightness = sl->value();
+  d->m_map->layerFactory().setLayerParameter(layername, lp);
+}
+
+void LayerControlWidget::contrast(int)
+{
+  mySlider *sl = qobject_cast<mySlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(layername);
+  lp.contrast = sl->value();
+  d->m_map->layerFactory().setLayerParameter(layername, lp);
+}
+
+void LayerControlWidget::gamma(int)
+{
+  mySlider *sl = qobject_cast<mySlider *>(sender());
+  if (!sl)
+    return;
+
+  QString layername = sl->m_layername;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(layername);
+  lp.gamma = sl->value();
+  d->m_map->layerFactory().setLayerParameter(layername, lp);
+}
+
+void LayerControlWidget::onLayerParamterChanged(const QString &layername, const LayerParameter &newLayerParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START"
+                      << " layername= '" << layername << "'";
+
+//  INFO_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+//                     << " layername=" << layername
+//                     << " lp=" << newLayerParameter;
+
+  if (! d->m_sliderMap.contains(layername))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'"
+                        << " layername='" << layername << "' is new -> updatePanel";
+    updatePanelLayer();
+    return;
+  }
+
+  // refresh GUI:
+  if (d->m_sliderMap.contains(layername))
+  {
+    SliderStruct &data = d->m_sliderMap[layername];
+
+    if (data.cbOnOff)       data.cbOnOff      ->setChecked(newLayerParameter.visible);
+    if (data.sl_opacity)    data.sl_opacity   ->setValue(newLayerParameter.opacity);
+    if (data.sl_brightness) data.sl_brightness->setValue(newLayerParameter.brightness);
+    if (data.sl_contrast)   data.sl_contrast  ->setValue(newLayerParameter.contrast);
+    if (data.sl_gamma)      data.sl_gamma     ->setValue(newLayerParameter.gamma);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+QString LayerControlWidget::layernameAt(const QPoint &pos) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+  QWidget *child = childAt(pos);
+  if (!child)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " no child";
+    return QString();
+  }
+
+  DragableCheckBox *cb = dynamic_cast<DragableCheckBox *>(child);
+  if (!cb)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " dynacast failed";
+    return QString();
+  }
+
+  const QString &childLayername = cb->property(LayernameProperty).toString();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " childLayername=" << childLayername;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return childLayername;
+}
+
+QStringList LayerControlWidget::newLayerOrder(const QString &draggedLayername, const QString &childLayername)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  // get current order:
+  QStringList sl = d->m_map->layerFactory().layernames();
+
+  if (draggedLayername == childLayername)
+    return sl;
+
+  // remove
+  sl.removeOne(draggedLayername);
+
+  // find new position:
+  int idx = sl.indexOf(childLayername);
+
+  // insert AFTER;
+  sl.insert(++idx, draggedLayername);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+  return sl;
+}
+
+
+
+
+
+
+void LayerControlWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (event->mimeData()->hasFormat(MIMETYPE))
+  {
+    if (event->source() == this)
+    {
+      event->setDropAction(Qt::MoveAction);
+      event->accept();
+    }
+    else
+    {
+
+      QByteArray itemData = event->mimeData()->data(MIMETYPE);
+      QDataStream dataStream(&itemData, QIODevice::ReadOnly);
+
+      QString draggedLayername;
+      dataStream >> draggedLayername;
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " draggedLayername=" << draggedLayername;
+
+      const QString &childLayername = layernameAt(event->pos());
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " childLayername=" << childLayername;
+
+      if (childLayername.isEmpty() ||
+          (draggedLayername == childLayername))
+        event->ignore();
+      else
+
+      {
+        const QStringList &newOrder = newLayerOrder(draggedLayername, childLayername);
+
+        bool ok = d->m_map->layerFactory().checkLayerOrder(newOrder);
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " layerOrder ok: " << ok;
+
+        if (ok)
+          event->acceptProposedAction();
+        else
+          event->ignore();
+      }
+
+    }
+  }
+  else
+    event->ignore();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+
+void LayerControlWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (event->mimeData()->hasFormat(MIMETYPE))
+  {
+
+    event->acceptProposedAction();
+
+//    if (event->source() != this) {
+////      event->setDropAction(Qt::MoveAction);
+//      event->accept();
+//    } else {
+//      event->acceptProposedAction();
+//    }
+  }
+  else
+    event->ignore();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+void LayerControlWidget::dropEvent(QDropEvent *event)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " START";
+
+  if (event->mimeData()->hasFormat(MIMETYPE))
+  {
+    QByteArray itemData = event->mimeData()->data(MIMETYPE);
+    QDataStream dataStream(&itemData, QIODevice::ReadOnly);
+
+    QString draggedLayername;
+    dataStream >> draggedLayername;
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " draggedLayername=" << draggedLayername;
+
+
+    if (event->source() == this)
+    {
+      event->setDropAction(Qt::MoveAction);
+      event->accept();
+    }
+    else
+    {
+      event->acceptProposedAction();
+
+      const QString &childLayername = layernameAt(event->pos());
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " childLayername=" << childLayername;
+
+      if (draggedLayername == childLayername)
+        return;
+
+      const QStringList &newOrder = newLayerOrder(draggedLayername, childLayername);
+
+      bool ok = d->m_map->layerFactory().orderLayerTo(newOrder);
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " layerOrder ok: " << ok;
+    }
+  }
+  else
+    event->ignore();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << d->m_debugInfo << "'" << " END";
+}
+
+
+
+} // namespace SituationMap
+
+#include "layer_control_widget.moc"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.h
new file mode 100755
index 000000000..e7974d96d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_control_widget.h
@@ -0,0 +1,125 @@
+/**
+  * @RDE_HEADER@
+  * Interface
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "situation_map_export.h"
+#include <Common/situation_map_logging.h>
+
+
+// Qt
+#include <QSlider>
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//Forward:
+class Map;
+class LayerParameter;
+
+
+class mySlider : public QSlider
+{
+  Q_OBJECT
+
+public:
+  mySlider(const QString &layername, int min, int max)
+    : QSlider(), m_layername(layername)
+  {
+    this->setOrientation(Qt::Horizontal);
+    setMinimum(min);
+    setMaximum(max);
+  }
+
+public:
+  QString m_layername;
+};
+
+
+
+class SITUATIONMAP_EXPORT LayerControlWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit LayerControlWidget(QWidget *parent,
+                              Map *map,
+                              bool enableLayer,
+                              bool enableBasemap,
+                              const QString &debugInfo);
+  ~LayerControlWidget();
+
+  bool updatePanel();
+private:
+  bool updatePanelZoomRotationScales();
+  bool updatePanelLayer();
+  bool updatePanelBasemap();
+  QString generateToolTip(const QString &layername, const LayerParameter &lp);
+  QSlider *generateZoomSlider();
+  QSlider *generateRotationSlider();
+  QSlider *generateSymbolSizeSlider();
+
+private slots:
+
+protected:
+  void dragMoveEvent(QDragMoveEvent *event) override;
+  void dragEnterEvent(QDragEnterEvent *event) override;
+  void dropEvent(QDropEvent *event) override;
+
+
+private slots:
+  void expandCollapse(bool expanded);
+  void layerOnOff();
+  void opacity(int);
+  void brightness(int);
+  void contrast(int);
+  void gamma(int);
+
+  void onLayerParamterChanged(const QString &layername,
+                              const LayerParameter &newLayerParameter);
+
+  void onZoomSliderInit(QSlider *slider);
+  void onZoomSliderValueChanged();
+
+  void onRotationSliderValueChanged();
+  void onRotationOfMapChanged(double rotation);
+
+  void onSymbolSizeSliderValueChanged();
+  void onSymbolSizeSliderValueChangedTimeout();
+  void onSymbolSizeOfMapChanged(double symbolSize);
+
+  void onBaseMapSelection();
+
+
+  // slots for external signals:
+  void onMapReady();
+  void onMapExtentChanged();
+
+private:
+  QString layernameAt(const QPoint &pos) const;
+  QStringList newLayerOrder(const QString &draggedLayername,
+                            const QString &childLayername);
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+};
+
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.cpp
new file mode 100755
index 000000000..a05c16c75
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.cpp
@@ -0,0 +1,3047 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LayerFactory
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "layer_factory_impl.h"
+#include "map_impl.h"
+#include "abstract_map_object_impl.h"
+#include <Map/situation_map_utils.h>
+#include "logical_layer.h"
+#include "location_to_elevation_helper.h"
+//#include "tms_layer.h"
+#include <Common/resource_path.h>   // for getResourcePath
+#include <SymbologyImpl/symbol_dictionary_impl.h>
+
+#include <ElevationMap/elevation_map_manager.h>
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <Map.h>
+#include <Layer.h>
+#include <TileCache.h>
+#include <ArcGISTiledLayer.h>
+#include <Raster.h>
+#include <RasterLayer.h>
+#include <Scene.h>
+#include <ArcGISSceneLayer.h>
+#include <RasterElevationSource.h>
+#include <ArcGISTiledElevationSource.h>
+#include <GraphicsOverlay.h>
+#include <MapGraphicsView.h>
+#include <SimpleFillSymbol.h>
+#include <SimpleMarkerSymbol.h>
+#include <PictureMarkerSymbol.h>
+#include <SimpleMarkerSceneSymbol.h>
+#include <UniqueValueRenderer.h>
+
+#include <ArcGISVectorTiledLayer.h>
+#include <ArcGISMapImageLayer.h>
+
+
+// Qt
+#include <QDir>
+#include <QEventLoop>
+#include <QFileInfo>
+#include <QNetworkProxy>
+#include <QVector>
+#include <QCoreApplication>
+
+#include <iostream>
+#include <Basemap.h>
+#include <ElevationSourceListModel.h>
+#include <Envelope.h>
+#include <LayerSceneProperties.h>
+#include <RendererSceneProperties.h>
+#include <UniqueValue.h>
+#include <VectorTileCache.h>
+#include <SymbolTypes.h>
+
+// FORCE_CREATION_GRAPHICSOVERLAY :
+// N.Thoden, 10.02.2017
+// Esri Case #01887547 - [BOS] Dictionary Symbol crasches
+// deals with order of creation of GraphicalOverlay and adding them to MapView.
+// Although the reordering of the GraphicalOverlay is not included in the case,
+// it seems to be relevant in this application.
+// To find a quick solution, GraphicalOverlays are created as soon as possible
+// (EsriDict must be loaded).
+//
+static bool s_forceCreationOfGraphicsOverlay = true;
+// : FORCE_CREATION_GRAPHICSOVERLAY
+
+
+namespace SituationMap
+{
+
+static const QLatin1String LayerNameJumpPoints("JumpPoints");
+static const QLatin1String LayerNameRubberband("RubberbandLayer");
+static const QLatin1String LayerNameTools("Tools");
+static const QLatin1String LayerNameSnapshotOverlay("SnaphotOverlay");
+static const QLatin1String LayerNameEmergencyCall("EmergencyCall");
+
+// #define USE_ARCGIS_SCENE_LAYER_CACHE
+#ifdef USE_ARCGIS_SCENE_LAYER_CACHE
+
+class ArcGISSceneLayerCache;
+static ArcGISSceneLayerCache *s_arcGisSceneLayerCache = nullptr;
+
+/*!
+ * \brief The ArcGISSceneLayerCache class reduces the number of loading processes
+ * We are caching here to avoid numerous loading and unloading.
+ * At least at linux the ArcGISSceneLayerCache tends to alloc a hugh amount of data.
+ * Additionally allocation is influenced by the viewpoint choosen by the operator.
+ * And with other allocations (dds data, GBViewer of similar) at the same time
+ * the heap memory gets fragemented.
+ * So we try to reduce the number of loading processes.
+ */
+class ArcGISSceneLayerCache
+{
+public:
+  static ArcGISSceneLayerCache *getInstance()
+  {
+    if (!s_arcGisSceneLayerCache)
+    {
+      s_arcGisSceneLayerCache = new ArcGISSceneLayerCache;
+      qAddPostRoutine(&ArcGISSceneLayerCache::cleanup);
+    }
+    return s_arcGisSceneLayerCache;
+  }
+
+  struct Item
+  {
+    QPointer<Esri::ArcGISRuntime::ArcGISSceneLayer> m_sceneLayer;
+    QPointer<Esri::ArcGISRuntime::Scene>            m_hostingScene;
+  };
+
+  Item& getFreeItemRef(const QString &itemName)
+  {
+    //Qt: If the map contains no item with key key, the function inserts a default-constructed value into the map with key key, and returns a reference to it.
+    QVector<Item> &vec = m_arcGISSceneLayerCache[itemName];
+
+    // search free item:
+    QMutableVectorIterator<Item> it(vec);
+    while (it.hasNext())
+    {
+      Item& itemRef = it.next();
+      if (itemRef.m_hostingScene.isNull())
+        return itemRef;
+    }
+
+    // Not found -> create:
+    vec.append(Item());
+    return vec.last();
+  }
+
+  static void cleanup()
+  {
+    delete s_arcGisSceneLayerCache;
+  }
+
+  ~ArcGISSceneLayerCache()
+  {
+    for (auto vec : m_arcGISSceneLayerCache)
+    {
+      for (auto item : vec)
+      {
+        std::cerr << " m_arcGISSceneLayerCache: delete " << item.m_sceneLayer << std::endl;
+        delete item.m_sceneLayer; // delete nullptr is ok
+      }
+    }
+  }
+
+  void dump()
+  {
+    std::cerr << " ArcGISSceneLayer CacheSize = " << m_arcGISSceneLayerCache.size() << std::endl;
+
+    for (auto vec : m_arcGISSceneLayerCache)
+    {
+      std::cerr << " ArcGISSceneLayer VectorSize: " << vec.size() << std::endl;
+      for (auto item : vec)
+      {
+        std::cerr << " ArcGISSceneLayer ITEM = "
+                  <<  " m_hostingScene=" << item.m_hostingScene
+                  <<  " m_sceneLayer=" << item.m_sceneLayer
+                  << std::endl;
+      } // for
+    } // for
+  }
+
+private:
+  //   slpk-name, ....
+  QMap<QString, QVector<Item>> m_arcGISSceneLayerCache;
+}; // class ArcGISSceneLayerCache
+
+#endif //  USE_ARCGIS_SCENE_LAYER_CACHE
+
+
+class LayerFactoryImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+
+  // ESRI data:
+  Esri::ArcGISRuntime::Basemap                 *m_basemap = nullptr;
+
+  Esri::ArcGISRuntime::GraphicsOverlayListModel *getEsriGraphicsOverlayListModel()
+  {
+    if (m_mapImpl && m_mapImpl->getEsriGeoView())
+      return m_mapImpl->getEsriGeoView()->graphicsOverlays();
+    else
+      return nullptr;
+  }
+
+
+  Esri::ArcGISRuntime::GraphicsOverlay         *m_functionDialogGraphicsLayer     = nullptr;
+
+
+  // Own data:
+  SituationMap::MapImpl                        *m_mapImpl = nullptr;
+  QStringList                                   m_mapServiceUrlList;
+  QVector<QUrl>                                 m_sceneObjectUrlCont;
+  Esri::ArcGISRuntime::Surface                 *m_baseSurface = nullptr;
+  bool                                          m_isSceneObjectLayerVisible = true;
+
+  QTimer                                        *reCalculateMinMaxScaleTimer = nullptr;
+
+  MapLayerOrderedList                           m_orderedMapLayer;  // store order of basemap and logical Layernames
+
+  bool hasLogicalLayer(const QString &logicalName)
+  {
+    return m_logicalLayerCont.contains(logicalName);
+  }
+
+  // create and initalize LogicalLayer:
+  void createLogicalLayer(const QString &logicalName)
+  {
+    // LayerListModel
+    Esri::ArcGISRuntime::LayerListModel *layerListModel = nullptr;
+    if (m_basemap)
+      layerListModel = m_basemap->baseLayers();
+
+    // GraphicsOverlayListModel
+    Esri::ArcGISRuntime::GraphicsOverlayListModel *graphicsOverlayListModel = this->getEsriGraphicsOverlayListModel();
+
+#ifdef LTS_DEBUG
+    if (!graphicsOverlayListModel)
+      qCritical() << " graphicsOverlayListModel"
+                  << " logicalName='" << logicalName << "'"
+                  << " m_mapImpl=" << m_mapImpl
+                  << " m_mapImpl->getEsriGeoView()=" << m_mapImpl->getEsriGeoView()
+                  << " m_mapImpl->isReady=" << m_mapImpl->isReady()
+                  << " graphicsOverlayListModel=" << graphicsOverlayListModel;
+    Q_ASSERT(graphicsOverlayListModel);
+#endif // LTS_DEBUG
+
+    QSharedPointer<LogicalLayer> ll = QSharedPointer<LogicalLayer>(new LogicalLayer(logicalName));
+    ll->init(m_mapImpl, layerListModel, graphicsOverlayListModel);
+    m_logicalLayerCont[logicalName] = ll;
+  }
+
+  QSharedPointer<LogicalLayer> getLogicalLayer(const QString &logicalName) const
+  {
+    if (m_logicalLayerCont.contains(logicalName))
+      return m_logicalLayerCont[logicalName];
+    return QSharedPointer<LogicalLayer>();
+  }
+  void removeLogicalLayer(const QString &logicalName)
+  {
+    m_logicalLayerCont.remove(logicalName);
+  }
+
+  QMap<QString, QSharedPointer<LogicalLayer>>   m_logicalLayerCont; // store logical layer without order
+
+  QString                                       m_basemapLayernamePrefix = QLatin1String("ArcGISTiledLayer_URL_");
+
+  QString                                       m_participantLayername              = QLatin1String("Participants");
+  RenderingMode                                 m_participantLayerRenderingMode     = RenderingMode::Dynamic;
+  SurfacePlacement                              m_participantLayerSurfacePlacement  = SurfacePlacement::Relative;
+
+
+  QString                                       m_logicalLayerNameForCubes;
+
+#if ACRGIS_VERSION < 0x640500 // 100.5.0 / Update 5
+  QColor                                        m_selectionColor = Qt::magenta;
+#endif // ACRGIS_VERSION
+
+
+}; // class LayerFactoryImpl::Private
+//-----------------------------------------------------------------------------
+
+//
+// class LayerFactoryImpl;
+//
+LayerFactoryImpl::LayerFactoryImpl(QObject *parent, SituationMap::MapImpl *mapImpl)
+  : LayerFactory()
+  , BaseClass(parent)
+  , m_logger(getLogger("LayerFactoryImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_mapImpl = mapImpl;
+  if (d->m_mapImpl)
+    d->m_basemap = d->m_mapImpl->getEsriBasemap();
+
+  d->reCalculateMinMaxScaleTimer = new QTimer(this);
+  d->reCalculateMinMaxScaleTimer->setInterval(500);
+  d->reCalculateMinMaxScaleTimer->setSingleShot(true);
+  connect(d->reCalculateMinMaxScaleTimer, &QTimer::timeout,
+          this, &LayerFactoryImpl::reCalculateMinMaxScaleBasedOnLayers);
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " Resource Path = '" << SituationMap::getResourcePath() << "'";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+LayerFactoryImpl::~LayerFactoryImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LayerFactoryImpl::initializeBasemapBuiltIn(const QString &tpkFile)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " tpkFile='" << tpkFile << "'";
+
+  QString tiledBaseMapLayer;
+  if (tpkFile.isEmpty())
+    tiledBaseMapLayer = SituationMap::getResourcePath() + QLatin1String("Topographic.tpk");
+  else
+  {
+    QFileInfo fi(tpkFile);
+    if (fi.isAbsolute())
+      tiledBaseMapLayer = tpkFile;
+    else
+    {
+      tiledBaseMapLayer = SituationMap::getResourcePath() + tpkFile;
+      if (fi.suffix().isEmpty())
+        tiledBaseMapLayer += QLatin1String(".tpk");
+    }
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " tiledBaseMapLayer='" << tiledBaseMapLayer << "'";
+
+  //-----------------------------------
+  // Local Tiled Basemap Layer using: sdk/samples/data/tpks/Topographic.tpk
+  //-----------------------------------
+  Esri::ArcGISRuntime::TileCache *tpkCache          = new Esri::ArcGISRuntime::TileCache(tiledBaseMapLayer, this);
+  tpkCache->setObjectName(QLatin1String("TPK-tpkCache"));
+
+  Esri::ArcGISRuntime::ArcGISTiledLayer *tiledLayer = new Esri::ArcGISRuntime::ArcGISTiledLayer(tpkCache, this);
+  tiledLayer->setName(QLatin1String("TPK-tiledLayer"));
+
+
+  // loadStatusChanged ->
+  connect(tpkCache, &Esri::ArcGISRuntime::TileCache::loadStatusChanged, this, [this](Esri::ArcGISRuntime::LoadStatus loadStatus)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " TileCache: " << "loadStatus changed to: " << loadStatus;
+  });
+  connect(tiledLayer, &Esri::ArcGISRuntime::ArcGISTiledLayer::loadStatusChanged, this, [this](Esri::ArcGISRuntime::LoadStatus loadStatus)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " ArcGISTiledLayer: " << "loadStatus changed to: " << loadStatus;
+  });
+
+
+  QString logicalLayerName = QStringLiteral("%1%2").arg(d->m_basemapLayernamePrefix).arg(0);
+  tiledLayer->setName(logicalLayerName);
+  tiledLayer->setObjectName(tiledLayer->name());
+
+  QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, LayerType::Basemap);
+  if (logicalLayer.isNull())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " getLogicalLayer invalid'" << logicalLayerName << "'";
+  else
+  {
+    // update LayerParameter first:
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.url         = QUrl(tiledBaseMapLayer);
+    lp.displayName = logicalLayerName;
+    logicalLayer->setLayerParameter(lp);
+
+    logicalLayer->setLayer(tiledLayer);
+    logicalLayer->setLayerType(LayerType::Basemap);
+    logicalLayer->setBasemapType(BasemapType::Topographic);  // basemapType -> aerial, topo...
+  }
+
+
+  int basemapCount = -1;
+  if (d->m_basemap->baseLayers())
+    basemapCount = d->m_basemap->baseLayers()->size();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " basemapCount = " << basemapCount;
+
+  d->m_basemap->baseLayers()->append(tiledLayer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool LayerFactoryImpl::isUsingBaseMapBuiltIn() const
+{
+  return d->m_mapServiceUrlList.isEmpty();
+}
+
+bool LayerFactoryImpl::addOperationalLayer(const QString &logicalLayerName,
+                                           const QString &displayName,
+                                           RenderingMode renderMode,
+                                           SurfacePlacement surfacePlacement)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " displayName='" << displayName << "'"
+                      << " renderMode=" << renderMode
+                      << " surfacePlacement=" << surfacePlacement;
+
+  if (s_forceCreationOfGraphicsOverlay && !logicalLayerName.startsWith(QLatin1String("Participant"), Qt::CaseInsensitive))
+  {
+    // First, wait until esriDict is load, second force creation of esriLayer:
+
+    // wait until esriDict is load:
+    AdvancedSymbology::SymbolDictionary     &dict     = d->m_mapImpl->symbolDictionary();
+    AdvancedSymbology::SymbolDictionaryImpl &dictImpl = static_cast<AdvancedSymbology::SymbolDictionaryImpl &>(dict);
+
+    // keep SymbologyType::None in mind:
+    Esri::ArcGISRuntime::DictionarySymbolStyle *esriDict = const_cast<Esri::ArcGISRuntime::DictionarySymbolStyle *>(dictImpl.getEsriSymbolDictionary());
+
+    if (esriDict)
+    {
+      if (esriDict->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+      {
+        QEventLoop loop;
+        connect(esriDict, &Esri::ArcGISRuntime::DictionarySymbolStyle::doneLoading,
+                &loop, &QEventLoop::quit);
+        QTimer::singleShot(2000, &loop, &QEventLoop::quit);
+        loop.exec();
+      }
+
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " FORCE_CREATION_GRAPHICSOVERLAY: "
+                          << " esriDict: loadStatus=" << esriDict->loadStatus();
+    }
+  } // if (s_forceCreationOfGraphicsOverlay)
+
+  const LayerType layerType = LayerType::Operational;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return false;
+    }
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.displayName = displayName;
+    logicalLayer->setLayerParameter(lp);
+    logicalLayer->setRenderingMode(renderMode);
+    logicalLayer->setSurfacePlacement(surfacePlacement);
+  }
+
+
+  //
+  // the real Esri-Layers will be create later on demand :-)
+  //
+
+  //#ifdef FORCE_CREATION_GRAPHICSOVERLAY
+  if (s_forceCreationOfGraphicsOverlay && !logicalLayerName.startsWith(QLatin1String("Participant"), Qt::CaseInsensitive))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalLayerName);
+    if (logicalLayer)
+    {
+      logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer);
+      if (d->m_mapImpl->symbologyType() != AdvancedSymbology::SymbologyType::None)
+        logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer_Dict);
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " FORCE_CREATION_GRAPHICSOVERLAY";
+    }
+  } // if (s_forceCreationOfGraphicsOverlay)
+  //#endif // FORCE_CREATION_GRAPHICSOVERLAY
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " success=" << true;
+  return true;
+}
+
+
+bool LayerFactoryImpl::removeOperationalLayer(const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalLayerName='" << logicalLayerName << "'";
+
+  if (logicalLayerName.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName empty"
+                        << logicalLayerName;
+    return false;
+  }
+
+  const LayerType layerType = LayerType::Operational;
+
+  if (! d->m_orderedMapLayer.contains(logicalLayerName, layerType))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName does not exist: '"
+                        << logicalLayerName << "'";
+    return false;
+  }
+
+  if (removeLayerInternal(layerType, logicalLayerName))
+    d->m_mapImpl->emitLayerOrderChanged();
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalLayerName='" << logicalLayerName << "'";
+  return true;
+}
+
+bool LayerFactoryImpl::hasOperationalLayer(const QString &logicalLayerName) const
+{
+  if (logicalLayerName.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName empty"
+                        << logicalLayerName;
+    return false;
+  }
+  return layerExistsInMngt(logicalLayerName, LayerType::Operational);
+}
+
+
+bool LayerFactoryImpl::addOverlayLayer(const QString &logicalLayerName, const QString &displayName, bool isSnaphot)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " displayName='" << displayName << "'"
+                      << " isSnaphot='" << isSnaphot;
+
+  const LayerType layerType = (isSnaphot) ? LayerType::SnapshotOverlay : LayerType::Overlay;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return false;
+    }
+    // logicalLayer->setRenderingMode(RenderingMode::Dynamic);
+  }
+
+  // update displayName:
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalLayerName);
+  if (logicalLayer.isNull())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " getLogicalLayer failed: '"
+                          << logicalLayerName << "'";
+  } else {
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.displayName = displayName;
+    logicalLayer->setLayerParameter(lp);
+  }
+
+
+  //
+  // the real Esri-Layers will be create later on demand :-)
+  //
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+QString LayerFactoryImpl::technicalNameOfOverlayLayer(const QString &logicalLayerName)
+{
+  // By default, our overlays are displayed on just one GraphicsLayer:
+  return createInternalLayerName(TechnicalLayerType::GraphicsLayer, logicalLayerName);
+}
+
+
+QSharedPointer<LogicalLayer> LayerFactoryImpl::addLayerToMgnt(const QString &logicalLayerName, const LayerType &layerType)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layerType=" << layerType
+                      << " logicalLayerName='" << logicalLayerName << "'";
+
+  QSharedPointer<LogicalLayer> logicalLayer;
+
+  if (logicalLayerName.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName empty"
+                        << logicalLayerName;
+    return logicalLayer;
+  }
+  if (d->m_orderedMapLayer.contains(logicalLayerName, LayerType::Undefined))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName already exists: '"
+                        << logicalLayerName << "'";
+    return logicalLayer;
+  }
+
+  // 1. add to orderedList:
+
+  if (! d->m_orderedMapLayer.addLayer(logicalLayerName, layerType))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                        << logicalLayerName << "'"
+                        << " layerType=" << layerType;
+    return logicalLayer;
+  }
+
+  // getLogicalLayer will
+  // - initialize
+  // - do errorHandling
+  // - update LayerParameter on doneLoading
+  // - and add layer to LayerlistModel of basemap:
+  logicalLayer = this->getCreateLogicalLayer(logicalLayerName);
+  if (logicalLayer.isNull())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " getLogicalLayer invalid'" << logicalLayerName << "'";
+    return logicalLayer;
+  }
+  logicalLayer->setLayerType(layerType);
+
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " handleEmergencySpecials ...";
+  handleEmergencyCallSpecials();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " handleEmergencySpecials ...DONE";
+
+  // trigger gui update:
+  d->m_mapImpl->emitLayerOrderChanged();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " layerType=" << layerType
+                      << " logicalLayerName='" << logicalLayerName << "'";
+  return logicalLayer;
+}
+
+bool LayerFactoryImpl::layerExistsInMngt(const QString &logicalLayerName, const LayerType &layerType) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layerType=" << layerType
+                      << " logicalLayerName='" << logicalLayerName << "'";
+
+  bool exists = d->m_orderedMapLayer.contains(logicalLayerName, layerType);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " layerType=" << layerType
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " exists=" << exists;
+  return exists;
+}
+
+bool LayerFactoryImpl::removeOverlayLayer(const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername='" << logicalLayerName << "'";
+
+  if (logicalLayerName.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName empty"
+                        << logicalLayerName;
+    return false;
+  }
+  const MapLayer &mapLayer = d->m_orderedMapLayer.getLayer(logicalLayerName);
+  if (!mapLayer.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName does not exist: '"
+                        << logicalLayerName << "'";
+    return false;
+  }
+
+  const LayerType type = mapLayer.type();
+  const bool isOverlayLayer = (type == LayerType::Overlay) || (type == LayerType::SnapshotOverlay);
+  if (!isOverlayLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName has wrong type: '"
+                        << logicalLayerName << "'"
+                        << " type = " << type;
+    return false;
+  }
+
+  if (removeLayerInternal(type, logicalLayerName))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " remove..."
+                        << " layername='" << logicalLayerName << "'";
+    d->m_mapImpl->emitLayerOrderChanged();
+  }
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalLayerName='" << logicalLayerName << "'";
+  return true;
+}
+
+QString LayerFactoryImpl::snapshotOverlayLayername() const
+{
+  return LayerNameSnapshotOverlay;
+}
+
+QString LayerFactoryImpl::layernameForCubes() const
+{
+  return d->m_logicalLayerNameForCubes;
+}
+
+void LayerFactoryImpl::setLayernameForCubes(const QString &logicalName)
+{
+  d->m_logicalLayerNameForCubes = logicalName;
+}
+
+bool LayerFactoryImpl::hasLayernameForCubes() const
+{
+  return !d->m_logicalLayerNameForCubes.isEmpty();
+}
+
+
+bool LayerFactoryImpl::assignUniqueValueRendererForCubes()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalLayerNameForCubes='" << d->m_logicalLayerNameForCubes << "'";
+
+  if (d->m_mapImpl->mode() != Mode::Mode_3D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not in 3Dmode";
+    return false;
+  }
+
+  if (d->m_logicalLayerNameForCubes.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_logicalLayerNameForCubes configured";
+    return false;
+  }
+
+
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay = this->getGraphicsLayer(d->m_logicalLayerNameForCubes);
+  if (!graphicsOverlay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " graphicsOverlay not found, d->m_logicalLayerNameForCubes='" << d->m_logicalLayerNameForCubes << "'";
+    return false;
+  }
+
+
+  const PartyIdToColorFunctor::ColorMap &colorMap = d->m_mapImpl->partyIdToColorFunctor().colorMap();
+  if (colorMap.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " colorMap is empty";
+    return false;
+  }
+
+
+
+  // prepare UniqueValues
+  Esri::ArcGISRuntime::SimpleFillSymbol *sls;
+  QList<Esri::ArcGISRuntime::UniqueValue *> uvList;
+
+  QObject *parent = graphicsOverlay;
+
+  for (const PartyIdToColorFunctor::PartyData &partyData : colorMap)
+  {
+    const QString &partyName = partyData.m_name;
+    const QColor &partyColor = partyData.m_color;
+
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " partyName=" << partyName << "'"
+                       << " partyColor=" << partyColor.name() << "'";
+
+    sls = new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, partyColor, parent);
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(partyName, // more or less relevant
+                                             QStringLiteral("Party '%1'").arg(partyName),
+                                             QVariantList() << partyColor.name(),  // (was in former times: partyName)
+                                             sls, parent);
+    uvList.append(uv);
+  } // for
+
+  //qt build in
+ // static QVector<QColor> addColors = {Qt::darkGray, Qt::gray, Qt::lightGray,
+  //                                    Qt::red, Qt::green, Qt::blue,
+  //                                    Qt::cyan, Qt::magenta, Qt::yellow,
+  //                                    Qt::darkRed, Qt::darkGreen, Qt::darkBlue,
+  //                                    Qt::darkCyan, Qt::darkMagenta, Qt::darkYellow, Qt::white};
+  static QVector<QColor> addColors = {
+    Qt::yellow
+  };
+  uvList.reserve(uvList.size() + addColors.size());
+
+  for (const QColor &addColor : qAsConst(addColors))
+  {
+    sls = new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, addColor.name(), parent);
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(addColor.name(), // more or less relevant
+                                             QStringLiteral("Party '%1'").arg(addColor.name()),
+                                             QVariantList() << addColor.name(),  // (was in former times: partyName)
+                                             sls, parent);
+    uvList.append(uv);
+  } //for
+
+  // setup UniqueValueRenderer:
+
+  // setup default:
+  sls = new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, Qt::white, this);
+
+
+  Esri::ArcGISRuntime::UniqueValueRenderer *uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QStringLiteral("UnknownParty"),
+                                                   sls,                             // default
+                                                   QStringList() << QStringLiteral("Extrusion_Color"), // fieldNames (was in former times: "PartyName")
+                                                   uvList, parent);
+  static long s_counter = 0;
+  uniqueRenderer->setObjectName(QStringLiteral("UniqueValueRenderer_ForCubes_%1").arg(s_counter++));
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- assignUniqueValueRendererForCubes occured: ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+  });
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::destroyed, this, [this, uniqueRenderer] () {
+    INFO_LOG(m_logger) << " UniqueValueRenderer is destroyed , objectName='" <<  uniqueRenderer->objectName() << "'";
+  });
+
+
+  // set sceneProperties:
+  Esri::ArcGISRuntime::RendererSceneProperties props = uniqueRenderer->sceneProperties();
+  props.setExtrusionMode(Esri::ArcGISRuntime::ExtrusionMode::AbsoluteHeight); // see BuildingOwnership::retrieveBuildingAbsHeight
+  props.setExtrusionExpression(QStringLiteral("[height]"));                  // <-- keyword
+  uniqueRenderer->setSceneProperties(props);
+
+
+  // take care that the old one is deleted:
+  Esri::ArcGISRuntime::Renderer *oldRenderer = graphicsOverlay->renderer();
+  delete oldRenderer; // delete nullptr is safe!
+
+  // assign new:
+  graphicsOverlay->setRenderer(uniqueRenderer);
+
+  return true;
+}
+
+bool LayerFactoryImpl::assignUniqueValueRenderer(const QString &layername,
+                                                 const QString &fieldName,
+                                                 const QVector<UniqueValueData> &uvDataCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, layername='" <<  layername << "'"
+                      << ", fieldName='" <<  fieldName << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+
+  // ensure existence:
+  getCreateLogicalLayer(layername);
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay = this->getGraphicsLayer(layername);
+  if (!graphicsOverlay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " graphicsOverlay not found, layername='" << layername << "'";
+    return false;
+  }
+
+
+  // prepare UniqueValues
+  Esri::ArcGISRuntime::PictureMarkerSymbol *pms;
+  QList<Esri::ArcGISRuntime::UniqueValue *> uvList;
+  QObject *parent = graphicsOverlay;
+
+  for (const UniqueValueData &uvData : qAsConst(uvDataCont))
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " uvData.value=" << uvData.value << "'";
+
+    pms = new Esri::ArcGISRuntime::PictureMarkerSymbol(uvData.img, parent);
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(uvData.value,
+                                             QStringLiteral("GenericUniqueValue '%1'").arg(uvData.value),
+                                             QVariantList() << uvData.value, pms, parent);
+    uvList.append(uv);
+  } // for
+
+  // setup default:
+  Esri::ArcGISRuntime::SimpleMarkerSymbol *sms;
+  sms = new Esri::ArcGISRuntime::SimpleMarkerSymbol(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::X, Qt::white, 5, parent);
+
+  // Finally, setup Renderer:
+  Esri::ArcGISRuntime::UniqueValueRenderer* uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QStringLiteral("GenericUniqueValueRenderer"),
+                                                   sms,  // default
+                                                   QStringList() << fieldName,
+                                                   uvList, parent);
+  static long s_counter = 0;
+  uniqueRenderer->setObjectName(QStringLiteral("UniqueValueRenderer_assignUniqueValueRenderer_%1").arg(s_counter++));
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- assignUniqueValueRenderer occured: ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+  });
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::destroyed, this, [this, uniqueRenderer] () {
+    INFO_LOG(m_logger) << " UniqueValueRenderer is destroyed , objectName='" <<  uniqueRenderer->objectName() << "'";
+  });
+
+  // take care that the old one is deleted:
+  Esri::ArcGISRuntime::Renderer *oldRenderer = graphicsOverlay->renderer();
+  delete oldRenderer; // delete nullptr is safe!
+
+  // assign new:
+  graphicsOverlay->setRenderer(uniqueRenderer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, layername='" <<  layername << "'"
+                      << ", fieldName='" <<  fieldName << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+  return true;
+}
+
+bool LayerFactoryImpl::assignUniqueValueRendererAesCentral(const QString &layername,
+                                                           const QStringList &fieldNames,
+                                                           const QVector<UniqueValueDataAesCentral> &uvDataCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, layername='" <<  layername << "'"
+                      << ", fieldNames='" <<  fieldNames.join(QStringLiteral(";")) << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+
+  // ensure existence:
+  getCreateLogicalLayer(layername);
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay = this->getGraphicsLayer(layername);
+  if (!graphicsOverlay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " graphicsOverlay not found, layername='" << layername << "'";
+    return false;
+  }
+
+  // prepare UniqueValues
+  QList<Esri::ArcGISRuntime::UniqueValue *> uvList;
+  QObject *parent = graphicsOverlay;
+  for (const UniqueValueDataAesCentral &uvData : qAsConst(uvDataCont))
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+//                       << " uvData.value=" << uvData.values << "'"
+                       << ", type " << toString(uvData.type)
+                       << ", col " << uvData.col
+                       << ", col.name " << uvData.col.name()
+                       << ", uvData.radius " << uvData.radius;
+    Esri::ArcGISRuntime::SimpleMarkerSceneSymbol *symbol = nullptr;
+
+    switch (uvData.type) {
+    case UniqueValueDataAesCentral::TYPE::CONE:
+      symbol = Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::cone(uvData.col,
+                                                                  // extent should be similar to sphere
+                                                                  uvData.radius, // V100.8: cone: diameter is interpreted as radius
+                                                                  uvData.height,
+                                                                  parent);
+      symbol->setAnchorPosition(Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Top);
+      break;
+    case UniqueValueDataAesCentral::TYPE::SPHERE:
+      symbol = Esri::ArcGISRuntime::SimpleMarkerSceneSymbol::sphere(uvData.col,
+                                                                    uvData.radius*2.0, // diameter
+                                                                    parent);
+      symbol->setAnchorPosition(Esri::ArcGISRuntime::SceneSymbolAnchorPosition::Center);
+    default:
+      break;
+    }
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(QStringLiteral("uvData.value"),
+                                             QStringLiteral("AesCentralUniqueValue '%%%1'"),
+                                             uvData.values, symbol, parent);
+    uvList.append(uv);
+  } // for
+
+  // setup default:
+  Esri::ArcGISRuntime::SimpleMarkerSymbol *sms;
+  sms = new Esri::ArcGISRuntime::SimpleMarkerSymbol(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::X, Qt::white, 25, parent);
+
+  // Finally, setup Renderer:
+  Esri::ArcGISRuntime::UniqueValueRenderer* uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QStringLiteral("AesCentralUniqueValueRenderer"),
+                                                   sms,  // default
+                                                   fieldNames,
+                                                   uvList, parent);
+  static long s_counter = 0;
+  uniqueRenderer->setObjectName(QStringLiteral("UniqueValueRenderer_assignUniqueValueRendererAesCentral_%1").arg(s_counter++));
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- UniqueValueRendererAesCentral occured: ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+  });
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::destroyed, this, [this, uniqueRenderer] () {
+    INFO_LOG(m_logger) << " UniqueValueRenderer is destroyed , objectName='" <<  uniqueRenderer->objectName() << "'";
+  });
+
+  // setup SceneProperties
+  Esri::ArcGISRuntime::RendererSceneProperties sceneProps;
+  sceneProps.setHeadingExpression(QStringLiteral("[HEADING]")); // Expression with "[]", later on without "[]"
+  sceneProps.setPitchExpression(QStringLiteral("[PITCH]"));     // Expression with "[]", later on without "[]"
+  sceneProps.setRollExpression(QStringLiteral("[ROLL]"));       // Expression with "[]", later on without "[]"
+  uniqueRenderer->setSceneProperties(sceneProps);
+
+  // take care that the old one is deleted:
+  Esri::ArcGISRuntime::Renderer *oldRenderer = graphicsOverlay->renderer();
+  delete oldRenderer; // delete nullptr is safe!
+
+  // assign new:
+  graphicsOverlay->setRenderer(uniqueRenderer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, layername='" <<  layername << "'"
+                      << ", fieldNames='" <<  fieldNames.join(QStringLiteral(";")) << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+  return true;
+}
+
+bool LayerFactoryImpl::assignUniqueValueRendererAesCentral3DExtrusion(const QString &layername,
+                                                                      const QStringList &fieldNames,
+                                                                      const QVector<LayerFactory::UniqueValueDataAesCentral> &uvDataCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, layername='" <<  layername << "'"
+                      << ", fieldNames='" <<  fieldNames.join(QStringLiteral(";")) << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+
+  // ensure existence:
+  getCreateLogicalLayer(layername);
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay = this->getGraphicsLayer3DExtrusion(layername);
+  if (!graphicsOverlay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " graphicsOverlay not found, layername='" << layername << "'";
+    return false;
+  }
+
+  // prepare UniqueValues
+  QList<Esri::ArcGISRuntime::UniqueValue *> uvList;
+  QObject *parent = graphicsOverlay;
+  for (const UniqueValueDataAesCentral &uvData : qAsConst(uvDataCont))
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+//                       << " uvData.value=" << uvData.values << "'"
+                       << ", type " << toString(uvData.type)
+                       << ", col " << uvData.col
+                       << ", col.name " << uvData.col.name()
+                       << ", uvData.radius " << uvData.radius;
+
+    Esri::ArcGISRuntime::SimpleFillSymbol *symbol =
+      new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, uvData.col, parent);
+
+    Esri::ArcGISRuntime::UniqueValue *uv =
+        new Esri::ArcGISRuntime::UniqueValue(uvData.label,
+                                             QString(QStringLiteral("Description '%1'")).arg(uvData.col.name()),
+                                             uvData.values, symbol, parent);
+    uvList.append(uv);
+  } // for
+
+  // setup default:
+  Esri::ArcGISRuntime::SimpleFillSymbol *defaultSymbol =
+    new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, Qt::white, parent);
+
+  // Finally, setup Renderer:
+  Esri::ArcGISRuntime::UniqueValueRenderer* uniqueRenderer =
+      new Esri::ArcGISRuntime::UniqueValueRenderer(QStringLiteral("assignUniqueValueRendererAesCentral3DUNKNOWN"),
+                                                   defaultSymbol,  // default
+                                                   fieldNames,
+                                                   uvList, parent);
+  static long s_counter = 0;
+  uniqueRenderer->setObjectName(QStringLiteral("UniqueValueRenderer_assignUniqueValueRendererAesCentral3D_%1").arg(s_counter++));
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- UniqueValueRendererAesCentral3DExtrusion occured: ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+  });
+  connect(uniqueRenderer, &Esri::ArcGISRuntime::UniqueValueRenderer::destroyed, this, [this, uniqueRenderer] () {
+    INFO_LOG(m_logger) << " UniqueValueRenderer is destroyed , objectName='" <<  uniqueRenderer->objectName() << "'";
+  });
+
+  Esri::ArcGISRuntime::RendererSceneProperties props = uniqueRenderer->sceneProperties();
+  props.setExtrusionMode(Esri::ArcGISRuntime::ExtrusionMode::BaseHeight);
+  props.setExtrusionExpression(QStringLiteral("[height]"));                  // <-- keyword
+  uniqueRenderer->setSceneProperties(props);
+
+  // take care that the old one is deleted:
+  Esri::ArcGISRuntime::Renderer *oldRenderer = graphicsOverlay->renderer();
+  delete oldRenderer; // delete nullptr is safe!
+
+  // assign new:
+  graphicsOverlay->setRenderer(uniqueRenderer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, layername='" <<  layername << "'"
+                      << ", fieldNames='" <<  fieldNames.join(QStringLiteral(";")) << "'"
+                      << ", uvDataCont.size()=" <<  uvDataCont.size();
+  return true;
+}
+
+bool LayerFactoryImpl::initializeUnitTestLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QUrl mapUrl(QLatin1String("http://DOES_NOT_EXISTS"));        // wkid = 102100/3857
+
+  this->addBasemap(QLatin1String("DummyLayerName"), mapUrl, BasemapType::Aerial);
+
+  //-----------------------------------
+  // Layer:
+  //-----------------------------------
+
+  QStringList layerNames;
+  layerNames << QLatin1String("AES");
+  layerNames << QLatin1String("Participants");
+  bool success = true;
+  for (const QString &layername : qAsConst(layerNames))
+    if (!addOperationalLayer(layername, layername))
+      success = false;
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " initializeOperationalLayers failed";
+
+  //  enableFunctionDialog();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return success;
+
+}
+
+bool LayerFactoryImpl::addBasemap(const QString &layername,
+                                  const QUrl &mapServiceUrl,
+                                  const BasemapType basemapType,
+                                  const double minScale,
+                                  const double maxScale,
+                                  const QString &displayName,
+                                  const QString &description,
+                                  const QImage &previewImage)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername='" << layername << "'"
+                      << " mapServiceUrl='" << mapServiceUrl.toString() << "'"
+                      << " basemapType='" << basemapType << "'"
+                      << " minScale='" << minScale << "'"
+                      << " maxScale='" << maxScale << "'"
+                      << " displayName='" << displayName << "'"
+                      << " description='" << description << "'"
+                      << " previewImage.isNull()=" << previewImage.isNull()
+                      << " wkid=" << d->m_mapImpl->getEsriSpatialReference().wkid();
+
+  bool success = addBasemapInternal(layername, mapServiceUrl, basemapType,
+                                    minScale, maxScale,
+                                    displayName, description);
+
+  // reOrder
+  success = success && reOrderLayer();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " layername='" << layername << "'"
+                      << " mapServiceUrl='" << mapServiceUrl.toString() << "'"
+                      << " displayName='" << displayName << "'"
+                      << " success =" << success;
+  return success;
+}
+
+bool LayerFactoryImpl::removeBasemap(const QString &layername)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername='" << layername << "'";
+  if (!d->m_orderedMapLayer.contains(layername, LayerType::Basemap))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername='" << layername << "' not found";
+    return false;
+  }
+
+  bool success = false;
+
+  if (d->m_orderedMapLayer.removeLayer(layername) && d->m_basemap)
+  {
+    Esri::ArcGISRuntime::Layer *layer = this->getEsriBasemapLayer(layername);
+    if (layer && d->m_basemap->baseLayers())
+    {
+      d->m_basemap->baseLayers()->removeOne(layer);
+      success = true;
+      INFO_LOG(m_logger) << LOGFUNCTION << " layer"
+                         << " layername='" << layername << "' removed";
+
+      d->m_mapImpl->emitLayerOrderChanged();
+    }
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " layername='" << layername << "' can`t be found";
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername='" << layername << "' can`t be removed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " layername='" << layername << "'"
+                      << " success='" << success << "'";
+  return success;
+}
+
+Esri::ArcGISRuntime::Envelope LayerFactoryImpl::fullExtentOfBasemaps(double margin_zeroToOne) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  Esri::ArcGISRuntime::LayerListModel *model = d->m_basemap->baseLayers();
+  if (!model || model->isEmpty())
+    return Esri::ArcGISRuntime::Envelope();
+
+  double xmin = std::numeric_limits<double>::max();
+  double ymin = std::numeric_limits<double>::max();
+  double xmax = std::numeric_limits<double>::lowest();
+  double ymax = std::numeric_limits<double>::lowest();
+
+  Esri::ArcGISRuntime::SpatialReference sr;
+
+  for (int idx = 0; idx < model->size(); ++idx)
+  {
+    Esri::ArcGISRuntime::Layer *layer = model->at(idx);
+    // 12.12.2018, N. Thoden, V100.4:
+    // Do not call fullExtent if layer is not loaded.
+    // Envelope contains nan and will not changed on further calls...
+    if (!layer || (layer->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded))
+      continue;
+
+    const Esri::ArcGISRuntime::Envelope singleEnv = layer->fullExtent();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " layer->loadStatus()" << layer->loadStatus()
+                        << ", singleEnv.toJson()" << singleEnv.toJson();
+
+    sr = singleEnv.spatialReference();
+
+    if (!std::isnan(singleEnv.xMin()))
+      xmin = std::min(singleEnv.xMin(), xmin);
+    if (!std::isnan(singleEnv.yMin()))
+      ymin = std::min(singleEnv.yMin(), ymin);
+
+    if (!std::isnan(singleEnv.xMax()))
+      xmax = std::max(singleEnv.xMax(), xmax);
+    if (!std::isnan(singleEnv.yMax()))
+      ymax = std::max(singleEnv.yMax(), ymax);
+  } // for
+
+  if (qFuzzyCompare(xmin, std::numeric_limits<double>::max()) || sr.isEmpty())
+    return Esri::ArcGISRuntime::Envelope();
+
+  if (margin_zeroToOne < 0.0)
+    margin_zeroToOne = 0.0;
+
+  if (margin_zeroToOne > 1.0)
+    margin_zeroToOne = 1.0;
+
+  if (margin_zeroToOne > 0)
+  {
+    double width = xmax - xmin;
+    double height = ymax - ymin;
+
+    xmin -= width * margin_zeroToOne;
+    xmax += width * margin_zeroToOne;
+
+    ymin -= height * margin_zeroToOne;
+    ymax += height * margin_zeroToOne;
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " return.x " << xmin << " - " << xmax;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " return.y " << ymin << " - " << ymax;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return Esri::ArcGISRuntime::Envelope(xmin, ymin, xmax, ymax, sr);
+}
+
+bool LayerFactoryImpl::addSceneObjectLayer(const QString &layername, const QUrl &sceneLayerServiceUrl, const double altitudeOffset, const QString &displayName, const QString &description, const QImage &previewImage)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername='" << layername << "'"
+                      << " sceneLayerServiceUrl='" << sceneLayerServiceUrl.toString() << "'"
+                      << " altitudeOffset='" << altitudeOffset << "'"
+                      << " displayName='" << displayName << "'"
+                      << " description='" << description << "'"
+                      << " previewImage.isNull()=" << previewImage.isNull();
+
+  if (d->m_mapImpl->mode() != Mode::Mode_3D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not allowd in Mode3D";
+    return false;
+  }
+
+  if (sceneLayerServiceUrl.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sceneLayerServiceUrl empty, can not add layer";
+    return false;
+  }
+
+  if (d->m_orderedMapLayer.contains(layername, LayerType::Undefined))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername '" << layername << "' already in use";
+    return false;
+  }
+
+  //-----------------------------------
+  // ArcGIS ArcGISSceneLayer
+  //-----------------------------------
+  //-----------------------------------------------------------------
+  // Attention:
+  // local    URLS -> do NOT specify any userCredentials (main)
+  // external URLS -> DO specify userCredentials (main)
+  //-----------------------------------------------------------------
+
+  QUrl finalUrl = this->completeUrl(QLatin1String("SCENE_OBJ"),
+                                    sceneLayerServiceUrl,
+                                    QLatin1String("slpk/"));
+  INFO_LOG(m_logger) << LOGFUNCTION << " SCENE_OBJ finalUrl '" << finalUrl.toString() << "'";
+
+  Esri::ArcGISRuntime::Scene *esriScene = d->m_mapImpl->getEsriScene();
+
+#ifdef USE_ARCGIS_SCENE_LAYER_CACHE
+  ArcGISSceneLayerCache::Item& aslCacheItem = ArcGISSceneLayerCache::getInstance()->getFreeItemRef(sceneLayerServiceUrl.toString());
+
+  if (m_logger.isInfoEnabled())
+      ArcGISSceneLayerCache::getInstance()->dump();
+
+
+  // const bool reUse = aslCacheItem.m_hostingScene.isNull() && aslCacheItem.m_sceneLayer;
+  // aslCacheItem.m_hostingScene is always null. See getItemRef
+  const bool reUse = aslCacheItem.m_sceneLayer;
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> reUse = "<< reUse
+                      << " itemName = '" << sceneLayerServiceUrl.toString() << "'"
+                      << " layername='" << layername << "'"
+                      << " aslCacheItem.m_hostingScene.data() = " << aslCacheItem.m_hostingScene.data()
+                      << " aslCacheItem.m_sceneLayer.data() = " << aslCacheItem.m_sceneLayer.data();
+
+  Esri::ArcGISRuntime::ArcGISSceneLayer *sceneLayer = nullptr;
+
+  if (!reUse)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> CREATE"
+                         << " (itemName = '" << sceneLayerServiceUrl.toString() << "', layername='" << layername << "')";
+
+    sceneLayer = new Esri::ArcGISRuntime::ArcGISSceneLayer(finalUrl); // ArcGISSceneLayer should live longer than the scene: -> no parent here :-)
+    sceneLayer->setName(layername);
+    sceneLayer->setObjectName(sceneLayer->name());
+
+    connect(sceneLayer, &Esri::ArcGISRuntime::ArcGISSceneLayer::errorOccurred, this, [this](const Esri::ArcGISRuntime::Error &error)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> EsriError occured: " << error;
+    });
+    connect(sceneLayer, &Esri::ArcGISRuntime::ArcGISSceneLayer::doneLoading, this, [this]()
+    {
+      Esri::ArcGISRuntime::ArcGISSceneLayer *sceneLayer = qobject_cast<Esri::ArcGISRuntime::ArcGISSceneLayer *>(sender());
+      if (!sceneLayer)
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " qobject_cast failed to get sender!?";
+        return;
+      }
+
+      QString senderName = sceneLayer->objectName();
+      INFO_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> doneLoading"
+                         << " ,sendername= '" << senderName << "'"
+                         << " ,URL= '" << sceneLayer->url().toString() << "'";
+    });
+
+    connect(sceneLayer, &Esri::ArcGISRuntime::ArcGISSceneLayer::destroyed, this, [this]()
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> destroyed";
+    });
+
+    aslCacheItem.m_hostingScene = esriScene;    // update cache
+    aslCacheItem.m_sceneLayer   = sceneLayer;   // update cache
+
+  } else {
+    INFO_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> TAKE FROM STATIC"
+                         << " (itemName = '" << sceneLayerServiceUrl.toString() << "', layername='" << layername << "')";
+
+    aslCacheItem.m_hostingScene = esriScene;  // update cache
+    sceneLayer = aslCacheItem.m_sceneLayer;
+  }
+#else
+  Esri::ArcGISRuntime::ArcGISSceneLayer *sceneLayer = new Esri::ArcGISRuntime::ArcGISSceneLayer(finalUrl, d->m_mapImpl);
+  sceneLayer->setName(layername);
+  sceneLayer->setObjectName(sceneLayer->name());
+  sceneLayer->setAltitudeOffset(altitudeOffset);
+
+  connect(sceneLayer, &Esri::ArcGISRuntime::ArcGISSceneLayer::errorOccurred, this, [this](const Esri::ArcGISRuntime::Error &error)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> EsriError occured: " << error;
+  });
+  connect(sceneLayer, &Esri::ArcGISRuntime::ArcGISSceneLayer::doneLoading, this, [this]()
+  {
+    Esri::ArcGISRuntime::ArcGISSceneLayer *sceneLayer = qobject_cast<Esri::ArcGISRuntime::ArcGISSceneLayer *>(sender());
+    if (!sceneLayer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " qobject_cast failed to get sender!?";
+      return;
+    }
+
+    QString senderName = sceneLayer->objectName();
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " ArcGISSceneLayer -> doneLoading"
+                       << " ,sendername= '" << senderName << "'"
+                       << " ,URL= '" << sceneLayer->url().toString() << "'";
+  });
+#endif // USE_ARCGIS_SCENE_LAYER_CACHE
+
+
+  if (esriScene)
+  {
+    esriScene->operationalLayers()->append(sceneLayer);
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no scene";
+    return false;
+  }
+
+#ifdef USE_ARCGIS_SCENE_LAYER_CACHE
+  if (m_logger.isInfoEnabled())
+    ArcGISSceneLayerCache::getInstance()->dump();
+#endif // USE_ARCGIS_SCENE_LAYER_CACHE
+
+  d->m_sceneObjectUrlCont += sceneLayerServiceUrl;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " sceneLayerServiceUrl='" << sceneLayerServiceUrl.toString() << "'";
+  return true;
+}
+
+bool LayerFactoryImpl::isSceneObjectLayerVisible() const
+{
+  return d->m_isSceneObjectLayerVisible;
+}
+
+void LayerFactoryImpl::setSceneObjectLayerVisible(bool visible)
+{
+  d->m_isSceneObjectLayerVisible = visible;
+
+  if ( (!d->m_mapImpl) || d->m_mapImpl->mode() != Mode::Mode_3D)
+    return;
+
+  Esri::ArcGISRuntime::Scene *esriScene = d->m_mapImpl->getEsriScene();
+  if (!esriScene)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no scene";
+    return;
+  }
+
+  Esri::ArcGISRuntime::LayerListModel *layerListModel = esriScene->operationalLayers();
+  if (!layerListModel)
+    return;
+
+  const int size = layerListModel->size();
+  for (int idx=0; idx<size; ++idx)
+  {
+    Esri::ArcGISRuntime::Layer *objLayer = layerListModel->at(idx);
+    if (!objLayer)
+      continue;
+    objLayer->setVisible(d->m_isSceneObjectLayerVisible);
+  } // for
+
+
+
+}
+
+bool LayerFactoryImpl::initializeElevationSources(const QStringList &sceneElevationServiceUrls)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " sceneElevationServiceUrls='" << sceneElevationServiceUrls.join(QLatin1String(";")) << "'";
+
+  const Mode mode = d->m_mapImpl->mode();
+
+  switch (mode)
+  {
+  case Mode::Mode_2D:
+    this->initializeElevationSources2D(sceneElevationServiceUrls);
+    break;
+  case Mode::Mode_3D:
+    this->initializeElevationSources3D(sceneElevationServiceUrls);
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " unknown mode";
+    return false;
+  } // switch
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool LayerFactoryImpl::initializeElevationSources2D(const QStringList &sceneElevationServiceUrls)
+{
+  if (sceneElevationServiceUrls.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sceneObjectServiceUrls is Empty";
+    return false;
+  }
+
+  if (d->m_mapImpl->mode() != Mode::Mode_2D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " wrong mode";
+    return false;
+  }
+
+  //
+  // append to 'own' esri (base) surface:
+  //
+  delete d->m_baseSurface;
+  d->m_baseSurface = new Esri::ArcGISRuntime::Surface(this);
+  d->m_baseSurface->setName(QLatin1String("BaseSurface2D"));
+  d->m_baseSurface->setObjectName(d->m_baseSurface->name());
+
+  connect(d->m_baseSurface, &Esri::ArcGISRuntime::Surface::errorOccurred, this, &LayerFactoryImpl::onSurfaceErrorOccured2D, Qt::UniqueConnection);
+  connect(d->m_baseSurface, &Esri::ArcGISRuntime::Surface::doneLoading, this, &LayerFactoryImpl::onSurfaceDoneLoading2D, Qt::UniqueConnection);
+
+  const QList<Esri::ArcGISRuntime::ElevationSource*> &elevationSources =
+      initializeElevationSourcesInternal(sceneElevationServiceUrls);
+
+  for (auto elevationSource : qAsConst(elevationSources))
+    d->m_baseSurface->elevationSources()->append(elevationSource);
+
+
+  // trigger loading:
+  // As Luke suggested: load surface if first elevation entry is loaded:
+  // https://community.esri.com/thread/206757-elevation-in-2d
+  if (!elevationSources.isEmpty())
+  {
+    Esri::ArcGISRuntime::ElevationSource* elevationSourcesFirst = elevationSources.first();
+    if (elevationSourcesFirst)
+    {
+      connect(elevationSourcesFirst, &Esri::ArcGISRuntime::ElevationSource::doneLoading, this, [this](const Esri::ArcGISRuntime::Error&)
+      {
+        d->m_baseSurface->load();
+      });
+      elevationSourcesFirst->load();
+    }
+  }
+
+  return true;
+}
+
+bool LayerFactoryImpl::initializeElevationSources3D(const QStringList &sceneElevationServiceUrls)
+{
+  if (sceneElevationServiceUrls.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sceneObjectServiceUrls is Empty";
+    return false;
+  }
+
+  if (d->m_mapImpl->mode() != Mode::Mode_3D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " wrong mode";
+    return false;
+  }
+
+  Esri::ArcGISRuntime::Scene *esriScene = d->m_mapImpl->getEsriScene();
+  if (!esriScene)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no scene";
+    return false;
+  }
+
+  if (!esriScene->baseSurface() || !esriScene->baseSurface()->elevationSources())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no ElevationSourceListModel";
+    return false;
+  }
+
+  //
+  // append to esri scene:
+  //
+  const QList<Esri::ArcGISRuntime::ElevationSource*> elevationSources =
+      initializeElevationSourcesInternal(sceneElevationServiceUrls);
+
+  for (auto item : elevationSources)
+    esriScene->baseSurface()->elevationSources()->append(item);
+
+  return true;
+}
+
+QList<Esri::ArcGISRuntime::ElevationSource*> LayerFactoryImpl::initializeElevationSourcesInternal(const QStringList &sceneElevationServiceUrls)
+{
+  if (sceneElevationServiceUrls.isEmpty())
+    return {};
+
+  Esri::ArcGISRuntime::RasterElevationSource* rasterElevationSource =
+      initializeRasterElevationSourceInternal(sceneElevationServiceUrls);
+
+  QList<Esri::ArcGISRuntime::ElevationSource*> elevationSources;
+  elevationSources.append(rasterElevationSource);
+
+  return elevationSources;
+}
+
+Esri::ArcGISRuntime::RasterElevationSource *LayerFactoryImpl::initializeRasterElevationSourceInternal(const QStringList &filePaths)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " filePaths = " << filePaths.join(QStringLiteral(";")) << "'";
+
+  QStringList absFilePaths_rough_to_fine;
+  absFilePaths_rough_to_fine.reserve(filePaths.size());
+
+  for (const QString &filePath : filePaths)
+  {
+    QUrl finalUrl = this->completeUrl(QLatin1String("ELEVATION"),
+                                      QUrl(filePath),
+                                      QLatin1String("elevation/"));
+
+    INFO_LOG(m_logger) << LOGFUNCTION << " ELEVATION finalUrl '" << finalUrl.toString() << "'";
+    absFilePaths_rough_to_fine.append(finalUrl.toLocalFile());
+  } // for
+
+  if (absFilePaths_rough_to_fine.isEmpty())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " filePaths are empty!!!";
+    return nullptr;
+  }
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " absFilePaths_rough_to_fine = " << absFilePaths_rough_to_fine.join(QStringLiteral(";")) << "'";
+
+  //
+  // init ElevationMapManager
+  //
+  if (!d->m_mapImpl->getElevationMapManager())
+  {
+    if (!d->m_mapImpl->initElevationMapManager(absFilePaths_rough_to_fine))
+      ERROR_LOG(m_logger) << LOGFUNCTION << " initElevationMapManager failed";
+  }
+
+  //
+  // Esri::ArcGISRuntime::RasterElevationSource with several files
+  //
+  Esri::ArcGISRuntime::RasterElevationSource *rasterElevationSource =
+      new Esri::ArcGISRuntime::RasterElevationSource(absFilePaths_rough_to_fine, this);
+
+  const QString &elevationSourceName = QStringLiteral("RasterElevationSources_((%1))").arg(absFilePaths_rough_to_fine.size());
+  rasterElevationSource->setName(elevationSourceName);
+  rasterElevationSource->setObjectName(rasterElevationSource->name());
+
+  // 2017-09-18; N.Thoden, V100.1:
+  // Following message occures very often. Therefore don`t connect to errorOccurred
+  // 'code=404 domain=0 extendedErrorType=0, message='Error transferring http://excgeo21.sl ..  - server replied: Not Found'
+  connect(rasterElevationSource, &Esri::ArcGISRuntime::ElevationSource::errorOccurred, this, &LayerFactoryImpl::onElevationSourceErrorOccured);
+  connect(rasterElevationSource, &Esri::ArcGISRuntime::ElevationSource::doneLoading,
+          this, &LayerFactoryImpl::onElevationSourceDoneLoading);
+  return rasterElevationSource;
+}
+
+
+void LayerFactoryImpl::setForceCreationOfGraphicsOverlay(bool onOff)
+{
+  s_forceCreationOfGraphicsOverlay = onOff;
+}
+
+
+QString LayerFactoryImpl::basemapLayernamePrefix() const
+{
+  return d->m_basemapLayernamePrefix;
+}
+void LayerFactoryImpl::setBasemapLayernamePrefix(const QString &basemapLayernamePrefix)
+{
+  d->m_basemapLayernamePrefix = basemapLayernamePrefix;
+}
+
+QString LayerFactoryImpl::participantLayername() const
+{
+  return d->m_participantLayername;
+}
+RenderingMode LayerFactoryImpl::participantLayerRenderingMode() const
+{
+  return d->m_participantLayerRenderingMode;
+}
+SurfacePlacement LayerFactoryImpl::participantLayerSurfacePlacement() const
+{
+  return d->m_participantLayerSurfacePlacement;
+}
+
+void LayerFactoryImpl::setParticipantLayer(const QString &participantLayername,
+                                           RenderingMode renderingMode,
+                                           SurfacePlacement surfacePlacement)
+{
+  d->m_participantLayername             = participantLayername;
+  d->m_participantLayerRenderingMode    = renderingMode;
+  d->m_participantLayerSurfacePlacement = surfacePlacement;
+}
+
+QString LayerFactoryImpl::jumpPointLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const QString &logicalLayerName = LayerNameJumpPoints;
+  const LayerType layerType       = LayerType::JumpPoint;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return QString();
+    }
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.displayName = tr("JumpPoints");                // dt. Sprungmarken
+    logicalLayer->setLayerParameter(lp);
+  }
+
+
+  //
+  // the real Esri-Layers will be create later on demand :-)
+  //
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return logicalLayerName; // == LayerNameJumpPoints;
+}
+
+
+bool LayerFactoryImpl::jumpPointLayerExists() const
+{
+  const QString &logicalLayerName = LayerNameJumpPoints;
+  return (d->m_orderedMapLayer.contains(logicalLayerName, SituationMap::LayerType::JumpPoint));
+}
+
+
+
+QString LayerFactoryImpl::toolLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const QString &logicalLayerName = LayerNameTools;
+  const LayerType layerType       = LayerType::Tools;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return QString();
+    }
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.displayName = tr("Tools");                           // dt. Werkzeuge (?)
+    logicalLayer->setLayerParameter(lp);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+
+  //
+  // the real Esri-Layers will be create later on demand :-)
+  //
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return logicalLayerName; // == LayerNameTools;
+}
+
+bool LayerFactoryImpl::toolLayerExists() const
+{
+  const QString &logicalLayerName = LayerNameTools;
+  return (d->m_orderedMapLayer.contains(logicalLayerName, SituationMap::LayerType::Tools));
+}
+
+
+QString LayerFactoryImpl::rubberbandLayer() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const QString &logicalLayerName = LayerNameRubberband;
+  const LayerType layerType       = LayerType::Rubberband;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    LayerFactoryImpl *THIS = const_cast<LayerFactoryImpl *>(this);
+    QSharedPointer<LogicalLayer> logicalLayer = THIS->addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return QString();
+    }
+  }
+
+  //
+  // the real Esri-Layers will be create later on demand :-)
+  //
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return logicalLayerName; // == LayerNameRubberband;
+}
+bool LayerFactoryImpl::rubberbandLayerExists() const
+{
+  const QString &logicalLayerName = LayerNameRubberband;
+  return (d->m_orderedMapLayer.contains(logicalLayerName, SituationMap::LayerType::Rubberband));
+}
+
+QString LayerFactoryImpl::emergencyCallLayer(bool getJustTheName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  const QString &logicalLayerName = LayerNameEmergencyCall;
+
+  if (getJustTheName)
+  {
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return logicalLayerName;
+  }
+
+  const LayerType layerType       = LayerType::EmergencyCall;
+
+  if (! layerExistsInMngt(logicalLayerName, layerType))
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = addLayerToMgnt(logicalLayerName, layerType);
+    if (logicalLayer.isNull())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addLayer failed: '"
+                          << logicalLayerName << "'";
+      return QString();
+    }
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.displayName = tr("EmergencyCalls");                         // dt. Notrufe/SOS (?)
+    logicalLayer->setLayerParameter(lp);
+  }
+
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay = this->getGraphicsLayer(logicalLayerName);
+    if (!graphicsOverlay)
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " graphicsOverlay not found, logicalLayerName'" << logicalLayerName<< "'";
+      return QString();
+    }
+    // set SurfacePlacement // EmergencyCalls have a pin/needle
+    Esri::ArcGISRuntime::LayerSceneProperties lsp = graphicsOverlay->sceneProperties();
+    lsp.setSurfacePlacement(static_cast<Esri::ArcGISRuntime::SurfacePlacement>(Esri::ArcGISRuntime::SurfacePlacement::Relative));
+    graphicsOverlay->setSceneProperties(lsp);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return logicalLayerName; // == LayerNameEmergencyCall;
+}
+
+bool LayerFactoryImpl::emergencyCallLayerExists() const
+{
+  const QString &emergencyCallLayername = LayerNameEmergencyCall;
+  return (d->m_orderedMapLayer.contains(emergencyCallLayername, SituationMap::LayerType::EmergencyCall));
+}
+
+bool LayerFactoryImpl::switchEmergencyCallLayerOn()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  const QString &emergencyCallLayername = LayerNameEmergencyCall;
+
+  if (!(d->m_orderedMapLayer.contains(emergencyCallLayername, SituationMap::LayerType::EmergencyCall)))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " EmergencyCallLayer does not exists, can´t be switched on.";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+  LayerParameter lp = this->layerParameter(emergencyCallLayername);
+  lp.visible = true;
+  lp.opacity = 100;
+  lp.minScale = -1;
+  lp.maxScale = -1;
+
+  const bool success = this->setLayerParameter(emergencyCallLayername, lp);
+  if (!success) {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " setLayerParameter failed for '" << emergencyCallLayername << "'";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool LayerFactoryImpl::switchEmergencyCallLayerOff()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  const QString &emergencyCallLayername = LayerNameEmergencyCall;
+
+  if (!(d->m_orderedMapLayer.contains(emergencyCallLayername, SituationMap::LayerType::EmergencyCall)))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " EmergencyCallLayer does not exists, can´t be switched off.";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+  LayerParameter lp = this->layerParameter(emergencyCallLayername);
+  lp.visible = false;
+  lp.opacity = 100;
+  lp.minScale = -1;
+  lp.maxScale = -1;
+
+  const bool success = this->setLayerParameter(emergencyCallLayername, lp);
+  if (!success) {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " setLayerParameter failed for '" << emergencyCallLayername << "'";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+
+}
+
+void LayerFactoryImpl::handleEmergencyCallSpecials()
+{
+  const QString &emergencyCallLayername = LayerNameEmergencyCall;
+  const bool bEmergencyCallLayerExists = emergencyCallLayerExists();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, emergencyCallLayerExists() = " << bEmergencyCallLayerExists;
+
+  if (!bEmergencyCallLayerExists)
+    return;
+
+  // ensure to be on top:
+  QStringList slLayerNamesOrdered = d->m_orderedMapLayer.layerNamesOrdered();
+  if (slLayerNamesOrdered.isEmpty())
+    return;
+
+  const QString &lastNameTOP = slLayerNamesOrdered.last();
+
+  if (lastNameTOP == emergencyCallLayer())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " emergencyCallLayer already on top";
+    return;
+  }
+
+  slLayerNamesOrdered.removeAll(emergencyCallLayername);
+  slLayerNamesOrdered.push_back(emergencyCallLayername);
+  orderLayerTo(slLayerNamesOrdered);
+
+  {
+    QStringList slLayerNamesOrderedLocal = d->m_orderedMapLayer.layerNamesOrdered();
+    if (slLayerNamesOrderedLocal.isEmpty())
+      return;
+
+    const QString &lastNameTOPLocal = slLayerNamesOrderedLocal.last();
+    if (lastNameTOPLocal == emergencyCallLayer())
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " emergencyCallLayer is now on top";
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+Map *LayerFactoryImpl::map() const
+{
+  return d->m_mapImpl;
+}
+
+int LayerFactoryImpl::count() const
+{
+  return d->m_orderedMapLayer.count();
+}
+
+QStringList LayerFactoryImpl::layernames() const
+{
+  return d->m_orderedMapLayer.layerNamesOrdered();
+}
+
+QStringList LayerFactoryImpl::layernames(const LayerType &layerType) const
+{
+  return d->m_orderedMapLayer.layerNamesOrdered(layerType);
+}
+
+bool SituationMap::LayerFactoryImpl::checkLayerOrder(const QStringList &orderedLayernames)
+{
+  bool requestedOrderIsValid = false;
+  bool success = d->m_orderedMapLayer.orderLayerTo(orderedLayernames, &requestedOrderIsValid);
+
+  if (success)
+    return requestedOrderIsValid;
+  else
+    return false;
+}
+
+bool LayerFactoryImpl::orderLayerTo(const QStringList &orderedLayernames)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", orderedLayername=        " << orderedLayernames.join(QLatin1String(";"));
+
+  if (orderedLayernames.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " orderedLayername is empty";
+    return false;
+  }
+
+  bool success = true;
+
+  const QStringList &orderedLayernamesCurrent = d->m_orderedMapLayer.layerNamesOrdered();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", orderedLayernamesCurrent=" << orderedLayernamesCurrent.join(QLatin1String(";"));
+
+  if (orderedLayernamesCurrent != orderedLayernames)
+  {
+    if ((success = d->m_orderedMapLayer.orderLayerTo(orderedLayernames)))
+      reOrderLayer();
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " orderLayerTo failed";
+      ERROR_LOG(m_logger) << LOGFUNCTION << " orderLayerTo failed, cur   =" << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+      ERROR_LOG(m_logger) << LOGFUNCTION << " orderLayerTo failed, should=" << orderedLayernames.join(QLatin1String(";"));
+    }
+    d->m_mapImpl->emitLayerOrderChanged();
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " END, success=" << success
+                      << ", orderedLayernamesCurrent=" << orderedLayernamesCurrent.join(QLatin1String(";"));
+  return success;
+}
+
+LayerType LayerFactoryImpl::layerType(const QString &layername) const
+{
+  LayerType layerType = LayerType::Undefined;
+
+  MapLayer mapLayer = d->m_orderedMapLayer.getLayer(layername);
+  if (mapLayer.isValid())
+    layerType = mapLayer.type();
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layer not found"
+                        << " layername='" << layername << "'";
+  }
+
+  return layerType;
+}
+
+LayerParameter LayerFactoryImpl::layerParameter(const QString &layername) const
+{
+  LayerParameter lp;
+
+  QSharedPointer<LogicalLayer> logicalLayer = this->getLogicalLayer(layername);
+  if (logicalLayer)
+    lp = logicalLayer->layerParameter();
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found"
+                        << " layername=" << layername;
+  }
+
+  return lp;
+}
+
+bool LayerFactoryImpl::setLayerParameter(const QString &layername, const LayerParameter &layerParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername=" << layername;
+
+  bool success = false;
+
+  QSharedPointer<LogicalLayer> logicalLayer = this->getLogicalLayer(layername);
+  if (logicalLayer)
+  {
+    logicalLayer->setLayerParameter(layerParameter);
+    success = true;
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not found"
+                        << " layername=" << layername;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " success=" << success;
+  return success;
+}
+
+
+bool LayerFactoryImpl::setLayerParameter(LayerType layerType, int value, int LayerParameter::*memberPtr)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layer type=" << int(layerType) << " layer parameter member=" << memberPtr << " value=" << value;
+
+  const QStringList &layerNameList = d->m_orderedMapLayer.layerNamesOrdered(layerType);
+  bool success = true;
+
+  for (const QString &layername : layerNameList)
+  {
+    QSharedPointer<LogicalLayer> logicalLayer = this->getLogicalLayer(layername);
+    if (logicalLayer)
+    {
+      LayerParameter layerParamTmp = logicalLayer->layerParameter();
+      layerParamTmp.*memberPtr = value;
+      logicalLayer->setLayerParameter(layerParamTmp);
+
+    }
+    else
+    {
+      success = false;
+      ERROR_LOG(m_logger) << LOGFUNCTION << " not found"
+                          << ", layername='" << layername << "'";
+    }
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " success=" << success;
+  return success;
+}
+
+bool LayerFactoryImpl::setLayerOpacity(LayerType layerType, int opacity)        { return setLayerParameter(layerType, opacity,     &LayerParameter::opacity);    }
+bool LayerFactoryImpl::setLayerBrightness(LayerType layerType, int brightness)  { return setLayerParameter(layerType, brightness,  &LayerParameter::brightness); }
+bool LayerFactoryImpl::setLayerContrast(LayerType layerType, int contrast)      { return setLayerParameter(layerType, contrast,    &LayerParameter::contrast);   }
+bool LayerFactoryImpl::setLayerGamma(LayerType layerType, int gamma)            { return setLayerParameter(layerType, gamma,       &LayerParameter::gamma);      }
+
+void LayerFactoryImpl::setLayersVisible(const QVector<LayerType> &layerTypes, bool visible)
+{
+  for (auto &logicalLayer : d->m_logicalLayerCont)
+  {
+    if (!layerTypes.contains(logicalLayer->layerType()))
+      continue;
+    LayerParameter layerParamTmp = logicalLayer->layerParameter();
+    layerParamTmp.visible = visible;
+    logicalLayer->setLayerParameter(layerParamTmp);
+  }
+}
+
+#if ACRGIS_VERSION < 0x640500 // 100.5.0 / Update 5
+// deprecated in V100.5, replaced by GeoView::setSelectionProperties()
+QColor LayerFactoryImpl::selectionColor() const
+{
+  return d->m_selectionColor;
+}
+void LayerFactoryImpl::setSelectionColor(const QColor &selectionColor)
+{
+  d->m_selectionColor = selectionColor;
+}
+#endif // ACRGIS_VERSION
+
+bool LayerFactoryImpl::elevationAvailable() const
+{
+  if (!d->m_mapImpl)
+    return false;
+  return this->elevationSourcesCount() > 0;
+}
+
+Esri::ArcGISRuntime::Surface *LayerFactoryImpl::baseSurface() const
+{
+  if (!elevationAvailable())
+    return nullptr;
+
+  Esri::ArcGISRuntime::Surface *baseSurface = nullptr;
+
+  switch (d->m_mapImpl->mode())
+  {
+  case Mode::Mode_2D:
+    baseSurface = d->m_baseSurface;
+    break;
+  case Mode::Mode_3D:
+  {
+    Esri::ArcGISRuntime::Scene *esriScene = d->m_mapImpl->getEsriScene();
+    if (esriScene &&
+        esriScene->baseSurface()
+        )
+      baseSurface = esriScene->baseSurface();
+  }
+    break;
+  default:
+    break;
+  } // switch
+
+
+  // Verify:
+  if (!baseSurface)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no baseSurface";
+    return nullptr;
+  }
+
+  if (baseSurface->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " baseSurface not loaded yet";
+    return nullptr;
+  }
+
+  int elevationSourcesCount = -1;
+  Esri::ArcGISRuntime::ElevationSourceListModel* eslm = baseSurface->elevationSources();
+  if (eslm)
+    elevationSourcesCount = eslm->size();
+
+  if (elevationSourcesCount <= 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no elevationSourcesCount";
+    return nullptr;
+  }
+
+  return baseSurface;
+}
+
+int LayerFactoryImpl::elevationSourcesCount(bool checkIfLoaded) const
+{
+  if (!d->m_mapImpl)
+    return -1;
+
+  Esri::ArcGISRuntime::ElevationSourceListModel* elevationSourceListModel = nullptr;
+
+  switch (d->m_mapImpl->mode())
+  {
+  case Mode::Mode_2D:
+  {
+    if (d->m_baseSurface && d->m_baseSurface->elevationSources())
+      elevationSourceListModel = d->m_baseSurface->elevationSources();
+  }
+
+    break;
+  case Mode::Mode_3D:
+  {
+    if (d->m_mapImpl->getEsriScene() &&
+        d->m_mapImpl->getEsriScene()->baseSurface() &&
+        d->m_mapImpl->getEsriScene()->baseSurface()->elevationSources()
+        )
+      elevationSourceListModel = d->m_mapImpl->getEsriScene()->baseSurface()->elevationSources();
+  }
+    break;
+  default:
+    return false;
+  } // switch
+
+  if (!elevationSourceListModel)
+    return -1;
+
+  int elevationSourcesCount = -1;
+
+  if (checkIfLoaded)
+  {
+    elevationSourcesCount = 0;
+
+    int idx = 0;
+    const int esmSize = elevationSourceListModel->size();
+    for (; idx < esmSize; ++idx)
+    {
+      Esri::ArcGISRuntime::ElevationSource *es = elevationSourceListModel->at(idx);
+
+      if (es && (es->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded))
+        ++elevationSourcesCount;
+    } // for
+
+    INFO_LOG(m_logger) << LOGFUNCTION << " elevationSourcesCount = " << esmSize
+                       << ", loaded = " << elevationSourcesCount;
+  }
+  else
+  {
+    elevationSourcesCount = elevationSourceListModel->size();
+  }
+
+  return elevationSourcesCount;
+}
+
+bool LayerFactoryImpl::elevationSourcesLoaded()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  const int elevationSourcesCount       = this->elevationSourcesCount();
+  const int elevationSourcesCountLoaded = this->elevationSourcesCount(true);
+  return (elevationSourcesCount == elevationSourcesCountLoaded);
+}
+
+QPointer<LocationToElevationHelper> LayerFactoryImpl::locationToElevation() const
+{
+  QPointer<LocationToElevationHelper> locationToElevationHelper;
+
+  if (!elevationAvailable())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no elevation available";
+    return locationToElevationHelper;
+  }
+
+  Esri::ArcGISRuntime::Surface *baseSurface = this->baseSurface();
+
+  if (!baseSurface)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no baseSurface";
+    return locationToElevationHelper;
+  }
+
+  LayerFactoryImpl *THIS = const_cast<LayerFactoryImpl*>(this);
+  locationToElevationHelper = new LocationToElevationHelper(THIS); // QPointer -> parent is ok!
+
+  if (!locationToElevationHelper->init(d->m_mapImpl,
+                                       baseSurface,
+                                       d->m_mapImpl->getEsriSpatialReference()))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " locationToElevationHelper->init failed";
+    delete locationToElevationHelper;
+    return nullptr;
+  }
+
+  return locationToElevationHelper;
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LayerFactoryImpl::getGraphicsLayer(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, logicalName='" << logicalName << "'";
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = nullptr;
+
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalName);
+  if (d->m_orderedMapLayer.contains(logicalName, LayerType::Undefined) &&  logicalLayer)
+    graphicsLayer = logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, logicalName='" << logicalName << "'"
+                      << " graphicsLayer=" << graphicsLayer;
+  return graphicsLayer;
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LayerFactoryImpl::getGraphicsLayerDict(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, logicalName='" << logicalName << "'";
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = nullptr;
+
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalName);
+  if (d->m_orderedMapLayer.contains(logicalName, LayerType::Undefined) &&  logicalLayer)
+    graphicsLayer = logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer_Dict);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, logicalName='" << logicalName << "'"
+                      << " graphicsLayer=" << graphicsLayer;
+  return graphicsLayer;
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LayerFactoryImpl::getGraphicsLayer3DExtrusion(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, logicalName='" << logicalName << "'";
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = nullptr;
+
+  // getGraphicsLayer3DExtrusion -> SurfacePlacement::Relative
+
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalName);
+  if (d->m_orderedMapLayer.contains(logicalName, LayerType::Undefined) &&  logicalLayer)
+    graphicsLayer = logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer_3D_Extrusion);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, logicalName='" << logicalName << "'"
+                      << " graphicsLayer=" << graphicsLayer;
+  return graphicsLayer;
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LayerFactoryImpl::getGraphicsLayer3D_SpAbsolute(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, logicalName='" << logicalName << "'";
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = nullptr;
+
+  // getGraphicsLayer3D_SpAbsolute -> SurfacePlacement::Absolute
+
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalName);
+  if (d->m_orderedMapLayer.contains(logicalName, LayerType::Undefined) &&  logicalLayer)
+    graphicsLayer = logicalLayer->getCreateGraphicalOverlay(TechnicalLayerType::GraphicsLayer_3D_Absolute);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, logicalName='" << logicalName << "'"
+                      << " graphicsLayer=" << graphicsLayer;
+  return graphicsLayer;
+}
+
+
+
+QString LayerFactoryImpl::createInternalLayerName(const TechnicalLayerType &technicalLayerType,
+                                                  const QString &logicalLayerName) const
+{
+  return LogicalLayer::createInternalLayerName(logicalLayerName, technicalLayerType);
+}
+
+QSharedPointer<LogicalLayer> LayerFactoryImpl::getLogicalLayer(const QString &logicalName) const
+{
+  return d->getLogicalLayer(logicalName);
+}
+
+QSharedPointer<LogicalLayer> LayerFactoryImpl::getCreateLogicalLayer(const QString &logicalName)
+{
+  if (! d->hasLogicalLayer(logicalName))
+    d->createLogicalLayer(logicalName);
+
+  QSharedPointer<LogicalLayer> logicalLayer = d->getLogicalLayer(logicalName);
+  if (logicalLayer)
+  {
+    connect(logicalLayer.data(), &LogicalLayer::layerParameterChanged,
+            this, &LayerFactoryImpl::onLayerParameterChanged);
+
+    connect(logicalLayer.data(), &LogicalLayer::layerCreatedOnDemand,
+            this, &LayerFactoryImpl::onLayerCreatedOnDemand);
+
+    connect(logicalLayer.data(), &LogicalLayer::layerDoneLoading,
+            this, &LayerFactoryImpl::onLayerDoneLoading);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " getLogicalLayer failed";
+  return logicalLayer;
+}
+
+bool LayerFactoryImpl::addBasemapInternal(const QString &layername,
+                                          const QUrl &mapServiceUrl,
+                                          const BasemapType basemapType,
+                                          const double minScale,
+                                          const double maxScale,
+                                          const QString &displayName,
+                                          const QString &description,
+                                          const QImage &previewImage)
+{
+  if (mapServiceUrl.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mapServiceUrl empty, can not add layer "
+                        << layername << " basemap type: " << basemapType;
+    return false;
+  }
+
+  if (d->m_orderedMapLayer.contains(layername, LayerType::Undefined))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername '" << layername << "' already in use";
+    return false;
+  }
+
+  //-----------------------------------
+  // ArcGIS Tiled Basemap Layer
+  //-----------------------------------
+  //-----------------------------------------------------------------
+  // Attention:
+  // local    URLS -> do NOT specify any userCredentials (main)
+  // external URLS -> DO specify userCredentials (main)
+  //-----------------------------------------------------------------
+
+  Esri::ArcGISRuntime::Layer *layer = nullptr;
+
+
+  if (mapServiceUrl.isLocalFile())
+  {
+    QUrl finalUrl = this->completeUrl(QLatin1String("BASEMAP"),
+                                      mapServiceUrl,
+                                      QLatin1String("/"));
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " TileCache: finalUrl '" << finalUrl.toString() << "'"
+                       << ", finalUrltoLocalFile '" << finalUrl.toLocalFile() << "'";
+    QString tcFileAbs = finalUrl.toLocalFile();
+
+    QFileInfo fi(tcFileAbs);
+
+    if (!fi.exists(tcFileAbs))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " file '" << tcFileAbs << "' doesn't exists";
+      return false;
+    }
+
+    if (fi.isDir() ||                                   // TileCacheFolder
+        fi.suffix().compare(QLatin1String("tpk"))==0)   // TilePackage
+    {
+      Esri::ArcGISRuntime::TileCache *tileCache = new Esri::ArcGISRuntime::TileCache(tcFileAbs, d->m_mapImpl);
+      tileCache->setObjectName(QLatin1String("BasemapTileCache-")+layername);
+      layer = new Esri::ArcGISRuntime::ArcGISTiledLayer(tileCache, d->m_mapImpl);
+    }
+    else if (fi.suffix().compare(QLatin1String("vtpk"))==0)   // VectorTilePackage
+    {
+      Esri::ArcGISRuntime::VectorTileCache *vectorTileCache = new Esri::ArcGISRuntime::VectorTileCache(tcFileAbs, d->m_mapImpl);
+      vectorTileCache->setObjectName(QLatin1String("BasemapVectorTileCache-")+layername);
+      layer = new Esri::ArcGISRuntime::ArcGISVectorTiledLayer(vectorTileCache, d->m_mapImpl);
+    }
+    else
+    {
+      // geotiff (often '.tif')
+      Esri::ArcGISRuntime::Raster* raster = new Esri::ArcGISRuntime::Raster(tcFileAbs, d->m_mapImpl);
+      layer = new Esri::ArcGISRuntime::RasterLayer(raster, d->m_mapImpl);
+
+      // loading of the geotiff may take a while (tile by tile)
+    }
+  }
+  else
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " loading url '" << mapServiceUrl.toString() << "'";
+    layer = new Esri::ArcGISRuntime::ArcGISTiledLayer(mapServiceUrl, d->m_mapImpl);
+  }
+
+  layer->setName(layername);
+  layer->setObjectName(layer->name());
+
+  if (!d->m_orderedMapLayer.addLayer(layer->name(), SituationMap::LayerType::Basemap))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " addLayer failed'" << layer->name() << "'";
+  }
+
+  QImage previewImageFinal = previewImage;
+  if (previewImageFinal.isNull())
+  {
+    switch (basemapType)
+    {
+    case BasemapType::Undefined:
+    case BasemapType::Aerial:
+      previewImageFinal = QImage(QLatin1String(":/situationMap/preview_aerial.png"));
+      break;
+    case BasemapType::Topographic:
+      previewImageFinal = QImage(QLatin1String(":/situationMap/preview_topographic.png"));
+      break;
+    } // switch
+  }
+
+  if (! d->m_basemap)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no basemap!!!";
+    return false;
+  }
+
+
+  int basemapCount = -1;
+  if (d->m_basemap->baseLayers())
+    basemapCount = d->m_basemap->baseLayers()->size();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " basemapCount = " << basemapCount;
+
+  d->m_basemap->baseLayers()->append(layer);
+
+
+  // getLogicalLayer will
+  // - initialize
+  // - do errorHandling
+  // - update Layerparamter on doneLoading
+  // - and add layer to LayerListModel of basemap:
+  QSharedPointer<LogicalLayer> logicalLayer = this->getCreateLogicalLayer(layername);
+  if (logicalLayer.isNull())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " getLogicalLayer invalid'" << layername << "'";
+  }
+  else
+  {
+    // update LayerParameter first:
+    LayerParameter lp = logicalLayer->layerParameter();
+    lp.url            = mapServiceUrl;
+    lp.minScale       = minScale;
+    lp.maxScale       = maxScale;
+    lp.basemapType    = basemapType;
+    lp.displayName    = displayName;
+    lp.description    = description;
+    lp.previewImage   = previewImageFinal;
+    logicalLayer->setLayerParameter(lp);
+
+    logicalLayer->setLayer(layer);
+    logicalLayer->setLayerType(LayerType::Basemap);
+    logicalLayer->setBasemapType(basemapType);  // basemapType -> aerial, topo...
+  }
+
+
+  //  // load / retryLoad:
+  //  if (d->m_esriMap->loadStatus() == Esri::ArcGISRuntime::LoadStatus::FailedToLoad)
+  //    d->m_esriMap->retryLoad();
+  //  else
+  //    d->m_esriMap->load();
+
+  return true;
+}
+
+bool LayerFactoryImpl::removeLayerInternal(const LayerType &layerType, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layerType=" << layerType
+                      << " logicalLayerName=" << logicalLayerName;
+
+  if (logicalLayerName.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " logicalLayerName empty"
+                        << logicalLayerName;
+    return false;
+  }
+  if (! d->m_orderedMapLayer.contains(logicalLayerName, layerType))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " does not exist: '"
+                        << " layerType=" << layerType
+                        << " logicalLayerName='" << logicalLayerName << "'";
+    return false;
+  }
+
+  if (! d->hasLogicalLayer(logicalLayerName))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " does not exist: '"
+                        << " layerType=" << layerType
+                        << " logicalLayerName='" << logicalLayerName << "'";
+  }
+
+  if (! d->m_orderedMapLayer.removeLayer(logicalLayerName))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " remove failed: '"
+                        << " layerType=" << layerType;
+    return false;
+  }
+
+  d->removeLogicalLayer(logicalLayerName);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalLayerName='" << logicalLayerName << "'";
+  return true;
+}
+
+bool LayerFactoryImpl::reOrderLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " orderedList 1: " << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+
+  reOrderLayerBasemap();
+  reOrderLayerGraphicOverlays();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " orderedList 2: " << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool LayerFactoryImpl::reOrderLayerBasemap()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!(d->m_basemap &&
+        d->m_basemap->baseLayers() &&
+        ! d->m_basemap->baseLayers()->isEmpty())
+      )
+    return false;
+
+  const QStringList &allLogicalLayerNames = d->m_orderedMapLayer.layerNamesOrdered();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " orderedListAll: " << allLogicalLayerNames.join(QLatin1String(";"));
+
+  const QStringList &basemapLogicalNames = d->m_orderedMapLayer.layerNamesOrdered(LayerType::Basemap);
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " orderedListBasemap: " << basemapLogicalNames.join(QLatin1String(";"));
+
+  int newIdx = 0;
+  Esri::ArcGISRuntime::LayerListModel *model = d->m_basemap->baseLayers();
+  for (const QString &basemapName : basemapLogicalNames)
+  {
+    int curIdx = getEsriBasemapLayerIndex(basemapName);
+
+    if (curIdx != newIdx)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION
+                          << " move"
+                          << " basemapName ='" << basemapName << "'"
+                          << " from " << curIdx
+                          << " to " << newIdx << "...";
+      model->move(curIdx, newIdx);
+    }
+    ++newIdx;
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " orderedList: " << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+  return true;
+}
+
+bool LayerFactoryImpl::reOrderLayerGraphicOverlays()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " orderedList: " << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+
+  if (! d->getEsriGraphicsOverlayListModel())
+    return false;
+
+  if (d->getEsriGraphicsOverlayListModel()->isEmpty())
+    return false;
+
+  const QStringList &layernamesOrdered = d->m_orderedMapLayer.layerNamesOrdered();
+
+  //
+  // reOrder all GraphicOverlays:
+  //
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " layernamesOrdered: " << layernamesOrdered.join(QLatin1String(";"));
+
+  Esri::ArcGISRuntime::GraphicsOverlayListModel *model = d->getEsriGraphicsOverlayListModel();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " model.size() 1= " << model->size();
+
+
+  //  N. Thoden, 28.03.2018, V100.2.1  -  Consulting with Luke Smallwood:
+  //  Using the testFix for the crashOnStartup, the approach of
+  //    model->clear();
+  //    // re-append in required new order:
+  //    foreach (auto l, newOrderedGraphicsOverlayList)
+  //        model->append(l)
+  //  fails. -> go back to the initial (move) approach
+  // ==> use MOVE_APPROACH
+#define MOVE_APPROACH
+
+  // N. Thoden, 06.04.2018, V100.2.1  -  AFTER Consulting with Luke Smallwood:
+  // Scenario:
+  // - start opApp,
+  // - add simple plan/overlay (one ETS point symbol) via Overlay Dialag
+  //   (participants can be picked and MapObjectSelection is opened)
+  // - remove plan/overlay via Overlay Dialag
+  //   (participants can no longer be picked and MapObjectSelection is opened)
+  // -> EventMouseNavigator::onGetPickingResult gets empty list from ESRI...
+  // ==> toogle back to NOT using MOVE_APPROACH
+#undef MOVE_APPROACH
+
+  // N. Thoden, 30.08.2018, V100.3.0  -  behaviour is now:
+  // Using the MOVE_APPROACH the picking is working
+#if ACRGIS_VERSION >= 0x640300 // 100.3.0 / Update 3
+#  define MOVE_APPROACH
+#endif
+
+
+#ifdef MOVE_APPROACH
+  //
+  // model->move(curIdx, newIdx); seems to be buggy
+  // (N. Thoden, 29.09.2016, QuartzBeta1)
+  //
+  int newIdx = 0;
+  for (const QString &logicalname : layernamesOrdered)
+  {
+    QSharedPointer<LogicalLayer> ll = d->getLogicalLayer(logicalname);
+    if (ll && ll->basemapType() == BasemapType::Undefined)  //BasemapType::Undefined -> GraphicsOverlay
+    {
+      QList<QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay*> > pairs =
+          ll->getCurrentGraphicalOverlaysOrderedWithName();
+
+      QListIterator< QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay*> > it(pairs);
+
+      while (it.hasNext())
+      {
+        const QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay*> &pair = it.next();
+
+        const QString &esriLayername = pair.first;
+        Esri::ArcGISRuntime::GraphicsOverlay *graphicalOverlay = pair.second;
+
+        DEBUG_LOG(m_logger) << LOGFUNCTION
+                            << " handle"
+                            << " esriLayername='" << esriLayername << "':";
+
+        int curIdx = model->indexOf(graphicalOverlay);
+
+        DEBUG_LOG(m_logger) << LOGFUNCTION
+                            << " handle"
+                            << " esriLayername='" << esriLayername << "':"
+                            << " curIdx=" << curIdx << " -> newIdx="<< newIdx;
+
+        if (curIdx < 0)
+        {
+          FATAL_LOG(m_logger) << LOGFUNCTION
+                              << " esriLayername='" << esriLayername << "':"
+                              << " not found";
+          abort();
+          // continue;
+        }
+
+        if (curIdx != newIdx)
+        {
+          DEBUG_LOG(m_logger) << LOGFUNCTION
+                              << " move"
+                              << " GraphicOverlays ="
+                              << " from " << curIdx
+                              << " to " << newIdx << "..." ;
+          DEBUG_LOG(m_logger) << LOGFUNCTION << " model.size() 2= " << model->size();
+          model->move(curIdx, newIdx);
+          DEBUG_LOG(m_logger) << LOGFUNCTION << " model.size() 3= " << model->size();
+
+          int retIdx = model->indexOf(graphicalOverlay);
+
+          if (retIdx != newIdx)
+          {
+            FATAL_LOG(m_logger) << LOGFUNCTION
+                                << " esriLayername='" << esriLayername << "':"
+                                << " move failed"
+                                << " curIdx='" << curIdx
+                                << " newIdx='" << newIdx
+                                << " retIdx='" << retIdx;
+            abort();
+          }
+        }
+        ++newIdx;
+      } // while
+    } // if
+  } // for
+
+#else
+
+  // build new order of GraphicsOverlays :
+  QList<Esri::ArcGISRuntime::GraphicsOverlay *> newOrderedGraphicsOverlayList;
+
+  foreach (const QString &logicalname, layernamesOrdered)
+  {
+    QSharedPointer<LogicalLayer> ll = d->getLogicalLayer(logicalname);
+    if (ll && ll->basemapType() == BasemapType::Undefined)  //BasemapType::Undefined -> GraphicsOverlay
+    {
+      QList<QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> > pairs =
+          ll->getCurrentGraphicalOverlaysOrderedWithName();
+
+      QListIterator< QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> > it(pairs);
+
+      while (it.hasNext())
+      {
+        const QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> &pair = it.next();
+
+        QString esriLayername = pair.first;
+        Esri::ArcGISRuntime::GraphicsOverlay *graphicalOverlay = pair.second;
+
+        DEBUG_LOG(m_logger) << LOGFUNCTION
+                            << " handle"
+                            << " esriLayername='" << esriLayername << "'";
+        newOrderedGraphicsOverlayList.append(graphicalOverlay);
+      } // while
+    } // if
+  } // foreach
+  // : build new order of GraphicsOverlays
+
+  // clear model:
+  model->clear();
+
+  // re-append in required new order:
+  foreach (auto l, newOrderedGraphicsOverlayList)
+    model->append(l);
+
+#endif // MOVE_APPROACH
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " model.size() 4= " << model->size();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " orderedList: " << d->m_orderedMapLayer.layerNamesOrdered().join(QLatin1String(";"));
+  return true;
+}
+
+int LayerFactoryImpl::getEsriBasemapLayerIndex(const QString &esriLayername) const
+{
+  if (!(d->m_basemap && d->m_basemap->baseLayers()))
+    return -1;
+
+  const Esri::ArcGISRuntime::LayerListModel *model = d->m_basemap->baseLayers();
+  for (int i = 0; i < model->size(); ++i)
+  {
+    const Esri::ArcGISRuntime::Layer *curLayer = model->at(i);
+    const QString &curName = curLayer->name();
+    if (QString::compare(esriLayername, curName) == 0)
+      return i;
+  }
+  return -1;
+}
+
+Esri::ArcGISRuntime::Layer *LayerFactoryImpl::getEsriBasemapLayer(const QString &esriLayername) const
+{
+  int idx = getEsriBasemapLayerIndex(esriLayername);
+  if (idx < 0)
+    return nullptr;
+  // d->m_basemap already checked within 'getEsriBasemapLayerIndex'
+  Esri::ArcGISRuntime::Layer *layerFound = d->m_basemap->baseLayers()->at(idx);
+  return layerFound;
+}
+
+QUrl LayerFactoryImpl::completeUrl(const QString &context,
+                                   const QUrl &urlIn,
+                                   const QString &resourceSubdir)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " context='" << context << "'"
+                      << ", urlIn='"         << urlIn.toString()
+                      << " resourceSubdir='" << resourceSubdir << "'";
+
+  if (!urlIn.isLocalFile())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " http -> return"
+                        << ", url ='"         << urlIn.toString();
+    return urlIn;
+  }
+
+  // assume it´s a file url:
+  // make absolute path according resourcePath:
+  QString filePathAbs = urlIn.toLocalFile();
+  if (QDir::isRelativePath(filePathAbs))
+    filePathAbs = SituationMap::getResourcePath() + resourceSubdir + filePathAbs;
+
+  if (!QFileInfo::exists(filePathAbs))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " context='" << context << "'"
+                        << " file '" << filePathAbs << "' doesn't exists";
+    return urlIn;
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " context='" << context << "'"
+                      << ", filePathAbs='"         << filePathAbs << "'";
+  return QUrl::fromLocalFile(filePathAbs);
+}
+
+
+void LayerFactoryImpl::onLayerParameterChanged(const QString &layername, const LayerParameter &newLayerParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " layername='" << layername << "'"
+                      << ", newLayerParameter='"         << newLayerParameter;
+  d->m_mapImpl->emitLayerParameterChanged(layername, newLayerParameter);
+}
+
+void LayerFactoryImpl::onLayerCreatedOnDemand(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalName='" << logicalName << "'";
+  this->reOrderLayer();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalName='" << logicalName << "'";
+}
+
+void LayerFactoryImpl::onLayerDoneLoading(const QString &logicalName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalName='" << logicalName << "'";
+
+  MapLayer mapLayer = d->m_orderedMapLayer.getLayer(logicalName);
+  if (!mapLayer.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mapLayer not found"
+                        << " layername='" << logicalName << "'";
+  }
+
+  if (mapLayer.type() != LayerType::Basemap)
+    return;
+
+  QSharedPointer<LogicalLayer> layer = d->getLogicalLayer(logicalName);
+  if (!layer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no layer, "
+                        << " layername='" << logicalName << "'";
+    return;
+  }
+
+  // Bugfix :
+  //  REGG-5350 - mit dem normalen Zoom ( Mausrad ) kann man 6 Stufen ansteuern.
+  //    Erst nach der Ums...
+  //  REGG-5338 - In der Live-Lage ist die Zoomstufe nicht
+  //    vollständig nutzbar, das letzte Viertel...
+  //  REGG-5317 - Die Lagekarte der 1. Lageanwendung lässt sich nicht bis
+  //    zur untersten Begrenzung...
+
+  // (Hinein)Zoomen nur bis Scale 4000 moeglich...
+  // Tritt mit TA Letzlingen und User OHNE Settings sgelgentlich auf.
+  // Loesungsansatz: Slot-Methoden von synchronen Aufruf zu
+  // reCalculateMinMaxScaleBasedOnLayers befreien und per Timer aufrufen.
+  //  // reCalculate minMaxScale even if there is just one Basemap:
+  //  // calulcate and set values direct:
+  //  reCalculateMinMaxScaleBasedOnLayers();
+  // : Bugfix
+
+  // do via timer:
+  d->reCalculateMinMaxScaleTimer->start(); // start == restart
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " logicalName='" << logicalName << "'";
+}
+
+void LayerFactoryImpl::onElevationSourceDoneLoading()
+{
+  Esri::ArcGISRuntime::ElevationSource *elevationSource = qobject_cast<Esri::ArcGISRuntime::ElevationSource *>(sender());
+  if (elevationSource)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " ElevationSource -> doneLoading: "
+                       << " sender= '" << elevationSource->objectName() << "'"
+                       << " loadStatus= '" << elevationSource->loadStatus() << "'"
+                       << " elevationSourceType= " << elevationSource->elevationSourceType();
+
+    INFO_LOG(m_logger) << LOGFUNCTION << " ElevationSources " << elevationSourcesLoaded();
+
+    if (elevationSourcesLoaded())
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION << " ElevationSources completed";
+      d->m_mapImpl->emitAllElevationSourcesLoaded();
+    }
+  }
+  else
+    INFO_LOG(m_logger) << LOGFUNCTION << " ElevationSource -> doneLoading";
+
+}
+
+void LayerFactoryImpl::onElevationSourceErrorOccured(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::ElevationSource *elevationSource = qobject_cast<Esri::ArcGISRuntime::ElevationSource *>(sender());
+  if (elevationSource)
+    senderName = elevationSource->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " ElevationSource -> EsriError occured: " << error
+                      << ", sender= '" << senderName << "'";
+}
+
+void LayerFactoryImpl::onSurfaceDoneLoading2D()
+{
+  QString senderName;
+  Esri::ArcGISRuntime::Surface *surface = qobject_cast<Esri::ArcGISRuntime::Surface *>(sender());
+  if (surface)
+    senderName = surface->objectName();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " Surface -> doneLoading: "
+                     << " sender= '" << senderName << "'";
+}
+
+void LayerFactoryImpl::onSurfaceErrorOccured2D(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::Surface *surface = qobject_cast<Esri::ArcGISRuntime::Surface *>(sender());
+  if (surface)
+    senderName = surface->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " Surface -> EsriError occured: " << error
+                      << ", sender= '" << senderName << "'";
+}
+
+void LayerFactoryImpl::reCalculateMinMaxScaleBasedOnLayers()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const QStringList &layernames = d->m_orderedMapLayer.layerNamesOrdered(LayerType::Basemap);
+
+  double minScale = 0;
+  double maxScale = 0;
+
+  QList<int> minScales;
+  QList<int> maxScales;
+
+
+  bool initial = true;
+
+  for (const QString &layername : layernames)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " layername" << layername;
+
+    QSharedPointer<LogicalLayer> layer = d->getLogicalLayer(layername);
+    if (!layer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no layer, "
+                          << " layername='" << layername << "'";
+      continue;
+    }
+
+    const LayerParameter &layerParameter = layer->layerParameter();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " layername='" << layername << "'"
+                        << " minScale=" << layerParameter.minScale
+                        << " maxScale=" << layerParameter.maxScale;
+
+
+    // already loaded? (
+    if (!layerParameter.minMaxScaleValid())
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " layername" << layername
+                          << " not valid";
+      continue;
+    }
+
+    double localMinScale = layerParameter.minScale;
+    double localMaxScale = layerParameter.maxScale;
+
+    minScales.append(static_cast<int>(localMinScale));
+    maxScales.append(static_cast<int>(localMaxScale));
+
+    // first time: set initial values:
+    if (initial)
+    {
+      initial = false;
+      minScale = localMinScale;
+      maxScale = localMaxScale;
+    }
+    else
+    {
+      minScale = std::max(minScale, localMinScale); // use std::max for minScale!!!
+      maxScale = std::min(maxScale, localMaxScale); // use std::min for maxScale!!!
+    }
+  } // for
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION
+                      << " a minScale=" << minScale
+                      << " maxScale=" << maxScale;
+
+  // OGC: scales are optional. In this case use '0':
+  // For MinScale:
+  if (minScales.contains(0))
+    minScale = 0;
+
+  // For MaxScale:
+  if (maxScales.contains(0))
+    maxScale = 0;
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION
+                      << " apply "
+                      << " minScale=" << minScale
+                      << " maxScale=" << maxScale;
+//  d->m_mapImpl->setMinScale(minScale+1);  // why did i wrote this?
+//  d->m_mapImpl->setMaxScale(maxScale+1);  // why did i wrote this?
+  d->m_mapImpl->setMinScale(minScale);
+  d->m_mapImpl->setMaxScale(maxScale);
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.h
new file mode 100755
index 000000000..a5dab51d0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/layer_factory_impl.h
@@ -0,0 +1,324 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LayerFactory
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "map_layer.h"
+#include "logical_layer.h"
+#include <Map/layer_factory.h>
+#include <Map/situation_map_types.h>
+#include <Map/party_id_to_color_functor.h>
+#include <Common/situation_map_logging.h>
+
+
+// ESRI
+#include <Error.h>
+#include <Surface.h>
+
+
+// Qt
+#include <QObject>
+
+
+// Forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Layer;
+class GraphicsOverlay;
+class RasterElevationSource;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+
+
+/**
+ * @brief The LayerFactoryImpl
+ *
+ *
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class LayerFactoryImpl : public QObject,  public virtual LayerFactory
+{
+  Q_OBJECT
+
+  using BaseClass = QObject;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit LayerFactoryImpl(QObject *parent, SituationMap::MapImpl *mapImpl);
+  virtual ~LayerFactoryImpl();
+
+  LayerFactoryImpl(const LayerFactoryImpl &other)           = delete;
+  LayerFactoryImpl &operator=(const LayerFactoryImpl &other) = delete;
+  //@}
+
+  /*! \name Basemap Layer */
+  //@{
+  bool initializeBasemapBuiltIn(const QString &tpkFile) override;
+  bool isUsingBaseMapBuiltIn() const override;
+
+  QString basemapLayernamePrefix() const override;
+  void setBasemapLayernamePrefix(const QString &basemapLayernamePrefix) override;
+
+  QString participantLayername() const override;
+  RenderingMode participantLayerRenderingMode() const override;
+  SurfacePlacement participantLayerSurfacePlacement() const override;
+  void setParticipantLayer(const QString &participantLayername,
+                           RenderingMode renderingMode,
+                           SurfacePlacement surfacePlacement) override;
+
+
+  bool addBasemap(const QString &layername,
+                  const QUrl &mapServiceUrl,
+                  const BasemapType basemapType,
+                  const double minScale = -1,
+                  const double maxScale = -1,
+                  const QString &displayName = QString(),
+                  const QString &description = QString(),
+                  const QImage &previewImage = QImage()) override;
+  bool removeBasemap(const QString &layername) override;
+
+  Esri::ArcGISRuntime::Envelope fullExtentOfBasemaps(double margin_zeroToOne = 0.0) const;
+
+  //@}
+
+  /*! \name Scene Object Layer */
+  //@{
+  bool addSceneObjectLayer(const QString &layername,
+                           const QUrl &sceneLayerServiceUrl,
+                           const double altitudeOffset = 0,
+                           const QString &displayName = QString(),
+                           const QString &description = QString(),
+                           const QImage &previewImage = QImage()) override;
+
+  bool isSceneObjectLayerVisible() const override;
+  void setSceneObjectLayerVisible(bool visible) override;
+  //@}
+
+
+  /*! \name Elevation */
+  //@{
+  bool initializeElevationSources(const QStringList &sceneElevationServiceUrls) override;
+  //@}
+
+  /*! \name Operational Layer */
+  //@{
+
+  static void setForceCreationOfGraphicsOverlay(bool onOff);  // to deal with esri bug
+
+  bool addOperationalLayer(const QString &logicalLayerName,
+                           const QString &displayName,
+                           RenderingMode renderMode = RenderingMode::Dynamic,
+                           SurfacePlacement surfacePlacement = SurfacePlacement::Relative) override;
+  bool removeOperationalLayer(const QString &logicalLayerName) override;
+  bool hasOperationalLayer(const QString &logicalLayerName) const override;
+
+
+  QString layernameForCubes() const override;
+  void setLayernameForCubes(const QString &logicalName) override;
+  bool hasLayernameForCubes() const override;
+
+  bool assignUniqueValueRendererForCubes() override;
+
+  bool assignUniqueValueRenderer(const QString &layername,
+                                 const QString &fieldName,
+                                 const QVector<UniqueValueData> &uvDataCont) override;
+
+  // For BoobyTraps
+  bool assignUniqueValueRendererAesCentral(const QString &layername,
+                                           const QStringList &fieldNames,
+                                           const QVector<UniqueValueDataAesCentral> &uvDataCont) override;
+
+  // For AES / 3D Extrusion
+  bool assignUniqueValueRendererAesCentral3DExtrusion(const QString &layername,
+                                                      const QStringList &fieldNames,
+                                                      const QVector<UniqueValueDataAesCentral> &uvDataCont) override;
+
+
+  bool initializeUnitTestLayer() override;
+  //@}
+
+
+  /*! \name Overlay Layer */
+  //@{
+  bool addOverlayLayer(const QString &logicalLayerName, const QString &displayName, bool isSnaphot = false) override;
+  QString technicalNameOfOverlayLayer(const QString &logicalLayerName);
+  bool removeOverlayLayer(const QString &logicalLayerName) override;
+
+  QString snapshotOverlayLayername() const override;
+  //@}
+
+
+  /*! \name Snapshot (overlay) Layer */
+  //@{
+  QString snapshotLayer();
+  bool snapshotLayerExists() const;
+  //@}
+
+
+  /*! \name JumpPoint Layer */
+  //@{
+  QString jumpPointLayer();
+  bool jumpPointLayerExists() const;
+  //@}
+
+  /*! \name Tool Layer */
+  //@{
+  QString toolLayer() override;              // Tools: Viewshed etc.
+  bool toolLayerExists() const;     // Tools: Viewshed etc.
+  //@}
+
+  /*! \name Rubberband Layer */
+  //@{
+  QString rubberbandLayer() const override;
+  bool rubberbandLayerExists() const;
+  //@}
+
+  /*! \name EmergencyCall Layer (at least relevant for GUEZ) */
+  //@{
+  QString emergencyCallLayer(bool getJustTheName = false) override;
+  bool emergencyCallLayerExists() const override;
+
+  bool switchEmergencyCallLayerOn() override;
+  bool switchEmergencyCallLayerOff() override;
+
+  void handleEmergencyCallSpecials();
+  //@}
+
+
+  /*! \name Common */
+  //@{
+  Map                  *map() const override;
+  int                   count() const override;
+  QStringList           layernames() const override;
+  QStringList           layernames(const LayerType &layerType) const override;
+  bool                  checkLayerOrder(const QStringList &orderedLayernames) override;
+  bool                  orderLayerTo(const QStringList &orderedLayernames) override;
+
+  LayerType             layerType(const QString &layername) const override;
+  LayerParameter        layerParameter(const QString &layername) const override;
+  bool                  setLayerParameter(const QString &layername, const LayerParameter &layerParameter) override;
+
+  bool setLayerOpacity(LayerType layerType, int opacity) override;
+  bool setLayerBrightness(LayerType layerType, int brightness) override;
+  bool setLayerContrast(LayerType layerType, int contrast) override;
+  bool setLayerGamma(LayerType layerType, int gamma) override;
+  bool setLayerParameter(LayerType layerType, int value, int LayerParameter::*memberPtr);
+  void setLayersVisible(const QVector<LayerType> &layerTypes, bool visible) override;
+  //@}
+
+
+#if ACRGIS_VERSION < 0x640500 // 100.5.0 / Update 5
+  /*! \name Selection */
+  //@{
+  QColor selectionColor() const override;
+  void setSelectionColor(const QColor &selectionColor) override;
+  //@}
+#endif // ACRGIS_VERSION
+
+
+  /*! \name Elevation */
+  //@{
+  Esri::ArcGISRuntime::Surface *baseSurface() const;
+  bool elevationAvailable() const override;
+  int elevationSourcesCount(bool checkIfLoaded = false) const;
+  bool elevationSourcesLoaded();
+  QPointer<LocationToElevationHelper>locationToElevation() const override;
+  //@}
+
+  // Not LayerIf, but for MapObject(Impl)
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayerDict(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer3DExtrusion(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer3D_SpAbsolute(const QString &logicalName);
+
+protected slots:
+  void onLayerParameterChanged(const QString &layername,
+                               const LayerParameter &newLayerParameter);
+
+  void onLayerCreatedOnDemand(const QString &logicalName);
+  void onLayerDoneLoading(const QString &logicalName);
+
+  void onElevationSourceDoneLoading();
+  void onElevationSourceErrorOccured(const Esri::ArcGISRuntime::Error &error);
+
+  void onSurfaceDoneLoading2D();
+  void onSurfaceErrorOccured2D(const Esri::ArcGISRuntime::Error &error);
+
+  void reCalculateMinMaxScaleBasedOnLayers();
+
+protected:
+  bool initializeElevationSources2D(const QStringList &sceneElevationServiceUrls);
+  bool initializeElevationSources3D(const QStringList &sceneElevationServiceUrls);
+  QList<Esri::ArcGISRuntime::ElevationSource*> initializeElevationSourcesInternal(const QStringList &sceneElevationServiceUrls);
+  Esri::ArcGISRuntime::ElevationSource* initializeElevationSourceInternal(const QUrl &elevationServiceUrl, int layerCount);
+  Esri::ArcGISRuntime::RasterElevationSource *initializeRasterElevationSourceInternal(const QStringList &filePaths);
+
+
+  QSharedPointer<LogicalLayer> addLayerToMgnt(const QString &logicalLayerName, const LayerType &layerType);
+  bool layerExistsInMngt(const QString &logicalLayerName, const LayerType &layerType) const;
+
+  QString createInternalLayerName(const TechnicalLayerType &technicalLayerType,
+                                  const QString &logicalLayerName) const;
+
+  QSharedPointer<LogicalLayer> getLogicalLayer(const QString &logicalName) const;
+  QSharedPointer<LogicalLayer> getCreateLogicalLayer(const QString &logicalName);
+
+
+  virtual bool addBasemapInternal(const QString &layername,
+                                  const QUrl &mapServiceUrl,
+                                  const BasemapType basemapType,
+                                  const double minScale = -1,
+                                  const double maxScale = -1,
+                                  const QString &displayName = QString(),
+                                  const QString &description = QString(),
+                                  const QImage &previewImage = QImage());
+
+
+  bool removeLayerInternal(const LayerType &layerType, const QString &logicalLayerName);
+
+
+  virtual bool                reOrderLayer();
+  virtual bool                reOrderLayerBasemap();
+  virtual bool                reOrderLayerGraphicOverlays();
+
+  int                         getEsriBasemapLayerIndex(const QString &esriLayername) const;
+  Esri::ArcGISRuntime::Layer *getEsriBasemapLayer(const QString &esriLayername) const;
+
+  QUrl completeUrl(const QString &context,
+                   const QUrl &urlIn,
+                   const QString &resourceSubdir);
+
+private :
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.cpp
new file mode 100755
index 000000000..89f91b2a7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.cpp
@@ -0,0 +1,248 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LocationDisplay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "location_display_impl.h"
+#include "map_impl.h"
+#include <Map/situation_map_utils.h>
+#include <MapImpl/coordinate_translation.h>
+
+
+// ESRI
+#include <arcgisversion.h>  // This file is created by RME, not ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+
+#if ACRGIS_VERSION >= 0x640800 // 100.8.0 / Update 8
+#  define HAS_LOCATION_DISPLAY
+#endif // ACRGIS_VERSION
+
+#ifdef HAS_LOCATION_DISPLAY
+#  include <LocationDisplay.h>
+#  include <SimulatedLocationDataSource.h>
+#  include <Location.h>
+#  include <Point.h>
+#endif // HAS_LOCATION_DISPLAY
+
+// Qt
+
+
+namespace SituationMap
+{
+
+#ifdef HAS_LOCATION_DISPLAY
+
+class LocationDisplayImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SituationMap::MapImpl                            *m_mapImpl{nullptr};
+  OriginTranslated                                  m_originTranslated;
+
+  Esri::ArcGISRuntime::LocationDisplay             *m_locationDisplay{nullptr};
+  Esri::ArcGISRuntime::SimulatedLocationDataSource *m_locationDataSource{nullptr};
+
+}; // class LocationDisplayImpl::Private
+//-----------------------------------------------------------------------------
+
+
+LocationDisplayImpl::LocationDisplayImpl(SituationMap::MapImpl *mapImpl)
+  : m_logger(getLogger("LocationDisplayImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mapImpl = mapImpl;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+LocationDisplayImpl::~LocationDisplayImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LocationDisplayImpl::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!d->m_mapImpl)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
+    return false;
+  }
+  if (d->m_mapImpl->mode() != Mode::Mode_2D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " LocationDisplay only supported at Mode2D";
+    return false;
+  }
+
+  // setup coordTranslationFunctor
+  d->m_originTranslated.setCoordTransFunctor(d->m_mapImpl->coordTranslationFunctor());
+
+  d->m_locationDisplay = d->m_mapImpl->getEsriMapGraphicsView()->locationDisplay();
+  if (!d->m_locationDisplay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no locationDisplay";
+    return false;
+  }
+
+  // setup LocationDisplay:
+  if (d->m_locationDisplay->objectName().isEmpty())
+    d->m_locationDisplay->setObjectName(QStringLiteral("EsriLocationDisplay"));
+
+  QObject::connect(d->m_locationDisplay, &Esri::ArcGISRuntime::LocationDisplay::errorOccurred, d->m_locationDisplay, [this](const Esri::ArcGISRuntime::Error &error) {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error on LocationDisplay, error " << error;
+  });
+  if (m_logger.isDebugEnabled())
+    QObject::connect(d->m_locationDisplay, &Esri::ArcGISRuntime::LocationDisplay::locationChanged, d->m_locationDisplay, [this](const Esri::ArcGISRuntime::Location &location) {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " Location changed: " << location.position().toJson();
+    });
+
+  // setup DataSource:
+  d->m_locationDataSource = new Esri::ArcGISRuntime::SimulatedLocationDataSource(d->m_mapImpl);
+  d->m_locationDataSource->setObjectName(QStringLiteral("SimulatedLocationDataSource"));
+  QObject::connect(d->m_locationDataSource, &Esri::ArcGISRuntime::SimulatedLocationDataSource::errorOccurred, d->m_locationDisplay, [this](const Esri::ArcGISRuntime::Error &error) {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error on SimulatedLocationDataSource, error " << error;
+  });
+
+  // Maybe reduce animation rate:
+  // d->m_locationDataSource->setIterationRate(0.25);
+
+  d->m_locationDisplay->setDataSource(d->m_locationDataSource);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return (d->m_locationDisplay);
+}
+
+bool LocationDisplayImpl::setCurrentLocation(const Point3D & currentLocation,
+                                             double horizontalAccuracy,
+                                             double velocity,
+                                             double course,
+                                             bool lastKnown)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, currentLocation=" << currentLocation
+                      << ", horizontalAccuracy=" << horizontalAccuracy
+                      << ", velocity=" << velocity
+                      << ", course=" << course
+                      << ", lastKnown=" << lastKnown;
+  if (!d->m_mapImpl)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
+    return false;
+  }
+  if (!d->m_locationDataSource)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no locationDataSource";
+    return false;
+  }
+
+  // convert using coordTranslationFunctor (wrapped by OriginTranslated)
+  d->m_originTranslated.setOrigin(currentLocation);
+  const Point3D &origionTranslated = d->m_originTranslated.originTranslated();
+
+  Esri::ArcGISRuntime::Point point(origionTranslated.x(), origionTranslated.y(), origionTranslated.z(), d->m_mapImpl->getEsriSpatialReference());
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " point=" << point.toJson();
+
+//  const int velocity = 0; // 0 => kein Richtungsinformation in der Darstellung
+  Esri::ArcGISRuntime::Location location(point,
+                                         0,                          // The horizontal accuracy in meters. Positive values or NaN are supported
+                                         velocity,                   // The location's velocity in meters per second
+                                         course,                     // The location's course in degrees (clockwise), 0 being true North.
+                                         lastKnown                   // (false->blue ; true -> gray)
+                                         );
+
+  d->m_locationDataSource->setLocations({location});
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool LocationDisplayImpl::setOutdated(bool lastKnown)
+{
+  return setCurrentLocation(d->m_originTranslated.origin(),0.0 ,0.0 ,0.0 ,lastKnown);
+}
+
+
+bool LocationDisplayImpl::start()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  // 2023, N.Thoden: V100.15: use LocationDisplay instead of LocationDataSource
+  if (!d->m_locationDisplay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no locationDisplay";
+    return false;
+  }
+
+//  d->m_locationDisplay->setAutoPanMode(Esri::ArcGISRuntime::LocationDisplayAutoPanMode::Recenter);
+//  d->m_locationDisplay->setInitialZoomScale(8123);
+
+  d->m_locationDisplay->start();
+//  d->m_locationDataSource->start();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void LocationDisplayImpl::stop()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  // 2023, N.Thoden: V100.15: use LocationDisplay instead of LocationDataSource
+  if (!d->m_locationDisplay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no locationDisplay";
+    return;
+  }
+
+  d->m_locationDisplay->stop();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LocationDisplayImpl::isStarted()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  // 2023, N.Thoden: V100.15: avoid deprecated, use LocationDisplay instead of LocationDataSource
+  if (!d->m_locationDisplay)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no locationDisplay";
+    return false;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_locationDisplay->isStarted();
+}
+
+#else // HAS_LOCATION_DISPLAY
+
+  LocationDisplayImpl::LocationDisplayImpl(SituationMap::MapImpl *mapImpl)
+    : m_logger(getLogger("LocationDisplayImpl"))
+    , d(nullptr)
+  {    Q_UNUSED(mapImpl);  }
+
+  LocationDisplayImpl::~LocationDisplayImpl() {}
+
+  bool LocationDisplayImpl::init() {return false; }
+
+  bool LocationDisplayImpl::setCurrentLocation(const Point3D & /*currentLocation*/,
+                                               double /*horizontalAccuracy*/,
+                                               double /*velocity*/,
+                                               double /*course*/,
+                                               bool /*lastKnown*/)
+                                            { return false; }
+
+  bool LocationDisplayImpl::start()         { return false; }
+  void LocationDisplayImpl::stop()          { }
+  bool LocationDisplayImpl::isStarted()     { return false; }
+  bool LocationDisplayImpl::setOutdated(bool lastKnown) { return lastKnown;  }
+
+
+#endif // HAS_LOCATION_DISPLAY
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.h
new file mode 100755
index 000000000..150a1d461
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_display_impl.h
@@ -0,0 +1,61 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LocationDisplay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/location_display.h> // Interface
+#include <Common/situation_map_logging.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+class LocationDisplayImpl : public SituationMap::LocationDisplay
+{
+  using BaseClass = SituationMap::LocationDisplay;
+
+public:
+
+  explicit LocationDisplayImpl(SituationMap::MapImpl *mapImpl);
+  virtual ~LocationDisplayImpl();
+
+  LocationDisplayImpl(const LocationDisplayImpl &other)      = delete;
+  LocationDisplayImpl &operator=(LocationDisplayImpl &other) = delete;
+
+  bool init();
+
+  bool setCurrentLocation(const Point3D & currentLocation,
+                          double horizontalAccuracy = 0,
+                          double velocity = 0,
+                          double course = 0,
+                          bool lastKnown = false
+                          ) override;
+  bool setOutdated(bool lastKnown) override;
+
+  bool start() override;
+  void stop() override;
+  bool isStarted() override;
+
+
+private :
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d{nullptr};
+
+};
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.cpp
new file mode 100755
index 000000000..a420ec4bd
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.cpp
@@ -0,0 +1,218 @@
+/**
+  * @RDE_HEADER@
+  * LocationToElevationBulk
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "location_to_elevation_bulk.h"
+#include <MapImpl/map_impl.h>
+#include "Map/situation_map_utils.h"
+
+#include "location_to_elevation_helper.h"  // to get define USE_ELEVATION_MAP_AS_WORKAROUND
+
+
+// ESRI
+#include <Surface.h>
+#include <Point.h>
+
+
+// Qt
+#include <QPointer>
+#include <QVector>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+class LocationToElevationBulk::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+
+  // ESRI data:
+  QPointer<Esri::ArcGISRuntime::Surface>  m_surface;      // for ESRI-Surface-based calculation
+  QPointer<Map>                           m_map;          // for ElevationMap-based calculation
+
+  Esri::ArcGISRuntime::Point              m_location;
+
+  Esri::ArcGISRuntime::SpatialReference   m_spatialReference;
+
+
+
+  QVector<QSharedPointer<LocationData>>   m_locationDataCont;
+  int                                     m_progressCount = 0;
+};
+
+
+//----------------------------------------------------------------------------
+LocationToElevationBulk::LocationToElevationBulk(QObject *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("LocationToElevationBulk"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  reset();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+LocationToElevationBulk::~LocationToElevationBulk()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->stop();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LocationToElevationBulk::init(Map *map, Esri::ArcGISRuntime::Surface *surface)
+{
+  this->reset();
+
+  if (!map)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
+    return false;
+  }
+  d->m_map = map;
+
+  connect(d->m_map.data(), &Map::beginDestroy, this, &LocationToElevationBulk::stop);
+
+  MapImpl *mapImpl = static_cast<MapImpl*>(d->m_map.data());
+  d->m_spatialReference = mapImpl->getEsriSpatialReference();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " m_spatialReference.wkid = " << d->m_spatialReference.wkid();
+
+  // use ESRI-Surface-based OR ElevationMap-based:
+
+#ifdef USE_ELEVATION_MAP_AS_WORKAROUND
+  Q_UNUSED(surface);
+  d->m_surface.clear();
+
+  auto elevationMap = static_cast<MapImpl*>(d->m_map.data())->getElevationMapManager();
+  if (!elevationMap)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no ElevationMapManager";
+    return false;
+  }
+
+#else
+  d->m_surface = surface;
+  if (!d->m_surface)
+    return false;
+
+
+  if (d->m_surface)
+  {
+    // be prepared in case of destruction:
+    connect(d->m_surface.data(), &Esri::ArcGISRuntime::Surface::destroyed, this, &LocationToElevationBulk::stop);
+  }
+#endif // USE_ELEVATION_MAP_AS_WORKAROUND
+
+  return true;
+}
+
+void LocationToElevationBulk::addLocation(const Esri::ArcGISRuntime::Point &esriMapLocation)
+{
+  d->m_locationDataCont.append(QSharedPointer<LocationData>(new LocationData(esriMapLocation)));
+}
+
+void LocationToElevationBulk::start()
+{
+  d->m_progressCount = 0;
+
+#ifndef USE_ELEVATION_MAP_AS_WORKAROUND
+
+  if (!d->m_surface || d->m_surface->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no surface or surface not loaded yet"
+                        << " d->m_surface = " << d->m_surface.data();
+    return;
+  }
+#endif // USE_ELEVATION_MAP_AS_WORKAROUND
+
+  QMutableVectorIterator<QSharedPointer<LocationData>> vecIt(d->m_locationDataCont);
+  while (vecIt.hasNext())
+  {
+    QSharedPointer<LocationData> ld = vecIt.next();
+    if(!ld)
+      continue;
+
+#ifdef USE_ELEVATION_MAP_AS_WORKAROUND
+    ld->setMap(d->m_map);
+#else
+    ld->setSurface(d->m_surface);
+#endif // USE_ELEVATION_MAP_AS_WORKAROUND
+
+
+    connect(ld.data(), &LocationData::elevationCompleted,
+            this, &LocationToElevationBulk::onLocationDataCompleted, Qt::UniqueConnection);
+
+    if (!ld->startLocationToElevation())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " startLocationToElevation failed";
+  } // while
+}
+
+
+void LocationToElevationBulk::stop()
+{
+  QMutableVectorIterator<QSharedPointer<LocationData>> vecIt(d->m_locationDataCont);
+  while (vecIt.hasNext())
+  {
+    QSharedPointer<LocationData> ld = vecIt.next();
+    if(!ld)
+      continue;
+    if (!ld->cancel())
+      INFO_LOG(m_logger) << LOGFUNCTION << " LocationData.cancel failed";
+  } // while
+}
+
+void LocationToElevationBulk::reset()
+{
+  stop();
+  d->m_locationDataCont.clear();
+  d->m_progressCount = 0;
+}
+
+int LocationToElevationBulk::size() const
+{
+  return d->m_locationDataCont.size();
+}
+
+QVector<QPair<QPointF, double> > LocationToElevationBulk::results() const
+{
+  QVector<QPair<QPointF, double> > results;
+
+  QVectorIterator<QSharedPointer<LocationData>> vecIt(d->m_locationDataCont);
+  while (vecIt.hasNext())
+  {
+    QSharedPointer<LocationData> ld = vecIt.next();
+    if(!ld)
+      continue;
+
+    const Esri::ArcGISRuntime::Point &location = ld->location();
+    QPair<QPointF, double> pair(QPointF(location.x(), location.y()), ld->elevation());
+    results.append(pair);
+  }
+  return results;
+}
+
+void LocationToElevationBulk::onLocationDataCompleted()
+{
+  ++d->m_progressCount;
+
+  if (d->m_progressCount >= d->m_locationDataCont.size())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " emit locationsToElevationsCompleted";
+    emit locationsToElevationsCompleted();
+  }
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.h
new file mode 100755
index 000000000..2b5340777
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_bulk.h
@@ -0,0 +1,224 @@
+/**
+  * @RDE_HEADER@
+  * LocationToElevationBulk
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "screen_location_elevation_helper_base.h"
+#include <Map/map.h>
+#include <Common/situation_map_logging.h>
+
+// for ElevationMap-based calculation
+#include <MapImpl/map_impl.h>
+#include <ElevationMap/elevation_map_manager.h>
+#include <Map/coord_translation_functor.h>
+
+
+//ESRI
+#include <Point.h>
+#include <Surface.h>
+
+
+// Qt
+#include <QObject>
+#include <QPointer>
+#include <QList>
+#include <QVector>
+#include <QFuture>
+#include <QFutureWatcher>
+
+
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Surface;
+class Point;
+class SpatialReference;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class LocationData : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit LocationData(const Esri::ArcGISRuntime::Point &esriMapLocation)
+    : QObject()
+    , m_esriMapLocation(esriMapLocation)
+  {}
+
+  ~LocationData()
+  {
+    cancel();
+  }
+
+  /*! \name Prepare surface (ESRI-based) OR map (own class ElevationMap */
+  //@{
+  void setSurface(Esri::ArcGISRuntime::Surface *surface)
+  {
+    m_map.clear();
+    m_surface = QPointer<Esri::ArcGISRuntime::Surface>(surface);
+    // 300: completion is handled by a QFutureWatcher set up in startLocationToElevation().
+  }
+
+  void setMap(Map *map)
+  {
+    m_surface.clear();
+    m_map = map;
+  }
+  //@}
+
+
+  bool startLocationToElevation()
+  {
+    // ESRI-Surface-based calculation :
+    if (m_surface)
+    {
+      // 300: locationToElevation() -> elevationAsync() returns QFuture<double>.
+      m_elevationFuture = m_surface->elevationAsync(m_esriMapLocation);
+      if (!m_elevationFuture.isValid())
+      {
+        qCritical() << " elevationAsync failed, future invalid";
+        return false;
+      }
+      if (!m_elevationWatcher)
+      {
+        m_elevationWatcher = new QFutureWatcher<double>(this);
+        connect(m_elevationWatcher, &QFutureWatcher<double>::finished, this, [this](){
+          m_elevation = m_elevationWatcher->result();
+          emit elevationCompleted();
+        });
+      }
+      m_elevationWatcher->setFuture(m_elevationFuture);
+      return true;
+    }
+    // : ESRI-Surface-based calculation
+
+    // ElevationMap-based calculation :
+    if (m_map)
+    {
+      auto elevationMap = static_cast<MapImpl*>(m_map.data())->getElevationMapManager(); // ToDo: remove if Esri-Surface will work without crash
+      if (!elevationMap)
+      {
+        qCritical() << " no ElevationMapManager";
+        return false;
+      }
+
+      double lon = m_esriMapLocation.x();
+      double lat = m_esriMapLocation.y();
+
+      CoordTranslationFunctor *coordTranslationFunctor = m_map->coordTranslationFunctor();
+      if ((coordTranslationFunctor) && (!coordTranslationFunctor->mapIsGeographic()))
+      {
+        const QPointF &geoLoc = coordTranslationFunctor->mapToGeographic(lon, lat);
+        lon = geoLoc.x();
+        lat = geoLoc.y();
+      }
+
+      m_elevation = elevationMap->elevation(lon, lat);
+      emit elevationCompleted();
+
+      return true;
+    }
+    // : ElevationMap-based calculation
+
+    return false;
+  }
+
+  bool cancel()
+  {
+    if (m_elevationFuture.isValid())
+      m_elevationFuture.cancel();   // 300: QFuture::cancel() returns void
+    return true;
+  }
+
+  const Esri::ArcGISRuntime::Point &location() const  { return m_esriMapLocation; }
+
+  bool hasElevation() const             { return std::isnan(m_elevation);   }
+  double elevation() const              { return m_elevation;               }
+  void setElevation(double elevation)   { m_elevation = elevation;          }
+
+signals:
+  void elevationCompleted();
+
+// (300: TaskWatcher completion slot removed; the QFutureWatcher callback in
+//  startLocationToElevation() handles the elevation result.)
+
+private:
+  // In:
+  Esri::ArcGISRuntime::Point              m_esriMapLocation;
+
+  // processing:
+  QPointer<Esri::ArcGISRuntime::Surface>  m_surface;      // for ESRI-Surface-based calculation
+  QPointer<Map>                           m_map;          // for ElevationMap-based calculation
+
+
+  QFuture<double>                         m_elevationFuture;
+  QFutureWatcher<double>                  *m_elevationWatcher  = nullptr;
+
+  // out:
+  double                                  m_elevation = std::nan("");
+}; // LocationData
+
+
+
+/**
+ * @brief The LocationToElevationBulk class helps calculate a couple of locations to their corresponding elevation
+ */
+class SITUATIONMAP_EXPORT LocationToElevationBulk : public QObject
+
+{
+  Q_OBJECT
+
+  using BaseClass = QObject;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit LocationToElevationBulk(QObject *parent = nullptr);
+  ~LocationToElevationBulk();
+
+  bool init(Map *map, Esri::ArcGISRuntime::Surface *surface);
+
+  LocationToElevationBulk(const LocationToElevationBulk &other)      = delete;
+  LocationToElevationBulk &operator=(LocationToElevationBulk &other) = delete;
+  //@}
+
+  void addLocation(const Esri::ArcGISRuntime::Point &esriMapLocation);
+  void start();
+  void stop();
+  void reset();
+
+  int size() const;
+
+  QVector< QPair< QPointF, double > > results() const;
+
+
+Q_SIGNALS:
+  void locationsToElevationsCompleted();
+
+private Q_SLOTS:
+  void onLocationDataCompleted();
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.cpp
new file mode 100755
index 000000000..117adc3ab
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.cpp
@@ -0,0 +1,205 @@
+/**
+  * @RDE_HEADER@
+  * LocationToElevationHelper
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+
+// Own
+#include "location_to_elevation_helper.h"
+#include "Map/situation_map_utils.h"
+
+//
+// NOTE: define should be in the headerfile to switch location_to_elevation_bulk also
+//
+#ifdef USE_ELEVATION_MAP_AS_WORKAROUND
+  #include "Map/coord_translation_functor.h" // ToDo: remove if Esri-Surface will work under windows without crash
+  #include "MapImpl/map_impl.h"
+  #include <ElevationMap/elevation_map_manager.h>
+#endif // USE_ELEVATION_MAP_AS_WORKAROUND
+
+// ESRI
+#include <Surface.h>
+#include <Point.h>
+
+
+// Qt
+#include <QPointer>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QUuid>
+
+
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+class LocationToElevationHelper::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+
+  // ESRI data:
+  QPointer<Esri::ArcGISRuntime::Surface>  m_surface;
+
+  Esri::ArcGISRuntime::Point              m_location;
+
+  Esri::ArcGISRuntime::SpatialReference   m_spatialReference;
+
+  #ifdef USE_ELEVATION_MAP_AS_WORKAROUND 
+  
+  CoordTranslationFunctor                *m_coordTransFunctor;  // ToDo: remove once Esri-Surface will work under windows without crash
+  QPointer<ElevationMapManager>           m_elevationMapManager;
+
+  #endif // USE_ELEVATION_MAP_AS_WORKAROUND 
+
+};
+
+//----------------------------------------------------------------------------
+LocationToElevationHelper::LocationToElevationHelper(QObject *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("LocationToElevationHelper"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+LocationToElevationHelper::~LocationToElevationHelper()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->stop();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool LocationToElevationHelper::init(Map *map,
+                                     Esri::ArcGISRuntime::Surface *surface,
+                                     const Esri::ArcGISRuntime::SpatialReference &spatialReference)
+{
+  this->stop();
+
+  connect(map, &Map::beginDestroy, this, &LocationToElevationHelper::stop);
+
+  d->m_surface          = surface;
+  d->m_spatialReference = spatialReference;
+
+  #ifdef USE_ELEVATION_MAP_AS_WORKAROUND 
+    d->m_elevationMapManager = static_cast<MapImpl*>(map)->getElevationMapManager().get(); // ToDo: remove (?) if Esri-Surface will work under windows without crash
+    d->m_coordTransFunctor = map->coordTranslationFunctor();
+
+    if (!d->m_elevationMapManager)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no ElevationMapManager";
+      return false;
+    }
+
+#endif // USE_ELEVATION_MAP_AS_WORKAROUND
+  
+  if (!d->m_surface)
+    return false;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " m_spatialReference.wkid = " << d->m_spatialReference.wkid();
+
+
+  // be prepared in case of destruction:
+  connect(d->m_surface.data(), &Esri::ArcGISRuntime::Surface::destroyed, this, &LocationToElevationHelper::stop);
+
+  // 300: Surface::locationToElevationCompleted signal is gone; elevationAsync() returns
+  // QFuture<double> and completion is handled per-op in mainComputation().
+  return true;
+}
+
+
+void LocationToElevationHelper::stop()
+{
+  if (d->m_surface)
+    d->m_surface->disconnect(this);
+  this->disconnect(this);
+  BaseClass::stop();
+  d->m_surface.clear();
+}
+
+void LocationToElevationHelper::locationToElevation(const QPointF &mapLocation)
+{
+  locationToElevation(Esri::ArcGISRuntime::Point(mapLocation.x(), mapLocation.y(), d->m_spatialReference));
+}
+
+void LocationToElevationHelper::locationToElevation(const Esri::ArcGISRuntime::Point &esriMapLocation)
+{
+  #ifdef USE_ELEVATION_MAP_AS_WORKAROUND 
+    if (d->m_elevationMapManager) // ToDo: remove (?) if Esri-Surface will work under windows without crash
+    {
+      double lon = esriMapLocation.x();
+      double lat = esriMapLocation.y();
+
+      if ((d->m_coordTransFunctor) && (!d->m_coordTransFunctor->mapIsGeographic()))
+      {
+        const QPointF & geoLoc = d->m_coordTransFunctor->mapToGeographic(lon, lat);
+        lon = geoLoc.x();
+        lat = geoLoc.y();
+      }
+  
+      const double ele = d->m_elevationMapManager->elevation(lon,lat);
+      emit elevationCompleted(ele);
+      return;
+    }
+  #endif // USE_ELEVATION_MAP_AS_WORKAROUND
+
+  d->m_location = esriMapLocation;
+
+//  this->cancel();       // cancel all former:
+
+  BaseClass::newComputationRequested();
+}
+
+void LocationToElevationHelper::mainComputation()
+{
+  if (!d->m_surface)
+    return;
+
+  if (d->m_surface->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " surface not loaded yet";
+    return;
+  }
+
+  const QUuid taskId = QUuid::createUuid();
+  auto *w = new QFutureWatcher<double>(this);
+  connect(w, &QFutureWatcher<double>::finished, this, [this, w, taskId]() {
+    const double elevation = w->result();
+    w->deleteLater();
+    onLocationToElevationCompleted(taskId, elevation);
+  });
+  w->setFuture(d->m_surface->elevationAsync(Esri::ArcGISRuntime::Point(d->m_location)));
+
+  if (!insertTask(taskId, [w](){ w->cancel(); }))
+    ERROR_LOG(m_logger) << LOGFUNCTION << " locationToElevation failed";
+}
+
+void LocationToElevationHelper::onLocationToElevationCompleted(const QUuid &taskId, double elevation)
+{
+  // INFO_LOG(m_logger) << LOGFUNCTION << " locationToElevation onLocationToElevationCompleted, elevation= " << elevation;
+
+  if (!this->removeTask(taskId))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " not our task -> skip;";
+    return;
+  }
+
+  emit elevationCompleted(elevation);
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.h
new file mode 100755
index 000000000..1927aeeab
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/location_to_elevation_helper.h
@@ -0,0 +1,83 @@
+/**
+  * @RDE_HEADER@
+  * LocationToElevationHelper
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "screen_location_elevation_helper_base.h"
+#include <Map/map.h>
+#include <Common/situation_map_logging.h>
+
+
+#define USE_ELEVATION_MAP_AS_WORKAROUND // ToDo: remove if Esri-Surface will work without crash
+
+
+// Qt
+#include <QObject>
+
+
+namespace Esri {
+namespace ArcGISRuntime
+{
+class Surface;
+class Point;
+class SpatialReference;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+/**
+ * @brief The ScreenToLocationHelper class helps to assign the (global) requests location_to_elevation to the right caller
+ */
+class SITUATIONMAP_EXPORT LocationToElevationHelper : public ScreenLocationElevationHelperBase
+{
+  Q_OBJECT
+
+  using BaseClass = ScreenLocationElevationHelperBase;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit LocationToElevationHelper(QObject *parent = nullptr);
+  ~LocationToElevationHelper();
+
+  bool init(Map *map,
+            Esri::ArcGISRuntime::Surface *surface,
+            const Esri::ArcGISRuntime::SpatialReference &spatialReference);
+
+  LocationToElevationHelper(const LocationToElevationHelper &other)     = delete;
+  LocationToElevationHelper &operator=(LocationToElevationHelper &other) = delete;
+  //@}
+
+  void stop();
+
+  void locationToElevation(const QPointF &mapLocation);
+  void locationToElevation(const Esri::ArcGISRuntime::Point &esriMapLocation);
+
+  void mainComputation() override;
+
+Q_SIGNALS:
+  void elevationCompleted(double elevation);
+
+private Q_SLOTS:
+  void onLocationToElevationCompleted(const QUuid &taskId, double elevation);
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.cpp
new file mode 100755
index 000000000..377632caf
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.cpp
@@ -0,0 +1,807 @@
+/**
+  * @RDE_HEADER@
+  * MapLayer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "logical_layer.h"
+#include <Map/map.h>
+#include <Symbology/symbol_dictionary.h>
+#include <SymbologyImpl/symbol_dictionary_impl.h>
+#include <Map/situation_map_utils.h>
+
+
+// ESRI
+#include <Layer.h>
+#include <GraphicsOverlay.h>
+#include <DictionaryRenderer.h>
+#include <ArcGISTiledLayer.h>
+#include <LayerSceneProperties.h>
+
+
+// Qt
+// #include <QDebug>
+#include <QTimer>
+#include <ArcGISMapServiceInfo.h>
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <MapTypes.h>
+#include <Error.h>
+
+
+// 300: the 100.x Esri::SurfacePlacement parity assert is obsolete (300 replaced
+// Draped with DrapedFlat/DrapedBillboarded); Draped is remapped at the Esri call site.
+
+
+
+namespace SituationMap
+{
+
+LogicalLayer::LogicalLayer(const QString &logicalName, QObject *parent)
+  : BaseClass(parent),
+    m_logicalName(logicalName),
+    m_logger(getLogger("LogicalLayer"))
+{
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_logicalName='" << m_logicalName << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_logicalName='" << m_logicalName << "'";
+}
+
+LogicalLayer::~LogicalLayer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_logicalName='" << m_logicalName << "'";
+  fini();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_logicalName='" << m_logicalName << "'";
+}
+
+void LogicalLayer::init(SituationMap::Map *map,
+                        Esri::ArcGISRuntime::LayerListModel *layerListModel,
+                        Esri::ArcGISRuntime::GraphicsOverlayListModel *graphicsOverlayListModel)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " layerListModel=" << layerListModel
+                      << " graphicsOverlayListModel=" << graphicsOverlayListModel;
+  m_map                       = map;
+  m_layerListModel            = layerListModel;
+  m_graphicsOverlayListModel  = graphicsOverlayListModel;
+
+
+#ifdef LTS_DEBUG
+  // sometimes getCreateGraphicalOverlay() has no m_graphicsOverlayListModel - hmm
+  // happens for layer 'MountingfPoints'
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " m_map=" << m_map
+                      << " m_map->isReady=" << m_map->isReady()
+                      << " layerListModel=" << layerListModel
+                      << " graphicsOverlayListModel=" << graphicsOverlayListModel;
+
+  Q_ASSERT(m_graphicsOverlayListModel);
+#endif // LTS_DEBUG
+
+  // set default order of GraphicalOverlays: (from bottom to top)
+  setOrderOfGraphicalOverlays({ TechnicalLayerType::GraphicsLayer,
+                                TechnicalLayerType::GraphicsLayer_Dict,
+                                TechnicalLayerType::GraphicsLayer_3D_Extrusion,
+                                TechnicalLayerType::GraphicsLayer_3D_Absolute });
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void LogicalLayer::fini()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " layerListModel=" << m_layerListModel
+                      << " graphicsOverlayListModel=" << m_graphicsOverlayListModel;
+
+  // process Layer (e.g. Basemap)
+  // Esri::ArcGISRuntime::Layer
+  if (m_layer && m_layerListModel)
+  {
+    m_layerListModel->removeOne(m_layer);
+    delete m_layer;
+    m_layer = nullptr;
+  }
+
+  // process GraphicsOverlay
+  if (m_graphicsOverlayListModel)
+  {
+    for (Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay : qAsConst(m_graphicalOverlays))
+    {
+      // do some checks :
+      {
+        const int numberOfCurrentObjects = graphicsOverlay->graphics()->size();
+        if (numberOfCurrentObjects != 0)
+        {
+          QString objectName;
+          Esri::ArcGISRuntime::Graphic* g = graphicsOverlay->graphics()->first();
+          if (g)
+            objectName = g->objectName();
+
+          ERROR_LOG(m_logger) << LOGFUNCTION
+                              << " Attention, removing GraphicsOverlay still having objects!!!"
+                              << ", graphicsOverlay='" << graphicsOverlay << "'"
+                              << ", numberOfCurrentObjects=" << numberOfCurrentObjects
+                              << ", m_logicalName='" << m_logicalName << "'"
+                              << ", objectName of first='" << objectName << "'";
+        }
+        TRACE_LOG(m_logger) << LOGFUNCTION << " m_logicalName='" << m_logicalName << "'"
+                            << " numberOfCurrentObjects=" << numberOfCurrentObjects;
+      }
+      // : do some checks
+
+      m_graphicsOverlayListModel->removeOne(graphicsOverlay);
+      delete graphicsOverlay;
+    }
+  }
+
+  // cleanup internal container:
+  m_graphicalOverlays.clear();
+  m_graphicOverlayContainer.clear();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " layerListModel=" << m_layerListModel
+                      << " graphicsOverlayListModel=" << m_graphicsOverlayListModel;
+}
+
+
+QString LogicalLayer::logicalName() const
+{
+  return m_logicalName;
+}
+
+void LogicalLayer::setLogicalName(const QString &logicalName)
+{
+  m_logicalName = logicalName;
+}
+
+
+LayerType LogicalLayer::layerType() const
+{
+  return m_layerType;
+}
+void LogicalLayer::setLayerType(const LayerType &layerType)
+{
+  m_layerType = layerType;
+}
+BasemapType LogicalLayer::basemapType() const
+{
+  return m_basemapType;
+}
+void LogicalLayer::setBasemapType(const BasemapType &basemapType)
+{
+  m_basemapType = basemapType;
+}
+
+
+RenderingMode LogicalLayer::renderingMode() const
+{
+  return m_graphicsOverlayRenderingMode;
+}
+void LogicalLayer::setRenderingMode(RenderingMode renderingMode)
+{
+  m_graphicsOverlayRenderingMode = renderingMode;
+}
+
+SurfacePlacement LogicalLayer::surfacePlacement() const
+{
+  return m_surfacePlacement;
+}
+void LogicalLayer::setSurfacePlacement(SurfacePlacement surfacePlacement)
+{
+  m_surfacePlacement = surfacePlacement;
+}
+
+const LayerParameter &LogicalLayer::layerParameter() const
+{
+  return m_layerParameter;
+}
+void LogicalLayer::setLayerParameter(const LayerParameter &layerParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " layerParameter=" << layerParameter;
+  bool changed = (m_layerParameter != layerParameter);
+
+  m_layerParameter = layerParameter;
+
+  if (changed)
+  {
+    // apply LayerParameters (visible, opca, brightness....)
+    this->applyLayerParameterToEsri();
+
+    // trigger update of gui:
+    emit layerParameterChanged(m_logicalName, m_layerParameter);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " changed=" << changed;
+}
+
+Esri::ArcGISRuntime::Layer *LogicalLayer::layer() const
+{
+  return m_layer;
+}
+void LogicalLayer::setLayer(Esri::ArcGISRuntime::Layer *layer)
+{
+  m_layer = layer;
+
+  // Handle errors of layer:
+  connect(m_layer, &Esri::ArcGISRuntime::Layer::errorOccurred,
+          this, &LogicalLayer::onLayerError, Qt::UniqueConnection);
+
+  // Handle doneLoading:
+  connect(m_layer, &Esri::ArcGISRuntime::Layer::doneLoading,
+          this, &LogicalLayer::onLayerDoneLoading, Qt::UniqueConnection);
+
+  connect(m_layer, &Esri::ArcGISRuntime::Layer::loadStatusChanged,
+          this, &LogicalLayer::onLayerLoadStatusChanged, Qt::UniqueConnection);
+
+
+  if (!m_layerListModel->contains(m_layer))
+    m_layerListModel->append(m_layer);
+}
+
+
+QList<Esri::ArcGISRuntime::GraphicsOverlay *> LogicalLayer::getCurrentGraphicalOverlaysOrdered() const
+{
+  QList<Esri::ArcGISRuntime::GraphicsOverlay *>  orderedLayerList;
+
+  for (TechnicalLayerType techType : m_orderOfGraphicalOverlays)
+  {
+    const QString &esriLayerName = LogicalLayer::createInternalLayerName(m_logicalName, techType);
+    if (!m_graphicOverlayContainer.contains(esriLayerName))
+      continue;
+    Esri::ArcGISRuntime::GraphicsOverlay *layer = m_graphicOverlayContainer[esriLayerName];
+    if (layer)
+      orderedLayerList.append(layer);
+  } // for
+  return orderedLayerList;
+}
+
+QList<QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> > LogicalLayer::getCurrentGraphicalOverlaysOrderedWithName() const
+{
+  QList<QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> > ret;
+
+  for (TechnicalLayerType techType : qAsConst(m_orderOfGraphicalOverlays))
+  {
+    const QString &esriLayerName = LogicalLayer::createInternalLayerName(m_logicalName, techType);
+    if (!m_graphicOverlayContainer.contains(esriLayerName))
+      continue;
+    Esri::ArcGISRuntime::GraphicsOverlay *layer = m_graphicOverlayContainer[esriLayerName];
+    if (!layer)
+      continue;
+
+    QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *> foundPair(esriLayerName, layer);
+    ret.append(foundPair);
+  } // for
+  return ret;
+}
+
+
+int LogicalLayer::layerIndex() const
+{
+  if (! m_layerListModel)
+    return -1;
+
+  return m_layerListModel->indexOf(m_layer);
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LogicalLayer::getCreateGraphicalOverlay(const TechnicalLayerType &technicalLayerType)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " technicalLayerType=" << technicalLayerType;
+
+  // [GUEZE-496] RPL Nr 770: 3D Lagedarstellung Einfrieren der SW Appl.
+  // Layer renderer does not support multipoint graphics (V100.8)
+  // So turn back to 2 technical layers per logical layer. So The MineArea
+  // is on a TechnicalLayerType::GraphicsLayer and MineArea/IndicationContainer
+  // uses ONE GraphicalObjectPictureMarker/Esri::ArcGISRuntime::PictureMarkerSymbol
+  // with multiple coordinates (multipoint)
+  TechnicalLayerType technicalLayerTypeLocal = technicalLayerType;
+
+  if ((m_layerType == LayerType::Rubberband) ||
+      (m_layerType == LayerType::Overlay) ||
+      ((m_layerType == LayerType::Operational) && (m_logicalName.compare(QStringLiteral("PlanEditorLayer")) == 0))
+      )
+  {
+    technicalLayerTypeLocal = TechnicalLayerType::GraphicsLayer_Dict;
+  }
+
+  if (! m_graphicsOverlayListModel)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_logicalName='" << m_logicalName << "'"
+                        << " no m_graphicsOverlayListModel";
+
+#ifdef LTS_DEBUG
+  Q_ASSERT(m_graphicsOverlayListModel);
+#endif // LTS_DEBUG
+
+    return nullptr;
+  }
+
+  if (! m_orderOfGraphicalOverlays.contains(technicalLayerTypeLocal))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_logicalName='" << m_logicalName << "'"
+                        << " not allowed: technicalLayerType=" << technicalLayerTypeLocal;
+    return nullptr;
+  }
+
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = nullptr;
+
+  const QString &esriLayerName = LogicalLayer::createInternalLayerName(m_logicalName, technicalLayerTypeLocal);
+
+  // lookup in own container:
+  if (m_graphicOverlayContainer.contains(esriLayerName))
+  {
+    graphicsLayer = m_graphicOverlayContainer[esriLayerName];
+
+    // make sure, that layer is still valid (within esri/model):
+    if (graphicsLayer)
+    {
+      if (! m_graphicsOverlayListModel->contains(graphicsLayer))
+      {
+        m_graphicOverlayContainer.remove(esriLayerName);
+        graphicsLayer = nullptr;
+      }
+    }
+  }
+
+  // create if not found
+  if (! graphicsLayer)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " requested (logical) layername ='" << m_logicalName << "' not in esriMap"
+                       << ", create on demand..."
+                       << " (renderMode=" << m_graphicsOverlayRenderingMode << ")";
+    graphicsLayer = createGraphicLayer(technicalLayerTypeLocal, m_graphicsOverlayRenderingMode);
+
+    //
+    // post operations:
+    //
+
+    // apply LayerParameters (visible, opca, brightness....)
+    this->applyLayerParameterToEsri();
+
+    // trigger re-ordering
+    emit layerCreatedOnDemand(m_logicalName);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " technicalLayerType=" << technicalLayerType;
+  return graphicsLayer;
+}
+
+void LogicalLayer::onLayerError(const Esri::ArcGISRuntime::Error &error)
+{
+  if (error.arcGISServerErrorCode().value_or(-1) == 404)
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error
+                        << ", layerName=" << m_layerParameter.url.toString();
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error
+                        << ", layerName=" << m_layerParameter.url.toString();
+}
+
+void LogicalLayer::onGraphicsOverlayLayerError(const Esri::ArcGISRuntime::Error &error)
+{
+  ERROR_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error
+                      << ", layerName=" << m_layerParameter.url.toString();
+}
+
+void LogicalLayer::onRendererError(const Esri::ArcGISRuntime::Error &error)
+{
+  ERROR_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error
+                      << ", layerName=" << m_layerParameter.url.toString();
+}
+
+void LogicalLayer::onLayerDoneLoading(const Esri::ArcGISRuntime::Error &loadError)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'";
+
+  if (!loadError.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_logicalName='" << m_logicalName << "'"
+                        << ", layerName = '" << m_layerParameter.url.toString() << "'"
+                        << ", loadError: " << loadError;
+
+    Esri::ArcGISRuntime::Layer *layer = qobject_cast<Esri::ArcGISRuntime::Layer *>(sender());
+    if (layer)
+    {
+      const int maxRetry = 2;
+      if (m_retryCounter<=maxRetry)
+      {
+        ++m_retryCounter;
+        QTimer::singleShot(1000 + (m_retryCounter+1000), this, std::bind(&Esri::ArcGISRuntime::Layer::retryLoad, layer));
+        INFO_LOG(m_logger) << LOGFUNCTION << " schedule retryLoad for '" << m_logicalName << "'" << " (m_retryCounter=" << m_retryCounter << ")";
+      }
+      else
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " max number of retries (" << maxRetry << ") exceeded, give up" << ", m_logicalName='" << m_logicalName << "'";
+      }
+      return;
+    }
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " qobject_cast failed m_logicalName='" << m_logicalName << "'";
+    return;
+
+  }
+
+
+  Esri::ArcGISRuntime::Layer *layer = qobject_cast<Esri::ArcGISRuntime::Layer *>(sender());
+  if (!layer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " qobject_cast failed m_logicalName='" << m_logicalName << "'";
+    return;
+  }
+
+  //  Esri::ArcGISRuntime::Item *item = layer->item();
+  //  if (!item)
+  //    FATAL_LOG(m_logger) << LOGFUNCTION << " no item!!!! " << m_logicalName << "'";
+
+
+  const QString layername(layer->name());
+  INFO_LOG(m_logger) << LOGFUNCTION << " esriLayer of LogicalLayer: '" << layername << "' is loaded now #1: ESRI-Layer: "
+                     << "  minScale()=" << layer->minScale()
+                     << ", maxScale()=" << layer->maxScale()
+                     << " (m_retryCounter=" << m_retryCounter << ")";
+
+  // minScale, maxScale at 3D returns always '0' for basemaps, so skip
+  if ((m_layerType == LayerType::Basemap) && (m_map->mode() == Mode::Mode_2D))
+  {
+    if (!m_layerParameter.minScaleValid())
+      m_layerParameter.minScale = layer->minScale();
+    if (!m_layerParameter.minMaxScaleValid())
+      m_layerParameter.maxScale = layer->maxScale();
+  }
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " esriLayer of LogicalLayer: '" << layername << "' is loaded now #2: LogicalLayer"
+                     << ", minScale = " << m_layerParameter.minScale
+                     << ", maxScale = " << m_layerParameter.maxScale;
+
+  Esri::ArcGISRuntime::ArcGISTiledLayer *arcGISTiledLayer = qobject_cast<Esri::ArcGISRuntime::ArcGISTiledLayer *>(sender());
+  if (arcGISTiledLayer)
+  {
+    const Esri::ArcGISRuntime::ArcGISMapServiceInfo &mapSvcInfo = arcGISTiledLayer->mapServiceInfo();
+    if (m_layerParameter.displayName.isEmpty()) // if not already set use mapName of Service
+      m_layerParameter.displayName    = mapSvcInfo.mapName();
+    m_layerParameter.description    = mapSvcInfo.description();
+    m_layerParameter.svcDescription = mapSvcInfo.serviceDescription();
+  } // if (arcGISTiledLayer)
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " doneLoading: '" << layername << "'"
+                      << " new m_layerParameter:" << m_layerParameter;
+
+
+  // maybe the para weren`t applied because not loaded..
+  // so do it here (again);
+  applyLayerParameterToEsri();
+
+  // trigger reCalulation of minMaxScale:
+  emit layerDoneLoading(m_logicalName);
+
+  // trigger update of gui:
+  emit layerParameterChanged(m_logicalName, m_layerParameter);
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " doneLoading: '" << layername << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void LogicalLayer::onLayerLoadStatusChanged(const Esri::ArcGISRuntime::LoadStatus &loadStatus)
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " START" << " m_logicalName='" << m_logicalName << "'"
+                     << " new loadStatus=" << loadStatus;
+}
+
+
+Esri::ArcGISRuntime::GraphicsOverlay *LogicalLayer::createGraphicLayer(const TechnicalLayerType &technicalLayerType,
+                                                                       RenderingMode renderingMode)
+{
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicalOverlay =
+      createGraphicLayerInternal(technicalLayerType, renderingMode);
+
+  if (technicalLayerType != TechnicalLayerType::GraphicsLayer_Dict)
+    return graphicalOverlay;
+
+  // get access to esri dictionary:
+  const AdvancedSymbology::SymbolDictionary     &dict     = m_map->symbolDictionary();
+  const AdvancedSymbology::SymbolDictionaryImpl &dictImpl = static_cast<const AdvancedSymbology::SymbolDictionaryImpl &>(dict);
+  Esri::ArcGISRuntime::DictionarySymbolStyle *esriDict = const_cast<Esri::ArcGISRuntime::DictionarySymbolStyle *>(dictImpl.getEsriSymbolDictionary());
+
+  if (!esriDict)
+    return graphicalOverlay;
+
+  // make sure, that dict is already loaded:
+  if (esriDict->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded)
+  {
+    // create renderer
+    Esri::ArcGISRuntime::DictionaryRenderer *dictRenderer =
+        new Esri::ArcGISRuntime::DictionaryRenderer(esriDict, this);
+
+    // Handle errors of DictionaryRenderer:
+    connect(dictRenderer, &Esri::ArcGISRuntime::DictionaryRenderer::errorOccurred,
+            this, &LogicalLayer::onRendererError);
+
+    // 300: DictionaryRenderer::setTextVisible() was removed from the SDK (text shown by default).
+
+    // set Renderer to layer:
+
+    // take care that the old one is deleted:
+    Esri::ArcGISRuntime::Renderer *oldRenderer = graphicalOverlay->renderer();
+    if (oldRenderer)
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " replace/destroy/remove old renderer, is this intended???";
+      oldRenderer->deleteLater(); // Qt-Doc: 'It is safe to call this function more than once;'
+    }
+    // assign new:
+    graphicalOverlay->setRenderer(dictRenderer);
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " requested (logical) layername ='" << m_logicalName << "' -> with Renderer"
+                       << " of symbologyType=" << dict.symbologyType();
+  }
+  else
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " SymbolDictionary not loaded!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " SymbolDictionary not loaded!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " SymbolDictionary not loaded!!!";
+    // do not return 'nullptr' to avoid crash on further operations
+  }
+  return graphicalOverlay;
+}
+
+QString LogicalLayer::createInternalLayerName(const QString &logicalLayerName, const TechnicalLayerType &technicalLayerType)
+{
+  return logicalLayerName + QLatin1Char('#') + toString(technicalLayerType);
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *LogicalLayer::createGraphicLayerInternal(const TechnicalLayerType &technicalLayerType,
+                                                                               RenderingMode renderingMode)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " technicalLayerType=" << technicalLayerType
+                      << " m_graphicalOverlays.size()=" << m_graphicalOverlays.size()
+                      << " m_graphicsOverlayListModel.size()=" << m_graphicsOverlayListModel->size();
+
+  if (! m_graphicsOverlayListModel)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_graphicsOverlayListModel";
+    return nullptr;
+  }
+
+  const QString &esriLayername = createInternalLayerName(m_logicalName, technicalLayerType);
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicalOverlay =
+      new Esri::ArcGISRuntime::GraphicsOverlay();
+
+  graphicalOverlay->setOverlayId(esriLayername);
+
+  static long s_counter = 0;
+  graphicalOverlay->setObjectName(QStringLiteral("GraphicsOverlay_%1_'%2'").arg(s_counter++).arg(esriLayername));
+  connect(graphicalOverlay, &Esri::ArcGISRuntime::GraphicsOverlay::destroyed, this, [this, graphicalOverlay] () {
+    INFO_LOG(m_logger) << " GraphicsOverlay is destroyed , objectName='" <<  graphicalOverlay->objectName() << "'";
+  });
+
+
+
+  // Extrusion requires
+  // a) GraphicsRenderingMode::Dynamic and
+  // b) SurfacePlacement::Relative
+
+  if (technicalLayerType == TechnicalLayerType::GraphicsLayer_3D_Extrusion)
+  {
+    graphicalOverlay->setRenderingMode(Esri::ArcGISRuntime::GraphicsRenderingMode::Dynamic);
+  } else {
+    switch (renderingMode)
+    {
+    case RenderingMode::Dynamic:
+      graphicalOverlay->setRenderingMode(Esri::ArcGISRuntime::GraphicsRenderingMode::Dynamic);
+      break;
+    case RenderingMode::Static:
+      graphicalOverlay->setRenderingMode(Esri::ArcGISRuntime::GraphicsRenderingMode::Static);
+      break;
+    default:
+      // empty
+      break;
+    }
+  }
+
+
+#if ACRGIS_VERSION < 0x640500 // 100.5.0 / Update 5
+  // deprecated in V100.5, replaced by GeoView::setSelectionProperties()
+  graphicalOverlay->setSelectionColor(Qt::magenta);
+#endif // ACRGIS_VERSION
+
+  m_graphicalOverlays.append(graphicalOverlay);
+  m_graphicsOverlayListModel->append(graphicalOverlay);
+
+  // store it for lookup in own container:
+  m_graphicOverlayContainer[esriLayername] = graphicalOverlay;
+
+
+  // set SurfacePlacement
+  Esri::ArcGISRuntime::LayerSceneProperties lsp = graphicalOverlay->sceneProperties();
+
+
+  // Extrusion requires
+  // a) GraphicsRenderingMode::Dynamic and
+  // b) SurfacePlacement::Relative
+
+  if (technicalLayerType == TechnicalLayerType::GraphicsLayer_3D_Extrusion)
+    lsp.setSurfacePlacement(Esri::ArcGISRuntime::SurfacePlacement::Relative);
+  else if (technicalLayerType == TechnicalLayerType::GraphicsLayer_3D_Absolute)
+    lsp.setSurfacePlacement(Esri::ArcGISRuntime::SurfacePlacement::Absolute);
+  else
+    lsp.setSurfacePlacement( m_surfacePlacement == SurfacePlacement::Draped
+                             ? Esri::ArcGISRuntime::SurfacePlacement::DrapedFlat
+                             : static_cast<Esri::ArcGISRuntime::SurfacePlacement>(m_surfacePlacement) ); // 300 split 100.x Draped: Draped->DrapedFlat (flat drape); Absolute/Relative keep 100.x values
+  graphicalOverlay->setSceneProperties(lsp);
+
+  Esri::ArcGISRuntime::GraphicsRenderingMode esriRenderingMode = graphicalOverlay->renderingMode();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " created GraphicsOverlay: "
+                     << " logicalName='" << m_logicalName << "'"
+                     << " technicalLayerType=" << technicalLayerType
+                     << " esriLayerName='" << esriLayername << "'"
+                     << " esriRenderModeStr=" << esriRenderingMode   // Check operator
+                     << " surfacePlacement=" << m_surfacePlacement
+                     << " curIdx=" <<   m_graphicsOverlayListModel->indexOf(graphicalOverlay)
+                     << " graphicalOverlay=" << graphicalOverlay;
+
+  // Handle errors of layer:
+  connect(graphicalOverlay, &Esri::ArcGISRuntime::GraphicsOverlay::errorOccurred,
+          this, &LogicalLayer::onGraphicsOverlayLayerError);
+
+  // GraphicsOverlay need no doneLoading :-)
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " technicalLayerType=" << technicalLayerType
+                      << " m_graphicalOverlays.size()=" << m_graphicalOverlays.size()
+                      << " m_graphicsOverlayListModel.size()=" << m_graphicsOverlayListModel->size();
+  return graphicalOverlay;
+}
+
+void LogicalLayer::applyLayerParameterToEsri()
+{
+  int graphicsOverlayListModelSize = -1;
+
+  if (m_graphicsOverlayListModel)
+    graphicsOverlayListModelSize = m_graphicsOverlayListModel->size();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_logicalName='" << m_logicalName << "'"
+                      << " m_layer=" << m_layer
+                      << " m_graphicalOverlays.size()=" << m_graphicalOverlays.size()
+                      << " m_graphicsOverlayListModel.size()=" << graphicsOverlayListModelSize
+                      << " lp=" << m_layerParameter;
+
+  // process Layer (e.g. Basemap)
+  // Esri::ArcGISRuntime::Layer
+  Esri::ArcGISRuntime::Layer *esriLayer = m_layer;
+  if (esriLayer)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_logicalName='" << m_logicalName << "'"
+                        << " CURRENT loadStatus =" << esriLayer->loadStatus();
+    if (esriLayer->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION << " not loaded yet, skip"
+                         << " m_logicalName='" << m_logicalName << "'"
+                         << " m_layer=" << m_layer
+                         << " lp=" << m_layerParameter;
+      return;
+    }
+
+
+    esriLayer->setVisible(m_layerParameter.visible);
+    esriLayer->setOpacity(m_layerParameter.opacity / 100.0f);
+
+    if (m_layerParameter.minScaleValid())
+      esriLayer->setMinScale(m_layerParameter.minScale);
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " minScale not valid, set to '0'"
+                          << " m_logicalName='" << m_logicalName << "'";
+      esriLayer->setMinScale(0);
+    }
+
+    // Sonderfall (leider)
+    // Für 3D wird maxScale hart auf '0' gesetzt, damit beim Neigen keine basemap
+    // (besser basemapkachel) ausgeblendet wird.
+    if ((m_layerType == LayerType::Basemap) &&
+        (m_map->mode() == Mode::Mode_3D)
+      )
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " set maxScale to '0', because Basemap and Mode_3D for: "
+                          << "m_logicalName='" << m_logicalName << "'";
+      esriLayer->setMaxScale(0);
+    } else {
+      if (m_layerParameter.maxScaleValid())
+        esriLayer->setMaxScale(m_layerParameter.maxScale);
+      else
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " maxScale not valid, set to '0'"
+                            << " m_logicalName='" << m_logicalName << "'";
+        esriLayer->setMaxScale(0);
+      }
+    } // : Sonderfall
+
+    // for layer supporting bightness, contrast, gamma:
+    if (esriLayer->layerType() == Esri::ArcGISRuntime::LayerType::ArcGISTiledLayer)
+    {
+      Esri::ArcGISRuntime::ArcGISTiledLayer *tiledLayer =
+          static_cast<Esri::ArcGISRuntime::ArcGISTiledLayer *>(esriLayer);
+
+      tiledLayer->setBrightness(m_layerParameter.brightness);
+      tiledLayer->setContrast(m_layerParameter.contrast);
+      tiledLayer->setGamma(m_layerParameter.gamma);
+    }
+  } // if (esriLayer)
+
+
+  // process GraphicsOverlay
+  for (Esri::ArcGISRuntime::GraphicsOverlay *graphicsOverlay : qAsConst(m_graphicalOverlays))
+  {
+    graphicsOverlay->setVisible(m_layerParameter.visible);
+    graphicsOverlay->setOpacity(m_layerParameter.opacity / 100.0);
+
+    if (m_layerParameter.minScaleValid())
+      graphicsOverlay->setMinScale(m_layerParameter.minScale);
+    if (m_layerParameter.maxScaleValid())
+      graphicsOverlay->setMaxScale(m_layerParameter.maxScale);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_logicalName='" << m_logicalName << "'";
+}
+
+
+
+void LogicalLayer::setOrderOfGraphicalOverlays(const QVector<TechnicalLayerType> &orderOfGraphicalOverlays)
+{
+  m_orderOfGraphicalOverlays = orderOfGraphicalOverlays;
+}
+
+
+
+
+
+
+//------------------------------------------------------------------------------
+QLatin1String toString(const TechnicalLayerType &value)
+{
+  switch (value)
+  {
+  case TechnicalLayerType::GraphicsLayer:
+    return QLatin1String("GraphicsLayer");
+  case TechnicalLayerType::GraphicsLayer_Dict:
+    return QLatin1String("GraphicsLayer_Dict");
+  case TechnicalLayerType::GraphicsLayer_3D_Extrusion:
+    return QLatin1String("GraphicsLayer_3DExtrusion");
+  case TechnicalLayerType::GraphicsLayer_3D_Absolute:
+    return QLatin1String("GraphicsLayer_3D_Absolute");
+  }
+
+  return QLatin1String("TechnicalLayerTypeERROR");
+}
+
+
+std::ostream &operator<<(std::ostream &stream, const TechnicalLayerType &value)
+{
+  stream << toString(value).latin1();
+  return stream;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.h
new file mode 100755
index 000000000..cecf3c3b0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/logical_layer.h
@@ -0,0 +1,190 @@
+/**
+  * @RDE_HEADER@
+  * MapLayer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/map.h>
+#include <Map/layer_parameter.h>
+#include <Common/situation_map_logging.h>
+
+
+//ESRI
+#include <LayerListModel.h>
+#include <Layer.h>
+#include <GraphicsOverlay.h>
+#include <GraphicsOverlayListModel.h>
+
+
+// Qt
+#include <QVector>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+
+enum class TechnicalLayerType
+{
+  GraphicsLayer,
+  GraphicsLayer_Dict,
+  GraphicsLayer_3D_Extrusion,
+  GraphicsLayer_3D_Absolute
+};
+SITUATIONMAP_EXPORT QLatin1String toString(const TechnicalLayerType &value);
+
+
+
+class LogicalLayer final : public QObject
+{
+  Q_OBJECT
+  using BaseClass = QObject;
+
+public:
+  /*! \name Creation, Destruction */
+  //@{
+  explicit LogicalLayer(const QString &logicalName, QObject *parent = nullptr);
+  ~LogicalLayer();
+
+  void init(SituationMap::Map *map,
+            Esri::ArcGISRuntime::LayerListModel *layerListModel,
+            Esri::ArcGISRuntime::GraphicsOverlayListModel *graphicsOverlayListModel);
+  void fini();
+
+  void setLayerType(const LayerType &layerType);
+  void setBasemapType(const BasemapType &basemapType);
+
+  RenderingMode renderingMode() const;                          ///< has to be set early
+  void setRenderingMode(RenderingMode renderingMode);           ///< has to be set early
+
+  SurfacePlacement surfacePlacement() const;                    ///< has to be set early
+  void setSurfacePlacement(SurfacePlacement surfacePlacement);  ///< has to be set early
+
+
+  void setOrderOfGraphicalOverlays(const QVector<TechnicalLayerType> &orderOfGraphicalOverlays);
+  //@}
+
+
+  /*! \name Some names */
+  //@{
+  QString logicalName() const;
+  void setLogicalName(const QString &logicalName);
+  static QString createInternalLayerName(const QString &logicalLayerName,
+                                         const TechnicalLayerType &technicalLayerType);
+  //@}
+
+
+  /*! \name Access to some types */
+  //@{
+  LayerType             layerType() const;
+  BasemapType           basemapType() const;
+  //@}
+
+  /*! \name Access to LayerParameter*/
+  //@{
+  const LayerParameter &layerParameter() const;
+  void setLayerParameter(const LayerParameter &layerParameter);
+  //@}
+
+
+  /*! \name Main Access without creation on demand*/
+  //@{
+  void setLayer(Esri::ArcGISRuntime::Layer *layer);
+  Esri::ArcGISRuntime::Layer *layer() const;
+  QList<Esri::ArcGISRuntime::GraphicsOverlay *> getCurrentGraphicalOverlaysOrdered() const;
+
+  QList<QPair<QString, Esri::ArcGISRuntime::GraphicsOverlay *>> getCurrentGraphicalOverlaysOrderedWithName() const;
+
+  //@}
+
+  /*! \name Main Access with creation on demand*/
+  //@{
+  Esri::ArcGISRuntime::GraphicsOverlay *getCreateGraphicalOverlay(const TechnicalLayerType &technicalLayerType);
+  //@}
+
+  /*! \name Access to LayerIndex*/
+  //@{
+  int layerIndex() const;
+  //@}
+
+
+
+
+protected:
+  QString                       m_logicalName;
+
+
+  // Some enums:
+  LayerType                     m_layerType                     = LayerType::Undefined;
+  BasemapType                   m_basemapType                   = BasemapType::Undefined;
+  RenderingMode                 m_graphicsOverlayRenderingMode  = RenderingMode::Dynamic;
+  SurfacePlacement              m_surfacePlacement              = SurfacePlacement::Draped;
+
+  // visi, opac, brigth, gamma, contrast...
+  LayerParameter                m_layerParameter;
+
+  // to enable/allow GraphicalOverlays and set their order:
+  QVector<TechnicalLayerType>   m_orderOfGraphicalOverlays;
+
+  // ESRI:
+  Esri::ArcGISRuntime::Layer                      *m_layer = nullptr;   // store BasemapLayer
+  QVector<Esri::ArcGISRuntime::GraphicsOverlay *>  m_graphicalOverlays; // store GraphicsOverlays (unordered)
+  int                                              m_retryCounter = 0;
+
+
+signals:
+  void layerCreatedOnDemand(const QString &logicalName);
+  void layerDoneLoading(const QString &logicalName);
+  void layerParameterChanged(const QString &logicalName, const LayerParameter &newLayerParameter);
+
+protected slots:
+  void onLayerError(const Esri::ArcGISRuntime::Error &error);
+  void onGraphicsOverlayLayerError(const Esri::ArcGISRuntime::Error &error);
+  void onRendererError(const Esri::ArcGISRuntime::Error &error);
+  void onLayerDoneLoading(const Esri::ArcGISRuntime::Error &loadError);       // not for GraphicOverlays
+  void onLayerLoadStatusChanged(const Esri::ArcGISRuntime::LoadStatus &loadStatus);  // not for GraphicOverlays
+
+
+private:
+  // to be able to handle with BaseLayers (got from Map)
+  Esri::ArcGISRuntime::LayerListModel           *m_layerListModel = nullptr;
+
+  // to be able to handle with GraphicalOverlays (got from GeoView)
+  Esri::ArcGISRuntime::GraphicsOverlayListModel *m_graphicsOverlayListModel          = nullptr;
+
+  // to be able to create DictionaryRenderer:
+  SituationMap::Map                             *m_map = nullptr;
+
+
+  // Since GraphicOverlays don`t support setName yet:
+  // (and objectname returns an empty string in any case):
+  mutable QMap<QString, Esri::ArcGISRuntime::GraphicsOverlay *> m_graphicOverlayContainer; // workaround
+
+
+  Esri::ArcGISRuntime::GraphicsOverlay *createGraphicLayer(const TechnicalLayerType &technicalLayerType,
+                                                           RenderingMode renderingMode = RenderingMode::Dynamic);
+  Esri::ArcGISRuntime::GraphicsOverlay *createGraphicLayerInternal(const TechnicalLayerType &technicalLayerType,
+                                                                   RenderingMode renderingMode = RenderingMode::Dynamic);
+
+  void applyLayerParameterToEsri();
+
+
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+std::ostream &operator<< (std::ostream   &stream,
+                          const SituationMap::TechnicalLayerType &value);
+
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.cpp
new file mode 100755
index 000000000..af518f04f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.cpp
@@ -0,0 +1,5822 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Map
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "map_impl.h"
+#include "grid_impl.h"
+#include "screen_to_location_helper.h"
+#include "location_to_elevation_helper.h"
+#include "layer_factory_impl.h"
+#include "layer_control_widget.h"
+#include "coord_translation_functor_impl.h"
+#include "object_indicator_impl.h"
+#include <SideBar/side_bar.h>
+#include "jump_point_widget.h"
+#include "overview_map_handler_impl.h"
+#include "measurement_impl.h"
+#include "terrain_profile_impl.h"
+#include "viewshed_impl.h"
+#include "location_display_impl.h"
+#include "pixel_based_textbox_handler_impl.h"
+
+#include <ElevationMap/elevation_map.h>
+#include <ElevationMap/elevation_map_manager.h>
+
+#include <Map/situation_map_utils.h>
+
+
+#include <Map/map_notifier.h>
+#include <Map/object_factory.h>
+#include <Map/party_id_to_color_functor.h>
+#include <Map/drop_event_manager.h>
+#include <Map/camera.h>
+#include <MapImpl/object_container_impl.h>
+#include <MapImpl/abstract_map_object_impl.h>
+#include <Symbology/symbol_dictionary.h>
+#include <SymbologyImpl/symbol_dictionary_impl.h>
+#include <Common/ref_pointer.h>
+#include <Rubberbands/event_mouse_navigator.h>
+#include <Rubberbands/rubberband_factory.h>
+#include "overlay_handler_impl.h"
+
+#include <Map/geometry_model_renderer.h>
+#include <MapImpl/geometry_model_renderer_esri.h>
+
+// NGL
+#include <ngltools/ngltools_dtg.h>
+
+// Lts
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+#include <GeometryModel/geometry_pixelTextBox.h>
+
+// ESRI
+#include <Map.h>
+#include <Scene.h>
+#include <ArcGISRuntimeEnvironment.h>
+#include <SpatialReference.h>
+#include <MapGraphicsView.h>
+#include <SceneGraphicsView.h>
+#include <SceneViewTypes.h>    // enum NavigationConstraint
+//#include <CoordinateConversion.h>
+#include <GeometryEngine.h>
+
+#include <Basemap.h>
+#include <LayerListModel.h>
+#include <ArcGISTiledLayer.h>
+#include <ArcGISTiledElevationSource.h>
+#include <GraphicsOverlay.h>
+#include <SimpleMarkerSymbol.h>
+#include <PolylineBuilder.h>
+#include <PolygonBuilder.h>
+#include <Polyline.h>
+#include <Graphic.h>
+#include <TextSymbol.h>
+
+#include <ServiceFeatureTable.h>
+#include <FeatureLayer.h>
+#include <ArcGISSceneLayer.h>
+
+
+#include <SimpleRenderer.h>
+#include <GraphicsOverlayListModel.h>
+#include <SimpleFillSymbol.h>
+#include <SelectionProperties.h>
+
+// 300: defining headers (the parent SDK headers only forward-declare these types)
+#include <CoreTypes.h>   // defines LicenseStatus enum (forward-declared in LicenseResult.h)
+#include <Viewpoint.h>
+#include <Envelope.h>
+#include <Camera.h>
+#include <LocationToScreenResult.h>
+#include <LicenseResult.h>
+#include <ArcGISMapServiceInfo.h>
+#include <LegendInfoListModel.h>
+#include <LegendInfo.h>
+#include <GraphicListModel.h>
+#include <LayerSceneProperties.h>
+#include <AttributeListModel.h>
+
+#include <arcgisversion.h>  // This file is created by RME, not ESRI
+
+#if ACRGIS_VERSION >= 0x640500 // 100.5.0
+#  define HAS_BELOW_GROUND
+#endif
+
+#if ACRGIS_VERSION >= 0x640f00 // 100.15.0
+#  define HAS_NETWORK_CACHE_CONFIGURATION
+#endif
+
+#ifdef HAS_NETWORK_CACHE_CONFIGURATION
+#include <RequestConfiguration.h>
+#include <NetworkCacheConfiguration.h>
+#endif // HAS_NETWORK_CACHE_CONFIGURATION
+
+
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+// Qt
+#include <QFileInfo>
+#include <QGuiApplication>
+#include <QStackedLayout>
+#include <QGraphicsProxyWidget>
+#include <QMimeData>
+#include <QMetaMethod>
+#include <QThread>
+#include <QImage>
+#include <QMessageBox>
+
+#include <QtPrintSupport/QPrinter>
+#include <QPageLayout>      // Qt6: QPageLayout::Orientation
+#include <QEvent>           // Qt6: QEnterEvent (QWidget::enterEvent(QEnterEvent*))
+#include <QFuture>          // 300: exportImageAsync() -> QFuture<QImage>
+#include <QFutureWatcher>   // 300: observe the export QFuture
+#include <QTextTable>
+#include <QNetworkProxy>
+#include <QSizeGrip>
+#include <QScreen>
+
+
+#include <limits>
+#include <iostream>
+#include <typeinfo>
+
+
+#define USE_OWN_EVENTHANDLER
+
+
+static_assert((int)SituationMap::DrawStatus::InProgress == (int)Esri::ArcGISRuntime::DrawStatus::InProgress,  "DrawStatus mismatch");
+static_assert((int)SituationMap::DrawStatus::Completed  == (int)Esri::ArcGISRuntime::DrawStatus::Completed,   "DrawStatus mismatch");
+
+#ifdef HAS_BELOW_GROUND
+static_assert((int)SituationMap::NavigationConstraint::None      == (int)Esri::ArcGISRuntime::NavigationConstraint::None,  "NavigationConstraint mismatch");
+static_assert((int)SituationMap::NavigationConstraint::StayAbove == (int)Esri::ArcGISRuntime::NavigationConstraint::StayAbove,  "NavigationConstraint mismatch");
+#endif // HAS_BELOW_GROUND
+
+
+namespace SituationMap
+{
+
+class MyGraphicsPixmapItem final : public QObject, public QGraphicsPixmapItem
+{
+  Q_OBJECT
+public:
+  explicit MyGraphicsPixmapItem(QGraphicsItem *parent = nullptr)
+    : QObject(),
+      QGraphicsPixmapItem(parent)
+  {}
+
+signals:
+  void doubleClicked();
+
+protected:
+  void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override
+  {
+    emit doubleClicked();
+  }
+
+}; // class MyGraphicsPixmapItem
+//-----------------------------------------------------------------------------
+
+
+class MyPushButton : public QPushButton
+{
+  Q_OBJECT
+public:
+  MyPushButton() : QPushButton() {}
+
+  void setIconPale(const QIcon &icon)
+  {
+    m_iconPale = icon;
+    setIcon(m_iconPale);
+  }
+
+  void setIconOnHover(const QIcon &icon)
+  {
+    m_iconOnHover = icon;
+  }
+
+  // Qt6: QWidget::enterEvent takes QEnterEvent* (leaveEvent stays QEvent*)
+  void enterEvent(QEnterEvent *e) override
+  {
+    setIcon(m_iconOnHover);
+    QPushButton::enterEvent(e);
+  }
+  void leaveEvent(QEvent *e) override
+  {
+    setIcon(m_iconPale);
+    QPushButton::leaveEvent(e);
+  }
+
+protected:
+  QIcon m_iconPale;
+  QIcon m_iconOnHover;
+}; // class MyPushButton
+//-----------------------------------------------------------------------------
+
+
+
+class MapImpl::Private
+{
+public:
+  Private() = default;
+
+  static int s_counter;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::Map                     *m_esriMap           = nullptr;
+  Esri::ArcGISRuntime::Scene                   *m_esriScene         = nullptr;
+  Esri::ArcGISRuntime::Basemap                 *m_basemap           = nullptr;
+
+  std::shared_ptr<ElevationMap>                 m_elevationMap;
+  std::shared_ptr<ElevationMapManager>          m_elevationMapManager;
+
+  Esri::ArcGISRuntime::MapGraphicsView         *m_mapGraphicsView   = nullptr;
+  Esri::ArcGISRuntime::SceneGraphicsView       *m_sceneGraphicsView = nullptr;
+  ScreenToLocationHelper                       *m_screenToLocationHelper = nullptr;
+
+  bool                                          m_destroying        = false;
+  bool                                          m_mapReadyFlag                        = false;
+  bool                                          m_mapReadyAndSymbolDictionaryEmitted  = false;
+
+  Viewpoint2D                                   m_initialViewpoint;
+  double                                        m_animationDuration = 0.5;
+  double                                        m_rocketDuration    = 2.0;
+  QTimer                                       *m_rocketTimer       = nullptr;
+  bool                                          m_rocketRunning     = false;
+
+  QPointF                                       m_currentCenterPointBeforeRocket;
+  double                                        m_currentScaleBeforeRocket = 0.0;
+  Camera                                        m_currentCameraBeforRocket;
+
+
+  // PositionLabel
+  QLabel                                       *m_positionLabel     = nullptr;
+  QString                                       m_positionStr;
+  QString                                       m_positionElevationStr = QLatin1String("0");
+  QColor                                        m_positionLabelForegroundColor;
+  QColor                                        m_positionLabelBackgroundColor;
+  QPointer<LocationToElevationHelper>           m_locationToElevationHelper;
+
+
+  void updatePositionText()
+  {
+    if (!m_positionLabel)
+      return;
+    m_positionLabel->setText(QStringLiteral("%1  %2").
+                             arg(m_positionStr).
+                             arg(m_positionElevationStr, 3));
+  }
+
+  // ExerciseTimeLabel
+  QLabel                                       *m_exerciseTimeLabel = nullptr;
+  QColor                                        m_exerciseTimeLabelForegroundColor;
+  QColor                                        m_exerciseTimeLabelBackgroundColor;
+  bool                                          m_isReplay = false;
+
+  // TimeLabel
+  QLabel                                       *m_timeLabel         = nullptr;
+  QColor                                        m_timeLabelForegroundColor;
+  QColor                                        m_timeLabelBackgroundColor;
+
+  // Compass
+  MyGraphicsPixmapItem                         *m_compass           = nullptr;  // scene will take ownership.
+
+
+  // OWN data:
+  QVector<QPointF>                              m_trainingsAreaExtent;
+
+  // Layout, SideBar etc
+  QStackedLayout                               *m_stackedLayout           = nullptr;
+  QPointer<SideBar>                             m_sideBar                 = nullptr;  // optional
+  QPushButton                                  *m_pbSideBar               = nullptr;  // optional
+  JumpPointWidget                              *m_jumpPointWidget         = nullptr;  // optional
+
+  // QTextEdit / TextBoxPixel
+  struct {
+    QPointer<QLabel>                            m_label;
+    QPointer<QTextEdit>                         m_textEdit;
+    QGraphicsRectItem                           *m_handle_or_proxyControl{nullptr};
+    QGraphicsProxyWidget                        *m_proxy{nullptr};
+    QPointer<QSizeGrip>                         m_sizeGrip;
+
+    void reset()
+    {
+      // ToDo: check
+      // delete without removing from scene/view?
+
+//      qCritical() << " 11";
+      delete m_handle_or_proxyControl;
+      m_handle_or_proxyControl = nullptr;
+
+      // since m_proxy has m_handle_or_proxyControl as parent...
+      m_proxy = nullptr;
+
+
+//      qCritical() << " 33";
+      delete m_textEdit; // QPointer
+      delete m_sizeGrip; // QPointer
+
+//      qCritical() << " fini";
+
+//      qCritical() << " m_handle_or_proxyControl= " << m_handle_or_proxyControl
+//                  << " m_proxy= " << m_proxy
+//                  << " m_textEdit= " << m_textEdit
+//                  << " m_sizeGrip= " << m_sizeGrip;
+
+    }
+
+  } m_textBoxPixelAndCo;
+
+
+  LayerFactoryImpl                             *m_layerFactoryImpl        = nullptr;
+
+  ObjectFactory                                *m_objectFactory           = nullptr;
+  QSharedPointer<ObjectContainer>               m_objectContainer;
+  CoordTranslationFunctor                      *m_coordTranslationFunctorInitialize = nullptr;
+  CoordTranslationFunctor                      *m_coordTranslationFunctor           = nullptr;
+
+  QSharedPointer<PartyIdToColorFunctor>         m_partyIdToColorFunctor;
+  QTimer                                       *m_partychangedDelayTimer  = nullptr;
+
+  QSharedPointer<OverlayHandlerImpl>            m_overlayHandler;
+
+  SituationMap::GridImpl                       *m_gridImpl                = nullptr;
+
+
+  bool                                          m_suppressFirstViewpointChange = true;
+  double                                        m_pixelsize               = -1.0;  // meterPerPixel
+  double                                        m_absoluteScale           = -1.0;
+
+  double                                        m_rotationAbsoluteAngleDegrees = 0;
+
+  QTimer                                       *m_maxExtentTimer          = nullptr;
+
+  RB::RubberbandFactory                        *m_rubberbandFactory       = nullptr;
+
+
+  OverviewMapHandlerImpl                       *m_overviewMapHandler      = nullptr;
+
+  ObjectIndicatorImpl                          *m_objectIndicatorImpl     = nullptr;
+  LocationDisplayImpl                          *m_locationDisplayImpl     = nullptr;
+  QPointer<PixelBasedTextBoxHandlerImpl>       m_pixelBasedTextBoxHandlerImpl;
+
+
+  MeasurementImpl                              *m_measurementImpl         = nullptr;
+  TerrainProfileImpl                           *m_terrainProfileImpl      = nullptr;
+  ViewshedImpl                                 *m_viewshedImpl            = nullptr;
+
+  AdvancedSymbology::SymbologyType              m_symbologyType = AdvancedSymbology::SymbologyType::None;
+  double                                        m_symbolScale = 1.0;
+
+  //  // 'Optional' / Internal :
+  // replaced by EventMoseNavigator
+  RB::EventMouseNavigator                      *m_mouseEventHandler       = nullptr;
+
+  QList<RefPointer<DropEventManager>>           m_dropEventManagerList;
+
+  // : 'Optional' / Internal
+
+
+}; // class MapImpl::Private
+//-----------------------------------------------------------------------------
+
+int MapImpl::Private::s_counter = 0;
+
+MapImpl::MapImpl(QWidget *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("MapImpl"))
+  , d(new Private())
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << ++d->s_counter;
+
+  // connect errorHandling:
+  connect(Esri::ArcGISRuntime::GeometryEngine::instance(), &Esri::ArcGISRuntime::GeometryEngine::errorOccurred,
+          this, &MapImpl::onErrorGeometryEngine);
+
+
+  d->m_basemap = new Esri::ArcGISRuntime::Basemap(this);
+  d->m_basemap->setObjectName(QLatin1String("Basemap-Basemap"));
+  //----------------------------------------------------------------------------
+  // connect errorHandling:
+  //----------------------------------------------------------------------------
+  connect(d->m_basemap, &Esri::ArcGISRuntime::Map::errorOccurred,
+          this, &MapImpl::onErrorBasemap);
+
+
+  d->m_maxExtentTimer = new QTimer(this);
+  d->m_maxExtentTimer->setSingleShot(true);
+  d->m_maxExtentTimer->setInterval(200);
+
+  connect(d->m_maxExtentTimer, &QTimer::timeout, this, [this]()
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " ************** extentChangedDELAYED=";
+
+    if (d->m_destroying)
+      return;
+    emit extentChangedDelayed(); // will be sent if zooming/scaling/moving/resizing has finished for a while
+  });
+
+
+  //----------------------------------------------------------------------------
+  // add view to widget:
+  // (dependency to plugin???)
+  //----------------------------------------------------------------------------
+  //  QGridLayout* layout = new QGridLayout(this);
+  //  layout->setObjectName(QLatin1String("MapImpl-layout"));
+  //  layout->setMargin(0);
+  //  layout->addWidget(d->m_mapGraphicsView, 0, 0);
+  //  this->setLayout(layout);
+
+  // StackedLayout:
+  d->m_stackedLayout = new QStackedLayout();
+  d->m_stackedLayout->setStackingMode(QStackedLayout::StackAll);
+  this->setLayout(d->m_stackedLayout);
+
+  //----------------------------------------------------------------------------
+  // set default IdGenerator / IdContainer:
+  // can be replaced using 'setObjectContainer'
+  //----------------------------------------------------------------------------
+  QSharedPointer<SituationMap::IdGenerator> idGen(new SituationMap::IdGenerator);
+  QSharedPointer<SituationMap::ObjectContainerCTC> objectCont(new SituationMap::ObjectContainerCTC(idGen));
+  setObjectContainer(objectCont);
+
+
+  //----------------------------------------------------------------------------
+  // set default partyIdToColorFunctor:
+  // can be replaced using ''
+  //----------------------------------------------------------------------------
+  d->m_partyIdToColorFunctor =
+      QSharedPointer<PartyIdToColorFunctor>(new PartyIdToColorFunctor());
+
+  d->m_partychangedDelayTimer = new QTimer(this);
+
+  d->m_partychangedDelayTimer->setSingleShot(true);
+  d->m_partychangedDelayTimer->setInterval(1000);
+  connect(d->m_partychangedDelayTimer, &QTimer::timeout, this, &MapImpl::onAllPartysChanged);
+
+
+  //----------------------------------------------------------------------------
+  // setting of further details are continued within 'init D' and 'onMapReady'...
+  //----------------------------------------------------------------------------
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END " << this;
+}
+
+bool MapImpl::init(const Mode mapMode_2D3D)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " mode=" << mapMode_2D3D;
+  bool success = false;
+  switch (mapMode_2D3D)
+  {
+  case Mode::Mode_2D:
+    success = init2D();
+    break;
+  case Mode::Mode_3D:
+    success = init3D();
+    break;
+  case Mode::Undefined:
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " undefined 2D/3D mode";
+    return false;
+  }
+  } //switch
+
+  this->getEsriGeoView()->setAttributionTextVisible(false);  // ToDo Check
+
+#if ACRGIS_VERSION >= 0x640500 // 100.5.0 / Update 5
+  this->getEsriGeoView()->setSelectionProperties(Esri::ArcGISRuntime::SelectionProperties(Qt::magenta));
+#endif // ACRGIS_VERSION
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " mode=" << mapMode_2D3D
+                      << " success=" << success;
+
+  return success;
+}
+
+
+// for debugging :
+class MyMapGraphicsView : public Esri::ArcGISRuntime::MapGraphicsView
+{
+  using BaseClass = Esri::ArcGISRuntime::MapGraphicsView;
+public:
+  MyMapGraphicsView(QWidget* parent = nullptr)
+    : BaseClass(parent)
+  {}
+
+  void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE
+  {
+    BaseClass::paintEvent(event);
+    qCritical() << " MyMapGraphicsView::paintEvent called"
+                << " type=" << event->type()
+                << " rect=" << event->rect()
+                << " region=" << event->region();
+  }
+}; // class MyMapGraphicsView
+
+class MySceneGraphicsView : public Esri::ArcGISRuntime::SceneGraphicsView
+{
+  using BaseClass = Esri::ArcGISRuntime::SceneGraphicsView;
+public:
+  MySceneGraphicsView(QWidget* parent = nullptr)
+    : BaseClass(parent)
+  {}
+
+  void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE
+  {
+    BaseClass::paintEvent(event);
+    qCritical() << " MySceneGraphicsView::paintEvent called"
+                << " type=" << event->type()
+                << " rect=" << event->rect()
+                << " region=" << event->region();
+  }
+}; // class MySceneGraphicsView
+// : for debugging
+
+
+
+bool MapImpl::init2D()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_mapReadyFlag = false;
+
+#ifdef LTS_DEBUG
+  //----------------------------------------------------------------------------
+  // QNetworkProxy
+  //----------------------------------------------------------------------------
+  {
+    QNetworkProxy proxy = QNetworkProxy::applicationProxy();
+    INFO_LOG(m_logger) << LOGFUNCTION << " QNetworkProxy is NOT Empty"
+                       << ", hostname: '" << proxy.hostName() << "'"
+                       << ", port: '" << proxy.port() << "'"
+                       << ", user: '" << proxy.user() << "'"
+                          // << ", password: '" << proxy.password() << "'"
+                          ;
+  }
+#endif
+
+  //----------------------------------------------------------------------------
+  // Map
+  //----------------------------------------------------------------------------
+  d->m_esriMap = new Esri::ArcGISRuntime::Map(d->m_basemap, this);
+  d->m_esriMap->setObjectName(QLatin1String("EsriMap"));
+
+  // the fetch infos (like minMaxScale) of layers:
+  d->m_esriMap->setAutoFetchLegendInfos(true);
+
+  //----------------------------------------------------------------------------
+  // connect some signals:
+  //----------------------------------------------------------------------------
+  connect(d->m_esriMap, &Esri::ArcGISRuntime::Map::errorOccurred,
+          this, &MapImpl::onErrorMap);
+
+  connect(d->m_esriMap, &Esri::ArcGISRuntime::Map::doneLoading,
+          this, &MapImpl::onDoneLoading);
+
+  connect(d->m_esriMap->operationalLayers(), &Esri::ArcGISRuntime::LayerListModel::errorOccurred,
+          this, &MapImpl::onErrorOperationalLayer);
+
+  //----------------------------------------------------------------------------
+  // MapGraphicsView
+  //----------------------------------------------------------------------------
+  try
+  {
+    //    d->m_mapGraphicsView = new Esri::ArcGISRuntime::MapGraphicsView(d->m_esriMap, this);
+    d->m_mapGraphicsView = new Esri::ArcGISRuntime::MapGraphicsView(this);
+    d->m_mapGraphicsView->setObjectName(QLatin1String("EsriMapGraphicsView"));
+    d->m_mapGraphicsView->setFrameShape(QFrame::NoFrame); // frameless
+#ifdef USE_OWN_EVENTHANDLER
+    d->m_mapGraphicsView->viewport()->installEventFilter(this); // filter drag and drop events
+#endif // USE_OWN_EVENTHANDLER
+    d->m_mapGraphicsView->installEventFilter(this); // filter keyboard events
+
+    // filter keyboard events new, for 2D and 3D
+    connect(d->m_mapGraphicsView, &Esri::ArcGISRuntime::MapGraphicsView::keyPressed,
+            this, &MapImpl::onKeyPressEvent);
+
+  }
+  catch (std::exception &stdEx)
+  {
+    const char *what = stdEx.what();
+    if (what)
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << "std Exception "
+                          << " what: '" << what << "'";
+    }
+    else
+      FATAL_LOG(m_logger) << LOGFUNCTION << "std Exception";
+    throw; // re-throw
+  }
+  catch (...)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << "unknown Exception";
+    throw; // re-throw
+  }
+
+  //----------------------------------------------------------------------------
+  // Add to StackedLayout:
+  //----------------------------------------------------------------------------
+  d->m_stackedLayout->addWidget(d->m_mapGraphicsView);
+
+
+  //----------------------------------------------------------------------------
+  // some details:
+  //----------------------------------------------------------------------------
+  d->m_mapGraphicsView->setWrapAroundMode(Esri::ArcGISRuntime::WrapAroundMode::Disabled);
+
+
+  //  initFeature();
+
+  // handle rotations controlled by ESRI View
+  connect( d->m_mapGraphicsView, &Esri::ArcGISRuntime::MapGraphicsView::mapRotationChanged, this, &MapImpl::onEsriRotate );
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+
+bool MapImpl::initFeature()
+{
+  QString urlStr(QLatin1String("http://sampleserver6.arcgisonline.com/arcgis/rest/services/Energy/Geology/FeatureServer/9"));
+  urlStr = QLatin1String("http://10.86.144.36/arcgis/rest/services/Bremen/MountingPoints/FeatureServer/0");
+
+  QUrl featureUrl(urlStr);
+
+  // create the feature table
+  Esri::ArcGISRuntime::ServiceFeatureTable *featureTable = new Esri::ArcGISRuntime::ServiceFeatureTable(featureUrl, this);
+
+  // create the feature layer using the feature table
+  Esri::ArcGISRuntime::FeatureLayer *featureLayer = new Esri::ArcGISRuntime::FeatureLayer(featureTable, this);
+
+  // add the feature layer to the map
+  d->m_esriMap->operationalLayers()->append(featureLayer);
+
+  return true;
+}
+
+
+bool MapImpl::init3D()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_mapReadyFlag = false;
+
+  //----------------------------------------------------------------------------
+  // Map
+  //----------------------------------------------------------------------------
+  d->m_esriScene = new Esri::ArcGISRuntime::Scene(d->m_basemap, this);
+  d->m_esriScene->setObjectName(QLatin1String("EsriScene"));
+
+
+  //----------------------------------------------------------------------------
+  // connect some signals:
+  //----------------------------------------------------------------------------
+  connect(d->m_esriScene, &Esri::ArcGISRuntime::Scene::errorOccurred,
+          this, &MapImpl::onErrorScene);
+
+  connect(d->m_esriScene, &Esri::ArcGISRuntime::Scene::doneLoading,
+          this, &MapImpl::onDoneLoading);
+
+  connect(d->m_esriScene->operationalLayers(), &Esri::ArcGISRuntime::LayerListModel::errorOccurred,
+          this, &MapImpl::onErrorOperationalLayer);
+
+  // the fetch infos (like minMaxScale) of layers:
+  d->m_esriScene->setAutoFetchLegendInfos(true);
+
+  //----------------------------------------------------------------------------
+  // SceneGraphicsView
+  //----------------------------------------------------------------------------
+  try
+  {
+    // 2017-11-02, V100.1
+    // restoreOperatorMapSettings (restoreViewpoint will not really work, if the parent is set.
+    // wierd, but true...
+    d->m_sceneGraphicsView = new Esri::ArcGISRuntime::SceneGraphicsView(); // no parent,
+    d->m_sceneGraphicsView->setObjectName(QLatin1String("EsriSceneView"));
+    d->m_sceneGraphicsView->setFrameShape(QFrame::NoFrame); // frameless
+
+    // filter keyboard events new, for 2D and 3D
+    connect(d->m_sceneGraphicsView, &Esri::ArcGISRuntime::SceneGraphicsView::keyPressed,
+            this, &MapImpl::onKeyPressEvent);
+  }
+  catch (std::exception &stdEx)
+  {
+    const char *what = stdEx.what();
+    if (what)
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << "std Exception "
+                          << " what: '" << what << "'";
+    }
+    else
+      FATAL_LOG(m_logger) << LOGFUNCTION << "std Exception";
+    throw; // re-throw
+  }
+  catch (...)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << "unknown Exception";
+    throw; // re-throw
+  }
+
+  //----------------------------------------------------------------------------
+  // ScreenToLocationHelper
+  // to reduce the load of screenToLocation, limit the number of calculation to 10/sec
+  //----------------------------------------------------------------------------
+  d->m_screenToLocationHelper = new ScreenToLocationHelper(d->m_sceneGraphicsView);
+
+  connect(d->m_screenToLocationHelper, &ScreenToLocationHelper::mouseScenePositionChanged,
+          this, &MapImpl::onMouseScenePositionChanged, Qt::UniqueConnection);
+
+
+  //----------------------------------------------------------------------------
+  // Add to StackedLayout:
+  //----------------------------------------------------------------------------
+  d->m_stackedLayout->addWidget(d->m_sceneGraphicsView);
+
+
+  //----------------------------------------------------------------------------
+  // some details:
+  //----------------------------------------------------------------------------
+
+  // SceneView has no member 'setWrapAroundMode'
+  // d->m_sceneGraphicsView->setWrapAroundMode(Esri::ArcGISRuntime::WrapAroundMode::Disabled);
+
+  // handle rotations controlled by ESRI View
+  connect(d->m_sceneGraphicsView, &Esri::ArcGISRuntime::SceneGraphicsView::viewpointChanged, this, &MapImpl::onEsriRotate);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void MapImpl::onPartyChanged(int changedPartyId)
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " START, changedPartyId=" << changedPartyId
+                     << ", this->objectContainer().countObjects()=" << this->objectContainer().countObjects()
+                     << ", isReady = " << this->isReady();
+
+  // partyIdToColorFunctor signals that colorTable has changed.
+
+  //
+  // Update UniqueValueRenderer: (for cubes displaying the buildingOwnership
+  //
+  if ((this->mode() == Mode::Mode_3D) && this->layerFactory().hasLayernameForCubes())
+    this->layerFactory().assignUniqueValueRendererForCubes();
+
+
+  if (this->isReady())
+    INFO_LOG(m_logger) << LOGFUNCTION << " do party-update.";
+  else
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " skip party-update, because map is not ready yet.";
+    emit partysChangedDelayed();
+
+    return;
+  }
+
+
+  //
+  // clearXmlSymbolCache
+  //
+  // maybe on particpant has an XML-Symbol with NBC-Protection=1;
+  // to force re-creation of that addonSymbol:
+  symbolDictionary().clearXmlSymbolCache();
+
+
+  //
+  // Update all MapObjects
+  //
+  long objectsToUpdate = 0;
+  QMutableMapIterator<UniqueMapId, RefPointer<AbstractMapObject>> mapObjIt = this->objectContainer().mutableIterator();
+
+  while (mapObjIt.hasNext())
+  {
+    mapObjIt.next();
+    RefPointer<AbstractMapObject> mapObj = mapObjIt.value();
+    if (mapObj)
+    {
+      bool changed = mapObj->setPartyIdChanged(changedPartyId);
+
+      if (changed)
+      {
+        ++objectsToUpdate;
+        if (! mapObj->updateView())
+          ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed, debugInfo='" << mapObj->debugInfo() << "'";
+      }
+
+//      if (changedPartyId >= 0)
+//        if (mapObj->partyId() != changedPartyId) // ToDo: honor injuryPartyId also
+//          continue;
+//      mapObj->setPartyIdChanged(changedPartyId);
+
+//      if (! mapObj->updateView())
+//        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed, debugInfo='" << mapObj->debugInfo() << "'";
+    }
+  } // while
+
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " START, partysChangedDelayed " ;
+  emit partysChangedDelayed();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << objectsToUpdate << " of " << this->objectContainer().countObjects()
+                     << " were updated";
+}
+
+void MapImpl::onAllPartysChanged()
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
+  onPartyChanged(-1);
+}
+
+void MapImpl::onCheckMapReadyAndSymbolDictionaryLoaded()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_mapReadyFlag &&
+      (AdvancedSymbology::SymbolDictionary::alreadyExists(d->m_symbologyType) && symbolDictionary().isLoaded() && (symbolDictionary().symbologySpecificCount()>0)) &&
+      d->m_layerFactoryImpl->elevationSourcesLoaded()
+      )
+  {
+    if (!d->m_mapReadyAndSymbolDictionaryEmitted)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " ***** emitting mapReadyAndSymbolDictionaryLoaded"
+                           << ": '" << mode() << "'"
+                           << ": '" << symbolDictionary().symbologyType() << "'"
+                           << " (" << symbolDictionary().symbologySpecificCount()
+                           << " + "
+                           << symbolDictionary().etsSymbolCount()
+                           << " + "
+                           << symbolDictionary().xmlSymbolCount() << " = "
+                           << symbolDictionary().count() << ")";
+      emit mapReadyAndSymbolDictionaryLoaded();
+      d->m_mapReadyAndSymbolDictionaryEmitted = true;
+    }
+  }
+}
+
+
+bool MapImpl::fini()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // Eventhandling:
+  delete d->m_mouseEventHandler;
+
+  delete d->m_measurementImpl;    // ToDo: check
+  delete d->m_terrainProfileImpl;
+  delete d->m_viewshedImpl;
+
+  if (d->m_partychangedDelayTimer)
+    d->m_partychangedDelayTimer->stop();
+
+  emit beginDestroy();  // to enable destruction of FunctionDialog and its object first
+
+  // cleanup overlays:
+  if (d->m_overlayHandler)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " cleanup " << d->m_overlayHandler->overlayCount() << " overlays...";
+    d->m_overlayHandler->removeAllOverlays();
+  }
+  else
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " no overlays to cleanup -> skip";
+  }
+
+  // cleanup overviewMap:
+  if (d->m_overviewMapHandler)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION
+                       << " cleanup overviewMap";
+    d->m_overviewMapHandler->removeAll();
+  }
+
+  // SideBar:
+  // (remove embedded widgets like JumpPointWidget and is JumpPoints from the map)
+  removeSideBar();
+
+
+  // ObjectFactory:
+  int numberOfObjects = d->m_objectFactory->count();
+  INFO_LOG(m_logger) << LOGFUNCTION
+                     << " numberOfObjects at the moment = " << numberOfObjects;
+
+  if (numberOfObjects > 0)
+    d->m_objectFactory->clearObjects();
+
+  // Verify:
+  numberOfObjects = d->m_objectFactory->count();
+  INFO_LOG(m_logger) << LOGFUNCTION << " numberOfObjects remaining = " << numberOfObjects;
+
+  // deleting the LayerFactory may cause changing to DratStatus::InProgress:
+  delete d->m_layerFactoryImpl;
+  delete d->m_gridImpl;
+  delete d->m_rubberbandFactory;
+
+  // The static MapSingleton::getFactoryMap() should be cleaned up
+  // via 'qAddPostRoutine(cleanupFactoryMap);'
+  delete d->m_objectFactory;
+
+  delete d->m_coordTranslationFunctorInitialize;
+
+  // cleanup/detach ElevationMap
+  d->m_elevationMap = nullptr;
+  d->m_elevationMapManager = nullptr;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " drawStatus = " << this->drawStatus();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void MapImpl::fini2D()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  fini();
+  delete d->m_esriMap;
+  d->m_esriMap = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+void MapImpl::fini3D()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  fini();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " drawStatus = " << this->drawStatus();
+
+  delete d->m_sceneGraphicsView;
+  d->m_sceneGraphicsView = nullptr;
+  //  delete d->m_esriScene;
+  INFO_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool MapImpl::load()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_mapGraphicsView && d->m_sceneGraphicsView)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+  }
+
+  //
+  // setMap
+  //
+  // will start esris cascading load dependecies...
+
+  if (d->m_mapGraphicsView)
+    d->m_mapGraphicsView->setMap(d->m_esriMap);
+
+  // or
+
+  if (d->m_sceneGraphicsView)
+    d->m_sceneGraphicsView->setArcGISScene(d->m_esriScene);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+Mode MapImpl::mode() const
+{
+  Mode mode = Mode::Undefined;
+  if (d->m_esriMap && (!d->m_esriScene))
+    mode = Mode::Mode_2D;
+  else if (!d->m_esriMap && d->m_esriScene)
+    mode = Mode::Mode_3D;
+
+  return mode;
+}
+
+void MapImpl::setParent(QWidget *parent, bool bBeginDestroyFini)
+{
+  QWidget::setParent(parent);
+
+  if (bBeginDestroyFini)
+  {
+    // GUEZE-791 - RPL Nr 791: Arbeitsspeicherleck
+    // If map at 3D is cached and going to be unused, destroy
+    // some high level objects:
+    // see ::fini()
+
+    delete d->m_measurementImpl;
+    d->m_measurementImpl = nullptr;
+
+    delete d->m_terrainProfileImpl;
+    d->m_terrainProfileImpl = nullptr;
+
+    delete d->m_viewshedImpl;
+    d->m_viewshedImpl = nullptr;
+
+    delete d->m_objectIndicatorImpl;
+    d->m_objectIndicatorImpl = nullptr;
+
+    emit beginDestroy();
+
+    // cleanup overlays:
+    if (d->m_overlayHandler)
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION
+                         << " cleanup " << d->m_overlayHandler->overlayCount() << " overlays...";
+      d->m_overlayHandler->removeAllOverlays();
+    }
+    else
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION
+                         << " no overlays to cleanup -> skip";
+    }
+
+    int numberOfObjects = d->m_objectFactory->count();
+    INFO_LOG(m_logger) << LOGFUNCTION
+                         << " numberOfObjects remaining = " << numberOfObjects;
+
+  }
+}
+
+void MapImpl::installViewPortEventFilter(QObject *eventFilter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (! eventFilter)
+    return;
+  d->m_mapGraphicsView->viewport()->installEventFilter(eventFilter);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+} // void MapImpl::installViewPortEventFilter( QObject * eventFilter )
+
+
+void MapImpl::removeViewPortEventFilter(QObject *eventFilter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (! eventFilter)
+    return;
+  d->m_mapGraphicsView->viewport()->removeEventFilter(eventFilter);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QPointer<MapNotifier> MapImpl::createMapNotifier() const
+{
+  MapImpl *THIS = const_cast<MapImpl *>(this);
+  return MapNotifier::createMapNotifier(THIS, THIS);
+}
+
+
+void MapImpl::onLoadStatusChanged(Esri::ArcGISRuntime::LoadStatus loadStatus)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " loadStatus changes to '" << loadStatus << "'";
+}
+
+void MapImpl::onDoneLoading(const Esri::ArcGISRuntime::Error &loadError)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START " << this
+                      << " d->m_mapGraphicsView=" << d->m_mapGraphicsView
+                      << " d->m_sceneGraphicsView=" << d->m_sceneGraphicsView;
+
+  if (! loadError.isEmpty())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " loadError: " << loadError;
+
+  if (d->m_mouseEventHandler)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " already loaded, return";
+    return;
+  }
+
+  //  d->m_absoluteScale = d->m_mapGraphicsView->mapScale();    // update d->m_absoluteScale
+
+  // filter mouse events to navigate the map
+
+#ifdef USE_OWN_EVENTHANDLER
+
+  {
+    switch (this->mode())
+    {
+    case Mode::Mode_2D:
+      d->m_mouseEventHandler = new RB::EventMouseNavigator(d->m_mapGraphicsView->viewport(), this);
+      break;
+    case Mode::Mode_3D:
+      d->m_mouseEventHandler = new RB::EventMouseNavigator(d->m_sceneGraphicsView->viewport(), this);
+      break;
+    default:
+      // empty
+      break;
+    } // switch
+
+    if (d->m_mouseEventHandler)
+    {
+      // handle mouse move events
+      connect(d->m_mouseEventHandler
+              , &RB::EventMouseNavigator::mouseMovedEvent
+              , this
+              , &MapImpl::onHandleMouseMove);
+
+      connect(d->m_mouseEventHandler
+              , &RB::EventMouseNavigator::selectionRequest
+              , this
+              , &MapImpl::onClickMapObject);
+
+      connect(d->m_mouseEventHandler
+              , &RB::EventMouseNavigator::contextMenuRequest
+              , this
+              , &MapImpl::onContextClick);
+
+#ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+      connect(d->m_mouseEventHandler
+              , &RB::EventMouseNavigator::mouseWheelEvent
+              , this
+              , &MapImpl::onWheelZoom);
+#endif // SITUATIONMAP_OWN_WHEEL_HANDLING
+
+      if (d->m_sideBar && d->m_pbSideBar)
+      {
+        connect(d->m_mouseEventHandler, &RB::EventMouseNavigator::selectionRequest, this, [this]
+                (const QList< SituationMap::UniqueMapId > & //idList
+                , const QPointF & viewPortPos)
+        {
+          // ignore event, if viewPortPos is at m_pbSideBar
+          // (In that case the SideBar is currently opening...)
+          QRect rect = d->m_pbSideBar->rect();
+          rect.moveTo(d->m_pbSideBar->pos());
+
+          if (! rect.contains(viewPortPos.toPoint()))
+            d->m_sideBar->hideAnimated();
+        });
+
+      } // if (d->m_sideBar && d->m_pbSideBar)
+    } // if (d->m_mouseEventHandler)
+  }
+#endif // USE_OWN_EVENTHANDLER
+
+
+
+  //----------------------------------------------------------------------------
+  // set CoordTranslationFunctor to default within Combat Training Centers (CTC)
+  // (SLSE)
+  //----------------------------------------------------------------------------
+  if (! d->m_coordTranslationFunctorInitialize)
+    d->m_coordTranslationFunctorInitialize = new CoordTranslationFunctorImpl(this);
+
+  if (! d->m_coordTranslationFunctor)
+    d->m_coordTranslationFunctor = d->m_coordTranslationFunctorInitialize;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " ***** CoordTranslationFunctor set" << " (" << d->m_coordTranslationFunctor << ")";
+  INFO_LOG(m_logger) << LOGFUNCTION << " ***** wkid=" << this->getEsriSpatialReference().wkid() << " *****";
+  INFO_LOG(m_logger) << LOGFUNCTION << " ***** wkt='" << this->getEsriSpatialReference().wkText() << "' *****";
+
+
+  if (this->getEsriSpatialReference().wkid() >= 0)
+  {
+    //
+    // set map ready:
+    //
+    INFO_LOG(m_logger) << LOGFUNCTION << " ***** emitting mapReady"
+                       << " (wkid = " << this->getEsriSpatialReference().wkid()
+                       << ", mode = " << this->mode()
+                       << ", minScale = " << this->minScale()
+                       << ", maxScale = " << this->maxScale()
+                       << ", this=" << this
+                       << ", ThreadId=" << QThread::currentThreadId()
+                       << ")";
+
+    d->m_mapReadyFlag = true;
+    emit mapReady();
+
+    // maybe SymbolDictionary was loaded earlier than map:
+    onCheckMapReadyAndSymbolDictionaryLoaded();
+
+
+  } // if (this->getEsriSpatialReference().wkid() >= 0)
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " wkid failed, wkid=" << this->getEsriSpatialReference().wkid() << " *****";
+
+
+  // Problems with order:
+  // mapReady and "connect viewpointChanged" -> ok
+  // "connect viewpointChanged" and mapReady -> NOT ok
+
+  // connect some signals:
+  if (d->m_mapGraphicsView)
+  {
+    connect(d->m_mapGraphicsView, &Esri::ArcGISRuntime::MapGraphicsView::viewpointChanged, this, &MapImpl::onViewpointChanged);
+    connect(d->m_mapGraphicsView, &Esri::ArcGISRuntime::MapGraphicsView::rectChanged,      this, &MapImpl::onRectChanged);
+  }
+  if (d->m_sceneGraphicsView)
+  {
+    connect(d->m_sceneGraphicsView, &Esri::ArcGISRuntime::SceneGraphicsView::viewpointChanged, this, &MapImpl::onViewpointChanged);
+    connect(d->m_sceneGraphicsView, &Esri::ArcGISRuntime::SceneGraphicsView::rectChanged,      this, &MapImpl::onRectChanged);
+  }
+
+  // check mapReady and SymbolDictionary::loaded
+  onCheckMapReadyAndSymbolDictionaryLoaded();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MapImpl::onMouseScenePositionChanged(const Point3D &locationScene, bool isValid)
+{
+  if (d->m_destroying)
+    return;
+
+  // 1
+  emit mouseMapPositionChanged(locationScene, isValid);
+
+  SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (mapCtFunctor)
+  {
+    if (isSignalConnected(QMetaMethod::fromSignal(&Map::mouseGeoPositionChanged)))
+    {
+      // 2
+      emit mouseGeoPositionChanged(mapCtFunctor->mapToGeographic(locationScene), isValid);
+    }
+  }
+}
+
+void MapImpl::onRubberbandPickMapObjectsApply(RB::RubberbandBase *rubberband)
+{
+  if (d->m_destroying)
+    return;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool mapObjectIdsPicked = isSignalConnected(QMetaMethod::fromSignal(&Map::mapObjectIdsPickedByArea));
+  bool mapObjectsPicked   = isSignalConnected(QMetaMethod::fromSignal(&Map::mapObjectsPickedByArea));
+
+  //  // cehck if any signal is connected:
+  if (!(mapObjectIdsPicked || mapObjectsPicked))
+    return;
+
+  QList<UniqueMapId>      pickedMapObjectIdList;
+  RefPointerMapObjectList pickedMapObjects;
+
+  const QVector<QPointF> &mapCoordVec = rubberband->coordinateVector(RB::CoordinateSystem::Map);
+  if (mapCoordVec.size() != 4)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failure, coordVec.size()=" << mapCoordVec.size();
+    return;
+  }
+
+  // create esriHull for geometryIsInHull ; create esriLine for geometryIntersect
+  //
+  // if required :
+  //  Esri::ArcGISRuntime::PolylineBuilder polylineBuilder(this->getEsriSpatialReference());
+  //  polylineBuilder.addPoint(mapCoord.x(), mapCoord.y());
+  //  mapObj->geometryIntersect(esriLine)
+  // : if required
+
+
+  Esri::ArcGISRuntime::PolygonBuilder  polygonBuilder(this->getEsriSpatialReference());
+  for (const QPointF &mapCoord : mapCoordVec)
+    polygonBuilder.addPoint(mapCoord.x(), mapCoord.y());
+  const Esri::ArcGISRuntime::Geometry &esriHull = polygonBuilder.toGeometry();
+
+  // check any MapObject
+  const QList<AbstractMapObject *> allMapObj = this->objectContainer().getAllObjects();
+  pickedMapObjectIdList.reserve(allMapObj.size());
+  pickedMapObjects.reserve(allMapObj.size());
+
+  for (AbstractMapObject *mapObj : allMapObj)
+  {
+    if (!mapObj)
+      continue;
+
+    if (!mapObj->pickable())
+      continue;
+
+    if (mapObj->geometryIsInHull(esriHull))
+    {
+      pickedMapObjectIdList.append(mapObj->uniqueMapId());
+      pickedMapObjects.append(RefPointer<AbstractMapObject>(mapObj));
+    }
+  }
+
+  // emit
+  if (mapObjectIdsPicked)
+    emit mapObjectIdsPickedByArea(pickedMapObjectIdList);
+  if (mapObjectsPicked)
+    emit mapObjectsPickedByArea(pickedMapObjects);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+MapImpl::~MapImpl()
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << d->s_counter--;
+
+  d->m_destroying = true;
+
+  if (d->m_maxExtentTimer)
+    d->m_maxExtentTimer->stop();
+  delete d->m_maxExtentTimer;
+  d->m_maxExtentTimer = nullptr;
+
+  delete d->m_rocketTimer;
+  d->m_rocketTimer = nullptr;
+
+  if (d->m_screenToLocationHelper)
+  {
+    d->m_screenToLocationHelper->disconnect(this);
+    INFO_LOG(m_logger) << LOGFUNCTION << " Helper pendingOperationsCount = " << d->m_screenToLocationHelper->pendingOperationsCount();
+    delete d->m_screenToLocationHelper;
+    d->m_screenToLocationHelper = nullptr;
+  }
+
+  if (d->m_locationToElevationHelper)
+  {
+    d->m_locationToElevationHelper->disconnect(this);
+    INFO_LOG(m_logger) << LOGFUNCTION << " Helper pendingOperationsCount = " << d->m_locationToElevationHelper->pendingOperationsCount();
+    delete d->m_locationToElevationHelper;
+    d->m_locationToElevationHelper = nullptr;
+  }
+
+  delete d->m_objectIndicatorImpl;
+  d->m_objectIndicatorImpl = nullptr;
+
+  delete d->m_locationDisplayImpl;
+  d->m_locationDisplayImpl = nullptr;
+
+  switch(mode())
+  {
+  case Mode::Mode_2D:    fini2D();    break;
+  case Mode::Mode_3D:    fini3D();    break;
+  case Mode::Undefined:  fini();      break;
+  }
+
+  delete d->m_basemap;
+  d->m_basemap = nullptr;
+  delete d;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " END " << this;
+}
+
+
+double MapImpl::animationDuration() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_animationDuration;
+}
+
+void SituationMap::MapImpl::setAnimationDuration(double durationSec)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " durationSec=" << durationSec;
+  d->m_animationDuration = durationSec;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+double SituationMap::MapImpl::rocketDuration() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_rocketDuration;
+}
+
+void SituationMap::MapImpl::setRocketDuration(double durationSec)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " durationSec=" << durationSec;
+  d->m_rocketDuration = durationSec;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+//class MyLabel : public QLabel
+//{
+//public:
+//  void hideEvent(QHideEvent* event) override
+//  {
+//    qWarning() << LOGFUNCTION << " type=" << event->type();
+//    QLabel::hideEvent(event);
+////    abort();
+//  }
+
+//  bool event(QEvent *e)
+//  {
+//    qWarning() << LOGFUNCTION << " type=" << e->type();
+//    return QLabel::event(e);
+//  }
+
+//  void updateGeometry()
+//  {
+//    qWarning() << LOGFUNCTION;
+//    QLabel::updateGeometry();
+//  }
+//};
+
+
+
+
+
+void MapImpl::addMapWidget()
+{
+  //  return addMapWidget_OwnWidget();
+  //  return this->addMapWidget_AddToScene();
+
+  if (this->isReady())
+    this->addMapWidget_AddToScene();
+  else
+  {
+    connect(this, &Map::mapReady, this, [this]()
+    {
+      this->addMapWidget_AddToScene();
+    });
+  }
+}
+
+bool MapImpl::setTextBox(const PixelTextBoxData &ptbd, bool enableGeometryModifications)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << "  XXXXXXXXXXXXXXXXXX START"
+                      << " enableGeomtryUpdate " << enableGeometryModifications
+                      << ", ptbd " << ptbd.toDebugString();
+
+  if (ptbd.m_htmlText.isEmpty())
+    return false;
+
+  QGraphicsView *gView = this->getQGraphicsView();
+  if (!gView)
+    return false;
+
+  d->m_textBoxPixelAndCo.reset();
+
+  if (!d->m_textBoxPixelAndCo.m_textEdit)
+  {
+    d->m_textBoxPixelAndCo.m_textEdit = new QTextEdit();
+    d->m_textBoxPixelAndCo.m_textEdit->setObjectName(QStringLiteral("WidgetOverlay_QTextEdit"));
+    d->m_textBoxPixelAndCo.m_textEdit->setReadOnly(false);
+
+    d->m_textBoxPixelAndCo.m_label = new QLabel(QStringLiteral("new QLabel"));
+
+    // Make it 'modifiable'
+    if (enableGeometryModifications)
+    {
+      // It looks like:
+      // GraphicsItem <-> ProxyWidget <-> Widget/TextEdit
+      // (QGraphicsItem is a baseclass of both GraphicsItem as well as ProxyWidget)
+      // GraphicsItem becomes parent of ProxyWidget
+      // Then TextEdit is added via setWidget to ProxyWidget
+      // Now both are connected, TextEdit in front of GraphicsItem which ist little bit bigger
+      // GraphicsItem is movable, GI an TE are connected to each other...
+      // 10.05.2023, Norbert Thoden
+      // (((Idea: Maybe ProxyWidget should be parent of GraphicsItem
+      // to put GraphicsItem on top of TextEdit???)))
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl = new QGraphicsRectItem(0, 0, 0, 0); // x,y == rel position, size will be set later
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setCursor(Qt::SizeAllCursor);
+
+      d->m_textBoxPixelAndCo.m_proxy = new QGraphicsProxyWidget(d->m_textBoxPixelAndCo.m_handle_or_proxyControl);
+      d->m_textBoxPixelAndCo.m_proxy->setObjectName(QStringLiteral("ProxyWidgetOverlay_QTextEdit"));
+      d->m_textBoxPixelAndCo.m_proxy->setWidget(d->m_textBoxPixelAndCo.m_textEdit);
+//      d->m_textBoxPixelAndCo.m_proxy->setWidget(d->m_textBoxPixelAndCo.m_label);
+
+      d->m_textBoxPixelAndCo.m_proxy->setPos(QPoint(0, 0)); // relative position to GraphicsItem !?
+
+      d->m_textBoxPixelAndCo.m_proxy->setOpacity(0.99); // avoid white on white
+      // d->m_textBoxPixelAndCo.m_proxy->setZValue(std::numeric_limits<double>::max());
+
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setPen(QPen(Qt::gray));
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setBrush(QBrush(Qt::gray));
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+
+      this->getQGraphicsView()->scene()->addItem(d->m_textBoxPixelAndCo.m_handle_or_proxyControl);
+
+      // restore geometry:
+      d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setPos(ptbd.m_position);
+
+      // SizeGrip :
+      QSizeGrip *sizeGrip = new QSizeGrip(d->m_textBoxPixelAndCo.m_textEdit);
+      QHBoxLayout *layout = new QHBoxLayout(d->m_textBoxPixelAndCo.m_textEdit);
+      layout->setContentsMargins(0, 0, 0, 0);
+      layout->addWidget(sizeGrip, 0, Qt::AlignRight | Qt::AlignBottom);
+      // : SizeGrip
+
+      {
+        // Sync geometry of TextEdit and GraphicsItem/ProxyWidget:
+        // create fn...
+        std::function<void()> fnUpdateGraphicsItemGeometry = [this]()
+        {
+          d->m_textBoxPixelAndCo.m_handle_or_proxyControl->setRect( d->m_textBoxPixelAndCo.m_textEdit->geometry().adjusted(-10, -10, 10, 10) );
+
+//          qCritical() << " handle_or_proxyControl = " << d->m_textBoxPixelAndCo.m_handle_or_proxyControl->pos();
+//          qCritical() << " d->m_textEdit->geometry() = " << d->m_textBoxPixelAndCo.m_textEdit->geometry();
+        };
+
+        // ... to be executed initially
+        fnUpdateGraphicsItemGeometry();
+
+        // ... and on geometry changes
+        // QTextEdit has no geometryChanged or similar, but ProxyWidget has:
+        connect(d->m_textBoxPixelAndCo.m_proxy, &QGraphicsProxyWidget::geometryChanged, fnUpdateGraphicsItemGeometry);
+      }
+
+      {
+        // get pos and geometry;
+        std::function<void()> fnGetPosAndGeometry = [this]()
+        {
+//          qCritical() << " 222 handle_or_proxyControl pos = " << handle_or_proxyControl->pos();
+//          qCritical() << " 222 handle_or_proxyControl rect= " << handle_or_proxyControl->rect();
+
+//          const QPoint &pos = d->m_textBoxPixelAndCo.m_handle_or_proxyControl->pos().toPoint();
+          const QSize size(d->m_textBoxPixelAndCo.m_handle_or_proxyControl->rect().width(),
+                           d->m_textBoxPixelAndCo.m_handle_or_proxyControl->rect().height());
+
+          //maybe take border of 10 pixel into account!?
+
+
+//          qCritical() << " 222 handle_or_proxyControl pos= " << pos
+//                      << ", size= " << size;
+
+
+//          ptbd.m_position = pos;
+//          ptbd.m_size = size;
+        };
+
+        auto *timer =new QTimer(this);
+        connect(timer, &QTimer::timeout, fnGetPosAndGeometry);
+//        timer->start(5000);
+      }
+
+    } else {
+//      d->m_textBoxPixelAndCo.m_proxy = this->getQGraphicsView()->scene()->addWidget(d->m_textBoxPixelAndCo.m_textEdit);
+//      d->m_textBoxPixelAndCo.m_proxy->setOpacity(0.99);
+//      d->m_textBoxPixelAndCo.m_proxy->setZValue(std::numeric_limits<double>::max());
+//      d->m_textBoxPixelAndCo.m_proxy->setPos(QPoint(75, 75));
+//      d->m_textBoxPixelAndCo.m_proxy->setObjectName(QStringLiteral("ProxyWidgetOverlay_QTextEdit"));
+    }
+
+  }
+
+//  qCritical() << " setText= " <<  ptbd.m_htmlText;
+
+  d->m_textBoxPixelAndCo.m_textEdit->setText(ptbd.m_htmlText);
+
+  d->m_textBoxPixelAndCo.m_proxy->setOpacity(0.99);
+
+//  QTimer::singleShot(5000, this, [this] () {
+//    FATAL_LOG(m_logger) << LOGFUNCTION << " XXXX timer: reset...";
+//    d->m_textBoxPixelAndCo.reset();
+//    FATAL_LOG(m_logger) << LOGFUNCTION << " XXXX timer: reset... Done";
+//  });
+
+//  QSizeF size = te->document()->size();
+//  te->setFixedWidth(te->document()->idealWidth() + 100);
+
+//  te->setFixedSize(size.toSize());
+
+//  QGraphicsProxyWidget *proxy = this->getQGraphicsView()->scene()->addWidget(d->m_textEdit);
+//  proxy->setOpacity(0.99);
+//  proxy->setZValue(std::numeric_limits<double>::max());
+
+//  proxy->setPos(QPoint(75, 75));
+
+//  proxy->setObjectName(QStringLiteral("ProxyWidgetOverlay_QTextEdit"));
+
+/*
+  QTimer::singleShot(10000000, this, [this] () {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " XXXX timer:";
+
+    qCritical() << " size " << d->m_textEdit->size();
+
+    auto *handle_or_proxyControl = new QGraphicsRectItem(0, 0, 0, 0); // x,y == rel position
+    handle_or_proxyControl->setCursor(Qt::SizeAllCursor);
+
+    auto *localProxy = new QGraphicsProxyWidget(handle_or_proxyControl);
+    localProxy->setWidget(d->m_textEdit);
+    localProxy->setPos(QPoint(75, 75));
+
+    // SizeGrip :
+    QSizeGrip *sizeGrip = new QSizeGrip(d->m_textEdit);
+    QHBoxLayout *layout = new QHBoxLayout(d->m_textEdit);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(sizeGrip, 0, Qt::AlignRight | Qt::AlignBottom);
+    // : SizeGrip
+
+    handle_or_proxyControl->setPen(QPen(Qt::yellow));
+    handle_or_proxyControl->setBrush(QBrush(Qt::gray));
+    handle_or_proxyControl->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable );
+
+    this->getQGraphicsView()->scene()->addItem(handle_or_proxyControl);
+
+    handle_or_proxyControl->setRect(d->m_textEdit->geometry().adjusted(-10, -10, 10, 10) );
+
+    connect(d->m_textEdit.data(), &QTextEdit::cursorPositionChanged, [this, handle_or_proxyControl] ()
+    {
+      handle_or_proxyControl->setRect( d->m_textEdit->geometry().adjusted(-10, -10, 10, 10) );
+    });
+
+
+//    QGraphicsWidget* parentWidget = new QGraphicsWidget(handle);//make parent of widget
+//    parentWidget->setCursor(Qt::SizeAllCursor);
+//    qCritical() << " size " << d->m_textEdit;
+//    parentWidget->setGeometry(100, 100, 500, 500);
+
+//    parentWidget->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable );
+//    parentWidget->setSelected(true);
+//    this->getQGraphicsView()->scene()->addItem(handle);
+
+//    localProxy->setParentItem(parentWidget);
+
+  });
+*/
+
+/*
+  // Moving:
+
+  QTimer::singleShot(1000, this, [this, &te] () {
+
+    FATAL_LOG(m_logger) << LOGFUNCTION << " timer:";
+
+    QGraphicsWidget* parentWidget = new QGraphicsWidget();//make parent of widget
+    parentWidget->setCursor(Qt::SizeAllCursor);
+    qCritical() << " size " << te->size();
+//    parentWidget->setGeometry(75, 75, te->size().width(), te->size().height());
+    parentWidget->setGeometry(75, 75, 200, 200);
+    parentWidget->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable );
+//    parentWidget->setSelected(true);
+    this->getQGraphicsView()->scene()->addItem(parentWidget);
+
+    QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget();
+    proxy->setPos(QPoint(75, 75));
+
+//    QGraphicsSimpleTextItem *gitem = new QGraphicsSimpleTextItem();
+//    gitem->setText(QStringLiteral("MyMovableText"));
+
+    proxy->setWidget(te);
+    proxy->setParentItem(parentWidget);
+
+  });
+*/
+
+  FATAL_LOG(m_logger) << LOGFUNCTION
+                      << "  XXXXXXXXXXXXXXXXXX Done";
+
+
+  return true;
+}
+
+bool MapImpl::removeTextBox()
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << "START";
+  d->m_textBoxPixelAndCo.reset();
+  FATAL_LOG(m_logger) << LOGFUNCTION << "START";
+  return true;
+}
+
+void moveLabelTo(QLabel *label, int windowWidth, int borderX, int y)
+{
+  QPoint newPos;
+  newPos.rx() = windowWidth - label->width() - borderX;
+  newPos.ry() = y;
+  label->move(newPos);
+}
+
+QWidget *MapImpl::addMapWidget_AddToScene()
+{
+  const QFont  font(QLatin1String("Courier New"), 13, QFont::DemiBold);
+  const QSize  labelBorderPixel(5, 2);
+  const QPoint distanceToFrame(25, 25);
+
+  QFontMetrics fm(font);
+  QSize labelMinSize;
+  if (true) // (mode() == Mode::Mode_3D) && layerFactory().elevationAvailable())
+    labelMinSize = fm.size(0, QLatin1String("32U MD 12345 12345 - 123"));
+  else
+    labelMinSize = fm.size(0, QLatin1String("32U MD 12345 12345"));
+
+  QPoint labelPos = distanceToFrame;
+
+  // PositionLabel
+  if (1) // Todo: unnecessary if ?
+  {
+    if (! d->m_positionLabel)
+    {
+      d->m_positionLabel = new QLabel();
+      d->m_positionLabel->setObjectName(QLatin1String("WidgetOverlayLayoutPositionLabel"));
+      d->m_positionLabel->setText(QLatin1String("-"));
+      d->m_positionLabel->setFont(font);
+      d->m_positionLabel->setAlignment(Qt::AlignBottom | Qt::AlignCenter);
+      d->m_positionLabel->setMinimumSize(labelMinSize + labelBorderPixel);
+
+      // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+      // Adding a widget will let the application crash
+      // Workaround: 'proxy->setOpacity(0.99);'
+      QGraphicsProxyWidget *proxy = this->getQGraphicsView()->scene()->addWidget(d->m_positionLabel);
+      proxy->setOpacity(0.99);
+      proxy->setZValue(std::numeric_limits<double>::max());
+
+      // lambda :-)
+      connect(this, &SituationMap::Map::rectChanged, this, [this, distanceToFrame]()
+      {
+        moveLabelTo(d->m_positionLabel, getQGraphicsView()->width(), distanceToFrame.x(), d->m_positionLabel->pos().y());
+      });
+
+      // lambda :-)
+      connect(this, &SituationMap::Map::mouseMapPositionChanged, this, [this](const Point3D &mapPos, bool isValid)
+      {
+        if (!this->isReady())
+          return;
+
+        if (!isValid)
+        {
+          d->m_positionLabel->setText(QStringLiteral("-"));
+          return;
+        }
+
+
+        // Shift + Strg -> lonLat in DEG
+        // Shift + Alt  -> lonLat in RAD
+        // default -> MGRS
+
+        if (d->m_positionLabel->isVisible())
+        {
+          QString posStr;
+
+          const Qt::KeyboardModifiers &curModifier = QGuiApplication::queryKeyboardModifiers();
+          SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+          if (mapCtFunctor && curModifier.testFlag(Qt::KeyboardModifier::ShiftModifier))
+          {
+            Point3D geoPos3D = mapCtFunctor->mapToGeographic(mapPos);
+            QPointF geoPos2D = geoPos3D.toPointF();
+            if (curModifier.testFlag(Qt::ControlModifier))
+            {
+              posStr = QStringLiteral("%1 - %2").arg(geoPos2D.x()).arg(geoPos2D.y());
+              d->m_positionLabel->setToolTip(QLatin1String("lon/x - lat/y "));
+            } else if (curModifier.testFlag(Qt::AltModifier))
+            {
+              geoPos2D *= LtsCoordTrans::rad2deg(); // RAD to DEG
+              posStr = QStringLiteral("%1 - %2").arg(geoPos2D.x()).arg(geoPos2D.y());
+              d->m_positionLabel->setToolTip(QLatin1String("lon/x - lat/y"));
+            }
+          } else {
+            d->m_positionLabel->setToolTip(QString());
+          }
+          if (posStr.isEmpty())
+            posStr = this->mapToMgrsString(mapPos.toPointF());
+          d->m_positionStr = posStr;
+
+
+          switch(this->mode())
+          {
+          case Mode::Mode_3D:
+          {
+            // 3D: simple -> use z value:
+            // based on Surface::screenToBaseSurface / Surface::screenToLocation
+            //
+            if (qIsNaN(mapPos.z()))
+              d->m_positionElevationStr = QLatin1String("INV");
+            else
+            {
+              if (std::lround(mapPos.z()) < 10.0)
+                d->m_positionElevationStr.setNum(mapPos.z(), 'f', 1);
+              else
+                d->m_positionElevationStr.setNum(std::lround(mapPos.z()));
+            }
+            d->updatePositionText();
+          }
+            break;
+          case Mode::Mode_2D:
+          {
+            // if elevation is available
+            if (this->layerFactory().elevationAvailable() && this->isReady())
+            {
+              // 2D: use LocationToElevationHelper:
+              // 1. do setup:
+              setupLocationToElevationHelper();
+
+              // 2. trigger computation:
+              if (d->m_locationToElevationHelper)
+                d->m_locationToElevationHelper->locationToElevation(mapPos.toPointF());
+            } // if (this->layerFactory().elevationAvailable() && this->isReady())
+            else
+              d->updatePositionText(); // update if elevation is NOT available
+          }
+            break;
+          case Mode::Undefined:
+            // empty
+            break;
+          } //switch
+
+
+
+        } // if (d->m_positionLabel->isVisible())
+      }); // lambda
+
+    }
+    moveLabelTo(d->m_positionLabel, getQGraphicsView()->width(), distanceToFrame.x(), labelPos.y());
+
+
+    // Prepare next label:
+    if (d->m_positionLabel->isVisible())
+      labelPos.ry() += d->m_positionLabel->minimumHeight();
+  }
+
+  // ExerciseTimeLabel
+ // if (isReplay())
+  {
+    if (! d->m_exerciseTimeLabel)
+    {
+      d->m_exerciseTimeLabel = new QLabel();
+      d->m_exerciseTimeLabel->setVisible(false);
+      d->m_exerciseTimeLabel->setObjectName(QLatin1String("WidgetOverlayLayoutExerciseTimeLabel"));
+      d->m_exerciseTimeLabel->setText(QLatin1String("-"));
+      d->m_exerciseTimeLabel->setFont(font);
+      d->m_exerciseTimeLabel->setAlignment(Qt::AlignBottom | Qt::AlignCenter);
+      d->m_exerciseTimeLabel->setMinimumSize(labelMinSize + labelBorderPixel);
+
+      // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+      // Adding a widget will let the application crash
+      // Workaround: 'proxy->setOpacity(0.99);'
+      QGraphicsProxyWidget *proxy = this->getQGraphicsView()->scene()->addWidget(d->m_exerciseTimeLabel);
+      proxy->setOpacity(0.99);
+      proxy->setZValue(std::numeric_limits<double>::max());
+
+      connect(this, &SituationMap::Map::rectChanged, this, [this, distanceToFrame]()
+      {
+        moveLabelTo(d->m_exerciseTimeLabel, getQGraphicsView()->width(), distanceToFrame.x(), d->m_exerciseTimeLabel->pos().y());
+      });
+    }
+    moveLabelTo(d->m_exerciseTimeLabel, getQGraphicsView()->width(), distanceToFrame.x(), labelPos.y());
+    // Prepare next label:
+    if (d->m_exerciseTimeLabel->isVisible())
+      labelPos.ry() += d->m_exerciseTimeLabel->minimumHeight();
+  }
+
+  // TimeLabel:
+  if (0) // Todo: unnecessary if ?
+  {
+    if (! d->m_timeLabel)
+    {
+      d->m_timeLabel = new QLabel();
+      d->m_timeLabel->setObjectName(QLatin1String("WidgetOverlayLayoutTimeStringLabel"));
+      d->m_timeLabel->setText(QLatin1String("#"));
+      d->m_timeLabel->setFont(font);
+      d->m_timeLabel->setAlignment(Qt::AlignBottom | Qt::AlignCenter);
+      d->m_timeLabel->setMinimumSize(labelMinSize + labelBorderPixel);
+
+      // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+      // Adding a widget will let the application crash
+      // Workaround: 'proxy->setOpacity(0.99);'
+      QGraphicsProxyWidget *proxy = this->getQGraphicsView()->scene()->addWidget(d->m_timeLabel);
+      proxy->setOpacity(0.99);
+      proxy->setZValue(std::numeric_limits<double>::max());
+
+      // lambda :-)
+      connect(this, &SituationMap::Map::rectChanged, this, [this, distanceToFrame]()
+      {
+        moveLabelTo(d->m_timeLabel, getQGraphicsView()->width(), distanceToFrame.x(), d->m_timeLabel->pos().y());
+      });
+
+      // by default -> not visible:
+      d->m_timeLabel->setVisible(false);
+    }
+
+    moveLabelTo(d->m_timeLabel, getQGraphicsView()->width(), distanceToFrame.x(), labelPos.y());
+
+
+
+    // Prepare next label:
+    if (d->m_timeLabel->isVisible())
+      labelPos.ry() += d->m_timeLabel->minimumHeight();
+
+  }
+
+  // compass
+  if (this->mode() != Mode::Undefined)
+  {
+    if (! d->m_compass)
+    {
+      d->m_compass = new MyGraphicsPixmapItem(); // QGraphicsPixmapItem
+
+      // get rde blue:
+      QColor rdeColor = this->palette().color(QPalette::WindowText); // RDE_DARK_BLUE
+      QColor bgColor;// = this->palette().color(QPalette::Shadow); // RDE_LIGHTER_GRAY is too pale
+      if (! bgColor.isValid())
+        bgColor = Qt::gray;
+      bgColor.setAlphaF(0.5);
+      QImage image = renderCompass(rdeColor, Qt::white, bgColor, 8, 30, this->mode()==Mode::Mode_3D);
+      d->m_compass->setPixmap(QPixmap::fromImage(image));
+
+      //      QPixmap pixmap(QLatin1String(":/compass.png"));
+      //      d->m_compass->setPixmap(pixmap.scaledToHeight(height));
+
+      qreal xOffset = d->m_compass->pixmap().width()  * 0.5;
+      qreal yOffset = d->m_compass->pixmap().height() * 0.5;
+      d->m_compass->setOffset(-xOffset, -yOffset);
+
+      d->m_compass->setZValue(std::numeric_limits<double>::max());
+      d->m_compass->setVisible(true);
+
+      d->m_compass->setFlags(QGraphicsItem::ItemIgnoresTransformations);
+      d->m_compass->setShapeMode(QGraphicsPixmapItem::BoundingRectShape);
+
+      this->getQGraphicsView()->scene()->addItem(d->m_compass);
+
+      // lambda :-)
+      connect(this, &SituationMap::Map::rectChanged, this, [this, distanceToFrame]()
+      {
+        QPoint newPos = d->m_compass->pos().toPoint();
+        int maxDimHalf = std::max(d->m_compass->pixmap().width(),
+                                  d->m_compass->pixmap().height()) * 0.5;
+        newPos.rx() = this->getQGraphicsView()->width() - maxDimHalf - distanceToFrame.x();
+        d->m_compass->setPos(newPos);
+      });
+
+
+      if (this->mode() == Mode::Mode_2D)
+      {
+        // lambda :-)
+        connect(this, &Map::rotationChanged, this, [this](double absoluteAngleDegrees)
+        {
+
+          // QGraphicsItem:
+          // Sets the clockwise rotation angle, in degrees, around the Z axis.
+          // The default value is 0 (i.e., the item is not rotated).
+          // Assigning a negative value will rotate the item counter-clockwise.
+          // Normally the rotation angle is in the range (-360, 360),
+          // but it's also possible to assign values outside of this range
+          // (e.g., a rotation of 370 degrees is the same as a rotation of 10 degrees).
+
+          // -> use values directly:
+          d->m_compass->setRotation(absoluteAngleDegrees);
+        });
+      } else if (this->mode() == Mode::Mode_3D)
+      {
+        // lambda :-)
+        connect(this, &Map::extentChanged, this, [this]()
+        {
+          const Esri::ArcGISRuntime::Camera &cam = d->m_sceneGraphicsView->currentViewpointCamera();
+          d->m_compass->setRotation(360.0 - cam.heading());
+        });
+      }
+
+      // lambda :-)
+      connect(d->m_compass, &MyGraphicsPixmapItem::doubleClicked, this, [this]()
+      {
+        if (mode() == Mode::Mode_2D)
+        {
+          if (qApp->keyboardModifiers().testFlag(Qt::ShiftModifier))
+          {
+            const Esri::ArcGISRuntime::Envelope &fullExtent = this->layerFactoryImpl().fullExtentOfBasemaps();
+            d->m_mapGraphicsView->setViewpointAndWait(Esri::ArcGISRuntime::Viewpoint(fullExtent));
+          } else if (qApp->keyboardModifiers().testFlag(Qt::ControlModifier))
+          {
+            this->zoomToArea(d->m_trainingsAreaExtent, 50);
+          } else {
+            Viewpoint2D vp = this->viewpoint2D();
+            vp.setRotation(0.0);
+            this->setViewpoint2D(vp);
+          }
+        }
+        else if(mode() == Mode::Mode_3D)
+        {
+          if (qApp->keyboardModifiers().testFlag(Qt::ShiftModifier))
+          {
+            const Esri::ArcGISRuntime::Envelope &fullExtent = this->layerFactoryImpl().fullExtentOfBasemaps();
+            d->m_sceneGraphicsView->setViewpointAndWait(Esri::ArcGISRuntime::Viewpoint(fullExtent));
+          } else if (qApp->keyboardModifiers().testFlag(Qt::ControlModifier))
+          {
+            this->zoomToArea(d->m_trainingsAreaExtent, 50);
+          } else {
+            Camera cam = this->camera();
+            cam.heading = 0.0;
+            cam.pitch = 0.0;
+            cam.roll = 0.0;
+            this->setCamera(cam);
+          }
+        }
+      });
+
+    } // if (! d->m_compass)
+
+    QPoint newPos = labelPos;
+    newPos.ry() += 10;  // small distance
+    int maxDimHalf = std::max(d->m_compass->pixmap().width(),
+                              d->m_compass->pixmap().height()) * 0.5;
+    newPos.ry() += maxDimHalf;
+    newPos.rx() = this->getQGraphicsView()->width() - maxDimHalf - distanceToFrame.x();
+    d->m_compass->setPos(newPos);
+  }
+  else
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " compass not supported for 3D yet";
+
+  // to trigger all 'consumer'
+  emitVisualComponentChanged(VisualComponent::PosititionString);
+  emitVisualComponentChanged(VisualComponent::ExerciseTimeString);
+  emitVisualComponentChanged(VisualComponent::TimeString);
+  emitVisualComponentChanged(VisualComponent::CompassRose);
+
+  return nullptr;
+}
+
+void MapImpl::setupLocationToElevationHelper()
+{
+  if (d->m_locationToElevationHelper)
+    return;
+
+  auto elevationMap = this->getElevationMapManager();
+  if (!elevationMap)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " no ElevationMapManager";
+    return;
+  }
+
+  d->m_locationToElevationHelper = this->layerFactory().locationToElevation(); // layerFactory has ownership
+  if (d->m_locationToElevationHelper)
+  {
+    // lambda :-)
+    connect(d->m_locationToElevationHelper.data(), &SituationMap::LocationToElevationHelper::elevationCompleted,
+            this, [this](double elevation)
+    {
+      // ElevationMap return std::numeric_limits<int>::min() or similar if location is not covered:
+      if (qIsNaN(elevation) || elevation < -30000)
+        d->m_positionElevationStr = QLatin1String("-");
+      else
+        if (std::lround(elevation) < 10.0)
+          d->m_positionElevationStr.setNum(elevation, 'f', 1);
+        else
+          d->m_positionElevationStr.setNum(std::lround(elevation));
+      d->updatePositionText();
+    });
+  }
+}
+
+
+#ifdef NEVER
+class MyWidget : public QWidget
+{
+  Q_OBJECT
+public:
+  MyWidget()
+    : QWidget()
+    , m_targetWidget(nullptr)
+    , m_enable(false)
+  {}
+
+  void setTargetWidget(QWidget *targetWidget)
+  {
+    m_targetWidget = targetWidget;
+  }
+
+  void enable()
+  {
+    qWarning() << " target is enabled now";
+    m_enable = true;
+  }
+
+  bool event(QEvent *e) override
+  {
+    qWarning() << " e=" << e;
+
+    if (!m_enable)
+      return QWidget::event(e);
+
+
+    if (e->type() == QEvent::MouseButtonDblClick
+        || e->type() == QEvent::MouseMove
+        || e->type() == QEvent::MouseButtonPress
+        || e->type() == QEvent::MouseButtonRelease)
+    {
+      // Mouse events are forwarded to the underlying widget
+      QMouseEvent *event = static_cast<QMouseEvent *>(e);
+
+      qWarning() << " event.pos=" << event->pos();
+
+      QWidget *child = childAt(event->pos());
+      qWarning() << " child=" << child;
+
+      // no own child widgets found:
+      if (! child)
+      {
+        QMouseEvent shiftedEvent(event->type(), event->pos(),
+                                 event->globalPos(), event->button(), event->buttons(),
+                                 event->modifiers());
+
+        qWarning() << " forwarding event=" << e;
+        // -> send event to 'underlying' widget:
+        QApplication::sendEvent(m_targetWidget, &shiftedEvent);
+      }
+
+    }
+    // own child widgets found -> handle event normally:
+    return QWidget::event(e);
+  }
+
+private:
+  QWidget *m_targetWidget;
+  bool m_enable;
+};
+#endif
+
+
+QWidget *MapImpl::addMapWidget_OwnWidget()
+{
+#ifdef NEVER
+  const QFont  font(QLatin1String("Courier New"), 13, QFont::DemiBold);
+  const QSize  labelBorderPixel(5, 2);
+  //  const QPoint distanceToFrame (25,25);
+
+  QFontMetrics fm(font);
+  //const QString defaultPostitionLabelStr(QLatin1String("32 U MD 12345 12345"));
+  const QString defaultTimeStr(QLatin1String("01234567890123456789"));
+  QSize labelMinSize = fm.size(0, defaultTimeStr);
+
+
+  MyWidget *widget = new MyWidget();
+  //  widget->setStyleSheet(QLatin1String("* {background-color: yellow;}"));
+  QHBoxLayout *layout = new QHBoxLayout();
+  widget->setLayout(layout);
+
+
+  widget->setTargetWidget(d->m_stackedLayout->currentWidget());
+
+  QTimer *timer = new QTimer();
+  timer->setSingleShot(true);
+  timer->setInterval(2000);
+
+  connect(timer, &QTimer::timeout, widget, [widget]()
+  {
+    widget->enable();
+  });
+
+  timer->start();
+
+
+  // add WidgetOverlayLayout and make it current:
+  int idx = d->m_stackedLayout->addWidget(widget);
+  d->m_stackedLayout->setCurrentIndex(idx);
+
+  d->m_positionLabel = new QLabel();
+  d->m_positionLabel->setObjectName(QLatin1String("WidgetOverlayLayoutPositionLabel"));
+  d->m_positionLabel->setStyleSheet(QLatin1String("QLabel {background-color: gray;}"));
+  d->m_positionLabel->setText(QLatin1String("-"));
+  d->m_positionLabel->setFont(font);
+  d->m_positionLabel->setAlignment(Qt::AlignBottom | Qt::AlignCenter);
+  d->m_positionLabel->setMinimumSize(labelMinSize + labelBorderPixel);
+  d->m_positionLabel->setMaximumSize(this->minimumSize());
+
+  //  QSpacerItem *spacer = new QSpacerItem(10, 1, QSizePolicy::Maximum, QSizePolicy::Maximum);
+  //  layout->addItem(spacer, 0,0);
+
+  layout->addStretch(2);
+  layout->addWidget(d->m_positionLabel);
+
+#endif
+  return nullptr;
+}
+
+QImage SituationMap::MapImpl::renderCompass(const QColor &colorNorth,
+                                            const QColor &colorSouth,
+                                            const QColor &colorBackground,
+                                            int halfWidth, int halfHeight,
+                                            bool b_3D)
+{
+  int width  = halfWidth  * 2;
+  int height = halfHeight * 2;
+  QImage image(width, height, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+  painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+  {
+    //    QPen pen(Qt::black);
+    //    pen.setWidth(1);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(QBrush(colorNorth, Qt::BrushStyle::SolidPattern));
+
+    //   2 ||
+    //    |  |
+    // 1 |    | 3
+    //    |  |
+    //     ||
+
+    QPolygon poly;
+    poly.reserve(3);
+    poly.append(QPoint(        0, halfHeight));
+    poly.append(QPoint(halfWidth, 0));
+    poly.append(QPoint(    width, halfHeight));
+
+    painter.drawPolygon(poly);
+  }
+  {
+    //    QPen pen(Qt::black);
+    //    pen.setWidth(1);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(QBrush(colorSouth, Qt::BrushStyle::SolidPattern));
+
+    //     ||
+    //    |  |
+    // 1 |    | 3
+    //    |  |
+    //   2 ||
+
+    QPolygon poly;
+    poly.reserve(3);
+    poly.append(QPoint(        0, halfHeight));
+    poly.append(QPoint(halfWidth, height));
+    poly.append(QPoint(    width, halfHeight));
+
+    painter.drawPolygon(poly);
+  }
+
+  painter.end();
+
+  // background:
+  int maxDim = std::max(width, height);
+  int border = 5;
+  QImage backgroundImage(maxDim + (2 * border),
+                         maxDim + (2 * border),
+                         QImage::Format_ARGB32);
+  {
+    backgroundImage.fill(Qt::transparent);
+
+    painter.begin(&backgroundImage);
+    painter.setBrush(QBrush(colorBackground));
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(backgroundImage.rect());
+    painter.end();
+  }
+
+
+  // merge:
+  {
+    painter.begin(&backgroundImage);
+
+    int offsetX = (backgroundImage.width() - image.width()) / 2;
+    int offsetY = (backgroundImage.height() - image.height()) / 2;
+
+    QRect r = image.rect();
+    r.moveTo(offsetX, offsetY);
+    painter.drawImage(r, image, image.rect());
+    painter.end();
+  }
+
+
+  {
+    painter.begin(&backgroundImage);
+    QPointF pos(backgroundImage.width() / 2.0 * 1.1,
+                backgroundImage.height() / 2.0 * 0.4);
+
+    // 'N'
+    QFont font = painter.font();
+    font.setBold(true);
+    painter.setFont(font);
+    painter.setPen(colorNorth);
+
+    painter.drawText(pos, QLatin1String("N"));
+
+    pos.rx() = backgroundImage.width() / 2.0 * 1.1;
+    pos.ry() = backgroundImage.height() / 2.0 * 1.9;
+    if (b_3D)
+      painter.drawText(pos, QLatin1String("3D"));
+    else
+      painter.drawText(pos, QLatin1String("2D"));
+  }
+
+  return backgroundImage;
+}
+
+
+bool SituationMap::MapImpl::isPositionStringVisible() const
+{
+  if (! d->m_positionLabel)
+    return false;
+  d->updatePositionText();
+  return d->m_positionLabel->isVisible();
+}
+
+void MapImpl::showPositionString(bool visible)
+{
+  if (! d->m_positionLabel)
+    return;
+
+  bool changed = d->m_positionLabel->isVisible() != visible;
+  d->m_positionLabel->setVisible(visible);
+  if (changed)
+  {
+    addMapWidget();
+    emitVisualComponentChanged(VisualComponent::PosititionString);
+  }
+}
+
+void SituationMap::MapImpl::setPositionStringColor(const QColor &foregroundColor, const QColor &backgroundColor)
+{
+  d->m_positionLabelForegroundColor = foregroundColor;
+  d->m_positionLabelBackgroundColor = backgroundColor;
+
+  if (! d->m_positionLabel)
+    return;
+
+  QLabel *label = d->m_positionLabel;
+  if (label)
+  {
+    QPalette palette = label->palette();
+    if (d->m_positionLabelForegroundColor.isValid())
+      palette.setColor(label->foregroundRole(), d->m_positionLabelForegroundColor);
+    if (d->m_positionLabelBackgroundColor.isValid())
+      palette.setColor(label->backgroundRole(), d->m_positionLabelBackgroundColor);
+    label->setPalette(palette);
+  }
+}
+
+void MapImpl::setPartitionTime(const qint64 &time)
+{
+  if(!d->m_exerciseTimeLabel)
+    return;
+  d->m_exerciseTimeLabel->setText(DTG::toStringMSec(time));
+}
+
+void MapImpl::setReplay(bool b)
+{
+  d->m_isReplay = b;
+}
+
+bool MapImpl::isReplay() const
+{
+  return d->m_isReplay;
+}
+
+bool MapImpl::isExerciseTimeStringVisible() const
+{
+  if (! d->m_exerciseTimeLabel)
+    return false;
+  return d->m_exerciseTimeLabel->isVisible();
+}
+
+void MapImpl::showExerciseTimeString(bool visible)
+{
+  if (! d->m_exerciseTimeLabel)
+    return;
+  bool changed = d->m_exerciseTimeLabel->isVisible() != visible;
+  d->m_exerciseTimeLabel->setVisible(visible);
+  if (changed)
+  {
+    addMapWidget();
+    emitVisualComponentChanged(VisualComponent::ExerciseTimeString);
+  }
+}
+
+void MapImpl::setExerciseTimeStringColor(const QColor &foregroundColor, const QColor &backgroundColor)
+{
+  d->m_exerciseTimeLabelForegroundColor = foregroundColor;
+  d->m_exerciseTimeLabelBackgroundColor = backgroundColor;
+
+  if (! d->m_exerciseTimeLabel)
+    return;
+
+  QLabel *label = d->m_exerciseTimeLabel;
+  if (label)
+  {
+    QPalette palette = label->palette();
+    if (d->m_exerciseTimeLabelForegroundColor.isValid())
+      palette.setColor(label->foregroundRole(), d->m_exerciseTimeLabelForegroundColor);
+    if (d->m_exerciseTimeLabelBackgroundColor.isValid())
+      palette.setColor(label->backgroundRole(), d->m_exerciseTimeLabelBackgroundColor);
+    label->setPalette(palette);
+  }
+}
+
+bool SituationMap::MapImpl::isTimeStringVisible() const
+{
+  if (! d->m_timeLabel)
+    return false;
+  return d->m_timeLabel->isVisible();
+}
+
+void MapImpl::setTimeString(const QString &timeString)
+{
+  if (! d->m_timeLabel)
+    return;
+
+  d->m_timeLabel->setText(timeString);
+}
+
+void SituationMap::MapImpl::showTimeString(bool visible)
+{
+  if (d->m_destroying)
+    return;
+
+  if (!d->m_timeLabel)
+    return;
+
+  bool changed = d->m_timeLabel->isVisible() != visible;
+  d->m_timeLabel->setVisible(visible);
+  if (changed)
+  {
+    addMapWidget();
+    emitVisualComponentChanged(VisualComponent::TimeString);
+  }
+}
+
+void SituationMap::MapImpl::setTimeStringColor(const QColor &foregroundColor, const QColor &backgroundColor)
+{
+  if (d->m_destroying)
+    return;
+
+  d->m_timeLabelForegroundColor = foregroundColor;
+  d->m_timeLabelBackgroundColor = backgroundColor;
+
+  if (! d->m_timeLabel)
+    return;
+
+  QLabel *label = d->m_timeLabel;
+  if (label)
+  {
+    QPalette palette = label->palette();
+    if (d->m_timeLabelForegroundColor.isValid())
+      palette.setColor(label->foregroundRole(), d->m_timeLabelForegroundColor);
+    if (d->m_timeLabelBackgroundColor.isValid())
+      palette.setColor(label->backgroundRole(), d->m_timeLabelBackgroundColor);
+    label->setPalette(palette);
+  }
+}
+
+bool SituationMap::MapImpl::isCompassVisible() const
+{
+  if (! d->m_compass)
+    return false;
+  return d->m_compass->isVisible();
+}
+
+void MapImpl::showCompass(bool visible)
+{
+  if (d->m_destroying)
+    return;
+
+  if (!d->m_compass)
+    return;
+
+  bool changed = d->m_compass->isVisible() != visible;
+  d->m_compass->setVisible(visible);
+  if (changed)
+    emitVisualComponentChanged(VisualComponent::CompassRose);
+}
+
+
+void MapImpl::addSideBar()
+{
+  if (d->m_destroying)
+    return;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_sideBar)
+    return;
+
+  // Create SideBar:
+  d->m_sideBar = QPointer<SideBar>(new SideBar());  // no parent, will be embedded to StackedItem taking ownership
+
+  d->m_sideBar->setAnimationDuration(500);
+
+  d->m_sideBar->setMinimumWidth(350);
+  d->m_sideBar->setMaximumWidth(d->m_sideBar->minimumWidth());
+  d->m_sideBar->setMinimumHeight(300);
+
+
+  int width = d->m_sideBar->minimumWidth();
+  d->m_sideBar->setVisiblePosition(QPoint(0, 0));
+  d->m_sideBar->setInvisiblePosition(QPoint(-width, 0));
+
+  // Embed (and take ownership)
+  if (d->m_stackedLayout)
+  {
+    int idx = d->m_stackedLayout->addWidget(d->m_sideBar);  // takes ownership
+    d->m_stackedLayout->setCurrentIndex(idx);
+  }
+
+  // Visibility:
+  d->m_sideBar->hide();
+
+
+  //----------------------------------------------
+  // add Entries:
+  //----------------------------------------------
+  SituationMap::SideBarItem *item;
+
+  // Show Grid
+  item = new SituationMap::SideBarItem(tr("Show Grid"));
+  item->setEnabled(this->mode() == Mode::Mode_2D);
+  item->setCheckState((this->grid().isVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  d->m_sideBar->addCheckableItem(item);
+  connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+  {
+    this->grid().setVisible(onOff);
+  });
+  connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+  {
+    item->setCheckState((this->grid().isVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  });
+
+  // Show Position String
+  item = new SituationMap::SideBarItem(tr("Show Position String"));
+  item->setCheckState((this->isPositionStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  d->m_sideBar->addCheckableItem(item);
+  connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+  {
+    this->showPositionString(onOff);
+  });
+  connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+  {
+    item->setCheckState((this->isPositionStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  });
+
+  // Show Exercise Time String
+  // //  if(isReplay()) // GUEZE-2921 'Anpassen der Uhrzeit auf Nutzerbasis (Checkbox)'
+  // Mit GUEZE-2921 ist es immer verfügbar.
+  // Muss es vielleicht über ein projectSetting gesteuert werden?
+  // Gilt es wirklich für alle Apps?
+  {
+    item = new SituationMap::SideBarItem(tr("Show Exercise Time String"));
+    item->setCheckState((this->isExerciseTimeStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+    d->m_sideBar->addCheckableItem(item);
+    connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+    {
+      this->showExerciseTimeString(onOff);
+    });
+    connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+    {
+      item->setCheckState((this->isExerciseTimeStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+    });
+  }
+
+  // Show Time String
+  //  item = new SituationMap::SideBarItem(tr("Show Time String"));
+  //  item->setCheckState((this->isTimeStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  //  d->m_sideBar->addCheckableItem(item);
+  //  connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+  //  {
+  //    this->showTimeString(onOff);
+  //  });
+  //  connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+  //  {
+  //    item->setCheckState((this->isTimeStringVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  //  });
+
+  // Show Compass Rose
+  item = new SituationMap::SideBarItem(tr("Show Compass Rose"));
+  item->setCheckState((this->isCompassVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  d->m_sideBar->addCheckableItem(item);
+  connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+  {
+    this->showCompass(onOff);
+  });
+  connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+  {
+    item->setCheckState((this->isCompassVisible()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  });
+
+
+  // Show Overview Map
+  item = new SituationMap::SideBarItem(tr("Show Overview Map"));
+  OverviewMapHandler &omHdl = overviewMapHandler();
+  item->setCheckState((omHdl.builtInOverviewMapWidget()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  d->m_sideBar->addCheckableItem(item);
+  connect(item, &SituationMap::SideBarItem::changed, this, [this](bool onOff)
+  {
+    OverviewMapHandler &omHdl = overviewMapHandler();
+    if (onOff)
+      omHdl.createBuiltInOverviewMap();
+    else
+      omHdl.removeBuiltInOverviewMap();
+  });
+  connect(this, &SituationMap::Map::visualComponentChanged, this, [this, item]()
+  {
+    OverviewMapHandler &omHdl = overviewMapHandler();
+    item->setCheckState((omHdl.builtInOverviewMapWidget()) ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+  });
+
+  // could be continue like:
+  //  item = new SituationMap::SideBarItem(tr("Scale Bar (tbd)"));
+  //  item->setCheckState(Qt::CheckState::Checked);
+  //  d->m_sideBar->addCheckableItem(item);
+
+  //  item = new SituationMap::SideBarItem(tr("Distance Measurement (tbd)"));
+  //  item->setCheckState(Qt::CheckState::Checked);
+  //  d->m_sideBar->addCheckableItem(item);
+  //  item = new SituationMap::SideBarItem(tr("Terrain Profile (tbd)"));
+  //  item->setCheckState(Qt::CheckState::Checked);
+  //  d->m_sideBar->addCheckableItem(item);
+  //  item = new SituationMap::SideBarItem(tr("Viewshed (tbd)"));
+  //  item->setCheckState(Qt::CheckState::Checked);
+  //  d->m_sideBar->addCheckableItem(item);
+
+
+  // Rocket
+  QPushButton *pbHome = new QPushButton(tr("Home"));
+  pbHome->setIcon(QIcon(QLatin1String("icon:go-home.svg")));
+  d->m_sideBar->addWidget(pbHome);
+  connect(pbHome, &QPushButton::clicked, this, [this]() {
+    this->zoomToArea(d->m_trainingsAreaExtent, 50);
+  });
+
+  // Rocket
+  QPushButton *pbRocket = new QPushButton(tr("Rocket"));
+  pbRocket->setIcon(QIcon(QLatin1String("icon:rocket.svg")));
+  d->m_sideBar->addWidget(pbRocket);
+  connect(pbRocket, &QPushButton::clicked, this, &MapImpl::startRocket);
+
+
+  // JumpPointWidget:
+  const QString jpLayername = this->layerFactoryImpl().jumpPointLayer();
+  d->m_jumpPointWidget = new JumpPointWidget(jpLayername, this, QLatin1String("myJumpPointWidget"));
+  d->m_sideBar->addWidget(d->m_jumpPointWidget);
+
+  // temporaery :
+  if (0)
+  {
+    if (this->isReady())
+    {
+      d->m_jumpPointWidget->addJumpPoint(QLatin1String("JP_BuildingDemo111"),
+                                         QPointF(0.155275, 0.925975),
+                                         1000);
+    }
+    else
+    {
+      connect(this, &Map::mapReady, this, [this]()
+      {
+        d->m_jumpPointWidget->addJumpPoint(QLatin1String("JP_BuildingDemo222"),
+                                           QPointF(0.155275, 0.925975),
+                                           1000);
+      });
+    }
+  }
+  // : temporaery
+
+
+
+  // Add Button for SideBar/BurgerMenue
+  {
+    if (!d->m_pbSideBar)
+    {
+      MyPushButton *pb = new MyPushButton(); // parent = 0 -> toplevelWidget
+
+      //const QColor &base = this->palette().color(QPalette::Base); // qt::white
+      QColor rdeColor = palette().color(QPalette::WindowText); // RDE_DARK_BLUE
+
+      pb->setFlat(true);
+      pb->setIconSize(QSize(36, 36));
+      pb->setFixedSize(pb->iconSize() * 1.2);
+
+      pb->setIconOnHover(SideBar::createIcon(rdeColor, QColor(), 100));
+      rdeColor.setAlphaF(0.7);
+      pb->setIconPale(SideBar::createIcon(rdeColor, QColor(), 100));
+
+      d->m_pbSideBar = pb;
+    }
+
+    QPushButton *pbSideBar = d->m_pbSideBar;
+    //    pbSideBar->setText(QLatin1String("MainMenue"));
+    pbSideBar->setObjectName(QLatin1String("QPushButton-MainMenue"));
+
+
+    // add button
+
+    // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+    // Adding a widget will let the application crash
+    // Workaround: 'proxy->setOpacity(0.99);'
+    switch (mode())
+    {
+    case Mode::Mode_2D:
+    {
+      QGraphicsProxyWidget *proxy = d->m_mapGraphicsView->scene()->addWidget(pbSideBar);
+      proxy->setOpacity(0.99);
+    }
+      break;
+    case Mode::Mode_3D:
+    {
+      QGraphicsProxyWidget *proxy = d->m_sceneGraphicsView->QGraphicsView::scene()->addWidget(pbSideBar);
+      proxy->setOpacity(0.99);
+    }
+      break;
+    case Mode::Undefined:
+      // empty
+      break;
+    } // switch
+
+    pbSideBar->move(25, 25);
+
+    //    connect(pbMainMenue, &QPushButton::clicked, this, &SitMap::onShowSideBar);
+    connect(pbSideBar, &QPushButton::clicked, this, [&]()
+    {
+      if (QGuiApplication::keyboardModifiers().testFlag(Qt::ShiftModifier)
+          && QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier)
+          && QGuiApplication::keyboardModifiers().testFlag(Qt::AltModifier))
+      {
+
+        // 'debug' behaviour: toDumpString
+        std::string localLoggerName = m_logger.getLoggerName() + ".dump";
+        LOGGER_T logger = m_logger.getNGLLogger(localLoggerName);
+
+        NOTICE_LOG(logger) << "START DUMP --- objectName: " << this->objectName();
+        const QString &dumpStr = this->toDumpString();
+        NOTICE_LOG(logger) << dumpStr;
+        NOTICE_LOG(logger) << "START END --- objectName: " << this->objectName();
+      } else {
+
+        // typical behaviour:
+        d->m_sideBar->showAnimated();
+
+      }
+    });
+
+    //    QDialog * d = new QDialog;
+    //    d->setLayout(new QHBoxLayout);
+    //    d->layout()->addWidget(pbSideBar);
+    //    d->setMinimumSize(QSize(500, 500));
+    //    d->exec();
+
+
+
+    // enable/disable button depending on mapReady
+    if (this->isReady())
+    {
+      pbSideBar->setStyleSheet(QLatin1String("QPushButton {background-color: transparent; border: 1px solid transparent;}"));
+      pbSideBar->setEnabled(true);
+    }
+    else
+    {
+      pbSideBar->setStyleSheet(QLatin1String("QPushButton {background-color: red; border: 1px solid transparent;}"));
+      pbSideBar->setEnabled(false);
+
+      connect(this, &Map::mapReady, this, [pbSideBar]()
+      {
+        pbSideBar->setStyleSheet(QLatin1String("QPushButton {background-color: transparent; border: 1px solid transparent;}"));
+        pbSideBar->setEnabled(true);
+
+        // pbSideBar->setStyleSheet(QLatin1String("QPushButton {background-color: transparent; border: 1px solid transparent;} QPushButton:hover {background-color: white; border: 1px solid transparent;}"));
+        // setStyleSheet(QLatin1String("QTabBar::close-button{ image: url(\"icon:dialog-close.svg\"); }"));
+      });
+    }
+
+
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MapImpl::removeSideBar()
+{
+  delete d->m_sideBar;
+}
+
+QPointer<SideBar> MapImpl::sideBar()
+{
+  return d->m_sideBar;
+}
+
+
+bool MapImpl::applyLicense(const QString &licenseStr, const QStringList &extensions)
+{
+  LOGGER_T logger = getLogger("MapImpl");
+  static int licensed = -1;
+
+  INFO_LOG(logger) << LOGFUNCTION << " licenseStr = '" << licenseStr << "'";
+  for (const auto &ex : extensions)
+    INFO_LOG(logger) << LOGFUNCTION << " extension = '" << ex << "'";
+
+  if (licensed != -1)
+  {
+    INFO_LOG(logger) << LOGFUNCTION
+                     << " already licensed"
+                     << " (licensed=" << licensed << ")";
+    return licensed == 1;
+  }
+
+  connect(Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::instance(), &Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::errorOccurred,
+          [](const Esri::ArcGISRuntime::Error & error)
+  {
+    std::cerr << " EsriError occured: " << error << std::endl;
+    LOGGER_T logger = getLogger("MapImpl");
+    ERROR_LOG(logger) << LOGFUNCTION << " EsriError occured: " << error;
+  });
+
+  // 1. setLicense
+  Esri::ArcGISRuntime::LicenseResult licResult;
+
+  if (extensions.isEmpty())
+    licResult = Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setLicense(licenseStr);
+  else
+    licResult = Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setLicense(licenseStr, extensions);
+
+  // 2. initialize
+  if (! Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::initialize())
+    FATAL_LOG(logger) << LOGFUNCTION << " ArcGISRuntimeEnvironment::initialize failed";
+  DEBUG_LOG(logger) << LOGFUNCTION << " licResult=" << (int)licResult.licenseStatus();
+  //  Invalid = 0, Expired = 2, LoginRequired = 3, Valid = 4
+
+  std::ostringstream msg;
+  msg << " licenseStatus = " << licResult.licenseStatus()
+      << " licenseStr='" << licenseStr.toStdString() << "'";
+  for (const QString &extStr : qAsConst(extensions))
+    msg << " extensionsStr= '" << extStr << "'";
+
+  if (licResult.licenseStatus() == Esri::ArcGISRuntime::LicenseStatus::Valid)
+  {
+    licensed = 1;
+    INFO_LOG(logger) << LOGFUNCTION  << " success: " << msg.str();
+  }
+  else
+  {
+    licensed = 0;
+    FATAL_LOG(logger) << LOGFUNCTION << " Error: " << msg.str();
+  }
+
+  return licResult.licenseStatus() == Esri::ArcGISRuntime::LicenseStatus::Valid;
+}
+
+bool MapImpl::applyNetworkCacheSettings(const EsriNetworkCacheSettings &esriNetworkCacheSettings)
+{
+  LOGGER_T logger = getLogger("MapImpl");
+  INFO_LOG(logger) << LOGFUNCTION << " EsriNetworkCacheSettings = " << esriNetworkCacheSettings;
+
+#if ACRGIS_VERSION < 0x640700 // 100.7.0 / Update 7
+  WARNING_LOG(logger) << LOGFUNCTION << " EsriNetworkCacheSettings not supported yet";
+#else
+#  ifdef HAS_NETWORK_CACHE_CONFIGURATION // 100.15
+  Esri::ArcGISRuntime::NetworkCacheConfiguration *globNetCacheConfig =
+      Esri::ArcGISRuntime::RequestConfiguration::globalNetworkCacheConfiguration();
+  if (!globNetCacheConfig)
+  {
+    WARNING_LOG(logger) << LOGFUNCTION << " globalNetworkCacheConfiguration failed";
+    return false;
+  }
+
+  // V100.8:
+  // setNetworkCachingEnabled -> NetworkCacheConfiguration
+  // V100.15: default CachePolicy is 'PreferNetwork'
+
+
+  INFO_LOG(logger) << LOGFUNCTION << " globalNetworkCacheConfiguration: clearCache... '" << globNetCacheConfig->cacheDirectory() << "'";
+  globNetCacheConfig->clearCacheAsync(); // clearCacheAsync - since 100.15.0
+
+  INFO_LOG(logger) << LOGFUNCTION << " globalNetworkCacheConfiguration: setNetworkCachingEnabledAsync... to " << globNetCacheConfig->networkCachingEnabled();
+  globNetCacheConfig->setNetworkCachingEnabledAsync(esriNetworkCacheSettings.enabled); // setNetworkCachingEnabledAsync - since 100.15.0
+
+  NOTICE_LOG(logger) << LOGFUNCTION << " globalNetworkCacheConfiguration: " << globNetCacheConfig->cachePolicy()
+                     << ", cacheDir='" << globNetCacheConfig->cacheDirectory() << "'"
+                     << ", cacheSize=" << globNetCacheConfig->cacheSize();
+#  else
+  Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setNetworkCachingEnabled(esriNetworkCacheSettings.enabled);
+#  endif // HAS_NETWORK_CACHE_CONFIGURATION
+#endif // ACRGIS_VERSION
+
+  return true;
+}
+EsriNetworkCacheSettings MapImpl::networkCacheSettings()
+{
+  EsriNetworkCacheSettings encs;
+
+
+#if ACRGIS_VERSION < 0x640700 // 100.7.0 / Update 7
+  LOGGER_T logger = getLogger("MapImpl");
+  WARNING_LOG(logger) << LOGFUNCTION << " EsriNetworkCacheSettings not supported yet";
+#else
+
+#  ifdef HAS_NETWORK_CACHE_CONFIGURATION // 100.15
+  LOGGER_T logger = getLogger("MapImpl");
+  Esri::ArcGISRuntime::NetworkCacheConfiguration *globNetCacheConfig =
+      Esri::ArcGISRuntime::RequestConfiguration::globalNetworkCacheConfiguration();
+  if (globNetCacheConfig)
+  {
+    encs.enabled = globNetCacheConfig->networkCachingEnabled();
+  } else {
+    WARNING_LOG(logger) << LOGFUNCTION << " globalNetworkCacheConfiguration failed";
+  }
+
+#  else
+  encs.enabled = Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::networkCachingEnabled();
+#  endif // HAS_NETWORK_CACHE_CONFIGURATION
+#endif // #if ACRGIS_VERSION < 0x640700
+
+  return encs;
+}
+
+
+
+Esri::ArcGISRuntime::Map *MapImpl::getEsriMap() const
+{
+  return d->m_esriMap;
+}
+
+Esri::ArcGISRuntime::Basemap *MapImpl::getEsriBasemap() const
+{
+  return d->m_basemap;
+}
+
+
+bool MapImpl::initElevationMapManager(const QStringList &filePaths_rough_to_fine)
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " read elevation data file \'" << filePaths_rough_to_fine.join(QStringLiteral(" ; ")) << "\' ...";
+
+  QString fileCombinationKey; // name of TrainingArea would be helpful :-)
+  for (const QString &filePath : filePaths_rough_to_fine)
+    fileCombinationKey.append(QFileInfo(filePath).fileName() + QStringLiteral("#"));
+
+
+  static QHash<QString, std::weak_ptr<ElevationMapManager>> s_elevationMapManagers;
+  auto it = s_elevationMapManagers.find(fileCombinationKey);
+  if (it != s_elevationMapManagers.end())
+  {
+    d->m_elevationMapManager = it.value().lock();
+    if (d->m_elevationMapManager)
+      return true;
+  }
+  d->m_elevationMapManager = std::make_shared<ElevationMapManager>();
+  d->m_elevationMapManager->init(filePaths_rough_to_fine);
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " read elevation data file \'" << filePaths_rough_to_fine.join(QStringLiteral(" ; ")) << "\' ... done";
+
+  return true;
+}
+
+std::shared_ptr<ElevationMapManager> MapImpl::getElevationMapManager() const
+{
+  if (d->m_elevationMapManager && !d->m_elevationMapManager->isValid())
+    return nullptr;
+  return d->m_elevationMapManager;
+}
+
+Esri::ArcGISRuntime::SpatialReference MapImpl::getEsriSpatialReference() const
+{
+  if (d->m_esriMap)
+    return d->m_esriMap->spatialReference();
+  if (d->m_esriScene)
+    return d->m_esriScene->spatialReference();
+  return Esri::ArcGISRuntime::SpatialReference();
+}
+
+Esri::ArcGISRuntime::Scene *MapImpl::getEsriScene() const
+{
+  if (!d->m_esriScene)
+    return nullptr;
+  return d->m_esriScene;
+}
+
+Esri::ArcGISRuntime::MapGraphicsView *MapImpl::getEsriMapGraphicsView() const
+{
+  return d->m_mapGraphicsView;
+}
+
+Esri::ArcGISRuntime::SceneGraphicsView *MapImpl::getEsriSceneGraphicsView() const
+{
+  return d->m_sceneGraphicsView;
+}
+
+QGraphicsView *MapImpl::getEsriQGraphicsView() const
+{
+  if (d->m_mapGraphicsView)
+    return d->m_mapGraphicsView;
+  if (d->m_sceneGraphicsView)
+    return d->m_sceneGraphicsView;
+  return nullptr;
+}
+
+Esri::ArcGISRuntime::GeoView *MapImpl::getEsriGeoView() const
+{
+  if (d->m_mapGraphicsView && d->m_sceneGraphicsView)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Upps, 2D(Map) and also 3D (Scene) -> error!!! ";
+  }
+  if (d->m_mapGraphicsView)
+    return d->m_mapGraphicsView;
+  if (d->m_sceneGraphicsView)
+    return d->m_sceneGraphicsView;
+  return nullptr;
+}
+
+QString MapImpl::toDumpString() const
+{
+  std::stringstream myLine;
+  Esri::ArcGISRuntime::Map             *esriMap             = d->m_esriMap;
+  Esri::ArcGISRuntime::MapGraphicsView *esriGraphicsMapView = d->m_mapGraphicsView;
+  Esri::ArcGISRuntime::Scene           *esriScene             = d->m_esriScene;
+  //  Esri::ArcGISRuntime::SceneGraphicsView *esriGraphicsSceneView = d->m_sceneGraphicsView;
+
+  Esri::ArcGISRuntime::GeoView         *geoView = this->getEsriGeoView();
+  if (! geoView)
+    return QString();
+
+  int graphicsOverlayCount = -1;
+  if (geoView->graphicsOverlays())
+    graphicsOverlayCount = geoView->graphicsOverlays()->size();
+
+  int basemapCount = -1;
+  if (this->getEsriBasemap() && this->getEsriBasemap()->baseLayers())
+    basemapCount = this->getEsriBasemap()->baseLayers()->size();
+
+  QRectF curExtent  = this->extent();
+  QRectF fullExtent; // = this->fullExtent();
+
+  //  Esri::ArcGISRuntime::Envelope env = esriMap->fullExtent();
+  //  QPointF fullExtentMin(env.xMin(), env.yMin());
+  //  QPointF fullExtentMax(env.xMax(), env.yMax());
+  //  QPointF fullExtentCenter(env.center().x(), env.center().y());
+
+
+  // header
+  {
+    myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+
+    //    myLine << " animationMode \t\t= " << static_cast<int>(esriMap->animationMode()) << std::endl;
+    //    myLine << " animationDuration \t= " << esriMap->animationDuration() << std::endl;
+
+    myLine << " current wkid \t\t= " << this->getEsriSpatialReference().wkid() << std::endl;
+    myLine << " wkText \t='" << this->getEsriSpatialReference().wkText() << "'" << std::endl;
+    myLine << " toJson='" << this->getEsriSpatialReference().toJson() << "'" << std::endl;
+
+    if (esriMap)
+      myLine << " Map::isAutoFetchLegendInfos='" << esriMap->isAutoFetchLegendInfos() << std::endl;
+    if (esriScene)
+      myLine << " Scene::isAutoFetchLegendInfos='" << esriScene->isAutoFetchLegendInfos() << std::endl;
+
+    myLine << " dict isLoaded \t\t= " << this->symbolDictionary().isLoaded() << std::endl;
+    myLine << " dict extraSymbolCount \t= " << this->symbolDictionary().etsSymbolCount() << std::endl;
+
+    myLine << " graphicsOverlayCount \t= " << graphicsOverlayCount << std::endl;
+    myLine << " basemapCount \t\t= " << basemapCount << std::endl;
+
+    myLine << " curExtent \t\t= " << "center=" << curExtent.center()
+           << " ; w=" << curExtent.width() << " h=" << curExtent.height() << std::endl;
+    myLine << " fullExtent \t\t= " << "center=" << fullExtent.center()
+           << " ; w=" << fullExtent.width() << " h=" << fullExtent.height() << std::endl;
+
+    //    myLine << " (fullExtent[esri] \t= " << "min=" << fullExtentMin << " ; max=" << fullExtentMax << ")" << std::endl;
+    //    myLine << " (fullExtent[esri] \t= " << "center=" << fullExtentCenter
+    //           << " ; w=" << env.width() << " h=" << env.height() << ")" << std::endl;
+
+    if (esriMap)
+    {
+      myLine << " minScale \t\t\t= " << esriMap->minScale() << std::endl;
+      myLine << " maxScale \t\t\t= " << esriMap->maxScale() << std::endl;
+    }
+    myLine << " scale(SitMap)  \t\t= " << this->scale() << std::endl;
+
+    myLine << " rotation(SitMap) \t\t= " << this->rotation() << " [deg]" << std::endl;
+    if (esriMap)
+      myLine << " MapView::rotation \t\t= " << esriGraphicsMapView->mapRotation()  << " [deg]" << std::endl;
+    if (esriScene)
+      myLine << " SceneView::rotation \t\t= " << "-" << std::endl;
+
+
+    myLine << " viewpoint \t\t\t= " << this->viewpoint2D() << std::endl;
+    if (d->m_mapGraphicsView)
+      myLine << " MapView::viewpoint   \t\t= " << d->m_mapGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale) << std::endl;
+    if (d->m_sceneGraphicsView)
+    {
+      myLine << " Camera(SitMap) \t\t= " << this->camera() << std::endl;
+      myLine << " SceneView::viewpoint \t\t= " << d->m_sceneGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale) << std::endl;
+      myLine << " SceneView::camera \t\t= " << d->m_sceneGraphicsView->currentViewpointCamera() << std::endl;
+
+      myLine << "\nXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+      myLine << " OperationalLayers:";
+
+      Esri::ArcGISRuntime::LayerListModel *llm = nullptr;
+      if (esriScene)
+        llm = esriScene->operationalLayers();
+      if (llm)
+      {
+        myLine << " - count=" << llm->size();
+        myLine << "\nLayer \tVisi \tOpac \tSts \t\tType \t\t\t\tName\n";
+        for (int i = 0; i < llm->size(); ++i)
+        {
+          Esri::ArcGISRuntime::Layer *layer = llm->at(i);
+          if (!layer)
+            continue;
+          myLine << " " << i
+                 << "\t" << layer->isVisible()
+                 << "\t" << layer->opacity()
+                 << "\t" << layer->loadStatus()
+                 << "\t" << layer->layerType()
+                 << "\t" << layer->name()
+                 << " (minScale=" << layer->minScale() << " ; maxScale=" << layer->maxScale() << ")"
+                 << " (attribution='" << layer->attribution() << "'')"
+                 << "\t description=" << layer->description()
+                 << "\t isShowInLegend=" << layer->isShowInLegend();
+
+          {
+            Esri::ArcGISRuntime::ArcGISSceneLayer *sceneLayer =
+                dynamic_cast<Esri::ArcGISRuntime::ArcGISSceneLayer *>(layer);
+
+            if (sceneLayer)
+              myLine << "\n\t\t\t\t\t url:" << sceneLayer->url().toString();
+          }
+
+          myLine << std::endl;
+        } // for
+
+      }
+
+
+    }
+  }
+
+
+  myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+  AdvancedSymbology::SymbolDictionary &dict = this->symbolDictionary();
+  AdvancedSymbology::SymbolDictionaryImpl &dictImpl = static_cast<AdvancedSymbology::SymbolDictionaryImpl &>(dict);
+
+  myLine << " symbologyFieldNames: " << dictImpl.symbologyFieldNamesInternal().join(QLatin1String(" ; ")) << std::endl;
+  myLine << " textFieldNames: " << dictImpl.textFieldNamesInternal().join(QLatin1String(" ; ")) << std::endl;
+
+  myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+  if (basemapCount > 0)
+  {
+    myLine << "basemapCount=" << basemapCount << std::endl;
+
+    myLine << "\nLayer \tVisi \tOpac \tSts \t\tType \t\t\t\tName" << std::endl;
+
+    const Esri::ArcGISRuntime::LayerListModel *model = this->getEsriBasemap()->baseLayers();
+    for (int i = 0; i < model->size(); ++i)
+    {
+      /*const*/ Esri::ArcGISRuntime::Layer *layer = model->at(i);
+
+      myLine << " " << i
+             << "\t" << layer->isVisible()
+             << "\t" << layer->opacity()
+             << "\t" << layer->loadStatus()
+             << "\t" << layer->layerType()
+             << "\t" << layer->name()
+             << " (minScale=" << layer->minScale() << " ; maxScale=" << layer->maxScale() << ")"
+             << " (attribution='" << layer->attribution() << "'')"
+
+             << "\t description=" << layer->description()
+             << "\t isShowInLegend=" << layer->isShowInLegend();
+
+      {
+        Esri::ArcGISRuntime::ImageAdjustmentLayer *iaLayer =
+            dynamic_cast<Esri::ArcGISRuntime::ImageAdjustmentLayer *>(layer);
+
+        if (iaLayer)
+        {
+          myLine << "\t b:" << iaLayer->brightness()
+                 << "\t g:" << iaLayer->gamma()
+                 << "\t c:" << iaLayer->contrast();
+        }
+      }
+
+      myLine << std::endl;
+
+      QString url(QLatin1String("no url availble"));
+      Esri::ArcGISRuntime::ArcGISTiledLayer *tiledLayer = dynamic_cast<Esri::ArcGISRuntime::ArcGISTiledLayer *>(layer);
+      if (tiledLayer)
+        url = tiledLayer->mapServiceInfo().url().toString();
+      myLine << "url= '" << url << "'";
+
+
+      {
+        Esri::ArcGISRuntime::LegendInfoListModel *lilm = layer->legendInfos();
+        int lSize = -1;
+        if (lilm)
+          lSize = lilm->size();
+
+        myLine << std::endl;
+        myLine << "LegendInfoListModelCount=" << lSize << std::endl;
+
+        for (int j = 0; j < lSize; ++j)
+        {
+          Esri::ArcGISRuntime::LegendInfo *li = lilm->at(j);
+
+          myLine << " " << j
+                 << "\t" << li->name()
+                 << "\t" << (int)li->symbol()->symbolType();
+        }
+      }
+
+      myLine << std::endl;
+    } // for
+  } // if (basemapCount > 0)
+
+  //
+  // GraphicsOverlays
+  //
+
+  myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+  int objCounter = 0;
+  QVector<QPair<QString, int>> gOverlayCounter;
+  if (graphicsOverlayCount)
+  {
+    myLine << std::endl;
+    myLine << "graphicsOverlayCount=" << graphicsOverlayCount << std::endl;
+    myLine << "i     \tVisi \tOpac \tGRM \t\t\tSP \t\t\t#Obj \tName" << std::endl;
+
+    Esri::ArcGISRuntime::GraphicsOverlayListModel *gOverlayListModel = getEsriGeoView()->graphicsOverlays();
+    const int gOverlayCount = gOverlayListModel->size();
+    for (int esriIdx=0; esriIdx<gOverlayCount; ++esriIdx)
+    {
+      Esri::ArcGISRuntime::GraphicsOverlay *gOverlay = gOverlayListModel->at(esriIdx);
+      if (!gOverlay)
+        continue;
+
+      const QString &name = gOverlay->overlayId(); // since 100.2.0
+      if (gOverlay)
+      {
+        int i = 0;
+
+        int objCountPerLayer = -1;
+        if (gOverlay->graphics())
+          objCountPerLayer = gOverlay->graphics()->size();
+
+        objCounter += objCountPerLayer;
+        gOverlayCounter.append(QPair<QString, int>(name, objCountPerLayer));
+
+        int esriIdx = gOverlayListModel ? gOverlayListModel->indexOf(gOverlay) : -1;
+
+        Esri::ArcGISRuntime::LayerSceneProperties sceneProperties = gOverlay->sceneProperties();
+
+        std::string typeName;
+        Esri::ArcGISRuntime::Renderer *renderer = gOverlay->renderer();
+        if (renderer)
+          typeName = typeid(*renderer).name();
+
+        QString objName;
+        if (renderer)
+          objName = renderer->objectName();
+
+        myLine << " " << i++
+               << "\t" << gOverlay->isVisible()
+               << "\t" << gOverlay->opacity()
+               << "\t" << gOverlay->renderingMode() << " "
+               << "\t" << sceneProperties.surfacePlacement() << "   "
+               << "\t" << objCountPerLayer
+               << "\t (" << esriIdx << ")"
+               << "\t" << name
+               << " (minScale=" << gOverlay->minScale() << " ; maxScale=" << gOverlay->maxScale() << ")"
+               << " (Renderer=" << gOverlay->renderer()
+               << ", type_info=" << typeName
+               << ", objName=" << objName
+               << ")";
+
+
+        Esri::ArcGISRuntime::GraphicListModel *gListModel = gOverlay->graphics();
+        if (gListModel && !gListModel->isEmpty())
+        {
+          myLine << std::endl;
+          myLine << "objIdx" << "\tUMapId \tVisi \tPick \tSel \tzIdx \tobjectName" << std::endl;
+
+          for (int idx = 0; idx < gListModel->size(); ++idx)
+          {
+            Esri::ArcGISRuntime::Graphic *graphic = gListModel->at(idx);
+            if (graphic)
+            {
+              UniqueMapId uniqueMapId = INVALID_MAP_ID;
+              bool isPickable = false;
+              Esri::ArcGISRuntime::AttributeListModel *attLisModel = graphic->attributes();
+              if (attLisModel)
+              {
+                bool ok;
+                uniqueMapId = attLisModel->attributeValue(QLatin1String(SituationMap::UniqueMapIdAttribute)).toUInt(&ok);
+                isPickable  = attLisModel->attributeValue(QLatin1String(SituationMap::IsPickableAttribute)).toBool();
+              }
+
+              myLine << " " << idx
+                     << "\t" << uniqueMapId
+                     << "\t" << graphic->isVisible()
+                     << "\t" << isPickable
+                     << "\t" << graphic->isSelected()
+                     << "\t" << graphic->zIndex()
+                     << "\t objName " << graphic->objectName()
+                     << "\t geom " << graphic->geometry().toJson().left(100)
+                     << std::endl;
+            }
+
+          } // for
+
+
+        }
+
+
+        myLine << std::endl;
+
+      }
+    } // while
+
+  } // if (graphicsOverlayCount)
+
+  myLine << "PartyIdToColorFunctor: " << std::endl;
+  this->partyIdToColorFunctor().toString(myLine);
+  myLine << std::endl;
+
+  myLine << "Obj per GraphicalOverlay:" << std::endl;
+  for (const QPair<QString, int> &item : gOverlayCounter)
+    myLine << " GraphicalOverlay: " << item.second << "\t" << " obj on '" << item.first << "'" << std::endl;
+
+  myLine << "-------" << std::endl;
+  myLine << "#Total:  " << objCounter << std::endl;
+
+  myLine << std::endl;
+
+  myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+  myLine << "count() of objectFactory/Container: " << d->m_objectFactory->count() << std::endl;
+  myLine << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << std::endl;
+
+
+
+  myLine << std::endl;
+  return QString::fromStdString(myLine.str());
+}
+
+
+bool MapImpl::isLoaded() const
+{
+  if (d->m_esriMap)
+    return d->m_esriMap->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded;
+  if (d->m_esriScene)
+    return d->m_esriScene->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded;
+  return false;
+}
+
+QGraphicsView *MapImpl::getQGraphicsView() const
+{
+  if (d->m_mapGraphicsView)
+    return d->m_mapGraphicsView;
+  if (d->m_sceneGraphicsView)
+    return d->m_sceneGraphicsView;
+  return nullptr;
+}
+
+double MapImpl::pixelSizeMeter()
+{
+  if (d->m_pixelsize <= 0)
+  {
+    if (d->m_mapGraphicsView)
+    {
+      Esri::ArcGISRuntime::Point p1_mapCoord = d->m_mapGraphicsView->screenToLocation(0, 0);
+      Esri::ArcGISRuntime::Point p2_mapCoord = d->m_mapGraphicsView->screenToLocation(0, 1);
+
+      if (d->m_coordTranslationFunctor)
+      {
+        // const QPointF &dist = d->m_coordTranslationFunctor->mapToGeographic(p1_mapCoord) - d->m_coordTranslationFunctor->mapToGeographic(p2_mapCoord);
+        const QPointF &dist = QPointF(p1_mapCoord.x(), p1_mapCoord.y()) - QPointF(p2_mapCoord.x(), p2_mapCoord.y());
+
+        d->m_pixelsize = sqrt(dist.x() * dist.x() + dist.y() * dist.y());
+      }
+      else
+      {
+        d->m_pixelsize = Esri::ArcGISRuntime::GeometryEngine::distance(d->m_mapGraphicsView->screenToLocation(0, 0),
+                                                                       d->m_mapGraphicsView->screenToLocation(0, 1));
+      }
+
+      // 2019-11-13, Norbert Thoden
+      // Sometimes (most of the time when starting a new map) the drawing of a
+      // spline results in a simple line (vertexCount=2 assumed)
+      // Maybe m_pixelsize is NaN? To avoid this:
+      if (std::isnan(d->m_pixelsize))
+      {
+        FATAL_LOG(m_logger) << LOGFUNCTION << " d->m_pixelsize is Nan, set to default";
+#ifdef LTS_DEBUG
+        QMessageBox::critical(nullptr, QLatin1String("pixelSizeMeter"), QLatin1String("pixelSizeMeter is NaN - abort."));
+        abort();
+#endif // LTS_DEBUG
+        d->m_pixelsize = 1.234567;
+      }
+
+    if (d->m_sceneGraphicsView)
+      d->m_pixelsize = 1.2345;
+   }
+  }
+  return d->m_pixelsize;
+}
+
+double MapImpl::pixelSizeGeographic()
+{
+  if (d->m_mapGraphicsView)
+  {
+    Esri::ArcGISRuntime::Point p1_mapCoord = d->m_mapGraphicsView->screenToLocation(0, 0);
+    Esri::ArcGISRuntime::Point p2_mapCoord = d->m_mapGraphicsView->screenToLocation(0, 1);
+
+    if (d->m_coordTranslationFunctor)
+    {
+      const QPointF &dist = d->m_coordTranslationFunctor->mapToGeographic(p1_mapCoord) - d->m_coordTranslationFunctor->mapToGeographic(p2_mapCoord);
+      return sqrt(dist.x() * dist.x() + dist.y() * dist.y());
+    }
+  }
+  return -1;
+}
+
+//void MapImpl::moveEvent(QMoveEvent *e)
+//{
+//  qWarning() << LOGFUNCTION << "moveEvent" << e->type();
+//  QWidget::moveEvent(e);
+//}
+
+//bool MapImpl::event(QEvent *e)
+//{
+//  qWarning() << LOGFUNCTION << "EVENT" << e->type();
+//    if (e->type() == QEvent::Move)
+//      qWarning() << "MOVEE";
+
+//    return QWidget::event(e);
+//}
+
+
+//Esri::ArcGISRuntime::Layer* MapImpl::getEsriLayerByName(const QString &layerName)
+//{
+//  Esri::ArcGISRuntime::Layer* foundLayer = nullptr;
+
+//  Esri::ArcGISRuntime::Map* esriMap = this->getEsriMap();
+//  QList<Esri::ArcGISRuntime::Layer*> layerList = esriMap->layers();
+
+//  foreach (Esri::ArcGISRuntime::Layer* layer, layerList) {
+//    if (layer)
+//    {
+//      if ( layer->name() == layerName)
+//      {
+//        foundLayer = layer;
+//        break;
+//      }
+//    }
+//  }
+
+//  return foundLayer;
+//}
+
+
+QPointF MapImpl::mapCoordinateToViewPortWindowPoint(const QPointF &mapPos) const
+{
+  // don NOT delegate to mapCoordinateToViewPortWindowPoint3D(Point3D::fromQPointF(mapPos));
+  // In that case, the z-value is set to zero. That is different to this method.
+  // Here the z-value is not taken into account:
+
+  if (!isReady())
+    return QPointF();
+
+  if (d->m_mapGraphicsView)
+  {
+    Esri::ArcGISRuntime::Point esriCoordinate(mapPos.x(), mapPos.y(), d->m_mapGraphicsView->spatialReference());
+    const QPointF &screenCoordinate = d->m_mapGraphicsView->locationToScreen(esriCoordinate);
+    return screenCoordinate;
+  }
+  else if (d->m_sceneGraphicsView)
+  {
+    Esri::ArcGISRuntime::Point esriCoordinate(mapPos.x(), mapPos.y(), d->m_sceneGraphicsView->spatialReference());
+    const Esri::ArcGISRuntime::LocationToScreenResult &locToSrnRes = d->m_sceneGraphicsView->locationToScreen(esriCoordinate);
+    switch (locToSrnRes.visibility())
+    {
+    case Esri::ArcGISRuntime::SceneLocationVisibility::Visible:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByBaseSurface:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByEarth:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByElevation:
+    {
+      const QPointF &screenCoordinate = locToSrnRes.screenPoint();
+      DEBUG_LOG(m_logger) << LOGFUNCTION  << " screenCoordinate=" << screenCoordinate << " locToSrnRes.visibility()=" << locToSrnRes.visibility();
+      return screenCoordinate;
+    }
+      break;
+    case Esri::ArcGISRuntime::SceneLocationVisibility::NotOnScreen:
+      DEBUG_LOG(m_logger) << LOGFUNCTION  << " locToSrnRes.visibility()=" << locToSrnRes.visibility()
+                          << ", locToSrnRes.screenPoint()=" << locToSrnRes.screenPoint();
+
+    } // switch
+  }
+  return QPointF();
+}
+
+QPointF MapImpl::mapCoordinateToViewPortWindowPoint3D(const Point3D &mapPos) const
+{
+  if (!isReady())
+    return QPointF();
+
+  if (d->m_mapGraphicsView)
+  {
+    Esri::ArcGISRuntime::Point esriCoordinate(mapPos.x(), mapPos.y(), mapPos.z(), d->m_mapGraphicsView->spatialReference());
+    const QPointF &screenCoordinate = d->m_mapGraphicsView->locationToScreen(esriCoordinate);
+    return screenCoordinate;
+  }
+  else if (d->m_sceneGraphicsView)
+  {
+    Esri::ArcGISRuntime::Point esriCoordinate(mapPos.x(), mapPos.y(), mapPos.z(), d->m_sceneGraphicsView->spatialReference());
+    const Esri::ArcGISRuntime::LocationToScreenResult &locToSrnRes = d->m_sceneGraphicsView->locationToScreen(esriCoordinate);
+    switch (locToSrnRes.visibility())
+    {
+    case Esri::ArcGISRuntime::SceneLocationVisibility::Visible:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByBaseSurface:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByEarth:
+    case Esri::ArcGISRuntime::SceneLocationVisibility::HiddenByElevation:
+    {
+      const QPointF &screenCoordinate = locToSrnRes.screenPoint();
+      DEBUG_LOG(m_logger) << LOGFUNCTION  << " screenCoordinate=" << screenCoordinate << " locToSrnRes.visibility()=" << locToSrnRes.visibility();
+      return screenCoordinate;
+    }
+      break;
+    case Esri::ArcGISRuntime::SceneLocationVisibility::NotOnScreen:
+      DEBUG_LOG(m_logger) << LOGFUNCTION  << " locToSrnRes.visibility()=" << locToSrnRes.visibility()
+                          << ", locToSrnRes.screenPoint()=" << locToSrnRes.screenPoint();
+      break;
+    } // switch
+  }
+  return QPointF();
+}
+
+
+QPointF MapImpl::viewPortWindowPointToMapCoordinate(const QPointF &pixelCoord) const
+{
+  if (!isReady())
+    return QPointF();
+
+  if (d->m_mapGraphicsView)
+  {
+    const Esri::ArcGISRuntime::Point &mapCoordinate = d->m_mapGraphicsView->screenToLocation(pixelCoord.x(), pixelCoord.y());
+    return QPointF(mapCoordinate.x(), mapCoordinate.y());
+  }
+  else if (d->m_sceneGraphicsView)
+  {
+    const Esri::ArcGISRuntime::Point &baseCoordinate = d->m_sceneGraphicsView->screenToBaseSurface(pixelCoord.x(), pixelCoord.y());
+    return QPointF(baseCoordinate.x(), baseCoordinate.y());
+  }
+  return QPointF();
+}
+
+Point3D MapImpl::viewPortWindowPointToMapCoordinate3D(const QPointF &pixelCoord) const
+{
+  if (!isReady())
+    return Point3D();
+
+  if (d->m_mapGraphicsView)
+  {
+    const Esri::ArcGISRuntime::Point &mapCoordinate = d->m_mapGraphicsView->screenToLocation(pixelCoord.x(), pixelCoord.y());
+    return Point3D(mapCoordinate.x(), mapCoordinate.y(), mapCoordinate.z());
+  }
+  else if (d->m_sceneGraphicsView)
+  {
+    const Esri::ArcGISRuntime::Point &baseCoordinate = d->m_sceneGraphicsView->screenToBaseSurface(pixelCoord.x(), pixelCoord.y());
+    return Point3D(baseCoordinate.x(), baseCoordinate.y(), baseCoordinate.z());
+  }
+  return Point3D();
+}
+
+QPointF MapImpl::geoCoordinateToViewPortWindowPoint(const QPointF &geoPos) const
+{
+  if (!isReady())
+    return QPointF();
+  const SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (!mapCtFunctor)
+    return QPointF();
+
+  return mapCoordinateToViewPortWindowPoint(mapCtFunctor->geographicToMap(geoPos));
+}
+
+QPointF MapImpl::geoCoordinateToViewPortWindowPoint3D(const Point3D &geoPos) const
+{
+  if (!isReady())
+    return QPointF();
+  const SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (!mapCtFunctor)
+    return QPointF();
+
+  Point3D mapPos = mapCtFunctor->geographicToMap(geoPos);
+
+  return mapCoordinateToViewPortWindowPoint3D(mapPos);
+}
+
+QPointF MapImpl::viewPortWindowPointToGeoCoordinate(const QPointF &pixelCoord) const
+{
+  if (!isReady())
+    return QPointF();
+  const SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (!mapCtFunctor)
+    return QPointF();
+  const QPointF mapCoordinate = viewPortWindowPointToMapCoordinate(pixelCoord);
+  return mapCtFunctor->mapToGeographic(mapCoordinate);
+}
+
+Point3D MapImpl::viewPortWindowPointToGeoCoordinate3D(const QPointF &pixelCoord) const
+{
+  if (!isReady())
+    return Point3D();
+  const SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (!mapCtFunctor)
+    return Point3D();
+  const Point3D mapCoordinate = viewPortWindowPointToMapCoordinate3D(pixelCoord);
+  return mapCtFunctor->mapToGeographic(mapCoordinate);
+}
+
+
+QString MapImpl::geoToMgrsString(const QPointF &geoPos) const
+{
+  SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+  if (!mapCtFunctor) return QString();
+
+  return mapToMgrsString(mapCtFunctor->geographicToMap(geoPos));
+}
+
+QString MapImpl::mapToMgrsString(const QPointF &mapPos) const
+{
+  // DEBUG_LOG(m_logger) << LOGFUNCTION  << "mapPos=" << mapPos;
+
+  const CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+
+  if (! ctFunctor)
+    return QString();
+
+  const QPointF &pointGeo = ctFunctor->mapToGeographic(mapPos);
+
+  //  DEBUG_LOG(m_logger) << LOGFUNCTION << " mapPos= " << mapPos << " pointGeo= " << pointGeo;
+
+  return LtsCoordTrans::mgrsFromGeographic(pointGeo.x(), pointGeo.y());
+}
+
+
+bool MapImpl::eventFilter(QObject *obj, QEvent *e)
+{
+  if (!e)
+    return false;
+
+  bool filterDragAndDrop = static_cast<QObject *>(d->m_mapGraphicsView) != obj;
+
+  if (filterDragAndDrop)
+  {
+    switch (e->type())
+    {
+    case QEvent::DragEnter:
+    case QEvent::DragMove:
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION  << "Drag enter event reached.";
+
+      const QMimeData *mimeData = ((QDropEvent *)e)->mimeData();
+
+      if (mimeData)
+      {
+        for (auto &mgrPtr : qAsConst(d->m_dropEventManagerList))
+        {
+          if (mimeData->hasFormat(mgrPtr->mimeFormatString()))
+            e->accept();
+        }
+      }
+      return true;
+    } break;
+
+    case QEvent::Drop:
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION  << "Drop event reached.";
+
+      const QMimeData *mimeData = ((QDropEvent *)e)->mimeData();
+
+      if (mimeData)
+      {
+        for (auto mgrPtr : qAsConst(d->m_dropEventManagerList))
+        {
+          if (mimeData->hasFormat(mgrPtr->mimeFormatString()))
+            mgrPtr->manageDrop(((QDropEvent *)e)->pos(), mimeData);
+        }
+        e->accept();
+      }
+      return true;
+    } break;
+    default : break;
+    } // switch
+  }
+
+  if (QEvent::KeyPress == e->type())
+  {
+    QKeyEvent              *keyEvent = static_cast<QKeyEvent *>(e);
+    int                     key      = keyEvent->key();
+    Qt::KeyboardModifiers   mod      = keyEvent->modifiers();
+
+    if ((Qt::Key_J == key) && (mod.testFlag(Qt::KeyboardModifier::ControlModifier)))
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION  << " rethink jumpPointRequest Modifier";
+
+      onJumpPointRequest(static_cast<QWidget *>(obj)->mapFromGlobal(QCursor::pos()));
+
+      e->accept();
+      return true;
+    }
+  }
+  return false;
+}
+
+void MapImpl::onKeyPressEvent(const QKeyEvent &keyEvent)
+{
+  const int key = keyEvent.key();
+  if (Qt::Key_Escape == key)
+  {
+    emit escapePressed();
+  }
+}
+
+void MapImpl::installDropEventManager(DropEventManager *demgr)
+{
+  if (demgr == nullptr) return;
+
+  RefPointer<DropEventManager>  refDemgr(demgr);
+  if (d->m_dropEventManagerList.contains(refDemgr)) return;
+  d->m_dropEventManagerList += refDemgr;
+} // MapImpl::installDropEventManager
+
+
+void MapImpl::deinstallDropEventManager(DropEventManager *demgr)
+{
+  if (demgr == nullptr) return;
+  RefPointer<DropEventManager>  refDemgr(demgr);
+  if (d->m_dropEventManagerList.contains(refDemgr))
+    d->m_dropEventManagerList.removeAll(refDemgr);
+}
+
+void MapImpl::onHandleMouseMove(int windowPosX, int windowPosY)
+{
+  if (d->m_destroying)
+    return;
+
+  if (!d->m_mapReadyFlag)
+    return;
+
+  if (windowPosX < 0 || windowPosY < 0)
+    return;
+
+  // 1
+  emit mouseWindowPositionChanged(windowPosX, windowPosY);
+
+  if (!isReady())
+  {
+    return;
+  }
+
+  if (mode() == Mode::Mode_2D)
+  {
+    // Mode_2D:
+    const QPointF pixelCoord(windowPosX, windowPosY);
+    const Point3D &mapCoordinate = viewPortWindowPointToMapCoordinate3D(pixelCoord);
+
+    // 2
+    emit mouseMapPositionChanged(mapCoordinate, true);
+
+    SituationMap::CoordTranslationFunctor *mapCtFunctor = coordTranslationFunctor();
+    if (mapCtFunctor)
+    {
+      if (isSignalConnected(QMetaMethod::fromSignal(&Map::mouseGeoPositionChanged)))
+      {
+        // 3
+        emit mouseGeoPositionChanged(mapCtFunctor->mapToGeographic(mapCoordinate), true);
+      }
+    }
+  }
+  else
+  {
+    // Mode_3D:
+    // 'screenToLocation' is expensive. Use screenToLocationHelper:
+    if (d->m_screenToLocationHelper)
+      d->m_screenToLocationHelper->screenToLocation(windowPosX, windowPosY);
+  }
+} // MapImpl::onHandleMouseMove
+
+
+bool MapImpl::isReady() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, m_mapReadyFlag=" << d->m_mapReadyFlag;
+  return d->m_mapReadyFlag;
+}
+
+DrawStatus MapImpl::drawStatus() const
+{
+  switch (this->mode())
+  {
+  case Mode::Mode_2D:
+    return DrawStatus::Completed;
+    break;
+  case Mode::Mode_3D:
+  {
+    if (d->m_sceneGraphicsView)
+      return static_cast<SituationMap::DrawStatus>(d->m_sceneGraphicsView->drawStatus());  // save due to static_assert
+  }
+    break;
+  default:
+    // empty
+    break;
+  } // switch
+  return DrawStatus::Completed;
+}
+
+int MapImpl::wkid() const
+{
+  return this->getEsriSpatialReference().wkid();
+}
+
+SituationMap::NavigationConstraint MapImpl::navigationConstraint() const
+{
+#ifdef HAS_BELOW_GROUND
+  Esri::ArcGISRuntime::Surface* baseSurface = nullptr;
+  if (!d->m_esriScene || !(baseSurface = d->m_esriScene->baseSurface()))
+    return SituationMap::NavigationConstraint::Undefined;
+  return static_cast<SituationMap::NavigationConstraint>(baseSurface->navigationConstraint());
+#else
+  return SituationMap::NavigationConstraint::Undefined;
+#endif // HAS_BELOW_GROUND
+}
+
+bool MapImpl::setNavigationConstraint(SituationMap::NavigationConstraint navigationConstraint)
+{
+  if (navigationConstraint == SituationMap::NavigationConstraint::Undefined)
+    return false;
+#ifdef HAS_BELOW_GROUND
+  Esri::ArcGISRuntime::Surface* baseSurface = nullptr;
+  if (!d->m_esriScene || !(baseSurface = d->m_esriScene->baseSurface()))
+    return false;
+  const SituationMap::NavigationConstraint currentNavConstraint = this->navigationConstraint();
+  if (currentNavConstraint != navigationConstraint)
+  {
+    baseSurface->setNavigationConstraint(static_cast<Esri::ArcGISRuntime::NavigationConstraint>(navigationConstraint));    // save due to static_assert
+    emit navigationConstraintChanged(navigationConstraint);
+  }
+  return true;
+#else
+  return true; // handle as successful operation
+#endif // HAS_BELOW_GROUND
+}
+
+float MapImpl::baseSurfaceOpacity() const
+{
+#ifdef HAS_BELOW_GROUND
+  Esri::ArcGISRuntime::Surface* baseSurface = nullptr;
+  if (!d->m_esriScene || !(baseSurface = d->m_esriScene->baseSurface()))
+    return 1.0; // opac, no transparency
+  return baseSurface->opacity();
+#else
+  return 1.0; // opac, no transparency
+#endif // HAS_BELOW_GROUND
+}
+
+bool MapImpl::setBaseSurfaceOpacity(float surfaceOpacity)
+{
+#ifdef HAS_BELOW_GROUND
+  Esri::ArcGISRuntime::Surface* baseSurface = nullptr;
+  if (!d->m_esriScene || !(baseSurface = d->m_esriScene->baseSurface()))
+    return false;
+  if (!qFuzzyCompare(baseSurface->opacity(), surfaceOpacity))
+  {
+    baseSurface->setOpacity(surfaceOpacity);
+    emit baseSurfaceOpacityChanged(baseSurface->opacity());
+  }
+  return true;
+#else
+  Q_UNUSED(surfaceOpacity);
+  return true; // handle as successful operation
+#endif // HAS_BELOW_GROUND
+}
+
+OverviewMapHandler &MapImpl::overviewMapHandler() const
+{
+  if (! d->m_overviewMapHandler)
+  {
+    MapImpl *THIS = const_cast<MapImpl *>(this);
+    d->m_overviewMapHandler = new OverviewMapHandlerImpl(THIS);
+  }
+  return *d->m_overviewMapHandler;
+}
+
+
+OperatorMapSettings MapImpl::operatorMapSettings() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" ;
+
+  OperatorMapSettings oms;
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " map not ready";
+    return oms;
+  }
+
+
+  oms.mode = this->mode();
+
+  //
+  // 1. viewpoint/camera :
+  //
+  switch (oms.mode)
+  {
+  case Mode::Mode_2D:
+    oms.viewpoint = this->viewpoint2D();
+    break;
+  case Mode::Mode_3D:
+    oms.camera = this->camera();
+//    oms.viewpoint.setScale(this->scale());  // additionally save current scale (which is not in camera)
+    oms.viewpoint = this->viewpoint2D();
+    break;
+  default:
+    // empty
+    break;
+  }
+  // : viewpoint/camera
+
+  //
+  // 1a. below ground :
+  //
+  oms.navigationConstraint = this->navigationConstraint();
+  oms.baseSurfaceOpacity = this->baseSurfaceOpacity();
+  // : 1a. below ground
+
+  //
+  // 2. orderedLayerList :
+  //
+  const LayerFactory &layerFactory = this->layerFactory();
+
+  const QList<QString> &layernames = layerFactory.layernames();
+  for (const auto &layername : layernames)
+  {
+    QPair<QString, LayerParameter> pair;
+    pair.first  = layername;
+    pair.second = layerFactory.layerParameter(layername);
+
+    oms.orderedLayers.append(pair);
+  }
+  // : orderedLayerList
+
+  //
+  // 3. orderedOverlayList :
+  //
+  const OverlayHandler &overlayHndl = this->overlayHandler();
+  oms.orderedOverlays = overlayHndl.overlays();
+  // : orderedOverlayList
+
+  //
+  // 4. some visiblities
+  //
+  oms.mapWidgetSettings.gridVisibility               = this->grid().isVisible();
+  oms.mapWidgetSettings.positionStringVisibility     = this->isPositionStringVisible();
+  oms.mapWidgetSettings.exerciseTimeStringVisibility = this->isExerciseTimeStringVisible();
+  oms.mapWidgetSettings.timeStringVisibility         = this->isTimeStringVisible();
+  oms.mapWidgetSettings.compassVisibility            = this->isCompassVisible();
+  oms.mapWidgetSettings.overviewMapVisibility        = this->overviewMapHandler().builtInOverviewMapWidget() != nullptr;
+
+  oms.symbolScale   = this->symbolScale();
+  //  oms.symbolOpacity = this->symbol
+
+
+  //
+  // 5. JumpPointWidget :
+  //
+  if (d->m_jumpPointWidget)
+  {
+    const QVector<JPData> &jumpPoints = d->m_jumpPointWidget->jumpPoints();
+
+    JumpPointData jpd;
+    for (const JPData &jpKey : jumpPoints)
+    {
+      jpd.key       = jpKey.m_name;
+      jpd.originGeo = jpKey.m_originGeo;
+      jpd.mapScale  = jpKey.m_mapScale;
+
+      oms.jumpPoints.append(jpd);
+    }
+  }
+  // : JumpPointWidget
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return oms;
+}
+
+bool MapImpl::restoreOperatorMapSettings(const OperatorMapSettings &oms)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!isReady())
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " map not ready";
+    return false;
+  }
+
+  if (!isValid(oms.mode))
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " mode no valid";
+    return false;
+  }
+
+  bool success = true;
+
+  const bool switchingBetweenModes =
+      isValid(this->mode()) &&
+      isValid(oms.mode) &&
+      (this->mode() != oms.mode);
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " switchingBetweenModes = " /*<< std::boolalpha*/ << switchingBetweenModes
+                      << " (this->mode()=" << this->mode()
+                      << " oms.mode=" << oms.mode << ")";
+
+  // conflict with FilterManagement::SymbolAppearanceSettings::Settings::symbolScale
+  // so skip oms.symbolScale
+  //  this->setSymbolScale(oms.symbolScale);
+
+  //
+  // 1. viewpoint/camera :
+  //
+
+  // Possible cases:
+  //  F1 - 2D -> 2D : setViewpoint2D
+  //  F2 - 3D -> 3D : setCamera
+  //  F3 - 2D -> 3D : setViewpoint2D
+  //  F4 - 3D -> 2D : setViewpoint2D ( finalViewpoint )
+
+  switch (oms.mode)
+  {
+  case Mode::Mode_2D:
+    this->setViewpoint2D(oms.viewpoint);          // F1, F3
+    break;
+  case Mode::Mode_3D:
+    if (this->mode() == Mode::Mode_3D && !oms.camera.isNull())
+      this->setCamera(oms.camera);                // F2
+    else
+      this->setViewpoint2D(oms.viewpoint); // F4
+    break;
+  default:
+    // empty
+    break;
+  } // switch
+
+  //
+  // below ground :
+  //
+  this->setNavigationConstraint(oms.navigationConstraint);
+  this->setBaseSurfaceOpacity(oms.baseSurfaceOpacity);
+  // : below ground
+
+  //
+  // process orderedOVERLAYList *before* orderedLAYERList
+  //
+  // 3. orderedOverlayList :
+  //
+  OverlayHandler &overlayHndl = this->overlayHandler();
+  for (auto ovlKey : oms.orderedOverlays)
+  {
+    QByteArray overlayContent;
+
+    QString displaynameEmpty; // empty -> logicalLayername will we shown. This name will be overwritten if overlay is loaded and updated.
+
+    // GUEZE-811 3D Lage Filter werde nicht korrekt abgebaut... wenn 2D-Snap
+    // mit SnapshotPlan auf 3D-Topic folgt...
+    // Szenario: 2D-Snapshuss wird wiedergegeben (App Snapshot|Script)
+    // und SitMap muss dafür von 3D auf 2D wechseln.
+    // Dabei werden die Overlays via MapOperatorSettings zunächst vorbereitet.
+    // Dabei wurde aber in MapImpl::restoreOperatorMapSettings der SNAPSHOT-Overlay
+    // als herkömmlicher Overlay vorbereitet.
+    // Beim nachfolgendem OverlayHandlerImpl::setOverlay usw. ergaben sich Fehler
+    // wg. LayerType::SnapshotOverlay vs. LayerType::Overlay.
+    // Mit dem FixPart1 wird in restoreOperatorMapSettings der snapShotOverlayId == -4711
+    // als isSnapshot==true eintragen.
+    // Mit FixPart2 bei SnapshotDialog::showSnapshotInternal ein
+    // setMapReadyCallback genutzt, weil die SitMap noch nicht mapReady ist.
+    // Mit FixPart3 bei InterfaceImpl::snapshotAdjustSitMap ebenfalls ein
+    // setMapReadyCallback genutzt, weil die SitMap noch nicht mapReady ist.
+
+    // Zu FixPart1 / GUEZE-1011
+    // Mit GUEZE-1011 'Absturz Planeditor' hat sich ein Problem gezeigt:
+    // Snap aufrufen, PlanEditor (auf dem Snap starten) ein TextObj anlegen... PlanEditor beenden -> Absturz
+    // Tritt auf, wenn -4711 als isSnapshot = true eingetragen wird. Daher lassen wir dass...
+    // const int snapShotOverlayId = -4711; // TODO: ???
+
+    //  const bool isSnapshot = false; //(ovlKey == snapShotOverlayId);
+
+    // GUEZE-1723 (swp_2023)
+    // Der SnapshotOverlay wurde (teilweise, ?3D -> 2D?) bei ersten Mal nicht geladen.
+    // Daher isSnapshot wieder auf true,
+    // Dafür den 'Absturz Planeditor' behoben (dtor geomodel at PlanEditor::onSignalClose)
+    // ---> Nun wird also der der SnapshotOverlay auch als Layer mit isSnapshot==true erstellt,
+    // korrekt in der layerOrder eingetragen. Displayname wird mit dem Laden "nachgeschoben.
+    const int snapShotOverlayId = -4711;
+    const bool isSnapshot = (ovlKey == snapShotOverlayId);
+
+    if (!overlayHndl.setOverlay(ovlKey, displaynameEmpty, overlayContent, isSnapshot))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " addOverlay failed, key=" << ovlKey;
+      success = false;
+    }
+  } // foreach
+  // : orderedOverlayList
+
+
+  //
+  // 2. orderedLayerList :
+  //
+  LayerFactory &layerFactory = this->layerFactory();
+  const QStringList &curLayernames = layerFactory.layernames();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " restore curLayernames = " << curLayernames.join(QStringLiteral(";"));
+
+  QStringList newOrderedLayerAll;
+  newOrderedLayerAll.reserve(oms.orderedLayers.size());
+
+  for (const auto &item : oms.orderedLayers)
+  {
+    const QString &layername = item.first;
+    LayerParameter layerParameter = item.second;
+    newOrderedLayerAll.append(layername);
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " restore orderedLayerList = "
+                        << " layername='" << layername << "'"
+                        << " layerParameter=" << layerParameter;
+
+    // restore Parameter:
+    if (curLayernames.contains(layername))
+    {
+      // maybe keep previewImage, displayName, description
+      const LayerParameter &currentLp = layerFactory.layerParameter(layername);
+      if (layerParameter.previewImage.isNull())   layerParameter.previewImage  = currentLp.previewImage;
+      if (layerParameter.displayName.isEmpty())   layerParameter.displayName   = currentLp.displayName;
+      if (layerParameter.description.isEmpty())   layerParameter.description   = currentLp.description;
+
+      // // GUEZE-2928 // Filtervoreinstellungen werden nicht übernommen
+      // GUEZE-2928 steht aber auch im Widerspruch zu GUEZE-1711
+      //      if (!isReplay() && (layername == layerFactory.emergencyCallLayer(true)))
+      //      {
+      //        // for Live:
+      //        layerParameter.visible = true;
+      //        layerParameter.opacity = 100;
+      //        layerParameter.minScale = -1;
+      //        layerParameter.maxScale = -1;
+      //        DEBUG_LOG(m_logger) << LOGFUNCTION << " 'fix' layerParameter due to emergencyCallLayer";
+      //      }
+
+      if (! layerFactory.setLayerParameter(layername, layerParameter))
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " setLayerParameter failed: layername='" << layername << "'";
+        success = false;
+      }
+    }
+    else
+      WARNING_LOG(m_logger) << LOGFUNCTION << " layer not found: layername='" << layername << "'";
+
+  } // for
+
+  // restore order :
+  if (!newOrderedLayerAll.isEmpty())  // in case of initial/empty oms, newOrderedLayerAll is empty
+  {
+    if (! layerFactory.orderLayerTo(newOrderedLayerAll))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " orderLayerTo failed";
+      success = false;
+    }
+  }
+  // : restore order
+
+  // : orderedLayerList
+
+
+  //
+  // 4. some flags, visiblities etc:
+  //
+  this->grid().setVisible(oms.mapWidgetSettings.gridVisibility);
+  this->showPositionString(oms.mapWidgetSettings.positionStringVisibility);
+  this->showExerciseTimeString(oms.mapWidgetSettings.exerciseTimeStringVisibility);
+#ifndef TABLET_MODE
+  this->showTimeString(oms.mapWidgetSettings.timeStringVisibility);
+#endif
+  this->showCompass(oms.mapWidgetSettings.compassVisibility);
+
+  if (oms.mapWidgetSettings.overviewMapVisibility)
+    this->overviewMapHandler().createBuiltInOverviewMap();
+  else
+    this->overviewMapHandler().removeBuiltInOverviewMap();
+
+
+  //
+  // 5. JumpPointWidget :
+  //
+  if (d->m_jumpPointWidget)
+  {
+    d->m_jumpPointWidget->cleanup();
+    for (const auto &jpd : oms.jumpPoints)
+    {
+      d->m_jumpPointWidget->addJumpPoint(jpd.key,
+                                         jpd.originGeo,
+                                         jpd.mapScale);
+
+    } // foreach
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success = " << success;
+  return success;
+}
+
+
+
+
+Esri::ArcGISRuntime::GraphicsOverlay *MapImpl::getGraphicsLayer(const QString &logicalName)
+{
+  return this->layerFactoryImpl().getGraphicsLayer(logicalName);
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *MapImpl::getGraphicsLayerDict(const QString &logicalName)
+{
+  return this->layerFactoryImpl().getGraphicsLayerDict(logicalName);
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *MapImpl::getGraphicsLayer3DExtrusion(const QString &logicalName)
+{
+  return this->layerFactoryImpl().getGraphicsLayer3DExtrusion(logicalName);
+}
+
+Esri::ArcGISRuntime::GraphicsOverlay *MapImpl::getGraphicsLayer3D_SpAbsolute(const QString &logicalName)
+{
+  return this->layerFactoryImpl().getGraphicsLayer3D_SpAbsolute(logicalName);
+}
+
+
+CoordTranslationFunctor *MapImpl::coordTranslationFunctor() const
+{
+  return d->m_coordTranslationFunctor;
+}
+
+
+ObjectContainer &MapImpl::objectContainer()
+{
+  return *(d->m_objectContainer.data());
+}
+void MapImpl::setObjectContainer(QSharedPointer<ObjectContainer> objectContainer)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_objectContainer = objectContainer;
+
+  this->objectFactory().setObjectContainer(d->m_objectContainer);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PartyIdToColorFunctor &MapImpl::partyIdToColorFunctor() const
+{
+  return *(d->m_partyIdToColorFunctor.data());
+}
+
+void MapImpl::setPartyIdToColorFunctor(QSharedPointer<PartyIdToColorFunctor> partyIdToColor)
+{
+  d->m_partyIdToColorFunctor = partyIdToColor;
+
+  // delay that signal, in rpelay it occurs more often:
+  connect(d->m_partyIdToColorFunctor.data(), &PartyIdToColorFunctor::partyChanged,
+          this, [this] () {
+    d->m_partychangedDelayTimer->start();  // is restart timer if already running
+  });
+
+  // to create UniqueValueRenderer if required:
+  this->onPartyChanged();
+}
+
+
+SituationMap::OverlayHandler &SituationMap::MapImpl::overlayHandler() const
+{
+  if (!d->m_overlayHandler)
+  {
+    MapImpl *map = const_cast<MapImpl *>(this);
+    d->m_overlayHandler = QSharedPointer<OverlayHandlerImpl> (new OverlayHandlerImpl(map));
+  }
+  return *(d->m_overlayHandler);
+}
+
+
+bool MapImpl::addJumpPoint(const QString &name, const Point3D &originGeo, double mapScale)
+{
+  if (!d->m_jumpPointWidget)
+    return false;
+  return d->m_jumpPointWidget->addJumpPoint(name, originGeo, mapScale);
+}
+bool MapImpl::removeJumpPoint(const QString &name)
+{
+  if (!d->m_jumpPointWidget)
+    return false;
+  return d->m_jumpPointWidget->removeJumpPoint(name);
+}
+QStringList MapImpl::jumpPointNames() const
+{
+  if (!d->m_jumpPointWidget)
+    return {};
+  return d->m_jumpPointWidget->names();
+}
+
+
+void MapImpl::initCoordTranslationFunctor()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (! d->m_coordTranslationFunctorInitialize)
+    d->m_coordTranslationFunctorInitialize = new CoordTranslationFunctorImpl(this);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+AdvancedSymbology::SymbolDictionary &MapImpl::symbolDictionary() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  AdvancedSymbology::SymbolDictionary &dict =
+      AdvancedSymbology::SymbolDictionary::dictionary(d->m_symbologyType);
+
+  // check mapReady and SymbolDictionary::loaded
+  connect(&dict, &AdvancedSymbology::SymbolDictionary::loaded,
+          this, &MapImpl::onCheckMapReadyAndSymbolDictionaryLoaded, Qt::UniqueConnection);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return dict;
+}
+
+bool MapImpl::isSymbolDictionaryLoaded() const
+{
+  if (d->m_symbologyType == AdvancedSymbology::SymbologyType::None)
+    return true;
+
+  bool isExisting = AdvancedSymbology::SymbolDictionary::alreadyExists(d->m_symbologyType) && symbolDictionary().isLoaded();
+  return isExisting;
+}
+
+bool MapImpl::setSymbologyType(AdvancedSymbology::SymbologyType symbologyType)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " set SymbologyType to " << d->m_symbologyType;
+
+  if (d->m_symbologyType == AdvancedSymbology::SymbologyType::None)
+  {
+    d->m_symbologyType = symbologyType;
+
+    AdvancedSymbology::SymbolDictionary &dict = this->symbolDictionary();
+    dict.load();
+    return dict.isOk();
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " modification of symbologyType is not allowed";
+  return false;
+}
+
+AdvancedSymbology::SymbologyType MapImpl::symbologyType()
+{
+  return d->m_symbologyType;
+}
+
+
+Viewpoint2D MapImpl::initialViewpoint() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, initialVp=" << d->m_initialViewpoint;
+  return d->m_initialViewpoint;
+}
+
+
+void MapImpl::setInitialViewpoint(const Viewpoint2D &initialViewpoint)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, initialViewpoint=" << initialViewpoint;
+
+  d->m_initialViewpoint = initialViewpoint;
+  if (d->m_initialViewpoint.scale() <= 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " initialViewpoint.scale less or equal zero!!! set to 1";
+    d->m_initialViewpoint.setScale(1.0);
+  }
+
+  // rad to deg:
+  QPointF centerGeo = d->m_initialViewpoint.centerGeo();
+  centerGeo.rx() *= LtsCoordTrans::rad2deg(); //  x = lon
+  centerGeo.ry() *= LtsCoordTrans::rad2deg(); //  y = lat
+
+  //                                                       lat,  lon
+  const Esri::ArcGISRuntime::Viewpoint initialVp(centerGeo.y(), centerGeo.x(),
+                                                 d->m_initialViewpoint.scale());    // skip rotation here
+
+  switch (mode())
+  {
+  case Mode::Mode_2D:
+    d->m_esriMap->setInitialViewpoint(initialVp);
+    break;
+  case Mode::Mode_3D:
+    d->m_esriScene->setInitialViewpoint(initialVp);
+    break;
+  default:
+    FATAL_LOG(m_logger) << LOGFUNCTION << " mode is undefined!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " mode is undefined!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " mode is undefined!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " mode is undefined!!!";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " mode is undefined!!!";
+    break;
+  }
+}
+
+
+Viewpoint2D MapImpl::viewpoint2D() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  Viewpoint2D vp;
+  vp.setCenterGeo(this->centerPoint());
+  vp.setScale(this->scale());
+  vp.setRotation(this->rotation());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, vp=" << vp;
+  return vp;
+}
+
+void MapImpl::setViewpoint2D(const Viewpoint2D &viewpoint, float durationSeconds)
+{
+  this->setViewpoint2DInternal(viewpoint, false, durationSeconds);
+}
+
+void MapImpl::setViewpoint2DAndWait(const Viewpoint2D &viewpoint)
+{
+  this->setViewpoint2DInternal(viewpoint, true, -1.0);
+}
+
+
+void MapImpl::setViewpoint2DInternal(const Viewpoint2D &viewpoint, bool andWait, float durationSeconds)
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " START, vp=" << viewpoint << " andWait=" << andWait << " durationSeconds=" << durationSeconds;
+
+  Esri::ArcGISRuntime::GeoView  *geoview   = this->getEsriGeoView();
+  const CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+  if (!geoview || !ctFunctor)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return;
+  }
+
+  const QPointF &centerPointMap = ctFunctor->geographicToMap(viewpoint.centerGeo());
+  const Esri::ArcGISRuntime::Point esriPoint(centerPointMap.x(), centerPointMap.y(), this->getEsriSpatialReference());
+
+  if (!esriPoint.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " esriPoint not valid!!!"
+                        << " (viewpoint=" << viewpoint << ")";
+    return;
+  }
+
+  if (viewpoint.isNull())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " viewpoint is null -> skip!!!"
+                        << " (viewpoint=" << viewpoint << ")";
+    return;
+  }
+
+  // scale in Viewport: value of 0 and below may raise an exception. Try to avoid:
+  double scale = viewpoint.scale();
+  if (scale <= 0)
+  {
+    scale = Viewpoint2D::defaultScale;
+    ERROR_LOG(m_logger) << LOGFUNCTION << " viewpoint.scale less or equal zero!!! set to default (" << scale << ")"
+                        << " (viewpoint=" << viewpoint << ")";
+  }
+
+  const Esri::ArcGISRuntime::Viewpoint targetVp(esriPoint,
+                                                scale,
+                                                viewpoint.rotation() * -1.0);  // clock vs. counterClock
+
+  if (andWait)
+    geoview->setViewpointAndWait(targetVp);
+  else
+  {
+
+    // use default (d->m_animationDuration) if not specified:
+    if (durationSeconds < 0)
+      durationSeconds = d->m_animationDuration;
+
+    // 300: setViewpoint removed; instant set -> setViewpointAndWait, animated -> setViewpointAsync
+    if (durationSeconds < 0)
+      geoview->setViewpointAndWait(targetVp);
+    else
+      geoview->setViewpointAsync(targetVp, durationSeconds);
+
+  }
+
+  d->m_rotationAbsoluteAngleDegrees = viewpoint.rotation();
+  emit rotationChanged(d->m_rotationAbsoluteAngleDegrees);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, vp=" << viewpoint;
+}
+
+QPointF MapImpl::centerPoint() const
+{
+  Esri::ArcGISRuntime::GeoView  *geoview   = this->getEsriGeoView();
+  const CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+  if (!geoview || !ctFunctor)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return QPointF();
+  }
+
+  const Esri::ArcGISRuntime::Viewpoint &curVp =
+      geoview->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+
+  Esri::ArcGISRuntime::Point mapCenter =
+      static_cast<Esri::ArcGISRuntime::Point>(curVp.targetGeometry());
+
+  const QPointF center(mapCenter.x(), mapCenter.y());
+
+  return ctFunctor->mapToGeographic(center);
+}
+
+
+void MapImpl::setCenterPoint(const QPointF &center, double scale, float durationSeconds)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " center=" << center
+                      << " scale=" << scale
+                      << " durationSeconds=" << durationSeconds
+                      << " sp=" << this->getEsriSpatialReference().wkid();
+
+  Esri::ArcGISRuntime::GeoView *geoview   = this->getEsriGeoView();
+  const CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+
+  if (!geoview || !ctFunctor)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return;
+  }
+
+  const QPointF &centerPointMap = ctFunctor->geographicToMap(center);
+
+  const Esri::ArcGISRuntime::Point esriPoint(centerPointMap.x(), centerPointMap.y(), this->getEsriSpatialReference());
+
+  const Esri::ArcGISRuntime::Viewpoint &curVp =
+      geoview->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+
+  Esri::ArcGISRuntime::Viewpoint targetVp(esriPoint,
+                                          (scale < 0) ? curVp.targetScale() : scale
+                                                        );
+  // use default (d->m_animationDuration) if not specified:
+  if (durationSeconds < 0)
+    durationSeconds = d->m_animationDuration;
+
+  // 300: setViewpoint removed; instant set -> setViewpointAndWait, animated -> setViewpointAsync
+  if (durationSeconds < 0)
+    geoview->setViewpointAndWait(targetVp);
+  else
+    geoview->setViewpointAsync(targetVp, durationSeconds);
+
+  if (isPositionStringVisible())
+  {
+    d->m_positionStr = this->mapToMgrsString(centerPointMap);
+    d->updatePositionText();
+  }
+}
+
+void MapImpl::zoomToArea(const QVector<QPointF> &coords, int paddingInDIPS)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " coords=" << coords.size();
+
+  Esri::ArcGISRuntime::GeoView *geoview   = this->getEsriGeoView();
+  const CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+
+  if (!geoview || !ctFunctor)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return;
+  }
+
+  if (coords.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not enough coords (" << coords.size() << ")";
+    return;
+  }
+
+  Esri::ArcGISRuntime::PolygonBuilder pBuilder(geoview->spatialReference());
+  for (const auto & coord : coords)
+  {
+    QPointF mapCoord = ctFunctor->geographicToMap(coord);
+    pBuilder.addPoint(mapCoord.x(), mapCoord.y());
+  } // for
+
+  switch (this->mode())
+  {
+  case Mode::Mode_2D:
+  {
+    Esri::ArcGISRuntime::MapGraphicsView *mapView = static_cast<Esri::ArcGISRuntime::MapGraphicsView *>(geoview);
+    mapView->setViewpointGeometryAsync(pBuilder.toGeometry(), paddingInDIPS);   // 300: setViewpointGeometry -> setViewpointGeometryAsync
+  }
+    break;
+  case Mode::Mode_3D:
+  {
+    Esri::ArcGISRuntime::SceneGraphicsView *sceneView = static_cast<Esri::ArcGISRuntime::SceneGraphicsView *>(geoview);
+    Esri::ArcGISRuntime::Viewpoint esriVp(pBuilder.toGeometry());       // unfortunately padding is not supported here
+    sceneView->setViewpointAndWait(esriVp);   // 300: setViewpoint -> setViewpointAndWait
+  }
+    break;
+  case Mode::Undefined:
+  {}
+  } // switch
+}
+
+void MapImpl::setTrainingsAreaExtent(const QVector<QPointF> &trainingsAreaExtent)
+{
+  d->m_trainingsAreaExtent = trainingsAreaExtent;
+}
+
+
+QRectF MapImpl::extent() const
+{
+  if (d->m_mapGraphicsView)
+  {
+    const Esri::ArcGISRuntime::Viewpoint &vp =
+        d->m_mapGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::BoundingGeometry);
+
+    if (vp.isEmpty())
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Viewpoint is empty";
+      return QRect();
+    }
+
+    const Esri::ArcGISRuntime::Envelope &env =
+        static_cast<Esri::ArcGISRuntime::Envelope>(vp.targetGeometry());
+
+    if (std::isnan(env.width()) || std::isnan(env.height()))
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Envelope: width|height isnan";
+
+    //    DEBUG_LOG(m_logger) << LOGFUNCTION
+    //                        << " xMin =" << env.xMin()
+    //                        << " yMin =" << env.yMin()
+    //                        << " xMax =" << env.xMax()
+    //                        << " yMax =" << env.yMax()
+    //                        << " width =" << env.width() << " height =" << env.height();
+
+    CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+    if (ctFunctor)
+    {
+      const QPointF upperLeft(ctFunctor->mapToGeographic(env.xMax(),
+                                                         env.yMin()));
+      const QPointF lowerRight(ctFunctor->mapToGeographic(env.xMin(),
+                                                          env.yMax()));
+
+      return QRectF(upperLeft, lowerRight);
+    }
+    else
+    {
+      // QRect -> left, top, width, height
+      return QRectF(env.xMin(),
+                    env.yMin(),  // use yMin, not yMax
+                    env.width(),
+                    env.height());
+    }
+
+
+  }
+  else
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " no object";
+    return QRectF();
+  }
+}
+
+void MapImpl::setExtent(const QRectF &extent)
+{
+  // !!! extent.bottom__.y() > extent.bottom.top__.y() !!!
+  setExtent(extent.topLeft()    .x(), extent.topLeft().    y(),
+            extent.bottomRight().x(), extent.bottomRight().y());
+}
+
+void MapImpl::setExtent(double xmin, double ymin, double xmax, double ymax)
+{
+  INFO_LOG(m_logger) << LOGFUNCTION << " xmin=" << xmin << " ymin=" << ymin << " xmax=" << xmax << " ymax=" << ymax
+                     << " w=" << xmax - xmin << " h= " << ymax - ymin;
+
+  if (d->m_mapGraphicsView)
+  {
+    Esri::ArcGISRuntime::Envelope env;
+
+    CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+    if (ctFunctor)
+    {
+      const QPointF bottomLeft(ctFunctor->geographicToMap(xmin, ymin));
+      const QPointF topRight(ctFunctor->geographicToMap(xmax, ymax));
+
+      // xmin,ymin,xmax,ymax
+      env = Esri::ArcGISRuntime::Envelope(bottomLeft.x(), bottomLeft.y(),
+                                          topRight.x(),   topRight.y(), d->m_esriMap->spatialReference());
+    }
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " !!! no CoordTranslationFunctor!!!"
+                                            " interpret values as absolute values";
+      // setCoords -> xmin,ymin,xmax,ymax
+      env = Esri::ArcGISRuntime::Envelope(xmin, ymin, xmax, ymax, d->m_esriMap->spatialReference());
+    }
+    // 300: setViewpoint(Envelope, duration) removed; animated -> setViewpointAsync(Viewpoint, duration)
+    d->m_mapGraphicsView->setViewpointAsync(Esri::ArcGISRuntime::Viewpoint(env), d->m_animationDuration);
+    //d->m_mapGraphicsView->setViewpointGeometry(env);
+    /////    d->m_absoluteScale = d->m_esriMap->scale();    // update d->m_absoluteScale
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+void MapImpl::setExtentMapWorld(double xmin, double ymin, double xmax, double ymax)
+{
+  if (d->m_mapGraphicsView)
+  {
+    Esri::ArcGISRuntime::Envelope env(xmin, ymin, xmax, ymax, d->m_esriMap->spatialReference());
+    d->m_mapGraphicsView->setViewpointAndWait(Esri::ArcGISRuntime::Viewpoint(env));   // 300: sync (scale() below depends on it)
+    d->m_absoluteScale = this->scale();    // update d->m_absoluteScale
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+
+/*
+QRectF MapImpl::fullExtent() const
+{
+  if (d->m_esriMap)
+  {
+    const EsriRuntimeQt::Envelope &env = d->m_esriMap->fullExtent();
+
+
+    CoordTranslationFunctor *ctFunctor = this->coordTranslationFunctor();
+    if (ctFunctor)
+    {
+      const QPointF upperLeft(ctFunctor->mapToGeographic(env.upperLeft()));
+      const QPointF lowerRight(ctFunctor->mapToGeographic(env.lowerRight()));
+
+      return QRectF(upperLeft, lowerRight);
+
+    }
+    else
+    {
+      // QRect -> left, top, width, height
+      return QRectF(env.xMin(),
+                    env.yMin(),  // use yMin, not yMax
+                    env.width(),
+                    env.height());
+    }
+
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return QRectF();
+
+  }
+}
+*/
+
+
+double MapImpl::scale() const
+{
+
+  if (!this->isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not ready yet!!!";
+    return 0.0;
+  }
+
+  if (d->m_destroying)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " is going to be destroyed!!!";
+    return 0.0;
+  }
+
+  // Keep in mind: while animation, esriMap delivers to old value.
+#ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+  return d->m_absoluteScale;
+#else
+
+  if (this->getEsriGeoView())
+  {
+
+    const Esri::ArcGISRuntime::Viewpoint &vp =
+        this->getEsriGeoView()->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+
+
+    if (vp.isEmpty())
+      return 0.0;
+
+    double scale = vp.targetScale();
+    return scale;
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+  return 0.0;
+#endif  // SITUATIONMAP_OWN_WHEEL_HANDLING
+}
+
+void MapImpl::setScale(double absoluteScale)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " absoluteScale = " << absoluteScale;
+
+  if (d->m_mapGraphicsView)
+  {
+    d->m_mapGraphicsView->setViewpointScaleAsync(absoluteScale);   // 300: setViewpointScale -> setViewpointScaleAsync
+    d->m_absoluteScale = absoluteScale;
+  }
+  else if (d->m_sceneGraphicsView)
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Does this work with V100  ???";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Does this work with V100  ???";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Does this work with V100  ???";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Does this work with V100  ???";
+    FATAL_LOG(m_logger) << LOGFUNCTION << " Does this work with V100  ???";
+
+    // Check: Does this work with QuartzFinal?
+    // Or Camera::moveForward ??
+    const Esri::ArcGISRuntime::Viewpoint &curVp =
+        d->m_sceneGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+
+    Esri::ArcGISRuntime::Viewpoint targetVp(curVp.targetGeometry(),
+                                            (absoluteScale < 0) ? curVp.targetScale() : absoluteScale);
+
+    d->m_sceneGraphicsView->setViewpointAndWait(targetVp);   // 300: setViewpoint -> setViewpointAndWait
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+
+void MapImpl::setMinScale(double minScaleToLimitZoomOut)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " minScaleToLimitZoomOut = " << minScaleToLimitZoomOut;
+
+  if (d->m_esriMap)
+    d->m_esriMap->setMinScale(minScaleToLimitZoomOut);
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+
+double MapImpl::minScale() const
+{
+  if (d->m_esriMap)
+    return d->m_esriMap->minScale();
+  ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+  return 0;
+}
+
+
+void MapImpl::setMaxScale(double maxScaleToLimitZoomIn)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " maxScaleToLimitZoomIn = " << maxScaleToLimitZoomIn;
+
+  if (d->m_esriMap)
+    d->m_esriMap->setMaxScale(maxScaleToLimitZoomIn);
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+}
+
+double MapImpl::maxScale() const
+{
+  if (d->m_esriMap)
+    return d->m_esriMap->maxScale();
+  ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+  return 0;
+}
+
+
+double MapImpl::rotation() const
+{
+  //  return d->m_rotationAbsoluteAngleDegrees;
+
+  if (this->getEsriGeoView())
+  {
+    const Esri::ArcGISRuntime::Viewpoint &vp =
+        this->getEsriGeoView()->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+    double rot = vp.rotation();
+    if (std::isnan(rot))
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " nan detected...";
+      return 0;
+    }
+    rot *= -1.0; // clock vs. counterClock
+    if (rot < 0)
+      rot += 360.0;
+    return rot;
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return 0.0;
+  }
+}
+
+void MapImpl::setRotation(double absoluteAngleDegrees)
+{
+  Esri::ArcGISRuntime::GeoView *geoview = this->getEsriGeoView();
+
+  if (mode() == Mode::Mode_3D)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return;
+  }
+
+  if (geoview)
+  {
+    d->m_rotationAbsoluteAngleDegrees = absoluteAngleDegrees;
+
+    const Esri::ArcGISRuntime::Viewpoint &curVp =
+        geoview->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+
+    // 300: Viewpoint(Geometry, scale, rotation) removed; CenterAndScale targetGeometry() is a Point ->
+    // use Viewpoint(Point, scale, rotation)
+    Esri::ArcGISRuntime::Viewpoint targetVp(static_cast<Esri::ArcGISRuntime::Point>(curVp.targetGeometry()),
+                                            curVp.targetScale(),
+                                            d->m_rotationAbsoluteAngleDegrees * -1.0);  // clock vs. counterClock
+    geoview->setViewpointAndWait(targetVp);   // 300: setViewpoint -> setViewpointAndWait
+    emit rotationChanged(d->m_rotationAbsoluteAngleDegrees);
+  }
+
+  //  if (d->m_mapGraphicsView)
+  //  {
+  //    d->m_rotationAbsoluteAngleDegrees = absoluteAngleDegrees;
+  //    d->m_mapGraphicsView->setViewpointRotation( d->m_rotationAbsoluteAngleDegrees * -1.0 ); // clock vs. counterClock
+  //    emit rotationChanged(d->m_rotationAbsoluteAngleDegrees);
+  //  }
+}
+
+
+void MapImpl::onEsriRotate()
+{
+  double rot = rotation();
+
+  if (!qFuzzyCompare(rot, d->m_rotationAbsoluteAngleDegrees))
+  {
+    d->m_rotationAbsoluteAngleDegrees = rot;
+    emit rotationChanged(d->m_rotationAbsoluteAngleDegrees);
+  }
+}
+
+
+Esri::ArcGISRuntime::Camera cameraToEsriCamera(const Camera &camIn)
+{
+  // rad to degree
+  const double factor = 180 / M_PI;
+  return Esri::ArcGISRuntime::Camera(camIn.loc_y_lat * factor,  // latitude  = y
+                                     camIn.loc_x_lon * factor, // longitude = x
+                                     camIn.loc_z,
+                                     camIn.heading * factor,
+                                     camIn.pitch   * factor,
+                                     camIn.roll    * factor
+                                     );
+}
+
+Camera esriCameraToCamera(const Esri::ArcGISRuntime::Camera &camIn)
+{
+  Camera cam;
+  const Esri::ArcGISRuntime::Point &loc = camIn.location();
+  const double factor = M_PI / 180;
+  cam.loc_x_lon = loc.x() * factor;
+  cam.loc_y_lat = loc.y() * factor;
+  cam.loc_z = loc.z();
+
+  cam.heading = camIn.heading() * factor;
+  cam.roll    = camIn.roll()    * factor;
+  cam.pitch   = camIn.pitch()   * factor;
+
+  return cam;
+}
+
+
+Camera MapImpl::camera() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_sceneGraphicsView)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return Camera();
+  }
+
+  const Esri::ArcGISRuntime::Camera &curCam = d->m_sceneGraphicsView->currentViewpointCamera();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return esriCameraToCamera(curCam);
+}
+
+void MapImpl::setCamera(const Camera &camera, float durationSeconds)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                       #ifndef WIN32
+                      << " camera=" << camera
+                       #endif // WIN32
+                      << ", durationSeconds=" << durationSeconds;
+
+  if (!d->m_sceneGraphicsView)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no object";
+    return;
+  }
+
+  const Esri::ArcGISRuntime::Camera &tarCam = cameraToEsriCamera(camera);
+
+  // avoid neg durationSeconds
+  // 300: setViewpointCamera removed; instant -> setViewpointCameraAndWait, animated -> setViewpointCameraAsync
+  if (durationSeconds < 0)
+    d->m_sceneGraphicsView->setViewpointCameraAndWait(tarCam);
+  else
+    d->m_sceneGraphicsView->setViewpointCameraAsync(tarCam, durationSeconds);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+Grid &MapImpl::grid() const
+{
+  if (!d->m_gridImpl)
+  {
+    MapImpl *THIS = const_cast<MapImpl *>(this);
+    d->m_gridImpl = new SituationMap::GridImpl(THIS);
+  }
+  return *(d->m_gridImpl);
+}
+
+
+ObjectFactory &MapImpl::objectFactory()
+{
+  if (!d->m_objectFactory)
+    d->m_objectFactory = new ObjectFactory(this);
+
+  return *(d->m_objectFactory);
+}
+
+LayerFactory &MapImpl::layerFactory() const
+{
+  return layerFactoryImpl();
+}
+
+LayerFactoryImpl &MapImpl::layerFactoryImpl() const
+{
+  if (!d->m_layerFactoryImpl)
+  {
+    MapImpl *THIS = const_cast<MapImpl *>(this);
+    d->m_layerFactoryImpl = new LayerFactoryImpl(THIS, THIS);
+  }
+  return *(d->m_layerFactoryImpl);
+}
+
+int MapImpl::basemapLayerCount() const
+{
+  int counter = -1;
+  if (d->m_basemap && d->m_basemap->baseLayers())
+    counter = d->m_basemap->baseLayers()->size();
+  return counter;
+}
+
+int MapImpl::graphicsOverlayCount() const
+{
+  int counter = -1;
+  if (d->m_mapGraphicsView && d->m_mapGraphicsView->graphicsOverlays())
+    counter = d->m_mapGraphicsView->graphicsOverlays()->size();
+  return counter;
+}
+
+int MapImpl::technicalLayerCount() const
+{
+  int counter = 0;
+
+  int cTemp = basemapLayerCount();
+  if (cTemp >= 0)
+    counter += cTemp;
+
+  cTemp = graphicsOverlayCount();
+  if (cTemp >= 0)
+    counter += cTemp;
+  return counter;
+}
+
+void MapImpl::emitVisualComponentChanged(const VisualComponent &visualComponent)
+{
+  if (d->m_destroying)
+    return;
+  emit visualComponentChanged(visualComponent);
+}
+
+
+void MapImpl::onClickMapObject(const QList<UniqueMapId> &uniqueMapIdList, const QPointF &pos)
+{
+  if (d->m_destroying)
+    return;
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START onClickMapObject clicked ids at viewport position x = " << pos.x() << " ; y = " << pos.y()
+                      << " uniqueMapIdList.size() = " << uniqueMapIdList.size();
+
+  RefPointerMapObjectList mapObjList;
+  QList<UniqueMapId>      mapObjIdList;
+  bool                    makeObjList   = isSignalConnected(QMetaMethod::fromSignal(&Map::mapObjectsClicked));
+  bool                    makeObjIdList = isSignalConnected(QMetaMethod::fromSignal(&Map::mapObjectIdsClicked));
+
+  for (const UniqueMapId &uniqueMapId : uniqueMapIdList)
+  {
+    AbstractMapObject *ifMapObjPtr = d->m_objectFactory->idToMapObject(uniqueMapId);
+    if (ifMapObjPtr)
+    {
+      if (ifMapObjPtr->pickable())
+      {
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << uniqueMapId
+                            << QStringLiteral(" Address=%1").arg((qint64)ifMapObjPtr, 0, 16)
+                            << " object-debugInfo="  << ifMapObjPtr->debugInfo()
+                            << " object-identifier=" << ifMapObjPtr->identifier();
+
+        if (makeObjList)   mapObjList   += RefPointer<AbstractMapObject>(ifMapObjPtr);
+        if (makeObjIdList) mapObjIdList += uniqueMapId;
+
+      }
+      else
+      {
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << uniqueMapId
+                            << QStringLiteral(" Address=%1").arg((qint64)ifMapObjPtr, 0, 16)
+                            << " object-debugInfo="  << ifMapObjPtr->debugInfo()
+                            << " object-identifier=" << ifMapObjPtr->identifier()
+                            << " object is NOT pickable!";
+      }
+    }
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " Unknown map object with uniqueMapId=" << uniqueMapId << " found.";
+
+  } // for
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " END onClickMapObject clicked ids"
+                      << ", mapObjList=" << mapObjList.size()
+                      << ", makeObjIdList=" << mapObjIdList.size();
+
+  if (makeObjList)
+    emit mapObjectsClicked(mapObjList, pos);
+
+  if (makeObjIdList)
+    emit mapObjectIdsClicked(mapObjIdList, pos);
+
+
+} // MapImpl::onClickMapObject
+
+
+void MapImpl::onContextClick(const QList<UniqueMapId> &uniqueMapIdList, const QPointF &pos)
+{
+  if (d->m_destroying)
+    return;
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START onContextClick clicked ids at viewport position x = " << pos.x() << " ; y = " << pos.y();
+
+  RefPointerMapObjectList  mapObjList;
+  bool                     makeObjList   = isSignalConnected(QMetaMethod::fromSignal((void (Map::*)(const RefPointerMapObjectList &, const QPointF &))(&Map::contextMenuClicked)));
+
+  if (!makeObjList)
+    return;
+
+  for (UniqueMapId uniqueMapId : uniqueMapIdList)
+  {
+    AbstractMapObject *ifMapObjPtr = d->m_objectFactory->idToMapObject(uniqueMapId);
+
+    if (ifMapObjPtr)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueMapId=" << uniqueMapId
+                          << QStringLiteral(" Address=%1").arg((qint64)ifMapObjPtr, 0, 16)
+                          << " object-debugInfo="  << ifMapObjPtr->debugInfo()
+                          << " object-identifier=" << ifMapObjPtr->identifier();
+
+      if (makeObjList)   mapObjList += RefPointer<AbstractMapObject>(ifMapObjPtr);
+
+    }
+    else ERROR_LOG(m_logger) << LOGFUNCTION << "Unknown map object with uniqueMapId=" << uniqueMapId << " found.";
+  } // for
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " END onContextClick clicked ids";
+
+  if (makeObjList)   emit contextMenuClicked(mapObjList, pos);
+
+} // MapImpl::onContextClick()
+
+
+void MapImpl::onWheelZoom(qreal factor, const QPointF &cursorPositionMap)
+{
+  if (d->m_destroying)
+    return;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " factor = " << factor
+                      << " cursorPositionMap = " << cursorPositionMap;
+
+  // scale -> non-animated ; zoomTo -> animated
+  //  zoomToScale( d->m_absoluteScale *= factor );
+  /////  zoomToScaleMapCoordinate(d->m_absoluteScale *= factor, cursorPositionMap);
+
+} // MapImpl::onWheelZoom( qreal factor )
+
+void MapImpl::startRocket()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " current Scale = " << d->m_mapGraphicsView->mapScale();
+
+  if (rocketIsRunning())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " rocket is running -> return";
+    return;
+  }
+
+  // Save value
+  // for 2D
+  d->m_currentCenterPointBeforeRocket = centerPoint();
+  d->m_currentScaleBeforeRocket       = scale();
+  d->m_currentCameraBeforRocket       = camera();
+
+  // Zoom out
+  switch (this->mode())
+  {
+  case Mode::Mode_2D:
+    setCenterPoint(d->m_currentCenterPointBeforeRocket, d->m_currentScaleBeforeRocket * 10, d->m_rocketDuration);
+    break;
+  case Mode::Mode_3D:
+  {
+    Esri::ArcGISRuntime::Camera curCam = cameraToEsriCamera(d->m_currentCameraBeforRocket);
+    const double curHeight = d->m_currentCameraBeforRocket.loc_z;
+    const Esri::ArcGISRuntime::Camera &newCam = curCam.moveForward(curHeight * 10.0 * -1);
+    setCamera(esriCameraToCamera(newCam), d->m_rocketDuration);
+    break;
+  }
+  case Mode::Undefined:
+    // empty;
+    break;
+  } // switch
+
+  delete d->m_rocketTimer;
+  d->m_rocketTimer = new QTimer(this);
+  d->m_rocketTimer->setSingleShot(true);
+  d->m_rocketTimer->setInterval((d->m_rocketDuration * 1000) + 100);   // add small amount to let zoomSlider react :-)
+  connect(d->m_rocketTimer, &QTimer::timeout, this, &MapImpl::onRocketTimerZoomOutFinished);
+
+  d->m_rocketTimer->start(); // to zoom out
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool SituationMap::MapImpl::rocketIsRunning() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_currentScaleBeforeRocket != 0.0;
+}
+
+double MapImpl::symbolScale() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, symbolScale = " << d->m_symbolScale;
+  return d->m_symbolScale;
+}
+
+void MapImpl::setSymbolScale(double symbolScale)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, new symbolScale = " << symbolScale;
+
+  // 0 check range:
+  if (symbolScale < SituationMap::symbolScaleMinimum)
+    symbolScale = SituationMap::symbolScaleMinimum;
+  if (symbolScale > SituationMap::symbolScaleMaximum)
+    symbolScale = SituationMap::symbolScaleMaximum;
+
+  // 1
+  d->m_symbolScale = symbolScale;
+
+  // 2 apply
+  QMutableMapIterator<UniqueMapId, RefPointer<AbstractMapObject>> mapObjIt = this->objectContainer().mutableIterator();
+
+  while (mapObjIt.hasNext())
+  {
+    mapObjIt.next();
+    RefPointer<AbstractMapObject> mapObj = mapObjIt.value();
+    if (mapObj)
+    {
+      mapObj->setScale(symbolScale);
+      if (! mapObj->updateView())
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed, debugInfo='" << mapObj->debugInfo() << "'";
+    }
+  } // while
+
+  // 3 emit
+  emit symbolScaleChanged(d->m_symbolScale);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, new symbolScale = " << symbolScale;
+}
+
+void MapImpl::onRocketTimerZoomOutFinished()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // Zoom in / restore initial values:
+  switch (this->mode())
+  {
+  case Mode::Mode_2D:
+    setCenterPoint(d->m_currentCenterPointBeforeRocket, d->m_currentScaleBeforeRocket, d->m_rocketDuration);
+    break;
+  case Mode::Mode_3D:
+    setCamera(d->m_currentCameraBeforRocket, d->m_rocketDuration);
+    break;
+  case Mode::Undefined:
+    // empty;
+    break;
+  } // switch
+
+
+  delete d->m_rocketTimer;
+  d->m_rocketTimer = new QTimer(this);
+  d->m_rocketTimer->setSingleShot(true);
+  d->m_rocketTimer->setInterval((d->m_rocketDuration * 1000) + 100);   // add small amount to let zoomSlider react :-)
+  connect(d->m_rocketTimer, &QTimer::timeout, this, &MapImpl::onRocketTimerZoomInFinished);
+  d->m_rocketTimer->start();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MapImpl::onRocketTimerZoomInFinished()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  delete d->m_rocketTimer;
+  d->m_rocketTimer = nullptr;
+
+  d->m_currentCenterPointBeforeRocket = QPointF();
+  d->m_currentScaleBeforeRocket = 0.0;
+  d->m_currentCameraBeforRocket.resetCamera();
+
+  emit rocketFinished();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SituationMap::MapImpl::onJumpPointRequest(const QPointF &viewPortPos)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_jumpPointWidget)
+    return;
+  const QPointF &coordGeo = this->viewPortWindowPointToGeoCoordinate(viewPortPos);
+  connect(d->m_jumpPointWidget, &JumpPointWidget::newName, this, &MapImpl::onName);
+  d->m_jumpPointWidget->askUserForName(coordGeo);
+
+}
+void SituationMap::MapImpl::onName(const QString &name, const QPointF &coordGeo)
+{
+  if (name.isEmpty())
+    return;
+
+  const double scale = this->scale();
+  d->m_jumpPointWidget->addJumpPoint(name, coordGeo, scale);
+  disconnect(d->m_jumpPointWidget, &JumpPointWidget::newName, this, &MapImpl::onName);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+GeometryModelRenderer *MapImpl::createGeometryModelRenderer(const QString &layerName, GeometryModel *geometryModel, QObject *parent)
+{
+  return new SituationMap::GeometryModelRendererEsri(this, layerName, *geometryModel, parent);
+}
+
+
+RB::RubberbandFactory &MapImpl::rubberbandFactory() const
+{
+  if (!d->m_rubberbandFactory)
+  {
+    MapImpl *THIS = const_cast<MapImpl *>(this);
+    d->m_rubberbandFactory = new RB::RubberbandFactory(THIS);
+  }
+  return *(d->m_rubberbandFactory);
+}
+
+bool MapImpl::pickMapObjectsArea() const
+{
+  // assume that we always use a rectangle (orientation north)
+
+  RB::RubberbandRectangle *rubberband = rubberbandFactory().create<SituationMap::RB::RubberbandRectangle>();
+
+  if (!rubberband)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed";
+    return false;
+  }
+  rubberband->constrainOrthogonal(true);
+  rubberband->setAutoDelete(true);
+  connect(rubberband, &RB::Rubberband::apply, this, &MapImpl::onRubberbandPickMapObjectsApply);
+
+  return true;
+}
+
+
+bool MapImpl::scaleByArea() const
+{
+  SituationMap::RB::RubberbandRectangle *rubberband = rubberbandFactory().create<SituationMap::RB::RubberbandRectangle>();
+
+  if (!rubberband)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed";
+    return false;
+  }
+
+  rubberband->constrainOrthogonal(true);
+  rubberband->setAutoDelete(true);
+
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, [this](SituationMap::RB::RubberbandBase *rubberband)
+  {
+    if (rubberband)
+    {
+      const QVector<QPointF> &points = rubberband->coordinateVector();
+
+      if (points.isEmpty())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed, no coords";
+        return;
+      }
+
+      double xmin = points[0].x();
+      double ymin = points[0].y();
+      double xmax = xmin;
+      double ymax = ymin;
+
+      for (auto pt : points)
+      {
+        if (pt.x() < xmin) xmin = pt.x();
+        if (pt.y() < ymin) ymin = pt.y();
+        if (pt.x() > xmax) xmax = pt.x();
+        if (pt.y() > ymax) ymax = pt.y();
+      }
+
+      if ((!qFuzzyCompare(xmin, xmax)) && (!qFuzzyCompare(ymin, ymax)))
+        const_cast<MapImpl*>(this)->setExtent(xmin, ymin, xmax, ymax);
+    }
+  });
+  return true;
+} // bool MapImpl::scaleByArea() const
+
+
+ObjectIndicator &MapImpl::objectIndicator()
+{
+  if (!d->m_objectIndicatorImpl)
+  {
+    d->m_objectIndicatorImpl = new ObjectIndicatorImpl();
+    d->m_objectIndicatorImpl->init(this);
+  }
+
+  return *(d->m_objectIndicatorImpl);
+}
+
+LocationDisplay &MapImpl::locationDisplay()
+{
+  if (!d->m_locationDisplayImpl)
+  {
+    d->m_locationDisplayImpl = new LocationDisplayImpl(this);
+    d->m_locationDisplayImpl->init();
+  }
+  return *(d->m_locationDisplayImpl);
+}
+
+PixelBasedTextBoxHandler &MapImpl::pixelBasedTextBoxHandler()
+{
+  if (!d->m_pixelBasedTextBoxHandlerImpl)
+  {
+    d->m_pixelBasedTextBoxHandlerImpl = new PixelBasedTextBoxHandlerImpl(this);
+  }
+  return *(d->m_pixelBasedTextBoxHandlerImpl);
+}
+
+
+Measurement &MapImpl::measurement()
+{
+  if (!d->m_measurementImpl)
+    d->m_measurementImpl = new MeasurementImpl(this);
+
+  return *(d->m_measurementImpl);
+}
+
+TerrainProfile &MapImpl::terrainProfile()
+{
+  if (!d->m_terrainProfileImpl)
+    d->m_terrainProfileImpl = new TerrainProfileImpl(this);
+
+  return *(d->m_terrainProfileImpl);
+}
+
+Viewshed &MapImpl::viewshed()
+{
+  if (!d->m_viewshedImpl)
+    d->m_viewshedImpl = new ViewshedImpl(this);
+
+  return *(d->m_viewshedImpl);
+}
+
+
+void MapImpl::onErrorGeometryEngine(const Esri::ArcGISRuntime::Error &error)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+}
+
+void MapImpl::onErrorMap(const Esri::ArcGISRuntime::Error &error)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+}
+
+void MapImpl::onErrorScene(const Esri::ArcGISRuntime::Error &error)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+}
+
+void MapImpl::onErrorOperationalLayer(const Esri::ArcGISRuntime::Error &error)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+}
+
+void MapImpl::onErrorBasemap(const Esri::ArcGISRuntime::Error &error)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " ---EsriError--- occured: " << error;
+}
+
+void MapImpl::onViewpointChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_destroying)
+    return;
+
+  if (!d->m_mapReadyFlag)
+    return;
+
+  // to ensure recalculation:
+  d->m_pixelsize = -1.0;
+
+
+  // The very first time, the extent is nan (not a number)
+  // Therefore suppress this:
+  // 23.11.16, N.Thoden, V100.0
+  if (d->m_suppressFirstViewpointChange)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " suppress firstViewpointChange";
+    d->m_suppressFirstViewpointChange = false;
+    return;
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " ************** viewpointChanged=" << toString(this->extent());
+
+
+  emit extentChanged();
+
+  d->m_maxExtentTimer->start(); // start -> restart
+
+  //  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MapImpl::onRectChanged()
+{
+  if (d->m_destroying)
+    return;
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " ************** signal emitted: rectChanged ************** ";
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " ************** signal emitted: rectChanged ************** "
+                      << " w=" << this->width() << " - h=" << this->height();
+  emit rectChanged();
+}
+
+QImage MapImpl::toImageSync()
+{
+  QScreen *screen = this->screen();
+  if (!screen)
+    return {};
+
+  WId winId = this->winId();
+  QSize size = this->size();
+  QPixmap pix = screen->grabWindow(winId,
+                                   0, 0,
+                                   size.width(), size.height());
+  return pix.toImage();
+}
+
+
+QUuid MapImpl::toImage()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  Esri::ArcGISRuntime::GeoView *geoview = this->getEsriGeoView();
+
+  if (! geoview)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no view";
+    return QUuid();
+  }
+
+  // 300: exportImage()/TaskWatcher/exportImageCompleted removed. exportImageAsync() returns a
+  // QFuture<QImage>, observed by a QFutureWatcher which emits imageCompleted on finished.
+  const QUuid taskId = QUuid::createUuid();
+  QFuture<QImage> fut = geoview->exportImageAsync();
+
+  if (! fut.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " QFuture invalid";
+    return QUuid();
+  }
+
+  QFutureWatcher<QImage> *watcher = new QFutureWatcher<QImage>(this);
+  connect(watcher, &QFutureWatcher<QImage>::finished, this,
+          [this, watcher, taskId](){ emit imageCompleted(taskId, watcher->result()); });
+  watcher->setFuture(fut);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, taskId=" << taskId;
+  return taskId;
+}
+
+void MapImpl::onExportImageCompleted(const QUuid &taskId, const QImage &image)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, taskId=" << taskId;
+
+  emit imageCompleted(taskId, image);
+
+  //  image.save(QLatin1String("./ExportImageCompleted.png"), "PNG");
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, taskId=" << taskId;
+}
+
+
+bool MapImpl::toPdf(const QString &outputFilename,
+                    const QString &title,
+                    const QString &footerLeft,
+                    const QString &footerCenter,
+                    const QString &footerRight,
+                    const QColor &textColor)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " outputFilename='" << outputFilename << "'";
+
+  connect(this, &MapImpl::imageCompleted, this,
+          [this,
+          outputFilename,
+          title,
+          footerLeft, footerCenter, footerRight,
+          textColor](const QUuid &, const QImage & image)
+  {
+    finishToPdf(image,
+                outputFilename,
+                title,
+                footerLeft, footerCenter, footerRight,
+                textColor);
+  });
+
+  if (this->toImage().isNull())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " taskId invalid";
+    return false;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " outputFilename='" << outputFilename << "'";
+  return true;
+}
+
+void MapImpl::finishToPdf(const QImage &image,
+                          const QString &outputFilename,
+                          const QString &title,
+                          const QString &footerLeft,
+                          const QString &footerCenter,
+                          const QString &footerRight,
+                          const QColor &textColor)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " outputFilename='" << outputFilename << "'";
+
+  QColor textColorInternal;
+  if (textColor.isValid())
+    textColorInternal = textColor;
+  else
+    textColorInternal = this->palette().color(QPalette::WindowText); // RDE_DARK_BLUE
+
+
+  QPrinter printer(QPrinter::PrinterMode::HighResolution);  // QPrinter::PrinterMode::ScreenResolution ; ScreenResolution is Qt-default
+  printer.setOutputFormat(QPrinter::PdfFormat);
+  printer.setOutputFileName(outputFilename);
+  printer.setPageOrientation(QPageLayout::Orientation::Landscape);   // 300/Qt6: setOrientation(QPrinter::Orientation) -> setPageOrientation(QPageLayout::Orientation)
+
+  int marginInt = 20;
+  QMarginsF margins;
+  margins.setLeft(marginInt);
+  margins.setTop(marginInt);
+  printer.setPageMargins(margins);
+
+  printer.setCreator(QStringLiteral("Rde-") + qAppName());
+
+  printer.setDocName(title);
+
+
+  const QSizeF pageSize = printer.paperRect(QPrinter::Point).size();   // Qt6: paperRect() now requires a Unit
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " pageSize=" << pageSize;
+
+  const QSizeF drawingSize = pageSize - QSizeF(2 * marginInt, 2 * marginInt) * 1.5;
+
+
+  QPainter painter(&printer);
+
+  QTextDocument document;
+  QTextCursor cursor(&document);
+
+
+  QTextTableFormat tableFormat;
+  //      tableFormat.setBackground(QColor(QLatin1String("lightGray")));
+  tableFormat.setBorder(0);
+  tableFormat.setCellPadding(10);
+
+  QTextCharFormat defaultFormat;
+  defaultFormat.setForeground(QBrush(textColorInternal));
+
+  //
+  // Header:
+  //
+  {
+    QTextCharFormat format = defaultFormat;
+    format.setFontWeight(QFont::Bold);
+    format.setFontPointSize(20);
+
+    QTextTable *headerTable = cursor.insertTable(1, 1, tableFormat);
+    QTextTableCell cell = headerTable->cellAt(0, 0);
+    QTextCursor cellCursor = cell.firstCursorPosition();
+    cellCursor.mergeCharFormat(format);
+    cellCursor.insertText(title);
+
+    // create small distance:
+    format.setFontPointSize(5);
+    cellCursor.mergeCharFormat(format);
+    cellCursor.insertBlock();
+
+  }
+  cursor.insertBlock();
+
+
+  //
+  // Image:
+  //
+  const QUrl imageUrl(QLatin1String("situationMap://sitMapScreenshot.png"));
+  document.addResource(QTextDocument::ImageResource, imageUrl, QVariant(image));
+
+
+  QTextImageFormat imageFormat;
+  imageFormat.setName(imageUrl.toString());
+  imageFormat.setWidth(drawingSize.width() * 0.95);
+  cursor.insertImage(imageFormat);
+
+
+  //
+  // Footer
+  //
+  {
+    QVector<QTextLength> constraints;
+    constraints << QTextLength(QTextLength::FixedLength, imageFormat.width() / 3);
+    constraints << QTextLength(QTextLength::FixedLength, imageFormat.width() / 3);
+    constraints << QTextLength(QTextLength::FixedLength, imageFormat.width() / 3);
+    tableFormat.setColumnWidthConstraints(constraints);
+    QTextTable *footerTable = cursor.insertTable(1, 3, tableFormat);
+
+    QStringList sl;
+    sl << footerLeft << footerCenter << footerRight;
+
+    // Footer -> centered:
+    QTextBlockFormat blockFormat = cursor.blockFormat();
+    Qt::Alignment alignment = Qt::AlignHCenter;
+
+    // Read vertical part of current alignment flags
+    Qt::Alignment vertAlign = blockFormat.alignment() & Qt::AlignVertical_Mask;
+
+    // Mask out vertical part of specified alignment flags
+    Qt::Alignment horzAlign = alignment & Qt::AlignHorizontal_Mask;
+
+    // Combine current vertical and specified horizontal alignment
+    Qt::Alignment combAlign = horzAlign | vertAlign;
+
+    // Apply and write
+    blockFormat.setAlignment(combAlign);
+
+    for (int i = 0; i < 3; ++i)
+    {
+      QTextTableCell cell = footerTable->cellAt(0, i);
+      QTextCursor cellCursor = cell.firstCursorPosition();
+      cellCursor.setBlockFormat(blockFormat);
+      cellCursor.mergeCharFormat(defaultFormat);
+      cellCursor.insertText(sl.at(i));
+    }
+
+    // finally:
+    document.drawContents(&painter);
+  }
+
+  emit pdfCompleted(outputFilename);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " outputFilename='" << outputFilename << "'";
+}
+
+
+
+
+//----------------------------------------------------------------------------
+// MapConnector (Map -> MapObjects)
+//----------------------------------------------------------------------------
+bool MapConnector::connectMapObject(MapImpl *mapImpl, AbstractMapObjectImpl *mapObjImpl)
+{
+  m_mapImpl       = mapImpl;
+  m_mapObjectImpl = mapObjImpl;
+  if (m_mapImpl && m_mapObjectImpl)
+  {
+    connect(m_mapImpl, &MapImpl::extentChangedDelayed,
+            this, &MapConnector::onMapExtentChanged);
+    return true;
+  }
+  return false;
+}
+
+void MapConnector::onMapExtentChanged()
+{
+  //  if (m_mapImpl && m_mapObjectImpl) // checked in connectObject
+  m_mapObjectImpl->onMapExtentChanged();
+
+}
+
+} // namespace SituationMap
+
+#include "map_impl.moc"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.h
new file mode 100755
index 000000000..5b8410486
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.h
@@ -0,0 +1,520 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Map
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+
+// Own
+#include <Map/map.h> // Interface
+#include <SideBar/side_bar.h> // Interface
+#include <Common/situation_map_logging.h>
+
+
+// ESRI
+#include <SpatialReference.h>
+#include <MapTypes.h>
+#include <MapViewTypes.h>
+#include <Error.h>
+
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Map;
+class Basemap;
+class GeoView;
+class MapGraphicsView;
+class Scene;
+class SceneGraphicsView;
+class GraphicsOverlay;
+class Layer;
+class Point;
+}
+}
+
+class Grid;
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class LayerFactoryImpl;
+class ObjectIndicator;
+class LocationDisplay;
+class ElevationMap;
+class ElevationMapManager;
+
+namespace RB
+{
+class RubberbandBase;
+}
+
+
+/**
+ * @brief The MapImpl
+ *
+ *
+ */
+class SITUATIONMAP_EXPORT MapImpl : public SituationMap::Map
+{
+  Q_OBJECT
+
+  using BaseClass = SituationMap::Map;
+
+public:
+
+  explicit MapImpl(QWidget *parent = nullptr);
+  virtual ~MapImpl();
+
+  MapImpl(const MapImpl &other)           = delete;
+  MapImpl &operator=(const MapImpl &other) = delete;
+
+  bool init(const Mode mapMode_2D3D) override;
+
+  bool load() override;
+
+  Mode mode() const override;
+
+  void setParent(QWidget *parent, bool bBeginDestroyFini) override;
+
+
+
+  double animationDuration() const override;
+  void setAnimationDuration(double durationSec) override;
+
+
+  void addMapWidget() override;
+
+  bool setTextBox(const PixelTextBoxData &ptbd, bool enableGeometryModifications = true) override;
+  bool removeTextBox() override;
+
+
+protected:
+  bool init2D();
+  bool initFeature();
+  bool init3D();
+
+  bool fini();
+  void fini2D();
+  void fini3D();
+
+  QWidget *addMapWidget_AddToScene();
+  QWidget *addMapWidget_OwnWidget();
+  void setupLocationToElevationHelper();
+
+
+  static QImage renderCompass(const QColor &colorNorth,
+                              const QColor &colorSouth,
+                              const QColor &colorBackground,
+                              int halfWidth, int halfHeight,
+                              bool b_3D = false);
+
+public:
+  bool isPositionStringVisible() const override;
+  void showPositionString(bool visible = true) override;
+  void setPositionStringColor(const QColor &foregroundColor, const QColor &backgroundColor) override;
+
+  void setPartitionTime(const qint64 &time) override;
+  void setReplay(bool b) override;
+  bool isReplay() const override;
+  bool isExerciseTimeStringVisible() const override;
+  void showExerciseTimeString(bool visible = false) override;
+  void setExerciseTimeStringColor(const QColor &foregroundColor, const QColor &backgroundColor) override;
+
+  bool isTimeStringVisible() const override;
+  void setTimeString(const QString &timeString) override;
+  void showTimeString(bool visible = true) override;
+  void setTimeStringColor(const QColor &foregroundColor, const QColor &backgroundColor) override;
+
+  bool isCompassVisible() const override;
+  void showCompass(bool visible = true) override;
+
+  void addSideBar() override;
+  void removeSideBar() override;
+  QPointer<SideBar> sideBar() override;
+
+  static bool applyLicense(const QString &licenseStr, const QStringList &extensions = QStringList());
+  static bool applyNetworkCacheSettings(const EsriNetworkCacheSettings &esriNetworkCacheSettings);
+  static EsriNetworkCacheSettings networkCacheSettings();
+
+
+
+  Esri::ArcGISRuntime::Map               *getEsriMap() const;
+  Esri::ArcGISRuntime::Basemap           *getEsriBasemap() const;
+  Esri::ArcGISRuntime::SpatialReference   getEsriSpatialReference() const;
+  Esri::ArcGISRuntime::Scene             *getEsriScene() const;
+  Esri::ArcGISRuntime::GeoView           *getEsriGeoView() const;
+  Esri::ArcGISRuntime::MapGraphicsView   *getEsriMapGraphicsView() const;
+  Esri::ArcGISRuntime::SceneGraphicsView *getEsriSceneGraphicsView() const;
+  QGraphicsView                          *getEsriQGraphicsView() const;
+  QString                                 toDumpString() const;
+
+  bool                                   isLoaded() const override;
+  QGraphicsView                         *getQGraphicsView() const override;
+
+//  bool                                   readSightFanElevationMap(const QString &filePath);
+//  std::shared_ptr<ElevationMap>          getSightFanElevationMap() const;
+
+  bool                                   initElevationMapManager(const QStringList &filePaths_rough_to_fine);
+  std::shared_ptr<ElevationMapManager>   getElevationMapManager() const;
+
+  double                                 pixelSizeMeter() override;
+  double                                 pixelSizeGeographic() override;
+
+
+public:
+  bool isReady() const override;
+
+  DrawStatus drawStatus() const override;
+
+  int wkid() const override;
+
+  /*! \name Surface: Below Ground, introduced with V100.5.0 */
+  //@{
+  SituationMap::NavigationConstraint navigationConstraint() const override;
+  bool setNavigationConstraint(SituationMap::NavigationConstraint NavigationConstraint) override;
+
+  float baseSurfaceOpacity() const override;
+  bool setBaseSurfaceOpacity(float surfaceOpacity) override;
+  //@}
+
+  OverviewMapHandler &overviewMapHandler() const override;
+
+
+  OperatorMapSettings operatorMapSettings() const override;
+  bool restoreOperatorMapSettings(const OperatorMapSettings &oms) override;
+
+
+  // Layer :
+  LayerFactory     &layerFactory() const override;
+  virtual LayerFactoryImpl &layerFactoryImpl() const;
+
+  int basemapLayerCount() const;
+  int graphicsOverlayCount() const;
+  int technicalLayerCount() const override;
+
+
+
+  // convenience :
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayerDict(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer3DExtrusion(const QString &logicalName);
+  virtual Esri::ArcGISRuntime::GraphicsOverlay *getGraphicsLayer3D_SpAbsolute(const QString &logicalName);
+  // : convenience
+  // : Layer
+
+  // Grid
+  Grid &grid() const override;
+
+
+  // Symbol Dictionary :
+  bool setSymbologyType(AdvancedSymbology::SymbologyType symbologyType) override;
+  AdvancedSymbology::SymbologyType      symbologyType() override;
+  AdvancedSymbology::SymbolDictionary  &symbolDictionary() const override;
+  bool isSymbolDictionaryLoaded() const override;
+  // : Symbol Dictionary
+
+
+  // Object Creation : (create MapObjects using a factory)
+  ObjectFactory &objectFactory() override;
+
+  // For object management (ObjectContainer)
+  virtual ObjectContainer &objectContainer();
+  void setObjectContainer(QSharedPointer<ObjectContainer> objectContainer) override;
+
+  PartyIdToColorFunctor &partyIdToColorFunctor() const override;
+  void setPartyIdToColorFunctor(QSharedPointer<PartyIdToColorFunctor> partyIdToColor) override;
+
+  OverlayHandler &overlayHandler() const override;
+
+  /*! \name JumpPoints... */
+  //@{
+  bool addJumpPoint(const QString &name, const Point3D &originGeo, double mapScale = -1) override;
+  bool removeJumpPoint(const QString &name) override;
+  QStringList jumpPointNames() const override;
+  //@}
+
+
+
+  void initCoordTranslationFunctor() override;
+
+  CoordTranslationFunctor *coordTranslationFunctor() const override;
+  // : Object Creation
+
+
+  // Map Extent :
+  Viewpoint2D initialViewpoint() const override;
+  void setInitialViewpoint(const Viewpoint2D &initialViewpoint) override;
+
+  Viewpoint2D viewpoint2D() const override;
+  void setViewpoint2D(const Viewpoint2D &viewpoint, float durationSeconds = -1.0) override;
+  void setViewpoint2DAndWait(const Viewpoint2D &viewpoint) override;
+
+  void setViewpoint2DInternal(const Viewpoint2D &viewpoint, bool andWait, float durationSeconds = -1.0);
+
+  QPointF centerPoint() const override;
+  void setCenterPoint(const QPointF &center, double scale = -1.0, float durationSeconds = -1.0) override;
+
+  void zoomToArea(const QVector<QPointF> &coords, int paddingInDIPS) override;
+
+  void setTrainingsAreaExtent(const QVector<QPointF> &trainingsAreaExtent) override;
+
+  QRectF extent() const override;
+  void setExtent(const QRectF &extent) override;
+  void setExtent(double xmin, double ymin, double xmax, double ymax) override;
+
+  /**
+   * @brief SetExtentMapWorld is for INTERNAL use only
+   * @param xmin
+   * @param ymin
+   * @param xmax
+   * @param ymax
+   */
+  virtual void setExtentMapWorld(double xmin, double ymin, double xmax, double ymax);
+
+//  QRectF fullExtent() const override;
+
+
+
+  double scale() const override;
+  void setScale(double absoluteScale) override;
+
+  void setMinScale(double minScaleToLimitZoomOut) override;
+  double minScale() const override;
+
+  void setMaxScale(double maxScaleToLimitZoomIn) override;
+  double maxScale() const override;
+
+  bool scaleByArea() const override;
+
+  // Rotation
+  double rotation() const override;
+  void setRotation(double absoluteAngleDegrees) override;
+
+  // for 3D:
+  Camera camera() const override;
+  void setCamera(const Camera &camera, float durationSeconds = -1.0) override;
+
+
+
+  // coordinate conversion
+  QPointF mapCoordinateToViewPortWindowPoint(const QPointF &mapPos) const override;
+  QPointF mapCoordinateToViewPortWindowPoint3D(const Point3D &mapPos) const override;
+
+  QPointF viewPortWindowPointToMapCoordinate(const QPointF &pixelCoord) const override; // ret = Point3D
+  Point3D viewPortWindowPointToMapCoordinate3D(const QPointF &pixelCoord) const override;
+
+
+  QPointF geoCoordinateToViewPortWindowPoint(const QPointF &geoPos) const override;
+  QPointF geoCoordinateToViewPortWindowPoint3D(const Point3D &geoPos) const override;
+
+
+  QPointF viewPortWindowPointToGeoCoordinate(const QPointF &pixelCoord) const override;   // ret = Point3D
+  Point3D viewPortWindowPointToGeoCoordinate3D(const QPointF &pixelCoord) const override;
+
+
+  QString geoToMgrsString(const QPointF &geoPos) const override;
+  QString mapToMgrsString(const QPointF &mapPos) const override;
+
+
+  GeometryModelRenderer *createGeometryModelRenderer(const QString &layerName,
+                                                     GeometryModel *geometryModel,
+                                                     QObject *parent = nullptr) override;
+
+  // Rubberbands
+  RB::RubberbandFactory &rubberbandFactory() const override;
+
+  // Pick objects by area
+  bool pickMapObjectsArea() const override;
+
+
+  // EventHandling
+  void installDropEventManager(DropEventManager *demgr) override;
+  void deinstallDropEventManager(DropEventManager *demgr) override;
+
+
+//  // MapObjectIndicator
+//  bool createMapObjectIndicator(UniqueMapId uniqueId) override;
+//  void removeMapObjectIndicator() override;
+//  UniqueMapId mapObjectIndicator() const override;
+
+
+  // ObjectIndicator
+  ObjectIndicator& objectIndicator() override;
+
+
+  // LocationDisplay
+  LocationDisplay &locationDisplay() override;
+
+
+  // PixelBasedTextBoxHandler
+  PixelBasedTextBoxHandler &pixelBasedTextBoxHandler() override;
+
+
+  // Tools (Measurement, Viewshed...)
+  Measurement &measurement()        override;
+  TerrainProfile &terrainProfile()  override;
+  Viewshed &viewshed()              override;
+
+  // Rocket
+  double rocketDuration() const override;
+  void setRocketDuration(double durationSec) override;
+  void startRocket() override;
+  bool rocketIsRunning() const override;
+
+  // Symbol scale
+  double symbolScale() const override;
+  void setSymbolScale(double symbolScale) override;
+
+
+  void installViewPortEventFilter(QObject *eventFilter) override;
+  void removeViewPortEventFilter(QObject *eventFilter) override;
+
+  QPointer<MapNotifier> createMapNotifier() const override;
+
+
+  // Screenshot etc:
+  QImage toImageSync() override;
+  QUuid toImage() override;
+
+  virtual bool toPdf(const QString &outputFilename,
+                     const QString &title,
+                     const QString &footerLeft,
+                     const QString &footerCenter,
+                     const QString &footerRight,
+                     const QColor &textColor = QColor()) override;
+
+
+
+protected:
+
+  bool eventFilter(QObject *obj, QEvent *e) final;
+
+public slots:
+  void onHandleMouseMove(int windowPosX, int windowPosY);   // used by EventDispatcher (Rubberband)
+
+protected slots:
+  void onErrorGeometryEngine(const Esri::ArcGISRuntime::Error &error);
+  void onErrorMap(const Esri::ArcGISRuntime::Error &error);
+  void onErrorScene(const Esri::ArcGISRuntime::Error &error);
+  void onErrorOperationalLayer(const Esri::ArcGISRuntime::Error &error);
+  void onErrorBasemap(const Esri::ArcGISRuntime::Error &error);
+  void onViewpointChanged();
+  void onRectChanged();
+  void onKeyPressEvent(const QKeyEvent& keyEvent);
+
+  void onLoadStatusChanged(Esri::ArcGISRuntime::LoadStatus loadStatus);
+  void onDoneLoading(const Esri::ArcGISRuntime::Error &loadError);
+
+  void onMouseScenePositionChanged(const Point3D &locationScene, bool isValid);
+
+
+
+  void onRubberbandPickMapObjectsApply(RB::RubberbandBase *rubberband);
+
+
+  void onExportImageCompleted(const QUuid &taskId, const QImage &image);
+  void finishToPdf(const QImage &image,
+                   const QString &outputFilename,
+                   const QString &title,
+                   const QString &footerLeft,
+                   const QString &footerCenter,
+                   const QString &footerRight,
+                   const QColor &textColor = QColor());
+
+  void onPartyChanged(int changedPartyId = -1);
+  void onAllPartysChanged();
+
+
+  void onCheckMapReadyAndSymbolDictionaryLoaded();
+
+
+  friend class LayerFactoryImpl;
+  friend class GridImpl;
+  friend class OverviewMapHandlerImpl;
+
+  void emitAllElevationSourcesLoaded()
+  {
+    emit allElevationSourcesLoaded();
+    onCheckMapReadyAndSymbolDictionaryLoaded();
+  }
+
+  void emitLayerCreateComplete(const QString &layername)
+  {
+    emit layerCreateComplete(layername);
+  }
+  void emitLayerCreateError(const QString &layername, const QString &error)
+  {
+    emit layerCreateError(layername, error);
+  }
+  void emitLayerOrderChanged()
+  {
+    emit layerOrderChanged();
+  }
+  void emitLayerParameterChanged(const QString &layername, const LayerParameter &newLayerParameter)
+  {
+    emit layerParameterChanged(layername, newLayerParameter);
+  }
+
+  void emitVisualComponentChanged(const VisualComponent &visualComponent);
+
+
+  void onClickMapObject(const QList<UniqueMapId> &uniqueMapIdList, const QPointF &pos);
+
+  void onContextClick(const QList<UniqueMapId> &uniqueMapIdList, const QPointF &pos);
+
+  void onWheelZoom(qreal factor, const QPointF &cursorPositionMap);
+
+  void onRocketTimerZoomOutFinished();
+  void onRocketTimerZoomInFinished();
+
+  void onName(const QString &name, const QPointF &coordGeo);
+  void onJumpPointRequest(const QPointF &viewPos);
+
+  void onEsriRotate();
+
+//  void showFunctionDialog();
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+
+//----------------------------------------------------------------------------
+// MapConnector (Map -> MapObjects)
+//----------------------------------------------------------------------------
+
+// forward:
+class AbstractMapObjectImpl;
+
+class MapConnector : public QObject
+{
+  Q_OBJECT
+public:
+  bool connectMapObject(MapImpl *mapImpl, AbstractMapObjectImpl *mapObjImpl);
+
+public Q_SLOTS:
+  void onMapExtentChanged();
+
+private:
+  MapImpl                *m_mapImpl       = nullptr; // map (emitting)
+  AbstractMapObjectImpl  *m_mapObjectImpl = nullptr; // 'host' (to be updated)
+};
+
+
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.cpp
new file mode 100755
index 000000000..4d861f3e6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.cpp
@@ -0,0 +1,325 @@
+/**
+  * @RDE_HEADER@
+  * MapLayer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "map_layer.h"
+#include <MapImpl/map_impl.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <Map/situation_map_utils.h>
+
+
+// ESRI
+#include <Layer.h>
+#include <GraphicsOverlay.h>
+#include <ArcGISTiledLayer.h>
+
+
+// Qt
+// #include <QDebug>
+
+namespace SituationMap
+{
+
+MapLayer::MapLayer(const QString &logicalName,
+                   LayerType layerType)
+  : m_name(logicalName)
+  , m_layerType(layerType)
+{
+}
+
+bool MapLayer::isValid() const
+{
+  return ((m_layerType != LayerType::Undefined) && (!m_name.isEmpty()));
+}
+
+QString MapLayer::name() const
+{
+  return m_name;
+}
+
+LayerType MapLayer::type() const
+{
+  return m_layerType;
+}
+
+
+//------------------------------------------------------------------------------
+
+bool MapLayerOrderedList::addLayer(const QString &name,
+                                   LayerType layerType)
+{
+  if (name.isEmpty() || layerType == LayerType::Undefined)
+    return false;
+
+  // Do NOT allow same names for different LayerTypes:
+  if (contains(name, LayerType::Undefined))
+    return false;
+
+  MapLayer temp(name, layerType);
+  if (!temp.isValid())
+    return false;
+
+  if (layerType == LayerType::Basemap)
+  {
+    // Basemap -> bottom;
+    int cnt = this->count(LayerType::Basemap);
+    m_mapLayerList.insert(cnt, temp);
+  }
+  else if (layerType == LayerType::Overlay)
+  {
+    // Overlay -> directly above Basemap;
+    int cntBM  = this->count(LayerType::Basemap);
+    int cntOVL = this->count(LayerType::Overlay);
+    m_mapLayerList.insert(cntBM + cntOVL, temp);
+  }
+  else
+    m_mapLayerList.append(temp);
+  return true;
+}
+
+bool MapLayerOrderedList::contains(const QString &name,
+                                   LayerType layerType) const
+{
+  bool found = false;
+  for (const MapLayer &layer : m_mapLayerList)
+  {
+    if (layerType == LayerType::Undefined)
+    {
+      if (layer.name().compare(name) == 0)
+      {
+        found = true;
+        break;
+      }
+    }
+    else
+    {
+      if ((layer.type() == layerType) && (layer.name().compare(name) == 0))
+      {
+        found = true;
+        break;
+      }
+    }
+  }
+  return found;
+}
+
+MapLayer MapLayerOrderedList::getLayer(const QString &name) const
+{
+  for (const MapLayer &layer : m_mapLayerList)
+  {
+    if (layer.name().compare(name) == 0)
+      return layer;
+  }
+  return MapLayer();
+}
+
+bool MapLayerOrderedList::removeLayer(const QString &name)
+{
+  // since a layername has to be unique independent it´s layertype:
+
+//     QMutableListIterator does not realy work, Problems with MapLayer ???
+//  QMutableListIterator<MapLayer> contIt(m_mapLayerList);
+
+//  while (contIt.hasNext());
+//  {
+//    contIt.next();
+//    const MapLayer & layer = contIt.value();
+//    if (layer.name().compare(name) == 0)
+//    {
+//      contIt.remove();
+//      return true;
+//    }
+//  }
+
+
+  for (int i = 0; i < m_mapLayerList.size(); ++i)
+  {
+    const MapLayer &layer = m_mapLayerList[i];
+    if (layer.name().compare(name) == 0)
+    {
+      m_mapLayerList.removeAt(i);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+int MapLayerOrderedList::count(LayerType layerType) const
+{
+  if (layerType == LayerType::Undefined)
+    return m_mapLayerList.size();
+
+
+  int counter = 0;
+  for (const MapLayer &mapLayer : qAsConst(m_mapLayerList))
+  {
+    if (mapLayer.type() == layerType)
+      ++counter;
+  }
+  return counter;
+}
+
+
+QStringList MapLayerOrderedList::layernamesOfType(const QStringList &layernames, LayerType layerType)
+{
+  QStringList layerCont;
+  for (const QString &lName : layernames)
+  {
+    const MapLayer &ml = getLayer(lName);
+    if (!ml.isValid())
+      continue;
+    if (ml.type() == layerType)
+      layerCont.push_back(lName);
+  }
+  return layerCont;
+}
+QStringList MapLayerOrderedList::layernamesOfTypeOther(const QStringList &layernames)
+{
+  QStringList layerCont;
+  for (const QString &lName : layernames)
+  {
+    const MapLayer &ml = getLayer(lName);
+    if (!ml.isValid())
+      continue;
+    if (
+        (ml.type() != LayerType::Basemap) &&
+        (ml.type() != LayerType::Overlay) &&
+        (ml.type() != LayerType::Operational) &&
+        (ml.type() != LayerType::EmergencyCall) &&
+        (ml.type() != LayerType::Undefined)
+        )
+      layerCont.push_back(lName);
+  }
+  return layerCont;
+}
+QStringList orderStringListPerType(const QStringList &slToOrder, const QStringList &slRequested)
+{
+  //
+  // !!!do not lose one layer existing in slToOrder!!!
+  //
+
+  QStringList slNew = slToOrder;
+
+  int newIdx = 0;
+  for (const QString &name : slRequested)
+  {
+    int idx = slNew.indexOf(name);
+    if (idx >= 0)
+    { // found
+      slNew.move(idx, newIdx++);
+    }
+  }
+  return slNew;
+}
+
+
+bool MapLayerOrderedList::orderLayerTo(const QStringList &orderedLayernamesReq, bool *bRequestedOrderIsValid)
+{
+  // cur   =ArcGISTiledLayer_URL_0;ArcGISTiledLayer_URL_1;ArcGISTiledLayer_URL_2;OverlayLayer_1001;OverlayLayer_1002;...;JumpPoints;SnaphotOverlay
+  // should=ArcGISTiledLayer_URL_0;ArcGISTiledLayer_URL_1;ArcGISTiledLayer_URL_2;OverlayLayer_1002;OverlayLayer_1001;...;JumpPoints
+
+  QStringList slMapLayerList;
+  slMapLayerList.reserve(m_mapLayerList.size());
+  for (const MapLayer &ml : qAsConst(m_mapLayerList))
+    slMapLayerList.push_back(ml.name());
+
+  //
+  // !!!do not lose one layer existing in the m_mapLayerList!!!
+  //
+
+  QStringList slBasemapNew;
+  {
+    QStringList slCur = layernamesOfType(slMapLayerList, LayerType::Basemap);
+    QStringList slReq = layernamesOfType(orderedLayernamesReq, LayerType::Basemap);
+    slBasemapNew = orderStringListPerType(slCur, slReq);
+  }
+
+  QStringList slOverlayNew;
+  {
+    QStringList slCur = layernamesOfType(slMapLayerList, LayerType::Overlay);
+    QStringList slReq = layernamesOfType(orderedLayernamesReq, LayerType::Overlay);
+    slOverlayNew = orderStringListPerType(slCur, slReq);
+  }
+
+  QStringList slOperationalNew;
+  {
+    QStringList slCur = layernamesOfType(slMapLayerList, LayerType::Operational);
+    QStringList slReq = layernamesOfType(orderedLayernamesReq, LayerType::Operational);
+    slOperationalNew = orderStringListPerType(slCur, slReq);
+  }
+
+  QStringList slOtherNew;
+  {
+    QStringList slCur = layernamesOfTypeOther(slMapLayerList);
+    QStringList slReq = layernamesOfTypeOther(orderedLayernamesReq);
+    slOtherNew = orderStringListPerType(slCur, slReq);
+  }
+
+  // Emergency should stay on top
+  QStringList slEmergencyCallNew;
+  {
+    QStringList slCur = layernamesOfType(slMapLayerList, LayerType::EmergencyCall);
+    QStringList slReq = layernamesOfType(orderedLayernamesReq, LayerType::EmergencyCall);
+    slEmergencyCallNew = orderStringListPerType(slCur, slReq);
+  }
+
+  // put all basemapLayer to front, then overlayLayers, then others and finally EmergencyCall on top
+  const QStringList &slMapLayerListNEW = slBasemapNew + slOverlayNew + slOperationalNew + slOtherNew + slEmergencyCallNew;
+
+  const bool localRequestedOrderIsValid = slMapLayerListNEW == orderedLayernamesReq;
+
+  if (bRequestedOrderIsValid)
+  {
+    // just request, do NOT modify !!!
+    *bRequestedOrderIsValid = localRequestedOrderIsValid;
+  } else {
+    QList<MapLayer> mlListNEW;
+    for(const QString &lName : slMapLayerListNEW)
+    {
+      const MapLayer &ml = getLayer(lName);
+      if (!ml.isValid())
+        continue;
+      mlListNEW.push_back(ml);
+    }
+    m_mapLayerList = mlListNEW;
+  }
+
+  return true;
+}
+
+
+int MapLayerOrderedList::count() const
+{
+  return m_mapLayerList.count();
+}
+
+QStringList MapLayerOrderedList::layerNamesOrdered() const
+{
+  QStringList ll;
+  ll.reserve(m_mapLayerList.size());
+  for (const MapLayer &layer : m_mapLayerList)
+    ll.append(layer.name());
+  return ll;
+}
+
+QStringList MapLayerOrderedList::layerNamesOrdered(LayerType layerType) const
+{
+  QStringList ll;
+  for (const MapLayer &layer : m_mapLayerList)
+  {
+    if (layer.type() == layerType)
+      ll.append(layer.name());
+  }
+  return ll;
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.h
new file mode 100755
index 000000000..7086961bb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_layer.h
@@ -0,0 +1,94 @@
+/**
+  * @RDE_HEADER@
+  * MapLayer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include <Common/situation_map_logging.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+
+class MapLayer
+{
+public:
+
+  explicit MapLayer(const QString &logicalName = QString(),
+                    LayerType layerType = LayerType::Undefined);
+
+  bool isValid() const;
+
+  // for some read-only values :
+  QString name() const;
+  LayerType type() const;
+  // : for some read-only values
+
+protected:
+  QString                       m_name;
+  LayerType                     m_layerType        = LayerType::Undefined;
+
+};
+
+/**
+ * @brief The MapLayerOrderedList class will store an ordered List of the MapLayer.
+ * The List can be used to get the orderedList of layernames as well as
+ * control the parameters like on/off, brightness etc.
+ */
+class MapLayerOrderedList final : public QObject
+{
+  Q_OBJECT
+  using BaseClass = QObject;
+
+public:
+  MapLayerOrderedList()  = default;
+  ~MapLayerOrderedList() = default;
+
+
+  /**
+   * @brief addLayer add Layername. Will NOT be added if name already exists (regardless layerType)
+   * !All LayerType::Basemap will below all other!
+   * @param name Layername to be added. Must be unique!
+   * @param layerType layerType to be added (Undefined is NOT allowed)
+   * @return true on success, otherwise false
+   */
+  bool          addLayer(const QString &name, LayerType layerType);
+  bool          contains(const QString &name, LayerType layerType) const;
+  MapLayer      getLayer(const QString &name) const;
+  bool          removeLayer(const QString &name);  // layername has to be unique
+  int           count() const;
+  int           count(LayerType layerType) const;
+
+  /**
+   * @brief Order layer according new list
+   * @param orderedLayernamesReq requested new order
+   * @param bRequestedOrderIsValid if set just a check will be performed. The result bool contains the check result.
+   * @return true on success, otherwise false
+   */
+  bool          orderLayerTo(const QStringList &orderedLayernamesReq, bool *bRequestedOrderIsValid = nullptr);
+
+
+  QStringList   layerNamesOrdered() const;
+  QStringList   layerNamesOrdered(LayerType layerType) const;
+
+
+protected:
+  QStringList         layernamesOfType(const QStringList &layernames, LayerType layerType);
+  QStringList         layernamesOfTypeOther(const QStringList &layernames);
+  QList<MapLayer>     m_mapLayerList;    ///< using logical layernames
+};
+
+
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.cpp
new file mode 100755
index 000000000..eb8e80586
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.cpp
@@ -0,0 +1,429 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "measurement_impl.h"
+#include "layer_factory_impl.h"
+#include "coord_translation_functor_impl.h"
+#include "Rubberbands/rubberband_factory.h"
+#include "Rubberbands/rubberband_multi_point_feature.h"
+
+#include "Map/object_factory.h"
+#include "MapObjects/polyline.h"
+#include "MapObjects/geo_image.h"
+#include "MapObjects/text.h"
+#include "MapImpl/abstract_map_object_impl.h"
+
+
+// Esri
+#include <GraphicsOverlay.h>
+#include <GeometryEngine.h>
+#include <GeodeticDistanceResult.h>
+#include <Point.h>
+#include <AngularUnit.h>
+#include <LinearUnit.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+
+class MeasurementImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SituationMap::MapImpl                          *m_mapImpl       = nullptr;
+  QString                                         m_toolsLayername;
+  QColor                                          m_color         = Qt::magenta;
+  Esri::ArcGISRuntime::GraphicsOverlay           *m_graphicsLayer = nullptr;
+
+  QPointer<RB::RubberbandMultiPointFeature>       m_rubberband;
+
+  QVector<Point3D>                                m_coordsGeo;
+  QVector<Point3D>                                m_coordsMap;
+
+  QVector<double>                                 m_lengthPerSegment;
+  double                                          m_totalLength = 0;
+
+  RefPointer<Polyline>                            m_polyline;
+  QVector<RefPointer<GeoImage>>                   m_markerCont;
+  RefPointer<Text>                                m_textTotalLength;
+
+  void resizeMarkerCont(int newSize)
+  {
+    if (newSize < 1)
+      return;
+
+    // increase
+    if (m_markerCont.size() < newSize)
+    {
+      m_markerCont.resize(newSize);
+      return;
+    }
+
+    // decrease
+    while (m_markerCont.size() > newSize)
+    {
+      // do not call 'takeLast' on empty container. But since newSize is >= 0...
+      RefPointer<GeoImage> item = m_markerCont.takeLast();
+      item->removeMySelf();
+    }
+  }
+
+
+}; // class MeasurementImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class MeasurementImpl
+//-----------------------------------------------------------------------------
+MeasurementImpl::MeasurementImpl(SituationMap::MapImpl *mapImpl)
+  : Measurement()
+  , QObject()
+  , m_logger(getLogger("MeasurementImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mapImpl = mapImpl;
+  init();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MeasurementImpl::~MeasurementImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->clear();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+long MeasurementImpl::measureLength()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // cleanup old
+  clear();
+
+  startRubberband();
+
+  return -1;
+}
+
+bool MeasurementImpl::startRubberband()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // verify mapReady
+  if (!d->m_mapImpl || !d->m_mapImpl->isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Failure - map is not ready yet!!!";
+    return false;
+  }
+
+  RB::RubberbandMultiPointFeature *rubberband = this->createRubberband();
+  if (!rubberband)
+    return false;
+
+  d->m_rubberband = rubberband;
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &MeasurementImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::interimResultsChanged, this, &MeasurementImpl::onRbInterimResultsChanged, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &MeasurementImpl::onRbApply, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::RubberbandMultiPointFeature::currentCursorPositionChanged, this, &MeasurementImpl::onCurrentCursorPositionChanged, Qt::UniqueConnection);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+
+void MeasurementImpl::clear()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_coordsGeo.clear();
+  d->m_coordsMap.clear();
+  d->m_lengthPerSegment.clear();
+  d->m_totalLength = 0;
+
+  if (d->m_polyline)
+    d->m_polyline->removeMySelf();
+  d->m_polyline.reset();
+
+  QMutableVectorIterator<RefPointer<GeoImage>> it(d->m_markerCont);
+  while (it.hasNext())
+  {
+    RefPointer<GeoImage> &marker = it.next();
+    if (marker)
+      marker->removeMySelf();
+  }
+  d->m_markerCont.clear();
+
+  if (d->m_textTotalLength)
+    d->m_textTotalLength->removeMySelf();
+  d->m_textTotalLength.reset();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool MeasurementImpl::displayPolyline()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_coordsGeo.size() < 2)
+    return false;
+
+  // create
+  if (!d->m_polyline)
+  {
+    d->m_polyline = d->m_mapImpl->objectFactory().create<Polyline>(d->m_toolsLayername,
+                                                                   QStringLiteral("MeasurementPolyline"));
+    d->m_polyline->setLineStyle(LineStyle(d->m_color, 3));
+    d->m_polyline->setScaleEnable(true);
+    d->m_polyline->setPickable(false);
+  }
+
+  // apply data
+  d->m_polyline->setPositions(d->m_coordsGeo);
+  for (int segment = 0; segment < d->m_lengthPerSegment.size(); ++segment)
+  {
+    const int dist = std::round(d->m_lengthPerSegment[segment]);
+    d->m_polyline->setTextOnSegment(segment, QStringLiteral("%1m").arg(dist));
+    // OutlineColor/Width is not supported yet
+  } // for
+
+  // update
+  if (!d->m_polyline->updateView())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " polyline::updateView failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool MeasurementImpl::displayVertices()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const int size = d->m_coordsGeo.size();
+  if (size < 1)
+    return false;
+
+  d->resizeMarkerCont(size);
+
+  int idx = 0;
+  QMutableVectorIterator<RefPointer<GeoImage>> it(d->m_markerCont);
+
+  while (it.hasNext())
+  {
+    RefPointer<GeoImage> &marker = it.next();
+    if (!marker.valid())
+    {
+      marker = d->m_mapImpl->objectFactory().create<GeoImage>(d->m_toolsLayername,
+                                                              QStringLiteral("MeasurementMarker%1").arg(idx));
+      marker->setProxyMarker(MarkerSymbolType::Circle);
+      marker->setProxyMarkerColor(d->m_color);
+      marker->setProxyMarkerSize(7);
+      marker->setPickable(false);
+    }
+    marker->setOrigin(d->m_coordsGeo[idx]);
+
+    // update
+    if (!marker->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " marker::updateView failed";
+
+    ++idx;
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool MeasurementImpl::displayTotalLength()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->m_coordsGeo.size() < 2)
+    return false;
+
+  if (!d->m_textTotalLength.valid())
+  {
+    d->m_textTotalLength = d->m_mapImpl->objectFactory().create<Text>(d->m_toolsLayername,
+                                                                      QStringLiteral("MeasurementText"));
+    TextStyle ts = AbstractMapObjectImpl::defaultTextStyle();
+    ts.setTextColor(d->m_color);
+    ts.setBold(true);
+    ts.setSize(ts.size() * 1.5);
+    d->m_textTotalLength->setTextStyle(ts);
+  }
+  const int dist = std::round(d->m_totalLength);
+  d->m_textTotalLength->setIdentifier(QStringLiteral("%1m").arg(dist));
+  d->m_textTotalLength->setOrigin(d->m_coordsGeo.last());
+
+  // update
+  if (!d->m_textTotalLength->updateView())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " textTotalLength::updateView failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool MeasurementImpl::calculateLength(const QVector<Point3D> &mapCoords)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (mapCoords.size() < 2)
+    return false;
+
+  static Esri::ArcGISRuntime::GeometryEngine *gEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+  const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+  d->m_totalLength = 0;
+  d->m_lengthPerSegment.clear();
+  d->m_lengthPerSegment.resize(mapCoords.size() - 1);
+
+  QVectorIterator<Point3D> it(mapCoords);
+  int segment = 0;
+  while (it.hasNext())
+  {
+    const Point3D &mapCoord1 = it.next();
+    if (!it.hasNext())
+      break;
+    const Point3D &mapCoord2 = it.peekNext();
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " segment=" << segment;
+
+    Esri::ArcGISRuntime::Point geom1(mapCoord1.x(), mapCoord1.y(), mapCoord1.z(), sr);
+    Esri::ArcGISRuntime::Point geom2(mapCoord2.x(), mapCoord2.y(), mapCoord2.z(), sr);
+
+    //    const double distancePlanar   = gEngine->distance(geom1, geom2);
+    // gEngine->distance return wrong results, if Topographic.tpk is used. Most likly due to wkid.
+    // Use distanceGeodetic, that works (at least in 2D) for 32632, 3857
+    Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
+                                                            Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                            Esri::ArcGISRuntime::AngularUnit::degrees(),
+                                                            Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+
+
+    d->m_lengthPerSegment[segment] = geodeticDistanceResult.distance();
+    d->m_totalLength += geodeticDistanceResult.distance();
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " segment=" << segment
+                        << " -> m_totalLength = " << d->m_totalLength;
+    ++segment;
+  } // while
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " distancePlanar = " << d->m_totalLength;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void MeasurementImpl::onRbAbort(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  clear();
+  if (!rbnd)
+    return;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " rb abort";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void MeasurementImpl::onRbInterimResultsChanged(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+    return;
+
+  d->m_coordsMap = SituationMap::convert2D3D(rbnd->coordinateVector(RB::CoordinateSystem::Map));
+  d->m_coordsGeo = SituationMap::convert2D3D(rbnd->coordinateVector(RB::CoordinateSystem::Geo));
+
+  calculateLength(d->m_coordsMap);
+  displayTotalLength();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void MeasurementImpl::onRbApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+    return;
+
+  d->m_coordsMap = SituationMap::convert2D3D(rbnd->coordinateVector(RB::CoordinateSystem::Map));
+  d->m_coordsGeo = SituationMap::convert2D3D(rbnd->coordinateVector(RB::CoordinateSystem::Geo));
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " rb apply, d->m_coordsMap.size()=" << d->m_coordsMap.size();
+
+  calculateLength(d->m_coordsMap);
+  displayPolyline();
+  displayVertices();
+  displayTotalLength();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MeasurementImpl::onCurrentCursorPositionChanged(const Point3D &mapCoord)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " mapCoord = " << mapCoord;
+
+  d->m_coordsMap = SituationMap::convert2D3D(d->m_rubberband->coordinateVector(RB::CoordinateSystem::Map));
+  d->m_coordsGeo = SituationMap::convert2D3D(d->m_rubberband->coordinateVector(RB::CoordinateSystem::Geo));
+  // DEBUG_LOG(m_logger) << LOGFUNCTION << " rb apply, d->m_coordsMap.size()=" << d->m_coordsMap.size();
+
+  // append coord of current mouse position:
+  d->m_coordsMap += mapCoord;
+  const Point3D &geoCoord = d->m_mapImpl->coordTranslationFunctor()->mapToGeographic(mapCoord);
+  d->m_coordsGeo += geoCoord;
+
+  calculateLength(d->m_coordsMap);
+  displayPolyline();
+  displayVertices();
+  displayTotalLength();
+}
+
+void MeasurementImpl::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_graphicsLayer)
+  {
+    LayerFactoryImpl &layerFactory = d->m_mapImpl->layerFactoryImpl();
+
+    d->m_toolsLayername = layerFactory.toolLayer();
+    d->m_graphicsLayer = layerFactory.getGraphicsLayer(d->m_toolsLayername);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+RB::RubberbandMultiPointFeature *MeasurementImpl::createRubberband()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandMultiPointFeature *rubberband =
+    d->m_mapImpl->rubberbandFactory().create<RB::RubberbandMultiPointFeature>(this);
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+    return nullptr;
+  rubberband->setAutoDelete(true);
+  rubberband->enableClosed(false);
+  rubberband->minimumPointCount(2);
+  rubberband->maximumPointCount(11);
+//  rubberband->maximumLength(maxSegmentLength);
+  return rubberband;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.h
new file mode 100755
index 000000000..f05502861
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/measurement_impl.h
@@ -0,0 +1,66 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/measurement.h> // Interface
+#include "map_impl.h"
+#include "Rubberbands/rubberband_multi_point_feature.h"
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MeasurementImpl : public QObject, public virtual Measurement
+{
+  Q_OBJECT
+
+public:
+  explicit MeasurementImpl(SituationMap::MapImpl *mapImpl);
+  virtual ~MeasurementImpl();
+
+  MeasurementImpl(const MeasurementImpl &other)     = delete;
+  MeasurementImpl &operator=(MeasurementImpl &other) = delete;
+
+  long measureLength() override;
+  void clear() override;
+
+  bool displayPolyline();
+  bool displayVertices();
+  bool displayTotalLength();
+  bool calculateLength(const QVector<Point3D> &mapCoords);
+
+protected Q_SLOTS:
+  void onRbAbort(RB::RubberbandBase *rbnd);
+  void onRbInterimResultsChanged(RB::RubberbandBase *rbnd);
+  void onRbApply(RB::RubberbandBase *rbnd);
+  void onCurrentCursorPositionChanged(const Point3D &mapCoord);
+
+private:
+  void init();
+  bool startRubberband();
+  RB::RubberbandMultiPointFeature *createRubberband();
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.cpp
new file mode 100755
index 000000000..7e478d9cb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.cpp
@@ -0,0 +1,134 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ObjectContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "object_container_impl.h"
+
+namespace SituationMap
+{
+
+ObjectContainerCTC::ObjectContainerCTC(const QSharedPointer<IdGenerator> &idGenerator)
+  : BaseClass(idGenerator)
+  , m_logger(getLogger("ObjectContainerCTC"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ObjectContainerCTC::~ObjectContainerCTC()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ObjectContainer::UniqueObjectId ObjectContainerCTC::insertObject(ObjectContainer::Object *object)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  UniqueObjectId newId = m_idGenerator->getNextId();
+  m_map.insert(newId, RefPointer<Object>(object));
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " uniqueId = " << newId;
+  return newId;
+}
+
+ObjectContainer::UniqueObjectId ObjectContainerCTC::insertObject(ObjectContainer::Object *object, const ObjectContainer::UniqueObjectId &uid)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  
+  if ((uid >= m_idGenerator->nextFreeId()) || (INVALID_MAP_ID == uid) || containsObject(uid))
+  {
+    // uid is unvalid and can't be used. In this case insert the map object with a new id.
+    return insertObject(object);
+  }
+
+  m_map.insert(uid, RefPointer<Object>(object));
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+    << " uniqueId = " << uid;
+  return uid;
+}
+
+bool ObjectContainerCTC::removeObject(const ObjectContainer::UniqueObjectId &id)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " uniqueId = " << id;
+  bool success = (m_map.remove(id) == 1);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " uniqueId = " << id
+                      << " success = " << success;
+  return success;
+}
+
+void ObjectContainerCTC::clear()
+{
+  m_map.clear();
+}
+
+ObjectContainer::Object *ObjectContainerCTC::getObject(const ObjectContainer::UniqueObjectId &id) const
+{
+  auto it = m_map.constFind(id);
+  if (it == m_map.constEnd())
+    return nullptr;
+  RefPointer<Object> obj = it.value();
+  return obj.get();
+}
+
+QList<ObjectContainer::Object *> ObjectContainerCTC::getAllObjects() const
+{
+  QList<ObjectContainer::Object *> list;
+
+  QMapIterator< UniqueObjectId, RefPointer<Object> > it(m_map);
+  while (it.hasNext())
+  {
+    it.next();
+    const RefPointer<Object> &obj = it.value();
+    if (obj)
+      list.append(const_cast<ObjectContainer::Object *>(obj.get()));
+  } // while
+
+  return list;
+}
+
+QList<ObjectContainer::Object *> ObjectContainerCTC::getAllObjects(const std::type_index &type) const
+{
+  QList<ObjectContainer::Object *> list;
+
+  QMapIterator< UniqueObjectId, RefPointer<Object> > it(m_map);
+  while (it.hasNext())
+  {
+    it.next();
+    const RefPointer<Object> &obj = it.value();
+
+    // !!! get typ_index of object, not pointer to object: !!!
+    const Object *objGet = obj.get();
+    if (type == std::type_index(typeid(*objGet)))
+      list.append(const_cast<ObjectContainer::Object *>(objGet));
+  } // while
+
+  return list;
+}
+
+QList<ObjectContainer::UniqueObjectId> ObjectContainerCTC::getAllKeys() const
+{
+  return m_map.keys();
+}
+
+bool ObjectContainerCTC::containsObject(const ObjectContainer::UniqueObjectId &id) const
+{
+  return m_map.contains(id);
+}
+
+qint64 ObjectContainerCTC::countObjects() const
+{
+  return m_map.size();
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.h
new file mode 100755
index 000000000..af7dfa9e6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_container_impl.h
@@ -0,0 +1,105 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ObjectContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+
+// Own
+#include <Map/object_container.h>
+#include <Common/ref_pointer.h>
+#include <Common/situation_map_logging.h>
+
+
+// Qt
+#include <QMap>
+
+#include <typeindex>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The ObjectContainerCTC class implements the interface SituationMap::ObjectContainer.
+ * It is a map of UniqueMapId to MapObjects.
+ * It uses a external IdGenerator to generate a next UniqueMapId returned
+ * while inserting.
+ * For documentation of inherented methods, see interface class SituationMap::ObjectContainer.
+ */
+class SITUATIONMAP_EXPORT ObjectContainerCTC : public ObjectContainer
+{
+
+  using BaseClass = ObjectContainer;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  /**
+   * @brief ObjectContainerCTC.
+   * @param idGenerator to be used
+   * (can be shared among different ObjectContainer instances).
+   */
+  explicit ObjectContainerCTC(const QSharedPointer<IdGenerator> &idGenerator);
+  virtual ~ObjectContainerCTC();
+  //@}
+
+  /*! \name Insert, Remove, Clear */
+  //@{
+
+  virtual UniqueObjectId insertObject( Object *object )                             override;
+  virtual UniqueObjectId insertObject( ObjectContainer::Object *object
+                                     , const ObjectContainer::UniqueObjectId &uid ) override;
+  virtual bool           removeObject( const UniqueObjectId &id )                   override;
+
+  virtual void clear()                                                              override;
+  //@}
+
+  /*! \name Access */
+  //@{
+  virtual QList<UniqueObjectId> getAllKeys()                                const override;
+
+  virtual Object                *getObject(const UniqueObjectId &id)        const override;    // Returns pointer to object
+  virtual QList<Object *>        getAllObjects()                            const override;
+  virtual QList<Object *>        getAllObjects(const std::type_index &type) const override; // without template
+
+  QMutableMapIterator<UniqueObjectId, RefPointer<Object>> mutableIterator() override
+  {
+    return QMutableMapIterator<UniqueObjectId, RefPointer<Object>> (m_map);
+  }
+
+  //@}
+
+
+  /*! \name Check */
+  //@{
+  virtual bool           containsObject(const UniqueObjectId &id)   const override;
+  //@}
+
+
+
+  /*! \name Count */
+  //@{
+  /**
+   * @brief Number of objects.
+   * @return Current number of objects.
+   */
+  virtual qint64         countObjects()                               const override;
+  //@}
+
+  QMap<UniqueObjectId, RefPointer<Object> >   m_map;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.cpp
new file mode 100755
index 000000000..b0674c087
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.cpp
@@ -0,0 +1,517 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ObjectIndicator
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "object_indicator_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/bounding_box.h>
+#include <Map/object_factory.h>
+#include <MapImpl/abstract_map_object_impl.h>
+#include <ElevationMap/elevation_map_manager.h>
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <MapGraphicsView.h>
+#include <SceneGraphicsView.h>
+
+
+// Qt
+#include <QGraphicsView>
+
+
+#include <cassert>
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ObjectIndicatorImpl
+//-----------------------------------------------------------------------------
+ObjectIndicatorImpl::ObjectIndicatorImpl()
+  : BaseClass()
+  , m_logger(getLogger("ObjectIndicatorImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_markerSize     = 15;        // size of filled circle at the origin (indicating the center of the map)
+  m_lineWidth      = 3;         // lineWidth of (dashed) line from origin to target
+
+  // updateTimer:
+  m_updateTimer = new QTimer(this);
+  m_updateTimer->setSingleShot(true);
+  m_updateTimer->setInterval(100);
+  connect(m_updateTimer, &QTimer::timeout, this, &ObjectIndicatorImpl::updateImpl);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool ObjectIndicatorImpl::init(MapImpl *mapImpl)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_mapImpl = mapImpl;
+
+  if (!m_mapImpl)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_map_impl is nullptr, init failed";
+    return false;
+  }
+
+  // to ensure graceful shutdown: (remove QGraphicsItems BEFORE qGraphicsScene/qGraphicsView is destroyed:
+  connect(m_mapImpl, &Map::beginDestroy, this, &ObjectIndicatorImpl::onMapDestroyed, Qt::UniqueConnection);
+
+  m_qGraphicsView  = static_cast<QGraphicsView *>(m_mapImpl->getEsriQGraphicsView());
+  if (m_qGraphicsView)
+    m_qGraphicsScene = m_qGraphicsView->scene();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+ObjectIndicatorImpl::~ObjectIndicatorImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  remove();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+UniqueMapId ObjectIndicatorImpl::mapObjectToPointTo()
+{
+  return m_uniqueIdToPointTo;
+}
+
+void ObjectIndicatorImpl::setMapObjectToPointTo(const UniqueMapId &newUniqueId, bool setSelected, int lifetimeMsec)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, newUniqueId = " << newUniqueId
+                      << ", (old m_uniqueIdToPointTo = " << m_uniqueIdToPointTo
+                      << ", lifetimeMsec=" << lifetimeMsec;
+
+  m_targetGeo2D = QPointF();
+
+  connect(m_mapImpl, &MapImpl::extentChangedDelayed,
+          this, &ObjectIndicatorImpl::update, Qt::UniqueConnection);
+
+  if (m_uniqueIdToPointTo != newUniqueId)
+  {
+    addRemoveCallback(m_uniqueIdToPointTo, AddRemove::Remove);
+    m_uniqueIdToPointTo = newUniqueId;
+    addRemoveCallback(m_uniqueIdToPointTo, AddRemove::Add);
+  }
+
+  update();
+
+  if (m_lifetimeTimer)
+    m_lifetimeTimer->stop();
+
+  if (lifetimeMsec > 1)
+  {
+    if (!m_lifetimeTimer)
+    {
+      m_lifetimeTimer = new QTimer(this);
+      m_lifetimeTimer->setSingleShot(true);
+      connect(m_lifetimeTimer.data(), &QTimer::timeout, this, &ObjectIndicatorImpl::remove); // lifetime expired
+    }
+    m_lifetimeTimer->setInterval(lifetimeMsec);
+    m_lifetimeTimer->start();
+  }
+
+  m_setSelected = setSelected;
+  if (m_setSelected)
+    setMapObjectSelected(m_setSelected);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, newUniqueId = " << newUniqueId;
+}
+
+void ObjectIndicatorImpl::setPointToPointTo(const QPointF &targetGeo, int lifetimeMsec)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, targetGeo = " << targetGeo
+                      << ", lifetimeMsec=" << lifetimeMsec;
+
+  connect(m_mapImpl, &MapImpl::extentChangedDelayed,
+          this, &ObjectIndicatorImpl::update, Qt::UniqueConnection);
+
+  clearCurrentSelection();
+
+  addRemoveCallback(m_uniqueIdToPointTo, AddRemove::Remove);
+  m_uniqueIdToPointTo = INVALID_MAP_ID;
+  m_targetGeo2D = targetGeo;
+
+  update();
+
+  if (m_lifetimeTimer)
+    m_lifetimeTimer->stop();
+
+  if (lifetimeMsec > 1)
+  {
+    if (!m_lifetimeTimer)
+    {
+      m_lifetimeTimer = new QTimer(this);
+      m_lifetimeTimer->setSingleShot(true);
+      connect(m_lifetimeTimer.data(), &QTimer::timeout, this, &ObjectIndicatorImpl::remove); // lifetime expired
+    }
+    m_lifetimeTimer->setInterval(lifetimeMsec);
+    m_lifetimeTimer->start();
+  }
+}
+
+void ObjectIndicatorImpl::clearCurrentSelection()
+{
+  ObjectContainer &objCont = m_mapImpl->objectContainer();
+  const QList<ObjectContainer::Object*> &allObj = objCont.getAllObjects();
+
+  for (ObjectContainer::Object* mapObj : allObj)
+  {
+    if (!mapObj)
+      continue;
+    if (!mapObj->selected())
+      continue;
+    mapObj->setSelected(false);
+    mapObj->updateView();
+  }
+}
+
+bool ObjectIndicatorImpl::update()
+{
+  if (!m_updateTimer)
+    return false;
+  m_updateTimer->start();  // start is restart
+  return true;
+}
+
+bool ObjectIndicatorImpl::updateImpl()
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_uniqueIdToPointTo = " << m_uniqueIdToPointTo;
+
+  if (!m_qGraphicsView)
+    return false;
+  if (!m_qGraphicsScene)
+    return false;
+
+  if (!SituationMap::isUniqueMapIdValid(m_uniqueIdToPointTo) && m_targetGeo2D.isNull())
+    return false;
+
+
+  //
+  // Line:
+  //
+  Point3D targetGeo;
+  QColor color = m_defaultColor;
+
+
+  // center:
+  bool targetIsValid = false;
+  if (!m_targetGeo2D.isNull())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " target: m_targetGeo2D= " << m_targetGeo2D;
+    targetGeo = Point3D::fromQPointF(m_targetGeo2D);
+    targetIsValid = true;
+  } else {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " target: m_uniqueIdToPointTo= " << m_uniqueIdToPointTo;
+    if (!SituationMap::isUniqueMapIdValid(m_uniqueIdToPointTo))
+      return false;
+    targetIsValid = centerOfTarget(targetGeo, color);
+  }
+
+
+  QRectF rect = m_qGraphicsScene->sceneRect();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " rect: " << rect;
+
+  QBrush brush(color, Qt::SolidPattern);
+  QPen pen(brush, m_lineWidth, Qt::DashLine);
+
+  QPointF targetSceneCoordinate;
+  if (targetIsValid)
+  {
+    if (m_mapImpl->getElevationMapManager())
+    {
+      const double ele = m_mapImpl->getElevationMapManager()->elevation(targetGeo.x(), targetGeo.y());
+      targetGeo.rz() += ele; // targetGeo should contain an absolute z-value
+    }
+    QPointF targetWindowCoord = m_mapImpl->geoCoordinateToViewPortWindowPoint3D(targetGeo);
+    targetSceneCoordinate = m_qGraphicsView->mapToScene(targetWindowCoord.toPoint());
+    if (targetSceneCoordinate.isNull())
+    {
+      INFO_LOG(m_logger) << LOGFUNCTION << " targetSceneCoordinate invisible!!!?";
+      targetSceneCoordinate = rect.center();
+    }
+
+    QLineF lineData(rect.center(), targetSceneCoordinate);
+    if (!m_qGraphicsLine)
+      m_qGraphicsLine = m_qGraphicsScene->addLine(lineData, pen);
+    m_qGraphicsLine->setLine(lineData);
+    m_qGraphicsLine->setPen(pen);
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << ", rect.center() " << rect.center()
+                        << ", bCenterOfTarget " << targetIsValid
+                        << ", targetGeo:" << targetGeo
+                        << ", targetSceneCoordinate " << targetSceneCoordinate;
+  }
+  else
+  {
+    delete m_qGraphicsLine;
+    m_qGraphicsLine = nullptr;
+    targetSceneCoordinate = rect.center();
+  }
+
+  //
+  // ArrowTip:
+  //
+  m_arrowTip = QPixmap::fromImage(renderArrowHeadSymbol(color, 30, 10));
+
+  if (!m_qGraphicsArrowTip)
+  {
+    m_qGraphicsArrowTip = m_qGraphicsScene->addPixmap(m_arrowTip);
+    m_qGraphicsArrowTip->setOffset(m_arrowTip.width() / -2.0, 0);
+  }
+  m_qGraphicsArrowTip->setPixmap(m_arrowTip);
+  m_qGraphicsArrowTip->setPos(targetSceneCoordinate);
+
+  const double lineAngle   = MathUtils::getAngleDegreeNorth(targetSceneCoordinate, rect.center());
+
+  const double angle = 360.0 - (lineAngle);
+  DEBUG_LOG(m_logger) << LOGFUNCTION << ", lineAngle " << lineAngle
+                      << ", angle " << angle;
+
+  // Sets the clockwise rotation angle, in degrees, around the Z axis.
+  m_qGraphicsArrowTip->setRotation(angle);
+
+  //
+  // centerMarker:
+  //
+  rect = QRect(rect.center().x() - m_markerSize * 0.5, rect.center().y() - m_markerSize * 0.5,
+               m_markerSize, m_markerSize);
+
+  if (!m_qGraphicsCenterMarker)
+    m_qGraphicsCenterMarker = m_qGraphicsScene->addEllipse(rect, pen, brush);
+  m_qGraphicsCenterMarker->setRect(rect);
+  m_qGraphicsCenterMarker->setPen(QPen(color, Qt::DashLine));
+  m_qGraphicsCenterMarker->setBrush(brush);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void ObjectIndicatorImpl::onMapDestroyed()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  remove();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AbstractMapObjectImpl *ObjectIndicatorImpl::getObject(const UniqueMapId &uniqueId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueId = " << uniqueId;
+
+  if (!SituationMap::isUniqueMapIdValid(uniqueId))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueId invalid: " << uniqueId;
+    return nullptr;
+  }
+
+  if (!m_mapImpl->objectFactory().contains(uniqueId))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_uniqueIdToPointTo not found: " << m_uniqueIdToPointTo;
+    return nullptr;
+  }
+
+  AbstractMapObjectImpl *impl = dynamic_cast<AbstractMapObjectImpl *>(m_mapImpl->objectFactory().idToMapObject(uniqueId));
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueId = " << uniqueId;
+  return impl;
+}
+
+bool ObjectIndicatorImpl::addRemoveCallback(const UniqueMapId &uniqueId, AddRemove addRemove)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueId = " << uniqueId
+                      << " addRemove = " << (int)addRemove;
+
+  if (!SituationMap::isUniqueMapIdValid(uniqueId))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueId invalid: " << uniqueId;
+    return false;
+  }
+
+  AbstractMapObjectImpl *impl = getObject(uniqueId);
+
+  if (!impl)
+    return false;
+
+  const QString &objToPointToDebugInfo = impl->debugInfo();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " uniqueId is valid, uniqueId=" << uniqueId
+                      << ", (objToPointToDebugInfo=" << objToPointToDebugInfo << ")";
+
+  if (addRemove == AddRemove::Add)
+    impl->addChangedCallback(this);
+  else
+    impl->removeChangedCallback(this);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueId = " << uniqueId
+                      << ", addRemove = " << (int)addRemove;
+  return true;
+}
+
+void ObjectIndicatorImpl::remove()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_uniqueIdToPointTo=" << m_uniqueIdToPointTo;
+  disconnect(this);
+
+  if (m_updateTimer)
+    m_updateTimer->stop();
+
+  addRemoveCallback(m_uniqueIdToPointTo, AddRemove::Remove);
+
+  // if we set the object selected, remove selection
+  if (m_setSelected)
+    setMapObjectSelected(false);
+
+  m_uniqueIdToPointTo = INVALID_MAP_ID;
+  m_targetGeo2D = QPointF();
+  delete m_qGraphicsCenterMarker;
+  delete m_qGraphicsLine;
+  delete m_qGraphicsArrowTip;
+
+  m_qGraphicsCenterMarker = nullptr;
+  m_qGraphicsLine = nullptr;
+  m_qGraphicsArrowTip = nullptr;
+
+  updateImpl();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, m_uniqueIdToPointTo=" << m_uniqueIdToPointTo;
+}
+
+void ObjectIndicatorImpl::onOriginPositionChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " update...";
+  update();
+}
+
+bool ObjectIndicatorImpl::centerOfTarget(Point3D &objCenterPoint, QColor &objColor)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  //
+  // point to desired obj:
+  //
+  RefPointer<AbstractMapObject> objToPointTo;
+  if (!SituationMap::isUniqueMapIdValid(m_uniqueIdToPointTo))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_uniqueIdToPointTo invalid: " << m_uniqueIdToPointTo;
+    return false;
+  }
+
+  if (!m_mapImpl->objectFactory().contains(m_uniqueIdToPointTo))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_uniqueIdToPointTo not found: " << m_uniqueIdToPointTo;
+    return false;
+  }
+
+  objToPointTo = m_mapImpl->objectFactory().get(m_uniqueIdToPointTo);
+
+  // retrive values from objToPointTo:
+
+  if (!objToPointTo.valid())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " objToPointTo not found";
+    return false;
+  }
+
+  AbstractMapObjectImpl *impl = dynamic_cast<AbstractMapObjectImpl *>(objToPointTo.get());
+  if (!impl)
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " dynamic_cast failed";
+    return false;
+  }
+
+  // get target position:
+  BoundingBox bbox;
+  objToPointTo->boundingBox(bbox);
+  if (!bbox.isValid())
+    WARNING_LOG(m_logger) << LOGFUNCTION << " boundingBox not valid: bbox = " << bbox;
+
+  const QString &objToPointToDebugInfo = objToPointTo->debugInfo();
+  DEBUG_LOG(m_logger) << LOGFUNCTION
+                      << ", objToPointTo is valid, uniqueIdToPointTo = " << m_uniqueIdToPointTo
+                      << ", (objToPointToDebugInfo = " << objToPointToDebugInfo << ")"
+                      << ", bbox= " << bbox;
+
+
+  objCenterPoint = bbox.center();
+
+  // objColor:
+  objColor = impl->majorColor();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+QImage ObjectIndicatorImpl::renderArrowHeadSymbol(const QColor &color, int length, int halfWidth)
+{
+  int width = halfWidth * 2;
+  QImage image(width, length, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+  painter.setRenderHints(QPainter::Antialiasing);
+
+  QPen pen(color);
+  pen.setWidth(2);
+  painter.setPen(pen);
+
+  painter.setBrush(QBrush(color, Qt::BrushStyle::SolidPattern));
+
+  //   2 ||
+  //    |  |
+  // 1 |    | 3
+
+  QPolygon poly;
+  poly.reserve(3);
+  poly.append(QPoint(0, length));
+  poly.append(QPoint(halfWidth, 0));
+  poly.append(QPoint(width, length));
+
+  painter.drawPolygon(poly);
+
+  painter.end();
+
+  //  image.save(QLatin1String("/tmp/Arrow.png"));
+  return image;
+}
+
+bool ObjectIndicatorImpl::setMapObjectSelected(bool selected)
+{
+  // 'clear' current selection:
+  clearCurrentSelection();
+
+  if (!selected)
+    return true;    // already done by clearCurrentSelection :-)
+
+  if (!SituationMap::isUniqueMapIdValid(m_uniqueIdToPointTo))
+    return false;
+
+  RefPointer<AbstractMapObject> objToPointTo = m_mapImpl->objectFactory().get(m_uniqueIdToPointTo);
+  // retrive values from objToPointTo:
+  if (!objToPointTo.valid())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " objToPointTo not found";
+    return false;
+  }
+  AbstractMapObjectImpl *impl = dynamic_cast<AbstractMapObjectImpl *>(objToPointTo.get());
+  if (!impl)
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " dynamic_cast failed";
+    return false;
+  }
+
+  if (impl->selected() == selected)
+    return true;
+  impl->setSelected(selected);
+  return impl->updateView();
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.h
new file mode 100755
index 000000000..bec24f27d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/object_indicator_impl.h
@@ -0,0 +1,114 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ObjectIndicator
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/object_indicator.h> // Interface
+#include <MapImpl/map_impl.h>
+#include <MapImpl/abstract_map_object_impl.h>  // OriginPositionChangedCallback
+
+
+// Qt
+#include <QTimer>
+#include <QString>
+#include <QColor>
+#include <QPointF>
+#include <QGraphicsEllipseItem>
+#include <QGraphicsLineItem>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The ObjectIndicatorImpl can be used to ease the locating of an object.
+ * The ObjectIndicatorImpl can by parametrized with just the UniqueMapId to point to.
+ * update() will do the rest for you:
+ * - retrieve the object to point to,
+ * - get the bounding box of that object and
+ * - create an indicator from the current center of the map to the object.
+ * \note <b> If the object to point to disappears, you are responsible for removing the ObjectIndicatorImpl! </b>
+ */
+class SITUATIONMAP_EXPORT ObjectIndicatorImpl final : public QObject, public virtual ObjectIndicator, public virtual OriginPositionChangedCallback
+{
+  Q_OBJECT
+
+  using BaseClass = QObject;
+
+protected:
+  explicit ObjectIndicatorImpl();
+  virtual ~ObjectIndicatorImpl();
+
+public:
+  ObjectIndicatorImpl(const ObjectIndicatorImpl &other)      = delete;
+  ObjectIndicatorImpl &operator=(ObjectIndicatorImpl &other) = delete;
+
+  UniqueMapId mapObjectToPointTo() override;
+  void setMapObjectToPointTo(const UniqueMapId &newUniqueId, bool setSelected = false, int lifetimeMsec = -1) override;
+  void setPointToPointTo(const QPointF &targetGeo, int lifetimeMsec = -1) override;
+
+  void clearCurrentSelection();
+
+protected Q_SLOTS:
+  void remove() override;
+  bool update();
+  bool updateImpl();
+  void onMapDestroyed();
+
+protected:
+
+  enum class AddRemove
+  {
+    Add,
+    Remove
+  };
+
+  AbstractMapObjectImpl *getObject(const UniqueMapId &uniqueId);
+  bool addRemoveCallback(const UniqueMapId &uniqueId, AddRemove addRemove);
+
+  void onOriginPositionChanged() override;
+
+  bool centerOfTarget(Point3D &objCenterPoint, QColor &objColor);
+  static QImage renderArrowHeadSymbol(const QColor &color, int length, int halfWidth);
+
+  bool setMapObjectSelected(bool selected);
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl);
+
+  // internal/admin
+  MapImpl                                      *m_mapImpl{nullptr};
+  QGraphicsView                                *m_qGraphicsView{nullptr};
+  QGraphicsScene                               *m_qGraphicsScene{nullptr};
+
+  QGraphicsEllipseItem                         *m_qGraphicsCenterMarker{nullptr};
+  QGraphicsLineItem                            *m_qGraphicsLine{nullptr};
+  QPixmap                                       m_arrowTip;
+  QGraphicsPixmapItem                          *m_qGraphicsArrowTip{nullptr};
+
+  QColor                                        m_defaultColor{Qt::magenta};
+  int                                           m_markerSize{1};
+  int                                           m_lineWidth{1};
+
+  QTimer                                       *m_updateTimer{nullptr};
+  QPointer<QTimer>                              m_lifetimeTimer;
+
+  // logical
+  UniqueMapId                                   m_uniqueIdToPointTo{INVALID_MAP_ID};  // target to pointTo, #1
+  bool                                          m_setSelected{false};
+  QPointF                                       m_targetGeo2D;                        // target to pointTo, #2
+
+  LOGGER_T                                      m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.cpp
new file mode 100755
index 000000000..2624ba2e2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.cpp
@@ -0,0 +1,644 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AbstractMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "overlay_handler_impl.h"
+#include <Map/map.h>
+#include <Map/layer_factory.h>
+#include <Map/layer_parameter.h>
+#include <Map/pixel_based_textbox_handler.h>
+#include <Map/situation_map_utils.h>
+#include <GeometryModel/geometry_model_factory.h>
+#include <GeometryModel/geometry_pixelTextBox.h>
+#include "geometry_model_renderer_esri.h"
+
+#include <QFile>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+OverlayHandler *OverlayHandler::create(Map *map)
+{
+  return new OverlayHandlerImpl(map);
+}
+
+
+static const QLatin1String s_verlayLayerPrefix = QLatin1String("OverlayLayer_");
+
+
+class OverlayData
+{
+public:
+  ~OverlayData()
+  {
+    // graceful cleanup, destroy associated MapObject (adequate signal will be emitted)
+    if (m_geoModel)
+      m_geoModel->clearModel();
+
+    m_geoModelRenderer.clear();
+    m_geoModel.clear();
+    // : graceful cleanup
+  }
+
+  int                                     m_key = -1;
+  QString                                 m_logicalLayerName;
+  QString                                 m_technicalLayerName; // just for debugging purpose
+
+  QSharedPointer<GeometryModel>           m_geoModel;
+  QSharedPointer<GeometryModelRenderer>   m_geoModelRenderer;
+
+  bool init(Map *map)
+  {
+    if (m_logicalLayerName.isEmpty())
+      return false;
+
+    m_geoModel = QSharedPointer<GeometryModel>(SituationMap::GeometryModelFactory::singleton()->create());
+
+    m_geoModelRenderer =
+      QSharedPointer<GeometryModelRenderer>(map->createGeometryModelRenderer(m_logicalLayerName, m_geoModel.data()));
+    m_geoModelRenderer->setNodesPickable(false); // we just want to display the overlay, no picking
+
+    return !m_geoModelRenderer.isNull();
+  }
+
+  QString toString() const
+  {
+    QString str;
+    str.append(QStringLiteral("m_key=%1").arg(m_key));
+    str.append(QStringLiteral(" m_logicalLayerName='%1'").arg(m_logicalLayerName));
+    str.append(QStringLiteral(" m_technicalLayerName='%1'").arg(m_technicalLayerName));
+    return str;
+  }
+};
+
+
+
+//-----------------------------------------------------------------------------
+class OverlayHandlerImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  Map                                    *m_map = nullptr;
+
+private:
+  QMap<int, QSharedPointer<OverlayData>>  m_overlayCont;
+
+public:
+  QSharedPointer<OverlayData> &getOverlayData(int key)
+  {
+    if (m_overlayCont[key].isNull())
+      m_overlayCont[key] = QSharedPointer<OverlayData>(new OverlayData());
+    return m_overlayCont[key];
+  }
+
+  int remove(int key)    { return m_overlayCont.remove(key);    }
+  void clear()           { m_overlayCont.clear();               }
+  int size()             { return m_overlayCont.size();         }
+  QList<int> keys()      { return m_overlayCont.keys();         }
+  bool contains(int key) { return m_overlayCont.contains(key);  }
+
+  QMutableMapIterator<int, QSharedPointer<OverlayData>> mutableIterator()
+  {
+    return QMutableMapIterator<int, QSharedPointer<OverlayData>> (m_overlayCont);
+  }
+
+
+}; // class OverlayHandlerImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+OverlayHandlerImpl::OverlayHandlerImpl(Map *map)
+  : BaseClass()
+  , m_logger(getLogger("OverlayHandlerImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_map = map;
+
+  if (! d->m_map)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error no Map ";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+OverlayHandlerImpl::~OverlayHandlerImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString OverlayHandlerImpl::toString() const
+{
+  QString str(QLatin1String("OverlayHandlerImpl"));
+  str.append(QStringLiteral(" m_overlayCont.size=%1").arg(d->size()));
+  return str;
+}
+
+bool OverlayHandlerImpl::setOverlay(int key, const QString &name, const QByteArray &overlayContent, bool isSnapshot)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " key=" << key
+                      << " name='" << name << "'"
+                      << " overlayContent.size()='" << overlayContent.size()
+                      << " isSnapshot=" << isSnapshot;
+  if (! d->m_map)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error, no Map " << " key=" << key;
+    return false;
+  }
+
+  const bool contains = d->contains(key);
+
+  // data:
+  QSharedPointer<OverlayData> overlayData;
+
+  // create or update?
+  if (contains)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " Current11 SnaphotOverlay" << d->m_map->layerFactory().layerParameter(QStringLiteral("SnaphotOverlay"));
+    overlayData = d->getOverlayData(key);
+
+    // already created, but update displayname:
+    if (! d->m_map->layerFactory().addOverlayLayer(overlayData->m_logicalLayerName, name, isSnapshot))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " error on addOverlayLayer" << " key=" << key;
+      TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key;
+      return false;
+    }
+  }
+  else
+  {
+    DEBUG_LOG(m_logger) << " CurrentAA SnaphotOverlay" << d->m_map->layerFactory().layerParameter(QStringLiteral("SnaphotOverlay"));
+
+    overlayData = QSharedPointer<OverlayData>(new OverlayData());
+    // case 'create' -> create layer:
+    overlayData->m_key = key;
+
+    if (isSnapshot)
+      overlayData->m_logicalLayerName = d->m_map->layerFactory().snapshotOverlayLayername();
+    else
+      overlayData->m_logicalLayerName = QString(s_verlayLayerPrefix) + QString::number(key);
+
+    if (! d->m_map->layerFactory().addOverlayLayer(overlayData->m_logicalLayerName, name, isSnapshot))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " error on addOverlayLayer" << " key=" << key;
+      TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key;
+      return false;
+    }
+    // LayerFactory will make sure the technical layer is created.
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " key=" << key << " overlayData init...";
+
+    if (! overlayData->init(d->m_map))
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " error on init" << " key=" << key;
+      d->m_map->layerFactory().removeOverlayLayer(overlayData->m_logicalLayerName);
+      TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key;
+      return false;
+    }
+  } // if (contains)
+
+
+  bool success = false;
+
+  if (overlayContent.isEmpty())
+  {
+    // in case of restoring the OperatorMapSettings / toggle 2D<->3D)
+    // prepare layer WITHOUNT content
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " END, overlayContent is empty, so just be prepared"
+                        << ", key=" << key
+                        << ", isSnapshot=" << isSnapshot;
+    success = true;
+  } else {
+
+    if (overlayData->m_geoModel && overlayData->m_geoModelRenderer)
+    {
+      if (!overlayData->m_geoModel->fromByteArray(overlayContent))
+      {
+        // overlayContent string is not a valid geoModel -> abort
+        ERROR_LOG(m_logger) << LOGFUNCTION << " error on fromString," << " key=" << key;
+        if (!d->m_map->layerFactory().removeOverlayLayer(overlayData->m_logicalLayerName))
+        {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " removeOverlayLayer failed," << " key=" << key;
+        }
+        TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key;
+        return false;
+      }
+      // overlayData->m_geoModel->cleanModel(true);  has been done in GeometryModel::fromString
+
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " key=" << key << " render...";
+
+      if (overlayData->m_geoModelRenderer->render())
+      {
+        success = true;
+      }
+      else
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " error on render" << " key=" << key;
+      }
+    }
+  } // if (overlayContent.isEmpty())
+
+  if (success)
+  {
+    // add temporary data to internal map:
+    if (!contains)
+      d->getOverlayData(key) = overlayData;
+    //INFO_LOG(m_logger) << LOGFUNCTION << " olData=" << d->getOverlayData(key).data()->toString();
+  } 
+  else 
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " removeOverlayLayer" << " key=" << key
+                        << ",  m_logicalLayerName " << overlayData->m_logicalLayerName;
+    d->m_map->layerFactory().removeOverlayLayer(overlayData->m_logicalLayerName);
+  }
+
+  //
+  const QString &strRef =
+      overlayData->m_geoModel->getModelAttribute(SituationMap::GeometryModel::Attribute::MetaPixelBasedTextBoxes).toString();
+  const QVector<SituationMap::PixelTextBoxData> &ptbdCont =
+      SituationMap::PixelTextBoxData::pixelTextBoxContainerFromJsonStr(strRef);
+
+  PixelBasedTextBoxHandler &pixelBasedTextBoxHandler = d->m_map->pixelBasedTextBoxHandler();
+  // cleanup:
+  const int parentId = key; // key == fileId
+  pixelBasedTextBoxHandler.removeAllTextBoxesOfParent(parentId);
+
+  for (const SituationMap::PixelTextBoxData &ptbd : qAsConst(ptbdCont))
+  {
+    // create WITHIN loop, since it will be modified by createUpdateTextBox:
+    PBTB_ID pbtbId;
+    pbtbId.m_parentId = parentId;
+    QTextEdit *newTextEdit = pixelBasedTextBoxHandler.createTextBox(pbtbId, ptbd, false);
+
+    if (newTextEdit)
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " new TextBox created: newTextEdit = " << newTextEdit
+                          << ", pbtbId=" << pbtbId
+                          << ", ptbd=" << ptbd;
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " createUpdateTextBox failed"
+                          << ", pbtbId=" << pbtbId
+                          << ", ptbd=" << ptbd;
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key
+                      << ", size=" << d->size();
+  return success;
+}
+
+QByteArray OverlayHandlerImpl::content(int key) const
+{
+  if (!d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return QByteArray();
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  return overlayData->m_geoModel->toByteArray();
+}
+
+
+bool OverlayHandlerImpl::reorderOverlays(const QVector<int> &orderOfIds)
+{
+  QStringList layerOrder = d->m_map->layerFactory().layernames();
+
+  // Change the logical layer names in layerOrder list at all positions where a logical layer name has been map to an id ...
+  int idIndex = 0;
+  for (QStringList::iterator iter = layerOrder.begin(); layerOrder.end() != iter; ++iter)
+  {
+    QVector<int>::const_iterator orderIter = orderOfIds.cbegin();
+
+    // looking for the current logicalLayername in list of orderOfIds
+    while (orderOfIds.cend() != orderIter)
+    {
+      if (*iter == d->getOverlayData(*orderIter)->m_logicalLayerName)
+      {
+        // layer exists in orderOfIds lets change the order
+
+        *iter = d->getOverlayData(orderOfIds[idIndex])->m_logicalLayerName;  // set new layername for this position
+        ++idIndex;
+
+        break; // logical layer name is existing only once and we have changed the order hat this position, so we can leaf the while loop here
+      }
+      ++orderIter;
+    }
+  }
+
+  // ready now give the new layer order to layer factory
+  if (!d->m_map->layerFactory().orderLayerTo(layerOrder))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " orderLayerTo failed.";
+    return false;
+  }
+  return true;
+} // void OverlayHandlerImpl::reorderOverlays( const QVector<int> & orderOfIds )
+
+
+double OverlayHandlerImpl::minScale(int key) const
+{
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return -1.0;
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  return lp.minScale;
+}
+
+
+bool OverlayHandlerImpl::setMinScale(int key, double minScale)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " key=" << key << " minScale=" << minScale;
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return false;
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  lp.minScale = minScale;
+  if (! d->m_map->layerFactory().setLayerParameter(logicalLayername, lp))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error updating LayerParameter, key=" << key;
+    return false;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key << " minScale=" << minScale;
+  return true;
+}
+
+double OverlayHandlerImpl::maxScale(int key) const
+{
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return -1.0;
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  return lp.maxScale;
+}
+
+bool OverlayHandlerImpl::setMaxScale(int key, double maxScale)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " key=" << key << " maxScale=" << maxScale;
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return false;
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  lp.maxScale = maxScale;
+  if (! d->m_map->layerFactory().setLayerParameter(logicalLayername, lp))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error updating LayerParameter, key=" << key;
+    return false;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key << " maxScale=" << maxScale;
+  return true;
+}
+
+
+double OverlayHandlerImpl::opacity(int key) const
+{
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return 0.0;
+  }
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+
+  return double(lp.opacity) / 100.0;
+}
+
+
+bool OverlayHandlerImpl::setOpacity(int key, double opacity)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " key=" << key << " opacity=" << opacity;
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return false;
+  }
+
+  opacity = (opacity < 0.0) ? 0.0 : ((opacity > 1.0) ? 1.0 : opacity);
+
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+
+  lp.opacity = int(opacity * 100);
+
+  if (! d->m_map->layerFactory().setLayerParameter(logicalLayername, lp))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error on setLayerParameter" << " key=" << key;
+    return false;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " key=" << key << " opacity=" << opacity;
+  return true;
+}
+
+
+bool OverlayHandlerImpl::setOverlayVisibility(int key, bool visibility)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " key=" << key
+                      << " visibility=" << visibility;
+
+  // Lookup:
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+  INFO_LOG(m_logger) << LOGFUNCTION << " visibility of layer='" << logicalLayername << "'"
+                     << " key=" << key
+                     << " -> " << visibility;
+
+  if (logicalLayername.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername is empty, key=" << key << " unknown";
+    return false;
+  }
+
+  // Technical/Esri:
+  // get LayerParameter, update data and set:
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  lp.visible = visibility;
+  if (! d->m_map->layerFactory().setLayerParameter(logicalLayername, lp))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error on setLayerParameter" << " key=" << key;
+    return false;
+  }
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " key=" << key
+                      << " visibility=" << visibility;
+  return true;
+}
+
+
+bool OverlayHandlerImpl::overlayVisibility(int key) const
+{
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  const QString &logicalLayername = overlayData->m_logicalLayerName;
+
+  if (logicalLayername.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername is empty, key=" << key << " unknown";
+    return false;
+  }
+  LayerParameter lp = d->m_map->layerFactory().layerParameter(logicalLayername);
+  return lp.visible;
+} // bool OverlayHandlerImpl::overlayVisibility(const int &key)
+
+
+bool OverlayHandlerImpl::removeOverlay(int key)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " key=" << key;
+
+  if (! d->m_map)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error no Map " << " key=" << key;
+    return false;
+  }
+
+  if (! d->contains(key))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " key=" << key << " unknown";
+    return false;
+  }
+
+
+  // Lookup:
+  QSharedPointer<OverlayData> overlayData = d->getOverlayData(key);
+  QString logicalLayername = overlayData->m_logicalLayerName;  // create a copy here
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " remove layer='" << logicalLayername << "'"
+                      << " key=" << key;
+
+  if (logicalLayername.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " layername is empty, key=" << key;
+    return false;
+  }
+
+  // Own data management:
+
+  //
+  // FIRST:
+  //
+  // Remove own MapObject BEFORE the layer
+  d->remove(key);
+  overlayData.clear();  // to decrease QSharedPointer    <----- important
+
+  //
+  // SECOND:
+  //
+  // Technical/Esri:
+  if (!d->m_map->layerFactory().removeOverlayLayer(logicalLayername))
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " remove layer='" << logicalLayername << "'"
+                       << " key=" << key;
+    return false;
+  }
+
+  //
+  // Pixel-based TextBoxes:
+  //
+  PixelBasedTextBoxHandler &pixelBasedTextBoxHandler = d->m_map->pixelBasedTextBoxHandler();
+  const int parentId = key; // key == fileId
+  pixelBasedTextBoxHandler.removeAllTextBoxesOfParent(parentId);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " key=" << key;
+  return true;
+}
+
+int OverlayHandlerImpl::removeAllOverlays()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, current size = " << d->size();
+
+  int removed = 0;
+
+  const QList<int> &currentKeys = d->keys();
+  for (int key : currentKeys)
+  {
+    if (removeOverlay(key))
+      ++removed;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " removed = " << removed
+                      << " size now = " << d->size();
+  return removed;
+}
+
+
+int OverlayHandlerImpl::overlayCount() const
+{
+  return d->size();
+}
+
+QList<int> OverlayHandlerImpl::overlays() const
+{
+  return d->keys();
+}
+
+bool OverlayHandlerImpl::containsOverlay(int key) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->contains(key);
+}
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+std::ostream &operator<< (std::ostream   &stream,
+                          const OverlayHandlerImpl &value)
+{
+  stream << value.toString();
+  return stream;
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.h
new file mode 100755
index 000000000..4a90a58d5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overlay_handler_impl.h
@@ -0,0 +1,108 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AbstractMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/overlay_handler.h>
+#include <Common/situation_map_logging.h>
+#include "situation_map_export.h"
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SITUATIONMAP_EXPORT OverlayHandlerImpl : public OverlayHandler
+{
+  using BaseClass = SituationMap::OverlayHandler;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit OverlayHandlerImpl(Map *map);
+  ~OverlayHandlerImpl();
+
+  OverlayHandlerImpl(const OverlayHandlerImpl &other)     = delete;
+  OverlayHandlerImpl &operator=(OverlayHandlerImpl &other) = delete;
+  //@}
+
+  QString toString() const;
+
+
+  /*! \name Adding / Updating */
+  //@{
+  bool setOverlay(int key, const QString &name, const QByteArray &overlayContent, bool isSnapshot = false) override;
+  QByteArray content(int key) const override;
+
+
+  double minScale(int key) const override;
+  bool   setMinScale(int key, double minScale) override;
+
+  double maxScale(int key) const override;
+  bool   setMaxScale(int key, double maxScale) override;
+
+  double opacity(int key) const override;
+  bool   setOpacity(int key, double opacity) override;
+  //@}
+
+  bool reorderOverlays(const QVector<int> &orderOfIds) override;
+
+  /*! \name Visibility */
+  //@{
+  bool setOverlayVisibility(int key, bool visibility) override;
+  bool overlayVisibility(int key) const override;
+  //@}
+
+
+  /*! \name Removing */
+  //@{
+  bool removeOverlay(int key) override;
+  int removeAllOverlays() override;
+  //@}
+
+  /*! \name Retrieving */
+  //@{
+  int         overlayCount() const override;
+  QList<int>  overlays() const override;
+  bool        containsOverlay(int key) const override;
+//  QString        getOverlay(int key);
+  //@}
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+
+
+//-----------------------------------------------------------------------------
+// output operator:
+//-----------------------------------------------------------------------------
+/**
+ * @brief Output operator
+ * @param stream used to stream into.
+ * @param value to be streamed.
+ * @return appended stream.
+ */
+SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream   &stream,
+                                              const OverlayHandlerImpl &value);
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.cpp
new file mode 100755
index 000000000..6f7152f70
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.cpp
@@ -0,0 +1,350 @@
+/**
+  * @RDE_HEADER@
+  * Implementation of AbstractMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "overview_map_handler_impl.h"
+#include <Common/resource_path.h>
+#include <MapImpl/map_impl.h>
+#include <SymbologyImpl/symbol_dictionary_impl.h>
+#include <Rubberbands/rubberband_factory.h>
+#include <Map/situation_map_utils.h>
+
+#include <MapImpl/layer_factory_impl.h>
+
+
+// ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <TileCache.h>
+#include <ArcGISTiledLayer.h>
+#include <Basemap.h>
+#include <SimpleRenderer.h>
+#include <GraphicsOverlayListModel.h>
+#include <SimpleLineSymbol.h>
+#include <SimpleFillSymbol.h>
+#include <Envelope.h>
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <QFile>
+#include <Viewpoint.h>
+#include <SymbolTypes.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+//-----------------------------------------------------------------------------
+class OverviewMapHandlerImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  QPointer<OverviewMap>                   m_builtInOverviewMap;
+
+  MapImpl                                *m_mainMap = nullptr;
+
+  QColor                                  m_color = Qt::red;
+
+}; // class OverviewMapHandlerImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+OverviewMapHandlerImpl::OverviewMapHandlerImpl(Map *map)
+  : BaseClass(map)
+  , m_logger(getLogger("OverviewMapHandlerImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mainMap = static_cast<MapImpl *>(map);
+
+  if (d->m_mainMap)
+  {
+//    d->m_color = d->m_mainMap->palette().color(QPalette::WindowText); // RDE_DARK_BLUE
+
+    // REGG-4125 - Karte: Bereichsauswahl verdrängt Übersichtskarte
+    // EventDispatcher und EventDelegater scheinen die OverviewMap zu verdrängen.
+    // OverviewMap per QGraphicsProxyWidget (QGraphicsView()->scene()->addWidget) schlägt auch fehl
+    // Daher dieser einfacher workaround:
+    // Raise nach dem Zerstören eines Rubberbands (und damit Entfernen von EventDispatcher und EventDelegater):
+    connect(&d->m_mainMap->rubberbandFactory(), &RB::RubberbandFactory::rubberbandDestroyed,
+            this, &OverviewMapHandlerImpl::onMainMapRectChanged);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " error no mainMap ";
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+OverviewMapHandlerImpl::~OverviewMapHandlerImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void OverviewMapHandlerImpl::createBuiltInOverviewMap()
+{
+  if (d->m_builtInOverviewMap)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " already exists";
+    return;
+  }
+
+  d->m_builtInOverviewMap = QPointer<OverviewMap>(new OverviewMap(this));
+  d->m_builtInOverviewMap->init(d->m_mainMap, d->m_color);
+  if (! d->m_builtInOverviewMap->createBasicOverviewMap())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " createBasicOverviewMap failed";
+
+  if (! d->m_builtInOverviewMap->widget())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " d->m_builtInOverviewMap->widget() failed";
+    return;
+  }
+
+  // confgure widget:
+  // disable mouse:
+  d->m_builtInOverviewMap->widget()->setAttribute(Qt::WA_TransparentForMouseEvents);
+  d->m_builtInOverviewMap->widget()->setFocusPolicy(Qt::NoFocus);
+
+  d->m_builtInOverviewMap->widget()->setMinimumSize(QSize(100, 100));
+  d->m_builtInOverviewMap->widget()->setStyleSheet(QLatin1String("border: 1px solid gray"));
+
+  d->m_builtInOverviewMap->widget()->show();
+
+  // take care of position:
+  connect(d->m_mainMap, &MapImpl::rectChanged,
+          this, &OverviewMapHandlerImpl::onMainMapRectChanged);
+
+  onMainMapRectChanged();
+
+  d->m_mainMap->emitVisualComponentChanged(VisualComponent::OverviewMap); // to update onOffCheckbox
+}
+
+
+void OverviewMapHandlerImpl::removeBuiltInOverviewMap()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (d->m_builtInOverviewMap)
+  {
+    QPointer<OverviewMap> localPtr = d->m_builtInOverviewMap;
+    d->m_builtInOverviewMap.clear();
+    localPtr->deleteLater();
+    d->m_mainMap->emitVisualComponentChanged(VisualComponent::OverviewMap);
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QWidget *OverviewMapHandlerImpl::builtInOverviewMapWidget()
+{
+  if (! d->m_builtInOverviewMap)
+    return nullptr;
+  return d->m_builtInOverviewMap->widget();
+}
+
+void OverviewMapHandlerImpl::removeAll()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  removeBuiltInOverviewMap();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void OverviewMapHandlerImpl::onMainMapRectChanged()
+{
+  if (! d->m_builtInOverviewMap)
+    return;
+
+  if (! d->m_builtInOverviewMap->widget())
+    return;
+
+  const QSize &mainSize = d->m_mainMap->size();
+  const QSize &overviewSize = d->m_builtInOverviewMap->widget()->size();
+
+  QSize diff = mainSize - overviewSize - QSize(10, 10); // additional border
+
+  d->m_builtInOverviewMap->widget()->move(diff.width(), diff.height());
+
+  d->m_builtInOverviewMap->widget()->raise();
+}
+
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+OverviewMap::OverviewMap(QObject *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("OverviewMap"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+OverviewMap::~OverviewMap()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (m_graphicsView)
+    m_graphicsView->deleteLater();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void OverviewMap::init(MapImpl *mainMap, const QColor &color)
+{
+  m_mainMap = mainMap;
+  m_color = color;
+}
+
+QWidget *OverviewMap::widget()
+{
+  return m_graphicsView.data();
+}
+
+bool OverviewMap::createBasicOverviewMap()
+{
+  if (m_graphicsView)
+    return true;
+
+  // create required objects:
+  m_graphicsView = QPointer<Esri::ArcGISRuntime::MapGraphicsView>(new Esri::ArcGISRuntime::MapGraphicsView(m_mainMap));
+
+  m_graphicsView->setAttributionTextVisible(false);
+
+  QObject *parent = this;
+
+  QString tiledBaseMapLayer = SituationMap::getResourcePath() + QLatin1String("Topographic.tpk");
+
+  QFile f(tiledBaseMapLayer);
+  if (!f.exists())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " file does not exist: tiledBaseMapLayer='" << tiledBaseMapLayer << "'";
+    return false;
+  }
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " tiledBaseMapLayer='" << tiledBaseMapLayer << "'";
+
+  Esri::ArcGISRuntime::TileCache *tpkCache = new Esri::ArcGISRuntime::TileCache(tiledBaseMapLayer, parent);
+  tpkCache->setObjectName(QLatin1String("OverviewMap-TPK-tpkCache"));
+
+  Esri::ArcGISRuntime::ArcGISTiledLayer *tiledLayer = new Esri::ArcGISRuntime::ArcGISTiledLayer(tpkCache, parent);
+  tiledLayer->setName(QLatin1String("OverviewMap-TPK-tiledLayer"));
+
+  Esri::ArcGISRuntime::Basemap *basemap = new Esri::ArcGISRuntime::Basemap(tiledLayer, parent);
+  basemap->setName(QLatin1String("TPK-Basemap"));
+
+  // connect signals
+  // loadStatusChanged ->
+  connect(tpkCache, &Esri::ArcGISRuntime::TileCache::loadStatusChanged, this, [this](Esri::ArcGISRuntime::LoadStatus loadStatus)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " OverviewMap-TileCache: " << "loadStatus changed to: " << loadStatus;
+  });
+  connect(tiledLayer, &Esri::ArcGISRuntime::ArcGISTiledLayer::loadStatusChanged, this, [this](Esri::ArcGISRuntime::LoadStatus loadStatus)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " OverviewMap-ArcGISTiledLayer: " << "loadStatus changed to: " << loadStatus;
+    if (loadStatus == Esri::ArcGISRuntime::LoadStatus::Loaded)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " loaded -> setToFullExtent";
+      setToFullExtent();
+    }
+
+  });
+  connect(basemap, &Esri::ArcGISRuntime::Basemap::loadStatusChanged, this, [this](Esri::ArcGISRuntime::LoadStatus loadStatus)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " OverviewMap-Basemap: " << "loadStatus changed to: " << loadStatus;
+  });
+
+
+  // Map:
+  Esri::ArcGISRuntime::Map *overviewMap = new Esri::ArcGISRuntime::Map(basemap, parent);
+  overviewMap->setObjectName(QLatin1String("OverviewMap-EsriMap"));
+
+  // will start esris cascading load dependecies...
+  m_graphicsView->setMap(overviewMap);
+
+
+  // GraphicsOverlay:
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicalOverlay = new Esri::ArcGISRuntime::GraphicsOverlay(parent);
+  m_graphicsView->graphicsOverlays()->append(graphicalOverlay);
+
+
+  QColor color = m_color;
+
+  // create symbol
+  Esri::ArcGISRuntime::SimpleLineSymbol *sls =
+    new Esri::ArcGISRuntime::SimpleLineSymbol(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid,
+                                              color, 1, parent);
+  color.setAlpha(100);
+  Esri::ArcGISRuntime::SimpleFillSymbol *sfs =
+    new Esri::ArcGISRuntime::SimpleFillSymbol(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid,
+                                              color, sls, parent);
+  // create renderer
+  Esri::ArcGISRuntime::SimpleRenderer *renderer =
+    new Esri::ArcGISRuntime::SimpleRenderer(sfs, parent);
+
+  // Handle errors of renderer:
+  connect(renderer, &Esri::ArcGISRuntime::SimpleRenderer::errorOccurred, this, [this](const Esri::ArcGISRuntime::Error & error)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error;
+  });
+
+  // set Renderer to layer:
+  graphicalOverlay->setRenderer(renderer);
+
+  // prepare graphic
+  m_graphic = new Esri::ArcGISRuntime::Graphic(graphicalOverlay);
+  graphicalOverlay->graphics()->append(m_graphic);
+
+  // update first time
+  onMainMapExtentChanged();
+
+  // execute on extentChanged
+  connect(m_mainMap, &MapImpl::extentChangedDelayed, this, &OverviewMap::onMainMapExtentChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void OverviewMap::onMainMapExtentChanged()
+{
+  if (! m_graphic)
+    return;
+
+  Esri::ArcGISRuntime::GeoView *geoView = m_mainMap->getEsriGeoView();
+  if (! geoView)
+    return;
+
+  setToFullExtent();
+
+  const Esri::ArcGISRuntime::Viewpoint curVp =
+    geoView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::BoundingGeometry);
+
+  m_graphic->setGeometry(curVp.targetGeometry()); // curVp.targetGeometry() should be a rectangle
+}
+
+void OverviewMap::setToFullExtent()
+{
+  if (!m_graphicsView || !m_mainMap)
+    return;
+
+  // zoom to fullExtent:
+  Esri::ArcGISRuntime::Envelope fullExtent = m_mainMap->layerFactoryImpl().fullExtentOfBasemaps(0.2); // add margin
+
+  Esri::ArcGISRuntime::Viewpoint vp(fullExtent);
+  m_graphicsView->setViewpointAndWait(vp);
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.h
new file mode 100755
index 000000000..cef8af081
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/overview_map_handler_impl.h
@@ -0,0 +1,113 @@
+/**
+  * @RDE_HEADER@
+  * Implementation of OverviewMap
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/overview_map_handler.h>
+#include <Common/situation_map_logging.h>
+#include "situation_map_export.h"
+
+// ESRI
+#include <MapGraphicsView.h>
+#include <QPointer>
+
+
+// Qt
+
+// Forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Graphic;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class MapImpl;
+
+/**
+ * @brief The OverviewMap is a wrapper around OverviewMapWidget.
+ */
+class OverviewMap : public QObject
+{
+  Q_OBJECT
+  using BaseClass = QObject;
+public:
+  explicit OverviewMap(QObject *parent = nullptr);
+  ~OverviewMap();
+
+  void init(MapImpl *mainMap, const QColor &color = Qt::red);
+  bool createBasicOverviewMap();
+
+  QWidget *widget();
+
+protected slots:
+  void onMainMapExtentChanged();
+  void setToFullExtent();
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+
+  // Own data:
+  MapImpl                                        *m_mainMap = nullptr;
+  QPointer<Esri::ArcGISRuntime::MapGraphicsView>  m_graphicsView;
+  Esri::ArcGISRuntime::Graphic                   *m_graphic = nullptr;
+  QColor                                          m_color;
+
+};
+
+
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAP_EXPORT OverviewMapHandlerImpl : public QObject, public virtual OverviewMapHandler
+{
+  Q_OBJECT
+
+  using BaseClass = QObject;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit OverviewMapHandlerImpl(Map *map);
+  ~OverviewMapHandlerImpl();
+
+  OverviewMapHandlerImpl(const OverviewMapHandlerImpl &other)     = delete;
+  OverviewMapHandlerImpl &operator=(OverviewMapHandlerImpl &other) = delete;
+
+  void createBuiltInOverviewMap() override;
+  void removeBuiltInOverviewMap() override;
+
+  QWidget *builtInOverviewMapWidget() override;
+
+
+  void removeAll() override;
+  //@}
+
+protected slots:
+  void onMainMapRectChanged();
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.cpp
new file mode 100755
index 000000000..ef63a328a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.cpp
@@ -0,0 +1,563 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LocationDisplay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "pixel_based_textbox_handler_impl.h"
+#include "map_impl.h"
+#include <Map/situation_map_utils.h>
+#include <MapImpl/coordinate_translation.h>
+
+
+// ESRI
+#include <arcgisversion.h>  // This file is created by RME, not ESRI
+#include <Map.h>
+#include <MapGraphicsView.h>
+
+// Qt
+#include <QHBoxLayout>
+#include <QGraphicsScene>
+#include <QGraphicsRectItem>
+#include <QGraphicsProxyWidget>
+#include <QPushButton>
+#include <QDebug>
+#include <QTimer>
+
+#include <sstream>
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// PBTB_ID output operator:
+//-----------------------------------------------------------------------------
+  std::ostream &operator<< (std::ostream &stream, const PBTB_ID &value)
+  {
+    stream << value.toString();
+    return stream;
+  }
+
+
+//-----------------------------------------------------------------------------
+// class
+//-----------------------------------------------------------------------------
+class PixelBasedTextBoxHandlerImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SituationMap::MapImpl            *m_mapImpl{nullptr};
+
+  QVector<QSharedPointer<TB_Data>>  m_tbDataCont;
+};
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// class PixelBasedTextBoxHandlerImpl
+//-----------------------------------------------------------------------------
+PixelBasedTextBoxHandlerImpl::PixelBasedTextBoxHandlerImpl(SituationMap::MapImpl *mapImpl)
+  : m_logger(getLogger("PixelBasedTextBoxHandlerImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mapImpl = mapImpl;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PixelBasedTextBoxHandlerImpl::~PixelBasedTextBoxHandlerImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QTextEdit *PixelBasedTextBoxHandlerImpl::createTextBox(PBTB_ID &pbtbIdRef, const PixelTextBoxData &ptbd, bool enableGeometryModifications)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, (((pbtbId=" << pbtbIdRef.toString()
+                      << "))) , ptbd=" << ptbd.toDebugString()
+                      << ", enableGeometryModifications=" << enableGeometryModifications;
+  if (!d->m_mapImpl)
+    return nullptr;
+
+  QSharedPointer<TB_Data> tbData = getCreateTbData(pbtbIdRef);
+
+  // pbtbId may have changed, write back to caller:
+  pbtbIdRef = tbData->m_pbtbId;
+
+  // backgroundColor is special (not with QTextEdit), so update tbData here:
+  if (ptbd.m_backgroundColor.isValid())
+    tbData->m_ptbd.m_backgroundColor = ptbd.m_backgroundColor;
+  else
+    tbData->m_ptbd.m_backgroundColor = Qt::white;
+
+  TB_Data::TB_GUI_DATA &guiDataRef = tbData->m_guiData;
+  if (!guiDataRef.m_textEdit)
+  {
+    QTextEditWithDoubleClick *myTextEdit = new QTextEditWithDoubleClick();
+    guiDataRef.m_textEdit = myTextEdit;
+    guiDataRef.m_textEdit->setObjectName(QStringLiteral("WidgetOverlay_QTextEdit"));
+    guiDataRef.m_textEdit->setReadOnly(true);
+    guiDataRef.m_textEdit->setProperty(PBTB_ID_PROPERTY_NAME, tbData->m_pbtbId.toString());
+
+    if (ptbd.m_size.isValid())
+      guiDataRef.m_textEdit->setGeometry(0, 0, ptbd.m_size.width(), ptbd.m_size.height());
+
+    if (enableGeometryModifications)
+    {
+      connect(myTextEdit, &QTextEditWithDoubleClick::doubleClickEvent,
+              this, [this] (const PBTB_ID &pbtbId) {
+        emit pixelBasedTextBoxDoubleClickEvent(pbtbId);
+      });
+    }
+
+    // It looks like:
+    // GraphicsItem <-> ProxyWidget <-> Widget/TextEdit
+    // (QGraphicsItem is a baseclass of both GraphicsItem as well as ProxyWidget)
+    // GraphicsItem becomes parent of ProxyWidget
+    // Then TextEdit is added via setWidget to ProxyWidget
+    // Now both are connected, TextEdit in front of GraphicsItem which ist little bit bigger
+    // GraphicsItem is movable, GI an TE are connected to each other...
+    // 10.05.2023, Norbert Thoden
+    // (((Idea: Maybe ProxyWidget should be parent of GraphicsItem
+    // to put GraphicsItem on top of TextEdit???)))
+    QGraphicsRectItemWithEvents *grItem = new QGraphicsRectItemWithEvents(0, 0, 0, 0); // x,y == rel position, size will be set later
+    grItem->setProperty(PBTB_ID_PROPERTY_NAME, tbData->m_pbtbId.toString());
+    grItem->setCursor(Qt::SizeAllCursor);
+    if (enableGeometryModifications)
+    {
+      grItem->activatePositionChangedEvents();
+      connect(grItem, &QGraphicsRectItemWithEvents::positionChangedFinishedEvent,
+              this, &PixelBasedTextBoxHandler::pixelBasedTextBoxGeometryChanged, Qt::UniqueConnection);
+    }
+
+    guiDataRef.m_handle_or_proxyControl = grItem;
+
+
+    guiDataRef.m_proxy = new QGraphicsProxyWidget(guiDataRef.m_handle_or_proxyControl); // parent is important for cleanup!
+
+    guiDataRef.m_proxy->setObjectName(QStringLiteral("ProxyWidgetOverlay_QTextEdit"));
+    guiDataRef.m_proxy->setProperty(PBTB_ID_PROPERTY_NAME, tbData->m_pbtbId.toString()); // maybe helpful in future
+
+    guiDataRef.m_proxy->setWidget(guiDataRef.m_textEdit);
+
+    guiDataRef.m_proxy->setPos(QPoint(0, 0)); // relative position to GraphicsItem !?
+
+    guiDataRef.m_proxy->setOpacity(0.99); // avoid white on white
+
+    guiDataRef.m_handle_or_proxyControl->setPen(QPen(Qt::gray));
+    guiDataRef.m_handle_or_proxyControl->setBrush(QBrush(Qt::gray));
+
+    if (enableGeometryModifications)
+      guiDataRef.m_handle_or_proxyControl->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+
+    d->m_mapImpl->getQGraphicsView()->scene()->addItem(guiDataRef.m_handle_or_proxyControl);
+
+    if (enableGeometryModifications)
+    {
+      // SizeGrip, removeBtn :
+      QSizeGripWithEvent *sizeGrip = new QSizeGripWithEvent(tbData->m_pbtbId, guiDataRef.m_textEdit);
+      QHBoxLayout *layout = new QHBoxLayout(guiDataRef.m_textEdit);
+      layout->setContentsMargins(0, 0, 0, 0);
+
+      QPushButton *btn = new QPushButton(guiDataRef.m_textEdit);
+      btn->setIcon(QIcon(QStringLiteral("icon:bgv_view_close.svg")));
+
+      connect(btn, &QPushButton::clicked, this, [this, pbtbIdRef](bool) {
+        emit pixelBasedTextBoxRemoveRequestedEvent(pbtbIdRef);
+      });
+
+      layout->addWidget(btn, 1, Qt::AlignRight | Qt::AlignBottom);
+      layout->addWidget(sizeGrip, 0, Qt::AlignRight | Qt::AlignBottom);
+
+      // [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+      // pass geometryChanged via signal-signal-connection:
+      connect(sizeGrip, &QSizeGripWithEvent::geometryChangedFinishedEvent,
+              this, &PixelBasedTextBoxHandler::pixelBasedTextBoxGeometryChanged, Qt::UniqueConnection);
+
+      // : SizeGrip, removeBtn
+
+    }
+
+    // Geometry :
+    tbData->onGeometryChanged();
+    if (!tbData->connectGeometryChanges())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " connectGeometryChanges failed!";
+
+    //
+    // [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+    //    // pass geometryChanged via signal-signal-connection:
+    //    connect(tbData.data(), &TB_Data::geometryChanged,
+    //            this, &PixelBasedTextBoxHandler::pixelBasedTextBoxGeometryChanged, Qt::UniqueConnection);
+
+    // : Geometry
+  }
+
+  //
+  // update GUI:
+  //
+  // update text
+  guiDataRef.m_textEdit->setText(ptbd.m_htmlText);
+  if (guiDataRef.m_textEdit->toPlainText().isEmpty())
+  {
+    const QString sansSerif = QLatin1String("Sans Serif");
+    QFont textFont = guiDataRef.m_textEdit->font();
+    textFont.setFamily(sansSerif);
+    textFont.setFamilies({sansSerif});
+    guiDataRef.m_textEdit->setFont(textFont);
+  }
+
+  // update backgroundColor
+  const QColor &bgCol = ptbd.m_backgroundColor;
+  if (bgCol.isValid())
+  {
+    QString styleSheet = QString(QStringLiteral("QTextEdit { background-color: rgb(%1, %2, %3) }")).arg(bgCol.red()).arg(bgCol.green()).arg(bgCol.blue());
+    guiDataRef.m_textEdit->setStyleSheet(styleSheet);
+  }
+
+  // update geometry and size:
+  guiDataRef.m_handle_or_proxyControl->setPos(ptbd.m_position);
+  if (ptbd.m_size.isValid())
+    guiDataRef.m_textEdit->setGeometry(0, 0, ptbd.m_size.width(), ptbd.m_size.height());
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbIdRef;
+  return guiDataRef.m_textEdit.data();
+}
+
+QTextEdit *PixelBasedTextBoxHandlerImpl::updateTextBox(const PBTB_ID &pbtbId, const PixelTextBoxData &ptbd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, (((pbtbId=" << pbtbId.toString()
+                      << "))) , ptbd=" << ptbd.toDebugString();
+
+  QSharedPointer<TB_Data> tbDataToCheckIfItExists = getTbDataIfExists(pbtbId);
+  if(!tbDataToCheckIfItExists)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " TextBox does not exists, pbtbId=" << pbtbId.toString();
+    return nullptr;
+  }
+
+  PBTB_ID pbtbIdCopy = pbtbId;
+  QTextEdit *te = this->createTextBox(pbtbIdCopy, ptbd, false); // enableGeometryModifications==false - that part is already done
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, (((pbtbId=" << pbtbId.toString()
+                      << "))) , ptbd=" << ptbd.toDebugString();
+  return te;
+};
+
+
+QTextEdit *PixelBasedTextBoxHandlerImpl::getTextBox(const PBTB_ID &pbtbId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, pbtbId=" << pbtbId.toString();
+  if (!d->m_mapImpl)
+    return nullptr;
+
+  QSharedPointer<TB_Data> tbData = getTbDataIfExists(pbtbId);
+
+  QTextEdit *te = nullptr;
+  if (tbData && tbData->hasValidId())
+  {
+    TB_Data::TB_GUI_DATA &guiDataRef = tbData->m_guiData;
+    te = guiDataRef.m_textEdit;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbId
+                      << ", te = " << te;
+  return te;
+}
+
+void PixelBasedTextBoxHandlerImpl::removeSelection()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QMutableVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> tbData = it.next();
+    if (tbData)
+    {
+      TB_Data::TB_GUI_DATA &guiDataRef = tbData->m_guiData;
+      guiDataRef.m_handle_or_proxyControl->setBrush(QBrush(Qt::gray));
+    }
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool PixelBasedTextBoxHandlerImpl::setSelected(const PBTB_ID &pbtbId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, pbtbId=" << pbtbId;
+
+  // part 1
+  removeSelection();
+
+  // part 2
+  QSharedPointer<TB_Data> tbData = getCreateTbData(pbtbId);
+  if (tbData->m_pbtbId != pbtbId)
+    return false;
+
+  QColor col = Qt::magenta;
+  col.setAlpha(128);
+
+  TB_Data::TB_GUI_DATA &guiDataRef = tbData->m_guiData;
+  guiDataRef.m_handle_or_proxyControl->setBrush(QBrush(col));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbId;
+  return true;
+}
+
+QVector<PBTB_ID> PixelBasedTextBoxHandlerImpl::getAllIdsOfParent(const PBTB_ID &pbtbId) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, pbtbId=" << pbtbId;
+
+  const int parentId = pbtbId.m_parentId;
+  QVector<PBTB_ID> retVec;
+  retVec.reserve(d->m_tbDataCont.size());
+
+  QVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> item = it.next();
+    if (item->m_pbtbId.m_parentId == parentId)
+      retVec.append(item->m_pbtbId);
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbId
+                      << ", retVec.size()" << retVec.size();
+  return retVec;
+}
+
+PixelTextBoxData PixelBasedTextBoxHandlerImpl::getPixelTextBoxData(const PBTB_ID &pbtbId) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, pbtbId=" << pbtbId;
+
+  QSharedPointer<TB_Data> tbData = getCreateTbData(pbtbId);
+  if (tbData->m_pbtbId != pbtbId)
+    return {};
+
+  PixelTextBoxData     &ptbdRef    = tbData->m_ptbd;
+  TB_Data::TB_GUI_DATA &guiDataRef = tbData->m_guiData;
+
+  //
+  // current guiData to ptbd:
+  //
+
+  // text
+  ptbdRef.m_htmlText = guiDataRef.m_textEdit->document()->toHtml();
+  // ptbdRef.m_backgroundColor; // already updated, see createTextBox()
+  ptbdRef.m_position = guiDataRef.m_handle_or_proxyControl->pos().toPoint();
+  ptbdRef.m_size     = guiDataRef.m_textEdit->geometry().size();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbId
+                      << ", ptbdRef = " << ptbdRef;
+  return ptbdRef;
+}
+
+bool PixelBasedTextBoxHandlerImpl::removeTextBox(const PBTB_ID &pbtbId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, pbtbId=" << pbtbId;
+  if (!d->m_mapImpl)
+    return false;
+  if (d->m_tbDataCont.isEmpty())
+    return true;
+
+  QMutableVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> item = it.next();
+    if (item->m_pbtbId == pbtbId)
+    {
+      it.remove(); // dtor will destroy guiElements
+      TRACE_LOG(m_logger) << LOGFUNCTION << " END, removed pbtbId=" << pbtbId;
+      return true;
+    }
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, pbtbId=" << pbtbId;
+  return false;
+}
+
+bool PixelBasedTextBoxHandlerImpl::removeAllTextBoxesOfParent(int parentId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, parentId=" << parentId;
+
+  if (!d->m_mapImpl)
+    return false;
+
+  int cnt  = 0;
+  QMutableVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> item = it.next();
+    if (item->m_pbtbId.m_parentId == parentId)
+    {
+      it.remove(); // dtor will destroy guiElements
+      ++cnt;
+    }
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, parentId=" << parentId
+                      << ", removed #items = " << cnt;
+  return true;
+}
+
+QSharedPointer<TB_Data> PixelBasedTextBoxHandlerImpl::getCreateTbData(const PBTB_ID &pbtbId) const
+{
+  QVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> item = it.next();
+    if (item->m_pbtbId == pbtbId)
+      return item;
+  } // while
+
+  // not found?
+  // insert and return;
+  QSharedPointer<TB_Data> initialData = QSharedPointer<TB_Data>(new TB_Data());
+  initialData->m_pbtbId.m_parentId  = pbtbId.m_parentId;  //     !!! keep m_parentId !!!
+  initialData->m_pbtbId.m_uid       = PBTB_ID::getNextId();
+  d->m_tbDataCont.append(initialData);
+  return d->m_tbDataCont.last();
+}
+
+QSharedPointer<TB_Data> PixelBasedTextBoxHandlerImpl::getTbDataIfExists(const PBTB_ID &pbtbId) const
+{
+  QVectorIterator<QSharedPointer<TB_Data>> it(d->m_tbDataCont);
+  while (it.hasNext())
+  {
+    QSharedPointer<TB_Data> item = it.next();
+    if (item->m_pbtbId == pbtbId)
+      return item;
+  } // while
+
+  return {};
+}
+
+TB_Data::TB_Data()
+{
+}
+
+TB_Data::~TB_Data()
+{
+  m_guiData.resetGui();
+}
+
+bool TB_Data::hasValidId() const
+{
+  return m_pbtbId.isValid();
+}
+
+bool TB_Data::connectGeometryChanges()
+{
+  if (!m_guiData.m_proxy)
+    return false;
+
+  // QTextEdit has no geometryChanged or similar, but ProxyWidget has:
+  connect(m_guiData.m_proxy, &QGraphicsProxyWidget::geometryChanged,
+          this, &TB_Data::onGeometryChanged);
+
+  return true;
+}
+
+void TB_Data::onGeometryChanged()
+{
+  // enableGeometryModifications could be 'read' by m_sizeGrip which is only created if modifications are enabled:
+  const bool enableGeometryModifications = m_guiData.m_handle_or_proxyControl->flags().testFlag(QGraphicsItem::ItemIsMovable);
+  if (enableGeometryModifications)
+    m_guiData.m_handle_or_proxyControl->setRect(m_guiData.m_textEdit->geometry().adjusted(-10, -10, 10, 10)); // bigger than textEdit
+  else
+    m_guiData.m_handle_or_proxyControl->setRect(m_guiData.m_textEdit->geometry().adjusted(1, 1, -1, -1));     // smaller than textEdit (invisible)
+
+  emit geometryChanged(m_pbtbId);
+}
+
+
+
+//-----------------------------------------------------------------------------
+// class QTextEditWithDoubleClick
+//-----------------------------------------------------------------------------
+void QTextEditWithDoubleClick::mouseDoubleClickEvent(QMouseEvent */*event*/)
+{
+  const QString &pbtbProp = this->property(PBTB_ID_PROPERTY_NAME).toString();
+  const PBTB_ID &pbtbId = SituationMap::PBTB_ID::fromString(pbtbProp);
+
+  emit doubleClickEvent(pbtbId);
+
+  // do NOT forward to baseClass. So we avoid the text being displayed xor/inverted
+  // BaseClass::mouseDoubleClickEvent(event);
+
+  // Maybe the selection coud be 'removed' in that way:
+  //  QTextCursor tc = textCursor();
+  //  tc.clearSelection();
+  //  setTextCursor(tc);
+}
+
+
+//-----------------------------------------------------------------------------
+// class QGraphicsRectItemWithMoveEvent
+//-----------------------------------------------------------------------------
+void QGraphicsRectItemWithEvents::activatePositionChangedEvents()
+{
+  m_qtimer = new QTimer(this);
+  m_qtimer->setInterval(100);
+  m_qtimer->setSingleShot(true);
+  connect(m_qtimer, &QTimer::timeout,
+           this, &QGraphicsRectItemWithEvents::onTimeout);
+}
+
+void QGraphicsRectItemWithEvents::onTimeout()
+{
+  const QString &pbtbProp = this->property(PBTB_ID_PROPERTY_NAME).toString();
+  const PBTB_ID &pbtbId = SituationMap::PBTB_ID::fromString(pbtbProp);
+  emit positionChangedEvent(pbtbId);
+}
+
+void QGraphicsRectItemWithEvents::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+  BaseClass::mouseMoveEvent(event);
+  m_qtimer->start();
+  m_isMoving = true;
+}
+
+void QGraphicsRectItemWithEvents::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+  BaseClass::mouseReleaseEvent(event);
+
+  if (m_isMoving)
+  {
+    const QString &pbtbProp = this->property(PBTB_ID_PROPERTY_NAME).toString();
+    const PBTB_ID &pbtbId = SituationMap::PBTB_ID::fromString(pbtbProp);
+    emit positionChangedFinishedEvent(pbtbId);
+    m_isMoving = false;
+  }
+}
+
+//-----------------------------------------------------------------------------
+// class QSizeGripWithEvent
+//-----------------------------------------------------------------------------
+void QSizeGripWithEvent::mouseMoveEvent(QMouseEvent *event)
+{
+  BaseClass::mouseMoveEvent(event);
+  m_isGeometryChanging = true;
+}
+
+void QSizeGripWithEvent::mouseReleaseEvent(QMouseEvent *mouseEvent)
+{
+  BaseClass::mouseReleaseEvent(mouseEvent);
+
+  if (m_isGeometryChanging)
+  {
+    m_isGeometryChanging = false;
+    emit geometryChangedFinishedEvent(m_pbtbId);
+  }
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.h
new file mode 100755
index 000000000..fbf5c1d18
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/pixel_based_textbox_handler_impl.h
@@ -0,0 +1,221 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of LocationDisplay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/pixel_based_textbox_handler.h>
+#include <GeometryModel/geometry_pixelTextBox.h>
+#include <Common/situation_map_logging.h>
+
+// Qt
+#include <QTextEdit>
+#include <QPointer>
+#include <QSizeGrip>
+#include <QGraphicsRectItem>
+#include <QGraphicsProxyWidget>
+#include <QVariant>
+#include <QTimer>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+class TB_Data;
+
+//-----------------------------------------------------------------------------
+// class TB_Data
+//-----------------------------------------------------------------------------
+class TB_Data  : public QObject
+{
+  Q_OBJECT
+
+public:
+  friend class PixelBasedTextBoxHandlerImpl;
+  TB_Data();
+  ~TB_Data();
+
+  bool hasValidId() const;
+  bool connectGeometryChanges();
+
+public Q_SLOTS:
+  void onGeometryChanged();
+
+Q_SIGNALS:
+  void geometryChanged(SituationMap::PBTB_ID pbtbId);
+  void geometryChangedFinished(SituationMap::PBTB_ID pbtbId); // [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+
+public:
+  PBTB_ID           m_pbtbId;
+  PixelTextBoxData  m_ptbd;
+
+  struct TB_GUI_DATA
+  {
+    QPointer<QTextEdit>   m_textEdit;
+    QGraphicsRectItem    *m_handle_or_proxyControl{nullptr};
+    QGraphicsProxyWidget *m_proxy{nullptr};
+
+    void resetGui()
+    {
+      // ToDo: check
+      // delete without removing from scene/view?
+
+      delete m_handle_or_proxyControl;
+      m_handle_or_proxyControl = nullptr;
+
+      // since m_proxy has m_handle_or_proxyControl as parent...
+      m_proxy = nullptr;
+
+      delete m_textEdit; // QPointer
+    }
+
+  };
+  TB_GUI_DATA m_guiData;
+
+private:
+  Q_DISABLE_COPY(TB_Data)
+};
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// class QTextEditWithDoubleClick
+//-----------------------------------------------------------------------------
+class QTextEditWithDoubleClick : public QTextEdit
+{
+    Q_OBJECT
+public:
+  using BaseClass = QTextEdit;
+  QTextEditWithDoubleClick(QWidget *parent = nullptr)
+    :BaseClass(parent)
+  {}
+  virtual ~QTextEditWithDoubleClick() = default;
+
+Q_SIGNALS:
+  void doubleClickEvent(PBTB_ID pbtbId);
+
+protected:
+  void mouseDoubleClickEvent(QMouseEvent *) override;
+};
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// class QGraphicsRectItemWithMoveEvent
+//-----------------------------------------------------------------------------
+class QGraphicsRectItemWithEvents : public QObject, public QGraphicsRectItem
+{
+  Q_OBJECT
+public:
+  using BaseClass = QGraphicsRectItem;
+  QGraphicsRectItemWithEvents(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = nullptr)
+    : QObject(), BaseClass(x, y, w, h, parent)
+  {}
+  virtual ~QGraphicsRectItemWithEvents() = default;
+
+  void activatePositionChangedEvents();
+
+Q_SIGNALS:
+  void positionChangedEvent(PBTB_ID pbtbId);
+  void positionChangedFinishedEvent(PBTB_ID pbtbId);   // [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+
+protected Q_SLOTS:
+  void onTimeout();
+
+protected:
+  void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+  void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+
+  QTimer *m_qtimer{nullptr};
+  bool    m_isMoving{false};
+};
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class QSizeGripWithEvent
+//-----------------------------------------------------------------------------
+// [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+// class QSizeGripWithEvent is introduced:
+class QSizeGripWithEvent : public QSizeGrip
+{
+  Q_OBJECT
+public:
+  using BaseClass = QSizeGrip;
+  QSizeGripWithEvent(const PBTB_ID &pbtbId, QWidget *parent)
+    : BaseClass(parent), m_pbtbId(pbtbId)
+  {}
+  virtual ~QSizeGripWithEvent() = default;
+
+Q_SIGNALS:
+  void geometryChangedFinishedEvent(SituationMap::PBTB_ID pbtbId);   // [GUEZE-2947] Undo,Redo fuer PixelBasedTextBoxen
+
+protected:
+  void mouseMoveEvent(QMouseEvent *) override;
+  void mouseReleaseEvent(QMouseEvent *mouseEvent) override;
+
+  PBTB_ID m_pbtbId;
+  bool m_isGeometryChanging{false};
+};
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class PixelBasedTextBoxHandlerImpl
+//-----------------------------------------------------------------------------
+class SITUATIONMAP_EXPORT PixelBasedTextBoxHandlerImpl : public SituationMap::PixelBasedTextBoxHandler
+{
+  Q_OBJECT
+
+  using BaseClass = SituationMap::PixelBasedTextBoxHandler;
+
+public:
+
+  explicit PixelBasedTextBoxHandlerImpl(SituationMap::MapImpl *mapImpl);
+  virtual ~PixelBasedTextBoxHandlerImpl();
+
+  PixelBasedTextBoxHandlerImpl(const PixelBasedTextBoxHandlerImpl &other)      = delete;
+  PixelBasedTextBoxHandlerImpl &operator=(PixelBasedTextBoxHandlerImpl &other) = delete;
+
+  // create/get
+  QTextEdit *createTextBox(PBTB_ID &pbtbIdRef, const PixelTextBoxData &ptbd, bool enableGeometryModifications = true) override;
+  QTextEdit *updateTextBox(const PBTB_ID &pbtbId, const PixelTextBoxData &ptbd) override;
+  QTextEdit *getTextBox(const PBTB_ID &pbtbId) override;
+
+
+  void removeSelection() override;
+  bool setSelected(const PBTB_ID &pbtbId) override;
+
+  // get:
+  QVector<PBTB_ID> getAllIdsOfParent(const PBTB_ID &pbtbId) const override;
+  PixelTextBoxData getPixelTextBoxData(const PBTB_ID &pbtbId) const override;
+
+  // remove:
+  bool removeTextBox(const PBTB_ID &pbtbId) override;
+  bool removeAllTextBoxesOfParent(int parentId) override;
+
+public Q_SLOTS:
+
+private:
+  QSharedPointer<TB_Data> getCreateTbData(const PBTB_ID &pbtbId) const;
+  QSharedPointer<TB_Data> getTbDataIfExists(const PBTB_ID &pbtbId) const;
+
+private :
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d{nullptr};
+
+};
+
+} // namespace SituationMap
+
+//----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.cpp
new file mode 100755
index 000000000..db1795d0a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.cpp
@@ -0,0 +1,142 @@
+/**
+  * @RDE_HEADER@
+  * Base class for ScreenToLocation and LocationToElevation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "screen_location_elevation_helper_base.h"
+#include "Map/situation_map_utils.h"
+
+// Qt
+#include <QHash>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+class ScreenLocationElevationHelperBase::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // 300: TaskWatcher was removed. In-flight async computations are QFutures; they
+  // are tracked by a self-assigned QUuid plus a cancel closure (QFuture::cancel()).
+  QHash<QUuid, std::function<void()>> m_taskCancelCbs;
+
+  QTimer                                       *m_mainTimer         = nullptr;
+  QTimer                                       *m_killTimer         = nullptr;
+};
+
+//----------------------------------------------------------------------------
+
+ScreenLocationElevationHelperBase::ScreenLocationElevationHelperBase(QObject *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("ScreenLocationElevationHelperBase"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  const int mainTimerMsec = 250;
+
+  // mainTimer
+  d->m_mainTimer = new QTimer(this);
+  d->m_mainTimer->setInterval(mainTimerMsec);
+
+  connect(d->m_mainTimer, &QTimer::timeout,
+          this, &ScreenLocationElevationHelperBase::onMainTimoutInternal);
+
+  // killTimer
+  d->m_killTimer = new QTimer(this);
+  d->m_killTimer->setSingleShot(true);
+  d->m_killTimer->setInterval(mainTimerMsec + 50);
+
+  connect(d->m_killTimer, &QTimer::timeout,
+          this, &ScreenLocationElevationHelperBase::onKillTimout);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ScreenLocationElevationHelperBase::~ScreenLocationElevationHelperBase()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->stop();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+int ScreenLocationElevationHelperBase::pendingOperationsCount() const
+{
+  return d->m_taskCancelCbs.size();
+}
+
+void ScreenLocationElevationHelperBase::cancel()
+{
+  if (d->m_taskCancelCbs.isEmpty())
+    return;
+
+  // Detach the cancel closures so a synchronous finished() (re-entrant
+  // removeTask) cannot mutate the map while we iterate it.
+  QHash<QUuid, std::function<void()>> cbs;
+  cbs.swap(d->m_taskCancelCbs);
+
+  for (auto it = cbs.constBegin(); it != cbs.constEnd(); ++it)
+  {
+    if (it.value())
+      it.value();
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " empty cancel closure";
+  } // for
+}
+
+void ScreenLocationElevationHelperBase::stop()
+{
+  this->cancel();
+  d->m_mainTimer->stop();
+  d->m_killTimer->stop();
+}
+
+void ScreenLocationElevationHelperBase::newComputationRequested()
+{
+  // long absence?
+  if (!d->m_mainTimer->isActive())
+    d->m_mainTimer->start();
+
+  // restarting killTimer
+  d->m_killTimer->start();
+}
+
+void ScreenLocationElevationHelperBase::onMainTimoutInternal()
+{
+  this->mainComputation();
+}
+
+void ScreenLocationElevationHelperBase::onKillTimout()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " killTimer stop mainTimer..."
+                      << " (size of m_taskCancelCbs=" << d->m_taskCancelCbs.size() << ")";
+  d->m_mainTimer->stop();
+}
+
+bool ScreenLocationElevationHelperBase::insertTask(const QUuid &taskId, const std::function<void()> &cancelCb)
+{
+  if (!cancelCb)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " cancel callback empty";
+    return false;
+  }
+  d->m_taskCancelCbs.insert(taskId, cancelCb);
+  return true;
+}
+
+bool ScreenLocationElevationHelperBase::removeTask(const QUuid &taskId)
+{
+  return (d->m_taskCancelCbs.remove(taskId) > 0);
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.h
new file mode 100755
index 000000000..547bff63e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_location_elevation_helper_base.h
@@ -0,0 +1,76 @@
+/**
+  * @RDE_HEADER@
+  * Base class for ScreenToLocation and LocationToElevation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <situation_map_export.h>
+#include <Common/situation_map_logging.h>
+
+
+// ESRI
+
+
+// Qt
+#include <QUuid>
+#include <QTimer>
+#include <functional>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+/**
+ * @brief The ScreenLocationElevationHelperBase class limits the load of
+ * e.g. Esri::ArcGISRuntime::SceneGraphicsView::screenToLocation
+ * (cpu load of ~50% was recognized othjerwise)
+ * This class limits this to 10 computations per second.
+ */
+class SITUATIONMAP_EXPORT ScreenLocationElevationHelperBase : public QObject
+{
+  Q_OBJECT
+
+  using BaseClass = QObject;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit ScreenLocationElevationHelperBase(QObject *parent = nullptr);
+  virtual ~ScreenLocationElevationHelperBase();
+
+  int pendingOperationsCount() const;
+  void cancel();
+  void stop();
+
+  void newComputationRequested();
+
+  ScreenLocationElevationHelperBase(const ScreenLocationElevationHelperBase &other)      = delete;
+  ScreenLocationElevationHelperBase &operator=(ScreenLocationElevationHelperBase &other) = delete;
+  //@}
+
+  virtual void mainComputation() = 0;
+
+private Q_SLOTS:
+  void onMainTimoutInternal();
+  void onKillTimout();
+
+protected:
+  bool insertTask(const QUuid &taskId, const std::function<void()> &cancelCb);
+  bool removeTask(const QUuid &taskId);
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.cpp
new file mode 100755
index 000000000..86dc3009a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.cpp
@@ -0,0 +1,143 @@
+/**
+  * @RDE_HEADER@
+  * ScreenToLocationHelper
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "screen_to_location_helper.h"
+#include "Map/situation_map_utils.h"
+
+
+// Qt
+#include <QPointer>
+
+
+// V100.2.1: to guarante good accuracy of elevation we have to ignore 3d objects :-(
+#define USE_SCREEN_TO_BASE_SURFACE
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+//----------------------------------------------------------------------------
+class ScreenToLocationHelper::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+
+  // ESRI data:
+  QPointer<Esri::ArcGISRuntime::SceneGraphicsView> m_sceneGraphicsView;
+
+  int                                           m_windowPosX        = 0;
+  int                                           m_windowPosY        = 0;
+};
+
+//----------------------------------------------------------------------------
+
+ScreenToLocationHelper::ScreenToLocationHelper(Esri::ArcGISRuntime::SceneGraphicsView *sceneGraphicsView)
+  : BaseClass(sceneGraphicsView)
+  , m_logger(getLogger("ScreenToLocationHelper"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_sceneGraphicsView = sceneGraphicsView;
+
+  // 300: SceneGraphicsView::screenToLocationCompleted signal is gone; the synchronous
+  // screenToBaseSurface() path (USE_SCREEN_TO_BASE_SURFACE) performs the computation.
+
+}
+
+ScreenToLocationHelper::~ScreenToLocationHelper()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->stop();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ScreenToLocationHelper::stop()
+{
+  if (d->m_sceneGraphicsView)
+    d->m_sceneGraphicsView->disconnect(this);
+  disconnect(this);
+  BaseClass::stop();
+}
+
+void ScreenToLocationHelper::screenToLocation(int windowPosX, int windowPosY)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " windowPosX = " << windowPosX << " windowPosY = " << windowPosY;
+
+  d->m_windowPosX = windowPosX;
+  d->m_windowPosY = windowPosY;
+
+  BaseClass::newComputationRequested();
+}
+
+void ScreenToLocationHelper::mainComputation()
+{
+  if (!d->m_sceneGraphicsView)
+    return;
+
+
+#ifdef USE_SCREEN_TO_BASE_SURFACE
+  // BUG-000109976 - Segmentation fault on Scene Viewer destruction (Esri Case #02020238)
+  // BUG on destroy of SceneView. So use 'screenToBaseSurface' instead.
+  // Difference: screenToLocations takes Building and Features into account.
+  // screenToBaseSurface uses baseSurface only.
+  const Esri::ArcGISRuntime::Point &locationMap = d->m_sceneGraphicsView->screenToBaseSurface(d->m_windowPosX, d->m_windowPosY);
+
+  emit mouseScenePositionChanged(Point3D(locationMap.x(), locationMap.y(), locationMap.z()), !locationMap.isEmpty());
+#else
+
+//  qCritical() << " ScreenX=" << d->m_windowPosX << " ScreenY=" << d->m_windowPosY;
+
+
+  const Esri::ArcGISRuntime::TaskWatcher &tw = d->m_sceneGraphicsView->screenToLocation(d->m_windowPosX, d->m_windowPosY);
+
+  if (!insertTask(tw))
+    ERROR_LOG(m_logger) << LOGFUNCTION << " screenToLocation failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " screenToLocation"
+                      << " taskId = " << tw.taskId()
+                      << " (m_windowPosX " << d->m_windowPosX << " m_windowPosY " << d->m_windowPosY << ")...";
+#endif // USE_SCREEN_TO_BASE_SURFACE
+}
+
+
+void ScreenToLocationHelper::onScreenToLocationCompleted(const QUuid &taskId, const Esri::ArcGISRuntime::Point &locationMap)
+{
+  if (!this->removeTask(taskId))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " not our task -> skip;";
+    return;
+  }
+
+
+//  qCritical() << " sceneLocation= " << " x:" << locationMap.x() << " y:" << locationMap.y() << " z:" << locationMap.z();
+
+
+  const Point3D mapCoordinate(locationMap.x(), locationMap.y(), locationMap.z());
+  //                                                            ^^^^^^^^^^^^^^^^^  depends on current map scale!?
+  // Case 02063359 [BOS] wrong Elevation with ElevationSource
+  // BUG-000111521 The elevation (z) value returned by SceneGraphicsView::screenToLocationCompleted() function depends on the current map scale
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " screenToLocationCompl "
+                      << " taskId = " << taskId
+                      << " (m_windowPosX " << d->m_windowPosX << " m_windowPosY " << d->m_windowPosY << ")..."
+                      << " (mapCoordinate " << mapCoordinate << ", z=" << locationMap.z() << ")";
+
+  emit mouseScenePositionChanged(mapCoordinate, !locationMap.isEmpty());
+}
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.h
new file mode 100755
index 000000000..1fc16c44f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/screen_to_location_helper.h
@@ -0,0 +1,73 @@
+/**
+  * @RDE_HEADER@
+  * ScreenToLocationHelper
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "screen_location_elevation_helper_base.h"
+#include <Map/map.h>
+#include <Common/situation_map_logging.h>
+
+// ESRI
+#include <SceneGraphicsView.h>
+#include <Point.h>
+
+// Qt
+#include <QObject>
+#include <QTimer>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+/**
+ * @brief The ScreenToLocationHelper class limits the load of
+ * Esri::ArcGISRuntime::SceneGraphicsView::screenToLocation
+ * (cpu load of ~50% was recognized othjerwise)
+ * This class limits this to 10 computation per second.
+ */
+class SITUATIONMAP_EXPORT ScreenToLocationHelper : public ScreenLocationElevationHelperBase
+{
+  Q_OBJECT
+
+  using BaseClass = ScreenLocationElevationHelperBase;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+  explicit ScreenToLocationHelper(Esri::ArcGISRuntime::SceneGraphicsView *sceneGraphicsView);
+  ~ScreenToLocationHelper();
+
+  void stop();
+
+  ScreenToLocationHelper(const ScreenToLocationHelper &other)      = delete;
+  ScreenToLocationHelper &operator=(ScreenToLocationHelper &other) = delete;
+  //@}
+
+  void screenToLocation(int windowPosX, int windowPosY);
+
+  void mainComputation() override;
+
+Q_SIGNALS:
+  void mouseScenePositionChanged(const Point3D &mapCoordinate, bool isValid);
+
+private Q_SLOTS:
+  void onScreenToLocationCompleted(const QUuid &taskId, const Esri::ArcGISRuntime::Point &locationMap);
+
+protected:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.cpp
new file mode 100755
index 000000000..bf02bbc9b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.cpp
@@ -0,0 +1,226 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of transient map objects for use while rubberbanding is done
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Joerg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   29.09.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+// Own
+#include "sidc_symbol_impl.h"
+#include "map_impl.h"
+
+#include <Map/bounding_box.h>
+#include <Map/coord_translation_functor.h>
+#include <Map/object_factory.h>
+
+#include <GraphicalObjects/stub_graphical_object.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+#include <Envelope.h>
+#include <Graphic.h>
+
+
+//Qt
+#include <QPointF>
+
+
+namespace SituationMap
+{
+
+
+SidcSymbolImpl::SidcSymbolImpl(const QString &debugInfo) : SidcSymbolImpl(QString(), debugInfo) {;}
+
+SidcSymbolImpl::SidcSymbolImpl(const QString &sidc, const QString &debugInfo)
+  : InterfaceClass()          // Interface
+  , BaseClass(debugInfo)      // Implementation
+  , m_sidc(sidc)
+  , m_color(0, 0, 0, 0)
+  , m_logger(getLogger("SIDC_SymbolImpl"))
+{
+  m_visibility          = true;
+  m_visibilityTactical  = true;
+  m_visibilityTechnical = false;
+  m_selected            = false;
+  m_pickable            = false;
+
+  m_positions.setMapObjectImpl(this);
+
+} /* SidcSymbolImpl::SidcSymbolImpl */
+
+
+PositionCont SidcSymbolImpl::positions()                                               const { return m_positions.positions();      }
+void            SidcSymbolImpl::setPositions(const PositionCont &posCont)                    { m_positions.setPositions(posCont); }
+
+PositionCont SidcSymbolImpl::positionsTranslated()                                     const { return m_positions.positionsTranslated();      }
+void            SidcSymbolImpl::setPositionsTranslated(const PositionCont &posCont)          { m_positions.setPositionsTranslated(posCont); }
+
+LineStyle       SidcSymbolImpl::lineStyle()                                            const { return BaseClass::lineStyle();       }
+LineStyle      &SidcSymbolImpl::rLineStyle()                                                 { return BaseClass::rLineStyle();      }
+void            SidcSymbolImpl::setLineStyle(const LineStyle &lineStyle)                     { BaseClass::setLineStyle(lineStyle);  }
+FillStyle       SidcSymbolImpl::fillStyle()                                            const { return BaseClass::fillStyle();       }
+FillStyle      &SidcSymbolImpl::rFillStyle()                                                 { return BaseClass::rFillStyle();      }
+void SidcSymbolImpl::setFillStyle(const FillStyle &fillStyle)                                { BaseClass::setFillStyle(fillStyle);  }
+
+float SidcSymbolImpl::scale()                                                          const { return (m_tacticalAppearance) ? m_tacticalAppearance->scale() : 1;   }
+void  SidcSymbolImpl::setScale(float scale)                                                  { if (m_tacticalAppearance) m_tacticalAppearance->setScale(scale); }
+
+
+const QString &SidcSymbolImpl::sidc() const { return m_symbol.value().sidc; }
+
+const QColor &SidcSymbolImpl::color() const { return m_color; }
+
+
+void SidcSymbolImpl::boundingBox(BoundingBox &bbox) const
+{
+  if (m_tacticalAppearance)
+  {
+    SituationMap::CoordTranslationFunctor *coordTransFunctor = nullptr;
+    if (const_cast<SidcSymbolImpl *>(this)->mapImpl())
+    {
+      // if useful, a MapObjectType specific functor can be prefered here:
+      // like: if (m_mapObjectImpl->coordTranslationFunctor()) ctFunctor=m_mapObjectImpl->coordTranslationFunctor();
+      coordTransFunctor = const_cast<SidcSymbolImpl *>(this)->mapImpl()->coordTranslationFunctor();
+    }
+
+    if (coordTransFunctor)
+    {
+      const Esri::ArcGISRuntime::Envelope &extent = m_tacticalAppearance->getGraphicGeometry().extent();
+
+      const QPointF &min = coordTransFunctor->mapToGeographic(extent.xMin(), extent.yMin());
+      const QPointF &max = coordTransFunctor->mapToGeographic(extent.xMax(), extent.yMax());
+      const QPointF &center = (min + max) * 0.5;
+      bbox = BoundingBox(BoundingBox::ExtentType::Sim, Point3D::fromQPointF(center), max.x() - min.x(), max.y() - min.y());
+    }
+  }
+} // void SidcSymbolImpl::boundingBox(BoundingBox &bbox) const
+
+
+void SidcSymbolImpl::setSidc(const QString &sidc)
+{
+  SymbolData symbolData = symbol();
+  symbolData.sidc = sidc;
+  symbolData.useAlwaysDictionaryRenderer = (!AdvancedSymbology::SidcCodec::isCivil(sidc));
+  setSymbol(symbolData);
+  m_sidc = sidc;
+} // void SidcSymbolImpl::setSidc( const QString & sidc )
+
+
+
+void SidcSymbolImpl::setColor(const QColor &color)
+{
+  m_color = color;
+} // void SidcSymbolImpl::setColor(const QColor & color)
+
+
+const QMap<QString, QVariant> &SidcSymbolImpl::attributeMap() const { return m_symbol.value().attributeMap; }
+
+
+void SidcSymbolImpl::setAttributeMap(const QMap<QString, QVariant> &attrMap)
+{
+  SymbolData symbolData = symbol();
+  symbolData.attributeMap = attrMap;
+  setSymbol(symbolData);
+} // SidcSymbolImpl::setAttributeMap(const QMap<QString, QVariant> & attrMap)
+
+
+void SidcSymbolImpl::defineSymbol(const QString &sidc, const PositionCont &posCont, const QMap<QString, QVariant> &attrMap, const QColor &color)
+{
+  SymbolData symbolData = symbol();
+  symbolData.sidc         = sidc;
+  symbolData.attributeMap = attrMap;
+  symbolData.color        = (color.alpha() < 1) ? QColor(0, 0, 0, 0) : color;
+  symbolData.useAlwaysDictionaryRenderer = (!AdvancedSymbology::SidcCodec::isCivil(sidc));
+  setSymbol(symbolData);
+  m_sidc  = sidc;
+  m_color = color;
+  m_positions.setPositions(posCont);
+} // void SidcSymbolImpl::defineSymbol( const QString & sidc, const PositionCont & posCont, const QMap<QString, QVariant> & attrMap )
+
+
+bool SidcSymbolImpl::updateViewImplPre()
+{
+  return BaseClass::updateViewImplPre();
+} // SidcSymbolImpl::updateViewImplPre
+
+
+bool SidcSymbolImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  // REGG-5261 - Alle Wirkfelder blinken in 3D, wenn C-Kampf ausgelöst ist
+  // War mit 100.4 meist, aber nicht immer reproduzierbar.
+  // Wenn aber per FunctionsDialog die TacticalAppearance sichtbar wurde,
+  // so war ein massives Flackern erkennbar.
+  // Daher wird die Ausdehnung nur an SICHTBARE m_tacticalAppearance übergeben
+  // [basic_path_object, sidc_symbol_impl]
+  if (m_tacticalAppearance && m_tacticalAppearance->visibility())
+  {
+    m_tacticalAppearance->setSymbol(m_symbol.value());
+    m_tacticalAppearance->setPositions(m_positions.positionsTranslated());
+    this->resetTacticalAppearanceDrawOrderOffset(); // avoid tacticalAppearance getting drawOrderOffset (2)
+  }
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+  else
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+} /* SidcSymbolImpl::updateViewImpl */
+
+
+
+bool SidcSymbolImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!mapImpl) return false;
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (success)
+  {
+    if (!m_mainGraphicalObject) m_mainGraphicalObject = new StubGraphicalObject();
+
+    m_symbol.refValue().sidc  = m_sidc;
+    m_symbol.refValue().color = (m_color.alpha() < 255) ? QColor(0, 0, 0, 0) : m_color; // to avoid color replacement (use default color)
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  }
+  else ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  return success;
+} /* SidcSymbolImpl::init */
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.h
new file mode 100755
index 000000000..c9e185191
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sidc_symbol_impl.h
@@ -0,0 +1,145 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of transient map objects for use while rubberbanding is done
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   29.09.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#pragma once
+
+#include "Map/sidc_symbol.h"
+#include "abstract_map_object_impl.h"
+#include "coordinate_translation.h"
+
+#include <QString>
+#include <QColor>
+
+
+
+namespace SituationMap
+{
+
+/**
+  @class SIDC_SymbolImpl SIDC_SymbolImpl.h
+  The class \c SIDC_SymbolImpl creates a tactical symbol due a sidc code. It is used by class
+  TransientTacticalSymbol to display transient tactical symbols during rubberband input is done.
+
+  @see TransientTacticalSymbol
+*/
+class SITUATIONMAP_EXPORT SidcSymbolImpl : public virtual SidcSymbol, public virtual AbstractMapObjectImpl
+{
+  using InterfaceClass = SituationMap::SidcSymbol;
+  using BaseClass      = SituationMap::AbstractMapObjectImpl;
+
+public:
+
+  /**
+    @name Construction & Destruction
+    @{
+  */
+  explicit SidcSymbolImpl(const QString &debugInfo = QString());
+  explicit SidcSymbolImpl(const QString &sidc, const QString &debugInfo);
+
+  SidcSymbolImpl(const SidcSymbolImpl &other) = delete;
+  SidcSymbolImpl &operator=(SidcSymbolImpl &other) = delete;
+  /** @} */
+
+  /**
+    @name Overloaded functions from base class
+    @see AbstractMapObject
+    @{
+  */
+  PositionCont positions() const override;
+  void         setPositions(const PositionCont &posCont) override;
+
+  virtual PositionCont positionsTranslated() const;
+  virtual void         setPositionsTranslated(const PositionCont &posCont);
+
+  LineStyle  lineStyle()  const override;
+  LineStyle &rLineStyle()       override;
+  void       setLineStyle(const LineStyle &lineStyle) override;
+
+  FillStyle  fillStyle()  const override;
+  FillStyle &rFillStyle()       override;
+  void       setFillStyle(const FillStyle &fillStyle) override;
+
+  float scale() const override;
+  void  setScale(float scale) override;
+  /** @} */
+
+  const QString &sidc() const override;
+  void           setSidc(const QString &) override;
+
+  const QColor &color() const override;
+  void          setColor(const QColor &color = QColor(0, 0, 0, 0)) override;
+
+  const QMap<QString, QVariant> &attributeMap() const override;
+  void                           setAttributeMap(const QMap<QString, QVariant> &attrMap) override;
+
+  void defineSymbol(const QString &sidc,
+                    const PositionCont &posCont,
+                    const QMap<QString, QVariant> &attrMap,
+                    const QColor &color = QColor(0, 0, 0, 0)) override;
+
+  /**
+    Overloaded from base class to implement the construction of GraphicalObjects.
+  */
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName = QStringLiteral("GraphicsLayer")) override;
+
+  void boundingBox(BoundingBox &bbox) const override;
+
+protected:
+
+  /**
+    The function \c updateViewImplPre implementents how to begin transfer values to view. It is been called
+    after changing values from AbstractMapObject::updateView() before calling \c updateViewImplPre().
+    @see AbstractMapObject
+  */
+  bool updateViewImplPre() override;
+
+  /**
+    The function \c updateViewImpl implementents how to transfer values to view. It is been called
+    after changing values from AbstractMapObject::updateView().
+    @see AbstractMapObject
+  */
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+
+
+  QString              m_sidc;
+  QColor               m_color;
+  PositionsTranslated  m_positions;
+
+private:
+
+  LOGGER_T         m_logger;      ///< Interface of the Logging-Facility
+
+}; /* SidcSymbolImpl */
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.cpp
new file mode 100755
index 000000000..6b5614cf0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.cpp
@@ -0,0 +1,801 @@
+
+/*
+** -----------------------------------------------------------------------------------------------
+**
+** @RDE_HEADER@
+** Implementation of fan of sight
+** $Id$
+** $HeadURL : svn ://192.168.133.21/TDS/branches/product/devel/trunk/Lts/Viewer/SituationMap/Rubberbands/rubberband.cpp $
+** $Author : ehrlicher $
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware - Environment : Intel - PC
+** Software - Environment : Windows 7, Qt 5.x.ArcGISRuntimeQt 100.2
+**
+** Language ........ : C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Autor ........... : Nikolaus Hanekamp, SEDG, Tel. 2906
+**                     Jörg Turla, SPDG, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notices ......... :
+**
+**   01.02.2005, NH : Urversion
+**   15.05.2018, JT : adapting GeISiR source to SituationMap
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "sight_fan_impl.h"
+
+#include <GraphicalObjects/graphical_object_path.h>
+
+#include <Map/bounding_box.h>
+#include <Map/coord_translation_functor.h>
+
+#include <MapImpl/layer_factory_impl.h>
+#include <MapImpl/map_impl.h>
+#include <ElevationMap/elevation_map_manager.h>
+
+#include <MathUtils/math_const.h>
+
+#include <Surface.h>
+
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVector>
+#include <QTimer>
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+
+namespace SituationMap
+{
+
+//  class SightFanImpl::Internal;
+
+
+enum SightMode { VISIBLE = 0, INVISIBLE, UNDEFINED, START };
+
+
+class SightEntry
+{
+public:
+
+  SightEntry() : _dist(0.0), _mode(START)                             {;}
+  SightEntry(double dist, SightMode mode) : _dist(dist), _mode(mode)  {;}
+
+  ~SightEntry() = default;
+
+  double & dist()    { return _dist; }
+  SightMode & mode() { return _mode; }
+
+  double dist()    const { return _dist; }
+  SightMode mode() const { return _mode; }
+
+private:
+
+  double      _dist;
+  SightMode   _mode;
+
+}; // SightEntry
+
+
+
+class SightBeam : public Referenced
+{
+public:
+
+  explicit SightBeam(int beamId, const QPointF &directionB, const QPointF &directionE)
+    : _beamId(beamId)
+    , _directionBeg(directionB)
+    , _directionEnd(directionE)
+    , _sightEntryVec()
+    , _graphicalQuadVec()            {;}
+
+  SightBeam() = delete;
+  ~SightBeam() = default;
+
+  QPointF direction() const
+  {
+    auto normalize = [](const QPointF &v) -> QPointF
+    {
+      double l = sqrt(v.x()*v.x() + v.y()*v.y());
+      return v / l;
+    };
+
+    return normalize(QPointF((_directionBeg + _directionEnd)*0.5));
+  } // QPointF direction()
+
+
+  void add(const SightEntry &sightE)
+  {
+    _sightEntryVec.push_back(sightE);
+  } // void add( const SightEntry &sightE)
+
+  void clear() { _sightEntryVec.clear(); }
+
+  // void draw(const QPointF &beamCenter, osg::Matrixd mat, QColor colors[]); // todo: Farbtabelle
+
+  void updateGraphic( MapImpl *mapImpl, AbstractMapObjectImpl *meMapObj, SightFanImpl::Internal * sightFanInternal );
+
+  int                       _beamId;
+
+protected:
+
+  QPointF                   _directionBeg;  // Einheitsvektoren die den Beam begrenzen
+  QPointF                   _directionEnd;
+
+  using SightEntryVec = QVector<SightEntry>;
+
+  SightEntryVec             _sightEntryVec;
+
+  QVector<QSharedPointer<GraphicalObjectPath>> _graphicalQuadVec;
+
+}; /* SightBeam */
+
+
+class SightFanImpl::Internal
+{
+public:
+
+  using SightBeamVec =  std::vector<RefPointer<SightBeam>> ;
+
+  QString             m_layerName;
+  std::shared_ptr<ElevationMapManager> m_eMapManager;
+  QPointF             m_center;
+  double              m_centHat;
+  double              m_objHat;
+  double              m_radius;
+  double              m_innerRadius;
+  double              m_startAngle;
+  double              m_dAngle;
+  unsigned int        m_nrFans;
+
+  double              m_alpha;
+
+  QRectF              m_location; // Lage des SightFans in Kartenkoordinaten
+
+  SightBeamVec        m_sightBeamVec;
+
+  QColor              m_colors[3]; // 0 : visibleCol, 1 : invisibleCol, 2 : undefinedCol
+
+  QColor              m_fanColorVec[2][4];
+
+  float               m_fanMult;   // Farbabsenkung jedes 2. Beams  < 1.0 !
+
+  MapImpl                      *m_mapImpl;
+  Esri::ArcGISRuntime::Surface *m_surface;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  Internal()
+    : m_layerName()
+    , m_center()
+    , m_centHat(1.8)
+    , m_objHat(0.5)
+    , m_radius(0.0)
+    , m_innerRadius(0.0)
+    , m_startAngle(0.0)
+    , m_dAngle(2.0*MathConst::pi/180)
+    , m_nrFans(180)
+    , m_alpha(0.8)
+    , m_fanMult(0.75)
+    , m_mapImpl(nullptr)
+    , m_surface(nullptr)
+    , m_logger(getLogger("SightFanImpl"))
+  {;}
+
+
+  void setFanColorMap( double brightness, double bias, double alpha)
+  {
+    for (int i = 0; i < 3; i++)
+    {
+      double r = (m_colors[i].redF()   * brightness) + bias;
+      double g = (m_colors[i].greenF() * brightness) + bias;
+      double b = (m_colors[i].blueF()  * brightness) + bias;
+      double a =  m_colors[i].alphaF() * alpha;
+
+      m_fanColorVec[0][i] = QColor::fromRgbF(r,g,b,a);
+      m_fanColorVec[1][i] = QColor::fromRgbF(r*m_fanMult,g*m_fanMult,b*m_fanMult,a);
+
+    }
+    m_fanColorVec[0][3] = m_fanColorVec[0][2];
+    m_fanColorVec[1][3] = m_fanColorVec[1][2];
+  } // void setFanColorMap()
+
+
+}; // SightFanImpl::Internal
+
+
+SightFanImpl::SightFanImpl( const QString &debugInfo )
+  : SightFan()
+  , QObject()
+  , AbstractMapObjectImpl(debugInfo)
+  , m_internal(new Internal())
+  , m_moveDelayTimer(new QTimer(this))
+
+{
+  initColors();
+  m_internal->setFanColorMap(1, 0, 1);
+  m_moveDelayTimer->setSingleShot(true);
+  m_moveDelayTimer->setInterval(250ms);
+  connect(m_moveDelayTimer, &QTimer::timeout, this, &SightFanImpl::delayedMove);
+} //  SightFanImpl::SightFanImpl
+
+
+SightFanImpl::~SightFanImpl()
+{
+  delete m_internal;
+} // SightFanImpl::~SightFanImpl()
+
+
+void SightFanImpl::initColors()
+{
+  m_internal->m_fanMult = 0.75;
+  m_internal->m_colors[0] = QColor(0, 255, 0, 180);
+  m_internal->m_colors[1] = QColor(255, 0, 0, 180);
+  m_internal->m_colors[2] = QColor(0, 0, 255, 180);
+} // void SightFanImpl::initColors()
+
+
+void SightFanImpl::setFanColor( const QColor &visible, const QColor &invisible, const QColor &undefined)
+{
+  m_internal->m_colors[0] = visible;
+  m_internal->m_colors[1] = invisible;
+  m_internal->m_colors[2] = undefined;
+} // void SightFanImpl::setFanColor( const QColor &visible, const QColor &invisible, const QColor &undefined)
+
+
+void SightFanImpl::setFanColorMark( float colMult)
+{
+  if( colMult > 1.0)
+    colMult = 1.0;
+  if( colMult < 0.0)
+    colMult = 0.0;
+
+  m_internal->m_fanMult = colMult;
+} // void SightFanImpl::setFanColorMark( float colMult)
+
+
+void SightFanImpl::setCenter(const QPointF &center)                   { m_internal->m_center      = center;                       }
+void SightFanImpl::setCenter(const Point3D &center)                   { m_internal->m_center      = center.toPointF();
+                                                                        m_internal->m_centHat     = center.z();                   }
+
+void SightFanImpl::setCenter(const QPointF &center, double centerHat) { m_internal->m_center      = center;
+                                                                        m_internal->m_centHat     = centerHat;                    }
+
+void SightFanImpl::setCenterHat(double centerHat)                     { m_internal->m_centHat     = centerHat;                    }
+void SightFanImpl::setObjectHat(double objHat)                        { m_internal->m_objHat      = objHat;                       }
+
+void SightFanImpl::setRadius(double radius)                           { m_internal->m_radius      = radius;                       }
+void SightFanImpl::setInnerRadius(double radius)                      { m_internal->m_innerRadius = radius;                       }
+void SightFanImpl::setStartAngle(double startAngle)                   { m_internal->m_startAngle  = startAngle;                   }
+void SightFanImpl::setdeltaAngle(double dAngle)                       { m_internal->m_dAngle      = dAngle;                       }
+void SightFanImpl::setNoOfFans(double noFans)                         { m_internal->m_nrFans      = noFans;                       }
+
+
+void SightFanImpl::setAlpha(double alpha)
+{
+  if (alpha < 0.0) alpha = 0.0;
+  if (alpha > 1.0) alpha = 1.0;
+
+  m_internal->m_alpha = alpha;
+} // void SightFanImpl::setAlpha(double alpha)
+
+
+QPointF       SightFanImpl::center()      const { return m_internal->m_center;      }
+double        SightFanImpl::centerHat()   const { return m_internal->m_centHat;     }
+double        SightFanImpl::objectHat()   const { return m_internal->m_objHat;      }
+double        SightFanImpl::innerRadius() const { return m_internal->m_innerRadius; }
+double        SightFanImpl::radius()      const { return m_internal->m_radius;      }
+double        SightFanImpl::startAngle()  const { return m_internal->m_startAngle;  }
+double        SightFanImpl::dAngle()      const { return m_internal->m_dAngle;      }
+double        SightFanImpl::alpha()       const { return m_internal->m_alpha;       }
+unsigned int  SightFanImpl::noOfFans()    const { return m_internal->m_nrFans;      }
+
+bool SightFanImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  if (mapImpl)
+  {
+    m_internal->m_mapImpl     = mapImpl;
+    m_internal->m_layerName   = logicalLayerName;
+    m_internal->m_eMapManager = mapImpl->getElevationMapManager();
+
+    if (!m_internal->m_eMapManager)
+    {
+      ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " failure, no ElevationMapManager";
+      return false;
+    }
+    if (!AbstractMapObjectImpl::init(mapImpl, logicalLayerName))
+    {
+      ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " failure, AbstractMapObjectImpl::init failed";
+      return false;
+    }
+    return true;
+  }
+  ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " init SightFanImpl failed";
+  return false;
+} // bool SightFanImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+
+
+void SightFanImpl::boundingBox(BoundingBox &bbox) const
+{
+  bbox.reset();
+
+  CoordTranslationFunctor * coordTransFunc = m_internal->m_mapImpl->coordTranslationFunctor();
+
+  if (coordTransFunc)
+  {
+    const QPointF &centerMap = coordTransFunc->geographicToMap(m_internal->m_center);
+    double         diameter  = 2 * m_internal->m_radius;
+
+    bbox = BoundingBox( BoundingBox::ExtentType::Sim, Point3D::fromQPointF(centerMap), diameter, diameter );
+  }
+} // void SightFanImpl::boundingBox(BoundingBox &bbox) const
+
+//---------------------------------------------------------------------------------------------------
+
+void SightFanImpl::initFan( const Point3D &center
+                            , double         objHat
+                            , double         radius
+                            , double         innerRadius
+                            , double         startAngle
+                            , double         dAngle
+                            , unsigned int   nrFans
+                            , double         alpha )
+{
+  initFan( center.toPointF(), center.z(), objHat, radius, innerRadius, startAngle, dAngle, nrFans, alpha );
+} // void SightFanImpl::init(...)
+
+
+void SightFanImpl::initFan( const QPointF         &center
+                            , double                 centHat
+                            , double                 objHat
+                            , double                 radius
+                            , double                 innerRadius
+                            , double                 startAngle
+                            , double                 dAngle
+                            , unsigned int           nrFans
+                            , double                 alpha  )
+{
+  if (!m_internal->m_mapImpl)
+  {
+    ERROR_LOG(m_internal->m_logger) << LOGFUNCTION << " no mapImpl";
+    return;
+  }
+
+  if (alpha < 0.0) alpha = 0.0;
+  if (alpha > 1.0) alpha = 1.0;
+
+  m_internal->m_center      = center;
+  m_internal->m_centHat     = centHat;
+  m_internal->m_objHat      = objHat;
+  m_internal->m_radius      = radius;
+  m_internal->m_innerRadius = innerRadius;
+  m_internal->m_startAngle  = startAngle;
+  m_internal->m_dAngle      = (dAngle < 0) ? -dAngle : dAngle;
+  m_internal->m_nrFans      = nrFans;
+  m_internal->m_alpha       = alpha;
+
+  QPointF offc(m_internal->m_radius, -m_internal->m_radius);
+  m_internal->m_location = QRectF(m_internal->m_center - offc, m_internal->m_center + offc);
+
+  if ((m_internal->m_nrFans*m_internal->m_dAngle) > (MathConst::pi*2.0))
+  {
+    m_internal->m_nrFans = floor((MathConst::pi*2.0) / m_internal->m_dAngle + 0.5);  // To avoid error with floor; 30.3.2006 JT
+  }
+
+  calculateSightBeamVec();
+
+} /* SightFan::SightFan */
+
+
+void SightFanImpl::calculateSightBeamVec()
+{
+  m_internal->m_sightBeamVec.clear();
+
+  double dAlfa = (m_internal->m_dAngle / 2.0) + 0.00025; // 0.00025 wegen Überlappung, auf antialiazed Systemen nicht nötig
+
+  for (unsigned int i = 0; i < m_internal->m_nrFans; i++)
+  {
+    double alfa = m_internal->m_startAngle + m_internal->m_dAngle * i;
+    double alfaBeg = alfa - dAlfa;
+    double alfaEnd = alfa + dAlfa;
+
+    RefPointer<SightBeam> sBeam = RefPointer<SightBeam>(new SightBeam(i, QPointF(cos(alfaBeg), sin(alfaBeg)), QPointF(cos(alfaEnd), sin(alfaEnd))));
+    calculateSightBeam(*(sBeam.get()));
+    m_internal->m_sightBeamVec.push_back(sBeam);
+  }
+} //  void SightFanImpl::calculateSightBeamVev()
+
+
+void SightFanImpl::move(const QPointF &center, double centHat, double objHat)
+{
+
+  m_internal->m_centHat = centHat;
+  m_internal->m_objHat  = objHat;
+  move(center);
+} // void SightFanImpl::move(ElevationMap &eMap, QPointF &center, double centHat, double objHat)
+
+
+void SightFanImpl::move(const QPointF & center)
+{
+  m_moveDelayedCenter = center;
+  m_moveDelayTimer->start();
+
+}
+
+void SightFanImpl::show()
+{
+  move( m_internal->m_center );
+} // void SightFanImpl::show
+
+
+bool SightFanImpl::updateViewImplPre()
+{
+  return true;
+} // bool SightFanImpl::updateViewImplPre()
+
+
+bool SightFanImpl::updateViewImpl()
+{
+  show();
+  return true;
+} // bool SightFanImpl::updateViewImpl()
+
+
+bool SightFanImpl::updateViewImplPost()
+{
+  return true;
+} // bool SightFanImpl::updateViewImplPost()
+
+
+inline QPointF mittelBreitenRechnung(const QPointF &start, const QPointF &direction, double distance)
+{
+//  ---------------------------------------------------------------
+//  Vec2d mittelBreitenRechnung( Vec2d start, Vec2d direction, double distance )
+
+//  Berechnet näherungsweise die Koordinate der Endposition eines
+//  Beams gemäß der ersten Aufgabe der Besteckrechnung durch das
+//  Verfahren der Mittelbreite.
+//  Siehe http://astrosail.de/de/static/tutorial/best3.php?cat=42
+
+//  Start ist die Anfangskoordinate im Bogenmaß, direction der
+//  normierte Richtungsvektor, distance die Entfernung in Metern.
+//  ---------------------------------------------------------------
+  double cosKurs = direction.y();
+  double sinKurs = direction.x();
+  double distanceBogen = distance / MathConst::EarthRadius;
+  double lat = distanceBogen * cosKurs + start.y();
+  double mittelbreite = (start.y() + lat) * 0.5;
+  double lon = distanceBogen * sinKurs / cos(mittelbreite) + start.x();
+  return {lon, lat};
+}
+
+inline QPointF endOfBeam( const QPointF &start, const QPointF &direction, double distance )
+{
+  return mittelBreitenRechnung(start,direction,distance);
+}
+
+
+void SightFanImpl::calculateSightBeam(SightBeam &sBeam)
+{
+  const QPointF &direction = sBeam.direction();
+  const QPointF &end       = endOfBeam(m_internal->m_center, direction, m_internal->m_radius);
+
+  LOSVector losProfile;
+  m_internal->m_eMapManager->LOSProfile(m_internal->m_center, end, losProfile);
+  calculateSightBeam(losProfile, sBeam);
+  sBeam.updateGraphic(m_internal->m_mapImpl, this, m_internal);
+} // void SightFanImpl::calculateSightBeam(ElevationMap &eMap, SightBeam &sBeam)
+
+
+void SightFanImpl::calculateSightBeam( const LOSVector &losProfile, SightBeam &sBeam )
+{
+  sBeam.clear();
+
+  if (losProfile.empty()) // Startpunkt undefiniert oder ausserhalb der Karte
+  {
+    sBeam.add( SightEntry(m_internal->m_innerRadius, START) );
+    sBeam.add( SightEntry(m_internal->m_radius, UNDEFINED) );
+    return;
+  }
+
+  LOSVector::const_iterator itr = losProfile.begin();
+  double centerHeight = itr->height() + m_internal->m_centHat;
+
+  double d1 = 0.0;
+  double height1 = itr->height();
+
+  // überspringen bis _innerRadius erreicht ist !
+  while(++itr != losProfile.end())
+  {
+    double d2 = itr->dist(); // *EarthRadius;
+    double height2 = itr->height();
+    if (d2 >= m_internal->m_innerRadius)
+    {
+      height1 = height1 + (m_internal->m_innerRadius - d1) * ( height2 - height1)/(d2 - d1);
+      d1 = m_internal->m_innerRadius;
+      --itr;
+      break;
+    }
+    d1 = d2;
+    height1 = height2;
+  }
+
+  //    bool visible = true;
+  SightMode mode = START;
+
+  double curM = (height1 - centerHeight ) / d1;     // bestimmende Steigung
+
+  sBeam.add(SightEntry( d1, START));
+
+  if (itr != losProfile.end())
+  {
+    while (++itr != losProfile.end())
+    {
+      double  d2      = itr->dist(); // *EarthRadius;
+      double  height2 = itr->height();
+
+      if (std::isnan(height2)) // Undefined
+      {
+        if (mode != START)
+        {
+          sBeam.add(SightEntry(d1, mode));
+        }
+        mode = UNDEFINED;
+        break;
+      }
+
+      double hObj = (height2 + m_internal->m_objHat - centerHeight );
+      double objM = hObj / d2;          // Steigung bezogen auf Objekte( Objekte verdecken nicht !)
+
+      SightMode newMode = ((objM >= curM)) ? VISIBLE : INVISIBLE;
+
+      if(newMode != mode)
+      {
+        if ((mode != START) && (d2 != d1))
+        {
+          // Korrekturwert für Distanz berechnen, unter Berücksichtigung der Objekthoehe !!
+          double localM = (height2 - height1) /(d2 -d1);
+          // localM == curM kann nicht auftreten, da newMode != mode
+          double dCorr = (hObj - (curM * d2)) / (localM - curM);
+
+          if (dCorr < 0.0)
+            dCorr = 0.0;
+          dCorr = d2 - dCorr;
+          if (dCorr  < d1)
+            dCorr = d1;
+
+          sBeam.add( SightEntry( dCorr, mode) );
+        }
+        mode = newMode;
+      }
+
+      double terrM = (height2 - centerHeight) / d2;      // Steigung bezogen auf Gelaende
+      if (terrM >= curM)
+      {
+        curM = terrM;  // neue bestimmende Steigung
+      }
+
+      height1 = height2;
+      d1 = d2;
+    } /* while */
+  }
+  sBeam.add( SightEntry(m_internal->m_radius, mode) );
+}
+/*!
+ * \brief SightFanImpl::delayedMove
+ * \param center
+ * \details Delays the move call to prevent crash of map beacause of the heavy load while moving
+ */
+void SightFanImpl::delayedMove()
+{
+  m_internal->m_center = m_moveDelayedCenter;
+
+  m_internal->setFanColorMap(1, 0, 1);
+
+  QPointF offc(m_internal->m_radius, -m_internal->m_radius);
+  m_internal->m_location = QRectF(m_internal->m_center - offc, m_internal->m_center + offc);
+
+  if (m_internal->m_nrFans == m_internal->m_sightBeamVec.size())
+  {
+    for (RefPointer<SightBeam> sBeam : qAsConst(m_internal->m_sightBeamVec))
+    {
+      calculateSightBeam(*sBeam.get());
+    }
+  }
+  else
+  {
+    calculateSightBeamVec();
+  }
+}
+
+
+void SightBeam::updateGraphic(MapImpl *mapImpl, AbstractMapObjectImpl *meMapObj, SightFanImpl::Internal *sightFanInternal)
+{
+  if (!mapImpl || !meMapObj || !sightFanInternal)
+    return;
+
+  if (_sightEntryVec.size() <= 1)
+    return;
+
+  Esri::ArcGISRuntime::GraphicsOverlay *graphicLayer = sightFanInternal->m_mapImpl->getGraphicsLayer(sightFanInternal->m_layerName);
+  if (!graphicLayer)
+  {
+    ERROR_LOG(sightFanInternal->m_logger) << LOGFUNCTION << " Creating graphic overlayer \'" << sightFanInternal->m_layerName << "\' failed. Can't render sight fan";
+    return;
+  }
+
+  // _sightEntryVec[0] is SightMode::START
+
+  // resize _graphicalQuadVec according _sightEntryVec
+  // (_sightEntryVec.size() <= 1 is chexck above)
+  const int newGraphicalSize = _sightEntryVec.size() - 1;
+  _graphicalQuadVec.resize(newGraphicalSize);
+
+  CoordTranslationFunctor *geoToMap = sightFanInternal->m_mapImpl->coordTranslationFunctor();
+
+  int                       quadNo  = 0;
+  SightEntryVec::iterator   itr     = _sightEntryVec.begin();
+
+  const QPointF &center = sightFanInternal->m_center;
+  QPointF v0 = endOfBeam(center, _directionBeg, itr->dist());
+  QPointF v1 = endOfBeam(center, _directionEnd, itr->dist());
+
+  if (geoToMap)
+  {
+    v0 = geoToMap->geographicToMap(v0);
+    v1 = geoToMap->geographicToMap(v1);
+  }
+
+  PositionCont locationVec;
+
+  // skip first, we know mode==SightMode::START
+  while (++itr != _sightEntryVec.end())
+  {
+    // GraphicalObjectPath already created :
+    QSharedPointer<GraphicalObjectPath> &spGopRef = _graphicalQuadVec[quadNo];
+    if (!spGopRef)
+    {
+      GraphicalObjectPath * grQuad = new GraphicalObjectPath( GraphicalObjectPathType::Polygon
+                                                              , mapImpl->getEsriGeoView()
+                                                              , graphicLayer
+                                                              , QStringLiteral("FanOfSight-Beam-%1").arg(_beamId)
+                                                              , meMapObj->uniqueMapId() );
+      grQuad->setPickable(false);
+      grQuad->rLineStyle().setLinePattern(LinePattern::Null);
+      grQuad->rFillStyle().setFillPattern(FillPattern::Solid);
+
+      // write to _graphicalQuadVec
+      spGopRef = QSharedPointer<GraphicalObjectPath>(grQuad);
+    }
+    // : GraphicalObjectPath already created
+
+    GraphicalObjectPath * grQuad    = _graphicalQuadVec[quadNo].data();
+    Q_ASSERT_X(grQuad, "SightBeam", "GraphicalObjectPath invalid");
+
+    SightMode             mode      = itr->mode();
+    double                dist      = itr->dist();
+    QColor                quadColor = sightFanInternal->m_fanColorVec[_beamId % 2][int(mode)];
+
+    quadColor.setAlphaF( quadColor.alphaF()*sightFanInternal->m_alpha );
+
+    grQuad->rFillStyle().setFillColor(quadColor);
+
+    QPointF v2 = endOfBeam(center, _directionBeg, dist);
+    QPointF v3 = endOfBeam(center, _directionEnd, dist);
+
+    if (geoToMap)
+    {
+      v2 = geoToMap->geographicToMap(v2);
+      v3 = geoToMap->geographicToMap(v3);
+    }
+
+    locationVec.clear();
+    locationVec << Point3D::fromQPointF(v0);
+    locationVec << Point3D::fromQPointF(v1);
+    locationVec << Point3D::fromQPointF(v2);
+    locationVec << Point3D::fromQPointF(v3);
+
+    grQuad->setPositions(locationVec);
+
+    grQuad->updateView();
+
+    v0 = v3;
+    v1 = v2;
+
+    ++quadNo;
+  } /* while */
+
+} // void SightBeam::updateGraphic(MapImpl *mapImpl, AbstractMapObjectImpl *meMapObj, SightFanImpl::Internal *sightFanInternal)
+
+
+#ifdef NEVER
+bool SightFan::draw( const AbstractView * const view, osg::Matrixd mat, 
+                     float alpha, float brightness, float bias, MapObject::RenderState rstate ) // todo: Farbtabelle
+{
+  if ((rstate & _renderState) == 0) return false;
+
+  if( !( _location.intersects( view->rectBound()) )) return false;  // isCulled
+
+
+  ColorVec  colors[2][4];
+  for( int i = 0; i < 3; i++)
+  {
+    colors[0][i] = (_colors[i] * brightness) + bias;
+    colors[1][i] = colors[0][i] * _fanMult;
+    colors[0][i].alpha = alpha * _colors[i].alpha;
+    colors[1][i].alpha = alpha * _colors[i].alpha;
+  }
+  colors[0][3] = colors[0][2];
+  colors[1][3] = colors[1][2];
+
+  GLint shadeModel;
+
+  glGetIntegerv( GL_SHADE_MODEL, &shadeModel );
+  glShadeModel(GL_FLAT);
+  glEnable( GL_BLEND);
+
+  int n = 0;
+  for( SightBeamVec::iterator itr = _sightBeamVec.begin(); itr != _sightBeamVec.end(); ++itr)
+  {
+    (*itr).get()->draw( _center, mat, colors[(++n)%2]);
+  }
+
+  glDisable( GL_BLEND);
+  glShadeModel(shadeModel);
+  return true;
+} /* SightFan::draw */
+
+
+
+void SightBeam::draw( Vec2d center, osg::Matrixd mat, ColorVec colors[])  // todo: Farbtabelle !?
+{
+  float z = 0;
+
+  if( _sightEntryVec.size() <= 1) return;
+
+  SightEntryVec::iterator itr = _sightEntryVec.begin();
+
+  Vec2d v0 = endOfBeam( center, _directionBeg, (*itr).dist() );
+  Vec2d v1 = endOfBeam( center, _directionEnd, (*itr).dist() );
+
+  osg::Vec3d _v0 = mat.preMult( osg::Vec3d( v0[0], v0[1], 0.0 ));
+  osg::Vec3d _v1 = mat.preMult( osg::Vec3d( v1[0], v1[1], 0.0 ));
+
+  glBegin( GL_QUAD_STRIP);
+  {
+    glVertex3f( _v0.x(), _v0.y(), z);
+    glVertex3f( _v1.x(), _v1.y(), z);
+
+
+    while( ++itr != _sightEntryVec.end() )
+    {
+      SightMode mode = (*itr).mode();
+      glColor4f( colors[mode].red, colors[mode].green, colors[mode].blue, colors[mode].alpha);
+
+      v0 = endOfBeam( center, _directionBeg, (*itr).dist() );
+      v1 = endOfBeam( center, _directionEnd, (*itr).dist() );
+
+      _v0 = mat.preMult( osg::Vec3d( v0[0], v0[1], 0.0 ));
+      _v1 = mat.preMult( osg::Vec3d( v1[0], v1[1], 0.0 ));
+
+      glVertex3f( _v0.x(), _v0.y(), z);
+      glVertex3f( _v1.x(), _v1.y(), z);
+    } /* while */
+  }
+  glEnd();
+} /* SightBeam::draw */
+#endif
+
+
+
+} // SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.h
new file mode 100755
index 000000000..359280058
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/sight_fan_impl.h
@@ -0,0 +1,184 @@
+/*
+** -----------------------------------------------------------------------------------------------
+**
+** @RDE_HEADER@
+** Implementation of fan of sight
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.x. ArcGISRuntimeQt 100.2
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Autor ...........: Nikolaus Hanekamp, SEDG, Tel. 2906
+**                    Jörg Turla, SPDG, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notices .........:
+**
+**   01.02.2005, NH  : Urversion
+**   15.05.2018, JT  : adapting GeISiR source to SituationMap
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <Map/sight_fan.h>
+
+#include <ElevationMap/elevation_map.h>
+
+#include <MapImpl/abstract_map_object_impl.h>
+ 
+
+namespace SituationMap
+{
+
+  class MapImpl;
+  class SightBeam;
+
+  class SITUATIONMAP_EXPORT SightFanImpl : public QObject, public AbstractMapObjectImpl, public virtual SightFan
+  {
+    friend class SightBeam;
+
+    Q_OBJECT
+
+    public:
+
+      explicit SightFanImpl(const QString &debugInfo = QString());
+      virtual ~SightFanImpl();
+
+      void initColors();
+
+      void initFan( const QPointF &center
+                  , double         centHat
+                  , double         objHat
+                  , double         radius
+                  , double         innerRadius
+                  , double         startAngle
+                  , double         dAngle
+                  , unsigned int   nrFans
+                  , double         alpha ) override;
+
+      void initFan( const Point3D &center
+                  , double         objHat
+                  , double         radius
+                  , double         innerRadius
+                  , double         startAngle
+                  , double         dAngle
+                  , unsigned int   nrFans
+                  , double         alpha ) override;
+
+      void setCenter(const QPointF &center) override;
+      void setCenter(const Point3D &center) override;
+      void setCenter(const QPointF &center, double centerHat) override;
+
+      void setCenterHat(double centerHat) override;
+      void setObjectHat(double objHat) override;
+
+      void setRadius(double radius) override;
+      void setInnerRadius(double radius) override;
+      void setStartAngle(double startAngle) override;
+      void setdeltaAngle(double dAngle) override;
+      void setNoOfFans(double noFans) override;
+      void setAlpha(double alpha) override;
+
+      QPointF center() const override;
+      double  centerHat() const override;
+      double  objectHat() const override;
+      double  innerRadius() const override;
+      double  radius() const override;
+      double  startAngle() const override;
+      double  dAngle() const override;
+      double  alpha() const override;
+      unsigned int noOfFans() const override;
+
+      void move(const QPointF &center) override;
+
+      void move(const QPointF &center, double centHat, double objHat) override;
+
+      void setFanColor(const QColor & visible, const QColor &invisible, const QColor &undefined) override;
+      void setFanColorMark(float colMult) override;
+
+      void show() override;
+
+      /**
+        Overloaded from base class to implement the construction of GraphicalObjects.
+      */
+      bool init( MapImpl *mapImpl, const QString &logicalLayerName = QStringLiteral("SightFanLayer")) override;
+
+      void boundingBox(BoundingBox &bbox) const override;
+
+
+    protected:
+
+      bool updateViewImplPre()  override;
+      bool updateViewImpl()     override;
+      bool updateViewImplPost() override;
+
+      void calculateSightBeamVec();
+
+      void calculateSightBeam(SightBeam &sBeam);
+      void calculateSightBeam(const LOSVector &losProfile, SightBeam &sBeam);
+
+      class Internal;
+
+      Internal *m_internal;
+
+    private slots:
+      void delayedMove();
+    private:
+      QTimer *m_moveDelayTimer;
+      QPointF m_moveDelayedCenter;
+
+  }; // SightFanImpl  
+
+} // SituationMap 
+
+ 
+ 
+/* ----------------------------------------------------------------------------------------------- 
+** CVS-Id/Release ...: $Header$ 
+** ----------------------------------------------------------------------------------------------- 
+** 
+** Historie: 
+** 
+**    $Log: not supported by cvs2svn $
+**    Revision 1.9  2007/12/18 18:11:00  joerg
+**    draw() um bias erweitert und Rückgabe Boolean = true wenn wriklich gezeichnet wurde.
+**
+**    Revision 1.8  2007/08/01 10:50:39  Jörg
+**    Neu: dirtyFlags und RenderState
+**
+**    Revision 1.7  2007/07/23 14:04:09  Jörg
+**    AbstractView eingeführt
+**
+**    Revision 1.6  2007/07/11 08:13:46  Jörg
+**    move jetzt auch nur mit Position
+**
+**    Revision 1.5  2005/11/09 13:44:19  klaus
+**    Umsetzung auf Linux;
+**
+**    Revision 1.4  2005/11/09 11:12:26  klaus
+**    Anpassung an Linux: Kommentar hinter #endif mit "//" versehen
+**
+**    Revision 1.3  2005/04/15 13:05:18  joerg
+**    Resource Control
+**
+**    Revision 1.2  2005/02/10 13:51:01  klaus
+**    Bias für SightFans eingeführt
+**
+**    Revision 1.1  2005/02/09 17:08:11  klaus
+**    1. Version der SightFans
+** 
+** 
+** ----------------------------------------------------------------------------------------------- */ 
+ 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.cpp
new file mode 100755
index 000000000..24c87ab17
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.cpp
@@ -0,0 +1,414 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of TerrainProfile
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "terrain_profile_impl.h"
+#include "terrain_profile_processor.h"
+#include "layer_factory_impl.h"
+#include "coord_translation_functor_impl.h"
+#include <LtsCoordTrans/lts_coord_trans.h>
+#include <LtsWidgets/lts_global_wait_dialog.h>
+
+#include "Rubberbands/rubberband_factory.h"
+
+
+//ESRI
+#include <Surface.h>
+
+
+// Qt
+#include <QList>
+#include <QVector>
+#include <QPair>
+
+
+#include <functional>
+
+namespace SituationMap
+{
+
+class TerrainProfileImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SituationMap::MapImpl                              *m_mapImpl       = nullptr;
+  Esri::ArcGISRuntime::Surface                       *m_surface       = nullptr;
+
+  TerrainProfileParameter                             m_terrainProfileParameter;
+  QPointer<RB::RubberbandBase>                        m_rubbandBase   = nullptr;
+
+  using COUNTER_T = long;
+  static COUNTER_T                                    m_terrainProfileCounter;
+  QMap<COUNTER_T, QPointer<TerrainProfileProcessor>>  m_terrainProfileMap;
+
+  std::function< bool(long id, const QVector<QPair<QPointF, double>> &)> m_finishedCallback;
+
+}; // class TerrainProfileImpl::Private
+//-----------------------------------------------------------------------------
+
+TerrainProfileImpl::Private::COUNTER_T TerrainProfileImpl::Private::m_terrainProfileCounter = 0;
+
+
+//-----------------------------------------------------------------------------
+// class TerrainProfileImpl
+//-----------------------------------------------------------------------------
+TerrainProfileImpl::TerrainProfileImpl(SituationMap::MapImpl *mapImpl)
+  : BaseClass()
+  , QObject()
+  , m_logger(getLogger("TerrainProfileImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mapImpl = mapImpl;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+TerrainProfileImpl::~TerrainProfileImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->remove();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool TerrainProfileImpl::isReady()
+{
+  init();
+  bool isReady =
+    d->m_surface && d->m_surface->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded &&
+    d->m_mapImpl->isReady();
+
+  if (!isReady)
+  {
+    Esri::ArcGISRuntime::LoadStatus ls = Esri::ArcGISRuntime::LoadStatus::Unknown;
+    if (d->m_surface)
+      ls = d->m_surface->loadStatus();
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " d->m_surface = "  << d->m_surface
+                        << " d->m_surface->loadStatus = "  << ls
+                        << " d->m_mapImpl->isReady() = "  << d->m_mapImpl->isReady();
+  }
+  return isReady;
+}
+
+void TerrainProfileImpl::setFinishedCallback(const std::function< bool(long id, const QVector<QPair<QPointF, double> > &)> &finishedCallback)
+{
+  d->m_finishedCallback = finishedCallback;
+}
+
+void TerrainProfileImpl::setTerrainProfileDialog(long id, QPointer<TerrainProfileDialog> &terrainProfileDialog)
+{
+  if (!d->m_terrainProfileMap.contains(id))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " no proc found for id = "  << id;
+    return;
+  }
+  QPointer<TerrainProfileProcessor> proc = d->m_terrainProfileMap[id];
+  if (!proc)
+    return;
+  proc->setTerrainProfileDialog(terrainProfileDialog);
+}
+
+bool TerrainProfileImpl::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return false;
+  }
+
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  // d->m_rubbandBase; should be cleared now
+
+  const Mode mode = d->m_mapImpl->mode();
+  switch (mode)
+  {
+  case Mode::Mode_2D:
+    d->m_rubbandBase = createRubberband2D();
+    break;
+  case Mode::Mode_3D:
+//    d->m_rubbandBase = createRubberband3D();
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mode (" << mode << ")" << " does not support viewshed";
+    return false;
+    break;
+  }
+
+  return true;
+}
+
+long TerrainProfileImpl::create(const TerrainProfileParameter &terrainProfileParameter)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " terrainProfileParameter: " << terrainProfileParameter;
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return -1;
+  }
+
+  // remove all former
+  this->remove();
+
+
+  // store current values:
+  d->m_terrainProfileParameter = terrainProfileParameter;
+
+  TerrainProfileProcessor *proc = new TerrainProfileProcessor();
+
+  if (!proc->init(d->m_mapImpl, d->m_terrainProfileCounter))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init of TerrainProfileProcessor failed";
+    delete proc;
+    return -1;
+  }
+  d->m_terrainProfileMap[d->m_terrainProfileCounter++] = proc;
+
+  connect(proc, &TerrainProfileProcessor::locationsToElevationsCompleted,
+          this, &TerrainProfileImpl::onLocationsToElevationsCompleted, Qt::UniqueConnection);
+
+  // GlobalWaitDialog
+  LtsWidgets::LtsGlobalWaitDialog::getInstance()->wait();
+
+  proc->start(d->m_terrainProfileParameter);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_terrainProfileCounter;
+}
+
+void TerrainProfileImpl::remove(long terrainProfileId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " terrainProfileId=" << terrainProfileId;
+
+  if (terrainProfileId < 0)
+  {
+    for (const QPointer<TerrainProfileProcessor> &proc : qAsConst(d->m_terrainProfileMap))
+      delete proc;
+    d->m_terrainProfileMap.clear();
+    return;
+  }
+
+  if (d->m_terrainProfileMap.contains(terrainProfileId))
+  {
+    QPointer<TerrainProfileProcessor> proc = d->m_terrainProfileMap[terrainProfileId];
+    if (proc)
+      delete d->m_terrainProfileMap[terrainProfileId];
+    d->m_terrainProfileMap.remove(terrainProfileId);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " terrainProfileId not found, id=" << terrainProfileId;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " terrainProfileId=" << terrainProfileId;
+}
+
+
+void TerrainProfileImpl::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_mapImpl)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no mapImpl";
+    return;
+  }
+
+  const LayerFactoryImpl &layerFactoryImpl = d->m_mapImpl->layerFactoryImpl();
+  if (!d->m_surface)
+    d->m_surface = layerFactoryImpl.baseSurface();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+RB::RubberbandMultiPointFeature *TerrainProfileImpl::createRubberband2D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandMultiPointFeature *rubberband =
+    d->m_mapImpl->rubberbandFactory().create<SituationMap::RB::RubberbandMultiPointFeature>(this);
+
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " create2D failed";
+    return nullptr;
+  }
+  rubberband->setAutoDelete(true);
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &TerrainProfileImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &TerrainProfileImpl::onRb2DApply, Qt::UniqueConnection);
+
+  return rubberband;
+}
+
+/*
+RB::RubberbandMultiPointFeature3D *TerrainProfileImpl::createRubberband3D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandMultiPointFeature3D *rubberband =
+    d->m_mapImpl->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>(this);
+
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " create3D failed";
+    return nullptr;
+  }
+  rubberband->setAutoDelete(true);
+
+//  rubberband->constrainQuadratic(true);
+//  rubberband->constrainOrthogonal(true);
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &TerrainProfileImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &TerrainProfileImpl::onRb3DApply, Qt::UniqueConnection);
+
+  return rubberband;
+}
+*/
+
+void TerrainProfileImpl::onRbAbort(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+    return;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " rb abort";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void TerrainProfileImpl::onRb2DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandMultiPointFeature *polyline = static_cast<RB::RubberbandMultiPointFeature *>(rbnd);
+
+  TerrainProfileParameter para;
+  para.m_coordinates = convert2D3D(polyline->coordinateVector(RB::CoordinateSystem::Geo));
+
+  long id = this->create(para);
+
+  if (id < 0)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " para.m_coordinates.size()= " << para.m_coordinates.size();
+}
+
+void TerrainProfileImpl::onLocationsToElevationsCompleted(long id)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", id=" << id;
+
+  // GlobalWaitDialog
+  LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
+
+  const auto it = d->m_terrainProfileMap.find(id);
+
+//  if (it == d->m_terrainProfileMap.constEnd())
+//  {
+//    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+//    return;
+//  }
+
+  QPointer<TerrainProfileProcessor> proc = it.value();
+
+  if (!proc)
+    return;
+
+  const QVector<QPair<QPointF, double>> &resultList = proc->results();
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " START"
+                     << " id =" << id
+                     << " m_locationToElevationBulk.resultList().size()=" << resultList.size();
+
+  if (d->m_finishedCallback)
+    d->m_finishedCallback(id, resultList);
+  else
+    WARNING_LOG(m_logger) << LOGFUNCTION << " NO exe CallBack!?";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", id=" << id;
+}
+
+/*
+ void TerrainProfileImpl::onRb3DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandMultiPointFeature3D *rubberband = static_cast<RB::RubberbandMultiPointFeature3D *>(rbnd);
+
+  const QVector<QPointF> &data = rubberband->coordinateVector(RB::CoordinateSystem::Map);  // 3D -> RB::CoordinateSystem::Map -> degree
+
+  if (data.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+    return;
+  }
+
+  if (data.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " insufficiant number of coords";
+    return;
+  }
+
+  ViewshedParameter viewshedParameter;
+
+  // degree to rad
+  const double factor = M_PI / 180.0;
+  const QPointF &center = data.at(0) * factor;
+  viewshedParameter.viewshedOrigin_latLon = center;
+
+
+  if (data.size() >= 2)
+  {
+    static Esri::ArcGISRuntime::GeometryEngine *gEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+    const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+    QPointF coord = data.at(0);
+    Esri::ArcGISRuntime::Point geom1(coord.x(), coord.y(), sr);
+    coord = data.at(1);
+    Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr);
+
+    Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
+                                                            Esri::ArcGISRuntime::LinearUnitId::Meters,
+                                                            Esri::ArcGISRuntime::AngularUnitId::Degrees,
+                                                            Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+
+    viewshedParameter.outerRadius = geodeticDistanceResult.distance();
+  }
+
+  long id = this->create(viewshedParameter);
+
+  if (id < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+*/
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.h
new file mode 100755
index 000000000..2f3b7b757
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_impl.h
@@ -0,0 +1,78 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of TerrainProfile
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/terrain_profile.h> // Interface
+#include "map_impl.h"
+#include "Rubberbands/rubberband_multi_point_feature.h"
+#include <Utils/terrain_profile_dialog.h>
+
+
+// Qt
+#include <QPointF>
+#include <QVector>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class TerrainProfileImpl : public QObject, public virtual TerrainProfile
+{
+  Q_OBJECT
+
+  using BaseClass = TerrainProfile;
+
+public:
+  explicit TerrainProfileImpl(SituationMap::MapImpl *mapImpl);
+  virtual ~TerrainProfileImpl();
+
+  TerrainProfileImpl(const TerrainProfileImpl &other)      = delete;
+  TerrainProfileImpl &operator=(TerrainProfileImpl &other) = delete;
+
+  bool isReady();
+
+  void setFinishedCallback(const std::function< bool(long id, const QVector<QPair<QPointF, double>> &)> &finishedCallback) override;
+
+  void setTerrainProfileDialog(long id, QPointer<SituationMap::TerrainProfileDialog> &terrainProfileDialog) override;
+
+
+  bool create() override;
+  long create(const TerrainProfileParameter &terrainProfileParameter) override;
+  void remove(long terrainProfileId = -1)                             override;
+
+private Q_SLOTS:
+  void onRbAbort(RB::RubberbandBase *rbnd);
+  void onRb2DApply(RB::RubberbandBase *rbnd);
+
+  void onLocationsToElevationsCompleted(long id);
+private:
+  void init();
+
+
+  RB::RubberbandMultiPointFeature  *createRubberband2D();
+  RB::RubberbandMultiPointFeature  *createRubberband3D();
+
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+}; // TerrainProfileImpl
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
new file mode 100755
index 000000000..bd49ba078
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
@@ -0,0 +1,369 @@
+/**
+  * @RDE_HEADER@
+  * TerrainProfileProcessor
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "terrain_profile_processor.h"
+
+#include "map_impl.h"
+#include <GraphicalObjects/graphical_object_path.h>
+#include <Map/object_factory.h>
+#include <Map/situation_map_utils.h>
+#include <Map/coord_translation_functor.h>
+#include <MapImpl/layer_factory_impl.h>
+
+
+
+// ESRI
+#include <GeometryEngine.h>
+#include <PolylineBuilder.h>
+#include <Polyline.h>
+#include <ImmutablePart.h>
+#include <ImmutablePartCollection.h>
+#include <LinearUnit.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ViewshedBase
+//-----------------------------------------------------------------------------
+TerrainProfileProcessor::TerrainProfileProcessor(QObject *parent)
+  : QObject(parent)
+  , m_logger(getLogger("TerrainProfileProcessor"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+TerrainProfileProcessor::~TerrainProfileProcessor()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, id=" << m_id;
+  removeUserInput();
+
+  // maybe clear the view of m_terrainProfileDialog here?
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << m_id;
+}
+
+bool TerrainProfileProcessor::init(SituationMap::MapImpl *mapImpl, long id)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_id = id;
+
+  m_initialized = false;
+
+  m_mapImpl = mapImpl;
+  m_srMap = m_mapImpl->getEsriSpatialReference();
+
+  LayerFactoryImpl &layerFactoryImpl = m_mapImpl->layerFactoryImpl();
+
+  m_toolsLayername = layerFactoryImpl.toolLayer();
+
+  if (!m_surface)
+    m_surface = layerFactoryImpl.baseSurface();
+
+  if (m_surface && m_surface->loadStatus() == Esri::ArcGISRuntime::LoadStatus::Loaded)
+    m_initialized = true;
+  else
+  {
+    Esri::ArcGISRuntime::LoadStatus ls = Esri::ArcGISRuntime::LoadStatus::Unknown;
+    if (m_surface)
+      ls = m_surface->loadStatus();
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " d->m_surface = "  << m_surface
+                        << " d->m_surface->loadStatus = "  << ls;
+  }
+
+  if (!m_locationToElevationBulk.init(m_mapImpl, m_surface))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " locationToElevationBulk.init() failed";
+    return false;
+  }
+
+  connect(&m_locationToElevationBulk, &LocationToElevationBulk::locationsToElevationsCompleted,
+          this, &TerrainProfileProcessor::onLocationsToElevationsCompleted, Qt::UniqueConnection);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_initialized=" << m_initialized;
+  return m_initialized;
+}
+
+bool TerrainProfileProcessor::start(const TerrainProfileParameter &terrainProfileParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " terrainProfileParameter=" << terrainProfileParameter
+                      << " m_srMap.wkid=" << m_srMap.wkid();
+
+  // don´t allow more than one at once:
+  if (m_inProgress)
+    return false;
+
+  m_inProgress = true;
+
+  m_terrainProfileParameter = terrainProfileParameter;
+
+  removeUserInput();
+  displayUserInput();
+
+  // densify
+  const Esri::ArcGISRuntime::Polyline &polylineOut_Map = densifiy(m_terrainProfileParameter);
+
+  // calculate distance
+
+  // bulk location to elevation
+  const Esri::ArcGISRuntime::ImmutablePart &immutablePart = polylineOut_Map.parts().part(0);
+  const int size = immutablePart.pointCount();
+  for (int i = 0; i < size; ++i)
+  {
+    const Esri::ArcGISRuntime::Point &esriMapLocation = immutablePart.point(i);
+    // DEBUG_LOG(m_logger) << LOGFUNCTION << " esriMapLocation: " << QPointF(esriMapLocation.x(), esriMapLocation.y());
+    m_locationToElevationBulk.addLocation(esriMapLocation);
+  }
+  m_locationToElevationBulk.start();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_viewshedInProgress=" << m_inProgress;
+  return true;
+}
+
+QVector<QPair<QPointF, double> > TerrainProfileProcessor::results() const
+{
+  return m_locationToElevationBulk.results();
+}
+
+void TerrainProfileProcessor::setTerrainProfileDialog(QPointer<TerrainProfileDialog> &terrainProfileDialog)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_terrainProfileDialog = terrainProfileDialog;
+
+  if (m_terrainProfileDialog)
+  {
+    m_terrainProfileDialog->setMap(m_mapImpl);
+
+    // mousePositionChanged
+    connect(m_terrainProfileDialog.data(), &TerrainProfileDialog::mousePositionChanged,
+            this, &TerrainProfileProcessor::onDialogMousePositionChanged, Qt::UniqueConnection);
+
+    // handle destruction of according dialog:
+    connect(terrainProfileDialog.data(), &TerrainProfileDialog::destroyed,
+            this, &TerrainProfileProcessor::deleteLater);
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+Esri::ArcGISRuntime::Polyline TerrainProfileProcessor::densifiy(TerrainProfileParameter &terrainProfileParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " terrainProfileParameter=" << terrainProfileParameter;
+
+  //
+  // PosCont to EsriPolyline:
+  //
+  Esri::ArcGISRuntime::PolylineBuilder polylineBuilder(m_srMap, this);
+
+  for (const Point3D &coord : qAsConst(terrainProfileParameter.m_coordinates))
+  {
+    // geo to map (polylineBuilder uses map also)
+    const Point3D &p3D = m_mapImpl->coordTranslationFunctor()->geographicToMap(coord);
+    polylineBuilder.addPoint(Esri::ArcGISRuntime::Point(p3D.x(), p3D.y(), p3D.z()));
+  }
+
+  const Esri::ArcGISRuntime::Polyline &polylineIn = polylineBuilder.toPolyline();
+
+  terrainProfileParameter.m_length =
+      Esri::ArcGISRuntime::GeometryEngine::lengthGeodetic(polylineIn,
+                                                          Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                          Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+  const int numberCoords = 50;
+
+  double maxSegmenthLength = terrainProfileParameter.m_length / numberCoords;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " START"
+                     << " lengthMeter=" << terrainProfileParameter.m_length
+                     << " numberCoords=" << numberCoords
+                     << " maxSegmenthLength=" << maxSegmenthLength;
+
+  const Esri::ArcGISRuntime::Geometry &geometryOut = Esri::ArcGISRuntime::GeometryEngine::densifyGeodetic(polylineIn,
+                                                                                                          maxSegmenthLength,
+                                                                                                          Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                                                                          Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+  const Esri::ArcGISRuntime::Polyline polylineOut(geometryOut);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " lengthMeter=" << terrainProfileParameter.m_length
+                      << " numberCoords=" << numberCoords
+                      << " maxSegmenthLength=" << maxSegmenthLength
+                      << " polylineOut.parts().part(0).pointCount()=" << polylineOut.parts().part(0).pointCount();
+  return polylineOut;
+}
+
+void TerrainProfileProcessor::displayUserInput()
+{
+  displayInputLine();
+  displayInputVertices();
+}
+
+void TerrainProfileProcessor::removeUserInput()
+{
+  removeInputLine();
+  removeInputVertices();
+  removeCurrentMarker();
+}
+
+void TerrainProfileProcessor::displayInputLine()
+{
+  // create
+  if (!m_polyline)
+  {
+    m_polyline = m_mapImpl->objectFactory().create<Polyline>(m_toolsLayername,
+                                                             QStringLiteral("TerrainProfileLineId%1").arg(m_id));
+    m_polyline->setLineStyle(LineStyle(m_color, 3));
+    m_polyline->setScaleEnable(true);
+    m_polyline->setPickable(false);
+  }
+
+  // apply data
+  m_polyline->setPositions(m_terrainProfileParameter.m_coordinates);
+
+  // update
+  if (!m_polyline->updateView())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " polyline::updateView failed";
+}
+void TerrainProfileProcessor::removeInputLine()
+{
+  if (m_polyline)
+    m_polyline->removeMySelf();
+  m_polyline.reset();
+}
+
+void TerrainProfileProcessor::displayInputVertices()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  PositionCont coordinates = m_terrainProfileParameter.m_coordinates;
+  const int size = coordinates.size();
+  if (size < 1)
+    return;
+
+  m_markerCont.resize(size);
+
+  int idx = 0;
+  QMutableVectorIterator<RefPointer<GeoImage>> it(m_markerCont);
+
+  while (it.hasNext())
+  {
+    RefPointer<GeoImage> &marker = it.next();
+    if (!marker.valid())
+    {
+      marker = m_mapImpl->objectFactory().create<GeoImage>(m_toolsLayername,
+                                                           QStringLiteral("TerrainProfileLineId%1_idx%2").arg(m_id).arg(idx));
+      marker->setProxyMarker(MarkerSymbolType::Circle);
+      marker->setProxyMarkerColor(m_color);
+      marker->setProxyMarkerSize(7);
+      marker->setPickable(false);
+    }
+    marker->setOrigin(coordinates[idx]);
+
+    // update
+    if (!marker->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " marker::updateView failed";
+
+    ++idx;
+  } // while
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+void TerrainProfileProcessor::removeInputVertices()
+{
+  QMutableVectorIterator<RefPointer<GeoImage>> it(m_markerCont);
+  while (it.hasNext())
+  {
+    RefPointer<GeoImage> &marker = it.next();
+    if (marker)
+      marker->removeMySelf();
+  }
+  m_markerCont.clear();
+}
+
+void TerrainProfileProcessor::displayCurrentMarker(const Point3D &pointGeo)
+{
+  // create
+  if (!m_currentMarker)
+  {
+    m_currentMarker = m_mapImpl->objectFactory().create<GeoImage>(m_toolsLayername,
+                                                                  QStringLiteral("TerrainProfileLineId%1_currentMarker").arg(m_id));
+    m_currentMarker->setProxyMarker(MarkerSymbolType::Circle);
+    m_currentMarker->setProxyMarkerColor(Qt::blue);
+    m_currentMarker->setProxyMarkerSize(10);
+    m_currentMarker->setPickable(false);
+  }
+
+  // apply data
+  m_currentMarker->setOrigin(pointGeo);
+
+  // update
+  if (!m_currentMarker->updateView())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_currentMarker::updateView failed";
+}
+
+void TerrainProfileProcessor::removeCurrentMarker()
+{
+  if (m_currentMarker)
+    m_currentMarker->removeMySelf();
+  m_currentMarker.reset();
+}
+
+void TerrainProfileProcessor::onLocationsToElevationsCompleted()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_locationToElevationBulk.size()=" << m_locationToElevationBulk.size();
+
+  const QVector<QPair<QPointF, double>> &results = m_locationToElevationBulk.results();
+
+  if (m_logger.isDebugEnabled())
+    for (const QPair<QPointF, double> &item : qAsConst(results))
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " location = " << item.first << " elevation = " << item.second;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " results.size()=" << results.size();
+
+
+  // The caller should set TerrainProfileDialog on this signal:
+  emit locationsToElevationsCompleted(m_id);
+
+  // maybe (better hopefully) the caller (via finishedCallback of TerrainProfileImpl)
+  // has updated our m_terrainProfileParameter !?!
+  if (m_terrainProfileDialog)
+  {
+    m_terrainProfileDialog->setData(this->results());
+
+    QVector<QPointF> marks;
+    marks.reserve(m_terrainProfileParameter.m_coordinates.size());
+    for (const Point3D &coord : qAsConst(m_terrainProfileParameter.m_coordinates))
+    {
+      // geo to map
+      const Point3D &p3D = m_mapImpl->coordTranslationFunctor()->geographicToMap(coord);
+      marks.append(p3D.toPointF());
+    }
+    m_terrainProfileDialog->setMarks(marks);
+  } else {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no dialog";
+  }
+
+  m_inProgress = false;
+}
+
+void TerrainProfileProcessor::onDialogMousePositionChanged(const QPointF &curPos)
+{
+  const Point3D &curPosGeo = Point3D::fromQPointF( m_mapImpl->coordTranslationFunctor()->mapToGeographic(curPos) );
+  displayCurrentMarker(curPosGeo);
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.h
new file mode 100755
index 000000000..afbc7f969
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.h
@@ -0,0 +1,125 @@
+/**
+  * @RDE_HEADER@
+  * TerrainProfileProcessor
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "map_impl.h"
+#include "location_to_elevation_bulk.h"
+#include <Map/terrain_profile_parameter.h>
+#include "MapObjects/polyline.h"
+#include "MapObjects/geo_image.h"
+#include <Utils/terrain_profile_dialog.h>
+
+
+// ESRI
+#include <Map.h>
+#include <Surface.h>
+#include <SpatialReference.h>
+
+
+// Qt
+#include <QObject>
+#include <QColor>
+#include <QPointF>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Map;
+class Graphic;
+class GraphicsOverlay;
+class Polyline;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class MapImpl;
+
+
+class TerrainProfileProcessor : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit TerrainProfileProcessor(QObject *parent = nullptr);
+  virtual ~TerrainProfileProcessor();
+
+  long id() const    { return m_id; }
+
+  bool init(SituationMap::MapImpl *mapImpl, long id);
+
+
+
+  bool start(const TerrainProfileParameter &terrainProfileParameter);
+
+  bool isRunning() const  { return m_inProgress; }
+
+  QVector< QPair< QPointF, double > > results() const;
+
+  void setTerrainProfileDialog(QPointer<TerrainProfileDialog> &terrainProfileDialog);
+
+signals:
+  void locationsToElevationsCompleted(long id);
+
+protected slots:
+  void onLocationsToElevationsCompleted();
+  void onDialogMousePositionChanged(const QPointF &curPos);
+
+protected:
+  Esri::ArcGISRuntime::Polyline densifiy(TerrainProfileParameter &terrainProfileParameter);
+
+  void displayUserInput();
+  void removeUserInput();
+
+  void displayInputLine();
+  void removeInputLine();
+  void displayInputVertices();
+  void removeInputVertices();
+  void displayCurrentMarker(const Point3D &pointGeo);
+  void removeCurrentMarker();
+
+private:
+  SituationMap::MapImpl                  *m_mapImpl               = nullptr;
+  Esri::ArcGISRuntime::SpatialReference   m_srMap;
+  Esri::ArcGISRuntime::Surface           *m_surface               = nullptr;
+
+  long                                    m_id                    = -1;
+  TerrainProfileParameter                 m_terrainProfileParameter;
+
+  // Calc
+  LocationToElevationBulk                 m_locationToElevationBulk;
+
+  bool                                    m_initialized           = false;
+  bool                                    m_inProgress            = false;
+
+  // Out
+  // TerrainProfileDialog (Displaying the results)
+  QPointer<SituationMap::TerrainProfileDialog>  m_terrainProfileDialog;
+
+  QString                                       m_toolsLayername;
+  QColor                                        m_color           = Qt::magenta;
+  RefPointer<Polyline>                          m_polyline;
+  QVector<RefPointer<GeoImage>>                 m_markerCont;
+  RefPointer<GeoImage>                          m_currentMarker;
+
+
+  LOGGER_T                                m_logger;
+
+}; // class TerrainProfileProcessor
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.cpp
new file mode 100755
index 000000000..110d0c7e1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.cpp
@@ -0,0 +1,213 @@
+/**
+  * @RDE_HEADER@
+  * Tile Map Service Layer for Esri
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * License: BSD 2-Clause
+  */
+
+
+#include "tms_layer.h"
+
+#include <QCoreApplication>
+#include <QDomDocument>
+#include <QNetworkAccessManager>
+
+
+namespace EsriExtension
+{
+
+TMSLayer::TMSLayer(const QString &url, QObject *parent)
+  : EsriRuntimeQt::TiledMapServiceLayer(url, parent)
+  , m_nam(nullptr)
+{
+  connect(this, SIGNAL(requestTile(int,int,int)),
+          this, SLOT(onRequestTMSTile(int,int,int)));
+}
+
+TMSLayer::~TMSLayer()
+{
+  delete m_nam;
+}
+
+void TMSLayer::initialize()
+{
+  if (!m_nam)
+  {
+    m_nam = new QNetworkAccessManager(this);
+    connect(m_nam, SIGNAL(finished(QNetworkReply*)),
+            this, SLOT(replyBaseXmlFinished(QNetworkReply*)));
+  }
+
+  QNetworkReply *reply = m_nam->get(QNetworkRequest(QUrl(url())));
+  connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+          this, SLOT(replyBaseXmlError(QNetworkReply::NetworkError)));
+}
+
+void TMSLayer::replyBaseXmlFinished(QNetworkReply *reply)
+{
+  if (!reply || reply->error() != QNetworkReply::NoError)
+  {
+    cleanupNetworkReply(reply);
+    return;
+  }
+  QDomDocument doc(QLatin1String("TMSLayerDoc"));
+  doc.setContent(reply);
+  const QDomElement domRoot = doc.documentElement();
+  const QDomElement domSRS = domRoot.firstChildElement(QLatin1String("SRS"));
+  const QDomElement domBoundingBox = domRoot.firstChildElement(QLatin1String("BoundingBox"));
+  const QDomElement domOrigin = domRoot.firstChildElement(QLatin1String("Origin"));
+  const QDomElement domTileFormat = domRoot.firstChildElement(QLatin1String("TileFormat"));
+  const QDomElement domTileSets = domRoot.firstChildElement(QLatin1String("TileSets"));
+
+  if (domSRS.isNull() ||
+      domBoundingBox.isNull() ||
+      domOrigin.isNull() ||
+      domTileFormat.isNull() ||
+      domTileSets.isNull())
+  {
+    cleanupNetworkReply(reply);
+    const QString errStr(QString(QLatin1String("Got invalid xml from tms server (url: %1)")).arg(url()));
+    layerCreateError(errStr);
+    qWarning("%s", qPrintable(errStr));
+    return;
+  }
+
+  // optional
+  if (domTileFormat.hasAttribute(QLatin1String("extension")))
+    m_extension = domTileFormat.attribute(QLatin1String("extension"));
+
+  //LODs:
+  const double dpi = 90.7;  // according to spec
+  const double ipf = 12.0;  // inch per foot
+  const double dpu = dpi * ipf; // dots per unit
+
+  // We expect a SRS string in the format 'EPSG:<number>' here ...
+  const EsriRuntimeQt::SpatialReference sr(domSRS.text().split(QLatin1Char(':')).at(1).toInt());
+  // Setting the image format is not needed (the image reader correctly guesses the format)
+  // Setting the spatial reference is also not needed - if not set, the default one
+  //   from the layer is used.
+  EsriRuntimeQt::TileInfo tileInfo;
+
+  tileInfo.setCols(domTileFormat.attribute(QLatin1String("width")).toInt());
+  tileInfo.setRows(domTileFormat.attribute(QLatin1String("height")).toInt());
+
+  tileInfo.setDpi(dpi);
+
+  EsriRuntimeQt::LOD lod;
+  QList<EsriRuntimeQt::LOD> lods;
+  const double minX = domBoundingBox.attribute(QLatin1String("minx")).toDouble();
+  const double minY = domBoundingBox.attribute(QLatin1String("miny")).toDouble();
+  const double maxX = domBoundingBox.attribute(QLatin1String("maxx")).toDouble();
+  const double maxY = domBoundingBox.attribute(QLatin1String("maxy")).toDouble();
+
+  // Since ArcGIS calculates from upper left (instead lower left as tms defines),
+  // we need to make sure all our zoom levels have the same upper y value
+  // TODO: use from zoom level
+  const double utm32MaxYcalc = 16384 * 256 * 3; // 3 - Anzahl kacheln lowest zoom level
+  const double utm32MinX = 166021.44309607695;  // min utm 32 boundary - calc from proj4 or smth. like this
+
+  const QString tsAttr(QLatin1String("TileSet"));
+  QDomElement tileSetSibling = domTileSets.firstChildElement(tsAttr);
+  for (; !tileSetSibling.isNull(); tileSetSibling = tileSetSibling.nextSiblingElement(tsAttr))
+  {
+    if (!tileSetSibling.hasAttribute(QLatin1String("order")))
+    {
+      qWarning("Could not find 'order' attribute for LOD - skipping lod");
+      continue;
+    }
+    const int lodLevel = tileSetSibling.attribute(QLatin1String("order")).toInt();
+
+    lod.setLevel(lodLevel);
+    lod.setResolution(tileSetSibling.attribute(QLatin1String("units-per-pixel")).toDouble());
+    lod.setScale(lod.resolution() / dpu);
+
+    if (!tileSetSibling.hasAttribute(QLatin1String("href")))
+    {
+      qWarning("Could not find 'href' attribute for LOD - skipping lod");
+      continue;
+    }
+
+    lods.append(lod);
+    m_tileUrls.insert(lodLevel, tileSetSibling.attribute(QLatin1String("href")));
+
+    // Since ArcGIS calculates from upper left (instead lower left as tms defines),
+    // we need to make sure all our zoom levels have the same upper y value
+    m_tilesYAxis.insert(lodLevel, qRound(utm32MaxYcalc / (lod.resolution() * tileInfo.cols())));
+    //qWarning("LOD: %d, %lf %lf, %lf", lodLevel, lod.resolution(), lod.scale(),
+    // lod.resolution() * 256 * m_tilesYAxis.value(lodLevel));
+
+    //qWarning("Y Tile count for level %d is %d - %lf", lodLevel, m_tilesYAxis.value(lodLevel),
+    //         utm32MaxYcalc / (lod.resolution() * tileInfo.cols()));
+  }
+  if (lods.isEmpty())
+  {
+    const QString errStr(QLatin1String("Could not find any layer in the xml file!"));
+    layerCreateError(errStr);
+    qWarning("%s", qPrintable(errStr));
+    cleanupNetworkReply(reply);
+    return;
+  }
+  tileInfo.setLODs(lods);
+
+  const EsriRuntimeQt::Envelope envelope(minX, minY, maxX, maxY, sr);
+  // TMS service origin is bottom left, arcgis upper left
+  tileInfo.setOrigin({utm32MinX, utm32MaxYcalc, sr});
+
+  setDefaultSpatialReference(sr);
+  setFullExtent(envelope);
+  setInitialExtent(envelope);
+  setTileInfo(tileInfo);
+
+  // TODO: setMin/Max scale ?
+
+  EsriRuntimeQt::TiledMapServiceLayer::initialize();
+
+  // clean up
+  cleanupNetworkReply(reply);
+}
+
+void TMSLayer::replyBaseXmlError(QNetworkReply::NetworkError error)
+{
+  const QString errStr(QString(QLatin1String("Error retrieving xml from %1, error: %2")).arg(url()).arg(error));
+  emit layerCreateError(errStr);
+  qWarning("%s", qPrintable(errStr));
+}
+
+void TMSLayer::onRequestTMSTile(int level, int col, int row)
+{
+  if (!m_tilesYAxis.contains(level))
+  {
+    qWarning("Invalud zoom level (%d)!", level);
+    return;
+  }
+  // TMS starts counting from bottom left, ArcGIS from upper left
+  // -> we need to mirror the y-axis
+  int reqRow = m_tilesYAxis.value(level) - row - 1;
+  //qWarning("onRequestTMSTile: %d, %d, %d (%d)", level, col, reqRow, row);
+  QString requestUrl(m_tileUrls.value(level) +
+                     QLatin1Char('/') + QString::number(col) +
+                     QLatin1Char('/') + QString::number(reqRow));
+  if (!m_extension.isEmpty())
+    requestUrl += QLatin1Char('.') + m_extension;
+  //qWarning("RequestUrl: %s", qPrintable(requestUrl));
+  setTile(level, col, row, QUrl(requestUrl));
+}
+
+void TMSLayer::cleanupNetworkReply(QNetworkReply *reply)
+{
+  if (reply)
+  {
+    reply->deleteLater();
+    reply->disconnect(this);
+  }
+  if (m_nam)
+  {
+    m_nam->disconnect(this);
+    m_nam->deleteLater();
+    m_nam = nullptr;
+  }
+}
+
+} // namespace EsriExtension
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.h
new file mode 100755
index 000000000..a9f2755bf
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/tms_layer.h
@@ -0,0 +1,50 @@
+/**
+  * @RDE_HEADER@
+  * Tile Map Service Layer for Esri
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * License: BSD 2-Clause
+  */
+
+#pragma once
+
+#include <TiledMapServiceLayer.h>
+#include <QNetworkReply>
+
+class QNetworkAccessManager;
+
+namespace EsriExtension
+{
+
+/** A small Wrapper around EsriRuntimeQt::TiledMapServiceLayer to
+ *  be able to access a tile map service through Qt Runtime SDK.
+ * Sadly Esri does not provide this layer for Qt...
+ * so we have to write one on our own
+ * It's far from perfect but works for our needs.
+ * It was only tested with geoserver 2.8 and EPSG:23632 projection
+ */
+class TMSLayer : public EsriRuntimeQt::TiledMapServiceLayer
+{
+  Q_OBJECT
+
+public:
+  explicit TMSLayer(const QString &url, QObject *parent = nullptr);
+  ~TMSLayer();
+
+  void initialize() override;
+private Q_SLOTS:
+  void replyBaseXmlFinished(QNetworkReply *reply);
+  void replyBaseXmlError(QNetworkReply::NetworkError);
+  void onRequestTMSTile(int level, int col, int row);
+private:
+  void cleanupNetworkReply(QNetworkReply *reply);
+private:
+  QMap<int, QString> m_tileUrls;
+  QMap<int, int> m_tilesYAxis;
+  QString m_extension;
+  QNetworkAccessManager *m_nam;
+
+};
+
+}
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp
new file mode 100755
index 000000000..704e4da9b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp
@@ -0,0 +1,122 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedAnalysis
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include <Map/situation_map_utils.h>
+#include "viewshed_analysis.h"
+
+
+// ESRI
+#include <SceneGraphicsView.h>
+
+#include <AnalysisOverlay.h>
+#include <AnalysisListModel.h>
+#include <ExploratoryLocationViewshed.h>
+#include <AnalysisOverlayListModel.h>
+#include <Point.h>
+
+// Qt
+#include <QDebug>
+
+namespace SituationMap
+{
+
+ViewshedAnalysis::ViewshedAnalysis(Esri::ArcGISRuntime::SceneGraphicsView *sceneGraphicsView, QObject *parent)
+  : ViewshedBase(parent)
+  , m_analysisOverlayModel(sceneGraphicsView->analysisOverlays())
+  , m_analysisOverlay(new Esri::ArcGISRuntime::AnalysisOverlay(this))
+  , m_viewsheds(3)                                                      // ESRI viewshed support 120 degree maximum, merge 3 of them
+  , m_logger(getLogger("ViewshedAnalysis"))                             // P.S.: from release 100.3 ESRI supports 360 degree viewshed
+{
+  m_analysisOverlay->setVisible(true);
+  for (int i = 0; i < m_viewsheds.size(); ++i)
+    m_viewsheds[i] = nullptr;
+  QObject::connect(m_analysisOverlay->analyses(), &Esri::ArcGISRuntime::AnalysisListModel::errorOccurred, this, &ViewshedAnalysis::onErrorOccured);
+
+  m_analysisOverlayModel->append(m_analysisOverlay);
+} //  ViewshedAnalysis::ViewshedAnalysis
+
+
+ViewshedAnalysis::~ViewshedAnalysis()
+{
+  for (int i = 0; i < m_viewsheds.size(); ++i)
+  {
+    delete m_viewsheds[i];
+    m_viewsheds[i] = nullptr;
+  }
+  m_analysisOverlayModel->removeOne(m_analysisOverlay);
+  delete m_analysisOverlay;
+} //  ViewshedAnalysis::~ViewshedAnalysis()
+
+
+bool ViewshedAnalysis::execute(const QPointF &viewshedPoint_map_degree, double outerRadius, double observerOffset)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " viewshedPoint_map_degree= " << viewshedPoint_map_degree
+                      << " outerRadius= " << outerRadius
+                      << " observerOffset= " << observerOffset;
+
+  if (!m_analysisOverlay)
+    return false;
+
+  Esri::ArcGISRuntime::Point viewshedCenter(viewshedPoint_map_degree.x(), viewshedPoint_map_degree.y(), observerOffset);
+  double                     heading(0.0);
+  double                     deltaHeading(360.0 / m_viewsheds.size());
+
+  // ToDo:
+  // Keep in mind that the number of viewsheds is restricted to 8 on mobile devices and 16 on desktop devices.
+  // The horizontal angle have to be less than 120 degree.
+
+  for (int i = 0; i < m_viewsheds.size(); ++i)
+  {
+    Esri::ArcGISRuntime::ExploratoryLocationViewshed *viewshed = m_viewsheds[i];
+
+    if (viewshed)
+    {
+      m_analysisOverlay->analyses()->removeOne(viewshed);
+      delete viewshed;
+    }
+
+    viewshed = new Esri::ArcGISRuntime::ExploratoryLocationViewshed(viewshedCenter
+                                                         , heading
+                                                         , 90.0          // pitch limited to 180
+                                                         , deltaHeading  // horizontalAngle limited to 120, from release 100.3 maximum is 360 here
+                                                         , 90.0          // verticalAngle limited to 120
+                                                         , 10.0          // minDistance
+                                                         , outerRadius   // maxDistance
+                                                         , this);
+    viewshed->setVisible(true);
+    viewshed->setFrustumOutlineVisible(false);
+    viewshed->setFrustumOutlineColor(QColor(0, 0, 255, 255));
+
+    // Add the Viewshed to the Analysis Overlay
+    m_analysisOverlay->analyses()->append(viewshed);
+
+    m_viewsheds[i] = viewshed;
+    heading += deltaHeading;
+  } // for
+
+  return true;
+} // bool ViewshedAnalysis::execute(const QPointF &viewshedPoint_map, double outerRadius, double observerOffset)
+} // namespace SituationMap
+
+
+namespace SituationMap
+{
+void ViewshedAnalysis::onErrorOccured(const Esri::ArcGISRuntime::Error &error)
+{
+  ERROR_LOG(m_logger) << LOGFUNCTION << "  EsriError occured: " << error;
+//  qCritical() << "Error reported from ESRI Analyse Overlay:" << error.message() << " code:" << error.code();
+} // void ViewshedAnalysis::onErrorOccured(const Esri::ArcGISRuntime::Error &error)
+
+} // namespace SituationMap
+
+
+
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.h
new file mode 100755
index 000000000..aba1dcfe5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.h
@@ -0,0 +1,64 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedAnalysis
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "viewshed_base.h"
+
+#include <QtCore/QVector>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class AnalysisOverlay;
+class AnalysisOverlayListModel;
+class ExploratoryLocationViewshed;
+class SceneGraphicsView;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class ViewshedAnalysis : public ViewshedBase
+{
+  Q_OBJECT
+
+public:
+
+  explicit ViewshedAnalysis(Esri::ArcGISRuntime::SceneGraphicsView *sceneGraphicsView
+                            , QObject                              *parent = nullptr);
+
+  virtual ~ViewshedAnalysis();
+
+  bool execute(const QPointF &viewshedPoint_map_degree, double outerRadius, double observerOffset) override;
+
+protected slots:
+
+  void onErrorOccured(const Esri::ArcGISRuntime::Error &error);
+
+private:
+
+  Esri::ArcGISRuntime::AnalysisOverlayListModel    *m_analysisOverlayModel;
+  Esri::ArcGISRuntime::AnalysisOverlay             *m_analysisOverlay;
+  QVector<Esri::ArcGISRuntime::ExploratoryLocationViewshed *>  m_viewsheds;
+
+  LOGGER_T                                          m_logger;
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.cpp
new file mode 100755
index 000000000..c99783f73
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.cpp
@@ -0,0 +1,27 @@
+/**
+  * @RDE_HEADER@
+  * Baseclass of Viewsheds
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "viewshed_base.h"
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ViewshedBase
+//-----------------------------------------------------------------------------
+ViewshedBase::ViewshedBase(QObject *parent)
+  : QObject(parent)
+{}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.h
new file mode 100755
index 000000000..71f2fc369
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_base.h
@@ -0,0 +1,62 @@
+/**
+  * @RDE_HEADER@
+  * Baseclass of Viewsheds
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Common/situation_map_logging.h>
+
+// ESRI
+#include <Map.h>
+#include <SpatialReference.h>
+
+
+// Qt
+#include <QObject>
+#include <QColor>
+#include <QPointF>
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Map;
+class Graphic;
+class GraphicsOverlay;
+class GeoprocessingTask;
+class GeoprocessingResult;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class ViewshedBase : public QObject
+{
+  Q_OBJECT
+
+public:
+
+  explicit ViewshedBase(QObject *parent = nullptr);
+  virtual ~ViewshedBase() = default;
+
+  ViewshedBase(const ViewshedBase &other)      = delete;
+  ViewshedBase &operator=(ViewshedBase &other) = delete;
+
+  virtual bool execute(const QPointF &viewshedPoint_map, double outerRadius, double observerOffset) = 0;
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp
new file mode 100755
index 000000000..b7d6dfc1e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp
@@ -0,0 +1,591 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedGeoProcessing
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "viewshed_geo_processing.h"
+
+#include "map_impl.h"
+#include <GraphicalObjects/graphical_object_path.h>
+#include <Map/situation_map_utils.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <LtsWidgets/lts_global_wait_dialog.h>
+
+
+// ESRI
+#include <Map.h>
+#include <GraphicsOverlay.h>
+#include <Graphic.h>
+#include <GeoprocessingTask.h>
+#include <GeoprocessingJob.h>
+#include <TaskTypes.h>        // 300: JobStatus moved from Job.h to TaskTypes.h
+#include <GeoprocessingFeatures.h>
+#include <GeoprocessingRaster.h>
+#include <GeoprocessingParameter.h>
+#include <GeoprocessingParameters.h>
+#include <GeoprocessingResult.h>
+#include <FeatureCollectionTable.h>
+#include <Feature.h>
+#include <Field.h>
+#include <SimpleMarkerSymbol.h>
+#include <SimpleFillSymbol.h>
+
+#include <GeoprocessingLinearUnit.h>
+#include <ImageServiceRaster.h>
+#include <RasterLayer.h>
+#include <GeometryEngine.h>
+
+// Qt
+#include <QDebug>
+#include <QMessageBox>
+#include <AttributeListModel.h>
+#include <FeatureIterator.h>
+#include <Geometry.h>
+#include <GraphicListModel.h>
+#include <LinearUnit.h>
+#include <Point.h>
+#include <Polygon.h>
+#include <SymbolTypes.h>
+#include <GeoprocessingTypes.h>
+#include <QFuture>
+#include <QFutureWatcher>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ViewshedBase
+//-----------------------------------------------------------------------------
+ViewshedGeoProcessing::ViewshedGeoProcessing(const QString &url,
+                                             Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                             const Esri::ArcGISRuntime::SpatialReference &spatialReference,
+                                             QObject *parent)
+  : ViewshedBase(parent)
+  , m_url(url)
+  , m_resultsOverlay(graphicsLayer)
+  , m_srMap(spatialReference)
+  , m_logger(getLogger("ViewshedGeoProcessing"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ViewshedGeoProcessing::~ViewshedGeoProcessing()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  clearGraphics();
+  delete m_viewshedTask;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool ViewshedGeoProcessing::init(SituationMap::MapImpl *mapImpl)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // check viewshedContraint (V100.2.1: disable usage of GPU to avoid failure:
+  /*
+  2018-03-21 13:06:15.911 ERROR ViewshedGeoProcessing |#| void SituationMap::ViewshedGeoProcessing::onErrorOccuredGeoprocessingJob(const Esri::ArcGISRuntime::Error &) GeoprocessingJob -> EsriError occured:  sender= 'GeoprocessingJob', code=400, domain=0, extendedErrorType=0, message='Unable to complete operation.', additionalMessage='Error executing tool. Viewshed2Feature : ERROR 010151: No features found in C:\users\ctc\Temp\arcgisruntime_8\LegatusBremen201803151510.gpk\jobs\_\j5a4e467cb51047c28a463a703c2f2bcd\scratch\scratch.gdb\Viewshed_Polygon. Possible empty feature class.
+  Failed to execute (Raster to Polygon).
+  Failed to execute (Viewshed2Feature).
+  Failed to execute (Viewshed2Feature).' (pl/viewshed_geo_processing.cpp:529)
+  2018-03-21 13:06:15.911 ERROR Qt |#| Geoprocessing Task failed (ication/ngl_qt_msg_handler.inc:26)
+  2018-03-21 13:06:15.911 ERROR Qt |#| Geoprocessing Task failed message:   code =  400  domain =  0  message =  "Unable to complete operation."  additionalMessage =  "Error executing tool. Viewshed2Feature : ERROR 010151: No features found in C:\\users\\ctc\\Temp\\arcgisruntime_8\\LegatusBremen201803151510.gpk\\jobs\\_\\j5a4e467cb51047c28a463a703c2f2bcd\\scratch\\scratch.gdb\\Viewshed_Polygon. Possible empty feature class.\nFailed to execute (Raster to Polygon).\nFailed to execute (Viewshed2Feature).\nFailed to execute (Viewshed2Feature)."  extendedErrorType =  0 (ication/ngl_qt_msg_handler.inc:26)
+  2018-03-21 13:06:15.911 INFO  ViewshedGeoProcessing |#| void SituationMap::ViewshedGeoProcessing::onJobStatusChanged() jobStatusChanged is now (m_jobStatus): Job failed (pl/viewshed_geo_processing.cpp:256)
+  */
+
+  {
+    const char cuda[] = "CUDA_VISIBLE_DEVICES";
+    bool ok = qEnvironmentVariableIsSet(cuda) &&
+        (qEnvironmentVariableIsEmpty(cuda) || qEnvironmentVariableIntValue(cuda) == -1);
+
+    if (ok)
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " VIEWSHED_CONTRAINT fulfilled: "
+                           << cuda << " = '" << qgetenv(cuda) << "'";
+    else
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " VIEWSHED_CONTRAINT NOT fulfilled: " << cuda << " = '" << qgetenv(cuda) << "'";
+
+      QMessageBox::critical(nullptr,
+                           tr("Configuration Error"),
+                           tr("Environmentvariable '%1' is not set to deactivate GPU. Operations can fail").arg(QString::fromLatin1(cuda)),
+                           QMessageBox::Ok);
+    }
+  }
+
+
+  if (m_url.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " url is empty";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+  m_mapImpl = mapImpl;    // mapImpl is required only if processRasterResults is used
+
+  delete m_viewshedTask;
+  m_viewshedTask = new Esri::ArcGISRuntime::GeoprocessingTask(QUrl(m_url), this);
+  m_viewshedTask->setObjectName(QLatin1String("GeoprocessingTask"));
+
+  // Handle errors of GeoprocessingTask:
+  connect(m_viewshedTask, &Esri::ArcGISRuntime::GeoprocessingTask::errorOccurred,
+          this, &ViewshedGeoProcessing::onErrorOccuredGeoprocessingTask);
+
+  m_initialized = true;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_initialized=" << m_initialized;
+  return m_initialized;
+}
+
+
+bool ViewshedGeoProcessing::execute(const QPointF &viewshedPoint_map, double outerRadius, double observerOffset)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " viewshedPoint_map=" << viewshedPoint_map
+                      << " m_srMap.wkid=" << m_srMap.wkid()
+                      << " outerRadius=" << outerRadius
+                      << " observerOffset=" << observerOffset
+                      << " m_viewshedInProgress=" << m_viewshedInProgress
+                      << " url='" << m_url << "'";
+
+  // check point is the viewshed point
+  Esri::ArcGISRuntime::Point esriViewshedPoint(viewshedPoint_map.x(), viewshedPoint_map.y(), m_srMap);   // Esri::ArcGISRuntime::SpatialReference::webMercator());
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " esriViewshedPoint.toJson: " << esriViewshedPoint.toJson();
+
+  m_viewshedInProgress = true;
+
+  createInputGraphic(esriViewshedPoint);
+  createExtentGraphic(esriViewshedPoint, outerRadius);
+  clearResultGraphics();
+
+  // Create a new feature collection table based upon point geometries using the current map view spatial reference
+  Esri::ArcGISRuntime::FeatureCollectionTable *inputFeatures =
+    new Esri::ArcGISRuntime::FeatureCollectionTable(QList<Esri::ArcGISRuntime::Field>()
+                                                    , Esri::ArcGISRuntime::GeometryType::Point
+                                                    , m_srMap
+                                                    , this);
+
+  // Create a new feature from the feature collection table. It will not have a coordinate location (x,y) yet
+  Esri::ArcGISRuntime::Feature *inputFeature = inputFeatures->createFeature(this);
+
+  // Assign a physical location to the new point feature based upon where the user clicked on the map view
+  inputFeature->setGeometry(esriViewshedPoint);
+
+  // 300: addFeature is async (addFeatureAsync -> QFuture<void>); run the job setup once it completes.
+  {
+    auto *fwatch = new QFutureWatcher<void>(this);
+    connect(fwatch, &QFutureWatcher<void>::finished, fwatch, [this, fwatch, inputFeatures, outerRadius, observerOffset]()
+    {
+      const bool success = !fwatch->isCanceled(); // 300: QFuture has no isSuccess(); a finished future is success unless canceled
+      fwatch->deleteLater();
+      INFO_LOG(m_logger) << LOGFUNCTION << " addFeatureCompleted...";
+
+    if (!success)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no success";
+      return;
+    }
+
+    // Create the parameters that are passed to the used geoprocessing task
+    Esri::ArcGISRuntime::GeoprocessingParameters viewshedParameters =
+      Esri::ArcGISRuntime::GeoprocessingParameters(Esri::ArcGISRuntime::GeoprocessingExecutionType::SynchronousExecute); // AsynchronousSubmit | SynchronousExecute
+    // GeoprocessingExecutionType should match Esri::ArcGISRuntime::GeoprocessingServiceType of LocalGeoprocessingService
+
+
+    // Request the output features to use the same SpatialReference as the map view
+    viewshedParameters.setOutputSpatialReference(m_srMap);
+
+    // Add an input location to the geoprocessing parameters
+    QMap<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> inputs;
+    inputs[QLatin1String("Input_point_or_polyline_observer_features")] = new Esri::ArcGISRuntime::GeoprocessingFeatures(inputFeatures, this);
+
+    // Radius
+    inputs[QLatin1String("Inner_radius")]        = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(55.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+    inputs[QLatin1String("Outer_radius")]        = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(outerRadius, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // Observer
+// //!!! DO NOT DEFINE, keep elevation of ellipsoid in mind //   inputs[QLatin1String("Observer_elevation")]  = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(0.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+    inputs[QLatin1String("Observer_offset")]     = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(observerOffset, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // Target
+    inputs[QLatin1String("Surface_offset")]      = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(0.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // setInputs
+    viewshedParameters.setInputs(inputs);
+
+    // Print geoprocessingParameters for debugging purpose:
+    QMapIterator<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> inputsIt(inputs);
+    while (inputsIt.hasNext())
+    {
+      inputsIt.next();
+      QString value(QLatin1String("-"));
+      Esri::ArcGISRuntime::GeoprocessingParameter *gpPara = inputsIt.value();
+      Esri::ArcGISRuntime::GeoprocessingLinearUnit *gpParaLU = dynamic_cast<Esri::ArcGISRuntime::GeoprocessingLinearUnit *>(gpPara);
+      if (gpParaLU)
+        value = QStringLiteral("%1 %2").arg(gpParaLU->distance()).arg(gpParaLU->linearUnit().name());
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " key= '" << inputsIt.key() << "'" << " value= '" << value << "'";
+    } // while
+
+
+
+    // Create the job that handles the communication between the application and the geoprocessing task
+    m_viewshedJob = m_viewshedTask->createJob(viewshedParameters);
+    m_viewshedJob->setObjectName(QLatin1String("GeoprocessingJob"));
+
+    // Handle errors of GeoprocessingJob:
+    connect(m_viewshedJob, &Esri::ArcGISRuntime::GeoprocessingJob::errorOccurred, this, &ViewshedGeoProcessing::onErrorOccuredGeoprocessingJob);
+
+    // Create signal handler for the job
+
+#if ACRGIS_VERSION >= 0x640E00 // 100.14.0
+    // since V100.14
+    connect(m_viewshedJob, &Esri::ArcGISRuntime::GeoprocessingJob::statusChanged, this, &ViewshedGeoProcessing::onJobStatusChangedWithJsParameter);
+#else
+    // until V100.14:
+    connect(m_viewshedJob, &Esri::ArcGISRuntime::GeoprocessingJob::jobStatusChanged, this, &ViewshedGeoProcessing::onJobStatusChanged);
+#endif // ACRGIS_VERSION
+
+
+    // start the job
+    if (m_viewshedJob->start())
+      LtsWidgets::LtsGlobalWaitDialog::getInstance()->wait();
+    else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " viewshedJob->start() failed";
+
+    });
+    fwatch->setFuture(inputFeatures->addFeatureAsync(inputFeature)); // Add the new feature (async in 300)
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_viewshedInProgress=" << m_viewshedInProgress;
+  return true;
+}
+
+void ViewshedGeoProcessing::onJobStatusChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  //      qCritical() << "jobStatusChanged... viewshedJob->jobStatus()=" << (int)viewshedJob->jobStatus();
+
+  bool viewshedInProgressOld = m_viewshedInProgress;
+
+  switch (m_viewshedJob->jobStatus())
+  {
+  case Esri::ArcGISRuntime::JobStatus::NotStarted:
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Geoprocessing Task failed";
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1String("Job NotStarted");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Failed:
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Geoprocessing Task failed";
+
+    const Esri::ArcGISRuntime::Error &err = m_viewshedJob->error();
+    ERROR_LOG(m_logger) << LOGFUNCTION << "Geoprocessing Task failed message: " << err;
+
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1String("Job failed");
+  }
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Started:
+    m_viewshedInProgress = true;
+    m_jobStatus = QLatin1String("Job in progress...");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Paused:
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1String("Job paused...");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Succeeded:
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1String("Job succeeded");
+    // handle the results
+    processResults(m_viewshedJob->result());
+    break;
+  default:
+    break;
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " jobStatusChanged is now (m_jobStatus): " << m_jobStatus;
+
+  if ((m_viewshedInProgress == false) && (viewshedInProgressOld != m_viewshedInProgress))
+    LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
+
+  // emit signals
+  //      emit viewshedInProgressChanged();
+  //      emit jobStatusChanged();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+#if ACRGIS_VERSION >= 0x640E00 // 100.14.0
+void ViewshedGeoProcessing::onJobStatusChangedWithJsParameter(const Esri::ArcGISRuntime::JobStatus &/*newStatus*/)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  onJobStatusChanged();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+#endif // ACRGIS_VERSION
+
+
+bool ViewshedGeoProcessing::processResults(Esri::ArcGISRuntime::GeoprocessingResult *results)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!results)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no results";
+    return false;
+  }
+
+  const QMap<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> &outputsMap = results->outputs();
+
+  if (outputsMap.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no keys, outputsMap is empty ";
+    return false;
+  }
+
+  // clear graphics:
+  clearResultGraphics();
+
+
+  QString key;
+
+  key = QStringLiteral("Output_polygon_features");
+  if (outputsMap.contains(key))
+  {
+    // Get the results from the outputs as GeoprocessingFeatures
+    Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures =
+      static_cast<Esri::ArcGISRuntime::GeoprocessingFeatures *>(outputsMap[key]);
+
+    return processFeatureResults(viewshedResultFeatures);
+  }
+
+  key = QStringLiteral("Output_raster");
+  if (outputsMap.contains(key))
+  {
+    Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster =
+      static_cast<Esri::ArcGISRuntime::GeoprocessingRaster *>(outputsMap[key]);
+    return processRasterResults(viewshedResultRaster);
+  }
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " failure, no known keyword found in outputsMap"
+                      << ", outputsMap.size() " << outputsMap.size();
+  return false;
+}
+
+bool ViewshedGeoProcessing::processFeatureResults(Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " processFeatureResults";
+
+  if (!viewshedResultFeatures)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no viewshedResultFeatures";
+    return false;
+  }
+
+  Esri::ArcGISRuntime::SimpleFillSymbol sfsVisi  (Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, QColor(0, 226, 0, 255), this);
+  Esri::ArcGISRuntime::SimpleFillSymbol sfsInVisi(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, QColor(226, 0, 0, 255), this);
+
+  // Add all the features from the result feature set as a graphics to the map
+  Esri::ArcGISRuntime::FeatureIterator features = viewshedResultFeatures->features()->iterator();
+  while (features.hasNext())
+  {
+    Esri::ArcGISRuntime::Feature *feat = features.next(this);
+
+    const QString &attKey(QLatin1String("gridcode"));
+    if (feat->attributes()->containsAttribute(attKey))
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " attributes()->attributeValue=== " << feat->attributes()->attributeValue(attKey).toString();
+
+      if (feat->attributes()->attributeValue(attKey).toInt())
+        m_resultGraphics.append(new Esri::ArcGISRuntime::Graphic(feat->geometry(), &sfsVisi));
+      else
+        m_resultGraphics.append(new Esri::ArcGISRuntime::Graphic(feat->geometry(), &sfsInVisi));
+
+      // ERROR_LOG(m_logger) << LOGFUNCTION << " attributeValue " << feat->attributes()->attributeValue(attKey).toInt();
+    } else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no key attributeValue ";
+
+  }
+
+  // transfer from own container to resultsOverlay:
+  m_resultsOverlay->graphics()->append(m_resultGraphics);
+
+  return true;
+}
+
+bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " viewshedResultRaster -> url = " << viewshedResultRaster->url().toString();
+
+  {
+    auto *fwatch = new QFutureWatcher<QString>(this);
+    connect(fwatch, &QFutureWatcher<QString>::finished, fwatch, [this, fwatch]() {
+      if (fwatch->isCanceled()) // 300: QFuture has no isSuccess(); treat a canceled future as failure
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " fetchFileAsync failed";
+        fwatch->deleteLater();
+        return;
+      }
+      const QString filePath = fwatch->result();
+      fwatch->deleteLater();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " filePath=" << filePath;
+
+    Esri::ArcGISRuntime::Raster *raster = new Esri::ArcGISRuntime::Raster(filePath, this);
+    if (!raster)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster failed";
+      return;
+    }
+    connect(raster, &Esri::ArcGISRuntime::Raster::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error) {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster EsriError occured: " << error;
+    });
+    connect(raster, &Esri::ArcGISRuntime::Raster::loadStatusChanged,  this, [this, raster] (Esri::ArcGISRuntime::LoadStatus loadStatus) {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster loadStatus="              << loadStatus;
+
+      if (loadStatus == Esri::ArcGISRuntime::LoadStatus::Loaded)
+      {
+
+
+        Esri::ArcGISRuntime::RasterLayer *rl = new Esri::ArcGISRuntime::RasterLayer(raster, this);
+        if (!rl)
+        {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " rl failed";
+          return;
+        }
+        connect(rl, &Esri::ArcGISRuntime::RasterLayer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error) {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " RasterLayer EsriError occured: " << error;
+        });
+        connect(rl, &Esri::ArcGISRuntime::RasterLayer::loadStatusChanged,  this, [this] (Esri::ArcGISRuntime::LoadStatus loadStatus) {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " RasterLayer loadStatus="              << loadStatus;
+        });
+
+
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << m_mapImpl->getEsriMap()->operationalLayers()->size();
+        m_mapImpl->getEsriMap()->operationalLayers()->append(rl);
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << m_mapImpl->getEsriMap()->operationalLayers()->size();
+
+
+        DEBUG_LOG(m_logger) << LOGFUNCTION << " rasterLayer loading ...";
+        rl->load();
+      }
+    });
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " raster loading ...";
+    raster->load();
+    });
+    fwatch->setFuture(viewshedResultRaster->fetchFileAsync(QStringLiteral("/tmp/viewshedFetched.tif"))); // 300: fetchFile -> fetchFileAsync (QFuture<QString>)
+  }
+
+  return true;
+}
+
+
+void ViewshedGeoProcessing::clearGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+  clearInputGraphics();
+  clearExtentGraphics();
+  clearResultGraphics();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ViewshedGeoProcessing::createInputGraphic(const Esri::ArcGISRuntime::Point &origin)
+{
+  if (!m_originGraphic)
+  {
+    m_originGraphic = new Esri::ArcGISRuntime::Graphic(this);
+    m_resultsOverlay->graphics()->append(m_originGraphic);
+  }
+
+  m_originGraphic->setGeometry(origin);
+
+  Esri::ArcGISRuntime::SimpleMarkerSymbol sms(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, QColor("red"), 12.0);
+  m_originGraphic->setSymbol(&sms);
+  m_originGraphic->setZIndex(std::numeric_limits<int>::max());
+}
+
+void ViewshedGeoProcessing::createExtentGraphic(const Esri::ArcGISRuntime::Point &origin, double radius)
+{
+  if (!m_extentGraphic)
+  {
+    m_extentGraphic = new Esri::ArcGISRuntime::Graphic(this);
+    m_resultsOverlay->graphics()->append(m_extentGraphic);
+  }
+
+   const Esri::ArcGISRuntime::Polygon &circlePoly = Esri::ArcGISRuntime::GeometryEngine::buffer(origin, radius); // circlePoly.parts().part(0).pointCount(); -> 96
+
+   m_extentGraphic->setGeometry(circlePoly);
+
+   Esri::ArcGISRuntime::SimpleLineSymbol sls(Esri::ArcGISRuntime::SimpleLineSymbolStyle::Solid, QColor("red"), 3.0);
+   m_extentGraphic->setSymbol(&sls);
+   m_extentGraphic->setZIndex(std::numeric_limits<int>::max());
+}
+
+void ViewshedGeoProcessing::clearInputGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+  if (m_originGraphic)
+  {
+    m_resultsOverlay->graphics()->removeOne(m_originGraphic);
+    delete m_originGraphic;
+    m_originGraphic = nullptr;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ViewshedGeoProcessing::clearExtentGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+  if (m_extentGraphic)
+  {
+    m_resultsOverlay->graphics()->removeOne(m_extentGraphic);
+    delete m_extentGraphic;
+    m_extentGraphic = nullptr;
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void ViewshedGeoProcessing::clearResultGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+
+  for (auto graphic : qAsConst(m_resultGraphics))
+  {
+    m_resultsOverlay->graphics()->removeOne(graphic);
+    delete graphic;
+  }
+  m_resultGraphics.clear();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ViewshedGeoProcessing::onErrorOccuredGeoprocessingTask(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::GeoprocessingTask *senderObj = qobject_cast<Esri::ArcGISRuntime::GeoprocessingTask *>(sender());
+  if (senderObj)
+    senderName = senderObj->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " GeoprocessingTask -> EsriError occured: " << error
+                      << ", sender= '" << senderName << "'";
+}
+
+void ViewshedGeoProcessing::onErrorOccuredGeoprocessingJob(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::GeoprocessingJob *senderObj = qobject_cast<Esri::ArcGISRuntime::GeoprocessingJob *>(sender());
+  if (senderObj)
+    senderName = senderObj->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " GeoprocessingJob -> EsriError occured: " << error
+                      << ", sender= '" << senderName << "'";
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp_ConsultingBuchta.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp_ConsultingBuchta.txt
new file mode 100755
index 000000000..d08253440
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp_ConsultingBuchta.txt
@@ -0,0 +1,526 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedGeoProcessing
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "viewshed_geo_processing.h"
+
+#include "map_impl.h"
+#include <GraphicalObjects/graphical_object_path.h>
+#include <Map/situation_map_utils.h>
+
+#include <MapImpl/layer_factory_impl.h>
+
+
+// ESRI
+#include <arcgis/Map.h>
+#include <arcgis/GraphicsOverlay.h>
+#include <arcgis/Graphic.h>
+#include <arcgis/GeoprocessingTask.h>
+#include <arcgis/GeoprocessingJob.h>
+#include <arcgis/GeoprocessingFeatures.h>
+#include <arcgis/GeoprocessingRaster.h>
+#include <arcgis/GeoprocessingParameter.h>
+#include <arcgis/GeoprocessingParameters.h>
+#include <arcgis/GeoprocessingResult.h>
+#include <arcgis/FeatureCollectionTable.h>
+#include <arcgis/Feature.h>
+#include <arcgis/SimpleMarkerSymbol.h>
+#include <arcgis/SimpleFillSymbol.h>
+
+#include <arcgis/GeoprocessingLinearUnit.h>
+#include <arcgis/ImageServiceRaster.h>
+#include <arcgis/RasterLayer.h>
+
+
+
+// Qt
+#include <QDebug>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ViewshedBase
+//-----------------------------------------------------------------------------
+ViewshedGeoProcessing::ViewshedGeoProcessing(const QString &url,
+                                             Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                             const Esri::ArcGISRuntime::SpatialReference &spatialReference,
+                                             QObject *parent)
+  : ViewshedBase(parent)
+  , m_url(url)
+  , m_resultsOverlay(graphicsLayer)
+  , m_srMap(spatialReference)
+  , m_logger(getLogger("ViewshedGeoProcessing"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ViewshedGeoProcessing::~ViewshedGeoProcessing()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  clearGraphics();
+  delete m_viewshedTask;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool ViewshedGeoProcessing::init(SituationMap::MapImpl *mapImpl)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (m_url.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " url is empty";
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return false;
+  }
+
+
+  m_mapImpl = mapImpl;
+
+  delete m_viewshedTask;
+  m_viewshedTask = new Esri::ArcGISRuntime::GeoprocessingTask(QUrl(m_url), this);
+  m_viewshedTask->setObjectName(QLatin1Literal("GeoprocessingTask"));
+
+  // Handle errors of GeoprocessingTask:
+  connect(m_viewshedTask, &Esri::ArcGISRuntime::GeoprocessingTask::errorOccurred,
+          this, &ViewshedGeoProcessing::onErrorOccuredGeoprocessingTask);
+
+  m_initialized = true;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_initialized=" << m_initialized;
+  return m_initialized;
+}
+
+
+bool ViewshedGeoProcessing::execute(const QPointF &viewshedPoint_map, const double distance, double zOffset)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " viewshedPoint_map=" << viewshedPoint_map
+                      << " m_srMap.wkid=" << m_srMap.wkid()
+                      << " distance=" << distance
+                      << " zOffset=" << zOffset
+                      << " m_viewshedInProgress=" << m_viewshedInProgress
+                      << " url='" << m_url << "'";
+
+  // check point is the viewshed point
+  Esri::ArcGISRuntime::Point esriViewshedPoint(viewshedPoint_map.x(), viewshedPoint_map.y(), m_srMap);   // Esri::ArcGISRuntime::SpatialReference::webMercator());
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " esriViewshedPoint.toJson: " << esriViewshedPoint.toJson();
+
+  m_viewshedInProgress = true;
+
+  createInputGraphic(esriViewshedPoint);
+  clearResultGraphics();
+
+  // Create a new feature collection table based upon point geometries using the current map view spatial reference
+  Esri::ArcGISRuntime::FeatureCollectionTable *inputFeatures =
+    new Esri::ArcGISRuntime::FeatureCollectionTable(QList<Esri::ArcGISRuntime::Field>()
+                                                    , Esri::ArcGISRuntime::GeometryType::Point
+                                                    , m_srMap
+                                                    , this);
+
+  // Create a new feature from the feature collection table. It will not have a coordinate location (x,y) yet
+  Esri::ArcGISRuntime::Feature *inputFeature = inputFeatures->createFeature(this);
+
+  // Assign a physical location to the new point feature based upon where the user clicked on the map view
+//  inputFeature->setGeometry(m_inputOverlay->graphics()->at(0)->geometry());
+  inputFeature->setGeometry(esriViewshedPoint);
+
+  // connect to addFeature status changed signal
+  connect(inputFeatures, &Esri::ArcGISRuntime::FeatureCollectionTable::addFeatureCompleted, this, [this, inputFeatures, distance, zOffset](QUuid, bool success)
+  {
+    INFO_LOG(m_logger) << LOGFUNCTION << " addFeatureCompleted...";
+
+    if (!success)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no success";
+      return;
+    }
+
+    // Create the parameters that are passed to the used geoprocessing task
+    Esri::ArcGISRuntime::GeoprocessingParameters viewshedParameters =
+      Esri::ArcGISRuntime::GeoprocessingParameters(Esri::ArcGISRuntime::GeoprocessingExecutionType::SynchronousExecute); // AsynchronousSubmit | SynchronousExecute
+    // GeoprocessingExecutionType should match Esri::ArcGISRuntime::GeoprocessingServiceType of LocalGeoprocessingService
+
+
+    // Request the output features to use the same SpatialReference as the map view
+    viewshedParameters.setOutputSpatialReference(m_srMap);
+
+    // Add an input location to the geoprocessing parameters
+    QMap<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> inputs;
+    inputs[QLatin1Literal("Input_point_or_polyline_observer_features")] = new Esri::ArcGISRuntime::GeoprocessingFeatures(inputFeatures, this); //QStringLiteral("ViewshedGeoProcessing")
+
+    // Radius
+    inputs[QLatin1Literal("Inner_radius")]        = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(100.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+    inputs[QLatin1Literal("Outer_radius")]        = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(distance, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // Observer
+// //!!!    inputs[QLatin1Literal("Observer_elevation")]  = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(0.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+    inputs[QLatin1Literal("Observer_offset")]     = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(zOffset, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // Target
+    inputs[QLatin1Literal("Surface_offset")]      = new Esri::ArcGISRuntime::GeoprocessingLinearUnit(0.0, Esri::ArcGISRuntime::GeoprocessingLinearUnits::Meter, this);
+
+    // setInputs
+    viewshedParameters.setInputs(inputs);
+
+    // Print geoprocessingParameters for debugging purpose:
+    QMapIterator<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> inputsIt(inputs);
+    while (inputsIt.hasNext())
+    {
+      inputsIt.next();
+      QString value(QLatin1Literal("-"));
+      Esri::ArcGISRuntime::GeoprocessingParameter *gpPara = inputsIt.value();
+      Esri::ArcGISRuntime::GeoprocessingLinearUnit *gpParaLU = dynamic_cast<Esri::ArcGISRuntime::GeoprocessingLinearUnit *>(gpPara);
+      if (gpParaLU)
+        value = QString(QLatin1Literal("%1 %2")).arg(gpParaLU->distance()).arg(gpParaLU->linearUnit().name());
+      NOTICE_LOG(m_logger) << LOGFUNCTION << " key= '" << inputsIt.key() << "'" << " value= '" << value << "'";
+    } // while
+
+
+
+    // Create the job that handles the communication between the application and the geoprocessing task
+    m_viewshedJob = m_viewshedTask->createJob(viewshedParameters);
+    m_viewshedJob->setObjectName(QLatin1Literal("GeoprocessingJob"));
+
+    // Handle errors of GeoprocessingJob:
+    connect(m_viewshedJob, &Esri::ArcGISRuntime::GeoprocessingJob::errorOccurred, this, &ViewshedGeoProcessing::onErrorOccuredGeoprocessingJob);
+
+    // Create signal handler for the job
+    connect(m_viewshedJob, &Esri::ArcGISRuntime::GeoprocessingJob::jobStatusChanged, this, &ViewshedGeoProcessing::onJobStatusChanged);
+
+    // start the job
+    m_viewshedJob->start();
+  });
+  // Add the new feature with (x,y) location to the feature collection table
+  inputFeatures->addFeature(inputFeature);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_viewshedInProgress=" << m_viewshedInProgress;
+  return true;
+}
+
+void ViewshedGeoProcessing::onJobStatusChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  //      qCritical() << "jobStatusChanged... viewshedJob->jobStatus()=" << (int)viewshedJob->jobStatus();
+
+  switch (m_viewshedJob->jobStatus())
+  {
+  case Esri::ArcGISRuntime::JobStatus::NotStarted:
+    qCritical() << "Geoprocessing Task failed";
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1Literal("Job NotStarted");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Failed:
+  {
+    qCritical() << "Geoprocessing Task failed";
+
+    const Esri::ArcGISRuntime::Error &err = m_viewshedJob->error();
+    qCritical() << "Geoprocessing Task failed message: "
+                << " code = " << err.code()
+                << " domain = " << (int)err.domain()
+                << " message = " << err.message()
+                << " additionalMessage = " << err.additionalMessage()
+                << " extendedErrorType = " << (int)err.extendedErrorType();
+
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1Literal("Job failed");
+  }
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Started:
+    m_viewshedInProgress = true;
+    m_jobStatus = QLatin1Literal("Job in progress...");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Paused:
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1Literal("Job paused...");
+    break;
+  case Esri::ArcGISRuntime::JobStatus::Succeeded:
+    m_viewshedInProgress = false;
+    m_jobStatus = QLatin1Literal("Job succeeded");
+    // handle the results
+    processResults(m_viewshedJob->result());
+    break;
+  default:
+    break;
+  }
+
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " jobStatusChanged is now (m_jobStatus): " << m_jobStatus;
+
+
+  // emit signals
+  //      emit viewshedInProgressChanged();
+  //      emit jobStatusChanged();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool ViewshedGeoProcessing::processResults(Esri::ArcGISRuntime::GeoprocessingResult *results)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!results)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no results";
+    return false;
+  }
+
+  const QMap<QString, Esri::ArcGISRuntime::GeoprocessingParameter *> &outputsMap = results->outputs();
+
+  if (outputsMap.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no keys, outputsMap is empty ";
+    return false;
+  }
+
+  // clear graphics:
+  clearResultGraphics();
+
+
+  QString key;
+
+  key = QStringLiteral("Output_polygon_features");
+  if (outputsMap.contains(key))
+  {
+    // Get the results from the outputs as GeoprocessingFeatures
+    Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures =
+      static_cast<Esri::ArcGISRuntime::GeoprocessingFeatures *>(outputsMap[key]);
+
+    return processFeatureResults(viewshedResultFeatures);
+  }
+
+  key = QStringLiteral("Output_raster");
+  if (outputsMap.contains(key))
+  {
+    Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster =
+      static_cast<Esri::ArcGISRuntime::GeoprocessingRaster *>(outputsMap[key]);
+    return processRasterResults(viewshedResultRaster);
+  }
+
+  key = QStringLiteral("Output_polygon_features");
+  if (outputsMap.contains(key))
+  {
+    // Get the results from the outputs as GeoprocessingFeatures
+    Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures =
+      static_cast<Esri::ArcGISRuntime::GeoprocessingFeatures *>(outputsMap[key]);
+
+    return processFeatureResults(viewshedResultFeatures);
+  }
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " no adeqaute keyword found in outputsMap";
+  return false;
+}
+
+bool ViewshedGeoProcessing::processFeatureResults(Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " processFeatureResults";
+
+  if (!viewshedResultFeatures)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no viewshedResultFeatures";
+    return false;
+  }
+
+  Esri::ArcGISRuntime::SimpleFillSymbol sfsVisi  (Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, QColor(0, 226, 0, 255), this);
+  Esri::ArcGISRuntime::SimpleFillSymbol sfsInVisi(Esri::ArcGISRuntime::SimpleFillSymbolStyle::Solid, QColor(226, 0, 0, 255), this);
+
+  // Add all the features from the result feature set as a graphics to the map
+  Esri::ArcGISRuntime::FeatureIterator features = viewshedResultFeatures->features()->iterator();
+  while (features.hasNext())
+  {
+    Esri::ArcGISRuntime::Feature *feat = features.next(this);
+
+    const QString &attKey(QLatin1String("gridcode"));
+    if (feat->attributes()->containsAttribute(attKey))
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " attributes()->attributeValue=== " << feat->attributes()->attributeValue(attKey).toString();
+
+      if (feat->attributes()->attributeValue(attKey).toInt())
+        m_resultGraphics.append(new Esri::ArcGISRuntime::Graphic(feat->geometry(), &sfsVisi));
+      else
+        m_resultGraphics.append(new Esri::ArcGISRuntime::Graphic(feat->geometry(), &sfsInVisi));
+
+      // ERROR_LOG(m_logger) << LOGFUNCTION << " attributeValue " << feat->attributes()->attributeValue(attKey).toInt();
+    } else
+      ERROR_LOG(m_logger) << LOGFUNCTION << " no key attributeValue ";
+
+  }
+
+  // transfer from own container to resultsOverlay:
+  m_resultsOverlay->graphics()->append(m_resultGraphics);
+
+  return true;
+}
+
+bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " viewshedResultRaster -> url = " << viewshedResultRaster->url().toString();
+
+  connect(viewshedResultRaster, &Esri::ArcGISRuntime::GeoprocessingRaster::fetchFileCompleted, this, [this] (QUuid taskId, const QString& filePath) {
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " filePath=" << filePath;
+
+    Esri::ArcGISRuntime::Raster *raster = new Esri::ArcGISRuntime::Raster(filePath, this);
+    if (!raster)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster failed";
+      return;
+    }
+    connect(raster, &Esri::ArcGISRuntime::Raster::errorOccurred, this, [this, raster] (const Esri::ArcGISRuntime::Error &error) {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster EsriError occured: "
+                          << ", code="              << error.code()
+                          << ", domain="            << (int)error.domain()
+                          << ", extendedErrorType=" << (int)error.extendedErrorType()
+                          << ", message='"         << error.message() << "'"
+                          << ", additionalMessage='"         << error.additionalMessage() << "'";
+    });
+    connect(raster, &Esri::ArcGISRuntime::Raster::loadStatusChanged,  this, [this, raster] (Esri::ArcGISRuntime::LoadStatus loadStatus) {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " raster loadStatus="              << loadStatus;
+
+      if (loadStatus == Esri::ArcGISRuntime::LoadStatus::Loaded)
+      {
+
+
+        Esri::ArcGISRuntime::RasterLayer *rl = new Esri::ArcGISRuntime::RasterLayer(raster, this);
+        if (!rl)
+        {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " rl failed";
+          return;
+        }
+        connect(rl, &Esri::ArcGISRuntime::RasterLayer::errorOccurred, this, [this] (const Esri::ArcGISRuntime::Error &error) {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " RasterLayer EsriError occured: "
+                              << ", code="              << error.code()
+                              << ", domain="            << (int)error.domain()
+                              << ", extendedErrorType=" << (int)error.extendedErrorType()
+                              << ", message='"         << error.message() << "'"
+                              << ", additionalMessage='"         << error.additionalMessage() << "'";
+        });
+        connect(rl, &Esri::ArcGISRuntime::RasterLayer::loadStatusChanged,  this, [this] (Esri::ArcGISRuntime::LoadStatus loadStatus) {
+          ERROR_LOG(m_logger) << LOGFUNCTION << " RasterLayer loadStatus="              << loadStatus;
+        });
+
+
+        NOTICE_LOG(m_logger) << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << m_mapImpl->getEsriMap()->operationalLayers()->size();
+        m_mapImpl->getEsriMap()->operationalLayers()->append(rl);
+        NOTICE_LOG(m_logger) << LOGFUNCTION << " getEsriMap()->operationalLayers()->size" << m_mapImpl->getEsriMap()->operationalLayers()->size();
+
+
+        NOTICE_LOG(m_logger) << LOGFUNCTION << " rasterLayer loading ...";
+        rl->load();
+
+      }
+
+
+    });
+
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " raster loading ...";
+    raster->load();
+
+  });
+
+  Esri::ArcGISRuntime::TaskWatcher tw = viewshedResultRaster->fetchFile(QString(QLatin1Literal("/tmp/viewshedFetched.tif")));
+
+  if (!tw.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl failed";
+    return false;
+  }
+
+  return true;
+}
+
+
+void ViewshedGeoProcessing::clearGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+  clearInputGraphics();
+  clearResultGraphics();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ViewshedGeoProcessing::createInputGraphic(const Esri::ArcGISRuntime::Point &origin)
+{
+  if (!m_originGraphic)
+  {
+    m_originGraphic = new Esri::ArcGISRuntime::Graphic(this);
+    m_resultsOverlay->graphics()->append(m_originGraphic);
+  }
+
+  m_originGraphic->setGeometry(origin);
+  Esri::ArcGISRuntime::SimpleMarkerSymbol sms(Esri::ArcGISRuntime::SimpleMarkerSymbolStyle::Circle, QColor("red"), 12.0);
+  m_originGraphic->setSymbol(&sms);
+  m_originGraphic->setZIndex(32000);
+  m_resultsOverlay->graphics()->append(m_originGraphic);
+}
+
+
+void ViewshedGeoProcessing::clearInputGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+  if (m_originGraphic)
+  {
+    m_resultsOverlay->graphics()->removeOne(m_originGraphic);
+    delete m_originGraphic;
+    m_originGraphic = nullptr;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void ViewshedGeoProcessing::clearResultGraphics()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << this;
+
+  for (auto graphic : qAsConst(m_resultGraphics))
+  {
+    m_resultsOverlay->graphics()->removeOne(graphic);
+    delete graphic;
+  }
+  m_resultGraphics.clear();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void ViewshedGeoProcessing::onErrorOccuredGeoprocessingTask(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::GeoprocessingTask *senderObj = qobject_cast<Esri::ArcGISRuntime::GeoprocessingTask *>(sender());
+  if (senderObj)
+    senderName = senderObj->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " GeoprocessingTask -> EsriError occured: "
+                      << " sender= '" << senderName << "'"
+                      << ", code="              << error.code()
+                      << ", domain="            << (int)error.domain()
+                      << ", extendedErrorType=" << (int)error.extendedErrorType()
+                      << ", message='"         << error.message() << "'"
+                      << ", additionalMessage='"         << error.additionalMessage() << "'";
+}
+
+void ViewshedGeoProcessing::onErrorOccuredGeoprocessingJob(const Esri::ArcGISRuntime::Error &error)
+{
+  QString senderName;
+  Esri::ArcGISRuntime::GeoprocessingJob *senderObj = qobject_cast<Esri::ArcGISRuntime::GeoprocessingJob *>(sender());
+  if (senderObj)
+    senderName = senderObj->objectName();
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " GeoprocessingJob -> EsriError occured: "
+                      << " sender= '" << senderName << "'"
+                      << ", code="              << error.code()
+                      << ", domain="            << (int)error.domain()
+                      << ", extendedErrorType=" << (int)error.extendedErrorType()
+                      << ", message='"         << error.message() << "'"
+                      << ", additionalMessage='"         << error.additionalMessage() << "'";
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h
new file mode 100755
index 000000000..2acb939fb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h
@@ -0,0 +1,125 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedGeoProcessing
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "viewshed_base.h"
+
+// ESRI
+#include <arcgisversion.h>    // This file is created by RME, not ESRI
+#include <Map.h>
+#include <SpatialReference.h>
+
+
+// Qt
+#include <QObject>
+#include <QColor>
+#include <QPointF>
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Map;
+class Graphic;
+class GraphicsOverlay;
+class GeoprocessingTask;
+class GeoprocessingJob;
+class GeoprocessingResult;
+class GeoprocessingFeatures;
+class GeoprocessingRaster;
+enum class JobStatus;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class MapImpl;
+
+
+class ViewshedGeoProcessing : public ViewshedBase
+{
+  Q_OBJECT
+
+public:
+  explicit ViewshedGeoProcessing(const QString &url,
+                                 Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                 const Esri::ArcGISRuntime::SpatialReference &spatialReference,
+                                 QObject *parent = nullptr);
+
+  virtual ~ViewshedGeoProcessing();
+
+
+  bool init(SituationMap::MapImpl *mapImpl = nullptr);   // mapImpl is required only if processRasterResults is used
+  bool initialized() const  { return m_initialized; }
+
+
+  bool execute(const QPointF &viewshedPoint_map, double outerRadius, double observerOffset) override;
+
+  bool isRunning() const  { return m_viewshedInProgress; }
+
+  bool processResults(Esri::ArcGISRuntime::GeoprocessingResult *results);
+
+  void clearGraphics();
+
+  void createInputGraphic(const Esri::ArcGISRuntime::Point &origin);
+  void clearInputGraphics();
+  void createExtentGraphic(const Esri::ArcGISRuntime::Point &origin, double radius);
+  void clearExtentGraphics();
+
+  void clearResultGraphics();
+
+
+protected slots:
+  void onJobStatusChanged();
+#if ACRGIS_VERSION >= 0x640E00 // 100.14.0
+  void onJobStatusChangedWithJsParameter(const Esri::ArcGISRuntime::JobStatus &);
+#endif // ACRGIS_VERSION
+
+  void onErrorOccuredGeoprocessingTask(const Esri::ArcGISRuntime::Error &error);
+  void onErrorOccuredGeoprocessingJob(const Esri::ArcGISRuntime::Error &error);
+
+
+protected:
+  bool processFeatureResults(Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures);
+  bool processRasterResults(Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster);
+
+private:
+
+  QString                                 m_url;
+
+  Esri::ArcGISRuntime::GraphicsOverlay   *m_resultsOverlay;
+
+  SituationMap::MapImpl                  *m_mapImpl             = nullptr;
+  Esri::ArcGISRuntime::SpatialReference   m_srMap;
+
+  Esri::ArcGISRuntime::GeoprocessingTask *m_viewshedTask        = nullptr;
+  QString                                 m_jobStatus;
+
+  Esri::ArcGISRuntime::GeoprocessingJob  *m_viewshedJob         = nullptr;
+
+  bool                                    m_initialized         = false;
+
+  bool                                    m_viewshedInProgress  = false;
+  QList<Esri::ArcGISRuntime::Graphic *>   m_resultGraphics;
+
+  Esri::ArcGISRuntime::Graphic           *m_originGraphic = nullptr;
+  Esri::ArcGISRuntime::Graphic           *m_extentGraphic = nullptr;
+
+  LOGGER_T                                m_logger;
+
+}; // class ViewshedGeoProcessing
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h_ConsultingBuchta.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h_ConsultingBuchta.txt
new file mode 100755
index 000000000..0c2077d3f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h_ConsultingBuchta.txt
@@ -0,0 +1,116 @@
+/**
+  * @RDE_HEADER@
+  * ViewshedGeoProcessing
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "viewshed_base.h"
+
+// ESRI
+#include <arcgis/Map.h>
+#include <arcgis/SpatialReference.h>
+
+
+// Qt
+#include <QObject>
+#include <QColor>
+#include <QPointF>
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class Map;
+class Graphic;
+class GraphicsOverlay;
+class GeoprocessingTask;
+class GeoprocessingJob;
+class GeoprocessingResult;
+class GeoprocessingFeatures;
+class GeoprocessingRaster;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class MapImpl;
+
+
+class ViewshedGeoProcessing : public ViewshedBase
+{
+  Q_OBJECT
+
+public:
+  explicit ViewshedGeoProcessing(const QString &url,
+                                 Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                 const Esri::ArcGISRuntime::SpatialReference &spatialReference,
+                                 QObject *parent = nullptr);
+
+  virtual ~ViewshedGeoProcessing();
+
+
+  bool init(SituationMap::MapImpl *mapImpl = nullptr);
+  bool initialized() const  { return m_initialized; }
+
+
+  bool execute(const QPointF &viewshedPoint_map, const double distance, double zOffset) override;
+
+  bool isRunning() const  { return m_viewshedInProgress; }
+
+  bool processResults(Esri::ArcGISRuntime::GeoprocessingResult *results);
+
+  void clearGraphics();
+
+  void createInputGraphic(const Esri::ArcGISRuntime::Point &origin);
+  void clearInputGraphics();
+
+  void clearResultGraphics();
+
+
+protected slots:
+  void onJobStatusChanged();
+  void onErrorOccuredGeoprocessingTask(const Esri::ArcGISRuntime::Error &error);
+  void onErrorOccuredGeoprocessingJob(const Esri::ArcGISRuntime::Error &error);
+
+
+protected:
+  bool processFeatureResults(Esri::ArcGISRuntime::GeoprocessingFeatures *viewshedResultFeatures);
+  bool processRasterResults(Esri::ArcGISRuntime::GeoprocessingRaster *viewshedResultRaster);
+
+private:
+
+  QString                                 m_url;
+
+  Esri::ArcGISRuntime::GraphicsOverlay   *m_resultsOverlay;
+
+  SituationMap::MapImpl                  *m_mapImpl             = nullptr;
+  Esri::ArcGISRuntime::SpatialReference   m_srMap;
+
+  Esri::ArcGISRuntime::GeoprocessingTask *m_viewshedTask        = nullptr;
+  QString                                 m_jobStatus;
+
+  Esri::ArcGISRuntime::GeoprocessingJob  *m_viewshedJob         = nullptr;
+
+  bool                                    m_initialized         = false;
+
+  bool                                    m_viewshedInProgress  = false;
+  QList<Esri::ArcGISRuntime::Graphic *>   m_resultGraphics;
+
+  Esri::ArcGISRuntime::Graphic           *m_originGraphic = nullptr;
+
+  LOGGER_T                                m_logger;
+
+}; // class ViewshedGeoProcessing
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp
new file mode 100755
index 000000000..9f5e2ce04
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp
@@ -0,0 +1,884 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Viewshed
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "viewshed_impl.h"
+#include "viewshed_analysis.h"
+#include "viewshed_geo_processing.h"
+#include "layer_factory_impl.h"
+
+#include "coord_translation_functor_impl.h"
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+#include <Map/object_factory.h>
+#include <Map/sight_fan.h>
+
+#include <MathUtils/math_const.h>
+#include <MathUtils/simple_helper.h>
+
+#include "Rubberbands/rubberband_factory.h"
+#include <GeodeticDistanceResult.h>
+#include <Point.h>
+#include <AngularUnit.h>
+#include <LinearUnit.h>
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+class ViewshedImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SituationMap::MapImpl                          *m_mapImpl   = nullptr;
+
+  QPointer<RB::RubberbandBase>                    m_rubbandBase = nullptr;
+
+  QString                                         m_url;
+
+  Esri::ArcGISRuntime::GraphicsOverlay           *m_graphicsLayer   = nullptr;  // graphicsLayer used in 2D
+
+  ViewshedParameter                               m_viewshedParameter;
+
+  using COUNTER_T = long;
+  static COUNTER_T                                m_viewshedCounter;
+  QMap<COUNTER_T, ViewshedBase* >                 m_viewshedMap;
+  QMap<COUNTER_T, SightFan*>                      m_sightFanMap;
+
+}; // class ViewshedImpl::Private
+//-----------------------------------------------------------------------------
+
+ViewshedImpl::Private::COUNTER_T ViewshedImpl::Private::m_viewshedCounter = 0;
+
+
+//-----------------------------------------------------------------------------
+// class ViewshedImpl
+//-----------------------------------------------------------------------------
+ViewshedImpl::ViewshedImpl(SituationMap::MapImpl *mapImpl)
+  : BaseClass()
+  , m_logger(getLogger("ViewshedImpl"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_mapImpl   = mapImpl;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ViewshedImpl::~ViewshedImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->remove();
+  delete d;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void ViewshedImpl::setViewshedUrl(const QString &viewshedServiceUrl)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, viewshedServiceUrl='" << viewshedServiceUrl << "'";
+
+  d->m_url = viewshedServiceUrl;
+
+  if (d->m_url.isEmpty())
+  {
+    // only demo!!! 10.2.6!?   http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed
+    // only demo!!! V100.2     https://sampleserver6.arcgisonline.com/arcgis/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed
+    d->m_url = QLatin1String("https://sampleserver6.arcgisonline.com/arcgis/rest/services/Elevation/ESRI_Elevation_World/GPServer/Viewshed"); // only demo!!!
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, d->m_url'" << d->m_url << "'";
+}
+
+bool ViewshedImpl::isReady()
+{
+  init();
+  bool isReady = (d->m_graphicsLayer) && d->m_mapImpl->isReady();
+
+  if (!isReady)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " d->m_url.isEmpty() = "  << d->m_url.isEmpty()
+                        << " d->m_graphicsLayer = "  << d->m_graphicsLayer
+                        << " d->m_mapImpl->isReady() = "  << d->m_mapImpl->isReady();
+  }
+  return isReady;
+}
+
+bool ViewshedImpl::create()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return false;
+  }
+
+  // remove all former
+  this->remove();
+
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  // d->m_rubbandBase; should be cleared now
+
+  const Mode mode = d->m_mapImpl->mode();
+  switch (mode) {
+  case Mode::Mode_2D:
+    d->m_rubbandBase = createRubberband2D();
+    break;
+  case Mode::Mode_3D:
+    d->m_rubbandBase = createRubberband3D();
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mode (" << mode << ")" << " does not support viewshed";
+    return false;
+  }
+
+  return true;
+}
+
+
+bool ViewshedImpl::create(double alpha, double innerRadius, double observerHeight, double targetHeight, double beamAngle)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return false;
+  }
+
+  if (alpha < 0.0) alpha = 0.0;
+  if (alpha > 1.0) alpha = 1.0;
+
+  if (beamAngle < 0.5) beamAngle = 0.5;
+
+  // remove all former
+  this->remove();
+
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  d->m_viewshedParameter.innerRadius    = innerRadius;
+  d->m_viewshedParameter.observerHeight = observerHeight;
+  d->m_viewshedParameter.targetHeight   = targetHeight;
+  d->m_viewshedParameter.dAngle         = beamAngle*MathConst::pi/180.0; // grad to rad
+  d->m_viewshedParameter.alpha          = alpha;
+
+  const Mode mode = d->m_mapImpl->mode();
+  switch (mode) {
+  case Mode::Mode_2D:
+    d->m_rubbandBase = createSightFanRubberband2D();
+    break;
+  case Mode::Mode_3D:
+    d->m_rubbandBase = createSightFanRubberband3D();
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mode (" << mode << ")" << " does not support viewshed";
+    return false;
+  }
+
+  return true;
+  // d->m_rubbandBase; should be cleared now
+}
+
+
+long ViewshedImpl::create(const ViewshedParameter &viewshedParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " viewshedParameter: " << viewshedParameter;
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return -1;
+  }
+
+  // store current values:
+  d->m_viewshedParameter = viewshedParameter;
+
+  ViewshedBase *viewshed = nullptr;
+
+  // GPU-based viewshed (viewshedAnalysis) is today supported for 3D only:
+  const Mode mode = d->m_mapImpl->mode();
+  switch (mode) {
+  case Mode::Mode_2D:
+    viewshed = create_viewshedGP(d->m_viewshedParameter);
+    break;
+  case Mode::Mode_3D:
+    viewshed = create_viewshedAnalysis(d->m_viewshedParameter);
+    break;
+  default:
+    ERROR_LOG(m_logger) << LOGFUNCTION << " mode (" << mode << ")" << " does not support viewshed";
+    return -1;
+  }
+
+  if (!viewshed)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " creation of viewshed failed" << " mode (" << mode << ")";
+    return -1;
+  }
+
+  d->m_viewshedMap[++d->m_viewshedCounter] = viewshed;
+
+  emit viewshedFinished(d->m_viewshedCounter);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+
+  return d->m_viewshedCounter;
+
+} // long ViewshedImpl::create(const ViewshedParameter &viewshedParameter)
+
+
+bool ViewshedImpl::modify(long viewshedId, double alpha, double innerRadius, double observerHeight, double targetHeight, double beamAngle)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!isReady())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " failed, not ready";
+    return false;
+  }
+
+  if (alpha < 0.0) alpha = 0.0;
+  if (alpha > 1.0) alpha = 1.0;
+  if (beamAngle < 0.5) beamAngle = 0.5;
+
+  if (viewshedId < 0) viewshedId = d->m_viewshedCounter;
+
+  if (d->m_sightFanMap.contains(viewshedId))
+  {
+    SightFan *sightFan = d->m_sightFanMap[viewshedId];
+
+    d->m_viewshedParameter.innerRadius = innerRadius;
+    d->m_viewshedParameter.observerHeight = observerHeight;
+    d->m_viewshedParameter.targetHeight = targetHeight;
+    d->m_viewshedParameter.dAngle = beamAngle * MathConst::pi / 180.0; // grad to rad
+    d->m_viewshedParameter.noBeams = MathConst::pi_two / d->m_viewshedParameter.dAngle;
+    d->m_viewshedParameter.alpha = alpha;
+
+    sightFan->setAlpha( d->m_viewshedParameter.alpha );
+    sightFan->setInnerRadius( d->m_viewshedParameter.innerRadius );
+    sightFan->setCenterHat( d->m_viewshedParameter.observerHeight );
+    sightFan->setObjectHat( d->m_viewshedParameter.targetHeight );
+    sightFan->setdeltaAngle( d->m_viewshedParameter.dAngle );
+    sightFan->setNoOfFans( d->m_viewshedParameter.noBeams );
+
+    sightFan->show();
+    return true;
+  }
+  return false;
+} // bool ViewshedImpl::modify(long viewshedId, double alpha, double innerRadius, double observerHeight, double targetHeight, double beamAngle)
+
+
+ViewshedBase *ViewshedImpl::create_viewshedGP(const ViewshedParameter &viewshedParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                       << " viewshedParameter: " << viewshedParameter;
+
+  if (!d->m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no graphicsLayer for viewshed";
+    return nullptr;
+  }
+  if (d->m_url.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no url for viewshed";
+    return nullptr;
+  }
+
+  ViewshedGeoProcessing *viewshed = new ViewshedGeoProcessing(d->m_url, d->m_graphicsLayer, d->m_mapImpl->getEsriSpatialReference());
+  if (!viewshed->init(d->m_mapImpl))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+    delete viewshed;
+    return nullptr;
+  }
+
+  // coordTranslation:
+  CoordTranslationFunctor *coordTransFunctor       = d->m_mapImpl->coordTranslationFunctor();
+  const QPointF           &viewshedPointTranslated = coordTransFunctor ? coordTransFunctor->geographicToMap(viewshedParameter.viewshedOrigin_latLon) : QPointF();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION
+                      << " viewshedParameter= " << viewshedParameter;
+
+  if (!viewshed->execute(viewshedPointTranslated,    // Map-Coord
+                         viewshedParameter.outerRadius,
+                         viewshedParameter.observerHeight))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " executing GeoProcessing viewshed failed.";
+    delete viewshed;
+    return nullptr;
+  }
+  return viewshed;
+} // ViewshedBase *ViewshedImpl::create_viewshedGP(const ViewshedParameter &viewshedParameter)
+
+
+ViewshedBase *ViewshedImpl::create_viewshedAnalysis(const ViewshedParameter &viewshedParameter)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                       << " viewshedParameter: " << viewshedParameter;
+
+  if (!d->m_mapImpl->getEsriSceneGraphicsView())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " getEsriSceneGraphicsView failed for viewsheds";
+    return nullptr;
+  }
+
+  ViewshedAnalysis *viewshed = new ViewshedAnalysis(d->m_mapImpl->getEsriSceneGraphicsView());
+
+  // rad to degree
+  const double factor = 180 / MathConst::pi;
+  const QPointF &centerDegree = viewshedParameter.viewshedOrigin_latLon * factor;
+
+  if (!viewshed->execute(centerDegree,  // degree
+                         viewshedParameter.outerRadius,
+                         viewshedParameter.observerHeight))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " executing analysis viewshed failed.";
+    delete viewshed;
+    return nullptr;
+  }
+  return viewshed;
+} // ViewshedBase *ViewshedImpl::create_viewshedAnalysis(const ViewshedParameter &viewshedParameter)
+
+
+void ViewshedImpl::remove(long viewshedId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " viewshedId=" << viewshedId;
+
+  //if (viewshedId < 0)
+  {
+    // ok, not special viewshed is adressed --> remove all
+    for (ViewshedBase *viewshed : qAsConst(d->m_viewshedMap))
+      delete viewshed;
+    d->m_viewshedMap.clear();
+
+    for (SightFan *sightFan : qAsConst(d->m_sightFanMap))
+    {
+      if (sightFan)
+        sightFan->removeMySelf();
+    }
+    d->m_sightFanMap.clear();
+    return;
+  }
+
+  if (d->m_viewshedMap.contains(viewshedId))
+  {
+    delete d->m_viewshedMap[viewshedId];
+    d->m_viewshedMap.remove(viewshedId);
+   
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+      << " viewshedId=" << viewshedId;
+    return;
+  }
+ 
+  if (d->m_sightFanMap.contains(viewshedId))
+  {
+    d->m_sightFanMap[viewshedId]->removeMySelf();
+    d->m_sightFanMap[viewshedId] = nullptr;
+    d->m_sightFanMap.remove(viewshedId);
+
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+      << " viewshedId=" << viewshedId;
+    return;
+  }
+
+  ERROR_LOG(m_logger) << LOGFUNCTION << " viewShedId not found, id=" << viewshedId;
+}
+
+
+ViewshedParameter ViewshedImpl::getViewshedParameter(long viewshedId, bool *ok) const
+{
+  if (ok)
+    *ok = false;
+
+  if (viewshedId < 0)
+    viewshedId = d->m_viewshedCounter;
+
+  if (d->m_sightFanMap.contains(viewshedId))
+  {
+    const SightFan *sightFan = d->m_sightFanMap[viewshedId];
+
+    if (sightFan)
+    {
+      ViewshedParameter vp;
+
+      vp.viewshedOrigin_latLon = sightFan->center();
+      vp.observerHeight        = sightFan->centerHat();
+      vp.targetHeight          = sightFan->objectHat();
+      vp.innerRadius           = sightFan->innerRadius();
+      vp.outerRadius           = sightFan->radius();
+      vp.startAngle            = sightFan->startAngle();
+      vp.dAngle                = sightFan->dAngle();
+      vp.alpha                 = sightFan->alpha();
+      vp.noBeams               = sightFan->noOfFans();
+
+      if (ok)
+        *ok = true;
+      return vp;
+    }
+  }
+  return d->m_viewshedParameter;
+} // const ViewshedParameter & ViewshedImpl::getViewshedParameter(long viewshedId = -1, bool *ok = nullptr)
+
+
+void ViewshedImpl::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_graphicsLayer)
+  {
+    LayerFactoryImpl &layerFactory = d->m_mapImpl->layerFactoryImpl();
+    const QString &toolsLayername = layerFactory.toolLayer();
+    d->m_graphicsLayer = layerFactory.getGraphicsLayer(toolsLayername);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+RB::RubberbandEllipse *ViewshedImpl::createRubberband2D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandEllipse *rubberband =
+      d->m_mapImpl->rubberbandFactory().create<SituationMap::RB::RubberbandEllipse>(this);
+
+ if (!rubberband || !rubberband->rubberbandIsAlive())
+ {
+   ERROR_LOG(m_logger) << LOGFUNCTION << " create2D failed";
+   return nullptr;
+ }
+ rubberband->setAutoDelete(true);
+
+ rubberband->constrainQuadratic(true);
+ rubberband->constrainOrthogonal(true);
+// rubberband->minWidth(radiusMin * 2); // Should be 2*radiusMin
+// rubberband->maxWidth(radiusMax * 2); // Should be 2*radiusMax
+
+
+ connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &ViewshedImpl::onRbAbort, Qt::UniqueConnection);
+ connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &ViewshedImpl::onRb2DApply, Qt::UniqueConnection);
+
+ return rubberband;
+}
+
+
+RB::RubberbandEllipse *ViewshedImpl::createSightFanRubberband2D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandEllipse *rubberband =
+    d->m_mapImpl->rubberbandFactory().create<SituationMap::RB::RubberbandEllipse>(this);
+
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " create2D failed";
+    return nullptr;
+  }
+  rubberband->setAutoDelete(true);
+
+  rubberband->constrainQuadratic(true);
+  rubberband->constrainOrthogonal(true);
+  rubberband->enableSector(false);       // set enableSector to true to allow sector sight fans instead of full circles
+
+  rubberband->minWidth(d->m_viewshedParameter.innerRadius * 3); // radius should be larger than innerRadius
+
+  // rubberband->maxWidth(radiusMax * 2); // Should be 2*radiusMax
+
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &ViewshedImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &ViewshedImpl::onSightFanRb2DApply, Qt::UniqueConnection);
+
+  return rubberband;
+} // RB::RubberbandEllipse *ViewshedImpl::createSightFanRubberband2D()
+
+
+RB::RubberbandMultiPointFeature3D *ViewshedImpl::createSightFanRubberband3D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandMultiPointFeature3D *rubberband =
+    d->m_mapImpl->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>(this);
+
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " create3D failed";
+    return nullptr;
+  }
+  rubberband->setAutoDelete(true);
+  rubberband->enableCircular(true);
+
+//  rubberband->constrainQuadratic(true);
+//  rubberband->constrainOrthogonal(true);
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &ViewshedImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &ViewshedImpl::onSightFanRb3DApply, Qt::UniqueConnection);
+
+  return rubberband;
+} // RB::RubberbandMultiPointFeature3D *ViewshedImpl::createSightFanRubberband3D()
+
+
+RB::RubberbandMultiPointFeature3D *ViewshedImpl::createRubberband3D()
+{
+  // remove any pending/active rubberbands of our map:
+  RB::Rubberband::deleteAllActiveRubberbands(d->m_mapImpl);
+
+  RB::RubberbandMultiPointFeature3D *rubberband =
+    d->m_mapImpl->rubberbandFactory().create3D<RB::RubberbandMultiPointFeature3D>(this);
+
+  if (!rubberband || !rubberband->rubberbandIsAlive())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " create3D failed";
+    return nullptr;
+  }
+  rubberband->setAutoDelete(true);
+  rubberband->enableCircular(true);
+
+  //  rubberband->constrainQuadratic(true);
+  //  rubberband->constrainOrthogonal(true);
+
+  connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &ViewshedImpl::onRbAbort, Qt::UniqueConnection);
+  connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &ViewshedImpl::onSightFanRb3DApply, Qt::UniqueConnection);
+
+  return rubberband;
+}
+
+
+void ViewshedImpl::onRbAbort(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+    return;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " rb abort";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void ViewshedImpl::onSightFanRb2DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandEllipse *ellipse       = static_cast<RB::RubberbandEllipse *>(rbnd);
+  const QString         &toolLayerName = d->m_mapImpl->layerFactoryImpl().toolLayer();
+
+  double                diameter;
+  double                dummy;
+  QPointF               direction;
+ 
+  ellipse->rectangleParameter( d->m_viewshedParameter.viewshedOrigin_latLon, diameter, dummy, direction );
+
+  if (diameter > 0.0)
+  {
+    d->m_viewshedParameter.outerRadius = diameter * 0.5;
+    if (ellipse->hasSector())
+    {
+      double startAngle = SituationMap::MathUtils::getMathAngle(ellipse->sectorStart());
+      double endAngle   = SituationMap::MathUtils::getMathAngle(ellipse->sectorEnd());
+
+      if (startAngle > endAngle)
+      {
+        startAngle -= MathConst::pi_two;
+      }
+
+      d->m_viewshedParameter.noBeams    = ceil( (endAngle - startAngle) / d->m_viewshedParameter.dAngle );
+      d->m_viewshedParameter.startAngle = startAngle;
+    }
+    else
+    {
+      d->m_viewshedParameter.startAngle = 0.0;
+      d->m_viewshedParameter.noBeams    = MathConst::pi_two / d->m_viewshedParameter.dAngle;
+    }
+
+   
+    ObjectFactory  &objFac   = d->m_mapImpl->objectFactory();
+    SightFan       *sightFan = objFac.create<SituationMap::SightFan>(toolLayerName).take();
+    if (sightFan)
+    {
+      sightFan->initFan( d->m_viewshedParameter.viewshedOrigin_latLon
+                       , d->m_viewshedParameter.observerHeight
+                       , d->m_viewshedParameter.targetHeight
+                       , d->m_viewshedParameter.outerRadius
+                       , d->m_viewshedParameter.innerRadius
+                       , d->m_viewshedParameter.startAngle
+                       , d->m_viewshedParameter.dAngle
+                       , d->m_viewshedParameter.noBeams
+                       , d->m_viewshedParameter.alpha );
+     
+      long sightFanId = ++d->m_viewshedCounter;
+      d->m_sightFanMap[sightFanId] = sightFan;
+
+      emit viewshedFinished(sightFanId);
+
+      // create a RubberbandPointFeature to let the user move around the sight fan
+
+      RB::RubberbandPointFeature *moveRB = d->m_mapImpl->rubberbandFactory().create<RB::RubberbandPointFeature>(this);
+      if (moveRB)
+      {
+        moveRB->setAutoDelete(true);
+        moveRB->enableModificationState();
+        moveRB->setCoordinateVector(QVector<QPointF>() << sightFan->center());
+
+        std::function<bool(SituationMap::RB::RubberbandBase*)> moveSightFan = [this, sightFanId](SituationMap::RB::RubberbandBase* rbBase) -> bool
+        {
+          SituationMap::RB::RubberbandPointFeature *rubberPFeat = dynamic_cast<SituationMap::RB::RubberbandPointFeature*>(rbBase);
+
+          SightFan * sightFan = d->m_sightFanMap[sightFanId];
+          if (nullptr == sightFan)
+          {
+            if (rubberPFeat) rubberPFeat->deleteMySelf();
+            return false;
+          }
+
+          if (rubberPFeat)
+          {
+            const QPointF & loc = rubberPFeat->singleCoordinate();
+            sightFan->move(loc);
+          }
+          return true;
+        };
+
+        moveRB->installExternalUpdate(moveSightFan);
+      }
+    } // if sightFan 
+  } // if diameter
+} // void ViewshedImpl::onSightFanRb2DApply(RB::RubberbandBase *rbnd)
+
+
+void ViewshedImpl::onSightFanRb3DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandMultiPointFeature3D *rubberband    = static_cast<RB::RubberbandMultiPointFeature3D *>(rbnd);
+  const QString                     &toolLayerName = d->m_mapImpl->layerFactoryImpl().toolLayer();
+  const QVector<QPointF>            &data          = rubberband->coordinateVector(RB::CoordinateSystem::Map);  // 3D -> RB::CoordinateSystem::Map -> degree
+
+  if (data.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+    return;
+  }
+
+  if (data.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " insufficiant number of coords";
+    return;
+  }
+
+  ViewshedParameter viewshedParameter;
+
+  // degree to rad
+  const double factor = MathConst::pi / 180.0;
+  const QPointF &center = data.at(0) * factor;
+//  viewshedParameter.viewshedOrigin_latLon = center;
+
+  {
+    static Esri::ArcGISRuntime::GeometryEngine *gEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+    const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+    QPointF coord = data.at(0);
+    Esri::ArcGISRuntime::Point geom1(coord.x(), coord.y(), sr);
+    coord = data.at(1);
+    Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr);
+
+    Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
+      Esri::ArcGISRuntime::LinearUnit::meters(),
+      Esri::ArcGISRuntime::AngularUnit::degrees(),
+      Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+
+    viewshedParameter.outerRadius = geodeticDistanceResult.distance();
+  }
+
+  unsigned int noBeams = floor((MathConst::pi_two) / d->m_viewshedParameter.dAngle);
+
+
+  ObjectFactory         &objFac   = d->m_mapImpl->objectFactory();
+  RefPointer<SightFan>   objRef = objFac.create<SituationMap::SightFan>(toolLayerName);
+  SightFan              *sightFan = objRef.get();
+
+  if (sightFan)
+  {
+    if (d->m_viewshedParameter.innerRadius*1.5 > viewshedParameter.outerRadius)
+    {
+      viewshedParameter.outerRadius = d->m_viewshedParameter.innerRadius*1.5;
+    }
+
+    sightFan->initFan(center
+      , d->m_viewshedParameter.observerHeight
+      , d->m_viewshedParameter.targetHeight
+      , viewshedParameter.outerRadius
+      , d->m_viewshedParameter.innerRadius
+      , 0.0
+      , d->m_viewshedParameter.dAngle
+      , noBeams
+      , d->m_viewshedParameter.alpha );
+
+    long sightFanId = ++d->m_viewshedCounter;
+    d->m_sightFanMap[sightFanId] = sightFan;
+
+    emit viewshedFinished(sightFanId);
+
+    // create a RubberbandPointFeature3D to let the user move around the sight fan
+
+    RB::RubberbandPointFeature3D *moveRB = d->m_mapImpl->rubberbandFactory().create3D<RB::RubberbandPointFeature3D>(this);
+    if (moveRB)
+    {
+      moveRB->setAutoDelete(true);
+      moveRB->enableModificationState();
+      moveRB->setCoordinateVector(QVector<QPointF>() << sightFan->center());
+
+      std::function<bool(SituationMap::RB::RubberbandBase*)> moveSightFan3D = [this, sightFanId](SituationMap::RB::RubberbandBase* rbBase) -> bool
+      {
+        SituationMap::RB::RubberbandPointFeature3D *rubberPFeat = dynamic_cast<SituationMap::RB::RubberbandPointFeature3D*>(rbBase);
+
+        SightFan * sightFan = d->m_sightFanMap[sightFanId];
+        if (nullptr == sightFan)
+        {
+          if (rubberPFeat) rubberPFeat->deleteMySelf();
+          return false;
+        }
+
+        if (rubberPFeat)
+        {
+          const QPointF & loc = rubberPFeat->singleCoordinate();
+          sightFan->move(loc);
+        }
+        return true;
+      };
+
+      moveRB->installExternalUpdate(moveSightFan3D);
+    }
+  }
+
+} // void ViewshedImpl::onSightFanRb3DApply(RB::RubberbandBase *rbnd)
+
+
+void ViewshedImpl::onRb2DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandEllipse *ellipse = static_cast<RB::RubberbandEllipse *>(rbnd);
+
+  const QVector<QPointF> &data = ellipse->rectangleVerticies();
+  const LtsCoordTrans::UtmCoordinate p0(LtsCoordTrans::UtmCoordinate::fromGeographic(data.at(0)));
+  const LtsCoordTrans::UtmCoordinate p1(LtsCoordTrans::UtmCoordinate::fromGeographic(data.at(2), p0.zone));
+
+  const QPointF &center = ellipse->centerPoint();
+  double radius = fabs((p0.x - p1.x) / 2);
+
+  // 23.03.2018, N. Thoden
+  // LegatusBremen201803151510.gpk contains dem with cell size of ~ 50m
+  // So the inner_radius has to be >= 50m
+  // And of course:  outer_radius > inner_radius
+  // So outerRadius > 60
+
+  if (radius < 100.0)
+    radius = 100.0;
+
+  ViewshedParameter viewshedParameter;
+  viewshedParameter.viewshedOrigin_latLon = center;
+  viewshedParameter.outerRadius = radius;
+
+  long id = this->create(viewshedParameter);
+
+  if (id < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ViewshedImpl::onRb3DApply(RB::RubberbandBase *rbnd)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (!rbnd)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no rubberband";
+    return;
+  }
+
+  RB::RubberbandMultiPointFeature3D *rubberband = static_cast<RB::RubberbandMultiPointFeature3D *>(rbnd);
+
+  const QVector<QPointF> &data = rubberband->coordinateVector(RB::CoordinateSystem::Map);  // 3D -> RB::CoordinateSystem::Map -> degree
+
+  if (data.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+    return;
+  }
+
+  if (data.size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " insufficiant number of coords";
+    return;
+  }
+
+  ViewshedParameter viewshedParameter;
+
+  // degree to rad
+  const double factor = MathConst::pi / 180.0;
+  const QPointF &center = data.at(0) * factor;
+  viewshedParameter.viewshedOrigin_latLon = center;
+
+  {
+    static Esri::ArcGISRuntime::GeometryEngine *gEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+    const Esri::ArcGISRuntime::SpatialReference &sr = d->m_mapImpl->getEsriSpatialReference();
+
+    QPointF coord = data.at(0);
+    Esri::ArcGISRuntime::Point geom1(coord.x(), coord.y(), sr);
+    coord = data.at(1);
+    Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr);
+
+    Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
+                                                            Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                            Esri::ArcGISRuntime::AngularUnit::degrees(),
+                                                            Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+
+    viewshedParameter.outerRadius = geodeticDistanceResult.distance();
+  }
+
+  long id = this->create(viewshedParameter);
+
+  if (id < 0)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " rubberband failed!?";
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.h
new file mode 100755
index 000000000..9cdcd8f24
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.h
@@ -0,0 +1,91 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Viewshed
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/viewshed.h> // Interface
+#include "map_impl.h"
+#include "Rubberbands/rubberband_ellipse.h"
+#include "Rubberbands/rubberband_multi_point_feature_3d.h"
+
+
+// Qt
+#include <QPointF>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class ViewshedBase;
+
+class ViewshedImpl : public /*virtual*/ Viewshed
+{
+  using BaseClass = Viewshed;
+
+  public:
+
+    explicit ViewshedImpl(SituationMap::MapImpl *mapImpl);
+    virtual ~ViewshedImpl();
+
+    ViewshedImpl(const ViewshedImpl &other)     = delete;
+    ViewshedImpl &operator=(ViewshedImpl &other) = delete;
+
+    void setViewshedUrl(const QString &viewshedServiceUrl) override;
+
+    bool isReady();
+
+    bool create() override;
+    bool create(double alpha, double innerRadius, double observerHeight, double targetHeight, double beamAngle) override;
+    long create(const ViewshedParameter &viewshedParameter) override;
+  
+    bool modify(long viewshedId, double alpha, double innerRadius, double observerHeight, double targetHeight, double beamAngle) override;
+
+    void remove(long viewshedId = -1) override;
+
+    ViewshedParameter getViewshedParameter(long viewshedId = -1, bool *ok = nullptr) const override;
+
+
+  private Q_SLOTS:
+ 
+    void onRbAbort(RB::RubberbandBase *rbnd);
+    void onRb2DApply(RB::RubberbandBase *rbnd);
+    void onRb3DApply(RB::RubberbandBase *rbnd);
+
+    void onSightFanRb2DApply(RB::RubberbandBase *rbnd);
+    void onSightFanRb3DApply(RB::RubberbandBase *rbnd);
+
+  private:
+
+    ViewshedBase *create_viewshedGP(const ViewshedParameter &viewshedParameter);
+    ViewshedBase *create_viewshedAnalysis(const ViewshedParameter &viewshedParameter);
+
+    void init();
+
+
+    RB::RubberbandEllipse             *createRubberband2D();
+    RB::RubberbandMultiPointFeature3D *createRubberband3D();
+
+    RB::RubberbandEllipse             *createSightFanRubberband2D();
+    RB::RubberbandMultiPointFeature3D *createSightFanRubberband3D();
+
+    LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+    class Private;
+    /**
+        * The private d->pointer to not break BC when changing internals of this class
+       */
+    Private *d = nullptr;
+
+}; // ViewshedImpl
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/_single_fire_central.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/_single_fire_central.h
new file mode 100755
index 000000000..7c9f117b2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/_single_fire_central.h
@@ -0,0 +1,58 @@
+/**
+  * @RDE_HEADER@
+  * Interface of SingleFireCentral
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The SingleFireCentral class supports Indirect Single Fire.
+ */
+class SingleFireCentral : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  SingleFireCentral() : BaseClass() {;}  ///< Contructor
+
+  virtual ~SingleFireCentral() = default;  ///< Destructor
+
+  /*! \name Specific data*/
+  //@{
+  struct DetonationData
+  {
+    DetonationData() = default;
+    DetonationData(const Point3D &origin, double radius)
+      : m_origin(origin), m_radius(radius)
+    {}
+    Point3D m_origin;
+    double m_radius{0.0};
+  };
+  virtual void setDetonation(const DetonationData &detonationData) = 0;
+  virtual DetonationData detonation() const = 0;
+  virtual bool startDetonationAnimation() = 0;
+
+  // required???
+  virtual Point3D impactOrigin() const = 0;
+  virtual void setImpactOrigin(const Point3D &impactOrigin) = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_multi_point_map_object.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_multi_point_map_object.h
new file mode 100755
index 000000000..b1738b0d6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_multi_point_map_object.h
@@ -0,0 +1,65 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AbstractMultiPointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include <Map/abstract_map_object.h>
+#include <Map/line_style.h>
+#include <Map/fill_style.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The AbstractMultiPointMapObject class serves as baseclass for
+ * MapObjects with a multiple coordinates.
+ * Therefore setPositions and positions are supported.
+ */
+class AbstractMultiPointMapObject : public virtual AbstractMapObject
+{
+
+  using BaseClass = AbstractMapObject;
+
+public:
+
+  /** \name Positions
+   * Set positions of the object.
+   */
+  //@{
+  virtual PositionCont positions() const = 0;
+  virtual bool setPositions(const PositionCont &posCont) = 0;
+  virtual PositionCont positionsTranslated() const = 0;
+  virtual bool setPositionsTranslated(const PositionCont &posCont) = 0;
+  //@}
+
+  /** \name LineStyle
+   * See AbstractMapObject for details.
+   */
+  //@{
+  virtual LineStyle lineStyle() const = 0;
+  virtual LineStyle &rLineStyle() = 0;
+  virtual void setLineStyle(const LineStyle &lineStyle) = 0;
+  //@}
+
+
+  /** \name FillStyle
+   * See AbstractMapObject for details.
+   */
+  //@{
+  virtual FillStyle fillStyle() const = 0;
+  virtual FillStyle &rFillStyle() = 0;
+  virtual void setFillStyle(const FillStyle &FillStyle) = 0;
+  //@}
+
+};
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_single_point_map_object.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_single_point_map_object.h
new file mode 100755
index 000000000..7d1298c22
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/abstract_single_point_map_object.h
@@ -0,0 +1,63 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AbstractSinglePointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include <Map/abstract_map_object.h>
+#include <Map/line_style.h>
+#include <Map/fill_style.h>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The AbstractSinglePointMapObject class serves as baseclass for
+ * MapObjects with a single coordinate.
+ * Therefore setOrigin and origin are supported.
+ */
+class AbstractSinglePointMapObject : public virtual AbstractMapObject
+{
+
+  using BaseClass = AbstractMapObject;
+
+public:
+  /** \name Origin
+   * Set origin of the object.
+   */
+  //@{
+  virtual Point3D origin() const = 0;
+  virtual bool setOrigin(const Point3D &origin) = 0;
+  //@}
+
+
+  /** \name LineStyle
+   * See AbstractMapObject for details.
+   */
+  //@{
+  virtual LineStyle lineStyle() const = 0;
+  virtual LineStyle &rLineStyle() = 0;
+  virtual void setLineStyle(const LineStyle &lineStyle) = 0;
+  //@}
+
+  /** \name FillStyle
+   * See AbstractMapObject for details.
+   */
+  //@{
+  virtual FillStyle fillStyle() const = 0;
+  virtual FillStyle &rFillStyle() = 0;
+  virtual void setFillStyle(const FillStyle &FillStyle) = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/air_support.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/air_support.h
new file mode 100755
index 000000000..11bba5d88
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/air_support.h
@@ -0,0 +1,38 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AirSupport
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The AirSupport class supports AirSupport.
+ */
+class AirSupport : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  AirSupport() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~AirSupport() = default;  ///< Destructor
+
+  virtual void setReferencedObject(const UniqueMapId &UniqueMapId) = 0;
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/area_fire.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/area_fire.h
new file mode 100755
index 000000000..fb424c801
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/area_fire.h
@@ -0,0 +1,90 @@
+/**
+  * @RDE_HEADER@
+  * Interface of AreaFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The AreaFire class supports AreaFire with impacts.
+ */
+//class SITUATIONMAP_EXPORT
+class AreaFire : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+  using BaseClass = SituationMap::AbstractMultiPointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  AreaFire() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+  virtual ~AreaFire() = default;  ///< Destructor
+
+  /*! \name Specific data - impacts */
+  //@{
+  virtual PositionCont scheduledImpacts() const = 0;
+  virtual PositionCont impacts() const = 0;
+  virtual PositionCont impactsAbsoluteHeight() const = 0;
+
+  /**
+   * @brief Set impacts of AreaFire.
+   * @param posCont Impacts to be set.
+   */
+  virtual void setScheduledImpacts(const PositionCont &posCont, const QColor &explicitColor = QColor()) = 0;
+  virtual void setImpacts(const PositionCont &posCont) = 0;
+  virtual void setImpactsAbsoluteHeight(const PositionCont &posCont) = 0;
+  //@}
+
+
+  virtual PositionCont detonationsAbsolute() const = 0;
+  virtual PositionCont detonationsDraped() const = 0;
+
+  /**
+   * @brief Set detonation (3D) of AreaFire.
+   * @param detonationRadius radius to be used.
+   * @param detonationsPositions detonations to be set.
+   */
+  virtual bool setDetonationsAbsolute(const PositionCont &detonationsPositions, int detonationRadius) = 0;  // Absolute
+  virtual bool setDetonationsDraped(const PositionCont &detonationsPositions, int detonationRadius) = 0;
+
+  /*! \name Specific data - GunToTargetLine / GunToTargetTrajectory */
+  //@{
+  virtual void setGunToTargetLineSurface(const Point3D &start, const Point3D &end) = 0;
+  virtual void setGunToTargetTrajectory3D(const PositionCont &gunToTargetPath) = 0;
+  //@}
+
+  /*! \name Specific data - NonLethalArea */
+  //@{
+  virtual void setNonLethalArea(const PositionCont &nonLethalArea) = 0;
+  //@}
+
+
+  /*! \name Specific data - trajectory */
+  //@{
+  virtual PositionCont trajectory(int index) const = 0;
+
+  /**
+   * @brief Set trajectoryPath of AreaFire.
+   * @param index path index.
+   * @param trajectoryPath path to be set.
+   */
+  virtual bool setTrajectory(int index, const PositionCont &trajectoryPath) = 0;
+  //@}
+
+
+};
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/biological_agent.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/biological_agent.h
new file mode 100755
index 000000000..e569dcc52
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/biological_agent.h
@@ -0,0 +1,46 @@
+/**
+  * @RDE_HEADER@
+  * Interface of BiologicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The BiologicalAgent class supports BiologicalAgent.
+ */
+class BiologicalAgent : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  BiologicalAgent() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+  virtual ~BiologicalAgent() = default;  ///< Destructor
+
+  /*! \name Specific data*/
+  //@{
+  virtual Point3D origin() const = 0;
+  virtual void setOrigin(const Point3D &origin) = 0;
+  virtual float radius() const = 0;
+  virtual void setRadius(float radius) = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/building_outline.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/building_outline.h
new file mode 100755
index 000000000..c3ee2d24d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/building_outline.h
@@ -0,0 +1,58 @@
+/**
+  * @RDE_HEADER@
+  * Interface of BuildingOutline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+
+// Qt
+#include <QUrl>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The BuildingOutline class supports BuildingOutline.
+ */
+class BuildingOutline : public virtual AbstractMultiPointMapObject
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  BuildingOutline() : AbstractMultiPointMapObject() {;} ///< Contructor
+
+  virtual ~BuildingOutline() = default;  ///< Destructor
+
+  virtual LineStyle lineStyle()                         const   = 0;
+  virtual LineStyle &rLineStyle()                               = 0;
+  virtual void setLineStyle(const LineStyle &lineStyle)         = 0;
+
+  virtual FillStyle fillStyle()                         const   = 0;
+  virtual FillStyle &rFillStyle()                               = 0;
+  virtual void setFillStyle(const FillStyle &FillStyle)         = 0;
+
+  virtual void setMarker(const Point3D &markerOrigin)           = 0;
+
+  // The 3D model is using the markerOrigin
+  struct ModelSceneSymbolData
+  {
+    QUrl  url;
+    float heading{0.0};    // degree, clockwise, 0 is north/12
+    float scale{1.0};
+  };
+  virtual ModelSceneSymbolData getModelSceneSymbolData()                             = 0;
+  virtual void setModelSceneSymbolData(const ModelSceneSymbolData &modelSceneSymbolData) = 0;
+};
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/chemical_agent.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/chemical_agent.h
new file mode 100755
index 000000000..eba12b457
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/chemical_agent.h
@@ -0,0 +1,46 @@
+/**
+  * @RDE_HEADER@
+  * Interface of ChemicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The ChemicalAgent class supports different agent types.
+ */
+class ChemicalAgent : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  ChemicalAgent() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;} ///< Contructor
+
+  virtual ~ChemicalAgent() = default;  ///< Destructor
+
+  /*! \name Specific data*/
+  //@{
+  virtual Point3D origin() const = 0;
+  virtual void setOrigin(const Point3D &origin) = 0;
+  virtual float radius() const = 0;
+  virtual void setRadius(float radius, unsigned int maxPointCount = 0) = 0;
+  //@}
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/cube.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/cube.h
new file mode 100755
index 000000000..8e71e1f75
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/cube.h
@@ -0,0 +1,44 @@
+/**
+  * @RDE_HEADER@
+  * Interface of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The Cube class supports staked cubes displaying the building ownership for example.
+ * The cubes can have more than 3 positions.
+ * But be aware that there is no 'roof' yes.
+ */
+class Cube : public virtual AbstractMultiPointMapObject
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Cube() : BaseClass() {;}  ///< Contructor
+
+  virtual ~Cube() = default;  ///< Destructor
+
+
+  virtual double height() const = 0;
+  virtual void setHeight(double height) = 0;
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/danger_area.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/danger_area.h
new file mode 100755
index 000000000..b32b1220a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/danger_area.h
@@ -0,0 +1,37 @@
+/**
+  * @RDE_HEADER@
+  * Interface of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The DangerArea class supports DangerAreas of different agents.
+ */
+class DangerArea : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  DangerArea() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~DangerArea() = default;  ///< Destructor
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/functional_area.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/functional_area.h
new file mode 100755
index 000000000..b9bb9a4c8
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/functional_area.h
@@ -0,0 +1,48 @@
+/**
+  * @RDE_HEADER@
+  * Interface of FunctionalArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The FunctionalArea class supports FunctionalArea.
+ */
+class FunctionalArea : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  FunctionalArea() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~FunctionalArea() = default;  ///< Destructor
+
+
+  /*! \name Point symbol */
+  //@{
+  virtual Point3D pointSymbolOrigin() const = 0;
+  virtual void setPointSymbolOrigin(const Point3D &pointSymbolOrigin) = 0;
+
+  virtual const QString &pointSymbolSidc() const = 0;
+  virtual void setPointSymbolSidc(const QString &pointSymbolOriginSidc) = 0;
+  //@}
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geo_image.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geo_image.h
new file mode 100755
index 000000000..8ebfc26a1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geo_image.h
@@ -0,0 +1,146 @@
+/**
+  * @RDE_HEADER@
+  * Interface of GeoImage
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_single_point_map_object.h"
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The GeoImage class supports displaying image proxies like a small dot.
+ * By clicking of the proxy the image and an optional description will be displayed.
+ */
+class GeoImage : public virtual AbstractSinglePointMapObject
+{
+public:
+
+  struct GeoImageData
+  {
+    MarkerSymbolType  proxyMarker     = MarkerSymbolType::Undefined; ///< if not set, a Diamond will be used
+    int               proxyMarkerSize = 20;
+    QColor            proxyMarkerColor = Qt::red;
+    QImage            proxyImage;                                ///< if not set, marker will be used
+    QSize             proxyImageDefaultSize;
+
+    QImage            mainImage;
+    QString           description;
+    bool              pinEnabled = false;
+
+    /**
+     * @brief operator== Compare two objects
+     * @param other to be compared with
+     * @return true if identical, otherwise false.
+     */
+    bool operator==(const GeoImageData &other) const
+    {
+      return ((this->description     == other.description) &&
+              (this->mainImage       == other.mainImage) &&
+              (this->proxyImage      == other.proxyImage) &&
+              (this->proxyMarkerSize == other.proxyMarkerSize) &&
+              (this->proxyMarkerColor== other.proxyMarkerColor) &&
+              (this->proxyMarker     == other.proxyMarker)
+             );
+    }
+
+    /**
+     * @brief operator!= Compare two objects
+     * @param other to be compared with
+     * @return true if NOT identical, otherwise false.
+     */
+    bool operator!=(const GeoImageData &other) const
+    {
+      return !(*this == other);
+    }
+
+    QString toString() const
+    {
+      QString str = QLatin1String("GeoImage(");
+      if (proxyImage.isNull())
+        str.append(QLatin1String("noProxyImage, "));
+      else
+        str.append(QLatin1String("withProxyImage, "));
+
+      if (mainImage.isNull())
+        str.append(QLatin1String("noMainImage, "));
+      else
+        str.append(QLatin1String("withMainImage, "));
+
+      str.append(QStringLiteral("desc='%1')").arg(description));
+
+      return str;
+    }
+  };
+
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  GeoImage() : AbstractSinglePointMapObject() {;}  ///< Contructor
+
+  virtual ~GeoImage() = default;  ///< Destructor
+
+  /*! \name Set data in one call */
+  //@{
+  virtual GeoImageData geoImageData() const = 0;
+  virtual void setGeoImageData(const GeoImageData &geoImageData) = 0;
+  //@}
+
+  /*! \name Set data separately */
+  //@{
+  virtual MarkerSymbolType proxyMarker() const = 0;
+  virtual void setProxyMarker(const MarkerSymbolType &proxyMarker) = 0;
+  virtual int proxyMarkerSize() const = 0;
+  virtual void setProxyMarkerSize(int proxyMarkerSize) = 0;
+  virtual QColor proxyMarkerColor() const = 0;
+  virtual void setProxyMarkerColor(const QColor &proxyMarkerColor) = 0;
+
+  virtual QImage proxyImage() const = 0;
+  virtual QSize proxyImageDefaultSize() const = 0;
+
+  /**
+   * @brief setProxyImage to set a proxy image be displayed on the map (instead of marker)
+   * @param proxyImage proxy image be displayed on the map
+   * @param proxyImageDefaultSize default size image if (user) scale is 1.0.
+   * The image will be scaled to the proxyImageDefaultSize * scale.
+   * To ensure that the image will be displayed with high resolution, the proxyImage must have this resolution.
+   * Example:
+   * Set an image of QSize(100,100), and set a proxyImageDefaultSize of QSize(20,20).
+   * Initially (scale = 1.0) the image will be downscaled to QSize(20,20).
+   * If the uses increases the scale to 4.0, the image will be scaled to QSize(80,80)
+   * This should ensure a good image quality.
+   */
+  virtual void setProxyImage(const QImage &proxyImage, const QSize &proxyImageDefaultSize) = 0;
+
+
+  virtual QImage mainImage() const = 0;
+  virtual void setMainImage(const QImage &mainImage) = 0;
+
+  virtual QString description() const = 0;
+  virtual void setDescription(const QString &description) = 0;
+
+  // for better visibility at 3D
+  virtual void setPinEnabled(bool enablePin) = 0;
+  virtual bool isPinEnabled() const = 0;
+  //@}
+
+
+  /*! \name Create default widget */
+  //@{
+  virtual QWidget *createWidget(QWidget *parent = nullptr) const = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.cpp
new file mode 100755
index 000000000..5d62eb985
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.cpp
@@ -0,0 +1,75 @@
+/**
+  * @RDE_HEADER@
+  * Class Geometry
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "geometry.h"
+#include <cmath>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+QList<QPointF> Geometry::createCircle(const QPointF &center, qreal radius, int steps)
+{
+  QList<QPointF> circle;
+  circle.reserve(steps);
+
+  if (steps < 10)
+    steps = 10;
+  for (int i = 0; i < 360; i += (360 / steps))
+  {
+    double winkel = i * M_PI / 180.0;
+    circle << (center + QPointF(cos(winkel) * radius, sin(winkel) * radius));
+  }
+  circle << circle.value(0); // 'close' the circle
+  //  circle.translate(center);
+  return circle;
+}
+
+
+QList<QPointF> Geometry::createArcSegment(const QPointF &center, qreal radius,
+                                          double startAngle_degree,
+                                          double angleOffset_clockwise_degree,
+                                          int stepsPer360)
+{
+  QList<QPointF> points;
+
+  if (stepsPer360 < 10)
+    stepsPer360 = 10;
+
+  startAngle_degree *= -1.0;
+  startAngle_degree += 90;
+
+  // normalize
+  startAngle_degree            = fmod(startAngle_degree, 360);
+  angleOffset_clockwise_degree = fmod(angleOffset_clockwise_degree, 360);
+
+  // steps
+  int steps = fabs(angleOffset_clockwise_degree) * stepsPer360 / 360;
+  points.reserve(steps + 1);
+
+  double startAngle_rad        = startAngle_degree            * M_PI / 180.0;
+  double angleOffset_right_rad = angleOffset_clockwise_degree * M_PI / 180.0;
+  for (int i = 0; i < steps; ++i)
+  {
+    //                                 '-' to go clockwise:
+    double winkel_rad = (startAngle_rad - (i * angleOffset_right_rad / steps));
+    points << (center + QPointF(cos(winkel_rad) * radius, sin(winkel_rad) * radius));
+  }
+  // calculate very last iteration (independent from 'steps'):
+  double winkel_rad = (startAngle_rad - (angleOffset_right_rad));
+  points << (center + QPointF(cos(winkel_rad) * radius, sin(winkel_rad) * radius));
+
+  return points;
+}
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.h
new file mode 100755
index 000000000..b73359d5b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/geometry.h
@@ -0,0 +1,46 @@
+/**
+  * @RDE_HEADER@
+  * Class Geometry
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "situation_map_export.h"
+
+
+// Qt
+#include <QPointF>
+#include <QList>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT Geometry final
+{
+public:
+  Geometry()  = default;
+  ~Geometry() = default;
+
+  static QList<QPointF> createCircle(const QPointF &center,
+                                     qreal radius,
+                                     int steps = 72); // 72 -> 5° Schritte
+
+  static QList<QPointF> createArcSegment(const QPointF &center, qreal radius,
+                                         double startAngle_degree,
+                                         double angleOffset_clockwise_degree,
+                                         int stepsPer360 = 72); // 72 -> 5° Schritte
+
+  static const int minNumberOfVerticesPerCircle = 10;
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/hit_line.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/hit_line.h
new file mode 100755
index 000000000..f96468406
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/hit_line.h
@@ -0,0 +1,58 @@
+/**
+  * @RDE_HEADER@
+  * Interface of HitLine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The HitLine class supports HitLines of different agents.
+ * The method setPositions() should never be called.
+ */
+class HitLine : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  HitLine() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~HitLine() = default;  ///< Destructor
+
+
+  /*! \name Specific data*/
+  //@{
+
+//  virtual PositionCont impacts() const = 0;
+
+  /**
+   * @brief Start and end point:.
+   */
+  virtual Point3D startPoint() const = 0;
+  virtual Point3D endPoint() const = 0;
+
+  virtual void setStartAndEndPoint(const Point3D &start, const Point3D &end) = 0;
+  //@}
+
+
+  // void setPositions(const PositionCont& posCont) //SHOULD NEVER BE CALLED
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/line_of_sight.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/line_of_sight.h
new file mode 100755
index 000000000..4834f8564
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/line_of_sight.h
@@ -0,0 +1,64 @@
+/**
+  * @RDE_HEADER@
+  * Interface of LineOfSight
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The LineOfSight class supports a "single" line with two colors.
+ * The method setPositions() should never be called.
+ */
+class LineOfSight : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  LineOfSight()
+    : AbstractMultiPointMapObject(), AbstractEffectSimulation()
+  {}  ///< Contructor
+
+  virtual ~LineOfSight() = default;  ///< Destructor
+
+
+  /*! \name Specific data*/
+  //@{
+
+
+  /*!
+   * \brief set relvants Points
+   * \param observer observerPoint (
+   * \param obstacle obstacle point
+   * \param target targetPoint
+   * \param visibleColor color to visualize the visible part
+   * \param obstructedColor color to visualize the obstructed part
+   */
+  virtual void setPoints(const Point3D &observer,
+                         const Point3D &obstacle,
+                         const Point3D &target,
+                         const QColor &visibleColor = Qt::green,
+                         const QColor &obstructedColor = Qt::red) = 0;
+  //@}
+
+
+  // void setPositions(const PositionCont& posCont) //SHOULD NEVER BE CALLED
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_attributes.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_attributes.h
new file mode 100755
index 000000000..e7ddb01c1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_attributes.h
@@ -0,0 +1,35 @@
+/**
+  * @RDE_HEADER@
+  * Interface of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_single_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief
+ */
+class MapObjectAttributes : public virtual AbstractSinglePointMapObject
+{
+
+public:
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  MapObjectAttributes() : AbstractSinglePointMapObject() {;}  ///< Contructor
+
+  virtual ~MapObjectAttributes() = default;  ///< Destructor
+
+  virtual QVariantMap attributes() const = 0;
+  virtual void setAttributes(const QVariantMap &attributes) = 0;
+};
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_indicator.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_indicator.h
new file mode 100755
index 000000000..f761d6bac
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/map_object_indicator.h
@@ -0,0 +1,80 @@
+/**
+  * @RDE_HEADER@
+  * Interface of MapObjectIndicator
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The MapObjectIndicator points to exactly one MapObject defined by its uniqueMapId.
+ *
+ * This MapObjectIndicator should be smart, you normally don´t have to set the position,
+ * color or similar directly.
+ * Just call setMapObjectToPointTo() and updateView();
+ * \n The MapObjectIndicator shoud 'follow' the object to be pointed to.
+ * \n The color is taken from the objectToBePointedTo (if that changes, call updateView() again).
+ *
+ * <b>Some Annotations / Recommendations:</b>
+ * - Layer: create the MapObjectIndicator in the topmost (operational) layer (LayerType::Operational)
+ * - The drawOrder is internal choosen to be OVER the objectToBePointedTo
+ * - The method setPositions() should never be called.
+ *
+ */
+class MapObjectIndicator : public virtual AbstractMultiPointMapObject
+{
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  MapObjectIndicator() : AbstractMultiPointMapObject() {;}  ///< Contructor
+
+  virtual ~MapObjectIndicator() = default;  ///< Destructor
+
+
+  /*! \name Specific data*/
+  //@{
+
+
+  /**
+   * @brief Start and end point:.
+   */
+  virtual Point3D startPoint() const = 0;
+  virtual Point3D endPoint() const = 0;
+
+  virtual void setStartAndEndPoint(const Point3D &start, const Point3D &end) = 0;
+
+  /**
+   * @brief mapObjectToPointTo
+   * @return uniqueId of the object to be pointed to.
+   */
+  virtual UniqueMapId mapObjectToPointTo() = 0;
+
+  /**
+   * @brief Set uniqueId of object should to be pointed to.
+   * @attention But there is NO automatic update yet. Caller is responsable for operforming updateView()!
+   * @param uniqueId of the object to be pointed to.
+   */
+  virtual void setMapObjectToPointTo(UniqueMapId uniqueId) = 0;
+  //@}
+
+
+  // void setPositions(const PositionCont& posCont) //SHOULD NEVER BE CALLED
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine.h
new file mode 100755
index 000000000..34b5710c4
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine.h
@@ -0,0 +1,53 @@
+/**
+  * @RDE_HEADER@
+  * Interface of Mine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_single_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The SingleFire class supports Indirect Single Fire.
+ */
+class Mine : public virtual AbstractSinglePointMapObject
+{
+
+  using BaseClass = AbstractSinglePointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Mine() : AbstractSinglePointMapObject() {;}  ///< Contructor
+
+  virtual ~Mine() = default;  ///< Destructor
+
+  /*! \name Specific data*/
+  //@{
+  /**
+   * @brief Set mine state (true = aimed/active => filled symbol).
+   * @return True for aimed/active, otherwise false.
+   */
+  virtual bool state() const = 0;
+
+  /**
+   * @brief Set new mine state.
+   * @param state (true = aimed/active => filled symbol)
+   */virtual void setState(bool state) = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine_field.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine_field.h
new file mode 100755
index 000000000..604e558c6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/mine_field.h
@@ -0,0 +1,90 @@
+/**
+  * @RDE_HEADER@
+  * Interface of MineField
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The MineField class supports MineFields with Activated and DeActivated mines.
+ */
+class MineField : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+  using BaseClass = AbstractMapObject;
+
+public:
+  enum class MineState
+  {
+    Activated,          ///< live, aimed
+    DeActivated         ///<
+  };
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  MineField() : AbstractMultiPointMapObject(), AbstractEffectSimulation() { ; }
+  virtual ~MineField() = default;  ///< Destructor
+
+
+  /*! \name Segments */
+  //@{
+  virtual PositionCont segment(int key) const = 0;
+  /**
+   * @brief Set positions of one segment.
+   * @param key of segment to be set.
+   * @param posCont positions of segment.
+   * @note: is key is negativ, no fill pattern is aplied.
+   * If key is >=0, the pattern of the segments take over the main pattern.
+   */
+  virtual void            setSegment(int key, const PositionCont &posCont) = 0;
+
+  /**
+   * @brief Remove one segment
+   * @param key to be removed.
+   */
+  virtual void removeSegment(int key) = 0;
+
+  /**
+   * @brief Remove all segments.
+   */
+  virtual void removeSegments() = 0;
+
+  /**
+   * @brief Get a list of keys in use.
+   * @return List of keys in use.
+   */
+  virtual QList<int> keysInUse() const = 0;
+
+
+  /*! \name Positions of Mines */
+  //@{
+  /**
+   * @brief Set all positions of mines (of all states)
+   * @param mineState to be set.
+   * @param posCont positions of mines to be set.
+   */
+  virtual void setPositionsMine(MineState mineState, const PositionCont &posCont) = 0;
+  //@}
+
+  virtual bool mineVisibility(MineState mineState) const = 0;
+  virtual void setMineVisibility(MineState mineState, bool visible) = 0;
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nine_liner.h
new file mode 100755
index 000000000..c6c4621bf
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nine_liner.h
@@ -0,0 +1,112 @@
+/**
+  * @RDE_HEADER@
+  * Interface of NineLiner
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The NineLiner class supports NineLiners of different agents.
+ * The method setPositions() should never be called.
+ */
+struct NineLiner : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+  class NineLinerData
+  {
+  public:
+    Point3D initialPoint;
+    Point3D targetPosition;
+
+    int    friendliesBearing  = -1;  // friendlies is optional
+    double friendliesDistance = -1;  // friendlies is optional
+
+    int fah = 0;      //finalAttackHeading
+    int fahLow = 0;   //finalAttackHeading-SectorLow
+    int fahHigh = 0;  //finalAttackHeading-SectorHigh
+
+    /**
+     * @brief operator== Compare two objects
+     * @param other to be compared with
+     * @return true if identical, otherwise false.
+     */
+    bool operator==(const NineLinerData &other) const
+    {
+      return ((this->initialPoint       == other.initialPoint) &&
+              (this->targetPosition     == other.targetPosition) &&
+
+              (this->friendliesBearing  == other.friendliesBearing) &&
+              (this->friendliesDistance == other.friendliesDistance) &&
+
+              (this->fah                == other.fah) &&
+              (this->fahLow             == other.fahLow) &&
+              (this->fahHigh            == other.fahHigh)
+             );
+    }
+
+    /**
+     * @brief operator!= Compare two objects
+     * @param other to be compared with
+     * @return true if NOT identical, otherwise false.
+     */
+    bool operator!=(const NineLinerData &other) const
+    {
+      return !(*this == other);
+    }
+
+    QString toString() const
+    {
+      QString str;
+
+      std::ostringstream stream;
+      stream << " initialPoint = " << initialPoint
+             << " targetPosition = " << targetPosition;
+      str.append(QLatin1String(stream.str().c_str()));
+
+      str.append(QStringLiteral(", friendliesBearing=%1").arg(friendliesBearing));
+      str.append(QStringLiteral(", friendliesDistance=%1").arg(friendliesDistance));
+
+      str.append(QStringLiteral(", fah=%1").arg(fah));
+      str.append(QStringLiteral(", fahLow=%1").arg(fahLow));
+      str.append(QStringLiteral(", fahHigh=%1").arg(fahHigh));
+      return str;
+    }
+  }; // class NineLinerData
+
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  NineLiner() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~NineLiner() = default;  ///< Destructor
+
+
+  /*! \name Specific data*/
+  //@{
+
+  virtual void setNineLinerData(const NineLinerData &data) = 0;
+
+//  virtual PositionCont impacts() const = 0;
+
+  //@}
+
+
+  // void setPositions(const PositionCont& posCont) //SHOULD NEVER BE CALLED
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nuclear_agent.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nuclear_agent.h
new file mode 100755
index 000000000..0fb154e82
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/nuclear_agent.h
@@ -0,0 +1,98 @@
+/**
+  * @RDE_HEADER@
+  * Interface of NuclearAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The ChemicalAgent class supports different agent types.
+ */
+class NuclearAgent : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  NuclearAgent() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~NuclearAgent() = default;  ///< Destructor
+
+
+  /*! \name Subsidiary polyline/polygons */
+  //@{
+  /**
+   * @brief Get subsidiary line with key.
+   * @param key to be retrieved.
+   * @return subsidiary line at index
+   */
+  virtual PositionCont subsidiaryLine(int key) const = 0;
+
+  /**
+   * @brief Set subsidiary line with key.
+   * @param key to be set.
+   * @param positions subsidiary line to be set.
+   */
+
+  struct OptionalData
+  {
+    // ctor
+    OptionalData() {}
+    // member
+    bool closed{false};
+    QSharedPointer<LineStyle> lineStyle; // default is 'empty', do not honor
+    QSharedPointer<FillStyle> fillStyle; // default is 'empty', do not honor
+  };
+
+//  virtual void setSubsidiaryLine(int key, const PositionCont &positions, bool clo = false) = 0;
+  virtual void setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData = OptionalData()) = 0;
+
+  /**
+   * @brief Get a list of keys in use.
+   * @return List of keys in use.
+   */
+  virtual QList<int> subsidiaryKeysInUse() = 0;
+
+  /**
+   * @brief Remove one subsidiary line.
+   * @param key to be removed.
+   */
+  virtual void removeSubsidiaryLine(int key) = 0;
+
+  /**
+   * @brief Remove all subsidiaryPositions.
+   */
+  virtual void removeSubsidiaryLines() = 0;
+  //@}
+
+  /*! \name Impact*/
+  //@{
+  virtual Point3D impactOrigin() const = 0;
+  virtual void setImpactOrigin(const Point3D &impactOrigin) = 0;
+  //@}
+
+  /*! \name Single Detonation */
+  //@{
+  virtual void setDetonation(const Point3D &origin, double radius) = 0;
+  virtual bool hasDetonation() const = 0;
+  virtual void resetDetonation() = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/participant.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/participant.h
new file mode 100755
index 000000000..4f8b0adeb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/participant.h
@@ -0,0 +1,279 @@
+/**
+  * @RDE_HEADER@
+  * Interface of Participant
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/abstract_map_object.h>
+
+
+// Qt
+#include <QString>
+#include <QColor>
+#include <QVector>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The Participant class supports Participant and their wide range of parameters.
+ *
+ */
+class Participant : public virtual AbstractMapObject
+{
+
+  using BaseClass = AbstractMapObject;
+
+public:
+
+  /*! \name TextModifier */
+  //@{
+  /**
+  * @brief The TextModifier enum contains some standard Text Modifier (MIL2525, APP6)
+  */
+  enum class TextModifier
+  {
+    EF_ReinforcedReduced = 0,       ///< E -> FrameShapeModifier; F-> reinforced of reduced
+    M_HigherFormation,              ///< Tactical Identifier (right handed)
+    T_UniqueDesignation,            ///< Designator          (left handed)
+    W_DateTimeGroup,
+    XY_AltitudeLocation,
+    V_Type,
+    Z_Speed,
+    G_StaffComments,
+    H_AdditionalInformation,
+    JKLNP,
+    END                             ///< This MUST mark the end, Do NOT use on interface
+  };
+
+  // Some helper functions:
+  static inline QLatin1String toString(TextModifier value)         ///< 'EF_ReinforcedReduced', ...
+  {
+    switch (value)
+    {
+    case TextModifier::EF_ReinforcedReduced:
+      return QLatin1String("EF_ReinforcedReduced");
+    case TextModifier::M_HigherFormation:
+      return QLatin1String("M_HigherFormation");
+    case TextModifier::T_UniqueDesignation:
+      return QLatin1String("T_UniqueDesignation");
+    case TextModifier::W_DateTimeGroup:
+      return QLatin1String("W_DateTimeGroup");
+    case TextModifier::XY_AltitudeLocation:
+      return QLatin1String("XY_AltitudeLocation");
+    case TextModifier::V_Type:
+      return QLatin1String("V_Type");
+    case TextModifier::Z_Speed:
+      return QLatin1String("Z_Speed");
+    case TextModifier::G_StaffComments:
+      return QLatin1String("G_StaffComments");
+    case TextModifier::H_AdditionalInformation:
+      return QLatin1String("H_AdditionalInformation");
+    case TextModifier::JKLNP:
+      return QLatin1String("JKLNP");
+    case TextModifier::END:
+      break;
+    } //switch
+    return QLatin1String("ERROR-TextModifier");
+  }
+
+  static inline QLatin1String toDisplayString(TextModifier value)  ///< 'ReinforcedReduced', ...
+  {
+    switch (value)
+    {
+    case TextModifier::EF_ReinforcedReduced:
+      return QLatin1String("ReinforcedReduced");
+    case TextModifier::M_HigherFormation:
+      return QLatin1String("HigherFormation");
+    case TextModifier::T_UniqueDesignation:
+      return QLatin1String("UniqueDesignation");
+    case TextModifier::W_DateTimeGroup:
+      return QLatin1String("DateTimeGroup");
+    case TextModifier::XY_AltitudeLocation:
+      return QLatin1String("AltitudeLocation");
+    case TextModifier::V_Type:
+      return QLatin1String("Type");
+    case TextModifier::Z_Speed:
+      return QLatin1String("Speed");
+    case TextModifier::G_StaffComments:
+      return QLatin1String("StaffComments");
+    case TextModifier::H_AdditionalInformation:
+      return QLatin1String("AdditionalInformation");
+    case TextModifier::JKLNP:
+      return QLatin1String("JKLNP");
+    case TextModifier::END:
+      break;
+    } //switch
+    return QLatin1String("ERROR-TextModifier");
+  }
+
+  static QVector<TextModifier> textModifiers()              ///< only relevant TextModifier items -> without 'END'
+  {
+    return
+    {
+      TextModifier::EF_ReinforcedReduced,
+          TextModifier::M_HigherFormation,
+          TextModifier::T_UniqueDesignation,
+          TextModifier::W_DateTimeGroup
+    };
+  }
+  //@}
+
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Participant() : BaseClass() {;} ///< Contructor
+
+  virtual ~Participant() = default;   ///< Destructor
+
+  /*! \name Origin*/
+  //@{
+  virtual Point3D origin() const = 0;
+  virtual bool setOrigin(const Point3D &origin) = 0;
+
+  virtual void setPositions(const PositionCont &posCont) = 0; ///< To enable using as AES item (template@AdapterDds)
+  //@}
+
+  /*! \name Symbol Display*/
+  //@{
+  virtual float userSymbolOpacity() const = 0;
+  virtual void setUserSymbolOpacity(float userSymbolOpacity) = 0;
+  virtual SymbolDataToRender symbolDataToRender(bool ignoreForcedColor = true) const = 0;
+  virtual QImage actualImage() const = 0;
+  virtual AdvancedSymbology::SymbologyType symbologyType() const = 0;
+  //@}
+
+  /*! \name Text Modifier*/
+  //@{
+  virtual QString textModifier(TextModifier textModifier) const = 0;
+  virtual void setTextModifier(TextModifier textModifier, const QString &text) = 0;
+  virtual bool textModifierVisibility(TextModifier textModifier) const = 0;
+  virtual void setTextModifierVisibility(TextModifier textModifier, bool visible) = 0;
+  //@}
+
+  /*! \name Graphical Modifier*/
+  //@{
+  virtual Injury injury() const = 0;
+  virtual QColor injuryColor() const = 0;
+  virtual bool setInjury(Injury injury, const QColor &injuryColor) = 0; ///< Attention: Qt::red is an int
+  virtual int injuryPartyId() const = 0;
+  virtual bool setInjury(Injury injury, int partyId) = 0;               ///< Attention: Qt::red is an int
+
+  virtual bool additionalSymbol(AdditionalSymbolType additionalSymbolType) const = 0;
+
+  /*!
+   * \brief setAdditionalSymbol
+   * \param additionalSymbolType to set
+   * \param newState new value
+   * \return true if changed, otherwise false
+   */
+    virtual bool setAdditionalSymbol(AdditionalSymbolType additionalSymbolType, bool newState) = 0;
+
+  virtual bool isMarked() const = 0;
+  /*!
+   * \brief setMarked
+   * \param marked new value
+   * \return true if changed, otherwise false
+   */
+  virtual bool setMarked(bool marked) = 0;
+  //@}
+
+  /*! \name Ranges*/
+  //@{
+  virtual QVector<int> ranges() const = 0;
+  virtual bool setRanges(const QVector<int> &ranges) = 0;
+
+  virtual bool isRangesVisible() const = 0;
+  virtual void setRangesVisibility(bool visible) = 0;
+  //@}
+
+  /*! \name DirectionIndicator like Turret Alignment*/
+  //@{
+  struct DirectionIndicatorData
+  {
+    double        directionDegree = 0.0;                       ///< degree, clockwise (0 means 12 on a analog clock)
+    int           lineWidth       = 2;                         ///< px @ sizeL==default
+    Qt::PenStyle  lineStyle       = Qt::SolidLine;
+    QColor        color;                                       ///< invalid, means partyColor
+  };
+
+  virtual void setDirectionIndicator(int key, const DirectionIndicatorData &data) = 0;
+  virtual void removeDirectionIndicator(int key = -1) = 0;
+
+  virtual bool isDirectionIndicatorsVisible() const = 0;
+  virtual void setDirectionIndicatorsVisibility(bool visible) = 0;
+  //@}
+
+
+  /*! \name Designation*/
+  //@{
+  struct DesignationData
+  {
+    Point3D        spotLocation;
+    int            code;
+
+    bool isNull() const    { return spotLocation.isNull(); }
+
+    bool operator==(const DesignationData& other) const
+    {
+      return this->spotLocation == other.spotLocation && this->code == other.code;
+    }
+    bool operator!=(const DesignationData& other) const
+    {
+      return !(*this == other);
+    }
+  };
+
+  virtual bool setDesignations(const QVector<DesignationData> &designations) = 0;
+  //@}
+
+
+  /*! \name Movement Track
+   * First of all you have the enable the MovementTrack using enableMovementTrack().
+   * \n Then you can optionally preset a couple of positions using setMovementTrack() or addToMovementTrack() to an MovementTrackContainer.
+   * \n Afterwards movement - transmitted by setOrigin() and a following updateView() - will be added to the MovementTrackContainer.
+   * \n If you hide the track by setMovementTrackVisibility() the movement will still be tracked until you disable the MovementTrack.
+   *
+   * <b>Behaviour if you enabled the MovementTrack and update the origin (using setOrigin()):</b>
+   * - <b>Every</b> position (different to last position) is added to track.
+   * \n There is currently no <b>minimum movement</b> required to be added to the track.
+   * - The number of positions in the track is unlimited.
+   * - There is no time-awareness of the positions.
+   */
+  //@{
+  virtual bool isMovementTrackEnabled() const = 0;
+  virtual void setMovementTrackEnabled(bool enable) = 0;
+
+  virtual void setMovementTrack(const PositionCont &movementTrack) = 0;
+  virtual void addToMovementTrack(const Point3D &addToMovementTrack) = 0;
+  virtual PositionCont movementTrack() const = 0;
+  virtual int sizeOfMovementTrack() const = 0;
+
+  virtual bool isMovementTrackVisible() const = 0;
+  virtual void setMovementTrackVisibility(bool visible) = 0;
+  //@}
+
+
+private:
+  // Forbid some overloaded methods without effects of this object:
+//  virtual QString identifier() const { return QString(); }
+//  virtual void setIdentifier(const QString& identifier) { Q_UNUSED(identifier); }
+
+//  virtual bool visibility(ObjectAppearance appearance) const  { Q_UNUSED(appearance); return true;}
+//  virtual void setVisibility(ObjectAppearance appearance, bool visibility) { Q_UNUSED(appearance); Q_UNUSED(visibility); };
+
+};
+
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polygon.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polygon.h
new file mode 100755
index 000000000..8dd2fb4ee
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polygon.h
@@ -0,0 +1,39 @@
+/**
+  * @RDE_HEADER@
+  * Interface of Polygon
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The Polygon class supports Polygons.
+ */
+class Polygon : public virtual AbstractMultiPointMapObject
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Polygon() : BaseClass() {;}  ///< Contructor
+
+  virtual ~Polygon() = default;  ///< Destructor
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polyline.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polyline.h
new file mode 100755
index 000000000..63fb414fd
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/polyline.h
@@ -0,0 +1,56 @@
+/**
+  * @RDE_HEADER@
+  * Interface of Polyline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The Polyline class supports polylines.
+ */
+class Polyline : public virtual AbstractMultiPointMapObject
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Polyline() : BaseClass() {;}  ///< Contructor
+
+  virtual ~Polyline() = default;  ///< Destructor
+
+  /*! \name ArrowHeads */
+  //@{
+  virtual bool arrowHeadStart() const = 0;
+  virtual void setArrowHeadStart(bool enable) = 0;
+
+  virtual bool arrowHeadEnd() const = 0;
+  virtual void setArrowHeadEnd(bool enable) = 0;
+  //@}
+
+  /*! \name Text on lineSegments */
+  //@{
+  virtual QString textOnSegment(uint segment) const = 0;
+  virtual void setTextOnSegment(uint segment, const QString &segmentText) = 0;
+  virtual void clearTextOnSegment(uint segment) = 0;
+  //@}
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/single_fire.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/single_fire.h
new file mode 100755
index 000000000..434d27d91
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/single_fire.h
@@ -0,0 +1,61 @@
+/**
+  * @RDE_HEADER@
+  * Interface of SingleFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The SingleFire class supports Indirect Single Fire.
+ */
+class SingleFire : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+  using BaseClass = AbstractMultiPointMapObject;
+
+public:
+
+  enum class ImpactType
+  {
+    normalImpact,
+    doubleImpact
+  };
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  SingleFire() : BaseClass() {;}  ///< Contructor
+
+  virtual ~SingleFire() = default;  ///< Destructor
+
+  /*! \name Specific data*/
+  //@{
+  virtual Point3D impactOrigin() const = 0;
+  virtual void setImpactOrigin(const Point3D &impactOrigin) = 0;
+
+  virtual ImpactType impactType() const = 0;
+  virtual void setImpactType(ImpactType impactType = ImpactType::normalImpact) = 0;
+
+  virtual Point3D origin() const = 0;
+  virtual void setOrigin(const Point3D &origin) = 0;
+  virtual float radius() const = 0;
+  virtual void setRadius(float radius) = 0;
+  virtual void setOriginatorToTargetLineSurface(const Point3D &start, const Point3D &end) = 0;
+  //@}
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/sound_area.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/sound_area.h
new file mode 100755
index 000000000..1ea17ca21
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/sound_area.h
@@ -0,0 +1,123 @@
+/**
+  * @RDE_HEADER@
+  * Interface of SoundArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MarkerData
+{
+public:
+  MarkerData() = default;
+
+  /// ctor for marker
+  MarkerData(MarkerSymbolType _markerSymbolType, int _proxyMarkerSize, const QColor &_markerColor)
+    : m_proxyMarker(_markerSymbolType), m_proxyMarkerSize(_proxyMarkerSize), m_proxyMarkerColor(_markerColor)
+  {}
+
+  /**
+   * @brief proxyImage to set a proxy image be displayed on the map (instead of marker)
+   * @param _proxyImage proxy image be displayed on the map
+   * @param _proxyImageDefaultSize default size image if (user) scale is 1.0.
+   * The image will be scaled to the proxyImageDefaultSize * scale.
+   * To ensure that the image will be displayed with high resolution, the proxyImage must have this resolution.
+   * Example:
+   * Set an image of QSize(100,100), and set a proxyImageDefaultSize of QSize(20,20).
+   * Initially (scale = 1.0) the image will be downscaled to QSize(20,20).
+   * If the user increases the scale to 4.0, the image will be scaled to QSize(80,80)
+   * This should ensure a good image quality.
+   */
+  MarkerData(const QImage &_proxyImage, const QSize &_proxyImageDefaultSize)
+    : m_proxyImage(_proxyImage)
+    , m_proxyImageDefaultSize(_proxyImageDefaultSize)
+  {}
+
+  /**
+   * @brief operator== Compare two objects
+   * @param other to be compared with
+   * @return true if identical, otherwise false.
+   */
+  bool operator==(const MarkerData &other) const
+  {
+    return ((this->m_proxyImage       == other.m_proxyImage) &&
+            (this->m_proxyMarkerSize  == other.m_proxyMarkerSize) &&
+            (this->m_proxyMarkerColor == other.m_proxyMarkerColor) &&
+            (this->m_proxyMarker      == other.m_proxyMarker)
+           );
+  }
+
+  /**
+   * @brief operator!= Compare two objects
+   * @param other to be compared with
+   * @return true if NOT identical, otherwise false.
+   */
+  bool operator!=(const MarkerData &other) const
+  {
+    return !(*this == other);
+  }
+
+  bool hasMarker()      const   {   return m_proxyMarker != MarkerSymbolType::Undefined;  }
+  bool hasProxyImage()  const   {   return !m_proxyImage.isNull();                        }
+  QImage proxyImage()   const   {   return m_proxyImage;                                  }
+  bool isEmpty()        const   {   return !hasMarker() && !hasProxyImage();            }
+
+  QString toString() const
+  {
+    QString str = QLatin1String("GeoImage(");
+    if (m_proxyImage.isNull())
+      str.append(QLatin1String("noProxyImage, "));
+    else
+      str.append(QLatin1String("withProxyImage, "));
+    return str;
+  }
+
+protected:
+  friend class SoundAreaImpl;
+  MarkerSymbolType  m_proxyMarker{MarkerSymbolType::Undefined};
+  int               m_proxyMarkerSize{20};
+  QColor            m_proxyMarkerColor{Qt::red};
+  QImage            m_proxyImage;                                ///< if not set, marker will be used
+  QSize             m_proxyImageDefaultSize;
+
+};
+
+
+/**
+ * @brief The SoundArea class supports SoundArea.
+ */
+class SoundArea : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+  SoundArea()  ///< Contructor
+    : AbstractMultiPointMapObject(), AbstractEffectSimulation()
+  {}
+
+  virtual ~SoundArea() = default;  ///< Destructor
+
+  /*! \name Point symbol */
+  //@{
+  virtual Point3D markerOrigin() const = 0;
+  virtual void setMarkerOrigin(const Point3D &origin) = 0;
+
+  virtual const MarkerData &markerData() const = 0;
+  virtual void setMarkerData(const MarkerData &markerData) = 0;
+  //@}
+
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/text.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/text.h
new file mode 100755
index 000000000..018c91980
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/text.h
@@ -0,0 +1,53 @@
+/**
+  * @RDE_HEADER@
+  * Interface of Text
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_single_point_map_object.h"
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The Polyline class supports polylines.
+ */
+class Text : public virtual AbstractSinglePointMapObject
+{
+
+  using BaseClass = AbstractSinglePointMapObject;
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  Text() : BaseClass()  {;}   ///< Contructor
+
+  virtual ~Text() = default;  ///< Destructor
+
+  /**
+  * @brief Set flag 'showAnchorMarker' to switch on additional anchor marker graphic
+  * @return value of flag 'showAnchorPosition'
+  *
+  * If 'showAnchorMarker' is switched on, some additional graphic is drawn to visualize anchor points of text lines. Per default 'showAnchorMarker' is switched off.
+  */
+  virtual void setShowAnchorMarker(bool on) = 0;
+
+  /**
+  * @brief Get flag 'showAnchorPosition'
+  * @return value of flag 'showAnchorMarker'
+  */
+  virtual bool showAnchorMarker() const = 0;
+
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/virtual_mine.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/virtual_mine.h
new file mode 100755
index 000000000..004f49ae5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjects/virtual_mine.h
@@ -0,0 +1,111 @@
+/**
+  * @RDE_HEADER@
+  * Interface of VirtualMine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "abstract_multi_point_map_object.h"
+#include <Map/abstract_effect_simulation.h>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The ChemicalAgent class supports different agent types.
+ */
+class VirtualMine : public virtual AbstractMultiPointMapObject, public virtual AbstractEffectSimulation
+{
+
+public:
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Don't use "= default" because of bug in VS2015 JT 2016/11/7
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  VirtualMine() : AbstractMultiPointMapObject(), AbstractEffectSimulation() {;}  ///< Contructor
+
+  virtual ~VirtualMine() = default;  ///< Destructor
+
+
+  /*! \name Subsidiary polyline/polygons */
+  //@{
+  /**
+   * @brief Get subsidiary line with key.
+   * @param key to be retrieved.
+   * @return subsidiary line at index
+   */
+  virtual PositionCont subsidiaryLine(int key) const = 0;
+
+  /**
+   * @brief Set subsidiary line with key.
+   * @param key to be set.
+   * @param positions subsidiary line to be set.
+   */
+
+  struct OptionalData
+  {
+    // ctor
+    OptionalData() {}
+    // member
+    bool closed{false};
+    QSharedPointer<LineStyle> lineStyle; // default is 'empty', do not honor
+    QSharedPointer<FillStyle> fillStyle; // default is 'empty', do not honor
+  };
+
+//  virtual void setSubsidiaryLine(int key, const PositionCont &positions, bool clo = false) = 0;
+  virtual void setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData = OptionalData()) = 0;
+
+  /**
+   * @brief Get a list of keys in use.
+   * @return List of keys in use.
+   */
+  virtual QList<int> subsidiaryKeysInUse() = 0;
+
+  /**
+   * @brief Remove one subsidiary line.
+   * @param key to be removed.
+   */
+  virtual void removeSubsidiaryLine(int key) = 0;
+
+  /**
+   * @brief Remove all subsidiaryPositions.
+   */
+  virtual void removeSubsidiaryLines() = 0;
+  //@}
+
+  /*! \name 3D marker / SimpleMarkerSceneSymbol (via renderer) */
+  //@{
+  virtual bool has3DMarkerRenderer() const = 0;
+  virtual void set3DMarkerRenderer(const Point3D &markerOrigin, const QVariantMap &attribMap) = 0;
+  //@}
+
+  /*! \name 3D marker / SimpleMarkerSceneSymbol (explicit symbol) */
+  //@{
+  struct SceneSymbolData
+  {
+    // ctor
+    SceneSymbolData() {}
+    // member
+    Point3D markerOrigin;
+    QColor color{Qt::gray};
+    double radius{1.0};
+
+    bool cone{false}; // cone - sphere
+    double heading{0.0};
+    double pitch{0.0};
+    double roll{0.0};
+  };
+
+  virtual bool has3DMarkerSceneSymbol() const = 0;
+  virtual void set3DMarkerSceneSymbol(const Point3D &markerOrigin, const SceneSymbolData &sceneSymbolData) = 0;
+  //@}
+};
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/CMakeLists.txt
new file mode 100755
index 000000000..59e1c8830
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/CMakeLists.txt
@@ -0,0 +1,119 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+# Qt6 + ArcGIS 300 migration: Qt5::->Qt6:: and gated on BUILD_ARCGIS (ArcGIS
+# dependent) to match the migrated Symbology convention.
+#
+# LIBRARY
+# Build this target as separate translation units (NOT a unity build).
+# area_fire_impl.cpp and single_fire_impl.cpp each define the same file-scope
+# statics (s_gunToTargetLine3DKEY / s_gunToTargetLineSurfaceKEY / s_nonLethalAreaKEY,
+# internal linkage, both in namespace SituationMap). Separate TUs keep the copies
+# independent (legacy structure); a unity TU sees two definitions in one scope and
+# fails with "redefinition of 'int SituationMap::...'" (behavior-neutral to disable).
+set(CMAKE_UNITY_BUILD FALSE)
+
+SET(MapObj_SRCS
+#  geometry.cpp
+)
+SET(MapObj_HDRS
+  situation_map_objects_export.h
+)
+
+SET(MapObjImpl_SRCS
+  abstract_multi_point_map_object_impl.cpp
+  abstract_single_point_map_object_impl.cpp
+  air_support_impl.cpp
+  area_fire_impl.cpp
+  basic_path_object_impl.cpp
+  biological_agent_impl.cpp
+  building_outline_impl.cpp
+  chemical_agent_impl.cpp
+  cube_impl.cpp
+  danger_area_impl.cpp
+  functional_area_impl.cpp
+  geo_image_impl.cpp
+  hit_line_impl.cpp
+  line_of_sight_impl.cpp
+  indication_container.cpp
+  mine_impl.cpp
+  map_object_attributes_impl.cpp
+  map_object_indicator_impl.cpp
+  mine_field_impl.cpp
+  nine_liner_impl.cpp
+  nuclear_agent_impl.cpp
+  path_container.cpp
+  path_container.h
+  participant_impl.cpp
+  polygon_impl.cpp
+  polyline_impl.cpp
+  single_fire_impl.cpp
+#  single_fire_central_impl.cpp
+  sound_area_impl.cpp
+  text_impl.cpp
+  virtual_mine_impl.cpp
+)
+
+SET(MapObjImpl_HDRS
+  abstract_multi_point_map_object_impl.h
+  abstract_single_point_map_object_impl.h
+  air_support_impl.h
+  area_fire_impl.h
+  basic_path_object_impl.h
+  biological_agent_impl.h
+  building_outline_impl.h
+  chemical_agent_impl.h
+  cube_impl.h
+  danger_area_impl.h
+  functional_area_impl.h
+  geo_image_impl.h
+  hit_line_impl.h
+  line_of_sight_impl.h
+  indication_container.h
+  map_object_attributes_impl.h
+  map_object_indicator_impl.h
+  mine_field_impl.h
+  mine_impl.h
+  nuclear_agent_impl.h
+  nine_liner_impl.h
+  participant_impl.h
+  polygon_impl.h
+  polyline_impl.h
+  single_fire_impl.h
+#  single_fire_central_impl.h
+  sound_area_impl.h
+  text_impl.h
+  virtual_mine_impl.h
+
+  situation_map_objects_export.h
+)
+
+
+SOURCE_GROUP(FunctionDialog   FILES ${FunctionDialog_SRCS})
+SOURCE_GROUP(MapObjectsImpl   FILES ${MapObj_SRCS} ${MapObj_HDRS} ${MapObjImpl_SRCS} ${MapObjImpl_HDRS})
+
+IF(BUILD_ARCGIS)
+NGL_ADD_LIBRARY(WS situationMapObjects SHARED ${MapObj_SRCS} ${MapObj_HDRS} ${MapObjImpl_SRCS} ${MapObjImpl_HDRS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES(situationMapObjects
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+
+NGL_TARGET_LINK_LIBRARIES(situationMapObjects
+  PRIVATE
+    NGLLogger
+    ArcGIS::ArcGIS
+    LtsCoordTrans
+  PUBLIC
+    situationMap
+    Qt6::Core
+    Qt6::Widgets
+)
+
+NGL_INSTALL_TARGET(situationMapObjects)
+ENDIF() # BUILD_ARCGIS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.cpp
new file mode 100755
index 000000000..976575e93
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.cpp
@@ -0,0 +1,415 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of SingleFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "single_fire_central_impl.h"
+#include "single_fire_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/party_id_to_color_functor.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <GraphicListModel.h>
+
+#include <GeometryEngine.h>
+
+// Qt
+#include <QPainter>
+#include <QPen>
+#include <QVariantAnimation>
+#include <QTimer>
+
+
+namespace SituationMap
+{
+
+class MyAnimation : public QVariantAnimation
+{
+public:
+  MyAnimation(GraphicalObjectSceneMarker *detonationSceneMarker)
+    : m_detonationSceneMarker(detonationSceneMarker)
+  {}
+  ~MyAnimation() = default;
+
+  void updateCurrentValue(const QVariant &value)
+  {
+    if (!m_detonationSceneMarker)
+      return;
+    fs = m_detonationSceneMarker->fillStyle();
+    col = fs.fillColor();
+    col.setAlphaF(value.toFloat());
+    fs.setFillColor(col);
+    m_detonationSceneMarker->setFillStyle(fs);
+    m_detonationSceneMarker->updateView();
+  }
+private:
+  GraphicalObjectSceneMarker *m_detonationSceneMarker{nullptr};
+  FillStyle                   fs;
+  QColor                      col;
+};
+
+
+//-----------------------------------------------------------------------------
+// class SingleFireCentralImpl
+//-----------------------------------------------------------------------------
+SingleFireCentralImpl::SingleFireCentralImpl(const QString &debugInfo)
+  : SingleFireCentral()            // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("SingleFireCentralImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_fillColorAlpha = 200;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+SingleFireCentralImpl::~SingleFireCentralImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_animation;
+  delete m_centerImage;
+  delete m_detonationPath;
+  delete m_detonationSceneMarker;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString SingleFireCentralImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(BasicPathObjectImpl::toString());
+  return str;
+}
+
+Point3D SingleFireCentralImpl::impactOrigin() const
+{
+  return BaseClass::tacticalOrigin();
+}
+void SingleFireCentralImpl::setImpactOrigin(const Point3D &impactOrigin)
+{
+  BaseClass::setTacticalOrigin(impactOrigin);
+}
+
+void SingleFireCentralImpl::setDetonation(const SingleFireCentral::DetonationData &detonationData)
+{
+  if (m_detonationOrigin.value().origin() != detonationData.m_origin)
+    m_detonationOrigin.refValue().setOrigin(detonationData.m_origin);
+  m_detonationRadius = detonationData.m_radius;
+}
+
+SingleFireCentral::DetonationData SingleFireCentralImpl::detonation() const
+{
+  return {m_detonationOrigin.value().origin(), m_detonationRadius.value()};
+}
+
+bool SingleFireCentralImpl::startDetonationAnimation()
+{
+  if (!m_detonationSceneMarker)
+    return false;
+  if (!m_animation)
+  {
+    m_animation = new MyAnimation(m_detonationSceneMarker);
+    m_animation->setDuration(500);
+    m_animation->setKeyValueAt(0.0 , 1.0);
+    m_animation->setKeyValueAt(0.2 , 0.5);
+    m_animation->setKeyValueAt(1.0 , 0.1);
+    // m_animation.setEasingCurve(QEasingCurve::InOutQuart);
+  }
+  m_animation->stop();
+  m_animation->start();
+
+
+
+  if (!m_symbol3D)
+  {
+    qCritical() << " ModelSceneSymbol: ....:";
+
+
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/Bristol/Collada/Bristol.dae")), 5.0); // works
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Proof_of_concept_Explosion_DAE/Proof_of_concept_Explosion_DAE_01.dae")), 10.0);
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Proof_of_concept_Explosion_DAE/Proof_of_concept_Explosion_DAE_02_60FPS.dae")), 10.0);
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Proof_of_concept_Explosion_DAE/Proof_of_concept_Explosion_DAE_Sampled.dae")), 10.0);
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Proof_of_concept_Explosion_DAE/Proof_of_concept_Explosion_DAE_unbaked.dae")), 10.0);
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Proof_of_concept_Explosion_DAE/Proof_of_concept_Explosion_3ds_NoAnimation.3ds")), 10.0);
+
+
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/3dexport/explosion/explosionFBX.fbx")), 10.0);
+
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/3dexport/JetAnim/jet anim.fbx")), 10.0);  // works
+//    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QLatin1Literal("/shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/bradley_low_3ds/bradle.3ds")), 10.0); // works
+    m_symbol3D = new Esri::ArcGISRuntime::ModelSceneSymbol(QUrl(QStringLiteral("/shd/CTC/TOOLS/ArcGIS/Runtime/Data/3D/dolmus_3ds/dolmus.3ds")), 10.0);
+
+
+    QObject::connect(m_symbol3D, &Esri::ArcGISRuntime::ModelSceneSymbol::errorOccurred,
+                     m_animation, [](const Esri::ArcGISRuntime::Error &loadError){
+      qCritical() << " Error: : isEmpty:" << loadError.isEmpty();
+      qCritical() << " Error: : code:" << loadError.code();
+      qCritical() << " Error: : loadError:" << loadError.message();
+    });
+
+
+    QObject::connect(m_symbol3D, &Esri::ArcGISRuntime::ModelSceneSymbol::doneLoading,
+                     m_animation, [](const Esri::ArcGISRuntime::Error &loadError){
+      qCritical() << " ModelSceneSymbol: doneLoading: isEmpty:" << loadError.isEmpty();
+      qCritical() << " ModelSceneSymbol: doneLoading: code:" << loadError.code();
+      qCritical() << " ModelSceneSymbol: doneLoading: loadError:" << loadError.message();
+    });
+    m_symbol3D->load();
+
+    if (!m_graphic3D)
+    {
+      Point3D pos = m_detonationOrigin.value().originTranslated();
+      m_graphic3D = new Esri::ArcGISRuntime::Graphic( Esri::ArcGISRuntime::Point(pos.x(), pos.y(), 20, m_mapImpl->getEsriSpatialReference()), m_symbol3D);
+      m_graphicsLayer->graphics()->append(m_graphic3D);
+    }
+
+  }
+
+
+
+
+
+  return true;
+}
+
+AesEffectState SingleFireCentralImpl::aesState() const
+{
+  return BaseClass::aesState();
+}
+void SingleFireCentralImpl::setAesState(AesEffectState aesState)
+{
+  BaseClass::setAesState(aesState);
+}
+
+SymbolImage SingleFireCentralImpl::symbolImage() const
+{
+  SymbolImage symImage = m_tacticalAppearance->symbolImage();
+  return symImage;
+}
+
+
+
+bool SingleFireCentralImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " positions =" << this->positions()
+                      << " radius =" << this->radius()
+                      << " partyId =" << this->partyId()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  if (m_tacticalAppearance)
+  {
+    if (partyChanged())
+      m_symbol.refValue().color = partyColor();
+  }
+
+  // centerImage:
+  if (!m_centerImage)
+  {
+    m_centerImage =
+      new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                       m_graphicsLayer,
+                                       m_debugInfo + QLatin1String("#CenterImage"),
+                                       m_uniqueMapId);
+  }
+
+  if (partyChanged())
+  {
+    QImage img = SingleFireImpl::renderImpactSymbol(partyColor(), 20, true); // filled
+    m_centerImage->setImage(img);
+  }
+
+//  m_centerImage->setScale(m_mainGraphicalObject->scale()); // do not scale centerImage, equal to mine of MineArea
+
+  m_centerImage->setOrigin(m_tacticalOrigin.value().originTranslated());
+  m_centerImage->setVisibility(m_visibility && m_visibilityTechnical);
+
+  bool success = BaseClass::updateViewImpl(); // will call onMapExtentChanged and therefore m_centerImage->updateView
+
+  bool successDetonationSceneMarker = true;
+  switch (m_mapImpl->mode())
+  {
+  case Mode::Mode_2D:
+   successDetonationSceneMarker = updateDetonationPath();
+   break;
+  case Mode::Mode_3D:
+   successDetonationSceneMarker = updateDetonationSceneMarker();
+   break;
+  case Mode::Undefined:
+    // empty
+    break;
+  }
+
+  success = success && successDetonationSceneMarker;
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SingleFireCentralImpl::updateDetonationPath()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = true;
+
+  // do we have a detonationPoint / impactOrigin?
+  if (m_detonationOrigin.value().origin().isNull() && (m_detonationRadius.value() < 1.0))
+  {
+    delete m_detonationPath;
+    m_detonationPath = nullptr;
+  } else {
+    if (!m_detonationPath)
+    {
+      m_detonationPath =
+          new GraphicalObjectEllipse(m_mapImpl->getEsriGeoView(),
+                                     m_graphicsLayer,
+                                     m_debugInfo + QLatin1String("#DetonationEllipse"),
+                                     m_uniqueMapId);
+    }
+    {
+      EllipseParameters ellipsePara;
+      ellipsePara.setLengthX(m_detonationRadius.value());
+      ellipsePara.setLengthY(m_detonationRadius.value());
+      ellipsePara.setMaxSegmentLength(1);
+      ellipsePara.setMaxPointCount(30);    // limit to 30 to reduce the number of vertices. If to high, keep performance impact to 3D in mind!!!
+      m_detonationPath->setEllipseParameters(ellipsePara);
+    }
+    m_detonationPath->setOrigin(m_detonationOrigin.value().originTranslated());
+    m_detonationPath->setPickable(m_pickable);
+    // path == 0; indicationCont == 1; Marker == 2
+    m_detonationPath->setDrawOrder(m_internalDrawOrder+2);
+    QColor col = partyColor();
+    m_detonationPath->setLineStyle(LineStyle(col, 2));
+    col.setAlphaF(col.alphaF() / 2.0);
+    m_detonationPath->setFillStyle(FillStyle(col,
+                                             m_mainGraphicalObject->fillStyle().fillPattern())); // take fillpattern
+    m_detonationPath->setScale(this->scale());
+    success = m_detonationPath->updateView();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+
+}
+
+bool SingleFireCentralImpl::updateDetonationSceneMarker()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = true;
+
+  // do we have a detonationPoint / impactOrigin?
+  if (m_detonationOrigin.value().origin().isNull() && (m_detonationRadius.value() < 1.0))
+  {
+    delete m_detonationSceneMarker;
+    m_detonationSceneMarker = nullptr;
+  } else {
+    if (!m_detonationSceneMarker)
+    {
+      m_detonationSceneMarker =
+          new GraphicalObjectSceneMarker(m_mapImpl->getEsriGeoView(),
+                                         m_graphicsLayer,
+                                         m_debugInfo + QLatin1String("#DetonationSceneMarker"),
+                                         m_uniqueMapId);
+    }
+    m_detonationSceneMarker->setOrigin(m_detonationOrigin.value().originTranslated());
+    m_detonationSceneMarker->setDiameter(m_detonationRadius.value()*2.0);
+    m_detonationSceneMarker->setPickable(m_pickable);
+    // path == 0; indicationCont == 1; Marker == 2
+    m_detonationSceneMarker->setDrawOrder(m_internalDrawOrder+2);
+    QColor col = partyColor();
+    col.setAlphaF(col.alphaF() / 2.0);
+    m_detonationSceneMarker->setFillStyle(FillStyle(col, FillPattern::Solid));
+    success = m_detonationSceneMarker->updateView();
+  }
+
+  // DEBUG: Animation in a loop
+  startDetonationAnimation();
+
+
+  // check intersect
+  if (m_detonationSceneMarker && m_mainGraphicalObject ){
+    Esri::ArcGISRuntime::GeometryEngine* geoEngine = Esri::ArcGISRuntime::GeometryEngine::instance();
+
+    Esri::ArcGISRuntime::Geometry geoLine   = m_mainGraphicalObject->getGraphicGeometry();
+    qCritical() << " geoLine " << geoLine.toJson();
+
+    Esri::ArcGISRuntime::Geometry geoSphere = m_detonationSceneMarker->getGraphicGeometry();
+    qCritical() << " geoSphere " << geoSphere.toJson();
+
+    Esri::ArcGISRuntime::Geometry resultGeometry =
+        geoEngine->intersection(geoLine, geoSphere);
+
+    qCritical() << " resultGeometry " << resultGeometry.toJson();
+  }
+
+
+
+  if (m_animation)
+    QObject::connect(m_animation, &QVariantAnimation::finished, [this]()
+    {
+      QTimer::singleShot(2000, m_animation, [this]() {
+        m_animation->start();
+      });
+    });
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SingleFireCentralImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  setLineStyle(LineStyle(Qt::black, 2));
+
+  m_detonationOrigin.refValue().setMapObjectImpl(this);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SingleFireCentralImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool successCenterImage = true;
+  bool visiScale = m_visibilityScaleRange.scaleHasVisibility(m_mapImpl->scale());
+  if (m_centerImage)
+  {
+    m_centerImage->setVisibility(visiScale && m_visibility && m_visibilityTechnical);
+    successCenterImage = m_centerImage->updateView();
+  }
+  bool successDetonationSceneMarker = true;
+  if (m_detonationSceneMarker)
+  {
+    m_detonationSceneMarker->setVisibility(visiScale && m_visibility && m_visibilityTechnical);
+    successCenterImage = m_detonationSceneMarker->updateView();
+  }
+
+  bool success = BaseClass::onMapExtentChanged() && successCenterImage && successDetonationSceneMarker;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.h
new file mode 100755
index 000000000..0340291ce
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/_single_fire_central_impl.h
@@ -0,0 +1,116 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of SingleFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "basic_path_object_impl.h"
+#include <MapObjects/single_fire_central.h> // Interface
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/graphical_object_scene_marker.h>
+
+#include <ModelSceneSymbol.h>
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class MyAnimation;
+
+
+/**
+ * @brief The SingleFireCentralImpl class displays a single impact.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (displaying a polyline)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT SingleFireCentralImpl : public BasicPathObjectImpl, public virtual SingleFireCentral
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit SingleFireCentralImpl(const QString &debugInfo = QString());
+  virtual ~SingleFireCentralImpl();
+
+public:
+  SingleFireCentralImpl(const SingleFireCentralImpl &other)     = delete;
+  SingleFireCentralImpl &operator=(SingleFireCentralImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  // some set/get methods:
+  //@{
+  void setDetonation(const DetonationData &detonationData) override;
+  DetonationData detonation() const override;
+  bool startDetonationAnimation() override;
+
+  // required???
+  Point3D impactOrigin() const override;
+  void setImpactOrigin(const Point3D &impactOrigin) override;
+  //@}
+
+  // Delegate to BaseClass:
+  AesEffectState aesState() const override;
+  void setAesState(AesEffectState aesState) override;
+
+  SymbolImage symbolImage() const override;
+
+protected:
+  bool updateViewImpl() override;
+
+  bool updateViewImplPost() override
+  {
+    BaseClass::updateViewImplPost();
+    m_detonationOrigin.reset();
+    m_detonationRadius.reset();
+    return true;
+  }
+
+  bool updateDetonationPath();
+  bool updateDetonationSceneMarker();
+
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  GraphicalObjectPictureMarker *m_centerImage{nullptr};
+
+  SimpleValue<OriginTranslated> m_detonationOrigin;
+  SimpleValue<double>           m_detonationRadius{0.0};
+  GraphicalObjectEllipse       *m_detonationPath{nullptr};        // 2D
+  GraphicalObjectSceneMarker   *m_detonationSceneMarker{nullptr}; // 3D
+
+  MyAnimation                  *m_animation{nullptr};
+
+  Esri::ArcGISRuntime::Graphic *m_graphic3D{nullptr};
+  Esri::ArcGISRuntime::ModelSceneSymbol *m_symbol3D{nullptr};
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.cpp
new file mode 100755
index 000000000..69993e186
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.cpp
@@ -0,0 +1,287 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractMultiPointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/bounding_box.h>
+#include <GraphicalObjects/abstract_graphical_object.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+// ESRI
+
+
+// Qt
+#include <QPainter>
+#include <QBrush>
+
+
+namespace SituationMap
+{
+
+// taken from AreaEffectSimulation::Icons::imageFromPolygon()
+QImage imageFromForm(const PositionCont &polyAbsGeoPos,
+                     QColor lineColor,
+                     bool closed,
+                     Qt::BrushStyle style,
+                     QColor fillColor = Qt::black,
+                     const int width = 100)
+{
+  if (polyAbsGeoPos.isEmpty())
+    return QImage();
+  QPolygonF polyInUtmCoords;
+  polyInUtmCoords.reserve(polyAbsGeoPos.size());
+  int zone = LtsCoordTrans::UtmCoordinate::fromGeographic(polyAbsGeoPos.first().toPointF()).zone;
+  for (const Point3D &point : polyAbsGeoPos)
+  {
+    const LtsCoordTrans::UtmCoordinate &coord = LtsCoordTrans::UtmCoordinate::fromGeographic(point.toPointF(), zone);
+    polyInUtmCoords << QPointF(coord.x, coord.y);
+  }
+
+  const QPolygonF bounding = polyInUtmCoords.boundingRect();
+
+  // center to center / Todo:: Does it always work?
+  const QTransform mTrans(QTransform::fromTranslate(-bounding.boundingRect().bottomLeft().x(), -bounding.boundingRect().bottomLeft().y()));
+
+
+  qreal w = bounding.boundingRect().width();
+  qreal h = bounding.boundingRect().height();
+  double scale = w > h ? width / w : width / h;
+  w *= scale;
+  h *= scale;
+  scale *= 0.90; // Leave 10% border (i.e. 5% each side)
+  const QTransform mScale(QTransform::fromScale(scale, -scale));
+  const QTransform mTransSmall(QTransform::fromTranslate(0.05 * width + (width - w) / 2, 0.05 * width + (width - h) / 2));
+
+  QImage img(width, width, QImage::Format_ARGB32);
+  img.fill(Qt::transparent);
+
+  QPainter painter(&img);
+  painter.setRenderHint(QPainter::Antialiasing, true);
+  painter.setPen(QPen(lineColor, 2));
+
+  QPolygonF mPoly = mTrans.map(polyInUtmCoords);
+  mPoly = mScale.map(mPoly);
+  mPoly = mTransSmall.map(mPoly);
+
+  if (closed && fillColor.isValid())
+  {
+    // polyGON / closed:
+    painter.setBrush(QBrush(fillColor, style));
+    painter.drawPolygon(mPoly);
+  }
+  else
+  {
+    // polyLINE / open:
+    painter.drawPolyline(mPoly);
+  }
+  painter.end();
+
+  return img;
+}
+
+//-----------------------------------------------------------------------------
+// class AbstractMultiPointMapObjectImpl
+//-----------------------------------------------------------------------------
+AbstractMultiPointMapObjectImpl::AbstractMultiPointMapObjectImpl(const QString &debugInfo)
+  : AbstractMultiPointMapObject()  // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("AbstractMultiPointMapObjectImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_positions.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AbstractMultiPointMapObjectImpl::~AbstractMultiPointMapObjectImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+PositionCont AbstractMultiPointMapObjectImpl::positions() const
+{
+  return m_positions.positions();
+}
+
+PositionCont AbstractMultiPointMapObjectImpl::positionsTranslated() const
+{
+  return m_positions.positionsTranslated();
+}
+
+bool AbstractMultiPointMapObjectImpl::setPositionsTranslated(const PositionCont &positions)
+{
+  m_updateObjectIndicator = m_positions.setPositionsTranslated(positions) || m_updateObjectIndicator;
+  return m_updateObjectIndicator;
+}
+
+bool AbstractMultiPointMapObjectImpl::setPositions(const PositionCont &positions)
+{
+  m_updateObjectIndicator = m_positions.setPositions(positions) || m_updateObjectIndicator;
+  return m_updateObjectIndicator;
+}
+
+LineStyle AbstractMultiPointMapObjectImpl::lineStyle() const
+{
+  return BaseClass::lineStyle();
+}
+LineStyle &AbstractMultiPointMapObjectImpl::rLineStyle()
+{
+  return BaseClass::rLineStyle();
+}
+void AbstractMultiPointMapObjectImpl::setLineStyle(const LineStyle &lineStyle)
+{
+  BaseClass::setLineStyle(lineStyle);
+}
+FillStyle AbstractMultiPointMapObjectImpl::fillStyle() const
+{
+  return BaseClass::fillStyle();
+}
+FillStyle &AbstractMultiPointMapObjectImpl::rFillStyle()
+{
+  return BaseClass::rFillStyle();
+}
+void AbstractMultiPointMapObjectImpl::setFillStyle(const FillStyle &fillStyle)
+{
+  BaseClass::setFillStyle(fillStyle);
+}
+
+void AbstractMultiPointMapObjectImpl::updateIdentifierPosition()
+{
+//  NOTICE_LOG(m_logger) << LOGFUNCTION << " START" << " debugInfo=" << m_debugInfo;
+
+  if (!m_mainGraphicalObject)
+    return;
+
+
+  if (m_positions.isEmpty())
+    return;
+
+  // find right coordinate:
+  Point3D resultPos;
+  const PositionCont &posCont = m_positions.positionsTranslated();
+  for (const Point3D &pos : qAsConst(posCont))
+    if (pos.x() > resultPos.x())
+      resultPos = pos;
+
+  if (!qFuzzyIsNull(resultPos.x()))
+    m_identifierPositionCandidateTranslated = resultPos;
+}
+
+QString AbstractMultiPointMapObjectImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(QStringLiteral(" positions.count='%1'").arg(m_positions.positions().count()));
+  return str;
+}
+
+void AbstractMultiPointMapObjectImpl::boundingBox(BoundingBox &bbox) const
+{
+  bbox.reset();
+
+  const PositionCont &posCont = m_positions.positions();
+  if (posCont.isEmpty())
+    return;
+
+  QVectorIterator<Point3D> it(posCont);
+  const Point3D &pos = it.next();
+
+  double xmin = pos.x();
+  double ymin = pos.y();
+  double xmax = pos.x();
+  double ymax = pos.y();
+
+  while (it.hasNext())
+  {
+    const Point3D &pos2 = it.next();
+    xmin = std::min(xmin, pos2.x());
+    ymin = std::min(ymin, pos2.y());
+    xmax = std::max(xmax, pos2.x());
+    ymax = std::max(ymax, pos2.y());
+  }
+
+  double width  = xmax - xmin;
+  double height = ymax - ymin;
+
+
+  QPointF center(xmin +  width / 2.0,
+                 ymin + height / 2.0);
+
+  bbox = BoundingBox(BoundingBox::ExtentType::Sim, Point3D::fromQPointF(center), width, height);
+}
+
+QImage AbstractMultiPointMapObjectImpl::previewImage() const
+{
+  return previewImageSpecific();
+}
+
+Qt::BrushStyle fillPatternToBrushStyle(const FillPattern &fillPattern)
+{
+  Qt::BrushStyle bs = Qt::SolidPattern;
+
+  switch (fillPattern) {
+  case FillPattern::BackwardDiagonal: // /
+    bs = Qt::BDiagPattern;
+    break;
+  case FillPattern::Cross:
+    bs = Qt::CrossPattern;
+    break;
+  case FillPattern::DiagonalCross:
+    bs = Qt::DiagCrossPattern;
+    break;
+  case FillPattern::ForwardDiagonal:  // '\'
+    bs = Qt::FDiagPattern;
+    break;
+  case FillPattern::Horizontal:
+    bs = Qt::HorPattern;
+    break;
+  case FillPattern::Null:
+    bs = Qt::NoBrush;
+    break;
+  case FillPattern::Solid:
+    bs = Qt::SolidPattern;
+    break;
+  case FillPattern::Vertical:
+    bs = Qt::VerPattern;
+    break;
+  default:
+    bs = Qt::SolidPattern;
+    break;
+  }
+
+  return bs;
+}
+
+
+
+QImage AbstractMultiPointMapObjectImpl::previewImageSpecific() const
+{
+  if (m_mainGraphicalObject)
+  {
+    FillStyle fs = m_mainGraphicalObject->fillStyle();
+    Qt::BrushStyle bs = fillPatternToBrushStyle(fs.fillPattern());
+
+    return imageFromForm(this->positions(),
+                         m_mainGraphicalObject->lineStyle().lineColor(),
+                         m_isClosed,
+                         bs,
+                         fs.fillColor());
+  }
+
+  QColor lineColor = this->majorColor();
+  if (!lineColor.isValid())
+    lineColor = Qt::black;
+  return imageFromForm(this->positions(), lineColor, m_isClosed, Qt::BrushStyle::SolidPattern);
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.h
new file mode 100755
index 000000000..503f09458
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_multi_point_map_object_impl.h
@@ -0,0 +1,83 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractMultiPointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <MapImpl/abstract_map_object_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <MapObjects/abstract_multi_point_map_object.h> // Interface
+#include "situation_map_objects_export.h"
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The AbstractMultiPointMapObjectImpl class adds a unlimited number of positions (PositionCont) to the AbstractMapObjectImpl.
+ * By this a polyline and a polygon can be described. Accordingly a LineStyle and a FillStyle is added also.
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT AbstractMultiPointMapObjectImpl : public AbstractMapObjectImpl, public virtual AbstractMultiPointMapObject
+{
+  using BaseClass = AbstractMapObjectImpl;
+
+public:
+  explicit AbstractMultiPointMapObjectImpl(const QString &debugInfo = QString());
+  virtual ~AbstractMultiPointMapObjectImpl();
+
+  AbstractMultiPointMapObjectImpl(const AbstractMultiPointMapObjectImpl &other)     = delete;
+  AbstractMultiPointMapObjectImpl &operator=(AbstractMultiPointMapObjectImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  PositionCont positions() const override;
+  bool setPositions(const PositionCont &positions) override;
+  PositionCont positionsTranslated() const override;
+  bool setPositionsTranslated(const PositionCont &positions) override;
+
+  void boundingBox(BoundingBox &bbox) const override;
+
+  QImage previewImage() const override;
+  QImage previewImageSpecific() const override;
+
+
+  LineStyle lineStyle() const override;
+  LineStyle &rLineStyle() override;
+  void setLineStyle(const LineStyle &lineStyle) override;
+
+  FillStyle fillStyle() const override;
+  FillStyle &rFillStyle() override;
+  void setFillStyle(const FillStyle &fillStyle) override;
+
+
+protected:
+  // internal/admin
+  void updateIdentifierPosition() override;
+
+
+  // logical
+  PositionsTranslated               m_positions;
+  bool                              m_isClosed = true;
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.cpp
new file mode 100755
index 000000000..aa3f050b0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.cpp
@@ -0,0 +1,175 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractSinglePointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "abstract_single_point_map_object_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/bounding_box.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+
+// ESRI
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class AbstractSinglePointMapObjectImpl
+//-----------------------------------------------------------------------------
+AbstractSinglePointMapObjectImpl::AbstractSinglePointMapObjectImpl(const QString &debugInfo)
+  : BaseClass(debugInfo)             // Implementation
+  , m_logger(getLogger("AbstractSinglePointMapObjectImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_origin.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AbstractSinglePointMapObjectImpl::~AbstractSinglePointMapObjectImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString AbstractSinglePointMapObjectImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+
+  std::ostringstream stream;
+  stream << " " << m_origin.origin();
+  str.append(QLatin1String(stream.str().c_str()));
+
+  str.append(QStringLiteral(" radius=%1").arg(m_radius.value()));
+
+  return str;
+}
+
+
+Point3D AbstractSinglePointMapObjectImpl::origin() const
+{
+  return m_origin.origin();
+}
+
+Point3D AbstractSinglePointMapObjectImpl::originTranslated() const
+{
+  return m_origin.originTranslated();
+}
+
+bool AbstractSinglePointMapObjectImpl::setOrigin(const Point3D &origin)
+{
+  m_updateObjectIndicator = m_origin.setOrigin(origin) || m_updateObjectIndicator;
+  return m_updateObjectIndicator;
+}
+
+void AbstractSinglePointMapObjectImpl::boundingBox(BoundingBox &bbox) const
+{
+  if (m_radius.value() > 0)
+    bbox = BoundingBox(BoundingBox::ExtentType::Sim, m_origin.origin(), 2 * m_radius.value(), 2 * m_radius.value());
+  else
+  {
+    GraphicalObjectPictureMarker *goPicture = dynamic_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+    if (goPicture)
+    {
+      // ToDo: offset of goPicture has to be honored...
+
+      if (!goPicture->image().isNull())
+      {
+        // goPicture has Image
+        const QSize &imgSize = goPicture->currentSize(); // currentSize
+        bbox = BoundingBox(BoundingBox::ExtentType::Pixel,
+                           m_origin.origin(),                   // Sim
+                           imgSize.width(), imgSize.height()    // pixel
+                           );
+      } else
+      {
+        // goPicture has Marker
+        int markerSize = goPicture->markerSymbolSize();
+
+        bbox = BoundingBox(BoundingBox::ExtentType::Pixel,
+                           m_origin.origin(),                   // Sim
+                           markerSize, markerSize               // pixel
+                           );
+
+      }
+    }
+    else
+      bbox = BoundingBox(BoundingBox::ExtentType::Sim, m_origin.origin()); // widht and heigth will be 0!
+  }
+}
+
+
+float AbstractSinglePointMapObjectImpl::radius() const
+{
+  return m_radius.value();
+}
+void AbstractSinglePointMapObjectImpl::setRadius(float radius)
+{
+  m_radius = radius;
+}
+
+
+
+
+LineStyle AbstractSinglePointMapObjectImpl::lineStyle() const
+{
+  return BaseClass::lineStyle();
+}
+LineStyle &AbstractSinglePointMapObjectImpl::rLineStyle()
+{
+  return BaseClass::rLineStyle();
+}
+void AbstractSinglePointMapObjectImpl::setLineStyle(const LineStyle &lineStyle)
+{
+  BaseClass::setLineStyle(lineStyle);
+}
+FillStyle AbstractSinglePointMapObjectImpl::fillStyle() const
+{
+  return BaseClass::fillStyle();
+}
+FillStyle &AbstractSinglePointMapObjectImpl::rFillStyle()
+{
+  return BaseClass::rFillStyle();
+}
+void AbstractSinglePointMapObjectImpl::setFillStyle(const FillStyle &fillStyle)
+{
+  BaseClass::setFillStyle(fillStyle);
+}
+
+void AbstractSinglePointMapObjectImpl::updateIdentifierPosition()
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " debugInfo=" << m_debugInfo;
+
+  if (m_mainGraphicalObjectText)
+  {
+    SituationMap::BoundingBox bbox;
+    this->boundingBox(bbox);
+
+    if (bbox.isValid() && bbox.extentType() == BoundingBox::ExtentType::Pixel)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " bbox=" << bbox;
+      m_mainGraphicalObjectText->setXOffset((bbox.width() / 2.0) + 10);
+    }
+    else
+      m_mainGraphicalObjectText->setXOffset(10);
+
+  }
+
+  BaseClass::updateIdentifierPosition(); // calculating the origin
+}
+
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.h
new file mode 100755
index 000000000..2182b0118
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/abstract_single_point_map_object_impl.h
@@ -0,0 +1,82 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AbstractSinglePointMapObject
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <MapImpl/abstract_map_object_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <MapObjects/abstract_single_point_map_object.h> // Interface
+#include "situation_map_objects_export.h"
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The AbstractSinglePointMapObjectImpl class adds excatly one positions (QPointF) to the AbstractMapObjectImpl.
+ * For convenience a radius can also be parametrized. Accordingly a LineStyle and a FillStyle is added also.
+ * \note Maybe the radius be be removed in future.
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT AbstractSinglePointMapObjectImpl : public AbstractMapObjectImpl, public virtual AbstractSinglePointMapObject
+{
+  using BaseClass = AbstractMapObjectImpl;
+
+public:
+  explicit AbstractSinglePointMapObjectImpl(const QString &debugInfo = QString());
+  virtual ~AbstractSinglePointMapObjectImpl();
+
+  AbstractSinglePointMapObjectImpl(const AbstractSinglePointMapObjectImpl &other)     = delete;
+  AbstractSinglePointMapObjectImpl &operator=(AbstractSinglePointMapObjectImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  Point3D origin() const override;
+  bool setOrigin(const Point3D &origin) override;
+  virtual Point3D originTranslated() const;
+
+  virtual float radius() const;
+  virtual void setRadius(float radius);
+
+  void boundingBox(BoundingBox &bbox) const override;
+
+
+  LineStyle lineStyle() const override;
+  LineStyle &rLineStyle() override;
+  void setLineStyle(const LineStyle &lineStyle) override;
+
+  FillStyle fillStyle() const override;
+  FillStyle &rFillStyle() override;
+  void setFillStyle(const FillStyle &fillStyle) override;
+
+
+protected:
+  // internal/admin
+  void updateIdentifierPosition() override;
+
+  // logical
+  OriginTranslated         m_origin;
+
+  SimpleValue<float>       m_radius = -1;
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.cpp
new file mode 100755
index 000000000..4e98433c0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.cpp
@@ -0,0 +1,593 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AirSupport
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "air_support_impl.h"
+#include <MapImpl/map_impl.h>
+#include <MapImpl/object_container_impl.h>
+#include <MapImpl/layer_factory_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <MapObjectsImpl/participant_impl.h>
+
+
+// ESRI
+#include <GeometryEngine.h>
+#include <PolylineBuilder.h>
+#include <Geometry.h>
+#include <GeometryTypes.h>   // 300: defines the GeometryDimension enum (fwd-declared in Geometry.h)
+#include <Point.h>
+#include <Polyline.h>
+#include <ImmutablePartCollection.h>  // 300: Polyline::parts() returns by value; only fwd-declared in Multipart.h
+#include <ImmutablePart.h>            // 300: parts().part(0).pointCount()/startPoint()
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+const int AIR_SUPPORT_LINE_WIDTH = 2;
+
+class AirSupportImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()
+  {
+    removeAesBuffer();
+    removeAFP();
+    removeALP();
+    m_pm_AFP    = nullptr;
+    m_pm_ALP    = nullptr;
+    m_aesBuffer = nullptr;
+  }
+
+  // ESRI data:
+  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer        = nullptr;
+
+
+  // Own data:
+  MapImpl                        *m_mapImpl = nullptr;
+  UniqueMapId                     m_referencedObject = INVALID_MAP_ID;
+
+  QString                         m_debugInfo;   // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId;
+  QColor                          m_color = Qt::black;
+
+
+  GraphicalObjectPictureMarker *m_pm_AFP    = nullptr;
+  GraphicalObjectPictureMarker *m_pm_ALP    = nullptr;
+  GraphicalObjectPath          *m_aesBuffer = nullptr;
+
+  QMap<int, QSharedPointer<GraphicalObjectPath> >    m_cont; /// one polyline per subsidiary line
+  typedef QMapIterator<int, QSharedPointer<GraphicalObjectPath>> MAP_IT_T;
+//  int                             m_drawOrder = 0;
+
+
+  GraphicalObjectPictureMarker *getAFP()
+  {
+    if (!m_pm_AFP)
+    {
+      QString debugInfo = QStringLiteral("%1#Marker(AFP)").arg(m_debugInfo);
+      m_pm_AFP = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                  m_graphicsLayer,
+                                                  debugInfo,
+                                                  m_uniqueMapId);
+      m_pm_AFP->setMarkerSymbol(MarkerSymbolType::Circle, 10, Qt::black);
+    }
+    return m_pm_AFP;
+  }
+  void removeAFP()
+  {
+    delete m_pm_AFP;
+    m_pm_AFP = nullptr;
+  }
+
+  GraphicalObjectPictureMarker *getALP()
+  {
+    if (!m_pm_ALP)
+    {
+      QString debugInfo = QStringLiteral("%1#Marker(ALP)").arg(m_debugInfo);
+      m_pm_ALP = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                  m_graphicsLayer,
+                                                  debugInfo,
+                                                  m_uniqueMapId);
+      m_pm_ALP->setMarkerSymbol(MarkerSymbolType::Circle, 10, Qt::black);
+    }
+    return m_pm_ALP;
+  }
+  void removeALP()
+  {
+    delete m_pm_ALP;
+    m_pm_ALP = nullptr;
+  }
+
+  GraphicalObjectPath *getAesBuffer()
+  {
+    if (!m_aesBuffer)
+    {
+      QString debugInfo = QStringLiteral("%1#AesBuffer").arg(m_debugInfo);
+      m_aesBuffer = new GraphicalObjectPath(GraphicalObjectPathType::Polygon,
+                                            m_mapImpl->getEsriGeoView(),
+                                            m_graphicsLayer,
+                                            debugInfo,
+                                            m_uniqueMapId);
+      m_aesBuffer->setFillStyle(FillStyle(FillPattern::Null));
+    }
+    return m_aesBuffer;
+  }
+  void removeAesBuffer()
+  {
+    delete m_aesBuffer;
+    m_aesBuffer = nullptr;
+  }
+
+
+
+  bool hasPathObject(int key)       { return m_cont.contains(key); }
+  QList<int> keysInUse()            { return m_cont.keys();        }
+  void removePathObject(int key)    { m_cont.remove(key);          }
+  void clearPathObjects()           { m_cont.clear();              }
+
+  QSharedPointer<GraphicalObjectPath> getPathObject(int key)
+  {
+    if (m_cont[key].isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#SubsidiaryLine(%2)").arg(m_debugInfo).arg(key);
+      GraphicalObjectPath *temp = new GraphicalObjectPath(GraphicalObjectPathType::Polyline,
+                                                          m_mapImpl->getEsriGeoView(),
+                                                          m_graphicsLayer,
+                                                          debugInfo,
+                                                          m_uniqueMapId);
+      if (temp)
+        m_cont[key] = QSharedPointer<GraphicalObjectPath>(temp);
+    }
+    return m_cont[key];
+  }
+}; // class AirSupportImpl::Private
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+// class AirSupportImpl
+//-----------------------------------------------------------------------------
+AirSupportImpl::AirSupportImpl(const QString &debugInfo)
+  : AirSupport()                // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , d(new Private)
+  , m_logger(getLogger("AirSupportImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AirSupportImpl::~AirSupportImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void AirSupportImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  BaseClass::setUniqueId(uniqueId);
+  d->m_uniqueMapId = m_uniqueMapId;
+}
+
+void AirSupportImpl::setReferencedObject(const UniqueMapId &referencedObject)
+{
+  d->m_referencedObject = referencedObject;
+}
+
+bool AirSupportImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_debugInfo=" << m_debugInfo
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << " this->drawOrder=" << this->drawOrder()
+                      << " this->positions()=" << this->positions();
+
+  // m_mainGraphicalObject stores the outline/'bounding box' (techn and tact)
+  // Those geometry should never be visible.
+  // The text of should be visible.
+  this->setVisibilityOfGeometry(false);
+
+  if (this->positions().size() < 2)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " number of coordinates is not sufficiant"
+                        << " (#coord=" << this->positions().size() << ")";
+    return false;
+  }
+
+  if (m_mainGraphicalObject)
+    d->m_color = m_mainGraphicalObject->lineStyle().lineColor();
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  // real work:
+
+  //
+  // First, draw AFP and ALP
+  //
+
+  // AFP
+  {
+    Point3D coordTranslated = getCoordinateTranslated(COORD_INDEX_AFP);
+    if (coordTranslated.isNull())
+    {
+      d->removeAFP();
+    } else {
+      GraphicalObjectPictureMarker *pm = d->getAFP();
+      pm->setMarkerSymbol(MarkerSymbolType::Circle, 10, d->m_color);
+      pm->setOrigin(coordTranslated);
+      pm->setVisibility(m_visibility && m_visibilityTechnical);
+      pm->setScale(m_mainGraphicalObject->scale());
+      pm->setDrawOrder(m_mainGraphicalObject->drawOrder());
+      if (!pm->updateView())
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed";
+    }
+  }
+
+  // ALP
+  {
+    Point3D coordTranslated = getCoordinateTranslated(COORD_INDEX_ALP);
+    if (coordTranslated.isNull())
+    {
+      d->removeALP();
+    } else {
+      GraphicalObjectPictureMarker *pm = d->getALP();
+      pm->setMarkerSymbol(MarkerSymbolType::Circle, 10, d->m_color);
+      pm->setOrigin(coordTranslated);
+      pm->setVisibility(m_visibility && m_visibilityTechnical);
+      pm->setScale(m_mainGraphicalObject->scale());
+      pm->setDrawOrder(m_mainGraphicalObject->drawOrder());
+      if (!pm->updateView())
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed";
+    }
+  }
+
+  //
+  // delegate remaining to onMapExtentChanged
+  //
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool AirSupportImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+
+  bool success = BaseClass::onMapExtentChanged();
+
+
+  if (!m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject yet";
+    return false;
+  }
+
+  // 1. create aesBuffer;
+  updateViewImplBuffer();
+
+  // 2. and see, if Alp is within:
+  bool contains = bufferContainsAlp();        // buffer and alp must exist!!!
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " buffer contains Alp: " << contains;
+
+
+  // Line Afp Alp
+  Point3D start = this->getCoordinateTranslated(COORD_INDEX_AFP);
+  Point3D end   = this->getCoordinateTranslated(COORD_INDEX_ALP);
+  if (end.isNull())
+    updateViewImplLineAfpAlp(false, Point3D(), Point3D());
+  else
+    updateViewImplLineAfpAlp(true, start, end);
+
+  // Line Alp Aes
+  start = this->getCoordinateTranslated(COORD_INDEX_ALP);
+  end   = this->getCoordinateTranslated(COORD_INDEX_AES);
+
+
+  // try to replace end by intersection with Aes:
+  Point3D intersection = this->intersectionAesAndLineAlpAes();
+  DEBUG_LOG(m_logger)  << " intersectionAes " << intersection;
+  if (!intersection.isNull())
+    end = intersection;
+
+  // try to replace end by intersection with buffer of Aes:
+  if (d->m_aesBuffer)
+  {
+    intersection = this->intersectionBufferAndLineAlpAes();
+    DEBUG_LOG(m_logger)  << " intersectionBuffer " << intersection;
+
+    if (!intersection.isNull())
+      end = intersection;
+  }
+
+  // Maybe 3rd coordinate is not provided?
+  if (start.isNull() || end.isNull())
+    updateViewImplLineAlpAes(false, Point3D(), Point3D());
+  else
+    updateViewImplLineAlpAes(!contains, start, end);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return success;
+}
+
+bool AirSupportImpl::updateViewImplBuffer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " pixelSize= " << m_mapImpl->pixelSizeMeter();
+
+  if (m_mapImpl->pixelSizeMeter() < 1)
+  {
+    d->removeAesBuffer();
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+    return true;
+  }
+
+  double bufferDistance = m_mapImpl->pixelSizeMeter() * 100;
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " bufferDistance= " << bufferDistance;
+
+  if (bufferDistance > 2000)
+    bufferDistance = 2000;
+
+  // AesBuffer of referenced object
+  if (!isUniqueMapIdValid(d->m_referencedObject))
+  {
+    // This can happen, if the object is just created:
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_referencedObject is invalid"
+                        << " (m_referencedObject=" << d->m_referencedObject << ")";
+    return false;
+  }
+
+  AbstractMapObject *amo = d->m_mapImpl->objectContainer().getObject(d->m_referencedObject);
+  if (!amo)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_referencedObject not found"
+                        << " (m_referencedObject=" << d->m_referencedObject << ")";
+    return false;
+  }
+
+  QVector<Point3D> resultVec = MathUtils::GeometryEngine::buffer(amo, bufferDistance);
+
+  GraphicalObjectPath *buffer = d->getAesBuffer();
+  if (buffer)
+  {
+    buffer->setVisibility(m_visibility && m_visibilityTechnical);
+    buffer->setScale(m_mainGraphicalObject->scale());
+    buffer->setLineStyle(LineStyle(d->m_color, AIR_SUPPORT_LINE_WIDTH, LinePattern::Solid));
+    buffer->setPositions(resultVec);
+    buffer->setDrawOrder(m_mainGraphicalObject->drawOrder());
+    if (!buffer->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed";
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void AirSupportImpl::updateViewImplLineAfpAlp(bool show, const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (show)
+  {
+    QSharedPointer<GraphicalObjectPath> line = d->getPathObject(LINE_INDEX_AFP_ALP);
+    if (line)
+    {
+      line->setVisibility(m_visibility && m_visibilityTechnical);
+      line->setScale(m_mainGraphicalObject->scale());
+      line->setDrawOrder(m_mainGraphicalObject->drawOrder());
+      line->setLineStyle(LineStyle(d->m_color, AIR_SUPPORT_LINE_WIDTH, LinePattern::Dash));
+      PositionCont posCont;
+      posCont.reserve(2);
+      posCont.append(start);
+      posCont.append(end);
+      line->setPositions(posCont);
+      if (!line->updateView())
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed";
+    }
+    TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  }
+  else
+    d->removePathObject(LINE_INDEX_AFP_ALP);
+}
+
+void AirSupportImpl::updateViewImplLineAlpAes(bool show, const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (show)
+  {
+    QSharedPointer<GraphicalObjectPath> line = d->getPathObject(LINE_INDEX_ALP_AES);
+    if (line)
+    {
+      line->setVisibility(m_visibility && m_visibilityTechnical);
+      line->setScale(m_mainGraphicalObject->scale());
+      line->setDrawOrder(m_mainGraphicalObject->drawOrder());
+      line->setLineStyle(LineStyle(d->m_color, AIR_SUPPORT_LINE_WIDTH, LinePattern::Solid));
+      PositionCont posCont;
+      posCont.reserve(2);
+      posCont.append(start);
+      posCont.append(end);
+      line->setPositions(posCont);
+      if (!line->updateView())
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed";
+    }
+  }
+  else
+    d->removePathObject(LINE_INDEX_ALP_AES);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool AirSupportImpl::bufferContainsAlp()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  Esri::ArcGISRuntime::Geometry geoHull;
+  if (d->m_aesBuffer)
+    geoHull = d->m_aesBuffer->getGraphicGeometry();
+
+  Esri::ArcGISRuntime::Geometry pntToCheck;
+  if (d->getALP())
+    pntToCheck = d->getALP()->getGraphicGeometry();
+
+  bool contains = false;
+
+  if (!geoHull.isEmpty() && !pntToCheck.isEmpty())
+    contains = Esri::ArcGISRuntime::GeometryEngine::contains(geoHull, pntToCheck);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, contains" << contains;
+  return contains;
+}
+
+Point3D AirSupportImpl::intersectionBufferAndLineAlpAes()
+{
+  Esri::ArcGISRuntime::Geometry geo1;
+  if (d->m_aesBuffer)
+    geo1 = d->m_aesBuffer->getGraphicGeometry();
+
+  if (geo1.isEmpty())
+    return Point3D();
+
+  Esri::ArcGISRuntime::Geometry geo2 = geometryOfLine(getCoordinateTranslated(COORD_INDEX_ALP),
+                                                      getCoordinateTranslated(COORD_INDEX_AES));
+
+  if (geo2.isEmpty())
+    return Point3D();
+
+  return intersection(geo1, geo2);
+}
+
+Point3D AirSupportImpl::intersectionAesAndLineAlpAes()
+{
+  AbstractMapObject *amo = d->m_mapImpl->objectContainer().getObject(d->m_referencedObject);
+  AbstractMapObjectImpl *mapObjImpl = dynamic_cast<AbstractMapObjectImpl *>(amo);
+
+  if (!mapObjImpl)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_referencedObject not found/dynamic_cast failed"
+                        << " (m_referencedObject=" << d->m_referencedObject << ")";
+    return Point3D();
+  }
+
+  Esri::ArcGISRuntime::Geometry geo1;
+  if (mapObjImpl)
+    geo1 = mapObjImpl->getEsriGeometry();
+
+  if (geo1.isEmpty())
+    return Point3D();
+
+  Esri::ArcGISRuntime::Geometry geo2 = geometryOfLine(getCoordinateTranslated(COORD_INDEX_ALP),
+                                                      getCoordinateTranslated(COORD_INDEX_AES));
+
+  if (geo2.isEmpty())
+    return Point3D();
+
+  return intersection(geo1, geo2);
+}
+
+Point3D AirSupportImpl::intersection(const Esri::ArcGISRuntime::Geometry &geo1, const Esri::ArcGISRuntime::Geometry &geo2)
+{
+  if (geo1.isEmpty() || geo2.isEmpty())
+    return Point3D();
+
+  Esri::ArcGISRuntime::Geometry geoResult =
+    Esri::ArcGISRuntime::GeometryEngine::intersection(geo1, geo2);
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " geoInter = " << geoResult.toJson();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " geoInter dimension = " << (int)geoResult.dimension();  // 300: GeometryDimension is a scoped enum
+
+  Esri::ArcGISRuntime::Point intersectPoint;
+
+  if (geoResult.dimension() == Esri::ArcGISRuntime::GeometryDimension::Curve)  // dim 1 -> Lines and Polyline (300: scoped enum)
+  {
+    Esri::ArcGISRuntime::Polyline polylineResult(geoResult);
+    if (polylineResult.parts().part(0).pointCount() > 0)
+      intersectPoint = polylineResult.parts().part(0).startPoint();
+  }
+  else if (geoResult.dimension() == Esri::ArcGISRuntime::GeometryDimension::Point)
+  {
+    intersectPoint = Esri::ArcGISRuntime::Point(geoResult);                // This is not tested yet
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " intersectPoint = " << intersectPoint.toJson();
+
+  if (std::isnan(intersectPoint.x()) ||
+      std::isnan(intersectPoint.y()) ||
+      std::isnan(intersectPoint.z()))
+    return Point3D();
+
+  Point3D intersection(intersectPoint.x(),
+                       intersectPoint.y(),
+                       intersectPoint.z());
+  return intersection;
+}
+
+Esri::ArcGISRuntime::Geometry AirSupportImpl::geometryOfLine(const Point3D &start, const Point3D &end)
+{
+  Esri::ArcGISRuntime::PolylineBuilder polylineBuilder(m_mapImpl->getEsriSpatialReference());
+  polylineBuilder.addPoint(Esri::ArcGISRuntime::Point(start.x(), start.y()));
+  polylineBuilder.addPoint(Esri::ArcGISRuntime::Point(end.x(), end.y()));
+
+  const Esri::ArcGISRuntime::Geometry &geo = polylineBuilder.toGeometry();
+  return geo;
+}
+
+bool AirSupportImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // no symbol required
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+
+  setLineStyle(LineStyle(Qt::black, 1));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  // set some values to Private:
+  d->m_mapImpl       = m_mapImpl;
+  d->m_debugInfo     = m_debugInfo;
+  d->m_uniqueMapId   = m_uniqueMapId;
+  d->m_graphicsLayer = m_graphicsLayer;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+Point3D AirSupportImpl::getCoordinateTranslated(int idx) const
+{
+  if (idx < 0 || idx > 2)
+    return Point3D();
+
+  const PositionCont &posContTranslated = m_positions.positionsTranslated();
+  if (idx >= posContTranslated.size())
+    return Point3D();
+
+  return posContTranslated[idx];
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.h
new file mode 100755
index 000000000..62bb89fd0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/air_support_impl.h
@@ -0,0 +1,119 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AirSupport
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/air_support.h> // Interface
+
+
+// Qt
+#include <QString>
+
+/*
+     o          AFP (Anflugpunkt)
+      \
+       \
+        o       ALP (Ausloesepunkt)
+        |
+        |
+        |
+     -------
+    |       |   AesItem / Buffer (Waffeneinsatzflaeche)
+     -------
+*/
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class ParticipantImpl;
+
+
+/**
+ * @brief The AirSupportImpl class displays (guez) air support, aka AerialOrdenance
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ *                             Line from 'Anflugpunkt' (AFP) over 'Ausloesepunkt' (ALP)
+ *                             to target (center of EffectSimulation)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ *
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT AirSupportImpl : public BasicPathObjectImpl, public virtual AirSupport
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit AirSupportImpl(const QString &debugInfo = QString());
+  virtual ~AirSupportImpl();
+
+  void setUniqueId(const UniqueMapId &uniqueId) override;
+
+public:
+  AirSupportImpl(const AirSupportImpl &other)      = delete;
+  AirSupportImpl &operator=(AirSupportImpl &other) = delete;
+
+  void setReferencedObject(const UniqueMapId &referencedObject) override;
+
+protected:
+  bool updateViewImpl() override;
+
+  bool onMapExtentChanged() override;
+
+  bool updateViewImplBuffer();
+  void updateViewImplLineAfpAlp(bool show, const Point3D &start, const Point3D &end);
+  void updateViewImplLineAlpAes(bool show, const Point3D &start, const Point3D &end);
+
+  bool bufferContainsAlp();
+  Point3D intersectionBufferAndLineAlpAes();
+  Point3D intersectionAesAndLineAlpAes();
+  Point3D intersection(const Esri::ArcGISRuntime::Geometry &geo1, const Esri::ArcGISRuntime::Geometry &geo2);
+  Esri::ArcGISRuntime::Geometry geometryOfLine(const Point3D &start, const Point3D &end);
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+  static const int COORD_INDEX_AFP = 0;  // Anflugpunkt
+  static const int COORD_INDEX_ALP = 1;  // Ausloesepunkt
+  static const int COORD_INDEX_AES = 2;  // target / EffectSimulation
+
+  static const int LINE_INDEX_AFP_ALP = 0;  // Anflugpunkt
+  static const int LINE_INDEX_ALP_AES = 1;  // Ausloesepunkt
+
+  Point3D getCoordinateTranslated(int idx) const;
+
+  // logical
+
+
+private:
+
+  // logical
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.cpp
new file mode 100755
index 000000000..ea9958f05
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.cpp
@@ -0,0 +1,820 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AreaFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "area_fire_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_scene_marker.h>
+#include <GraphicalObjects/graphical_object_renderer_attributes.h>
+#include "single_fire_impl.h"
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+#ifdef LTS_DEBUG
+#include <QMessageBox>
+#include <Graphic.h>
+#endif // LTS_DEBUG
+
+// Qt
+
+
+//#define USE_MARKER
+
+
+namespace SituationMap
+{
+
+static int s_gunToTargetLine3DKEY      = -1;
+static int s_gunToTargetLineSurfaceKEY = 0;
+static int s_nonLethalAreaKEY          = 1;
+
+
+class AreaFireImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+//  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer        = nullptr;
+
+
+  // Own data:
+  MapImpl                        *m_mapImpl = nullptr;
+  QString                         m_logicalLayer;
+  QString                         m_debugInfo;   // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId = INVALID_MAP_ID;
+
+  SimpleValue<QColor>             m_scheduledImpactsExplcitColor; // by default invalid color
+
+  struct Detonations
+  {
+    PositionsTranslated             m_detonationPositions;
+    SimpleValue<double>             m_detonationRadius{5};
+    bool                            m_detonationChanged{true};
+
+    bool changed() const { return m_detonationRadius.changed() || m_detonationChanged; }
+    void reset()         { m_detonationRadius.reset(); m_detonationChanged = false; }
+
+
+
+  } m_detonationsAbsolute, m_detonationsDraped;
+
+  //
+  // ABSOLUTE using SceneMarker
+  //
+
+  struct ValueDataGOSM_Abs
+  {
+    QSharedPointer<GraphicalObjectSceneMarker> m_goSceneMarker;
+  };
+  QVector<ValueDataGOSM_Abs>                   m_cont_VDGOSM_Abs;
+
+  void resizeGOSM_Abs(int newSize)          { m_cont_VDGOSM_Abs.resize(newSize);      }
+
+  ValueDataGOSM_Abs& getObjectGOSM_abs(int idx)
+  {
+    ValueDataGOSM_Abs &retRef = m_cont_VDGOSM_Abs[idx];
+    if (retRef.m_goSceneMarker.isNull())
+    {
+      Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = m_mapImpl->getGraphicsLayer3D_SpAbsolute(m_logicalLayer);
+      if (!graphicsLayer)
+      {
+        qCritical() << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                            << " getGraphicsLayer3D_SpAbsolute failed";
+      }
+
+      QString debugInfo = QStringLiteral("%1#ModelSceneMarkerAbs(%2)").arg(m_debugInfo).arg(idx);
+      GraphicalObjectSceneMarker *temp = new GraphicalObjectSceneMarker(SituationMap::SceneMarkerType::SPHERE,
+                                                                        m_mapImpl->getEsriGeoView(),
+                                                                        graphicsLayer,
+                                                                        debugInfo,
+                                                                        m_uniqueMapId);
+      temp->setUniqueMapId(m_uniqueMapId);
+
+      retRef.m_goSceneMarker = QSharedPointer<GraphicalObjectSceneMarker>(temp);
+    }
+    return retRef;
+  }
+
+  //
+  // DRAPED a) using renderer approach
+  //
+#ifdef AREA_FIRE_DRAPED_RENDERER                                                // GUEZE_2933
+  struct ValueDataGORA_Drpd
+  {
+    QSharedPointer<GraphicalObjectRendererAttributes> m_goRendererAtt;
+  };
+
+  QVector<ValueDataGORA_Drpd>                         m_cont_GORA_drpd;
+  void resizeDraped_GORA(int newSize)
+  {
+    m_cont_GORA_drpd.resize(newSize);
+  }
+
+  ValueDataGORA_Drpd& getObjectDraped_GORA(int idx, Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer)
+  {
+    Q_ASSERT(graphicsLayer);
+
+    ValueDataGORA_Drpd &retRef = m_cont_GORA_drpd[idx];
+    if (retRef.m_goRendererAtt.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#Drpd_goRendererAtt_%2").arg(m_debugInfo).arg(idx);
+      retRef.m_goRendererAtt = QSharedPointer<GraphicalObjectRendererAttributes>
+          (new GraphicalObjectRendererAttributes(m_mapImpl->getEsriGeoView()
+                                                 , graphicsLayer
+                                                 , debugInfo
+                                                 , m_uniqueMapId)
+           );
+      retRef.m_goRendererAtt->setUniqueMapId(m_uniqueMapId);
+    }
+
+    return retRef;
+  }
+
+  static QVariantMap createGORA_AttributeMap(const QColor &majorColor, double radius)
+  {
+    QVariantMap attribMap;
+    QString attribValue;
+    {
+      attribValue = QString(QStringLiteral("Impact_Color_%1")).arg(majorColor.name());
+      attribMap.insert(QStringLiteral("IMPACT_COLOR"), attribValue);
+    }
+    {
+      const double radiusWithMin = std::max(radius, 1.0); // at least 1 meter
+      attribValue = QString(QStringLiteral("Impact_Radius_%1")).arg(radiusWithMin);
+      attribMap.insert(QStringLiteral("IMPACT_RADIUS"), attribValue);
+    }
+    {
+      LayerFactory::UniqueValueDataAesCentral::TYPE type{LayerFactory::UniqueValueDataAesCentral::TYPE::SPHERE};
+      attribValue = QString(QStringLiteral("Impact_Type_%1")).arg(LayerFactory::toString(type));
+      attribMap.insert(QStringLiteral("IMPACT_TYPE"), attribValue);
+    }
+//    {
+//      // SceneProperties: HEADING, PITCH, ROLL
+//      int heading = 0;
+//      if (data.rotationAngle().has_value())
+//         heading = static_cast<int>(data.rotationAngle().get());
+//      attribMap.insert(QStringLiteral("HEADING"), ((heading+90)%360)); // data.rotationAngle()
+//      attribMap.insert(QStringLiteral("PITCH"), 0);
+//      attribMap.insert(QStringLiteral("ROLL"), 90);
+//    }
+
+//    qCritical() << " ident " << ", " << attribMap;
+    return attribMap;
+  }
+#else
+  //
+  // DRAPED b) using SceneMarker (see also GUEZE_2933)
+  //
+  struct ValueDataGOSM_Drpd
+  {
+    QSharedPointer<GraphicalObjectSceneMarker> m_goSceneMarker;
+  };
+  QVector<ValueDataGOSM_Drpd>                   m_cont_GOSM_drpd;
+  void resizeDraped_GOSM(int newSize)
+  {
+    m_cont_GOSM_drpd.resize(newSize);
+  }
+
+  ValueDataGOSM_Drpd& getObjectDraped_GOSM(int idx, Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer)
+  {
+    Q_ASSERT(graphicsLayer);
+
+    ValueDataGOSM_Drpd &retRef = m_cont_GOSM_drpd[idx];
+    if (retRef.m_goSceneMarker.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#Drpd_GOSM_%2").arg(m_debugInfo).arg(idx);
+      GraphicalObjectSceneMarker *temp = new GraphicalObjectSceneMarker(SituationMap::SceneMarkerType::SPHERE,
+                                                                        m_mapImpl->getEsriGeoView(),
+                                                                        graphicsLayer,
+                                                                        debugInfo,
+                                                                        m_uniqueMapId);
+      temp->setUniqueMapId(m_uniqueMapId);
+
+      retRef.m_goSceneMarker = QSharedPointer<GraphicalObjectSceneMarker>(temp);
+    }
+    return retRef;
+  }
+#endif // AREA_FIRE_DRAPED_RENDERER
+
+
+
+}; // class AreaFireImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class AreaFireImpl
+//-----------------------------------------------------------------------------
+AreaFireImpl::AreaFireImpl(const QString &debugInfo)
+  : AreaFire()                     // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , d(new Private)
+  , m_logger(getLogger("AreaFireImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo=" << m_debugInfo;
+  m_fillColorAlpha = 200;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo=" << m_debugInfo;
+}
+
+AreaFireImpl::~AreaFireImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo=" << m_debugInfo;
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo=" << m_debugInfo;
+}
+
+void AreaFireImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  BaseClass::setUniqueId(uniqueId);
+  d->m_uniqueMapId = m_uniqueMapId;
+}
+
+PositionCont AreaFireImpl::scheduledImpacts() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return this->rIndicationContainer().positions(1);
+}
+void AreaFireImpl::setScheduledImpacts(const PositionCont &posCont, const QColor &explicitColor)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " scheduledImpactsSize=" << posCont.size()
+                      << " explicitColor=" << explicitColor
+                         ;
+
+  IndicationContainer &drapedImpactsIC = this->rIndicationContainer();
+  drapedImpactsIC.setDebugInfo(m_debugInfo + QStringLiteral("DefaultSpDraped"));
+  drapedImpactsIC.setPositions(1, posCont);
+
+  d->m_scheduledImpactsExplcitColor = explicitColor;
+}
+
+PositionCont AreaFireImpl::impacts() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return this->rIndicationContainer().positions(0);
+}
+void AreaFireImpl::setImpacts(const PositionCont &posCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", impactSize=" << posCont.size();
+
+  IndicationContainer &drapedImpactsIC = this->rIndicationContainer();
+
+  drapedImpactsIC.setDebugInfo(m_debugInfo + QStringLiteral("DefaultSpDraped"));
+  drapedImpactsIC.setPositions(0, posCont);
+
+#ifdef USE_MARKER
+  drapedImpactsIC.setMarker(0, MarkerSymbolType::X, 20, partyColor());
+#endif
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PositionCont AreaFireImpl::impactsAbsoluteHeight() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return this->rIndicationContainerAbsolute().positions(0);
+}
+
+void AreaFireImpl::setImpactsAbsoluteHeight(const PositionCont &posCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " impactSize=" << posCont.size()
+                      << " lineStyle().lineColor()=" << lineStyle().lineColor();
+
+  IndicationContainer &impactsAbsolute = this->rIndicationContainerAbsolute();
+
+  impactsAbsolute.setDebugInfo(m_debugInfo + QStringLiteral("SpAbso"));
+  impactsAbsolute.setPositions(0, posCont);
+
+#ifdef USE_MARKER
+  impacts.setMarker(0, MarkerSymbolType::X, 20, partyColor());
+#endif
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PositionCont AreaFireImpl::detonationsAbsolute() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_detonationsAbsolute.m_detonationPositions.positions();
+}
+
+bool AreaFireImpl::setDetonationsAbsolute(const PositionCont &detonationsPositions, int detonationRadius)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", set detonationsPositions = " << detonationsPositions
+                      << ", radius=" << detonationRadius;
+  bool bHasChanged = d->m_detonationsAbsolute.m_detonationPositions.setPositions(detonationsPositions);
+  d->m_detonationsAbsolute.m_detonationRadius = detonationRadius;
+  d->m_detonationsAbsolute.m_detonationChanged = d->m_detonationsAbsolute.m_detonationChanged || bHasChanged; // Do not reset of changed==true; (maybe it was already changed)
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", bHasChanged=" << d->m_detonationsAbsolute.changed();
+  return d->m_detonationsAbsolute.changed();
+}
+
+PositionCont AreaFireImpl::detonationsDraped() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_detonationsDraped.m_detonationPositions.positions();
+}
+
+bool AreaFireImpl::setDetonationsDraped(const PositionCont &detonationsPositions, int detonationRadius)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", set detonationsPositions = " << detonationsPositions
+                      << ", radius=" << detonationRadius;
+  bool bHasChanged = d->m_detonationsDraped.m_detonationPositions.setPositions(detonationsPositions);
+  d->m_detonationsDraped.m_detonationRadius = detonationRadius;
+  d->m_detonationsDraped.m_detonationChanged = d->m_detonationsDraped.m_detonationChanged || bHasChanged; // Do not reset of changed==true; (maybe it was already changed)
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", bHasChanged=" << d->m_detonationsDraped.changed();
+  return d->m_detonationsDraped.changed();
+}
+
+void AreaFireImpl::setGunToTargetLineSurface(const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", start=" << start << ", end=" << end << ", debugInfo=" << m_debugInfo;
+
+  PathContainer &path = this->rPathContainer(); // should be SP::Draped
+  path.setDebugInfo(m_debugInfo + QStringLiteral("SpDraped"));
+
+  if (start.isNull() && end.isNull())
+  {
+    path.clear(s_gunToTargetLineSurfaceKEY); // 0
+  } else {
+    LineStyle ls = m_mainGraphicalObject->lineStyle();
+    ls.setLinePattern(LinePattern::Dot);
+    ls.setLineWidth(2);
+    path.setLineStyle(ls);
+    path.setPath(s_gunToTargetLineSurfaceKEY, {start, end});
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", start=" << start << ", end=" << end << ", debugInfo=" << m_debugInfo;
+}
+
+void AreaFireImpl::setGunToTargetTrajectory3D(const PositionCont &gunToTargetPath)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", gunToTargetPath=" << gunToTargetPath.size()
+                      << ", debugInfo=" << m_debugInfo;
+
+  PathContainer &path3D_Abs = this->rPathContainerSpAbsolute2(); // should be SP::Absolute
+  path3D_Abs.setDebugInfo(m_debugInfo + QStringLiteral("Absolute"));
+  path3D_Abs.setDrawOrder(5);
+
+  if (gunToTargetPath.isEmpty())
+  {
+    path3D_Abs.clear(s_gunToTargetLine3DKEY); // -1
+  } else {
+    LineStyle ls = m_mainGraphicalObject->lineStyle();
+
+    // Try to reduce z-Fighting between gunToTarget and trajectory.
+    // by reducing the opacity (GUEZE-2722)
+    QColor lCol = ls.lineColor();
+    lCol.setAlphaF(0.99);
+    ls.setLineColor(lCol);
+
+    ls.setLinePattern(LinePattern::Dot);
+    ls.setLineWidth(1);
+    path3D_Abs.setLineStyle(ls);
+    path3D_Abs.setPath(s_gunToTargetLine3DKEY, gunToTargetPath);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", gunToTargetPath=" << gunToTargetPath.size()
+                      << ", debugInfo=" << m_debugInfo;
+}
+
+void AreaFireImpl::setNonLethalArea(const PositionCont &nonLethalArea)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", nonLethalArea=" << nonLethalArea.size()
+                      << ", debugInfo=" << m_debugInfo;
+
+  // avoid creating PathContainer in case of non-existing data:
+  if (nonLethalArea.size() < 3)
+  {
+    clearPathContainerSpDrapedPolygon(s_nonLethalAreaKEY);
+    return;
+  }
+
+  PathContainer &path = this->rPathContainerSpDrapedPolygon();
+  path.setDebugInfo(m_debugInfo + QStringLiteral("SpDrapedNonLethalArea"));
+
+  // LineStyle ls = m_mainGraphicalObject->lineStyle();
+  // ls.setLineColor(partyColor());
+  // ls.setLinePattern(LinePattern::Solid);
+  // ls.setLineWidth(2);
+  // path.setLineStyle(ls);
+
+  // const FillStyle &fs = m_mainGraphicalObject->fillStyle();
+  // path.setFillStyle(fs);
+
+  path.setPath(s_nonLethalAreaKEY, nonLethalArea); // 1
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", nonLethalArea=" << nonLethalArea.size()
+                      << ", debugInfo=" << m_debugInfo;
+}
+
+PositionCont AreaFireImpl::trajectory(int index) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", index=" << index;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"   << ", index=" << index;
+  return this->rPathContainerSpAbsolute1().path(index);
+}
+
+bool AreaFireImpl::setTrajectory(int index, const PositionCont &trajectoryPath)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " index=" << index
+                      << ", trajectoryPath.size=" << trajectoryPath.size()
+                      << ", lineStyle().lineColor()=" << lineStyle().lineColor();
+
+  PathContainer &path = this->rPathContainerSpAbsolute1();  // Trajectory -> Absolute
+  path.setDebugInfo(m_debugInfo + QStringLiteral("Draped"));
+  path.setDrawOrder(6); // 'above' guntToTargetLine/guntToTargetCurve
+  LineStyle ls = this->lineStyle();
+  ls.setLinePattern(LinePattern::Solid);
+  ls.setLineWidth(2);
+  path.setLineStyle(ls);
+  return path.setPath(index, trajectoryPath);
+}
+
+
+bool AreaFireImpl::updateViewImpl()
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", visibility=" << m_visibility
+                      << ", visiTechn=" << m_visibilityTechnical
+                      << ", visiTact=" << m_visibilityTactical
+                         //   IndicationContainer &drapedImpactsIC = this->rIndicationContainer();
+                         //   IndicationContainer &impactsAbsolute = this->rIndicationContainerAbsolute();
+                      << ", d->m_detonationsAbsolute.changed() = " << d->m_detonationsAbsolute.changed()
+                      << ", d->m_detonationsAbsolute.size() = "    << d->m_detonationsAbsolute.m_detonationPositions.size()
+                      << ", d->m_detonationsDraped.changed() = "   << d->m_detonationsDraped.changed()
+                      << ", d->m_detonationsDraped.size() = "      << d->m_detonationsDraped.m_detonationPositions.size();
+
+  for (IndicationContainer *indCont : {m_indicationCont, m_indicationContSpAbsolute})
+  {
+    if (!indCont)
+      continue;
+
+    if (m_mainGraphicalObject)
+    {
+#ifdef USE_MARKER
+      indCont->setMarker(0, col);
+#else
+      if (indCont->image(0).isNull() || m_party.partyId.changed())
+      {
+        const QColor &col = m_mainGraphicalObject->lineStyle().lineColor();
+        indCont->setImage(0, SingleFireImpl::renderImpactSymbol(col, 20, true));  // filled for impacts
+      }
+      if (indCont->image(1).isNull() || m_party.partyId.changed() || d->m_scheduledImpactsExplcitColor.changed())
+      {
+        d->m_scheduledImpactsExplcitColor.reset();
+        QColor col = d->m_scheduledImpactsExplcitColor.value();
+        if (!col.isValid())
+          col = m_mainGraphicalObject->lineStyle().lineColor();
+        indCont->setImage(1, SingleFireImpl::renderImpactSymbol(col, 20, false)); // open for scheduledImpacts
+      }
+#endif
+    }
+
+    indCont->setSelected(0, m_selected);
+    indCont->setPickable(0, m_pickable);
+    indCont->setVisible(0, m_visibility);
+    indCont->setSelected(1, m_selected);
+    indCont->setPickable(1, m_pickable);
+    indCont->setVisible(1, m_visibility);
+  } // for (IndicationContainer *indCont...
+
+  // control selection
+  if (m_pathCont_SpDraped)
+  {
+    m_pathCont_SpDraped->setSelected(m_selected);
+    // m_pathCont_SpDraped->setPickable(0, m_pickable);
+    m_pathCont_SpDraped->setVisibility(s_gunToTargetLineSurfaceKEY, m_visibility); // 0 -> GunToTargetLineSurface
+  }
+  if (m_pathCont_SpDrapedPolygon)
+  {
+    m_pathCont_SpDrapedPolygon->setSelected(m_selected);
+    // m_pathCont->setPickable(0, m_pickable);
+    m_pathCont_SpDrapedPolygon->setVisibility(s_nonLethalAreaKEY, m_visibility);
+
+    LineStyle ls = m_mainGraphicalObject->lineStyle();
+    ls.setLinePattern(LinePattern::Solid);
+    ls.setLineWidth(2);
+    m_pathCont_SpDrapedPolygon->setLineStyle(ls);
+
+    FillStyle fs = m_mainGraphicalObject->fillStyle();
+    m_pathCont_SpDrapedPolygon->setFillStyle(fs);
+  }
+
+  if (m_pathCont_SpAbsolute1)
+  {
+    const auto &keys = m_pathCont_SpAbsolute1->getIndicationIndexList();
+    for (auto keyIndex : qAsConst(keys))
+      m_pathCont_SpAbsolute1->setVisibility(keyIndex, m_visibility); // trajectories
+
+    m_pathCont_SpAbsolute1->setSelected(m_selected);
+    // m_pathCont->setPickable(0, m_pickable);
+  }
+  if (m_pathCont_SpAbsolute2)
+  {
+    m_pathCont_SpAbsolute2->setSelected(m_selected);
+    // m_pathCont->setPickable(0, m_pickable);
+    m_pathCont_SpAbsolute2->setVisibility(s_gunToTargetLine3DKEY, m_visibility); // -1 -> GunToTargetLine3D
+  }
+
+  const bool mgoVisiOld = m_mainGraphicalObject->visibility();
+
+  bool success = BaseClass::updateViewImpl();
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  // Detonations (3D)
+  bool successDetonationsAbs = true;
+
+  if ( (m_mapImpl->mode() == Mode::Mode_3D) &&
+       (d->m_detonationsAbsolute.changed() || (mgoVisiOld != m_mainGraphicalObject->visibility()))
+        )
+  {
+    const PositionCont &positionsTranslated = d->m_detonationsAbsolute.m_detonationPositions.positionsTranslated();
+    const int newSize = positionsTranslated.size();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " resizeGOSM_Abs" << d->m_cont_VDGOSM_Abs.size() << " to " << newSize;
+
+    d->resizeGOSM_Abs(newSize);
+
+    int idx = 0;
+    for(const Point3D &point3DTranslated : qAsConst(positionsTranslated))
+    {
+      Private::ValueDataGOSM_Abs &vdGOSM_absRef = d->getObjectGOSM_abs(idx);
+      QSharedPointer<GraphicalObjectSceneMarker> goSceneMarker = vdGOSM_absRef.m_goSceneMarker;
+
+      goSceneMarker->setOrigin(point3DTranslated);
+      goSceneMarker->setDiameter(d->m_detonationsAbsolute.m_detonationRadius.value() * 2);
+      goSceneMarker->setPickable(false);
+      goSceneMarker->setSelected(false);
+
+      QColor col = partyColor();
+      col.setAlphaF(col.alphaF() / 2.0);
+      goSceneMarker->setFillStyle(FillStyle(col, FillPattern::Solid));
+      goSceneMarker->setVisibility(m_visibility);
+
+      if (!goSceneMarker->updateView())
+        successDetonationsAbs = false;
+      ++idx;
+    } // for
+
+    if (!successDetonationsAbs)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateView m_goSceneMarker failed, m_debugInfo = " << m_debugInfo;
+
+    d->m_detonationsAbsolute.reset();
+  } else {
+    // To simplifiy debugging:
+    d->m_detonationsAbsolute.reset();
+  }
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", d->m_detonationsDraped.changed = " << d->m_detonationsDraped.changed();
+
+
+  bool successDetonationsDrpd = true;
+  if ( (m_mapImpl->mode() == Mode::Mode_3D) &&
+       (d->m_detonationsDraped.changed() || (mgoVisiOld != m_mainGraphicalObject->visibility())) )
+  {
+
+#ifdef AREA_FIRE_DRAPED_RENDERER
+    successDetonationsDrpd = updateViewImplDetonation3dDraped_RendererApproach();
+#else
+    successDetonationsDrpd = updateViewImplDetonation3dDraped_SceneMarkerApproach();
+#endif // AREA_FIRE_DRAPED_RENDERER
+
+  } else {
+    // to simplify debugging:
+    d->m_detonationsDraped.reset();
+  }
+
+  success = success && successDetonationsAbs && successDetonationsDrpd;
+
+
+#ifdef LTS_DEBUG
+  const bool afVisi = m_visibility;
+  const bool mgoVisi = m_mainGraphicalObject->visibility();
+  const bool esriGraphicVisi = m_mainGraphicalObject->graphic()->isVisible();
+  // REGG-5360 - Wenn man beim Beobachten der Live-Lage über den Wirksimulationsfilter alle gepla..
+  // ... sind Flächenfeuer entgegen dem Filter sichtbar
+
+  if ( (afVisi != mgoVisi) || (afVisi != esriGraphicVisi) )
+  {
+    for (int i = 0; i < 100; ++i)
+      FATAL_LOG(m_logger) << LOGFUNCTION << " INKONSISTENCY!!!!!!!!!!!!!!";
+
+    FATAL_LOG(m_logger) << LOGFUNCTION << " INKONSISTENCY!!!!!!!!!!!!!!"
+                        << ", afVisi=" << afVisi
+                        << ", mgoVisi=" << mgoVisi
+                        << ", esriGraphicVisi" << esriGraphicVisi;
+
+    QMessageBox::critical(nullptr,
+                          QLatin1String("INKONSISTENCY"),
+                          QLatin1String("INKONSISTENCY, corefile wil be created ; check logfile regarding REGG-5360.."));
+    abort();
+
+  }
+#endif // LTS_DEBUG
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+
+}
+
+#ifdef AREA_FIRE_DRAPED_RENDERER
+bool AreaFireImpl::updateViewImplDetonation3dDraped_RendererApproach()          // GUEZE_2933
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", visibility=" << m_visibility
+                      << ", visiTechn=" << m_visibilityTechnical
+                      << ", visiTact=" << m_visibilityTactical
+                      << ", d->m_detonationsDraped.changed() = "   << d->m_detonationsDraped.changed()
+                      << ", d->m_detonationsDraped.size() = "      << d->m_detonationsDraped.m_detonationPositions.size();
+
+  bool successDetonationsDrpd = true;
+  if ((m_mapImpl->mode() == Mode::Mode_3D) && d->m_detonationsDraped.changed())
+  {
+    const PositionCont &positionsTranslated_drpdTrans = d->m_detonationsDraped.m_detonationPositions.positionsTranslated();
+    const int newSize = positionsTranslated_drpdTrans.size();
+    d->resizeDraped_GORA(newSize);
+
+    int idx = 0;
+    for(const Point3D &point3DTranslated : qAsConst(positionsTranslated_drpdTrans))
+    {
+      Private::ValueDataGORA_Drpd &vdGORA_drpdRef = d->getObjectDraped_GORA(idx, m_graphicsLayer);
+      QSharedPointer<GraphicalObjectRendererAttributes> goRendererAtt = vdGORA_drpdRef.m_goRendererAtt;
+
+      goRendererAtt->setOrigin(point3DTranslated);
+
+      const QVariantMap &attribMap = d->createGORA_AttributeMap(m_mainGraphicalObject->lineStyle().lineColor(), d->m_detonationsDraped.m_detonationRadius.value());
+
+      if (m_logger.isDebugEnabled())
+        qCritical() << LOGFUNCTION << " START"
+                    << ", m_debugInfo=" << m_debugInfo
+                    << ", attribMap = " << attribMap
+                    << ", point3DTranslated = " << point3DTranslated.x() << " / " << point3DTranslated.y() << " / " << point3DTranslated.z()
+                    << ", m_visibility = " << m_visibility;
+
+
+      goRendererAtt->setAttributeMap(attribMap);
+      goRendererAtt->setVisibility(m_visibility);
+      goRendererAtt->setPickable(false);
+      goRendererAtt->setSelected(false);
+
+      if (!goRendererAtt->updateView())
+        successDetonationsDrpd = false;
+      ++idx;
+    } // for
+    if (!successDetonationsDrpd)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl m_goRendererAtt failed, m_debugInfo=" << m_debugInfo;
+
+    d->m_detonationsDraped.reset();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, successDetonationsDrpd=" << successDetonationsDrpd;
+  return successDetonationsDrpd;
+}
+
+#else //  AREA_FIRE_DRAPED_RENDERER                                             // GUEZE_2933
+
+bool AreaFireImpl::updateViewImplDetonation3dDraped_SceneMarkerApproach()       // GUEZE_2933
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", visibility=" << m_visibility
+                      << ", visiTechn=" << m_visibilityTechnical
+                      << ", visiTact=" << m_visibilityTactical
+                      << ", d->m_detonationsDraped.changed() = "   << d->m_detonationsDraped.changed()
+                      << ", d->m_detonationsDraped.size() = "      << d->m_detonationsDraped.m_detonationPositions.size();
+
+  bool successDetonationsDrpd = true;
+  if ((m_mapImpl->mode() == Mode::Mode_3D) && d->m_detonationsDraped.changed())
+  {
+    const PositionCont &positionsTranslated_drpdTrans = d->m_detonationsDraped.m_detonationPositions.positionsTranslated();
+    const int newSize = positionsTranslated_drpdTrans.size();
+    d->resizeDraped_GOSM(newSize);
+
+    int idx = 0;
+    for(const Point3D &point3DTranslated : qAsConst(positionsTranslated_drpdTrans))
+    {
+      Private::ValueDataGOSM_Drpd &GOSM_drpdRef = d->getObjectDraped_GOSM(idx, m_graphicsLayer);
+
+      QSharedPointer<GraphicalObjectSceneMarker> goSceneMarker = GOSM_drpdRef.m_goSceneMarker;
+
+      goSceneMarker->setOrigin(point3DTranslated);
+      goSceneMarker->setDiameter(d->m_detonationsDraped.m_detonationRadius.value() * 2);
+      goSceneMarker->setPickable(false);
+      goSceneMarker->setSelected(false);
+
+      QColor col = partyColor();
+      col.setAlphaF(col.alphaF() / 2.0);
+      goSceneMarker->setFillStyle(FillStyle(col, FillPattern::Solid));
+      goSceneMarker->setVisibility(m_visibility);
+
+      if (!goSceneMarker->updateView())
+        successDetonationsDrpd = false;
+      ++idx;
+    } // for
+    if (!successDetonationsDrpd)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl GOSM_drpdRef failed, m_debugInfo=" << m_debugInfo;
+
+    d->m_detonationsDraped.reset();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, successDetonationsDrpd=" << successDetonationsDrpd;
+  return successDetonationsDrpd;
+}
+#endif //  AREA_FIRE_DRAPED_RENDERER
+
+
+
+bool AreaFireImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002408010000"); // SymbolSet = 25 240801
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      //  m_symbol.refValue().m_sidc = QLatin1String("GHFPATB---");  // GHFPATB--- 0879, Area Target Bomb
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GHFPATS---"); // GHFPATB--- 0879, Area Target Smoke
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GHCPFLKS--"); // APP6B: 3965: GHCPFLKS-- -> Polygon
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::black, 2));
+
+  // setup Private:
+  d->m_mapImpl = mapImpl;
+  d->m_logicalLayer = logicalLayerName;
+  d->m_debugInfo = this->debugInfo();
+  d->m_detonationsAbsolute.m_detonationPositions.setMapObjectImpl(this);
+  d->m_detonationsDraped.m_detonationPositions.setMapObjectImpl(this);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool AreaFireImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  for (auto item : {m_indicationCont, m_indicationContSpAbsolute})
+  {
+    const bool visiScale = m_visibilityScaleRange.scaleHasVisibility(m_mapImpl->scale());
+    if (item)
+    {
+      item->setVisible(0, m_visibility && m_visibilityTechnical && visiScale);
+      item->setVisible(1, m_visibility && m_visibilityTechnical && visiScale);
+    }
+  }
+
+  bool success = BaseClass::onMapExtentChanged();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.h
new file mode 100755
index 000000000..e68aa4f93
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/area_fire_impl.h
@@ -0,0 +1,108 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of AreaFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/area_fire.h> // Interface
+
+// Qt
+#include <QString>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// GUEZE_2933
+// // #define AREA_FIRE_DRAPED_RENDERER
+
+
+/**
+ * @brief The AreaFireImpl class displays a area of impacts.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ * - an infinite number indication objects for displaying impacts (inherented from BasicPathObjectImpl)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT AreaFireImpl : public BasicPathObjectImpl, public virtual AreaFire
+{
+  using BaseClass = BasicPathObjectImpl;
+
+public:
+  explicit AreaFireImpl(const QString &debugInfo = QString());
+  virtual ~AreaFireImpl();
+
+  AreaFireImpl(const AreaFireImpl &other)     = delete;
+  AreaFireImpl &operator=(AreaFireImpl &other) = delete;
+
+  void setUniqueId(const UniqueMapId &uniqueId) override;
+
+  PositionCont scheduledImpacts() const override;
+  void setScheduledImpacts(const PositionCont &posCont, const QColor &explicitColor = QColor()) override;
+
+  PositionCont impacts() const override;
+  void setImpacts(const PositionCont &posCont) override;
+
+  PositionCont impactsAbsoluteHeight() const override;
+  void setImpactsAbsoluteHeight(const PositionCont &posCont) override;
+
+
+  PositionCont detonationsAbsolute() const override;
+  bool setDetonationsAbsolute(const PositionCont &detonationsPositions, int detonationRadius) override;
+
+  PositionCont detonationsDraped() const override;
+  bool setDetonationsDraped(const PositionCont &detonationsPositions, int detonationRadius) override;
+
+  void setGunToTargetLineSurface(const Point3D &start, const Point3D &end) override;
+  void setGunToTargetTrajectory3D(const PositionCont &gunToTargetPath) override;
+
+  void setNonLethalArea(const PositionCont &nonLethalArea) override;
+
+  PositionCont trajectory(int index) const override;
+  bool setTrajectory(int index, const PositionCont &trajectoryPath) override;
+
+protected:
+  virtual bool updateViewImpl() override;
+
+#ifdef AREA_FIRE_DRAPED_RENDERER
+  virtual bool updateViewImplDetonation3dDraped_RendererApproach();
+#else
+  virtual bool updateViewImplDetonation3dDraped_SceneMarkerApproach();
+#endif // AREA_FIRE_DRAPED_RENDERER
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+
+  // internal/admin
+
+  // logical
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.cpp
new file mode 100755
index 000000000..867de0aea
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.cpp
@@ -0,0 +1,1120 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BasicPathObjectImpl
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "basic_path_object_impl.h"
+#include "indication_container.h"
+#include <MapImpl/map_impl.h>
+#include <MapImpl/coord_translation_functor_impl.h>
+#include <MapObjects/geometry.h>
+#include <GraphicalObjects/graphical_object_path.h>
+//#include <GraphicalObjects/graphical_object_multi_path.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/graphical_object_scene_marker.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/tactical_appearance.h>
+#include <MathUtils/simple_helper.h>
+
+
+// ESRI
+#include <GeoView.h>
+#include <SceneGraphicsView.h>
+#include <Point.h>
+#include <Camera.h>
+#include <GraphicsOverlay.h>
+#include <GeometryEngine.h>
+#include <GeometryTypes.h>                 // 300: GeodeticCurveType + GeometryDimension enums
+#include <GeodeticDistanceResult.h>
+#include <LinearUnit.h>                    // 300: distanceGeodetic() takes LinearUnit (meters()) not LinearUnitId
+#include <AngularUnit.h>                   // 300: distanceGeodetic() takes AngularUnit (degrees()) not AngularUnitId
+
+
+// Qt
+#include <QElapsedTimer>
+#include <QPainter>
+#include <QPen>
+#include <QPoint>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class BasicPathObjectImpl
+//-----------------------------------------------------------------------------
+BasicPathObjectImpl::BasicPathObjectImpl(const QString &debugInfo)
+  : BaseClass(debugInfo)           // Implementation
+  , AbstractEffectSimulationImpl() // Secondary implementation
+  , m_logger(getLogger("BasicPathObjectImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo << "'";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo << "'";
+}
+
+BasicPathObjectImpl::~BasicPathObjectImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo << "'";
+  delete m_indicationCont;
+  delete m_indicationContSpAbsolute;
+  delete m_pathCont_SpDraped;
+  delete m_pathCont_SpDrapedPolygon;
+  delete m_pathCont_SpAbsolute1;
+  delete m_pathCont_SpAbsolute2;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo << "'";
+}
+
+
+QString BasicPathObjectImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(AbstractEffectSimulationImpl::toString());
+  return str;
+}
+
+Point3D BasicPathObjectImpl::tacticalOrigin() const
+{
+  return m_tacticalOrigin.value().origin();
+}
+
+void BasicPathObjectImpl::setTacticalOrigin(const Point3D &tacticalOrigin)
+{
+  if (m_tacticalOrigin.value().origin() != tacticalOrigin)
+    m_tacticalOrigin.refValue().setOrigin(tacticalOrigin);
+}
+
+Point3D BasicPathObjectImpl::origin() const
+{
+  return m_origin.value();
+}
+void BasicPathObjectImpl::setOrigin(const Point3D &origin)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo << "'"
+                      << " origin=" << origin;
+  m_origin = origin;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo << "'";
+}
+
+float BasicPathObjectImpl::radius() const
+{
+  return m_radius.value();
+}
+void BasicPathObjectImpl::setRadius(float radius, unsigned int maxPointCount)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo=" << m_debugInfo << "'"
+                      << " radius=" << radius
+                      << " maxPointCount=" << maxPointCount;
+  m_radius        = radius;
+  m_maxPointCount = maxPointCount;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo=" << m_debugInfo << "'";
+}
+
+
+#ifdef SUPPORT_SUBSIDIARY_LINES
+
+PositionCont BasicPathObjectImpl::subsidiaryPositions(int pathIndex) const
+{
+  if (m_subsidiaryPositionsCont.contains(pathIndex))
+    return m_subsidiaryPositionsCont[pathIndex].positions();
+  return PositionCont();
+}
+
+void BasicPathObjectImpl::setSubsidiaryPositions(int pathIndex, const PositionCont &positions)
+{
+  m_subsidiaryPositionsCont[pathIndex].setPositions(positions);
+}
+
+QList<int> BasicPathObjectImpl::subsidiaryPathIndexInUse()
+{
+  return m_subsidiaryPositionsCont.keys();
+}
+
+void BasicPathObjectImpl::clearSubsidiaryPositions(int pathIndex)
+{
+  m_subsidiaryPositionsCont.remove(pathIndex);
+}
+
+void BasicPathObjectImpl::clearSubsidiaryPositions()
+{
+  m_subsidiaryPositionsCont.clear();
+}
+#endif // SUPPORT_SUBSIDIARY_LINES
+
+
+GraphicalObjectPathType BasicPathObjectImpl::pathType() const
+{
+  GraphicalObjectPath *path = static_cast<GraphicalObjectPath *>(m_mainGraphicalObject);
+  return (path) ? path->pathType() : GraphicalObjectPathType::Polyline;
+}
+
+int BasicPathObjectImpl::segmentCount() const
+{
+  if (m_positions.size() >= 2)
+    return m_positions.size() - 1;
+
+  return 0;
+}
+
+
+AesEffectState BasicPathObjectImpl::aesState() const
+{
+  return BaseClass::aesState();
+}
+void BasicPathObjectImpl::setAesState(AesEffectState aesState)
+{
+  BaseClass::setAesState(aesState);
+}
+
+
+
+
+IndicationContainer &BasicPathObjectImpl::rIndicationContainer() const
+{
+  if (!m_indicationCont)
+  {
+    m_indicationCont = new IndicationContainer(m_mapImpl->getEsriGeoView(),
+                                               m_graphicsLayer,
+                                               m_mapImpl->coordTranslationFunctor(),
+                                               m_uniqueMapId);
+  }
+  return *m_indicationCont;
+}
+
+IndicationContainer &BasicPathObjectImpl::rIndicationContainerAbsolute() const
+{
+  if (!m_indicationContSpAbsolute)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = m_mapImpl->getGraphicsLayer3D_SpAbsolute(m_logicalLayerName);
+    if (!graphicsLayer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " getGraphicsLayer3D_SpAbsolute failed";
+    }
+    m_indicationContSpAbsolute = new IndicationContainer(m_mapImpl->getEsriGeoView(),
+                                                         graphicsLayer,
+                                                         m_mapImpl->coordTranslationFunctor(),
+                                                         m_uniqueMapId);
+  }
+  return *m_indicationContSpAbsolute;
+}
+
+PathContainer &BasicPathObjectImpl::rPathContainer() const
+{
+  if (!m_pathCont_SpDraped)
+  {
+    m_pathCont_SpDraped = new PathContainer(m_mapImpl->getEsriGeoView(),
+                                            m_graphicsLayer,
+                                            m_mapImpl->coordTranslationFunctor(),
+                                            m_uniqueMapId);
+  }
+  return *m_pathCont_SpDraped;
+}
+
+PathContainer &BasicPathObjectImpl::rPathContainerSpDrapedPolygon() const
+{
+  if (!m_pathCont_SpDrapedPolygon)
+  {
+    m_pathCont_SpDrapedPolygon = new PathContainer(GraphicalObjectPathType::Polygon,
+                                                   m_mapImpl->getEsriGeoView(),
+                                                   m_graphicsLayer,
+                                                   m_mapImpl->coordTranslationFunctor(),
+                                                   m_uniqueMapId);
+  }
+  return *m_pathCont_SpDrapedPolygon;
+}
+
+void BasicPathObjectImpl::clearPathContainerSpDrapedPolygon(int idx)
+{
+  if (!m_pathCont_SpDrapedPolygon)
+    return;
+  rPathContainerSpDrapedPolygon().clear(idx);
+}
+
+
+PathContainer &BasicPathObjectImpl::rPathContainerSpAbsolute1() const
+{
+  if (!m_pathCont_SpAbsolute1)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = m_mapImpl->getGraphicsLayer3D_SpAbsolute(m_logicalLayerName);
+    if (!graphicsLayer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " getGraphicsLayer3D_SpAbsolute failed";
+    }
+
+    m_pathCont_SpAbsolute1 = new PathContainer(m_mapImpl->getEsriGeoView(),
+                                              graphicsLayer,
+                                              m_mapImpl->coordTranslationFunctor(),
+                                              m_uniqueMapId);
+  }
+  return *m_pathCont_SpAbsolute1;
+}
+PathContainer &BasicPathObjectImpl::rPathContainerSpAbsolute2() const
+{
+  if (!m_pathCont_SpAbsolute2)
+  {
+    Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer = m_mapImpl->getGraphicsLayer3D_SpAbsolute(m_logicalLayerName);
+    if (!graphicsLayer)
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " getGraphicsLayer3D_SpAbsolute failed";
+    }
+
+    m_pathCont_SpAbsolute2 = new PathContainer(m_mapImpl->getEsriGeoView(),
+                                              graphicsLayer,
+                                              m_mapImpl->coordTranslationFunctor(),
+                                              m_uniqueMapId);
+  }
+  return *m_pathCont_SpAbsolute2;
+}
+
+
+
+
+bool BasicPathObjectImpl::arrowHeadStart() const
+{
+  return m_arrowHeadStart.enable;
+}
+void BasicPathObjectImpl::setArrowHeadStart(bool enable)
+{
+  m_arrowHeadStart.enable = enable;
+}
+
+bool BasicPathObjectImpl::arrowHeadEnd() const
+{
+  return m_arrowHeadEnd.enable;
+}
+void BasicPathObjectImpl::setArrowHeadEnd(bool enable)
+{
+  m_arrowHeadEnd.enable = enable;
+}
+
+void BasicPathObjectImpl::setArrowHeadsSelected(bool select)
+{
+  if (m_arrowHeadStart.pmArrowHead)
+    m_arrowHeadStart.pmArrowHead->setSelected(select);
+  if (m_arrowHeadEnd.pmArrowHead)
+    m_arrowHeadEnd.pmArrowHead->setSelected(select);
+}
+
+void BasicPathObjectImpl::setDetonation(const Point3D &origin, double radius)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  if (m_detonationOrigin.value().origin() != origin)
+    m_detonationOrigin.refValue().setOrigin(origin);
+  m_detonationRadius = radius;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool BasicPathObjectImpl::hasDetonation() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return m_detonationRadius.value() > 0;
+}
+
+void BasicPathObjectImpl::resetDetonation()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  setDetonation({}, 0.0);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString BasicPathObjectImpl::textOnSegment(uint segment) const
+{
+  return m_textDataCont[segment].text;
+}
+
+void BasicPathObjectImpl::setTextOnSegment(uint segment, const QString &segmentText)
+{
+  m_textDataCont[segment].text = segmentText;
+}
+
+void BasicPathObjectImpl::clearTextOnSegment(uint segment)
+{
+  m_textDataCont.remove(segment);
+}
+
+
+QImage BasicPathObjectImpl::renderArrowHeadSymbol(const QColor &color, int length, int halfWidth)
+{
+  int width = halfWidth * 2;
+  QImage image(width, length, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+  painter.setRenderHints(QPainter::Antialiasing);
+
+  QPen pen(color);
+  pen.setWidth(2);
+  painter.setPen(pen);
+
+  painter.setBrush(QBrush(color, Qt::BrushStyle::SolidPattern));
+
+  //   2 ||
+  //    |  |
+  // 1 |    | 3
+
+  QPolygon poly;
+  poly.reserve(3);
+  poly.append(QPoint(0        , length));
+  poly.append(QPoint(halfWidth, 0));
+  poly.append(QPoint(width    , length));
+
+  painter.drawPolygon(poly);
+
+  painter.end();
+
+  //  image.save(QLatin1String("/tmp/Arrow.png"));
+  return image;
+}
+
+
+bool BasicPathObjectImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_debugInfo=" << m_debugInfo
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no graphicsLayer";
+    return false;
+  }
+
+  if (!m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << "no m_mainGraphicalObject";
+    return false;
+  }
+
+  //
+  // Use positions or origin/radius=
+  //
+
+  if (m_radius.value() > 0)
+  {
+    // origin/radius :
+    if (m_origin.changed() || m_radius.changed() || m_maxPointCount.changed())
+    {
+      // clear/disable some other things:
+      m_positions.clear();
+      m_arrowHeadStart.enable = false;
+      m_arrowHeadEnd.enable = false;
+      m_textDataCont.clear();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " positions,arrowHeads,textDataCont cleared";
+    }
+
+    OriginTranslated orgTemp;
+    orgTemp.setMapObjectImpl(this);
+    orgTemp.setOrigin(m_origin.value());
+    const Point3D &orgMapPoint = orgTemp.originTranslated();
+
+// for 2D
+//    QList<QPointF> posContTrans = Geometry::createCircle(orgMapPoint, m_radius.value());
+//    Q_FOREACH(const QPointF &pp, posContTrans)
+//      qWarning() << "posContTrans" << pp;
+
+//    m_positions.setPositionsTranslated( posContTrans );
+//    m_mainGraphicalObject->setPositions(this->positionsTranslated());
+
+// for 2D and 3D:
+    Esri::ArcGISRuntime::Point centerP(orgMapPoint.x(), orgMapPoint.y(), orgMapPoint.z(), this->mapImpl()->getEsriSpatialReference());
+    PositionCont posCont;
+    if (! GraphicalObjectEllipse::createCirclePolygon(centerP, m_radius.value(), m_maxPointCount.value(), posCont))
+      ERROR_LOG(m_logger) << LOGFUNCTION << " createCirclePolygon failed";
+    else
+    {
+      m_positions.setPositionsTranslated(posCont);
+      m_mainGraphicalObject->setPositions(this->positionsTranslated());
+    }
+
+    // : origin/radius
+  }
+  else
+  {
+    if (!m_positions.isEmpty())
+      m_mainGraphicalObject->setPositions(this->positionsTranslated());
+  }
+
+  // verify:
+  const int minPoints = this->pathType() == GraphicalObjectPathType::Polyline ? 2 : 3;
+  if (m_mainGraphicalObject->positions().count() < minPoints)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION
+                        << " debugInfo1='" << m_debugInfo << "'"
+                        << " incorrect number of positions"
+                        << " (" << this->positions().count() << ")";
+    return false;
+  }
+
+  // REGG-5261 - Alle Wirkfelder blinken in 3D, wenn C-Kampf ausgelöst ist
+  // War mit 100.4 meist, aber nicht immer reproduzierbar.
+  // Wenn aber per FunctionsDialog die TacticalAppearance sichtbar wurde,
+  // so war ein massives Flackern erkennbar.
+  // Daher wird die Ausdehnung nur an SICHTBARE m_tacticalAppearance übergeben
+  // [basic_path_object, sidc_symbol_impl]
+  if (m_tacticalAppearance && m_tacticalAppearance->visibility())
+  {
+    // m_tacticalOrigin has priority (SingleFire)
+    if (!m_tacticalOrigin.value().origin().toPointF().isNull())  // check if x,y are defined, just z is not sufficiant
+      m_tacticalAppearance->setOrigin(m_tacticalOrigin.value().originTranslated());
+    else
+      m_tacticalAppearance->setPositions(m_mainGraphicalObject->positions());
+  }
+
+
+  // Indication:
+  if (m_indicationCont)
+  {
+    // The drawOrder should be above the m_mainGraphicalObject (==Path)
+    // (case: path is closed and filled -> guarantee that indication is visible.)
+    m_indicationCont->setDrawOrder(m_internalDrawOrder + 1);
+  }
+  if (m_indicationContSpAbsolute)
+  {
+    m_indicationContSpAbsolute->setDrawOrder(m_internalDrawOrder + 1);
+  }
+
+  // Paths:
+  if (m_pathCont_SpDraped)
+  {
+    // The drawOrder should be above the m_mainGraphicalObject (==Path)
+    // (case: path is closed and filled -> guarantee that indication is visible.)
+    m_pathCont_SpDraped->setDrawOrder(m_internalDrawOrder + 1);
+
+    // lineStyle has to be set explicit
+    // m_pathCont->setLineStyle(m_mainGraphicalObject->lineStyle());
+  }
+
+  // Paths:
+  if (m_pathCont_SpDrapedPolygon)
+  {
+    // The drawOrder should be above the m_mainGraphicalObject (==Path)
+    // (case: path is closed and filled -> guarantee that indication is visible.)
+    m_pathCont_SpDrapedPolygon->setDrawOrder(m_internalDrawOrder + 1);
+  }
+
+
+//  if (m_pathCont_SpAbsolute)
+//  {
+//    // DrawOrder for SpAbsolute not really helpful:
+//    // m_pathCont_SpAbsolute->setDrawOrder(m_internalDrawOrder + 1);
+//    // m_pathCont_SpAbsolute->setLineStyle(m_mainGraphicalObject->lineStyle());
+//  }
+
+  if (m_pathCont_SpDraped)
+    if (!m_pathCont_SpDraped->updateView())
+      WARNING_LOG(m_logger) << LOGFUNCTION << " m_pathCont_SpDraped updateView failed";
+  if (m_pathCont_SpDrapedPolygon)
+    if (!m_pathCont_SpDrapedPolygon->updateView())
+      WARNING_LOG(m_logger) << LOGFUNCTION << " m_pathCont_SpDrapedPolygon updateView failed";
+
+  if (m_pathCont_SpAbsolute1)
+    if (!m_pathCont_SpAbsolute1->updateView())
+      WARNING_LOG(m_logger) << LOGFUNCTION << " m_pathCont_SpAbsolute1 updateView failed";
+  if (m_pathCont_SpAbsolute2)
+    if (!m_pathCont_SpAbsolute2->updateView())
+      WARNING_LOG(m_logger) << LOGFUNCTION << " m_pathCont_SpAbsolute2 updateView failed";
+
+
+  // Single Scene Marker
+  // has to be executed in final class
+  // updateSingleSceneMarker();
+  // updateSingleSceneMarker(true);
+
+
+  // Arrowhead:
+  updateArrowHead(m_arrowHeadStart, true);
+  updateArrowHead(m_arrowHeadEnd, false);
+
+  // SegmentText:
+  bool successSegText = updateSegmentText();
+  if (!successSegText)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " successSegText failed";
+
+
+#ifdef SUPPORT_SUBSIDIARY_LINES
+  // subsidiaryPositionsCont :
+  GraphicalObjectMultiPath *multiPath = static_cast<GraphicalObjectMultiPath *>(m_mainGraphicalObject);
+
+  QList<int> pathIdxInUse;
+  int pathIdx = 0;
+  QMutableMapIterator<int, PositionsTranslated> mapIt(m_subsidiaryPositionsCont);
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    PositionsTranslated &posTranslated = mapIt.value();
+    posTranslated.setMapObjectImpl(this);  // let functor work :-)
+
+    // PRE-increment! (pathIdx=0 is the main path in GraphicalObjectMultiPath
+    multiPath->setPath(++pathIdx, posTranslated.positionsTranslated());
+    pathIdxInUse.append(pathIdx);
+
+  } // while
+
+  // remove non-existing subsidiary idx from multiPath:
+  multiPath->reduceTo(pathIdxInUse);
+
+  // : subsidiaryPositionsCont
+#endif // SUPPORT_SUBSIDIARY_LINES
+
+
+  // BaseClass:
+  bool success = BaseClass::updateViewImpl() && successSegText;
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool BasicPathObjectImpl::updateSingleSceneMarker(bool newVisibility)
+{
+  DEBUG_LOG(m_logger) << " START, newVisibility = " << newVisibility
+                      << ", m_debugInfo" << m_debugInfo;
+
+  // do we have a detonationPoint / impactOrigin?
+  if (m_detonationOrigin.value().origin().isNull() && (m_detonationRadius.value() < 1.0))
+  {
+    m_detonationSceneMarker.clear();
+  } else {
+    if (!m_detonationSceneMarker)
+    {
+      m_detonationSceneMarker = QSharedPointer<GraphicalObjectSceneMarker>(new GraphicalObjectSceneMarker(SituationMap::SceneMarkerType::SPHERE,
+                                                                                                          m_mapImpl->getEsriGeoView(),
+                                                                                                          m_graphicsLayer,
+                                                                                                          m_debugInfo + QLatin1String("#DetonationSceneMarker"),
+                                                                                                          m_uniqueMapId));
+    }
+    m_detonationSceneMarker->setOrigin(m_detonationOrigin.value().originTranslated());
+    m_detonationSceneMarker->setDiameter(m_detonationRadius.value()*2.0);
+    m_detonationSceneMarker->setPickable(m_pickable);
+    // path == 0; indicationCont == 1; Marker == 2
+    m_detonationSceneMarker->setDrawOrder(m_internalDrawOrder+2);
+
+    QColor col = fillStyle().fillColor(); //partyColor(); partyColor could be invalid, e.g. in case of NContamination!
+    col.setAlphaF(col.alphaF() / 2.0);
+    m_detonationSceneMarker->setFillStyle(FillStyle(col, FillPattern::Solid));
+
+    m_detonationSceneMarker->setVisibility(newVisibility);
+
+    if (!m_detonationSceneMarker->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " updateView failed for"
+                          << " debugInfo='" << m_detonationSceneMarker->debugInfo() << "'";
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+double viewAngleOfMapCoordinates3D(MapImpl * mapImpl, const Point3D &mapPos0, const Point3D &mapPos1, bool &bOkOut)
+{
+  bOkOut = false;
+
+  if (!mapImpl)
+    return 0.0;
+
+  QPointF p0 = mapImpl->mapCoordinateToViewPortWindowPoint3D(mapPos0);
+  if (p0.isNull())
+    return 0.0;
+  QPointF p1 = mapImpl->mapCoordinateToViewPortWindowPoint3D(mapPos1);
+  if (p1.isNull())
+    return 0.0;
+
+  p0.ry() = p0.ry() * -1;
+  p1.ry() = p1.ry() * -1;
+
+  double angle = MathUtils::getAngleDegreeNorth(p0, p1);
+
+//  qCritical() << " mapPos0 = " << mapPos0 << " -  mapPos1 = " << mapPos1;
+//  qCritical() << " p0 = " << p0 << " -  p1 = " << p1;
+//  qCritical() << " angle = " << angle;
+
+  bOkOut = true;
+  return angle;
+}
+
+bool BasicPathObjectImpl::updateArrowHead(BasicPathObjectImpl::ArrowHead &arrowHead,
+                                          bool start)
+{
+  // pre-condition:
+  if (m_positions.size() < 2)
+    return false;
+
+  if (!m_mainGraphicalObject)
+    return false;
+
+  bool realEnable = arrowHead.enable;
+
+  if (arrowHead.enable &&
+      m_visibility &&
+      m_visibilityTechnical &&
+      (m_mapImpl->mode() == Mode::Mode_3D)
+      )
+  {
+    // 3D -> take distance into account:
+    Point3D pt = m_positions.startPointTranslated();
+    Esri::ArcGISRuntime::Point esriEnd3D(pt.x(), pt.y(), pt.z(), m_mapImpl->getEsriSpatialReference());
+    const Esri::ArcGISRuntime::Point &camPoint = m_mapImpl->getEsriSceneGraphicsView()->currentViewpointCamera().location();
+
+    Esri::ArcGISRuntime::GeodeticDistanceResult distRes = Esri::ArcGISRuntime::GeometryEngine::distanceGeodetic(esriEnd3D,
+                                                                                                                camPoint,
+                                                                                                                Esri::ArcGISRuntime::LinearUnit::meters(),     // 300: unit id -> unit value
+                                                                                                                Esri::ArcGISRuntime::AngularUnit::degrees(),   // 300: unit id -> unit value
+                                                                                                                Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+    realEnable = distRes.distance() < 20000;
+  }
+
+  if (realEnable)
+  {
+    // delay creation if not visible:
+    if (arrowHead.pmArrowHead.isNull() && m_visibility && m_visibilityTechnical)
+    {
+      arrowHead.pmArrowHead = QSharedPointer<GraphicalObjectPictureMarker>
+                              (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                                                , m_graphicsLayer
+                                                                , m_debugInfo + QLatin1String("#ArrowHead")
+                                                                , m_uniqueMapId)
+                              );
+    }
+
+    if (arrowHead.pmArrowHead)
+    {
+
+      // maybe only if partyId changed or scale changed or selectionChanged
+      {
+        // colorChanged -> must be rendered again:
+        const float scale = m_mainGraphicalObject->scale() * m_mainGraphicalObject->lineStyle().lineWidth() * 0.5;
+        int lengthHeight  = m_arrowHeadLengthHeight * scale;
+        int halfWidth     = m_arrowHeadHalfWidth * scale;
+
+        const QImage arrowImg =
+          renderArrowHeadSymbol(m_mainGraphicalObject->lineStyle().lineColor(), lengthHeight, halfWidth);
+        arrowHead.pmArrowHead->setImage(arrowImg);
+        arrowHead.pmArrowHead->setYOffset(lengthHeight / -2.0);
+      }
+
+
+      // take mapRotation into account, if necessary
+      double mapRotation = 0;
+      if (this->m_graphicsLayer->renderingMode() == Esri::ArcGISRuntime::GraphicsRenderingMode::Dynamic)
+        mapRotation = m_mapImpl->rotation();
+
+
+      if (start)
+      {
+        arrowHead.pmArrowHead->setOrigin(m_positions.startPointTranslated());
+        if (m_mapImpl->mode() == Mode::Mode_2D)
+        {
+          arrowHead.pmArrowHead->setRotationAngle(m_positions.angleOfStartSegment() + 180 + mapRotation);
+        } else {
+          // Mode::Mode_3D:
+          const PositionCont &posTranslated = m_positions.positionsTranslated();
+          if (m_mapImpl && posTranslated.size() >= 2)
+          {
+            bool bOkOut = false;
+            double viewAngle = viewAngleOfMapCoordinates3D(m_mapImpl, posTranslated[1], posTranslated[0], bOkOut);
+            if (bOkOut)
+              arrowHead.pmArrowHead->setRotationAngle(viewAngle);
+            else
+              arrowHead.pmArrowHead->setRotationAngle(90);
+          }
+        }
+      }
+      else
+      {
+        switch (pathType())
+        {
+        case GraphicalObjectPathType::Polyline:
+          arrowHead.pmArrowHead->setOrigin(m_positions.endPointTranslated());
+          if (m_mapImpl->mode() == Mode::Mode_2D)
+            arrowHead.pmArrowHead->setRotationAngle(m_positions.angleOfEndSegment() + mapRotation);
+          else {
+            // Mode::Mode_3D:
+            const PositionCont &posTranslated = m_positions.positionsTranslated();
+            const int size = posTranslated.size();
+            if (m_mapImpl && size >= 2)
+            {
+              bool bOkOut = false;
+              double viewAngle = viewAngleOfMapCoordinates3D(m_mapImpl, posTranslated.at(size - 2), posTranslated.at(size - 1), bOkOut);
+              if (bOkOut)
+                arrowHead.pmArrowHead->setRotationAngle(viewAngle);
+              else
+                arrowHead.pmArrowHead->setRotationAngle(-90);
+            }
+          }
+          break;
+        case GraphicalObjectPathType::Polygon:
+          arrowHead.pmArrowHead->setOrigin(m_positions.startPointTranslated());
+          if (m_mapImpl->mode() == Mode::Mode_2D)
+          arrowHead.pmArrowHead->setRotationAngle(m_positions.angleOfClosingSegment() + mapRotation);
+          else {
+            // Mode::Mode_3D:
+            const PositionCont &posTranslated = m_positions.positionsTranslated();
+            const int size = posTranslated.size();
+            if (m_mapImpl && size >= 2)
+            {
+              bool bOkOut = false;
+              double viewAngle = viewAngleOfMapCoordinates3D(m_mapImpl, posTranslated.first(), posTranslated.last(), bOkOut);
+              if (bOkOut)
+                arrowHead.pmArrowHead->setRotationAngle(viewAngle);
+              else
+                arrowHead.pmArrowHead->setRotationAngle(90);
+            }
+          }
+          break;
+        } // switch
+
+      }
+
+      arrowHead.pmArrowHead->setDrawOrder(m_internalDrawOrder + 1);
+      arrowHead.pmArrowHead->setVisibility(m_visibility && m_visibilityTechnical);
+      arrowHead.pmArrowHead->setPickable(m_pickable);
+      arrowHead.pmArrowHead->setSelected(m_selected);
+      arrowHead.pmArrowHead->updateView();
+
+    } // if (arrowHead.pmArrowHead)
+
+  }
+  else
+    arrowHead.pmArrowHead.clear();
+
+  return true;
+}
+
+bool BasicPathObjectImpl::updateSegmentText()
+{
+  // Qt5.4: QMap::lastKey(): "This function assumes that the map is not empty."
+  if (m_textDataCont.isEmpty())
+    return true;
+
+  if (!m_mapImpl)
+    return false;
+
+  bool success = true;
+
+  // Maybe the number of coordinates has been decreased and therefore the number of segments:
+  // They have to be removed to delete the TextData.goText (should be removed from screen.)
+
+  while (!m_textDataCont.isEmpty() && m_textDataCont.lastKey() >= static_cast<uint>(this->segmentCount()))
+  {
+    // see QTBUG-59373
+    const auto key = m_textDataCont.lastKey();
+    m_textDataCont.remove(key);
+  }
+
+  // ok, 'resized' :-)
+  // go on ->
+
+  QMutableMapIterator<uint, TextData> it(m_textDataCont);
+  int i = -1;
+  while (it.hasNext())
+  {
+    ++i;
+
+    // current number of lineSegment exists?
+    if (i >= segmentCount())
+      break;
+
+    it.next();
+    TextData &textData = it.value();
+
+    if (textData.goText.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#Text_seg(%2)").arg(m_debugInfo).arg(i);
+
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " create new Object "
+                          << " " << debugInfo;
+      textData.goText = QSharedPointer<GraphicalObjectText>
+                        (new GraphicalObjectText(m_mapImpl->getEsriGeoView()
+                                                 , m_graphicsLayer
+                                                 , debugInfo
+                                                 , m_uniqueMapId)
+                        );
+    }
+
+    // calculate textOrigin on this segment:
+    const Point3D &mapCoord1 = m_positions.positionsTranslated()[i];
+    const Point3D &mapCoord2 = m_positions.positionsTranslated()[i + 1];
+
+    const Point3D &textOrigin = MathUtils::getPointOnLine(mapCoord1, mapCoord2, 0.5);
+
+    double angle = 0.0;
+
+    if (m_mapImpl->mode() == Mode::Mode_2D)
+    {
+      angle = MathUtils::getAngleDegreeNorth(mapCoord1.toPointF(), mapCoord2.toPointF());
+    } else {
+      // Mode::Mode_3D:
+      const PositionCont &posTranslated = m_positions.positionsTranslated();
+      if (m_mapImpl && posTranslated.size() >= 2)
+      {
+        bool bOkOut = false;
+        angle = viewAngleOfMapCoordinates3D(m_mapImpl, mapCoord1, mapCoord2, bOkOut);
+        if (!bOkOut)
+          angle = 90; // degree, 3 o'clock
+      }
+    }
+
+
+    // take mapRotation into account, if necessary
+    if ((this->m_graphicsLayer->renderingMode() == Esri::ArcGISRuntime::GraphicsRenderingMode::Dynamic) &&
+        (m_mapImpl->mode() == Mode::Mode_2D))
+      angle += m_mapImpl->rotation();
+
+    if (angle > 360.0)
+      angle -= 360;
+    else if (angle < -360.0)
+      angle += 360;
+
+    if ((angle >= 0) && (angle < 180))
+    {
+      // Q1 & Q2
+      angle -= 90;
+    }
+    else
+    {
+      // Q3 & Q4
+      angle += 90;
+    }
+
+    textData.goText->setOrigin(textOrigin);
+    textData.goText->setVisibility(m_visibility && m_visibilityTechnical);
+    textData.goText->setDrawOrder(m_internalDrawOrder + 1);
+    textData.goText->setText(textData.text);
+
+    if (m_mainGraphicalObject)
+    {
+      textData.goText->setScale(m_mainGraphicalObject->scale());
+      textData.goText->setPickable(m_mainGraphicalObject->pickable());
+    }
+
+
+    TextStyle ts = defaultTextStyle();
+    if (m_mainGraphicalObject)
+      ts.setTextColor(m_mainGraphicalObject->lineStyle().lineColor());
+    //    ts.setTextOutlineColor(Qt::white);
+    //    ts.setTextOutlineWidth(2);
+    ts.setHorizontalAlignment(HorizontalAlignment::Center);
+    ts.setVerticalAlignment(VerticalAlignment::Bottom);
+
+    ts.setAngle(angle);
+    //    int outlineWith = 2 * scale();
+    //    if (outlineWith > 4)
+    //      outlineWith = 4;
+    //    ts.setTextOutlineWidth( outlineWith );
+    textData.goText->setTextStyle(ts);
+
+
+
+//    TextStyle ts;
+//    ts.setTextOutlineColor(Qt::white);
+//    ts.setTextOutlineWidth(2);
+//    ts.setHorizontalAlignment(HorizontalAlignment::Center);
+//    ts.setVerticalAlignment(VerticalAlignment::Middle);
+
+//    ts.setAngle(angle);
+//    ts.setSize(ts.size() * scale());
+//    int outlineWith = 2 * scale();
+//    if (outlineWith > 4)
+//      outlineWith = 4;
+//    ts.setTextOutlineWidth( outlineWith );
+//    textData.goText->setTextStyle(ts);
+
+    if (! textData.goText->updateView())
+    {
+      success = false;
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " updateView failed"
+                          << " debugInfo1='" << m_debugInfo << "'"
+                          << " debugInfo2='" << textData.goText->debugInfo() << "'";
+    }
+
+
+  } // while
+
+  return success;
+}
+
+
+
+bool BasicPathObjectImpl::init(MapImpl *mapImpl,
+                               const QString &logicalLayerName,
+                               GraphicalObjectPathType pathType,
+                               double maxSegmentLength)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " logicalLayerName='" << logicalLayerName << "'"
+                      << " pathType=" << pathType;
+
+  // to create adequate preview:
+  m_isClosed = (pathType == GraphicalObjectPathType::Polygon);
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (success)
+  {
+    // create underlying object (to save most attributes only there)
+    if (!m_mainGraphicalObject)
+    {
+      //      m_mainGraphicalObject = new GraphicalObjectMultiPath(pathType,
+      GraphicalObjectPath *goPath = new GraphicalObjectPath(pathType,
+                                                            m_mapImpl->getEsriGeoView(),
+                                                            m_graphicsLayer,
+                                                            m_debugInfo +  QLatin1String("#GOPath"),
+                                                            m_uniqueMapId);
+      goPath->setMaxSegmentLength(maxSegmentLength);
+      m_mainGraphicalObject = goPath;
+    }
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  m_tacticalOrigin.refValue().setMapObjectImpl(this);
+  m_detonationOrigin.refValue().setMapObjectImpl(this);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+double BasicPathObjectImpl::maxSegmentLength() const
+{
+  if (!m_mainGraphicalObject)
+    return -1;
+  GraphicalObjectPath *goPath = dynamic_cast<GraphicalObjectPath*>(m_mainGraphicalObject);
+  if (!goPath)
+    return -1;
+  return goPath->maxSegmentLength();
+}
+
+bool BasicPathObjectImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo=" << debugInfo();
+
+  bool success = BaseClass::onMapExtentChanged();
+
+  bool successIndication = true;
+  if (m_indicationCont)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successIndication = m_indicationCont->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " Indication.updateView took[ms] " << timer.elapsed();
+  }
+  bool successIndicationAbs = true;
+  if (m_indicationContSpAbsolute)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successIndicationAbs = m_indicationContSpAbsolute->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " IndicationSpAbsolute.updateView took[ms] " << timer.elapsed();
+  }
+
+
+
+  bool successPath1 = true;
+  if (m_pathCont_SpDraped)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successPath1 = m_pathCont_SpDraped->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " m_pathCont_SpDraped.updateView took[ms] " << timer.elapsed();
+  }
+
+  bool successPath2 = true;
+  if (m_pathCont_SpDrapedPolygon)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successPath2 = m_pathCont_SpDrapedPolygon->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " m_pathCont_SpDrapedPolygon.updateView took[ms] " << timer.elapsed();
+  }
+
+  bool successPathSpA1 = true;
+  if (m_pathCont_SpAbsolute1)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successPathSpA1 = m_pathCont_SpAbsolute1->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " m_pathCont_SpAbsolute1.updateView took[ms] " << timer.elapsed();
+  }
+  bool successPathSpA2 = true;
+  if (m_pathCont_SpAbsolute2)
+  {
+    QElapsedTimer timer;
+
+    if (m_logger.isDebugEnabled())
+      timer.start();
+
+    successPathSpA2 = m_pathCont_SpAbsolute2->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " debugInfo=" << m_debugInfo
+                        << " m_pathCont_SpAbsolute2.updateView took[ms] " << timer.elapsed();
+  }
+
+  // to honor mapRotation:
+  updateArrowHead(m_arrowHeadStart, true);
+  updateArrowHead(m_arrowHeadEnd, false);
+  updateSegmentText();
+
+  success = success && successIndication && successIndicationAbs && successPath1 && successPath2 && successPathSpA1 && successPathSpA2;
+
+  if (!success)
+    ERROR_LOG(m_logger)
+        << " successIndication=" << successIndication
+        << " successIndicationAbs=" << successIndicationAbs
+        << " successPath1=" << successPath1
+        << " successPath2=" << successPath2
+        << " successPathSpA1=" << successPathSpA1
+        << " successPathSpA2=" << successPathSpA2;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.h
new file mode 100755
index 000000000..3a6d98724
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/basic_path_object_impl.h
@@ -0,0 +1,295 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BasicPathObjectImpl
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "indication_container.h"
+#include "path_container.h"
+#include <MapImpl/abstract_effect_simulation_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+
+
+// Qt
+#include <QString>
+#include <QColor>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+class GraphicalObjectSceneMarker;
+
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+/**
+ * @brief The BasicPathObjectImpl class combines a couple of usefull features required by path objects.
+ *
+ * These features are:
+ * - For convenience an origin and radius can also be parametrized. This will be transformed into a polygon during updateView().
+ * - an arrowHead at the start and/or at the end of that path (both polyline and polygon)
+ *  - m_arrowHeadStart, m_arrowHeadEnd of type ArrowHead / GraphicalObjectPictureMarker / Image
+ *
+ * - text positioned on the line segments
+ *  - m_textDataCont of type TextData / GraphicalObjectText
+ *
+ * - an infinite number of different indication objects for displaying impacts, mines etc.
+ *  - m_indicationCont of type IndicationContainer / GraphicalObjectPictureMarker / Image
+ *  - m_pathCont of type PathContainer (on main Layer)
+ *  - m_pathCont_SpAbsolute of type PathContainer (on subLayer with SurfacePlacementMode::Absolute)
+ */
+class SITUATIONMAPOBJECTS_EXPORT BasicPathObjectImpl : public AbstractMultiPointMapObjectImpl, public AbstractEffectSimulationImpl
+{
+  using BaseClass = AbstractMultiPointMapObjectImpl;
+
+public:
+  /*! \name Construction, Destruction */
+  //@{
+
+  explicit BasicPathObjectImpl(const QString &debugInfo = QString());
+  virtual ~BasicPathObjectImpl();
+
+  BasicPathObjectImpl(const BasicPathObjectImpl &other)     = delete;
+  BasicPathObjectImpl &operator=(BasicPathObjectImpl &other) = delete;
+  //@}
+
+  QString toString() const override;
+
+  virtual Point3D tacticalOrigin() const;
+  virtual void setTacticalOrigin(const Point3D &tacticalOrigin);
+
+  /*! \name Set origin and radius as alternative to 'setPositions' */
+  //@{
+  virtual Point3D origin() const;
+  virtual void setOrigin(const Point3D &origin);
+  virtual float radius() const;
+  virtual void setRadius(float radius, unsigned int maxPointCount = 0);
+  //@}
+
+#ifdef SUPPORT_SUBSIDIARY_LINES
+  /*! \name Subsidiary polyline/polygons */
+  //@{
+  /**
+   * @brief Get positions at pathIndex.
+   * @param pathIndex to be retrieved (if '0' identical to positions();)
+   * @return positions at index
+   */
+  virtual PositionCont subsidiaryPositions(int pathIndex) const;
+
+  /**
+   * @brief Set positions at pathIndex.
+   * @param pathIndex to be set.
+   * @param positions values to be set.
+   */
+  virtual void setSubsidiaryPositions(int pathIndex, const PositionCont &positions);
+
+  virtual QList<int> subsidiaryPathIndexInUse();
+
+
+  /**
+   * @brief Clear positions.
+   * @param pathIndex to be cleared.
+   * @note if not pathIndex is specified, ALL are cleared!)
+   */
+  virtual void clearSubsidiaryPositions(int pathIndex);
+
+  /**
+   * @brief Clear all subsidiaryPositions.
+   */
+  virtual void clearSubsidiaryPositions();
+
+  //@}
+#endif // SUPPORT_SUBSIDIARY_LINES
+
+
+
+  GraphicalObjectPathType pathType() const;
+
+  virtual int segmentCount() const;
+
+  // Delegate to BaseClass:
+  virtual AesEffectState aesState() const override;
+  virtual void setAesState(AesEffectState aesState) override;
+
+
+  /*! \name Indication (for displaying impacts, mines etc.) */
+  //@{
+  virtual IndicationContainer &rIndicationContainer() const;
+  virtual IndicationContainer &rIndicationContainerAbsolute() const;
+  //@}
+
+  /*! \name Path (for displaying paths like trajectories) */
+  //@{
+  virtual PathContainer &rPathContainer() const;
+
+  virtual PathContainer &rPathContainerSpDrapedPolygon() const;
+  virtual void clearPathContainerSpDrapedPolygon(int idx);
+
+  virtual PathContainer &rPathContainerSpAbsolute1() const;
+
+  virtual PathContainer &rPathContainerSpAbsolute2() const;
+  //@}
+
+  /*! \name ArrowHeads */
+  //@{
+
+  //@}
+
+  /*! \name ArrowHeads */
+  //@{
+  virtual bool arrowHeadStart() const;
+  virtual void setArrowHeadStart(bool enable);
+
+  virtual bool arrowHeadEnd() const;
+  virtual void setArrowHeadEnd(bool enable);
+
+  virtual void setArrowHeadsSelected(bool select);
+  //@}
+
+
+  /*! \name Single Detonation */
+  //@{
+  void setDetonation(const Point3D &origin, double radius);
+  bool hasDetonation() const;
+  void resetDetonation();
+  //@}
+
+
+  /*! \name Text on lineSegments */
+  //@{
+  virtual QString textOnSegment(uint segment) const;
+  virtual void setTextOnSegment(uint segment, const QString &segmentText);
+  virtual void clearTextOnSegment(uint segment);
+  //@}
+
+
+  static QImage renderArrowHeadSymbol(const QColor &color, int length, int halfWidth);
+
+protected:
+  bool updateViewImplPost() override
+  {
+    BaseClass::updateViewImplPost();
+    m_tacticalOrigin.reset();
+    m_origin.reset();
+    m_radius.reset();
+    m_maxPointCount.reset();
+
+    // Single Detonation by SingleSceneMarker
+    m_detonationOrigin.reset();
+    m_detonationRadius.reset();
+    return true;
+  }
+
+
+  bool updateViewImpl() override;
+
+  bool updateSingleSceneMarker(bool newVisibility);
+
+
+  friend class MapImpl;
+  virtual bool init(MapImpl *mapImpl,
+                    const QString &logicalLayerName,
+                    GraphicalObjectPathType pathType,
+                    double maxSegmentLength = -1);
+
+  double maxSegmentLength() const;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+  // logical
+  SimpleValue<OriginTranslated>          m_tacticalOrigin; // has priority if set (related to mainGO->positions - SingleFire)
+
+  // origin, radius as alternative to 'setPositions' :
+  SimpleValue<Point3D>                   m_origin;
+  SimpleValue<float>                     m_radius  = 0;
+  SimpleValue<unsigned int>              m_maxPointCount = 0;
+  // : origin, radius as alternative to 'setPositions'
+
+
+  // Indication :
+  mutable IndicationContainer           *m_indicationCont{nullptr};
+  mutable IndicationContainer           *m_indicationContSpAbsolute{nullptr}; // SurfacePlacementMode::Absolute
+  // : Indication
+
+  // Paths :
+  mutable PathContainer                 *m_pathCont_SpDraped{nullptr};
+  mutable PathContainer                 *m_pathCont_SpDrapedPolygon{nullptr}; // SurfacePlacementMode::Draped
+
+  mutable PathContainer                 *m_pathCont_SpAbsolute1{nullptr};     // SurfacePlacementMode::Absolute
+  mutable PathContainer                 *m_pathCont_SpAbsolute2{nullptr};     // SurfacePlacementMode::Absolute
+  // : Paths
+
+  // Single Scene Marker
+  // (arbitrary geometry like detonations of nContamination makes it impossible to use renderer approach)
+  SimpleValue<OriginTranslated>               m_detonationOrigin;
+  SimpleValue<double>                         m_detonationRadius{0.0};
+  QSharedPointer<GraphicalObjectSceneMarker>  m_detonationSceneMarker; // 3D
+  // : Single Scene Marker
+
+
+  // ArrowHeads :
+  struct ArrowHead
+  {
+    bool                                         enable = false;
+    QSharedPointer<GraphicalObjectPictureMarker> pmArrowHead;
+
+  };
+  ArrowHead                               m_arrowHeadStart;
+  ArrowHead                               m_arrowHeadEnd;
+  int                                     m_arrowHeadLengthHeight  = 20;
+  int                                     m_arrowHeadHalfWidth     =  7;
+
+  bool updateArrowHead(ArrowHead &arrowHead, bool start);
+  // : ArrowHeads
+
+  // Text on line segments :
+  struct TextData
+  {
+    QString                              text;
+    QSharedPointer<GraphicalObjectText>  goText;
+  };
+
+  QMap< uint, TextData >                  m_textDataCont;
+
+  bool updateSegmentText();
+
+  // : Text on line segments
+
+
+#ifdef SUPPORT_SUBSIDIARY_LINES
+  QMap<int, PositionsTranslated>          m_subsidiaryPositionsCont;
+#endif // SUPPORT_SUBSIDIARY_LINES
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+// Under special circumstances we have to instanciate BasicPathObjectImpl.
+// Think of subsidiaryliens at VirtualMines.
+// To to so, create 'LocalBasicPathObject'
+
+// to get access to 'init'
+class LocalBasicPathObject final : public BasicPathObjectImpl
+{
+public:
+  using BasicPathObjectImpl::BasicPathObjectImpl;
+  using BasicPathObjectImpl::init;
+  using BasicPathObjectImpl::setUniqueId;
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.cpp
new file mode 100755
index 000000000..2a8a3c37f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.cpp
@@ -0,0 +1,156 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BiologicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "biological_agent_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/party_id_to_color_functor.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class BiologicalAgentImpl
+//-----------------------------------------------------------------------------
+BiologicalAgentImpl::BiologicalAgentImpl(const QString &debugInfo)
+  : BiologicalAgent()              // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("BiologicalAgentImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_lineColorFromParty = false;
+  m_fillColorAlpha = 200;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+BiologicalAgentImpl::~BiologicalAgentImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString BiologicalAgentImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(BasicPathObjectImpl::toString());
+  return str;
+}
+
+
+Point3D BiologicalAgentImpl::origin() const
+{
+  return BaseClass::origin();
+}
+void BiologicalAgentImpl::setOrigin(const Point3D &origin)
+{
+  BaseClass::setOrigin(origin);
+}
+float BiologicalAgentImpl::radius() const
+{
+  return BaseClass::radius();
+}
+
+void BiologicalAgentImpl::setRadius(float radius)
+{
+  BaseClass::setRadius(radius);
+}
+
+
+AesEffectState BiologicalAgentImpl::aesState() const
+{
+  return BaseClass::aesState();
+}
+void BiologicalAgentImpl::setAesState(AesEffectState aesState)
+{
+  BaseClass::setAesState(aesState);
+}
+
+SymbolImage BiologicalAgentImpl::symbolImage() const
+{
+  SymbolImage symImage = m_tacticalAppearance->symbolImage();
+  return symImage;
+}
+
+
+
+bool BiologicalAgentImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " origin =" << this->origin() //.x() << ", " << this->origin().y()
+                      << " radius =" << this->radius()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool BiologicalAgentImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002717000000"); // SymbolSet = 25 271700
+      //                                                                                                    ^^    ^^^^^^
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      //  m_symbol.refValue().m_sidc = QLatin1String("GUMPNB----"); // 0953 GUMPNB---- -> Polygon -> Image WITH Area     // small icon and big border
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFMPNEB---");  // 0081 GFMPNEB--- -> Point   -> Image WITHOUT Area  // not 'centered'
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      //      m_symbol.refValue().m_sidc = QLatin1String("GHCPBWC---");   // APP6B: 3937 GHCPBWC--- -> Polygon
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUCPBWK---");  // APP6B: 2875 GUCPBWK--- -> Point
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+
+  } // if (mapImpl)
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  setLineStyle(LineStyle(Qt::yellow, 2));
+  setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.h
new file mode 100755
index 000000000..e6a34cc52
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/biological_agent_impl.h
@@ -0,0 +1,83 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BiologicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/biological_agent.h> // Interface
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The BiologicalAgentImpl class can be described by an origin and a radius.
+ * \note Maybe this will be changed in future to be consistent to the ChemicalAgent.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath/Polyline, displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT BiologicalAgentImpl : public BasicPathObjectImpl, public virtual BiologicalAgent
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit BiologicalAgentImpl(const QString &debugInfo = QString());
+  virtual ~BiologicalAgentImpl();
+
+public:
+  BiologicalAgentImpl(const BiologicalAgentImpl &other)     = delete;
+  BiologicalAgentImpl &operator=(BiologicalAgentImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  // some set/get methods:
+  Point3D origin() const override;
+  void setOrigin(const Point3D &origin) override;
+  float radius() const override;
+  void setRadius(float radius) override;
+
+
+  // Delegate to BaseClass:
+  AesEffectState aesState() const override;
+  void setAesState(AesEffectState aesState) override;
+
+  SymbolImage symbolImage() const override;
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.cpp
new file mode 100755
index 000000000..bb76b4827
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.cpp
@@ -0,0 +1,269 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BuildingOutline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "building_outline_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <Map/bounding_box.h>
+
+#include "Map/object_factory.h"
+
+#include<Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class BuildingOutlineImpl
+//-----------------------------------------------------------------------------
+BuildingOutlineImpl::BuildingOutlineImpl(const QString &debugInfo)
+  : BuildingOutline()         // Interface
+  , BaseClass(debugInfo)      // Implementation
+  , m_logger(getLogger("BuildingOutlineImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_markerOrigin.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+BuildingOutlineImpl::~BuildingOutlineImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_marker;
+  delete m_modelSceneMarker;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+PositionCont BuildingOutlineImpl::positions() const
+{
+  return BaseClass::positions();
+}
+
+bool BuildingOutlineImpl::setPositions(const PositionCont &posCont)
+{
+  return BaseClass::setPositions(posCont);
+}
+
+QColor BuildingOutlineImpl::majorColor() const
+{
+  if (m_forcedMajorColor.isValid())
+    return m_forcedMajorColor;
+  // use fillColor here:
+  return (m_mainGraphicalObject) ? m_mainGraphicalObject->fillStyle().fillColor() : BaseClass::majorColor();
+}
+
+
+
+LineStyle BuildingOutlineImpl::lineStyle() const
+{
+  return BaseClass::lineStyle();
+}
+LineStyle &BuildingOutlineImpl::rLineStyle()
+{
+  return BaseClass::rLineStyle();
+}
+void BuildingOutlineImpl::setLineStyle(const LineStyle &lineStyle)
+{
+  BaseClass::setLineStyle(lineStyle);
+}
+FillStyle BuildingOutlineImpl::fillStyle() const
+{
+  return BaseClass::fillStyle();
+}
+FillStyle &BuildingOutlineImpl::rFillStyle()
+{
+  return BaseClass::rFillStyle();
+}
+void BuildingOutlineImpl::setFillStyle(const FillStyle &fillStyle)
+{
+  BaseClass::setFillStyle(fillStyle);
+}
+
+void BuildingOutlineImpl::setMarker(const Point3D &markerOrigin)
+{
+  m_markerOrigin.setOrigin(markerOrigin);
+}
+
+BuildingOutline::ModelSceneSymbolData BuildingOutlineImpl::getModelSceneSymbolData()
+{
+  return m_modelSceneSymolData;
+}
+
+void BuildingOutlineImpl::setModelSceneSymbolData(const BuildingOutline::ModelSceneSymbolData &modelSceneSymbolData)
+{
+  m_modelSceneSymolData = modelSceneSymbolData;
+}
+
+bool BuildingOutlineImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << " scale=" << m_mainGraphicalObject->scale()
+                      << " posCont=" << m_positions.positions()
+                      << " url=" << m_modelSceneSymolData.url.toString()
+                      << " scale=" << m_modelSceneSymolData.scale
+                      << " m_heading=" << m_modelSceneSymolData.heading;
+
+  bool success = BaseClass::updateViewImpl();
+  updateViewImplMarker();
+
+  if (m_mapImpl->mode() == Mode::Mode_3D)
+    updateModelSceneSymbol();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool BuildingOutlineImpl::updateViewImplMarker()
+{
+  if (m_markerOrigin.isEmpty())
+  {
+    delete m_marker;
+    m_marker = nullptr;
+  }
+  else
+  {
+    if (!m_marker)
+    {
+      m_marker = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                  m_graphicsLayer,
+                                                  m_debugInfo + QLatin1String("#Marker"),
+                                                  m_uniqueMapId);
+    }
+    const float scale = m_mainGraphicalObject->scale() * m_mainGraphicalObject->lineStyle().lineWidth() * 0.5f;
+
+    m_marker->setMarkerSymbol(MarkerSymbolType::Triangle, qRound(5.0f * scale), m_mainGraphicalObject->rLineStyle().lineColor());
+    m_marker->setPickable(m_mainGraphicalObject->pickable());
+    m_marker->setDrawOrder(m_internalDrawOrder+1);
+    m_marker->setOrigin(m_markerOrigin.originTranslated());
+    m_marker->setVisibility(m_visibility && m_visibilityTechnical);
+
+    if (!m_marker->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
+                          << " updateView failed";
+  }
+
+  return true;
+}
+
+bool BuildingOutlineImpl::updateModelSceneSymbol()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << m_debugInfo << "'"
+                      << " url=" << m_modelSceneSymolData.url.toString()
+                      << " scale=" << m_modelSceneSymolData.scale
+                      << " m_heading=" << m_modelSceneSymolData.heading;
+
+  bool success = false;
+
+  if (m_markerOrigin.isEmpty())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no markerOrigin"
+                        << " debugInfo='" << m_debugInfo << "'";
+    return false;
+  }
+
+  if (m_modelSceneSymolData.url.isEmpty())
+  {
+    delete m_modelSceneMarker;
+    m_modelSceneMarker= nullptr;
+  } else {
+    if (!m_modelSceneMarker)
+      m_modelSceneMarker = new GraphicalObjectModelSceneMarker(m_mapImpl->getEsriGeoView(),
+                                                               m_graphicsLayer,
+                                                               m_debugInfo + QLatin1String("#ModelSceneMarker"),
+                                                               m_uniqueMapId);
+    // Symbol:
+    m_modelSceneMarker->setUrl(m_modelSceneSymolData.url);
+    m_modelSceneMarker->setOrigin(m_markerOrigin.originTranslated());
+    m_modelSceneMarker->setHeading(m_modelSceneSymolData.heading);
+    m_modelSceneMarker->setScale(m_modelSceneSymolData.scale);  // use scale of m_modelSceneSymolData, not of m_mainGraphicalObject
+    m_modelSceneMarker->setVisibility(m_visibility && m_visibilityTechnical);
+    success = m_modelSceneMarker->updateView();
+
+    if (!success)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed"
+                          << " debugInfo='" << m_debugInfo << "'";
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << m_debugInfo << "'";
+  return success;
+}
+
+
+bool BuildingOutlineImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10042500002701000000"); // SymbolSet = 25 270100
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "G*MPOGZ---****X");
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFCPBOGB--"); // APP6B: 3845: GFCPBOGB-- -> Polygon
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::black, 2));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+void BuildingOutlineImpl::updateIdentifierPosition()
+{
+  if (m_positions.isEmpty())
+    return;
+
+  BoundingBox bbox;
+  this->boundingBox(bbox);
+
+  if (!bbox.isValid())
+    return BaseClass::updateIdentifierPosition();
+
+  OriginTranslated objCenterPoint;
+  objCenterPoint.setMapObjectImpl(this);
+  objCenterPoint.setOrigin(bbox.center());
+
+  m_identifierPositionCandidateTranslated = objCenterPoint.originTranslated();
+}
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.h
new file mode 100755
index 000000000..6ce1276fd
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/building_outline_impl.h
@@ -0,0 +1,94 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of BuildingOutline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "basic_path_object_impl.h"
+#include <MapObjects/building_outline.h> // Interface
+#include <GraphicalObjects/graphical_object_model_scene_marker.h>
+
+// Qt
+#include <QString>
+#include <QUrl>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The BuildingOutlineImpl class displays the outline of a building.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT BuildingOutlineImpl : public BasicPathObjectImpl, public virtual BuildingOutline
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit BuildingOutlineImpl(const QString &debugInfo = QString());
+  virtual ~BuildingOutlineImpl();
+
+public:
+  BuildingOutlineImpl(const BuildingOutlineImpl &other)     = delete;
+  BuildingOutlineImpl &operator=(BuildingOutlineImpl &other) = delete;
+
+  PositionCont positions() const override;
+  bool setPositions(const PositionCont &posCont) override;
+
+  QColor majorColor() const override;
+
+  LineStyle lineStyle() const override;
+  LineStyle &rLineStyle() override;
+  void setLineStyle(const LineStyle &lineStyle) override;
+
+  FillStyle fillStyle() const override;
+  FillStyle &rFillStyle() override;
+  void setFillStyle(const FillStyle &fillStyle) override;
+
+  void setMarker(const Point3D &markerOrigin) override;
+
+  ModelSceneSymbolData getModelSceneSymbolData() override;
+  void setModelSceneSymbolData(const ModelSceneSymbolData &modelSceneSymbolData) override;
+
+protected:
+  bool updateViewImpl() override;
+  bool updateViewImplMarker();
+  bool updateModelSceneSymbol();
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+  void updateIdentifierPosition() override;
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  GraphicalObjectPictureMarker    *m_marker{nullptr};
+  OriginTranslated                 m_markerOrigin;
+
+  ModelSceneSymbolData             m_modelSceneSymolData;
+  GraphicalObjectModelSceneMarker *m_modelSceneMarker{nullptr};
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.cpp
new file mode 100755
index 000000000..b46a8c293
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.cpp
@@ -0,0 +1,129 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ChemicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "chemical_agent_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class ChemicalAgentImpl
+//-----------------------------------------------------------------------------
+ChemicalAgentImpl::ChemicalAgentImpl(const QString &debugInfo)
+  : ChemicalAgent()                // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("ChemicalAgentImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_lineColorFromParty = false;
+  m_fillColorAlpha = 200;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+ChemicalAgentImpl::~ChemicalAgentImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+Point3D ChemicalAgentImpl::origin() const
+{
+  return BaseClass::origin();
+}
+void ChemicalAgentImpl::setOrigin(const Point3D &origin)
+{
+  BaseClass::setOrigin(origin);
+}
+float ChemicalAgentImpl::radius() const
+{
+  return BaseClass::radius();
+}
+
+void ChemicalAgentImpl::setRadius(float radius, unsigned int maxPointCount)
+{
+  BaseClass::setRadius(radius, maxPointCount);
+}
+
+
+bool ChemicalAgentImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool ChemicalAgentImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002718000000"); // SymbolSet = 25 271800
+      //                                                                                                    ^^    ^^^^^^
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUMPNC----"); // 0985 GUMPNC---- -> Polygon
+      // m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GFMPNEC---");    // MIL2525D: 0115: GFMPNEC--- "Chemical F"s
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUCPBWH---");  // APP6B: 3943 GUCPBWH--- -> Polygon
+      // m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUCPBWK---"); // APP6B: 2879: GUCPBWK--- -> Point "Chemical Attack, Release Event U"
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::yellow, 2));
+  setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.h
new file mode 100755
index 000000000..535844fa8
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/chemical_agent_impl.h
@@ -0,0 +1,78 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of ChemicalAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/chemical_agent.h> // Interface
+
+
+// Qt
+#include <QString>
+#include <QPointF>
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The ChemicalAgentImpl class can be described by an unlimited number of positions (PositionCont).
+ * For convenience an origin and radius can also be parametrized (inherented from BasicPathObjectImpl)
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ * - an infinite number indication objects for displaying impacts (inherented from BasicPathObjectImpl).
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT ChemicalAgentImpl : public BasicPathObjectImpl, public virtual ChemicalAgent
+{
+  using BaseClass = SituationMap::BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit ChemicalAgentImpl(const QString &debugInfo = QString());
+  virtual ~ChemicalAgentImpl();
+
+public:
+  ChemicalAgentImpl(const ChemicalAgentImpl &other)     = delete;
+  ChemicalAgentImpl &operator=(ChemicalAgentImpl &other) = delete;
+
+  Point3D origin() const override;
+  void setOrigin(const Point3D &origin) override;
+  float radius() const override;
+  void setRadius(float radius, unsigned int maxPointCount = 0) override;
+
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.cpp
new file mode 100755
index 000000000..d3dd02397
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.cpp
@@ -0,0 +1,166 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "cube_impl.h"
+#include <Map/coord_translation_functor.h>
+#include <Map/party_id_to_color_functor.h>
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_cube.h>
+
+
+
+// ESRI
+#include <GraphicsOverlay.h>
+#include <Renderer.h>
+#include <PolygonBuilder.h>
+
+
+// Qt
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class CubeImpl
+//-----------------------------------------------------------------------------
+CubeImpl::CubeImpl(const QString &debugInfo)
+  : Cube()                      // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("CubeImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+CubeImpl::~CubeImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+double CubeImpl::height() const
+{
+  return m_height;
+}
+void CubeImpl::setHeight(double height)
+{
+  m_height = height;
+}
+
+
+bool CubeImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  // pre-condition
+  Esri::ArcGISRuntime::Renderer *curRenderer = nullptr;
+  if (m_graphicsLayer)
+    curRenderer = m_graphicsLayer->renderer();
+  if (!curRenderer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no ArcGISRuntime::Renderer, layername='" << m_logicalLayerName << "'";
+    return false;
+  }
+
+
+  // Destroy if invisible :
+  // 13.09.2018, Norbert Thoden
+  // Regarding ESRI Case #02170796 - [BOS] Crash with Destruction of 3D Scene
+  // To reduce likelihood of crash:
+  // Destroy GraphicalObject (GO, m_mainGraphicalObject) if it becomes invisible
+  // With V100.3.0 the behaviour does not change.
+  // (switching cubes for 180 bldgs on and off)
+  //
+  if (m_visibility)
+  {
+    if (!m_mainGraphicalObject)
+    {
+      m_mainGraphicalObject = new GraphicalObjectCube(m_mapImpl->getEsriGeoView(),
+                                                      m_graphicsLayer,
+                                                      m_debugInfo +  QStringLiteral("#GOCube"),
+                                                      m_uniqueMapId);
+    }
+  } else {
+    delete m_mainGraphicalObject;
+    m_mainGraphicalObject = nullptr;
+    return true;
+  }
+  // : Destroy if invisible
+
+
+  GraphicalObjectCube *goCube = static_cast<GraphicalObjectCube *>(m_mainGraphicalObject);
+  if (goCube)
+  {
+    // in former times: partyName was used
+    // it´s replaced by more flexible ExtrusionColorName:
+    // const QString &partyName = m_mapImpl->partyIdToColorFunctor().partyIdToName(m_party.partyId.value());
+    // goCube->setPartyName(partyName);
+
+    const QColor &partyColor= m_mapImpl->partyIdToColorFunctor().partyIdToColor(m_party.partyId.value());
+    if (m_party.partyId.value() > -2) //Use Default: White or TeamColor
+    {
+      goCube->setExtrusionColorName( partyColor.name() );
+    }
+    else // Use given Color //need to be prepared in layerfactory!
+    {
+      goCube->setExtrusionColorName( majorColor().name() );
+    }
+
+    goCube->setPositions(m_positions.positionsTranslated());
+    goCube->setHeight(m_height);
+  }
+  else
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+
+  bool success = BaseClass::updateViewImpl();
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool CubeImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  // create underlying object (to save most attributes only there)
+  if (!m_mainGraphicalObject)
+  {
+    m_mainGraphicalObject = new GraphicalObjectCube(m_mapImpl->getEsriGeoView(),
+                                                    m_graphicsLayer,
+                                                    m_debugInfo +  QStringLiteral("#GOCube"),
+                                                    m_uniqueMapId);
+    //this MapObject is not very typical, therefore set some attributes:
+    this->setPickable(false);
+    this->setScaleEnable(false);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return success;
+}
+
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.h
new file mode 100755
index 000000000..e2d1b4c51
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/cube_impl.h
@@ -0,0 +1,76 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/cube.h> // Interface
+
+
+// ESRI
+#include <Graphic.h>
+
+
+// Qt
+#include <QString>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The CubeImpl class a cube if the UniqueValueRenderer is set.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance, the cube)
+ * - mainGraphicalObjectText  not used
+ * - tacticalAppearance       not used
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT CubeImpl : public AbstractMultiPointMapObjectImpl, public virtual Cube
+{
+  using BaseClass = AbstractMultiPointMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit CubeImpl(const QString &debugInfo = QString());
+  virtual ~CubeImpl();
+
+public:
+  CubeImpl(const CubeImpl &other)     = delete;
+  CubeImpl &operator=(CubeImpl &other) = delete;
+
+  double height() const override;
+  void setHeight(double height) override;
+
+
+protected:
+  bool updateViewImpl() override;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+
+  // logical
+
+
+private:
+  double   m_height;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.cpp
new file mode 100755
index 000000000..cf0d6042f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.cpp
@@ -0,0 +1,105 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "danger_area_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class DangerAreaImpl
+//-----------------------------------------------------------------------------
+DangerAreaImpl::DangerAreaImpl(const QString &debugInfo)
+  : DangerArea()                // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("DangerAreaImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+DangerAreaImpl::~DangerAreaImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool DangerAreaImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool DangerAreaImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500001511000000"); // SymbolSet = 25 151100
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUMPNC----"); // Image WITH Area    // small icon and big border
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUCPMGASM-"); // APP6B: 3556: GUCPMGASM- -> Polygon
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUCPBWC---"); // APP6B: 3939: GUCPBWC---- -> Polygon
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::yellow, 2));
+  setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.h
new file mode 100755
index 000000000..12d7a7c76
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/danger_area_impl.h
@@ -0,0 +1,68 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/danger_area.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The DangerAreaImpl class displays an area of undefined danger.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT DangerAreaImpl : public BasicPathObjectImpl, public virtual DangerArea
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit DangerAreaImpl(const QString &debugInfo = QString());
+  virtual ~DangerAreaImpl();
+
+public:
+  DangerAreaImpl(const DangerAreaImpl &other)     = delete;
+  DangerAreaImpl &operator=(DangerAreaImpl &other) = delete;
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.cpp
new file mode 100755
index 000000000..e96844ff7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.cpp
@@ -0,0 +1,179 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of FunctionalArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "functional_area_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <MapObjectsImpl/participant_impl.h>
+
+
+// ESRI
+
+
+// Qt
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class FunctionalAreaImpl
+//-----------------------------------------------------------------------------
+FunctionalAreaImpl::FunctionalAreaImpl(const QString &debugInfo)
+  : FunctionalArea()            // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("FunctionalAreaImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_pointSymbolData.origin.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+FunctionalAreaImpl::~FunctionalAreaImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_pointSymbol;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void FunctionalAreaImpl::reRenderSymbol()
+{
+  BaseClass::reRenderSymbol();
+  if (m_pointSymbol)
+    m_pointSymbol->reRenderSymbol();
+}
+
+Point3D FunctionalAreaImpl::pointSymbolOrigin() const
+{
+  return m_pointSymbolData.origin.origin();
+}
+void FunctionalAreaImpl::setPointSymbolOrigin(const Point3D &pointSymbolOrigin)
+{
+  m_pointSymbolData.origin.setOrigin(pointSymbolOrigin);
+}
+
+const QString &FunctionalAreaImpl::pointSymbolSidc() const
+{
+  return m_pointSymbolData.symbolData.sidc;
+}
+void FunctionalAreaImpl::setPointSymbolSidc(const QString &pointSymbolOriginSidc)
+{
+  m_pointSymbolData.symbolData.sidc = pointSymbolOriginSidc;
+}
+
+
+bool FunctionalAreaImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  if (!updateViewImplPointSymbolData())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImplPointSymbolData failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool FunctionalAreaImpl::updateViewImplPointSymbolData()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // sidc empty?
+  if (m_pointSymbolData.symbolData.sidc.isEmpty())
+  {
+    delete m_pointSymbol;
+    m_pointSymbol = nullptr;
+    return true;
+  }
+
+  // ok, sidc available:
+  if (!m_pointSymbol)
+  {
+    m_pointSymbol = new ParticipantImpl(m_debugInfo + QStringLiteral("#PntSymblTactApp"));
+    m_pointSymbol->init(m_mapImpl, m_logicalLayerName);  // use same layer as mainGraphicalObj/TECHN. Appearance
+    m_pointSymbol->setUniqueId(m_uniqueMapId);
+  }
+
+  if (m_party.partyId.changed())
+    m_pointSymbol->setPartyIdChanged(m_party.partyId.value());
+
+
+  // The drawOrder should be above the m_mainGraphicalObject (==Path)
+  m_pointSymbol->setDrawOrder(this->drawOrder() + 1); // since m_pointSymbol is a participant, use drawOrder instead of m_internalDrawOrder
+
+  AbstractMapObjectImpl *amoImp = static_cast<AbstractMapObjectImpl*>(m_pointSymbol);
+  amoImp->setVisibility((m_mainGraphicalObject) ? m_mainGraphicalObject->visibility() : false);
+
+  m_pointSymbol->setOrigin(m_pointSymbolData.origin.origin());
+
+  m_pointSymbol->setPartyId(this->partyId());
+
+//  m_pointSymbolData.symbolData.color = this->partyColor();
+
+//  return m_mapImpl->partyIdToColorFunctor().partyIdToRole(m_party.partyId.value(), identityAssumed);
+
+//  AdvancedSymbology::Role role = this->partyRole();
+//  SymbolData symbolData = m_pointSymbolData.symbolData;
+//  symbolData = m_pointSymbolData.symbolData;
+
+  m_pointSymbol->setSymbol(m_pointSymbolData.symbolData);
+
+  m_pointSymbol->setScale(this->scale());
+
+  // add m_userSymbolOpacity???
+
+  bool success = m_pointSymbol->updateView();
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, m_debugInfo =" << m_debugInfo;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool FunctionalAreaImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+//  if (mapImpl)
+//  {
+//    switch (mapImpl->symbologyType()) {
+//    case AdvancedSymbology::SymbologyType::MIL2525C:
+//      m_symbol.refValue().sidc = QLatin1String("GUMPNC----"); // Image WITH Area    // small icon and big border
+//      break;
+//    case AdvancedSymbology::SymbologyType::APP6B:
+//      m_symbol.refValue().sidc = QLatin1String("GUCPMGASM-"); // APP6B: 3556: GUCPMGASM- -> Polygon
+//      break;
+//    } // switch
+//  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::black, 2));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.h
new file mode 100755
index 000000000..74424ea53
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/functional_area_impl.h
@@ -0,0 +1,97 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of FunctionalArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/functional_area.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class ParticipantImpl;
+
+
+/**
+ * @brief The FunctionalAreaImpl class displays an functional area (e.g. medical area).
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT FunctionalAreaImpl : public BasicPathObjectImpl, public virtual FunctionalArea
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit FunctionalAreaImpl(const QString &debugInfo = QString());
+  virtual ~FunctionalAreaImpl();
+
+public:
+  FunctionalAreaImpl(const FunctionalAreaImpl &other)     = delete;
+  FunctionalAreaImpl &operator=(FunctionalAreaImpl &other) = delete;
+
+  void reRenderSymbol() override;
+
+  /*! \name Point symbol */
+  //@{
+  Point3D pointSymbolOrigin() const override;
+  void setPointSymbolOrigin(const Point3D &pointSymbolOrigin) override;
+
+  const QString &pointSymbolSidc() const override;
+  void setPointSymbolSidc(const QString &pointSymbolOriginSidc) override;
+  //@}
+
+
+protected:
+  bool updateViewImpl() override;
+
+  bool updateViewImplPointSymbolData();
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+
+  // logical
+  struct PointSymbolData
+  {
+    OriginTranslated  origin;
+    SymbolData        symbolData;
+  };
+
+  PointSymbolData     m_pointSymbolData;
+  ParticipantImpl     *m_pointSymbol = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.cpp
new file mode 100755
index 000000000..88ffbf696
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.cpp
@@ -0,0 +1,371 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of GeoImage
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "geo_image_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_path.h>
+
+
+// ESRI
+
+
+// Qt
+#include <QWidget>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+
+
+namespace SituationMap
+{
+
+
+class GeoImageImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+
+  // Own data:
+  SimpleValue<GeoImageData>                    m_geoImageData;
+  QSharedPointer<GraphicalObjectPictureMarker> m_gopmPin;
+
+
+}; // class GeoImageImpl::Private
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// class GeoImageImpl
+//-----------------------------------------------------------------------------
+GeoImageImpl::GeoImageImpl(const QString &debugInfo)
+  : GeoImage()              // Interface
+  , BaseClass(debugInfo)    // Implementation
+  , d(new Private)
+  , m_logger(getLogger("GeoImageImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+GeoImageImpl::~GeoImageImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString GeoImageImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(d->m_geoImageData.value().toString());
+  return str;
+}
+
+GeoImage::GeoImageData GeoImageImpl::geoImageData() const            { return d->m_geoImageData.value(); }
+void GeoImageImpl::setGeoImageData(const GeoImageData &geoImageData) { d->m_geoImageData = geoImageData; }
+
+MarkerSymbolType GeoImageImpl::proxyMarker() const                   { return d->m_geoImageData.value().proxyMarker;       }
+
+void GeoImageImpl::setProxyMarker(const MarkerSymbolType &proxyMarker)
+{
+  if (d->m_geoImageData.value().proxyMarker != proxyMarker)
+    d->m_geoImageData.refValue().proxyMarker = proxyMarker;
+}
+
+int GeoImageImpl::proxyMarkerSize() const                            { return d->m_geoImageData.value().proxyMarkerSize;   }
+void GeoImageImpl::setProxyMarkerSize(int proxyMarkerSize)
+{
+  if (d->m_geoImageData.value().proxyMarkerSize != proxyMarkerSize)
+    d->m_geoImageData.refValue().proxyMarkerSize = proxyMarkerSize;
+}
+
+QColor GeoImageImpl::proxyMarkerColor() const                        { return d->m_geoImageData.value().proxyMarkerColor;  }
+void GeoImageImpl::setProxyMarkerColor(const QColor &proxyMarkerColor)
+{
+  if (d->m_geoImageData.value().proxyMarkerColor != proxyMarkerColor)
+    d->m_geoImageData.refValue().proxyMarkerColor = proxyMarkerColor;
+}
+
+
+QImage GeoImageImpl::proxyImage() const                              { return d->m_geoImageData.value().proxyImage;        }
+void GeoImageImpl::setProxyImage(const QImage &proxyImage, const QSize &proxyImageDefaultSize)
+{
+  if (d->m_geoImageData.value().proxyImage != proxyImage)
+    d->m_geoImageData.refValue().proxyImage = proxyImage;
+
+  if (d->m_geoImageData.value().proxyImageDefaultSize != proxyImageDefaultSize)
+    d->m_geoImageData.refValue().proxyImageDefaultSize = proxyImageDefaultSize;
+}
+QSize GeoImageImpl::proxyImageDefaultSize() const                    { return d->m_geoImageData.value().proxyImageDefaultSize; }
+
+
+QImage GeoImageImpl::mainImage() const                               { return d->m_geoImageData.value().mainImage;         }
+
+void GeoImageImpl::setMainImage(const QImage &mainImage)
+{
+  if (d->m_geoImageData.value().mainImage != mainImage)
+    d->m_geoImageData.refValue().mainImage = mainImage;
+}
+
+QImage GeoImageImpl::previewImageTypical() const
+{
+  if (!d->m_geoImageData.value().proxyImage.isNull())
+    return d->m_geoImageData.value().proxyImage;
+  if (!d->m_geoImageData.value().mainImage.isNull())
+    return d->m_geoImageData.value().mainImage;
+  return QImage();
+}
+
+QString GeoImageImpl::description() const                            { return d->m_geoImageData.value().description;       }
+
+void GeoImageImpl::setDescription(const QString &description)
+{
+  if (d->m_geoImageData.value().description != description)
+    d->m_geoImageData.refValue().description = description;
+}
+
+void GeoImageImpl::setPinEnabled(bool enablePin)
+{
+  if (d->m_geoImageData.value().pinEnabled != enablePin)
+    d->m_geoImageData.refValue().pinEnabled = enablePin;
+}
+bool GeoImageImpl::isPinEnabled() const                              { return d->m_geoImageData.value().pinEnabled;        }
+
+
+QWidget *GeoImageImpl::createWidget(QWidget *parent) const
+{
+  const GeoImageData &geoImageData = d->m_geoImageData.value();
+
+  if (geoImageData.mainImage.isNull())
+    return nullptr;
+
+  QWidget *widget = new QWidget(parent);
+  widget->setLayout(new QVBoxLayout());
+
+  QLabel *img = new QLabel();
+  img->setPixmap(QPixmap::fromImage(geoImageData.mainImage));
+  widget->layout()->addWidget(img);
+
+  widget->layout()->addWidget(new QLabel(geoImageData.description));
+
+
+  // CloseButton
+  QPushButton *pbClose = new QPushButton(QLatin1String("Close"));
+  widget->layout()->addWidget(pbClose);
+
+  pbClose->connect(pbClose, &QPushButton::clicked, widget, [widget]()
+  {
+    widget->deleteLater();
+  });
+
+  return widget;
+}
+
+
+bool GeoImageImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " origin =" << this->origin() //.x() << ", " << this->origin().y()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no graphicsLayer";
+    return false;
+  }
+
+  if (!m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+  // Marker:
+  GraphicalObjectPictureMarker *pMarker = static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+
+  if (d->m_geoImageData.changed())
+  {
+    const GeoImageData &geoImageData = d->m_geoImageData.value();
+
+    if (geoImageData.proxyImage.isNull())
+    {
+      if (geoImageData.proxyMarker == MarkerSymbolType::Undefined)
+        pMarker->setMarkerSymbol(MarkerSymbolType::Diamond, 20, Qt::red);
+      else
+        pMarker->setMarkerSymbol(geoImageData.proxyMarker,
+                                 geoImageData.proxyMarkerSize,
+                                 geoImageData.proxyMarkerColor);
+    }
+    else
+      pMarker->setImage(geoImageData.proxyImage, geoImageData.proxyImageDefaultSize);
+
+    // Pin
+    if (m_mapImpl->mode() == Mode::Mode_3D)
+    {
+      if (geoImageData.pinEnabled)
+        createPin();
+      else
+        resetPin();
+    }
+  }
+
+  updateIdentifierPosition();
+
+  pMarker->setOrigin(this->originTranslated());
+
+
+  bool success = BaseClass::updateViewImpl();
+
+  // reset changed:
+  d->m_geoImageData.reset();
+
+  onMapExtentChanged();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool GeoImageImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (success)
+  {
+    // create underlying object (to save most attributes only there)
+    if (!m_mainGraphicalObject)
+      m_mainGraphicalObject = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                               m_graphicsLayer,
+                                                               m_debugInfo + QLatin1String("#Image"),
+                                                               m_uniqueMapId);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool GeoImageImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << " onMapExtentChanged";
+
+  if (m_graphicalObjectPin && m_mainGraphicalObject) // m_graphicalObjectPin exists only at Mode_3D
+  {
+    if (!d->m_gopmPin)
+    {
+      d->m_gopmPin = QSharedPointer<GraphicalObjectPictureMarker>
+                     (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                                       , m_graphicsLayer
+                                                       , m_debugInfo + QStringLiteral("#PictureMarkerPin")
+                                                       , m_uniqueMapId)
+                      );
+
+      GraphicalObjectPictureMarker *pMarker = static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+      if (pMarker)
+      {
+        const GeoImageData &geoImageData = d->m_geoImageData.value();
+        d->m_gopmPin->setImage(pMarker->image(), geoImageData.proxyImageDefaultSize);
+      }
+    }
+
+    d->m_gopmPin->setScale(m_mainGraphicalObject->scale());
+
+    Point3D originTranslated = this->originTranslated();
+    DEBUG_LOG(m_logger) << " XXX originTranslatedORG = " << originTranslated;
+
+    // GUEZE-2620 3D Sicht SOS Symbole
+    // Bisher wurde die Höhe des SOS-Images und -Textes quasi getuned, wobei ja nun
+    // unter bestimmten Umständen leider zu einem Höhenwert ausserhalb des
+    // Sichtfensters kam.
+    // Daher:
+    //  - Pflicht: SOS-Symbol und Text auf den Boden
+    //  - Kuer: Zudem versucht die SW, eine zweite Instanz des Images
+    //    (inkl. Verbindungslinie) zu positionieren.
+    //     Und zwar grob mittig zw. Erdoberfläche und oberen Kante des Sichtbereichs.
+    // Leider funktioniert des dafür genutzte ESRI-Befehl nicht immer zuverlässig.
+    // Meist dann, wenn sich der Augenpunkt (ViewPoint) dicht am Objekt befinden...
+    // Noch ein bisschen Tuning, aber es verbleiben leider Fehlersituationen.
+
+    if (m_mapImpl->scale() > 1500)
+    {
+      const double zVal = m_mapImpl->scale() * m_mapImpl->scale() * 0.0001;
+      DEBUG_LOG(m_logger) << " zVal = " << zVal;
+
+      originTranslated.rz() = zVal;
+
+      // 1 ... 10000 (qBound ~ std::clamp)
+      originTranslated.rz() = qBound(1.0, originTranslated.rz(), 10000.0);
+
+      // check viewPort:
+      // Note: unfortunately its dows not work perfect :-(
+      int cnt = 0;
+      static int s_counterMax = 10;
+      while (m_mapImpl->mapCoordinateToViewPortWindowPoint3D(originTranslated).isNull() && (originTranslated.rz() > 1) && (cnt <= s_counterMax))
+      {
+        originTranslated.rz() /= 2.0;
+        ++cnt;
+      }
+
+      if (cnt == s_counterMax)
+        originTranslated.rz() = 0;
+       else
+        originTranslated.rz() *= 0.5; // try to show in the middle between baseSurface and upper edge of window
+
+      d->m_gopmPin->setVisibility(true);
+
+    } else {
+      // GUEZE-3460 - SOS Meldungen werden nicht korrekt angezeigt
+      if (m_mapImpl->scale() <  500)
+        originTranslated.rz() =  1.0; // meter
+      else if (m_mapImpl->scale() < 1000)
+        originTranslated.rz() =  2.5; // meter
+      else
+        originTranslated.rz() = 10.0; // meter
+
+      d->m_gopmPin->setVisibility(true);
+    }
+
+    DEBUG_LOG(m_logger) << " originTranslated = " << originTranslated;
+
+    d->m_gopmPin->setOrigin(originTranslated);
+    if (!d->m_gopmPin->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed" << m_mainGraphicalObject->debugInfo();
+
+    // update m_identifierPositionCandidateTranslated ,
+    // it will be transfered to m_mainGraphicalObject via BaseClass::onMapExtentChanged()
+    //    m_identifierPositionCandidateTranslated = originTranslated;
+
+    Point3D centerEarth = originTranslated;
+    centerEarth.rz() = -100; // hopefully lower than lowest level of training area
+    m_graphicalObjectPin->setPositions({originTranslated, centerEarth});
+
+    m_graphicalObjectPin->setVisibility(d->m_gopmPin->visibility());
+
+    if (!m_graphicalObjectPin->updateView())
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateView failed" << m_graphicalObjectPin->debugInfo();
+
+  } // if (m_graphicalObjectPin && m_mainGraphicalObject)
+
+  return BaseClass::onMapExtentChanged();
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.h
new file mode 100755
index 000000000..082cd59d1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/geo_image_impl.h
@@ -0,0 +1,101 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of GeoImage
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_single_point_map_object_impl.h"
+#include <MapObjects/geo_image.h> // Interface
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT GeoImageImpl : public AbstractSinglePointMapObjectImpl, public virtual GeoImage
+{
+  using BaseClass = AbstractSinglePointMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit GeoImageImpl(const QString &debugInfo = QString());
+  virtual ~GeoImageImpl();
+
+public:
+
+  GeoImageImpl(const GeoImageImpl &other)     = delete;
+  GeoImageImpl &operator=(GeoImageImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  GeoImageData geoImageData() const override;
+  void setGeoImageData(const GeoImageData &geoImageData) override;
+
+
+  MarkerSymbolType proxyMarker() const override;
+  void setProxyMarker(const MarkerSymbolType &proxyMarker) override;
+
+  int proxyMarkerSize() const override;
+  void setProxyMarkerSize(int proxyMarkerSize) override;
+
+  QColor proxyMarkerColor() const override;
+  void setProxyMarkerColor(const QColor &proxyMarkerColor) override;
+
+  QImage proxyImage() const override;
+  QSize proxyImageDefaultSize() const override;
+
+  void setProxyImage(const QImage &proxyImage, const QSize &proxyImageDefaultSize) override;
+
+
+  QImage mainImage() const override;
+  void setMainImage(const QImage &mainImage) override;
+
+  QImage previewImageTypical() const override;
+
+
+  QString description() const override;
+  void setDescription(const QString &description) override;
+
+  void setPinEnabled(bool enablePin) override;
+  bool isPinEnabled() const override;
+
+  QWidget *createWidget(QWidget *parent = nullptr) const override;
+
+
+protected:
+  virtual bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+  // logical
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.cpp
new file mode 100755
index 000000000..e067047a5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.cpp
@@ -0,0 +1,177 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of HitLine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "hit_line_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+#include <cassert>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class HitLineImpl
+//-----------------------------------------------------------------------------
+HitLineImpl::HitLineImpl(const QString &debugInfo)
+  : HitLine()                   // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("HitLineImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo=" << m_debugInfo;
+
+  setArrowHeadStart(true);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo=" << m_debugInfo;
+}
+
+HitLineImpl::~HitLineImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, debugInfo=" << m_debugInfo;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, debugInfo=" << m_debugInfo;
+}
+
+QString HitLineImpl::identifier() const
+{
+  return this->textOnSegment(0);
+}
+void HitLineImpl::setIdentifier(const QString &identifier)
+{
+  this->setTextOnSegment(0, identifier);
+}
+
+Point3D HitLineImpl::startPoint() const
+{
+  // !!! see setStartAndEndPoint() !!!
+
+  const PositionCont &pos = m_positions.positions();
+  if (pos.size() < 2)
+    return Point3D();
+  else
+    return pos[1];            // !!! see setStartAndEndPoint() !!!
+}
+Point3D HitLineImpl::endPoint() const
+{
+  // !!! see setStartAndEndPoint() !!!
+
+  const PositionCont &pos = m_positions.positions();
+  if (pos.size() < 2)
+    return Point3D();
+  else
+    return pos[0];            // !!! see setStartAndEndPoint() !!!
+}
+
+
+void HitLineImpl::setStartAndEndPoint(const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " start=" << start
+                      << " end=" << end
+                      << ", debugInfo=" << m_debugInfo;
+
+  // According MIL2525 a line (like attack) starts with an arrow.
+  // But in this context (HitLine)
+  //    start == shooter -> no arrowHead
+  //    end == target    -> with arrowHead
+
+  // Therefore we have to add the 'end'/target point first:
+  m_positions.setPositions(PositionCont() << end << start);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool HitLineImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << ", debugInfo=" << m_debugInfo;
+
+
+  setArrowHeadsSelected(m_selected);
+
+  bool success = BaseClass::updateViewImpl();
+
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool HitLineImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10032500001406030000"); // SymbolSet = 25 140602
+      //                                                                                                     ^^    ^^^^^^
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFGPOLKGS-"); // 1047 - Direction Of Attack Ground Supporting Attack F
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GHGPOLKA--"); //
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GHGPOLKGM-"); //
+
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFCPMOLDS-"); // APP6B-3733 GFCPMOLDS- -> Direction Of Attack Ground Supporting Attack F
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  double maxSegmentLength = -1; // -> GeometryEngine::densifyGeodetic
+  if (mapImpl && (mapImpl->mode() == Mode::Mode_3D))
+    maxSegmentLength = 10; // -> GeometryEngine::densifyGeodetic
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline, maxSegmentLength);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  m_mainGraphicalObject->rLineStyle().setLinePattern(LinePattern::Dash);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+bool HitLineImpl::setPositions(const PositionCont &)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " DO NOT CALL!!!";
+  assert(false);
+  return false;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.h
new file mode 100755
index 000000000..2883adac6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/hit_line_impl.h
@@ -0,0 +1,82 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of HitLine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/hit_line.h> // Interface
+
+
+// Qt
+#include <QString>
+#include <QPointF>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The HitLineImpl class displays shot from a startpoint to an endpoint.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name/identifier)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT HitLineImpl : public BasicPathObjectImpl, public virtual HitLine
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit HitLineImpl(const QString &debugInfo = QString());
+  virtual ~HitLineImpl();
+
+public:
+  HitLineImpl(const HitLineImpl &other)     = delete;
+  HitLineImpl &operator=(HitLineImpl &other) = delete;
+
+  QString identifier() const override;
+  void setIdentifier(const QString &identifier) override;
+
+  Point3D startPoint() const override;
+  Point3D endPoint() const override;
+
+  void setStartAndEndPoint(const Point3D &start, const Point3D &end) override;
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+private:
+  bool setPositions(const PositionCont &) override; //SHOULD NEVER BE CALLED
+
+private:
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.cpp
new file mode 100755
index 000000000..b48492442
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.cpp
@@ -0,0 +1,575 @@
+/**
+  * @RDE_HEADER@
+  * IndicationContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "indication_container.h"
+#include <MapImpl/coordinate_translation.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <MapImpl/coordinate_translation_thread.h>
+
+
+// ESRI
+#include <GeoView.h>
+#include <PictureMarkerSymbol.h>
+
+// Qt
+#include <QElapsedTimer>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class IndicationData
+//-----------------------------------------------------------------------------
+class IndicationData
+{
+public:
+  const QImage &image() const          { return m_image;}
+  void setImage(const QImage &image)   { if (m_image != image) m_changed = true; m_image = image; }
+
+  MarkerSymbolType markerSymbolType() const                           { return m_markerSymbolType;  }
+  void setMarkerSymbolType(const MarkerSymbolType &markerSymbolType)  { if (m_markerSymbolType != markerSymbolType) m_changed = true;  m_markerSymbolType = markerSymbolType; }
+
+  const QColor &markerColor() const              { return m_markerColor; }
+  void setMarkerColor(const QColor &markerColor) { if (m_markerColor != markerColor) m_changed = true; m_markerColor = markerColor; }
+
+  int markerSize() const             { return m_markerSize; }
+  void setMarkerSize(int markerSize) { if (m_markerSize != markerSize) m_changed = true; m_markerSize = markerSize; }
+
+  bool markerSelected() const                 { return m_markerSelected; }
+  void setMarkerSelected(bool markerSelected) { if (m_markerSelected != markerSelected) m_changed = true;  m_markerSelected = markerSelected; }
+
+  bool markerPickable() const                 { return m_markerPickable; }
+  void setMarkerPickable(bool markerPickable) { if (m_markerPickable != markerPickable) m_changed = true; m_markerPickable = markerPickable; }
+
+  PositionsTranslated &positionsTrans()                 { return m_positions; }
+  void setPositions(const PositionCont &positions)      { if (m_positions.positions() != positions) m_changed = true; m_positions.setPositions(positions); }
+
+  bool markerVisible() const { return m_markerVisible; }
+  void setMarkerVisible(bool markerVisible) { if (m_markerVisible != markerVisible) m_changed = true; m_markerVisible = markerVisible; }
+
+
+
+  bool changed() const  { return m_changed;  }
+  void resetChanged()   { m_changed = false; }
+
+  IndicationData()
+  {}
+
+  ~IndicationData()
+  {
+    m_pictureMarker.clear();
+  }
+
+public:
+  QSharedPointer<CoordTranslationThread>                   m_coordTranslationThread;
+  QSharedPointer<GraphicalObjectPictureMarker>             m_pictureMarker;
+
+private:
+  QImage                          m_image;
+
+  PositionsTranslated             m_positions;
+  MarkerSymbolType                m_markerSymbolType        = MarkerSymbolType::Undefined;
+  int                             m_markerSize              = 20;
+  QColor                          m_markerColor             = Qt::black;
+  bool                            m_markerVisible           = true;
+  bool                            m_markerSelected          = false;
+  bool                            m_markerPickable          = true;
+  bool                            m_changed                 = true;
+};
+
+
+class IndicationContainer::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::GeoView         *m_geoView        = nullptr;
+  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer  = nullptr;
+
+
+  // Own data:
+  CoordTranslationFunctor        *m_coordTransFunctor    = nullptr;
+  QString                         m_debugInfo;           // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId;
+
+  SimpleValue<int>                m_drawOrder            = 0;
+
+private:
+  // TODO: use sorted vector - only max. 10 elements in there, so qhash/qmap is overkill
+  QHash<int, QSharedPointer<IndicationData>> m_map;
+
+public:
+  QSharedPointer<IndicationData> getIndicationData(int key)
+  {
+    auto it = m_map.find(key);
+    if (it != m_map.end())
+      return it.value();
+    auto ret = QSharedPointer<IndicationData>(new IndicationData());
+    m_map[key] = ret;
+    return ret;
+  }
+
+  void remove(int key) // attention, will remove the provides image/marker...
+  {
+    auto it = m_map.find(key);
+    if (it == m_map.end())
+      return;
+    const QSharedPointer<IndicationData> &indicationData = it.value();
+    if (indicationData && indicationData->m_coordTranslationThread)
+      indicationData->m_coordTranslationThread->wait();
+    m_map.erase(it);
+  }
+  void clear()            { m_map.clear();       }
+  int size() const        { return m_map.size(); }
+  QList<int> keys() const { return m_map.keys(); }
+  bool contains(int key) const { return m_map.contains(key); }
+  const QHash<int, QSharedPointer<IndicationData>> &container() const { return m_map; }
+
+}; // class IndicationContainer::Private
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+// class IndicationContainer
+//-----------------------------------------------------------------------------
+IndicationContainer::IndicationContainer(const Esri::ArcGISRuntime::GeoView   *geoView,
+                                         Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                                         CoordTranslationFunctor              *coordTransFunctor,
+                                         const UniqueMapId                    &uniqueMapId)
+  : QObject()
+  , m_logger(getLogger("IndicationContainer"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_geoView            = const_cast<Esri::ArcGISRuntime::GeoView *>(geoView);
+  d->m_graphicsLayer      = graphicsLayer;
+  d->m_coordTransFunctor  = coordTransFunctor;
+  d->m_uniqueMapId        = uniqueMapId;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+IndicationContainer::~IndicationContainer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // Thread::wait():
+  for (const QSharedPointer<IndicationData> &id : d->container())
+  {
+    if (id && id->m_coordTranslationThread)
+    {
+      id->m_coordTranslationThread->quit();
+      id->m_coordTranslationThread->wait();
+    }
+  } // for
+
+
+  d->clear();
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString IndicationContainer::debugInfo() const
+{
+  return d->m_debugInfo;
+}
+void IndicationContainer::setDebugInfo(const QString &debugInfo)
+{
+  d->m_debugInfo = debugInfo;
+}
+
+
+PositionCont IndicationContainer::positions(int idx) const
+{
+  return d->getIndicationData(idx)->positionsTrans().positions();
+}
+void IndicationContainer::setPositions(int idx, const PositionCont &positions)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", debugInfo='" << d->m_debugInfo << "'"
+                      << ", m_uniqueMapId = " << d->m_uniqueMapId
+                      << ", idx=" << idx
+                      << ", positions.size=" << positions.size();
+
+  d->getIndicationData(idx)->setPositions(positions);
+
+ // //    d->remove(idx);     // attention: remove will implicit rmove the provided image...
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void IndicationContainer::setMarker(int idx, MarkerSymbolType mst, int size, const QColor &color)
+{
+  d->getIndicationData(idx)->setMarkerSymbolType(mst);
+  d->getIndicationData(idx)->setMarkerSize(size);
+  d->getIndicationData(idx)->setMarkerColor(color);
+}
+
+void IndicationContainer::setMarker(int idx, int size)
+{
+  d->getIndicationData(idx)->setMarkerSize(size);
+}
+
+void IndicationContainer::setMarker(int idx, const QColor &color)
+{
+  d->getIndicationData(idx)->setMarkerColor(color);
+}
+
+
+const QImage &IndicationContainer::image(int idx) const
+{
+  return d->getIndicationData(idx)->image();
+}
+void IndicationContainer::setImage(int idx, const QImage &image)
+{
+  auto id = d->getIndicationData(idx);
+
+  if (id->image() == image)
+    return;
+  id->setImage(image);
+}
+
+void IndicationContainer::clear(int idx)
+{
+  d->remove(idx);
+}
+
+void IndicationContainer::clearAll()
+{
+  d->clear();
+}
+
+int IndicationContainer::drawOrder() const
+{
+  return d->m_drawOrder.value();
+}
+void IndicationContainer::setDrawOrder(int drawOrder)
+{
+  d->m_drawOrder = drawOrder;
+}
+
+bool IndicationContainer::visible(int idx) const
+{
+  return d->getIndicationData(idx)->markerVisible();
+}
+void IndicationContainer::setVisible(int idx, bool visible)
+{
+  d->getIndicationData(idx)->setMarkerVisible(visible);
+}
+
+bool IndicationContainer::selected(int idx) const
+{
+  return d->getIndicationData(idx)->markerSelected();
+}
+void IndicationContainer::setSelected(int idx, bool selected)
+{
+  d->getIndicationData(idx)->setMarkerSelected(selected);
+}
+
+bool IndicationContainer::pickable(int idx) const
+{
+  return d->getIndicationData(idx)->markerPickable();
+}
+
+void IndicationContainer::setPickable(int idx, bool pickable)
+{
+  d->getIndicationData(idx)->setMarkerPickable(pickable);
+}
+
+
+
+int IndicationContainer::getIndicationCount() const
+{
+  return d->size();
+}
+
+QList<int> IndicationContainer::getIndicationIndexList() const
+{
+  return d->keys();
+}
+
+
+bool IndicationContainer::updateView()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", debugInfo='" << d->m_debugInfo << "'"
+                      << ", m_uniqueMapId = " << d->m_uniqueMapId
+                      << " , d->m_map.size()=" << d->size();
+  bool success = true;
+
+
+//  int outterSize = d->m_map.size();
+
+  for (auto it = d->container().begin(); it != d->container().end(); ++it)
+  {
+    const QSharedPointer<IndicationData> &indicationData = it.value();
+    // per single dimension:
+
+    // nothing changed?
+    if ((!indicationData->changed()) && (!d->m_drawOrder.changed()))
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " no change -> continue... "
+                          << ", debugInfo='" << d->m_debugInfo << "'";
+      continue;
+    }
+
+    // set
+    indicationData->positionsTrans().setCoordTransFunctor(d->m_coordTransFunctor);
+
+    int idx = it.key();
+
+#define SYNC
+#ifdef SYNC
+    bool updated = updateIndicationContainer(idx);
+    success = success && updated;
+
+#else
+
+    // skip thread and do call sync if:
+    if (indicationData->positionsTrans().isTranslated()
+        || ! indicationData->markerVisible()
+       )
+    {
+      // call sync:
+      updateIndicationContainer(idx); // update of invisible marker is cheap :-)
+    }
+    else
+    {
+
+      // ok, thread is requested:
+
+      // another thread prepared/running or finished/deleted?
+      if (indicationData->m_coordTranslationThread.isNull())
+      {
+        // move time consuming work to worker thread:
+        // apply Deleter to SharedPointer (to avoid simple 'delete')
+        indicationData->m_coordTranslationThread =
+          QSharedPointer<CoordTranslationThread> (new CoordTranslationThread(d->m_debugInfo), &QObject::deleteLater);
+
+        indicationData->m_coordTranslationThread->setUserData(idx);
+        indicationData->m_coordTranslationThread->setPositions(& (indicationData->positionsTrans()));
+
+        // QObject::connect(indicationData.m_coordTranslationThread.data(), &CoordTranslationThread::finished, indicationData.m_coordTranslationThread.data(), &QObject::deleteLater);
+        QObject::connect(indicationData->m_coordTranslationThread.data(), &CoordTranslationThread::finished,    this, &IndicationContainer::onThreadFinished);
+        QObject::connect(indicationData->m_coordTranslationThread.data(), &CoordTranslationThread::resultReady, this, &IndicationContainer::onResultReady);
+
+        qWarning() << " start workerThread, idx=" << idx;
+        indicationData->m_coordTranslationThread->start();
+
+      }
+      else
+      {
+        FATAL_LOG(m_logger) << LOGFUNCTION
+                            << " new Translation via Thread requested, but still exists...";
+      }
+
+    }
+#endif // SYNC
+
+    indicationData->resetChanged();
+
+  } // while
+  d->m_drawOrder.reset();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " success=" << success;
+  return success;
+}
+
+bool IndicationContainer::onResultReady(const QVariant &userData)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << "threadId: " << QThread::currentThreadId();
+
+  bool success = false;
+
+  bool bOk = false;
+  int idx = userData.toInt(&bOk);
+  if (bOk)
+  {
+    if (d->contains(idx))
+    {
+      QSharedPointer<IndicationData> indicationData = d->getIndicationData(idx);
+      if (! indicationData->positionsTrans().isTranslated())
+      {
+        ERROR_LOG(m_logger) << LOGFUNCTION << " NOT TRANSLATED, should not happen!!!"
+                            << " debugInfo='" << d->m_debugInfo << "'"
+                            << " idx=" << idx;
+      }
+    }
+
+    success = updateIndicationContainer(idx);
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " QVariant toInt failed!!!";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " success = " << success;
+  return success;
+}
+
+void IndicationContainer::onThreadFinished(const QVariant &userData)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << d->m_debugInfo << "'";
+  bool bOk = false;
+  int idx = userData.toInt(&bOk);
+  if (bOk)
+  {
+    if (d->contains(idx))
+      d->getIndicationData(idx)->m_coordTranslationThread.clear();  // will call the Deleter which is 'deleteLater'
+  }
+  else
+    qWarning() << "resultReady: QVariant toInt failed!!!";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'";
+}
+
+
+bool IndicationContainer::updateIndicationContainer(int idx)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " idx=" << idx;
+
+  QElapsedTimer timer;
+
+  if (m_logger.isInfoEnabled())
+    timer.start();
+
+  if (! d->contains(idx))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " idx does not exist: idx=" << idx;
+    return false;
+  }
+
+  bool successPM = true;
+  QSharedPointer<IndicationData> indicationData = d->getIndicationData(idx);
+
+  // do we have positions or is PositionCont empty?
+  const PositionsTranslated &posTransRef = indicationData->positionsTrans();
+  int numberOfPositions = posTransRef.size();
+  if (posTransRef.isEmpty())
+  {
+    QSharedPointer<GraphicalObjectPictureMarker> &picMarker = indicationData->m_pictureMarker;
+    picMarker.clear();
+  }
+  else
+  {
+    successPM = updateIndicationContainerPictureMarker(idx);
+  }
+
+  bool success = successPM;
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " END"
+                     << " debugInfo='" << d->m_debugInfo << "'"
+                     << " success=" << success
+                     << " successPM=" << successPM
+                     << " numberOfPositions = " << numberOfPositions
+                     << " took[ms] " << timer.elapsed();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " numberOfPositions = " << numberOfPositions
+                      << " successPM=" << successPM
+                      << " success=" << success;
+  return success;
+}
+
+bool IndicationContainer::updateIndicationContainerPictureMarker(int idx)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " idx=" << idx;
+  QElapsedTimer timer;
+
+  if (m_logger.isInfoEnabled())
+    timer.start();
+
+  bool success = true;
+  int numberOfPositions = -1;
+
+  QSharedPointer<IndicationData> indicationData = d->getIndicationData(idx);
+
+  QSharedPointer<GraphicalObjectPictureMarker> &picMarker = indicationData->m_pictureMarker;
+
+  const MarkerSymbolType &mst = indicationData->markerSymbolType();
+  const bool bPicMarkerNeeded = (mst != MarkerSymbolType::Undefined) || !indicationData->image().isNull();
+
+  if (bPicMarkerNeeded)
+  {
+    if (picMarker.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#Indication_idx(%2)_PM").arg(d->m_debugInfo).arg(idx);
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " create new Object: " << debugInfo;
+      picMarker = QSharedPointer<GraphicalObjectPictureMarker>
+          (new GraphicalObjectPictureMarker(d->m_geoView,
+                                            d->m_graphicsLayer,
+                                            debugInfo,
+                                            d->m_uniqueMapId));
+    }
+
+    // set parameter:
+
+    // [GUEZE-496] RPL Nr 770: 3D Lagedarstellung Einfrieren der SW Appl.
+    // GraphicalObjectPictureMarker supports multipoint geometry now
+
+    // do we have an mst or image?
+    if (mst != MarkerSymbolType::Undefined)
+    {
+      // Marker:
+      picMarker->setMarkerSymbol(mst,
+                                 indicationData->markerSize(),
+                                 indicationData->markerColor());
+    }
+    else
+    {
+      // Image:
+      picMarker->setImage(indicationData->image());
+    }
+
+    bool visible = indicationData->markerVisible();
+    picMarker->setDrawOrder(d->m_drawOrder.value());
+    picMarker->setVisibility(visible);
+    picMarker->setSelected(indicationData->markerSelected());
+    picMarker->setPickable(indicationData->markerPickable());
+
+    // Geometry/Positions
+    const PositionCont &positionsTrans = indicationData->positionsTrans().positionsTranslated();
+    picMarker->setPositions(positionsTrans);
+    numberOfPositions = positionsTrans.size();
+
+    success = picMarker->updateView();
+  } else {
+    picMarker.clear();
+  }
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " END"
+                     << " debugInfo='" << d->m_debugInfo << "'"
+                     << " success=" << success
+                     << " numberOfPositions = " << numberOfPositions
+                     << " took[ms] " << timer.elapsed();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " numberOfPositions = " << numberOfPositions
+                      << " success=" << success;
+  return success;
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.h
new file mode 100755
index 000000000..56b19e82e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/indication_container.h
@@ -0,0 +1,115 @@
+/**
+  * @RDE_HEADER@
+  * IndicationContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include <Common/situation_map_logging.h>
+
+
+// Qt
+#include <QImage>
+#include <QMap>
+#include <QVariant>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class GeoView;
+class GraphicsOverlay;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// Forward:
+class CoordTranslationFunctor;
+class IndicationData;
+
+
+class IndicationContainer : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit IndicationContainer(const Esri::ArcGISRuntime::GeoView   *geoView,
+                               Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                               CoordTranslationFunctor              *coordTransFunctor,
+                               const UniqueMapId                    &uniqueMapId);
+  virtual ~IndicationContainer();
+
+  IndicationContainer(const IndicationContainer &other)     = delete;
+  IndicationContainer &operator=(IndicationContainer &other) = delete;
+
+  QString debugInfo() const;
+  void setDebugInfo(const QString &debugInfo);
+
+  // Marker :
+
+  virtual PositionCont positions(int idx) const;
+  virtual void setPositions(int idx, const PositionCont &positions);
+
+  virtual void setMarker(int idx, MarkerSymbolType mst, int size, const QColor &color);
+  virtual void setMarker(int idx, int size);
+  virtual void setMarker(int idx, const QColor &color);
+
+  virtual const QImage &image(int idx) const;
+  virtual void setImage(int idx, const QImage &image);
+
+  virtual void clear(int idx);
+  virtual void clearAll();
+
+  virtual int drawOrder() const;
+  virtual void setDrawOrder(int drawOrder);
+
+  virtual bool visible(int idx) const;
+  virtual void setVisible(int idx, bool visible);
+
+  virtual bool selected(int idx) const;
+  virtual void setSelected(int idx, bool selected);
+
+  virtual bool pickable(int idx) const;
+  virtual void setPickable(int idx, bool pickable);
+
+
+  virtual int getIndicationCount() const;
+  virtual QList<int> getIndicationIndexList() const;
+
+
+  virtual bool updateView();
+  virtual bool updateIndicationContainer(int idx);
+  virtual bool updateIndicationContainerPictureMarker(int idx);
+//  virtual bool updateIndicationContainerSceneMarker(int idx);
+
+public slots:
+  virtual void onThreadFinished(const QVariant &userData);
+  virtual bool onResultReady(const QVariant &userData);
+
+
+private:
+  LOGGER_T                        m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.cpp
new file mode 100755
index 000000000..2536710d1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.cpp
@@ -0,0 +1,205 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of HitLine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "line_of_sight_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+#include <cassert>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class LineOfSightImpl
+//-----------------------------------------------------------------------------
+LineOfSightImpl::LineOfSightImpl(const QString &debugInfo)
+  : LineOfSight()           // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("LineOfSightImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_extensionLineCoordinate.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+LineOfSightImpl::~LineOfSightImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_extensionLine;
+  m_extensionLine = nullptr;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString LineOfSightImpl::identifier() const
+{
+  return this->textOnSegment(0);
+}
+void LineOfSightImpl::setIdentifier(const QString &identifier)
+{
+  this->setTextOnSegment(0, identifier);
+}
+
+void LineOfSightImpl::setPoints(const Point3D &observer,
+                                const Point3D &obstacle,
+                                const Point3D &target,
+                                const QColor &visibleColor,         // green,
+                                const QColor &obstructedColor)      // red
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " observer=" << observer
+                      << " obstacle=" << obstacle
+                      << " target=" << target
+                      << " visibleColor=" << visibleColor
+                      << " obstructedColor=" << obstructedColor;
+
+  // some checks
+  if (observer.isNull() || target.isNull())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " start of end is null";
+    return;
+  }
+
+  if (obstacle.isNull())
+  {
+    // no obstacle -> just a single (green) line:
+    m_positions.setPositions(PositionCont() << observer << target);
+    m_extensionLineCoordinate.clear();
+  }
+  else
+  {
+    // obstacle -> first (green) line:
+    m_positions.setPositions(PositionCont() << observer << obstacle);
+    m_extensionLineCoordinate.setOrigin(target);
+  }
+
+  // handle color:
+  if (visibleColor.isValid())
+  {
+    LineStyle ls = this->lineStyle();
+    ls.setLineColor(visibleColor);
+    this->setLineStyle(ls);
+  }
+
+  if (obstructedColor.isValid())
+    m_extensionLineColor = obstructedColor;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool LineOfSightImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << " m_positions=" << m_positions.positions()
+                      << " m_additionalCoordinate=" << m_extensionLineCoordinate.origin();
+
+  //
+  //
+  // maybe the line(s) are densified @ GraphicalObjectPath::updateViewImpl()
+  // to use more vertices (for 3D) !?
+  //
+  //
+
+
+  bool success = BaseClass::updateViewImpl();
+
+  updateExtensionLine();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+void LineOfSightImpl::updateExtensionLine()
+{
+  if (!m_extensionLineCoordinate.isEmpty())
+  {
+    if (!m_extensionLine)
+    {
+      QString debugInfo = QStringLiteral("%1#ExtensionLine").arg(m_debugInfo);
+      m_extensionLine = new GraphicalObjectPath(GraphicalObjectPathType::Polyline,
+                                                m_mapImpl->getEsriGeoView(),
+                                                m_graphicsLayer,
+                                                debugInfo,
+                                                m_uniqueMapId);
+    }
+
+    m_extensionLine->setVisibility(m_visibility && m_visibilityTechnical);
+    m_extensionLine->setScale(m_mainGraphicalObject->scale());
+    m_extensionLine->setDrawOrder(m_mainGraphicalObject->drawOrder());
+
+    LineStyle ls = m_mainGraphicalObject->lineStyle();
+    ls.setLineColor(m_extensionLineColor);
+    m_extensionLine->setLineStyle(ls);
+
+    // positions:
+    PositionsTranslated tempPosTrans;
+    tempPosTrans.setPositionsTranslated(PositionCont() <<
+                                        m_extensionLineCoordinate.originTranslated()  // obstaclePosition
+                                        << m_positions.positionsTranslated()[1]);     // end/targetPosition
+
+    m_extensionLine->setPositions(tempPosTrans.positionsTranslated());
+
+    m_extensionLine->updateView();
+
+  }
+  else
+  {
+    // no m_extensionLineCoordinate -> remove extensionLine
+    delete m_extensionLine;
+    m_extensionLine = nullptr;
+  }
+}
+
+bool LineOfSightImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  // default: green, 3px
+  LineStyle ls = this->lineStyle();
+  ls.setLineColor(Qt::green);
+  ls.setLineWidth(3);
+  this->setLineStyle(ls);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+bool LineOfSightImpl::setPositions(const PositionCont &)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " DO NOT CALL!!!";
+  assert(false);
+  return false;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.h
new file mode 100755
index 000000000..879f97fd9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/line_of_sight_impl.h
@@ -0,0 +1,82 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of HitLine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/line_of_sight.h> // Interface
+#include <GraphicalObjects/graphical_object_path.h>
+
+// Qt
+#include <QString>
+#include <QPointF>
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The LineOfSightImpl class supports a "single" line with two colors.
+ * The method setPositions() should never be called.
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name/identifier)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT LineOfSightImpl : public BasicPathObjectImpl, public virtual LineOfSight
+{
+  using BaseClass = SituationMap::BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit LineOfSightImpl(const QString &debugInfo = QString());
+  virtual ~LineOfSightImpl();
+
+public:
+  QString identifier() const override;
+  void setIdentifier(const QString &identifier) override;
+
+  void setPoints(const Point3D &observer,
+                 const Point3D &obstacle,
+                 const Point3D &target,
+                 const QColor &visibleColor = Qt::green,
+                 const QColor &obstructedColor = Qt::red) override;
+
+protected:
+  bool updateViewImpl() override;
+  void updateExtensionLine();
+
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+  OriginTranslated      m_extensionLineCoordinate;
+  GraphicalObjectPath  *m_extensionLine = nullptr;
+  QColor m_extensionLineColor = Qt::red;
+
+  // logical
+
+private:
+  bool setPositions(const PositionCont &) override; //SHOULD NEVER BE CALLED
+
+private:
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.cpp
new file mode 100755
index 000000000..82c10a9cd
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.cpp
@@ -0,0 +1,111 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "map_object_attributes_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_attributes.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class MapObjectAttributesImpl
+//-----------------------------------------------------------------------------
+MapObjectAttributesImpl::MapObjectAttributesImpl(const QString &debugInfo)
+  : MapObjectAttributes()       // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("MapObjectAttributesImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MapObjectAttributesImpl::~MapObjectAttributesImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QVariantMap MapObjectAttributesImpl::attributes() const
+{
+  if (!m_mainGraphicalObject)
+    return {};
+  GraphicalObjectAttributes *goa = static_cast<GraphicalObjectAttributes *>(m_mainGraphicalObject);
+  if (!goa)
+    return {};
+  return goa->attributes();
+}
+
+void MapObjectAttributesImpl::setAttributes(const QVariantMap &attributes)
+{
+  if (!m_mainGraphicalObject)
+    return;
+
+  GraphicalObjectAttributes *goa = static_cast<GraphicalObjectAttributes *>(m_mainGraphicalObject);
+  if (!goa)
+    return;
+  goa->setAttributes(attributes);
+}
+
+bool MapObjectAttributesImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  m_mainGraphicalObject->setOrigin(this->originTranslated());
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool MapObjectAttributesImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  if (success)
+  {
+    // create underlying object (to save most attributes only there)
+    if (!m_mainGraphicalObject)
+      m_mainGraphicalObject = new GraphicalObjectAttributes(m_mapImpl,
+                                                            m_graphicsLayer,
+                                                            m_debugInfo + QLatin1String("#GOAttributes"),
+                                                            m_uniqueMapId);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.h
new file mode 100755
index 000000000..c64326112
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_attributes_impl.h
@@ -0,0 +1,65 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of DangerArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "situation_map_objects_export.h"
+#include "abstract_single_point_map_object_impl.h"
+#include <MapImpl/map_impl.h>
+#include <MapObjects/map_object_attributes.h> // Interface
+
+
+// Qt
+#include <QString>
+#include <QVariantMap>
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT MapObjectAttributesImpl : public AbstractSinglePointMapObjectImpl, public virtual MapObjectAttributes
+{
+  using BaseClass = AbstractSinglePointMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit MapObjectAttributesImpl(const QString &debugInfo = QString());
+  virtual ~MapObjectAttributesImpl();
+
+public:
+  MapObjectAttributesImpl(const MapObjectAttributesImpl &other)      = delete;
+  MapObjectAttributesImpl &operator=(MapObjectAttributesImpl &other) = delete;
+
+  QVariantMap attributes() const override;
+  void setAttributes(const QVariantMap &attributes) override;
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.cpp
new file mode 100755
index 000000000..b45f9a6b2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.cpp
@@ -0,0 +1,289 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of MapObjectIndicator
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "map_object_indicator_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/object_factory.h>
+#include <Map/bounding_box.h>
+#include "abstract_single_point_map_object_impl.h"
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+
+// ESRI
+
+
+// Qt
+
+#include <cassert>
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class MapObjectIndicatorImpl
+//-----------------------------------------------------------------------------
+MapObjectIndicatorImpl::MapObjectIndicatorImpl(const QString &debugInfo)
+  : MapObjectIndicator()        // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("MapObjectIndicatorImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  setPickable(false);
+
+  setArrowHeadStart(true);
+
+  m_arrowHeadLengthHeight = 25;        // size of arrow
+  m_arrowHeadHalfWidth    = 7;         // size of arrow
+
+  m_pictureMarkerSize     = 10;        // size of filled circle at the origin (indicating the center of the map)
+  m_lineWidth             = 2;         // lineWidth of (dahed) line from origin to target
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MapObjectIndicatorImpl::~MapObjectIndicatorImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // disconnect lambda!!! Otherwise it will be called with a dangling 'this'pointer.
+  QObject::disconnect(m_extentChangedConnection);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+Point3D MapObjectIndicatorImpl::startPoint() const
+{
+  // !!! see setStartAndEndPoint() !!!
+
+  const PositionCont &pos = m_positions.positions();
+  if (pos.size() < 2)
+    return Point3D();
+  else
+    return pos[1];            // !!! see setStartAndEndPoint() !!!
+}
+Point3D MapObjectIndicatorImpl::endPoint() const
+{
+  // !!! see setStartAndEndPoint() !!!
+
+  const PositionCont &pos = m_positions.positions();
+  if (pos.size() < 2)
+    return Point3D();
+  else
+    return pos[0];            // !!! see setStartAndEndPoint() !!!
+}
+
+
+void MapObjectIndicatorImpl::setStartAndEndPoint(const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " start=" << start
+                      << " end=" << end;
+
+  // According MIL2525 a line (like attack) starts with an arrow.
+  // But in this context (HitLine)
+  //    start == shooter -> no arrowHead
+  //    end == target    -> with arrowHead
+
+  // Therefore we have to add the 'end'/target point first:
+  m_positions.setPositions(PositionCont() << end << start);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+UniqueMapId MapObjectIndicatorImpl::mapObjectToPointTo()
+{
+  return m_uniqueIdToPointTo;
+}
+
+void MapObjectIndicatorImpl::setMapObjectToPointTo(UniqueMapId uniqueId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueId=" << uniqueId;
+
+  m_uniqueIdToPointTo = uniqueId;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueId=" << uniqueId;
+}
+
+
+bool MapObjectIndicatorImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  // create PictureMarker here, to have m_uniqueMapId already set ( compared to init() )
+  if (m_pictureMarker.isNull())
+  {
+    QString debugInfo = QStringLiteral("%1#CenterMarker").arg(m_debugInfo);
+    m_pictureMarker =  QSharedPointer<GraphicalObjectPictureMarker>
+                       (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                                         , m_graphicsLayer
+                                                         , debugInfo
+                                                         , m_uniqueMapId));
+  }
+
+
+  setArrowHeadsSelected(m_selected);
+
+
+  // real work:
+
+  //
+  // point to desired obj now:
+  //
+  RefPointer<AbstractMapObject> objToPointTo;
+  if (SituationMap::isUniqueMapIdValid(m_uniqueIdToPointTo))
+    objToPointTo = m_mapImpl->objectFactory().get(m_uniqueIdToPointTo);
+  else
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_uniqueIdToPointTo invalid: " << m_uniqueIdToPointTo;
+
+  // retrive values from objToPointTo:
+  PositionCont line;
+  QColor       color;
+
+  if (objToPointTo.valid())
+  {
+    const QString &objToPointToDebugInfo = objToPointTo->debugInfo();
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " objToPointTo is valid, uniqueIdToPointTo=" << m_uniqueIdToPointTo
+                        << " (objToPointToDebugInfo=" << objToPointToDebugInfo << ")";
+    // 1
+    AbstractMapObjectImpl *impl = dynamic_cast<AbstractMapObjectImpl *>(objToPointTo.get());
+    if (impl)
+    {
+      color = impl->majorColor();
+//      color.setAlpha(255);  // no transperency
+      this->setDrawOrder(std::max(this->drawOrder(), impl->drawOrder()));
+    }
+    else
+    {
+      ERROR_LOG(m_logger) << LOGFUNCTION
+                          << " dynamic_cast failed, uniqueIdToPointTo=" << m_uniqueIdToPointTo
+                          << " (objToPointToDebugInfo=" << objToPointToDebugInfo << ")";
+    }
+
+    // get target position:
+    BoundingBox bbox;
+    objToPointTo->boundingBox(bbox);
+    if (!bbox.isValid())
+      WARNING_LOG(m_logger) << LOGFUNCTION << " boundingBox not valid: bbox=" << bbox;
+    line.append(bbox.center());
+
+    const QPointF &curCenterPoint = m_mapImpl->centerPoint();
+    const Point3D curCenterPoint3D(curCenterPoint.x(), curCenterPoint.y(), .0);
+    line.append(curCenterPoint3D);
+
+
+    // Color:
+    LineStyle ls = this->lineStyle();
+    ls.setLineColor(color);
+    this->setLineStyle(ls);
+
+  }
+  else     // if (objToPointTo.valid())
+  {
+    WARNING_LOG(m_logger) << LOGFUNCTION << " objToPointTo not found";
+
+    const QPointF &curCenterPoint = m_mapImpl->centerPoint();
+    const Point3D curCenterPoint3D(curCenterPoint.x(), curCenterPoint.y(), .0);
+    line << curCenterPoint3D << curCenterPoint3D;      // use curCenterPoint twice (to show a very 'short line');
+    color = Qt::magenta;
+  }
+
+  //
+  // transfer values:
+  //
+  if (line.size() == 2)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " setStartAndEndPoint, uniqueIdToPointTo=" << m_uniqueIdToPointTo
+                        << " line=" << line;
+    m_positions.setPositions(line);
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " size insufficiant, " << " objToPointTo is valid, uniqueIdToPointTo=" << m_uniqueIdToPointTo;
+
+  // update marker values:
+  const PositionCont &positionsTranslated = m_positions.positionsTranslated();
+  if (positionsTranslated.size() >= 2)
+    m_pictureMarker->setOrigin(m_positions.positionsTranslated()[1]);
+  color.setAlpha(255);
+  m_pictureMarker->setMarkerSymbol(MarkerSymbolType::Circle, m_pictureMarkerSize, color);
+
+  bool successBaseClass = BaseClass::updateViewImpl();
+  if (!successBaseClass)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  m_pictureMarker->setSelected(m_selected);
+  m_pictureMarker->setVisibility((m_mainGraphicalObject) ? m_mainGraphicalObject->visibility() : false);
+
+  bool successPictureMarker = m_pictureMarker->updateView();
+  if (!successPictureMarker)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_pictureMarker->updateViewImpl failed";
+
+
+  bool success = successPictureMarker && successBaseClass;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool MapObjectIndicatorImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  this->setVisibility(ObjectAppearance::Tactical, false);
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+    return false;
+  }
+
+  if (!m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << "no m_mainGraphicalObject";
+    return false;
+  }
+
+  m_mainGraphicalObject->rLineStyle().setLinePattern(LinePattern::Dash);
+  m_mainGraphicalObject->rLineStyle().setLineWidth(m_lineWidth);
+
+  // connect to extentChanged...
+  // ! Must be disconnected in dtor !
+  m_extentChangedConnection = QObject::connect(m_mapImpl, &MapImpl::extentChangedDelayed, m_mapImpl, [this]()
+  //                                                                                         ^^^^ to avoid CLazy warning
+  {
+    this->updateView();
+  });
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+bool MapObjectIndicatorImpl::setPositions(const PositionCont &)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " DO NOT CALL!!!";
+  assert(false);
+  return false;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.h
new file mode 100755
index 000000000..b14f83498
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/map_object_indicator_impl.h
@@ -0,0 +1,101 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of MapObjectIndicator
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/map_object_indicator.h> // Interface
+
+
+// Qt
+#include <QString>
+#include <QColor>
+#include <QPointF>
+#include <QSharedPointer>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward
+class GraphicalObjectPictureMarker;
+
+
+/**
+ * @brief The MapObjectIndicatorImpl can be used to ease the locating of an object.
+ * The MapObjectIndicatorImpl can by parametrized with just the UniqueMapId to point to.
+ * updateView() will do the rest for you:
+ * - retrieve the object to point to,
+ * - get the bounding box of that object and
+ * - create an indicator from the current center of the map to the object.
+ * \note <b> If the object to point to disappears, you are responsible for removing the MapObjectIndicatorImpl! </b>
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the line with arrowhead)
+ * - m_pictureMarker of type GraphicalObjectPictureMarker / Image to show circle at the center of the map.
+ * - mainGraphicalObjectText  (displaying the text/name/identifier)
+ * - tacticalAppearance       (irrelevant)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT MapObjectIndicatorImpl : public BasicPathObjectImpl, public virtual MapObjectIndicator
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit MapObjectIndicatorImpl(const QString &debugInfo = QString());
+  virtual ~MapObjectIndicatorImpl();
+
+public:
+  MapObjectIndicatorImpl(const MapObjectIndicatorImpl &other)     = delete;
+  MapObjectIndicatorImpl &operator=(MapObjectIndicatorImpl &other) = delete;
+
+
+  Point3D startPoint() const override;
+  Point3D endPoint() const override;
+
+  void setStartAndEndPoint(const Point3D &start, const Point3D &end) override;
+
+  UniqueMapId mapObjectToPointTo() override;
+  void setMapObjectToPointTo(UniqueMapId uniqueId) override;
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+private:
+  bool setPositions(const PositionCont &) override; //SHOULD NEVER BE CALLED
+
+private:
+  UniqueMapId                                   m_uniqueIdToPointTo        = INVALID_MAP_ID;
+  QSharedPointer<GraphicalObjectPictureMarker>  m_pictureMarker;           // circle at the center of the map
+  int                                           m_pictureMarkerSize        = 20;
+  int                                           m_lineWidth                = 4;
+
+  QMetaObject::Connection                       m_extentChangedConnection;
+
+  LOGGER_T                                      m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.cpp
new file mode 100755
index 000000000..4e12cab99
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.cpp
@@ -0,0 +1,381 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of MineField
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "mine_field_impl.h"
+#include <MapImpl/map_impl.h>
+#include "basic_path_object_impl.h"
+#include <GraphicalObjects/stub_graphical_object.h>
+#include "mine_impl.h"
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+#include <QMap>
+
+
+
+namespace SituationMap
+{
+
+// to get access to 'init'
+class MineFieldLocalBasicPathObject final : public BasicPathObjectImpl
+{
+public:
+  using BasicPathObjectImpl::BasicPathObjectImpl;
+  using BasicPathObjectImpl::init;
+  using BasicPathObjectImpl::setUniqueId;
+};
+
+
+
+//-----------------------------------------------------------------------------
+class MineFieldImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer        = nullptr;
+
+
+  // Own data:
+  MapImpl                        *m_mapImpl = nullptr;
+  QString                         m_logicalLayer;
+  QString                         m_debugInfo;   // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId = INVALID_MAP_ID;
+
+  QMap<int, bool>                 m_visibilityMines;
+
+
+
+  QMap<int, QSharedPointer<BasicPathObjectImpl> >    m_cont;
+  using MAP_IT_T = QMapIterator<int, QSharedPointer<BasicPathObjectImpl>>;
+
+//  int                             m_drawOrder = 0;
+
+  bool hasPathObject(int key) const  { return m_cont.contains(key); }
+  QList<int> keysInUse()      const  { return m_cont.keys();        }
+  void remove(int key)               { m_cont.remove(key);          }
+  void clear()                       { m_cont.clear();              }
+
+  QSharedPointer<BasicPathObjectImpl> getPathObject(int key)
+  {
+    auto ret = m_cont.value(key);
+    if (ret.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#MineFieldSeg(%2)").arg(m_debugInfo).arg(key);
+      MineFieldLocalBasicPathObject *temp = new MineFieldLocalBasicPathObject(debugInfo);
+      bool success = temp->init(m_mapImpl, m_logicalLayer, GraphicalObjectPathType::Polygon);
+      temp->setUniqueId(m_uniqueMapId);
+      temp->setFillStyle(FillStyle(FillPattern::Null)); // no fill by default
+
+      if (success)
+      {
+        ret = QSharedPointer<BasicPathObjectImpl>(static_cast<BasicPathObjectImpl *>(temp));
+        m_cont.insert(key, ret);
+      }
+      else
+        temp->removeMySelf();
+    }
+    return ret;
+  }
+}; // class MineFieldImpl::Private
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+// class MineFieldImpl
+//-----------------------------------------------------------------------------
+MineFieldImpl::MineFieldImpl(const QString &debugInfo)
+  : MineField()                    // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , d(new Private)
+  , m_logger(getLogger("MineFieldImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_visibilityMines[static_cast<int>(MineState::Activated)]   = true;
+  d->m_visibilityMines[static_cast<int>(MineState::DeActivated)] = true;
+
+  m_lineColorFromParty = false;
+  m_fillColorAlpha = 200;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MineFieldImpl::~MineFieldImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MineFieldImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  BaseClass::setUniqueId(uniqueId);
+  d->m_uniqueMapId = m_uniqueMapId;
+}
+
+
+PositionCont MineFieldImpl::segment(int key) const
+{
+  if (d->hasPathObject(key))
+    return d->getPathObject(key)->positions();
+  else
+    return PositionCont();
+}
+
+void MineFieldImpl::setSegment(int key, const PositionCont &positions)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " key=" << key
+                      << " positions.size=" << positions.size();
+
+  QSharedPointer<BasicPathObjectImpl> pathObj = d->getPathObject(key);
+  if (pathObj)
+    pathObj->setPositions(positions);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void MineFieldImpl::removeSegment(int key)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->remove(key);
+}
+
+void MineFieldImpl::removeSegments()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->clear();
+}
+
+QList<int> MineFieldImpl::keysInUse() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->keysInUse();
+}
+
+
+void MineFieldImpl::setPositionsMine(MineField::MineState mineState, const PositionCont &posCont)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " mineState=" << static_cast<int>(mineState)
+                      << " posCont.size()=" << posCont.size();
+
+  IndicationContainer &mines = this->rIndicationContainer();
+
+  mines.setDebugInfo(m_debugInfo);
+  mines.setPositions(static_cast<int>(mineState), posCont);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " mineState=" << static_cast<int>(mineState)
+                      << " posCont.size()=" << posCont.size();
+}
+
+bool MineFieldImpl::mineVisibility(MineField::MineState mineState) const
+{
+  return d->m_visibilityMines[static_cast<int>(mineState)];
+}
+void MineFieldImpl::setMineVisibility(MineField::MineState mineState, bool visible)
+{
+  d->m_visibilityMines[static_cast<int>(mineState)] = visible;
+}
+
+
+bool MineFieldImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << " mineVisibility(MineState::Activated)=" << this->mineVisibility(MineState::Activated)
+                      << " mineVisibility(MineState::DeActivated)=" << this->mineVisibility(MineState::DeActivated)
+                      << " m_positions->positions().count()=" <<  m_positions.positions().count()
+                      << " m_mainGraphicalObject->positions().count()=" <<  m_mainGraphicalObject->positions().count()
+                      << " m_mainGraphicalObject->fillStyle().fillPattern()=" <<  (int)m_mainGraphicalObject->fillStyle().fillPattern();
+
+  // indication :
+  if (nullptr == m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+  if (m_indicationCont)
+  {
+    const QColor &col = m_mainGraphicalObject->lineStyle().lineColor();
+
+    const QList<int> idxInUse = m_indicationCont->getIndicationIndexList();
+    for (int idx : idxInUse)
+    {
+      // handle image on if not already set:
+      if (m_indicationCont->image(idx).isNull())
+      {
+        bool filled = (idx == static_cast<int>(MineState::DeActivated));
+        const QImage &img = MineImpl::renderMineSymbol(col, 20, filled);    // filled
+        m_indicationCont->setImage(idx, img);
+      }
+
+      m_indicationCont->setSelected(idx, m_selected);
+      m_indicationCont->setPickable(idx, m_pickable);
+    }
+  }
+  // : indication
+
+
+  // m_mainGraphicalObject stores the outline/'bounding box' (techn and tact)
+  // Those geometry should never be visible.
+  // The text of should be visible.
+  this->setVisibilityOfGeometry(false);
+
+  bool success = BaseClass::updateViewImpl();
+
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  // segment :
+
+  Private::MAP_IT_T mapIt(d->m_cont);
+
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    QSharedPointer<BasicPathObjectImpl> pathObj = mapIt.value();
+    if (pathObj)
+    {
+      int idx = mapIt.key();
+
+//      pathObj->setDebugInfo(m_mainGraphicalObject->debugInfo());  // will overwrite complete string -> skip
+
+      pathObj->setLineStyle(m_mainGraphicalObject->lineStyle());
+      if (idx >= 0)
+        pathObj->setFillStyle(m_mainGraphicalObject->fillStyle());
+
+      pathObj->setVisibility(m_visibility);
+      pathObj->setVisibility(ObjectAppearance::Technical, m_visibilityTechnical);
+
+      // Do not Transfer symbol. Only m_mainGraphicalObject uses ObjectAppearance::Tactical:
+//      pathObj->setSymbol(this->symbol());
+      pathObj->setVisibility(ObjectAppearance::Tactical,  false);
+
+      pathObj->setPickable(m_mainGraphicalObject->pickable());
+
+      pathObj->setSelected(m_mainGraphicalObject->selected());
+
+      pathObj->setDrawOrder(this->drawOrder());  // use m_drawOrder instead m_internalDrawOrder.
+
+      if (!pathObj->updateView())
+      {
+        int key = mapIt.key();
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, key=" << key;
+      }
+    }
+  } // while
+
+  // : segment
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical
+                      << " mineVisibility(MineState::Activated)=" << this->mineVisibility(MineState::Activated)
+                      << " mineVisibility(MineState::DeActivated)=" << this->mineVisibility(MineState::DeActivated)
+                      << " m_positions->positions().count()=" <<  m_positions.positions().count()
+                      << " m_mainGraphicalObject->positions().count()=" <<  m_mainGraphicalObject->positions().count()
+                      << " m_mainGraphicalObject->fillStyle().fillPattern()=" <<  (int)m_mainGraphicalObject->fillStyle().fillPattern();
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool MineFieldImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"10012500002707060000"); // SymbolSet = 25 270701 , 270705, 270706, 270707
+      // Case #01977851 - Runitme SDK for Qt: IdentifyGraphicsOverlays crashes
+      // BUG-000107707 : IdentifyGraphicsOverlays crashes on military symbol "10012500002707060000"]
+      // -> use another:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500001511000000"); // SymbolSet = 25 151100
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFMPOFA---"); // Mil2525C: 0843: GFMPOFA--- -> Polygon (Minefields Mined Area F)
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GFCPBOAIL-");  // APP6B: 3852: GFCPBOAIL- -> Polygon (Minefield - Antipersonnel Mines)
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GFCPBOAIN-");  // APP6B: 3853: GFCPBOAIN- -> Polygon (Minefield - Antitank)
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFCPBOAIM-"); // APP6B: 3857: GFCPBOAIM- -> Polygon (Minefields Mined Area)
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  setLineStyle(LineStyle(Qt::green, 2));
+  setFillStyle(FillStyle(Qt::green, FillPattern::Null));
+
+  // set some values to Private:
+  d->m_mapImpl      = m_mapImpl;
+  d->m_logicalLayer = m_logicalLayerName;
+  d->m_debugInfo    = m_debugInfo;
+  d->m_uniqueMapId  = m_uniqueMapId;
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool MineFieldImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (m_indicationCont)
+  {
+    bool visiScale = m_visibilityScaleRange.scaleHasVisibility(m_mapImpl->scale());
+    const QList<int> &idxInUse = m_indicationCont->getIndicationIndexList();  // idxInUse is representing all values of 'MineState'
+    for (int idx : qAsConst(idxInUse))
+    {
+      m_indicationCont->setVisible(idx, m_visibility && m_visibilityTechnical && d->m_visibilityMines.value(idx) && visiScale);
+    }
+  }
+
+  bool success = BaseClass::onMapExtentChanged();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.h
new file mode 100755
index 000000000..f1bb23bbe
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_field_impl.h
@@ -0,0 +1,110 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of MineField
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/mine_field.h> // Interface
+
+
+// Qt
+#include <QList>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+enum class MinesState;
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+/**
+ * @brief The MineFieldImpl class supports MineFields with an unlimited number of segments.
+ * Additionally the positions of mines can be set.
+ * MineState::Activated and MineState::DeActivated are supported.
+ *
+ * The segments are implemented using a BasicPathObjectImpl.
+ * The subsidiary lines of the mainGraphicalObject (also of type BasicPathObjectImpl)
+ * are not used because the geometry part of the mainGraphicalObject is hidden (replaced by the segments.)
+ * But the envelope of the MineField is necessary to show the TacticalAppearance.
+ *
+ * The identifier of the MineFieldImpl is used, not the identifier of the segments.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance (is hidden, see above)
+ * - mainGraphicalObjectText  (displaying the text/name/identifier)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ * - Container of BasicPathObjectImpl's to display the single segments.
+ */
+class SITUATIONMAPOBJECTS_EXPORT MineFieldImpl : public BasicPathObjectImpl, public virtual MineField
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit MineFieldImpl(const QString &debugInfo = QString());
+  virtual ~MineFieldImpl();
+
+public:
+  MineFieldImpl(const MineFieldImpl &other)     = delete;
+  MineFieldImpl &operator=(MineFieldImpl &other) = delete;
+
+  void setUniqueId(const UniqueMapId &uniqueId) override;
+
+
+  PositionCont segment(int key) const override;
+
+  /**
+   * @brief Set positions of one segment.
+   * @param key of segment to be set.
+   * @param posCont positions of segment.
+   * @note: is key is negativ, no fill pattern is aplied.
+   * If key is >=0, the pattern of the segments take over the main pattern.
+   */
+  void setSegment(int key, const PositionCont &positions) override;
+
+  void removeSegment(int key) override;
+  void removeSegments() override;
+  QList<int> keysInUse() const override;
+
+  void setPositionsMine(MineState mineState, const PositionCont &posCont) override;
+
+  bool mineVisibility(MineState mineState) const override;
+  void setMineVisibility(MineState mineState, bool visible) override;
+
+
+protected:
+  virtual bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.cpp
new file mode 100755
index 000000000..e83ffefd9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.cpp
@@ -0,0 +1,241 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Mine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "mine_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/party_id_to_color_functor.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+#include <QPainter>
+#include <QPen>
+
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// Utils:
+//-----------------------------------------------------------------------------
+
+
+
+
+
+//-----------------------------------------------------------------------------
+// class MineImpl
+//-----------------------------------------------------------------------------
+MineImpl::MineImpl(const QString &debugInfo)
+  : Mine()              // Interface
+  , BaseClass(debugInfo)           // Implementation
+//  , AbstractEffectSimulationImpl() // Secondary implementation
+  , m_logger(getLogger("MineImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MineImpl::~MineImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString MineImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+//  str.append( AbstractEffectSimulationImpl::toString() );
+  return str;
+}
+
+
+bool MineImpl::state() const
+{
+  return m_state.value();
+}
+void MineImpl::setState(bool state)
+{
+  m_state = state;
+}
+
+SymbolImage MineImpl::symbolImage() const
+{
+  SymbolImage symImage;
+  GraphicalObjectPictureMarker *pMarker = static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+  if (pMarker)
+  {
+    symImage.setImage(pMarker->image());
+    symImage.setValid(!symImage.image().isNull());
+  }
+  return symImage;
+}
+
+
+bool MineImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " origin =" << this->origin() //.x() << ", " << this->origin().y()
+                      << " radius =" << this->radius()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  if (!m_graphicsLayer)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no graphicsLayer";
+    return false;
+  }
+
+  if (nullptr == m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+  // image:
+  GraphicalObjectPictureMarker *pMarker = static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+  if (m_state.changed())
+  {
+    const QImage &img = renderMineSymbol(partyColor(),
+                                         20,
+                                         m_state.value());
+    pMarker->setImage(img);
+  }
+  pMarker->setOrigin(this->originTranslated());
+
+
+  // tacticalAppearance:
+  if (m_tacticalAppearance)
+  {
+    if (partyChanged())
+      m_symbol.refValue().color = partyColor();
+
+    m_tacticalAppearance->setOrigin(this->originTranslated());
+  }
+
+  bool success = BaseClass::updateViewImpl();
+
+  // reset changed:
+  m_state.reset();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool MineImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10011500002102000000"); // SymbolSet = 15 210100 ; 280000 -> Crash on Click
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GHMPOB----");   // 0754 GHMPOMP--- (Antipersonnel (AP) Mines H) -> Point
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GHMPOB----");  // 0760 GHMPOB---- (Booby Trap H) -> Point
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUOPVY----");  // APP6B: 2549 GUOPVY---- (Booby Trap U) -> Point
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+
+  } // if (mapImpl)
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (success)
+  {
+    // create underlying object (to save most attributes only there)
+    if (!m_mainGraphicalObject)
+      m_mainGraphicalObject = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                               m_graphicsLayer,
+                                                               m_debugInfo + QStringLiteral("#Image"),
+                                                               m_uniqueMapId);
+
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+QImage MineImpl::renderMineSymbol(const QColor &color, int size, bool filled)
+{
+  QImage image(size, size, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+
+  QPen pen(color);
+  pen.setWidth(2);    // filled == deactivated == triggered
+  if (!filled)
+    pen.setWidth(1);  // !filled == active == still armed
+  painter.setPen(pen);
+
+  const int sizeHalf = size / 2.0;
+
+  QPointF center(sizeHalf, sizeHalf);
+
+  // circle
+  if (filled)
+    painter.setBrush(color);
+  painter.drawEllipse(center, sizeHalf * 0.5, sizeHalf * 0.5);
+
+  // lines
+  QLine newLine(0, sizeHalf, size / 4.0, sizeHalf);
+  painter.drawLine(newLine);
+
+  QTransform trans;
+  trans.translate(sizeHalf, sizeHalf);
+  trans.rotate(90);
+  trans.translate(-sizeHalf, -sizeHalf);
+
+  newLine = trans.map(newLine);
+  painter.drawLine(newLine);
+
+  newLine = trans.map(newLine);
+  painter.drawLine(newLine);
+
+  newLine = trans.map(newLine);
+  painter.drawLine(newLine);
+
+  painter.end();
+
+  return image;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.h
new file mode 100755
index 000000000..7f12b0085
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/mine_impl.h
@@ -0,0 +1,77 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Mine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_single_point_map_object_impl.h"
+//#include "abstract_effect_simulation_impl.h"
+#include <MapObjects/mine.h> // Interface
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The MineImpl class displays a mine impact.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPictureMarker / Image, displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT MineImpl : public AbstractSinglePointMapObjectImpl, public virtual Mine
+{
+  using BaseClass = AbstractSinglePointMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit MineImpl(const QString &debugInfo = QString());
+  virtual ~MineImpl();
+
+public:
+  MineImpl(const MineImpl &other)     = delete;
+  MineImpl &operator=(MineImpl &other) = delete;
+
+  QString toString() const override;
+
+  bool state() const override;
+  void setState(bool state) override;
+
+  SymbolImage symbolImage() const override;
+
+
+  static QImage renderMineSymbol(const QColor &color, int size, bool filled);
+
+
+protected:
+  virtual bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+  SimpleValue<bool>           m_state = false;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.cpp
new file mode 100755
index 000000000..7245017c2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.cpp
@@ -0,0 +1,393 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of NineLiner
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "nine_liner_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+// ESRI
+#include <GeometryEngine.h>
+#include <GeometryTypes.h>                 // 300: GeodeticCurveType enum
+#include <Point.h>
+#include <SpatialReference.h>
+#include <LinearUnit.h>
+#include <AngularUnit.h>
+
+// Qt
+
+
+#include <cassert>
+
+
+namespace SituationMap
+{
+
+double adaptScale(double scale)
+{
+  if (scale<1.0)
+    return scale;
+  return (0.33 * scale) + 0.66;
+}
+
+//-----------------------------------------------------------------------------
+// class NineLinerImpl
+//-----------------------------------------------------------------------------
+NineLinerImpl::NineLinerImpl(const QString &debugInfo)
+  : NineLiner()                 // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("NineLinerImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_color = Qt::blue;
+
+  m_otInitialPoint.setMapObjectImpl(this);
+  m_otTargetPosition.setMapObjectImpl(this);
+  m_otFriendliesPosition.setMapObjectImpl(this);
+
+//  setArrowHeadStart(true);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+NineLinerImpl::~NineLinerImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString NineLinerImpl::identifier() const
+{
+  return this->textOnSegment(0);
+}
+void NineLinerImpl::setIdentifier(const QString &identifier)
+{
+  this->setTextOnSegment(0, identifier);
+}
+
+void NineLinerImpl::setScale(float scale)
+{
+  m_ownScale = scale;     // to use m_ownScale.changed();
+  BaseClass::setScale(scale);
+}
+
+bool NineLinerImpl::updateViewInitialPoint()
+{
+  bool success = false;
+  const NineLinerData &data = m_data.value();
+
+  // InitialPoint / square
+  const Point3D &ip = data.initialPoint;
+  if (ip.isNull())
+  {
+    m_pmInitialPoint.clear();
+    success = true;
+  } else {
+    if(!m_pmInitialPoint)
+    {
+      QString debugInfo = QStringLiteral("%1#InitialPointMarker").arg(m_debugInfo);
+      m_pmInitialPoint =  QSharedPointer<GraphicalObjectPictureMarker>
+                         (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                                           , m_graphicsLayer
+                                                           , debugInfo
+                                                           , m_uniqueMapId));
+    }
+
+    m_pmInitialPoint->setMarkerSymbol(MarkerSymbolType::Square,
+                                      20*adaptScale(m_mainGraphicalObject->scale()),  // cover the lines less by reduced growing of pointSymbols
+                                      m_color.value());
+    m_otInitialPoint.setOrigin(ip);
+    m_pmInitialPoint->setOrigin(m_otInitialPoint.originTranslated());
+    m_pmInitialPoint->setPickable(m_mainGraphicalObject->pickable());
+    m_pmInitialPoint->setVisibility(m_mainGraphicalObject->visibility());
+    success = m_pmInitialPoint->updateView();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " success=" << success;
+  return success;
+}
+
+bool NineLinerImpl::updateViewTargetPosition()
+{
+  bool success = false;
+  const NineLinerData &data = m_data.value();
+
+  // TargetPosition / triangle
+  const Point3D &ip = data.targetPosition;
+  if (ip.isNull())
+  {
+    m_pmTargetPosition.clear();
+    success = true;
+  } else {
+    if(!m_pmTargetPosition)
+    {
+      QString debugInfo = QStringLiteral("%1#TargetPositionMarker").arg(m_debugInfo);
+      m_pmTargetPosition =  QSharedPointer<GraphicalObjectPictureMarker>
+                         (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                                           , m_graphicsLayer
+                                                           , debugInfo
+                                                           , m_uniqueMapId));
+    }
+
+    m_pmTargetPosition->setMarkerSymbol(MarkerSymbolType::Triangle,
+                                        20*adaptScale(m_mainGraphicalObject->scale()),  // cover the lines less by reduced growing of pointSymbols
+                                        m_color.value());
+    m_otTargetPosition.setOrigin(ip);
+    m_pmTargetPosition->setOrigin(m_otTargetPosition.originTranslated());
+    m_pmTargetPosition->setPickable(m_mainGraphicalObject->pickable());
+    m_pmTargetPosition->setVisibility(m_mainGraphicalObject->visibility());
+    success = m_pmTargetPosition->updateView();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " success=" << success;
+  return success;
+}
+
+Point3D movePoint(const Point3D& point, int length, int angle)
+{
+  QList<Esri::ArcGISRuntime::Point> pColl;
+
+  constexpr double deg2rad = LtsCoordTrans::deg2rad();
+  constexpr double rad2deg = LtsCoordTrans::rad2deg();
+
+  // to wgs84 / degree
+  Esri::ArcGISRuntime::Point p(point.x()*rad2deg, point.y()*rad2deg, point.z()*rad2deg, Esri::ArcGISRuntime::SpatialReference::wgs84());
+
+  pColl = Esri::ArcGISRuntime::GeometryEngine::moveGeodetic({p},
+                                                            length, Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                            angle, Esri::ArcGISRuntime::AngularUnit::degrees(),
+                                                            Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+  p = pColl.first();
+  // back to rad
+  const Point3D movedPoint (p.x()*deg2rad, p.y()*deg2rad, p.z()*deg2rad);
+
+//  qCritical() << " length = " << length << " angle= " << angle;
+
+  return movedPoint;
+}
+
+Point3D movePointFah(const Point3D& point, int length, int angle)
+{
+  if (length < 1000)
+    length = 1000;
+
+  if (length > 100000)
+    length = 100000;
+
+  return movePoint(point, length, angle+180);
+}
+
+bool NineLinerImpl::updateViewFriendlies()
+{
+  bool success = false;
+  const NineLinerData &data = m_data.value();
+
+  if (data.friendliesDistance < 0)
+  {
+    m_pmFriendlies.clear();
+    success = true;
+  }
+  else
+  {
+    const Point3D &tartgetPosition = m_otTargetPosition.origin();
+    const Point3D &friendliesOrigin = movePoint(tartgetPosition, static_cast<int>(data.friendliesDistance), data.friendliesBearing);
+
+    if(!m_pmFriendlies)
+    {
+      QString debugInfo = QStringLiteral("%1#FriendliesPositionMarker").arg(m_debugInfo);
+      m_pmFriendlies =  QSharedPointer<GraphicalObjectPictureMarker>
+          (new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView()
+                                            , m_graphicsLayer
+                                            , debugInfo
+                                            , m_uniqueMapId));
+    }
+    m_pmFriendlies->setMarkerSymbol(MarkerSymbolType::Circle,
+                                    15*adaptScale(m_mainGraphicalObject->scale()),  // cover the lines less by reduced growing of pointSymbols
+                                    m_color.value());
+    m_otFriendliesPosition.setOrigin(friendliesOrigin);
+    m_pmFriendlies->setOrigin(m_otFriendliesPosition.originTranslated());
+    m_pmFriendlies->setPickable(m_mainGraphicalObject->pickable());
+    m_pmFriendlies->setVisibility(m_mainGraphicalObject->visibility());
+    success = m_pmFriendlies->updateView();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " success=" << success;
+  return success;
+}
+
+
+bool NineLinerImpl::updateViewFinalAttackHeading(int length)
+{
+  const NineLinerData &data = m_data.value();
+
+  const Point3D &tartgetPosition = m_otTargetPosition.origin();
+  const Point3D &fahOrigin = movePointFah(tartgetPosition, length, data.fah);
+
+  m_positions.setPositions(PositionCont() << fahOrigin << tartgetPosition);
+
+  return true;
+}
+
+bool NineLinerImpl::updateViewFahSector(QSharedPointer<GraphicalObjectPath> &path, const QString &debugInfo, int length, int angle)
+{
+  const Point3D &tartgetPosition = m_otTargetPosition.origin();
+  const Point3D &origin = movePointFah(tartgetPosition, length, angle);
+
+  bool success = false;
+
+  if (angle < 0)
+  {
+    path.clear();
+    success = true;
+  } else {
+    if(!path)
+    {
+      path =  QSharedPointer<GraphicalObjectPath>
+          (new GraphicalObjectPath(GraphicalObjectPathType::Polyline,
+                                   m_mapImpl->getEsriGeoView()
+                                   , m_graphicsLayer
+                                   , debugInfo
+                                   , m_uniqueMapId));
+      path->setDrawOrder(m_internalDrawOrder - 1);
+    }
+    path->setLineStyle(LineStyle(m_color.value(), 3, LinePattern::Dash));
+
+    PositionsTranslated positions;
+    positions.setMapObjectImpl(this);
+    positions.addSinglePosition(tartgetPosition);
+    positions.addSinglePosition(origin);
+
+    path->setPositions(positions.positionsTranslated());
+    path->setScale(m_mainGraphicalObject->scale());
+    path->setPickable(m_mainGraphicalObject->pickable());
+    path->setVisibility(m_mainGraphicalObject->visibility());
+    success = path->updateView();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " success=" << success;
+  return success;
+}
+
+bool NineLinerImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_data=" << m_data.value().toString()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  BaseClass::updateViewImpl();
+
+  m_color = partyColor();
+
+//  if (m_data.changed() || m_color.changed() || m_ownScale.changed())
+  {
+    updateViewInitialPoint();
+    updateViewTargetPosition();
+    updateViewFriendlies();
+
+    const int length = static_cast<int>(m_mapImpl->pixelSizeMeter() * 100);
+    updateViewFinalAttackHeading(length);
+    updateViewFahSector(m_pathFahSectorLow,  QStringLiteral("%1#FahSectorLow").arg(m_debugInfo),  length, m_data.value().fahLow);
+    updateViewFahSector(m_pathFahSectorHigh, QStringLiteral("%1#FahSectorHigh").arg(m_debugInfo), length, m_data.value().fahHigh);
+  }
+
+  setArrowHeadsSelected(m_selected);
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  // reset changed flag -> updateViewImplPost
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool NineLinerImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::onMapExtentChanged();
+
+  // to handle unchanged pixelSizeMeter
+  const int newFahLength = static_cast<int>(m_mapImpl->pixelSizeMeter() * 100);
+
+  if (m_fahLength == newFahLength)
+    return true;
+
+  // store new value
+  m_fahLength = newFahLength;
+
+  updateViewFinalAttackHeading(m_fahLength);
+  m_mainGraphicalObject->setPositions(m_positions.positionsTranslated());
+  if(!m_mainGraphicalObject->updateView())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed (m_mainGraphicalObject)";
+
+  if (!updateViewFahSector(m_pathFahSectorLow,  QStringLiteral("%1#FahSectorLow").arg(m_debugInfo),  m_fahLength, m_data.value().fahLow))
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed (m_pathFahSectorLow)";
+
+  if (!updateViewFahSector(m_pathFahSectorHigh, QStringLiteral("%1#FahSectorHigh").arg(m_debugInfo), m_fahLength, m_data.value().fahHigh))
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed (m_pathFahSectorHigh)";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return success;
+}
+
+bool NineLinerImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10032500001406030000"); // SymbolSet = 25 140602
+      //                                                                                                     ^^    ^^^^^^
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFGPOLKGS-"); // 1047 - Direction Of Attack Ground Supporting Attack F
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GHGPOLKA--"); //
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GHGPOLKGM-"); //
+
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GFCPMOLDS-"); // APP6B-3733 GFCPMOLDS- -> Direction Of Attack Ground Supporting Attack F
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  m_mainGraphicalObject->setLineStyle(LineStyle(Qt::cyan, 2, LinePattern::Solid));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+bool NineLinerImpl::setPositions(const PositionCont &)
+{
+  FATAL_LOG(m_logger) << LOGFUNCTION << " DO NOT CALL!!!";
+  assert(false);
+  return false;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.h
new file mode 100755
index 000000000..d7bae0236
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nine_liner_impl.h
@@ -0,0 +1,108 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of NineLiner
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/nine_liner.h> // Interface
+
+
+// Qt
+#include <QString>
+#include <QPointF>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT NineLinerImpl : public BasicPathObjectImpl, public virtual NineLiner
+{
+  using BaseClass =  SituationMap::BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit NineLinerImpl(const QString &debugInfo = QString());
+  virtual ~NineLinerImpl();
+
+public:
+  NineLinerImpl(const NineLinerImpl &other)     = delete;
+  NineLinerImpl &operator=(NineLinerImpl &other) = delete;
+
+  QString identifier() const override;
+  void setIdentifier(const QString &identifier) override;
+
+  void setNineLinerData(const NineLinerData& data) override      { m_data = data; }
+
+  void setScale(float scale) override;
+
+protected:
+  bool updateViewInitialPoint();
+  bool updateViewTargetPosition();
+
+  bool updateViewFriendlies();
+
+  bool updateViewFinalAttackHeading(int length);
+  bool updateViewFahSector(QSharedPointer<GraphicalObjectPath> &path, const QString &debugInfo, int length, int angle);
+
+
+  bool updateViewImpl() override;
+  bool onMapExtentChanged() override;
+
+  bool updateViewImplPost() override
+  {
+    BaseClass::updateViewImplPost();
+    m_data.reset();
+    m_color.reset();
+    m_ownScale.reset();
+    return true;
+  }
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+private:
+  bool setPositions(const PositionCont &) override; //SHOULD NEVER BE CALLED
+
+private:
+  // input:
+  SimpleValue<NineLinerData> m_data;
+
+  OriginTranslated  m_otInitialPoint;
+  OriginTranslated  m_otTargetPosition;
+  OriginTranslated  m_otFriendliesPosition;
+  int               m_fahLength = 1;
+
+  // display:
+  SimpleValue<float>                            m_ownScale;
+  SimpleValue<QColor>                           m_color;
+  QSharedPointer<GraphicalObjectPictureMarker>  m_pmInitialPoint;             // square
+  QSharedPointer<GraphicalObjectPictureMarker>  m_pmTargetPosition;           // triangle
+
+  QSharedPointer<GraphicalObjectPath>           m_pathFahSectorLow;
+  QSharedPointer<GraphicalObjectPath>           m_pathFahSectorHigh;
+
+  QSharedPointer<GraphicalObjectPictureMarker>  m_pmFriendlies;               // circle
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.cpp
new file mode 100755
index 000000000..4a665aaa7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.cpp
@@ -0,0 +1,428 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of NuclearAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "nuclear_agent_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+#include <Symbology/sidc_codec.h>
+
+
+// ESRI
+
+
+// Qt
+#include <QList>
+#include <QPainter>
+
+
+namespace SituationMap
+{
+
+// to get access to 'init'
+using NAgentLocalBasicPathObject = LocalBasicPathObject;
+
+QImage renderImpactSymbol(const QColor &color, int size, bool filled)
+{
+  QImage image(size, size, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+
+  QPen pen(color);
+  int penWidth = size/10;
+  if (penWidth < 2)
+    penWidth = 2;
+  pen.setWidth(penWidth);
+  painter.setPen(pen);
+
+  const int sizeHalf = size / 2;
+
+  QPointF center(sizeHalf, sizeHalf);
+
+  // circle
+  if (filled)
+    painter.setBrush(color);
+  painter.drawEllipse(center, sizeHalf * 0.5, sizeHalf * 0.5);
+
+  // lines
+  QLine newLine(0, sizeHalf, size / 4.0, sizeHalf);
+  painter.drawLine(newLine);
+
+  QTransform trans;
+  trans.translate(sizeHalf, sizeHalf);
+  trans.rotate(45);
+  trans.translate(-sizeHalf, -sizeHalf);
+
+  // 8 are required, one is already draw, so 7:
+  for (int i=0; i<7; ++i)
+  {
+    newLine = trans.map(newLine);
+    painter.drawLine(newLine);
+  }
+
+  painter.end();
+
+  return image;
+}
+
+
+class NuclearAgentImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+//  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer        = nullptr;
+
+
+  // Own data:
+  MapImpl                        *m_mapImpl{nullptr};
+  QString                         m_logicalLayer;
+  QString                         m_debugInfo;   // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId{INVALID_MAP_ID};
+
+  GraphicalObjectPictureMarker   *m_centerImage{nullptr};
+
+
+  struct ValueDataNA
+  {
+    QSharedPointer<BasicPathObjectImpl> basicPathObj;
+    NuclearAgent::OptionalData        optData;
+  };
+
+  QMap<int, ValueDataNA>    m_cont; /// one polyline per subsidiary line
+  using MAP_IT_T = QMapIterator<int, ValueDataNA>;
+//  int                             m_drawOrder = 0;
+
+  bool hasPathObject(int key) const { return m_cont.contains(key); }
+  QList<int> keysInUse()      const { return m_cont.keys();        }
+  void remove(int key)              { m_cont.remove(key);          }
+  void clear()                      { m_cont.clear();              }
+
+  ValueDataNA getPathObject(int key, const OptionalData &optData = OptionalData())
+  {
+    auto ret = m_cont.value(key); // copy
+    if (ret.basicPathObj.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#SubsidiaryLine(%2)").arg(m_debugInfo).arg(key);
+      NAgentLocalBasicPathObject *temp = new NAgentLocalBasicPathObject(debugInfo);
+      GraphicalObjectPathType pathType = GraphicalObjectPathType::Polyline;
+      if (optData.closed)
+        pathType = GraphicalObjectPathType::Polygon;
+      bool success = temp->init(m_mapImpl, m_logicalLayer, pathType);
+      temp->setUniqueId(m_uniqueMapId);
+
+      if (success)
+        ret.basicPathObj = QSharedPointer<BasicPathObjectImpl>(static_cast<BasicPathObjectImpl *>(temp));
+      else
+        temp->removeMySelf();
+
+      ret.optData.closed = optData.closed;
+    }
+    // transfer optional data (line|fill) to ret and then to container _if_ set:
+    if (optData.lineStyle)
+      ret.optData.lineStyle = optData.lineStyle;
+    if (optData.fillStyle)
+      ret.optData.fillStyle = optData.fillStyle;
+    m_cont.insert(key, ret);
+
+    return ret;
+  }
+}; // class NuclearAgentImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class NuclearAgentImpl
+//-----------------------------------------------------------------------------
+NuclearAgentImpl::NuclearAgentImpl(const QString &debugInfo)
+  : NuclearAgent()              // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , d(new Private)
+  , m_logger(getLogger("NuclearAgentImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_fillColorAlpha = 200;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+NuclearAgentImpl::~NuclearAgentImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d->m_centerImage;
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void NuclearAgentImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  BaseClass::setUniqueId(uniqueId);
+  d->m_uniqueMapId = m_uniqueMapId;
+}
+
+
+PositionCont NuclearAgentImpl::subsidiaryLine(int key) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->hasPathObject(key))
+    return d->getPathObject(key).basicPathObj->positions();
+  else
+    return PositionCont();
+}
+
+void NuclearAgentImpl::setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", key=" << key
+                      << ", closed=" << optData.closed
+                      << ", positions.size=" << positions.size();
+
+  Private::ValueDataNA vd = d->getPathObject(key, optData);
+  QSharedPointer<BasicPathObjectImpl> pathObj = vd.basicPathObj;
+  if (pathObj)
+    pathObj->setPositions(positions);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QList<int> NuclearAgentImpl::subsidiaryKeysInUse()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->keysInUse();
+}
+
+void NuclearAgentImpl::removeSubsidiaryLine(int key)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->remove(key);
+}
+
+void NuclearAgentImpl::removeSubsidiaryLines()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->clear();
+}
+
+Point3D NuclearAgentImpl::impactOrigin() const
+{
+  return BaseClass::tacticalOrigin();
+}
+
+void NuclearAgentImpl::setImpactOrigin(const Point3D &impactOrigin)
+{
+  BaseClass::setTacticalOrigin(impactOrigin);
+}
+
+void NuclearAgentImpl::setDetonation(const Point3D &origin, double radius)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  BaseClass::setDetonation(origin, radius);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool NuclearAgentImpl::hasDetonation() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return BaseClass::hasDetonation();
+}
+
+void NuclearAgentImpl::resetDetonation()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  BaseClass::resetDetonation();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool NuclearAgentImpl::updateViewImpl()
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  // centerImage:
+  if (!d->m_centerImage)
+  {
+    d->m_centerImage =
+        new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                         m_graphicsLayer,
+                                         m_debugInfo + QLatin1String("#CenterImage"),
+                                         m_uniqueMapId);
+  }
+//  if (partyChanged())
+  {
+    // QImage img = renderImpactSymbol(partyColor(), 20, true); // filled
+    QImage img = renderImpactSymbol(m_mainGraphicalObject->lineStyle().lineColor(), 20, true); // filled
+    d->m_centerImage->setImage(img);
+  }
+
+//  m_centerImage->setScale(m_mainGraphicalObject->scale()); // do not scale centerImage, equal to mine of MineArea
+
+  d->m_centerImage->setOrigin(m_tacticalOrigin.value().originTranslated());
+  d->m_centerImage->setVisibility(m_visibility && m_visibilityTechnical);
+
+
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+    return false;
+  }
+
+  if (nullptr == m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+
+
+
+  // subsidiary :
+
+  Private::MAP_IT_T mapIt(d->m_cont);
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    const Private::ValueDataNA &vd = mapIt.value();
+    QSharedPointer<BasicPathObjectImpl> pathObj = vd.basicPathObj;
+    const OptionalData &optData = vd.optData;
+    if (pathObj)
+    {
+//      pathObj->setDebugInfo(m_mainGraphicalObject->debugInfo());  // will overwrite complete string -> skip
+
+      if (optData.lineStyle)
+        pathObj->setLineStyle((*optData.lineStyle.data()));
+      else
+        pathObj->setLineStyle(m_mainGraphicalObject->lineStyle());
+
+      // transfer fillStyle only if relevant:
+      if (pathObj->pathType() == GraphicalObjectPathType::Polygon)
+      {
+        if (optData.fillStyle)
+          pathObj->setFillStyle((*optData.fillStyle.data()));
+        else
+          pathObj->setFillStyle(m_mainGraphicalObject->fillStyle());
+      }
+
+      pathObj->setVisibility(m_visibility);
+      pathObj->setVisibility(ObjectAppearance::Technical, m_visibilityTechnical);
+
+      // Do not Transfer symbol. Only m_mainGraphicalObject uses ObjectAppearance::Tactical:
+//      pathObj->setSymbol(this->symbol());
+
+
+      pathObj->setVisibility(ObjectAppearance::Tactical,  false);
+
+      pathObj->setPickable(m_mainGraphicalObject->pickable());
+
+      pathObj->setSelected(m_mainGraphicalObject->selected());
+
+      pathObj->setDrawOrder(m_internalDrawOrder);
+
+      success = pathObj->updateView();
+      if (!success)
+      {
+        int key = mapIt.key();
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, key=" << key;
+      }
+    }
+  } // while
+
+  // : subsidiary
+
+
+  // singleSceneMarker :
+  updateSingleSceneMarker(m_visibility); // inclusive updateView()
+  // : singleSceneMarker
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool NuclearAgentImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002719000000"); // SymbolSet = 25 271900
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUMPNR----"); // MIL2525D: 1388 GUMPNR---- -> Polygon (Radioactive Area U)
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUMPNZ----"); // MIL2525D: 0359 GUMPNZ---- -> Point (Nuclear Detonations Ground Zero U)
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUCPBWR---"); // APP6B: 3935 GUCPBWR--- -> Polygon
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUCPBWP---"); // APP6B: 2871 GUCPBWP--- -> Point (Fallout Producing U)
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::yellow, 2));
+  setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  // set some values to Private:
+  d->m_mapImpl      = m_mapImpl;
+  d->m_logicalLayer = m_logicalLayerName;
+  d->m_debugInfo    = m_debugInfo;
+  d->m_uniqueMapId  = m_uniqueMapId;
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool NuclearAgentImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool successCenterImage = true;
+  if (d->m_centerImage)
+  {
+    bool visiScale = m_visibilityScaleRange.scaleHasVisibility(m_mapImpl->scale());
+    d->m_centerImage->setVisibility(visiScale && m_visibility && m_visibilityTechnical);
+    successCenterImage = d->m_centerImage->updateView();
+  }
+
+  bool success = BaseClass::onMapExtentChanged() && successCenterImage;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.h
new file mode 100755
index 000000000..ebae69f6d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/nuclear_agent_impl.h
@@ -0,0 +1,106 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of NuclearAgent
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/nuclear_agent.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The NuclearAgentImpl class displays a nuclear area. The outline is displayed as well a subsidiary lines.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance / outline)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ * - Container of BasicPathObjectImpl's to display the subsidiary lines.
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT NuclearAgentImpl : public BasicPathObjectImpl, public virtual NuclearAgent
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit NuclearAgentImpl(const QString &debugInfo = QString());
+  virtual ~NuclearAgentImpl();
+
+public:
+  NuclearAgentImpl(const NuclearAgentImpl &other)     = delete;
+  NuclearAgentImpl &operator=(NuclearAgentImpl &other) = delete;
+
+  void setUniqueId(const UniqueMapId &uniqueId) override;
+
+  /*! \name Subsidiary polylines, identified by an arbitrary choose key.*/
+  //@{
+  PositionCont subsidiaryLine(int key) const override;
+  void setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData = OptionalData()) override;
+
+  QList<int> subsidiaryKeysInUse() override;
+
+  void removeSubsidiaryLine(int key) override;
+  void removeSubsidiaryLines() override;
+  //@}
+
+  /*! \name Impact*/
+  //@{
+  Point3D impactOrigin() const override;
+  void setImpactOrigin(const Point3D &impactOrigin) override;
+  //@}
+
+
+  /*! \name Single Detonation */
+  //@{
+  void setDetonation(const Point3D &origin, double radius) override;
+  bool hasDetonation() const override;
+  void resetDetonation() override;
+  //@}
+
+
+protected:
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+
+  // logical
+
+
+private:
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.cpp
new file mode 100755
index 000000000..aaee641fa
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.cpp
@@ -0,0 +1,1237 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Participant
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "participant_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/party_id_to_color_functor.h>
+#include <Map/bounding_box.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <Symbology/symbol_dictionary.h>  // for renderExtensions
+#include <Symbology/sidc_builder.h>  //
+#include <GraphicalObjects/graphical_object_path.h>
+
+
+// ESRI
+#include <Point.h>
+
+
+// Qt
+#include <QSize>
+#include <QPolygon>
+#include <QPainter>
+#include <QPen>
+
+#ifdef LTS_DEBUG
+#  include <QMessageBox>
+#endif
+
+#include <functional>
+
+
+namespace SituationMap
+{
+
+// to get access to 'init'
+class DesignationLocalBasicPathObject final : public BasicPathObjectImpl
+{
+  DesignationLocalBasicPathObject()               {}
+  virtual ~DesignationLocalBasicPathObject()      {}
+public:
+  using BasicPathObjectImpl::BasicPathObjectImpl;
+  using BasicPathObjectImpl::init;
+  using BasicPathObjectImpl::setUniqueId;
+};
+
+//-----------------------------------------------------------------------------
+// class ParticipantImpl
+//-----------------------------------------------------------------------------
+ParticipantImpl::ParticipantImpl(const QString &debugInfo)
+  : Participant()        // Interface
+  , BaseClass(debugInfo) // Implementation
+  , m_logger(getLogger("ParticipantImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_origin.setMapObjectImpl(this);
+  initTextModifierData();
+
+  m_movementTrackCoords.setMapObjectImpl(this);
+
+  // m_symbolResultWatcher is canceled on destruction.
+  // So it`s safe that no signal will be fired afterwards.
+  // To avoid CLang warnings use m_symbolResultWatcher as context (3rd para), although it´s not intended.
+  // Better idea?
+  QObject::connect(&m_symbolResultWatcher, &AdvancedSymbology::SymbolResultWatcher::resultReady,
+                   &m_symbolResultWatcher, std::bind(&ParticipantImpl::onSymbolResultReady, this));
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ParticipantImpl::onSymbolResultReady()
+{
+  QSharedPointer<AdvancedSymbology::SymbolResult> symResult = m_symbolResultWatcher.symbolResult();
+
+  if (AdvancedSymbology::SymbolDictionary::doParanoiaChecks() && (! symResult))
+  {
+    FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " no symResult..."
+                        << " m_symDataToRender= '" << m_symDataToRender.toString();
+    abort();
+  }
+
+
+  if (! symResult)
+    return;  // should NEVER happen! (Which object should have triggered the signal???)
+
+  const SymbolImage &symImage = symResult->symbolImage();
+
+  if (AdvancedSymbology::SymbolDictionary::doParanoiaChecks())
+  {
+    if (m_symDataToRender.sidc != symResult->symbolDataToRender().sidc ||
+        m_symDataToRender.role != symResult->symbolDataToRender().role)
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " resultReady...sidc or role mismatch..."
+                          << " m_symDataToRender= '" << m_symDataToRender.toString()
+                          << " symResult->symbolDataToRender()= '" << symResult->symbolDataToRender().toString();
+      abort();
+    }
+
+    if (symImage.image().isNull())
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " image is null";
+      abort();
+    }
+  }
+
+  // For preview purpose:
+  m_symbolImage.setValid(true);
+  m_symbolImage.setImage(symImage.image());
+
+  if (m_mainGraphicalObject)
+  {
+    GraphicalObjectPictureMarker *goPicture =
+      static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+
+    goPicture->setImage(symImage.image());
+    if (!goPicture->updateView())
+      FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " updateView failed";
+
+
+    // Note:
+    // XML-Symbols have their own/symbol-specific scale.
+    // We don´t have that value directly here, so we have to 'reinterpret'
+    // the final image:
+    // do this calculation only for Xml symbols,
+    // otherwise the other symbols will scale in two steps if you modify the slider
+    if (AdvancedSymbology::SidcCodec::decodeSidcType(symResult->symbolDataToRender().sidc) == AdvancedSymbology::SidcCodec::SidcType::CivilXml)
+    {
+      int imageSize = actualImage().size().width(); // width and heigth are equal
+      if (imageSize > 0)
+        m_scale4XmlSymbolWithSymbolSpecificScale = 0.7 * imageSize / (51 * m_scale.value() * m_symbol.value().size);  // 51 == EsriSymbolSize
+    }
+  } else {
+    if (AdvancedSymbology::SymbolDictionary::doParanoiaChecks())
+    {
+      FATAL_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << " no m_mainGraphicalObject";
+      abort();
+    }
+  }
+}
+
+
+ParticipantImpl::~ParticipantImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // clear all LaserDesignations:
+  m_designationData.reset();
+
+  for (const auto &mod : m_textModifierCont)
+    delete mod.goText;
+
+  // abort pending call:
+  m_symbolResultWatcher.cancel();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+AdvancedSymbology::SymbologyType ParticipantImpl::symbologyType() const
+{
+  return (m_dictionary) ? m_dictionary->symbologyType() : AdvancedSymbology::SymbolDictionary::defaultSymbologyType();
+} // AdvancedSymbology::SymbologyType ParticipantImpl::symbologyType() const
+
+
+void ParticipantImpl::initTextModifierData()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  TextModifierData data;
+  data.verticalAlignment = VerticalAlignment::Bottom;
+
+  // right side:
+  data.horizontalAlignment = HorizontalAlignment::Left;
+
+  int xOffset =  0; // pixel
+  int yOffset = -9; // pixel
+
+  const int x = 27;
+
+  // right side:
+
+  data.offset = QPoint(x + xOffset, 30 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::EF_ReinforcedReduced) ] = data;
+
+  data.offset = QPoint(x + xOffset,  15 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::G_StaffComments) ] = data;
+
+  data.offset = QPoint(x + xOffset,  yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::H_AdditionalInformation) ] = data;
+
+  data.offset = QPoint(x + xOffset, -15 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::M_HigherFormation) ] = data;
+
+  data.offset = QPoint(x + xOffset, -30 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::JKLNP) ] = data;
+  // left side:
+  data.horizontalAlignment = HorizontalAlignment::Right;
+
+  data.offset = QPoint(-x + xOffset,  30 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::W_DateTimeGroup) ] = data;
+
+  data.offset = QPoint(-x + xOffset,  15 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::XY_AltitudeLocation) ] = data;
+
+  data.offset = QPoint(-x + xOffset, yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::V_Type) ] = data;
+
+  data.offset = QPoint(-x + xOffset, -15 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::T_UniqueDesignation) ] = data;
+
+  data.offset = QPoint(-x + xOffset, -30 + yOffset);
+  m_textModifierCont[ static_cast<int>(TextModifier::Z_Speed) ] = data;
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void ParticipantImpl::setDebugInfo(const QString &debugInfo)
+{
+  // Do NOT call the baseclass,
+  // ParticipantImpl will create m_mainGraphicalObject only on demand.
+  m_debugInfo = debugInfo;
+}
+
+
+QString ParticipantImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(QStringLiteral(" symbol='%1'").arg(m_symbol.value().toString()));
+  return str;
+}
+
+Point3D ParticipantImpl::origin() const
+{
+  return m_origin.origin();
+}
+bool ParticipantImpl::setOrigin(const Point3D &origin)
+{
+  m_updateObjectIndicator = m_origin.setOrigin(origin) || m_updateObjectIndicator;
+  return m_updateObjectIndicator;
+}
+
+
+// Just to enable using as AES item (template@AdapterDds)
+void ParticipantImpl::setPositions(const PositionCont &posCont)
+{
+  Q_UNUSED(posCont);
+  // Should not be called
+}
+
+
+void ParticipantImpl::boundingBox(BoundingBox &bbox) const
+{
+  GraphicalObjectPictureMarker *goPicture =
+    static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+
+  if (goPicture && !goPicture->image().isNull())
+  {
+    const QSize &imgSize = goPicture->image().size();      // maybe a HotSpot has to be honored!?
+
+    bbox = BoundingBox(BoundingBox::ExtentType::Pixel,
+                       m_origin.origin(),                   // Sim
+                       imgSize.width(), imgSize.height()    // pixel
+                      );
+  }
+}
+
+QColor ParticipantImpl::majorColor() const
+{
+  const QColor &partyCol = partyColor();
+  return partyCol;
+}
+
+
+float ParticipantImpl::userSymbolOpacity() const
+{
+  return m_userSymbolOpacity.value();
+}
+void ParticipantImpl::setUserSymbolOpacity(float userSymbolOpacity)
+{
+  m_userSymbolOpacity = userSymbolOpacity;
+}
+
+SymbolDataToRender ParticipantImpl::symbolDataToRender(bool ignoreForcedColor) const
+{
+  if (ignoreForcedColor && m_party.forcedPartyColor.value().isValid())
+  {
+    SymbolDataToRender copy = m_symDataToRender;
+    copy.fillColor = m_party.partyColor;
+    return copy;
+  }
+  return m_symDataToRender;
+}
+
+QImage ParticipantImpl::actualImage() const
+{
+  if (! m_mainGraphicalObject)
+    return QImage();
+
+  GraphicalObjectPictureMarker *goPicture =
+    static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+
+  return goPicture->image();
+}
+
+float ParticipantImpl::scale() const
+{
+  return m_scale.value();
+}
+void ParticipantImpl::setScale(float scale)
+{
+  m_scale = scale;
+}
+
+
+bool ParticipantImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_debugInfo=" << m_debugInfo
+                      << " m_party.partyId=" << m_party.partyId
+                      << " m_party.changed()=" << m_party.changed()
+                      << " m_origin()=" << m_origin.origin()
+                      << " m_height=" << m_height
+                      << " m_origin.originTranslated()=" << m_origin.originTranslated()
+                      << " visibility=" << m_visibility
+                      << " m_symbol.changed=" << m_symbol.changed()
+                      << " m_symbol=" << m_symbol.value().toString()
+                      << " extensionsChanged=" << m_extensionsChanged
+                      << " m_movementTrackCoords= " << m_movementTrackCoords.positions();
+
+  // Prepare / create :
+  if (!m_mainGraphicalObject)
+  {
+    m_mainGraphicalObject = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                             m_graphicsLayer,
+                                                             m_debugInfo + QLatin1String("#Image"),
+                                                             m_uniqueMapId);
+    // to avoid incorrect number of positions, set them already here:
+    m_mainGraphicalObject->setOrigin(m_origin.originTranslated());
+  }
+  // : Prepare / create
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START2"
+                      << " m_debugInfo=" << m_debugInfo
+                      << " m_scale=" << m_scale.value()
+                      << " m_scaleChanged=" << m_scale.changed();
+
+  bool successPicture = true;
+  const bool visiSwitchedChanged = m_mainGraphicalObject->visibility() != m_visibility;
+
+  // scenario: object invisible, partyId changes, object becomes visible:
+  // So we have to force an update of the cached partyColor:
+  if (visiSwitchedChanged && m_visibility)
+  {
+    // enforce following block (fetchSymbol) being proccessed
+    // Szenario:
+    // 'Organize Participants': add template to Pool (ParticipantImpl are created)
+    // Move them to Attached (partyId is updated, invisible)
+    // On 'Move Participants' the become visible, but partyId does NOT change.
+    // So the symbol was still ocker
+    m_party.partyId.setChanged();
+    m_party.partyColor = QColor(); // set invalid to force cache update
+
+    // NLDEVCTRL: Ausfallkreuz Teilnehmersymbol
+    // Auch diese Farbe zurücksetzen:
+    m_injuryData.resetChanged();
+  }
+
+  if (m_visibility)
+  {
+    if (m_mainGraphicalObject)
+    {
+      GraphicalObjectPictureMarker *goPicture =
+        static_cast<GraphicalObjectPictureMarker *>(m_mainGraphicalObject);
+
+      goPicture->setOrigin(m_origin.originTranslated());
+
+
+      if (m_scale.changed() ||
+          m_symbol.changed() ||
+          m_userSymbolOpacity.changed() ||
+          m_marked.changed() ||
+          m_party.changed() ||
+          m_extensionsChanged ||
+          m_injuryData.changed)
+      {
+        m_symDataToRender                   = m_symbol.value().getDefaultRenderData();
+
+        bool isIdentityAssumed = false;
+
+        if (!m_symDataToRender.sidc.isEmpty())
+        {
+          AdvancedSymbology::SidcBuilder sidcBuilder(m_dictionary);
+          if (sidcBuilder.setSidc(m_symDataToRender.sidc))
+            isIdentityAssumed = sidcBuilder.isIdentityAssumed();
+          else
+            DEBUG_LOG(m_logger) << LOGFUNCTION << " sidcBuilder.setSidc failed"
+                                << " m_debugInfo=" << m_debugInfo;
+        }
+
+
+        m_symDataToRender.role              = this->partyRole(isIdentityAssumed);
+
+        int widthPixel = SituationMap::SymbolSizeLdefault; // * m_mapImpl->symbologyScaleFactor();
+        widthPixel *= m_symbol.value().size * m_scale.value();
+        m_symDataToRender.sizeL             = widthPixel;
+
+        // main symbol color
+        const QColor &partyCol = partyColor();
+        m_symDataToRender.fillColor = partyCol;
+        // use userSymbolOpacity only for fillColor:
+        m_symDataToRender.fillColor.setAlpha(m_userSymbolOpacity.value() * 255);
+        m_symDataToRender.fillColorReplace  = (m_party.partyId() >= 0);
+
+        // add other data
+        m_symDataToRender.injury            = m_injuryData.injury;
+        m_symDataToRender.injuryColor       = injuryColorInternal();
+        m_symDataToRender.marking           = m_marked.value();
+        m_symDataToRender.additionalSymbols = m_additionalSymbols;
+
+        if (goPicture->image().isNull())
+          goPicture->setImage(m_dictionary->temporaryImage(m_symDataToRender.sizeL));
+
+        successPicture = true;
+
+        // until the result is delivered:
+        m_scale4XmlSymbolWithSymbolSpecificScale = 1.0;
+
+        // you expect findImage - correct
+        // But findImage handles multiPoint object special, which is not relevant here.
+        // So, in this case (for pointSymbols) use fetchSymbol:
+        m_symbolResultWatcher.setSymbolResult(m_dictionary->fetchSymbol(m_symDataToRender));
+      }
+
+    } // if (m_mainGraphicalObject)
+
+  }
+
+  //
+  // MovementTrack :
+  //
+  // MovementTrackData:
+
+  TRACE_LOG(m_logger) << LOGFUNCTION
+                      << " m_debugInfo=" << m_debugInfo
+                      << " m_movementTrackEnabled=" << m_movementTrackEnabled
+                      << ", m_movementTrackCoords.size=" << m_movementTrackCoords.size()
+                      << ", m_movementTrackVisibility=" << m_movementTrackVisibility;
+
+  bool successMovementTrack = true;
+  if (!m_movementTrackEnabled)
+  {
+    m_movementTrackCoords.clear();
+    m_movementTrack.clear();  // destroy GraphicalObjectPath
+  } // if (m_movementTrackEnabled)
+
+  // Display:
+  if (m_movementTrackCoords.size() >= 2)
+  {
+    if (! m_movementTrack)
+    {
+      m_movementTrack =
+        QSharedPointer<GraphicalObjectPath>(new GraphicalObjectPath(GraphicalObjectPathType::Polyline,
+                                                                    m_mapImpl->getEsriGeoView(),
+                                                                    m_graphicsLayer,
+                                                                    m_debugInfo + QStringLiteral("#Track"),
+                                                                    m_uniqueMapId));
+      m_movementTrack->setLineStyle(LineStyle(partyColor(), 2, LinePattern::Solid));
+    }
+    // move one layer backwards to put the Track BEHIND the image (drawOrder==0):
+    m_movementTrack->setDrawOrder(m_internalDrawOrder - 1);
+
+    m_movementTrack->setPositions(m_movementTrackCoords.positionsTranslated());
+
+    if (m_party.changed())
+      m_movementTrack->rLineStyle().setLineColor(partyColor());
+
+    if (m_scale.changed())
+      m_movementTrack->setScale(m_scale.value()>1.0f ? m_scale.value() : 1.0f);
+
+    m_movementTrack->setVisibility(m_visibility && m_visibilityTechnical && m_movementTrackVisibility);
+    successMovementTrack = m_movementTrack->updateView();
+  }
+  else
+    m_movementTrack.clear();  // destroy GraphicalObjectPath
+  // : MovementTrack
+
+  bool successTextModifier        = updateViewImplTextModifier();
+  bool successRanges              = updateViewImplRanges();
+  bool successDesignation         = updateViewImplDesignation();
+
+  bool successDirectionIndicators = updateViewImplDirectionIndicators();
+
+  bool success = BaseClass::updateViewImpl() &&
+                 successPicture &&
+                 successTextModifier &&
+                 successRanges &&
+                 successDesignation &&
+                 successDirectionIndicators &&
+                 successMovementTrack;
+
+  // reset changed flags is done via updateViewImplPost
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", success=" << success;
+  return success;
+}
+
+bool ParticipantImpl::updateViewImplTextModifier()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = true;
+
+  const int size = static_cast<int>(TextModifier::END);
+  for (int i = 0; i < size; ++i)
+  {
+    TextModifierData &tmData = m_textModifierCont[i];
+
+    if (tmData.text.isEmpty())
+    {
+      // text empty
+      delete tmData.goText;
+      tmData.goText = nullptr;
+    }
+    else
+    {
+      // text filled:
+      if (!tmData.goText)
+      {
+        QString debugInfo = QStringLiteral("%1#textMod(%2)").arg(m_debugInfo).arg(i);
+
+        tmData.goText = new GraphicalObjectText(m_mapImpl->getEsriGeoView(),
+                                                m_graphicsLayer,
+                                                debugInfo,
+                                                m_uniqueMapId);
+      }
+    }
+
+    if (tmData.goText)
+    {
+      const bool bNewVisibility = tmData.visible && m_visibility;
+      tmData.goText->setVisibility(bNewVisibility);
+
+      // save following fo invisble object
+      if (bNewVisibility)
+      {
+        tmData.goText->setText(tmData.text);
+        // move one layer topwards to let the GraphicalObjectRange stay behind:
+        tmData.goText->setDrawOrder(m_internalDrawOrder + 1);
+
+        TextStyle ts;
+        const bool bigger = (i == static_cast<int>(TextModifier::EF_ReinforcedReduced) &&
+                             tmData.text.compare(QLatin1String("+")) == 0);
+
+        const float finalScale = m_scale.value() * m_symbol.value().size * m_scale4XmlSymbolWithSymbolSpecificScale;
+        ts.setSize(finalScale * (bigger ? 22.5 : 15));
+
+        if (m_party.partyId() < 0)
+          ts.setTextColor(QColor(Qt::black));
+        else
+          ts.setTextColor(partyColor());
+
+        // Alignment:
+        ts.setHorizontalAlignment(tmData.horizontalAlignment);
+        ts.setVerticalAlignment(tmData.verticalAlignment);
+        tmData.goText->setTextStyle(ts);
+
+        // Offset:
+        tmData.goText->setXOffset(finalScale * static_cast<float>(tmData.offset.x()));
+        tmData.goText->setYOffset(finalScale * static_cast<float>(tmData.offset.y()));
+      }
+
+      // origin is required for updateView (otherwise 'incorrect number of positions'):
+      // (originTranslated is cached)
+      tmData.goText->setOrigin(m_origin.originTranslated());
+
+      success = success && tmData.goText->updateView();
+    }
+
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", success=" << success;
+  return success;
+}
+
+QImage generateDirectionIndicatorImage(int sizeL,
+                                       const QColor &defaultColor,
+                                       const QMap<int, Participant::DirectionIndicatorData> &directionIndicatorCont)
+{
+  const int fullSize = sizeL * 1.7 * 2.0; // try and error: '1.7';
+
+  QImage fullImage(fullSize, fullSize, QImage::Format_ARGB32);
+  fullImage.fill(Qt::transparent);
+
+#ifdef NEVER
+  // for debugging :
+  if (1)
+  {
+    QPainter painter(&fullImage);
+    QPen pen(Qt::black);
+    pen.setWidth(2.0);
+    painter.setPen(pen);
+    painter.drawRect(fullImage.rect());
+  }
+  // : for debugging
+#endif
+
+  QPainter painter(&fullImage);
+  painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+
+  const QPointF center((fullImage.width() / 2), (fullImage.height() / 2));
+  const QPointF dest(center.x(), 0);
+  const int width = fullImage.size().width();
+  const int height = fullImage.size().height();
+
+  for (const auto &item : directionIndicatorCont)
+  {
+    QColor finalColor = item.color.isValid() ? item.color : defaultColor;
+
+    QPen pen(finalColor);
+    pen.setWidthF(item.lineWidth * double(sizeL)/SituationMap::SymbolSizeLdefault);
+    pen.setStyle(item.lineStyle);
+    painter.setPen(pen);
+
+    painter.save();
+
+    painter.translate(width / 2, height / 2);
+    painter.rotate(item.directionDegree);
+    painter.translate(-width / 2, -height / 2);
+
+    // line
+    painter.drawLine(center, dest); // | to top
+
+    // arrow
+    QPen penArrow(finalColor);
+    penArrow.setWidthF(item.lineWidth * double(sizeL)/SituationMap::SymbolSizeLdefault);
+    painter.setPen(penArrow);
+
+    QPolygon poly;
+    poly.reserve(3);
+
+    int aLength = 6 * pen.width();
+    int aWidth = 2 * pen.width();
+
+    //   2 || (dest)
+    //    |  |
+    // 1 |    | 3
+
+    poly.append(dest.toPoint() + QPoint(-aWidth, aLength) );
+    poly.append(dest.toPoint());
+    poly.append(dest.toPoint() + QPoint(+aWidth, aLength));
+
+    painter.drawPolyline(poly);
+
+    painter.restore();
+  } // for
+
+  return fullImage;
+}
+
+
+bool ParticipantImpl::updateViewImplDirectionIndicators()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_directionIndicatorCont.count()=" << m_directionIndicatorCont.count();
+
+  bool success = true;
+
+  if (m_directionIndicatorCont.isEmpty())
+    m_directionIndicatorPms.clear(); // destroy object
+  else
+  {
+    // needs to be created?
+    if (!m_directionIndicatorPms)
+    {
+      m_directionIndicatorPms = QSharedPointer<GraphicalObjectPictureMarker>(new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                                                                              m_graphicsLayer,
+                                                                                                              m_debugInfo + QLatin1String("#DirectionIndImage"),
+                                                                                                              m_uniqueMapId));
+    }
+    const QImage &image = generateDirectionIndicatorImage(m_symDataToRender.sizeL, majorColor(), m_directionIndicatorCont);
+    m_directionIndicatorPms->setImage(image);
+    m_directionIndicatorPms->setOrigin(m_origin.originTranslated());
+    m_directionIndicatorPms->setVisibility(m_mainGraphicalObject->visibility());
+    m_directionIndicatorPms->setSelected(m_selected);
+
+    // move one level backwards to put the GraphicalObjectRange BEHIND the image (drawOrder==0), but on top of WaeaponRanges:
+    m_directionIndicatorPms->setDrawOrder(m_internalDrawOrder - 1);
+
+    success = m_directionIndicatorPms->updateView();
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", success=" << success;
+  return success;
+}
+
+bool ParticipantImpl::updateViewImplRanges()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " number Ranges=" << m_ranges.value().count();
+
+  bool success = true;
+
+  const QVector<int> &ranges = m_ranges.value();
+  int size = ranges.size();
+  m_graphObjRanges.resize(size);
+
+  for (int i = 0; i < size; ++i)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " i=" << i;
+
+    // get some values/references:
+    int range                                     = ranges[i];
+    QSharedPointer<GraphicalObjectRange> &goRange = m_graphObjRanges[i];
+    const bool visi = m_visibility && m_rangesVisibility;
+
+    if (!visi)
+    {
+      goRange.clear(); // destroy object
+    }
+    else
+    {
+      if (goRange.isNull())
+      {
+        goRange = QSharedPointer<GraphicalObjectRange>
+            (new GraphicalObjectRange(m_mapImpl->getEsriGeoView()
+                                      , m_graphicsLayer
+                                      , QStringLiteral("%1#Range_i(%2)_r(%3)").arg(m_debugInfo).arg(i).arg(range)
+                                      , m_uniqueMapId)
+             );
+      }
+
+      // move two level backwards to put the GraphicalObjectRange BEHIND the image (drawOrder==0):
+      goRange->setVisibility(visi);
+      goRange->setDrawOrder(m_internalDrawOrder - 2);
+      goRange->setOrigin(m_origin.originTranslated());
+      goRange->setRange(range, i * 15);
+      goRange->setLineStyle(LineStyle(partyColor(), 3, LinePattern::Solid));
+      goRange->setFillStyle(FillStyle(Qt::black, FillPattern::Null));
+
+      bool updated = goRange->updateView();
+      success = success && updated;
+
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " updated=" << updated;
+    } // if (!visi)
+
+  }// for
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", success=" << success;
+  return success;
+}
+
+bool ParticipantImpl::updateViewImplDesignation()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", m_designationData.value().size()=" << m_designationData.value().size();
+  bool success = true;
+
+  const QVector<Participant::DesignationData> &designationDataVec = m_designationData.value();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START 11" << ", m_debugInfo=" << m_debugInfo
+                      << " m_designationMapObjects.size() = " << m_designationMapObjects.size()
+                      << " m_designationData.value().size() = " << designationDataVec.size();
+
+  m_designationMapObjects.resize(designationDataVec.size());
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START 22" << ", m_debugInfo=" << m_debugInfo
+                      << " m_designationMapObjects.size() = " << m_designationMapObjects.size()
+                      << " m_designationData.value().size() = " << designationDataVec.size();
+
+  int idx = -1;
+  for (const Participant::DesignationData &designationData : qAsConst(designationDataVec))
+  {
+    ++idx;
+
+    QSharedPointer<BasicPathObjectImpl> &bpoRef = m_designationMapObjects[idx];
+    if (bpoRef.isNull())
+    {
+      QString debugInfo = QString(QStringLiteral("%1#Designation_code_%2")).arg(m_debugInfo).arg(idx);
+      DesignationLocalBasicPathObject *designationDPO = new DesignationLocalBasicPathObject(debugInfo);
+
+      success = designationDPO->init(m_mapImpl, m_logicalLayerName, GraphicalObjectPathType::Polyline);
+      designationDPO->setUniqueId(m_uniqueMapId);
+      designationDPO->setArrowHeadEnd(true);
+      if (success)
+      {
+        bpoRef = QSharedPointer<BasicPathObjectImpl>(static_cast<BasicPathObjectImpl *>(designationDPO));
+      } else {
+        ERROR_LOG(m_logger) << LOGFUNCTION << ", m_debugInfo=" << m_debugInfo
+                               << "  designationPO->init failed";
+        designationDPO->removeMySelf();
+        continue;
+      }
+    }
+
+    // since DesignationLocalBasicPathObject is a MapObject (and not GraphicalObject)
+    // untranslated coords have to be used here:
+    bpoRef->setPositions({ this->origin(), designationData.spotLocation });
+    bpoRef->setTextOnSegment(0, QObject::tr("Code: %1").arg(designationData.code));
+    bpoRef->setSelected(m_selected);
+    bpoRef->setLineStyle(LineStyle(partyColor(), 3, LinePattern::DashDot));     // partyColor may change
+    bpoRef->setVisibility(m_visibility);
+
+    const bool updated = bpoRef->updateView();
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", m_debugInfo=" << m_debugInfo << " updated= " << updated;
+
+    success = success && updated;
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << ", m_debugInfo=" << m_debugInfo
+                        << ", updated= " << updated
+                        << ", success= " << success;
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", m_debugInfo=" << m_debugInfo
+                      << ", success=" << success;
+  return success;
+}
+
+bool ParticipantImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (mapImpl)
+    m_dictionary = &(m_mapImpl->symbolDictionary());
+
+  success = success && (m_dictionary);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", success=" << success;
+  return success;
+}
+
+const QColor &ParticipantImpl::partyColor() const
+{
+  if (m_party.forcedPartyColor.value().isValid())
+    return m_party.forcedPartyColor.value();
+
+  if ((m_party.partyId.value() == -1) && m_symbol.value().color.isValid())
+    return m_symbol.value().color;
+
+  if (m_party.partyId.changed() || m_party.useLightColor.changed() || !m_party.partyColor.isValid())
+  {
+    m_party.partyColor =
+      m_mapImpl->partyIdToColorFunctor().partyIdToColor(m_party.partyId.value(),
+                                                        m_party.useLightColor.value());
+  }
+  return m_party.partyColor;
+}
+
+QColor ParticipantImpl::partyColor(int partyId, bool isOutOfDate) const
+{
+  return BaseClass::partyColor(partyId, isOutOfDate);
+}
+
+
+//#define NEVER
+#ifdef NEVER
+QStringList sl;
+sl << "uniquedesignation";
+sl << "type";
+sl << "datetimevalid";
+sl << "quantity";
+
+sl << "speed";
+sl << "staffcomment";
+sl << "z";
+sl << "x";
+sl << "z/x";
+sl << "y";
+sl << "combateffectiveness";
+sl << "iff_sif";
+
+
+Q_FOREACH (const QString &item, sl)
+  m_message->setProperty(item, QString("%1_V").arg(item));
+
+
+// toJson:
+// "{"type":"esriMultiPartCIMSymbol","parts":[{"id":"GHMPNZ----_mil2525c","
+// content":[{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":
+//
+//    [uniquedesignation]","textPlacement":{"type":"point","method":"southwest","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":
+//
+//    [type]","textPlacement":{"type":"point","method":"west","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,
+//    pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":""
+
+//    [datetimevalid]","textPlacement":{"type":"point","method":"northwest","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":
+//    [{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,
+//    "text":"[x],[y]","textPlacement":
+//    {"type":"point","method":"south","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round",
+//    "joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"
+
+//    [quantity]","textPlacement":{"type":"point","method":"north","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer",
+//    "fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,
+//    "pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,
+//    "alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"
+
+//    [additionalinformation]", "textPlacement":{"type":"point","method":"northeast","offset":1}}]},{"type":"CIMPointSymbol",
+//    "symbolLayers":[{"type":"CIMVectorMarker","size":25,"anchorPoint":{"x":0,"y":0},"anchorPointUnits":"Relative","scaleStrokesAndFills":true,"offsetY":9,"dominantSizeAxis3D":"Z","frame":{"xmin":0,"ymin":0,"xmax":515,"ymax":515},"markerGraphics":[{"type":"CIMMarkerGraphic",
+//    "geometry":{"rings":[[[209.8,357.1],[305.3,357.1],[305.3,91.8],[209.8,91.8],[209.8,357.1]]]},"symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":6.432937632884479,
+//    "pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]},"capStyle":
+//    "Butt","joinStyle":"Miter","miterLimit":112,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},
+//    {"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,255,128,255]}}]}},
+//    {"type":"CIMMarkerGraphic","geometry":{"rings":[[[232.1,197.9],[232.1,258.6],[240.4,258.6],[272.3,210.9],[272.3,258.6],[280,258.6],[280,197.9],[271.8,197.9],[239.8,245.6],[239.8,197.9],[232.1,197.9]]]},"
+//    symbol":{"type":"CIMPolygonSymbol","symbolLayers":
+//    [{"type":"CIMFilledStroke","width":1.2774627923458541,"pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]},
+//    "capStyle":"Butt","joinStyle":"Miter","miterLimit":112,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},
+//    {"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]}}]}},
+//    {"type":"CIMMarkerGraphic","geometry":{"rings":[[[257.5,357.1],[124.9,357.1],[128.3,385.1],[136.5,412.4],[148.5,435.9],[164.2,455.3],[182.9,470.3],[204.7,481.1],[229.6,487.6],[257.5,489.7],[285.4,487.6],[310.3,481.1],[332.2,470.3],[350.9,455.3],[366.5,435.9],[378.5,412.4],[386.7,385.1],[390.2,357.1],[257.5,357.1]]]},
+//    "symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":6.432937632884479,"pattern":{"type":"CIMSolidPattern","color":[255,0,0,255]},
+//    "capStyle":"Butt","joinStyle":"Miter","miterLimit":112,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},
+//    {"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[255,255,128,255]}}]}}]}]}]}]}" (ication/ngl_qt_msg_handler.inc:21)
+
+// Second:
+//    2015-05-06 09:39:18,903 INFO  SituationMap.MapImpl |#| SituationMap::MapImpl::onMouseRelease onMouseRelease for left mouse button gId= 4 symbol.toJson= '{"type":"esriMultiPartCIMSymbol","parts":[{"id":"SFGPUCD---_mil2525c","content":[{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]}}]},"horizontalAlignment":"Left","verticalAlignment":"Baseline","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"[uniquedesignation]
+//    [speed]","textPlacement":{"type":"point","method":"southwest","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]}}]},"horizontalAlignment":"Center","verticalAlignment":"Center","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"[datetimevalid]
+//    [z]/[x],[y]","textPlacement":{"type":"point","method":"northwest","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]}}]},"horizontalAlignment":"Center","verticalAlignment":"Center","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"[reinforced]
+//    [staffcomment]","textPlacement":{"type":"point","method":"northeast","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]}}]},"horizontalAlignment":"Center","verticalAlignment":"Center","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"[additionalinformation]","textPlacement":{"type":"point","method":"east","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMTextLayer","fontFamilyName":"Arial","fontStyleName":"Bold","symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":1,"pattern":{"type":"CIMSolidPattern","color":[255,255,255,255]},"capStyle":"Round","joinStyle":"Round","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]}}]},"horizontalAlignment":"Center","verticalAlignment":"Center","textCase":"Normal","textDirection":"LTR","height":8.25,"letterWidth":100,"wordSpacing":100,"text":"[higherformation]
+//    [combateffectiveness]/[iff_sif]","textPlacement":{"type":"point","method":"southeast","offset":1}}]},{"type":"CIMPointSymbol","symbolLayers":[{"type":"CIMVectorMarker","size":25,"anchorPoint":{"x":0,"y":0},"anchorPointUnits":"Relative","scaleStrokesAndFills":true,"dominantSizeAxis3D":"Z","frame":{"xmin":0,"ymin":0,"xmax":710,"ymax":530},"markerGraphics":[{"type":"CIMMarkerGraphic","geometry":{"rings":[[[85,445],[85,85],[625,85],[625,445],[85,445]]]},"symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":15,"pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]},"capStyle":"Butt","joinStyle":"Miter","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[128,224,255,255]}}]}},{"type":"CIMMarkerGraphic","geometry":{"rings":[[[91,85],[113,120],[138,151],[168,178],[201,200],[237,219],[275,232],[314,240],[355,243],[396,240],[435,232],[473,219],[509,200],[542,178],[571,151],[597,120],[619,85],[91,85]]]},"symbol":{"type":"CIMPolygonSymbol","symbolLayers":[{"type":"CIMFilledStroke","width":15,"pattern":{"type":"CIMSolidPattern","color":[0,0,0,255]},"capStyle":"Butt","joinStyle":"Miter","miterLimit":10,"alignment":"Center","lineStyle3D":"Strip","patternFollowsStroke":true},{"type":"CIMFill","pattern":{"type":"CIMSolidPattern","color":[128,224,255,255]}}]}}]}]}]}]}' (t/Legatus/Plugins/SituationMap/MapImpl/MapImpl.cpp:1019)
+
+#endif
+
+
+
+
+QString ParticipantImpl::textModifier(TextModifier textModifier) const
+{
+  return m_textModifierCont[ static_cast<int>(textModifier) ].text;
+}
+void ParticipantImpl::setTextModifier(TextModifier textModifier, const QString &text)
+{
+  m_textModifierCont[ static_cast<int>(textModifier) ].text = text;
+}
+
+bool ParticipantImpl::textModifierVisibility(TextModifier textModifier) const
+{
+  return m_textModifierCont[ static_cast<int>(textModifier) ].visible;
+}
+void ParticipantImpl::setTextModifierVisibility(TextModifier textModifier, bool visible)
+{
+  m_textModifierCont[ static_cast<int>(textModifier) ].visible = visible;
+}
+
+
+QColor ParticipantImpl::injuryColor() const
+{
+  return m_injuryData.injuryColor;
+}
+Injury ParticipantImpl::injury() const
+{
+  return m_injuryData.injury;
+}
+bool ParticipantImpl::setInjury(Injury injury,
+                                const QColor &injuryColor)
+{
+  bool changed = false;
+
+  if (m_injuryData.injury != injury)
+  {
+    m_injuryData.injury  = injury;
+    m_injuryData.changed = true;
+    changed = true;
+  }
+
+  if (m_injuryData.injuryColor != injuryColor)
+  {
+    m_injuryData.injuryColor = injuryColor;
+    m_injuryData.changed     = true;
+    changed = true;
+  }
+
+  // switch from partyId to color:
+  m_injuryData.injuryPartyId = -1;
+  return changed;
+}
+
+int ParticipantImpl::injuryPartyId() const
+{
+  return m_injuryData.injuryPartyId;
+}
+bool ParticipantImpl::setInjury(Injury injury, int partyId)
+{
+  bool changed = false;
+
+  if (m_injuryData.injury != injury)
+  {
+    m_injuryData.injury  = injury;
+    m_injuryData.changed = true;
+    changed = true;
+  }
+
+  if (m_injuryData.injuryPartyId != partyId)
+  {
+    m_injuryData.injuryPartyId = partyId;
+    m_injuryData.changed       = true;
+    changed = true;
+  }
+  return changed;
+}
+
+bool ParticipantImpl::setPartyIdChanged(int partyId)
+{
+  bool changed = BaseClass::setPartyIdChanged(partyId);
+  if ((partyId < 0) || (m_injuryData.injuryPartyId == partyId))
+  {
+    m_injuryData.changed = true;
+    changed = true;
+  }
+  return changed;
+}
+
+
+const QColor &ParticipantImpl::injuryColorInternal()
+{
+  if (m_injuryData.changed)
+  {
+    if (m_injuryData.partyIdValid())
+      m_injuryData.injuryColor = this->partyColor(m_injuryData.injuryPartyId);
+    else
+      m_injuryData.injuryColor = QColor(100, 100, 0); // 100, 100, 0 -> ocker; same as ASB oreignInterfaceImpl::findImage()
+  }
+  return m_injuryData.injuryColor;
+}
+
+
+
+
+
+bool ParticipantImpl::additionalSymbol(AdditionalSymbolType additionalSymbolType) const
+{
+  return (m_additionalSymbols.contains(additionalSymbolType));
+}
+
+bool ParticipantImpl::setAdditionalSymbol(AdditionalSymbolType additionalSymbolType, bool newState)
+{
+  bool changed = false;
+
+  if (newState)
+  {
+    if (!m_additionalSymbols.contains(additionalSymbolType))
+    {
+      changed = true;
+      m_extensionsChanged = true;
+      m_additionalSymbols.insert(additionalSymbolType);
+    }
+  }
+  else
+  {
+    if (m_additionalSymbols.contains(additionalSymbolType))
+    {
+      changed = true;
+      m_extensionsChanged = true;
+      m_additionalSymbols.remove(additionalSymbolType);
+    }
+  }
+  return changed;
+}
+
+bool SituationMap::ParticipantImpl::isMarked() const
+{
+  return m_marked.value();
+}
+
+bool ParticipantImpl::setMarked(bool marked)
+{
+  bool changed = m_marked.value() != marked;
+  m_marked = marked;
+  return changed;
+}
+
+void ParticipantImpl::setDirectionIndicator(int key, const DirectionIndicatorData &data)
+{
+  m_directionIndicatorCont[key] = data;
+}
+
+void ParticipantImpl::removeDirectionIndicator(int key)
+{
+  if (key < 0)
+    m_directionIndicatorCont.clear();
+  else
+    m_directionIndicatorCont.remove(key);
+}
+
+bool ParticipantImpl::isDirectionIndicatorsVisible() const
+{
+  return m_directionIndicatorsVisibility.value();
+}
+
+void ParticipantImpl::setDirectionIndicatorsVisibility(bool visible)
+{
+  m_directionIndicatorsVisibility = visible;
+}
+
+QVector<int> ParticipantImpl::ranges() const
+{
+  return m_ranges.value();
+}
+bool ParticipantImpl::setRanges(const QVector<int> &ranges)
+{
+  bool changed = m_ranges.value() != ranges;
+  m_ranges = ranges;
+  return changed;
+}
+
+bool ParticipantImpl::isRangesVisible() const
+{
+  return m_rangesVisibility;
+}
+void ParticipantImpl::setRangesVisibility(bool visible)
+{
+  m_rangesVisibility = visible;
+}
+
+bool ParticipantImpl::setDesignations(const QVector<Participant::DesignationData> &designations)
+{
+  m_designationData = designations;
+  return m_designationData.changed();
+}
+
+//bool ParticipantImpl::addUpdateDesignation(const DesignationData &designationData)
+//{
+//  // try the keep the m_designationData clean
+//  if (designationData.isNull())
+//    return removeDesignation(designationData.code);
+
+//  bool changed = m_designationData.value(designationData.code) != designationData;
+//  if (changed)
+//    m_designationData[designationData.code] = designationData;
+//  return changed;
+//}
+
+//bool ParticipantImpl::removeDesignation(int code)
+//{
+//  return (m_designationData.remove(code) > 0);
+//}
+
+bool ParticipantImpl::isMovementTrackEnabled() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_movementTrackEnabled=" << m_movementTrackEnabled;
+  return m_movementTrackEnabled;
+}
+
+void ParticipantImpl::setMovementTrackEnabled(bool enable)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_movementTrackEnabled=" << m_movementTrackEnabled;
+  m_movementTrackEnabled = enable;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_movementTrackEnabled=" << m_movementTrackEnabled;
+}
+
+void ParticipantImpl::setMovementTrack(const PositionCont &movementTrack)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_debugInfo=" << m_debugInfo
+                      << ", movementTrack=" << movementTrack;
+  m_movementTrackCoords.setPositions(movementTrack);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_debugInfo=" << m_debugInfo
+                      << ", movementTrack=" << movementTrack;
+}
+
+void ParticipantImpl::addToMovementTrack(const Point3D &addToMovementTrack)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_movementTrackCoords.addSinglePosition(addToMovementTrack);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PositionCont ParticipantImpl::movementTrack() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " movementTrackSize=" << m_movementTrackCoords.size();
+  return m_movementTrackCoords.positions();
+}
+
+int ParticipantImpl::sizeOfMovementTrack() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " movementTrackSize=" << m_movementTrackCoords.size();
+  return m_movementTrackCoords.size();
+}
+
+bool ParticipantImpl::isMovementTrackVisible() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_movementTrackVisibility=" << m_movementTrackVisibility;
+  return m_movementTrackVisibility;
+}
+
+void ParticipantImpl::setMovementTrackVisibility(bool enable)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_movementTrackVisibility = enable;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " m_movementTrackVisibility=" << m_movementTrackVisibility;
+}
+
+int ParticipantImpl::numberOfValuesChanged()
+{
+  int count = BaseClass::numberOfValuesChanged();
+
+  if (m_userSymbolOpacity.changed())      { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+  if (m_scale.changed())                  { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+
+  if (m_extensionsChanged)                { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+
+  if (m_marked.changed())                 { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+  if (m_ranges.changed())                 { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+  if (m_injuryData.changed)               { WARNING_LOG(m_logger) << LOGFUNCTION << " START "; count++; }
+
+  return count;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.h
new file mode 100755
index 000000000..d0cf3e16d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/participant_impl.h
@@ -0,0 +1,293 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Participant
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <MapObjects/participant.h> // Interface
+#include <MapImpl/abstract_map_object_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <GraphicalObjects/graphical_object_range.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <Common/simple_value.h>
+#include "situation_map_objects_export.h"
+
+
+// Qt
+#include <QString>
+#include <QColor>
+#include <QSet>
+#include <QSharedPointer>
+
+
+// forward:
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class BasicPathObjectImpl;
+class ParticipantImplMessage;
+
+
+struct TextModifierData
+{
+  QString                   text;
+  GraphicalObjectText      *goText = nullptr;
+  QPoint                    offset;
+
+  HorizontalAlignment       horizontalAlignment = HorizontalAlignment::Left;
+  VerticalAlignment         verticalAlignment   = VerticalAlignment::Bottom;
+
+  bool                      visible = true;
+};
+
+
+
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+
+
+/**
+ * @brief The ParticipantImpl class implements the Participant.
+ *
+ * @internal Internal: Though this class derives from AbstractMapObject like many others this class is special.
+ * In contrast to most other sub classes the Participant does NOT call some baseclass methods (like updateView):
+ */
+class SITUATIONMAPOBJECTS_EXPORT ParticipantImpl : public AbstractMapObjectImpl, public virtual Participant
+{
+  using BaseClass = AbstractMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+  friend class FunctionalAreaImpl;
+protected:
+  explicit ParticipantImpl(const QString &debugInfo = QString());
+  virtual ~ParticipantImpl();
+
+public:
+  void initTextModifierData();
+
+
+  ParticipantImpl(const ParticipantImpl &other)     = delete;
+  ParticipantImpl &operator=(ParticipantImpl &other) = delete;
+
+  void setDebugInfo(const QString &debugInfo) override;
+
+  QString toString() const override;
+
+
+  // Data access:
+  Point3D origin() const override;
+  bool setOrigin(const Point3D &origin) override;
+
+  /*! Just to enable using as AES item (template@AdapterDds) !*/
+  void setPositions(const PositionCont &posCont) override;
+
+  void boundingBox(BoundingBox &bbox) const override;
+  QColor majorColor() const override;
+
+
+  float userSymbolOpacity() const override;
+  void setUserSymbolOpacity(float userSymbolOpacity) override;
+
+  SymbolDataToRender symbolDataToRender(bool ignoreForcedColor = true) const override;
+  QImage actualImage() const override;
+
+  AdvancedSymbology::SymbologyType symbologyType() const override;
+
+  // Scale : ('overload' AbstractMapObjectImpl)
+  float scale() const override;
+  void setScale(float scale) override;
+  // : Scale
+
+
+  QString textModifier(TextModifier textModifier) const override;
+  void setTextModifier(TextModifier textModifier, const QString &text) override;
+  bool textModifierVisibility(TextModifier textModifier) const override;
+  void setTextModifierVisibility(TextModifier textModifier, bool visible) override;
+
+  Injury injury() const override;
+  QColor injuryColor() const override;
+  bool setInjury(Injury injury, const QColor &injuryColor) override;      ///< Attention: 'Qt::red' is an int
+
+  int injuryPartyId() const override;
+  bool setInjury(Injury injury, int partyId) override;            ///< Attention: 'Qt::red' is an int
+
+  bool setPartyIdChanged(int partyId = -1) override;
+
+  bool additionalSymbol(AdditionalSymbolType additionalSymbolType) const override;
+  bool setAdditionalSymbol(AdditionalSymbolType additionalSymbolType, bool newState) override;
+
+  bool isMarked() const override;
+  bool setMarked(bool marked) override;
+
+  /*! \name DirectionIndicator like Turret Alignment*/
+  //@{
+  void setDirectionIndicator(int key, const DirectionIndicatorData &data) override;
+  void removeDirectionIndicator(int key = -1) override;
+
+  bool isDirectionIndicatorsVisible() const override;
+  void setDirectionIndicatorsVisibility(bool visible) override;
+  //@}
+
+  QVector<int> ranges() const override;
+  bool setRanges(const QVector<int> &ranges) override;
+  bool isRangesVisible() const override;
+  void setRangesVisibility(bool visible) override;
+
+  bool setDesignations(const QVector<DesignationData> &designations) override;
+
+
+  bool isMovementTrackEnabled() const override;
+  void setMovementTrackEnabled(bool enable) override;
+
+  void setMovementTrack(const PositionCont &movementTrack) override;
+  void addToMovementTrack(const Point3D &addToMovementTrack) override;
+  PositionCont movementTrack() const override;
+  int sizeOfMovementTrack() const override;
+
+  bool isMovementTrackVisible() const override;
+  void setMovementTrackVisibility(bool enable) override;
+
+
+  // CHECK :
+  QString identifier() const override { return QString();}
+  virtual void setIdentifier(const QString &identifier) override { Q_UNUSED(identifier); }
+
+  void setVisibility(ObjectAppearance appearance, bool visibility) override { Q_UNUSED(appearance); Q_UNUSED(visibility);}
+  // : CHECK
+
+
+  int numberOfValuesChanged();     ///< For Unit/Module Test
+
+
+protected:
+  friend class MapImpl;
+
+private:
+
+
+protected:
+  bool updateViewImplPre() override { return true; }  // no tactical Appearance is necessary
+  bool updateViewImpl() override;
+  bool updateViewImplTextModifier();
+
+  bool updateViewImplDirectionIndicators();
+  bool updateViewImplRanges();
+  bool updateViewImplDesignation();
+
+  bool updateViewImplPost() override
+  {
+    // reset changed flags:
+    BaseClass::updateViewImplPost();
+    m_userSymbolOpacity.reset();
+    m_scale.reset();
+    m_injuryData.changed = false;
+    m_marked.reset();
+    m_directionIndicatorsVisibility.reset();
+    m_ranges.reset();
+    m_extensionsChanged = false;
+    m_designationData.reset();
+    return true;
+  }
+
+
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+  void onSymbolResultReady();
+
+
+  // logical
+  OriginTranslated                                m_origin;
+  double                                          m_height = 0;
+
+  SimpleValue<float>                              m_userSymbolOpacity = 1.0;  // 0..1
+
+  SimpleValue<float>                              m_scale        = 1.0;  // 'overload' AbstractMapObjectImpl
+
+public:
+  const QColor           &partyColor() const override;
+  QColor                  partyColor(int partyId, bool isOutOfDate = false) const override;
+
+protected:
+  TextModifierData         m_textModifierCont[static_cast<int>(TextModifier::END)];
+
+  // Extensions :
+  struct InjuryData
+  {
+    SituationMap::Injury    injury = SituationMap::Injury::NoInjury;
+    QColor                  injuryColor;
+    int                     injuryPartyId = -1;
+
+    bool                    changed = true;
+
+    void resetChanged()  {  changed = true; }
+
+    bool partyIdValid() const
+    {
+      return injuryPartyId >= 0;
+    }
+  };
+
+  InjuryData                                      m_injuryData;
+  const QColor                                   &injuryColorInternal();
+
+  QSet<AdditionalSymbolType>                      m_additionalSymbols;
+
+  SimpleValue<bool>                               m_marked        = false;
+
+  SymbolDataToRender                              m_symDataToRender;
+  float                                           m_scale4XmlSymbolWithSymbolSpecificScale = 0;
+
+  QMap<int, DirectionIndicatorData>               m_directionIndicatorCont;
+  QSharedPointer<GraphicalObjectPictureMarker>    m_directionIndicatorPms;
+  SimpleValue<bool>                               m_directionIndicatorsVisibility = true;
+
+  SimpleValue< QVector<int> >                     m_ranges;
+  bool                                            m_rangesVisibility        = false;
+  QVector< QSharedPointer<GraphicalObjectRange> > m_graphObjRanges;
+
+
+  SimpleValue< QVector<Participant::DesignationData> > m_designationData; // Key = PRF Code
+  QVector<QSharedPointer<BasicPathObjectImpl>>         m_designationMapObjects;
+
+
+  PositionsTranslated                             m_movementTrackCoords;
+  bool                                            m_movementTrackEnabled    = false;
+  bool                                            m_movementTrackVisibility = true;
+  QSharedPointer<GraphicalObjectPath>             m_movementTrack;
+
+  bool                                            m_extensionsChanged = true;
+  // : Extensions
+
+  AdvancedSymbology::SymbolDictionary            *m_dictionary              = nullptr;
+  AdvancedSymbology::SymbolResultWatcher          m_symbolResultWatcher;
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  // Forbid some overloaded methods without effects of this object:
+//  virtual QString identifier() const { return QString();};
+//  virtual void setIdentifier(const QString& identifier) { Q_UNUSED(identifier); };
+
+//  virtual bool visibility(ObjectAppearance appearance) const  { Q_UNUSED(appearance); return true;};
+//  virtual void setVisibility(ObjectAppearance appearance, bool visibility)  { Q_UNUSED(appearance); Q_UNUSED(appearance);};
+
+};
+
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.cpp
new file mode 100755
index 000000000..6d570ffef
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.cpp
@@ -0,0 +1,370 @@
+/**
+  * @RDE_HEADER@
+  * PathContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "path_container.h"
+#include <MapImpl/coordinate_translation.h>
+#include <GraphicalObjects/graphical_object_multi_path.h>
+#include <MapImpl/coordinate_translation_thread.h>
+
+
+// ESRI
+#include <GeoView.h>
+#include <PictureMarkerSymbol.h>
+
+// Qt
+#include <QElapsedTimer>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class PathData
+//-----------------------------------------------------------------------------
+class PathData
+{
+public:
+  PathData() = default;
+
+  PositionsTranslated &pathTrans()                      { return m_path; }
+  bool setPath(const PositionCont &path)
+  {
+    if (m_path.positions() != path)
+      m_changed = true;
+    m_path.setPositions(path);
+    return m_changed;
+  }
+
+  bool visibility() const                               { return m_visibility.value();  }
+  void setVisibility(bool onOff)                        { m_visibility = onOff; }
+
+  bool changed() const  { return m_changed || m_visibility.changed();  }
+  void resetChanged()   { m_changed = false; m_visibility.reset();     }
+
+
+  ~PathData()
+  {
+  }
+
+public:
+
+private:
+  PositionsTranslated             m_path;
+  SimpleValue<bool>               m_visibility{true};
+  bool                            m_changed{true};
+};
+
+
+class PathContainer::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  Esri::ArcGISRuntime::GeoView            *m_geoView{nullptr};
+  Esri::ArcGISRuntime::GraphicsOverlay    *m_graphicsLayer{nullptr};
+
+
+  // Own data:
+  CoordTranslationFunctor                  *m_coordTransFunctor{nullptr};
+  QString                                   m_debugInfo;           // will be appended by consecutive number
+  UniqueMapId                               m_uniqueMapId;
+
+  SimpleValue<LineStyle>                    m_lineStyle;
+  SimpleValue<FillStyle>                    m_fillStyle;
+  SimpleValue<int>                          m_drawOrder{0};
+  SimpleValue<bool>                         m_selected{false};
+  QSharedPointer<GraphicalObjectMultiPath>  m_multiPath;
+
+#ifdef LTS_DEBUG
+  static long                               m_counter;
+#endif
+
+private:
+  QHash<int, QSharedPointer<PathData>>      m_map;
+
+public:
+  QSharedPointer<PathData> getPathData(int key)
+  {
+    auto it = m_map.find(key);
+    if (it != m_map.end())
+      return it.value();
+    auto ret = QSharedPointer<PathData>(new PathData());
+    m_map[key] = ret;
+    return ret;
+  }
+
+  bool remove(int key)
+  {
+    auto it = m_map.find(key);
+    if (it == m_map.end())
+      return false;
+    m_map.erase(it);
+    return true;
+  }
+  void clear()                                                  { m_map.clear();       }
+  int size() const                                              { return m_map.size(); }
+  QList<int> keys() const                                       { return m_map.keys(); }
+  bool contains(int key) const                                  { return m_map.contains(key); }
+  const QHash<int, QSharedPointer<PathData>> &container() const { return m_map; }
+
+}; // class PathContainer::Private
+#ifdef LTS_DEBUG
+long PathContainer::Private::m_counter = 0;
+#endif
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+// class PathContainer
+//-----------------------------------------------------------------------------
+PathContainer::PathContainer(const Esri::ArcGISRuntime::GeoView   *geoView,
+                             Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                             CoordTranslationFunctor              *coordTransFunctor,
+                             const UniqueMapId                    &uniqueMapId)
+  : QObject()
+  , m_logger(getLogger("PathContainer"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_geoView            = const_cast<Esri::ArcGISRuntime::GeoView *>(geoView);
+  d->m_graphicsLayer      = graphicsLayer;
+  d->m_coordTransFunctor  = coordTransFunctor;
+  d->m_uniqueMapId        = uniqueMapId;
+
+  QString debugInfo = QStringLiteral("%1#PathContainerPolyline").arg(d->m_debugInfo);
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " create new Object: " << debugInfo;
+  d->m_multiPath = QSharedPointer<GraphicalObjectMultiPath>
+      (new GraphicalObjectMultiPath(GraphicalObjectPathType::Polyline,
+                                    d->m_geoView,
+                                    d->m_graphicsLayer,
+                                    debugInfo,
+                                    d->m_uniqueMapId));
+
+#ifdef LTS_DEBUG
+  INFO_LOG(m_logger) << " ctor PathContainer-Polyline counter = " << d->m_counter++
+                     << ", debugInfo = " << debugInfo;
+#endif // LTS_DEBUG
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+PathContainer::PathContainer(const GraphicalObjectPathType         pathType,
+                             const Esri::ArcGISRuntime::GeoView   *geoView,
+                             Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                             CoordTranslationFunctor              *coordTransFunctor,
+                             const UniqueMapId                    &uniqueMapId)
+  : QObject()
+  , m_logger(getLogger("PathContainer"))
+  , d(new Private)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_geoView            = const_cast<Esri::ArcGISRuntime::GeoView *>(geoView);
+  d->m_graphicsLayer      = graphicsLayer;
+  d->m_coordTransFunctor  = coordTransFunctor;
+  d->m_uniqueMapId        = uniqueMapId;
+
+  QString debugInfo = QStringLiteral("%1#PathContainerPolygon").arg(d->m_debugInfo);
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " create new Object: " << debugInfo;
+  d->m_multiPath = QSharedPointer<GraphicalObjectMultiPath>
+      (new GraphicalObjectMultiPath(pathType,
+                                    d->m_geoView,
+                                    d->m_graphicsLayer,
+                                    debugInfo,
+                                    d->m_uniqueMapId));
+#ifdef LTS_DEBUG
+  INFO_LOG(m_logger) << " ctor PathContainer-Polygon counter = " << d->m_counter++
+                     << ", debugInfo = " << debugInfo;
+#endif // LTS_DEBUG
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PathContainer::~PathContainer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->clear();
+  delete d;
+
+#ifdef LTS_DEBUG
+  INFO_LOG(m_logger) << " dtor PathContainer counter =" << --d->m_counter;
+#endif // LTS_DEBUG
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString PathContainer::debugInfo() const
+{
+  return d->m_debugInfo;
+}
+void PathContainer::setDebugInfo(const QString &debugInfo)
+{
+  d->m_debugInfo = debugInfo;
+  d->m_multiPath->setDebugInfo(QStringLiteral("%1#PathContainer").arg(d->m_debugInfo));
+}
+
+
+PositionCont PathContainer::path(int idx) const
+{
+  return d->getPathData(idx)->pathTrans().positions();
+}
+bool PathContainer::setPath(int idx, const PositionCont &path)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " idx=" << idx
+                      << " path.size=" << path.size();
+
+  bool hasChanged = false;
+
+  if (path.isEmpty())
+    hasChanged = d->remove(idx);
+  else
+    hasChanged = d->getPathData(idx)->setPath(path);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return hasChanged;
+}
+
+void PathContainer::clear(int idx)
+{
+  d->remove(idx);
+}
+
+void PathContainer::clearAll()
+{
+  d->clear();
+}
+
+LineStyle PathContainer::lineStyle() const
+{
+  return d->m_lineStyle.value();
+}
+void PathContainer::setLineStyle(const LineStyle &lineStyle)
+{
+  d->m_lineStyle = lineStyle;
+}
+
+FillStyle PathContainer::fillStyle() const
+{
+  return d->m_fillStyle.value();
+}
+
+void PathContainer::setFillStyle(const FillStyle &fillStyle)
+{
+  d->m_fillStyle = fillStyle;
+}
+
+int PathContainer::drawOrder() const
+{
+  return d->m_drawOrder.value();
+}
+void PathContainer::setDrawOrder(int drawOrder)
+{
+  d->m_drawOrder = drawOrder;
+}
+
+bool PathContainer::selected() const
+{
+  return d->m_selected.value();
+}
+void PathContainer::setSelected(bool selected)
+{
+  d->m_selected = selected;
+}
+
+bool PathContainer::visibility(int idx) const
+{
+  return d->getPathData(idx)->visibility();
+}
+
+void PathContainer::setVisibility(int idx, bool onOff)
+{
+  d->getPathData(idx)->setVisibility(onOff);
+}
+
+int PathContainer::getPathCount() const
+{
+  return d->size();
+}
+
+QList<int> PathContainer::getIndicationIndexList() const
+{
+  return d->keys();
+}
+
+
+bool PathContainer::updateView()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", debugInfo='" << d->m_debugInfo << "'"
+                      << ", d->m_map.size()= " << d->size();
+  bool success = true;
+
+  bool bDoUpdateView = false;
+  if (d->m_lineStyle.changed() || d->m_fillStyle.changed() || d->m_drawOrder.changed() || d->m_selected.changed())
+  {
+    d->m_multiPath->setLineStyle(d->m_lineStyle.value());
+    d->m_multiPath->setFillStyle(d->m_fillStyle.value());
+    d->m_multiPath->setDrawOrder(d->m_drawOrder.value());
+    d->m_multiPath->setSelected(d->m_selected.value());
+    bDoUpdateView = true;
+  }
+
+  // is something removed?
+  if (d->m_multiPath->pathIndexInUse() != d->keys())
+  {
+    d->m_multiPath->reduceTo(d->keys());
+    bDoUpdateView = true;
+  }
+
+  for (auto it = d->container().begin(); it != d->container().end(); ++it)
+  {
+    QSharedPointer<PathData> pathData = it.value();
+    if (pathData->changed())
+    {
+      const int idx = it.key();
+      pathData->pathTrans().setCoordTransFunctor(d->m_coordTransFunctor);
+
+      if (pathData->visibility())
+      {
+        const PositionCont &pathTrans = pathData->pathTrans().positionsTranslated();
+        d->m_multiPath->setPath(idx, pathTrans);
+      } else {
+        // a cleared path will not be transfered to ESRI::Graphic, see GraphicalObjectMultiPath
+        // So clearPath is sufficiant
+        d->m_multiPath->clearPath(idx);
+      }
+      bDoUpdateView = true;
+      pathData->resetChanged();
+    }
+  } // for
+
+  if (bDoUpdateView)
+  {
+    bool updated = d->m_multiPath->updateView();
+    success = updated;
+  }
+
+  // reset
+  d->m_lineStyle.reset();
+  d->m_fillStyle.reset();
+  d->m_drawOrder.reset();
+  d->m_selected.reset();
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << " debugInfo='" << d->m_debugInfo << "'"
+                      << " success=" << success;
+  return success;
+}
+
+
+}
+// namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.h
new file mode 100755
index 000000000..cebcb29c2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/path_container.h
@@ -0,0 +1,110 @@
+/**
+  * @RDE_HEADER@
+  * PathContainer
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include <Common/situation_map_logging.h>
+#include <Map/line_style.h>
+#include <Map/fill_style.h>
+
+// Qt
+#include <QImage>
+#include <QMap>
+#include <QVariant>
+
+
+// forward:
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+class GeoView;
+class GraphicsOverlay;
+}
+}
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// Forward:
+class CoordTranslationFunctor;
+class PathData;
+enum class GraphicalObjectPathType;
+
+
+class PathContainer : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit PathContainer(const Esri::ArcGISRuntime::GeoView   *geoView,
+                         Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                         CoordTranslationFunctor              *coordTransFunctor,
+                         const UniqueMapId                    &uniqueMapId);
+
+  explicit PathContainer(const GraphicalObjectPathType         pathType,
+                         const Esri::ArcGISRuntime::GeoView   *geoView,
+                         Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
+                         CoordTranslationFunctor              *coordTransFunctor,
+                         const UniqueMapId                    &uniqueMapId);
+  virtual ~PathContainer();
+
+  PathContainer(const PathContainer &other)     = delete;
+  PathContainer &operator=(PathContainer &other) = delete;
+
+  QString debugInfo() const;
+  void setDebugInfo(const QString &debugInfo);
+
+  // Marker :
+
+  virtual PositionCont path(int idx) const;
+  virtual bool setPath(int idx, const PositionCont &path);
+
+  virtual void clear(int idx);
+  virtual void clearAll();
+
+  virtual LineStyle lineStyle() const;
+  virtual void setLineStyle(const LineStyle &lineStyle);
+
+  virtual FillStyle fillStyle() const;
+  virtual void setFillStyle(const FillStyle &fillStyle);
+
+  virtual int drawOrder() const;
+  virtual void setDrawOrder(int drawOrder);
+
+  virtual bool selected() const;
+  virtual void setSelected(bool selected);
+
+  virtual bool visibility(int idx) const;
+  virtual void setVisibility(int idx, bool onOff);
+
+  virtual int getPathCount() const;
+  virtual QList<int> getIndicationIndexList() const;
+
+
+  virtual bool updateView();
+
+public slots:
+
+private:
+  LOGGER_T                        m_logger;      ///< Interface of the Logging-Facility
+
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.cpp
new file mode 100755
index 000000000..efa989d23
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.cpp
@@ -0,0 +1,75 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Polygon
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "polygon_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+
+
+// ESRI
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class PolygonImpl
+//-----------------------------------------------------------------------------
+PolygonImpl::PolygonImpl(const QString &debugInfo)
+  : Polygon()                      // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("PolygonImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PolygonImpl::~PolygonImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool PolygonImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool PolygonImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.h
new file mode 100755
index 000000000..91058d417
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polygon_impl.h
@@ -0,0 +1,69 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Polygon
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/polygon.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The PolygonImpl class displays a polygon.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the line)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT PolygonImpl : public BasicPathObjectImpl, public virtual Polygon
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit PolygonImpl(const QString &debugInfo = QString());
+  virtual ~PolygonImpl();
+
+public:
+  PolygonImpl(const PolygonImpl &other)     = delete;
+  PolygonImpl &operator=(PolygonImpl &other) = delete;
+
+//  void setScale(float) override {}
+
+
+protected:
+  virtual bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.cpp
new file mode 100755
index 000000000..fb158144b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.cpp
@@ -0,0 +1,115 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Polyline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "polyline_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+
+
+// ESRI
+
+
+// Qt
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class PolylineImpl
+//-----------------------------------------------------------------------------
+PolylineImpl::PolylineImpl(const QString &debugInfo)
+  : Polyline()                     // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("PolylineImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+PolylineImpl::~PolylineImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool PolylineImpl::arrowHeadStart() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return BaseClass::arrowHeadStart();
+}
+void PolylineImpl::setArrowHeadStart(bool enable)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  BaseClass::setArrowHeadStart(enable);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool PolylineImpl::arrowHeadEnd() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return BaseClass::arrowHeadEnd();
+}
+void PolylineImpl::setArrowHeadEnd(bool enable)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  BaseClass::setArrowHeadEnd(enable);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString PolylineImpl::textOnSegment(uint segment) const
+{
+  return BaseClass::textOnSegment(segment);
+}
+void PolylineImpl::setTextOnSegment(uint segment, const QString &segmentText)
+{
+  BaseClass::setTextOnSegment(segment, segmentText);
+}
+void PolylineImpl::clearTextOnSegment(uint segment)
+{
+  BaseClass::clearTextOnSegment(segment);
+}
+
+
+bool PolylineImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool PolylineImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polyline);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.h
new file mode 100755
index 000000000..6d16bf342
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/polyline_impl.h
@@ -0,0 +1,81 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Polyline
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/polyline.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The PolylineImpl class displays a polyline.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the line)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT PolylineImpl : public BasicPathObjectImpl, public virtual Polyline
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit PolylineImpl(const QString &debugInfo = QString());
+  virtual ~PolylineImpl();
+
+public:
+  PolylineImpl(const PolylineImpl &other)     = delete;
+  PolylineImpl &operator=(PolylineImpl &other) = delete;
+
+//  void setScale(float) override {}
+
+
+  /*! \name ArrowHeads */
+  //@{
+  bool arrowHeadStart() const override;
+  void setArrowHeadStart(bool enable) override;
+
+  bool arrowHeadEnd() const override;
+  void setArrowHeadEnd(bool enable) override;
+  //@}
+
+  QString textOnSegment(uint segment) const override;
+  void setTextOnSegment(uint segment, const QString &segmentText) override;
+  void clearTextOnSegment(uint segment) override;
+
+protected:
+  virtual bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/position_marker.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/position_marker.xpm
new file mode 100755
index 000000000..981c6d979
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/position_marker.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static const char * position_marker_xpm[] = 
+{
+  "15 15 2 1",
+  " 	c None",
+  ".	c #FB0000",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "...............",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       ",
+  "       .       "
+};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.cpp
new file mode 100755
index 000000000..85bee45d0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.cpp
@@ -0,0 +1,323 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of SingleFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "single_fire_impl.h"
+#include <MapImpl/map_impl.h>
+#include <Map/party_id_to_color_functor.h>
+#include <GraphicalObjects/graphical_object_ellipse.h>
+#include <GraphicalObjects/tactical_appearance.h>
+
+
+#include <Symbology/sidc_codec.h>
+
+// ESRI
+
+
+// Qt
+#include <QPainter>
+#include <QPen>
+
+
+namespace SituationMap
+{
+
+static int s_gunToTargetLine3DKEY      = -1;
+static int s_gunToTargetLineSurfaceKEY = 0;
+static int s_nonLethalAreaKEY          = 1;
+//-----------------------------------------------------------------------------
+// class SingleFireImpl
+//-----------------------------------------------------------------------------
+SingleFireImpl::SingleFireImpl(const QString &debugInfo)
+  : SingleFire()              // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_logger(getLogger("SingleFireImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_fillColorAlpha = 200;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+SingleFireImpl::~SingleFireImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_centerImage;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+QString SingleFireImpl::toString() const
+{
+  QString str;
+  str.append(BaseClass::toString());
+  str.append(BasicPathObjectImpl::toString());
+  return str;
+}
+
+Point3D SingleFireImpl::impactOrigin() const
+{
+  return BaseClass::tacticalOrigin();
+}
+void SingleFireImpl::setImpactOrigin(const Point3D &impactOrigin)
+{
+  BaseClass::setTacticalOrigin(impactOrigin);
+}
+
+SingleFire::ImpactType SingleFireImpl::impactType() const
+{
+  return m_impactType.value();
+}
+
+void SingleFireImpl::setImpactType(SingleFire::ImpactType impactType)
+{
+  m_impactType = impactType;
+}
+
+Point3D SingleFireImpl::origin() const
+{
+  return BaseClass::origin();
+}
+void SingleFireImpl::setOrigin(const Point3D &origin)
+{
+  BaseClass::setOrigin(origin);
+}
+float SingleFireImpl::radius() const
+{
+  return BaseClass::radius();
+}
+
+void SingleFireImpl::setRadius(float radius)
+{
+  BaseClass::setRadius(radius);
+}
+
+void SingleFireImpl::setOriginatorToTargetLineSurface(const Point3D &start, const Point3D &end)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", start=" << start << ", end=" << end << ", debugInfo=" << m_debugInfo;
+
+  PathContainer &path = this->rPathContainer(); // should be SP::Draped
+  path.setDebugInfo(m_debugInfo + QStringLiteral("SpDraped"));
+
+  if (start.isNull() && end.isNull())
+  {
+    path.clear(s_gunToTargetLineSurfaceKEY);
+  } else {
+    LineStyle ls = m_mainGraphicalObject->lineStyle();
+    ls.setLinePattern(LinePattern::Dash);
+    ls.setLineWidth(2);
+    path.setLineStyle(ls);
+
+    path.setPath(s_gunToTargetLineSurfaceKEY, {start, end});
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
+                      << ", start=" << start << ", end=" << end << ", debugInfo=" << m_debugInfo;
+
+}
+
+AesEffectState SingleFireImpl::aesState() const
+{
+  return BaseClass::aesState();
+}
+void SingleFireImpl::setAesState(AesEffectState aesState)
+{
+  BaseClass::setAesState(aesState);
+}
+
+SymbolImage SingleFireImpl::symbolImage() const
+{
+  SymbolImage symImage = m_tacticalAppearance->symbolImage();
+  return symImage;
+}
+
+
+
+bool SingleFireImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " origin =" << this->origin() //.x() << ", " << this->origin().y()
+                      << " radius =" << this->radius()
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  if (m_tacticalAppearance)
+  {
+    if (partyChanged())
+      m_symbol.refValue().color = partyColor();
+  }
+
+  // centerImage:
+  if (!m_centerImage)
+  {
+    m_centerImage =
+      new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                       m_graphicsLayer,
+                                       m_debugInfo + QLatin1String("#CenterImage"),
+                                       m_uniqueMapId);
+    m_impactType.setChanged();
+  }
+
+  if (m_impactType.changed() || partyChanged())
+  {
+    QImage img;
+    switch(m_impactType.value())
+    {
+    case SingleFire::ImpactType::normalImpact:
+      img = renderImpactSymbol(partyColor(), 20, true); // filled
+      break;
+    case SingleFire::ImpactType::doubleImpact:
+      img = renderDoubleImpactSymbol(partyColor(), 20, true); // filled
+      break;
+    } // switch
+    m_centerImage->setImage(img);
+  }
+
+//  m_centerImage->setScale(m_mainGraphicalObject->scale()); // do not scale centerImage, equal to mine of MineArea
+
+  m_centerImage->setOrigin(m_tacticalOrigin.value().originTranslated());
+  m_centerImage->setVisibility(m_visibility && m_visibilityTechnical);
+
+  bool success = BaseClass::updateViewImpl(); // will call onMapExtentChanged and therefore m_centerImage->updateView
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool SingleFireImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+
+    switch (mapImpl->symbologyType())
+    {
+
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002108000000"); // SymbolSet = 21 270800 , 270900
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      //  m_symbol.refValue().m_sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUGPGPWP--"); // 0431 GUGPGPWP-- (Predicted Impact Point U) -> Point
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUGPGPWI--");  // 0293 GHGPGPWI-- (Impact Point H) -> Point
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      //m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUOPVMM---");   // APP6B: 2564 GUOPVMM--- -> Point
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUOPVI----");  // APP6B: 2560 GUOPVI---- -> Point
+      break;
+    case AdvancedSymbology::SymbologyType::APP6D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002108000000"); // SymbolSet = 21 270800 , 270900
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+
+  } // if (mapImpl)
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SingleFireImpl::onMapExtentChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool successCenterImage = true;
+  if (m_centerImage)
+  {
+    bool visiScale = m_visibilityScaleRange.scaleHasVisibility(m_mapImpl->scale());
+    m_centerImage->setVisibility(visiScale && m_visibility && m_visibilityTechnical);
+    successCenterImage = m_centerImage->updateView();
+  }
+
+  bool success = BaseClass::onMapExtentChanged() && successCenterImage;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+
+}
+
+QImage SingleFireImpl::renderDoubleImpactSymbol(const QColor &color, int size, bool filled)
+{
+  QImage finalImage(2.25*size, size, QImage::Format_ARGB32);
+  finalImage.fill(Qt::transparent);
+
+  const QImage &singleImg = renderImpactSymbol(color, size, filled);
+  QRect target = singleImg.rect();
+  QPainter painter(&finalImage);
+
+  // left
+  painter.drawImage(target, singleImg, singleImg.rect());
+
+  // right
+  target.moveTo(finalImage.width() - singleImg.width(), 0);
+  painter.drawImage(target, singleImg, singleImg.rect());
+
+  painter.end();
+
+  return finalImage;
+}
+
+QImage SingleFireImpl::renderImpactSymbol(const QColor &color, int size, bool filled)
+{
+  QImage image(size, size, QImage::Format_ARGB32);
+  image.fill(Qt::transparent);
+
+  QPainter painter(&image);
+
+  QPen pen(color);
+  int penWidth = size/10;
+  if (penWidth < 2)
+    penWidth = 2;
+  pen.setWidth(penWidth);
+  painter.setPen(pen);
+
+  const int sizeHalf = size / 2;
+
+  QPointF center(sizeHalf, sizeHalf);
+
+  // circle
+  if (filled)
+    painter.setBrush(color);
+  painter.drawEllipse(center, sizeHalf * 0.5, sizeHalf * 0.5);
+
+  // lines
+  QLine newLine(0, sizeHalf, size / 4.0, sizeHalf);
+  painter.drawLine(newLine);
+
+  QTransform trans;
+  trans.translate(sizeHalf, sizeHalf);
+  trans.rotate(45);
+  trans.translate(-sizeHalf, -sizeHalf);
+
+  // 8 are required, one is already draw, so 7:
+  for (int i=0; i<7; ++i)
+  {
+    newLine = trans.map(newLine);
+    painter.drawLine(newLine);
+  }
+
+  painter.end();
+
+  return image;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.h
new file mode 100755
index 000000000..fef90eaff
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/single_fire_impl.h
@@ -0,0 +1,106 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of SingleFire
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "basic_path_object_impl.h"
+#include <MapObjects/single_fire.h> // Interface
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+
+
+// Qt
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+/**
+ * @brief The SingleFireImpl class displays a single impact.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPictureMarker / Image, displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT SingleFireImpl : public BasicPathObjectImpl, public virtual SingleFire
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit SingleFireImpl(const QString &debugInfo = QString());
+  virtual ~SingleFireImpl();
+
+public:
+  SingleFireImpl(const SingleFireImpl &other)     = delete;
+  SingleFireImpl &operator=(SingleFireImpl &other) = delete;
+
+  QString toString() const override;
+
+
+  // some set/get methods:
+  Point3D impactOrigin() const override;
+  void setImpactOrigin(const Point3D &impactOrigin) override;
+
+  ImpactType impactType() const override;
+  void setImpactType(ImpactType impactType = ImpactType::normalImpact) override;
+
+  Point3D origin() const override;
+  void setOrigin(const Point3D &origin) override;
+  float radius() const override;
+  void setRadius(float radius) override;
+  void setOriginatorToTargetLineSurface(const Point3D &start, const Point3D &end) override;
+
+
+  // Delegate to BaseClass:
+  AesEffectState aesState() const override;
+  void setAesState(AesEffectState aesState) override;
+
+  SymbolImage symbolImage() const override;
+
+  static QImage renderDoubleImpactSymbol(const QColor &color, int size, bool filled);
+  static QImage renderImpactSymbol(const QColor &color, int size, bool filled);
+
+
+
+protected:
+  bool updateViewImpl() override;
+
+  bool updateViewImplPost() override
+  {
+    BaseClass::updateViewImplPost();
+    m_impactType.reset();
+    return true;
+  }
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  bool onMapExtentChanged() override;
+
+  // internal/admin
+
+  // logical
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+  SimpleValue<ImpactType>       m_impactType  = ImpactType::normalImpact;
+  GraphicalObjectPictureMarker *m_centerImage = nullptr;
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/situation_map_objects_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/situation_map_objects_export.h
new file mode 100755
index 000000000..2e4782dd6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/situation_map_objects_export.h
@@ -0,0 +1,21 @@
+/**
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef SITUATIONMAPOBJECTS_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define SITUATIONMAPOBJECTS_EXPORT
+# else
+#  if defined(MAKE_SITUATIONMAPOBJECTS_LIB)
+#   define SITUATIONMAPOBJECTS_EXPORT Q_DECL_EXPORT
+#  else
+#   define SITUATIONMAPOBJECTS_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.cpp
new file mode 100755
index 000000000..30eecf88c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.cpp
@@ -0,0 +1,193 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of FunctionalArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "sound_area_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+
+
+// ESRI
+
+
+// Qt
+#include <QPainter>
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// class SoundAreaImpl
+//-----------------------------------------------------------------------------
+SoundAreaImpl::SoundAreaImpl(const QString &debugInfo)
+  : SoundArea()                 // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , m_logger(getLogger("SoundAreaImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_markerOrigin.setMapObjectImpl(this);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+SoundAreaImpl::~SoundAreaImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_pictureMarker;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+//void SoundAreaImpl::reRenderSymbol()
+//{
+//  BaseClass::reRenderSymbol();
+//  if (m_pointSymbol)
+//    m_pointSymbol->reRenderSymbol();
+//}
+
+Point3D SoundAreaImpl::markerOrigin() const
+{
+  return m_markerOrigin.origin();
+}
+void SoundAreaImpl::setMarkerOrigin(const Point3D &origin)
+{
+  m_markerOrigin.setOrigin(origin);
+}
+
+const MarkerData &SoundAreaImpl::markerData() const
+{
+  return m_markerData.value();
+}
+void SoundAreaImpl::setMarkerData(const MarkerData &markerData)
+{
+  m_markerData = markerData;
+}
+
+QImage SoundAreaImpl::previewImageTypical() const
+{
+  return m_markerData.value().m_proxyImage;  // maybe mainImage if it will be provided (see geo_image_impl)
+}
+
+QImage SoundAreaImpl::previewImageSpecific() const
+{
+  QImage imageFromForm = BaseClass::previewImageSpecific();
+  QImage markerImage = markerData().proxyImage();
+
+  // most likely bothj are available:
+  if (!imageFromForm.isNull() && !markerImage.isNull())
+  {
+    // merge marker image on top:
+    const QSize &outerSize = imageFromForm.size();
+    markerImage = markerImage.scaled(outerSize/1.5, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+    QPainter painter(&imageFromForm);
+    painter.setRenderHints(QPainter::Antialiasing|QPainter::SmoothPixmapTransform);
+
+    QRect r = markerImage.rect();
+
+    int offsetX = (outerSize.width()  - r.width())  / 2;
+    int offsetY = (outerSize.height() - r.height()) / 2;
+
+    r.moveTo(offsetX, offsetY);
+    painter.drawImage(r, markerImage, markerImage.rect());
+    return imageFromForm;
+  } else if (imageFromForm.isNull())
+    return markerImage;
+
+  return imageFromForm;
+}
+
+
+bool SoundAreaImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+
+  if (!updateViewImplMarkerData())
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImplPointSymbolData failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SoundAreaImpl::updateViewImplMarkerData()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (m_markerData.changed())
+  {
+    const MarkerData &markerData = m_markerData.value();
+
+    // empty?
+    if (markerData.isEmpty())
+    {
+      delete m_pictureMarker;
+      m_pictureMarker = nullptr;
+      return true;
+    }
+
+    // ok, data available:
+    if (!m_pictureMarker)
+    {
+      m_pictureMarker = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                         m_graphicsLayer,
+                                                         m_debugInfo + QLatin1String("#Marker"),
+                                                         m_uniqueMapId);
+    }
+    if (markerData.hasMarker())
+      m_pictureMarker->setMarkerSymbol(markerData.m_proxyMarker,
+                                       markerData.m_proxyMarkerSize,
+                                       markerData.m_proxyMarkerColor);
+    else if (markerData.hasProxyImage())
+      m_pictureMarker->setImage(markerData.m_proxyImage,
+                                markerData.m_proxyImageDefaultSize);
+  } // if (m_markerData.changed())
+
+  m_pictureMarker->setOrigin(m_markerOrigin.originTranslated());
+
+  m_pictureMarker->setPickable(m_mainGraphicalObject->pickable());
+  m_pictureMarker->setSelected(m_mainGraphicalObject->selected());
+  m_pictureMarker->setDrawOrder(m_internalDrawOrder + 1);
+  // m_pictureMarker->setScale();
+  m_pictureMarker->setVisibility(m_visibility && m_visibilityTechnical);
+
+  bool success = m_pictureMarker->updateView();
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, m_debugInfo =" << m_debugInfo;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool SoundAreaImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::black, 2));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.h
new file mode 100755
index 000000000..34d4d2757
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/sound_area_impl.h
@@ -0,0 +1,89 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of FunctionalArea
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/sound_area.h> // Interface
+
+
+// Qt
+#include <QImage>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+
+
+/**
+ * @brief The SoundAreaImpl class displays a sound area and an image.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT SoundAreaImpl : public BasicPathObjectImpl, public virtual SoundArea
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit SoundAreaImpl(const QString &debugInfo = QString());
+  virtual ~SoundAreaImpl();
+
+public:
+  SoundAreaImpl(const SoundAreaImpl &other)     = delete;
+  SoundAreaImpl &operator=(SoundAreaImpl &other) = delete;
+
+//  void reRenderSymbol() override;
+
+  /*! \name Marker / Point symbol*/
+  //@{
+  Point3D markerOrigin() const override;
+  void setMarkerOrigin(const Point3D &origin) override;
+
+  const MarkerData &markerData() const override;
+  void setMarkerData(const MarkerData &markerData) override;
+  //@}
+
+  QImage previewImageTypical() const override;
+  QImage previewImageSpecific() const override;
+
+
+protected:
+  bool updateViewImpl() override;
+
+  bool updateViewImplMarkerData();
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+private:
+  // logical
+  OriginTranslated                         m_markerOrigin;
+  SimpleValue<MarkerData>                  m_markerData;
+  GraphicalObjectPictureMarker             *m_pictureMarker{nullptr};
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.cpp
new file mode 100755
index 000000000..474606376
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.cpp
@@ -0,0 +1,149 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Text
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "text_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/stub_graphical_object.h>
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_text.h>
+
+// ESRI
+
+
+// Qt
+#include <QString>
+
+
+#include "position_marker.xpm"
+
+
+namespace SituationMap
+{
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// Utils:
+//-----------------------------------------------------------------------------
+
+
+
+
+
+//-----------------------------------------------------------------------------
+// class TextImpl
+//-----------------------------------------------------------------------------
+TextImpl::TextImpl(const QString &debugInfo)
+  : Text()                         // Interface
+  , BaseClass(debugInfo)           // Implementation
+  , m_showAnchorMarker(false)
+  , m_anchorMarker(nullptr)
+  , m_logger(getLogger("TextImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  m_visibilityScaleRange.resetToMax();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+TextImpl::~TextImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete m_anchorMarker;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+void TextImpl::setShowAnchorMarker(bool on)
+{
+  if (on == m_showAnchorMarker)
+    return;
+
+  m_showAnchorMarker = on;
+  if (on)
+  {
+    static QImage markerSymbol;
+
+    if (markerSymbol.isNull())
+      markerSymbol = QImage(position_marker_xpm);
+
+    m_anchorMarker = new GraphicalObjectPictureMarker(m_mapImpl->getEsriGeoView(),
+                                                      m_graphicsLayer,
+                                                      QLatin1String("AnchorMarker"),
+                                                      INVALID_MAP_ID);
+    m_anchorMarker->setImage(markerSymbol);
+  }
+  else
+  {
+    delete m_anchorMarker;
+    m_anchorMarker = nullptr;
+  }
+} // TextImpl::setShowAnchorMarker
+
+
+bool TextImpl::showAnchorMarker() const { return m_showAnchorMarker; }
+
+
+bool TextImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " visibility=" << m_visibility;
+
+  // put translated origin to stub. Later GOText will takeover the (translated) origin.
+  if (m_mainGraphicalObject) m_mainGraphicalObject->setOrigin(originTranslated());
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (m_anchorMarker)
+  {
+    m_anchorMarker -> setSelected(m_selected);
+    m_anchorMarker -> setDrawOrder(m_internalDrawOrder);
+    m_anchorMarker -> setOrigin(m_mainGraphicalObjectText->origin());
+    m_anchorMarker -> setVisibility(m_mainGraphicalObjectText->visibility());
+    m_anchorMarker -> updateView();
+  }
+
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool TextImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName);
+
+  if (success)
+  {
+    /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     * Use the StubGraphicalObject, which is doing nothing of the work, because
+     * the text will be rendered using m_mainGraphicalObjectText
+     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+    m_mainGraphicalObject = new StubGraphicalObject();
+  }
+  else
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.h
new file mode 100755
index 000000000..bd4e65715
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/text_impl.h
@@ -0,0 +1,76 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of Text
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_single_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/text.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class GraphicalObjectPictureMarker;
+
+/**
+ * @brief The TextImpl class displays a text.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (irrelevant)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (irrelevant)
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT TextImpl : public AbstractSinglePointMapObjectImpl, public virtual Text
+{
+  using BaseClass = AbstractSinglePointMapObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit TextImpl(const QString &debugInfo = QString());
+  virtual ~TextImpl();
+
+public:
+  TextImpl(const TextImpl &other)     = delete;
+  TextImpl &operator=(TextImpl &other) = delete;
+
+//  void setScale(float) override {}
+
+  void setShowAnchorMarker(bool on) override;
+  bool showAnchorMarker() const override;
+
+protected:
+
+  bool updateViewImpl() override;
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+  // logical
+  bool                           m_showAnchorMarker;
+  GraphicalObjectPictureMarker  *m_anchorMarker;
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.cpp
new file mode 100755
index 000000000..affacbed1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.cpp
@@ -0,0 +1,494 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of VirtualMine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "virtual_mine_impl.h"
+#include <MapImpl/map_impl.h>
+#include <GraphicalObjects/graphical_object_path.h>
+#include <GraphicalObjects/graphical_object_text.h>
+#include <GraphicalObjects/graphical_object_renderer_attributes.h>
+#include <GraphicalObjects/graphical_object_scene_marker.h>
+
+#include <Symbology/sidc_codec.h>
+
+
+// ESRI
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <GraphicsOverlay.h>
+
+// Qt
+#include <QList>
+#include <QSharedPointer>
+
+namespace SituationMap
+{
+
+//// to get access to 'init'
+//class VMineLocalBasicPathObject final : public BasicPathObjectImpl
+//{
+//public:
+//  using BasicPathObjectImpl::BasicPathObjectImpl;
+//  using BasicPathObjectImpl::init;
+//  using BasicPathObjectImpl::setUniqueId;
+//};
+
+using VMineLocalBasicPathObject = LocalBasicPathObject;
+
+
+class VirtualMineImpl::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+//  Esri::ArcGISRuntime::GraphicsOverlay *m_graphicsLayer        = nullptr;
+
+
+  // Own data:
+  MapImpl                        *m_mapImpl = nullptr;
+  QString                         m_logicalLayer;
+  QString                         m_debugInfo;   // will be appended by consecutive number
+  UniqueMapId                     m_uniqueMapId = INVALID_MAP_ID;
+
+  struct MarkerSymbolDataRenderer
+  {
+//    std::shared_ptr<Esri::ArcGISRuntime::Graphic> m_graphic3D;
+    QSharedPointer<GraphicalObjectRendererAttributes> m_goRendererAtt;
+    QVariantMap                                        m_attribMap;
+    OriginTranslated                                   m_origin;
+  } m_markerSymbolDataRenderer;
+
+  struct MarkerSymbolData
+  {
+    QSharedPointer<GraphicalObjectSceneMarker> m_goSceneMarker;
+    SceneSymbolData                            m_sceneSymbolData;
+    OriginTranslated                           m_origin;
+  } m_markerSymbolData;
+
+  struct ValueDataVM
+  {
+    QSharedPointer<BasicPathObjectImpl> basicPathObj;
+    VirtualMine::OptionalData           optData;
+  };
+
+  QMap<int, ValueDataVM>                m_cont; /// one polyline per subsidiary line
+  using MAP_IT_T = QMapIterator<int, ValueDataVM>;
+//  int                             m_drawOrder = 0;
+
+  bool hasPathObject(int key) const { return m_cont.contains(key); }
+  QList<int> keysInUse()      const { return m_cont.keys();        }
+  void remove(int key)              { m_cont.remove(key);          }
+  void clear()                      { m_cont.clear();              }
+
+  ValueDataVM getPathObject(int key, const OptionalData &optData = OptionalData())
+  {
+    auto ret = m_cont.value(key); // copy
+    if (ret.basicPathObj.isNull())
+    {
+      QString debugInfo = QStringLiteral("%1#SubsidiaryLine(%2)").arg(m_debugInfo).arg(key);
+      VMineLocalBasicPathObject *temp = new VMineLocalBasicPathObject(debugInfo);
+      GraphicalObjectPathType pathType = GraphicalObjectPathType::Polyline;
+      if (optData.closed)
+        pathType = GraphicalObjectPathType::Polygon;
+      bool success = temp->init(m_mapImpl, m_logicalLayer, pathType);
+      temp->setUniqueId(m_uniqueMapId);
+
+      if (success)
+        ret.basicPathObj = QSharedPointer<BasicPathObjectImpl>(static_cast<BasicPathObjectImpl *>(temp));
+      else
+        temp->removeMySelf();
+
+      ret.optData.closed = optData.closed;
+    }
+    // transfer optional data (line|fill) to ret and then to container _if_ set:
+    if (optData.lineStyle)
+      ret.optData.lineStyle = optData.lineStyle;
+    if (optData.fillStyle)
+      ret.optData.fillStyle = optData.fillStyle;
+    m_cont.insert(key, ret);
+
+    return ret;
+  }
+}; // class VirtualMineImpl::Private
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// class VirtualMineImpl
+//-----------------------------------------------------------------------------
+VirtualMineImpl::VirtualMineImpl(const QString &debugInfo)
+  : VirtualMine()               // Interface
+  , BaseClass(debugInfo)        // Implementation
+  , d(new Private)
+  , m_logger(getLogger("VirtualMineImpl"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_fillColorAlpha = 200;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+VirtualMineImpl::~VirtualMineImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  d->m_markerSymbolDataRenderer.m_goRendererAtt.clear();
+  d->m_markerSymbolData.m_goSceneMarker.clear();
+
+//  // approach for V100.15 ; will maybe crash with older versions
+//  if (d->m_markerSymbolData.m_graphic3D && m_graphicsLayer && m_graphicsLayer->graphics())
+//    m_graphicsLayer->graphics()->removeOne(d->m_markerSymbolData.m_graphic3D.get());
+//  d->m_markerSymbolData.m_graphic3D.reset();
+
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void VirtualMineImpl::setUniqueId(const UniqueMapId &uniqueId)
+{
+  BaseClass::setUniqueId(uniqueId);
+  d->m_uniqueMapId = m_uniqueMapId;
+}
+
+
+PositionCont VirtualMineImpl::subsidiaryLine(int key) const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (d->hasPathObject(key))
+    return d->getPathObject(key).basicPathObj->positions();
+  else
+    return PositionCont();
+}
+
+void VirtualMineImpl::setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << ", key=" << key
+                      << ", closed=" << optData.closed
+                      << ", positions.size=" << positions.size();
+
+  Private::ValueDataVM vd = d->getPathObject(key, optData);
+  QSharedPointer<BasicPathObjectImpl> pathObj = vd.basicPathObj;
+  if (pathObj)
+    pathObj->setPositions(positions);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QList<int> VirtualMineImpl::subsidiaryKeysInUse()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->keysInUse();
+}
+
+void VirtualMineImpl::removeSubsidiaryLine(int key)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->remove(key);
+}
+
+void VirtualMineImpl::removeSubsidiaryLines()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->clear();
+}
+
+bool VirtualMineImpl::has3DMarkerRenderer() const
+{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END, isEmpty = " << d->m_markerSymbolData.m_origin.isEmpty();
+  return !d->m_markerSymbolDataRenderer.m_origin.isEmpty();
+}
+
+void VirtualMineImpl::set3DMarkerRenderer(const Point3D &markerOrigin, const QVariantMap &attribMap)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_markerSymbolDataRenderer.m_origin.setOrigin(markerOrigin);
+  d->m_markerSymbolDataRenderer.m_attribMap = attribMap;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool VirtualMineImpl::has3DMarkerSceneSymbol() const
+{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return !d->m_markerSymbolData.m_origin.isEmpty();
+}
+
+void VirtualMineImpl::set3DMarkerSceneSymbol(const Point3D &markerOrigin, const SceneSymbolData &sceneSymbolData)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_markerSymbolData.m_origin.setOrigin(markerOrigin);
+  d->m_markerSymbolData.m_sceneSymbolData = sceneSymbolData;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool VirtualMineImpl::updateViewImpl()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " m_debugInfo=" << m_debugInfo
+                      << " symbol=" << m_symbol.value().sidc
+                      << " visibility=" << m_visibility
+                      << " visiTechn=" << m_visibilityTechnical
+                      << " visiTact=" << m_visibilityTactical;
+
+  bool success = BaseClass::updateViewImpl();
+
+  if (!success)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed";
+    return false;
+  }
+
+  if (nullptr == m_mainGraphicalObject)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " no m_mainGraphicalObject";
+    return false;
+  }
+
+  // subsidiary :
+
+  Private::MAP_IT_T mapIt(d->m_cont);
+  while (mapIt.hasNext())
+  {
+    mapIt.next();
+    const Private::ValueDataVM &vd = mapIt.value();
+    QSharedPointer<BasicPathObjectImpl> pathObj = vd.basicPathObj;
+    const OptionalData &optData = vd.optData;
+    if (pathObj)
+    {
+//      pathObj->setDebugInfo(m_mainGraphicalObject->debugInfo());  // will overwrite complete string -> skip
+
+      if (optData.lineStyle)
+        pathObj->setLineStyle((*optData.lineStyle.data()));
+      else
+        pathObj->setLineStyle(m_mainGraphicalObject->lineStyle());
+
+      // transfer fillStyle only if relevant:
+      if (pathObj->pathType() == GraphicalObjectPathType::Polygon)
+      {
+        if (optData.fillStyle)
+          pathObj->setFillStyle((*optData.fillStyle.data()));
+        else
+          pathObj->setFillStyle(m_mainGraphicalObject->fillStyle());
+      }
+
+      pathObj->setVisibility(m_visibility);
+      pathObj->setVisibility(ObjectAppearance::Technical, m_visibilityTechnical);
+
+      // Do not Transfer symbol. Only m_mainGraphicalObject uses ObjectAppearance::Tactical:
+//      pathObj->setSymbol(this->symbol());
+
+
+      pathObj->setVisibility(ObjectAppearance::Tactical,  false);
+
+      pathObj->setPickable(m_mainGraphicalObject->pickable());
+
+      pathObj->setSelected(m_mainGraphicalObject->selected());
+
+      pathObj->setDrawOrder(m_internalDrawOrder);
+
+      success = pathObj->updateView();
+      if (!success)
+      {
+        int key = mapIt.key();
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, key=" << key
+                            << ", m_debugInfo=" << m_debugInfo;
+
+      }
+    }
+  } // while
+
+  // : subsidiary
+
+
+  // 3DMarkerSceneSymbol :
+  if (m_mapImpl->mode() == Mode::Mode_3D)
+  {
+    const bool successUpdateRender = updateViewImpl3DMarkerRenderer();
+    if (!successUpdateRender)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl3DMarkerRenderer failed" << ", m_debugInfo=" << m_debugInfo;
+
+    const bool successUpdateSceneSymbol = updateViewImpl3DMarkerSceneSymbol();
+    if (!successUpdateSceneSymbol)
+      ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl3DMarkerSceneSymbol failed" << ", m_debugInfo=" << m_debugInfo;
+
+    success = success && successUpdateRender && successUpdateSceneSymbol;
+  }
+  // : 3DMarkerSceneSymbol
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool VirtualMineImpl::updateViewImpl3DMarkerRenderer()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = true;
+
+  // qCritical() << " attribMap " << attribMap;
+  if (m_mapImpl->mode() == Mode::Mode_3D)
+  {
+    if (d->m_markerSymbolDataRenderer.m_origin.isEmpty())
+    {
+      d->m_markerSymbolDataRenderer.m_goRendererAtt.clear();
+    } else {
+
+      if (!d->m_markerSymbolDataRenderer.m_goRendererAtt)
+      {
+        QString debugInfo = QStringLiteral("%1#goRendererAtt").arg(m_debugInfo);
+        d->m_markerSymbolDataRenderer.m_goRendererAtt = QSharedPointer<GraphicalObjectRendererAttributes>
+            (new GraphicalObjectRendererAttributes(m_mapImpl->getEsriGeoView()
+                                                   , m_graphicsLayer
+                                                   , debugInfo
+                                                   , m_uniqueMapId)
+             );
+      }
+
+      d->m_markerSymbolDataRenderer.m_origin.setMapObjectImpl(this);
+      const Point3D &pos = d->m_markerSymbolDataRenderer.m_origin.originTranslated();
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setOrigin(pos);
+
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setAttributeMap(d->m_markerSymbolDataRenderer.m_attribMap);
+
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setVisibility(m_visibility);
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setPickable(m_mainGraphicalObject->pickable());
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setSelected(m_mainGraphicalObject->selected());
+      d->m_markerSymbolDataRenderer.m_goRendererAtt->setDrawOrder(m_internalDrawOrder);
+
+      // scale does not makes sense :-)
+
+      success = d->m_markerSymbolDataRenderer.m_goRendererAtt->updateView();
+      if (!success)
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, m_goRendererAtt"
+                            << ", m_debugInfo=" << m_debugInfo;
+    }
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+bool VirtualMineImpl::updateViewImpl3DMarkerSceneSymbol()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  bool success = true;
+
+  // qCritical() << " attribMap " << attribMap;
+  if (m_mapImpl->mode() == Mode::Mode_3D)
+  {
+    if (d->m_markerSymbolData.m_origin.isEmpty())
+    {
+      d->m_markerSymbolData.m_goSceneMarker.clear();
+    } else {
+
+      if (!d->m_markerSymbolData.m_goSceneMarker)
+      {
+        SituationMap::SceneMarkerType type = SituationMap::SceneMarkerType::SPHERE;
+        if (d->m_markerSymbolData.m_sceneSymbolData.cone)
+          type = SituationMap::SceneMarkerType::CONE;
+
+        QString debugInfo = QStringLiteral("%1#goSceneMarker").arg(m_debugInfo);
+        d->m_markerSymbolData.m_goSceneMarker = QSharedPointer<GraphicalObjectSceneMarker>
+            (new GraphicalObjectSceneMarker(type,
+                                            m_mapImpl->getEsriGeoView()
+                                            , m_graphicsLayer
+                                            , debugInfo
+                                            , m_uniqueMapId)
+             );
+      }
+
+      d->m_markerSymbolData.m_origin.setMapObjectImpl(this);
+      const Point3D &pos = d->m_markerSymbolData.m_origin.originTranslated();
+      d->m_markerSymbolData.m_goSceneMarker->setOrigin(pos);
+      d->m_markerSymbolData.m_goSceneMarker->setDiameter(d->m_markerSymbolData.m_sceneSymbolData.radius*2.0);
+
+      d->m_markerSymbolData.m_goSceneMarker->setHeading(d->m_markerSymbolData.m_sceneSymbolData.heading);
+      d->m_markerSymbolData.m_goSceneMarker->setPitch(d->m_markerSymbolData.m_sceneSymbolData.pitch);
+      d->m_markerSymbolData.m_goSceneMarker->setRoll(d->m_markerSymbolData.m_sceneSymbolData.roll);
+
+      d->m_markerSymbolData.m_goSceneMarker->setVisibility(m_visibility);
+      d->m_markerSymbolData.m_goSceneMarker->setPickable(m_mainGraphicalObject->pickable());
+      d->m_markerSymbolData.m_goSceneMarker->setSelected(m_mainGraphicalObject->selected());
+      d->m_markerSymbolData.m_goSceneMarker->setDrawOrder(m_internalDrawOrder);
+
+      QColor col = d->m_markerSymbolData.m_sceneSymbolData.color;
+      col.setAlphaF(col.alphaF() / 2.0);
+      d->m_markerSymbolData.m_goSceneMarker->setFillStyle(FillStyle(col, FillPattern::Solid));
+
+      // scale does not makes sense :-)
+
+      success = d->m_markerSymbolData.m_goSceneMarker->updateView();
+      if (!success)
+        ERROR_LOG(m_logger) << LOGFUNCTION << " updateViewImpl failed, m_goSceneMarker"
+                            << ", m_debugInfo=" << m_debugInfo;
+    }
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+
+bool VirtualMineImpl::init(MapImpl *mapImpl, const QString &logicalLayerName)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (mapImpl)
+  {
+    switch (mapImpl->symbologyType())
+    {
+    case AdvancedSymbology::SymbologyType::APP6D:
+    case AdvancedSymbology::SymbologyType::MIL2525D:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "10012500002719000000"); // SymbolSet = 25 271900
+      break;
+    case AdvancedSymbology::SymbologyType::MIL2525C:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUMPNR----"); // MIL2525D: 1388 GUMPNR---- -> Polygon (Radioactive Area U)
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUMPNZ----"); // MIL2525D: 0359 GUMPNZ---- -> Point (Nuclear Detonations Ground Zero U)
+      break;
+    case AdvancedSymbology::SymbologyType::APP6B:
+      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(), "GUCPBWR---"); // APP6B: 3935 GUCPBWR--- -> Polygon
+//      m_symbol.refValue().sidc = AdvancedSymbology::SidcCodec::encodeComplete(mapImpl->symbologyType(),"GUCPBWP---"); // APP6B: 2871 GUCPBWP--- -> Point (Fallout Producing U)
+      break;
+    case AdvancedSymbology::SymbologyType::None:
+      // empty
+      break;
+    } // switch
+  } // if (mapImpl)
+
+
+  bool success = BaseClass::init(mapImpl, logicalLayerName, GraphicalObjectPathType::Polygon);
+
+  setLineStyle(LineStyle(Qt::yellow, 2));
+  setFillStyle(FillStyle(Qt::yellow, FillPattern::Null));
+
+  if (!success)
+    ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
+
+  // set some values to Private:
+  d->m_mapImpl      = m_mapImpl;
+  d->m_logicalLayer = m_logicalLayerName;
+  d->m_debugInfo    = m_debugInfo;
+  d->m_uniqueMapId  = m_uniqueMapId;
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
+  return success;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.h
new file mode 100755
index 000000000..a6e860620
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapObjectsImpl/virtual_mine_impl.h
@@ -0,0 +1,102 @@
+/**
+  * @RDE_HEADER@
+  * Interface-Implementation of VirtualMine
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "abstract_multi_point_map_object_impl.h"
+#include "basic_path_object_impl.h"
+#include <MapObjects/virtual_mine.h> // Interface
+
+
+// Qt
+#include <QString>
+
+
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+/**
+ * @brief The VirtualMineImpl class displays a nuclear area. The outline is displayed as well a subsidiary lines.
+ *
+ * A class instance consists of the following logical elements:
+ * - mainGraphicalObject      (GraphicalObjectPath displaying the main techn. Appearance / outline)
+ * - mainGraphicalObjectText  (displaying the text/name)
+ * - tacticalAppearance       (displaying the tact. Appearance)
+ * - Container of BasicPathObjectImpl's to display the subsidiary lines.
+ */
+// inherent 'public', to get that implementation
+// inherent 'public virtual'  to get that interface
+class SITUATIONMAPOBJECTS_EXPORT VirtualMineImpl : public BasicPathObjectImpl, public virtual VirtualMine
+{
+  using BaseClass = BasicPathObjectImpl;
+
+  template <typename> friend class GenericObjectFactory;
+protected:
+  explicit VirtualMineImpl(const QString &debugInfo = QString());
+  virtual ~VirtualMineImpl();
+
+public:
+  VirtualMineImpl(const VirtualMineImpl &other)     = delete;
+  VirtualMineImpl &operator=(VirtualMineImpl &other) = delete;
+
+  void setUniqueId(const UniqueMapId &uniqueId) override;
+
+  /*! \name Subsidiary polylines, identified by an arbitrary choose key.*/
+  //@{
+  PositionCont subsidiaryLine(int key) const override;
+  void setSubsidiaryLine(int key, const PositionCont &positions, const OptionalData &optData = OptionalData()) override;
+
+  QList<int> subsidiaryKeysInUse() override;
+
+  void removeSubsidiaryLine(int key) override;
+  void removeSubsidiaryLines() override;
+  //@}
+
+
+  /*! \name 3D marker / SimpleMarkerSceneSymbol (via renderer) */
+  //@{
+  bool has3DMarkerRenderer() const override;
+  void set3DMarkerRenderer(const Point3D &markerOrigin, const QVariantMap &attribMap) override;
+  //@}
+
+  bool has3DMarkerSceneSymbol() const override;
+  void set3DMarkerSceneSymbol(const Point3D &markerOrigin, const SceneSymbolData &sceneSymbolData) override;
+
+
+protected:
+  bool updateViewImpl() override;
+  bool updateViewImpl3DMarkerRenderer();
+  bool updateViewImpl3DMarkerSceneSymbol();
+
+  friend class MapImpl;
+  bool init(MapImpl *mapImpl, const QString &logicalLayerName) override;
+
+  // internal/admin
+
+
+  // logical
+
+
+private:
+  class Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.cpp
new file mode 100755
index 000000000..d1b156223
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.cpp
@@ -0,0 +1,4691 @@
+/**
+**
+** @RDE_HEADER@
+** Clipping and Offsetting of lines and polygons
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+** To use under Boost Software License Vers. 1
+** see also http://www.angusj.com/delphi/clipper/documentation/Docs/_Body.htm 
+** -----------------------------------------------------------------------------------------------
+*/
+
+/*******************************************************************************
+*                                                                              *
+* Author    :  Angus Johnson                                                   *
+* Version   :  6.2.1                                                           *
+* Date      :  31 October 2014                                                 *
+* Website   :  http://www.angusj.com                                           *
+* Copyright :  Angus Johnson 2010-2014                                         *
+*                                                                              *
+* License:                                                                     *
+* Use, modification & distribution is subject to Boost Software License Ver 1. *
+* http://www.boost.org/LICENSE_1_0.txt                                         *
+*                                                                              *
+* Attributions:                                                                *
+* The code in this library is an extension of Bala Vatti's clipping algorithm: *
+* "A generic solution to polygon clipping"                                     *
+* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63.             *
+* http://portal.acm.org/citation.cfm?id=129906                                 *
+*                                                                              *
+* Computer graphics and geometric modeling: implementation and algorithms      *
+* By Max K. Agoston                                                            *
+* Springer; 1 edition (January 4, 2005)                                        *
+* http://books.google.com/books?q=vatti+clipping+agoston                       *
+*                                                                              *
+* See also:                                                                    *
+* "Polygon Offsetting by Computing Winding Numbers"                            *
+* Paper no. DETC2005-85513 pp. 565-575                                         *
+* ASME 2005 International Design Engineering Technical Conferences             *
+* and Computers and Information in Engineering Conference (IDETC/CIE2005)      *
+* September 24-28, 2005 , Long Beach, California, USA                          *
+* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf              *
+*                                                                              *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                                                              *
+* This is a translation of the Delphi Clipper library and the naming style     *
+* used has retained a Delphi flavour.                                          *
+*                                                                              *
+*******************************************************************************/
+
+#include "clipper.hpp"
+#include <cmath>
+#include <vector>
+#include <algorithm>
+#include <stdexcept>
+#include <cstring>
+#include <cstdlib>
+#include <ostream>
+#include <functional>
+
+#include "math_const.h"
+
+namespace ClipperLib {
+
+static double const pi                = MathConst::pi;
+static double const two_pi            = MathConst::pi_two;
+static double const def_arc_tolerance = 0.25;
+
+enum Direction { dRightToLeft, dLeftToRight };
+
+static int const Unassigned = -1;  //edge not currently 'owning' a solution
+static int const Skip = -2;        //edge that would otherwise close a path
+
+#define HORIZONTAL (-1.0E+40)
+#define TOLERANCE (1.0e-20)
+#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE))
+
+struct TEdge {
+  IntPoint Bot;
+  IntPoint Curr;
+  IntPoint Top;
+  IntPoint Delta;
+  double Dx;
+  PolyType PolyTyp;
+  EdgeSide Side;
+  int WindDelta; //1 or -1 depending on winding direction
+  int WindCnt;
+  int WindCnt2; //winding count of the opposite polytype
+  int OutIdx;
+  TEdge *Next;
+  TEdge *Prev;
+  TEdge *NextInLML;
+  TEdge *NextInAEL;
+  TEdge *PrevInAEL;
+  TEdge *NextInSEL;
+  TEdge *PrevInSEL;
+
+  TEdge() : Bot()
+          , Curr()
+          , Top()
+          , Delta()
+          , Dx(0)
+          , PolyTyp(PolyType::ptClip)
+          , Side(EdgeSide::esLeft)
+          , WindDelta(0)
+          , WindCnt(0)
+          , WindCnt2(0)
+          , OutIdx(0)
+          , Next(nullptr)
+          , Prev(nullptr)
+          , NextInLML(nullptr)
+          , NextInAEL(nullptr)
+          , PrevInAEL(nullptr)
+          , NextInSEL(nullptr)
+          , PrevInSEL(nullptr) {;}
+
+  void init()
+  {
+    Bot       = IntPoint();
+    Curr      = IntPoint();
+    Top       = IntPoint();
+    Delta     = IntPoint();
+    Dx        = 0.0;
+    PolyTyp   = PolyType::ptClip;
+    Side      = EdgeSide::esLeft;
+    WindDelta = 0;
+    WindCnt   = 0;
+    WindCnt2  = 0;
+    OutIdx    = 0;
+    Next      = nullptr;
+    Prev      = nullptr;
+    NextInLML = nullptr;
+    NextInAEL = nullptr;
+    PrevInAEL = nullptr;
+    NextInSEL = nullptr;
+    PrevInSEL = nullptr;
+  }
+};
+
+struct IntersectNode {
+  TEdge          *Edge1;
+  TEdge          *Edge2;
+  IntPoint        Pt;
+};
+
+struct LocalMinimum {
+  cInt          Y;
+  TEdge        *LeftBound;
+  TEdge        *RightBound;
+};
+
+struct OutPt;
+
+struct OutRec {
+  int       Idx;
+  bool      IsHole;
+  bool      IsOpen;
+  OutRec   *FirstLeft;  //see comments in clipper.pas
+  PolyNode *PolyNd;
+  OutPt    *Pts;
+  OutPt    *BottomPt;
+};
+
+struct OutPt {
+  int       Idx;
+  IntPoint  Pt;
+  OutPt    *Next;
+  OutPt    *Prev;
+};
+
+struct Join {
+  OutPt    *OutPt1;
+  OutPt    *OutPt2;
+  IntPoint  OffPt;
+};
+
+struct LocMinSorter
+{
+  inline bool operator()(const LocalMinimum& locMin1, const LocalMinimum& locMin2) const 
+  {
+    return locMin2.Y < locMin1.Y;
+  }
+};
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+inline cInt Round(double val)
+{
+  if ((val < 0)) return static_cast<cInt>(val - 0.5); 
+  else return static_cast<cInt>(val + 0.5);
+}
+//------------------------------------------------------------------------------
+
+inline cInt Abs(cInt val)
+{
+  return val < 0 ? -val : val;
+}
+
+//------------------------------------------------------------------------------
+// PolyTree methods ...
+//------------------------------------------------------------------------------
+
+void PolyTree::Clear()
+{
+    for (PolyNodes::size_type i = 0; i < AllNodes.size(); ++i)
+      delete AllNodes[i];
+    AllNodes.resize(0); 
+    Childs.resize(0);
+}
+//------------------------------------------------------------------------------
+
+PolyNode* PolyTree::GetFirst() const
+{
+  if (!Childs.empty())
+      return Childs[0];
+  else
+      return nullptr;
+}
+//------------------------------------------------------------------------------
+
+int PolyTree::Total() const
+{
+  int result = (int)AllNodes.size();
+  //with negative offsets, ignore the hidden outer polygon ...
+  if (result > 0 && Childs[0] != AllNodes[0]) result--;
+  return result;
+}
+
+//------------------------------------------------------------------------------
+// PolyNode methods ...
+//------------------------------------------------------------------------------
+
+PolyNode::PolyNode() 
+  : Contour()
+  , Childs()
+  , Parent(nullptr)
+  , Index(0)
+  , m_IsOpen(false)
+  , m_jointype(JoinType::jtSquare)
+  , m_endtype(EndType::etClosedPolygon)
+{
+}
+//------------------------------------------------------------------------------
+
+int PolyNode::ChildCount() const
+{
+  return (int)Childs.size();
+}
+//------------------------------------------------------------------------------
+
+void PolyNode::AddChild(PolyNode& child)
+{
+  unsigned cnt = (unsigned)Childs.size();
+  Childs.emplace_back(&child);
+  child.Parent = this;
+  child.Index = cnt;
+}
+//------------------------------------------------------------------------------
+
+PolyNode* PolyNode::GetNext() const
+{ 
+  if (!Childs.empty()) 
+      return Childs[0]; 
+  else
+      return GetNextSiblingUp();    
+}  
+//------------------------------------------------------------------------------
+
+PolyNode* PolyNode::GetNextSiblingUp() const
+{ 
+  if (!Parent) //protects against PolyTree.GetNextSiblingUp()
+      return nullptr;
+  else if (Index == Parent->Childs.size() - 1)
+      return Parent->GetNextSiblingUp();
+  else
+      return Parent->Childs[Index + 1];
+}  
+//------------------------------------------------------------------------------
+
+bool PolyNode::IsHole() const
+{ 
+  bool result = true;
+  PolyNode* node = Parent;
+  while (node)
+  {
+      result = !result;
+      node = node->Parent;
+  }
+  return result;
+}  
+//------------------------------------------------------------------------------
+
+bool PolyNode::IsOpen() const
+{ 
+  return m_IsOpen;
+}  
+//------------------------------------------------------------------------------
+
+#ifndef use_int32
+
+//------------------------------------------------------------------------------
+// Int128 class (enables safe math on signed 64bit integers)
+// eg Int128 val1((long64)9223372036854775807); //ie 2^63 -1
+//    Int128 val2((long64)9223372036854775807);
+//    Int128 val3 = val1 * val2;
+//    val3.AsString => "85070591730234615847396907784232501249" (8.5e+37)
+//------------------------------------------------------------------------------
+
+class Int128
+{
+  public:
+    ulong64 lo = 0;
+    long64 hi = 0;
+
+    Int128() = default;
+    explicit Int128(long64 _lo)
+      : lo(_lo), hi(_lo < 0 ? -1 : 0)
+    {}
+
+    explicit Int128(const long64& _hi, const ulong64& _lo)
+      : lo(_lo), hi(_hi)
+    {}
+    
+    Int128 & operator = (const long64 &val)
+    {
+      lo = (ulong64)val;
+      if (val < 0) hi = -1; else hi = 0;
+      return *this;
+    }
+
+    bool operator == (const Int128 &val) const
+      {return (hi == val.hi && lo == val.lo);}
+
+    bool operator != (const Int128 &val) const
+      { return !(*this == val);}
+
+    bool operator > (const Int128 &val) const
+    {
+      if (hi != val.hi)
+        return hi > val.hi;
+      else
+        return lo > val.lo;
+    }
+
+    bool operator < (const Int128 &val) const
+    {
+      if (hi != val.hi)
+        return hi < val.hi;
+      else
+        return lo < val.lo;
+    }
+
+    bool operator >= (const Int128 &val) const
+      { return !(*this < val);}
+
+    bool operator <= (const Int128 &val) const
+      { return !(*this > val);}
+
+    Int128& operator += (const Int128 &rhs)
+    {
+      hi += rhs.hi;
+      lo += rhs.lo;
+      if (lo < rhs.lo) hi++;
+      return *this;
+    }
+
+    Int128 operator + (const Int128 &rhs) const
+    {
+      Int128 result(*this);
+      result+= rhs;
+      return result;
+    }
+
+    Int128& operator -= (const Int128 &rhs)
+    {
+      *this += -rhs;
+      return *this;
+    }
+
+    Int128 operator - (const Int128 &rhs) const
+    {
+      Int128 result(*this);
+      result -= rhs;
+      return result;
+    }
+
+    Int128 operator-() const //unary negation
+    {
+      if (lo == 0)
+        return Int128(-hi, 0);
+      else
+        return Int128(~hi, ~lo + 1);
+    }
+
+    operator double() const
+    {
+      const double shift64 = 18446744073709551616.0; //2^64
+      if (hi < 0)
+      {
+        if (lo == 0) return (double)hi * shift64;
+        else return -(double)(~lo + ~hi * shift64);
+      }
+      else
+        return (double)(lo + hi * shift64);
+    }
+
+};
+//------------------------------------------------------------------------------
+
+Int128 Int128Mul (long64 lhs, long64 rhs)
+{
+  bool negate = (lhs < 0) != (rhs < 0);
+
+  if (lhs < 0) lhs = -lhs;
+  ulong64 int1Hi = ulong64(lhs) >> 32;
+  ulong64 int1Lo = ulong64(lhs & 0xFFFFFFFF);
+
+  if (rhs < 0) rhs = -rhs;
+  ulong64 int2Hi = ulong64(rhs) >> 32;
+  ulong64 int2Lo = ulong64(rhs & 0xFFFFFFFF);
+
+  //nb: see comments in clipper.pas
+  ulong64 a = int1Hi * int2Hi;
+  ulong64 b = int1Lo * int2Lo;
+  ulong64 c = int1Hi * int2Lo + int1Lo * int2Hi;
+
+  Int128 tmp;
+  tmp.hi = long64(a + (c >> 32));
+  tmp.lo = long64(c << 32);
+  tmp.lo += long64(b);
+  if (tmp.lo < b) tmp.hi++;
+  if (negate) tmp = -tmp;
+  return tmp;
+};
+#endif
+
+//------------------------------------------------------------------------------
+// Miscellaneous global functions
+//------------------------------------------------------------------------------
+
+void Swap(cInt& val1, cInt& val2)
+{
+  cInt tmp = val1;
+  val1 = val2;
+  val2 = tmp;
+}
+//------------------------------------------------------------------------------
+bool Orientation(const Path &poly)
+{
+    return Area(poly) >= 0;
+}
+//------------------------------------------------------------------------------
+
+double Area(const Path &poly)
+{
+  int size = (int)poly.size();
+  if (size < 3) return 0;
+
+  double a = 0;
+  for (int i = 0, j = size -1; i < size; ++i)
+  {
+    a += ((double)poly[j].X + poly[i].X) * ((double)poly[j].Y - poly[i].Y);
+    j = i;
+  }
+  return -a * 0.5;
+}
+//------------------------------------------------------------------------------
+
+double Area(const OutRec &outRec)
+{
+  OutPt *op = outRec.Pts;
+  if (!op) return 0;
+  double a = 0;
+  do {
+    a +=  (double)(op->Prev->Pt.X + op->Pt.X) * (double)(op->Prev->Pt.Y - op->Pt.Y);
+    op = op->Next;
+  } while (op != outRec.Pts);
+  return a * 0.5;
+}
+//------------------------------------------------------------------------------
+
+bool PointIsVertex(const IntPoint &Pt, OutPt *pp)
+{
+  OutPt *pp2 = pp;
+  do
+  {
+    if (pp2->Pt == Pt) return true;
+    pp2 = pp2->Next;
+  }
+  while (pp2 != pp);
+  return false;
+}
+//------------------------------------------------------------------------------
+
+int PointInPolygon (const IntPoint &pt, const Path &path)
+{
+  //returns 0 if false, +1 if true, -1 if pt ON polygon boundary
+  //See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos
+  //http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf
+  int result = 0;
+  size_t cnt = path.size();
+  if (cnt < 3) return 0;
+  IntPoint ip = path[0];
+  for(size_t i = 1; i <= cnt; ++i)
+  {
+    IntPoint ipNext = (i == cnt ? path[0] : path[i]);
+    if (ipNext.Y == pt.Y)
+    {
+        if ((ipNext.X == pt.X) || (ip.Y == pt.Y && 
+          ((ipNext.X > pt.X) == (ip.X < pt.X)))) return -1;
+    }
+    if ((ip.Y < pt.Y) != (ipNext.Y < pt.Y))
+    {
+      if (ip.X >= pt.X)
+      {
+        if (ipNext.X > pt.X) result = 1 - result;
+        else
+        {
+          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - 
+            (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
+          if (!d) return -1;
+          if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result;
+        }
+      } else
+      {
+        if (ipNext.X > pt.X)
+        {
+          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - 
+            (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
+          if (!d) return -1;
+          if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result;
+        }
+      }
+    }
+    ip = ipNext;
+  } 
+  return result;
+}
+//------------------------------------------------------------------------------
+
+int PointInPolygon (const IntPoint &pt, OutPt *op)
+{
+  //returns 0 if false, +1 if true, -1 if pt ON polygon boundary
+  int result = 0;
+  OutPt* startOp = op;
+  for(;;)
+  {
+    if (op->Next->Pt.Y == pt.Y)
+    {
+        if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y && 
+          ((op->Next->Pt.X > pt.X) == (op->Pt.X < pt.X)))) return -1;
+    }
+    if ((op->Pt.Y < pt.Y) != (op->Next->Pt.Y < pt.Y))
+    {
+      if (op->Pt.X >= pt.X)
+      {
+        if (op->Next->Pt.X > pt.X) result = 1 - result;
+        else
+        {
+          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - 
+            (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
+          if (!d) return -1;
+          if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result;
+        }
+      } else
+      {
+        if (op->Next->Pt.X > pt.X)
+        {
+          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - 
+            (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
+          if (!d) return -1;
+          if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result;
+        }
+      }
+    } 
+    op = op->Next;
+    if (startOp == op) break;
+  } 
+  return result;
+}
+//------------------------------------------------------------------------------
+
+bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2)
+{
+  OutPt* op = OutPt1;
+  do
+  {
+    //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon
+    int res = PointInPolygon(op->Pt, OutPt2);
+    if (res >= 0) return res > 0;
+    op = op->Next; 
+  }
+  while (op != OutPt1);
+  return true; 
+}
+//----------------------------------------------------------------------
+
+bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range)
+{
+#ifndef use_int32
+  if (UseFullInt64Range)
+    return Int128Mul(e1.Delta.Y, e2.Delta.X) == Int128Mul(e1.Delta.X, e2.Delta.Y);
+  else 
+#endif
+    return e1.Delta.Y * e2.Delta.X == e1.Delta.X * e2.Delta.Y;
+}
+//------------------------------------------------------------------------------
+
+bool SlopesEqual(const IntPoint & pt1, const IntPoint & pt2,
+  const IntPoint &pt3, bool UseFullInt64Range)
+{
+#ifndef use_int32
+  if (UseFullInt64Range)
+    return Int128Mul(pt1.Y-pt2.Y, pt2.X-pt3.X) == Int128Mul(pt1.X-pt2.X, pt2.Y-pt3.Y);
+  else 
+#endif
+    return (pt1.Y-pt2.Y)*(pt2.X-pt3.X) == (pt1.X-pt2.X)*(pt2.Y-pt3.Y);
+}
+//------------------------------------------------------------------------------
+
+bool SlopesEqual(const IntPoint & pt1, const IntPoint & pt2,
+  const IntPoint & pt3, const IntPoint & pt4, bool UseFullInt64Range)
+{
+#ifndef use_int32
+  if (UseFullInt64Range)
+    return Int128Mul(pt1.Y-pt2.Y, pt3.X-pt4.X) == Int128Mul(pt1.X-pt2.X, pt3.Y-pt4.Y);
+  else 
+#endif
+    return (pt1.Y-pt2.Y)*(pt3.X-pt4.X) == (pt1.X-pt2.X)*(pt3.Y-pt4.Y);
+}
+//------------------------------------------------------------------------------
+
+inline bool IsHorizontal(const TEdge &e)
+{
+  return e.Delta.Y == 0;
+}
+//------------------------------------------------------------------------------
+
+inline double GetDx(const IntPoint & pt1, const IntPoint & pt2)
+{
+  return (pt1.Y == pt2.Y) ?
+    HORIZONTAL : (double)(pt2.X - pt1.X) / (pt2.Y - pt1.Y);
+}
+//---------------------------------------------------------------------------
+
+inline void SetDx(TEdge &e)
+{
+  e.Delta.X = (e.Top.X - e.Bot.X);
+  e.Delta.Y = (e.Top.Y - e.Bot.Y);
+
+  if (e.Delta.Y == 0) e.Dx = HORIZONTAL;
+  else e.Dx = (double)(e.Delta.X) / e.Delta.Y;
+}
+//---------------------------------------------------------------------------
+
+inline void SwapSides(TEdge &Edge1, TEdge &Edge2)
+{
+  EdgeSide Side =  Edge1.Side;
+  Edge1.Side = Edge2.Side;
+  Edge2.Side = Side;
+}
+//------------------------------------------------------------------------------
+
+inline void SwapPolyIndexes(TEdge &Edge1, TEdge &Edge2)
+{
+  int OutIdx =  Edge1.OutIdx;
+  Edge1.OutIdx = Edge2.OutIdx;
+  Edge2.OutIdx = OutIdx;
+}
+//------------------------------------------------------------------------------
+
+inline cInt TopX(const TEdge &edge, const cInt currentY)
+{
+  return ( currentY == edge.Top.Y ) ?
+    edge.Top.X : edge.Bot.X + Round(edge.Dx *(currentY - edge.Bot.Y));
+}
+//------------------------------------------------------------------------------
+
+void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
+{
+#ifdef use_xyz  
+  ip.Z = 0;
+#endif
+
+  double b1, b2;
+  if (Edge1.Dx == Edge2.Dx)
+  {
+    ip.Y = Edge1.Curr.Y;
+    ip.X = TopX(Edge1, ip.Y);
+    return;
+  }
+  else if (Edge1.Delta.X == 0)
+  {
+    ip.X = Edge1.Bot.X;
+    if (IsHorizontal(Edge2))
+      ip.Y = Edge2.Bot.Y;
+    else
+    {
+      b2 = Edge2.Bot.Y - (Edge2.Bot.X / Edge2.Dx);
+      ip.Y = Round(ip.X / Edge2.Dx + b2);
+    }
+  }
+  else if (Edge2.Delta.X == 0)
+  {
+    ip.X = Edge2.Bot.X;
+    if (IsHorizontal(Edge1))
+      ip.Y = Edge1.Bot.Y;
+    else
+    {
+      b1 = Edge1.Bot.Y - (Edge1.Bot.X / Edge1.Dx);
+      ip.Y = Round(ip.X / Edge1.Dx + b1);
+    }
+  } 
+  else 
+  {
+    b1 = Edge1.Bot.X - Edge1.Bot.Y * Edge1.Dx;
+    b2 = Edge2.Bot.X - Edge2.Bot.Y * Edge2.Dx;
+    double q = (b2-b1) / (Edge1.Dx - Edge2.Dx);
+    ip.Y = Round(q);
+    if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx))
+      ip.X = Round(Edge1.Dx * q + b1);
+    else 
+      ip.X = Round(Edge2.Dx * q + b2);
+  }
+
+  if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y) 
+  {
+    if (Edge1.Top.Y > Edge2.Top.Y)
+      ip.Y = Edge1.Top.Y;
+    else
+      ip.Y = Edge2.Top.Y;
+    if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx))
+      ip.X = TopX(Edge1, ip.Y);
+    else
+      ip.X = TopX(Edge2, ip.Y);
+  } 
+  //finally, don't allow 'ip' to be BELOW curr.Y (ie bottom of scanbeam) ...
+  if (ip.Y > Edge1.Curr.Y)
+  {
+    ip.Y = Edge1.Curr.Y;
+    //use the more vertical edge to derive X ...
+    if (std::fabs(Edge1.Dx) > std::fabs(Edge2.Dx))
+      ip.X = TopX(Edge2, ip.Y); else
+      ip.X = TopX(Edge1, ip.Y);
+  }
+}
+//------------------------------------------------------------------------------
+
+void ReversePolyPtLinks(OutPt *pp)
+{
+  if (!pp) return;
+  OutPt *pp1, *pp2;
+  pp1 = pp;
+  do {
+  pp2 = pp1->Next;
+  pp1->Next = pp1->Prev;
+  pp1->Prev = pp2;
+  pp1 = pp2;
+  } while( pp1 != pp );
+}
+//------------------------------------------------------------------------------
+
+void DisposeOutPts(OutPt*& pp)
+{
+  if (pp == nullptr) return;
+  pp->Prev->Next = nullptr;
+  while( pp )
+  {
+    OutPt *tmpPp = pp;
+    pp = pp->Next;
+    delete tmpPp;
+  }
+}
+//------------------------------------------------------------------------------
+
+inline void InitEdge(TEdge* e, TEdge* eNext, TEdge* ePrev, const IntPoint& Pt)
+{
+  #ifdef USE_MEMSET
+  std::memset(e, 0, sizeof(TEdge));
+  #else
+    e->init();
+  #endif
+  e->Next = eNext;
+  e->Prev = ePrev;
+  e->Curr = Pt;
+  e->OutIdx = Unassigned;
+}
+//------------------------------------------------------------------------------
+
+void InitEdge2(TEdge& e, PolyType Pt)
+{
+  if (e.Curr.Y >= e.Next->Curr.Y)
+  {
+    e.Bot = e.Curr;
+    e.Top = e.Next->Curr;
+  } else
+  {
+    e.Top = e.Curr;
+    e.Bot = e.Next->Curr;
+  }
+  SetDx(e);
+  e.PolyTyp = Pt;
+}
+//------------------------------------------------------------------------------
+
+TEdge* RemoveEdge(TEdge* e)
+{
+  //removes e from double_linked_list (but without removing from memory)
+  e->Prev->Next = e->Next;
+  e->Next->Prev = e->Prev;
+  TEdge* result = e->Next;
+  e->Prev = nullptr; //flag as removed (see ClipperBase.Clear)
+  return result;
+}
+//------------------------------------------------------------------------------
+
+inline void ReverseHorizontal(TEdge &e)
+{
+  //swap horizontal edges' Top and Bottom x's so they follow the natural
+  //progression of the bounds - ie so their xbots will align with the
+  //adjoining lower edge. [Helpful in the ProcessHorizontal() method.]
+  Swap(e.Top.X, e.Bot.X);
+#ifdef use_xyz  
+  Swap(e.Top.Z, e.Bot.Z);
+#endif
+}
+//------------------------------------------------------------------------------
+
+void SwapPoints(IntPoint &pt1, IntPoint &pt2)
+{
+  IntPoint tmp = pt1;
+  pt1 = pt2;
+  pt2 = tmp;
+}
+//------------------------------------------------------------------------------
+
+bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a,
+  IntPoint pt2b, IntPoint &pt1, IntPoint &pt2)
+{
+  //precondition: segments are Collinear.
+  if (Abs(pt1a.X - pt1b.X) > Abs(pt1a.Y - pt1b.Y))
+  {
+    if (pt1a.X > pt1b.X) SwapPoints(pt1a, pt1b);
+    if (pt2a.X > pt2b.X) SwapPoints(pt2a, pt2b);
+    if (pt1a.X > pt2a.X) pt1 = pt1a; else pt1 = pt2a;
+    if (pt1b.X < pt2b.X) pt2 = pt1b; else pt2 = pt2b;
+    return pt1.X < pt2.X;
+  } else
+  {
+    if (pt1a.Y < pt1b.Y) SwapPoints(pt1a, pt1b);
+    if (pt2a.Y < pt2b.Y) SwapPoints(pt2a, pt2b);
+    if (pt1a.Y < pt2a.Y) pt1 = pt1a; else pt1 = pt2a;
+    if (pt1b.Y > pt2b.Y) pt2 = pt1b; else pt2 = pt2b;
+    return pt1.Y > pt2.Y;
+  }
+}
+//------------------------------------------------------------------------------
+
+bool FirstIsBottomPt(const OutPt* btmPt1, const OutPt* btmPt2)
+{
+  OutPt *p = btmPt1->Prev;
+  while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Prev;
+  double dx1p = std::fabs(GetDx(btmPt1->Pt, p->Pt));
+  p = btmPt1->Next;
+  while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Next;
+  double dx1n = std::fabs(GetDx(btmPt1->Pt, p->Pt));
+
+  p = btmPt2->Prev;
+  while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Prev;
+  double dx2p = std::fabs(GetDx(btmPt2->Pt, p->Pt));
+  p = btmPt2->Next;
+  while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Next;
+  double dx2n = std::fabs(GetDx(btmPt2->Pt, p->Pt));
+  return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n);
+}
+//------------------------------------------------------------------------------
+
+OutPt* GetBottomPt(OutPt *pp)
+{
+  OutPt* dups = nullptr;
+  OutPt* p = pp->Next;
+  while (p != pp)
+  {
+    if (p->Pt.Y > pp->Pt.Y)
+    {
+      pp = p;
+      dups = nullptr;
+    }
+    else if (p->Pt.Y == pp->Pt.Y && p->Pt.X <= pp->Pt.X)
+    {
+      if (p->Pt.X < pp->Pt.X)
+      {
+        dups = nullptr;
+        pp = p;
+      } else
+      {
+        if (p->Next != pp && p->Prev != pp) dups = p;
+      }
+    }
+    p = p->Next;
+  }
+  if (dups)
+  {
+    //there appears to be at least 2 vertices at BottomPt so ...
+    while (dups != p)
+    {
+      if (!FirstIsBottomPt(p, dups)) pp = dups;
+      dups = dups->Next;
+      while (dups->Pt != pp->Pt) dups = dups->Next;
+    }
+  }
+  return pp;
+}
+//------------------------------------------------------------------------------
+
+bool Pt2IsBetweenPt1AndPt3(const IntPoint & pt1,
+  const IntPoint & pt2, const IntPoint & pt3)
+{
+  if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2))
+    return false;
+  else if (pt1.X != pt3.X)
+    return (pt2.X > pt1.X) == (pt2.X < pt3.X);
+  else
+    return (pt2.Y > pt1.Y) == (pt2.Y < pt3.Y);
+}
+//------------------------------------------------------------------------------
+
+bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b)
+{
+  if (seg1a > seg1b) Swap(seg1a, seg1b);
+  if (seg2a > seg2b) Swap(seg2a, seg2b);
+  return (seg1a < seg2b) && (seg2a < seg1b);
+}
+
+//------------------------------------------------------------------------------
+// ClipperBase class methods ...
+//------------------------------------------------------------------------------
+
+
+ClipperBase::ClipperBase() : m_MinimaList(), m_UseFullRange(false), m_edges(), m_PreserveCollinear(false), m_HasOpenPaths(false)
+{
+  m_CurrentLM = m_MinimaList.begin(); //begin() == end() here
+}
+//------------------------------------------------------------------------------
+
+ClipperBase::~ClipperBase() //destructor
+{
+  Clear();
+}
+//------------------------------------------------------------------------------
+
+void RangeTest(const IntPoint& Pt, bool& useFullRange)
+{
+  if (useFullRange)
+  {
+    if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange) 
+      throw "Coordinate outside allowed range";
+  }
+  else if (Pt.X > loRange|| Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange) 
+  {
+    useFullRange = true;
+    RangeTest(Pt, useFullRange);
+  }
+}
+//------------------------------------------------------------------------------
+
+TEdge* FindNextLocMin(TEdge* E)
+{
+  for (;;)
+  {
+    while (E->Bot != E->Prev->Bot || E->Curr == E->Top) E = E->Next;
+    if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev)) break;
+    while (IsHorizontal(*E->Prev)) E = E->Prev;
+    TEdge* E2 = E;
+    while (IsHorizontal(*E)) E = E->Next;
+    if (E->Top.Y == E->Prev->Bot.Y) continue; //ie just an intermediate horz.
+    if (E2->Prev->Bot.X < E->Bot.X) E = E2;
+    break;
+  }
+  return E;
+}
+//------------------------------------------------------------------------------
+
+TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
+{
+  TEdge *Result = E;
+  TEdge *Horz = nullptr;
+
+  if (E->OutIdx == Skip)
+  {
+    //if edges still remain in the current bound beyond the skip edge then
+    //create another LocMin and call ProcessBound once more
+    if (NextIsForward)
+    {
+      while (E->Top.Y == E->Next->Bot.Y) E = E->Next;
+      //don't include top horizontals when parsing a bound a second time,
+      //they will be contained in the opposite bound ...
+      while (E != Result && IsHorizontal(*E)) E = E->Prev;
+    }
+    else
+    {
+      while (E->Top.Y == E->Prev->Bot.Y) E = E->Prev;
+      while (E != Result && IsHorizontal(*E)) E = E->Next;
+    }
+
+    if (E == Result)
+    {
+      if (NextIsForward) Result = E->Next;
+      else Result = E->Prev;
+    }
+    else
+    {
+      //there are more edges in the bound beyond result starting with E
+      if (NextIsForward)
+        E = Result->Next;
+      else
+        E = Result->Prev;
+      MinimaList::value_type locMin;
+      locMin.Y = E->Bot.Y;
+      locMin.LeftBound = nullptr;
+      locMin.RightBound = E;
+      E->WindDelta = 0;
+      Result = ProcessBound(E, NextIsForward);
+      m_MinimaList.emplace_back(locMin);
+    }
+    return Result;
+  }
+
+  TEdge *EStart;
+
+  if (IsHorizontal(*E))
+  {
+    //We need to be careful with open paths because this may not be a
+    //true local minima (ie E may be following a skip edge).
+    //Also, consecutive horz. edges may start heading left before going right.
+    if (NextIsForward) 
+      EStart = E->Prev;
+    else 
+      EStart = E->Next;
+    if (EStart->OutIdx != Skip)
+    {
+      if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge
+      {
+        if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X)
+          ReverseHorizontal(*E);
+      }
+      else if (EStart->Bot.X != E->Bot.X)
+        ReverseHorizontal(*E);
+    }
+  }
+  
+  EStart = E;
+  if (NextIsForward)
+  {
+    while (Result->Top.Y == Result->Next->Bot.Y && Result->Next->OutIdx != Skip)
+      Result = Result->Next;
+    if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip)
+    {
+      //nb: at the top of a bound, horizontals are added to the bound
+      //only when the preceding edge attaches to the horizontal's left vertex
+      //unless a Skip edge is encountered when that becomes the top divide
+      Horz = Result;
+      while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev;
+      if (Horz->Prev->Top.X == Result->Next->Top.X) 
+      {
+        if (!NextIsForward) Result = Horz->Prev;
+      }
+      else if (Horz->Prev->Top.X > Result->Next->Top.X) Result = Horz->Prev;
+    }
+    while (E != Result) 
+    {
+      E->NextInLML = E->Next;
+      if (IsHorizontal(*E) && E != EStart &&
+        E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E);
+      E = E->Next;
+    }
+    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X) 
+      ReverseHorizontal(*E);
+    Result = Result->Next; //move to the edge just beyond current bound
+  } else
+  {
+    while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip) 
+      Result = Result->Prev;
+    if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip)
+    {
+      Horz = Result;
+      while (IsHorizontal(*Horz->Next)) Horz = Horz->Next;
+      if (Horz->Next->Top.X == Result->Prev->Top.X) 
+      {
+        if (!NextIsForward) Result = Horz->Next;
+      }
+      else if (Horz->Next->Top.X > Result->Prev->Top.X) Result = Horz->Next;
+    }
+
+    while (E != Result)
+    {
+      E->NextInLML = E->Prev;
+      if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) 
+        ReverseHorizontal(*E);
+      E = E->Prev;
+    }
+    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) 
+      ReverseHorizontal(*E);
+    Result = Result->Prev; //move to the edge just beyond current bound
+  }
+
+  return Result;
+}
+//------------------------------------------------------------------------------
+
+bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
+{
+#ifdef use_lines
+  if (!Closed && PolyTyp == ptClip)
+    throw clipperException("AddPath: Open paths must be subject.");
+#else
+  if (!Closed)
+    throw clipperException("AddPath: Open paths have been disabled.");
+#endif
+
+  int highI = (int)pg.size() -1;
+  if (Closed) while (highI > 0 && (pg[highI] == pg[0])) --highI;
+  while (highI > 0 && (pg[highI] == pg[highI -1])) --highI;
+  if ((Closed && highI < 2) || (!Closed && highI < 1)) return false;
+
+  //create a new edge array ...
+  TEdge *edges = new TEdge [highI +1];
+
+  bool IsFlat = true;
+  //1. Basic (first) edge initialization ...
+  try
+  {
+    edges[1].Curr = pg[1];
+    RangeTest(pg[0], m_UseFullRange);
+    RangeTest(pg[highI], m_UseFullRange);
+    InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]);
+    InitEdge(&edges[highI], &edges[0], &edges[highI-1], pg[highI]);
+    for (int i = highI - 1; i >= 1; --i)
+    {
+      RangeTest(pg[i], m_UseFullRange);
+      InitEdge(&edges[i], &edges[i+1], &edges[i-1], pg[i]);
+    }
+  }
+  catch(...)
+  {
+    delete [] edges;
+    throw; //range test fails
+  }
+  TEdge *eStart = &edges[0];
+
+  //2. Remove duplicate vertices, and (when closed) collinear edges ...
+  TEdge *E = eStart, *eLoopStop = eStart;
+  for (;;)
+  {
+    //nb: allows matching start and end points when not Closed ...
+    if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart))
+    {
+      if (E == E->Next) break;
+      if (E == eStart) eStart = E->Next;
+      E = RemoveEdge(E);
+      eLoopStop = E;
+      continue;
+    }
+    if (E->Prev == E->Next) 
+      break; //only two vertices
+    else if (Closed &&
+      SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) && 
+      (!m_PreserveCollinear ||
+      !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr)))
+    {
+      //Collinear edges are allowed for open paths but in closed paths
+      //the default is to merge adjacent collinear edges into a single edge.
+      //However, if the PreserveCollinear property is enabled, only overlapping
+      //collinear edges (ie spikes) will be removed from closed paths.
+      if (E == eStart) eStart = E->Next;
+      E = RemoveEdge(E);
+      E = E->Prev;
+      eLoopStop = E;
+      continue;
+    }
+    E = E->Next;
+    if ((E == eLoopStop) || (!Closed && E->Next == eStart)) break;
+  }
+
+  if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next)))
+  {
+    delete [] edges;
+    return false;
+  }
+
+  if (!Closed)
+  { 
+    m_HasOpenPaths = true;
+    eStart->Prev->OutIdx = Skip;
+  }
+
+  //3. Do second stage of edge initialization ...
+  E = eStart;
+  do
+  {
+    InitEdge2(*E, PolyTyp);
+    E = E->Next;
+    if (IsFlat && E->Curr.Y != eStart->Curr.Y) IsFlat = false;
+  }
+  while (E != eStart);
+
+  //4. Finally, add edge bounds to LocalMinima list ...
+
+  //Totally flat paths must be handled differently when adding them
+  //to LocalMinima list to avoid endless loops etc ...
+  if (IsFlat) 
+  {
+    if (Closed) 
+    {
+      delete [] edges;
+      return false;
+    }
+    E->Prev->OutIdx = Skip;
+    if (E->Prev->Bot.X < E->Prev->Top.X) ReverseHorizontal(*E->Prev);
+    MinimaList::value_type locMin;
+    locMin.Y = E->Bot.Y;
+    locMin.LeftBound = nullptr;
+    locMin.RightBound = E;
+    locMin.RightBound->Side = esRight;
+    locMin.RightBound->WindDelta = 0;
+    while (E->Next->OutIdx != Skip)
+    {
+      E->NextInLML = E->Next;
+      if (E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E);
+      E = E->Next;
+    }
+    m_MinimaList.emplace_back(locMin);
+    m_edges.emplace_back(edges);
+     return true;
+  }
+
+  m_edges.emplace_back(edges);
+  bool leftBoundIsForward;
+  TEdge* EMin = nullptr;
+
+  //workaround to avoid an endless loop in the while loop below when
+  //open paths have matching start and end points ...
+  if (E->Prev->Bot == E->Prev->Top) E = E->Next;
+
+  for (;;)
+  {
+    E = FindNextLocMin(E);
+    if (E == EMin) break;
+    else if (!EMin) EMin = E;
+
+    //E and E.Prev now share a local minima (left aligned if horizontal).
+    //Compare their slopes to find which starts which bound ...
+    MinimaList::value_type locMin;
+    locMin.Y = E->Bot.Y;
+    if (E->Dx < E->Prev->Dx) 
+    {
+      locMin.LeftBound = E->Prev;
+      locMin.RightBound = E;
+      leftBoundIsForward = false; //Q.nextInLML = Q.prev
+    } else
+    {
+      locMin.LeftBound = E;
+      locMin.RightBound = E->Prev;
+      leftBoundIsForward = true; //Q.nextInLML = Q.next
+    }
+    locMin.LeftBound->Side = esLeft;
+    locMin.RightBound->Side = esRight;
+
+    if (!Closed) locMin.LeftBound->WindDelta = 0;
+    else if (locMin.LeftBound->Next == locMin.RightBound)
+      locMin.LeftBound->WindDelta = -1;
+    else locMin.LeftBound->WindDelta = 1;
+    locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta;
+
+    E = ProcessBound(locMin.LeftBound, leftBoundIsForward);
+    if (E->OutIdx == Skip) E = ProcessBound(E, leftBoundIsForward);
+
+    TEdge* E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward);
+    if (E2->OutIdx == Skip) E2 = ProcessBound(E2, !leftBoundIsForward);
+
+    if (locMin.LeftBound->OutIdx == Skip)
+      locMin.LeftBound = nullptr;
+    else if (locMin.RightBound->OutIdx == Skip)
+      locMin.RightBound = nullptr;
+    m_MinimaList.emplace_back(locMin);
+    if (!leftBoundIsForward) E = E2;
+  }
+  return true;
+}
+//------------------------------------------------------------------------------
+
+bool ClipperBase::AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed)
+{
+  bool result = false;
+  for (Paths::size_type i = 0; i < ppg.size(); ++i)
+    if (AddPath(ppg[i], PolyTyp, Closed)) result = true;
+  return result;
+}
+//------------------------------------------------------------------------------
+
+void ClipperBase::Clear()
+{
+  DisposeLocalMinimaList();
+  for (EdgeList::size_type i = 0; i < m_edges.size(); ++i)
+  {
+    //for each edge array in turn, find the first used edge and 
+    //check for and remove any hiddenPts in each edge in the array.
+    TEdge* edges = m_edges[i];
+    delete [] edges;
+  }
+  m_edges.clear();
+  m_UseFullRange = false;
+  m_HasOpenPaths = false;
+}
+//------------------------------------------------------------------------------
+
+void ClipperBase::Reset()
+{
+  m_CurrentLM = m_MinimaList.begin();
+  if (m_CurrentLM == m_MinimaList.end()) return; //ie nothing to process
+  std::sort(m_MinimaList.begin(), m_MinimaList.end(), LocMinSorter());
+
+  //reset all edges ...
+  for (MinimaList::iterator lm = m_MinimaList.begin(); lm != m_MinimaList.end(); ++lm)
+  {
+    TEdge* e = lm->LeftBound;
+    if (e)
+    {
+      e->Curr = e->Bot;
+      e->Side = esLeft;
+      e->OutIdx = Unassigned;
+    }
+
+    e = lm->RightBound;
+    if (e)
+    {
+      e->Curr = e->Bot;
+      e->Side = esRight;
+      e->OutIdx = Unassigned;
+    }
+  }
+}
+//------------------------------------------------------------------------------
+
+void ClipperBase::DisposeLocalMinimaList()
+{
+  m_MinimaList.clear();
+  m_CurrentLM = m_MinimaList.begin();
+}
+//------------------------------------------------------------------------------
+
+void ClipperBase::PopLocalMinima()
+{
+  if (m_CurrentLM == m_MinimaList.end()) return;
+  ++m_CurrentLM;
+}
+//------------------------------------------------------------------------------
+
+IntRect ClipperBase::GetBounds()
+{
+  IntRect result;
+  MinimaList::iterator lm = m_MinimaList.begin();
+  if (lm == m_MinimaList.end())
+  {
+    result.left = result.top = result.right = result.bottom = 0;
+    return result;
+  }
+  result.left = lm->LeftBound->Bot.X;
+  result.top = lm->LeftBound->Bot.Y;
+  result.right = lm->LeftBound->Bot.X;
+  result.bottom = lm->LeftBound->Bot.Y;
+  while (lm != m_MinimaList.end())
+  {
+    result.bottom = std::max(result.bottom, lm->LeftBound->Bot.Y);
+    TEdge* e = lm->LeftBound;
+    for (;;) {
+      TEdge* bottomE = e;
+      while (e->NextInLML)
+      {
+        if (e->Bot.X < result.left) result.left = e->Bot.X;
+        if (e->Bot.X > result.right) result.right = e->Bot.X;
+        e = e->NextInLML;
+      }
+      result.left = std::min(result.left, e->Bot.X);
+      result.right = std::max(result.right, e->Bot.X);
+      result.left = std::min(result.left, e->Top.X);
+      result.right = std::max(result.right, e->Top.X);
+      result.top = std::min(result.top, e->Top.Y);
+      if (bottomE == lm->LeftBound) e = lm->RightBound;
+      else break;
+    }
+    ++lm;
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+// TClipper methods ...
+//------------------------------------------------------------------------------
+
+Clipper::Clipper(int initOptions) 
+  : ClipperBase()
+  , m_PolyOuts()
+  , m_Joins()
+  , m_GhostJoins()
+  , m_IntersectList()
+  , m_ClipType(ClipType::ctIntersection)
+  , m_Scanbeam()
+  , m_ActiveEdges(nullptr)
+  , m_SortedEdges(nullptr)
+  , m_ExecuteLocked(false)
+  , m_ClipFillType(PolyFillType::pftEvenOdd)
+  , m_SubjFillType(PolyFillType::pftEvenOdd)
+  , m_ReverseOutput((initOptions & ioReverseSolution) != 0)
+  , m_UsingPolyTree(false)
+  , m_StrictSimple((initOptions & ioStrictlySimple) != 0)
+#ifdef use_xyz
+  , m_ZFill(nullptr) 
+#endif
+{
+  m_UseFullRange = false;
+  m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0);
+  m_HasOpenPaths = false;
+}
+//------------------------------------------------------------------------------
+
+Clipper::~Clipper() //destructor
+{
+  Clear();
+}
+//------------------------------------------------------------------------------
+
+#ifdef use_xyz  
+void Clipper::ZFillFunction(ZFillCallback zFillFunc)
+{  
+  m_ZFill = zFillFunc;
+}
+//------------------------------------------------------------------------------
+#endif
+
+void Clipper::Reset()
+{
+  ClipperBase::Reset();
+  m_Scanbeam = ScanbeamList();
+  m_ActiveEdges = nullptr;
+  m_SortedEdges = nullptr;
+  for (MinimaList::iterator lm = m_MinimaList.begin(); lm != m_MinimaList.end(); ++lm)
+    InsertScanbeam(lm->Y);
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::Execute(ClipType clipType, Paths &solution,
+    PolyFillType subjFillType, PolyFillType clipFillType)
+{
+  if( m_ExecuteLocked ) return false;
+  if (m_HasOpenPaths)
+    throw clipperException("Error: PolyTree struct is need for open path clipping.");
+  m_ExecuteLocked = true;
+  solution.resize(0);
+  m_SubjFillType = subjFillType;
+  m_ClipFillType = clipFillType;
+  m_ClipType = clipType;
+  m_UsingPolyTree = false;
+  bool succeeded = ExecuteInternal();
+  if (succeeded) BuildResult(solution);
+  DisposeAllOutRecs();
+  m_ExecuteLocked = false;
+  return succeeded;
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::Execute(ClipType clipType, PolyTree& polytree,
+    PolyFillType subjFillType, PolyFillType clipFillType)
+{
+  if( m_ExecuteLocked ) return false;
+  m_ExecuteLocked = true;
+  m_SubjFillType = subjFillType;
+  m_ClipFillType = clipFillType;
+  m_ClipType = clipType;
+  m_UsingPolyTree = true;
+  bool succeeded = ExecuteInternal();
+  if (succeeded) BuildResult2(polytree);
+  DisposeAllOutRecs();
+  m_ExecuteLocked = false;
+  return succeeded;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::FixHoleLinkage(OutRec &outrec)
+{
+  //skip OutRecs that (a) contain outermost polygons or
+  //(b) already have the correct owner/child linkage ...
+  if (!outrec.FirstLeft ||                
+      (outrec.IsHole != outrec.FirstLeft->IsHole &&
+      outrec.FirstLeft->Pts)) return;
+
+  OutRec* orfl = outrec.FirstLeft;
+  while (orfl && ((orfl->IsHole == outrec.IsHole) || !orfl->Pts))
+      orfl = orfl->FirstLeft;
+  outrec.FirstLeft = orfl;
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::ExecuteInternal()
+{
+  bool succeeded = true;
+  try {
+    Reset();
+    if (m_CurrentLM == m_MinimaList.end()) return true;
+    cInt botY = PopScanbeam();
+    do {
+      InsertLocalMinimaIntoAEL(botY);
+      ClearGhostJoins();
+      ProcessHorizontals(false);
+      if (m_Scanbeam.empty()) break;
+      cInt topY = PopScanbeam();
+      succeeded = ProcessIntersections(topY);
+      if (!succeeded) break;
+      ProcessEdgesAtTopOfScanbeam(topY);
+      botY = topY;
+    } while (!m_Scanbeam.empty() || m_CurrentLM != m_MinimaList.end());
+  }
+  catch(...) 
+  {
+    succeeded = false;
+  }
+
+  if (succeeded)
+  {
+    //fix orientations ...
+    for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+    {
+      OutRec *outRec = m_PolyOuts[i];
+      if (!outRec->Pts || outRec->IsOpen) continue;
+      if ((outRec->IsHole ^ m_ReverseOutput) == (Area(*outRec) > 0))
+        ReversePolyPtLinks(outRec->Pts);
+    }
+
+    if (!m_Joins.empty()) JoinCommonEdges();
+
+    //unfortunately FixupOutPolygon() must be done after JoinCommonEdges()
+    for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+    {
+      OutRec *outRec = m_PolyOuts[i];
+      if (outRec->Pts && !outRec->IsOpen)
+        FixupOutPolygon(*outRec);
+    }
+
+    if (m_StrictSimple) DoSimplePolygons();
+  }
+
+  ClearJoins();
+  ClearGhostJoins();
+  return succeeded;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::InsertScanbeam(const cInt Y)
+{
+  //if (!m_Scanbeam.empty() && Y == m_Scanbeam.top()) return;// avoid duplicates.
+  m_Scanbeam.push(Y);
+}
+//------------------------------------------------------------------------------
+
+cInt Clipper::PopScanbeam()
+{
+  const cInt Y = m_Scanbeam.top();
+  m_Scanbeam.pop();
+  while (!m_Scanbeam.empty() && Y == m_Scanbeam.top()) { m_Scanbeam.pop(); } // Pop duplicates.
+  return Y;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DisposeAllOutRecs(){
+  for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+    DisposeOutRec(i);
+  m_PolyOuts.clear();
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DisposeOutRec(PolyOutList::size_type index)
+{
+  OutRec *outRec = m_PolyOuts[index];
+  if (outRec->Pts) DisposeOutPts(outRec->Pts);
+  delete outRec;
+  m_PolyOuts[index] = nullptr;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::SetWindingCount(TEdge &edge) const
+{
+  TEdge *e = edge.PrevInAEL;
+  //find the edge of the same polytype that immediately preceeds 'edge' in AEL
+  while (e  && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL;
+  if (!e)
+  {
+    edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta);
+    edge.WindCnt2 = 0;
+    e = m_ActiveEdges; //ie get ready to calc WindCnt2
+  }   
+  else if (edge.WindDelta == 0 && m_ClipType != ctUnion)
+  {
+    edge.WindCnt = 1;
+    edge.WindCnt2 = e->WindCnt2;
+    e = e->NextInAEL; //ie get ready to calc WindCnt2
+  }
+  else if (IsEvenOddFillType(edge))
+  {
+    //EvenOdd filling ...
+    if (edge.WindDelta == 0)
+    {
+      //are we inside a subj polygon ...
+      bool Inside = true;
+      TEdge *e2 = e->PrevInAEL;
+      while (e2)
+      {
+        if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0) 
+          Inside = !Inside;
+        e2 = e2->PrevInAEL;
+      }
+      edge.WindCnt = (Inside ? 0 : 1);
+    }
+    else
+    {
+      edge.WindCnt = edge.WindDelta;
+    }
+    edge.WindCnt2 = e->WindCnt2;
+    e = e->NextInAEL; //ie get ready to calc WindCnt2
+  } 
+  else
+  {
+    //nonZero, Positive or Negative filling ...
+    if (e->WindCnt * e->WindDelta < 0)
+    {
+      //prev edge is 'decreasing' WindCount (WC) toward zero
+      //so we're outside the previous polygon ...
+      if (Abs(e->WindCnt) > 1)
+      {
+        //outside prev poly but still inside another.
+        //when reversing direction of prev poly use the same WC 
+        if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
+        //otherwise continue to 'decrease' WC ...
+        else edge.WindCnt = e->WindCnt + edge.WindDelta;
+      } 
+      else
+        //now outside all polys of same polytype so set own WC ...
+        edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta);
+    } else
+    {
+      //prev edge is 'increasing' WindCount (WC) away from zero
+      //so we're inside the previous polygon ...
+      if (edge.WindDelta == 0) 
+        edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1);
+      //if wind direction is reversing prev then use same WC
+      else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
+      //otherwise add to WC ...
+      else edge.WindCnt = e->WindCnt + edge.WindDelta;
+    }
+    edge.WindCnt2 = e->WindCnt2;
+    e = e->NextInAEL; //ie get ready to calc WindCnt2
+  }
+
+  //update WindCnt2 ...
+  if (IsEvenOddAltFillType(edge))
+  {
+    //EvenOdd filling ...
+    while (e != &edge)
+    {
+      if (e->WindDelta != 0)
+        edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0);
+      e = e->NextInAEL;
+    }
+  } else
+  {
+    //nonZero, Positive or Negative filling ...
+    while ( e != &edge )
+    {
+      edge.WindCnt2 += e->WindDelta;
+      e = e->NextInAEL;
+    }
+  }
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::IsEvenOddFillType(const TEdge& edge) const
+{
+  if (edge.PolyTyp == ptSubject)
+    return m_SubjFillType == pftEvenOdd; else
+    return m_ClipFillType == pftEvenOdd;
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::IsEvenOddAltFillType(const TEdge& edge) const
+{
+  if (edge.PolyTyp == ptSubject)
+    return m_ClipFillType == pftEvenOdd; else
+    return m_SubjFillType == pftEvenOdd;
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::IsContributing(const TEdge& edge) const
+{
+  PolyFillType pft, pft2;
+  if (edge.PolyTyp == ptSubject)
+  {
+    pft = m_SubjFillType;
+    pft2 = m_ClipFillType;
+  } else
+  {
+    pft = m_ClipFillType;
+    pft2 = m_SubjFillType;
+  }
+
+  switch(pft)
+  {
+    case pftEvenOdd: 
+      //return false if a subj line has been flagged as inside a subj polygon
+      if (edge.WindDelta == 0 && edge.WindCnt != 1) return false;
+      break;
+    case pftNonZero:
+      if (Abs(edge.WindCnt) != 1) return false;
+      break;
+    case pftPositive: 
+      if (edge.WindCnt != 1) return false;
+      break;
+    default: //pftNegative
+      if (edge.WindCnt != -1) return false;
+  }
+
+  switch(m_ClipType)
+  {
+    case ctIntersection:
+      switch(pft2)
+      {
+        case pftEvenOdd: 
+        case pftNonZero: 
+          return (edge.WindCnt2 != 0);
+        case pftPositive: 
+          return (edge.WindCnt2 > 0);
+        default: 
+          return (edge.WindCnt2 < 0);
+      }
+      break;
+    case ctUnion:
+      switch(pft2)
+      {
+        case pftEvenOdd: 
+        case pftNonZero: 
+          return (edge.WindCnt2 == 0);
+        case pftPositive: 
+          return (edge.WindCnt2 <= 0);
+        default: 
+          return (edge.WindCnt2 >= 0);
+      }
+      break;
+    case ctDifference:
+      if (edge.PolyTyp == ptSubject)
+        switch(pft2)
+        {
+          case pftEvenOdd: 
+          case pftNonZero: 
+            return (edge.WindCnt2 == 0);
+          case pftPositive: 
+            return (edge.WindCnt2 <= 0);
+          default: 
+            return (edge.WindCnt2 >= 0);
+        }
+      else
+        switch(pft2)
+        {
+          case pftEvenOdd: 
+          case pftNonZero: 
+            return (edge.WindCnt2 != 0);
+          case pftPositive: 
+            return (edge.WindCnt2 > 0);
+          default: 
+            return (edge.WindCnt2 < 0);
+        }
+      break;
+    case ctXor:
+      if (edge.WindDelta == 0) //XOr always contributing unless open
+        switch(pft2)
+        {
+          case pftEvenOdd: 
+          case pftNonZero: 
+            return (edge.WindCnt2 == 0);
+          case pftPositive: 
+            return (edge.WindCnt2 <= 0);
+          default: 
+            return (edge.WindCnt2 >= 0);
+        }
+      else 
+        return true;
+      break;
+    default:
+      return true;
+  }
+}
+//------------------------------------------------------------------------------
+
+OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
+{
+  OutPt* result;
+  TEdge *e, *prevE;
+  if (IsHorizontal(*e2) || ( e1->Dx > e2->Dx ))
+  {
+    result = AddOutPt(e1, Pt);
+    e2->OutIdx = e1->OutIdx;
+    e1->Side = esLeft;
+    e2->Side = esRight;
+    e = e1;
+    if (e->PrevInAEL == e2)
+      prevE = e2->PrevInAEL; 
+    else
+      prevE = e->PrevInAEL;
+  } else
+  {
+    result = AddOutPt(e2, Pt);
+    e1->OutIdx = e2->OutIdx;
+    e1->Side = esRight;
+    e2->Side = esLeft;
+    e = e2;
+    if (e->PrevInAEL == e1)
+        prevE = e1->PrevInAEL;
+    else
+        prevE = e->PrevInAEL;
+  }
+
+  if (prevE && prevE->OutIdx >= 0 &&
+      (TopX(*prevE, Pt.Y) == TopX(*e, Pt.Y)) &&
+      SlopesEqual(*e, *prevE, m_UseFullRange) &&
+      (e->WindDelta != 0) && (prevE->WindDelta != 0))
+  {
+    OutPt* outPt = AddOutPt(prevE, Pt);
+    AddJoin(result, outPt, e->Top);
+  }
+  return result;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
+{
+  AddOutPt( e1, Pt );
+  if (e2->WindDelta == 0) AddOutPt(e2, Pt);
+  if( e1->OutIdx == e2->OutIdx )
+  {
+    e1->OutIdx = Unassigned;
+    e2->OutIdx = Unassigned;
+  }
+  else if (e1->OutIdx < e2->OutIdx) 
+    AppendPolygon(e1, e2); 
+  else 
+    AppendPolygon(e2, e1);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::AddEdgeToSEL(TEdge *edge)
+{
+  //SEL pointers in PEdge are reused to build a list of horizontal edges.
+  //However, we don't need to worry about order with horizontal edge processing.
+  if( !m_SortedEdges )
+  {
+    m_SortedEdges = edge;
+    edge->PrevInSEL = nullptr;
+    edge->NextInSEL = nullptr;
+  }
+  else
+  {
+    edge->NextInSEL = m_SortedEdges;
+    edge->PrevInSEL = nullptr;
+    m_SortedEdges->PrevInSEL = edge;
+    m_SortedEdges = edge;
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::CopyAELToSEL()
+{
+  TEdge* e = m_ActiveEdges;
+  m_SortedEdges = e;
+  while ( e )
+  {
+    e->PrevInSEL = e->PrevInAEL;
+    e->NextInSEL = e->NextInAEL;
+    e = e->NextInAEL;
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::AddJoin(OutPt *op1, OutPt *op2, const IntPoint & OffPt)
+{
+  Join* j = new Join;
+  j->OutPt1 = op1;
+  j->OutPt2 = op2;
+  j->OffPt = OffPt;
+  m_Joins.emplace_back(j);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::ClearJoins()
+{
+  for (JoinList::size_type i = 0; i < m_Joins.size(); i++)
+    delete m_Joins[i];
+  m_Joins.resize(0);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::ClearGhostJoins()
+{
+  for (JoinList::size_type i = 0; i < m_GhostJoins.size(); i++)
+    delete m_GhostJoins[i];
+  m_GhostJoins.resize(0);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::AddGhostJoin(OutPt *op, const IntPoint & OffPt)
+{
+  Join* j = new Join;
+  j->OutPt1 = op;
+  j->OutPt2 = nullptr;
+  j->OffPt = OffPt;
+  m_GhostJoins.emplace_back(j);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
+{
+  while (m_CurrentLM != m_MinimaList.end() && (m_CurrentLM->Y == botY))
+  {
+    TEdge* lb = m_CurrentLM->LeftBound;
+    TEdge* rb = m_CurrentLM->RightBound;
+    PopLocalMinima();
+    OutPt *Op1 = nullptr;
+    if (!lb)
+    {
+      //nb: don't insert LB into either AEL or SEL
+      InsertEdgeIntoAEL(rb, nullptr);
+      SetWindingCount(*rb);
+      if (IsContributing(*rb))
+        Op1 = AddOutPt(rb, rb->Bot); 
+    } 
+    else if (!rb)
+    {
+      InsertEdgeIntoAEL(lb, nullptr);
+      SetWindingCount(*lb);
+      if (IsContributing(*lb))
+        Op1 = AddOutPt(lb, lb->Bot);
+      InsertScanbeam(lb->Top.Y);
+    }
+    else
+    {
+      InsertEdgeIntoAEL(lb, nullptr);
+      InsertEdgeIntoAEL(rb, lb);
+      SetWindingCount( *lb );
+      rb->WindCnt = lb->WindCnt;
+      rb->WindCnt2 = lb->WindCnt2;
+      if (IsContributing(*lb))
+        Op1 = AddLocalMinPoly(lb, rb, lb->Bot);      
+      InsertScanbeam(lb->Top.Y);
+    }
+
+     if (rb)
+     {
+       if(IsHorizontal(*rb)) AddEdgeToSEL(rb);
+       else InsertScanbeam( rb->Top.Y );
+     }
+
+    if (!lb || !rb) continue;
+
+    //if any output polygons share an edge, they'll need joining later ...
+    if (Op1 && IsHorizontal(*rb) && 
+      !m_GhostJoins.empty() && (rb->WindDelta != 0))
+    {
+      for (JoinList::size_type i = 0; i < m_GhostJoins.size(); ++i)
+      {
+        Join* jr = m_GhostJoins[i];
+        //if the horizontal Rb and a 'ghost' horizontal overlap, then convert
+        //the 'ghost' join to a real join ready for later ...
+        if (HorzSegmentsOverlap(jr->OutPt1->Pt.X, jr->OffPt.X, rb->Bot.X, rb->Top.X))
+          AddJoin(jr->OutPt1, Op1, jr->OffPt);
+      }
+    }
+
+    if (lb->OutIdx >= 0 && lb->PrevInAEL && 
+      lb->PrevInAEL->Curr.X == lb->Bot.X &&
+      lb->PrevInAEL->OutIdx >= 0 &&
+      SlopesEqual(*lb->PrevInAEL, *lb, m_UseFullRange) &&
+      (lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0))
+    {
+        OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot);
+        AddJoin(Op1, Op2, lb->Top);
+    }
+
+    if(lb->NextInAEL != rb)
+    {
+
+      if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 &&
+        SlopesEqual(*rb->PrevInAEL, *rb, m_UseFullRange) &&
+        (rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0))
+      {
+          OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot);
+          AddJoin(Op1, Op2, rb->Top);
+      }
+
+      TEdge* e = lb->NextInAEL;
+      if (e)
+      {
+        while( e != rb )
+        {
+          //nb: For calculating winding counts etc, IntersectEdges() assumes
+          //that param1 will be to the Right of param2 ABOVE the intersection ...
+          IntersectEdges(rb , e , lb->Curr); //order important here
+          e = e->NextInAEL;
+        }
+      }
+    }
+    
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DeleteFromAEL(TEdge *e)
+{
+  TEdge* AelPrev = e->PrevInAEL;
+  TEdge* AelNext = e->NextInAEL;
+  if(  !AelPrev &&  !AelNext && (e != m_ActiveEdges) ) return; //already deleted
+  if( AelPrev ) AelPrev->NextInAEL = AelNext;
+  else m_ActiveEdges = AelNext;
+  if( AelNext ) AelNext->PrevInAEL = AelPrev;
+  e->NextInAEL = nullptr;
+  e->PrevInAEL = nullptr;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DeleteFromSEL(TEdge *e)
+{
+  TEdge* SelPrev = e->PrevInSEL;
+  TEdge* SelNext = e->NextInSEL;
+  if( !SelPrev &&  !SelNext && (e != m_SortedEdges) ) return; //already deleted
+  if( SelPrev ) SelPrev->NextInSEL = SelNext;
+  else m_SortedEdges = SelNext;
+  if( SelNext ) SelNext->PrevInSEL = SelPrev;
+  e->NextInSEL = nullptr;
+  e->PrevInSEL = nullptr;
+}
+//------------------------------------------------------------------------------
+
+#ifdef use_xyz
+void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2)
+{
+  if (pt.Z != 0 || !m_ZFill) return;
+  else if (pt == e1.Bot) pt.Z = e1.Bot.Z;
+  else if (pt == e1.Top) pt.Z = e1.Top.Z;
+  else if (pt == e2.Bot) pt.Z = e2.Bot.Z;
+  else if (pt == e2.Top) pt.Z = e2.Top.Z;
+  else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); 
+}
+//------------------------------------------------------------------------------
+#endif
+
+void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, const IntPoint &Pt)
+{
+  bool e1Contributing = ( e1->OutIdx >= 0 );
+  bool e2Contributing = ( e2->OutIdx >= 0 );
+
+#ifdef use_xyz
+        SetZ(Pt, *e1, *e2);
+#endif
+
+#ifdef use_lines
+  //if either edge is on an OPEN path ...
+  if (e1->WindDelta == 0 || e2->WindDelta == 0)
+  {
+    //ignore subject-subject open path intersections UNLESS they
+    //are both open paths, AND they are both 'contributing maximas' ...
+   if (e1->WindDelta == 0 && e2->WindDelta == 0) return;
+
+    //if intersecting a subj line with a subj poly ...
+    else if (e1->PolyTyp == e2->PolyTyp && 
+      e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion)
+    {
+      if (e1->WindDelta == 0)
+      {
+        if (e2Contributing)
+        {
+          AddOutPt(e1, Pt);
+          if (e1Contributing) e1->OutIdx = Unassigned;
+        }
+      }
+      else
+      {
+        if (e1Contributing)
+        {
+          AddOutPt(e2, Pt);
+          if (e2Contributing) e2->OutIdx = Unassigned;
+        }
+      }
+    }
+    else if (e1->PolyTyp != e2->PolyTyp)
+    {
+      //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ...
+      if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 && 
+        (m_ClipType != ctUnion || e2->WindCnt2 == 0))
+      {
+        AddOutPt(e1, Pt);
+        if (e1Contributing) e1->OutIdx = Unassigned;
+      }
+      else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) && 
+        (m_ClipType != ctUnion || e1->WindCnt2 == 0))
+      {
+        AddOutPt(e2, Pt);
+        if (e2Contributing) e2->OutIdx = Unassigned;
+      }
+    }
+    return;
+  }
+#endif
+
+  //update winding counts...
+  //assumes that e1 will be to the Right of e2 ABOVE the intersection
+  if ( e1->PolyTyp == e2->PolyTyp )
+  {
+    if ( IsEvenOddFillType( *e1) )
+    {
+      int oldE1WindCnt = e1->WindCnt;
+      e1->WindCnt = e2->WindCnt;
+      e2->WindCnt = oldE1WindCnt;
+    } else
+    {
+      if (e1->WindCnt + e2->WindDelta == 0 ) e1->WindCnt = -e1->WindCnt;
+      else e1->WindCnt += e2->WindDelta;
+      if ( e2->WindCnt - e1->WindDelta == 0 ) e2->WindCnt = -e2->WindCnt;
+      else e2->WindCnt -= e1->WindDelta;
+    }
+  } else
+  {
+    if (!IsEvenOddFillType(*e2)) e1->WindCnt2 += e2->WindDelta;
+    else e1->WindCnt2 = ( e1->WindCnt2 == 0 ) ? 1 : 0;
+    if (!IsEvenOddFillType(*e1)) e2->WindCnt2 -= e1->WindDelta;
+    else e2->WindCnt2 = ( e2->WindCnt2 == 0 ) ? 1 : 0;
+  }
+
+  PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2;
+  if (e1->PolyTyp == ptSubject)
+  {
+    e1FillType = m_SubjFillType;
+    e1FillType2 = m_ClipFillType;
+  } else
+  {
+    e1FillType = m_ClipFillType;
+    e1FillType2 = m_SubjFillType;
+  }
+  if (e2->PolyTyp == ptSubject)
+  {
+    e2FillType = m_SubjFillType;
+    e2FillType2 = m_ClipFillType;
+  } else
+  {
+    e2FillType = m_ClipFillType;
+    e2FillType2 = m_SubjFillType;
+  }
+
+  cInt e1Wc, e2Wc;
+  switch (e1FillType)
+  {
+    case pftPositive: e1Wc = e1->WindCnt; break;
+    case pftNegative: e1Wc = -e1->WindCnt; break;
+    default: e1Wc = Abs(e1->WindCnt);
+  }
+  switch(e2FillType)
+  {
+    case pftPositive: e2Wc = e2->WindCnt; break;
+    case pftNegative: e2Wc = -e2->WindCnt; break;
+    default: e2Wc = Abs(e2->WindCnt);
+  }
+
+  if ( e1Contributing && e2Contributing )
+  {
+    if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) ||
+      (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) )
+    {
+      AddLocalMaxPoly(e1, e2, Pt); 
+    }
+    else
+    {
+      AddOutPt(e1, Pt);
+      AddOutPt(e2, Pt);
+      SwapSides( *e1 , *e2 );
+      SwapPolyIndexes( *e1 , *e2 );
+    }
+  }
+  else if ( e1Contributing )
+  {
+    if (e2Wc == 0 || e2Wc == 1) 
+    {
+      AddOutPt(e1, Pt);
+      SwapSides(*e1, *e2);
+      SwapPolyIndexes(*e1, *e2);
+    }
+  }
+  else if ( e2Contributing )
+  {
+    if (e1Wc == 0 || e1Wc == 1) 
+    {
+      AddOutPt(e2, Pt);
+      SwapSides(*e1, *e2);
+      SwapPolyIndexes(*e1, *e2);
+    }
+  } 
+  else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1))
+  {
+    //neither edge is currently contributing ...
+
+    cInt e1Wc2, e2Wc2;
+    switch (e1FillType2)
+    {
+      case pftPositive: e1Wc2 = e1->WindCnt2; break;
+      case pftNegative : e1Wc2 = -e1->WindCnt2; break;
+      default: e1Wc2 = Abs(e1->WindCnt2);
+    }
+    switch (e2FillType2)
+    {
+      case pftPositive: e2Wc2 = e2->WindCnt2; break;
+      case pftNegative: e2Wc2 = -e2->WindCnt2; break;
+      default: e2Wc2 = Abs(e2->WindCnt2);
+    }
+
+    if (e1->PolyTyp != e2->PolyTyp)
+    {
+      AddLocalMinPoly(e1, e2, Pt);
+    }
+    else if (e1Wc == 1 && e2Wc == 1)
+      switch( m_ClipType ) {
+        case ctIntersection:
+          if (e1Wc2 > 0 && e2Wc2 > 0)
+            AddLocalMinPoly(e1, e2, Pt);
+          break;
+        case ctUnion:
+          if ( e1Wc2 <= 0 && e2Wc2 <= 0 )
+            AddLocalMinPoly(e1, e2, Pt);
+          break;
+        case ctDifference:
+          if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) ||
+              ((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0)))
+                AddLocalMinPoly(e1, e2, Pt);
+          break;
+        case ctXor:
+          AddLocalMinPoly(e1, e2, Pt);
+      }
+    else
+      SwapSides( *e1, *e2 );
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::SetHoleState(TEdge *e, OutRec *outrec) const
+{
+  bool IsHole = false;
+  TEdge *e2 = e->PrevInAEL;
+  while (e2)
+  {
+    if (e2->OutIdx >= 0 && e2->WindDelta != 0)
+    {
+      IsHole = !IsHole;
+      if (! outrec->FirstLeft)
+        outrec->FirstLeft = m_PolyOuts[e2->OutIdx];
+    }
+    e2 = e2->PrevInAEL;
+  }
+  if (IsHole) outrec->IsHole = true;
+}
+//------------------------------------------------------------------------------
+
+OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2)
+{
+  //work out which polygon fragment has the correct hole state ...
+  if (!outRec1->BottomPt) 
+    outRec1->BottomPt = GetBottomPt(outRec1->Pts);
+  if (!outRec2->BottomPt) 
+    outRec2->BottomPt = GetBottomPt(outRec2->Pts);
+  OutPt *OutPt1 = outRec1->BottomPt;
+  OutPt *OutPt2 = outRec2->BottomPt;
+  if (OutPt1->Pt.Y > OutPt2->Pt.Y) return outRec1;
+  else if (OutPt1->Pt.Y < OutPt2->Pt.Y) return outRec2;
+  else if (OutPt1->Pt.X < OutPt2->Pt.X) return outRec1;
+  else if (OutPt1->Pt.X > OutPt2->Pt.X) return outRec2;
+  else if (OutPt1->Next == OutPt1) return outRec2;
+  else if (OutPt2->Next == OutPt2) return outRec1;
+  else if (FirstIsBottomPt(OutPt1, OutPt2)) return outRec1;
+  else return outRec2;
+}
+//------------------------------------------------------------------------------
+
+bool Param1RightOfParam2(OutRec* outRec1, OutRec* outRec2)
+{
+  do
+  {
+    outRec1 = outRec1->FirstLeft;
+    if (outRec1 == outRec2) return true;
+  } while (outRec1);
+  return false;
+}
+//------------------------------------------------------------------------------
+
+OutRec* Clipper::GetOutRec(int Idx)
+{
+  OutRec* outrec = m_PolyOuts[Idx];
+  while (outrec != m_PolyOuts[outrec->Idx])
+    outrec = m_PolyOuts[outrec->Idx];
+  return outrec;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::AppendPolygon(TEdge *e1, TEdge *e2) const
+{
+  //get the start and ends of both output polygons ...
+  OutRec *outRec1 = m_PolyOuts[e1->OutIdx];
+  OutRec *outRec2 = m_PolyOuts[e2->OutIdx];
+
+  OutRec *holeStateRec;
+  if (Param1RightOfParam2(outRec1, outRec2)) 
+    holeStateRec = outRec2;
+  else if (Param1RightOfParam2(outRec2, outRec1)) 
+    holeStateRec = outRec1;
+  else 
+    holeStateRec = GetLowermostRec(outRec1, outRec2);
+
+  //get the start and ends of both output polygons and
+  //join e2 poly onto e1 poly and delete pointers to e2 ...
+
+  OutPt* p1_lft = outRec1->Pts;
+  OutPt* p1_rt = p1_lft->Prev;
+  OutPt* p2_lft = outRec2->Pts;
+  OutPt* p2_rt = p2_lft->Prev;
+
+  EdgeSide Side;
+  //join e2 poly onto e1 poly and delete pointers to e2 ...
+  if(  e1->Side == esLeft )
+  {
+    if(  e2->Side == esLeft )
+    {
+      //z y x a b c
+      ReversePolyPtLinks(p2_lft);
+      p2_lft->Next = p1_lft;
+      p1_lft->Prev = p2_lft;
+      p1_rt->Next = p2_rt;
+      p2_rt->Prev = p1_rt;
+      outRec1->Pts = p2_rt;
+    } else
+    {
+      //x y z a b c
+      p2_rt->Next = p1_lft;
+      p1_lft->Prev = p2_rt;
+      p2_lft->Prev = p1_rt;
+      p1_rt->Next = p2_lft;
+      outRec1->Pts = p2_lft;
+    }
+    Side = esLeft;
+  } else
+  {
+    if(  e2->Side == esRight )
+    {
+      //a b c z y x
+      ReversePolyPtLinks(p2_lft);
+      p1_rt->Next = p2_rt;
+      p2_rt->Prev = p1_rt;
+      p2_lft->Next = p1_lft;
+      p1_lft->Prev = p2_lft;
+    } else
+    {
+      //a b c x y z
+      p1_rt->Next = p2_lft;
+      p2_lft->Prev = p1_rt;
+      p1_lft->Prev = p2_rt;
+      p2_rt->Next = p1_lft;
+    }
+    Side = esRight;
+  }
+
+  outRec1->BottomPt = nullptr;
+  if (holeStateRec == outRec2)
+  {
+    if (outRec2->FirstLeft != outRec1)
+      outRec1->FirstLeft = outRec2->FirstLeft;
+    outRec1->IsHole = outRec2->IsHole;
+  }
+  outRec2->Pts = nullptr;
+  outRec2->BottomPt = nullptr;
+  outRec2->FirstLeft = outRec1;
+
+  int OKIdx = e1->OutIdx;
+  int ObsoleteIdx = e2->OutIdx;
+
+  e1->OutIdx = Unassigned; //nb: safe because we only get here via AddLocalMaxPoly
+  e2->OutIdx = Unassigned;
+
+  TEdge* e = m_ActiveEdges;
+  while( e )
+  {
+    if( e->OutIdx == ObsoleteIdx )
+    {
+      e->OutIdx = OKIdx;
+      e->Side = Side;
+      break;
+    }
+    e = e->NextInAEL;
+  }
+
+  outRec2->Idx = outRec1->Idx;
+}
+//------------------------------------------------------------------------------
+
+OutRec* Clipper::CreateOutRec()
+{
+  OutRec* result = new OutRec;
+  result->IsHole = false;
+  result->IsOpen = false;
+  result->FirstLeft = nullptr;
+  result->Pts = nullptr;
+  result->BottomPt = nullptr;
+  result->PolyNd = nullptr;
+  m_PolyOuts.emplace_back(result);
+  result->Idx = (int)m_PolyOuts.size()-1;
+  return result;
+}
+//------------------------------------------------------------------------------
+
+OutPt* Clipper::AddOutPt(TEdge *e, const IntPoint &pt)
+{
+  bool ToFront = (e->Side == esLeft);
+  if(  e->OutIdx < 0 )
+  {
+    OutRec *outRec = CreateOutRec();
+    outRec->IsOpen = (e->WindDelta == 0);
+    OutPt* newOp = new OutPt;
+    outRec->Pts = newOp;
+    newOp->Idx = outRec->Idx;
+    newOp->Pt = pt;
+    newOp->Next = newOp;
+    newOp->Prev = newOp;
+    if (!outRec->IsOpen)
+      SetHoleState(e, outRec);
+    e->OutIdx = outRec->Idx;
+    return newOp;
+  } else
+  {
+    OutRec *outRec = m_PolyOuts[e->OutIdx];
+    //OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most'
+    OutPt* op = outRec->Pts;
+
+    if (ToFront && (pt == op->Pt)) return op;
+    else if (!ToFront && (pt == op->Prev->Pt)) return op->Prev;
+
+    OutPt* newOp = new OutPt;
+    newOp->Idx = outRec->Idx;
+    newOp->Pt = pt;
+    newOp->Next = op;
+    newOp->Prev = op->Prev;
+    newOp->Prev->Next = newOp;
+    op->Prev = newOp;
+    if (ToFront) outRec->Pts = newOp;
+    return newOp;
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::ProcessHorizontals(bool IsTopOfScanbeam)
+{
+  TEdge* horzEdge = m_SortedEdges;
+  while(horzEdge)
+  {
+    DeleteFromSEL(horzEdge);
+    ProcessHorizontal(horzEdge, IsTopOfScanbeam);
+    horzEdge = m_SortedEdges;
+  }
+}
+//------------------------------------------------------------------------------
+
+inline bool IsMinima(TEdge *e)
+{
+  return e  && (e->Prev->NextInLML != e) && (e->Next->NextInLML != e);
+}
+//------------------------------------------------------------------------------
+
+inline bool IsMaxima(TEdge *e, const cInt Y)
+{
+  return e && e->Top.Y == Y && !e->NextInLML;
+}
+//------------------------------------------------------------------------------
+
+inline bool IsIntermediate(TEdge *e, const cInt Y)
+{
+  return e->Top.Y == Y && e->NextInLML;
+}
+//------------------------------------------------------------------------------
+
+TEdge *GetMaximaPair(TEdge *e)
+{
+  TEdge* result = nullptr;
+  if ((e->Next->Top == e->Top) && !e->Next->NextInLML)
+    result = e->Next;
+  else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML)
+    result = e->Prev;
+
+  if (result && (result->OutIdx == Skip ||
+    //result is false if both NextInAEL & PrevInAEL are nil & not horizontal ...
+    (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result))))
+      return nullptr;
+  return result;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2)
+{
+  //check that one or other edge hasn't already been removed from AEL ...
+  if (Edge1->NextInAEL == Edge1->PrevInAEL || 
+    Edge2->NextInAEL == Edge2->PrevInAEL) return;
+
+  if(  Edge1->NextInAEL == Edge2 )
+  {
+    TEdge* Next = Edge2->NextInAEL;
+    if( Next ) Next->PrevInAEL = Edge1;
+    TEdge* Prev = Edge1->PrevInAEL;
+    if( Prev ) Prev->NextInAEL = Edge2;
+    Edge2->PrevInAEL = Prev;
+    Edge2->NextInAEL = Edge1;
+    Edge1->PrevInAEL = Edge2;
+    Edge1->NextInAEL = Next;
+  }
+  else if(  Edge2->NextInAEL == Edge1 )
+  {
+    TEdge* Next = Edge1->NextInAEL;
+    if( Next ) Next->PrevInAEL = Edge2;
+    TEdge* Prev = Edge2->PrevInAEL;
+    if( Prev ) Prev->NextInAEL = Edge1;
+    Edge1->PrevInAEL = Prev;
+    Edge1->NextInAEL = Edge2;
+    Edge2->PrevInAEL = Edge1;
+    Edge2->NextInAEL = Next;
+  }
+  else
+  {
+    TEdge* Next = Edge1->NextInAEL;
+    TEdge* Prev = Edge1->PrevInAEL;
+    Edge1->NextInAEL = Edge2->NextInAEL;
+    if( Edge1->NextInAEL ) Edge1->NextInAEL->PrevInAEL = Edge1;
+    Edge1->PrevInAEL = Edge2->PrevInAEL;
+    if( Edge1->PrevInAEL ) Edge1->PrevInAEL->NextInAEL = Edge1;
+    Edge2->NextInAEL = Next;
+    if( Edge2->NextInAEL ) Edge2->NextInAEL->PrevInAEL = Edge2;
+    Edge2->PrevInAEL = Prev;
+    if( Edge2->PrevInAEL ) Edge2->PrevInAEL->NextInAEL = Edge2;
+  }
+
+  if( !Edge1->PrevInAEL ) m_ActiveEdges = Edge1;
+  else if( !Edge2->PrevInAEL ) m_ActiveEdges = Edge2;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2)
+{
+  if(  !( Edge1->NextInSEL ) &&  !( Edge1->PrevInSEL ) ) return;
+  if(  !( Edge2->NextInSEL ) &&  !( Edge2->PrevInSEL ) ) return;
+
+  if(  Edge1->NextInSEL == Edge2 )
+  {
+    TEdge* Next = Edge2->NextInSEL;
+    if( Next ) Next->PrevInSEL = Edge1;
+    TEdge* Prev = Edge1->PrevInSEL;
+    if( Prev ) Prev->NextInSEL = Edge2;
+    Edge2->PrevInSEL = Prev;
+    Edge2->NextInSEL = Edge1;
+    Edge1->PrevInSEL = Edge2;
+    Edge1->NextInSEL = Next;
+  }
+  else if(  Edge2->NextInSEL == Edge1 )
+  {
+    TEdge* Next = Edge1->NextInSEL;
+    if( Next ) Next->PrevInSEL = Edge2;
+    TEdge* Prev = Edge2->PrevInSEL;
+    if( Prev ) Prev->NextInSEL = Edge1;
+    Edge1->PrevInSEL = Prev;
+    Edge1->NextInSEL = Edge2;
+    Edge2->PrevInSEL = Edge1;
+    Edge2->NextInSEL = Next;
+  }
+  else
+  {
+    TEdge* Next = Edge1->NextInSEL;
+    TEdge* Prev = Edge1->PrevInSEL;
+    Edge1->NextInSEL = Edge2->NextInSEL;
+    if( Edge1->NextInSEL ) Edge1->NextInSEL->PrevInSEL = Edge1;
+    Edge1->PrevInSEL = Edge2->PrevInSEL;
+    if( Edge1->PrevInSEL ) Edge1->PrevInSEL->NextInSEL = Edge1;
+    Edge2->NextInSEL = Next;
+    if( Edge2->NextInSEL ) Edge2->NextInSEL->PrevInSEL = Edge2;
+    Edge2->PrevInSEL = Prev;
+    if( Edge2->PrevInSEL ) Edge2->PrevInSEL->NextInSEL = Edge2;
+  }
+
+  if( !Edge1->PrevInSEL ) m_SortedEdges = Edge1;
+  else if( !Edge2->PrevInSEL ) m_SortedEdges = Edge2;
+}
+//------------------------------------------------------------------------------
+
+TEdge* GetNextInAEL(TEdge *e, Direction dir)
+{
+  return dir == dLeftToRight ? e->NextInAEL : e->PrevInAEL;
+}
+//------------------------------------------------------------------------------
+
+void GetHorzDirection(const TEdge &HorzEdge, Direction& Dir, cInt& Left, cInt& Right)
+{
+  if (HorzEdge.Bot.X < HorzEdge.Top.X)
+  {
+    Left = HorzEdge.Bot.X;
+    Right = HorzEdge.Top.X;
+    Dir = dLeftToRight;
+  } else
+  {
+    Left = HorzEdge.Top.X;
+    Right = HorzEdge.Bot.X;
+    Dir = dRightToLeft;
+  }
+}
+//------------------------------------------------------------------------
+
+/*******************************************************************************
+* Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or    *
+* Bottom of a scanbeam) are processed as if layered. The order in which HEs    *
+* are processed doesn't matter. HEs intersect with other HE Bot.Xs only [#]    *
+* (or they could intersect with Top.Xs only, ie EITHER Bot.Xs OR Top.Xs),      *
+* and with other non-horizontal edges [*]. Once these intersections are        *
+* processed, intermediate HEs then 'promote' the Edge above (NextInLML) into   *
+* the AEL. These 'promoted' edges may in turn intersect [%] with other HEs.    *
+*******************************************************************************/
+
+void Clipper::ProcessHorizontal(TEdge *horzEdge, bool isTopOfScanbeam)
+{
+  Direction dir;
+  cInt horzLeft, horzRight;
+
+  GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
+
+  TEdge* eLastHorz = horzEdge, *eMaxPair = nullptr;
+  while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML)) 
+    eLastHorz = eLastHorz->NextInLML;
+  if (!eLastHorz->NextInLML)
+    eMaxPair = GetMaximaPair(eLastHorz);
+
+  for (;;)
+  {
+    bool IsLastHorz = (horzEdge == eLastHorz);
+    TEdge* e = GetNextInAEL(horzEdge, dir);
+    while(e)
+    {
+      //Break if we've got to the end of an intermediate horizontal edge ...
+      //nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal.
+      if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML && 
+        e->Dx < horzEdge->NextInLML->Dx) break;
+
+      TEdge* eNext = GetNextInAEL(e, dir); //saves eNext for later
+
+      if ((dir == dLeftToRight && e->Curr.X <= horzRight) ||
+        (dir == dRightToLeft && e->Curr.X >= horzLeft))
+      {
+        //so far we're still in range of the horizontal Edge  but make sure
+        //we're at the last of consec. horizontals when matching with eMaxPair
+        if(e == eMaxPair && IsLastHorz)
+        {
+
+          if (horzEdge->OutIdx >= 0)
+          {
+            OutPt* op1 = AddOutPt(horzEdge, horzEdge->Top);
+            TEdge* eNextHorz = m_SortedEdges;
+            while (eNextHorz)
+            {
+              if (eNextHorz->OutIdx >= 0 &&
+                HorzSegmentsOverlap(horzEdge->Bot.X,
+                horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X))
+              {
+                OutPt* op2 = AddOutPt(eNextHorz, eNextHorz->Bot);
+                AddJoin(op2, op1, eNextHorz->Top);
+              }
+              eNextHorz = eNextHorz->NextInSEL;
+            }
+            AddGhostJoin(op1, horzEdge->Bot);
+            AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top);
+          }
+          DeleteFromAEL(horzEdge);
+          DeleteFromAEL(eMaxPair);
+          return;
+        }
+        else if(dir == dLeftToRight)
+        {
+          IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y);
+          IntersectEdges(horzEdge, e, Pt);
+        }
+        else
+        {
+          IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y);
+          IntersectEdges( e, horzEdge, Pt);
+        }
+        SwapPositionsInAEL( horzEdge, e );
+      }
+      else if( (dir == dLeftToRight && e->Curr.X >= horzRight) ||
+       (dir == dRightToLeft && e->Curr.X <= horzLeft) ) break;
+      e = eNext;
+    } //end while
+
+    if (horzEdge->NextInLML && IsHorizontal(*horzEdge->NextInLML))
+    {
+      UpdateEdgeIntoAEL(horzEdge);
+      if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Bot);
+      GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
+    } else
+      break;
+  } //end for (;;)
+
+  if(horzEdge->NextInLML)
+  {
+    if(horzEdge->OutIdx >= 0)
+    {
+      OutPt* op1 = AddOutPt( horzEdge, horzEdge->Top);
+      if (isTopOfScanbeam) AddGhostJoin(op1, horzEdge->Bot);
+      UpdateEdgeIntoAEL(horzEdge);
+      if (horzEdge->WindDelta == 0) return;
+      //nb: HorzEdge is no longer horizontal here
+      TEdge* ePrev = horzEdge->PrevInAEL;
+      TEdge* eNext = horzEdge->NextInAEL;
+      if (ePrev && ePrev->Curr.X == horzEdge->Bot.X &&
+        ePrev->Curr.Y == horzEdge->Bot.Y && ePrev->WindDelta != 0 &&
+        (ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y &&
+        SlopesEqual(*horzEdge, *ePrev, m_UseFullRange)))
+      {
+        OutPt* op2 = AddOutPt(ePrev, horzEdge->Bot);
+        AddJoin(op1, op2, horzEdge->Top);
+      }
+      else if (eNext && eNext->Curr.X == horzEdge->Bot.X &&
+        eNext->Curr.Y == horzEdge->Bot.Y && eNext->WindDelta != 0 &&
+        eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y &&
+        SlopesEqual(*horzEdge, *eNext, m_UseFullRange))
+      {
+        OutPt* op2 = AddOutPt(eNext, horzEdge->Bot);
+        AddJoin(op1, op2, horzEdge->Top);
+      }
+    }
+    else
+      UpdateEdgeIntoAEL(horzEdge); 
+  }
+  else
+  {
+    if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Top);
+    DeleteFromAEL(horzEdge);
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::UpdateEdgeIntoAEL(TEdge *&e)
+{
+  if( !e->NextInLML ) throw
+    clipperException("UpdateEdgeIntoAEL: invalid call");
+
+  e->NextInLML->OutIdx = e->OutIdx;
+  TEdge* AelPrev = e->PrevInAEL;
+  TEdge* AelNext = e->NextInAEL;
+  if (AelPrev) AelPrev->NextInAEL = e->NextInLML;
+  else m_ActiveEdges = e->NextInLML;
+  if (AelNext) AelNext->PrevInAEL = e->NextInLML;
+  e->NextInLML->Side = e->Side;
+  e->NextInLML->WindDelta = e->WindDelta;
+  e->NextInLML->WindCnt = e->WindCnt;
+  e->NextInLML->WindCnt2 = e->WindCnt2;
+  e = e->NextInLML;
+  e->Curr = e->Bot;
+  e->PrevInAEL = AelPrev;
+  e->NextInAEL = AelNext;
+  if (!IsHorizontal(*e)) InsertScanbeam(e->Top.Y);
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::ProcessIntersections(const cInt topY)
+{
+  if( !m_ActiveEdges ) return true;
+  try {
+    BuildIntersectList(topY);
+    size_t IlSize = m_IntersectList.size();
+    if (IlSize == 0) return true;
+    if (IlSize == 1 || FixupIntersectionOrder()) ProcessIntersectList();
+    else return false;
+  }
+  catch(...) 
+  {
+    m_SortedEdges = nullptr;
+    DisposeIntersectNodes();
+    throw clipperException("ProcessIntersections error");
+  }
+  m_SortedEdges = nullptr;
+  return true;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DisposeIntersectNodes()
+{
+  for (size_t i = 0; i < m_IntersectList.size(); ++i )
+    delete m_IntersectList[i];
+  m_IntersectList.clear();
+}
+//------------------------------------------------------------------------------
+
+void Clipper::BuildIntersectList(const cInt topY)
+{
+  if ( !m_ActiveEdges ) return;
+
+  //prepare for sorting ...
+  TEdge* e = m_ActiveEdges;
+  m_SortedEdges = e;
+  while( e )
+  {
+    e->PrevInSEL = e->PrevInAEL;
+    e->NextInSEL = e->NextInAEL;
+    e->Curr.X = TopX( *e, topY );
+    e = e->NextInAEL;
+  }
+
+  //bubblesort ...
+  bool isModified;
+  do
+  {
+    isModified = false;
+    e = m_SortedEdges;
+    while( e->NextInSEL )
+    {
+      TEdge *eNext = e->NextInSEL;
+      IntPoint Pt;
+      if(e->Curr.X > eNext->Curr.X)
+      {
+        IntersectPoint(*e, *eNext, Pt);
+        IntersectNode * newNode = new IntersectNode;
+        newNode->Edge1 = e;
+        newNode->Edge2 = eNext;
+        newNode->Pt = Pt;
+        m_IntersectList.emplace_back(newNode);
+
+        SwapPositionsInSEL(e, eNext);
+        isModified = true;
+      }
+      else
+        e = eNext;
+    }
+    if( e->PrevInSEL ) e->PrevInSEL->NextInSEL = nullptr;
+    else break;
+  }
+  while ( isModified );
+  m_SortedEdges = nullptr; //important
+}
+//------------------------------------------------------------------------------
+
+
+void Clipper::ProcessIntersectList()
+{
+  for (size_t i = 0; i < m_IntersectList.size(); ++i)
+  {
+    IntersectNode* iNode = m_IntersectList[i];
+    {
+      IntersectEdges( iNode->Edge1, iNode->Edge2, iNode->Pt);
+      SwapPositionsInAEL( iNode->Edge1 , iNode->Edge2 );
+    }
+    delete iNode;
+  }
+  m_IntersectList.clear();
+}
+//------------------------------------------------------------------------------
+
+bool IntersectListSort(IntersectNode* node1, IntersectNode* node2)
+{
+  return node2->Pt.Y < node1->Pt.Y;
+}
+//------------------------------------------------------------------------------
+
+inline bool EdgesAdjacent(const IntersectNode &inode)
+{
+  return (inode.Edge1->NextInSEL == inode.Edge2) ||
+    (inode.Edge1->PrevInSEL == inode.Edge2);
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::FixupIntersectionOrder()
+{
+  //pre-condition: intersections are sorted Bottom-most first.
+  //Now it's crucial that intersections are made only between adjacent edges,
+  //so to ensure this the order of intersections may need adjusting ...
+  CopyAELToSEL();
+  std::sort(m_IntersectList.begin(), m_IntersectList.end(), IntersectListSort);
+  size_t cnt = m_IntersectList.size();
+  for (size_t i = 0; i < cnt; ++i) 
+  {
+    if (!EdgesAdjacent(*m_IntersectList[i]))
+    {
+      size_t j = i + 1;
+      while (j < cnt && !EdgesAdjacent(*m_IntersectList[j])) j++;
+      if (j == cnt)  return false;
+      std::swap(m_IntersectList[i], m_IntersectList[j]);
+    }
+    SwapPositionsInSEL(m_IntersectList[i]->Edge1, m_IntersectList[i]->Edge2);
+  }
+  return true;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::DoMaxima(TEdge *e)
+{
+  TEdge* eMaxPair = GetMaximaPair(e);
+  if (!eMaxPair)
+  {
+    if (e->OutIdx >= 0)
+      AddOutPt(e, e->Top);
+    DeleteFromAEL(e);
+    return;
+  }
+
+  TEdge* eNext = e->NextInAEL;
+  while(eNext && eNext != eMaxPair)
+  {
+    IntersectEdges(e, eNext, e->Top);
+    SwapPositionsInAEL(e, eNext);
+    eNext = e->NextInAEL;
+  }
+
+  if(e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned)
+  {
+    DeleteFromAEL(e);
+    DeleteFromAEL(eMaxPair);
+  }
+  else if( e->OutIdx >= 0 && eMaxPair->OutIdx >= 0 )
+  {
+    if (e->OutIdx >= 0) AddLocalMaxPoly(e, eMaxPair, e->Top);
+    DeleteFromAEL(e);
+    DeleteFromAEL(eMaxPair);
+  }
+#ifdef use_lines
+  else if (e->WindDelta == 0)
+  {
+    if (e->OutIdx >= 0) 
+    {
+      AddOutPt(e, e->Top);
+      e->OutIdx = Unassigned;
+    }
+    DeleteFromAEL(e);
+
+    if (eMaxPair->OutIdx >= 0)
+    {
+      AddOutPt(eMaxPair, e->Top);
+      eMaxPair->OutIdx = Unassigned;
+    }
+    DeleteFromAEL(eMaxPair);
+  } 
+#endif
+  else throw clipperException("DoMaxima error");
+}
+//------------------------------------------------------------------------------
+
+void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY)
+{
+  TEdge* e = m_ActiveEdges;
+  while( e )
+  {
+    //1. process maxima, treating them as if they're 'bent' horizontal edges,
+    //   but exclude maxima with horizontal edges. nb: e can't be a horizontal.
+    bool IsMaximaEdge = IsMaxima(e, topY);
+
+    if(IsMaximaEdge)
+    {
+      TEdge* eMaxPair = GetMaximaPair(e);
+      IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair));
+    }
+
+    if(IsMaximaEdge)
+    {
+      TEdge* ePrev = e->PrevInAEL;
+      DoMaxima(e);
+      if( !ePrev ) e = m_ActiveEdges;
+      else e = ePrev->NextInAEL;
+    }
+    else
+    {
+      //2. promote horizontal edges, otherwise update Curr.X and Curr.Y ...
+      if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML))
+      {
+        UpdateEdgeIntoAEL(e);
+        if (e->OutIdx >= 0)
+          AddOutPt(e, e->Bot);
+        AddEdgeToSEL(e);
+      } 
+      else
+      {
+        e->Curr.X = TopX( *e, topY );
+        e->Curr.Y = topY;
+      }
+
+      if (m_StrictSimple)
+      {  
+        TEdge* ePrev = e->PrevInAEL;
+        if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
+          (ePrev->Curr.X == e->Curr.X) && (ePrev->WindDelta != 0))
+        {
+          IntPoint pt = e->Curr;
+#ifdef use_xyz
+          SetZ(pt, *ePrev, *e);
+#endif
+          OutPt* op = AddOutPt(ePrev, pt);
+          OutPt* op2 = AddOutPt(e, pt);
+          AddJoin(op, op2, pt); //StrictlySimple (type-3) join
+        }
+      }
+
+      e = e->NextInAEL;
+    }
+  }
+
+  //3. Process horizontals at the Top of the scanbeam ...
+  ProcessHorizontals(true);
+
+  //4. Promote intermediate vertices ...
+  e = m_ActiveEdges;
+  while(e)
+  {
+    if(IsIntermediate(e, topY))
+    {
+      OutPt* op = nullptr;
+      if( e->OutIdx >= 0 ) 
+        op = AddOutPt(e, e->Top);
+      UpdateEdgeIntoAEL(e);
+
+      //if output polygons share an edge, they'll need joining later ...
+      TEdge* ePrev = e->PrevInAEL;
+      TEdge* eNext = e->NextInAEL;
+      if (ePrev && ePrev->Curr.X == e->Bot.X &&
+        ePrev->Curr.Y == e->Bot.Y && op &&
+        ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y &&
+        SlopesEqual(*e, *ePrev, m_UseFullRange) &&
+        (e->WindDelta != 0) && (ePrev->WindDelta != 0))
+      {
+        OutPt* op2 = AddOutPt(ePrev, e->Bot);
+        AddJoin(op, op2, e->Top);
+      }
+      else if (eNext && eNext->Curr.X == e->Bot.X &&
+        eNext->Curr.Y == e->Bot.Y && op &&
+        eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y &&
+        SlopesEqual(*e, *eNext, m_UseFullRange) &&
+        (e->WindDelta != 0) && (eNext->WindDelta != 0))
+      {
+        OutPt* op2 = AddOutPt(eNext, e->Bot);
+        AddJoin(op, op2, e->Top);
+      }
+    }
+    e = e->NextInAEL;
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::FixupOutPolygon(OutRec &outrec)
+{
+  //FixupOutPolygon() - removes duplicate points and simplifies consecutive
+  //parallel edges by removing the middle vertex.
+  OutPt *lastOK = nullptr;
+  outrec.BottomPt = nullptr;
+  OutPt *pp = outrec.Pts;
+
+  for (;;)
+  {
+    if (pp->Prev == pp || pp->Prev == pp->Next )
+    {
+      DisposeOutPts(pp);
+      outrec.Pts = nullptr;
+      return;
+    }
+
+    //test for duplicate points and collinear edges ...
+    if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) || 
+      (SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) &&
+      (!m_PreserveCollinear || 
+      !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt))))
+    {
+      lastOK = nullptr;
+      OutPt *tmp = pp;
+      pp->Prev->Next = pp->Next;
+      pp->Next->Prev = pp->Prev;
+      pp = pp->Prev;
+      delete tmp;
+    }
+    else if (pp == lastOK) break;
+    else
+    {
+      if (!lastOK) lastOK = pp;
+      pp = pp->Next;
+    }
+  }
+  outrec.Pts = pp;
+}
+//------------------------------------------------------------------------------
+
+int PointCount(OutPt *Pts)
+{
+    if (!Pts) return 0;
+    int result = 0;
+    OutPt* p = Pts;
+    do
+    {
+        result++;
+        p = p->Next;
+    }
+    while (p != Pts);
+    return result;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::BuildResult(Paths &polys)
+{
+  polys.reserve(m_PolyOuts.size());
+  for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+  {
+    if (!m_PolyOuts[i]->Pts) continue;
+    Path pg;
+    OutPt* p = m_PolyOuts[i]->Pts->Prev;
+    const int cnt = PointCount(p);
+    if (cnt < 2) continue;
+    pg.reserve(cnt);
+    for (int j = 0; j < cnt; ++j)
+    {
+      pg.emplace_back(p->Pt);
+      p = p->Prev;
+    }
+    polys.emplace_back(pg);
+  }
+}
+//------------------------------------------------------------------------------
+
+void Clipper::BuildResult2(PolyTree& polytree)
+{
+    polytree.Clear();
+    polytree.AllNodes.reserve(m_PolyOuts.size());
+    //add each output polygon/contour to polytree ...
+    for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++)
+    {
+        OutRec* outRec = m_PolyOuts[i];
+        int cnt = PointCount(outRec->Pts);
+        if ((outRec->IsOpen && cnt < 2) || (!outRec->IsOpen && cnt < 3)) continue;
+        FixHoleLinkage(*outRec);
+        PolyNode* pn = new PolyNode();
+        //nb: polytree takes ownership of all the PolyNodes
+        polytree.AllNodes.emplace_back(pn);
+        outRec->PolyNd = pn;
+        pn->Parent = nullptr;
+        pn->Index = 0;
+        pn->Contour.reserve(cnt);
+        OutPt *op = outRec->Pts->Prev;
+        for (int j = 0; j < cnt; j++)
+        {
+            pn->Contour.emplace_back(op->Pt);
+            op = op->Prev;
+        }
+    }
+
+    //fixup PolyNode links etc ...
+    polytree.Childs.reserve(m_PolyOuts.size());
+    for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++)
+    {
+        OutRec* outRec = m_PolyOuts[i];
+        if (!outRec->PolyNd) continue;
+        if (outRec->IsOpen) 
+        {
+          outRec->PolyNd->m_IsOpen = true;
+          polytree.AddChild(*outRec->PolyNd);
+        }
+        else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd) 
+          outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd);
+        else
+          polytree.AddChild(*outRec->PolyNd);
+    }
+}
+//------------------------------------------------------------------------------
+
+void SwapIntersectNodes(IntersectNode &int1, IntersectNode &int2)
+{
+  //just swap the contents (because fIntersectNodes is a single-linked-list)
+  IntersectNode inode = int1; //gets a copy of Int1
+  int1.Edge1 = int2.Edge1;
+  int1.Edge2 = int2.Edge2;
+  int1.Pt = int2.Pt;
+  int2.Edge1 = inode.Edge1;
+  int2.Edge2 = inode.Edge2;
+  int2.Pt = inode.Pt;
+}
+//------------------------------------------------------------------------------
+
+inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2)
+{
+  if (e2.Curr.X == e1.Curr.X) 
+  {
+    if (e2.Top.Y > e1.Top.Y)
+      return e2.Top.X < TopX(e1, e2.Top.Y); 
+      else return e1.Top.X > TopX(e2, e1.Top.Y);
+  } 
+  else return e2.Curr.X < e1.Curr.X;
+}
+//------------------------------------------------------------------------------
+
+bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2, 
+    cInt& Left, cInt& Right)
+{
+  if (a1 < a2)
+  {
+    if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);}
+    else {Left = std::max(a1,b2); Right = std::min(a2,b1);}
+  } 
+  else
+  {
+    if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);}
+    else {Left = std::max(a2,b2); Right = std::min(a1,b1);}
+  }
+  return Left < Right;
+}
+//------------------------------------------------------------------------------
+
+inline void UpdateOutPtIdxs(const OutRec &outrec)
+{  
+  OutPt* op = outrec.Pts;
+  do
+  {
+    op->Idx = outrec.Idx;
+    op = op->Prev;
+  }
+  while(op != outrec.Pts);
+}
+//------------------------------------------------------------------------------
+
+void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge)
+{
+  if(!m_ActiveEdges)
+  {
+    edge->PrevInAEL = nullptr;
+    edge->NextInAEL = nullptr;
+    m_ActiveEdges = edge;
+  }
+  else if(!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge))
+  {
+      edge->PrevInAEL = nullptr;
+      edge->NextInAEL = m_ActiveEdges;
+      m_ActiveEdges->PrevInAEL = edge;
+      m_ActiveEdges = edge;
+  } 
+  else
+  {
+    if(!startEdge) startEdge = m_ActiveEdges;
+    while(startEdge->NextInAEL  && 
+      !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge))
+        startEdge = startEdge->NextInAEL;
+    edge->NextInAEL = startEdge->NextInAEL;
+    if(startEdge->NextInAEL) startEdge->NextInAEL->PrevInAEL = edge;
+    edge->PrevInAEL = startEdge;
+    startEdge->NextInAEL = edge;
+  }
+}
+//----------------------------------------------------------------------
+
+OutPt* DupOutPt(OutPt* outPt, bool InsertAfter)
+{
+  OutPt* result = new OutPt;
+  result->Pt = outPt->Pt;
+  result->Idx = outPt->Idx;
+  if (InsertAfter)
+  {
+    result->Next = outPt->Next;
+    result->Prev = outPt;
+    outPt->Next->Prev = result;
+    outPt->Next = result;
+  } 
+  else
+  {
+    result->Prev = outPt->Prev;
+    result->Next = outPt;
+    outPt->Prev->Next = result;
+    outPt->Prev = result;
+  }
+  return result;
+}
+//------------------------------------------------------------------------------
+
+bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b,
+  const IntPoint & Pt, bool DiscardLeft)
+{
+  Direction Dir1 = (op1->Pt.X > op1b->Pt.X ? dRightToLeft : dLeftToRight);
+  Direction Dir2 = (op2->Pt.X > op2b->Pt.X ? dRightToLeft : dLeftToRight);
+  if (Dir1 == Dir2) return false;
+
+  //When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we
+  //want Op1b to be on the Right. (And likewise with Op2 and Op2b.)
+  //So, to facilitate this while inserting Op1b and Op2b ...
+  //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b,
+  //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.)
+  if (Dir1 == dLeftToRight) 
+  {
+    while (op1->Next->Pt.X <= Pt.X && 
+      op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)  
+        op1 = op1->Next;
+    if (DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next;
+    op1b = DupOutPt(op1, !DiscardLeft);
+    if (op1b->Pt != Pt) 
+    {
+      op1 = op1b;
+      op1->Pt = Pt;
+      op1b = DupOutPt(op1, !DiscardLeft);
+    }
+  } 
+  else
+  {
+    while (op1->Next->Pt.X >= Pt.X && 
+      op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) 
+        op1 = op1->Next;
+    if (!DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next;
+    op1b = DupOutPt(op1, DiscardLeft);
+    if (op1b->Pt != Pt)
+    {
+      op1 = op1b;
+      op1->Pt = Pt;
+      op1b = DupOutPt(op1, DiscardLeft);
+    }
+  }
+
+  if (Dir2 == dLeftToRight)
+  {
+    while (op2->Next->Pt.X <= Pt.X && 
+      op2->Next->Pt.X >= op2->Pt.X && op2->Next->Pt.Y == Pt.Y)
+        op2 = op2->Next;
+    if (DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next;
+    op2b = DupOutPt(op2, !DiscardLeft);
+    if (op2b->Pt != Pt)
+    {
+      op2 = op2b;
+      op2->Pt = Pt;
+      op2b = DupOutPt(op2, !DiscardLeft);
+    };
+  } else
+  {
+    while (op2->Next->Pt.X >= Pt.X && 
+      op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) 
+        op2 = op2->Next;
+    if (!DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next;
+    op2b = DupOutPt(op2, DiscardLeft);
+    if (op2b->Pt != Pt)
+    {
+      op2 = op2b;
+      op2->Pt = Pt;
+      op2b = DupOutPt(op2, DiscardLeft);
+    };
+  };
+
+  if ((Dir1 == dLeftToRight) == DiscardLeft)
+  {
+    op1->Prev = op2;
+    op2->Next = op1;
+    op1b->Next = op2b;
+    op2b->Prev = op1b;
+  }
+  else
+  {
+    op1->Next = op2;
+    op2->Prev = op1;
+    op1b->Prev = op2b;
+    op2b->Next = op1b;
+  }
+  return true;
+}
+//------------------------------------------------------------------------------
+
+bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2)
+{
+  OutPt *op1 = j->OutPt1, *op1b;
+  OutPt *op2 = j->OutPt2, *op2b;
+
+  //There are 3 kinds of joins for output polygons ...
+  //1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are a vertices anywhere
+  //along (horizontal) collinear edges (& Join.OffPt is on the same horizontal).
+  //2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same
+  //location at the Bottom of the overlapping segment (& Join.OffPt is above).
+  //3. StrictSimple joins where edges touch but are not collinear and where
+  //Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point.
+  bool isHorizontal = (j->OutPt1->Pt.Y == j->OffPt.Y);
+
+  if (isHorizontal  && (j->OffPt == j->OutPt1->Pt) &&
+  (j->OffPt == j->OutPt2->Pt))
+  {
+    //Strictly Simple join ...
+    if (outRec1 != outRec2) return false;
+    op1b = j->OutPt1->Next;
+    while (op1b != op1 && (op1b->Pt == j->OffPt)) 
+      op1b = op1b->Next;
+    bool reverse1 = (op1b->Pt.Y > j->OffPt.Y);
+    op2b = j->OutPt2->Next;
+    while (op2b != op2 && (op2b->Pt == j->OffPt)) 
+      op2b = op2b->Next;
+    bool reverse2 = (op2b->Pt.Y > j->OffPt.Y);
+    if (reverse1 == reverse2) return false;
+    if (reverse1)
+    {
+      op1b = DupOutPt(op1, false);
+      op2b = DupOutPt(op2, true);
+      op1->Prev = op2;
+      op2->Next = op1;
+      op1b->Next = op2b;
+      op2b->Prev = op1b;
+      j->OutPt1 = op1;
+      j->OutPt2 = op1b;
+      return true;
+    } else
+    {
+      op1b = DupOutPt(op1, true);
+      op2b = DupOutPt(op2, false);
+      op1->Next = op2;
+      op2->Prev = op1;
+      op1b->Prev = op2b;
+      op2b->Next = op1b;
+      j->OutPt1 = op1;
+      j->OutPt2 = op1b;
+      return true;
+    }
+  } 
+  else if (isHorizontal)
+  {
+    //treat horizontal joins differently to non-horizontal joins since with
+    //them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt
+    //may be anywhere along the horizontal edge.
+    op1b = op1;
+    while (op1->Prev->Pt.Y == op1->Pt.Y && op1->Prev != op1b && op1->Prev != op2)
+      op1 = op1->Prev;
+    while (op1b->Next->Pt.Y == op1b->Pt.Y && op1b->Next != op1 && op1b->Next != op2)
+      op1b = op1b->Next;
+    if (op1b->Next == op1 || op1b->Next == op2) return false; //a flat 'polygon'
+
+    op2b = op2;
+    while (op2->Prev->Pt.Y == op2->Pt.Y && op2->Prev != op2b && op2->Prev != op1b)
+      op2 = op2->Prev;
+    while (op2b->Next->Pt.Y == op2b->Pt.Y && op2b->Next != op2 && op2b->Next != op1)
+      op2b = op2b->Next;
+    if (op2b->Next == op2 || op2b->Next == op1) return false; //a flat 'polygon'
+
+    cInt Left, Right;
+    //Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges
+    if (!GetOverlap(op1->Pt.X, op1b->Pt.X, op2->Pt.X, op2b->Pt.X, Left, Right))
+      return false;
+
+    //DiscardLeftSide: when overlapping edges are joined, a spike will created
+    //which needs to be cleaned up. However, we don't want Op1 or Op2 caught up
+    //on the discard Side as either may still be needed for other joins ...
+    IntPoint Pt;
+    bool DiscardLeftSide;
+    if (op1->Pt.X >= Left && op1->Pt.X <= Right) 
+    {
+      Pt = op1->Pt; DiscardLeftSide = (op1->Pt.X > op1b->Pt.X);
+    } 
+    else if (op2->Pt.X >= Left&& op2->Pt.X <= Right) 
+    {
+      Pt = op2->Pt; DiscardLeftSide = (op2->Pt.X > op2b->Pt.X);
+    } 
+    else if (op1b->Pt.X >= Left && op1b->Pt.X <= Right)
+    {
+      Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.X > op1->Pt.X;
+    } 
+    else
+    {
+      Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.X > op2->Pt.X);
+    }
+    j->OutPt1 = op1; j->OutPt2 = op2;
+    return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide);
+  } else
+  {
+    //nb: For non-horizontal joins ...
+    //    1. Jr.OutPt1.Pt.Y == Jr.OutPt2.Pt.Y
+    //    2. Jr.OutPt1.Pt > Jr.OffPt.Y
+
+    //make sure the polygons are correctly oriented ...
+    op1b = op1->Next;
+    while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Next;
+    bool Reverse1 = ((op1b->Pt.Y > op1->Pt.Y) ||
+      !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange));
+    if (Reverse1)
+    {
+      op1b = op1->Prev;
+      while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Prev;
+      if ((op1b->Pt.Y > op1->Pt.Y) ||
+        !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)) return false;
+    };
+    op2b = op2->Next;
+    while ((op2b->Pt == op2->Pt) && (op2b != op2))op2b = op2b->Next;
+    bool Reverse2 = ((op2b->Pt.Y > op2->Pt.Y) ||
+      !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange));
+    if (Reverse2)
+    {
+      op2b = op2->Prev;
+      while ((op2b->Pt == op2->Pt) && (op2b != op2)) op2b = op2b->Prev;
+      if ((op2b->Pt.Y > op2->Pt.Y) ||
+        !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)) return false;
+    }
+
+    if ((op1b == op1) || (op2b == op2) || (op1b == op2b) ||
+      ((outRec1 == outRec2) && (Reverse1 == Reverse2))) return false;
+
+    if (Reverse1)
+    {
+      op1b = DupOutPt(op1, false);
+      op2b = DupOutPt(op2, true);
+      op1->Prev = op2;
+      op2->Next = op1;
+      op1b->Next = op2b;
+      op2b->Prev = op1b;
+      j->OutPt1 = op1;
+      j->OutPt2 = op1b;
+      return true;
+    } else
+    {
+      op1b = DupOutPt(op1, true);
+      op2b = DupOutPt(op2, false);
+      op1->Next = op2;
+      op2->Prev = op1;
+      op1b->Prev = op2b;
+      op2b->Next = op1b;
+      j->OutPt1 = op1;
+      j->OutPt2 = op1b;
+      return true;
+    }
+  }
+}
+//----------------------------------------------------------------------
+
+static OutRec* ParseFirstLeft(OutRec* FirstLeft)
+{
+  while (FirstLeft && !FirstLeft->Pts)
+    FirstLeft = FirstLeft->FirstLeft;
+  return FirstLeft;
+}
+//------------------------------------------------------------------------------
+
+void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const
+{ 
+  //tests if NewOutRec contains the polygon before reassigning FirstLeft
+  for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+  {
+    OutRec* outRec = m_PolyOuts[i];
+    if (!outRec->Pts || !outRec->FirstLeft) continue;
+    OutRec* firstLeft = ParseFirstLeft(outRec->FirstLeft);
+    if (firstLeft == OldOutRec)
+    {
+      if (Poly2ContainsPoly1(outRec->Pts, NewOutRec->Pts))
+        outRec->FirstLeft = NewOutRec;
+    }
+  }
+}
+//----------------------------------------------------------------------
+
+void Clipper::FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const
+{ 
+  //reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon
+  for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
+  {
+    OutRec* outRec = m_PolyOuts[i];
+    if (outRec->FirstLeft == OldOutRec) outRec->FirstLeft = NewOutRec;
+  }
+}
+//----------------------------------------------------------------------
+
+void Clipper::JoinCommonEdges()
+{
+  for (JoinList::size_type i = 0; i < m_Joins.size(); i++)
+  {
+    Join* join = m_Joins[i];
+
+    OutRec *outRec1 = GetOutRec(join->OutPt1->Idx);
+    OutRec *outRec2 = GetOutRec(join->OutPt2->Idx);
+
+    if (!outRec1->Pts || !outRec2->Pts) continue;
+
+    //get the polygon fragment with the correct hole state (FirstLeft)
+    //before calling JoinPoints() ...
+    OutRec *holeStateRec;
+    if (outRec1 == outRec2) holeStateRec = outRec1;
+    else if (Param1RightOfParam2(outRec1, outRec2)) holeStateRec = outRec2;
+    else if (Param1RightOfParam2(outRec2, outRec1)) holeStateRec = outRec1;
+    else holeStateRec = GetLowermostRec(outRec1, outRec2);
+
+    if (!JoinPoints(join, outRec1, outRec2)) continue;
+
+    if (outRec1 == outRec2)
+    {
+      //instead of joining two polygons, we've just created a new one by
+      //splitting one polygon into two.
+      outRec1->Pts = join->OutPt1;
+      outRec1->BottomPt = nullptr;
+      outRec2 = CreateOutRec();
+      outRec2->Pts = join->OutPt2;
+
+      //update all OutRec2.Pts Idx's ...
+      UpdateOutPtIdxs(*outRec2);
+
+      //We now need to check every OutRec.FirstLeft pointer. If it points
+      //to OutRec1 it may need to point to OutRec2 instead ...
+      if (m_UsingPolyTree)
+        for (PolyOutList::size_type j = 0; j < m_PolyOuts.size() - 1; j++)
+        {
+          OutRec* oRec = m_PolyOuts[j];
+          if (!oRec->Pts || ParseFirstLeft(oRec->FirstLeft) != outRec1 ||
+            oRec->IsHole == outRec1->IsHole) continue;
+          if (Poly2ContainsPoly1(oRec->Pts, join->OutPt2))
+            oRec->FirstLeft = outRec2;
+        }
+
+      if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts))
+      {
+        //outRec2 is contained by outRec1 ...
+        outRec2->IsHole = !outRec1->IsHole;
+        outRec2->FirstLeft = outRec1;
+
+        //fixup FirstLeft pointers that may need reassigning to OutRec1
+        if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1);
+
+        if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0))
+          ReversePolyPtLinks(outRec2->Pts);
+            
+      } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts))
+      {
+        //outRec1 is contained by outRec2 ...
+        outRec2->IsHole = outRec1->IsHole;
+        outRec1->IsHole = !outRec2->IsHole;
+        outRec2->FirstLeft = outRec1->FirstLeft;
+        outRec1->FirstLeft = outRec2;
+
+        //fixup FirstLeft pointers that may need reassigning to OutRec1
+        if (m_UsingPolyTree) FixupFirstLefts2(outRec1, outRec2);
+
+        if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0))
+          ReversePolyPtLinks(outRec1->Pts);
+      } 
+      else
+      {
+        //the 2 polygons are completely separate ...
+        outRec2->IsHole = outRec1->IsHole;
+        outRec2->FirstLeft = outRec1->FirstLeft;
+
+        //fixup FirstLeft pointers that may need reassigning to OutRec2
+        if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2);
+      }
+     
+    } else
+    {
+      //joined 2 polygons together ...
+
+      outRec2->Pts = nullptr;
+      outRec2->BottomPt = nullptr;
+      outRec2->Idx = outRec1->Idx;
+
+      outRec1->IsHole = holeStateRec->IsHole;
+      if (holeStateRec == outRec2) 
+        outRec1->FirstLeft = outRec2->FirstLeft;
+      outRec2->FirstLeft = outRec1;
+
+      //fixup FirstLeft pointers that may need reassigning to OutRec1
+      if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1);
+    }
+  }
+}
+
+//------------------------------------------------------------------------------
+// ClipperOffset support functions ...
+//------------------------------------------------------------------------------
+
+DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2)
+{
+  if(pt2.X == pt1.X && pt2.Y == pt1.Y) 
+    return DoublePoint(0, 0);
+
+  double Dx = (double)(pt2.X - pt1.X);
+  double dy = (double)(pt2.Y - pt1.Y);
+  double f = 1 *1.0/ std::sqrt( Dx*Dx + dy*dy );
+  Dx *= f;
+  dy *= f;
+  return DoublePoint(dy, -Dx);
+}
+
+//------------------------------------------------------------------------------
+// ClipperOffset class
+//------------------------------------------------------------------------------
+
+ClipperOffset::ClipperOffset(double miterLimit, double arcTolerance)
+  : m_destPolys()
+  , m_srcPoly()
+  , m_destPoly()
+  , m_normals()
+  , m_delta()
+  , m_sinA(0.0)
+  , m_sin(0.0)
+  , m_cos(1.0)
+  , m_miterLim()
+  , m_StepsPerRad()
+  , m_lowest()
+  , m_polyNodes()
+{
+  this->MiterLimit = miterLimit;
+  this->ArcTolerance = arcTolerance;
+  m_lowest.X = -1;
+}
+//------------------------------------------------------------------------------
+
+ClipperOffset::~ClipperOffset()
+{
+  Clear();
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::Clear()
+{
+  for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
+    delete m_polyNodes.Childs[i];
+  m_polyNodes.Childs.clear();
+  m_lowest.X = -1;
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::AddPath(const Path& path, JoinType joinType, EndType endType)
+{
+  int highI = (int)path.size() - 1;
+  if (highI < 0) return;
+  PolyNode* newNode = new PolyNode();
+  newNode->m_jointype = joinType;
+  newNode->m_endtype = endType;
+
+  //strip duplicate points from path and also get index to the lowest point ...
+  if (endType == etClosedLine || endType == etClosedPolygon)
+    while (highI > 0 && path[0] == path[highI]) highI--;
+  newNode->Contour.reserve(highI + 1);
+  newNode->Contour.emplace_back(path[0]);
+  int j = 0, k = 0;
+  for (int i = 1; i <= highI; i++)
+    if (newNode->Contour[j] != path[i])
+    {
+      j++;
+      newNode->Contour.emplace_back(path[i]);
+      if (path[i].Y > newNode->Contour[k].Y ||
+        (path[i].Y == newNode->Contour[k].Y &&
+        path[i].X < newNode->Contour[k].X)) k = j;
+    }
+  if (endType == etClosedPolygon && j < 2)
+  {
+    delete newNode;
+    return;
+  }
+  m_polyNodes.AddChild(*newNode);
+
+  //if this path's lowest pt is lower than all the others then update m_lowest
+  if (endType != etClosedPolygon) return;
+  if (m_lowest.X < 0)
+    m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
+  else
+  {
+    IntPoint ip = m_polyNodes.Childs[(int)m_lowest.X]->Contour[(int)m_lowest.Y];
+    if (newNode->Contour[k].Y > ip.Y ||
+      (newNode->Contour[k].Y == ip.Y &&
+      newNode->Contour[k].X < ip.X))
+      m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
+  }
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::AddPaths(const Paths& paths, JoinType joinType, EndType endType)
+{
+  for (Paths::size_type i = 0; i < paths.size(); ++i)
+    AddPath(paths[i], joinType, endType);
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::FixOrientations()
+{
+  //fixup orientations of all closed paths if the orientation of the
+  //closed path with the lowermost vertex is wrong ...
+  if (m_lowest.X >= 0 && 
+    !Orientation(m_polyNodes.Childs[(int)m_lowest.X]->Contour))
+  {
+    for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
+    {
+      PolyNode& node = *m_polyNodes.Childs[i];
+      if (node.m_endtype == etClosedPolygon ||
+        (node.m_endtype == etClosedLine && Orientation(node.Contour)))
+          ReversePath(node.Contour);
+    }
+  } else
+  {
+    for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
+    {
+      PolyNode& node = *m_polyNodes.Childs[i];
+      if (node.m_endtype == etClosedLine && !Orientation(node.Contour))
+        ReversePath(node.Contour);
+    }
+  }
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::Execute(Paths& solution, double delta)
+{
+  solution.clear();
+  FixOrientations();
+  DoOffset(delta);
+  
+  //now clean up 'corners' ...
+  Clipper clpr;
+  clpr.AddPaths(m_destPolys, ptSubject, true);
+  if (delta > 0)
+  {
+    clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
+  }
+  else
+  {
+    IntRect r = clpr.GetBounds();
+    Path outer(4);
+    outer[0] = IntPoint(r.left - 10, r.bottom + 10);
+    outer[1] = IntPoint(r.right + 10, r.bottom + 10);
+    outer[2] = IntPoint(r.right + 10, r.top - 10);
+    outer[3] = IntPoint(r.left - 10, r.top - 10);
+
+    clpr.AddPath(outer, ptSubject, true);
+    clpr.ReverseSolution(true);
+    clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
+    if (!solution.empty()) solution.erase(solution.begin());
+  }
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Builds a new path from "path" with offset "delta"
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+bool ClipperOffset::PathOffset( const Path & path, Path & offsetPath, double delta )
+{
+  IntPoint pathBegin;
+  IntPoint pathEnd;
+
+  Clear();
+
+  if (delta < 0)
+  {
+    Path reversePath;
+
+    reversePath.reserve(path.size());
+
+    for (auto p = path.crbegin(); p != path.crend(); ++p)
+    {
+      reversePath.emplace_back(*p);
+    }
+   
+    AddPath( reversePath, JoinType::jtSquare, EndType::etOpenButt );
+    
+    delta     = fabs(delta);
+    pathBegin = path.back();
+    pathEnd   = path.front();
+  }
+  else
+  {
+    pathBegin = path.front();
+    pathEnd   = path.back();
+    AddPath( path, JoinType::jtSquare, EndType::etOpenButt );
+  }
+
+  // build offset polygon:
+  
+  Paths solution;
+
+  FixOrientations();
+  DoOffset(delta);
+ 
+  Clipper clpr;
+
+  clpr.AddPaths(m_destPolys, ptSubject, true);
+  clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
+
+  // filter edges to get only the moved path:
+
+  bool  onOffsetPath = false;
+  for (auto solutionPath : solution)
+  {
+    if (onOffsetPath) break;
+
+    ClipperLib::Path::const_iterator it                   = solutionPath.begin();
+    ClipperLib::Path::const_iterator beginningOnPathPoint = solutionPath.end();
+
+    if (it != solutionPath.end())
+    {            
+      ClipperLib::cInt px = it->X;
+      ClipperLib::cInt py = it->Y;
+      ClipperLib::cInt dx;
+      ClipperLib::cInt dy;
+
+      ++it;
+      
+      // iterate over edges
+      while (it != beginningOnPathPoint)
+      {
+        ClipperLib::cInt rx = it->X - px;
+        ClipperLib::cInt ry = it->Y - py;
+
+        if (onOffsetPath)
+        {
+          dx = pathEnd.X - px;
+          dy = pathEnd.Y - py;
+        }
+        else
+        {
+          dx = pathBegin.X - px;
+          dy = pathBegin.Y - py;
+        }
+
+        // check for begin or end point is on edge
+        if (((dx*ry) == (dy*rx)) && ((std::abs(dx) <= std::abs(rx)) && ((dx*rx) >= 0))) 
+        {
+          if (!onOffsetPath)
+          {
+            // begin point is on edge start copying geometry to offsetPath
+            onOffsetPath = true;
+            // set end condition of loop walk again over all verticies
+            beginningOnPathPoint = it;
+          }
+          else break; // end point is on edge, skip the rest of the path 
+        }
+
+        if (onOffsetPath) offsetPath.emplace_back( *it );
+
+        px = it->X;
+        py = it->Y;
+
+        ++it;
+
+        if (it == solutionPath.end())
+        {
+          // end of geometry is reached, but there not all geometry copied now
+          // set it to the beginning and go on. Or pathBegin is lying in the
+          // in the last segment (closing segment) of the polygon
+          it = solutionPath.begin();
+          if (!onOffsetPath)
+          { 
+            // check the closing segment and finish search if not found
+            beginningOnPathPoint = it+1;
+          }
+        }
+      } // while
+    }
+  }
+
+  // Should never be nessecary, but could be useful in worthed case
+  if ((offsetPath.empty()) && (!solution.empty()))
+  {
+     auto solutionPath = solution.front();
+     for (auto vertex : solutionPath)
+     {
+        offsetPath.emplace_back(vertex);
+     }
+     return false;
+  }
+
+  return (!offsetPath.empty());
+} /* ClipperOffset::PathOffset */
+
+//------------------------------------------------------------------------------
+
+void ClipperOffset::Execute(PolyTree& solution, double delta)
+{
+  solution.Clear();
+  FixOrientations();
+  DoOffset(delta);
+
+  //now clean up 'corners' ...
+  Clipper clpr;
+  clpr.AddPaths(m_destPolys, ptSubject, true);
+  if (delta > 0)
+  {
+    clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
+  }
+  else
+  {
+    IntRect r = clpr.GetBounds();
+    Path outer(4);
+    outer[0] = IntPoint(r.left - 10, r.bottom + 10);
+    outer[1] = IntPoint(r.right + 10, r.bottom + 10);
+    outer[2] = IntPoint(r.right + 10, r.top - 10);
+    outer[3] = IntPoint(r.left - 10, r.top - 10);
+
+    clpr.AddPath(outer, ptSubject, true);
+    clpr.ReverseSolution(true);
+    clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
+    //remove the outer PolyNode rectangle ...
+    if (solution.ChildCount() == 1 && solution.Childs[0]->ChildCount() > 0)
+    {
+      PolyNode* outerNode = solution.Childs[0];
+      solution.Childs.reserve(outerNode->ChildCount());
+      solution.Childs[0] = outerNode->Childs[0];
+      solution.Childs[0]->Parent = outerNode->Parent;
+      for (int i = 1; i < outerNode->ChildCount(); ++i)
+        solution.AddChild(*outerNode->Childs[i]);
+    }
+    else
+      solution.Clear();
+  }
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::DoOffset(double delta)
+{
+  m_destPolys.clear();
+  m_delta = delta;
+
+  //if Zero offset, just copy any CLOSED polygons to m_p and return ...
+  if (NEAR_ZERO(delta)) 
+  {
+    m_destPolys.reserve(m_polyNodes.ChildCount());
+    for (int i = 0; i < m_polyNodes.ChildCount(); i++)
+    {
+      PolyNode& node = *m_polyNodes.Childs[i];
+      if (node.m_endtype == etClosedPolygon)
+        m_destPolys.emplace_back(node.Contour);
+    }
+    return;
+  }
+
+  //see offset_triginometry3.svg in the documentation folder ...
+  if (MiterLimit > 2) m_miterLim = 2/(MiterLimit * MiterLimit);
+  else m_miterLim = 0.5;
+
+  double y;
+  if (ArcTolerance <= 0.0) y = def_arc_tolerance;
+  else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance) 
+    y = std::fabs(delta) * def_arc_tolerance;
+  else y = ArcTolerance;
+  //see offset_triginometry2.svg in the documentation folder ...
+  double steps = pi / std::acos(1 - y / std::fabs(delta));
+  if (steps > std::fabs(delta) * pi) 
+    steps = std::fabs(delta) * pi;  //ie excessive precision check
+  m_sin = std::sin(two_pi / steps);
+  m_cos = std::cos(two_pi / steps);
+  m_StepsPerRad = steps / two_pi;
+  if (delta < 0.0) m_sin = -m_sin;
+
+  m_destPolys.reserve(m_polyNodes.ChildCount() * 2);
+  for (int i = 0; i < m_polyNodes.ChildCount(); i++)
+  {
+    PolyNode& node = *m_polyNodes.Childs[i];
+    m_srcPoly = node.Contour;
+
+    int len = (int)m_srcPoly.size();
+    if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon)))
+        continue;
+
+    m_destPoly.clear();
+    if (len == 1)
+    {
+      if (node.m_jointype == jtRound)
+      {
+        double X = 1.0, Y = 0.0;
+        for (cInt j = 1; j <= steps; j++)
+        {
+          m_destPoly.emplace_back(IntPoint(
+            Round(m_srcPoly[0].X + X * delta),
+            Round(m_srcPoly[0].Y + Y * delta)));
+          double X2 = X;
+          X = X * m_cos - m_sin * Y;
+          Y = X2 * m_sin + Y * m_cos;
+        }
+      }
+      else
+      {
+        double X = -1.0, Y = -1.0;
+        for (int j = 0; j < 4; ++j)
+        {
+          m_destPoly.emplace_back(IntPoint(
+            Round(m_srcPoly[0].X + X * delta),
+            Round(m_srcPoly[0].Y + Y * delta))); 
+          if (X < 0) X = 1;
+          else if (Y < 0) Y = 1;
+          else X = -1;
+        }
+      }
+      m_destPolys.emplace_back(m_destPoly);
+      continue;
+    }
+    //build m_normals ...
+    m_normals.clear();
+    m_normals.reserve(len);
+    for (int j = 0; j < len - 1; ++j)
+      m_normals.emplace_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1]));
+    if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon)
+      m_normals.emplace_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0]));
+    else
+      m_normals.emplace_back(DoublePoint(m_normals[len - 2]));
+
+    if (node.m_endtype == etClosedPolygon)
+    {
+      int k = len - 1;
+      for (int j = 0; j < len; ++j)
+        OffsetPoint(j, k, node.m_jointype);
+      m_destPolys.emplace_back(m_destPoly);
+    }
+    else if (node.m_endtype == etClosedLine)
+    {
+      int k = len - 1;
+      for (int j = 0; j < len; ++j)
+        OffsetPoint(j, k, node.m_jointype);
+      m_destPolys.emplace_back(m_destPoly);
+      m_destPoly.clear();
+      //re-build m_normals ...
+      DoublePoint n = m_normals[len -1];
+      for (int j = len - 1; j > 0; j--)
+        m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y);
+      m_normals[0] = DoublePoint(-n.X, -n.Y);
+      k = 0;
+      for (int j = len - 1; j >= 0; j--)
+        OffsetPoint(j, k, node.m_jointype);
+      m_destPolys.emplace_back(m_destPoly);
+    }
+    else
+    {
+      int k = 0;
+      for (int j = 1; j < len - 1; ++j)
+        OffsetPoint(j, k, node.m_jointype);
+
+      IntPoint pt1;
+      if (node.m_endtype == etOpenButt)
+      {
+        int j = len - 1;
+        pt1 = IntPoint((cInt)Round(m_srcPoly[j].X + m_normals[j].X *
+          delta), (cInt)Round(m_srcPoly[j].Y + m_normals[j].Y * delta));
+        m_destPoly.emplace_back(pt1);
+
+        pt1 = IntPoint((cInt)Round(m_srcPoly[j].X - m_normals[j].X *
+          delta), (cInt)Round(m_srcPoly[j].Y - m_normals[j].Y * delta));
+        m_destPoly.emplace_back(pt1);
+      }
+      else
+      {
+        int j = len - 1;
+        k = len - 2;
+        m_sinA = 0;
+        m_normals[j] = DoublePoint(-m_normals[j].X, -m_normals[j].Y);
+        if (node.m_endtype == etOpenSquare)
+          DoSquare(j, k);
+        else
+          DoRound(j, k);
+      }
+
+      //re-build m_normals ...
+      for (int j = len - 1; j > 0; j--)
+        m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y);
+      m_normals[0] = DoublePoint(-m_normals[1].X, -m_normals[1].Y);
+      k = len - 1;
+  
+      for (int j = k - 1; j > 0; --j) OffsetPoint(j, k, node.m_jointype);
+
+      if (node.m_endtype == etOpenButt)
+      {
+        pt1 = IntPoint((cInt)Round(m_srcPoly[0].X - m_normals[0].X * delta),
+          (cInt)Round(m_srcPoly[0].Y - m_normals[0].Y * delta));
+        m_destPoly.emplace_back(pt1);
+
+        pt1 = IntPoint((cInt)Round(m_srcPoly[0].X + m_normals[0].X * delta),
+          (cInt)Round(m_srcPoly[0].Y + m_normals[0].Y * delta));
+        m_destPoly.emplace_back(pt1);
+      }
+      else
+      {
+        m_sinA = 0;
+        if (node.m_endtype == etOpenSquare)
+          DoSquare(0, 1);
+        else
+          DoRound(0, 1);
+      }
+      m_destPolys.emplace_back(m_destPoly);
+    }
+  }
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype)
+{
+  //cross product ...
+  m_sinA = (m_normals[k].X * m_normals[j].Y - m_normals[j].X * m_normals[k].Y);
+  if (std::fabs(m_sinA * m_delta) < 1.0) 
+  {
+    //dot product ...
+    double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y ); 
+    if (cosA > 0) // angle => 0 degrees
+    {
+      m_destPoly.emplace_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta),
+        Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta)));
+      return; 
+    }
+    //else angle => 180 degrees   
+  }
+  else if (m_sinA > 1.0) m_sinA = 1.0;
+  else if (m_sinA < -1.0) m_sinA = -1.0;
+
+  if (m_sinA * m_delta < 0)
+  {
+
+    m_destPoly.emplace_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta),
+      Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta)));
+    m_destPoly.emplace_back(m_srcPoly[j]);
+    m_destPoly.emplace_back(IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * m_delta),
+      Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta)));
+   
+  }
+  else
+    switch (jointype)
+    {
+      case jtMiter:
+        {
+          double r = 1 + (m_normals[j].X * m_normals[k].X +
+            m_normals[j].Y * m_normals[k].Y);
+          if (r >= m_miterLim) DoMiter(j, k, r); else DoSquare(j, k);
+          break;
+        }
+      case jtSquare: DoSquare(j, k); break;
+      case jtRound: DoRound(j, k); break;
+    }
+  k = j;
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::DoSquare(int j, int k)
+{
+  double dx = std::tan(std::atan2(m_sinA,
+      m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y) / 4);
+ 
+  m_destPoly.emplace_back(IntPoint(
+      Round(m_srcPoly[j].X + m_delta * (m_normals[k].X - m_normals[k].Y * dx)),
+      Round(m_srcPoly[j].Y + m_delta * (m_normals[k].Y + m_normals[k].X * dx))));
+   
+  m_destPoly.emplace_back(IntPoint(
+      Round(m_srcPoly[j].X + m_delta * (m_normals[j].X + m_normals[j].Y * dx)),
+      Round(m_srcPoly[j].Y + m_delta * (m_normals[j].Y - m_normals[j].X * dx))));
+
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::DoMiter(int j, int k, double r)
+{
+  double q = m_delta / r;
+  m_destPoly.emplace_back(IntPoint(Round(m_srcPoly[j].X + (m_normals[k].X + m_normals[j].X) * q),
+      Round(m_srcPoly[j].Y + (m_normals[k].Y + m_normals[j].Y) * q)));
+}
+//------------------------------------------------------------------------------
+
+void ClipperOffset::DoRound(int j, int k)
+{
+  double a = std::atan2(m_sinA,
+  m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y);
+  int steps = std::max((int)Round(m_StepsPerRad * std::fabs(a)), 1);
+
+  double X = m_normals[k].X, Y = m_normals[k].Y;
+  for (int i = 0; i < steps; ++i)
+  {
+    m_destPoly.emplace_back(IntPoint(
+        Round(m_srcPoly[j].X + X * m_delta),
+        Round(m_srcPoly[j].Y + Y * m_delta)));
+    double X2 = X;
+    X = X * m_cos - m_sin * Y;
+    Y = X2 * m_sin + Y * m_cos;
+  }
+  m_destPoly.emplace_back(IntPoint(
+  Round(m_srcPoly[j].X + m_normals[j].X * m_delta),
+  Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta)));
+}
+
+//------------------------------------------------------------------------------
+// Miscellaneous public functions
+//------------------------------------------------------------------------------
+
+void Clipper::DoSimplePolygons()
+{
+  PolyOutList::size_type i = 0;
+  while (i < m_PolyOuts.size()) 
+  {
+    OutRec* outrec = m_PolyOuts[i++];
+    OutPt* op = outrec->Pts;
+    if (!op || outrec->IsOpen) continue;
+    do //for each Pt in Polygon until duplicate found do ...
+    {
+      OutPt* op2 = op->Next;
+      while (op2 != outrec->Pts) 
+      {
+        if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) 
+        {
+          //split the polygon into two ...
+          OutPt* op3 = op->Prev;
+          OutPt* op4 = op2->Prev;
+          op->Prev = op4;
+          op4->Next = op;
+          op2->Prev = op3;
+          op3->Next = op2;
+
+          outrec->Pts = op;
+          OutRec* outrec2 = CreateOutRec();
+          outrec2->Pts = op2;
+          UpdateOutPtIdxs(*outrec2);
+          if (Poly2ContainsPoly1(outrec2->Pts, outrec->Pts))
+          {
+            //OutRec2 is contained by OutRec1 ...
+            outrec2->IsHole = !outrec->IsHole;
+            outrec2->FirstLeft = outrec;
+            if (m_UsingPolyTree) FixupFirstLefts2(outrec2, outrec);
+          }
+          else
+            if (Poly2ContainsPoly1(outrec->Pts, outrec2->Pts))
+          {
+            //OutRec1 is contained by OutRec2 ...
+            outrec2->IsHole = outrec->IsHole;
+            outrec->IsHole = !outrec2->IsHole;
+            outrec2->FirstLeft = outrec->FirstLeft;
+            outrec->FirstLeft = outrec2;
+            if (m_UsingPolyTree) FixupFirstLefts2(outrec, outrec2);
+            }
+            else
+          {
+            //the 2 polygons are separate ...
+            outrec2->IsHole = outrec->IsHole;
+            outrec2->FirstLeft = outrec->FirstLeft;
+            if (m_UsingPolyTree) FixupFirstLefts1(outrec, outrec2);
+            }
+          op2 = op; //ie get ready for the Next iteration
+        }
+        op2 = op2->Next;
+      }
+      op = op->Next;
+    }
+    while (op != outrec->Pts);
+  }
+}
+//------------------------------------------------------------------------------
+
+void ReversePath(Path& p)
+{
+  std::reverse(p.begin(), p.end());
+}
+//------------------------------------------------------------------------------
+
+void ReversePaths(Paths& p)
+{
+  for (Paths::size_type i = 0; i < p.size(); ++i)
+    ReversePath(p[i]);
+}
+//------------------------------------------------------------------------------
+
+void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType)
+{
+  Clipper c;
+  c.StrictlySimple(true);
+  c.AddPath(in_poly, ptSubject, true);
+  c.Execute(ctUnion, out_polys, fillType, fillType);
+}
+//------------------------------------------------------------------------------
+
+void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType)
+{
+  Clipper c;
+  c.StrictlySimple(true);
+  c.AddPaths(in_polys, ptSubject, true);
+  c.Execute(ctUnion, out_polys, fillType, fillType);
+}
+//------------------------------------------------------------------------------
+
+void SimplifyPolygons(Paths &polys, PolyFillType fillType)
+{
+  SimplifyPolygons(polys, polys, fillType);
+}
+//------------------------------------------------------------------------------
+
+inline double DistanceSqrd(const IntPoint& pt1, const IntPoint& pt2)
+{
+  double Dx = ((double)pt1.X - pt2.X);
+  double dy = ((double)pt1.Y - pt2.Y);
+  return (Dx*Dx + dy*dy);
+}
+//------------------------------------------------------------------------------
+
+double DistanceFromLineSqrd(
+  const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2)
+{
+  //The equation of a line in general form (Ax + By + C = 0)
+  //given 2 points (x¹,y¹) & (x²,y²) is ...
+  //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0
+  //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹
+  //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²)
+  //see http://en.wikipedia.org/wiki/Perpendicular_distance
+  double A = double(ln1.Y - ln2.Y);
+  double B = double(ln2.X - ln1.X);
+  double C = A * ln1.X  + B * ln1.Y;
+  C = A * pt.X + B * pt.Y - C;
+  return (C * C) / (A * A + B * B);
+}
+//---------------------------------------------------------------------------
+
+bool SlopesNearCollinear(const IntPoint& pt1, 
+    const IntPoint& pt2, const IntPoint& pt3, double distSqrd)
+{
+  //this function is more accurate when the point that's geometrically
+  //between the other 2 points is the one that's tested for distance.
+  //ie makes it more likely to pick up 'spikes' ...
+   if (Abs(pt1.X - pt2.X) > Abs(pt1.Y - pt2.Y))
+   {
+    if ((pt1.X > pt2.X) == (pt1.X < pt3.X))
+      return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
+    else if ((pt2.X > pt1.X) == (pt2.X < pt3.X))
+      return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
+      else
+       return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
+   }
+   else
+   {
+    if ((pt1.Y > pt2.Y) == (pt1.Y < pt3.Y))
+      return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
+    else if ((pt2.Y > pt1.Y) == (pt2.Y < pt3.Y))
+      return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
+      else
+      return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
+   }
+}
+//------------------------------------------------------------------------------
+
+bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd)
+{
+    double Dx = (double)pt1.X - pt2.X;
+    double dy = (double)pt1.Y - pt2.Y;
+    return ((Dx * Dx) + (dy * dy) <= distSqrd);
+}
+//------------------------------------------------------------------------------
+
+OutPt* ExcludeOp(OutPt* op)
+{
+  OutPt* result = op->Prev;
+  result->Next = op->Next;
+  op->Next->Prev = result;
+  result->Idx = 0;
+  return result;
+}
+//------------------------------------------------------------------------------
+
+void CleanPolygon(const Path& in_poly, Path& out_poly, double distance)
+{
+  //distance = proximity in units/pixels below which vertices
+  //will be stripped. Default ~= sqrt(2).
+  
+  size_t size = in_poly.size();
+  
+  if (size == 0) 
+  {
+    out_poly.clear();
+    return;
+  }
+
+  OutPt* outPts = new OutPt[size];
+  for (size_t i = 0; i < size; ++i)
+  {
+    outPts[i].Pt = in_poly[i];
+    outPts[i].Next = &outPts[(i + 1) % size];
+    outPts[i].Next->Prev = &outPts[i];
+    outPts[i].Idx = 0;
+  }
+
+  double distSqrd = distance * distance;
+  OutPt* op = &outPts[0];
+  while (op->Idx == 0 && op->Next != op->Prev) 
+  {
+    if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd))
+    {
+      op = ExcludeOp(op);
+      size--;
+    } 
+    else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd))
+    {
+      ExcludeOp(op->Next);
+      op = ExcludeOp(op);
+      size -= 2;
+    }
+    else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd))
+    {
+      op = ExcludeOp(op);
+      size--;
+    }
+    else
+    {
+      op->Idx = 1;
+      op = op->Next;
+    }
+  }
+
+  if (size < 3) size = 0;
+  out_poly.resize(size);
+  for (size_t i = 0; i < size; ++i)
+  {
+    out_poly[i] = op->Pt;
+    op = op->Next;
+  }
+  delete [] outPts;
+}
+//------------------------------------------------------------------------------
+
+void CleanPolygon(Path& poly, double distance)
+{
+  CleanPolygon(poly, poly, distance);
+}
+//------------------------------------------------------------------------------
+
+void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance)
+{
+  for (Paths::size_type i = 0; i < in_polys.size(); ++i)
+    CleanPolygon(in_polys[i], out_polys[i], distance);
+}
+//------------------------------------------------------------------------------
+
+void CleanPolygons(Paths& polys, double distance)
+{
+  CleanPolygons(polys, polys, distance);
+}
+//------------------------------------------------------------------------------
+
+void Minkowski(const Path& poly, const Path& path, 
+  Paths& solution, bool isSum, bool isClosed)
+{
+  int delta = (isClosed ? 1 : 0);
+  size_t polyCnt = poly.size();
+  size_t pathCnt = path.size();
+  Paths pp;
+  pp.reserve(pathCnt);
+  if (isSum)
+    for (size_t i = 0; i < pathCnt; ++i)
+    {
+      Path p;
+      p.reserve(polyCnt);
+      for (size_t j = 0; j < poly.size(); ++j)
+        p.emplace_back(IntPoint(path[i].X + poly[j].X, path[i].Y + poly[j].Y));
+      pp.emplace_back(p);
+    }
+  else
+    for (size_t i = 0; i < pathCnt; ++i)
+    {
+      Path p;
+      p.reserve(polyCnt);
+      for (size_t j = 0; j < poly.size(); ++j)
+        p.emplace_back(IntPoint(path[i].X - poly[j].X, path[i].Y - poly[j].Y));
+      pp.emplace_back(p);
+    }
+
+  solution.clear();
+  solution.reserve((pathCnt + delta) * (polyCnt + 1));
+  for (size_t i = 0; i < pathCnt - 1 + delta; ++i)
+    for (size_t j = 0; j < polyCnt; ++j)
+    {
+      Path quad;
+      quad.reserve(4);
+      quad.emplace_back(pp[i % pathCnt][j % polyCnt]);
+      quad.emplace_back(pp[(i + 1) % pathCnt][j % polyCnt]);
+      quad.emplace_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]);
+      quad.emplace_back(pp[i % pathCnt][(j + 1) % polyCnt]);
+      if (!Orientation(quad)) ReversePath(quad);
+      solution.emplace_back(quad);
+    }
+}
+//------------------------------------------------------------------------------
+
+void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed)
+{
+  Minkowski(pattern, path, solution, true, pathIsClosed);
+  Clipper c;
+  c.AddPaths(solution, ptSubject, true);
+  c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
+}
+//------------------------------------------------------------------------------
+
+void TranslatePath(const Path& input, Path& output, IntPoint delta) 
+{
+  //precondition: input != output
+  output.resize(input.size());
+  for (size_t i = 0; i < input.size(); ++i)
+    output[i] = IntPoint(input[i].X + delta.X, input[i].Y + delta.Y);
+}
+//------------------------------------------------------------------------------
+
+void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed)
+{
+  Clipper c;
+  for (size_t i = 0; i < paths.size(); ++i)
+  {
+    Paths tmp;
+    Minkowski(pattern, paths[i], tmp, true, pathIsClosed);
+    c.AddPaths(tmp, ptSubject, true);
+    if (pathIsClosed)
+    {
+      Path tmp2;
+      TranslatePath(paths[i], tmp2, pattern[0]);
+      c.AddPath(tmp2, ptClip, true);
+    }
+  }
+    c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
+}
+//------------------------------------------------------------------------------
+
+void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution)
+{
+  Minkowski(poly1, poly2, solution, false, true);
+  Clipper c;
+  c.AddPaths(solution, ptSubject, true);
+  c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
+}
+//------------------------------------------------------------------------------
+
+enum NodeType {ntAny, ntOpen, ntClosed};
+
+void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& paths)
+{
+  bool match = true;
+  if (nodetype == ntClosed) match = !polynode.IsOpen();
+  else if (nodetype == ntOpen) return;
+
+  if (!polynode.Contour.empty() && match)
+    paths.emplace_back(polynode.Contour);
+  for (int i = 0; i < polynode.ChildCount(); ++i)
+    AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths);
+}
+//------------------------------------------------------------------------------
+
+void PolyTreeToPaths(const PolyTree& polytree, Paths& paths)
+{
+  paths.resize(0); 
+  paths.reserve(polytree.Total());
+  AddPolyNodeToPaths(polytree, ntAny, paths);
+}
+//------------------------------------------------------------------------------
+
+void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths)
+{
+  paths.resize(0); 
+  paths.reserve(polytree.Total());
+  AddPolyNodeToPaths(polytree, ntClosed, paths);
+}
+//------------------------------------------------------------------------------
+
+void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths)
+{
+  paths.resize(0); 
+  paths.reserve(polytree.Total());
+  //Open paths are top level only, so ...
+  for (int i = 0; i < polytree.ChildCount(); ++i)
+    if (polytree.Childs[i]->IsOpen())
+      paths.emplace_back(polytree.Childs[i]->Contour);
+}
+//------------------------------------------------------------------------------
+
+std::ostream& operator <<(std::ostream &s, const IntPoint &p)
+{
+  s << "(" << p.X << "," << p.Y << ")";
+  return s;
+}
+//------------------------------------------------------------------------------
+
+std::ostream& operator <<(std::ostream &s, const Path &p)
+{
+  if (p.empty()) return s;
+  Path::size_type last = p.size() -1;
+  for (Path::size_type i = 0; i < last; i++)
+    s << "(" << p[i].X << "," << p[i].Y << "), ";
+  s << "(" << p[last].X << "," << p[last].Y << ")\n";
+  return s;
+}
+//------------------------------------------------------------------------------
+
+std::ostream& operator <<(std::ostream &s, const Paths &p)
+{
+  for (Paths::size_type i = 0; i < p.size(); i++)
+    s << p[i];
+  s << "\n";
+  return s;
+}
+//------------------------------------------------------------------------------
+
+} //ClipperLib namespace
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.hpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.hpp
new file mode 100755
index 000000000..08dc41fd4
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/clipper.hpp
@@ -0,0 +1,411 @@
+/**
+**
+** @RDE_HEADER@
+** Clipping and Offsetting of lines and polygons
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+** To use under Boost Software License Vers. 1
+** see also http://www.angusj.com/delphi/clipper/documentation/Docs/_Body.htm 
+** -----------------------------------------------------------------------------------------------
+*/
+/*******************************************************************************
+*                                                                              *
+* Author    :  Angus Johnson                                                   *
+* Version   :  6.2.1                                                           *
+* Date      :  31 October 2014                                                 *
+* Website   :  http://www.angusj.com                                           *
+* Copyright :  Angus Johnson 2010-2014                                         *
+*                                                                              *
+* License:                                                                     *
+* Use, modification & distribution is subject to Boost Software License Ver 1. *
+* http://www.boost.org/LICENSE_1_0.txt                                         *
+*                                                                              *
+* Attributions:                                                                *
+* The code in this library is an extension of Bala Vatti's clipping algorithm: *
+* "A generic solution to polygon clipping"                                     *
+* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63.             *
+* http://portal.acm.org/citation.cfm?id=129906                                 *
+*                                                                              *
+* Computer graphics and geometric modeling: implementation and algorithms      *
+* By Max K. Agoston                                                            *
+* Springer; 1 edition (January 4, 2005)                                        *
+* http://books.google.com/books?q=vatti+clipping+agoston                       *
+*                                                                              *
+* See also:                                                                    *
+* "Polygon Offsetting by Computing Winding Numbers"                            *
+* Paper no. DETC2005-85513 pp. 565-575                                         *
+* ASME 2005 International Design Engineering Technical Conferences             *
+* and Computers and Information in Engineering Conference (IDETC/CIE2005)      *
+* September 24-28, 2005 , Long Beach, California, USA                          *
+* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf              *
+*                                                                              *
+*******************************************************************************/
+
+#ifndef clipper_hpp
+#define clipper_hpp
+
+#define CLIPPER_VERSION "6.2.0"
+
+//use_int32: When enabled 32bit ints are used instead of 64bit ints. This
+//improve performance but coordinate values are limited to the range +/- 46340
+//#define use_int32
+
+//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
+//#define use_xyz
+
+//use_lines: Enables line clipping. Adds a very minor cost to performance.
+//#define use_lines
+  
+//use_deprecated: Enables temporary support for the obsolete functions
+//#define use_deprecated  
+
+#include <vector>
+#include <set>
+#include <stdexcept>
+#include <cstring>
+#include <cstdlib>
+#include <ostream>
+#include <functional>
+#include <queue>
+
+namespace ClipperLib {
+
+enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor };
+enum PolyType { ptSubject, ptClip };
+//By far the most widely used winding rules for polygon filling are
+//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32)
+//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL)
+//see http://glprogramming.com/red/chapter11.html
+enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
+
+#ifdef use_int32
+  typedef int cInt;
+  static cInt const loRange = 0x7FFF;
+  static cInt const hiRange = 0x7FFF;
+#else
+  typedef signed long long cInt;
+  static cInt const loRange = 0x3FFFFFFF;
+  static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
+  typedef signed long long long64;     //used by Int128 class
+  typedef unsigned long long ulong64;
+
+#endif
+
+struct IntPoint {
+  cInt X;
+  cInt Y;
+#ifdef use_xyz
+  cInt Z;
+  IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {};
+#else
+  IntPoint(cInt x = 0, cInt y = 0): X(x), Y(y) {};
+#endif
+
+  friend inline bool operator== (const IntPoint& a, const IntPoint& b)
+  {
+    return a.X == b.X && a.Y == b.Y;
+  }
+  friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
+  {
+    return a.X != b.X  || a.Y != b.Y; 
+  }
+};
+//------------------------------------------------------------------------------
+
+typedef std::vector< IntPoint > Path;
+typedef std::vector< Path > Paths;
+
+inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;}
+inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;}
+
+std::ostream& operator <<(std::ostream &s, const IntPoint &p);
+std::ostream& operator <<(std::ostream &s, const Path &p);
+std::ostream& operator <<(std::ostream &s, const Paths &p);
+
+struct DoublePoint
+{
+  double X;
+  double Y;
+  DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {}
+  explicit DoublePoint(const IntPoint &ip) : X(ip.X), Y(ip.Y) {}
+};
+//------------------------------------------------------------------------------
+
+#ifdef use_xyz
+typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
+#endif
+
+enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4};
+enum JoinType {jtSquare, jtRound, jtMiter};
+enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound};
+
+class PolyNode;
+typedef std::vector< PolyNode* > PolyNodes;
+
+class PolyNode 
+{ 
+public:
+    PolyNode();
+    virtual ~PolyNode(){};
+    Path Contour;
+    PolyNodes Childs;
+    PolyNode* Parent;
+    PolyNode* GetNext() const;
+    bool IsHole() const;
+    bool IsOpen() const;
+    int ChildCount() const;
+private:
+    unsigned Index; //node index in Parent.Childs
+    bool m_IsOpen;
+    JoinType m_jointype;
+    EndType m_endtype;
+    PolyNode* GetNextSiblingUp() const;
+    void AddChild(PolyNode& child);
+    friend class Clipper; //to access Index
+    friend class ClipperOffset; 
+};
+
+class PolyTree: public PolyNode
+{ 
+public:
+    ~PolyTree(){Clear();};
+    PolyNode* GetFirst() const;
+    void Clear();
+    int Total() const;
+private:
+    PolyNodes AllNodes;
+    friend class Clipper; //to access AllNodes
+};
+
+bool Orientation(const Path &poly);
+double Area(const Path &poly);
+int PointInPolygon(const IntPoint &pt, const Path &path);
+
+void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
+
+void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415);
+void CleanPolygon(Path& poly, double distance = 1.415);
+void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
+void CleanPolygons(Paths& polys, double distance = 1.415);
+
+void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
+void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
+void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
+
+void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
+void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
+void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
+
+void ReversePath(Path& p);
+void ReversePaths(Paths& p);
+
+struct IntRect { cInt left; cInt top; cInt right; cInt bottom; };
+
+//enums that are used internally ...
+enum EdgeSide { esLeft = 1, esRight = 2};
+
+//forward declarations (for stuff used internally) ...
+struct TEdge;
+struct IntersectNode;
+struct LocalMinimum;
+struct Scanbeam;
+struct OutPt;
+struct OutRec;
+struct Join;
+
+typedef std::vector < OutRec* > PolyOutList;
+typedef std::vector < TEdge* > EdgeList;
+typedef std::vector < Join* > JoinList;
+typedef std::vector < IntersectNode* > IntersectList;
+
+//------------------------------------------------------------------------------
+
+//ClipperBase is the ancestor to the Clipper class. It should not be
+//instantiated directly. This class simply abstracts the conversion of sets of
+//polygon coordinates into edge objects that are stored in a LocalMinima list.
+class ClipperBase
+{
+public:
+  ClipperBase();
+  virtual ~ClipperBase();
+  bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
+  bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed);
+  virtual void Clear();
+  IntRect GetBounds();
+  bool PreserveCollinear() const {return m_PreserveCollinear;};
+  void PreserveCollinear(bool value) {m_PreserveCollinear = value;};
+protected:
+  void DisposeLocalMinimaList();
+  TEdge* AddBoundsToLML(TEdge *e, bool IsClosed);
+  void PopLocalMinima();
+  virtual void Reset();
+  TEdge* ProcessBound(TEdge* E, bool IsClockwise);
+  void DoMinimaLML(TEdge* E1, TEdge* E2, bool IsClosed);
+  TEdge* DescendToMin(TEdge *&E);
+  void AscendToMax(TEdge *&E, bool Appending, bool IsClosed);
+
+  typedef std::vector<LocalMinimum> MinimaList;
+  MinimaList::iterator m_CurrentLM;
+  MinimaList           m_MinimaList;
+
+  bool              m_UseFullRange;
+  EdgeList          m_edges;
+  bool             m_PreserveCollinear;
+  bool             m_HasOpenPaths;
+};
+//------------------------------------------------------------------------------
+
+class Clipper : public virtual ClipperBase
+{
+public:
+  explicit Clipper(int initOptions = 0);
+  ~Clipper();
+  bool Execute(ClipType clipType,
+    Paths &solution,
+    PolyFillType subjFillType = pftEvenOdd,
+    PolyFillType clipFillType = pftEvenOdd);
+  bool Execute(ClipType clipType,
+    PolyTree &polytree,
+    PolyFillType subjFillType = pftEvenOdd,
+    PolyFillType clipFillType = pftEvenOdd);
+  bool ReverseSolution() const {return m_ReverseOutput;};
+  void ReverseSolution(bool value) {m_ReverseOutput = value;};
+  bool StrictlySimple() const {return m_StrictSimple;};
+  void StrictlySimple(bool value) {m_StrictSimple = value;};
+  //set the callback function for z value filling on intersections (otherwise Z is 0)
+#ifdef use_xyz
+  void ZFillFunction(ZFillCallback zFillFunc);
+#endif
+protected:
+  void Reset();
+  virtual bool ExecuteInternal();
+private:
+  PolyOutList       m_PolyOuts;
+  JoinList          m_Joins;
+  JoinList          m_GhostJoins;
+  IntersectList     m_IntersectList;
+  ClipType          m_ClipType;
+  typedef std::priority_queue<cInt> ScanbeamList;
+  ScanbeamList      m_Scanbeam;
+  TEdge           *m_ActiveEdges;
+  TEdge           *m_SortedEdges;
+  bool             m_ExecuteLocked;
+  PolyFillType     m_ClipFillType;
+  PolyFillType     m_SubjFillType;
+  bool             m_ReverseOutput;
+  bool             m_UsingPolyTree; 
+  bool             m_StrictSimple;
+#ifdef use_xyz
+  ZFillCallback   m_ZFill; //custom callback 
+#endif
+  void SetWindingCount(TEdge& edge) const;
+  bool IsEvenOddFillType(const TEdge& edge) const;
+  bool IsEvenOddAltFillType(const TEdge& edge) const;
+  void InsertScanbeam(const cInt Y);
+  cInt PopScanbeam();
+  void InsertLocalMinimaIntoAEL(const cInt botY);
+  void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge);
+  void AddEdgeToSEL(TEdge *edge);
+  void CopyAELToSEL();
+  void DeleteFromSEL(TEdge *e);
+  void DeleteFromAEL(TEdge *e);
+  void UpdateEdgeIntoAEL(TEdge *&e);
+  void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2);
+  bool IsContributing(const TEdge& edge) const;
+  bool IsTopHorz(const cInt XPos);
+  void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
+  void DoMaxima(TEdge *e);
+  void ProcessHorizontals(bool IsTopOfScanbeam);
+  void ProcessHorizontal(TEdge *horzEdge, bool isTopOfScanbeam);
+  void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
+  OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
+  OutRec* GetOutRec(int idx);
+  void AppendPolygon(TEdge *e1, TEdge *e2) const;
+  void IntersectEdges(TEdge *e1, TEdge *e2, const IntPoint &pt);
+  OutRec* CreateOutRec();
+  OutPt* AddOutPt(TEdge *e, const IntPoint &pt);
+  void DisposeAllOutRecs();
+  void DisposeOutRec(PolyOutList::size_type index);
+  bool ProcessIntersections(const cInt topY);
+  void BuildIntersectList(const cInt topY);
+  void ProcessIntersectList();
+  void ProcessEdgesAtTopOfScanbeam(const cInt topY);
+  void BuildResult(Paths& polys);
+  void BuildResult2(PolyTree& polytree);
+  void SetHoleState(TEdge *e, OutRec *outrec) const;
+  void DisposeIntersectNodes();
+  bool FixupIntersectionOrder();
+  void FixupOutPolygon(OutRec &outrec);
+  bool IsHole(TEdge *e);
+  bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl);
+  static void FixHoleLinkage(OutRec &outrec);
+  void AddJoin(OutPt *op1, OutPt *op2, const IntPoint & offPt);
+  void ClearJoins();
+  void ClearGhostJoins();
+  void AddGhostJoin(OutPt *op, const IntPoint & offPt);
+  bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2);
+  void JoinCommonEdges();
+  void DoSimplePolygons();
+  void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const;
+  void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const;
+#ifdef use_xyz
+  void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
+#endif
+};
+//------------------------------------------------------------------------------
+
+class ClipperOffset 
+{
+public:
+  ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
+  ~ClipperOffset();
+  void AddPath(const Path& path, JoinType joinType, EndType endType);
+  void AddPaths(const Paths& paths, JoinType joinType, EndType endType);
+  void Execute(Paths& solution, double delta);
+  void Execute(PolyTree& solution, double delta);
+
+  bool PathOffset( const Path& path, Path & offsetPath, double delta ); //  calc offset of one  path
+
+  void Clear();
+  double MiterLimit;
+  double ArcTolerance;
+private:
+  Paths m_destPolys;
+  Path m_srcPoly;
+  Path m_destPoly;
+  std::vector<DoublePoint> m_normals;
+  double m_delta, m_sinA, m_sin, m_cos;
+  double m_miterLim, m_StepsPerRad;
+  IntPoint m_lowest;
+  PolyNode m_polyNodes;
+
+  void FixOrientations();
+  void DoOffset(double delta);
+  void OffsetPoint(int j, int& k, JoinType jointype);
+  void DoSquare(int j, int k);
+  void DoMiter(int j, int k, double r);
+  void DoRound(int j, int k);
+};
+//------------------------------------------------------------------------------
+
+class clipperException : public std::exception
+{
+  public:
+    explicit clipperException(const char* description): m_descr(description) {}
+    virtual ~clipperException() throw() {}
+    virtual const char* what() const throw() {return m_descr.c_str();}
+  private:
+    std::string m_descr;
+};
+//------------------------------------------------------------------------------
+
+} //ClipperLib namespace
+
+#endif //clipper_hpp
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.cpp
new file mode 100755
index 000000000..51e1dbb74
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.cpp
@@ -0,0 +1,736 @@
+/**
+**
+** @RDE_HEADER@
+** Rasterize functional path geometries to polylines
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   12.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "curve.h"
+#include "path_rasterer.h"
+
+
+#include <Common/exception.h>
+
+namespace SituationMap { namespace MathUtils
+{
+
+   static QPointF calcBezierVertex( double t, const QPointF control[4] )
+   {
+      double u, u2, u3, t2, t3;
+      double xx, yy;
+
+      t2 = t*t;
+      t3 = t2*t;
+      u  = 1.0 - t;
+      u2 = u*u;
+      u3 = u2*u;
+      xx = control[0].x()*u3 + 3.0*(control[1].x()*t*u2 + control[2].x()*t2*u) + control[3].x()*t3;
+      yy = control[0].y()*u3 + 3.0*(control[1].y()*t*u2 + control[2].y()*t2*u) + control[3].y()*t3;
+
+      return QPointF(xx,yy);
+
+   } /* calcBezierVertex */
+
+
+   static QPointF calcBezierTangent( double t, const QPointF control[4] )
+   {
+      double t2(t*t);
+      double u(1.0-t);
+      double u2(u*u);
+      double xx(3.0*((control[1].x()-control[0].x())*u2 + (control[2].x()-control[1].x())*t*u*2.0 + (control[3].x()-control[2].x())*t2));
+      double yy(3.0*((control[1].y()-control[0].y())*u2 + (control[2].y()-control[1].y())*t*u*2.0 + (control[3].y()-control[2].y())*t2));
+
+      return QPointF(xx,yy);
+
+   } /* calcBezierTangent */
+
+
+   static double hypotBezierTangent( double t, const QPointF control[4] )
+   {
+      QPointF p(calcBezierTangent(t,control));
+      return hypot(p.x(),p.y());
+   } /* hypotBezierTangent */
+
+
+   static double simpsonApproximation( const QPointF control[4], double a, double b )
+   {
+      const unsigned int NLenSteps = 800;
+
+      double t( b-a );
+      double h( t/NLenSteps );
+
+      double sum( 0.0 );
+
+      // Zusammengesetzte Integration nach der Simpson-Regel
+
+      double s1( 0.0 );
+      double s2( 0.0 );
+
+      for (unsigned int i = 0; i < NLenSteps; i++)
+      {
+         s1 += hypotBezierTangent( a+h*i, control );
+         s2 += hypotBezierTangent( a+h*(double(i)-0.5), control );
+      }
+      s2 += hypotBezierTangent( a+h*(double(NLenSteps)-0.5), control );
+
+      sum += h/6.0 *( hypotBezierTangent(a,control)+hypotBezierTangent(b,control)+2.0*s1+4.0*s2);
+
+      return sum;
+
+   } /* simpsonApproximation */
+
+
+   static inline void buildControlPoints( const QPointF &  p_i,
+                                          const QPointF &  p_i1,
+                                          const QPointF &  p_i2,
+                                          QPointF          control[4],
+                                          bool             startSegm  = false,
+                                          bool             endSegm    = false  )
+   {
+      if (startSegm)
+      {
+         control[0] = p_i;
+         control[1] = p_i*0.333 + p_i1*0.667;
+      }
+      else
+      {
+         control[0] = p_i*0.5   + p_i1*0.5;
+         control[1] = p_i*0.167 + p_i1*0.833;
+      }
+
+      if (endSegm)
+      {
+         control[2] = p_i1*0.667 + p_i2*0.333;
+         control[3] = p_i2;
+      }
+      else
+      {
+         control[2] = p_i1*0.833 + p_i2*0.167;
+         control[3] = p_i1*0.5   + p_i2*0.5;
+      }
+   } /* buildControlPoints */
+
+
+
+   SmoothLine::SmoothLine(const QVector<QPointF> & vertexVector, bool closedCurve )
+   {
+      SmoothLine::vertexVector( vertexVector, closedCurve );
+   } /* BezierSpline::SmoothLine */
+
+   void SmoothLine::vertexVector( const QVector<QPointF> & vertexVector, bool closedCurve )
+   {
+      _closedCurve = closedCurve;
+      _vertexVector = vertexVector;
+   } /*  SmoothLine::vertexVector */
+
+
+   qreal SmoothLine::maximumCurveParameter() const
+   {
+      if (_vertexVector.size() > 2)
+      {
+         return (_closedCurve) ? (qreal)_vertexVector.size() : (qreal)_vertexVector.size() - 2.0;
+      }
+      return 0;
+   } /* SmoothLine::maximumCurveParameter */
+
+
+   QPointF SmoothLine::positionOnCurve( qreal t ) const
+   {
+      if (_vertexVector.size() < 3)
+      {
+         if (_vertexVector.size() > 1)
+         {
+            // It's just a straight line
+            if (t < 0.0) t = 1.0-t;
+
+            if ((t >= 0.0) && (t <= 1.0))
+            {
+               const QPointF & v0 = _vertexVector[0];
+               const QPointF & v1 = _vertexVector[1];
+               return v0 + (v1-v0)*t;
+            }
+         }
+      }
+      else
+      {
+         int  maxSegm = _vertexVector.size() - ((_closedCurve) ? 1 : 3);
+
+         if (t < 0.0) t = double(maxSegm+1) - t;
+
+         int segment( floor(t) );
+
+         if ((segment >= 0) && (segment <= maxSegm))
+         {
+            QPointF  control[4];
+            QPointF  p[3];
+
+            if ((_closedCurve) && (segment == (maxSegm-1)))
+            {
+               p[0] = _vertexVector[_vertexVector.size()-2];
+               p[1] = _vertexVector.back();
+               p[2] = _vertexVector[0];
+
+               buildControlPoints( p[0], p[1], p[2], control, false, false );
+            }
+            else if ((_closedCurve) && (segment == maxSegm))
+            {
+               p[0] = _vertexVector.back();
+               p[1] = _vertexVector[0];
+               p[2] = _vertexVector[1];
+
+               buildControlPoints( p[0], p[1], p[2], control, false, false );
+            }
+            else
+            {
+               p[0] = _vertexVector[segment  ];
+               p[1] = _vertexVector[segment+1];
+               p[2] = _vertexVector[segment+2];
+
+               buildControlPoints( p[0], p[1], p[2], control, ((segment == 0) && (!_closedCurve)), (segment == maxSegm) );
+            }
+            return calcBezierVertex( t-double(segment), control );
+         }
+         else
+         {
+            if (t == (maxSegm+1))
+            {
+               QPointF  control[4];
+               QPointF  p[3];
+
+               if (_closedCurve)
+               {
+                  p[0] = _vertexVector[0];
+                  p[1] = _vertexVector[1];
+                  p[2] = _vertexVector[2];
+
+                  buildControlPoints( p[0], p[1], p[2], control, true, false );
+                  return calcBezierVertex( 0.0, control );
+               }
+               else
+               {
+                  p[0] = _vertexVector[maxSegm  ];
+                  p[1] = _vertexVector[maxSegm+1];
+                  p[2] = _vertexVector[maxSegm+2];
+
+                  buildControlPoints( p[0], p[1], p[2], control, (maxSegm == 0), true );
+                  return calcBezierVertex( 1.0, control );
+               }
+            }
+         }
+      }
+      return QPointF(0.0,0.0);
+   } /* SmoothLine::positionOnCurve */
+
+
+   QPointF SmoothLine::directionOnCurve( qreal t ) const
+   {
+      if (_vertexVector.size() < 3)
+      {
+         if (_vertexVector.size() >1)
+         {
+            // It's just a straight line
+            if (t < 0.0) t = 1.0-t;
+
+            if ((t >= 0.0) && (t <= 1.0))
+            {
+               return (_vertexVector[1]-_vertexVector[0]);
+            }
+         }
+      }
+      else
+      {
+         int  maxSegm = _vertexVector.size() - ((_closedCurve) ? 1 : 3);
+
+         if (t < 0.0) t = double(maxSegm+1) - t;
+
+         int segment( floor(t) );
+
+         if ((segment >= 0) && (segment <= maxSegm))
+         {
+            QPointF  control[4];
+            QPointF  p[3];
+
+            if ((_closedCurve) && (segment == (maxSegm-1)))
+            {
+               p[0] = _vertexVector[_vertexVector.size()-2];
+               p[1] = _vertexVector.back();
+               p[2] = _vertexVector[0];
+
+               buildControlPoints( p[0], p[1], p[2], control, false, false );
+            }
+            else if ((_closedCurve) && (segment == maxSegm))
+            {
+               p[0] = _vertexVector.back();
+               p[1] = _vertexVector[0];
+               p[2] = _vertexVector[1];
+
+               buildControlPoints( p[0], p[1], p[2], control, false, false );
+            }
+            else
+            {
+               p[0] = _vertexVector[segment  ];
+               p[1] = _vertexVector[segment+1];
+               p[2] = _vertexVector[segment+2];
+
+               buildControlPoints( p[0], p[1], p[2], control, ((segment == 0) && (!_closedCurve)), (segment == maxSegm) );
+            }
+            return calcBezierTangent( t-double(segment), control );
+         }
+         else
+         {
+            if (t == (maxSegm+1))
+            {
+               QPointF  control[4];
+               QPointF  p[3];
+
+               if (_closedCurve)
+               {
+                  p[0] = _vertexVector[0];
+                  p[1] = _vertexVector[1];
+                  p[2] = _vertexVector[2];
+
+                  buildControlPoints( p[0], p[1], p[2], control, true, false );
+                  return calcBezierTangent( 0.0, control );
+               }
+               else
+               {
+                  p[0] = _vertexVector[maxSegm  ];
+                  p[1] = _vertexVector[maxSegm+1];
+                  p[2] = _vertexVector[maxSegm+2];
+
+                  buildControlPoints( p[0], p[1], p[2], control, (maxSegm == 0), true );
+                  return calcBezierTangent( 1.0, control );
+               }
+            }
+         }
+      }
+      return QPointF(0.0,0.0);
+   } /* SmoothLine::directionOnCurve */
+
+
+   qreal SmoothLine::arcLength( qreal t) const
+   {
+      if (t < 0.0) return 0.0;
+
+      QPointF                          control[4];
+      QPointF                          p[3];
+      QVector<QPointF>::const_iterator it = _vertexVector.begin();
+
+      if (_closedCurve)
+      {
+         int i = 0;
+         p[i++] = _vertexVector.back();
+         while ((i<3) && (it != _vertexVector.end()))
+         {
+            p[i] = *it;
+            ++it;
+            ++i;
+         }
+         buildControlPoints( p[0], p[1], p[2], control, false, false );
+      }
+      else
+      {
+         int i = 0;
+         while ((i<3) && (it != _vertexVector.end()))
+         {
+            p[i] = *it;
+            ++it;
+            ++i;
+         }
+         buildControlPoints( p[0], p[1], p[2], control, true, (it == _vertexVector.end()) );
+      }
+
+      if (t < 1.0) return simpsonApproximation( control, 0.0, t );
+
+      double sum = simpsonApproximation( control, 0.0, 1.0 ); t -= 1.0;
+
+      while (it != _vertexVector.end())
+      {
+         p[0] = p[1];
+         p[1] = p[2];
+         p[2] = *it;
+         ++it;
+
+         if (_closedCurve) buildControlPoints( p[0], p[1], p[2], control, false, false );
+         else              buildControlPoints( p[0], p[1], p[2], control, false, (it == _vertexVector.end()) );
+
+         if (t < 1.0)
+         {
+            sum += simpsonApproximation( control, 0.0, t );
+            break;
+         }
+         else sum += simpsonApproximation( control, 0.0, 1.0 );
+      }
+
+      if ((t > 0.0) && (_closedCurve))
+      {
+         p[0] = p[1];
+         p[1] = p[2];
+         p[2] = _vertexVector.front();
+
+         buildControlPoints( p[0], p[1], p[2], control, false, false );
+
+         sum += simpsonApproximation( control, 0.0, t );
+      }
+      return sum;
+   } /* SmoothLine::arcLength */
+
+
+   HermiteSpline::HermiteSpline( const QVector<QPointF> & vertexVector
+                               , const QVector<QPointF> & tangentVector, bool closedCurve )
+   {
+      HermiteSpline::vertexVector(vertexVector, tangentVector, closedCurve );
+   } /* HermiteSpline::HermiteSpline */
+
+
+   void HermiteSpline::vertexVector( const QVector<QPointF> & vertexVector
+                                  , const QVector<QPointF> & tangentVector, bool closedCurve )
+   {
+      _closedCurve    = closedCurve;
+      _vertexVector  = vertexVector;
+      _tangentVector = tangentVector;
+
+      int countOfTangents = (_closedCurve) ? _vertexVector.size()*2 : (_vertexVector.size()-1) * 2;
+
+      if (_tangentVector.size() >= countOfTangents)
+      {
+         // fatal error
+         throw
+         SituationMap::Exception( __FILE__, __LINE__,
+                    "No enough tangents defined to calculate spline. Each spline segment must have defined 2 tangents per vertex, excepting the border segments where only 1 tangent must be defined.");
+
+      }
+   } /* HermiteSpline::vertexVector */
+
+
+   qreal HermiteSpline::maximumCurveParameter() const
+   {
+       if (_vertexVector.size() < 2) return 0.0;
+       return (_closedCurve) ? _vertexVector.size() :  (_vertexVector.size() - 1.0);
+   } /* HermiteSpline::maximumCurveParameter */
+
+
+   QPointF HermiteSpline::positionOnCurve( qreal t ) const
+   {
+      if (_vertexVector.size() < 2) return QPointF(0.0,0.0);
+
+      int  maxSegm = _vertexVector.size() - ((_closedCurve) ? 1 : 2);
+
+      if (t < 0.0) t = double(maxSegm+1) - t;
+
+      int segment( floor(t) );
+
+      if ((segment >= 0) && (segment <= maxSegm))
+      {
+         QPointF  control[4];
+
+         if ((_closedCurve) && (segment == maxSegm))
+         {
+            control[0] = _vertexVector.back();
+            control[3] = _vertexVector.front();
+            control[1] = control[0] + _tangentVector[_tangentVector.size()-2]/3.0;
+            control[2] = control[3] - _tangentVector[_tangentVector.size()-1]/3.0;
+         }
+         else
+         {
+            control[0] = _vertexVector[segment];
+            control[3] = _vertexVector[segment+1];
+            control[1] = control[0] + _tangentVector[segment*2]/3.0;
+            control[2] = control[3] - _tangentVector[segment*2+1]/3.0;
+         }
+         return calcBezierVertex( t-double(segment), control );
+      }
+
+      return QPointF(0.0,0.0);
+
+   } /* HermiteSpline::positionOnCurve */
+
+
+   QPointF HermiteSpline::directionOnCurve( qreal t ) const
+   {
+      if (_vertexVector.size() < 2)  return QPointF(0.0,0.0);
+
+      int  maxSegm = _vertexVector.size() - ((_closedCurve) ? 1 : 2);
+
+      if (t < 0.0) t = double(maxSegm+1) - t;
+
+      int segment( floor(t) );
+
+      if ((segment >= 0) && (segment <= maxSegm))
+      {
+         QPointF  control[4];
+
+         if ((_closedCurve) && (segment == maxSegm))
+         {
+            control[0] = _vertexVector.back();
+            control[3] = _vertexVector.front();
+            control[1] = control[0] + _tangentVector[_tangentVector.size()-2]/3.0;
+            control[2] = control[3] - _tangentVector[_tangentVector.size()-1]/3.0;
+         }
+         else
+         {
+            control[0] = _vertexVector[segment];
+            control[3] = _vertexVector[segment+1];
+            control[1] = control[0] + _tangentVector[segment*2]/3.0;
+            control[2] = control[3] - _tangentVector[segment*2+1]/3.0;
+         }
+         return calcBezierTangent( t-double(segment), control );
+      }
+
+      return QPointF(0.0,0.0);
+
+   } /* HermiteSpline::directionOnCurve */
+
+
+   qreal HermiteSpline::arcLength( qreal t ) const
+   {
+      if (t < 0.0)                  return 0.0;
+      if (_vertexVector.size() < 2) return 0.0;
+
+      double     sum = 0.0;
+      QPointF    control[4];
+
+      QVector<QPointF>::const_iterator itv    = _vertexVector.begin();
+      QVector<QPointF>::const_iterator itt    = _vertexVector.begin();
+
+      if (_closedCurve) { if (2*_vertexVector.size()   != _tangentVector.size()) return 0.0; }
+      else              { if (2*_vertexVector.size()-2 != _tangentVector.size()) return 0.0; }
+
+      control[3] = *itv; ++itv;
+
+      while (itv != _vertexVector.end())
+      {
+         control[0] = control[3];
+         control[1] = control[0] + *itt / 3.0; ++itt;
+         control[2] = *itv       - *itt / 3.0; ++itt;
+         control[3] = *itv;
+
+         if (t < 1.0) return sum + simpsonApproximation( control, 0.0, t );
+         sum = simpsonApproximation( control, 0.0, 1.0 ); t -= 1.0;
+
+         ++itv;
+      } // while
+
+      if (_closedCurve)
+      {
+         control[0] = control[3];
+         control[1] = control[0]         + *itt / 3.0; ++itt;
+         control[2] = _vertexVector.front() - *itt / 3.0; ++itt;
+         control[3] = _vertexVector.front();
+
+         if (t < 1.0) return sum + simpsonApproximation( control, 0.0, t );
+         sum = simpsonApproximation( control, 0.0, 1.0 ); // t -= 1.0; // 'ScanBuild: 't is never read'
+      }
+      return sum;
+   } /* HermiteSpline::arcLength */
+
+
+
+   BezierSpline::BezierSpline( const QVector<QPointF> & ctrlPntVector, bool closedCurve )
+      : HermiteSpline()
+   {
+      controlPointVector(ctrlPntVector,closedCurve);
+   } /* BezierSpline::BezierSpline */
+
+
+   void BezierSpline::controlPointVector( const QVector<QPointF> & ctrlPntVector, bool closedCurve )
+   {
+      if (ctrlPntVector.size() < 4) return;
+
+      QVector<QPointF> vertexVector;
+      QVector<QPointF> tangentVector;
+
+      QVector<QPointF>::const_iterator it = ctrlPntVector.begin();
+
+      vertexVector.append( *it );
+      ++it;
+      while (it != ctrlPntVector.end())
+      {
+         // set first tangent
+         tangentVector.append( ((*it) - vertexVector.back()) * 3.0 );
+         ++it;
+         if (it == ctrlPntVector.end())
+         {
+            throw SituationMap::Exception(__FILE__, __LINE__, "Missing bezier spline tangent control point." );
+         }
+         ++it;
+
+         if (it == ctrlPntVector.end())
+         {
+            // error
+            if (closedCurve)
+            {
+               tangentVector.append( ((it[-1]) - vertexVector.front()) * 3.0 );
+            }
+            else throw SituationMap::Exception(__FILE__, __LINE__, "Missing bezier spline vertex control point." );
+            break;
+         }
+         else
+         {
+            vertexVector.append( *it );
+            tangentVector.append( ((it[-1]) - vertexVector.back()) * 3.0 );
+            ++it;
+         }
+      } // while
+
+      HermiteSpline::vertexVector(vertexVector,tangentVector,closedCurve);
+
+   } /* BezierSpline::controlPointVector */
+
+
+   void BezierSpline::vertexVector( const QVector<QPointF>&, const QVector<QPointF>&, bool )
+   {
+      throw SituationMap::Exception(__FILE__, __LINE__, "Function is not defined for BezierSpline. Use controlPointVector instead." );
+   } /* BezierSpline::vertexVector */
+
+
+
+
+   Ellipse::Ellipse( QPointF center, qreal rx, qreal ry, qreal phi, qreal sectorStart, qreal sectorEnd )
+      : _center(center)
+      , _radiusX(fabs(rx))
+      , _radiusY(fabs(ry))
+      , _sinPhi(sin(phi))
+      , _cosPhi(cos(phi))
+      , _phiSectorStart(sectorStart)
+      , _phiSectorEnd(sectorEnd)
+   {
+      if (_radiusX < _radiusY)
+      {
+         // swap _radiusX and _radiusY
+         _radiusX = fabs(ry);
+         _radiusY = fabs(rx);
+
+         // and rotate
+         phi += MathConst::pi_half;
+         _sinPhi = sin(phi);
+         _cosPhi = cos(phi);
+      }
+
+      qreal a2 = _radiusX * _radiusX;
+      qreal b2 = _radiusY * _radiusY;
+
+      _eccentricity2 = (a2-b2) / a2;
+
+      if (fabs(_phiSectorStart) > MathConst::pi_two) _phiSectorStart /= MathConst::pi_two;
+      if (fabs(_phiSectorEnd)   > MathConst::pi_two) _phiSectorEnd   /= MathConst::pi_two;
+
+      if (_phiSectorStart >= 0)
+      {
+         if (_phiSectorStart > _phiSectorEnd) _phiSectorStart -= MathConst::pi_two;
+      }
+      else
+      {
+         if (_phiSectorStart > _phiSectorEnd)_phiSectorEnd += MathConst::pi_two;
+      }
+   } /* Ellipse::Ellipse */
+
+
+   qreal  Ellipse::maximumCurveParameter() const { return _phiSectorEnd;   }
+   qreal  Ellipse::minimumCurveParameter() const { return _phiSectorStart; }
+
+   QPointF Ellipse::positionOnCurve(qreal t) const
+   {
+      // Using ellipse equation in polar coordinates relative to center point(0,0)
+      // because in this case the parameter t is identical with polar angle.
+
+      qreal sin_t  = sin(t);
+      qreal cos_t  = cos(t);
+
+      /*
+      qreal r = _radiusY / (1.0 - _eccentricity2 * cos_t*cos_t);
+      qreal x = cos_t*r;
+      qreal y = sin_t*r;
+      */
+      qreal x = cos_t*_radiusX;
+      qreal y = sin_t*_radiusY;
+      return _center + QPointF( x*_cosPhi - y*_sinPhi, y*_cosPhi + x*_sinPhi );
+
+   } /* Ellipse::positionOnCurve */
+
+   QPointF Ellipse::directionOnCurve(qreal t) const
+   {
+     qreal sin_t = sin(t);
+     qreal cos_t = cos(t);
+
+     if (cos_t == 0.0) return QPointF( -sin_t, 0.0 );
+
+     qreal tan_t = sin_t / cos_t;
+     qreal tan_n = tan_t / 1.0 - _eccentricity2; // tan normal
+
+     // normal  QPointF( 1.0/sqrt(1+tan_n*tan_n), tan_n/sqrt(1+tan_n*tan_n) )
+     QPointF tangente( -tan_n/sqrt(1+tan_n*tan_n), 1.0/sqrt(1+tan_n*tan_n) );
+
+     return QPointF( tangente.x()*_cosPhi - tangente.y()*_sinPhi, tangente.y()*_cosPhi + tangente.x()*_sinPhi );
+   } /* Ellipse::directionOnCurve */
+
+
+   qreal  Ellipse::arcLength(qreal t) const
+   {
+     return arcLength( 0.0, t );
+   } /* Ellipse::arcLength */
+
+
+   qreal  Ellipse::arcLength(qreal tmin, qreal tmax ) const
+   {
+     Q_UNUSED(tmin);
+     Q_UNUSED(tmax);
+
+     // ToDo: calculate convergenting formula based on polar center points equation of ellipse if needed
+     return 0.0;
+   } /* Ellipse::arcLength */
+
+
+   class CurvePathRasterer : public PathRasterer
+   {
+      public:
+
+         CurvePathRasterer()                                         : PathRasterer(), _curveFunction(nullptr)        {}
+         explicit CurvePathRasterer( const Curve * splineFunction )  : PathRasterer(), _curveFunction(splineFunction) {}
+         ~CurvePathRasterer() = default;
+
+         void function( qreal t, QPointF & result )  override
+         {
+            if (_curveFunction) result = _curveFunction->positionOnCurve(t);
+            else
+            {
+               throw SituationMap::Exception(__FILE__, __LINE__, "Curve function is undefined for PathRasterer." );
+            }
+         } /* function */
+
+
+      protected:
+
+          const Curve * _curveFunction;
+
+   }; /* CurvePathRasterer */
+
+
+   PathRasterer * Ellipse::createPathRaster()       const { return new CurvePathRasterer(this); }
+   PathRasterer * SmoothLine::createPathRaster()    const { return new CurvePathRasterer(this); }
+   PathRasterer * HermiteSpline::createPathRaster() const { return new CurvePathRasterer(this); }
+   PathRasterer * BezierSpline::createPathRaster()  const { return new CurvePathRasterer(this); }
+
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.h
new file mode 100755
index 000000000..e4c67967f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/curve.h
@@ -0,0 +1,288 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of Splines
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   12.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
+
+#include <MathUtils/math_const.h>
+#include <situation_map_export.h>
+
+
+namespace SituationMap { namespace MathUtils
+{
+
+   class PathRasterer;
+
+   /**
+     @class Curve curve.h
+     @brief Base class to calculate a polyline from curve functions like splines, circles, ellpises ...
+
+     Pure virtual base class to calculate a polyline from curve functions. The curve function is defined
+     in derived classes. The resolution of rasterization can be set in PathRasterer class.
+
+     @see PathRasterer, Ellipse, Spline, SmoothLine, HermiteSpline, BezierSpline
+   */
+
+   class SITUATIONMAP_EXPORT Curve
+   {
+      public:
+
+         /**
+            Returns the maximum curve paramter t. The curve is defined in interval tmin ... tmax
+         */
+         virtual qreal maximumCurveParameter() const = 0;
+
+
+         /**
+            Returns the minimum curve paramter t. The curve is defined in interval tmin ... tmax
+         */
+         virtual qreal minimumCurveParameter() const = 0;
+
+
+         /**
+            Returns the position on curve at \c t
+            @param t curve parameter, should be in range of 0 ... tmax
+         */
+         virtual QPointF positionOnCurve ( qreal t ) const = 0;
+
+         /**
+            Returns the tangent at position \c t
+            @param t curve parameter, should be in range of 0 ... tmax
+         */
+         virtual QPointF directionOnCurve( qreal t ) const = 0;
+
+         /**
+            Returns the length of curve from start to position t
+            @param t curve parameter, should be in range of 0 ... tmax
+         */
+         virtual qreal arcLength( qreal t ) const = 0;
+
+         /**
+            Returns the length of curve from position \c tmin to position \c tmax
+            @param tmin curve parameter, should be in range of 0 ... maximumCurveParameter()
+            @param tmax curve parameter, should be in range of tmin ... maximumCurveParameter()
+         */
+         virtual qreal arcLength( qreal tmin, qreal tmax ) const { return arcLength(tmax)-arcLength(tmin); }
+
+         /**
+            Returns the length of complete curve
+         */
+         inline qreal arcLength() const  { return arcLength( maximumCurveParameter() ); }
+
+         /**
+           Create instance of class \c PathRasterer to rasterize the spline curve. After usage the
+           caller should use delete to free memory and avoid memory leaks. This methode is pure virtual
+           and has to be override by the derived class.
+
+           @see PathRasterer
+         */
+         virtual PathRasterer * createPathRaster() const = 0;
+
+   }; /* Curve */
+
+
+   /**
+     @class SmoothLine curve.h
+     @brief Class to calculate a ellipse. A angle have to be defined in RAD in mathematical manner (counter clockwise and (1,0) is zero angle)
+   */
+   class SITUATIONMAP_EXPORT Ellipse : public Curve
+   {
+      public:
+
+         Ellipse() = default;
+
+         Ellipse( QPointF center, qreal rx, qreal ry, qreal phi, qreal sectorStart = 0, qreal sectorEnd = MathConst::pi_two );
+
+         virtual ~Ellipse() = default;
+
+         qreal maximumCurveParameter() const override;
+         qreal minimumCurveParameter() const override;
+
+         QPointF positionOnCurve ( qreal t ) const override;
+         QPointF directionOnCurve( qreal t ) const override;
+
+         qreal arcLength( qreal t ) const override;
+         qreal arcLength( qreal tmin, qreal tmax ) const override;
+
+         PathRasterer * createPathRaster() const override;
+
+      protected:
+
+         QPointF  _center;
+         qreal    _radiusX;
+         qreal    _radiusY;
+         qreal    _eccentricity2;
+         qreal    _sinPhi;
+         qreal    _cosPhi;
+         qreal    _phiSectorStart;
+         qreal    _phiSectorEnd;
+
+   }; /* Ellipse */
+
+
+   /**
+     @class SmoothLine curve.h
+     @brief Class to calculate a line with rounded verticies based on spline functions
+   */
+
+   class SITUATIONMAP_EXPORT SmoothLine : public Curve
+   {
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         SmoothLine() = default;
+
+         explicit SmoothLine( const QVector<QPointF> & vertexVector, bool closedCurve = false );
+
+         virtual ~SmoothLine() = default;
+         /** @} */
+
+         /**
+            Defines the predicated polyline
+            @param vertexVector verticies of the polyline
+            @param closedCurve  if \c closedCurve is true the polyline is closed to a polygon
+         */
+         void vertexVector( const QVector<QPointF> & vertexVector, bool closedCurve = false );
+
+
+         qreal maximumCurveParameter() const override;
+         qreal minimumCurveParameter() const override  { return 0.0; }
+
+         QPointF positionOnCurve ( qreal t ) const override;
+         QPointF directionOnCurve( qreal t ) const override;
+
+         qreal arcLength( qreal t ) const override;
+
+         PathRasterer * createPathRaster() const override;
+
+      protected:
+
+         bool              _closedCurve;
+         QVector<QPointF>  _vertexVector;
+
+   }; /* SmoothLine */
+
+
+   /**
+     @class HermitSpline curve.h
+     @brief Class to calculate 2D hermit spline curves
+   */
+   class SITUATIONMAP_EXPORT HermiteSpline : public Curve
+   {
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         HermiteSpline() = default;
+
+         HermiteSpline( const QVector<QPointF> & vertexVector
+                     , const QVector<QPointF> & tangentVector
+                     , bool closedCurve = false );
+
+         ~HermiteSpline() = default;
+         /** @} */
+
+         /**
+            Defines the gemeotry of the hermite spline
+            @param vertexVector  verticies to define the hermite spline
+            @param tangentVector tangents to define the hermite spline
+            @param closedCurve  if \c closedCurve is true the spline curve is closed
+         */
+         virtual void vertexVector( const QVector<QPointF> & vertexVector
+                                  , const QVector<QPointF> & tangentVector
+                                  , bool closedCurve = false                 );
+
+
+         qreal maximumCurveParameter() const override;
+         qreal minimumCurveParameter() const override  { return 0.0; }
+
+         QPointF positionOnCurve ( qreal t ) const override;
+         QPointF directionOnCurve( qreal t ) const override;
+
+         qreal arcLength( qreal t ) const override;
+
+         PathRasterer * createPathRaster() const override;
+
+      private:
+
+         bool              _closedCurve;
+         QVector<QPointF>  _vertexVector;
+         QVector<QPointF>  _tangentVector;
+
+   }; /* HermiteSpline */
+
+
+   /**
+     @class BezierSpline curve.h
+     @brief Class to calculate 2D bezier spline curves
+   */
+   class SITUATIONMAP_EXPORT BezierSpline : public HermiteSpline
+   {
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         BezierSpline() = default;
+
+         explicit BezierSpline( const QVector<QPointF> & ctrlPntVector, bool closedCurve = false );
+
+         ~BezierSpline() = default;
+         /** @} */
+
+
+         /**
+            Defines the control points of the bezier curve
+            @param ctrlPntVector control points of bezier curve
+            @param closedCurve   if \c closedCurve is true the spline curve is closed
+         */
+         void controlPointVector( const QVector<QPointF> & ctrlPntVector, bool closedCurve = false );
+
+
+         /**
+           Don't call vertexVector methode from class HermiteSpline. It is not defined for bezier curves.
+           If you call it anyway, you will get an execption.
+         */
+         void vertexVector( const QVector<QPointF> & vertexVector
+                          , const QVector<QPointF> & tangentVector
+                          , bool closedCurve = false                 ) override;
+
+         PathRasterer * createPathRaster() const override;
+
+   }; /* BezierSpline */
+
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.cpp
new file mode 100755
index 000000000..83a4a2352
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.cpp
@@ -0,0 +1,413 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of 2d matrix operations
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   22.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#include "geometry_engine.h"
+
+
+#include <Map/coord_translation_functor.h>
+#include <Map/map.h>
+#include <MapImpl/map_impl.h>
+#include <MapImpl/abstract_map_object_impl.h>
+
+#include <MathUtils/clipper.hpp>
+
+// ESRI
+#include <Geometry.h>
+#include <GeometryEngine.h>
+//#include <Line.h>
+#include <Polyline.h>
+#include <PolylineBuilder.h>
+#include <Polygon.h>
+#include <PolygonBuilder.h>
+
+#include <QPointF>
+#include <QVector>
+#include <QDebug>
+#include <ImmutablePartCollection.h>
+#include <Point.h>
+#include <ImmutablePart.h>
+#include <LinearUnit.h>
+
+
+namespace SituationMap { namespace MathUtils
+{
+  //
+  // Line
+  //
+
+  GeometryEngine::Geometry *GeometryEngine::createLine(Map *map, const QPointF &p1, const QPointF &p2)
+  {
+    QVector<QPointF> vertices;
+    vertices << p1 << p2;
+
+    return SituationMap::MathUtils::GeometryEngine::createPolyline(map, vertices);
+  } // GeometryEngine::Geometry *GeometryEngine::createLine( Map * map, QPointF p1, QPointF p2 )
+
+
+  template<class T>
+  inline GeometryEngine::Geometry * createPolyline(Map * map, const T & verticies)
+  {
+    MapImpl * mapImpl = dynamic_cast<MapImpl*>(map);
+    if (! mapImpl)
+      return nullptr;
+
+    SituationMap::CoordTranslationFunctor *mapCtFunctor = map->coordTranslationFunctor();
+    if (! mapCtFunctor)
+      return nullptr;
+
+    Esri::ArcGISRuntime::PolylineBuilder builder ( mapImpl->getEsriSpatialReference() );
+
+    for (auto pit = verticies.cbegin(); pit != verticies.cend(); ++pit)
+    {
+      const QPointF p(mapCtFunctor->geographicToMap(*pit));
+      builder.addPoint(p.x(),p.y());
+    }
+
+    Esri::ArcGISRuntime::Polyline * esriPolyline = new Esri::ArcGISRuntime::Polyline( builder.toGeometry() );
+
+    return esriPolyline;
+  } // GeometryEngine::Geometry * createPolyline(Map * map, const T & verticies)
+
+
+
+  GeometryEngine::Geometry *GeometryEngine::createPolyline(Map *map, const QVector<QPointF> &vertices )
+  {
+    return SituationMap::MathUtils::createPolyline<QVector<QPointF>>(map, vertices);
+  } // GeometryEngine::Geometry * GeometryEngine::createPolyline( Map * map, const QVector<QPointF> & verticies )
+
+
+  //
+  // Polygon
+  //
+
+  template<class T>
+  inline GeometryEngine::Geometry *createPolygon(Map *map, const T &verticies)
+  {
+    MapImpl * mapImpl = dynamic_cast<MapImpl*>(map);
+
+    if (! mapImpl) return nullptr;
+
+    SituationMap::CoordTranslationFunctor * mapCtFunctor = map->coordTranslationFunctor();
+
+    if (! mapCtFunctor) return nullptr;
+
+    Esri::ArcGISRuntime::PolygonBuilder builder( mapImpl->getEsriSpatialReference() );
+
+    for (auto pit = verticies.cbegin(); pit != verticies.cend(); ++pit )
+    {
+      const QPointF p(mapCtFunctor->geographicToMap(*pit));
+      builder.addPoint(p.x(),p.y());
+    }
+
+    Esri::ArcGISRuntime::Polygon * esriPolygon = new Esri::ArcGISRuntime::Polygon( builder.toGeometry() );
+
+    return esriPolygon;
+  } // GeometryEngine::Geometry * GeometryEngine::createPolygon(  Map * map, const QVector<QPointF> & verticies )
+
+
+  GeometryEngine::Geometry * GeometryEngine::createPolygon(Map * map, const QVector<QPointF> & vertices )
+  {
+    return SituationMap::MathUtils::createPolygon<QVector<QPointF>>( map, vertices );
+  } // GeometryEngine::Geometry * GeometryEngine::createPolygon( Map * map, const QVector<QPointF> & verticies )
+
+
+  //
+  // cleanup etc.
+  //
+
+  void GeometryEngine::deleteGeometry(Geometry *geom)
+  {
+    delete geom;
+  } // void GeometryEngine::deleteGeoemtry( Geometry * geom )
+
+
+  bool GeometryEngine::contains( AbstractMapObject *mapObj, const Geometry &hull)
+  {
+    if (nullptr == mapObj) return false;
+    return mapObj->geometryIsInHull( hull );
+
+  } //bool GeometryEngine::contains( AbstractMapObject * mapObj, const Geometry & hull )
+
+
+  bool GeometryEngine::contains(const Geometry &geom, const Geometry &hull)
+  {
+    if (geom.isEmpty() || hull.isEmpty())
+      return false;
+    return Esri::ArcGISRuntime::GeometryEngine::contains(hull, geom);
+  } // bool GeometryEngine::contains(const Geometry & geom, const Geometry & hull)
+
+
+  bool GeometryEngine::intersect(  AbstractMapObject *mapObj, const Geometry &intersector)
+  {
+    if (! mapObj)
+      return false;
+    return mapObj->geometryIntersect(intersector);
+  } // bool GeometryEngine::intersect( const Geometry & inputGeom, const Geometry & intersector )
+
+
+  bool GeometryEngine::intersect(const Geometry &inputGeom, const Geometry &intersector)
+  {
+    if (inputGeom.isEmpty() || intersector.isEmpty())
+      return false;
+
+#ifdef DEBUGGERTEST
+    if (inputGeom.type() == EsriRuntimeQt::GeometryType::Polyline)
+    {
+      const EsriRuntimeQt::Polyline & l         = inputGeom;
+      int                             numPoints = l.pointCount();
+
+      for (int i = 0; i < numPoints; ++i)
+      {
+        QPointF p = l.qxy(i);
+        __asm int 3
+      }
+    }
+
+    if (intersector.type() == EsriRuntimeQt::GeometryType::Line)
+    {
+      const EsriRuntimeQt::Line & l      = intersector;
+      double                      startx = l.startX();
+      double                      starty = l.startY();
+      double                      endx   = l.endX();
+      double                      endy   = l.endY();
+
+      __asm int 3
+    }
+#endif
+
+    return Esri::ArcGISRuntime::GeometryEngine::crosses(inputGeom, intersector);
+  } // bool GeometryEngine::intersect( const Geometry & inputGeom, const Geometry & intersector )
+
+QVector<QPointF> GeometryEngine::parallelTranslation(SituationMap::CoordTranslationFunctor *mapCtFunctor, const QVector<QPointF> &line, double distance)
+{
+  /* ~ first lokal functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  auto length = [](const QPointF &v) -> double { return sqrt(v.x()*v.x() + v.y()*v.y()); };
+
+
+  auto normalize = [](const QPointF &v) -> QPointF { return v / sqrt(v.x()*v.x() + v.y()*v.y()); };
+
+
+  auto intersection = [](const QPointF &p1, const QPointF &r1, const QPointF &p2, const QPointF &r2) -> QPointF
+  {
+    double f = r2.y()*r1.x() - r1.y()*r2.x();
+
+    double a = (p1.x() + r1.x()) * p1.y() - p1.x() * (p1.y() + r1.y());
+    double b = (p2.x() + r2.x()) * p2.y() - p2.x() * (p2.y() + r2.y());
+
+    double sx = (r2.x() * a - r1.x() * b) / f;
+    double sy = (-r1.y() * b + r2.y() * a) / f;
+
+    return QPointF(sx, sy);
+
+  }; // intersection
+
+
+  auto orientation = [](const QPointF &p, const QPointF &q, const QPointF &r) -> int
+  {
+    // See https://www.geeksforgeeks.org/orientation-3-ordered-points/
+    // for details of below formula.
+    double f = (q.y() - p.y()) * (r.x() - q.x()) - (q.x() - p.x()) * (r.y() - q.y());
+
+    if (qFuzzyIsNull(f)) return 0;  // colinear
+
+    return (f > 0) ? 1 : 2; // clock or counterclock wise
+  }; // orientation
+
+
+  auto testIntersection = [&orientation, &intersection, &normalize](const QPointF &p1, const QPointF &q1, const QPointF &p2, const QPointF &q2) -> bool
+  {
+    // Find the four orientations needed for general and
+    // special cases
+    int o1 = orientation(p1, q1, p2);
+    int o2 = orientation(p1, q1, q2);
+    int o3 = orientation(p2, q2, p1);
+    int o4 = orientation(p2, q2, q1);
+
+    // General case
+    if (o1 != o2 && o3 != o4)
+    {
+      const QPointF & n1 = q1 - p1;
+      const QPointF & n2 = q2 - p2;
+      const QPointF & s = intersection(p1, normalize(n1), p2, normalize(n2));
+
+      double f1 = (!qFuzzyIsNull(n1.x())) ? (s.x() - p1.x()) / n1.x() : (s.y() - p1.y()) / n1.y();
+      double f2 = (!qFuzzyIsNull(n2.x())) ? (s.x() - p2.x()) / n2.x() : (s.y() - p2.y()) / n2.y();
+
+      return ((f1 >= 0) && (f1 <= 1.0) && (f2 >= 0) && (f2 <= 1.0));
+    }
+
+    return false; // Doesn't fall in any of the above cases
+
+  }; // testIntersection
+
+
+  /* ~ now let's do the job ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  if (line.size() < 2)
+  {
+    // Nothing to do --> return input line
+    return line;
+  }
+
+  QVector<QPointF> transformedLine;
+
+  transformedLine.reserve(line.size());
+
+  for (auto &point : qAsConst(line))
+  {
+    // Let's transform the coordinates to maps coordinate system ...
+    transformedLine << mapCtFunctor->geographicToMap(point);
+  }
+
+  struct LineSegment
+  {
+    QPointF m_p1;
+    QPointF m_p2;
+    QPointF m_t;
+
+    LineSegment() = default;
+    LineSegment(const QPointF &p1, const QPointF &p2, const QPointF &t)
+      : m_p1(p1), m_p2(p2), m_t(t)
+    {}
+  };
+
+  // build single line segments to translate along it's normal
+  QVector<LineSegment> multiSegmLine;
+
+  multiSegmLine.reserve(transformedLine.size() - 1);
+
+  for (int i = 1; i < transformedLine.size(); ++i)
+  {
+    const QPointF & p1 = transformedLine[i - 1];
+    const QPointF & p2 = transformedLine[i];
+    const QPointF & t = normalize(p2 - p1);
+    QPointF         n = QPointF(t.y()*distance, -t.x()*distance);
+    multiSegmLine << LineSegment(p1 + n, p2 + n, t);
+  }
+
+
+  transformedLine.clear();
+  transformedLine << multiSegmLine.first().m_p1;
+
+  for (int i = 1; i < multiSegmLine.size(); ++i)
+  {
+    const LineSegment & l1 = multiSegmLine[i - 1];
+    const LineSegment & l2 = multiSegmLine[i];
+
+    const QPointF & dt = l1.m_t - l2.m_t;
+
+    transformedLine << ((qFuzzyIsNull(dt.x()) && qFuzzyIsNull(dt.y())) ? l1.m_p2 : intersection(l1.m_p2, l1.m_t, l2.m_p1, l2.m_t));
+  }
+
+  transformedLine << multiSegmLine.last().m_p2;
+
+  // check result
+  for (int i = 1; i < transformedLine.size(); ++i)
+  {
+    const QPointF & p1 = transformedLine[i - 1];
+    const QPointF & p2 = transformedLine[i];
+
+    if (length(p2 - p1) < distance)
+    {
+      // failure segment is to short relative to distance
+      return QVector<QPointF>();
+    }
+    for (int j = 1; j < transformedLine.size(); ++j)
+    {
+      if (j == i) continue;
+
+      const QPointF & g1 = transformedLine[j-1];
+      const QPointF & g2 = transformedLine[j];
+
+      if (testIntersection(p1, p2, g1, g2))
+      {
+        // failure resulting line has self intersections
+        return QVector<QPointF>();
+      }
+    }
+  }
+
+  QVector<QPointF> pLine;
+
+  // Transform coordinates back to geographic ...
+  pLine.reserve(transformedLine.size());
+  for (auto &p : qAsConst(transformedLine))
+  {
+    pLine << mapCtFunctor->mapToGeographic(p);
+  }
+
+  return pLine;
+}
+// QVector<QPointF> GeometryEngine::parallelTranslation(SituationMap::CoordTranslationFunctor *mapCtFunctor, const QVector<QPointF> &line, double distance)
+
+QVector<Point3D> GeometryEngine::buffer(AbstractMapObject *mapObj, double distance)
+{
+  if (!mapObj)
+    return QVector<Point3D>();
+
+  AbstractMapObjectImpl *mapObjImpl = dynamic_cast<AbstractMapObjectImpl*>(mapObj);
+
+  if (!mapObjImpl)
+    return QVector<Point3D>();
+
+
+  const Esri::ArcGISRuntime::Geometry &esriGeometry = mapObjImpl->getEsriGeometry();
+
+  // Esri::ArcGISRuntime::GeometryEngine::buffer         -> works for 2D
+  // Esri::ArcGISRuntime::GeometryEngine::bufferGeodetic -> works for 2D and 3D!?
+  const Esri::ArcGISRuntime::Polygon polyline = Esri::ArcGISRuntime::GeometryEngine::bufferGeodetic(esriGeometry,
+                                                                                                    distance,
+                                                                                                    Esri::ArcGISRuntime::LinearUnit::meters(),
+                                                                                                    1,
+                                                                                                    Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
+  if (polyline.parts().isEmpty())
+      return QVector<Point3D>();
+
+
+  const Esri::ArcGISRuntime::ImmutablePart &immutablePart = polyline.parts().part(0);
+  const int size = immutablePart.pointCount();
+
+  QVector<Point3D> resultVec;
+  resultVec.reserve(size);
+  for (int i = 0; i < size; ++i)
+  {
+    const Esri::ArcGISRuntime::Point &esriP = immutablePart.point(i);
+    resultVec.append(Point3D(esriP.x(), esriP.y(), esriP.z()));
+  }
+
+  //  qCritical() << " resultVec = " << resultVec.size();
+  //  qCritical() << " res = " << polyline.toJson();
+
+  return resultVec;
+}
+
+
+} } // namespace SituationMap::MathUtils
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.h
new file mode 100755
index 000000000..56bef725d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/geometry_engine.h
@@ -0,0 +1,86 @@
+/**
+**
+** @RDE_HEADER@
+** 2D matrix operations
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   22.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPoint>
+
+#include <Map/point3D.h>
+#include <situation_map_export.h>
+
+namespace Esri {
+namespace ArcGISRuntime {
+    class Geometry;
+} }
+
+
+namespace SituationMap
+{
+  class Map;
+  class AbstractMapObject;
+  class CoordTranslationFunctor;
+
+  namespace MathUtils
+  {
+
+    class SITUATIONMAP_EXPORT GeometryEngine
+    {
+
+      public:
+
+        using Geometry = Esri::ArcGISRuntime::Geometry;
+
+
+        static Geometry *createLine    (Map *map, const QPointF &p1, const QPointF &p2);
+        static Geometry *createPolyline(Map *map, const QVector<QPointF> &vertices);
+        static Geometry *createPolygon (Map *map, const QVector<QPointF> &vertices);
+
+        static void deleteGeometry(Geometry *geom);
+
+        static bool contains(const Geometry    &geom,   const Geometry &hull);
+        static bool contains(AbstractMapObject *mapObj, const Geometry &hull);
+
+        static bool intersect(const Geometry    &inputGeom, const Geometry &intersector);
+        static bool intersect(AbstractMapObject *mapObj   , const Geometry &intersector);
+
+        /**
+          Calculating a parallel line.
+          @param mapCtFunctor CoordTranslationFunctor to translate coordinates from geographic to map coordinate system and vis versa.
+          @param line         Line to use as input, the coordinates are geograpihc coordinates.
+          @param distance     Distance in meter.
+        */
+        static QVector<QPointF> parallelTranslation(SituationMap::CoordTranslationFunctor *mapCtFunctor, const QVector<QPointF> &line, double distance );
+
+        static QVector<SituationMap::Point3D> buffer(AbstractMapObject *mapObj, double distance);
+
+
+    }; // GeometryEngine
+
+
+  } // namespace MathUtils
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/math_const.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/math_const.h
new file mode 100755
index 000000000..79be0f391
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/math_const.h
@@ -0,0 +1,47 @@
+/**
+**
+** @RDE_HEADER@
+** Math const
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   04.12.2015, JT  : First edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <cmath>
+
+namespace MathConst
+{
+
+  constexpr double pi        = M_PI;
+  constexpr double pi_two    = pi * 2;
+  constexpr double pi_half   = M_PI_2;
+  constexpr double pi_quater = M_PI_4;
+
+  constexpr double EarthRadius   = 6371001.0;
+  
+  constexpr double WGS84_Major_a = 6378137.0;  // WGS84 Ellipsoid, a value (Radius am Äquator, große Halbachse)
+  constexpr double WGS84_Minor_b = 6378137.0*( 1.0 - 1.0/298.257223563);
+  constexpr double WGS84_SQR_EXC = ((WGS84_Major_a * WGS84_Major_a) - (WGS84_Minor_b * WGS84_Minor_b))/(WGS84_Major_a * WGS84_Major_a);
+
+} // namespace MathConst
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.cpp
new file mode 100755
index 000000000..2af58b453
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.cpp
@@ -0,0 +1,114 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of 2d matrix operations
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   22.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "matrix2d.h"
+
+#include <sstream>
+
+
+namespace SituationMap { namespace MathUtils
+{
+  
+      QPointF Matrix2D::apply( const QPointF & v ) const
+      {
+         QGenericMatrix<1,3,qreal> vM;
+
+         vM(0,0) = v.x();
+         vM(1,0) = v.y();
+         vM(2,0) = 1.0;
+
+         QGenericMatrix<1,3,qreal> result = m_matrix * vM;
+
+         qreal x = result(0,0) / result(2,0);
+         qreal y = result(1,0) / result(2,0);
+
+         return QPointF(x,y);
+
+      } /* Matrix2D::apply */
+
+
+      void  Matrix2D::putTranslation( const QPointF & t )
+      {
+        QGenericMatrix<3,3,qreal> tM;
+
+        tM(0,2) = t.x();
+        tM(1,2) = t.y();
+
+        m_matrix = tM * m_matrix;
+      } /*  Matrix2D::putTranslation */
+
+
+      void  Matrix2D::putScale( const QPointF & s)
+      {
+        QGenericMatrix<3,3,qreal> sM;
+
+        sM(0,0) = s.x();
+        sM(1,1) = s.y();
+
+        m_matrix = sM * m_matrix;
+      } /*  Matrix2D::putScale */
+
+
+      void Matrix2D::putScale( const QPointF & s, qreal sinPhi, qreal cosPhi )
+      {
+        putRotate(QPointF(cosPhi,-sinPhi));
+        putScale(s);
+        putRotate(sinPhi,cosPhi);
+      } /* Matrix2D::putScale */
+
+
+      void  Matrix2D::putRotate( qreal sinPhi, qreal cosPhi )
+      {
+        QGenericMatrix<3,3,qreal> rM;
+
+        rM(0,0) =  cosPhi;
+        rM(0,1) =  sinPhi;
+        rM(1,0) = -sinPhi;
+        rM(1,1) =  cosPhi;
+
+        m_matrix = rM * m_matrix;
+      } /*  Matrix2D::putRotate */
+
+      
+      std::ostream & operator<< ( std::ostream  & stream, const Matrix2D & mat )
+      {
+       
+        stream << "Matrix2D:" << std::endl;
+        for (int r = 0; r < 3; ++r)
+        {
+          for (int c = 0; c < 3; ++c)
+          {
+            stream << "[" << r << "," << c << "] = " << mat(r,c) << "    ";
+          }
+          stream << std::endl;
+        }
+        return stream;
+      } // std::ostream & operator<< ( std::ostream  & stream, const Matrix2D & mat )
+
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.h
new file mode 100755
index 000000000..f286fd5df
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/matrix2d.h
@@ -0,0 +1,413 @@
+/**
+**
+** @RDE_HEADER@
+** 2D matrix operations
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   22.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointF>
+
+#include <QtGui/QGenericMatrix>
+
+#include <situation_map_export.h>
+
+#include <ostream>
+
+
+namespace SituationMap { namespace MathUtils
+{
+
+  /**
+     @class Matrix2D matrix2d.h
+     @brief The class implements a 3x3 matrix for calculating 2D coordinate transformation with homogeneouse coordinates.
+
+     One of the most common and important tasks in computer graphics is to transform the coordinates ( position,
+     orientation, and size ) of either objects within the graphical scene or the camera that is viewing the scene.
+     It is also frequently necessary to transform coordinates from one coordinate system to another, ( e.g. world
+     coordinates to viewpoint coordinates to screen coordinates. ) 
+
+     All of these transformations can be efficiently and succintly handled using some simple matrix representations,
+     which we will see can be particularly useful for combining multiple transformations into a single composite
+     transform matrix. The base transformations for translating, scaling and rotating coordinates can be combined in
+     an arbitrary manner.
+
+     <b>Translation in 2D</b>
+
+     Point (X,Y) is to be translated by amount Dx and Dy to a new location (X',Y').
+
+     \code
+     X' = Dx + X
+     Y' = Dy + Y
+     \endcode
+
+     or P' = T + P where
+
+     \code
+     P' = |  X' |
+          |  Y' |
+
+     T  = |  Dx  |
+          |  Dy  |
+
+     P  = |  X  |
+          |  Y  |
+     \endcode
+
+     <b>Scaling in 2D</b>
+
+     Point (X,Y) is to be scaled by amount Sx and Sy to location (X',Y').
+
+     \code
+     X' = Sx * X
+     Y' = Sy * Y
+     \endcode
+
+     or P' = S * P where
+
+     \code
+     P' = |  X' |
+          |  Y' |
+
+     S  = |  Sx  0  |
+          |  0   Sy |
+
+     P  = |  X  |
+          |  Y  |
+     \endcode
+
+     Scaling is performed about the origin (0,0) not about the center of the line/polygon/whatever.
+
+     - Scale > 1 enlarge the object and move it away from the origin.
+     - Scale = 1 leave the object alone
+     - Scale < 1 shrink the object and move it towards the origin.
+     - uniform scaling: Sx = Sy
+     - differential scaling Sx != Sy -> alters proportions
+
+
+     <b>Rotation in 2D</b>
+
+     point (X,Y) is to be rotated about the origin by angle theta to location (X',Y')
+
+     \code{.unparsed}
+     X' = X * cos(theta) - Y * sin(theta)
+     Y' = X * sin(theta) + Y * cos(theta)
+     \endcode
+
+     or P' = R * P where
+
+     \code
+     P' = |  X' |
+          |  Y' |
+
+     R  = |  cos(theta) -sin(theta) |
+          |  sin(theta) cos(theta)  |
+
+     P  = |  X  |
+          |  Y  |
+     \endcode
+
+     Note that this does involve sin and cos which are much more costly than addition or multiplication.
+
+     Rotation is performed about the origin \f$(0,0)\f$ not about the center of the line/polygon/whatever.
+
+
+     <b>Derivation of the 2D Rotation Equations</b>
+
+     Where does this matrix come from?
+
+     (X,Y) is located r away from (0,0) at a CCW angle of phi from the X axis.
+     (X',Y') is located r away from (0,0) at a CCW angle of theta+phi from the X axis.
+
+     Since rotation is about the origin, (X',Y') must be the same distance from the origin as (X,Y).
+
+     From trigonometry we have:
+
+     \code
+     X = r * cos(phi)
+     Y = r * sin(phi)
+     \endcode
+
+     and
+
+     \code
+     X' = r * cos(theta+phi)
+     Y' = r * sin(theta+phi)
+     \endcode
+
+     Now making use of the following trigonometric identities:
+
+     \code
+     cos(a+b) = cos(a) * cos(b) - sin(a) * sin(b)
+     sin(a+b) = sin(a) * cos(b) + cos(a) * sin(b)
+     \endcode
+     
+     and substituting in for the above equations for X' and Y', we get:
+
+     \code
+     X' = r * cos(theta) * cos(phi) - r * sin(theta) * sin(phi)
+     Y' = r * sin(theta) * cos(phi) + r * cos(theta) * sin(phi)
+     \endcode
+
+     Then we substitute in X and Y from their definitions above, and the final result simplifies to:
+
+     \code
+     X' = X * cos(theta) - Y * sin(theta)
+     Y' = X * sin(theta) + Y * cos(theta)
+     \endcode
+
+     <b>Homogeneous Coordinates in 2 Dimensions</b>
+
+     Scaling and rotations are both handled using matrix multiplication, which can be combined as we 
+     will see shortly. The translations cause a difficulty, however, since they use addition instead
+     of multiplication. We want to be able to treat all 3 transformations (translation, scaling,
+     rotation) in the same way - as multiplications. The solution is to give each point a third 
+     coordinate (X,Y,W), which will allow translations to be handled as a multiplication also. (Note
+     that we are not really moving into the third dimension yet. The third coordinate is being added to
+     the mathematics solely in order to combine the addition and multiplication of 2-D coordinates.)
+
+     Two triples (X,Y,W) and (X',Y',W') represent the same point if they are multiples of each other e.g. 
+     (1,2,3) and (2,4,6).
+
+     At least one of the three coordinates must be nonzero. If W is 0 then the point is at infinity. This
+     situation will rarely occur in practice in computer graphics. If W is nonzero we can divide the triple
+     by W to get the cartesian coordinates of X and Y which will be identical for triples representing the
+     same point (X/W,Y/W,1). This step can be considered as mapping the point from 3-D space onto the
+     plane W=1. Conversely, if the 2-D cartesian coordinates of a point are known as (X,Y), then the
+     homogenous coordinates can be given as (X,Y,1)
+
+     So, how does this apply to translation, scaling, and rotation of 2D coordinates?
+
+
+     <b>Translation of 2D Homogenous Coordinates</b>
+
+     point (X,Y) is to be translated by amount Dx and Dy to location (X',Y')
+
+     \code
+     X' = Dx + X
+     Y' = Dy + Y
+     \endcode
+
+     or P' = T * P where
+       
+     \code
+          |  X' |
+     P' = |  Y' |
+          |  1  |
+  
+          |  1 0 Dx  |
+     T  = |  0 1 Dy  | = T(Dx,Dy)
+          |  0 0  1  |
+           
+          |  X  |
+     P  = |  Y  |
+          |  1  |
+     \endcode
+     
+     Hey Look! Translation is now a multiplication instead of an addition!
+
+     <b>Scaling of 2D Homogenous Coordinates</b>
+     
+     P' = S * P where
+   
+     \code
+     P' = |  X' |
+          |  Y' |
+          |  1  |
+ 
+          |  Sx 0 0  |
+     S  = |  0 Sy 0  | = S(Sx,Sy)
+          |  0  0 1  |
+   
+          |  X  |
+     P  = |  Y  |
+          |  1  |
+     \endcode
+
+     <b>Rotation of 2D Homogenous Coordinates</b>
+
+     P' = R * P where
+
+     \code
+          |  X' |
+     P' = |  Y' |
+          |  1  |
+ 
+          |  cos(theta) -sin(theta) 0 |
+     R  = |  sin(theta)  cos(theta) 0 | = R(theta)
+          |       0           0     1 |
+
+          |  X  |
+     P  = |  Y  |
+          |  1  |
+     \endcode
+
+     <b>Composition of 2D Transformations</b>
+
+     There are many situations in which the final transformation of a point is a combination of several
+     (often many) individual transformations. For example, the position of the finger of a robot might be
+     a function of the rotation of the robots hand, arm, and torso, as well as the position of the robot
+     on the railroad train and the position of the train in the world, and the rotation of the planet
+     around the sun, and . . .
+
+     Applying each transformation individually to all points in a model would take a lot of time. Instead
+     of applying several transformations matrices to each point we want to combine the transformations to
+     produce 1 matrix which can be applied to each point.
+
+     In the simplest case we want to apply the same type of transformation (translation, rotation, scaling)
+     more than once.
+
+     - translation is additive as expected
+     - scaling is multiplicative as expected
+     - rotation is additive as expected
+
+     But what if we want to combine different types of transformations?
+
+     A very common reason for doing this is to rotate a polygon about an arbitrary point (e.g. the center of
+     the polygon) rather than around the origin.
+
+     - Translate so that P1 is at the origin T(-Dx,-Dy)
+     - Rotate R(theta)
+     - Translate so that the point at the origin is at P1 T(Dx,Dy)
+
+     Note the order of operations here is right to left:
+
+     \code
+     P' = T(Dx,Dy) * R(theta) * T(-Dx,-Dy) * P
+     \endcode
+     
+     is equal to
+
+     \code
+     P' = T(Dx,Dy) * { R(theta) * [ T(-Dx,-Dy) * P ] }
+    \endcode
+     
+     is equal to
+
+     \code
+     P' = [ T(Dx,Dy) * R(theta) * T(-Dx,-Dy) ] * P
+     \endcode
+
+     The matrix that results from these 3 steps can then be applied to all of the points in the polygon. Another
+     common reason for doing this is to scale a polygon about an arbitrary point (e.g. the center of the polygon)
+     rather than around the origin.
+
+     - Translate so that P1 is at the origin
+     - Scale
+     - Translate so that the point at the origin is at P1
+
+     A detailed description can be also found in  J.D.Foley, A.Van Dam "Fundamentals of Interactive Computer Graphics"
+
+   */
+  class SITUATIONMAP_EXPORT Matrix2D
+  {
+    public:
+
+      /**
+        @name Construction, Destruction and Assign
+        @{
+      */
+      Matrix2D() = default;
+      explicit Matrix2D(const QGenericMatrix<3, 3, qreal>  & matrix) : m_matrix(matrix) {;}
+
+      Matrix2D & operator = ( const QGenericMatrix<3, 3, qreal> & matrix)               { m_matrix = matrix;          return *this; }
+
+      /** @} */
+
+      /**
+        Set matrix to identity.
+      */
+      void setToIdentity()                                                { m_matrix.setToIdentity();        }
+
+      /**
+        Returns true if this matrix is the identity; false otherwise.
+      */
+      bool isIdentity() const                                             { return m_matrix.isIdentity();    }
+
+      /**
+        Returns true if a translation is set, otherwise false
+      */
+      bool isTranslation() const                                          { return (!qFuzzyCompare( m_matrix(0,2),0.0) || !qFuzzyCompare(m_matrix(1,2),0.0)); }
+
+      /**
+        Returns true if a rotation is set, otherwise false
+      */
+      bool isRotation() const                                             { return (!qFuzzyCompare( m_matrix(0,1),0.0) || !qFuzzyCompare(m_matrix(1,0),0.0)); }
+      /**
+        Apply the coordinate transformation to one coordinate and returns the result.
+      */
+      QPointF apply( const QPointF & ) const;
+
+      /**
+        Add translation to the current matrix
+      */
+      void putTranslation( const QPointF & );
+
+      /**
+        Add scaling to the current matrix.
+      */
+      void putScale( const QPointF & );
+
+
+      /**
+        Add scaling to the current matrix.
+      */
+      void putScale(const QPointF & s, const QPointF & oVec)    { putScale(s, oVec.y(), oVec.x() ); }
+      void putScale( const QPointF & s, qreal sinPhi, qreal cosPhi );
+
+      /**
+        Add rotation to the current matrix.
+        @param oVec vector defining the rotation regarding to (1,0). The length of \a oVec has to be 1 (unit vector)
+      */
+      void putRotate( const QPointF & oVec )               { putRotate(oVec.y(),oVec.x()); }
+      void putRotate( qreal sinPhi, qreal cosPhi );
+
+      /**
+        Returns underlying QGenericMatrix.
+      */
+      QGenericMatrix<3,3,qreal>       & operator()()       { return m_matrix; }
+      const QGenericMatrix<3,3,qreal> & operator()() const { return m_matrix; }
+
+      qreal   operator()(int row, int col) const           { return m_matrix(row,col); }
+      qreal & operator()(int row, int col)                 { return m_matrix(row,col); }
+
+    protected:
+
+      QGenericMatrix<3,3,qreal>  m_matrix;
+
+  }; // Matrix2D
+ 
+  /**
+    Returns the product of N*M
+  */
+  inline Matrix2D operator* ( const Matrix2D & N, const Matrix2D & M ) { return Matrix2D( N()*M() ); } 
+
+
+  /**
+    Output operator
+  */
+  SITUATIONMAP_EXPORT std::ostream & operator<< (std::ostream  & stream, const Matrix2D & mat );
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.cpp
new file mode 100755
index 000000000..3bba846b4
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.cpp
@@ -0,0 +1,98 @@
+/**
+**
+** @RDE_HEADER@
+** Rasterize functional path geometries to polylines
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   12.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "path_rasterer.h"
+#include <cmath>
+
+namespace SituationMap { namespace MathUtils
+{
+   PathRasterer::PathRasterer() : _eps(1.0), _maxVertexCount(0)
+   {
+   } /* PathRasterer::PathRasterer */
+   
+
+   void PathRasterer::rasterize(qreal tMin, qreal tMax, QVector<QPointF> & vertexList) { exeRasterize( tMin, tMax, vertexList ); }
+
+
+   template <class List> void PathRasterer::exeRasterize( qreal tMin, qreal tMax, List & vertexList )
+   {
+      vertexList.clear();
+
+      if (tMin >= tMax) return;
+      
+      QPointF vMin, vMax;
+
+      function( tMax, vMax );
+      function( tMin, vMin );
+      vertexList.append(vMin);
+      splitSegment( vMin, tMin, vMax, tMax, _maxVertexCount, vertexList );
+      vertexList.append(vMax);
+   } /* PathRasterer::exeRasterize */
+
+
+   template <class List> void PathRasterer::splitSegment( const QPointF & v0
+                                                        , qreal           t0
+                                                        , const QPointF & v1
+                                                        , qreal           t1
+                                                        , unsigned int    maxVertexCount
+                                                        , List          & vertexList      )
+   {
+      if (maxVertexCount < 1)
+        return;
+
+      QPointF v2;
+      qreal   t2 = (t0+t1) * 0.5;
+
+      function( t2, v2 );
+
+      auto length = []( const QPointF & v ) -> qreal { return sqrt(v.x()*v.x() + v.y()*v.y()); };
+
+      qreal l0 = length(v1-v0);
+      qreal l1 = length(v1-v2);
+      qreal l2 = length(v2-v0);
+
+
+      /* -------------------------------------------------------------------------
+       * Berechnen der Höhe des Dreiecks über l0 für den Vergleich mit
+       * dem Schwellwert (siehe Kosinussatz, Trigonometrische Funktionen, etc.).
+       * ------------------------------------------------------------------------- */
+
+      qreal cosPhi = (l2*l2+l0*l0-l1*l1)/(2.0*l2*l0);
+      qreal h_eps  = l2*sqrt(1.0-cosPhi*cosPhi);
+
+      // (maxVertexCount > 0) -> see pre-condition
+      if  (((std::isnan(h_eps)) || (h_eps > _eps)))
+      {
+         maxVertexCount /= 2;
+         splitSegment( v0, t0, v2, t2, maxVertexCount, vertexList );
+         vertexList.append( v2 );
+         splitSegment( v2, t2, v1, t1, maxVertexCount, vertexList );
+      }
+   } /* PathRasterer::splitSegment */
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h
new file mode 100755
index 000000000..f6ad2117d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h
@@ -0,0 +1,92 @@
+/**
+**
+** @RDE_HEADER@
+** Rasterize functional path geometries to polylines
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   12.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <situation_map_export.h>
+
+namespace SituationMap { namespace MathUtils
+{
+
+    /**
+     @class PathRasterer path_rasterer.h
+     @brief Base class to rasterize parametric functions, like splines
+
+     Base class to rasterize parametric functions, like splines, with an interval halving method
+     to approximate the function by a discrete polyline.
+
+     @see Ellipse, Spline, SmoothLine, HermiteSpline, BezierSpline
+   */
+   class SITUATIONMAP_EXPORT PathRasterer
+   {
+      public:
+
+         PathRasterer();
+         virtual ~PathRasterer() = default;
+
+         /**
+            Defines a threshold values to decide ending convergence
+         */
+         inline void epsilon( qreal eps )               { _eps = eps;            }
+
+         /**
+            Defines the maximum of calculated verticies if \c epsilon doesn't terminate the convergence operation
+         */
+         inline void maxVertexCount(unsigned int max)   { _maxVertexCount = max; }
+
+         /**
+            Method to override to define the parametric function
+         */
+         virtual void function( qreal t, QPointF & result ) = 0;
+
+         /**
+           Creating a vertex vector with an interval halving method to approximate a parametric function by a polyline
+         */
+         void rasterize(qreal tMin, qreal tMax, QVector<QPointF> & vertexList);
+
+      protected:
+
+         qreal         _eps;
+         unsigned int  _maxVertexCount;
+
+         template<class List> void exeRasterize( qreal tMin, qreal tMax, List & vertexList );
+
+         template<class List> void splitSegment( const QPointF & v0
+                                               , qreal           t0
+                                               , const QPointF & v1
+                                               , qreal           t1
+                                               , unsigned int    maxVertexCount
+                                               , List          & vertexList );
+
+   }; /* PathRasterer */
+
+} } // namespace SituationMap::MathUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.cpp
new file mode 100755
index 000000000..3b5fe05ee
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.cpp
@@ -0,0 +1,207 @@
+/**
+  * @RDE_HEADER@
+  * Helper functions related to CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "simple_helper.h"
+#include "math_const.h"
+#include "clipper.hpp"
+#include <LtsCoordTrans/lts_coord_trans.h>
+// Qt
+#include <QList>
+#include <QTransform>
+
+namespace SituationMap
+{
+namespace MathUtils
+{
+
+
+QPointF rotate(const QPointF &p, const QPointF &center, qreal sinA, qreal cosA)
+{
+  qreal x = p.x() - center.x();
+  qreal y = p.y() - center.y();
+  return QPointF(x * cosA - y * sinA + center.x(), y * cosA + x * sinA + center.y());
+}
+
+
+QPointF rotate(const QPointF &p, const QPointF &center, qreal phi) { return rotate(p, center, sin(phi), cos(phi)); }
+
+
+qreal getMathAngle(qreal sinPhi, qreal cosPhi)
+{
+  qreal phi = acos(cosPhi);
+  if (sinPhi < 0) phi = MathConst::pi_two - phi;
+  return phi;
+}
+
+
+qreal getMathAngle(const QPointF &oVec) { return getMathAngle(oVec.y(), oVec.x()); }
+
+
+double getAngleDegreeNorth(const QPointF &p1, const QPointF &p2)
+{
+  double x = p2.x() - p1.x();
+  double y = p2.y() - p1.y();
+
+  // Winkel der Geraden bestimmen
+  double alphaRad = atan2(y, x);
+
+//  // Fuer Winkel > PI liefert atan2  math. rechts drehende (also negative) Werte.
+//  // Um Werte von 0-2PI zu bekommen muss deshalb hier von 2Pi abgezogen werden.
+
+  alphaRad -= M_PI / 2.0;
+  alphaRad *= -1.0;
+
+  if (alphaRad < 0.0)
+    alphaRad = 2 * M_PI + alphaRad;
+
+  return (alphaRad * 180.0 / M_PI);
+}
+
+QPointF getPointOnLine(const QPointF &p1, const QPointF &p2, double position_0_to_1)
+{
+  QPointF pRet;
+
+  pRet.rx() = p1.x() + (p2.x() - p1.x()) * position_0_to_1;
+  pRet.ry() = p1.y() + (p2.y() - p1.y()) * position_0_to_1;
+
+  return pRet;
+}
+
+Point3D getPointOnLine(const Point3D &p1, const Point3D &p2, double position_0_to_1)
+{
+  Point3D pRet;
+
+  pRet.rx() = p1.x() + (p2.x() - p1.x()) * position_0_to_1;
+  pRet.ry() = p1.y() + (p2.y() - p1.y()) * position_0_to_1;
+  pRet.rz() = p1.z() + (p2.z() - p1.z()) * position_0_to_1;
+
+  return pRet;
+}
+
+void rotatePoint(QPointF &pToBeRotated, const QPointF &center, double angleDegree)
+{
+  // angle to rad
+  double radAngle = ((M_PI) / -180.0) * angleDegree;
+
+  // Translate
+  QPointF t = pToBeRotated - center;
+
+  // Rotate
+  QPointF tmp;
+  tmp.rx() = t.x() * cos(radAngle) - t.y() * sin(radAngle);
+  tmp.ry() = t.x() * sin(radAngle) + t.y() * cos(radAngle);
+
+  // Translate back and write result
+  pToBeRotated = tmp + center;
+}
+
+
+
+QList<QPointF> mineFieldCenterLineToOutline(const QList<QPointF> &centerLine,
+                                            double width)
+{
+  QList<QPointF> outline;
+
+  // Clipper is using ints (typedef signed long long cInt;)
+  // The coordinate of centerline will have values much lower the the maximum.
+  // Therefore the factor can be 1000. So the resolution is bit enough (->Millimeter):
+  const int    factorInt    = 10;
+  const double factorDouble = 10.0;
+
+  ClipperLib::ClipperOffset                        pathOffset;
+  ClipperLib::Path                                 borderPath;      // vector< int >
+  ClipperLib::Paths                                offsetPathVec;   // vector< vector< int > >
+
+  for (auto point : centerLine)
+  {
+    borderPath << ClipperLib::IntPoint(static_cast<int>(point.x()*factorInt),
+                                       static_cast<int>(point.y()*factorInt));
+  }
+
+  pathOffset.AddPath(borderPath, ClipperLib::JoinType::jtSquare, ClipperLib::EndType::etOpenButt);
+  pathOffset.Execute(offsetPathVec, static_cast<int>(fabs(width)*factorInt));
+
+  for (auto path : offsetPathVec)
+  {
+    ClipperLib::Path::const_iterator it = path.begin();
+
+    for (; it != path.end(); ++it)
+    {
+      outline.append(QPointF(static_cast<double>(it->X) / factorDouble,
+                             static_cast<double>(it->Y) / factorDouble)
+                    );
+
+    }
+  }
+
+  return outline;
+}
+
+qreal getAngleDegree2North(qreal angleDeg)
+{
+  double rotationAngle = angleDeg < 360.  ? angleDeg : std::fmod(angleDeg, 360.);
+  // set rotation to 0° North(12h) counter clock wise
+  rotationAngle = rotationAngle < 90. ? std::fabs(90 - rotationAngle) : std::fabs(360 - rotationAngle + 90) ;
+  return rotationAngle;
+}
+
+qreal getAngleDegree2Math(qreal angleDeg)
+{
+  // set rotation to 0° math(3h) clockwise
+  const double rotationMath = angleDeg < 90. ? std::fabs(angleDeg - 90) : std::fabs(360 - angleDeg + 90) ;
+  return rotationMath;
+}
+
+QPolygonF getCircleSectorPolygon(const QPointF &centerPoint, qreal radius, double rotationAngleDeg, double centralAngleDeg)
+{
+  //       | <-rotationAngle
+  //   | <StartPoint
+  //
+  //   \   |   /
+  //    \     /
+  //     \ | /
+  //      \ /
+
+  rotationAngleDeg = 90 - rotationAngleDeg;
+
+  // rotate point with ~5 degree steps:
+  int steps = centralAngleDeg/5.0;
+  if (steps<3)  // at least 3 steps
+    steps=3;
+  const double singleIncrementDegree = centralAngleDeg/steps;
+
+  QPolygonF poly;
+  poly.reserve(steps+1);
+
+  // CenterPunkt erstellen und einfügen;
+  const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
+  poly << centerUtm.geographic(QPointF(0,0));
+
+  // Startwinkel:
+  const double angle = rotationAngleDeg - (centralAngleDeg/2.0); // start angle ->.\ | /
+  const double angleRad = angle * LtsCoordTrans::deg2rad();
+
+  // relPosition des StartPoint (point on circle)
+  const QPointF position(cos(angleRad) * radius, sin(angleRad) * radius);
+
+  // StartPoint einfügen
+  poly << centerUtm.geographic(position);
+
+  // calculate all steps, inclusive EndPos
+  for (int step = 1; step<=steps; ++step)
+  {
+    double curAngle = angle + (step*singleIncrementDegree);
+    double curAngleRad = curAngle * LtsCoordTrans::deg2rad();
+    poly << centerUtm.geographic( QPointF(cos(curAngleRad) * radius, sin(curAngleRad) * radius) );
+  } // for
+  return poly;
+}
+
+} // namespace SituationMap::MathUtils
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.h
new file mode 100755
index 000000000..b70acd3bb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/simple_helper.h
@@ -0,0 +1,130 @@
+/**
+  * @RDE_HEADER@
+  * Helper functions related to CoordinateTranslation
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+// Own
+#include "situation_map_export.h"
+#include <Map/point3D.h>
+
+
+// Qt
+#include <QPointF>
+#include <QPolygonF>
+
+
+// ESRI
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+namespace MathUtils
+{
+
+/**
+  @brief        Rotate a 2 dimensional point
+  @param p      point to rotate
+  @param center center point of rotation
+  @param sinA   sinus of rotation angle
+  @param cosA   cosinus of rotation angle
+  */
+QPointF SITUATIONMAP_EXPORT rotate(const QPointF &p, const QPointF &center, qreal sinA, qreal cosA);
+
+/**
+  @brief        Rotate a 2 dimensional point
+  @param p      point to rotate
+  @param center center point of rotation
+  @param phi    rotation angle in rad
+*/
+QPointF SITUATIONMAP_EXPORT rotate(const QPointF &p, const QPointF &center, qreal phi);
+
+/**
+  * @brief Get math angle in radiant from orientation vector
+  * @param oVec orientation vector, must be normalized to length 1
+  * @return mathematical angle in rad
+  */
+qreal SITUATIONMAP_EXPORT getMathAngle(const QPointF &oVec);
+
+
+/**
+  * @brief Get math angle in radiant from sinus and cosinus
+  * @param sinPhi sinus of angle, is equal to y component of orientation vector
+  * @param cosPhi cosinus of angle, is equal to x component of orientation vector
+  * @return mathematical angle in rad
+  */
+qreal SITUATIONMAP_EXPORT getMathAngle(qreal sinPhi, qreal cosPhi);
+
+
+double SITUATIONMAP_EXPORT getAngleDegreeNorth(const QPointF &p1, const QPointF &p2);
+
+/**
+  * @brief Get North angle from Math angle
+  * @param mathematical orientated angle in degree
+  * @return north (0° = 12h) orientated angle in degree
+  */
+qreal SITUATIONMAP_EXPORT getAngleDegree2North(qreal angleDeg);
+
+/**
+  * @brief Get North angle from Math angle
+  * @param mathematical orientated angle in degree
+  * @return math (0° = 3h) orientated angle in degree
+  */
+qreal SITUATIONMAP_EXPORT getAngleDegree2Math(qreal angleDeg);
+
+
+/**
+ * @brief Get the position on a given line (for positioning a text)
+ * @param p1 startPoint of line
+ * @param p2 endPoint of line
+ * @param position_0_to_1 value from 0.0 up to 1.0.
+ * 0.0 ->   0% -> startPoint
+ * 0.5 ->  50% -> middle between startPoint and endPoint
+ * 1.0 -> 100% -> endPoint
+ * @return position between start and end.
+ */
+QPointF SITUATIONMAP_EXPORT getPointOnLine(const QPointF &p1, const QPointF &p2, double position_0_to_1);
+
+Point3D SITUATIONMAP_EXPORT getPointOnLine(const Point3D &p1, const Point3D &p2, double position_0_to_1);
+
+/**
+ * @brief getCircleSectorPolygon
+ * @param centerPoint [geo coordinates]
+ * @param radius [m]
+ * @param rotationAngleDeg (orientation of segment)
+ * @param centralAngleDeg
+ * @return polygon describing the circle sector
+ */
+QPolygonF SITUATIONMAP_EXPORT getCircleSectorPolygon(const QPointF &centerPoint, qreal radius,  double rotationAngleDeg, double centralAngleDeg);
+
+
+
+/**
+ * @brief Rotate a point around with another point as center.
+ * @param pToBeRotated Point to be rotated
+ * @param center Center
+ * @param angleDegree Angle in degree (clockwise).
+ */
+void SITUATIONMAP_EXPORT rotatePoint(QPointF &pToBeRotated,
+                                     const QPointF &center,
+                                     double angleDegree);
+
+
+
+
+QList<QPointF> SITUATIONMAP_EXPORT mineFieldCenterLineToOutline(const QList<QPointF> &centerLine,
+                                                                double width);
+
+
+
+
+
+
+} // namespace MathUtils
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/CMakeLists.txt
new file mode 100755
index 000000000..d1f86147c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/CMakeLists.txt
@@ -0,0 +1,37 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+# Qt6 + ArcGIS 300 migration: Qt5::->Qt6:: and gated on BUILD_ARCGIS (ArcGIS
+# dependent) to match the migrated Symbology convention.
+#
+# LIBRARY
+SET(Portal_SRCS
+  portal.cpp
+  portal.h
+  portal_export.h
+)
+
+SOURCE_GROUP(Portal FILES ${Portal_SRCS})
+IF(BUILD_ARCGIS)
+NGL_ADD_LIBRARY(WS situationMapPortal SHARED ${Portal_SRCS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES(situationMapPortal
+  PUBLIC
+)
+
+
+NGL_TARGET_LINK_LIBRARIES(situationMapPortal
+  PRIVATE
+    ArcGIS::ArcGIS
+    NGLLogger
+    Qt6::Network
+    Qt6::Gui
+    Qt6::Core
+    situationMapCommon
+  PUBLIC
+)
+
+NGL_INSTALL_TARGET(situationMapPortal)
+ENDIF() # BUILD_ARCGIS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.cpp
new file mode 100755
index 000000000..137090824
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.cpp
@@ -0,0 +1,376 @@
+/**
+  * @RDE_HEADER@
+  * Portal
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLSE, 2018-10-08
+  */
+
+
+// Own
+#include "portal.h"
+//#include <Map/situation_map_utils.h>
+
+
+// Esri
+#include <Portal.h>
+#include <PortalItem.h>
+#include <Item.h>                    // 300: PortalItem::name() is on the Item base
+#include <PortalGroup.h>
+#include <PortalItemListModel.h>
+#include <PortalGroupListModel.h>
+#include <BasemapListModel.h>
+#include <Basemap.h>
+#include <LayerListModel.h>
+#include <Layer.h>
+#include <PortalQueryParametersForItems.h>
+#include <PortalQueryParametersForGroups.h>
+#include <PortalQueryResultSetForItems.h>
+#include <PortalQueryResultSetForGroups.h>
+#include <Error.h>
+#include <MapTypes.h>                 // 300: defines the LoadStatus enum (only fwd-declared in Portal.h)
+
+// Qt
+#include <QUrl>
+#include <QFuture>
+#include <QFutureWatcher>
+
+
+namespace Esri
+{
+namespace ArcGISRuntime
+{
+
+QString toString(const Error &value)
+{
+  std::ostringstream stream;
+  stream << "Esri::ArcGISRuntime::Error: "
+         << " code="                << value.arcGISServerErrorCode().value_or(0)  // 300: code() removed
+         << ", domain="             << (int)value.domain()
+         << ", extendedErrorType="  << (int)value.extendedErrorType()
+         << ", message='"           << value.message().toStdString() << "'"
+         << ", additionalMessage='" << value.additionalMessage().toStdString() << "'";
+  return QString::fromStdString(stream.str());
+}
+
+std::ostream &operator<< (std::ostream &stream,
+                          const Esri::ArcGISRuntime::Error &value)
+{
+  stream << toString(value);
+  return stream;
+}
+
+}
+}
+
+namespace SituationMap
+{
+
+
+
+
+class Portal::Private
+{
+public:
+  Private()  = default;
+  ~Private() = default;
+
+
+  Esri::ArcGISRuntime::Portal    *m_portal = nullptr;
+//  QTimer           *m_suppressTimer = nullptr;
+
+  // 300: the Portal "changed" signals (basemapsChanged/featuredGroupsChanged/
+  // featuredItemsChanged) and findItemsCompleted/findGroupsCompleted were removed; the
+  // equivalent fetch*Async()/find*Async() QFutures are watched to fire the same logging
+  // slots the old signals did. The watchers are parented to the Portal QObject.
+  QFutureWatcher<void>                                                *m_basemapsWatcher       = nullptr;
+  QFutureWatcher<void>                                                *m_featuredGroupsWatcher = nullptr;
+  QFutureWatcher<void>                                                *m_featuredItemsWatcher  = nullptr;
+  QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForItems*>  *m_findItemsWatcher  = nullptr;
+  QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForGroups*> *m_findGroupsWatcher = nullptr;
+
+}; // class Portal::Private
+//-----------------------------------------------------------------------------
+
+
+
+
+//-----------------------------------------------------------------------------
+
+Portal::Portal(QObject *parent)
+  : BaseClass(parent)
+  , d(new Private)
+  , m_logger(getLogger("Portal"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+Portal::~Portal()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool Portal::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d->m_portal;
+
+  QUrl portalUrl(QStringLiteral("http://excgeo20.sl.defence-elec.de/arcgis")); // http://excgeo20.sl.defence-elec.de/arcgis/
+  // 300: Esri::ArcGISRuntime::Credential removed (replaced by the Authentication framework);
+  // it was only referenced by the commented-out ctor below, so the unused credential is dropped.
+  d->m_portal = new Esri::ArcGISRuntime::Portal(portalUrl, false);
+//  d->m_portal = new Esri::ArcGISRuntime::Portal(portalUrl, &credential);
+
+  // 300: Portal::errorOccurred signal removed -> load errors arrive via doneLoading(Error).
+  connect(d->m_portal, &Esri::ArcGISRuntime::Portal::doneLoading, this, &Portal::onPortalDoneLoading);
+
+  // 300: basemapsChanged/featuredGroupsChanged/featuredItemsChanged/homepageFeaturedContentChanged
+  // signals removed -> the equivalent QFutureWatchers are set up in fetchData().
+
+  d->m_portal->load();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool Portal::fetchData()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_portal || d->m_portal->loadStatus() != Esri::ArcGISRuntime::LoadStatus::Loaded)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " not loaded yet";
+    return false;
+  }
+
+  // 300: fetchBasemaps()/fetchFeaturedGroups()/fetchFeaturedItems() removed -> fetch*Async()
+  // return QFuture<void>; watch them to fire the same slots the old *Changed signals fired.
+  d->m_basemapsWatcher = new QFutureWatcher<void>(this);
+  connect(d->m_basemapsWatcher, &QFutureWatcher<void>::finished,
+          this, [this](){ onBasemapsChanged(); });
+  d->m_basemapsWatcher->setFuture(d->m_portal->fetchBasemapsAsync());
+
+  d->m_featuredGroupsWatcher = new QFutureWatcher<void>(this);
+  connect(d->m_featuredGroupsWatcher, &QFutureWatcher<void>::finished,
+          this, [this](){ onFeaturedGroupsChanged(); });
+  d->m_featuredGroupsWatcher->setFuture(d->m_portal->fetchFeaturedGroupsAsync());
+
+  d->m_featuredItemsWatcher = new QFutureWatcher<void>(this);
+  connect(d->m_featuredItemsWatcher, &QFutureWatcher<void>::finished,
+          this, [this](){ onFeaturedItemsChanged(); });
+  d->m_featuredItemsWatcher->setFuture(d->m_portal->fetchFeaturedItemsAsync());
+
+  // 300: fetchHomepageFeaturedContent()/homepageFeaturedContent() removed.
+
+
+  // findItems :
+  Esri::ArcGISRuntime::PortalQueryParametersForItems query;
+  query.setSearchString(QLatin1String("1==1"));
+  //  query.setTypes(QList<PortalItemType>() << PortalItemType::WebMap);
+
+  // 300: findItems() + findItemsCompleted signal removed -> findItemsAsync() returns
+  // QFuture; watch it to fire onFindItemsCompleted with the result.
+  d->m_findItemsWatcher = new QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForItems*>(this);
+  connect(d->m_findItemsWatcher,
+          &QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForItems*>::finished,
+          this, [this](){ onFindItemsCompleted(d->m_findItemsWatcher->result()); });
+  d->m_findItemsWatcher->setFuture(d->m_portal->findItemsAsync(query));
+
+
+  // findGroups
+  QString groupsQuery(QLatin1String("1==1"));
+  Esri::ArcGISRuntime::PortalQueryParametersForGroups findGroupsQueryParameters(groupsQuery);
+
+  d->m_findGroupsWatcher = new QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForGroups*>(this);
+  connect(d->m_findGroupsWatcher,
+          &QFutureWatcher<Esri::ArcGISRuntime::PortalQueryResultSetForGroups*>::finished,
+          this, [this](){ onFindGroupsCompleted(d->m_findGroupsWatcher->result()); });
+  d->m_findGroupsWatcher->setFuture(d->m_portal->findGroupsAsync(findGroupsQueryParameters));
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+
+void Portal::onPortalErrorOccurred(const Esri::ArcGISRuntime::Error &error)
+{
+  ERROR_LOG(m_logger) << LOGFUNCTION << " Portal -> EsriError occured: " << error;
+}
+
+void Portal::onPortalDoneLoading(const Esri::ArcGISRuntime::Error &loadError)
+{
+  if (loadError.isEmpty())
+  {
+    NOTICE_LOG(m_logger) << LOGFUNCTION << " Portal loaded";
+    fetchData();
+  } else {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " Portal -> EsriError occured: " << loadError;
+  }
+}
+
+void Portal::onBasemapsChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+
+  Esri::ArcGISRuntime::BasemapListModel *model = d->m_portal->basemaps();
+  if (!model)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " model does not exits";
+    return;
+  }
+
+  for (int i=0; i<model->size(); ++i)
+  {
+    Esri::ArcGISRuntime::Basemap *item = model->at(i);
+    if (!item)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " item is empty";
+      continue;
+    }
+    NOTICE_LOG(m_logger) << LOGFUNCTION
+                         << " i=" << i
+                         << " name = '" << item->name() << "'"
+                         << " url = '" << item->url().toString() << "'";
+
+    Esri::ArcGISRuntime::LayerListModel *llm = item->baseLayers();
+    if (!llm)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " llm is empty";
+      continue;
+    }
+    for (int j=0; i<llm->size(); ++j)
+    {
+      Esri::ArcGISRuntime::Layer *layer = llm->at(j);
+      if (!layer)
+      {
+        WARNING_LOG(m_logger) << LOGFUNCTION << " layer is empty";
+        continue;
+      }
+      NOTICE_LOG(m_logger) << LOGFUNCTION
+                           << " j=" << j
+                           << " layer = '" << layer->name() << "'"
+                           << " layerType = '" << (int)layer->layerType();
+    } // for
+
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+void Portal::onFeaturedGroupsChanged()
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+
+  Esri::ArcGISRuntime::PortalGroupListModel *model = d->m_portal->featuredGroups();
+  if (!model)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " model does not exits";
+    return;
+  }
+
+  for (int i=0; i<model->size(); ++i)
+  {
+    Esri::ArcGISRuntime::PortalGroup *item = model->at(i);
+    if (!item)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " item is empty";
+      continue;
+    }
+    NOTICE_LOG(m_logger) << LOGFUNCTION
+                         << " i=" << i
+                         << " title = '" << item->title() << "'"
+//                         << " url = '" << item->url().toString() << "'"
+                            ;
+  } // for
+
+}
+void Portal::onFeaturedItemsChanged()
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+
+  Esri::ArcGISRuntime::PortalItemListModel *model = d->m_portal->featuredItems();
+  if (!model)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " model does not exits";
+    return;
+  }
+
+  for (int i=0; i<model->size(); ++i)
+  {
+    Esri::ArcGISRuntime::PortalItem *item = model->at(i);
+    if (!item)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " item is empty";
+      continue;
+    }
+    NOTICE_LOG(m_logger) << LOGFUNCTION
+                         << " i=" << i
+                         << " name = '" << item->name() << "'"
+                         << " serviceUrl = '" << item->serviceUrl().toString() << "'";
+  } // for
+}
+void Portal::onHomepageFeatureContentChanged()
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+  // 300: Portal::homepageFeaturedContent()/fetchHomepageFeaturedContent() removed; nothing to log.
+  TRACE_LOG(m_logger) << LOGFUNCTION << " (homepage featured content no longer available in ArcGIS 300)";
+}
+
+void Portal::onFindItemsCompleted(Esri::ArcGISRuntime::PortalQueryResultSetForItems *result)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+  Esri::ArcGISRuntime::PortalItemListModel *model = result->itemResults();
+  if (!model)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " model does not exits";
+    return;
+  }
+
+  for (int i=0; i<model->size(); ++i)
+  {
+    Esri::ArcGISRuntime::PortalItem *item = model->at(i);
+    if (!item)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " item is empty";
+      continue;
+    }
+    NOTICE_LOG(m_logger) << LOGFUNCTION
+                         << " i=" << i
+                         << " name = '" << item->name() << "'"
+                         << " serviceUrl = '" << item->serviceUrl().toString() << "'";
+  } // for
+}
+
+void Portal::onFindGroupsCompleted(Esri::ArcGISRuntime::PortalQueryResultSetForGroups *result)
+{
+  NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** fired";
+  Esri::ArcGISRuntime::PortalGroupListModel *model = result->groupResults();
+  if (!model)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " model does not exits";
+    return;
+  }
+
+  for (int i=0; i<model->size(); ++i)
+  {
+    Esri::ArcGISRuntime::PortalGroup *item = model->at(i);
+    if (!item)
+    {
+      WARNING_LOG(m_logger) << LOGFUNCTION << " item is empty";
+      continue;
+    }
+    NOTICE_LOG(m_logger) << LOGFUNCTION
+                         << " i=" << i
+                         << " title = '" << item->title() << "'"
+//                         << " toJson() = '" << item->toJson() << "'"
+                            ;
+  } // for
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.h
new file mode 100755
index 000000000..25a2501b9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal.h
@@ -0,0 +1,80 @@
+/**
+  * @RDE_HEADER@
+  * SideBar
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLSE, 2018-10-08
+  */
+
+#pragma once
+
+// Own
+#include "portal_export.h"
+#include <Common/situation_map_logging.h>
+
+
+// Qt
+#include <QObject>
+
+
+namespace Esri {
+namespace ArcGISRuntime {
+class Error;
+class PortalQueryResultSetForItems;
+class PortalQueryResultSetForGroups;
+}
+}
+class QModelIndex;
+class QStandardItem;
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAPPORTAL_EXPORT Portal : public QObject
+{
+  using BaseClass = QObject;
+
+  Q_OBJECT
+
+public:
+  explicit Portal(QObject *parent = nullptr);
+  virtual ~Portal();
+
+  bool init();
+
+  bool fetchData();
+
+signals:
+
+protected Q_SLOTS:
+  void onPortalErrorOccurred(const Esri::ArcGISRuntime::Error &error);
+  void onPortalDoneLoading(const Esri::ArcGISRuntime::Error &loadError);
+
+  void onBasemapsChanged();
+
+  void onFeaturedGroupsChanged();
+  void onFeaturedItemsChanged();
+  void onHomepageFeatureContentChanged();
+
+  void onFindItemsCompleted(Esri::ArcGISRuntime::PortalQueryResultSetForItems* result);
+  void onFindGroupsCompleted(Esri::ArcGISRuntime::PortalQueryResultSetForGroups* result);
+
+
+private:
+
+private:
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal_export.h
new file mode 100755
index 000000000..d3a43cda5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Portal/portal_export.h
@@ -0,0 +1,21 @@
+/**
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef SITUATIONMAPPORTAL_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define SITUATIONMAPPORTAL_EXPORT
+# else
+# if defined(MAKE_SITUATIONMAPPORTAL_LIB)
+#   define SITUATIONMAPPORTAL_EXPORT Q_DECL_EXPORT
+#  else
+#   define SITUATIONMAPPORTAL_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.png b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.png
new file mode 100755
index 000000000..0943a7a28
Binary files /dev/null and b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.png differ
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.svg b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.svg
new file mode 100755
index 000000000..69d0f3b7e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/compass.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg1655"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docname="compass.svg"
+   sodipodi:docbase="/home/tackat/globepedia/data/svg">
+  <metadata
+     id="metadata1372">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="540"
+     inkscape:window-width="749"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.921875"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="0"
+     inkscape:window-y="155"
+     inkscape:current-layer="svg1655" />
+  <defs
+     id="defs1658" />
+  <g
+     id="layer4" />
+  <g
+     style="display:inline"
+     id="layer2" />
+  <path
+     d="M 64.000002,7.8827703 L 75.899275,52.095786 L 120.09371,64.00006 L 75.899275,75.904337 L 64.000006,120.11735 L 52.100734,75.904336 L 7.9063054,64.000063 L 52.100734,52.095786 L 64.000002,7.8827703 z "
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:#ffffcb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+     id="path2637" />
+  <path
+     d="M 64.000002,7.8827703 L 75.899275,52.095786 L 120.09371,64.00006 L 75.899275,75.904337 L 64.000006,120.11735 L 52.100734,75.904336 L 7.9063054,64.000063 L 52.100734,52.095786 L 64.000002,7.8827703 z "
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+     id="path2640" />
+  <g
+     transform="matrix(-0.517891,0,0,-0.517891,353.8668,171.0979)"
+     style="display:inline"
+     id="g2592">
+    <path
+       d="M 536.88161,229.87756 L 451.35003,206.809 L 559.70462,206.809 L 536.88161,229.87756 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1692" />
+    <path
+       d="M 582.77318,229.63201 L 559.70462,315.16359 L 559.70462,206.809 L 582.77318,229.63201 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="path2580" />
+    <path
+       d="M 582.52763,183.74044 L 668.05921,206.809 L 559.70462,206.809 L 582.52763,183.74044 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="path2586" />
+    <path
+       d="M 536.63606,183.98599 L 559.70462,98.45441 L 559.70462,206.809 L 536.63606,183.98599 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="path2590" />
+  </g>
+</svg>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_aerial.png b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_aerial.png
new file mode 100755
index 000000000..602bf28bc
Binary files /dev/null and b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_aerial.png differ
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_topographic.png b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_topographic.png
new file mode 100755
index 000000000..2596282ec
Binary files /dev/null and b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/preview_topographic.png differ
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/pushPinRedClipArt.png b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/pushPinRedClipArt.png
new file mode 100755
index 000000000..d88e7c97a
Binary files /dev/null and b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/pushPinRedClipArt.png differ
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/situation_map.qrc b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/situation_map.qrc
new file mode 100755
index 000000000..16f269476
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Resources/situation_map.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/situationMap">
+        <file>preview_aerial.png</file>
+        <file>preview_topographic.png</file>
+        <file>pushPinRedClipArt.png</file>
+    </qresource>
+</RCC>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/README.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/README.txt
new file mode 100755
index 000000000..2d9c60c4b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/README.txt
@@ -0,0 +1,34 @@
+// @RDE_HEADER@
+// Notizen zu den Rubberbands
+// $Id$
+// $HeadURL$
+// $Author$
+// Created by Norbert Thoden, SLSE, 2023-08-26
+
+Notizen zu den Rubberbands
+
+- Sie wurden von Jörg Turla erstellt
+
+- 2023: Erweiterung durch Steve Kemayou and Norbert Thoden
+
+Norbert Thoden, 08/2023 :
+- Habe ein neues RB erstellt: RubberbandMultiEllipseFeature
+- Vorlage war RubberbandMultiPointFeature (Polyline)
+  Weiterer Stützpunte habe nicht mehr die Linie verlängtert, sondern neue Ellipse/Kreise eingefügt.
+
+- API & Name wurden überwiegend für Ellipse konzipiert, getestet wurde aber im Wesentlichen mit Kreis (constrainQuadratic=true9
+
+  Probleme/ToDo sind u.a:
+  - Screenresolution führt dazu, das bei eng gefassten Constraints (z.B. radius =5m, min/Max ebenfalls bei 5m)
+    die checkMinMaxRadiusConstraint nicht bestehen und als Fehler betrachtet werden... :-(
+
+  - Setzen der Predefines Values (setCenterAndRadii) unterstützt noch keine Constraints
+
+
+ Empfehlung für neues RB
+ -  Bedeutung erlernen von: selectAction, moveAction, movePickedAction und ihrer returnValues.
+ -  Hilfsfile für rotations methoden etc. um ständiges kopieren (von Lmabdas!?) zu vermeiden.
+ - ...
+
+: Norbert Thoden, 08/2023:
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abort.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abort.xpm
new file mode 100755
index 000000000..62a95633d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abort.xpm
@@ -0,0 +1,149 @@
+/* XPM */
+static const char * abort_xpm[] = {
+"24 24 122 2",
+"  	c None",
+". 	c #E98774",
+"+ 	c #F6866F",
+"@ 	c #FB6C50",
+"# 	c #F28773",
+"$ 	c #F8856E",
+"% 	c #EF8672",
+"& 	c #F5846E",
+"* 	c #F96346",
+"= 	c #F96042",
+"- 	c #F96649",
+"; 	c #F28670",
+"> 	c #8E5246",
+", 	c #F7836C",
+"' 	c #F96245",
+") 	c #F9674B",
+"! 	c #F18570",
+"~ 	c #F3836D",
+"{ 	c #F76245",
+"] 	c #F75F41",
+"^ 	c #F76447",
+"/ 	c #F2846E",
+"( 	c #945549",
+"_ 	c #F7806A",
+": 	c #F76143",
+"< 	c #F76548",
+"[ 	c #F0856F",
+"} 	c #E47B66",
+"| 	c #F56043",
+"1 	c #F55D3F",
+"2 	c #F56144",
+"3 	c #9A574A",
+"4 	c #F57E67",
+"5 	c #F55E41",
+"6 	c #F56245",
+"7 	c #D1725F",
+"8 	c #E55539",
+"9 	c #F35A3C",
+"0 	c #F35D40",
+"a 	c #F27F68",
+"b 	c #9F5A4C",
+"c 	c #F47B63",
+"d 	c #F35B3E",
+"e 	c #D44E34",
+"f 	c #E35337",
+"g 	c #F1583A",
+"h 	c #F15B3D",
+"i 	c #F17D66",
+"j 	c #F37860",
+"k 	c #F1593B",
+"l 	c #D14C32",
+"m 	c #DF5034",
+"n 	c #EE5638",
+"o 	c #EE583A",
+"p 	c #EE5739",
+"q 	c #CC4A30",
+"r 	c #DC4D31",
+"s 	c #EC5335",
+"t 	c #CA472D",
+"u 	c #D94B2F",
+"v 	c #E95133",
+"w 	c #C7452C",
+"x 	c #DF4B2E",
+"y 	c #E74E30",
+"z 	c #CE462B",
+"A 	c #A45949",
+"B 	c #E55235",
+"C 	c #E44C2E",
+"D 	c #E35A3F",
+"E 	c #975244",
+"F 	c #E76950",
+"G 	c #E2492B",
+"H 	c #E24B2D",
+"I 	c #E47059",
+"J 	c #83473C",
+"K 	c #E36A52",
+"L 	c #DF4628",
+"M 	c #E04A2C",
+"N 	c #E06F59",
+"O 	c #E16C55",
+"P 	c #DC4528",
+"Q 	c #DC4426",
+"R 	c #DD482B",
+"S 	c #DC6F59",
+"T 	c #DD6C56",
+"U 	c #DA4326",
+"V 	c #DA4123",
+"W 	c #D74022",
+"X 	c #D84123",
+"Y 	c #DB472A",
+"Z 	c #D96E59",
+"` 	c #DA6A55",
+" .	c #D94325",
+"..	c #D83F21",
+"+.	c #D13D20",
+"@.	c #D63F21",
+"#.	c #DA472B",
+"$.	c #D46C58",
+"%.	c #D26A55",
+"&.	c #D64326",
+"*.	c #D53D1F",
+"=.	c #CF3B1E",
+"-.	c #D33C1F",
+";.	c #D7482B",
+">.	c #C36552",
+",.	c #D03A1D",
+"'.	c #D33B1D",
+").	c #CB391C",
+"!.	c #D13A1D",
+"~.	c #CA381C",
+"{.	c #CD381A",
+"].	c #D2391B",
+"^.	c #CB371A",
+"/.	c #D0381B",
+"(.	c #C7361A",
+"_.	c #CA3518",
+":.	c #D03719",
+"<.	c #C93518",
+"[.	c #CD3619",
+"}.	c #C43417",
+"|.	c #BF3216",
+"1.	c #BD3116",
+"                                                ",
+"          .                         .           ",
+"        + @ #                     $ @ %         ",
+"      & * = - ;               > , ' = ) !       ",
+"    ~ { ] ] ] ^ /           ( _ : ] ] ] < [     ",
+"  } | 1 1 1 1 1 2 ~       3 4 5 1 1 1 1 1 6 7   ",
+"    8 9 9 9 9 9 9 0 a   b c d 9 9 9 9 9 9 e     ",
+"      f g g g g g g h i j k g g g g g g l       ",
+"        m n n n n n n o p n n n n n n q         ",
+"          r s s s s s s s s s s s s t           ",
+"            u v v v v v v v v v v w             ",
+"              x y y y y y y y y z               ",
+"            A B C C C C C C C C D               ",
+"          E F G G G G G G G G G H I             ",
+"        J K L L L L L L L L L L L M N           ",
+"        O P Q Q Q Q Q Q Q Q Q Q Q Q R S         ",
+"      T U V V V V V V W X V V V V V V Y Z       ",
+"    `  .............+.    @.............#.$.    ",
+"  %.&.*.*.*.*.*.*.=.        -.*.*.*.*.*.*.;.>.  ",
+"    ,.'.'.'.'.'.).            !.'.'.'.'.'.~.    ",
+"      {.].].].^.                /.].].].(.      ",
+"        _.:.<.                    [.:.}.        ",
+"          |.                        1.          ",
+"                                                "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.cpp
new file mode 100755
index 000000000..595957822
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.cpp
@@ -0,0 +1,291 @@
+/**
+**
+** @RDE_HEADER@
+** Abstract Event Dispatcher for Qt5
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   28.04.2003, JT  : First edition for use with Qt4 in START Feature Editor fee
+**   25.03.2015, JT  : Refactoring for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "abstract_event_dispatcher.h"
+#include "gestures.h"
+
+#include <math.h>
+
+#include <QtWidgets/QWidget>
+#include <QtCore/QCoreApplication>
+
+
+namespace SituationMap { namespace RB
+{
+
+   static QHash<QWidget*, QList<AbstractEventDispatcher*>> &runningDispatcher()
+   {
+     static QHash<QWidget*, QList<AbstractEventDispatcher*>> hashTable;
+     return hashTable;
+   } // runningDispatcher()
+
+
+   QGestureRecognizer  * AbstractEventDispatcher::_applyGestureDetection = nullptr;
+   unsigned int          AbstractEventDispatcher::_applyGestureID        = 0;
+
+
+   AbstractEventDispatcher::AbstractEventDispatcher( QWidget * getEventsFrom )
+      : QObject(getEventsFrom)
+      , _getEventsFrom(getEventsFrom)
+      , _logger(getLogger("EventDispatcher"))
+      , _cursorIsInWidget(false)
+      , _synthesisTouchFromMouseEvents(false)
+      , _deleteRequested(false)
+      , _hasGrab(false)
+      , _finishFlag(false)
+      , _activeEvent(false)
+      , _dispatcherCursor()
+      , _whatsThisBackup()
+      , _eventActions(nullptr)
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION <<  " " << this;
+      initDispatcher();
+   } /* AbstractEventDispatcher::AbstractEventDispatcher */
+
+
+   AbstractEventDispatcher::AbstractEventDispatcher( QWidget * getEventsFrom, EventActionInterface * eventActions )
+      : QObject(getEventsFrom)
+      , _getEventsFrom(getEventsFrom)
+      , _logger(getLogger("EventDispatcher"))
+      , _cursorIsInWidget(false)
+      , _synthesisTouchFromMouseEvents(false)
+      , _deleteRequested(false)
+      , _hasGrab(false)
+      , _finishFlag(false)
+      , _activeEvent(false)
+      , _dispatcherCursor()
+      , _whatsThisBackup()
+      , _eventActions(eventActions)
+
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION <<  " " << this;
+      initDispatcher();
+   } /* AbstractEventDispatcher::AbstractEventDispatcher */
+
+
+    void AbstractEventDispatcher::initDispatcher()
+    {
+      _restoreCursor = _getEventsFrom->testAttribute(Qt::WA_SetCursor);
+
+      if (_restoreCursor)
+      {
+         _cursorToRestore = getCursorFromWidget();
+
+         DEBUG_LOG(_logger) << LOGFUNCTION <<  " this=" << this << " get cursorToRestore";
+      }
+      _restoreMouseTracking = _getEventsFrom->hasMouseTracking();
+
+//      {
+//        bool activeEvent = _activeEvent;
+//        _activeEvent = true;                 // don't process events while init has not been finished
+//        QCoreApplication::process Events();   // remove  events from event queue; in which circumstances this is necessary?
+//        _activeEvent = activeEvent;
+//      }
+
+      _getEventsFrom->setMouseTracking(true);
+      _getEventsFrom->raise();
+      _getEventsFrom->installEventFilter(this);
+
+      _synthesisTouchFromMouseEvents = QCoreApplication::testAttribute( Qt::AA_SynthesizeTouchForUnhandledMouseEvents );
+      QCoreApplication::setAttribute( Qt::AA_SynthesizeTouchForUnhandledMouseEvents, false );
+      QCoreApplication::setAttribute( Qt::AA_SynthesizeMouseForUnhandledTouchEvents, true  );
+
+      static const Qt::GestureType gestures[] = { Qt::GestureType::TapGesture
+                                                , Qt::GestureType::TapAndHoldGesture
+                                                , Qt::GestureType::PanGesture
+                                                , Qt::GestureType::PinchGesture
+                                                , Qt::GestureType::SwipeGesture };
+
+      for (auto gestureType : gestures) _getEventsFrom->grabGesture(gestureType);
+
+      if (_applyGestureDetection == nullptr)
+      {
+         _applyGestureDetection = new ApplyGestureRecognizer();
+         _applyGestureID        = QGestureRecognizer::registerRecognizer( _applyGestureDetection );
+      }
+
+      _getEventsFrom->grabGesture( (Qt::GestureType)_applyGestureID );
+      _getEventsFrom->setAttribute( Qt::WA_AcceptTouchEvents, true );
+
+      runningDispatcher()[_getEventsFrom].append(this);
+   } /* AbstractEventDispatcher::initDispatcher */
+
+
+   AbstractEventDispatcher::~AbstractEventDispatcher()
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION << " " << this;
+
+      _finishFlag = true;
+
+      if (_getEventsFrom)
+      {
+         _getEventsFrom->removeEventFilter(this);
+         _getEventsFrom->setMouseTracking( _restoreMouseTracking );
+
+         ungrab();
+
+         if (!_whatsThisBackup.isNull())
+         {
+            _getEventsFrom->setWhatsThis(_whatsThisBackup);
+         }
+         runningDispatcher()[_getEventsFrom].removeAll(this);
+      }
+
+      QCoreApplication::setAttribute( Qt::AA_SynthesizeTouchForUnhandledMouseEvents, _synthesisTouchFromMouseEvents );
+
+   } /* AbstractEventDispatcher::~AbstractEventDispatcher */
+
+
+   unsigned int AbstractEventDispatcher::numberOfEventDispatcher() const
+   {
+     return static_cast<unsigned int>( runningDispatcher()[_getEventsFrom].size() );
+   } /* AbstractEventDispatcher::numberOfEventDispatcher */
+
+
+   void AbstractEventDispatcher::onDo_delete()
+   {
+     if (_deleteRequested) return;
+     _deleteRequested = true;
+     QObject::deleteLater();
+   } /* AbstractEventDispatcher::onDo_delete */
+
+
+   void AbstractEventDispatcher::KickTheBucket()
+   {
+      if (_getEventsFrom == nullptr) return;
+
+      _finishFlag = true;
+
+      unlinkEventDispatcher();
+
+      _getEventsFrom->removeEventFilter(this);
+      _getEventsFrom->setMouseTracking( _restoreMouseTracking );
+
+      ungrab();
+
+      if (!_whatsThisBackup.isNull())
+      {
+         _getEventsFrom->setWhatsThis(_whatsThisBackup);
+      }
+
+      runningDispatcher()[_getEventsFrom].removeAll(this);
+      _getEventsFrom = nullptr;
+
+      emit signalKickTheBucket();
+
+//      QCoreApplication::sendPostedEvents();
+//      QCoreApplication::process Events();      // dispatch window system events
+
+      onDo_delete();
+
+   } /* AbstractEventDispatcher::KickTheBucket */
+
+
+   void AbstractEventDispatcher::onDo_kickTheBucket() { KickTheBucket(); }
+
+
+   void AbstractEventDispatcher::setWhatsThis(const QString & whatsThis)
+   {
+      if (_whatsThisBackup.isNull())
+      {
+         _whatsThisBackup = _getEventsFrom->whatsThis();
+      }
+      _getEventsFrom->setWhatsThis(whatsThis);
+   } /* AbstractEventDispatcher::setWhatsThis */
+
+
+
+   void AbstractEventDispatcher::grab()
+   {
+      if (_hasGrab) return;
+      _hasGrab = true;
+      DEBUG_LOG(_logger) << LOGFUNCTION <<  " this=" << this << " set dispatcherCursor = " << (int)_dispatcherCursor.shape();
+      setCursorToWidget( _dispatcherCursor );
+      _getEventsFrom -> setFocus();
+   } /* AbstractEventDispatcher::Grab */
+
+
+   void AbstractEventDispatcher::ungrab()
+   {
+      if (!_hasGrab) return;
+
+      _hasGrab = false;
+      if (_restoreCursor)
+      {
+         DEBUG_LOG(_logger) << LOGFUNCTION <<  " this=" << this << " set cursorToRestore = " << (int)_cursorToRestore.shape();
+         setCursorToWidget( _cursorToRestore );
+      }
+      else _getEventsFrom -> unsetCursor();
+
+      _getEventsFrom -> clearFocus();
+
+   } /* AbstractEventDispatcher::Ungrab */
+
+
+   bool AbstractEventDispatcher::eventFilter( QObject * widget, QEvent * e )
+   {
+      if (widget != ((QObject*)_getEventsFrom)) return false;
+
+      if (_logger.isDebugEnabled())
+      {
+         switch (e->type())
+         {
+            case QEvent::CursorChange:
+            {
+               QCursor cursor = _getEventsFrom->cursor();
+               DEBUG_LOG(_logger) << LOGFUNCTION << " Cursor has changed, this = " << this << " cursor = " << cursor.shape();
+            } break;
+
+            case QEvent::Enter :
+            {
+               _cursorIsInWidget = true;
+               QCursor cursor = _getEventsFrom->cursor();
+               DEBUG_LOG(_logger) << LOGFUNCTION << " Enter event, this = " << this << " cursor = " << cursor.shape();
+            } break;
+
+            case QEvent::Leave :
+            {
+               _cursorIsInWidget = false;
+               QCursor cursor = _getEventsFrom->cursor();
+               DEBUG_LOG(_logger) << LOGFUNCTION << " Leave event, this = " << " cursor = " << cursor.shape();
+            } break;
+
+            default: break;
+         }
+      }
+      return false;
+   } /* AbstractEventDispatcher::eventFilter */
+
+
+   void AbstractEventDispatcher::setCursorToWidget( const QCursor & cursor )  { _getEventsFrom -> setCursor( cursor ); }
+
+   QCursor AbstractEventDispatcher::getCursorFromWidget() const               { return _getEventsFrom->cursor();       }
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.h
new file mode 100755
index 000000000..687fcd433
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/abstract_event_dispatcher.h
@@ -0,0 +1,234 @@
+/**
+**
+** @RDE_HEADER@
+** Abstract Event Dispatcher for Qt5
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   28.04.2003, JT  : First edition for use with Qt4 in START Feature Editor fee
+**   25.03.2015, JT  : Refactoring for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <functional>
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtGui/QCursor>
+
+#include <Common/situation_map_logging.h>
+
+class QEvent;
+class QWidget;
+class QGestureRecognizer;
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class  AbstractEventDispatcher  abstract_event_dispatcher.h
+     @brief Base class of Qt event filter implementations to handle user interactions of map window
+
+     An EventDispatcher installs an event filter on a QWidget to receive all events that are send to
+     the widget. Depending on the type of event and the state of the event dispatcher the event will
+     be processed by the dispatcher and stopped or forwarded to the QWidget. In case of processing
+     the event methodes of the EventActionInterface are called to controll a rubberband.
+
+     @see EventDelegater, EventDispatcher, EventMouseNavigator
+   */
+   class AbstractEventDispatcher : public QObject
+   {
+      friend class EventDelegater;
+
+      Q_OBJECT
+
+      public:
+
+         /**
+            @brief Logical interface between EventDispatcher and Rubberband
+            Defines interface functions the EventDispatcher will call to control a rubberband. The rubberband class
+            is derived from EventActionInterface and overrides the interface functions to implement them. The mapping
+            user interaction to interface action is defined the derived classes of AbstractEventDispatcher.
+         */
+         class EventActionInterface
+         {
+            public:
+
+               EventActionInterface()          = default;
+               virtual ~EventActionInterface() = default;
+
+               virtual void unlinkEventDispatcher   ( AbstractEventDispatcher * causer ) = 0;
+               virtual void resetAction             ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); }
+               virtual bool selectAction            ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool setCoordinateAction     ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool moveAction              ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool movePickedAction        ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool contextMenuAction       ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool completeStateAction     ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool deleteAction            ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool undoAction              ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool applyAndEndAction       ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool abortAction             ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+               virtual bool buttonPositionAction    ( AbstractEventDispatcher * causer, int x, int y ) { Q_UNUSED(causer); Q_UNUSED(x); Q_UNUSED(y); return false; }
+
+               virtual void userActionFinished() = 0;
+
+         }; /* EventActionInterface */
+
+         /**
+            @name Construction & Destruction
+            @{
+         */
+         explicit AbstractEventDispatcher( QWidget * getEventsFrom );
+         explicit AbstractEventDispatcher( QWidget * getEventsFrom, EventActionInterface* );
+
+         virtual ~AbstractEventDispatcher();
+
+         AbstractEventDispatcher(const AbstractEventDispatcher &) = delete;
+         AbstractEventDispatcher & operator = (const AbstractEventDispatcher &) = delete;
+         /** @} */
+
+         /**
+           Conceal deleteLater slot. Use onDo_delete() instead to avoid "QCoreApplication::postEvent: Unexpected null receiver" warning.
+         */
+         void deleteLater() = delete;
+
+         /**
+           Provides the number of EventDispatcher installed to the QWidget of this EventDispatcher
+         */
+         unsigned int numberOfEventDispatcher() const;
+         
+         inline void setEventActions(EventActionInterface * eventActions) { _eventActions = eventActions; }
+
+         inline bool hasGrab() const { return _hasGrab; }
+
+         inline void setCursor(const QCursor & cursor) { _dispatcherCursor = cursor; }
+
+         void setWhatsThis(const QString & whatsThis);
+
+         void grab();
+         void ungrab();
+
+
+      public slots:
+
+        /**
+           @brief Slot calling internal \c KickTheBucket methode
+
+           Calls internal methode \c KickTheBucket. Be careful using this function. Should only be used
+           from implementations of \c EventActionInterface methodes or \c EventDelegater class.
+         */
+         void onDo_kickTheBucket();
+
+         /**
+           @brief Slot calling \c deleteLater function of QObject
+
+           Never use \c delete directly for EventDispatcher class. Instead of use \c onDo_delete() function.
+         */
+         void onDo_delete();
+
+      protected:
+
+         QWidget * _getEventsFrom;
+         LOGGER_T  _logger;
+         bool      _cursorIsInWidget;
+
+         inline bool hasFinished()    { return _finishFlag;  }
+         inline bool hasActiveEvent() { return _activeEvent; }
+
+         inline void setActiveEvent(bool val) { _activeEvent = val; }
+
+         /**
+            @brief Destroying EventDispatcher as result of an incoming event.
+
+            As result of an incomming event (e.g. Keypress ESC) the EventDispatcher will stop, emiting signal \c signalKickTheBucket()
+            and calls methode \c EventActionInterface::unlinkEventDispatcher() before setup \c deleteLater() call to destroy it self.
+         */
+         virtual void KickTheBucket();
+
+
+         inline void unlinkEventDispatcher()
+         {
+            if (_eventActions)
+            {
+               _eventActions -> unlinkEventDispatcher( this );
+               _eventActions  = nullptr;
+            }
+         } /* unlinkEventDispatcher */
+
+
+         inline bool callEventAction( bool( EventActionInterface::*actionMethodePtr)( AbstractEventDispatcher*,int,int), int x, int y )
+         {
+            if (_eventActions == nullptr) return false;
+            return (_eventActions->*actionMethodePtr)( this, x, y );
+         } /* callEventAction */
+
+
+         /**
+            Event filter function to override to implement event handling. To workaround a cursor handling bug in QGraphicsView it is
+            necessary to call the eventFilter function of this base class, which will monitor enter and leave events.
+         */
+         virtual bool eventFilter( QObject * widget, QEvent * e );
+
+         inline EventActionInterface * getEventActions() { return _eventActions; }
+
+         void    setCursorToWidget( const QCursor & cursor );
+         QCursor getCursorFromWidget() const;
+
+         bool                   _synthesisTouchFromMouseEvents;
+
+         static unsigned int    _applyGestureID;
+
+      private:
+
+         void initDispatcher();
+
+         bool                   _deleteRequested;
+
+         bool                   _hasGrab;
+         bool                   _finishFlag;
+
+         bool                   _restoreCursor;
+         bool                   _restoreMouseTracking;
+         QCursor                _cursorToRestore;
+
+         bool                   _activeEvent;
+
+         QCursor                _dispatcherCursor;
+         QString                _whatsThisBackup;
+
+         EventActionInterface * _eventActions;
+
+
+
+         static QGestureRecognizer * _applyGestureDetection;
+
+      signals:
+
+         void signalKickTheBucket();
+
+   }; /* EventDispatcher */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/apply.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/apply.xpm
new file mode 100755
index 000000000..cd1a26d20
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/apply.xpm
@@ -0,0 +1,110 @@
+/* XPM */
+static const char * apply_xpm[] = {
+"24 24 83 1",
+" 	c None",
+".	c #7FBD7C",
+"+	c #8BCF88",
+"@	c #84C582",
+"#	c #588456",
+"$	c #63BE5F",
+"%	c #57B953",
+"&	c #73BF70",
+"*	c #56B752",
+"=	c #499B45",
+"-	c #699F66",
+";	c #59B755",
+">	c #54B550",
+",	c #52B14E",
+"'	c #6ABC67",
+")	c #52B34E",
+"!	c #377334",
+"~	c #6FAF6C",
+"{	c #50B24C",
+"]	c #4FB14B",
+"^	c #48A144",
+"/	c #4C734A",
+"(	c #5DB559",
+"_	c #4DAE49",
+":	c #4CAD48",
+"<	c #6BB569",
+"[	c #4AAC46",
+"}	c #377F35",
+"|	c #5E915C",
+"1	c #50AD4C",
+"2	c #48A944",
+"3	c #44A040",
+"4	c #61B05E",
+"5	c #45A641",
+"6	c #527F50",
+"7	c #7BBF78",
+"8	c #78BA75",
+"9	c #639C60",
+"0	c #46A542",
+"a	c #42A33E",
+"b	c #368633",
+"c	c #389035",
+"d	c #3FA13B",
+"e	c #43A33F",
+"f	c #619B5E",
+"g	c #56AC53",
+"h	c #3D9D39",
+"i	c #3B9C37",
+"j	c #3C9E38",
+"k	c #54A951",
+"l	c #64A761",
+"m	c #3D9E39",
+"n	c #2A6B26",
+"o	c #3A9B35",
+"p	c #3B9B36",
+"q	c #62A55F",
+"r	c #4B7749",
+"s	c #48A243",
+"t	c #33892F",
+"u	c #328B2F",
+"v	c #379833",
+"w	c #459F41",
+"x	c #4F7E4D",
+"y	c #5CA659",
+"z	c #369632",
+"A	c #349530",
+"B	c #349630",
+"C	c #59A955",
+"D	c #3A9936",
+"E	c #276C25",
+"F	c #256C22",
+"G	c #32932E",
+"H	c #2F892B",
+"I	c #2C8728",
+"J	c #2F912B",
+"K	c #2F902B",
+"L	c #2D8E29",
+"M	c #2D8F29",
+"N	c #257322",
+"O	c #226E1F",
+"P	c #2B8D27",
+"Q	c #298826",
+"R	c #288424",
+"                        ",
+"                        ",
+"                 .+++@  ",
+"                #$%%%   ",
+"                &***=   ",
+"               -;>>,    ",
+"               ')))!    ",
+"              ~{]]^     ",
+"             /(__:      ",
+"             <[[[}      ",
+"            |1223       ",
+"            4555        ",
+" 67778     90aab        ",
+"  cddef    gddh         ",
+"   ijjk   lmjj          ",
+"   noopq rsoot          ",
+"    uvvwxyvvz           ",
+"     ABBCDBBE           ",
+"     FGGGGGH            ",
+"      IJJJK             ",
+"       LMMN             ",
+"       OPQ              ",
+"        R               ",
+"                        "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/constrainsMarker.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/constrainsMarker.xpm
new file mode 100755
index 000000000..516636927
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/constrainsMarker.xpm
@@ -0,0 +1,200 @@
+/* XPM */
+static const char * constrainsMarker_xpm[] = {
+"24 24 173 2",
+"  	c None",
+". 	c #AE6557",
+"+ 	c #DF826F",
+"@ 	c #F18C78",
+"# 	c #FE947F",
+"$ 	c #FD937E",
+"% 	c #EC8976",
+"& 	c #E08270",
+"* 	c #A35F51",
+"= 	c #C17060",
+"- 	c #F88C77",
+"; 	c #FD7F67",
+"> 	c #FC7257",
+", 	c #FC6A4E",
+"' 	c #FC6345",
+") 	c #FC6446",
+"! 	c #FC6C50",
+"~ 	c #FD8269",
+"{ 	c #B86A5B",
+"] 	c #EA8672",
+"^ 	c #FC7A61",
+"/ 	c #FB6548",
+"( 	c #FB6244",
+"_ 	c #F45F42",
+": 	c #E85B3F",
+"< 	c #EF5D41",
+"[ 	c #FC7C64",
+"} 	c #EA8673",
+"| 	c #EF846F",
+"1 	c #F9694D",
+"2 	c #F96042",
+"3 	c #F55E41",
+"4 	c #BB4832",
+"5 	c #C04A33",
+"6 	c #F65F41",
+"7 	c #EE8571",
+"8 	c #E9816C",
+"9 	c #F76548",
+"0 	c #F75E40",
+"a 	c #F66143",
+"b 	c #E6573C",
+"c 	c #F76649",
+"d 	c #E67F6B",
+"e 	c #B86959",
+"f 	c #F56549",
+"g 	c #F45C3E",
+"h 	c #E8583B",
+"i 	c #F45D3F",
+"j 	c #F27D66",
+"k 	c #E25539",
+"l 	c #F5674B",
+"m 	c #F0725A",
+"n 	c #F2593B",
+"o 	c #EE583A",
+"p 	c #B8442D",
+"q 	c #F25C3F",
+"r 	c #EA7C67",
+"s 	c #EE7259",
+"t 	c #A95E4F",
+"u 	c #EF593B",
+"v 	c #EF5638",
+"w 	c #B4432D",
+"x 	c #CF4B30",
+"y 	c #F05D41",
+"z 	c #DF7A66",
+"A 	c #B9452E",
+"B 	c #EF593C",
+"C 	c #A75C4E",
+"D 	c #D36650",
+"E 	c #EC5436",
+"F 	c #DA4E32",
+"G 	c #ED6044",
+"H 	c #CE7361",
+"I 	c #D16550",
+"J 	c #E35E44",
+"K 	c #EA5133",
+"L 	c #DF4D31",
+"M 	c #E24E31",
+"N 	c #EC6449",
+"O 	c #B36354",
+"P 	c #DF5D43",
+"Q 	c #E75436",
+"R 	c #E74E30",
+"S 	c #D04D34",
+"T 	c #E44D2F",
+"U 	c #EB6A51",
+"V 	c #8D4E42",
+"W 	c #D54D32",
+"X 	c #E45539",
+"Y 	c #E34C2E",
+"Z 	c #E44B2D",
+"` 	c #CE5138",
+" .	c #E76F57",
+"..	c #D45036",
+"+.	c #E14E30",
+"@.	c #D94729",
+"#.	c #E1492A",
+"$.	c #D85339",
+"%.	c #A0341E",
+"&.	c #E14B2D",
+"*.	c #E0725B",
+"=.	c #DB5236",
+"-.	c #D8492C",
+";.	c #C24329",
+">.	c #DE4628",
+",.	c #E04F32",
+"'.	c #BB3B22",
+").	c #DF4C2F",
+"!.	c #D56F5B",
+"~.	c #C2432A",
+"{.	c #963B28",
+"].	c #DC4325",
+"^.	c #B25C4B",
+"/.	c #C93D22",
+"(.	c #DE4F33",
+"_.	c #C86A57",
+":.	c #B95D4A",
+"<.	c #913927",
+"[.	c #D53F21",
+"}.	c #D94022",
+"|.	c #DC5B42",
+"1.	c #CF3D21",
+"2.	c #DD5338",
+"3.	c #B25F4F",
+"4.	c #DB583F",
+"5.	c #9D311B",
+"6.	c #D73E20",
+"7.	c #D84123",
+"8.	c #D16A55",
+"9.	c #D33D1F",
+"0.	c #DD5A40",
+"a.	c #D86B55",
+"b.	c #D74023",
+"c.	c #9A2F1B",
+"d.	c #C3371C",
+"e.	c #D43C1E",
+"f.	c #D7472B",
+"g.	c #D06C58",
+"h.	c #D33C1E",
+"i.	c #D64326",
+"j.	c #C4381C",
+"k.	c #C7361A",
+"l.	c #D2391B",
+"m.	c #D54529",
+"n.	c #DB6B56",
+"o.	c #B35E4D",
+"p.	c #B85441",
+"q.	c #D0391C",
+"r.	c #CA371A",
+"s.	c #C13418",
+"t.	c #D0381A",
+"u.	c #D13A1D",
+"v.	c #D65339",
+"w.	c #DC6A53",
+"x.	c #D7715D",
+"y.	c #CF6C59",
+"z.	c #DC735E",
+"A.	c #DC6953",
+"B.	c #D64F35",
+"C.	c #BD3318",
+"D.	c #972812",
+"E.	c #CC3518",
+"F.	c #CF3618",
+"G.	c #D03C1E",
+"H.	c #D24226",
+"I.	c #D0381B",
+"J.	c #CA3517",
+"K.	c #912611",
+"L.	c #B12E14",
+"M.	c #BE3115",
+"N.	c #CA3417",
+"O.	c #CC3517",
+"P.	c #AF2D14",
+"                                                ",
+"                . + @ # $ % & *                 ",
+"            = - ; > , ' ) ! > ~ - {             ",
+"          ] ^ / ( ( _ : : < ( ( / [ }           ",
+"        | 1 2 3 4             5 6 2 1 7         ",
+"      8 9 0 0 a                   b 0 c d       ",
+"    e f g h g i j                   k g l e     ",
+"    m n o   p n q r                   o n s     ",
+"  t u v w     x v y z                 A v B C   ",
+"  D E E         F E G H                 E E I   ",
+"  J K L           M K N O               M K P   ",
+"  Q R S             T R U V             W R X   ",
+"  Y Z `               Z Z  .            ..Z +.  ",
+"  @.#.$.              %.#.&.*.          =.#.-.  ",
+"  ;.>.,.                '.>.).!.        ).>.~.  ",
+"  {.].].^.                /.].(._.    :.].].<.  ",
+"    [.}.|.                  1.}.2.3.  4.}.[.    ",
+"    5.6.7.8.                  9.6.0.a.b.6.c.    ",
+"      d.e.f.g.                  h.e.i.e.j.      ",
+"        k.l.m.n.o.            p.q.l.l.r.        ",
+"          s.t.u.v.w.x.y.y.z.A.B.u.t.C.          ",
+"            D.E.F.F.G.H.H.I.F.F.J.K.            ",
+"                  L.M.N.O.M.P.                  ",
+"                                                "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.cpp
new file mode 100755
index 000000000..d108b2937
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.cpp
@@ -0,0 +1,127 @@
+
+/**
+**
+** @RDE_HEADER@
+** Definition of ellipse drawable
+** $Id$
+** $HeadURL$
+** $Author$
+*/
+
+#include "drawable_ellipse.h"
+
+#include <MathUtils/math_const.h>
+#include <QtWidgets/QGraphicsEllipseItem>
+
+
+namespace SituationMap { namespace RB
+{
+
+   DrawableEllipse::DrawableEllipse(Esri::ArcGISRuntime::MapGraphicsView * map) : DrawableEllipse(map,map->scene()) {;}
+
+
+   DrawableEllipse::DrawableEllipse(Esri::ArcGISRuntime::MapGraphicsView * map, QGraphicsScene * scene)
+      : RubberbandDrawable(map, scene)
+      , _elliItem(nullptr)
+      , _center()
+      , _radiusX(0)
+      , _radiusY(0)
+      , _elliStyle()
+      , _sinRect(0)
+      , _cosRect(1)
+      , _sectorStart()
+      , _sectorEnd()
+   {
+      _elliItem  = new QGraphicsEllipseItem();
+      _scene -> addItem( _elliItem );
+      makeLineStyle( false, _elliStyle );
+      _elliItem -> setPen( _elliStyle );
+
+      _sectItem  = new QGraphicsEllipseItem();
+      _scene -> addItem( _sectItem );
+      makeLineStyle( false, _elliStyle );
+      _sectItem -> setPen( _elliStyle );
+   } /* DrawableLine::DrawableLine */
+
+
+   DrawableEllipse::~DrawableEllipse()
+   {
+      if (_scene)
+      {
+        if (_elliItem) _scene->removeItem(_elliItem);
+        if (_sectItem) _scene->removeItem(_sectItem);
+        delete _elliItem;
+        delete _sectItem;
+      }
+      _elliItem = nullptr;
+      _sectItem = nullptr;
+   } /*  DrawableEllipse::~DrawableEllipse */
+
+
+   void  DrawableEllipse::updateGraphic()
+   {
+      auto length = []( const QPointF & p ) -> qreal { return sqrt(p.x()*p.x()+p.y()*p.y()); };
+
+      qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+      qreal sinMap = sin(mapRotatePhi);
+      qreal cosMap = cos(mapRotatePhi);
+
+      qreal sinPhi = _sinRect * cosMap + _cosRect * sinMap;
+      qreal cosPhi = _cosRect * cosMap - _sinRect * sinMap;
+
+      _center.mapToScene(_mapView);
+
+      QPointF mapCenter( _center._mapCoordinate.x(), _center._mapCoordinate.y() );
+
+      RubberbandCoordinate x0y0(_mapView, convert( mapCenter+QPointF(-_radiusX,-_radiusY), _mapView->map()->spatialReference()) );
+      RubberbandCoordinate x1y0(_mapView, convert( mapCenter+QPointF( _radiusX,-_radiusY), _mapView->map()->spatialReference()) );
+      RubberbandCoordinate x0y1(_mapView, convert( mapCenter+QPointF(-_radiusX, _radiusY), _mapView->map()->spatialReference()) );
+
+      qreal width  = length(x1y0._sceneCoordinate-x0y0._sceneCoordinate);
+      qreal height = length(x0y1._sceneCoordinate-x0y0._sceneCoordinate);
+
+      makeLineStyle( false, _elliStyle );
+
+      QColor fillColor = transparentFillColor();
+      //fillColor.setAlpha(0);
+
+      QPen pen(_drawColor);
+      pen.setWidth(_lineWidth);
+
+      if (_sectorStart != _sectorEnd)
+      {
+         auto getAngle = [](qreal sinPhi, qreal cosPhi) -> int
+         {
+           qreal phi = acos( cosPhi );
+           if (sinPhi < 0) phi = MathConst::pi_two - phi;
+           return int( (phi * 180.0 / MathConst::pi) * 16);
+         }; // getAngle
+
+         int startAngle = getAngle(_sectorStart.y(), _sectorStart.x());
+         int endAngle   = getAngle(  _sectorEnd.y(),   _sectorEnd.x());
+         int spanAngle  = (endAngle > startAngle) ? endAngle-startAngle : 5760-startAngle+endAngle;
+
+         _sectItem -> setRect( -width*0.5, -height*0.5, width, height );
+         _sectItem -> setPen( pen );
+         _sectItem -> setBrush( (fillColor.alpha() > 0) ? QBrush(fillColor) : QBrush() );
+         _sectItem -> setTransform( QTransform( cosPhi, -sinPhi, sinPhi, cosPhi, _center._sceneCoordinate.x(), _center._sceneCoordinate.y() ));
+         _sectItem -> setStartAngle( startAngle );
+         _sectItem -> setSpanAngle( spanAngle );
+         _sectItem -> setVisible( true );
+
+         fillColor.setAlphaF(fillColor.alphaF() * 0.5 );
+      }
+      else _sectItem -> setVisible( false );
+
+      _elliItem -> setRect( -width*0.5, -height*0.5, width, height );
+      _elliItem -> setPen(pen);
+      _elliItem -> setBrush( (fillColor.alpha() > 0) ? QBrush(fillColor) : QBrush() );
+      _elliItem -> setTransform( QTransform( cosPhi, -sinPhi, sinPhi, cosPhi, _center._sceneCoordinate.x(), _center._sceneCoordinate.y() ));
+
+   } /* DrawableEllipse::updateGraphic */
+
+   void DrawableEllipse::adjustCoordinates()            { updateGraphic(); }
+   void DrawableEllipse::adjustWindow( const QRectF& )  { updateGraphic(); }
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.h
new file mode 100755
index 000000000..af68620ba
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_ellipse.h
@@ -0,0 +1,73 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of ellipse drawable
+** $Id$
+** $HeadURL$
+** $Author$
+*/
+
+#pragma once
+
+
+#include "rubberband_drawable.h"
+
+#include <Map.h>
+#include <SpatialReference.h>
+
+
+namespace SituationMap { namespace RB
+{
+   class DrawableEllipse : public RubberbandDrawable
+   {
+      Q_OBJECT
+      public:
+
+         explicit DrawableEllipse( Esri::ArcGISRuntime::MapGraphicsView * );
+         explicit DrawableEllipse( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+         ~DrawableEllipse();
+
+         DrawableEllipse(const RubberbandDrawable &) = delete;
+         DrawableEllipse & operator = (const RubberbandDrawable &) = delete;
+
+
+         inline void setRect(const QPointF & center, qreal radiusX, qreal radiusY, qreal sin, qreal cos, const QPointF & sectorStart = QPointF(), const QPointF & sectorEnd = QPointF() )
+         {
+           // p1,p2 = corner points of unrotated ellipse in scene coordinates
+           _center  = RubberbandCoordinate( _mapView, convert(center, _mapView->map()->spatialReference()) );
+           _radiusX = radiusX;
+           _radiusY = radiusY;
+
+           _sinRect = sin;
+           _cosRect = cos;
+
+           _sectorStart = sectorStart;
+           _sectorEnd   = sectorEnd;
+           updateGraphic();
+         }
+
+         qreal radiusX() { return _radiusX; }
+         qreal radiusY() { return _radiusY; }
+
+      protected:
+
+         QGraphicsEllipseItem                     * _elliItem;
+         QGraphicsEllipseItem                     * _sectItem;
+         RubberbandDrawable::RubberbandCoordinate   _center;
+         qreal                                      _radiusX;
+         qreal                                      _radiusY;
+         QPen                                       _elliStyle;
+         qreal                                      _sinRect;
+         qreal                                      _cosRect;
+         QPointF                                    _sectorStart;
+         QPointF                                    _sectorEnd;
+
+         void updateGraphic() override;
+
+
+         void adjustCoordinates() override;
+         void adjustWindow( const QRectF& ) override;
+
+   }; /* DrawableEllipse */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.cpp
new file mode 100755
index 000000000..cab0e5861
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.cpp
@@ -0,0 +1,109 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of line drawables
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   06.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "drawable_line.h"
+
+#include <QtWidgets/QGraphicsLineItem>
+
+
+namespace SituationMap { namespace RB
+{
+
+   DrawableLine::DrawableLine(Esri::ArcGISRuntime::MapGraphicsView * map)
+      : RubberbandDrawable(map)
+      , _lineItem(nullptr)
+      , _lineStyle()
+      , _dottedLine(false)
+   {
+      _lineItem  = new QGraphicsLineItem();
+      _scene -> addItem( _lineItem );
+
+      makeLineStyle( _dottedLine, _lineStyle );
+      _lineItem -> setPen( _lineStyle );
+
+   } /* DrawableLine::DrawableLine */
+
+
+   DrawableLine::DrawableLine(Esri::ArcGISRuntime::MapGraphicsView * map, QGraphicsScene * scene)
+      : RubberbandDrawable(map, scene)
+      , _lineItem(nullptr)
+      , _lineStyle()
+      , _dottedLine(false)
+   {
+      _lineItem  = new QGraphicsLineItem();
+      _scene -> addItem( _lineItem );
+      makeLineStyle( _dottedLine, _lineStyle );
+      _lineItem -> setPen( _lineStyle );
+
+   } /* DrawableLine::DrawableLine */
+
+   DrawableLine::~DrawableLine()
+   {
+      if (_scene)
+      {
+        if (_lineItem)
+        {
+          _scene->removeItem(_lineItem);
+          delete _lineItem;
+        }
+      }
+      _lineItem = nullptr;
+   } /* DrawableLine::~DrawableLine */
+
+
+   void DrawableLine::setLine( const RubberbandDrawable::RubberbandCoordinate & p1, const RubberbandDrawable::RubberbandCoordinate & p2 )
+   {
+      _lineCoordinates[0]  = p1;
+      _lineCoordinates[1]  = p2;
+      updateGraphic();
+   } /* DrawableLine::setPath */
+
+
+   void  DrawableLine::updateGraphic()
+   {
+      _lineCoordinates[0].mapToScene(_mapView);
+      _lineCoordinates[1].mapToScene(_mapView);
+
+      qreal x1 = _lineCoordinates[0]._sceneCoordinate.x();
+      qreal y1 = _lineCoordinates[0]._sceneCoordinate.y();
+      qreal x2 = _lineCoordinates[1]._sceneCoordinate.x();
+      qreal y2 = _lineCoordinates[1]._sceneCoordinate.y();
+
+      makeLineStyle( _dottedLine, _lineStyle );
+
+      _lineItem -> setLine( x1,y1,x2,y2 );
+      _lineItem -> setPen( _lineStyle );
+      _lineItem -> setVisible( _isVisible );
+
+   } /* DrawableLine::updateGraphic */
+
+   void DrawableLine::adjustCoordinates()           { updateGraphic(); }
+   void DrawableLine::adjustWindow( const QRectF& ) { updateGraphic(); }
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.h
new file mode 100755
index 000000000..00ade66ae
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_line.h
@@ -0,0 +1,68 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of line drawable
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "rubberband_drawable.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class DrawableLine : public RubberbandDrawable
+   {
+      Q_OBJECT
+      public:
+
+         explicit DrawableLine( Esri::ArcGISRuntime::MapGraphicsView * );
+         explicit DrawableLine( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+         ~DrawableLine();
+
+         DrawableLine(const RubberbandDrawable &) = delete;
+         DrawableLine & operator = (const RubberbandDrawable &) = delete;
+
+         void setLine( const RubberbandDrawable::RubberbandCoordinate & p1, const RubberbandDrawable::RubberbandCoordinate & p2 );
+
+         inline void dottedLine(bool on = true) { _dottedLine = on; }
+
+      protected:
+
+         QGraphicsLineItem                        * _lineItem;
+         RubberbandDrawable::RubberbandCoordinate   _lineCoordinates[2];
+         QPen                                       _lineStyle;
+         bool                                       _dottedLine;
+
+         void updateGraphic() override;
+
+         void adjustCoordinates() override;
+         void adjustWindow( const QRectF& ) override;
+
+   }; /* DrawableLine */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.cpp
new file mode 100755
index 000000000..c272673b4
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.cpp
@@ -0,0 +1,152 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of path drawables
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.07.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "drawable_painter_path.h"
+
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+
+
+namespace SituationMap { namespace RB
+{
+
+   DrawablePainterPath::DrawablePainterPath(Esri::ArcGISRuntime::MapGraphicsView * map)
+      : RubberbandDrawable(map)
+      , _painterPathItem(nullptr)
+      , _pathCoordinates()
+      , _lineStyle()
+      , _dottedPath(false)
+      , _closedLine(false)
+      , _fillSolid(false)
+   {
+      _painterPathItem  = _scene->addPath( QPainterPath() );
+      _painterPathItem -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+      makeLineStyle( _dottedPath, _lineStyle );
+      _painterPathItem -> setPen  ( (_drawColor.alpha()) ?  QPen(_drawColor)   : QPen() );
+      _fillColor.setAlpha(0);
+      _painterPathItem -> setBrush( (_fillColor.alpha()) ?  QBrush(_fillColor) : QBrush() );
+   } /* DrawablePainterPath::DrawablePainterPath */
+
+
+   DrawablePainterPath::DrawablePainterPath(Esri::ArcGISRuntime::MapGraphicsView * map, QGraphicsScene * scene)
+      : RubberbandDrawable(map, scene)
+      , _painterPathItem(nullptr)
+      , _pathCoordinates()
+      , _lineStyle()
+      , _dottedPath(false)
+      , _closedLine(false)
+      , _fillSolid(false)
+   {
+      _painterPathItem  = _scene->addPath( QPainterPath() );
+      _painterPathItem -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+      makeLineStyle( _dottedPath, _lineStyle );
+      _painterPathItem -> setPen  ( (_drawColor.alpha()) ?  _lineStyle         : QPen()   );
+      _fillColor.setAlpha(0);
+      _painterPathItem -> setBrush( (_fillColor.alpha()) ?  QBrush(_fillColor) : QBrush() );
+   } /* DrawablePainterPath::DrawablePainterPath */
+
+
+   DrawablePainterPath::~DrawablePainterPath()
+   {
+     if (_scene)
+     {
+       if (_painterPathItem)
+       {
+          _scene->removeItem(_painterPathItem);
+          delete _painterPathItem;
+       }
+       _painterPathItem = nullptr;
+     }
+   } /* DrawablePainterPath::~DrawablePainterPath */
+
+
+   void DrawablePainterPath::setPath( const QVector<RubberbandDrawable::RubberbandCoordinate> & path )
+   {
+      _pathCoordinates  = path;
+      updateGraphic();
+   } /* DrawablePainterPath::setPath */
+
+
+   void DrawablePainterPath::setPath( const QVector<QPointF> & scenePath )
+   {
+      _pathCoordinates.clear();
+      _pathCoordinates.reserve( scenePath.size() );
+
+      for ( auto p : scenePath )
+      {
+         _pathCoordinates.append( RubberbandDrawable::RubberbandCoordinate(_mapView,p) );
+      }
+      updateGraphic();
+
+   } /* DrawablePainterPath::setPath */
+
+
+   void DrawablePainterPath::updateGraphic()
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION;
+
+      if ((_closedLine) && (_pathCoordinates.size() < 3))
+      {
+         _painterPathItem -> setVisible( false );
+         return;
+      }
+
+      QPainterPath painterPath;
+
+      QVector<RubberbandDrawable::RubberbandCoordinate>::iterator it = _pathCoordinates.begin();
+
+      if (it != _pathCoordinates.end())
+      {
+         painterPath.moveTo( it->mapToScene(_mapView) );
+         DEBUG_LOG(_logger) << LOGFUNCTION << " map-x = " << it->_mapCoordinate.x() << " map-y = " << it->_mapCoordinate.y();
+         while (true)
+         {
+            ++it;
+            if (it == _pathCoordinates.end()) break;
+            painterPath.lineTo( it->mapToScene(_mapView) );
+            DEBUG_LOG(_logger) << LOGFUNCTION << " map-x = " << it->_mapCoordinate.x() << " map-y = " << it->_mapCoordinate.y();
+         }
+         if (_closedLine) painterPath.closeSubpath();
+      }
+
+      const QColor &fillColor = transparentFillColor();
+      makeLineStyle( _dottedPath, _lineStyle );
+
+      _painterPathItem -> setVisible( _isVisible );
+      _painterPathItem -> setPen  ( (_drawColor.alpha() > 0) ?  _lineStyle        : QPen()   );
+      _painterPathItem -> setBrush( ( fillColor.alpha() > 0) ?  QBrush(fillColor) : QBrush() );
+      _painterPathItem -> setZValue( _zBufferValue );
+      _painterPathItem -> setPath( painterPath );
+
+   } /* DrawablePainterPath::updateGraphic */
+
+   void DrawablePainterPath::adjustCoordinates()           { updateGraphic(); }
+   void DrawablePainterPath::adjustWindow( const QRectF& ) { updateGraphic(); }
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.h
new file mode 100755
index 000000000..cdf043647
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_painter_path.h
@@ -0,0 +1,75 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband drawing objects
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "rubberband_drawable.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class DrawablePainterPath : public RubberbandDrawable
+   {
+      Q_OBJECT
+      public:
+
+         explicit DrawablePainterPath( Esri::ArcGISRuntime::MapGraphicsView * );
+         explicit DrawablePainterPath( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+         ~DrawablePainterPath();
+
+         DrawablePainterPath(const RubberbandDrawable &) = delete;
+         DrawablePainterPath & operator = (const RubberbandDrawable &) = delete;
+
+         void setPath( const QVector<QPointF> & scenePath );
+
+         void setPath( const QVector<RubberbandDrawable::RubberbandCoordinate> & path );
+
+         inline void enableClosedLine(bool on = true) { _closedLine = on; }
+
+         inline void dottedPath(bool on = true)       { _dottedPath = on; }
+         inline void fillSolid(bool on = true)        { _fillSolid  = on; }
+
+      protected:
+
+         QGraphicsPathItem                                 * _painterPathItem;
+         QVector<RubberbandDrawable::RubberbandCoordinate>   _pathCoordinates;
+         QPen                                                _lineStyle;
+         bool                                                _dottedPath;
+         bool                                                _closedLine;
+         bool                                                _fillSolid;
+
+         void updateGraphic() override;
+
+         void adjustCoordinates() override;
+         void adjustWindow( const QRectF& ) override;
+
+   }; /* DrawablePainterPath */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.cpp
new file mode 100755
index 000000000..d205478ac
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.cpp
@@ -0,0 +1,127 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of line drawables
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   06.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "drawable_smooth_path.h"
+
+#include <QPainterPath>
+#include <QGraphicsPathItem>
+
+#include <MathUtils/curve.h>
+#include <MathUtils/path_rasterer.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   DrawableSmoothPath::DrawableSmoothPath(Esri::ArcGISRuntime::MapGraphicsView * map)
+      : DrawablePainterPath(map)
+      , _smoothLine( new SituationMap::MathUtils::SmoothLine() )
+   {
+      _pathRasterer = _smoothLine->createPathRaster();
+   } /* DrawableSmoothPath::DrawableLine */
+
+
+   DrawableSmoothPath::DrawableSmoothPath(Esri::ArcGISRuntime::MapGraphicsView * map, QGraphicsScene * scene)
+      : DrawablePainterPath(map, scene)
+      , _smoothLine( new SituationMap::MathUtils::SmoothLine() )
+   {
+      _pathRasterer = _smoothLine->createPathRaster();
+   } /* DrawableSmoothLine::DrawableLine */
+
+
+   DrawableSmoothPath::~DrawableSmoothPath()
+   {
+      delete _pathRasterer;
+      delete _smoothLine;
+      _pathRasterer = nullptr;
+      _smoothLine   = nullptr;
+   } /* DrawableSmoothPath::~DrawableSmoothPath */
+
+
+   void DrawableSmoothPath::setPath( const QVector<RubberbandDrawable::RubberbandCoordinate> & vertexVector )
+   {
+     _pathCoordinates = vertexVector;
+      updateGraphic();
+   } /* DrawableSmoothPath::setPath */
+
+
+   void  DrawableSmoothPath::updateGraphic()
+   {
+      if (_pathCoordinates.size() > 2)
+      {
+         makeLineStyle( _dottedPath, _lineStyle );
+
+         _painterPathItem -> setPen( _lineStyle );
+         _painterPathItem -> setVisible( _isVisible );
+
+         if (_closedLine)
+         {
+         const QColor &fillColor = transparentFillColor();
+            _painterPathItem -> setBrush( (fillColor.alpha() > 0) ? QBrush(fillColor) : QBrush() );
+         }
+         else _painterPathItem -> setBrush( QBrush() );
+
+         QVector<QPointF>  vertexVector;
+         vertexVector.reserve( _pathCoordinates.size() );
+
+         for (auto vertex : qAsConst(_pathCoordinates))
+         {
+            vertex.mapToScene(_mapView);
+            vertexVector.append( vertex._sceneCoordinate );
+         }
+
+         _smoothLine   -> vertexVector( vertexVector, _closedLine );
+         _pathRasterer -> epsilon( 2 );
+         _pathRasterer -> maxVertexCount( 1000 );
+         _pathRasterer -> rasterize(  _smoothLine->minimumCurveParameter(), _smoothLine->maximumCurveParameter(), vertexVector );
+
+         QPainterPath path;
+
+         if (vertexVector.size() > 1)
+         {
+            QVector<QPointF>::const_iterator vit = vertexVector.constBegin();
+
+            path.moveTo( *vit );
+            for (++vit; vit != vertexVector.end(); ++vit)
+            {
+               path.lineTo( *vit );
+            }
+            if (_closedLine)  path.lineTo( QPointF(path.elementAt(0)) );
+         }
+         _painterPathItem->setPath(path);
+      }
+      else _painterPathItem ->setVisible(false);
+
+   } /* DrawableSmoothPath::updateGraphic */
+
+
+   void DrawableSmoothPath::adjustCoordinates()            { updateGraphic(); }
+   void DrawableSmoothPath::adjustWindow( const QRectF& )  { updateGraphic(); }
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.h
new file mode 100755
index 000000000..24c9c64a6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/drawable_smooth_path.h
@@ -0,0 +1,77 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of line drawable
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "drawable_painter_path.h"
+
+
+namespace SituationMap {
+
+
+   namespace MathUtils
+   {
+      class SmoothLine;
+      class PathRasterer;
+   }
+
+
+   namespace RB
+   {
+
+
+      class DrawableSmoothPath : public DrawablePainterPath
+      {
+         Q_OBJECT
+         public:
+
+            explicit DrawableSmoothPath( Esri::ArcGISRuntime::MapGraphicsView * );
+            explicit DrawableSmoothPath( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+            ~DrawableSmoothPath();
+
+            DrawableSmoothPath(const DrawableSmoothPath &) = delete;
+            DrawableSmoothPath & operator = (const DrawableSmoothPath &) = delete;
+
+            void setPath( const QVector<RubberbandDrawable::RubberbandCoordinate> & vertexVector );
+
+         protected:
+
+
+            SituationMap::MathUtils::SmoothLine               * _smoothLine;
+            SituationMap::MathUtils::PathRasterer             * _pathRasterer;
+
+            void updateGraphic() override;
+
+            void adjustCoordinates() override;
+            void adjustWindow( const QRectF& ) override;
+
+      }; /* DrawableSmoothPath */
+
+   } /* namespace RB */
+} /* namespace SituationMap */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.cpp
new file mode 100755
index 000000000..974e722a3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.cpp
@@ -0,0 +1,72 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to delegate mouse and keyboard event to another event dispatcher
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   15.04.2015, JT  : First edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "event_delegater.h"
+
+namespace SituationMap { namespace RB
+{
+
+   EventDelegater::EventDelegater(QWidget * getEventsFrom, AbstractEventDispatcher * delegateEventTo) 
+      : AbstractEventDispatcher(getEventsFrom), _delegateEventTo(delegateEventTo)
+   {
+      connect( delegateEventTo, &AbstractEventDispatcher::signalKickTheBucket,
+               this           , &AbstractEventDispatcher::onDo_kickTheBucket    );
+
+      connect( this           , &AbstractEventDispatcher::signalKickTheBucket,
+               delegateEventTo, &AbstractEventDispatcher::onDo_kickTheBucket    );
+
+     _restoreMouseTracking = delegateEventTo->_restoreMouseTracking;
+     _whatsThisBackup      = delegateEventTo->_whatsThisBackup;
+
+   } /* EventDispatcher::EventDispatcher */ 
+
+
+   bool EventDelegater::eventFilter(QObject * watched, QEvent * e)
+   {
+      if (hasFinished())    return true; // don't accept new events if  dispatcher is going to finish
+      if (hasActiveEvent()) return true; // don't accept new events before last event has been handled completly
+
+      if (_delegateEventTo != nullptr)
+      {
+         return _delegateEventTo->eventFilter( watched, e );
+      }
+      return false;
+   } /* EventDispatcher::eventFilter */
+
+
+   void EventDelegater::KickTheBucket()
+   {
+      if (_delegateEventTo != nullptr)
+      {
+         _delegateEventTo->unlinkEventDispatcher();
+      }
+      AbstractEventDispatcher::KickTheBucket();
+   } /* EventDelegater::KickTheBucket */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.h
new file mode 100755
index 000000000..595372fd7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_delegater.h
@@ -0,0 +1,72 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to delegate mouse and keyboard event to another event dispatcher
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   15.04.2015, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointer>
+
+#include "abstract_event_dispatcher.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class EventDelegater event_delegater.h
+     @brief Event filter that delegates events to another event filter
+
+     Some Qt-Widgets have a special viewport widget. In this case keyboard and mouse events
+     are sended to different widgets. To concentrate the event handling in one event filter
+     for both types of events, it is necessary to forward events from event filter to another
+     one.
+
+     @see AbstractEventDispatcher, EventDispatcher, EventMouseNavigator
+   */
+   class EventDelegater final : public AbstractEventDispatcher
+   {
+      Q_OBJECT
+      public:
+
+         EventDelegater( QWidget * getEventsFrom, AbstractEventDispatcher * delegateEventTo );
+
+         ~EventDelegater() = default;
+
+         EventDelegater(const EventDelegater &) = delete;
+         EventDelegater & operator = (const EventDelegater &) = delete;
+
+      protected:
+
+         QPointer<AbstractEventDispatcher> _delegateEventTo;
+
+         bool eventFilter(QObject*, QEvent*) override;
+
+         void KickTheBucket() override;
+   }; /* EventDelegater */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.cpp
new file mode 100755
index 000000000..26f56aa3a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.cpp
@@ -0,0 +1,626 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to handle mouse and keyboard event
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   28.04.2003, JT  : First edition for use with Qt4 in START Feature Editor fee
+**   25.03.2015, JT  : Refactoring for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "event_dispatcher.h"
+
+#include "gestures.h"
+
+#include <QtGui/QKeyEvent>
+
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
+
+#include <QtWidgets/QGesture>
+#include <QtWidgets/QWidget>
+#include <QMetaMethod>
+
+namespace SituationMap { namespace RB
+{
+
+EventDispatcher::EventDispatcher(QWidget * getEventsFrom)
+  : AbstractEventDispatcher(getEventsFrom)
+  , _snapEnabled(false)
+  , _snapRatio(5)
+  , _drawRatio(false)
+  , _doubleClickHandled(false)
+  , _leftPressHandled(false)
+{
+} /* EventDispatcher::EventDispatcher */
+
+
+EventDispatcher::EventDispatcher(QWidget * getEventsFrom, EventActionInterface * eventActions )
+  : AbstractEventDispatcher(getEventsFrom, eventActions)
+  , _snapEnabled(false)
+  , _snapRatio(5)
+  , _drawRatio(false)
+  , _doubleClickHandled(false)
+  , _leftPressHandled(false)
+{
+} /* EventDispatcher::EventDispatcher */
+
+
+bool EventDispatcher::eventFilterKey( int key, Qt::KeyboardModifiers mod )
+{
+  QPoint moveDelta;
+  int    multiply  ( (mod.testFlag(Qt::KeyboardModifier::ShiftModifier)) ? 10 : 1);
+  bool   controlKey( (mod.testFlag(Qt::KeyboardModifier::ControlModifier)) );
+
+  switch (key)
+  {
+  case Qt::Key_Delete : return onDoDelete();                 break;
+  case Qt::Key_Z      : if (controlKey) return onDoUndo();   break;
+  case Qt::Key_Escape : return onDoEscape();                 break;
+  case Qt::Key_Return : return onDoEnd();                    break;
+  case Qt::Key_Left   : moveDelta = QPoint(-1, 0)*multiply;  break;
+  case Qt::Key_Right  : moveDelta = QPoint( 1, 0)*multiply;  break;
+  case Qt::Key_Up     : moveDelta = QPoint( 0,-1)*multiply;  break;
+  case Qt::Key_Down   : moveDelta = QPoint( 0, 1)*multiply;  break;
+  default             : return false;
+  } /* switch */
+
+  if (_getEventsFrom != nullptr)
+  {
+    QPoint cursorPos = _getEventsFrom->mapFromGlobal( QCursor::pos() );
+    onPress( cursorPos.x(), cursorPos.y(), mod );
+    cursorPos += moveDelta;
+    onMove ( cursorPos.x(), cursorPos.y(), Qt::MouseButton::LeftButton, mod );
+    onClick( cursorPos.x(), cursorPos.y(), mod );
+
+    QCursor::setPos( _getEventsFrom->mapToGlobal(cursorPos) );
+  }
+  return true;
+} /* EventDispatcher::eventFilterKey */
+
+
+bool EventDispatcher::eventFilterGesture( QGestureEvent * gestureEvent )
+{
+  bool handled = false;
+
+  if (gestureEvent)
+  {
+    const QList<QGesture*> & gestureList = gestureEvent->gestures();
+    for (auto gesture : gestureList)
+    {
+      Qt::GestureType  gestureType  = gesture->gestureType();
+      Qt::GestureState gestureState = gesture->state();
+
+      QTapGesture        * tapGesture        = nullptr;
+      QTapAndHoldGesture * tapAndHoldGesture = nullptr;
+      QPanGesture        * panGesture        = nullptr;
+      QPinchGesture      * pinchGesture      = nullptr;
+      QSwipeGesture      * swipeGesture      = nullptr;
+      ApplyGesture       * applyGesture      = nullptr;
+      QString              typeName;
+      QString              stateName;
+
+      switch (gestureType)
+      {
+      case Qt::TapGesture        : tapGesture        = static_cast<QTapGesture       *>(gesture); typeName = QLatin1String("TapGesture");        break;
+      case Qt::TapAndHoldGesture : tapAndHoldGesture = static_cast<QTapAndHoldGesture*>(gesture); typeName = QLatin1String("TapAndHoldGesture"); break;
+      case Qt::PanGesture        : panGesture        = static_cast<QPanGesture       *>(gesture); typeName = QLatin1String("PanGesture");        break;
+      case Qt::PinchGesture      : pinchGesture      = static_cast<QPinchGesture     *>(gesture); typeName = QLatin1String("PinchGesture");      break;
+      case Qt::SwipeGesture      : swipeGesture      = static_cast<QSwipeGesture     *>(gesture); typeName = QLatin1String("SwipeGesture");      break;
+      default:
+      {
+        if (gestureType == _applyGestureID)
+        {
+          applyGesture = static_cast<ApplyGesture*>(gesture);
+          typeName = QLatin1String("ApplyGesture");
+        }
+      } break;
+      }
+      switch (gestureState)
+      {
+      case Qt::NoGesture       : stateName = QLatin1String("NoGesture");       break;
+      case Qt::GestureStarted  : stateName = QLatin1String("GestureStarted");  break;
+      case Qt::GestureUpdated  : stateName = QLatin1String("GestureUpdated");  break;
+      case Qt::GestureFinished : stateName = QLatin1String("GestureFinished"); break;
+      case Qt::GestureCanceled : stateName = QLatin1String("GestureCanceled"); break;
+      }
+
+      DEBUG_LOG(_logger) << LOGFUNCTION << " Gesture type=" << typeName << " Gesture state=" << stateName;
+
+      if (panGesture)
+      {
+        const QPoint & offset  = panGesture->offset().toPoint();
+        const QPoint & hotSpot = _getEventsFrom->mapFromGlobal( panGesture->hotSpot().toPoint() );
+
+        switch (gestureState)
+        {
+        case Qt::GestureStarted:
+        {
+          handled = onPress( hotSpot.x(), hotSpot.y(), Qt::NoModifier );
+          if (handled) gestureEvent -> accept( panGesture );
+        } break;
+
+        case Qt::GestureUpdated:
+          handled = onMove ( hotSpot.x() + offset.x(), hotSpot.y() + offset.y(), Qt::MouseButton::LeftButton, Qt::NoModifier );
+          break;
+        case Qt::GestureFinished:
+          //                  handled = onMove ( hotSpot.x() + offset.x(), hotSpot.y() + offset.y(), Qt::MouseButton::LeftButton, 0 );
+          handled = onClick( hotSpot.x() + offset.x(), hotSpot.y() + offset.y(), Qt::NoModifier );
+          break;
+        case Qt::GestureCanceled:
+          getEventActions()->resetAction( this, 0, 0 );
+          break;
+        default:
+          break;
+        }
+
+      }
+
+      if (applyGesture)
+      {
+        switch (gestureState)
+        {
+        case Qt::GestureStarted  : gestureEvent -> accept( applyGesture ); break;
+        case Qt::GestureFinished :
+        {
+          getEventActions()->resetAction( this, qRound(applyGesture->position().x()), qRound(applyGesture->position().y()) );
+          handled = onDoubleClick( qRound(applyGesture->position().x()), qRound(applyGesture->position().y()), Qt::NoModifier );
+          if (handled)
+          {
+            gestureEvent -> accept( applyGesture );
+            return true;
+          }
+        } break;
+        default : break;
+        }
+      }
+
+      // currently not used
+      Q_UNUSED(handled);
+      Q_UNUSED(tapGesture);
+      Q_UNUSED(tapAndHoldGesture);
+      Q_UNUSED(pinchGesture);
+      Q_UNUSED(swipeGesture);
+    }
+  }
+  return handled;
+} /* EventDispatcher::eventFilerGesture */
+
+
+bool EventDispatcher::eventFilterWheel( QWheelEvent * e )
+{
+  const int WHEEL_DELTA = 120;  // natural mouse driver constant
+
+  if (e->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier) &&
+      e->buttons().testFlag(Qt::MiddleButton))
+  {
+    int newValue = (int)_snapRatio + (e->angleDelta() / WHEEL_DELTA).manhattanLength();
+    _snapRatio = (newValue < 5) ? 5 : newValue;
+    return onMove( qRound(e->position().x()), qRound(e->position().y()), e->buttons(), e->modifiers() );
+  }
+  return false;
+} /* EventDispatcher::eventFilterWheel */
+
+
+bool EventDispatcher::eventFilter( QObject * watched, QEvent * e )
+{
+  // Maybe ???
+  //     qCritical() << " _getEventsFrom = " << _getEventsFrom
+  //                 << " watched = " << watched
+  //                 << " e->type() = " << e->type();
+  //     if (watched != _getEventsFrom)
+  //       return AbstractEventDispatcher::eventFilter(watched,e);
+
+
+  Q_UNUSED(watched);
+
+  QString debugString(QLatin1String("unhandled event"));
+
+  if (hasFinished())    return true; // don't accept new events if  dispatcher is going to finish
+  if (hasActiveEvent()) return true; // don't accept new events before last event has been handled completly
+
+  if (e)
+  {
+    bool handled( false );
+
+    setActiveEvent( true );
+
+    switch( e->type() )
+    {
+    case QEvent::Enter :
+    {
+      debugString = QLatin1String("enter event");
+      _getEventsFrom -> setFocus();
+      _doubleClickHandled = false;
+      _leftPressHandled   = false;
+    } break;
+
+    case QEvent::Leave                   : _doubleClickHandled = _leftPressHandled = false; break;
+
+    case QEvent::GraphicsSceneMousePress : break;
+    case QEvent::MouseButtonPress        :
+    {
+      debugString = QLatin1String("mouse button press event");
+
+      _doubleClickHandled = false;
+
+      QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
+      if (Qt::RightButton == mouseEvent->button())
+      {
+        handled = onMenuPress( mouseEvent->x()
+                               , mouseEvent->y()
+                               , mouseEvent->modifiers() );
+      }
+      if (Qt::LeftButton == mouseEvent->button())
+      {
+        if (!(mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier)))
+        {
+          handled = onPress( mouseEvent->x()
+                             , mouseEvent->y()
+                             , mouseEvent->modifiers() );
+          if (handled) _leftPressHandled = true;
+        }
+      }
+      if (Qt::MiddleButton == mouseEvent->button())
+      {
+        handled = mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier);
+      }
+    } break;
+
+    case QEvent::TouchBegin:
+    {
+      debugString = QLatin1String("mouse button press event TOUCH");
+
+      _doubleClickHandled = false;
+
+      QTouchEvent *mouseEvent = static_cast<QTouchEvent*>(e);
+
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+
+        handled = onPress( tp.pos().x()
+                           , tp.pos().y()
+                           , mouseEvent->modifiers() );
+        if (handled) _leftPressHandled = true;
+      }
+      break;
+    }
+
+
+    case QEvent::GraphicsSceneMouseDoubleClick : break;
+    case QEvent::MouseButtonDblClick           :
+    {
+      debugString = QLatin1String("mouse double click event");
+      QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
+      if (Qt::LeftButton == mouseEvent->button())
+      {
+        if (!(mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier)))
+        {
+          onDoubleClick( mouseEvent->x()
+                         , mouseEvent->y()
+                         , mouseEvent->modifiers() );
+
+          _doubleClickHandled = handled = true;
+        }
+      }
+    } break;
+
+    case QEvent::GraphicsSceneMouseRelease  : break;
+    case QEvent::MouseButtonRelease         :
+    {
+      if (!_doubleClickHandled)
+      {
+        debugString = QLatin1String("mouse button release event");
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
+        if (Qt::RightButton == mouseEvent->button())
+        {
+          handled = onMenuClick( mouseEvent->x()
+                                 , mouseEvent->y()
+                                 , mouseEvent->modifiers() );
+        }
+        if (Qt::LeftButton == mouseEvent->button())
+        {
+          if (!(mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier)))
+          {
+            // The mouse button press event must had be handled before. If not skip button release ...
+            if (_leftPressHandled)
+            {
+              _leftPressHandled = false;
+              handled = onClick( mouseEvent->x()
+                                 , mouseEvent->y()
+                                 , mouseEvent->modifiers() );
+            }
+            else callEventAction( &EventActionInterface::buttonPositionAction, mouseEvent->x(), mouseEvent->y() );
+          }
+        }
+        if (Qt::MiddleButton == mouseEvent->button())
+        {
+          handled = mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier);
+        }
+      }
+      else  _doubleClickHandled = false;
+
+    } break;
+
+    case QEvent::TouchEnd:
+    {
+
+      debugString = QLatin1String("mouse button release event TOUCH");
+      QTouchEvent *mouseEvent = static_cast<QTouchEvent*>(e);
+
+      // The mouse button press event must had be handled before. If not skip button release ...
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+        if (_leftPressHandled)
+        {
+          _leftPressHandled = false;
+          handled = onClick( tp.pos().x()
+                             , tp.pos().y()
+                             , mouseEvent->modifiers() );
+
+        }
+        else
+        {
+          callEventAction( &EventActionInterface::buttonPositionAction, tp.pos().x(), tp.pos().y() );
+        }
+      }
+
+      break;
+    }
+
+    case QEvent::GraphicsSceneMouseMove : break;
+    case QEvent::MouseMove              :
+    {
+      debugString = QLatin1String("mouse move event");
+
+      _doubleClickHandled = false;
+
+      QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
+
+      if (mouseEvent->buttons() != Qt::MiddleButton)
+      {
+        if (!(mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier)))
+        {
+          if (_drawRatio)
+          {
+            if (!(mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::AltModifier)))
+            {
+              _drawRatio = false;
+            }
+          }
+          else
+          {
+            if (mouseEvent->modifiers().testFlag(Qt::KeyboardModifier::AltModifier))
+            {
+              _drawRatio = true;
+            }
+          }
+
+          handled = onMove( mouseEvent->x()
+                            , mouseEvent->y()
+                            , mouseEvent->buttons()
+                            , mouseEvent->modifiers());
+
+          // REGG-5230 - PlanEditor: Position beim Erstellen und Modifizieren
+          // von Elementen wird nicht aktualisiert
+          // Next handler is EventMouseNavigator. ::eventFilter() will handle
+          // QEvent::MouseMove and emit mouseMovedEvent to update PositionStr.
+          // If handled == true, the next handler is NOT called.
+          // So emit here alternatively.
+          if (handled)
+            emit mouseMovedEvent(mouseEvent->pos().x(), mouseEvent->pos().y());
+        }
+      }
+    } break;
+
+    case QEvent::TouchUpdate:
+    {
+      debugString = QLatin1String("mouse move event Touch");
+
+      _doubleClickHandled = false;
+
+      QTouchEvent* mouseEvent = static_cast<QTouchEvent*>(e);
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+
+        handled = onMove( tp.pos().x()
+                          , tp.pos().y()
+                          , Qt::LeftButton
+                          , mouseEvent->modifiers());
+      }
+      break;
+    }
+
+
+    case QEvent::KeyPress :
+    {
+      QKeyEvent *keyEvent = static_cast<QKeyEvent*>(e);
+
+      debugString = QStringLiteral("key press event (%1)").arg(keyEvent->key());
+
+      handled = eventFilterKey( keyEvent->key(),keyEvent->modifiers() );
+      if ((keyEvent->modifiers().testFlag(Qt::KeyboardModifier::ControlModifier)) || (keyEvent->key() == Qt::Key_Control))
+      {
+        setSnapEnabled( true );
+        _drawRatio = true;
+        handled    = true;
+      }
+    } break;
+
+    case QEvent::KeyRelease :
+    {
+      debugString = QLatin1String("key release event");
+      if (_drawRatio)
+      {
+        _drawRatio = false;
+        setSnapEnabled( true );
+      }
+      // handled = true;
+    } break;
+
+
+    case QEvent::Wheel :
+    {
+      debugString = QLatin1String("mouse wheel event");
+      QWheelEvent *wheelEvent = static_cast<QWheelEvent*>(e);
+      if (wheelEvent->modifiers() & (Qt::KeyboardModifier::ShiftModifier | Qt::KeyboardModifier::ControlModifier))
+      {
+        handled = eventFilterWheel( wheelEvent );
+      }
+    } break;
+
+    case QEvent::Gesture:
+    {
+      handled = eventFilterGesture( static_cast<QGestureEvent*>(e) );
+    } break;
+
+    default: break;
+
+    } /* switch */
+
+    if (!hasFinished()) setActiveEvent( false );
+
+    if (handled) e->accept();
+
+    TRACE_LOG(_logger) << LOGFUNCTION <<  " Event " << debugString << " handled = " << handled;
+
+    if (handled) return true;
+  }
+  return AbstractEventDispatcher::eventFilter(watched,e);
+} /* EventDispatcher::eventFilter */
+
+
+bool EventDispatcher::onMove(int x, int y, Qt::MouseButtons buttons, Qt::KeyboardModifiers mod)
+{
+  Q_UNUSED(mod);
+  if (buttons.testFlag(Qt::MouseButton::LeftButton)) return callEventAction( &EventActionInterface::movePickedAction, x, y );
+  return callEventAction( &EventActionInterface::moveAction, x, y );
+} /* EventDispatcher::onMove */
+
+
+bool EventDispatcher::onPress(int x, int y, Qt::KeyboardModifiers mod)
+{
+  if (mod == Qt::NoModifier)
+    return callEventAction( &EventActionInterface::selectAction, x, y );
+  if (mod.testFlag(Qt::KeyboardModifier::ShiftModifier))
+    return callEventAction( &EventActionInterface::multiSelectActionPress, x, y );
+  return false;
+} /* EventDispatcher::onPress */
+
+
+bool EventDispatcher::onClick(int x, int y, Qt::KeyboardModifiers mod)
+{
+  Q_UNUSED(x);
+  Q_UNUSED(y);
+
+  if (mod == Qt::NoModifier)
+  {
+    bool ret = callEventAction( &EventActionInterface::setCoordinateAction, x, y );
+    if (ret)
+    {
+      EventActionInterface * eaIf = getEventActions();
+      if (eaIf) eaIf->userActionFinished();
+    }
+    return ret;
+  }
+  if (mod.testFlag( Qt::KeyboardModifier::ShiftModifier ))
+    return callEventAction( &EventActionInterface::multiSelectActionRelease, x, y );
+
+  return false;
+} /* EventDispatcher::onClick */
+
+
+bool EventDispatcher::onMenuPress(int x, int y, Qt::KeyboardModifiers mod)
+{
+  Q_UNUSED(x);
+  Q_UNUSED(y);
+  Q_UNUSED(mod);
+
+  return false;
+} /* EventDispatcher::onMenuPress */
+
+
+bool EventDispatcher::onMenuClick(int x, int y, Qt::KeyboardModifiers mod)
+{
+  Q_UNUSED(mod);
+  return callEventAction( &EventActionInterface::contextMenuAction, x, y );
+} /* EventDispatcher::onMenuClick */
+
+
+bool EventDispatcher::onDoubleClick(int x, int y, Qt::KeyboardModifiers )
+{
+  callEventAction( &EventActionInterface::completeStateAction, x, y );
+  return true;
+} /* EventDispatcher::onDoubleClick */
+
+
+bool EventDispatcher::onDoDelete()
+{
+  if (_getEventsFrom != nullptr)
+  {
+    QPoint cursorPos = _getEventsFrom->mapFromGlobal( QCursor::pos() );
+    callEventAction( &EventActionInterface::selectAction, cursorPos.x(), cursorPos.y() );
+    bool ret = callEventAction( &EventActionInterface::deleteAction, cursorPos.x(), cursorPos.y() );
+    if (ret)
+    {
+      EventActionInterface * eaIf = getEventActions();
+      if (eaIf) eaIf->userActionFinished();
+    }
+    return ret;
+  }
+  return false;
+} /* EventDispatcher::onDoDelete */
+
+
+bool EventDispatcher::onDoUndo()
+{
+  bool ret = callEventAction( &EventActionInterface::undoAction, 0, 0 );
+  if (ret)
+  {
+    EventActionInterface * eaIf = getEventActions();
+    if (eaIf) eaIf->userActionFinished();
+  }
+  return ret;
+} /* EventDispatcher::onDoUndo */
+
+
+bool EventDispatcher::onDoEscape()
+{
+  EventActionInterface * eventActions = getEventActions();
+  KickTheBucket();
+  if (eventActions) eventActions->abortAction( this, 0, 0 );
+  return true;
+} /* EventDispatcher::onDoEscape */
+
+bool EventDispatcher::onDoEnd()
+{
+  EventActionInterface * eventActions = getEventActions();
+  KickTheBucket();
+  if (eventActions) eventActions->applyAndEndAction( this, 0, 0 );
+  return true;
+} /* EventDispatcher::onDoEnd */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.h
new file mode 100755
index 000000000..004b9e840
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_dispatcher.h
@@ -0,0 +1,140 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to handle mouse and keyboard event
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   28.04.2003, JT  : First edition for use with Qt4 in START Feature Editor fee
+**   25.03.2015, JT  : Refactoring for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "abstract_event_dispatcher.h"
+
+class QGestureEvent;
+class QWheelEvent;
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class EventDispatcher event_dispatcher.h
+     @brief Event filter that handles events when a rubberband it active.
+
+     Implements class \c AbstractEventDispatcher to manage event handling for rubberbands. Following events are handled:
+
+     | Input-Event                                    | Interface Function  | Description                                                                                              |
+     | :--------------------------------------------- | : ----------------- | : ------------------------------------------------------------------------------------------------------ |
+     | Mouse move without any modifier                | moveAction          | Move Cursor or preview                                                                                   |
+     | Mouse move with pressed left button            | movePickedAction    | Move selected items. If movePickedAction == false redirect to \c EventMouseNavigator for panning of map. |
+     | Mouse move with pressed middle button          |                     | Redirect to \c EventMouseNavigator for panning of map                                                    |
+     | Mouse wheel                                    |                     | Redirect to \c EventMouseNavigator for zooming of map                                                    |
+     | Left mouse button press                        | selectAction        | Do selection of single item or panning of map.                                                           |
+     | Left mouse button press with pressed SHIFT key | multiSelectAction   | Do selection of multiple items.                                                                          |
+     | Left mouse button release                      | setCoordinateAction | Set final coordinate to selected items and deselects item.                                               |
+     | Double click left mouse button                 | completeStateAction | Finish input.                                                                                            |
+     | Right mouse button release                     | contextMenuAction   | Show context menu.                                                                                       |
+     | Key release CTRL-Z                             | undoMenuAction      | Undo last left mouse button click if possible.                                                           |
+     | Key release Delete                             | deleteMenuAction    | Delete selected item.                                                                                    |
+     | Key release ESC                                | abortAction         | Abort rubberband without saving data. The rubberband emits the abort signal.                             |
+     | Key release RETURN                             | applyAndEndAction   | Finish rubberband. The rubberband emits the apply signal.                                                |
+     | Key release UP                                 | moveAction          | Moves 1 pixel up.                                                                                        |
+     | Key release DOWN                               | moveAction          | Moves 1 pixel down.                                                                                      |
+     | Key release LEFT                               | moveAction          | Moves 1 pixel left.                                                                                      |
+     | Key release RIGHT                              | moveAction          | Moves 1 pixel right.                                                                                     |
+     | Key release UP with SHIFT key pressed          | moveAction          | Moves 10 pixel up.                                                                                       |
+     | Key release DOWN with SHIFT key pressed        | moveAction          | Moves 10 pixel down.                                                                                     |
+     | Key release LEFT with SHIFT key pressed        | moveAction          | Moves 10 pixel left.                                                                                     |
+     | Key release RIGHT with SHIFT key pressed       | moveAction          | Moves 10 pixel right.                                                                                    |
+    
+    @see AbstractEventDispatcher, EventDelegater, EventMouseNavigator, 
+          Rubberband, RubberbandPointFeature, RubberbandPointCluster,
+          RubberbandMultiPointFeature, RubberbandCorridor, RubberbandRectangle, RubberbandEllipse,
+          EventMouseNavigator
+   */
+
+   class EventDispatcher final : public AbstractEventDispatcher
+   {
+      friend class RubberbandBase;
+
+      Q_OBJECT
+      public:
+
+        /**
+            @name Construction & Destruction
+            @{
+         */
+         explicit EventDispatcher( QWidget * getEventsFrom );
+         explicit EventDispatcher( QWidget * getEventsFrom, EventActionInterface* );
+
+         ~EventDispatcher() = default;
+
+         EventDispatcher(const EventDispatcher &) = delete;
+         EventDispatcher & operator = (const EventDispatcher &) = delete;
+         /** @} */
+
+         inline void  setSnapEnabled(bool)     {}
+         inline bool  SnapEnabled()            { return _snapEnabled; }
+
+      signals:
+         /**
+           Signal will be emitted if a mouse move is done (and if event is handled)
+         */
+         void mouseMovedEvent(int windowPosX, int windowPosY);
+
+
+      protected:
+
+         bool eventFilter(QObject*, QEvent*) override;
+
+         bool eventFilterKey( int key,  Qt::KeyboardModifiers mod );
+         bool eventFilterGesture( QGestureEvent * gestureEvent );
+         bool eventFilterWheel( QWheelEvent * );
+
+      private:
+
+         bool onMove (int x, int y, Qt::MouseButtons buttons, Qt::KeyboardModifiers mod); //!< Handle a mouse move event.
+
+         bool onPress      ( int x, int y,  Qt::KeyboardModifiers mod); //!< Handle left mouse button press event.
+         bool onClick      ( int x, int y,  Qt::KeyboardModifiers mod); //!< Handle left mouse button release event.    
+         bool onMenuPress  ( int x, int y,  Qt::KeyboardModifiers mod); //!< Handle right mouse button press event. 
+         bool onMenuClick  ( int x, int y,  Qt::KeyboardModifiers mod); //!< Handle right mouse button release event.
+         bool onDoubleClick( int x, int y,  Qt::KeyboardModifiers mod); //!< Handle left mouse button double click event.
+
+         bool onDoDelete();  //!< Handle del key press event.
+
+         bool onDoUndo();    //!< Handle ctrl-c key press event.
+         bool onDoEscape();  //!< Handle esc key press event.
+         bool onDoEnd();     //!< Handle enter key press event.
+
+         bool     _snapEnabled;
+         uint     _snapRatio;
+         bool     _drawRatio;
+         bool     _doubleClickHandled;
+         bool     _leftPressHandled;
+
+   }; /* EventDispatcher */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.cpp
new file mode 100755
index 000000000..837de4a18
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.cpp
@@ -0,0 +1,639 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to delegate mouse and keyboard event to another event dispatcher
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   15.04.2015, JT  : First edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "event_mouse_navigator.h"
+#include "rubberband.h"
+
+#include <QtCore/QMetaMethod>
+#include <QtCore/QtMath>
+
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
+
+#include <QtWidgets/QGesture>
+#include <QtWidgets/QWidget>
+
+#include <MapImpl/map_impl.h>
+#include <Map/situation_map_utils.h>
+
+#include <Map.h>
+#include <Layer.h>
+#include <FeatureLayer.h>
+#include <GraphicsOverlay.h>
+#include <Graphic.h>
+#include <MapGraphicsView.h>
+#include <SceneGraphicsView.h>
+#include <Point.h>
+#include <Viewpoint.h>
+#include <IdentifyGraphicsOverlayResult.h>
+#include <AttributeListModel.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+int   EventMouseNavigator::_pickTolerance  = 5;
+qreal EventMouseNavigator::_zoomFactorBase = 1.002;
+
+EventMouseNavigator::EventMouseNavigator(QWidget * getEventsFrom, SituationMap::MapImpl *sitMap )
+  : AbstractEventDispatcher(getEventsFrom)
+  , _sitMap(sitMap)
+  , _cursorChanged(false)
+  , _viewPortPos(QPointF(-1, -1))
+  , _selectionMode(SelectionMode::NoSelection)
+  , _pendingRequest(RequestType::None)
+  , _mousePanningActive(false)
+  , _mousePanningActiveForCenterMapMidButton(false)
+  #ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+  , _mouseZoomTaskWatcher()
+  #endif
+  , _pressedMouseButton(Qt::NoButton)
+{
+  // 300: identifyGraphicsOverlaysCompleted signals are gone; picking results arrive via a
+  // QFutureWatcher on identifyGraphicsOverlaysAsync(), set up in requestPicking().
+} // EventMouseNavigator::EventMouseNavigator
+
+
+bool EventMouseNavigator::eventFilter(QObject * watched, QEvent * e)
+{
+  Q_UNUSED(watched);
+
+  QString debugString(QLatin1String("unhandled event"));
+
+  if (hasFinished())    return true; // don't accept new events if  dispatcher is going to finish
+  if (hasActiveEvent()) return true; // don't accept new events before last event has been handled completly
+
+  if (e)
+  {
+    bool handled( false );
+
+    setActiveEvent( true );
+
+    switch( e->type() )
+    {
+    case QEvent::Enter :
+    {
+      _pressedMouseButton = Qt::NoButton;
+      emit enterEvent();
+    } break;
+
+    case QEvent::Leave :
+    {
+      emit leaveEvent();
+      _pressedMouseButton = Qt::NoButton;
+    } break;
+
+    case QEvent::MouseButtonPress :
+    {
+      handled = false;
+      debugString = QLatin1String("mouse button press event");
+
+      QMouseEvent * mouseEvent = static_cast<QMouseEvent*>(e);
+
+      _pressedMouseButton = mouseEvent->button();
+
+      _mousePanningActive = false;
+      _mouseMoveRefPos    = mouseEvent->pos();                         // for panning
+
+      _restoreMouseCursor = getCursorFromWidget();
+
+      if (Qt::MiddleButton == mouseEvent->button())
+      {
+        handled = true;
+
+        _mousePanningActive = true;
+        _mousePanningActiveForCenterMapMidButton = false;
+        //                  setCursorToWidget( QCursor(Qt::CursorShape::ClosedHandCursor) );
+      }
+    } break;
+    case QEvent::TouchBegin :
+    {
+      handled = false;
+      debugString = QLatin1String("Touch button press event");
+
+      QTouchEvent * mouseEvent = static_cast<QTouchEvent*>(e);
+
+      _pressedMouseButton = Qt::MouseButton::LeftButton;
+
+      _mousePanningActive = false;
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+
+        _mouseMoveRefPos    = tp.pos().toPoint();                         // for panning
+        _restoreMouseCursor = getCursorFromWidget();
+      }
+    } break;
+
+    case QEvent::MouseButtonRelease :
+    {
+      debugString = QLatin1String("mouse button release event");
+
+      QMouseEvent * mouseEvent = static_cast<QMouseEvent*>(e);
+
+
+      if (Qt::LeftButton == mouseEvent->button())
+      {
+        if (_cursorChanged)
+        {
+          setCursorToWidget(_restoreMouseCursor);
+          _cursorChanged = false;
+        }
+
+        /*
+                   * The ESRI::MapView is doing panning on mouse move when left mouse button is pressed.
+                   * To prevent selection in this case check mouse move distance.
+                   */
+        if (Qt::LeftButton == _pressedMouseButton && ((mouseEvent->pos() - _mouseMoveRefPos).manhattanLength() < 3) )
+        {
+          if (Rubberband::activeRubberbands(_sitMap).isEmpty())
+          {
+            handled = false; // pass event to esri map to click buttons
+            selectionRequested(mouseEvent->localPos());
+            // do not handled = true; because some buttons in GraphicsView needs to get the event later.
+          }
+        }
+        else
+          handled = true; // may be a double click catched at higher event filter
+      }
+
+      if (Qt::RightButton == mouseEvent->button())
+      {
+        handled = true;
+        pickRequested( mouseEvent->localPos() );
+      }
+
+      if ((Qt::MiddleButton == mouseEvent->button()))
+      {
+        if (!_mousePanningActiveForCenterMapMidButton)
+        {
+          // press MidButton and Release MidButton without panning in the meantime:
+          // center map to current mouse position:
+
+          // set viewpoint : (perform this only in 2D - MapGraphicsView <-> MapSceneView)
+          // (3D had different screenToLocation...)
+          Esri::ArcGISRuntime::MapGraphicsView *esriMapGraphicsView = _sitMap->getEsriMapGraphicsView();
+          if (esriMapGraphicsView)
+          {
+            const QPoint &mousePos    = mouseEvent->pos();
+            const Esri::ArcGISRuntime::Point     & mapCoordEsri = esriMapGraphicsView->screenToLocation(mousePos.x(), mousePos.y());
+            const Esri::ArcGISRuntime::Viewpoint & curVp        = esriMapGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+            const Esri::ArcGISRuntime::Viewpoint   newVp(mapCoordEsri, curVp.targetScale());
+
+            esriMapGraphicsView->setViewpointAndWait(newVp);             // sync / andWAIT
+
+            _getEventsFrom -> update();
+          }
+        }
+      }
+
+      if ((_mousePanningActive) || (Qt::MiddleButton == mouseEvent->button()))
+      {
+        handled = (Qt::MiddleButton == mouseEvent->button());
+        setCursorToWidget( _restoreMouseCursor );
+      }
+      _mousePanningActive = false;
+
+    } break;
+
+    case QEvent::TouchEnd :
+    {
+      debugString = QLatin1String("Touch button release event");
+
+      QTouchEvent * mouseEvent = static_cast<QTouchEvent*>(e);
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+
+        if (_cursorChanged)
+        {
+          setCursorToWidget(_restoreMouseCursor);
+          _cursorChanged = false;
+        }
+
+        /*
+                   * The ESRI::MapView is doing panning on mouse move when left mouse button is pressed.
+                   * To prevent selection in this case check mouse move distance.
+                   */
+        if (Qt::LeftButton == _pressedMouseButton && ((tp.pos() - _mouseMoveRefPos).manhattanLength() < 3) )
+        {
+          if (Rubberband::activeRubberbands(_sitMap).isEmpty())
+          {
+            handled = false; // pass event to esri map to click buttons
+            selectionRequested(tp.pos());
+            // do not handled = true; because some buttons in GraphicsView needs to get the event later.
+          }
+        }
+        else
+          handled = true; // may be a double click catched at higher event filter
+
+      }
+      _mousePanningActive = false;
+
+    } break;
+
+    case QEvent::MouseMove :
+    {
+      handled = false;
+      debugString = QLatin1String("mouse button move event");
+      QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
+
+      if (isSignalConnected(QMetaMethod::fromSignal(&EventMouseNavigator::mouseMovedEvent)))
+      {
+        emit mouseMovedEvent(mouseEvent->pos().x(), mouseEvent->pos().y());
+      }
+
+      if (_mousePanningActive)
+      {
+        handled = true;
+
+        if (mouseEvent->buttons().testFlag(Qt::MiddleButton))
+        {
+          _mousePanningActiveForCenterMapMidButton = true;
+
+          // move viewpoint : (perform this only in 2D - MapGraphicsView <-> MapSceneView)
+          // (3D had different screenToLocation...)
+          Esri::ArcGISRuntime::MapGraphicsView *esriMapGraphicsView = _sitMap->getEsriMapGraphicsView();
+          if (esriMapGraphicsView)
+          {
+            QPointF deltaMove = mouseEvent->pos()-_mouseMoveRefPos;
+            QPointF winCenter = QPointF( qreal(_getEventsFrom->width())*0.5, qreal(_getEventsFrom->height())*0.5 );
+            QPointF newCenter = winCenter-deltaMove;
+
+            _mouseMoveRefPos = mouseEvent->pos();
+
+            const Esri::ArcGISRuntime::Point     & mapCoordEsri = esriMapGraphicsView->screenToLocation(newCenter.x(), newCenter.y());
+            const Esri::ArcGISRuntime::Viewpoint & curVp        = esriMapGraphicsView->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+            const Esri::ArcGISRuntime::Viewpoint   newVp(mapCoordEsri, curVp.targetScale());
+
+            esriMapGraphicsView->setViewpointAndWait(newVp);             // sync / andWAIT
+
+            _getEventsFrom -> update();
+
+            DEBUG_LOG(_logger) << LOGFUNCTION << " Panning to " << mapCoordEsri.x() << " - " << mapCoordEsri.y()
+                               << " newCenter pos=" << newCenter
+                               << " mouse pos="     << mouseEvent->pos()
+                               << " delta pos="     << deltaMove;
+          }
+        }
+        else
+        {
+          setCursorToWidget( _restoreMouseCursor );
+          _mousePanningActive = false;
+        }
+        // : move viewpoint
+      }
+    } break;
+    case QEvent::TouchUpdate :
+    {
+      handled = false;
+      debugString = QLatin1String("touch button move event");
+      QTouchEvent *mouseEvent = static_cast<QTouchEvent*>(e);
+
+      if (mouseEvent->touchPoints().size() > 0)
+      {
+        const QTouchEvent::TouchPoint tp = mouseEvent->touchPoints().at(0);
+
+        if (isSignalConnected(QMetaMethod::fromSignal(&EventMouseNavigator::mouseMovedEvent)))
+        {
+          emit mouseMovedEvent(tp.pos().x(), tp.pos().y());
+        }
+
+        if (_mousePanningActive)
+        {
+          handled = true;
+        }
+        else
+        {
+          setCursorToWidget( _restoreMouseCursor );
+          _mousePanningActive = false;
+        }
+
+      }
+    } break;
+
+#ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+    case QEvent::Wheel :
+    {
+      debugString = QLatin1String("mouse wheel event");
+      handled = true;
+      if ((!_mouseZoomTaskWatcher.isValid()) || (_mouseZoomTaskWatcher.isFinished()))
+      {
+
+        QWheelEvent  * wheelEvent      = static_cast<QWheelEvent*>(e);
+        qreal          delta           = wheelEvent->angleDelta().manhattanLength();
+        bool           zoomIn          = (wheelEvent->angleDelta().x() < 0) || (wheelEvent->angleDelta().y() < 0);
+        qreal          zoomFactor      = qreal( qRound( qPow( _zoomFactorBase, (zoomIn) ? delta : -delta ) * 10 )) / 10.0;
+        QPointF        winCenter       = QPointF( qreal(_getEventsFrom->width())*0.5, qreal(_getEventsFrom->height())*0.5 );
+
+        const QPoint & cursorPosWidget = _getEventsFrom->mapFromGlobal( QCursor::pos() ); // e doesn't have a position get position from cursor here
+
+        Esri::ArcGISRuntime::MapView     * esriMapView  = _sitMap->getEsriMapGraphicsView();
+        const Esri::ArcGISRuntime::Point & mapCenter    = esriMapView -> screenToLocation(winCenter.x(), winCenter.y());
+        const Esri::ArcGISRuntime::Point & cursorPosMap = esriMapView -> screenToLocation(cursorPosWidget.x(), cursorPosWidget.y());
+        double                             mapScale     = esriMapView -> mapScale() * zoomFactor;
+
+        double mapX = (-cursorPosMap.x()+mapCenter.x())*zoomFactor + cursorPosMap.x();
+        double mapY = (-cursorPosMap.y()+mapCenter.y())*zoomFactor + cursorPosMap.y();
+
+        _mouseZoomTaskWatcher = esriMapView->setViewpointCenterAsync( Esri::ArcGISRuntime::Point(mapX,mapY,esriMapView->map()->spatialReference()), mapScale );
+        if (isSignalConnected( QMetaMethod::fromSignal(&EventMouseNavigator::mouseWheelEvent) ))
+        {
+          emit mouseWheelEvent(zoomFactor, QPointF(cursorPosMap.x(), cursorPosMap.y()) );
+        }
+
+      }
+    } break;
+#endif
+
+    case QEvent::Gesture:
+    {
+      QGestureEvent * gestureEvent = static_cast<QGestureEvent*>(e);
+
+      if (gestureEvent)
+      {
+        const QList<QGesture*> & gestureList = gestureEvent->gestures();
+        for (auto gesture : gestureList)
+        {
+          Qt::GestureType  gestureType  = gesture->gestureType();
+          Qt::GestureState gestureState = gesture->state();
+
+          // QTapGesture        * tapGesture        = nullptr;
+          // QTapAndHoldGesture * tapAndHoldGesture = nullptr;
+          QPanGesture        * panGesture        = nullptr;
+          QPinchGesture      * pinchGesture      = nullptr;
+          // QSwipeGesture      * swipeGesture      = nullptr;
+          QString              typeName;
+          QString              stateName;
+
+          switch (gestureType)
+          {
+          // case Qt::TapGesture        : tapGesture        = (QTapGesture       *)gesture; typeName = QLatin1String("TapGesture");        break;
+          // case Qt::TapAndHoldGesture : tapAndHoldGesture = (QTapAndHoldGesture*)gesture; typeName = QLatin1String("TapAndHoldGesture"); break;
+          case Qt::PanGesture        : panGesture        = (QPanGesture       *)gesture; typeName = QLatin1String("PanGesture");        break;
+          case Qt::PinchGesture      : pinchGesture      = (QPinchGesture     *)gesture; typeName = QLatin1String("PinchGesture");      break;
+            // case Qt::SwipeGesture      : swipeGesture      = (QSwipeGesture     *)gesture; typeName = QLatin1String("SwipeGesture");      break;
+
+          default: break;
+          }
+          switch (gestureState)
+          {
+          case Qt::NoGesture       : stateName = QLatin1String("NoGesture");       break;
+          case Qt::GestureStarted  : stateName = QLatin1String("GestureStarted");  break;
+          case Qt::GestureUpdated  : stateName = QLatin1String("GestureUpdated");  break;
+          case Qt::GestureFinished : stateName = QLatin1String("GestureFinished"); break;
+          case Qt::GestureCanceled : stateName = QLatin1String("GestureCanceled"); break;
+          }
+          DEBUG_LOG(_logger) << LOGFUNCTION << " Gesture type=" << typeName << " Gesture state=" << stateName;
+
+          // tapGesture = nullptr;
+          panGesture = nullptr;     // ToDo: check: Why this?
+
+          if (panGesture)
+          {
+            QPointF deltaMove = panGesture->delta();
+            QPoint  winCenter = QPoint( _getEventsFrom->width() / 2, _getEventsFrom->height() / 2 );
+            QPoint  newCenter = winCenter-QPoint((int)deltaMove.x(),(int)deltaMove.y());
+
+            const Esri::ArcGISRuntime::Point mapCoordEsri =
+                _sitMap->getEsriMapGraphicsView()->screenToLocation(newCenter.x(), newCenter.y());
+            Esri::ArcGISRuntime::Viewpoint curVp = _sitMap->getEsriMapGraphicsView()->currentViewpoint(Esri::ArcGISRuntime::ViewpointType::CenterAndScale);
+            Esri::ArcGISRuntime::Viewpoint newVp(mapCoordEsri, curVp.targetScale());
+            _sitMap->getEsriMapGraphicsView()->setViewpointAndWait(newVp);
+
+            _getEventsFrom -> update();
+
+            if (gestureState == Qt::GestureStarted) gestureEvent -> setAccepted(panGesture, true);
+
+          }
+
+          if (pinchGesture)
+          {
+            /////                   QPinchGesture::ChangeFlags   changeFlags = pinchGesture->changeFlags();
+
+
+            /////                        if (changeFlags & QPinchGesture::RotationAngleChanged)
+            /////                        {
+            /////                          qreal deltaPhi = pinchGesture->rotationAngle() - pinchGesture->lastRotationAngle();
+
+            /////                          _esriMap -> setRotation( _esriMap->rotation()-deltaPhi );
+            /////                        }
+            /////                        if (changeFlags & QPinchGesture::ScaleFactorChanged)   _esriMap -> zoom( 1.0/pinchGesture->scaleFactor() );
+
+            _getEventsFrom -> update();
+
+            if (gestureState == Qt::GestureStarted) gestureEvent -> setAccepted(pinchGesture, true);
+          }
+        }
+      }
+    } break;
+
+    default: break;
+
+    } // switch
+
+    if (!hasFinished()) setActiveEvent( false );
+
+    if (handled) e->accept();
+    DEBUG_LOG(_logger) << LOGFUNCTION
+                         <<  " Event '" << debugString << "'"
+                          <<  " event->type() '" << e->type() << "'"
+                          << " handled = " << handled
+                          << " mouse panning is active = " << _mousePanningActive;
+
+    //
+    // 'if (handled) return true;' lead to bad behaviour at 3D: globe is often connected to mouse, without any button pressed...
+    //
+    //  if (handled) return true;
+
+  }
+  return AbstractEventDispatcher::eventFilter(watched,e);
+
+} // EventMouseNavigator::eventFilter
+
+
+bool EventMouseNavigator::checkRunningPickingTask()
+{
+  if ((!_pickingTask.isCanceled()) && (_pendingRequest != RequestType::None))
+  {
+    _pickingTask.cancel();
+    _pendingRequest = RequestType::None;
+    return true;
+  }
+  return false;
+} // void EventMouseNavigator::checkRunningPickingTask()
+
+
+void EventMouseNavigator::selectionRequested( const QPointF & pos )
+{
+  // do the work only in case of slot connections are installed
+  if (! isSignalConnected( QMetaMethod::fromSignal(&EventMouseNavigator::selectionRequest) ))
+  {
+    return;
+  }
+
+  if (checkRunningPickingTask())
+  {
+    qWarning() << LOGFUNCTION << " request is still pending!";
+  }
+
+  _pendingRequest = RequestType::Selection;
+  _viewPortPos    = pos;
+
+  requestPicking(pos);
+
+} // EventMouseNavigator::selectionRequested
+
+
+void EventMouseNavigator::pickRequested( const QPointF &pos )
+{
+  // do the work only in case of slot connections are installed
+  if (! isSignalConnected( QMetaMethod::fromSignal(&EventMouseNavigator::contextMenuRequest) ))
+  {
+    return;
+  }
+
+  if (checkRunningPickingTask())
+  {
+    qWarning() << LOGFUNCTION << " request is still pending!";
+  }
+
+  _pendingRequest = RequestType::Picking;
+  _viewPortPos    = pos;
+
+  requestPicking(pos);
+
+} // EventMouseNavigator::pickRequested
+
+
+void EventMouseNavigator::requestPicking(const QPointF &pos)
+{
+  _pickingTask.cancel(); // cancel old task
+
+  // store new task
+  bool returnPopUpsOnly = false;
+  int maximumResultsPerOverlay = std::numeric_limits<int>::max(); // huge number;
+  _pickingTask = _sitMap->getEsriGeoView()->identifyGraphicsOverlaysAsync(pos, _pickTolerance,
+                                                                     returnPopUpsOnly, maximumResultsPerOverlay, this);
+  //qWarning() << " XXXXXXX" << LOGFUNCTION;
+
+  // check new task
+  if (!_pickingTask.isValid())
+  {
+    _pendingRequest = RequestType::None;
+    qWarning() << LOGFUNCTION << " _identfyGraphicsOverlayTask invalid";
+    return;
+  }
+
+  // 300: watch the QFuture for completion.
+  if (!_pickingWatcher)
+  {
+    _pickingWatcher = new QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>(this);
+    connect(_pickingWatcher, &QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>::finished,
+            this, [this](){
+      onGetPickingResult(_pickingWatcher->result());
+    });
+  }
+  _pickingWatcher->setFuture(_pickingTask);
+
+} // EventMouseNavigator::requestPicking
+
+
+void EventMouseNavigator::onGetPickingResult(const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult*> &identifyResults)
+{
+  //     qWarning() << " YYYYYYY" << LOGFUNCTION;
+
+  // 300: no QUuid taskId (TaskWatcher removed); stale requests are handled by canceling the
+  // previous QFuture in requestPicking().
+
+  const QList<SituationMap::UniqueMapId> & selectedIdList =  mapToUniqueMapId(identifyResults);
+
+  //     qWarning() << " _pendingRequest="<< (int)_pendingRequest << " count= " << _selectedIdList.count();
+
+  switch (_pendingRequest)
+  {
+  case RequestType::Picking:
+    emit contextMenuRequest(selectedIdList, _viewPortPos);
+    break;
+  case RequestType::Selection:
+    emit selectionRequest(selectedIdList, _viewPortPos);
+    break;
+  case RequestType::None:
+    //emtpy
+    break;
+  } // switch
+
+  // reset some 'flags' to enable a new request:
+  _pendingRequest = RequestType::None;
+  _viewPortPos = QPointF(-1, -1);
+} // EventMouseNavigator::onGetPickingResult
+
+
+QList<UniqueMapId> EventMouseNavigator::mapToUniqueMapId(const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *> &identifyResults)
+{
+  QList<SituationMap::UniqueMapId> idList;
+
+  for (auto iResult : identifyResults)
+  {
+    //       qWarning() << " process result of layer: " << iResult->graphicsOverlay();
+
+    const QList<Esri::ArcGISRuntime::Graphic*> &gResults = iResult->graphics();
+    for (auto pickedGraphic : gResults)
+    {
+      //         qWarning() << " process pickedGraphic: " << pickedGraphic;
+      if (pickedGraphic->attributes())
+      {
+        //           qWarning() << " process pickedGraphic cont: " << pickedGraphic->attributes()->containsAttribute(QLatin1String(SituationMap::UniqueMapIdAttribute));
+        //           qWarning() << " process pickedGraphic cont: " << pickedGraphic->attributes()->containsAttribute(QLatin1String(SituationMap::IsPickableAttribute));
+
+        bool                      ok;
+        SituationMap::UniqueMapId uniqueMapId = pickedGraphic->attributes()->attributeValue(QLatin1String(SituationMap::UniqueMapIdAttribute)).toUInt(&ok);
+
+        if (ok)
+        {
+          //           qWarning() << " process pickedGraphic uid: " << uniqueMapId;
+          if (!idList.contains(uniqueMapId))
+          {
+            idList += uniqueMapId;
+          }
+        }
+        else
+        {
+          ERROR_LOG(_logger) << " process pickedGraphic " << pickedGraphic
+                             << " uid: '" << pickedGraphic->attributes()->attributeValue(QLatin1String(SituationMap::UniqueMapIdAttribute)).toString()
+                             << "' (has uid attribute is " << pickedGraphic->attributes()->containsAttribute(QLatin1String(SituationMap::UniqueMapIdAttribute)) << ")";
+        }
+      }
+    } // foreach inner
+  } // foreach outter
+
+  return idList;
+} // EventMouseNavigator::mapToUniqueMapId
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.h
new file mode 100755
index 000000000..eec816556
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/event_mouse_navigator.h
@@ -0,0 +1,227 @@
+/**
+**
+** @RDE_HEADER@
+** Event Dispatcher for Qt5 to handle mouse events navigate on map
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   24.04.2015, JT  : first edition
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+// Own
+#include <Map/situation_map_types.h>
+#include "abstract_event_dispatcher.h"
+
+
+//Esri
+#include <QFuture>
+#include <QFutureWatcher>
+
+
+// Qt
+#include <QtCore/QList>
+
+
+// #define SITUATIONMAP_OWN_WHEEL_HANDLING
+
+
+
+// Forward:
+namespace Esri {
+namespace ArcGISRuntime {
+  class Map;
+  class IdentifyGraphicsOverlayResult;
+} }
+
+namespace SituationMap {
+class MapImpl;
+}
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class EventMouseNavigator event_mouse_navigator.h
+     @brief Event filter that handles mouse events for general map operation like selecting object, zooming and paning the map window
+
+     Implements class \c AbstractEventDispatcher to manage event handling for general map operation like selecting object, zooming and
+     panning the map window. Monitoring the mouse position can be realized by connecting the \c mouseMovedEvent signal. If the user has
+     clicked to map objects the signal \c selectionRequest is emitted.
+
+     Following events are handled:
+
+     | Input-Event                                    | Interface Function  | Description                                                                   |
+     | :--------------------------------------------- | : ----------------- | : --------------------------------------------------------------------------- |
+     | Mouse enter                                    |                     | To show/hide some widgets                                                     |
+     | Mouse leave                                    |                     | To show/hide some widgets                                                     |
+     | Mouse move without any modifier                |                     | Move Cursor.                                                                  |
+     | Mouse move with pressed left button            |                     | Panning of map if more then 3 pixels moved.                                   |
+     | Mouse move with pressed middle button          |                     | Panning of map.                                                               |
+     | Mouse wheel                                    |                     | Redirect to \c Esri map for zooming.                                          |
+     | Left mouse button release                      |                     | Emits signal \c selectionRequest with list of map objects at cursor position. |
+
+     @see AbstractEventDispatcher, EventDelegater, EventDispatcher
+   */
+
+   class EventMouseNavigator : public AbstractEventDispatcher
+   {
+
+      Q_OBJECT
+
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         EventMouseNavigator(const EventMouseNavigator &) = delete;
+         EventMouseNavigator & operator = (const EventMouseNavigator &) = delete;
+
+         EventMouseNavigator( QWidget * getEventsFrom, SituationMap::MapImpl *sitMap );
+
+         virtual ~EventMouseNavigator() = default;
+         /** @} */
+
+         inline static void setPickTolerance( int value = 5 )      { _pickTolerance = value; }
+
+         inline static int pickTolerance()                         { return _pickTolerance;  }
+
+         inline static void setZoomFactorBase(qreal value = 1.002) { if ((value > 1) && (value <= 1.1))_zoomFactorBase = value; }
+
+         inline static qreal zoomFactorBase()                      { return _zoomFactorBase; }
+
+      signals:
+         /**
+            Will be emitted if the mouse enters the widget.
+         */
+         void enterEvent();
+
+         /**
+            Will be emitted if the mouse leaves the widget.
+         */
+         void leaveEvent();
+
+
+         /**
+            Will be emitted if the user clicks to map objects with the left mouse button.
+         */
+         void selectionRequest( const QList< SituationMap::UniqueMapId > & idList, const QPointF &viewPortPos );
+
+         /**
+            Will be emitted if the user clicks to the map with the rigth mouse button.
+         */
+         void contextMenuRequest( const QList< SituationMap::UniqueMapId > & idList, const QPointF &viewPortPos );
+
+         /**
+           Signal will be emitted if a mouse move is done.
+         */
+         void mouseMovedEvent( int x, int y );
+
+#ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+         /**
+           Signal will be emitted if the mouse wheel has been rotated
+         */
+         void mouseWheelEvent(qreal factor, const QPointF &cursorPositionMap);
+#endif
+
+      protected slots:
+
+         void onGetPickingResult(const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *> &identifyResults );
+
+      protected:
+
+
+          QList<UniqueMapId> mapToUniqueMapId( const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult*> & identifyResults);
+
+          bool eventFilter(QObject*, QEvent*) override;
+
+
+          enum class RequestType
+          {
+            None,
+            Selection,
+            Picking
+          }; // RequestType
+
+
+          enum SelectionMode
+          {
+             NoSelection        = 0x00,
+             SingleSelection    = 0x01,
+             MultiSelection     = 0x02,
+             FrameSelection     = 0x04
+          }; // SelectionMode
+
+          Q_DECLARE_FLAGS(SelectionModes,SelectionMode)
+
+          SituationMap::MapImpl             *_sitMap;
+
+          QPoint                             _mouseMoveRefPos;
+          QCursor                            _restoreMouseCursor;
+          bool                               _cursorChanged;
+
+          static int                         _pickTolerance;
+
+          QPointF                            _viewPortPos;
+          SelectionModes                     _selectionMode;
+          RequestType                        _pendingRequest;
+          bool                               _mousePanningActive;
+          bool                               _mousePanningActiveForCenterMapMidButton;
+
+#ifdef SITUATIONMAP_OWN_WHEEL_HANDLING
+          QFuture<bool>                       _mouseZoomTaskWatcher;
+#endif
+
+          Qt::MouseButton                    _pressedMouseButton;
+
+          static qreal                       _zoomFactorBase;          // Base value to calculate zoom factor values from QWheelEvent
+
+          QFuture<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>   _pickingTask;
+          QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>   *_pickingWatcher = nullptr;
+
+          /**
+            test for already running picking task.
+           */
+          bool checkRunningPickingTask();
+
+          /**
+            Find out which map objects are at given mouse position and emits the signal selectionRequest
+           */
+          void selectionRequested(const QPointF & );
+
+          /**
+            Find out which map objects are at given mouse position and emits the signal contextMenuRequest
+          */
+          void pickRequested( const QPointF & );
+
+          /**
+            Helper function to get all map objects at a given position of all GraphicsOverlays
+            @param pos        position in window coordinates
+          */
+          void requestPicking(const QPointF &pos);
+
+   }; /* EventMouseNavigator */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.cpp
new file mode 100755
index 000000000..99e8e2e74
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.cpp
@@ -0,0 +1,106 @@
+/**
+  * @RDE_HEADER@
+  * Declaration/Definition
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+#include "gestures.h"
+
+#include <QtCore/QDebug>
+#include <QtCore/QEvent>
+
+#include <QtWidgets/QWidget>
+
+namespace SituationMap { namespace RB {
+
+// TabGestureRecognizer
+
+ApplyGestureRecognizer::ApplyGestureRecognizer() : QGestureRecognizer()
+{
+}
+
+ApplyGestureRecognizer::~ApplyGestureRecognizer()
+{}
+
+
+QGesture * ApplyGestureRecognizer::create( QObject * target )
+{
+  //    qDebug() << "ApplyGesture create";
+
+  if (target && target->isWidgetType())
+  {
+    ((QWidget*)target)->setAttribute(Qt::WA_AcceptTouchEvents);
+  }
+  return new ApplyGesture();
+} // TabGestureRecognizer::create
+
+
+QGestureRecognizer::Result ApplyGestureRecognizer::recognize( QGesture * stateGesture, QObject* , QEvent * event)
+{
+  ApplyGesture      * q  = static_cast<ApplyGesture*>(stateGesture);
+
+  QGestureRecognizer::Result result = QGestureRecognizer::CancelGesture;
+
+  switch (event->type())
+  {
+  case QEvent::TouchBegin:
+  {
+    const QTouchEvent * ev = static_cast<const QTouchEvent*>(event);
+    //        qDebug() << "ApplyGesture begin";
+    q->_position = ev->touchPoints().at(0).pos();
+    q->setHotSpot(ev->touchPoints().at(0).screenPos());
+    q->_tripleTouch = (ev->touchPoints().size() == 3);
+    if (ev->touchPoints().size() == 1 )
+      result = QGestureRecognizer::Ignore;
+    else
+      result = QGestureRecognizer::TriggerGesture;
+  } break;
+    
+  case QEvent::TouchUpdate:
+  case QEvent::TouchEnd:
+  {
+    const QTouchEvent * ev = static_cast<const QTouchEvent*>(event);
+    if (q->state() != Qt::NoGesture && ev->touchPoints().size() >= 1 && ev->touchPoints().size() <= 3)
+    {
+      if (ev->touchPoints().size() == 3) q->_tripleTouch = true;
+      //        qDebug() << "ApplyGesture update _tripleTouch=" <<  q->_tripleTouch;
+      QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
+      QPoint delta = p.pos().toPoint() - p.startPos().toPoint();
+      enum { TapRadius = 40 };
+      if (delta.manhattanLength() <= TapRadius)
+      {
+        if (event->type() == QEvent::TouchEnd)
+        {
+          result = (q->_tripleTouch) ? QGestureRecognizer::FinishGesture : QGestureRecognizer::CancelGesture;
+        }
+        else result = QGestureRecognizer::TriggerGesture;
+      }
+    }
+  } break;
+    
+  case QEvent::MouseButtonPress:
+  case QEvent::MouseMove:
+  case QEvent::MouseButtonRelease:
+    result = QGestureRecognizer::Ignore;
+    break;
+  default:
+    result = QGestureRecognizer::Ignore;
+    break;
+  }
+
+  return result;
+} // TabGestureRecognizer::recognize( QGesture * stateGesture, QObject * watched, QEvent * event)
+
+
+void ApplyGestureRecognizer::reset( QGesture * stateGesture )
+{
+  ApplyGesture * q  = static_cast<ApplyGesture*>(stateGesture);
+  q->_tripleTouch = false;
+} // TabGestureRecognizer::reset( QGesture * stateGesture )
+
+
+
+}} // namspaces
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.h
new file mode 100755
index 000000000..9847c0bb5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/gestures.h
@@ -0,0 +1,72 @@
+/**
+**
+** @RDE_HEADER@
+** Gesture recognition
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Joerg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   09.12.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtWidgets/QGesture>
+#include <QtWidgets/QGestureRecognizer>
+
+
+namespace SituationMap { namespace RB
+{
+  class ApplyGestureRecognizer : public QGestureRecognizer
+  {
+    public:
+      ApplyGestureRecognizer();
+      virtual ~ApplyGestureRecognizer();
+
+      QGesture *                 create( QObject * target ) override;
+      QGestureRecognizer::Result recognize( QGesture * stateGesture, QObject * watched, QEvent * event) override;
+      void                       reset( QGesture * stateGesture ) override;
+
+  }; // ApplyGestureRecognizer
+
+
+  class ApplyGesture : public QGesture
+  {
+    Q_OBJECT
+    friend class ApplyGestureRecognizer;
+
+    public:
+
+      ApplyGesture()  = default;
+      ~ApplyGesture() = default;
+
+      ApplyGesture( const ApplyGesture & )               = delete;
+      ApplyGesture & operator = ( const ApplyGesture & ) = delete;
+
+      QPointF position() const { return _position; }
+
+    private:
+
+      QPointF  _position;
+      bool     _tripleTouch;
+  }; // ApplyGesture
+
+}} // namespaces
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/polygon.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/polygon.xpm
new file mode 100755
index 000000000..d7b513ff4
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/polygon.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static const char * polygon_xpm[] = {
+"24 24 25 1",
+" 	c None",
+".	c #59BA55",
+"+	c #57B953",
+"@	c #56B852",
+"#	c #55B651",
+"$	c #53B44F",
+"%	c #51B24D",
+"&	c #4FB04B",
+"*	c #4DAE49",
+"=	c #4AAC46",
+"-	c #48A944",
+";	c #46A742",
+">	c #43A53F",
+",	c #41A23D",
+"'	c #3E9F3A",
+")	c #3C9D38",
+"!	c #399B35",
+"~	c #379833",
+"{	c #349630",
+"]	c #32942E",
+"^	c #30922C",
+"/	c #2E902A",
+"(	c #2D8E28",
+"_	c #2B8C27",
+":	c #2A8B26",
+"      .                 ",
+"      ++                ",
+"     @ @           @    ",
+"     #  #        ###    ",
+"    $$  $      $$$ $$   ",
+"    %   %%   %%%    %   ",
+"   &&    & &&&       &  ",
+"   *     ***         *  ",
+"  ==                  = ",
+"  -                   - ",
+"  ;                    ;",
+" >                     >",
+" ,                    ,,",
+"''                   '' ",
+")                   ))  ",
+"!                  !!   ",
+"~~                ~~    ",
+" {{{             {{     ",
+"  ]]]           ]]      ",
+"    ^^         ^^       ",
+"     //       //        ",
+"       ((    ((         ",
+"        __  __          ",
+"         ::::           "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.cpp
new file mode 100755
index 000000000..9b62c81e1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.cpp
@@ -0,0 +1,309 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for 2D rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband.h"
+#include "rubberband_drawable.h"
+#include "rubberband_handle.h"
+#include "rubberband_handle_proxy.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include "rubberband_factory.h"
+
+#include <MapGraphicsView.h>
+
+// Qt
+#include <QtCore/QMetaMethod>
+#include <QtWidgets/QGraphicsPixmapItem>
+
+
+namespace SituationMap { namespace RB
+{
+   
+   
+   Rubberband::Rubberband(  SituationMap::Map * map, QObject * parent, bool isActive )
+      : RubberbandBase(map,parent,isActive)
+      , _internal( new Rubberband::InternalData(map) )
+      , _state( RubberbandState::ConstructionState )
+      , _previewSidc()
+      , _previewCursorOffset(32,32)
+      , _previewSize(32)
+   {
+      _fillColor.setAlpha(100);
+
+      connect( &_previewSymbolResultWatcher
+             , &AdvancedSymbology::SymbolResultWatcher::resultReady
+             , this
+             , &Rubberband::onPreviewSymbolResultReady                      );
+
+   } /* Rubberband::Rubberband */
+
+
+   Rubberband::~Rubberband()
+   {
+      delete _internal;
+      _internal = nullptr;
+   } /* Rubberband::~Rubberband */
+
+
+   void Rubberband::connectPreviewPixmap( const QPixmap & symbolPixmap )
+   {
+      if (nullptr == _internal->_connectedPreviewPixmap)
+      {
+         _internal->_connectedPreviewPixmap  = new QGraphicsPixmapItem( symbolPixmap );
+         _internal->_connectedPreviewPixmap -> setOffset(-qreal(symbolPixmap.width())/2,-qreal(symbolPixmap.height())/2);
+
+         _internal->_mapScene -> addItem( _internal->_connectedPreviewPixmap );
+      }
+   } /* RubberbandPointFeature::connectPreviewPixmap */
+
+   unsigned int Rubberband::coordinateCount() const { return static_cast<unsigned int>(_internal->_handleList.size()); }
+
+
+   void Rubberband::resetAction(AbstractEventDispatcher*, int, int)
+   {
+      disenableSelectedState();
+      disenableMultiSelectedState();
+      update();
+   } /* Rubberband::resetAction */
+
+
+
+   bool Rubberband::selectAction( AbstractEventDispatcher*, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePos = pixel2ScenePosition(x,y);
+
+         if (_baseInternal->buttonProxyActive(scenePos)) return false;
+         _baseInternal->_lastClickPosition = scenePos;
+         return true;
+      }
+      return false;
+   } /* Rubberband::selectAction */
+
+
+   bool Rubberband::multiSelectActionPress( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         if (isEnabledModificationState())
+         {
+           _baseInternal->_lastClickPosition = pixel2ScenePosition(x,y);
+           enableMultiSelectedState();
+         }
+         return selectAction( causer, x, y);
+      }
+      return false;
+   } /* RubberbandPointFeature::multiSelectActionPress */
+
+
+   bool Rubberband::multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y )
+   {
+     if (rubberbandIsAlive())
+     {
+       if (isEnabledModificationState())
+       {
+         updateButtonPosition();
+         activateButtons();
+       }
+       else return setCoordinateAction(causer,x,y);
+     }
+     return false;
+   } /* RubberbandPointFeature::multiSelectActionRelease */
+
+
+   void Rubberband::adjustConnectedPreviewPixmap( int x, int y )
+   {
+      if (_internal->_connectedPreviewPixmap)
+      {
+         _internal->_connectedPreviewPixmap -> setPos(pixel2ScenePosition( x+_previewCursorOffset.x(), y+_previewCursorOffset.y() ));
+      }
+   } /* Rubberband::adjustConnectedPreviewPixmap */
+
+
+   bool Rubberband::moveAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+      return rubberbandIsAlive();
+
+   } /* moveAction */
+
+
+   bool Rubberband::setCoordinateAction( AbstractEventDispatcher*, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePos = pixel2ScenePosition(x,y);
+         if (_baseInternal->buttonProxyActive(scenePos)) return false;
+         _internal->_lastClickPosition = scenePos;
+         return true;
+      }
+      return false;
+   } /* Rubberband::setCoordinateAction */
+
+
+   bool Rubberband::movePickedAction    ( AbstractEventDispatcher*, int x, int y ) { adjustConnectedPreviewPixmap(x,y); return false;               }
+   bool Rubberband::contextMenuAction   ( AbstractEventDispatcher*, int x, int y ) { Q_UNUSED(x); Q_UNUSED(y);          return rubberbandIsAlive(); }
+   bool Rubberband::completeStateAction ( AbstractEventDispatcher*, int x, int y ) { Q_UNUSED(x); Q_UNUSED(y);          return rubberbandIsAlive(); }
+   bool Rubberband::deleteAction        ( AbstractEventDispatcher*, int x, int y ) { Q_UNUSED(x); Q_UNUSED(y);          return rubberbandIsAlive(); }
+   bool Rubberband::undoAction          ( AbstractEventDispatcher*, int x, int y ) { Q_UNUSED(x); Q_UNUSED(y);          return rubberbandIsAlive(); }
+
+
+   RubberbandHandle * Rubberband::pickHandle( int x, int y ) const
+   {
+      if (_internal->_mapView != nullptr)
+      {
+         QPointF scenePosition = pixel2ScenePosition(x,y);
+         for (auto handle : qAsConst(_internal->_handleList))
+         {
+            if (handle->isPositionInside(scenePosition))
+              return handle.get();
+         }
+      }
+      return nullptr;
+   } /* Rubberband::pickHandle */
+
+
+   void Rubberband::deSelectHandles()
+   {
+      for (auto handle : qAsConst(_internal->_handleList))
+      {
+         RubberbandHandle * handlePtr = handle.get();
+         if (handlePtr)
+         {
+            handlePtr->setSelection(false);
+         }
+      }
+   } /* Rubberband::deSelectHandles */
+
+
+   QRectF Rubberband::sceneBbox() const
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION;
+
+      QPointF topLeft( std::numeric_limits<double>::max(), std::numeric_limits<double>::max() );
+      QPointF bottomRight( std::numeric_limits<double>::min(), std::numeric_limits<double>::min() );
+
+      for (auto handle : qAsConst(_internal->_handleList))
+      {
+         RubberbandPointHandle * pointHandlePtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+         if (pointHandlePtr)
+         {
+            const QPointF & p  = pointHandlePtr->getCoordinate()._sceneCoordinate;
+            if (topLeft.x()     > p.x()) topLeft.setX(p.x());
+            if (topLeft.y()     > p.y()) topLeft.setY(p.y());
+            if (bottomRight.x() < p.x()) bottomRight.setX(p.x());
+            if (bottomRight.y() < p.y()) bottomRight.setY(p.y());
+         }
+      }
+
+      return QRectF( topLeft, bottomRight );
+
+   } /* Rubberband::sceneBbox */
+
+
+   void Rubberband::update()
+   {
+      // Check Quartz
+      //      if (isSignalConnected(QMetaMethod::fromSignal(&Rubberband::updatePreview)))
+      //      {
+      //        emit updatePreview( this );
+      //      }
+      //      if (_internal->_map->symbolDictionary().contains(_previewSidc))
+      //      {
+      //         const QImage& symbolImage = _internal->_map->symbolDictionary().symbolImageBySidc( _previewSidc, _previewSize );
+      //         connectPreviewPixmap( QPixmap::fromImage(symbolImage) );
+      //      }
+
+      if ((!_previewSidc.isEmpty()) &&  (nullptr == _internal->_connectedPreviewPixmap) && (!_previewSymbolResultWatcher.resultIsValid()))
+      {
+        _previewSymbolResultWatcher.setSymbolResult(_baseInternal->_map->symbolDictionary().findBaseSymbol(_previewSidc));
+      }
+
+      for (auto handle : qAsConst(_internal->_handleList))
+      {
+         handle -> setDrawColor(_handleDrawColor);
+         handle -> setFillColor(_handleFillColor);
+         handle -> setSelectionColor(_handleSelectionColor);
+         handle -> setPickingRatio( _pickingRatio );
+      }
+
+      updateButtonPosition();
+
+      if (_internal->_constructionObjectDraw != nullptr)
+      {
+         // _constructionObjectDraw -> setColors
+      }
+
+      externalUpdate();
+      
+   } /* Rubberband::update */
+
+
+   void Rubberband::onPreviewSymbolResultReady()
+   {
+      QSharedPointer<AdvancedSymbology::SymbolResult> symResult = _previewSymbolResultWatcher.symbolResult();
+
+      if (!symResult) return;  // should NEVER happen! (Which object should have triggered the signal???)
+
+      const QPixmap & symbolPixmap = QPixmap::fromImage(symResult->symbolImage().image()).scaled(_previewSize,_previewSize,Qt::KeepAspectRatio);
+
+      if (symbolPixmap.isNull())
+      {
+        DEBUG_LOG(_internal->_logger) << LOGFUNCTION << "Preview symbol image is empty.";
+      }
+      connectPreviewPixmap( symbolPixmap );
+   } /* Rubberband::onPreviewSymbolResultReady */
+
+ 
+   #include "./constrainsMarker.xpm"
+
+   void Rubberband::markFailedConstrains(  const QPointF & scenePos, bool on )
+   {
+     if (on)
+     {
+       QPixmap        markerPixmap(constrainsMarker_xpm);
+       
+       if (nullptr == _internal->_constrainFailedMarker)
+       {
+         _internal->_constrainFailedMarker  = new QGraphicsPixmapItem( markerPixmap );
+         _internal->_mapScene -> addItem( _internal->_constrainFailedMarker );
+       }
+       _internal->_constrainFailedMarker -> setOffset(-qreal(markerPixmap.width())/2,-qreal(markerPixmap.height())/2);
+       _internal->_constrainFailedMarker -> setPos(scenePos-QPointF(_previewCursorOffset));
+       _internal->_constrainFailedMarker->setVisible(true);
+     }
+     else if (_internal->_constrainFailedMarker) _internal->_constrainFailedMarker->setVisible(false);
+   } /* Rubberband::markFailedConstrains */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.h
new file mode 100755
index 000000000..ed09383e3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband.h
@@ -0,0 +1,319 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for 2D rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "rubberband_base.h"
+
+#include <Map/map.h>
+#include <Common/ref_pointer.h>
+
+#include <QtCore/QFlags>
+#include <QtCore/QPointer>
+
+#include <memory>
+
+
+namespace Esri {
+namespace ArcGISRuntime {
+  class MapGraphicsView;
+  class Point;
+} }
+
+
+
+namespace SituationMap
+{
+
+/**
+   Namespace for all rubberband stuff (is part of namespace SituationMap)
+*/
+namespace RB
+{
+   class RubberbandDrawable;
+   class RubberbandHandle;
+
+   /**
+     @class Rubberband rubberband.h
+     @brief Base class of all 2D rubberbands
+
+     Rubberbands are used to create or modifiy 2D geometries like lines, circles, polygons etc. by processing
+     Qt input events like keyboard and mouse events. To create a rubberband the RubberbandFactory has to be used.
+     At end of rubberband processing the signal \c abort or\c apply are emitted. To delete the rubberband the
+     function deleteMySelf must be called. To use the delete operator is dangerous because at end of signal
+     processing some program code may be performed.
+
+     Example to how to use rubberband:
+
+     @code
+
+        SituationMap::Map & map = ...
+
+        const RubberbandFactory & rubberbandFactory = map.rubberbandFactory();
+
+        RubberbandPointFeature * rubberband = rubberbandFactory.create<RubberbandPointFeature>();
+        if (rubberband != nullptr)
+        {
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::apply, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // rubberband has finished input
+              if (rubberband)
+              {
+                 const QVector<QPointF> & vertexList = rubberband->coordinateVector();
+
+                 // do something with vertexList
+
+                 rubberband->deleteMySelf();  // notice don't call here delete rubberband directly !!!
+              }
+           } );
+
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::abort, this, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // Rubberband has been aborted by user
+              if (rubberband)
+              {
+                 rubberband->deleteMySelf(); // notice don't call here delete rubberband directly !!!
+              }
+           } );
+        }
+
+     @endcode
+
+     Following keyboard commands are available in active rubberbands:
+
+     | Key    | Modifier | Funktion                                                                     |
+     | :----: |:-------: | :--------------------------------------------------------------------------- |
+     | Esc    |          | Rubberband abbrechen                                                         |
+     | Return |          | Rubberband abschließen und Eingabe übernehmen wenn möglich, sonst Abbruch    |
+     | Left   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach links schieben             |
+     | Right  |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach rechts schieben            |
+     | Up     |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach oben schieben              |
+     | Down   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach unten schieben             |
+     | Left   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach links schieben            |
+     | Right  | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach rechts schieben           |
+     | Up     | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach oben schieben             |
+     | Down   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach unten schieben            |
+
+     @see EventDispatcher
+     @see RubberbandBase, Rubberband, RubberbandPointFeature, RubberbandPointCluster, RubberbandMultiPointFeature, RubberbandRectangle, RubberbandEllipse, RubberbandCorridor, RubberbandArrow
+   */
+
+   class SITUATIONMAP_EXPORT Rubberband : public RubberbandBase
+   {
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * Because class EventDispatcher::EventActionInterface is a pure virtual interface function the classic way of declaration would be
+       *
+       *   SITUATIONMAP_EXPORT Rubberband : public QObject, public virtual EventDispatcher::EventActionInterface
+       *
+       * But with Visual Studio 2013 virtual inheritance combined with constructor delegation doesn't work and may crash the program. In
+       * this case the virtual inheritance of EventActionInterface isn't need because in the derived classes multiple inheritance will
+       * not be used.
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+      Q_OBJECT
+
+      public:
+
+         /**
+           @defgroup States Internal state of the rubberband
+           @{
+         */
+
+          enum RubberbandState : unsigned int
+          {
+            ConstructionState      = 1 << 0, ///< Construction state is active when a geomtrie is been build new
+            ModificationState      = 1 << 1, ///< Modification state is active when a existing geometrie is been modified
+            SelectedState          = 1 << 2, ///< Selection state is active, one ore more handles are selected
+            MultiSelectedState     = 1 << 3, ///< multiple handles can be selected
+            ConstructionWidthState = 1 << 4  ///< Initial define of a width e.b. for corridors
+          }; /* RubberbandSate */
+
+          Q_DECLARE_FLAGS(RubberbandStates,RubberbandState)
+
+         /** @} */
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+      private:
+
+         friend class RubberbandFreeHand;
+         friend class RubberbandPointFeature;
+         friend class RubberbandMultiPointFeature;
+         friend class RubberbandMultiEllipseFeature;
+         friend class RubberbandRectangle;
+         friend class RubberbandStateSelect;
+         friend class RubberbandTransformMove;
+         friend class RubberbandTransformRotate;
+         friend class RubberbandTransformScale;
+
+         /**
+           Constructs a Rubberband for a situation map. Use \c RubberbandFactor to create a rubberband.
+           In case of the user actions the autoDelete mechanism can be used to delete the rubberband. Sometimes
+           the application wants to finish a running rubberband. This can be done by calling \c deleteMySelf. The
+           rubberband will be destroyed also automatically if the parent QObject or the map (see
+           SituationMap::Map::beginDestroy signal) will be destroyed.
+
+           @param map     Pointer to SituationMap::Map
+           @param parent  Pointer to QObject to use as parent.
+           @isActive      If set to false the Rubberband is not active and have to be actived to start the input.
+           @see RubberbandFactory
+         */
+         explicit Rubberband( SituationMap::Map * map, QObject * parent, bool isActive = true );
+
+      public:
+         Q_DISABLE_COPY(Rubberband)
+
+         virtual ~Rubberband();
+
+         /** @} */
+
+         /**
+           @addtogroup States Methodes to query and modify rubberband states
+           @{
+         */
+         inline bool isEnabledConstructionState()  const { return _state.testFlag(RubberbandState::ConstructionState);  }
+         inline bool isEnabledModificationState()  const { return _state.testFlag(RubberbandState::ModificationState);  }
+         inline bool isEnabledSelectedState()      const { return _state.testFlag(RubberbandState::SelectedState);      }
+         inline bool isEnabledMultiSelectedState() const { return _state.testFlag(RubberbandState::MultiSelectedState); }
+
+         inline void enableConstructionState()           { disenableModificationState(); }
+         inline void enableModificationState()           { disenableConstructionState(); }
+         inline void enableSelectedState()               { _state |= RubberbandState::SelectedState;      }
+         inline void enableMultiSelectedState()          { _state |= RubberbandState::MultiSelectedState; }
+
+         inline void disenableConstructionState()        { _state &= ~QFlags<RubberbandState>(RubberbandState::ConstructionState);  _state |= RubberbandState::ModificationState; }
+         inline void disenableModificationState()        { _state &= ~QFlags<RubberbandState>(RubberbandState::ModificationState);  _state |= RubberbandState::ConstructionState; }
+         inline void disenableSelectedState()            { _state &= ~QFlags<RubberbandState>(RubberbandState::SelectedState);      }
+         inline void disenableMultiSelectedState()       { _state &= ~QFlags<RubberbandState>(RubberbandState::MultiSelectedState); }
+         //@}
+
+         /**
+           @name EventHandlerInterface Methodes of AbstractEventDispatcher::EventActionInterface
+           The interface between EventDispatcher and Rubberband are defined in class AbstractEventDispatcher.
+           To Implement the interface these methodes have to be override again in the derived classes of the Rubberband class. */
+         /**
+           @{
+         */
+         bool selectAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         void resetAction             ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         /** @} */
+
+         /**
+           @name Preview Setting Methodes to define visual behaviour of rubberband preview
+           @{
+         */
+         inline void setPreviewSidc         (const QString & sidc  )  { _previewSidc          = sidc;   update(); }  ///< Defines tactical symbol for preview
+         inline void setPreviewOffset       (const QPoint  & off   )  { _previewCursorOffset  = off;    update(); }  ///< set offset to cursor position for preview pixmap
+         inline void setPreviewSize         (unsigned int    size  )  { _previewSize          = size;   update(); }  ///< set size of preview pixmap
+
+         inline QString       getPreviewSidc()          const { return _previewSidc; }               ///< get code of tactical preview symbol
+         inline const QPoint  getPreviewOffset()        const { return _previewCursorOffset; }       ///< get offset to cursor position for preview pixmap
+         inline unsigned int  getPreviewSize()          const { return _previewSize; }               ///< get size of preview pixmap
+         /** @} */
+
+
+         /**
+            Returns Sidc code of preview symbol (if defined)
+         */
+         inline QString previewSidc() const { return _previewSidc; }
+
+         /**
+           Sets a QPixmap to use for drawing symbol preview image
+           @param symbolImage a nice QPixmap
+         */
+         void connectPreviewPixmap( const QPixmap & symbolPixmap );
+
+         /**
+         Returns count of coordinates
+         */
+         virtual unsigned int coordinateCount() const override;
+
+      protected:
+
+         void deSelectHandles();
+
+
+         void update() override;
+
+         /**
+           Returns the rubberband handle at screen position (x,y) or nullptr if there isn't any handle at this
+           position.
+         */
+         RubberbandHandle * pickHandle( int x, int y ) const;
+
+         /**
+           Moves preview image to QGraphicView position (x,y) in window coordinates.
+         */
+         void adjustConnectedPreviewPixmap( int x, int y );
+
+
+         /**
+           Shows a icon near the cursor to mark failing constrains.
+         */
+         void markFailedConstrains( const QPointF & scenePos, bool on );
+
+         /*
+           Forward declaration of internal container class for member variables. The derived classes of Rubberband
+           often have also a declaration of InternalData for there own internal members.
+         */
+         struct InternalData;
+
+         InternalData     * _internal;
+
+         RubberbandStates   _state;
+
+         QString            _previewSidc;
+         QPoint             _previewCursorOffset;
+         unsigned int       _previewSize;
+
+         AdvancedSymbology::SymbolResultWatcher  _previewSymbolResultWatcher;
+
+         QRectF sceneBbox() const override;
+
+      protected slots:
+
+         void onPreviewSymbolResultReady();
+
+   }; /* Rubberband */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.cpp
new file mode 100755
index 000000000..d5c806669
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.cpp
@@ -0,0 +1,116 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for 3d rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#include "rubberband_3d.h"
+
+#include <Map/map.h>
+
+#include <QtGui/QPainter>
+
+namespace SituationMap
+{
+
+
+namespace RB
+{
+
+  Rubberband3D::Rubberband3D( SituationMap::Map * map, QObject * parent, bool isActive )
+    : RubberbandBase(map,parent,isActive), _markerPixmap(nullptr), _markerSelectionPixmap(nullptr)
+  {
+  } // Rubberband3D::Rubberband3D( SituationMap::Map * map, QObject * parent, bool isActive )
+
+
+  Rubberband3D::~Rubberband3D()
+  {
+    delete _markerPixmap;
+    delete _markerSelectionPixmap;
+  } // Rubberband3D::~Rubberband3D()
+
+
+  void Rubberband3D::resetAction( AbstractEventDispatcher*,int,int )               {;}
+  bool Rubberband3D::selectAction( AbstractEventDispatcher*,int,int  )             { return false; }
+  bool Rubberband3D::multiSelectActionPress ( AbstractEventDispatcher*,int,int )   { return false; }
+  bool Rubberband3D::multiSelectActionRelease( AbstractEventDispatcher*,int,int )  { return false; }
+  bool Rubberband3D::setCoordinateAction( AbstractEventDispatcher*,int,int )       { return false; }
+  bool Rubberband3D::moveAction( AbstractEventDispatcher*,int,int )                { return false; }
+  bool Rubberband3D::movePickedAction( AbstractEventDispatcher*,int,int )          { return false; }
+  bool Rubberband3D::contextMenuAction( AbstractEventDispatcher*,int,int )         { return false; }
+  bool Rubberband3D::completeStateAction( AbstractEventDispatcher*,int,int )       { return false; }
+  bool Rubberband3D::deleteAction( AbstractEventDispatcher*,int,int )              { return false; }
+  bool Rubberband3D::undoAction( AbstractEventDispatcher*,int,int )                { return false; }
+
+
+  QRectF Rubberband3D::sceneBbox() const { return QRectF(); }
+
+
+  #include "sphere_pattern.xpm"
+
+  QImage Rubberband3D::markerSelectionImage()
+  {
+    if (nullptr == _markerSelectionPixmap)
+    {
+      _markerSelectionPixmap = new QPixmap( sphere_pattern_xpm );
+
+      QPainter painter(_markerSelectionPixmap);
+      QBrush   brush;
+
+      brush.setStyle(Qt::BrushStyle::SolidPattern);
+      brush.setColor(_handleSelectionColor);
+
+      painter.setCompositionMode(QPainter::CompositionMode::CompositionMode_Multiply);
+      painter.setPen(_handleDrawColor);
+      painter.setBrush(brush);
+      painter.drawEllipse( 0, 0, _markerSelectionPixmap->width(), _markerSelectionPixmap->height() );
+    }
+    return _markerSelectionPixmap->toImage();
+  } // QImage Rubberband3D::markerSelectionImage()
+
+
+  QImage Rubberband3D::markerImage()
+  {
+    if (nullptr == _markerPixmap)
+    {
+      _markerPixmap = new QPixmap( sphere_pattern_xpm );
+
+      QPainter painter(_markerPixmap);
+      QBrush   brush;
+
+      brush.setStyle(Qt::BrushStyle::SolidPattern);
+      brush.setColor(_handleFillColor);
+
+      painter.setCompositionMode(QPainter::CompositionMode::CompositionMode_Multiply);
+      painter.setPen(_handleDrawColor);
+      painter.setBrush(brush);
+      painter.drawEllipse( 0, 0, _markerPixmap->width(), _markerPixmap->height() );
+    }
+    return _markerPixmap->toImage();
+  } // QImage Rubberband3D::markerImage()
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.h
new file mode 100755
index 000000000..0fac8bfd2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_3d.h
@@ -0,0 +1,214 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for 3d rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "rubberband_base.h"
+
+#include <Map/map.h>
+#include <Common/ref_pointer.h>
+
+
+class QObject;
+namespace Esri {
+namespace ArcGISRuntime {
+  class MapGraphicsView;
+  class Point;
+} }
+
+
+
+namespace SituationMap
+{
+
+/**
+   Namespace for all rubberband stuff (is part of namespace SituationMap)
+*/
+namespace RB
+{
+   class RubberbandDrawable;
+   class RubberbandHandle;
+
+   /**
+     @class Rubberband3D rubberband_3d.h
+     @brief Base class of all 3D rubberbands
+
+     Rubberbands are used to create or modifiy geometries like single points or lines in 3D views by processing
+     Qt input events like keyboard and mouse events. To create a rubberband the RubberbandFactory has to be used.
+     At end of rubberband processing the signal \c abort or\c apply are emitted. To delete the rubberband the
+     function deleteMySelf must be called. To use the delete operator is dangerous because at end of signal
+     processing some program code may be performed.
+
+     Example to how to use rubberband:
+
+     @code
+
+        SituationMap::Map & map = ...
+
+        const RubberbandFactory & rubberbandFactory = map.rubberbandFactory();
+
+        RubberbandPointFeature * rubberband = rubberbandFactory.create<RubberbandPointFeature3D>();  // the map has to be in 3D mode
+        if (rubberband != nullptr)
+        {
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::apply, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // rubberband has finished input
+              if (rubberband)
+              {
+                 const QVector<QPointF> & vertexList = rubberband->coordinateVector();
+
+                 // do something with vertexList
+
+                 rubberband->deleteMySelf();  // notice don't call here delete rubberband directly !!!
+              }
+           } );
+
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::abort, this, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // Rubberband has been aborted by user
+              if (rubberband)
+              {
+                 rubberband->deleteMySelf(); // notice don't call here delete rubberband directly !!!
+              }
+           } );
+        }
+
+     @endcode
+
+     Following keyboard commands are available in active rubberbands:
+     
+     | Key    | Modifier | Funktion                                                                     |
+     | :----: |:-------: | :--------------------------------------------------------------------------- |
+     | Esc    |          | Rubberband abbrechen                                                         |
+     | Return |          | Rubberband abschließen und Eingabe übernehmen wenn möglich, sonst Abbruch    |
+     | Left   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach links schieben             |
+     | Right  |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach rechts schieben            |
+     | Up     |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach oben schieben              |
+     | Down   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach unten schieben             |
+     | Left   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach links schieben            |
+     | Right  | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach rechts schieben           |
+     | Up     | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach oben schieben             |
+     | Down   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach unten schieben            |
+     
+     @see EventDispatcher
+     @see RubberbandBase, Rubberband, RubberbandPointFeature3D, RubberbandMultiPointFeature3D
+   */
+
+   class SITUATIONMAP_EXPORT Rubberband3D : public RubberbandBase
+   {
+      Q_OBJECT
+
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+      private:
+
+         friend class RubberbandPointFeature3D;
+         friend class RubberbandMultiPointFeature3D;
+        
+
+         /**
+           Constructs a Rubberband for a situation map. Use \c RubberbandFactor to create a rubberband. 
+           In case of the user actions the autoDelete mechanism can be used to delete the rubberband. Sometimes
+           the application wants to finish a running rubberband. This can be done by calling \c deleteMySelf. The 
+           rubberband will be destroyed also automatically if the parent QObject or the map (see 
+           SituationMap::Map::beginDestroy signal) will be destroyed.
+
+           @param map     Pointer to SituationMap::Map
+           @param parent  Pointer to QObject to use as parent.
+           @isActive      If set to false the Rubberband is not active and have to be actived to start the input.
+           @see RubberbandFactory
+         */
+         explicit Rubberband3D( SituationMap::Map * map, QObject * parent, bool isActive = true );
+
+      public:
+
+         ~Rubberband3D();
+
+         /** @} */
+
+         /**
+           @name EventHandlerInterface Methodes of AbstractEventDispatcher::EventActionInterface
+           The interface between EventDispatcher and Rubberband are defined in class AbstractEventDispatcher.
+           To Implement the interface these methodes have to be override again in the derived classes of the Rubberband class. */
+         /**
+           @{
+         */
+
+         bool selectAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         void resetAction             ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+         
+
+         /** @} */
+
+
+         /**
+           Retrieve and set 3D coordinates.
+          @{
+         */
+         virtual Point3D singleCoordinate3D( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const = 0;
+         
+         virtual QVector<Point3D> coordinateVector3D( CoordinateSystem cs = CoordinateSystem::Geo ) const = 0;
+
+         virtual void setCoordinateVector( const QVector<Point3D> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) = 0; 
+         /** @} */
+
+
+ 
+
+      protected:
+
+         QRectF sceneBbox() const override;
+
+         QImage markerImage();
+         QImage markerSelectionImage();
+
+         
+
+     private:
+
+       QPixmap * _markerPixmap;
+       QPixmap * _markerSelectionPixmap;
+
+   }; /* Rubberband3D */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.cpp
new file mode 100755
index 000000000..72a5e4a15
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.cpp
@@ -0,0 +1,359 @@
+
+/**
+** @RDE_HEADER@
+** Implementation of rubberband class to define multi point feature geoemtry with arrow
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   21.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_arrow.h"
+#include "rubberband_frame_handle.h"
+#include "rubberband_line_handle.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+
+#include "drawable_painter_path.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandArrow::InternalData
+   {
+         SituationMap::RefPointer<RubberbandPointHandle>   _arrowHandle;
+         SituationMap::RefPointer<DrawablePainterPath>     _arrowItem;
+
+   }; /* struct RubberbandArrow::InternalData */
+
+
+   RubberbandArrow::RubberbandArrow( SituationMap::Map * map, QObject * parent )
+      : RubberbandMultiPointFeature(map,parent)
+      , _internal(new InternalData)
+      , _arrowSceneHalfWidth(0)
+      , _arrowSceneLength(0)
+     
+   {
+      _isClosed = false;
+   } /* RubberbandArrow::RubberbandArrow */
+
+
+   RubberbandArrow::~RubberbandArrow()
+   {
+      delete _internal;
+      _internal = nullptr;
+   } /* RubberbandArrow::~RubberbandArrow */
+
+
+   unsigned int RubberbandArrow::arrowHalfWidth() const { return _arrowSceneHalfWidth; } 
+   unsigned int RubberbandArrow::arrowLength()    const { return _arrowSceneLength;    } 
+
+
+   void RubberbandArrow::setCoordinateVector(const QVector<QPointF> & coordinateVec, CoordinateSystem cs )
+   {
+      setCoordinateVectorArrow( coordinateVec, 0.0, 0.0, cs );
+   } /*  RubberbandArrow::coordinateVector */
+
+
+   void RubberbandArrow::setCoordinateVectorArrow(const QVector<QPointF> & coordinateVec, unsigned int arrowHalfWidth, unsigned int arrowLength, CoordinateSystem cs )
+   {
+      if (coordinateVec.size() < 2) return;
+
+      RubberbandMultiPointFeature::setCoordinateVector( coordinateVec, cs );
+      
+      const QPointF & aux = pixel2ScenePosition(arrowHalfWidth,arrowLength);
+
+      _arrowSceneHalfWidth = (unsigned int) aux.x();
+      _arrowSceneLength    = (unsigned int) aux.y();
+      
+      enableModificationState();
+      constructArrowHandle();
+
+      _baseInternal->_applyIsPossible = true;
+
+      activateButtons();
+   } /* RubberbandArrow::setCoordinateVectorArrow */
+
+
+   QPointF RubberbandArrow::getArrowHandleScenePosition()
+   {
+      if (!_arrowSceneLength)    _arrowSceneLength    = 40;
+      if (!_arrowSceneHalfWidth) _arrowSceneHalfWidth = 20;
+     
+
+      QPointF p0 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate;
+      QPointF p1 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+
+      QPointF rv( p0.x()-p1.x(), p0.y()-p1.y() );
+      rv /= sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+
+      return QPointF( p1.x() + rv.x()*_arrowSceneLength - rv.y()*_arrowSceneHalfWidth ,
+                      p1.y() + rv.y()*_arrowSceneLength + rv.x()*_arrowSceneHalfWidth );
+    
+   } /* RubberbandArrow::getArrowHandleScenePosition */
+
+
+   QPointF RubberbandArrow::getArrowHandlePosition()
+   {
+      const QPointF                            & handlePos = getArrowHandleScenePosition();
+      RubberbandDrawable::RubberbandCoordinate   mapHandlePos(Rubberband::_internal->_mapView, handlePos);
+
+      return QPointF( mapHandlePos._mapCoordinate.x(),  mapHandlePos._mapCoordinate.y() );
+
+   } /* RubberbandArrow::getArrowhHandlePosition */
+
+
+   void RubberbandArrow::constructArrowHandle()
+   {
+      if (Rubberband::_internal->_handleList.size() < 2) return;
+
+      const QPointF & p = getArrowHandlePosition();
+     
+      _internal->_arrowHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, p );
+     
+      // ensure thate the arrow the arrow size in pixel remain the same size
+      connect( _internal->_arrowHandle.get(), &RubberbandHandle::adjusted, this, [this]() {
+         this->_internal->_arrowHandle->updateCoordinate( this->getArrowHandleScenePosition() ); 
+         this->updateArrowPath();
+      } );
+      update();
+
+   } /* RubberbandArrow::constructArrowhHandle */
+
+
+   void RubberbandArrow::constructArrow( const QPointF & p )
+   {
+      qreal p0X = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate.x();
+      qreal p0Y = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate.y();
+      qreal p1X = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.x();
+      qreal p1Y = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.y();
+       
+      QPointF rv10( p0X-p1X  , p0Y-p1Y );
+      QPointF rv1p( p.x()-p1X, p.y()-p1Y );
+
+      rv10 /= sqrt(rv10.x()*rv10.x()+rv10.y()*rv10.y());
+
+      qreal scalarProduct = QPointF::dotProduct(rv1p, rv10);
+      if (scalarProduct > 0.0)
+      {
+         _internal->_arrowHandle->getCoordinate().updateSceneCoordinate( Rubberband::_internal->_mapView, p );
+         
+         _arrowSceneLength    = (unsigned int) scalarProduct;   
+         _arrowSceneHalfWidth = (unsigned int) sqrt( rv1p.x()*rv1p.x()+rv1p.y()*rv1p.y() - scalarProduct*scalarProduct );
+      }
+   } /* RubberbandArrow::constructArrow */
+
+
+   void RubberbandArrow::updateHandleScenePosition()
+   {
+      if (!_internal->_arrowHandle) return;
+
+      QPointF pos = getArrowHandleScenePosition();
+
+      _internal->_arrowHandle->updateCoordinate( pos );
+
+   } /* RubberbandArrow::updateHandleScenePosition */
+
+
+   void RubberbandArrow::updateArrowPath()
+   {
+      if (!_internal->_arrowHandle) return;
+
+      if (Rubberband::_internal->_handleList.size() < 2) return;
+
+      const QPointF & p0 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate;
+      const QPointF & p1 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+      const QPointF & p  = _internal->_arrowHandle->getCoordinate()._sceneCoordinate;
+
+      QPointF rv( p0.x()-p1.x(), p0.y()-p1.y() );
+      rv /= sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+      
+      if (!_internal->_arrowItem)
+      {
+         _internal->_arrowItem  = new DrawablePainterPath( Rubberband::_internal->_mapView );
+         _internal->_arrowItem -> enableClosedLine( true );
+         _internal->_arrowItem -> fillSolid( true );
+         _internal->_arrowItem -> zBufferPlane( RubberbandDrawable::ZBufferPlane::ArrowSymbol );
+      }
+
+      QVector<QPointF> arrowPath;
+
+      arrowPath.append( p1 );
+      arrowPath.append( p  );
+      arrowPath.append( QPointF( p1.x() + rv.x()*_arrowSceneLength + rv.y()*_arrowSceneHalfWidth 
+                               , p1.y() + rv.y()*_arrowSceneLength - rv.x()*_arrowSceneHalfWidth ) );
+
+      _internal->_arrowItem -> setPath( arrowPath );
+     
+      RubberbandFrameHandle * frameHandle = getFrameHandle();
+
+      if (frameHandle)
+      {
+         QVector<RubberbandHandle::RubberbandCoordinate>  vertexSet;
+
+         for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+         {
+            RubberbandPointHandle * pointHandlePtr  = dynamic_cast<RubberbandPointHandle*>(handle.get());
+    
+            vertexSet.append(pointHandlePtr->getCoordinate() );
+         }
+         vertexSet.append( _internal->_arrowHandle->getCoordinate() );
+         vertexSet.append( RubberbandDrawable::RubberbandCoordinate(Rubberband::_internal->_mapView,p) );
+       
+         frameHandle->updateFrameShape( vertexSet );
+      }
+   } /* RubberbandArrow::updateArrowPath */
+
+
+   bool RubberbandArrow::selectAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      Q_UNUSED(causer);
+
+      if (!rubberbandIsAlive()) return false;
+
+      bool    eventHandled = false;
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+      _baseInternal->_lastClickPosition = scenePos;
+
+      if (isEnabledConstructionState()) return RubberbandMultiPointFeature::selectAction(causer,x,y);
+      if (_internal->_arrowHandle->isPositionInside(scenePos))
+      {
+         _internal->_arrowHandle->setSelection();
+         eventHandled = true;
+      }
+      else eventHandled = selectHandles( x, y, scenePos );
+
+      if (eventHandled)
+      {
+         update();
+         deactivateButtons();
+      }
+      return eventHandled;
+   } /* RubberbandArrow::selectAction */
+
+
+   bool RubberbandArrow::setCoordinateAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      Q_UNUSED(causer);
+
+      if (!rubberbandIsAlive()) return false;
+
+      bool    eventHandled = false;
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      Rubberband::_internal->_lastClickPosition = scenePos;
+
+      if (isEnabledConstructionState()) return RubberbandMultiPointFeature::setCoordinateAction(causer, x, y);
+
+      if (_internal->_arrowHandle->isSelected())
+      {
+         _internal->_arrowHandle->setSelection(false);
+         constructArrow(scenePos);
+         eventHandled = true;
+      }
+      else return RubberbandMultiPointFeature::setCoordinateAction(causer, x, y);
+
+      if (eventHandled) update();
+
+      updateButtonPosition();
+
+      activateButtons();
+
+      return eventHandled;
+   } /* RubberbandArrow::setCoordinateAction */
+
+
+   bool RubberbandArrow::movePickedAction(AbstractEventDispatcher * causer, int x, int y )
+   {
+       if (!rubberbandIsAlive()) return false;
+
+       if ((_internal->_arrowHandle) && (_internal->_arrowHandle->isSelected()))
+       {
+          QPointF scenePos(pixel2ScenePosition(x,y));
+          constructArrow( scenePos );  
+          update();
+          return false; 
+       }
+
+       return RubberbandMultiPointFeature::movePickedAction(causer,x,y);
+
+   } /*  RubberbandArrow::movePickedAction */
+
+
+   bool RubberbandArrow::moveAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      if (_internal->_arrowHandle)
+      {
+         if (_internal->_arrowHandle->isPositionInside(scenePos))
+         {
+            _internal->_arrowHandle->setSelection(true);
+            return false;
+         }
+         _internal->_arrowHandle->setSelection(false);
+      }
+      return RubberbandMultiPointFeature::moveAction(causer,x,y);
+   } /* RubberbandArrow::moveAction */
+
+
+   bool RubberbandArrow::completeStateAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (isEnabledConstructionState())
+         {
+            if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount) 
+            {
+               constructArrowHandle();
+            }
+            update();
+         }
+      }
+      return RubberbandMultiPointFeature::completeStateAction(causer,x,y);;
+   } /* RubberbandArrow::completeStateAction */
+
+
+   void RubberbandArrow::update()
+   {
+      _isClosed = false;
+      RubberbandMultiPointFeature::update();
+
+      if (_internal->_arrowHandle)
+      {
+         _internal->_arrowHandle -> setDrawColor(_handleDrawColor );
+         _internal->_arrowHandle -> setFillColor(_handleFillColor );
+         _internal->_arrowHandle -> setSelectionColor(_handleSelectionColor );
+         _internal->_arrowHandle -> setPickingRatio( _pickingRatio );
+ 
+         updateHandleScenePosition();
+         updateArrowPath();
+      }
+   } /* RubberbandArrow::update */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.h
new file mode 100755
index 000000000..ca63b054f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_arrow.h
@@ -0,0 +1,130 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geoemtry with Arrow
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   21.08.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_multi_point_feature.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandLineHandle;
+   class RubberbandFrameHandle;
+
+   /**
+     @class RubberbandArrow rubberband_arrow.h
+     @brief Implementation of a rubberband for lines with arrow.
+     @see RubberbandFactory, Rubberband, RubberbandMultiPointFeature
+
+     Implementation of rubberbands used to input corridors. There are two different modes \c InputCenterLine and \c InputBoundary. In the 
+     InputCenterLine mode the center line of the corridor has to be defined. The rubberband displays then the border geometry.
+     In the InputBoundary mode one side of the border has to be defined. The \c coordinateVector methodes always working on the input geometry.
+   */
+   class SITUATIONMAP_EXPORT RubberbandArrow : public RubberbandMultiPointFeature
+   {
+      Q_OBJECT
+      public:
+         /**
+            @name Construction & Destruction
+            @{
+         */
+      private:
+
+         friend class RubberbandFactory;
+         explicit RubberbandArrow(  SituationMap::Map * map, QObject * parent = nullptr );
+       
+      public:
+         ~RubberbandArrow();
+         /** @} */
+
+
+          /**
+            Sets coordinates to modify to internal coordinate list.
+
+            @param coordinateVec List of coordinates to modify.
+            @param cs            Defines the coordinate system of returned coordinates.
+         */
+         void setCoordinateVector( const QVector<QPointF> & coordinateVec, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+          /**
+            Sets coordinates to modify to internal coordinate list. In \c InputCenterLine mode the coordinates will be interpreted as
+            center line of the corridor. In \c InputBoundary the coordinates are defining one border. Id \c corridorWidth is negative
+            the coordinates are the right border otherwise the left one.
+            
+            @param coordinateVec  List of coordinates to modify.
+            @param arrowHalfWidth Half width of arrow in pixel.
+            @param arrowLength    Length of arrow in pixel.
+            @param cs             Defines the coordinate system of returned coordinates.
+         */
+         void setCoordinateVectorArrow(const QVector<QPointF> & coordinateVec, unsigned int arrowHalfWidth, unsigned int arrowLength, CoordinateSystem cs = CoordinateSystem::Geo );
+        
+
+         /**
+           Return the width of the corridor.
+         */
+         unsigned int arrowHalfWidth() const; 
+         unsigned int arrowLength() const;
+        
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+       
+      protected:
+          /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         unsigned int     _arrowSceneHalfWidth;
+         unsigned int     _arrowSceneLength;
+         
+         void update() override;
+
+        
+         void updateArrowPath();
+         void updateHandleScenePosition();
+
+         void constructArrow( const QPointF & p );
+         void constructArrowHandle();
+
+         QPointF getArrowHandleScenePosition();
+         QPointF getArrowHandlePosition();
+
+         
+
+   }; /* RubberbandCorridor */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.cpp
new file mode 100755
index 000000000..3f99b1220
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.cpp
@@ -0,0 +1,654 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_base.h"
+#include "rubberband_base_internal.h"
+#include "rubberband_handle_proxy.h"
+
+#include "rubberband_factory.h"
+
+#include <Common/exception.h>
+
+#include <Map/coord_translation_functor.h>
+#include <MapImpl/map_impl.h>
+
+// Qt
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMetaMethod>
+
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtGui/QPixmap>
+
+#include "apply.xpm"
+#include "abort.xpm"
+#include "undo.xpm"
+
+   static SituationMap::Map * currentFactoryMap        = nullptr;
+   static bool                allowMultipleRubberbands = false;
+
+
+namespace SituationMap { namespace RB
+{
+   QPixmap * RubberbandBase::BaseInternalData::_applyIcon  = nullptr;
+   QPixmap * RubberbandBase::BaseInternalData::_abortIcon  = nullptr;
+   QPixmap * RubberbandBase::BaseInternalData::_undoIcon   = nullptr;
+
+   RubberbandBase::BaseInternalData::BaseInternalData( SituationMap::Map * map, RubberbandBase * me )
+     : _map(map)
+     , _mapCtFunctor(map->coordTranslationFunctor())
+     , _isActive(false)
+     , _applyIsPossible(false)
+     , _undoIsPossible(false)
+     , _hasUndoButton(false)
+     , _lastClickPosition(-1,-1)
+     , _buttonBoxSceneAnchor()
+     , _buttonBoxFixPosition(-1,-1)
+     , _buttonProxy()
+     , _updateFunctorList()
+     , _logger(getLogger("RubberbandBase"))
+   {
+     QGraphicsView * view = map->getQGraphicsView();
+    
+     if (view)
+     {
+       _restoreCursor = view->viewport()->cursor(); // workaround Qt bug. remove when fixed
+     }
+
+     _buttonBox  = new QWidget();
+     _buttonBox->setObjectName(QLatin1String("RBButtonBoxWidget"));
+     _buttonBox->hide();
+     _buttonBox->setAttribute( Qt::WidgetAttribute::WA_NoSystemBackground, true );
+
+     _applyButton  = new QPushButton( (_applyIcon) ? *_applyIcon : QPixmap(apply_xpm), QString(), _buttonBox );
+     _applyButton -> setAttribute( Qt::WidgetAttribute::WA_NoSystemBackground, true );
+     _applyButton -> setObjectName(QLatin1String("RBApply"));
+     _applyButton -> setAttribute(Qt::WA_AcceptTouchEvents);
+     _applyButton -> grabGesture( Qt::GestureType::TapGesture );
+     me->connect( _applyButton, &QPushButton::clicked, me, &RubberbandBase::onDo_applyButtonClicked );
+
+     _cancelButton  = new QPushButton( (_abortIcon) ? *_abortIcon : QPixmap(abort_xpm), QString(), _buttonBox );
+     _cancelButton -> setAttribute( Qt::WidgetAttribute::WA_NoSystemBackground, true );
+     _cancelButton -> setObjectName(QLatin1String("RBCancel"));
+     _cancelButton -> setAttribute(Qt::WA_AcceptTouchEvents);
+     _cancelButton -> grabGesture( Qt::GestureType::TapGesture );
+     me->connect( _cancelButton, &QPushButton::clicked, me, &RubberbandBase::onDo_cancelButtonClicked );
+
+     _undoButton  = new QPushButton( (_undoIcon) ? *_undoIcon : QPixmap(undo_xpm), QString(), _buttonBox );
+     _undoButton -> setAttribute( Qt::WidgetAttribute::WA_NoSystemBackground, true );
+     _undoButton -> setObjectName(QLatin1String("RBUndo"));
+     _undoButton -> setAttribute(Qt::WA_AcceptTouchEvents);
+     _undoButton -> grabGesture( Qt::GestureType::TapGesture );
+     _undoButton -> hide();
+     me->connect( _undoButton, &QPushButton::clicked, me, &RubberbandBase::onDo_undoButtonClicked );
+
+     _buttonLayout = new QHBoxLayout( _buttonBox );
+     _buttonLayout->setObjectName(QLatin1String("RBButtonBoxLayoutHBox"));
+
+     _buttonLayout -> addWidget( _undoButton   );
+     _buttonLayout -> addWidget( _cancelButton );
+     _buttonLayout -> addWidget( _applyButton  );
+
+   } /* InternalData */
+
+
+   Rubberband::BaseInternalData::~BaseInternalData()
+   {
+     _map          = nullptr;
+     _mapCtFunctor = nullptr;
+
+     _buttonProxy = nullptr;      // delete RefPointer
+     if (_buttonBox) _buttonBox -> deleteLater(); // delete all widgets of button box
+
+     _buttonBox              = nullptr;
+     _buttonLayout           = nullptr;
+     _applyButton            = nullptr;
+     _cancelButton           = nullptr;
+     _undoButton             = nullptr;
+
+   } /* ~InternalData */
+
+
+   bool RubberbandBase::BaseInternalData::buttonProxyActive( const QPointF & pos ) const
+   {
+     if (_buttonProxy)
+     {
+       return ((_buttonProxy->isVisible()) && (_buttonProxy->isPositionInside(pos)));
+     }
+     return false;
+   } /* bool RubberbandBase::BaseInternalData::buttonProxyActive( const QPointF & pos ) const*/
+
+
+   void RubberbandBase::BaseInternalData::enableAndShowOnlyPossibleButtons()
+   {
+     _applyButton->setEnabled(_applyIsPossible);
+
+     if (_undoButton)
+     {
+       if (_hasUndoButton)
+       {
+         _undoButton -> show();
+       }
+       _undoButton -> setEnabled(_undoIsPossible);
+     }
+   } /* void RubberbandBase::InternalData::showOnlyPossibleButtons() */
+
+
+   static QHash<SituationMap::Map*, QList<RubberbandBase*>> &activeRubberbands()
+   {
+     static QHash<SituationMap::Map*, QList<RubberbandBase*>> hashTable;
+     return hashTable;
+   } // activeRubberbands()
+
+
+   void RubberbandBase::currentFactoryMap(SituationMap::Map * map) { ::currentFactoryMap        = map;  }
+   void RubberbandBase::allowMultipleRubberbands( bool ok )        { ::allowMultipleRubberbands = ok;   }
+
+
+   void * RubberbandBase::operator new(size_t bytes)
+   {
+      QString exceptionMsg;
+
+      // be careful it is not thread safe here
+      if (::currentFactoryMap)
+      {
+         bool doNew( ::allowMultipleRubberbands );
+
+         if (!doNew)
+         {
+            doNew = true;
+            const auto rubberbands = SituationMap::RB::activeRubberbands().value(::currentFactoryMap);
+            for (const auto rbnd : rubberbands)
+            {
+               if (rbnd->rubberbandIsAlive())
+               {
+                 doNew = false;
+                 break;
+               }
+            }
+         }
+
+         if (doNew)
+         {
+            RubberbandBase::currentFactoryMap( nullptr );
+            RubberbandBase::allowMultipleRubberbands( false );
+            return ::operator new(bytes);
+         }
+         else exceptionMsg = QLatin1String("Another rubberband is already alive at moment");
+         RubberbandBase::currentFactoryMap( nullptr );
+      }
+      else exceptionMsg = QLatin1String("Use rubberband factory to create rubberbands. Calling new directly is forbidden!");
+
+      RubberbandBase::currentFactoryMap( nullptr );
+      RubberbandBase::allowMultipleRubberbands( false );
+
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * because "return nullptr;" is not compliante with the c++ standard
+       * throw exception instead
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+      throw Exception( __FILE__, __LINE__, exceptionMsg );
+
+   } /*  RubberbandBase::operator new */
+
+
+   QList<RubberbandBase*> RubberbandBase::activeRubberbands( SituationMap::Map * map )
+   {
+     QList<RubberbandBase*> ret;
+     const auto rubberbands = SituationMap::RB::activeRubberbands().value(map);
+     for (const auto rbnd : rubberbands)
+     {
+       if (rbnd && rbnd->rubberbandIsAlive())
+         ret += rbnd;
+     }
+     return ret;
+   } /* RubberbandBase::activeRubberbands */
+
+   void RubberbandBase::deleteAllActiveRubberbands(Map *map)
+   {
+     const QList<SituationMap::RB::RubberbandBase*> &rbCont = RubberbandBase::activeRubberbands(map);
+     qDeleteAll(rbCont);
+   } /* RubberbandBase::deleteAllActiveRubberbands */
+
+
+   bool RubberbandBase::isRubberbandActive(SituationMap::Map * map)
+   {
+     return (activeRubberbands(map).size() > 0);
+   } /* RubberbandBase::isRubberbandActive */
+
+   
+   void RubberbandBase::abortActiveRubberbands( SituationMap::Map * map )
+   {
+     const QList<RubberbandBase*> & rbList = activeRubberbands(map);
+     for (auto rb : rbList)
+     {
+       emit rb->abort(rb);
+       rb->doAutoDelete();
+     }
+   } /* RubberbandBase::abortActiveRubberbands */
+
+
+   void RubberbandBase::deleteMySelf()
+   {
+     if (_viewPortEventDispatcher) _viewPortEventDispatcher -> onDo_kickTheBucket();
+     if (_viewPortEventDispatcher) _viewPortEventDispatcher -> onDo_delete();
+     if (_windowEventDispatcher)   _windowEventDispatcher   -> onDo_delete();
+
+     _viewPortEventDispatcher = nullptr;
+     _windowEventDispatcher   = nullptr;
+     _baseInternal->_isActive     = false;
+
+     deleteLater();
+   } /* RubberbandBase::deleteMySelf */
+
+
+   RubberbandBase::RubberbandBase(  SituationMap::Map * map, QObject * parent, bool isActive )
+      : QObject( parent )
+      , EventActionInterface()
+      , _baseInternal( new RubberbandBase::BaseInternalData(map,this) )
+      , _drawColor(QColor("black"))
+      , _fillColor(QColor("black"))
+      , _handleDrawColor(QColor("black"))
+      , _handleFillColor(QColor("yellow"))
+      , _handleSelectionColor(QColor("red"))
+      , _frameColor(QColor("black"))
+      , _frameFillColor(QColor(150,150,0,50))
+      , _frameSelectionColor(QColor(255,0,0,50))
+      , _frameHandleMargin(10)
+      , _pickingRatio(0)
+      , _finishAfterConstruction(true)
+      , _autoDelete(false)
+      , _viewPortEventDispatcher(nullptr)
+      , _windowEventDispatcher  (nullptr)
+      , _userData(nullptr)
+   {
+      _fillColor.setAlpha(100);
+
+      if (isActive) activate();
+
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * In case of multiple rubberbands can be active, it is forbidden to
+       * create a rubberband of the same type twice anyway.
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+      bool rubberbandOfSameTypeIsActive = false;
+      const auto rubberbands =  SituationMap::RB::activeRubberbands().value(map);
+      for (auto rbnd : rubberbands)
+      {
+         // Just to check the class names with debugger
+         // const char * rbndName = typeid(*rbnd).name();
+         // const char * thisName = typeid(*this).name();
+
+         if (( typeid(*rbnd) == typeid(*this)) && rbnd->rubberbandIsAlive())
+         {
+            rubberbandOfSameTypeIsActive = true;
+            break;
+         }
+      }
+
+      if (rubberbandOfSameTypeIsActive)
+      {
+         // disable dispatcher, so the rubberband is not alive yet.
+         if (_viewPortEventDispatcher)
+         {
+            _viewPortEventDispatcher -> onDo_kickTheBucket();
+            _viewPortEventDispatcher -> onDo_delete();
+         }
+         if (_windowEventDispatcher)   _windowEventDispatcher->onDo_delete();
+         _viewPortEventDispatcher = nullptr;
+         _windowEventDispatcher   = nullptr;
+      }
+      else
+      {
+         SituationMap::RB::activeRubberbands()[map].append( this );
+         if (_windowEventDispatcher)
+         {
+            _windowEventDispatcher->setCursor(QCursor(Qt::CrossCursor));
+            _windowEventDispatcher->grab();
+         }
+         if (_viewPortEventDispatcher)
+         {
+           _viewPortEventDispatcher->setCursor(QCursor(Qt::CrossCursor));
+           _viewPortEventDispatcher->grab();
+         }
+      }
+
+      if (map) 
+      {
+        /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         *
+         * Sending signals of RubberbandFactory to inform about rubberband creation and destroy would be
+         * better placed in RubberbandFactory source (rubberband_factory.cpp) but there it's a lot of
+         * more writing stuff ...
+         * 
+         * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+        SituationMap::RB::RubberbandFactory & rbndFactory = map -> rubberbandFactory();
+        emit rbndFactory.rubberbandCreated();
+
+        connect( this, &QObject::destroyed, &rbndFactory, &SituationMap::RB::RubberbandFactory::rubberbandDestroyed );
+      }
+
+   } /* RubberbandBase::RubberbandBase */
+
+
+   RubberbandBase::~RubberbandBase()
+   {
+      if (_viewPortEventDispatcher) _viewPortEventDispatcher -> onDo_kickTheBucket();
+      if (_viewPortEventDispatcher) _viewPortEventDispatcher -> onDo_delete();
+      if (_windowEventDispatcher)   _windowEventDispatcher   -> onDo_delete();
+
+      _viewPortEventDispatcher  = nullptr;
+      _windowEventDispatcher    = nullptr;
+
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * Test if map has been already destroyed. If map exists all is nice ...
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+      if (_baseInternal->_map)
+      {
+        SituationMap::RB::activeRubberbands()[_baseInternal->_map].removeOne( this );
+        emit finished( this );
+      }
+      else
+      {
+        /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         * ... otherwise we have to search the rubberband
+         * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+        const auto rubberbands = SituationMap::RB::activeRubberbands();
+        for (auto rubberList : rubberbands)
+          rubberList.removeOne(this);
+      }
+
+      delete _baseInternal;
+      _baseInternal = nullptr;
+
+   } /* RubberbandBase::~RubberbandBase */
+
+
+   QPointF RubberbandBase::projectCoordinateToMap( CoordinateSystem cs, const QPointF & loc ) const
+   {
+     return (cs != CoordinateSystem::Geo || !_baseInternal->_mapCtFunctor) ? loc : _baseInternal->_mapCtFunctor->geographicToMap( loc );
+   } /* RubberbandBase::projectCoordinateToMap */
+
+
+   QPointF RubberbandBase::projectCoordinateFromMap( CoordinateSystem cs, const QPointF & loc ) const
+   {
+     return (cs != CoordinateSystem::Geo || !_baseInternal->_mapCtFunctor) ? loc : _baseInternal->_mapCtFunctor->mapToGeographic( loc );
+   } /* RubberbandBase::projectCoordinateFromMap */
+
+
+   QPointF RubberbandBase::projectCoordinateFromMap( CoordinateSystem cs, const Esri::ArcGISRuntime::Point & loc ) const
+   {
+     return (cs != CoordinateSystem::Geo || !_baseInternal->_mapCtFunctor) ? QPointF(loc.x(), loc.y()) : _baseInternal->_mapCtFunctor->mapToGeographic( loc );
+   } /* RubberbandBase::projectCoordinateFromMap */
+
+
+
+   void RubberbandBase::activate()
+   {
+     if (!_baseInternal->_map) return;
+
+     if (!_baseInternal->_isActive)
+     { 
+       QGraphicsView * view = _baseInternal->_map->getQGraphicsView();
+       if (view)
+       {
+         _viewPortEventDispatcher = new EventDispatcher(view->viewport(), this);
+         _windowEventDispatcher   = new EventDelegater(view, _viewPortEventDispatcher);
+         _baseInternal->_isActive = true;
+
+         MapImpl *mapImpl = static_cast<MapImpl*>(_baseInternal->_map.data());
+
+         connect(_viewPortEventDispatcher.data(), &EventDispatcher::mouseMovedEvent,
+                 mapImpl, &MapImpl::onHandleMouseMove);
+       }
+     }
+   } /* RubberbandBase::activate */
+
+
+   bool RubberbandBase::autoSelectAction(int x, int y)
+   {
+     _viewPortEventDispatcher->_leftPressHandled = true;
+     return selectAction(nullptr,x,y);
+   } /* RubberbandBase::autoSelectAction */
+
+
+   void RubberbandBase::installExternalUpdate(const std::function<bool(RubberbandBase*)> & updateFunctor)
+   {
+     _baseInternal->_updateFunctorList << updateFunctor;
+   } //  void RubberbandBase::installExternalUpdate( const std::function<bool(RubberbandBase*)> & updateFunctor)
+
+
+   void RubberbandBase::externalUpdate()
+   {
+     for (const auto &update : qAsConst(_baseInternal->_updateFunctorList))
+     {
+       if (!update(this))
+          break;
+     }
+   } // void RubberbandBase::externalUpdate()
+
+
+
+   void RubberbandBase::updateButtonPosition()
+   {
+      if ((_baseInternal->_lastClickPosition.x() < 0) || (_baseInternal->_lastClickPosition.y() < 0))
+        _baseInternal->_buttonBoxSceneAnchor = sceneBbox().bottomRight();
+      else
+        _baseInternal->_buttonBoxSceneAnchor = _baseInternal->_lastClickPosition;
+
+      // _internal->_mapView->update();
+   } /* RubberbandBase::updateButtonPosition */
+
+
+   void RubberbandBase::setFixedButtonBoxPosition( QPoint widgetPos )
+   {
+      _baseInternal->_buttonBoxFixPosition = widgetPos;
+      activateButtons();
+   } /* RubberbandBase::setFixedButtonBoxPosition */
+
+
+   void RubberbandBase::unsetFixedButtonBoxPosition()
+   {
+      _baseInternal->_buttonBoxFixPosition = QPoint(-1,-1);
+
+      if (_baseInternal->_buttonProxy)
+      {
+         _baseInternal->_buttonProxy->setPos( _baseInternal->_buttonBoxSceneAnchor );
+      }
+   } /* RubberbandBase::unsetFixedButtonBoxPosition */
+
+
+   bool RubberbandBase::isButtonBoxPositionFixed()  { return ((_baseInternal->_buttonBoxFixPosition.x() >= 0) && (_baseInternal->_buttonBoxFixPosition.y() >= 0)); }
+
+
+   void RubberbandBase::onDo_updateButtonFixCoordinates()
+   {
+      if (!_baseInternal->_buttonProxy) return;
+
+      if (isButtonBoxPositionFixed())
+      {
+         // Don't use bottom right corner of rubberband bbox to place the buttons,
+         // rather than use fixed window position.
+
+         const QPoint & pos = _baseInternal->_buttonBoxFixPosition;
+         _baseInternal->_buttonProxy->setPos( pixel2ScenePosition(pos.x(),pos.y()) );
+      }
+   } /* RubberbandStateSelect::onDo_updateButtonFixCoordinates */
+
+
+   void RubberbandBase::activateButtons()
+   {
+      DEBUG_LOG(_baseInternal->_logger) << LOGFUNCTION;
+      if (!_baseInternal->_buttonProxy)
+      {
+         _baseInternal->_buttonProxy = new RubberbandHandleProxy( _baseInternal->_map->getQGraphicsView(), _baseInternal->_buttonBox );
+         _baseInternal->_buttonProxy->setRestoreCursor( _baseInternal->_restoreCursor ); // workaround Qt bug. remove when fixed
+
+         connect( _baseInternal->_buttonProxy.get(), &RubberbandHandleProxy::adjusted, this, [this]()
+         {
+            this->_baseInternal->_buttonBoxSceneAnchor = this->_baseInternal->_buttonProxy->getCoordinate()._sceneCoordinate;
+         } );
+      }
+
+      _baseInternal->enableAndShowOnlyPossibleButtons();
+
+      if (isButtonBoxPositionFixed())
+      {
+         const QPoint & pos = _baseInternal->_buttonBoxFixPosition;
+         _baseInternal->_buttonProxy->setPos( pixel2ScenePosition(pos.x(),pos.y()) );
+         _baseInternal->_buttonProxy->setSceneOffset( QPointF(0,0) );
+
+      }
+      else
+      {
+         _baseInternal->_buttonProxy->setPos( _baseInternal->_buttonBoxSceneAnchor );
+         _baseInternal->_buttonProxy->setSceneOffset( QPointF(_frameHandleMargin+5,_frameHandleMargin+5) );
+      }
+
+      _baseInternal->_buttonProxy->show();
+
+   } /* Rubberband::activateButtons */
+
+
+   void RubberbandBase::deactivateButtons()
+   {
+      DEBUG_LOG(_baseInternal->_logger) << LOGFUNCTION;
+      if (isButtonBoxPositionFixed()) return;
+      if  (_baseInternal->_buttonProxy) _baseInternal->_buttonProxy->hide();
+   } /* RubberbandBase::deactivateButtons() */
+
+
+   void RubberbandBase::adjustButtons()
+   {
+     if (_baseInternal->_buttonProxy)
+     {
+       activateButtons();
+     }
+   } /* RubberbandBase::adjustButtons */
+
+
+   void RubberbandBase::applyButtonClicked()
+   {
+      completeStateAction( _viewPortEventDispatcher, 0.0, 0.0 );
+   } /* RubberbandBase::applyButtonClicked */
+
+
+   void RubberbandBase::cancelButtonClicked()
+   {
+      abortAction( _viewPortEventDispatcher, 0.0, 0.0 );
+   } /* RubberbandBase::cancelButtonClicked */
+
+
+   void RubberbandBase::undoButtonClicked()
+   {
+      undoAction( _viewPortEventDispatcher, 0.0, 0.0 );
+   } /* RubberbandBase::undoButtonClicked */
+
+
+   void RubberbandBase::resetIconsToDefault()
+   {
+      if (BaseInternalData::_applyIcon) { delete BaseInternalData::_applyIcon;  BaseInternalData::_applyIcon = nullptr; }
+      if (BaseInternalData::_abortIcon) { delete BaseInternalData::_abortIcon;  BaseInternalData::_abortIcon = nullptr; }
+      if (BaseInternalData::_undoIcon ) { delete BaseInternalData::_undoIcon;   BaseInternalData::_undoIcon  = nullptr; }
+   } /* RubberbandBase::resetIconsToDefault */
+
+
+   void RubberbandBase::setIconApply(const QPixmap & icon)
+   {
+      if (BaseInternalData::_applyIcon == nullptr) BaseInternalData::_applyIcon  = new QPixmap(icon);
+      else                                         *BaseInternalData::_applyIcon = icon;
+   } /* RubberbandBase::setIconApply */
+
+
+   void RubberbandBase::setIconAbort(const QPixmap & icon)
+   {
+      if (BaseInternalData::_abortIcon == nullptr) BaseInternalData::_abortIcon  = new QPixmap(icon);
+      else                                         *BaseInternalData::_abortIcon = icon;
+   } /* RubberbandBase::setIconAbort */
+
+
+   void RubberbandBase::setIconUndo(const QPixmap & icon)
+   {
+      if (BaseInternalData::_undoIcon == nullptr) BaseInternalData::_undoIcon  = new QPixmap(icon);
+      else                                        *BaseInternalData::_undoIcon = icon;
+   } /* RubberbandBase::setIconUndo */
+
+
+   QPointF RubberbandBase::pixel2ScenePosition( int x, int y ) const
+   {
+     QGraphicsView * view = _baseInternal->_map->getQGraphicsView();
+     return (view) ? view->mapToScene(x, y) : QPointF(x,y);
+   } /* RubberbandBase::pixel2ScenePosition */
+
+
+   bool RubberbandBase::buttonPositionAction(AbstractEventDispatcher *, int x, int y)
+   {
+     QPointF scenePos(pixel2ScenePosition(x,y));
+
+     if (!_baseInternal->buttonProxyActive(scenePos))
+     {
+       _baseInternal->_buttonBoxSceneAnchor = scenePos;
+       adjustButtons();
+     }
+     return false;
+   } /* bool RubberbandBase::buttonPositionAction(AbstractEventDispatcher * causer, int x, int y) */
+
+
+   void RubberbandBase::unlinkEventDispatcher( AbstractEventDispatcher*  )
+   {
+     _viewPortEventDispatcher = nullptr;
+     _windowEventDispatcher   = nullptr;
+
+   } /* RubberbandBase::unlinkEventDispatcher */
+
+
+   bool RubberbandBase::abortAction( AbstractEventDispatcher * causer, int, int )
+   {
+     _baseInternal->_buttonBox->hide();
+
+     if (causer) causer->onDo_kickTheBucket();
+
+     emit abort( this );
+     doAutoDelete();
+     return true;
+   } /* RubberbandBase::abortAction */
+
+
+   bool RubberbandBase::applyAndEndAction( AbstractEventDispatcher * causer, int,int )
+   {
+     _baseInternal->_buttonBox->hide();
+
+     if (causer) causer->onDo_kickTheBucket();
+
+     emit apply( this );
+     doAutoDelete();
+     return true;
+   } /* RubberbandBase::applyAndEndAction */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.h
new file mode 100755
index 000000000..d43ea7ca5
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base.h
@@ -0,0 +1,500 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include "event_dispatcher.h"
+#include "event_delegater.h"
+
+#include <Map/map.h>
+#include <Common/ref_pointer.h>
+
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+
+#include <QtGui/QColor>
+
+#include <memory>
+
+
+namespace Esri {
+namespace ArcGISRuntime {
+  class MapGraphicsView;
+  class Point;
+} }
+
+
+
+namespace SituationMap
+{
+
+/**
+   Namespace for all rubberband stuff (is part of namespace SituationMap)
+*/
+namespace RB
+{
+   /**
+   */
+   enum class CoordinateSystem
+   {
+      Map,
+      Geo
+   };
+
+
+   /**
+     @class RubberbandBase rubberband_base.h
+     @brief Base class of all Rubberbands
+
+     Rubberbands are used to create or modifiy geometries like lines, circles, polygons etc. by processing
+     Qt input events like keyboard and mouse events. To create a rubberband the RubberbandFactory has to be used.
+     At end of rubberband processing the signal \c abort or\c apply are emitted. To delete the rubberband the
+     function deleteMySelf must be called. To use the delete operator is dangerous because at end of signal
+     processing some program code may be performed.
+
+     Example to how to use rubberband:
+
+     @code
+
+        SituationMap::Map & map = ...
+
+        const RubberbandFactory & rubberbandFactory = map.rubberbandFactory();
+
+        RubberbandPointFeature * rubberband = rubberbandFactory.create<RubberbandPointFeature>();
+        if (rubberband != nullptr)
+        {
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::apply, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // rubberband has finished input
+              if (rubberband)
+              {
+                 const QVector<QPointF> & vertexList = rubberband->coordinateVector();
+
+                 // do something with vertexList
+
+                 rubberband->deleteMySelf();  // notice don't call here delete rubberband directly !!!
+              }
+           } );
+
+           QObject::connect( rubberband, &SiMapRubBnd::Rubberband::abort, this, [=](SiMapRubBnd::Rubberband * rubberband )
+           {
+              // Rubberband has been aborted by user
+              if (rubberband)
+              {
+                 rubberband->deleteMySelf(); // notice don't call here delete rubberband directly !!!
+              }
+           } );
+        }
+
+     @endcode
+
+     Following keyboard commands are available in active rubberbands:
+
+     | Key    | Modifier | Funktion                                                                     |
+     | :----: |:-------: | :--------------------------------------------------------------------------- |
+     | Esc    |          | Rubberband abbrechen                                                         |
+     | Return |          | Rubberband abschließen und Eingabe übernehmen wenn möglich, sonst Abbruch    |
+     | Left   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach links schieben             |
+     | Right  |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach rechts schieben            |
+     | Up     |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach oben schieben              |
+     | Down   |          | Selektierten Handle (Punkt,Frame) um 1 Pixel nach unten schieben             |
+     | Left   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach links schieben            |
+     | Right  | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach rechts schieben           |
+     | Up     | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach oben schieben             |
+     | Down   | Shift    | Selektierten Handle (Punkt,Frame) um 10 Pixel nach unten schieben            |
+
+     @see EventDispatcher
+     @see Rubberband, RubberbandPointFeature, RubberbandPointCluster, RubberbandMultiPointFeature, RubberbandRectangle, RubberbandEllipse, RubberbandCorridor, RubberbandArrow
+          Rubberband3D, RubberbandPointFeature3D, RubberbandMultiPointFeature3D
+
+   */
+
+   class SITUATIONMAP_EXPORT RubberbandBase : public QObject, public EventDispatcher::EventActionInterface
+   {
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * Because class EventDispatcher::EventActionInterface is a pure virtual interface function the classic way of declaration would be
+       *
+       *   SITUATIONMAP_EXPORT Rubberband : public QObject, public virtual EventDispatcher::EventActionInterface
+       *
+       * But with Visual Studio 2013 virtual inheritance combined with constructor delegation doesn't work and may crash the program. In
+       * this case the virtual inheritance of EventActionInterface isn't need because in the derived classes multiple inheritance will
+       * not be used.
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+      Q_OBJECT
+
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+      public:
+
+         /**
+           Constructs a Rubberband for a situation map. Use \c RubberbandFactor to create a rubberband.
+           In case of the user actions the autoDelete mechanism can be used to delete the rubberband. Sometimes
+           the application wants to finish a running rubberband. This can be done by calling \c deleteMySelf. The
+           rubberband will be destroyed also automatically if the parent QObject or the map (see
+           SituationMap::Map::beginDestroy signal) will be destroyed.
+
+           @param map     Pointer to SituationMap::Map
+           @param parent  Pointer to QObject to use as parent.
+           @isActive      If set to false the Rubberband is not active and have to be actived to start the input.
+           @see RubberbandFactory
+         */
+         RubberbandBase( SituationMap::Map * map, QObject * parent, bool isActive = true  );
+
+         ~RubberbandBase();
+         /** @} */
+
+         /**
+         Activate rubberband if it has been created with \c isActive = false.
+         */
+         void activate();
+
+         /**
+           Provides a list of active rubberbands for a situation map.
+         */
+         static QList<RubberbandBase*> activeRubberbands( SituationMap::Map * map );
+
+         /**
+           Delete active rubberbands for a situation map.
+         */
+         static void deleteAllActiveRubberbands( SituationMap::Map * map );
+
+         /**
+           Use deleteMySelft instead of delete operator to avoid dangling this pointerin Qt signal processing. It calls delete this; later on.
+         */
+         void deleteMySelf();
+
+         /**
+           If setting auto delete flag to true the delete will be done automatically after sending signal abort or apply.
+           The default value of auto delete flag is false.
+           @{
+         */
+         inline void setAutoDelete(bool on) { _autoDelete = on; }
+
+
+         inline bool autoDelete() const     { return _autoDelete; }
+         /** @} */
+
+         /**
+           Returns true if the rubberband is already alive. Should be tested after creation of a rubberband because it is
+           possibled to create not living rubberbands, e.g. a rubberband was create twice and the first one has not finished
+         */
+         inline bool rubberbandIsAlive() const { return !_viewPortEventDispatcher.isNull(); }
+
+         /** A single user action step has finished. Interim results can be used to show a preview now.
+          */
+         void userActionFinished() override { emit interimResultsChanged(this); }
+
+         /**
+           @name ColorSettings Methodes to define visual behaviour of rubberband
+           @{
+         */
+         inline void setDrawColor           (const QColor  & col   )  { _drawColor            = col;    update(); }  ///< set color for general drawing
+         inline void setFillColor           (const QColor  & col   )  { _fillColor            = col;    update(); }  ///< set color for general filling
+         inline void setHandleDrawColor     (const QColor  & col   )  { _handleDrawColor      = col;    update(); }  ///< set color for drawing handles
+         inline void setHandleFillColor     (const QColor  & col   )  { _handleFillColor      = col;    update(); }  ///< set color for filling handles
+         inline void setHandleSelectionColor(const QColor  & col   )  { _handleSelectionColor = col;    update(); }  ///< set handle selection color
+         inline void setFrameColor          (const QColor  & col   )  { _frameColor           = col;    update(); }  ///< set frame handle outline color
+         inline void setFrameFillColor      (const QColor  & col   )  { _frameFillColor       = col;    update(); }  ///< set frame handle fill color
+         inline void setFrameHandleMargin   (int  margin           )  { _frameHandleMargin    = margin; update(); }  ///< set margin of frame in pixel
+
+         inline void setPickingRatio        (unsigned int    size  )  { _pickingRatio         = size;   update(); }  ///< set size of point handles
+         inline void setLineHandleWidth     (unsigned int    width )  { _lineHandleWidth      = width;  update(); }  ///< set width of line handles
+
+         inline const QColor  getDrawColor ()           const { return _drawColor; }                 ///< get color for general drawing
+         inline const QColor  getFillColor ()           const { return _fillColor; }                 ///< get color for general filling
+         inline const QColor  getHandleDrawColor()      const { return _handleDrawColor; }           ///< get color for drawing handles
+         inline const QColor  getHandleFillColor()      const { return _handleFillColor; }           ///< get color for filling handles
+         inline const QColor  getHandleSelectionColor() const { return _handleSelectionColor; }      ///< get handle selection color
+         inline const QColor  getFrameColor()           const { return _frameColor; }                ///< get frame handle outline color
+         inline const QColor  getFrameFillColor()       const { return _frameFillColor; }            ///< get frame handle fill color
+         inline int           getFrameHandleMargin()    const { return _frameHandleMargin; }         ///< get margin of frame in pixel
+
+         inline unsigned int  getPickingRatio()         const { return _pickingRatio; }              ///< get size of point handles
+         /** @} */
+
+         bool applyAndEndAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool abortAction             ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+          /**
+            @name Set icons for rubberband buttons
+
+            In case of the application doesn't use the default rubberband icons other icons can be set with the setIcon functions. This redefine
+            of the button icons have to be done before creating a rubberband.
+            @{
+         */
+         static void setIconApply( const QPixmap & );
+         static void setIconAbort( const QPixmap & );
+         static void setIconUndo ( const QPixmap & );
+
+         static void resetIconsToDefault();
+         /** @} */
+
+         /**
+         Start Rubberband mouse input automatically by program
+         */
+         bool autoSelectAction( int x, int y );
+
+         /**
+           If set to true the rubberband will send apply signal after leaving construction state and ends
+           otherwise it continues in modification state. Default value is true.
+         */
+         inline void enableFinishAfterConstruction(bool flag) { _finishAfterConstruction = flag; }
+
+
+         /**
+           Defines fixed widget position of rubberband button box
+         */
+         void setFixedButtonBoxPosition( QPoint widgetPos );
+
+
+         /**
+           Undefines fixed widget position. The rubberband button box will be placed at the bottom right coner of
+           the rubberbands bounding box.
+         */
+         void unsetFixedButtonBoxPosition();
+
+         /**
+           Returns true if a fixed widget position of rubberband button box is used.
+         */
+         bool isButtonBoxPositionFixed();
+
+         /**
+         @name EventHandlerInterface Methodes of AbstractEventDispatcher::EventActionInterface
+         The interface between EventDispatcher and Rubberband are defined in class AbstractEventDispatcher.
+         To Implement the interface these methodes have to be override again in the derived classes of the Rubberband class. */
+         /**
+         @{
+         */
+
+         bool buttonPositionAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+         void unlinkEventDispatcher   ( AbstractEventDispatcher * causer ) override;
+
+         /** @} */
+
+
+         /**
+           Returns true if the coordinates are valid elsewise false
+         */
+         virtual bool coordinatesAreValid() const { return true; }
+
+
+         /**
+           Returns count of coordinates
+         */
+         virtual unsigned int coordinateCount() const = 0;
+
+         /**
+            Returns constructed or modified coordinates
+            @param cs     Defines the coordinate system of returned coordinates.
+         */
+         virtual QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const = 0;
+
+         /**
+            Returns a single coordinate from rubberbands coordinate list
+            @param idx    index of coordinate
+            @param cs     Defines the coordinate system of returned coordinate.
+         */
+         virtual QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const = 0;
+
+         /**
+            Sets coordinates to modify to internal coordinate list
+
+            @param pntList List of coordinates to modify
+            @param cs     Defines the coordinate system of input coordinates.
+         */
+         virtual void setCoordinateVector( const QVector<QPointF> & pntList, CoordinateSystem cs = CoordinateSystem::Geo  ) = 0;
+
+         /**
+           Set user defined informations to this rubberband
+         */
+         inline void   setUserData(void * p)
+         {
+           _userData = p;
+         }
+
+         /**
+           returns the user defined informations, which are set with methode userData(void*)
+         */
+         inline void * userData() { return _userData; }
+
+
+         /**
+           Draw rubberband manually by calling the update function. In general it is not neccessary to call draw function.
+           But in some cases, for example the color setting functions, the graphic view update will not be done automatically.
+           Here calling draw forces an update of graphic view.
+         */
+         inline void draw() { update(); }
+
+
+         /**
+         Sets call back function to realize an external update. The updateFunctor should return false to abort update process. In other case it have to return true.
+         */
+         void installExternalUpdate(const std::function<bool(RubberbandBase*)> & updateFunctor);
+
+
+         /**
+           Returns true if there is a active rubberband on map.
+           @param map Pointer to map
+         */
+         static bool isRubberbandActive( SituationMap::Map * map );
+
+         /**
+           Abort all  active rubberbands on map.
+           @param map Pointer to map
+         */
+         static void abortActiveRubberbands( SituationMap::Map * map );
+
+
+      protected:
+
+         Q_REQUIRED_RESULT QPointF projectCoordinateToMap( CoordinateSystem cs, const QPointF &loc ) const;
+         Q_REQUIRED_RESULT QPointF projectCoordinateFromMap( CoordinateSystem cs, const QPointF & loc ) const;
+         Q_REQUIRED_RESULT QPointF projectCoordinateFromMap( CoordinateSystem cs, const Esri::ArcGISRuntime::Point & loc ) const;
+
+         inline void doAutoDelete() { if (_autoDelete) deleteMySelf(); }
+
+         void updateButtonPosition();
+
+         QPointF pixel2ScenePosition( int x, int y ) const;
+
+         virtual void update() = 0;
+
+         void externalUpdate();
+
+         /*
+         Forward declaration of internal container class for member variables. The derived classes of Rubberband
+         often have also a declaration of InternalData for there own internal members.
+         */
+         class BaseInternalData;
+
+         BaseInternalData  *_baseInternal;
+
+         QColor             _drawColor;
+         QColor             _fillColor;
+         QColor             _handleDrawColor;
+         QColor             _handleFillColor;
+         QColor             _handleSelectionColor;
+         QColor             _frameColor;
+         QColor             _frameFillColor;
+         QColor             _frameSelectionColor;
+         int                _frameHandleMargin;
+
+         unsigned int       _lineHandleWidth;
+
+         unsigned int       _pickingRatio;
+
+         bool               _finishAfterConstruction;
+         bool               _autoDelete;
+
+         QPointer<EventDispatcher> _viewPortEventDispatcher;
+         QPointer<EventDelegater>  _windowEventDispatcher;
+
+         virtual QRectF sceneBbox() const = 0;
+
+         virtual void activateButtons();
+         virtual void deactivateButtons();
+         virtual void adjustButtons();
+         virtual void applyButtonClicked();
+         virtual void cancelButtonClicked();
+         virtual void undoButtonClicked();
+
+      protected slots:
+
+         void onDo_applyButtonClicked()   { applyButtonClicked();  }
+         void onDo_cancelButtonClicked()  { cancelButtonClicked(); }
+         void onDo_undoButtonClicked()    { undoButtonClicked();   }
+
+         void onDo_updateButtonFixCoordinates();
+
+      private:
+
+         void * _userData;
+
+         friend class RubberbandFactory;
+
+         static void * operator new(size_t);
+
+         /**
+           The function \c allowMultipleRubberbands set a flag to allow new to create more than one rubberband
+           per situation map for the next new operator call. The function is used in class RubberbandFactory. The
+           value will be resetted to \c false at end of new operator.
+         */
+         static void allowMultipleRubberbands( bool ok );
+
+         /**
+           The function \c currentFactoryMap defines the calling situation map for the next new operator call. The
+           function is used in class RubberbandFactory.The value will be resetted to \c nullptr at end of new operator.
+         */
+         static void currentFactoryMap( SituationMap::Map * map );
+
+
+      signals:
+
+         /**
+           The abort signal will be emitted, when the abortAction has been called by one of the attached event handlers.
+           Before emtting the signal the event handler are closed and deleted. To avoid memory leaks the application has to
+           ensure that the delete function is called for this rubberband. See also example code at beginning.
+
+           @param rbnd pointer to this Rubberband
+         */
+         void abort( RubberbandBase * rbnd );
+
+         /**
+           The apply signal will be emitted, when the applyAndEndAction has been called by one of the attached event handler. The connected slot can now
+           read the geometry information. Before emtting the signal the event handler are closed and deleted.To avoid memory leaks the application has to
+           ensure that the delete function is called for this rubberband. See also example code at beginning.
+
+           @param rbnd pointer to this Rubberband.
+         */
+         void apply( RubberbandBase * rbnd );
+
+         /**
+           The finished signal will be emitted, when the rubberband is going to terminate and all user actions are done.
+
+           @param rbnd pointer to this Rubberband.
+         */
+         void finished( RubberbandBase * rbnd );
+
+         /**
+           The coordinatesChanged signal will be emitted , when the user has changed, removed or added coordinates. Can be used to implement
+           a preview of interim results.
+         */
+         void interimResultsChanged( RubberbandBase * rbnd );
+
+   }; /* Rubberband */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base_internal.h
new file mode 100755
index 000000000..61039acca
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_base_internal.h
@@ -0,0 +1,118 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of internal data of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Joerg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   16.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <QtCore/QList>
+#include <QtCore/QPointer>
+
+#include <Common/ref_pointer.h>
+#include <Common/situation_map_logging.h>
+
+#include "rubberband_base.h"
+
+
+
+class QHBoxLayout;
+class QWidget;
+class QPushButton;
+class QGraphicsScene;
+class QGraphicsView;
+
+
+namespace Esri {
+namespace ArcGISRuntime {
+  class MapGraphicsView;
+} }
+
+
+namespace SituationMap
+{
+   class Map;
+}
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandHandleProxy;
+
+   /**
+     @class Rubberband::BaseInternalData rubberband_base_internal.h
+     @brief Definition of internal data of rubberband base class.
+   */
+   class RubberbandBase::BaseInternalData
+   {
+      public:
+
+         static QPixmap * _applyIcon;
+         static QPixmap * _abortIcon;
+         static QPixmap * _undoIcon;
+
+         QPointer<SituationMap::Map>                         _map;
+         
+         SituationMap::CoordTranslationFunctor             * _mapCtFunctor;
+
+         bool                                                _isActive;
+
+         bool                                                _applyIsPossible;
+         bool                                                _undoIsPossible;
+         bool                                                _hasUndoButton;
+
+         QPointF                                             _lastClickPosition;
+
+         QPointF                                             _buttonBoxSceneAnchor;
+         QPoint                                              _buttonBoxFixPosition;
+         SituationMap::RefPointer<RubberbandHandleProxy>     _buttonProxy;
+         QPointer<QWidget>                                   _buttonBox;
+         QHBoxLayout                                       * _buttonLayout;
+         QPushButton                                       * _undoButton;
+         QPushButton                                       * _cancelButton;
+         QPushButton                                       * _applyButton;
+
+         QCursor                                             _restoreCursor; // workaround Qt bug. remove when fixed
+
+         QVector<std::function<bool(RubberbandBase*)>>       _updateFunctorList;
+
+         LOGGER_T                                            _logger;
+
+         explicit BaseInternalData( SituationMap::Map * map, RubberbandBase * me );
+
+         virtual ~BaseInternalData();
+
+         bool buttonProxyActive( const QPointF & pos ) const;
+
+         void enableAndShowOnlyPossibleButtons();
+
+         BaseInternalData( const BaseInternalData & ) = delete;
+         BaseInternalData & operator = ( const BaseInternalData & ) = delete;
+
+   }; /* BaseInternalData */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.cpp
new file mode 100755
index 000000000..5729d5f4f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.cpp
@@ -0,0 +1,992 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define multi point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_corridor.h"
+#include "rubberband_drawable.h"
+#include "rubberband_frame_handle.h"
+#include "rubberband_handle_proxy.h"
+#include "rubberband_line_handle.h"
+#include "rubberband_point_handle.h"
+
+#include "drawable_painter_path.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <MathUtils/clipper.hpp>
+
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <SpatialReference.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandCorridor::InternalData
+   {
+         SituationMap::RefPointer<RubberbandPointHandle>   _widthHandle;
+         qreal                                             _corridorSceneWidth = 0.0;
+         SituationMap::RefPointer<RubberbandLineHandle>    _widthLine;
+         SituationMap::RefPointer<DrawablePainterPath>     _geoBufferItem;
+         SituationMap::RefPointer<DrawablePainterPath>     _centerLineItem;
+         QRectF                                            _sceneBbox;
+
+   }; /* class RubberbandCorridor::InternalData */
+
+
+   RubberbandCorridor::RubberbandCorridor( SituationMap::Map * map, QObject * parent ) : RubberbandCorridor( map, InputMode::InputBoundary, 0, parent ) {;}
+
+
+   RubberbandCorridor::RubberbandCorridor( SituationMap::Map * map, InputMode mode, qreal width, QObject * parent )
+      : RubberbandMultiPointFeature(map, false, parent) // Map*, bool complexGeometry, QObject* parent
+      , _internal(new InternalData)
+      , _inputMode(mode)
+      , _corridorWidth(width)
+      , _minimumCorridorWidth( 0.0 )
+      , _maximumCorridorWidth( std::numeric_limits<qreal>::infinity() )
+      , _corridorBorderColor("black")
+      , _corridorFillColor("yellow")
+   {
+      _corridorFillColor.setAlphaF( 0.5 );
+      _isClosed = false;
+
+      setCheckMaxAngle(160.0 / 180.0*M_PI); // restrict angle between line segments
+   } /* RubberbandCorridor::RubberbandCorridor */
+
+
+   RubberbandCorridor::~RubberbandCorridor()
+   {
+      delete _internal;
+      _internal = nullptr;
+   } /* RubberbandCorridor::~RubberbandCorridor */
+
+
+   void RubberbandCorridor::minimumCorridorWidth( qreal min )
+   {
+      min = fabs(min);
+      if (min < _maximumCorridorWidth)
+      {
+         _minimumCorridorWidth = min;
+         if ((_minimumCorridorWidth) > _corridorWidth)
+         {
+            _corridorWidth = _minimumCorridorWidth;
+            constructWidthHandle();
+         }
+      }
+   } /* RubberbandCorridor::minimumCorridorWidth */
+
+
+   void RubberbandCorridor::maximumCorridorWidth( qreal max )
+   {
+      max = fabs(max);
+      if (max > _minimumCorridorWidth)
+      {
+         _maximumCorridorWidth = max;
+         if ((_maximumCorridorWidth) < _corridorWidth)
+         {
+            _corridorWidth = _maximumCorridorWidth;
+            constructWidthHandle();
+         }
+      }
+   } /* RubberbandCorridor::maximumCorridorWidth */
+
+
+   bool RubberbandCorridor::isEnabledConstructionWidthState()  const
+   {
+      return _state.testFlag( RubberbandState::ConstructionWidthState );
+   } /* RubberbandCorridor::isEnabledConstructionWidthState */
+
+   void RubberbandCorridor::enableConstructionWidthState()
+   {
+      _state &= ~QFlags<RubberbandState>(RubberbandState::ModificationState);
+      _state |= RubberbandState::ConstructionWidthState;
+   } /* RubberbandCorridor::enableConstructionWidthState */
+
+   void RubberbandCorridor::disenableConstructionWidthState()
+   {
+      _state &= ~QFlags<RubberbandState>(RubberbandState::ConstructionWidthState);
+      _state |= RubberbandState::ModificationState;
+   } /* RubberbandCorridor::disenableConstructionWidthState */
+
+
+   qreal RubberbandCorridor::corridorWidth() const
+   {
+      return _corridorWidth;
+   } /* RubberbandCorridor::corridorWidth */
+
+
+   void RubberbandCorridor::setCoordinateVector(const QVector<QPointF> & coordinateVec, CoordinateSystem cs )
+   {
+      setCoordinateVectorWidth( coordinateVec, 0.0, cs );
+   } /*  RubberbandCorridor::setCoordinateVector */
+
+
+   void RubberbandCorridor::setCoordinateVectorWidth(const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs )
+   {
+      if (coordinateVec.size() < 2) return;
+
+      if (corridorWidth < 0)
+      {
+        QVector<QPointF> reverseVec;
+        reverseVec.reserve(coordinateVec.size());
+        for (const auto &point : coordinateVec)
+        {
+          reverseVec.push_front(point);
+        }
+        RubberbandMultiPointFeature::setCoordinateVector(reverseVec, cs);
+      }
+      else RubberbandMultiPointFeature::setCoordinateVector( coordinateVec, cs );
+
+      _corridorWidth = fabs(corridorWidth);
+
+      enableModificationState();
+      constructWidthHandle();
+
+      _baseInternal->_applyIsPossible = true;
+
+      activateButtons();
+      update();
+
+   } /* RubberbandCorridor::setCoordinateVectorWidth */
+
+
+
+   QVector<QPointF> RubberbandCorridor::centerLine( CoordinateSystem cs )
+   {
+      if (_inputMode == InputMode::InputCenterLine)
+      {
+         return RubberbandMultiPointFeature::coordinateVector( cs );
+      }
+
+      QVector<QPointF>  cLine;
+      QVector<QPointF>  cLineRet;
+
+      // getCenterLineFromHandleBorder( cLine, _corridorWidth * ((_internal->_corridorSceneWidth >= 0) ? 0.5 : -0.5), true );
+      getCenterLineFromHandleBorder( cLine, _corridorWidth * 0.5, true );
+      cLineRet.reserve(cLine.size());
+      for (const auto &point : qAsConst(cLine))
+         cLineRet.push_back(projectCoordinateFromMap( cs, point ));
+      return cLineRet;
+   } /* RubberbandCorridor::centerLine */
+
+
+   void RubberbandCorridor::setCenterLine( const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs )
+   {
+      if (_inputMode == InputMode::InputBoundary)
+      {
+         const QVector<QPointF> &borderLine = getCenterLineFromBorder( coordinateVec, corridorWidth*-0.5,cs);
+         setCoordinateVectorWidth( borderLine, corridorWidth, CoordinateSystem::Map);
+         return;
+      }
+
+      setCoordinateVectorWidth( coordinateVec, corridorWidth, cs );
+   } /* RubberbandCorridor::setCenterLine */
+
+
+   QVector<QPointF> RubberbandCorridor::frontLine(CoordinateSystem cs)
+   {
+     if (_inputMode == InputMode::InputBoundary)
+     {
+       const QVector<QPointF> & fLine = RubberbandMultiPointFeature::coordinateVector(cs);
+       if (_internal->_corridorSceneWidth >= 0) return fLine;
+       // reverse order of coordinates
+       QVector<QPointF>  fLineRet;
+       fLineRet.reserve(fLine.size());
+       for (const auto & point : fLine)
+       {
+         fLineRet.push_front(point);
+       }
+       return fLineRet;
+     }
+
+     // In case of InputMode::InputCenterLine construct centerLine
+
+     QVector<QPointF>  fLine;
+     getCenterLineFromHandleBorder(fLine, _corridorWidth*-1.0, true);
+
+     if (_internal->_corridorSceneWidth >= 0)
+     {
+       for (QPointF & point : fLine)
+       {
+         point = projectCoordinateFromMap(cs, point);
+       }
+       return fLine;
+     }
+
+     // reverse order of coordinates
+     QVector<QPointF>  fLineRet;
+     fLineRet.reserve(fLine.size());
+     for (const auto & point : qAsConst(fLine))
+     {
+       fLineRet.push_front( projectCoordinateFromMap(cs,point) );
+     }
+
+     return fLineRet;
+    
+   } /* RubberbandCorridor::frontLine */
+
+
+   void RubberbandCorridor::setFrontLine(const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs)
+   {
+     if (_inputMode == InputMode::InputBoundary)
+     {
+       setCoordinateVectorWidth(coordinateVec, corridorWidth, cs);
+     }
+
+     // In case of InputMode::InputCenterLine construct centerLine
+     
+     const QVector<QPointF> &centerLine = getCenterLineFromBorder( coordinateVec, corridorWidth*0.5, cs);
+     setCoordinateVectorWidth(centerLine, corridorWidth, CoordinateSystem::Map);
+
+   } /* RubberbandCorridor::setFrontLine */
+
+
+   void  RubberbandCorridor::constructWidth( const QPointF & scenePos )
+   {
+      if (Rubberband::_internal->_handleList.size() < 2) return;
+
+      QPointF p0 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate;
+      QPointF p1 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+
+      QPointF rv( p0.y()-p1.y(), p1.x()-p0.x() );
+      rv /= sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+
+      QPointF pScene = scenePos - p1;
+
+      qreal scalarProduct = pScene.x()*rv.x() + pScene.y()*rv.y();
+
+      if (_inputMode == InputMode::InputCenterLine) scalarProduct *= 2;
+
+      _internal->_corridorSceneWidth = scalarProduct;
+
+      rv *= scalarProduct;
+
+      RubberbandHandle::RubberbandCoordinate pointW( Rubberband::_internal->_mapView, p1+rv );
+
+      rv = QPointF( pointW._mapCoordinate.x() - static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.x()
+                  , pointW._mapCoordinate.y() - static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.y() );
+
+
+//      _corridorWidth = sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+      _corridorWidth =  (scalarProduct > 0 ) ? sqrt(rv.x()*rv.x()+rv.y()*rv.y()) : - sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+
+      bool constrainsComplied = true;
+
+      if (_corridorWidth != 0.0)
+      {
+         qreal constraintFactor = 1.0;
+         if (_minimumCorridorWidth > fabs(_corridorWidth)) { constraintFactor = _minimumCorridorWidth / _corridorWidth;  constrainsComplied = false; }
+         if (_maximumCorridorWidth < fabs(_corridorWidth)) { constraintFactor = _maximumCorridorWidth / fabs(_corridorWidth);  constrainsComplied = false; }
+         _corridorWidth                 *= constraintFactor;
+         _internal->_corridorSceneWidth *= constraintFactor;
+      }
+      else
+      {
+         if (_minimumCorridorWidth > 0)
+         {
+            _corridorWidth = _minimumCorridorWidth;
+
+            const QPointF                           & whp     = calcWidthHandlePosition();
+            Esri::ArcGISRuntime::MapGraphicsView    * mapView = Rubberband::_internal->_mapView;
+            RubberbandDrawable::RubberbandCoordinate  widthCoordinate( mapView, convert( whp, mapView->map()->spatialReference() ));
+
+            const QPointF & p0 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+            const QPointF & p1 = widthCoordinate._sceneCoordinate;
+
+            QPointF rv( p0.y()-p1.y(), p1.x()-p0.x() );
+
+           _internal->_corridorSceneWidth = sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+           if (_inputMode == InputMode::InputCenterLine) _internal->_corridorSceneWidth *= 2;
+         }
+      }
+
+      markFailedConstrains( scenePos, !constrainsComplied );
+
+   } /* RubberbandCorridor::constructWidth */
+
+
+   QPointF RubberbandCorridor::getWidthHandleScenePosition() const
+   {
+      QPointF p0 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._sceneCoordinate;
+      QPointF p1 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+
+      QPointF rv( p0.y()-p1.y(), p1.x()-p0.x() );
+ 
+      rv /= sqrt(rv.x()*rv.x()+rv.y()*rv.y());
+
+      if ((std::numeric_limits<qreal>::infinity() != rv.x()) && (std::numeric_limits<qreal>::infinity() != rv.y()))
+      {
+        rv *= _internal->_corridorSceneWidth;
+        if (_inputMode == InputMode::InputCenterLine) rv *= 0.5;
+        return p1 + rv;
+      }
+      return p1;
+      
+   } /* RubberbandCorridor::getWidthHandleScenePosition */
+
+
+   QPointF RubberbandCorridor::calcWidthHandlePosition()
+   {
+       qreal p0X = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._mapCoordinate.x();
+       qreal p0Y = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-2].get())->getCoordinate()._mapCoordinate.y();
+       qreal p1X = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.x();
+       qreal p1Y = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.y();
+
+       QPointF p( p1Y-p0Y, p1X-p0X );
+       qreal   lp = _corridorWidth / sqrt(p.x()*p.x()+p.y()*p.y());
+       
+       if (std::numeric_limits<qreal>::infinity() != lp)
+       {
+         p *= lp;
+         if (_inputMode == InputMode::InputCenterLine) p *= 0.5;
+         p  = QPointF(p1X,p1Y) + p;
+       }
+       else p = QPointF(p1X,p1Y);
+       return p;
+   } /* RubberbandCorridor::calcWidthHandlePosition */
+
+
+   void RubberbandCorridor::constructWidthHandle()
+   {
+      if (Rubberband::_internal->_handleList.size() < 2) return;
+
+      if ((fabs(_corridorWidth) <= _minimumCorridorWidth) || (fabs(_corridorWidth) >= _maximumCorridorWidth))
+      {
+         enableConstructionWidthState();
+         deactivateButtons();
+      }
+
+      const QPointF                   & p = calcWidthHandlePosition();
+      const Esri::ArcGISRuntime::Point mapP( convert(p, Rubberband::_internal->_mapView->map()->spatialReference()) );
+
+      _internal->_widthHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP );
+
+      qreal pX = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.x();
+      qreal pY = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._mapCoordinate.y();
+
+      _internal->_widthLine = new RubberbandLineHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, QPointF(pX,pY), p, 2, true );
+
+      pX = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.x();
+      pY = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.y();
+
+      const QPointF & pScene  = _internal->_widthHandle->getCoordinate()._sceneCoordinate;
+
+      pX -= pScene.x();
+      pY -= pScene.y();
+
+      _internal->_corridorSceneWidth = sqrt(pX*pX+pY*pY);
+      if (_inputMode == InputMode::InputCenterLine) _internal->_corridorSceneWidth *= 2;
+
+      // connect signal to call updateBufferGeometry when zooming or resizing the window
+      // connect( _internal->_widthHandle.get(), &RubberbandHandle::adjusted, [this]() { this->updateBufferGeometry(); } );
+      // doesn't work because not all handles are adjusted this time ...
+
+      // but we have to ensure that coordinateSceneWidth have all ways the correct value:
+      connect( _internal->_widthHandle.get(), &RubberbandHandle::adjusted, this, &RubberbandCorridor::onDo_adjustCorridorSceneWidth );
+
+   } /* RubberbandCorridor::constructWidthHandle */
+
+
+   void RubberbandCorridor::onDo_adjustCorridorSceneWidth()
+   {
+      if (Rubberband::_internal->_handleList.size() > 1)
+      {
+         qreal           pX     = static_cast<RubberbandPointHandle*>(this->Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.x();
+         qreal           pY     = static_cast<RubberbandPointHandle*>(this->Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate.y();
+         const QPointF & pScene = this->_internal->_widthHandle->getCoordinate()._sceneCoordinate;
+
+         pX -= pScene.x();
+         pY -= pScene.y();
+
+         qreal sceneWidth = sqrt(pX*pX+pY*pY);
+         if (_inputMode == InputMode::InputCenterLine) sceneWidth *= 2;
+
+         _internal->_corridorSceneWidth = (_internal->_corridorSceneWidth >= 0) ? sceneWidth : -sceneWidth;
+      }
+   } /* RubberbandCorridor::onDo_adjustCorridorSceneWidth */
+
+
+   void RubberbandCorridor::updateHandleScenePosition()
+   {
+      if (!_internal->_widthHandle) return;
+
+      QPointF pos = getWidthHandleScenePosition();
+
+      DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " old handle Position = " << _internal->_widthHandle->getCoordinate()._sceneCoordinate.x()
+                                                                                            << " ; " <<  _internal->_widthHandle->getCoordinate()._sceneCoordinate.y()
+                                                               << " new handle position = " << pos.x() << " ; " << pos.y()
+                                                               << " width = " << _corridorWidth
+                                                               << " scene width = " << _internal->_corridorSceneWidth;
+
+      _internal->_widthHandle->updateCoordinate( pos );
+
+      const QPointF & lp1 = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate;
+
+      _internal->_widthLine->updateCoordinate( 0, lp1 );
+      _internal->_widthLine->updateCoordinate( 1, pos );
+
+   } /* RubberbandCorridor::updateHandleScenePosition */
+
+
+   bool RubberbandCorridor::getCenterLineFromHandleBorder( QVector<QPointF> & centerLine, qreal corridorWidth, bool mapCoordinates )
+   {
+      ClipperLib::ClipperOffset pathOffset;
+      ClipperLib::Path          borderPath;
+      ClipperLib::Path          offsetPath;
+      int                       precision = (mapCoordinates) ? 1000 : 10;
+      qreal                     baseX     = 0.0;
+      qreal                     baseY     = 0.0;
+      bool                      initBase  = true;
+
+      for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+      {
+         RubberbandPointHandle                             * pointHandlePtr  = dynamic_cast<RubberbandPointHandle*>(handle.get());
+         const RubberbandPointHandle::RubberbandCoordinate & pointCoordinate = pointHandlePtr->getCoordinate();
+
+         qreal  x  = (mapCoordinates) ? pointCoordinate._mapCoordinate.x() :  pointCoordinate._sceneCoordinate.x();
+         qreal  y  = (mapCoordinates) ? pointCoordinate._mapCoordinate.y() : -pointCoordinate._sceneCoordinate.y();
+
+         if (mapCoordinates)
+         {
+            // use relative coordinates to avoid to large numbers
+            if (initBase)
+            {
+               baseX = x; baseY = y;   x = 0.0; y = 0.0;
+               initBase = false;
+            }
+            else { x -= baseX; y -= baseY; }
+         }
+         borderPath << ClipperLib::IntPoint(int(x*precision),int(y*precision));
+      }
+
+      bool ok = pathOffset.PathOffset( borderPath, offsetPath, int(corridorWidth*precision) );
+
+      ClipperLib::Path::const_iterator it = offsetPath.begin();
+
+      if (mapCoordinates)
+      {
+        for (; it != offsetPath.end(); ++it)
+        {
+          centerLine << QPointF(qreal(it->X)/qreal(precision)+baseX, qreal(it->Y)/qreal(precision)+baseY);
+        }
+      }
+      else
+      {
+        for (; it != offsetPath.end(); ++it)
+        {
+           centerLine << QPointF(qreal(it->X)/qreal(precision)+baseX, qreal(-it->Y)/qreal(precision)-baseY);
+        }
+      }
+
+      return ok;
+   } /* RubberbandCorridor::getCenterLineFromHandleBorder */
+
+
+   QVector<QPointF> RubberbandCorridor::getCenterLineFromBorder(const QVector<QPointF> & borderLine, qreal corridorWidth, CoordinateSystem cs)
+   {
+     const int                 precision = 1000;
+
+     QVector<QPointF>          centerLine;
+
+     ClipperLib::ClipperOffset pathOffset;
+     ClipperLib::Path          borderPath;
+     ClipperLib::Path          offsetPath;
+    
+     qreal                     baseX     = 0.0;
+     qreal                     baseY     = 0.0;
+     bool                      initBase  = true;
+
+     for (const auto &point : borderLine)
+     {
+       const QPointF & mapPoint = projectCoordinateToMap(cs, point);
+
+       qreal x = mapPoint.x();
+       qreal y = mapPoint.y();
+
+       // use relative coordinates to avoid to large numbers
+       if (initBase)
+       {
+         baseX = x; baseY = y;   x = 0.0; y = 0.0;
+         initBase = false;
+       }
+       else { x -= baseX; y -= baseY; }
+
+       borderPath << ClipperLib::IntPoint(int(x*precision), int(y*precision));
+     }
+
+     if (pathOffset.PathOffset(borderPath, offsetPath, int(corridorWidth*precision)))
+     {
+       centerLine.reserve(100);
+       for (const auto &p : offsetPath)
+       {
+         centerLine << QPointF( qreal(p.X)/qreal(precision)+baseX, qreal(p.Y)/qreal(precision)+baseY );
+       }
+     }
+     return centerLine;
+   } // RubberbandCorridor::getCenterLineFromBorder
+
+
+
+   void RubberbandCorridor::updateBufferGeometry()
+   {
+      if (!_internal->_widthHandle) return;
+
+      QVector<QPointF>  centerLine;
+      qreal             corridorWidth = 0.0;
+      bool              centerLineOk  = true;
+
+      centerLine.reserve(Rubberband::_internal->_handleList.size() );
+
+      switch (_inputMode)
+      {
+         case InputMode::InputBoundary:
+         {
+            corridorWidth = _internal->_corridorSceneWidth * 0.5;
+            centerLineOk  = getCenterLineFromHandleBorder( centerLine, corridorWidth, false );
+            if (_internal->_centerLineItem == nullptr)
+            {
+               _internal->_centerLineItem = new DrawablePainterPath( Rubberband::_internal->_mapView );
+            }
+            _internal -> _centerLineItem -> setDrawColor( centerLineOk ? _drawColor : QColor(255,0,0) );
+            _internal -> _centerLineItem -> setFillColor( QColor(0,0,0,0) ); // turn off filling
+            _internal -> _centerLineItem -> dottedPath( centerLineOk );
+            _internal -> _centerLineItem -> setVisibility( true );
+            _internal -> _centerLineItem -> enableClosedLine( !centerLineOk );
+            _internal -> _centerLineItem -> setPath( centerLine );
+
+         } break;
+
+         case InputMode::InputCenterLine:
+         {
+            corridorWidth = _internal->_corridorSceneWidth * 0.5;
+            for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+            {
+               RubberbandPointHandle                             * pointHandlePtr  = dynamic_cast<RubberbandPointHandle*>(handle.get());
+               const RubberbandPointHandle::RubberbandCoordinate & pointCoordinate = pointHandlePtr->getCoordinate();
+
+               qreal  x  = pointCoordinate._sceneCoordinate.x();
+               qreal  y  = pointCoordinate._sceneCoordinate.y();
+
+               centerLine.append( QPointF(x,y) );
+            }
+            _internal -> _centerLineItem = nullptr;
+         } break;
+      }
+
+      ClipperLib::ClipperOffset                        pathOffset;
+      ClipperLib::Path                                 borderPath;
+      ClipperLib::Paths                                offsetPathVec;
+      QVector<RubberbandHandle::RubberbandCoordinate>  vertexSet;
+
+      for (auto point : qAsConst(centerLine))
+         borderPath << ClipperLib::IntPoint(int(point.x()*10),int(-point.y()*10));
+
+      pathOffset.AddPath( borderPath, ClipperLib::JoinType::jtSquare, ClipperLib::EndType::etOpenButt);
+      pathOffset.Execute( offsetPathVec, int(fabs(corridorWidth)*10) );
+
+      if (centerLineOk)
+      {
+         if (_internal->_geoBufferItem) _internal->_geoBufferItem->setVisibility(false);
+
+         for (auto path : offsetPathVec)
+         {
+            ClipperLib::Path::const_iterator it = path.begin();
+
+            for (; it != path.end(); ++it)
+            {
+               vertexSet.append( RubberbandHandle::RubberbandCoordinate( Rubberband::_internal->_mapView
+                                                                       , QPointF(qreal(it->X)/10.0,qreal(-it->Y)/10.0) ));
+            }
+
+            if (!vertexSet.empty())
+            {
+               if (!_internal->_geoBufferItem)
+               {
+                  _internal->_geoBufferItem = new DrawablePainterPath( Rubberband::_internal->_mapView );
+               }
+
+               _internal -> _geoBufferItem -> setVisibility( true );
+               _internal -> _geoBufferItem -> enableClosedLine( true );
+               _internal -> _geoBufferItem -> setDrawColor( _corridorBorderColor );
+               _internal -> _geoBufferItem -> setFillColor( _corridorFillColor   );
+               _internal -> _geoBufferItem -> setPath( vertexSet );
+            }
+            break;
+         }
+      }
+      else if (_internal->_geoBufferItem) _internal->_geoBufferItem->setVisibility(false);
+
+      RubberbandFrameHandle * frameHandle = getFrameHandle();
+
+      if (frameHandle)
+      {
+         if (vertexSet.isEmpty())
+         {
+           for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+            {
+               RubberbandPointHandle * pointHandlePtr  = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+               vertexSet.append(pointHandlePtr->getCoordinate() );
+            }
+
+            if (_internal->_widthHandle != nullptr)
+            {
+               vertexSet.append( _internal->_widthHandle->getCoordinate() );
+            }
+         }
+         DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " frameHandle->updateFrameShape( vertexSet );";
+         frameHandle->updateFrameShape( vertexSet );
+      }
+
+      if (!vertexSet.isEmpty())
+      {
+         qreal minX = vertexSet.first()._sceneCoordinate.x();
+         qreal maxX  = minX;
+         qreal minY = vertexSet.first()._sceneCoordinate.y();
+         qreal maxY  = minY;
+
+         for (const auto &v : qAsConst(vertexSet))
+         {
+            const QPointF & p = v._sceneCoordinate;
+            if (p.x() < minX) minX = p.x();
+            if (p.y() < minY) minY = p.y();
+            if (p.x() > maxX) maxX = p.x();
+            if (p.y() > maxY) maxY = p.y();
+         }
+         _internal->_sceneBbox.setCoords( minX, minY, maxX, maxY );
+
+         if (!isButtonBoxPositionFixed())
+         {
+            RubberbandBase::_baseInternal->_buttonBoxSceneAnchor = QPointF(maxX,maxY);
+         }
+      }
+      else _internal->_sceneBbox = QRectF();
+   } /* RubberbandCorridor::updateBufferGeometry*/
+
+
+   bool RubberbandCorridor::bufferPolygon( QVector<QPointF> & coordinateVec, CoordinateSystem cs )
+   {
+     coordinateVec.clear();
+
+     const QVector<QPointF> & cLine = centerLine( CoordinateSystem::Map );
+     
+     if (cLine.size() < 2) return false;
+
+     ClipperLib::ClipperOffset                        pathOffset;
+     ClipperLib::Path                                 borderPath;
+     ClipperLib::Paths                                offsetPathVec;
+     int                                              precision = 1000;
+     const QPointF                                  & basePoint = cLine.first();
+
+     for (const auto &point : cLine)
+     {
+       borderPath << ClipperLib::IntPoint(int((point.x()-basePoint.x())*precision),
+                                          int((point.y()-basePoint.y())*precision));
+     }
+
+     pathOffset.AddPath( borderPath, ClipperLib::JoinType::jtSquare, ClipperLib::EndType::etOpenButt);
+     pathOffset.Execute( offsetPathVec, int(fabs(_corridorWidth*0.5)*precision) );
+
+     if (offsetPathVec.empty()) return false;
+
+     const ClipperLib::Path & bufferCoordinates = offsetPathVec.front();
+
+     if (bufferCoordinates.empty()) return false;
+
+     coordinateVec.reserve(bufferCoordinates.size());
+
+     for (const ClipperLib::IntPoint & p : bufferCoordinates)
+     {
+       const QPointF & vertex = QPointF( qreal(p.X)/qreal(precision), qreal(p.Y)/qreal(precision) ) + basePoint;
+       coordinateVec << projectCoordinateFromMap( cs, vertex );   
+     }
+     return true;
+   } /* RubberbandCorridor::bufferPolygon */
+
+
+   void RubberbandCorridor::resetAction(AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         if (!isEnabledConstructionWidthState())
+         {
+            if (isEnabledConstructionState())
+            {
+               RubberbandMultiPointFeature::resetAction(causer,x,y);
+               return;
+            }
+         }
+      }
+      RubberbandMultiPointFeature::resetAction(causer,x,y);
+   } /* RubberbandCorridor::resetAction */
+
+
+   bool RubberbandCorridor::selectAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      Q_UNUSED(causer);
+
+      if (!rubberbandIsAlive()) return false;
+
+      bool    eventHandled = false;
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+      _baseInternal->_lastClickPosition = scenePos;
+
+      if (!isEnabledConstructionWidthState())
+      {
+         if (isEnabledConstructionState()) return RubberbandMultiPointFeature::selectAction(causer,x,y);
+         if (_internal->_widthHandle->isPositionInside(scenePos))
+         {
+            _internal->_widthHandle->setSelection();
+            eventHandled = true;
+         }
+         else return RubberbandMultiPointFeature::selectAction(causer,x,y);
+      }
+      else eventHandled = true;
+
+
+      if (eventHandled)
+      {
+         update();
+         deactivateButtons();
+      }
+      return eventHandled;
+   } /* RubberbandCorridor::selectAction */
+
+
+   bool RubberbandCorridor::setCoordinateAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      Q_UNUSED(causer);
+
+      markFailedConstrains( QPointF(), false );
+
+      if (!rubberbandIsAlive()) return false;
+
+      bool    eventHandled = false;
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      if (isEnabledConstructionWidthState())
+      {
+         Rubberband::_internal->_lastClickPosition = scenePos;
+         constructWidth( scenePos );
+         updateHandleScenePosition();
+         disenableConstructionWidthState();
+         enableModificationState();
+         eventHandled = true;
+         markFailedConstrains( QPointF(), false );
+      }
+      else
+      {
+         if (isEnabledConstructionState())
+         {
+           bool handled = RubberbandMultiPointFeature::setCoordinateAction(causer,x,y);
+           if (isEnabledConstructionWidthState())
+           {
+             // guarantee that buttons are of
+             deactivateButtons();
+           }
+           return handled;
+         }
+
+         if (_internal->_widthHandle->isSelected())
+         {
+            _internal->_widthHandle->setSelection(false);
+            constructWidth( scenePos );
+            markFailedConstrains( QPointF(), false );
+            eventHandled = true;
+            RubberbandMultiPointFeature::setCoordinateAction(causer,x,y);
+         }
+         else return RubberbandMultiPointFeature::setCoordinateAction(causer,x,y);
+      }
+
+      if (eventHandled) update();
+
+      updateButtonPosition();
+
+      activateButtons();
+
+      return eventHandled;
+   } /* RubberbandCorridor::setCoordinateAction */
+
+
+   bool RubberbandCorridor::movePickedAction(AbstractEventDispatcher * causer, int x, int y )
+   {
+       adjustConnectedPreviewPixmap(x,y);
+
+       if (!rubberbandIsAlive()) return false;
+
+       if ((isEnabledConstructionWidthState()) || ((_internal->_widthHandle) && (_internal->_widthHandle->isSelected())))
+       {
+          QPointF scenePos(pixel2ScenePosition(x,y));
+
+          constructWidth( scenePos );
+          update();
+          return false;
+       }
+
+       return RubberbandMultiPointFeature::movePickedAction(causer,x,y);
+
+   } /*  RubberbandCorridor::movePickedAction */
+
+
+   bool RubberbandCorridor::moveAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      QPointF scenePos(pixel2ScenePosition(x,y));
+
+      if (isEnabledConstructionWidthState())
+      {
+         constructWidth( scenePos );
+         update();
+         return false;
+      }
+
+      if (_internal->_widthHandle)
+      {
+         if (_internal->_widthHandle->isPositionInside(scenePos))
+         {
+            _internal->_widthHandle->setSelection(true);
+            return true;
+         }
+         _internal->_widthHandle->setSelection(false);
+      }
+      return RubberbandMultiPointFeature::moveAction(causer,x,y);
+   } /* RubberbandCorridor::moveAction */
+
+
+   bool RubberbandCorridor::completeStateAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (isEnabledConstructionWidthState())
+         {
+            if (!_finishAfterConstruction)
+            {
+               disenableSelectedState();
+               enableModificationState();
+               update();
+               return true;
+            }
+         }
+         if (isEnabledConstructionState())
+         {
+            if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+            {
+               disenableConstructionState();
+
+               if ((fabs(_corridorWidth) <= _minimumCorridorWidth) || (fabs(_corridorWidth) >= _maximumCorridorWidth))
+               {
+                  enableConstructionWidthState();
+
+                  deSelectHandles();
+                  disenableSelectedState();
+
+                  deactivateButtons();
+
+                  updatePreviewLine(QPointF(0,0));
+
+                  constructWidth( static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.end()[-1].get())->getCoordinate()._sceneCoordinate );
+                  constructWidthHandle();
+
+                  if (_internal->_widthHandle)
+                  {
+                     _internal->_widthHandle->setSelection(true);
+                  }
+               }
+               else
+               {
+                  if (_finishAfterConstruction)
+                  {
+                     return applyAndEndAction(causer,x,y);
+                  }
+                  else
+                  {
+                     deSelectHandles();
+                     constructWidthHandle();
+                     disenableSelectedState();
+                     enableModificationState();
+                  }
+               }
+            }
+            update();
+            return true;
+         }
+         return applyAndEndAction(causer,x,y);
+      }
+      return false;
+   } /* RubberbandCorridor::completeStateAction */
+
+
+   void RubberbandCorridor::activateButtons()
+   {
+      if (isEnabledConstructionWidthState())
+      {
+         _baseInternal->_applyIsPossible = false;
+         _baseInternal->_undoIsPossible  = false;
+         RubberbandMultiPointFeature::activateButtons();
+      }
+      else RubberbandMultiPointFeature::activateButtons();
+
+   } /* RubberbandCorridor::activateButtons */
+
+
+   QRectF RubberbandCorridor::sceneBbox() const
+   {
+      if (_internal->_sceneBbox.isValid()) return  _internal->_sceneBbox;
+      else                                 return Rubberband::sceneBbox();
+   } /* RubberbandCorridor::sceneBbox */
+
+
+   void RubberbandCorridor::update()
+   {
+      RubberbandMultiPointFeature::update();
+
+      DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION;
+
+      _isClosed = false;
+
+      if (_internal->_widthHandle)
+      {
+         _internal->_widthHandle -> setDrawColor(_handleDrawColor);
+         _internal->_widthHandle -> setFillColor(_handleFillColor);
+         _internal->_widthHandle -> setSelectionColor(_handleSelectionColor);
+         _internal->_widthHandle -> setPickingRatio( _pickingRatio );
+
+         updateHandleScenePosition();
+         updateBufferGeometry();
+      }
+
+   } /* RubberbandCorridor::update */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.h
new file mode 100755
index 000000000..9879a3238
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_corridor.h
@@ -0,0 +1,239 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_multi_point_feature.h"
+
+
+namespace SituationMap { namespace RB
+{
+   /**
+     @class RubberbandCorridor rubberband_corridor.h
+     @brief Implementation of a rubberband for corridors.
+     @see RubberbandFactory, Rubberband, RubberbandMultiPointFeature
+
+     Implementation of rubberbands used to input corridors. There are two different modes \c InputCenterLine and \c InputBoundary. In the 
+     InputCenterLine mode the center line of the corridor has to be defined. The rubberband displays then the border geometry.
+     In the InputBoundary mode one side of the border has to be defined. The \c coordinateVector methodes always working on the input geometry.
+   */
+   class SITUATIONMAP_EXPORT RubberbandCorridor : public RubberbandMultiPointFeature
+   {
+      Q_OBJECT
+
+      public:
+
+         enum class InputMode
+         {
+            InputCenterLine,
+            InputBoundary
+         }; /* InputMethode */
+
+
+         /**
+            @name Construction & Destruction
+            @{
+
+            Construction of one instance of class RubberbandCorridor.
+
+            @param map     Pointer to SituationMap class instance
+            @param mode    Two mode are distinguished. In \c InputCenterLine mode the coordinates will be interpreted as center line of the corridor.
+                           In \c InputBoundary the coordinates are defining one border.
+            @param width   With of a corridor in meters. In \c InputBoundary the coordinates are defining one border. If \c corridorWidth is negative
+                           the coordinates are the right border otherwise the left one.
+         */
+
+      private:
+
+         friend class RubberbandFactory;
+        
+         explicit RubberbandCorridor( SituationMap::Map * map, QObject * parent );
+         explicit RubberbandCorridor( SituationMap::Map * map, InputMode mode = InputMode::InputBoundary, qreal width = 0, QObject * parent = nullptr );
+        
+      
+      public:
+
+         ~RubberbandCorridor();
+         /** @} */
+
+         /** 
+            @addtogroup States Methodes to query and modify rubberband states 
+            @{
+         */
+         bool isEnabledConstructionWidthState()  const;
+         void enableConstructionWidthState();
+         void disenableConstructionWidthState();
+         /** @} */
+
+
+
+         inline bool isEnabledInputBoundary() const { return _inputMode == InputMode::InputBoundary; }
+         inline void setInputBoundary() { _inputMode = InputMode::InputBoundary; }
+         inline void setInputCenterline() { _inputMode = InputMode::InputCenterLine; }
+
+          /**
+            Sets coordinates to modify to internal coordinate list.
+
+            @param coordinateVec List of coordinates to modify
+            @param cs            Defines the coordinate system of returned coordinates.
+         */
+         void setCoordinateVector( const QVector<QPointF> & coordinateVec, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+          /**
+            Sets coordinates to modify to internal coordinate list. In \c InputCenterLine mode the coordinates will be interpreted as
+            center line of the corridor. In \c InputBoundary the coordinates are defining one border. If \c corridorWidth is negative
+            the coordinates are the right border otherwise the left one.
+            
+            @param coordinateVec  List of coordinates to modify
+            @param corridorWidth  Width of corridor in meters. 
+            @param cs             Defines the coordinate system of returned coordinates.
+         */
+         void setCoordinateVectorWidth(const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs = CoordinateSystem::Geo );
+         
+         /**
+           Returns the center line of the corridor
+
+           @param cs            Defines the coordinate system of returned coordinates.
+         */
+         QVector<QPointF> centerLine( CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+           Sets the center line of the corridor.
+
+           @param coordinateVec  List of coordinates of border to modify
+           @param corridorWidth  Width of corridor in meters
+           @param cs             Defines the coordinate system of returned coordinates.
+         */
+         void setCenterLine( const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+           Returns the front line of the rubberband.
+
+           @param cs            Defines the coordinate system of returned coordinates.
+          */
+         QVector<QPointF> frontLine(CoordinateSystem cs = CoordinateSystem::Geo);
+
+         /**
+           Sets the front line of the corridor.
+
+           @param coordinateVec  List of coordinates of border to modify
+           @param corridorWidth  Width of corridor in meters
+           @param cs             Defines the coordinate system of returned coordinates.
+         */
+         void setFrontLine(const QVector<QPointF> & coordinateVec, qreal corridorWidth, CoordinateSystem cs = CoordinateSystem::Geo);
+
+         /**
+           Provides the buffer polygon (outline) of the corridor.
+
+           @param coordinateVec Coordinate list of buffer polygon
+           @param cs            Defines the coordinate system of returned coordinates.
+           @return              true on success otherwise false
+         */
+         bool bufferPolygon( QVector<QPointF> & coordinateVec, CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+           Return the width of the corridor.
+         */
+         qreal corridorWidth() const; 
+
+         /**
+           Set the width of the corridor.
+         */
+         inline void setCorridorWidth(qreal width) { _corridorWidth = width;}
+
+         /**
+            @name Constrains for corridor width
+            @{
+         */
+         void  minimumCorridorWidth( qreal min );
+         void  maximumCorridorWidth( qreal max );
+
+         qreal minimumCorridorWidth() const { return _minimumCorridorWidth; }
+         qreal maximumCorridorWidth() const { return _maximumCorridorWidth; }
+         /** @} */
+
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         void resetAction         ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+         QColor getCorridorBorderColor() const  { return _corridorBorderColor; }
+         QColor getCorridorFillColor()   const  { return _corridorFillColor;   }
+
+         void setCorridorBorderColor( const QColor & color )  { _corridorBorderColor = color; }
+         void setCorridorFillColor  ( const QColor & color )  { _corridorFillColor   = color; }
+
+      protected:
+          /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         InputMode        _inputMode;
+         qreal            _corridorWidth;
+
+         qreal            _minimumCorridorWidth;
+         qreal            _maximumCorridorWidth;
+
+         QColor           _corridorBorderColor;
+         QColor           _corridorFillColor;
+
+         void activateButtons() override;
+
+         QRectF sceneBbox() const override;
+
+         void update() override;
+
+         QPointF calcWidthHandlePosition();
+
+         void constructWidth( const QPointF & );
+         void constructWidthHandle();
+
+         QPointF getWidthHandleScenePosition() const;
+         
+         bool getCenterLineFromHandleBorder(QVector<QPointF> & centerLine, qreal corridorWidth, bool mapCoordinates);
+
+         QVector<QPointF> getCenterLineFromBorder(const QVector<QPointF> & borderLine, qreal corridorWidth, CoordinateSystem cs );
+
+         void updateHandleScenePosition();
+         void updateBufferGeometry();
+
+      private slots:
+
+      void onDo_adjustCorridorSceneWidth();
+
+   }; /* RubberbandCorridor */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.cpp
new file mode 100755
index 000000000..6b53338f1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.cpp
@@ -0,0 +1,155 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_drawable.h"
+
+
+// ESRI
+#include <Map.h>
+
+
+
+namespace SituationMap { namespace RB
+{
+
+   Esri::ArcGISRuntime::Point convert(const QPointF &point, const Esri::ArcGISRuntime::SpatialReference& spatialReference)
+   {
+      return Esri::ArcGISRuntime::Point(point.x(), point.y(), spatialReference);
+   } // convert
+
+
+   RubberbandDrawable::RubberbandDrawable( QGraphicsView * view )
+     : _scene((view) ? view->scene() : nullptr)
+     , _mapView()
+     , _isVisible(true)
+     , _lineWidth(1)
+     , _zBufferValue((unsigned int) ZBufferPlane::Drawables)
+     , _logger(getLogger("RubberbandDrawable"))
+     
+   {
+     doConnecting();
+   } /* RubberbandDrawable::RubberbandDrawable */
+
+   RubberbandDrawable::RubberbandDrawable( Esri::ArcGISRuntime::MapGraphicsView * mapView )
+      : _scene(mapView->scene())
+      , _mapView(mapView)
+      , _isVisible(true)
+      , _lineWidth(1)
+      , _zBufferValue((unsigned int) ZBufferPlane::Drawables)
+      , _logger(getLogger("RubberbandDrawable"))
+      
+   {
+      doConnecting();
+   } /* RubberbandDrawable::RubberbandDrawable */
+
+   RubberbandDrawable::RubberbandDrawable( Esri::ArcGISRuntime::MapGraphicsView * mapView, QGraphicsScene * scene)
+      : _scene(scene)
+      , _mapView(mapView)
+      , _isVisible(true)
+      , _lineWidth(1)
+      , _zBufferValue((unsigned int) ZBufferPlane::Drawables)
+      , _logger(getLogger("RubberbandDrawable"))
+      
+   {
+      doConnecting();
+   } /* RubberbandDrawable::RubberbandDrawable */
+
+
+#ifdef ADJUST_COORDINATES_EVERY_PAINT_EVENT
+   bool RubberbandDrawable::eventFilter( QObject*, QEvent * e )
+   {
+      if (e)
+      {
+         if (e->type() == QEvent::Paint)
+         {
+           /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            * Sometimes the signals extentChanges and rectChanged of Esri Map Widget are not emitted. In this case
+            * the position update of handles and drawabled fails and they are drawn at wrong positions on map. As
+            * workaround updates coordinates at every paint event.
+            * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+            DEBUG_LOG(_logger) << LOGFUNCTION << " paint event";
+            onDo_adjustCoordinates();
+         }
+      }
+      return false;
+   } /* RubberbandDrawable::eventFilter */
+#endif
+
+   void RubberbandDrawable::doConnecting()
+   {
+      if (nullptr == _mapView) return;
+
+      #ifdef ADJUST_COORDINATES_EVERY_PAINT_EVENT
+         _view -> installEventFilter( this );
+      #endif
+ 
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * It is really important to specify the connnection type as following. Because the onDo_adjustCoordinates
+       * should be call as soon as possible to get smooth changes of map. The connection type is DirectConnnection here.
+       * The rectChanged signal is some times emitted, when the calculation of screen coordinates to map coordinates
+       * and vice versa has not been updated to the new map window size. In this case all calculations provides wrong
+       * results. Using the connection type QueuedConnection defers the call of onDo_adjustWindow.
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+      // Check Quartz
+      connect( _mapView.data(), &Esri::ArcGISRuntime::MapGraphicsView::viewpointChanged,
+               this, &RubberbandDrawable::onDo_adjustCoordinates, Qt::ConnectionType::DirectConnection );
+      connect( _mapView.data(), &Esri::ArcGISRuntime::MapGraphicsView::rectChanged  ,
+               this, &RubberbandDrawable::onDo_adjustWindow     , Qt::ConnectionType::QueuedConnection );
+
+   } /* RubberbandDrawable::doConnecting */
+
+
+   void RubberbandDrawable::onDo_adjustCoordinates()
+   {
+     adjustCoordinates();
+     forceUpdateViewWidget();
+   } /* RubberbandDrawable::onDo_adjustCoordinates */
+
+
+   void RubberbandDrawable::onDo_adjustWindow( const QRectF &r )
+   {
+     adjustWindow(r);
+     forceUpdateViewWidget();
+   } /* RubberbandDrawable::onDo_adjustWindow */
+
+
+   void RubberbandDrawable::makeLineStyle( bool dottedLine, QPen & lineStyle )
+   {
+      lineStyle.setColor( _drawColor      );
+      lineStyle.setWidth( int(_lineWidth) );
+
+      if (dottedLine) lineStyle.setStyle( Qt::DashDotLine );
+      else lineStyle.setStyle( Qt::SolidLine );
+   } /* DrawablePainterPathItem::makeLineStyle */
+
+
+   RubberbandDrawable::~RubberbandDrawable() { if (_mapView) _mapView->removeEventFilter(this); }
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.h
new file mode 100755
index 000000000..e54f44690
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_drawable.h
@@ -0,0 +1,214 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband drawing objects
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <QtCore/QObject>
+
+#include <QtGui/QColor>
+#include <QPointer>
+#include <QGraphicsScene>
+
+#include <MapGraphicsView.h>
+#include <Point.h>
+
+#include <Common/referenced.h>
+#include <Common/situation_map_logging.h>
+
+
+class QGraphicsScene;
+
+namespace SituationMap { namespace RB
+{
+
+   Esri::ArcGISRuntime::Point convert(const QPointF &point, const Esri::ArcGISRuntime::SpatialReference& spatialReference);
+
+
+
+   /**
+     @class RubberbandDrawable rubberband_drawable.h
+     @brief Base class of all rubberband drawables and handles for rubberband internal use.
+   */
+   class RubberbandDrawable : public QObject,  public SituationMap::Referenced
+   {
+      Q_OBJECT
+      public:
+
+         enum class ZBufferPlane
+         {
+            FrameHandle  =  10,
+            Drawables    =  20,
+            LineHandle   =  30,
+            ArrowSymbol  =  31,
+            PointHandle  =  40,
+            Widget       = 100
+         }; /* InputMethode */
+
+
+          /**
+            Manages scene and map coordinates.
+         */
+         struct RubberbandCoordinate
+         {
+            QPointF                     _sceneCoordinate;
+            Esri::ArcGISRuntime::Point  _mapCoordinate;
+
+
+            RubberbandCoordinate()
+            {}
+
+            explicit RubberbandCoordinate( const QPointF & sceneCoordinate)
+            {
+              updateSceneCoordinate( sceneCoordinate );
+            } /* RubberbandCoordinate */
+
+            explicit  RubberbandCoordinate( Esri::ArcGISRuntime::MapGraphicsView * mapView, const QPointF & sceneCoordinate)
+            {
+               updateSceneCoordinate( mapView, sceneCoordinate );
+            } /* RubberbandCoordinate */
+
+
+            explicit RubberbandCoordinate( Esri::ArcGISRuntime::MapGraphicsView * mapView, const Esri::ArcGISRuntime::Point  & mapCoordinate)
+               : _mapCoordinate(mapCoordinate)
+            {
+               mapToScene( mapView );
+            } /* RubberbandCoordinate */
+
+
+            inline QPointF mapToScene(Esri::ArcGISRuntime::MapGraphicsView * mapView)
+            {
+               if (!_mapCoordinate.isValid())
+                 return QPointF();
+               const QPointF pixelCoordinate = mapView->locationToScreen(_mapCoordinate);
+               _sceneCoordinate = mapView->mapToScene( pixelCoordinate.x(), pixelCoordinate.y() );
+               return _sceneCoordinate;
+            } /* QPointF mapToScene(Esri::ArcGISRuntime::MapGraphicsView * mapView) */
+
+
+            inline void updateSceneCoordinate( Esri::ArcGISRuntime::MapGraphicsView * mapView, const QPointF & sceneCoordinate)
+            {
+               if (mapView)
+               {
+                  _sceneCoordinate = sceneCoordinate;
+                  QPoint pixelCoordinate = mapView->mapFromScene(sceneCoordinate);
+                  _mapCoordinate = mapView->screenToLocation( pixelCoordinate.x(), pixelCoordinate.y() );
+               }
+               else updateSceneCoordinate( sceneCoordinate );
+            } /* void updateSceneCoordinate( Esri::ArcGISRuntime::MapGraphicsView * mapView, const QPointF & sceneCoordinate) */
+
+
+            inline void updateSceneCoordinate( const QPointF & sceneCoordinate )
+            {
+              _sceneCoordinate = sceneCoordinate;
+              _mapCoordinate = Esri::ArcGISRuntime::Point();
+            } /* void updateSceneCoordinate( const QPointF & sceneCoordinate ) */
+
+            bool isNull() const
+            {
+              return _sceneCoordinate.isNull();
+            }
+
+         }; /* RubberbandCoordinate */
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         explicit RubberbandDrawable( QGraphicsView *view );
+         explicit RubberbandDrawable( Esri::ArcGISRuntime::MapGraphicsView * );
+         explicit RubberbandDrawable( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+         ~RubberbandDrawable();
+         /** @} */
+
+         inline bool isVisible() const              { return _isVisible; }
+         inline void setVisibility(bool on = true)  { _isVisible = on;  updateGraphic(); }
+
+         inline void setDrawColor     (const QColor & col)   { _drawColor = col;   updateGraphic(); }
+         inline void setFillColor     (const QColor & col)   { _fillColor = col;   updateGraphic(); }
+         inline void setLineWidth(unsigned int width)        { _lineWidth = width; updateGraphic(); }
+
+         inline void zBufferPlane( ZBufferPlane zPlane )     { _zBufferValue = (unsigned int) zPlane; }
+
+         inline void setZValue(qreal zValue)                 { _zValue = zValue;  updateGraphic();    }
+         inline qreal zValue() const                         { return _zValue;                        }
+
+      protected:
+
+         QPointer<QGraphicsScene>                       _scene;
+         QPointer<Esri::ArcGISRuntime::MapGraphicsView> _mapView;
+
+         bool                      _isVisible;
+         QColor                    _drawColor;
+         QColor                    _fillColor;
+         unsigned int              _lineWidth;
+         qreal                     _zBufferValue;
+         qreal                     _zValue{0};    // combine _zBufferValue and _zValue???
+
+         LOGGER_T                  _logger;
+
+      #ifdef ADJUST_COORDINATES_EVERY_PAINT_EVENT
+         bool eventFilter(QObject*, QEvent*) override;
+      #endif
+
+         virtual void updateGraphic() = 0;
+
+         void makeLineStyle( bool dottedLine, QPen & lineStyle );
+
+         inline void forceUpdateViewWidget() { _mapView->viewport()->update(); }
+
+         virtual void adjustCoordinates()           = 0;
+         virtual void adjustWindow( const QRectF& ) = 0;
+
+
+         QColor transparentFillColor() const
+         {
+           QColor fillColor(_fillColor);
+
+           if (fillColor.alphaF() > 0.85)
+           {
+             fillColor.setAlphaF( fillColor.alphaF()*0.5 );
+           }
+           return fillColor;
+         } // QColor transparentFillColor()
+
+
+      protected slots:
+
+         void onDo_adjustCoordinates();
+         void onDo_adjustWindow(const QRectF & );
+
+      private:
+
+        
+
+         void doConnecting();
+
+   }; /* RubberbandDrawable */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.cpp
new file mode 100755
index 000000000..74c53c015
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.cpp
@@ -0,0 +1,456 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_ellipse.h"
+#include "drawable_ellipse.h"
+#include "rubberband_point_handle.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <MathUtils/math_const.h>
+#include <MathUtils/simple_helper.h>
+#include <LtsCoordTrans/lts_coord_trans.h>
+#include <SpatialReference.h>
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandEllipse::InternalData
+   {
+         SituationMap::RefPointer<DrawableEllipse>      _ellipseSymbol;
+         int                                            _alphaFill = 50;   // alpha value used for fill color of ellipse
+
+         QPointF                                         _sectorOStart = QPointF(1,0);
+         QPointF                                         _sectorOEnd = QPointF(1,0);
+         SituationMap::RefPointer<RubberbandPointHandle> _sectorStartHandle;
+         SituationMap::RefPointer<RubberbandPointHandle> _sectorEndHandle;
+
+         bool                                            _sectorEnabled = false;
+         bool                                            _sectorFixedAngleEnabled = false;
+
+   }; /* RubberbandEllipse::InternalData */
+
+
+   RubberbandEllipse::RubberbandEllipse( SituationMap::Map * map, QObject * parent  )
+      : RubberbandRectangle(map,parent), _internal(new InternalData)
+   {
+      useDottedLineHandles(true);
+   } /* RubberbandEllipse::RubberbandEllipse */
+
+
+   RubberbandEllipse::~RubberbandEllipse()
+   {
+      delete _internal;
+      _internal = nullptr;
+   } /* RubberbandEllipse::~RubberbandEllipse */
+
+
+   QPointF RubberbandEllipse::getRotatedPoint(QPointF sector) const
+   {
+     qreal sinRect = 0, cosRect = 1;
+     getSceneRotation( sinRect, cosRect);
+     double angleRad = SituationMap::MathUtils::getMathAngle(QPointF(cosRect,sinRect));// angle rad
+     //double angleDeg = SituationMap::MathUtils::getMathAngle(QPointF(cosRect,sinRect)) * LtsCoordTrans::rad2deg();
+     const double clockwiseAngle = ((360*LtsCoordTrans::deg2rad()) - angleRad);// angle in rad;
+
+     // map clockwise rotation
+     QPointF point = sector;
+     point.setX(  sector.x()*std::cos(clockwiseAngle) + sector.y()*std::sin(clockwiseAngle));
+     point.setY( -sector.x()*std::sin(clockwiseAngle) + sector.y()*std::cos(clockwiseAngle));
+
+     return point;
+   }
+
+   void RubberbandEllipse::setSectorStart(qreal sinPhi, qreal cosPhi)
+   {
+     _internal->_sectorOStart = QPointF( cosPhi, sinPhi );
+     update();
+   } /* RubberbandEllipse::setSectorStart */
+
+
+   void RubberbandEllipse::setSectorEnd(qreal sinPhi, qreal cosPhi)
+   {
+      _internal->_sectorOEnd = QPointF( cosPhi, sinPhi );
+      update();
+   } /* RubberbandEllipse::setSectorEnd */
+
+
+   QPointF RubberbandEllipse::sectorStart() const
+   {
+     return getRotatedPoint(_internal->_sectorOStart);
+   } /* RubberbandEllipse::sectorStart */
+
+
+   QPointF RubberbandEllipse::sectorEnd() const
+   {
+     return getRotatedPoint(_internal->_sectorOEnd);
+   } /* RubberbandEllipse::sectorEnd */
+
+
+   bool RubberbandEllipse::hasSector() const
+   {
+     auto getAngle = [](qreal sinPhi, qreal cosPhi) -> int
+     {
+        qreal phi = acos( cosPhi );
+        if (sinPhi < 0) phi = MathConst::pi_two - phi;
+        return int( (phi * 180.0 / MathConst::pi) * 16);
+      }; // getAngle
+
+     int phiStart = getAngle(_internal->_sectorOStart.y(),_internal->_sectorOStart.y());
+     int phiEnd   = getAngle(  _internal->_sectorOEnd.y(),  _internal->_sectorOEnd.y());
+     return phiStart != phiEnd;
+   } /* RubberbandEllipse::hasSector */
+
+   void RubberbandEllipse::enableSector(bool on)   { _internal -> _sectorEnabled = on;   }
+   bool RubberbandEllipse::isSectorEnabled() const { return _internal -> _sectorEnabled; }
+
+   void RubberbandEllipse::setSectorAngleFixed(bool on)
+   {
+     _internal -> _sectorFixedAngleEnabled = on;
+   }
+
+   bool RubberbandEllipse::isSectorFixedAngeEnabled() const
+   {
+     return _internal->_sectorFixedAngleEnabled;
+   }
+
+
+   bool RubberbandEllipse::selectAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         _baseInternal->_lastClickPosition = scenePos;
+
+         if (_internal -> _sectorEnabled)
+         {
+            if ((_internal->_sectorEndHandle.valid()) && (_internal->_sectorEndHandle->isPositionInside(scenePos)))
+            {
+               _internal->_sectorEndHandle->setSelection(true);
+               enableSelectedState();
+               update();
+               deactivateButtons();
+               return true;
+             }
+
+            if ((_internal->_sectorStartHandle.valid()) && (_internal->_sectorStartHandle->isPositionInside(scenePos)))
+            {
+               _internal->_sectorStartHandle->setSelection(true);
+               enableSelectedState();
+               update();
+               deactivateButtons();
+               return true;
+             }
+         }
+      }
+      return RubberbandRectangle::selectAction(causer,x,y);
+   } /* RubberbandEllipse::selectAction */
+
+
+   bool RubberbandEllipse::moveAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+         if (_internal -> _sectorEnabled)
+         {
+            if (_internal->_sectorEndHandle.valid())
+            {
+               if (_internal->_sectorEndHandle->isPositionInside(scenePos))
+               {
+                  _internal->_sectorEndHandle->setSelection(true);
+                  update();
+                  return false;
+               }
+               else _internal->_sectorEndHandle->setSelection(false);
+            }
+
+            if (_internal->_sectorStartHandle.valid())
+            {
+               if (_internal->_sectorStartHandle->isPositionInside(scenePos))
+               {
+                  _internal->_sectorStartHandle->setSelection(true);
+                  update();
+                  return false;
+               }
+               else _internal->_sectorStartHandle->setSelection(false);
+            }
+         }
+      }
+      return RubberbandRectangle::moveAction(causer,x,y);
+   } /* RubberbandEllipse::moveAction */
+
+
+   bool RubberbandEllipse::setCoordinateAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if (rubberbandIsAlive())
+      {
+         if (_internal -> _sectorEnabled)
+         {
+            if ((_internal->_sectorEndHandle.valid()) && (_internal->_sectorEndHandle->isSelected()))
+            {
+               _internal->_sectorEndHandle->setSelection(false);
+               update();
+               activateButtons();
+               return true;
+            }
+
+            if ((_internal->_sectorStartHandle.valid()) && (_internal->_sectorStartHandle->isSelected()))
+            {
+               _internal->_sectorStartHandle->setSelection(false);
+               update();
+               activateButtons();
+               return true;
+            }
+         }
+      }
+      return RubberbandRectangle::setCoordinateAction(causer,x,y);
+   } /* RubberbandEllipse::setCoordinateAction */
+
+
+   bool RubberbandEllipse::movePickedAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+      if (rubberbandIsAlive())
+      {
+         auto updateHandle = [this](RubberbandPointHandle * handle, const RubberbandHandle::RubberbandCoordinate & pos, QPointF & oVector ) -> bool
+         {
+            if (handle == nullptr)     return false;
+            if (!handle->isSelected()) return false;
+            if (isSectorFixedAngeEnabled()) return false;
+
+            qreal           sinRect = 0;
+            qreal           cosRect = 1;
+            const QPointF & center  = getCenter();
+
+            getSceneRotation( sinRect, cosRect);
+
+            qreal cosA = pos._mapCoordinate.x() - center.x();
+            qreal sinA = pos._mapCoordinate.y() - center.y();
+            qreal len  = sqrt(cosA*cosA+sinA*sinA);
+
+            cosA /= len;
+            sinA /= len;
+
+            oVector.setX( cosA*cosRect + sinA*sinRect );
+            oVector.setY( sinA*cosRect - cosA*sinRect );
+            update();
+            return true;
+         }; // updateHandle
+
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         RubberbandHandle::RubberbandCoordinate pos(Rubberband::_internal->_mapView, scenePos );
+
+         if (updateHandle( _internal->_sectorEndHandle.get()  , pos, _internal->_sectorOEnd   )) return false;
+         if (updateHandle( _internal->_sectorStartHandle.get(), pos, _internal->_sectorOStart )) return false;
+      }
+      return RubberbandRectangle::movePickedAction(causer,x,y);
+   } /* RubberbandEllipse::movePickedAction */
+
+
+   void RubberbandEllipse::updateSectorHandles()
+   {
+
+      auto ellipse = []( qreal a, qreal b, qreal sinA, qreal cosA ) -> QPointF
+      {
+         /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+          *
+          * Qt does not use the paramater equation of a ellipse to draw sectors. Instead of a simpler term
+          * is used. For simpleness we use the same of.
+          *
+         qreal    e2   = 1 - (b*b) / (a*a);
+         qreal    cos2 = cosA * cosA;
+         qreal    f    = b / sqrt(1-e2*cos2);
+         return QPointF( f*cosA, f*sinA );
+         * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+         return QPointF(a*cosA,b*sinA);
+      };
+
+      auto rotate = [] ( const QPointF & p, qreal sinA, qreal cosA ) -> QPointF { return QPointF( p.x()*cosA - p.y()*sinA, p.y()*cosA + p.x()*sinA ); };
+
+      qreal   a      = getWidth()  * 0.5;
+      qreal   b      = getHeight() * 0.5;
+      QPointF startP = ellipse(a,b,_internal->_sectorOStart.y(),_internal->_sectorOStart.x() );
+      QPointF endP   = ellipse(a,b,_internal->_sectorOEnd.y()  ,_internal->_sectorOEnd.x()   );
+
+      qreal sinRect = 0;
+      qreal cosRect = 1;
+
+      getSceneRotation( sinRect, cosRect);
+
+      startP = rotate(startP, sinRect, cosRect) + getCenter();
+      endP   = rotate(  endP, sinRect, cosRect) + getCenter();
+
+      const Esri::ArcGISRuntime::Point &mapStartP = convert( startP, Rubberband::_internal->_mapView->map()->spatialReference() );
+      const Esri::ArcGISRuntime::Point &mapEndP   = convert(   endP, Rubberband::_internal->_mapView->map()->spatialReference() );
+
+      if (!_internal->_sectorStartHandle.valid())
+      {
+        _internal->_sectorStartHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapStartP );
+      }
+      else _internal->_sectorStartHandle->setCoordinate(  RubberbandHandle::RubberbandCoordinate(Rubberband::_internal->_mapView,mapStartP) );
+
+      _internal->_sectorStartHandle -> setVisibility((isSectorEnabled() && !isSectorFixedAngeEnabled())/*_internal->_sectorEnabled*/);
+      _internal->_sectorStartHandle -> setDrawColor(_handleDrawColor);
+      _internal->_sectorStartHandle -> setFillColor( _handleFillColor );
+      _internal->_sectorStartHandle -> setSelectionColor(_handleSelectionColor);
+
+      if (!_internal->_sectorEndHandle.valid())
+      {
+        _internal->_sectorEndHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapEndP );
+      }
+      else _internal->_sectorEndHandle->setCoordinate(  RubberbandHandle::RubberbandCoordinate(Rubberband::_internal->_mapView,mapEndP) );
+
+      _internal->_sectorEndHandle -> setVisibility(isSectorEnabled() && !isSectorFixedAngeEnabled()/*_internal->_sectorEnabled*/);
+      _internal->_sectorEndHandle -> setDrawColor(_handleDrawColor);
+      _internal->_sectorEndHandle -> setFillColor( _handleFillColor );
+      _internal->_sectorEndHandle -> setSelectionColor(_handleSelectionColor);
+
+   } /* RubberbandEllipse::updateSectorHandles */
+
+
+   void RubberbandEllipse::update()
+   {
+
+      RubberbandRectangle::update();
+
+      if (isEnabledModificationState())
+      {
+         updateSectorHandles();
+
+         QPointF  center  = getCenter();
+         qreal    width2  = getWidth()*0.5;
+         qreal    height2 = getHeight()*0.5;
+         qreal    sinRect = 0.0;
+         qreal    cosRect = 1.0;
+
+         getSceneRotation( sinRect, cosRect );
+
+         if (_internal->_ellipseSymbol == nullptr)
+         {
+            _internal->_ellipseSymbol = new DrawableEllipse( Rubberband::_internal->_mapView );
+         }
+
+         QColor drawColor = _drawColor;
+
+         _internal->_ellipseSymbol->setDrawColor( drawColor );
+         drawColor.setAlpha(_internal->_alphaFill);
+         if (_internal -> _sectorEnabled){
+           _fillColor.setAlpha(_internal->_alphaFill+10);
+           _internal->_ellipseSymbol->setFillColor( _fillColor );
+         }
+         else
+         {
+           _fillColor.setAlpha(0);
+           _internal->_ellipseSymbol->setFillColor( _fillColor );
+         }
+
+         _internal->_ellipseSymbol->setRect( center, width2, height2, sinRect, cosRect, _internal->_sectorOStart, _internal->_sectorOEnd );
+
+      }
+   } /* RubberbandEllipse::update */
+
+
+   void RubberbandEllipse::buildTmpConstruction( SituationMap::RefPointer<RubberbandDrawable> &tmpGraphic, QPointF &start, QPointF &end )
+   {
+      if (!tmpGraphic.valid())
+      {
+         tmpGraphic  = new DrawableEllipse( Rubberband::_internal->_mapView );
+         tmpGraphic -> setDrawColor( _drawColor );
+         tmpGraphic -> setFillColor( _fillColor );
+         tmpGraphic -> setLineWidth( 1 );
+         tmpGraphic -> zBufferPlane( RubberbandDrawable::ZBufferPlane::Drawables );
+      }
+
+      QVector<QPointF> path;
+      QPointF          sceneCenter;
+      qreal            sceneWidth;
+      qreal            sceneHeight;
+      qreal            sinMap;
+      qreal            cosMap;
+
+      getMapRotation( sinMap, cosMap );
+
+      auto rotate = [sinMap, cosMap](qreal x, qreal y) -> QPointF
+      {
+         qreal px = x*cosMap - y*sinMap;
+         qreal py = y*cosMap + x*sinMap;
+         return QPointF(px,py);
+      }; // rotate
+
+      buildTmpConstructionPath( start-end + start, end, path, sceneCenter, sceneWidth, sceneHeight );
+
+      DrawableEllipse * tmpEllipse = static_cast<DrawableEllipse*>(tmpGraphic.get());
+
+      RubberbandHandle::RubberbandCoordinate  mapCenter( Rubberband::_internal->_mapView, start );
+      RubberbandHandle::RubberbandCoordinate  mapRadius( Rubberband::_internal->_mapView, start+rotate(sceneWidth*0.5,sceneHeight*0.5) );
+
+      qreal w = mapRadius._mapCoordinate.x() - mapCenter._mapCoordinate.x();
+      qreal h = mapRadius._mapCoordinate.y() - mapCenter._mapCoordinate.y();
+
+      tmpEllipse->setRect( QPointF(mapCenter._mapCoordinate.x(),mapCenter._mapCoordinate.y()), w, h, 0, 1 );
+   } /* RubberbandEllipse::buildTmpConstruction */
+
+
+   void RubberbandEllipse::getTmpConstructionParameter(const QPointF & start, const QPointF & end, QPointF & sceneCenter, qreal & sceneWidth, qreal & sceneHeight)
+   {
+      QVector<QPointF> path;
+      qreal            sinMap;
+      qreal            cosMap;
+
+      getMapRotation( sinMap, cosMap );
+
+      auto rotate = [sinMap, cosMap]( qreal x, qreal y ) -> QPointF
+      {
+         qreal px = x*cosMap - y*sinMap;
+         qreal py = y*cosMap + x*sinMap;
+         return QPointF(px,py);
+      }; // rotate
+
+      auto length = [](qreal x, qreal y) -> qreal { return sqrt(x*x+y*y); };
+
+      buildTmpConstructionPath( start, end, path, sceneCenter, sceneWidth, sceneHeight );
+
+      RubberbandHandle::RubberbandCoordinate  mapCenter ( Rubberband::_internal->_mapView, start );
+      RubberbandHandle::RubberbandCoordinate  mapRadiusX( Rubberband::_internal->_mapView, start+rotate(sceneWidth,0) );
+      RubberbandHandle::RubberbandCoordinate  mapRadiusY( Rubberband::_internal->_mapView, start+rotate(0,sceneHeight) );
+
+      qreal w = length( mapRadiusX._sceneCoordinate.x()-mapCenter._sceneCoordinate.x(), mapRadiusX._sceneCoordinate.y()-mapCenter._sceneCoordinate.y() );
+      qreal h = length( mapRadiusY._sceneCoordinate.x()-mapCenter._sceneCoordinate.x(), mapRadiusY._sceneCoordinate.y()-mapCenter._sceneCoordinate.y() );
+
+      sceneCenter  = start;
+      sceneWidth  = 2*w;
+      sceneHeight = 2*h;
+   } /* RubberbandEllipse::getTmpConstructionParameter */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.h
new file mode 100755
index 000000000..a92f0aa6a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse.h
@@ -0,0 +1,95 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_rectangle.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+
+  /**
+     @class RubberbandEllipse rubberband_ellipse.h
+     @brief Implementation of a rubberband to input ellipses and circles
+     @see Rubberband, RubberbandRectangle
+   */
+   class SITUATIONMAP_EXPORT RubberbandEllipse : public RubberbandRectangle
+   {
+      Q_OBJECT
+         /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+         explicit RubberbandEllipse( SituationMap::Map * map, QObject * parent = nullptr );
+
+      public:
+
+         virtual ~RubberbandEllipse();
+
+         RubberbandEllipse(const RubberbandEllipse &) = delete;
+         RubberbandEllipse & operator = (const RubberbandEllipse &) = delete;
+         /** @} */
+
+         void setSectorStart( qreal sinPhi, qreal cosPhi );
+         void setSectorEnd( qreal sinPhi, qreal cosPhi );
+
+         QPointF getRotatedPoint(QPointF sector)const;
+         bool    hasSector()   const;
+         QPointF sectorStart() const;
+         QPointF sectorEnd()   const;
+
+         void enableSector( bool on = true );
+         bool isSectorEnabled() const;
+         void setSectorAngleFixed(bool on); // true: start and end sectors positon can't be modifed
+         bool isSectorFixedAngeEnabled() const;
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+   protected:
+
+         void updateSectorHandles();
+
+         void update() override;
+
+         struct InternalData;
+
+         InternalData  * _internal;
+
+         void buildTmpConstruction( SituationMap::RefPointer<RubberbandDrawable> & tmpGraphic, QPointF & start, QPointF & end ) override;
+         void getTmpConstructionParameter( const QPointF & start, const QPointF & end, QPointF & sceneCenter, qreal & sceneWidth, qreal & sceneHeight ) override;
+
+   }; /* RubberbandPointFeature */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.cpp
new file mode 100755
index 000000000..872fc4cdb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.cpp
@@ -0,0 +1,237 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_ellipse_handle.h"
+#include <MathUtils/math_const.h>
+
+#include <MapGraphicsView.h>
+#include <Map.h>
+
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsEllipseItem>
+
+#include <math.h>
+#include <SpatialReference.h>
+
+namespace SituationMap { namespace RB
+{
+
+RubberbandEllipseHandle::RubberbandEllipseHandle(Esri::ArcGISRuntime::MapGraphicsView * mapView, QGraphicsScene *scene)
+  : RubberbandHandle(mapView, scene)
+{
+  zBufferPlane( ZBufferPlane::LineHandle );
+  updateGraphic();
+}
+
+RubberbandEllipseHandle::~RubberbandEllipseHandle()
+{
+  if (!_scene)
+    return;
+
+  if (_ellipseSymbol)
+  {
+    _scene->removeItem(_ellipseSymbol);
+    delete _ellipseSymbol;
+  }
+}
+
+void RubberbandEllipseHandle::adjustCoordinates()
+{
+  _center.mapToScene(_mapView);
+  updateGraphic();
+
+  emit adjusted();
+}
+
+
+void RubberbandEllipseHandle::adjustWindow( const QRectF& )
+{
+  onDo_adjustCoordinates();
+}
+
+qreal length(const QPointF &p)
+{
+  return sqrt(p.x()*p.x()+p.y()*p.y());
+}
+
+
+void RubberbandEllipseHandle::updateGraphic()
+{
+  if (_scene)
+  {
+    if (!_ellipseSymbol)
+    {
+      _ellipseSymbol = new QGraphicsEllipseItem();
+      _scene->addItem(_ellipseSymbol);
+      _ellipseSymbol->setFlags( QGraphicsItem::ItemIgnoresTransformations );
+    }
+
+    _ellipseSymbol->setZValue(_zValue);
+
+    // Style
+    makeLineStyle( _dottedLine, _lineStyle );
+
+    if (_isSelected)
+    {
+      _lineStyle.setWidth( _lineStyle.width() + 1 );
+      _lineStyle.setColor( _selectionColor );
+    }
+
+    _ellipseSymbol->setPen(_lineStyle);
+
+    if (isSelected())
+      _ellipseSymbol->setBrush( QBrush(_selectionColor) );
+    else
+      _ellipseSymbol->setBrush( QBrush(_fillColor) );
+
+    _ellipseSymbol->setVisible(_isVisible);
+
+    // geometry:
+    {
+      _center.mapToScene(_mapView);
+
+      QPointF mapCenter( _center._mapCoordinate.x(), _center._mapCoordinate.y() );
+
+      qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+      qreal sinMap = sin(mapRotatePhi);
+      qreal cosMap = cos(mapRotatePhi);
+
+      qreal sinPhi = _sinRect * cosMap + _cosRect * sinMap;
+      qreal cosPhi = _cosRect * cosMap - _sinRect * sinMap;
+
+
+      RubberbandCoordinate x0y0(_mapView, convert( mapCenter+QPointF(-_radiusX,-_radiusY), _mapView->map()->spatialReference()) );
+      RubberbandCoordinate x1y0(_mapView, convert( mapCenter+QPointF( _radiusX,-_radiusY), _mapView->map()->spatialReference()) );
+      RubberbandCoordinate x0y1(_mapView, convert( mapCenter+QPointF(-_radiusX, _radiusY), _mapView->map()->spatialReference()) );
+
+      const qreal width  = length(x1y0._sceneCoordinate-x0y0._sceneCoordinate);
+      const qreal height = length(x0y1._sceneCoordinate-x0y0._sceneCoordinate);
+
+      // honor sector??
+
+      if (_sectorStart != _sectorEnd)
+      {
+         auto getAngle = [](qreal sinPhi, qreal cosPhi) -> int
+         {
+           qreal phi = acos( cosPhi );
+           if (sinPhi < 0) phi = MathConst::pi_two - phi;
+           return int( (phi * 180.0 / MathConst::pi) * 16);
+         }; // getAngle
+
+         int startAngle = getAngle(_sectorStart.y(), _sectorStart.x());
+         int endAngle   = getAngle(  _sectorEnd.y(),   _sectorEnd.x());
+         int spanAngle  = (endAngle > startAngle) ? endAngle-startAngle : 5760-startAngle+endAngle;
+
+         QColor fillColor = transparentFillColor();
+         _ellipseSymbol->setRect(-width*0.5, -height*0.5, width, height);
+         _ellipseSymbol->setPen(_lineStyle );
+         _ellipseSymbol->setBrush( (fillColor.alpha() > 0) ? QBrush(fillColor) : QBrush() );
+         _ellipseSymbol->setTransform( QTransform( cosPhi, -sinPhi, sinPhi, cosPhi, _center._sceneCoordinate.x(), _center._sceneCoordinate.y() ));
+         _ellipseSymbol->setStartAngle(startAngle );
+         _ellipseSymbol->setSpanAngle(spanAngle);
+         _ellipseSymbol->setVisible(true);
+      }
+
+      _ellipseSymbol->setRect(-width*0.5, -height*0.5, width, height);
+      _ellipseSymbol->setTransform( QTransform( cosPhi, -sinPhi, sinPhi, cosPhi, _center._sceneCoordinate.x(), _center._sceneCoordinate.y()) );
+    }
+  }
+
+}
+
+QPointF RubberbandEllipseHandle::getRadius()
+{
+  return {_radiusX, _radiusY};
+}
+
+
+void RubberbandEllipseHandle::setRect(const RubberbandCoordinate &center, qreal radiusX, qreal radiusY,
+                                      qreal sin, qreal cos,
+                                      const QPointF &sectorStart, const QPointF &sectorEnd)
+{
+  // p1,p2 = corner points of unrotated ellipse in scene coordinates
+  _center  = center;
+  _radiusX = radiusX;
+  _radiusY = radiusY;
+
+  _sinRect = sin;
+  _cosRect = cos;
+
+  _sectorStart = sectorStart;
+  _sectorEnd   = sectorEnd;
+
+  updateGraphic();
+}
+
+
+bool RubberbandEllipseHandle::isPositionInside(const QPointF &scenePosition) const
+{
+  if (_ellipseSymbol)
+  {
+    if (_ellipseSymbol->contains( scenePosition ))
+    {
+      return true;
+    }
+//    else
+//    {
+//      // Ok, Qt's methodes doesn't work safely
+//      // if it fails do some own calculations
+
+//      QPointF V0   = _coordinates[0]._sceneCoordinate;
+//      QPointF V1   = _coordinates[1]._sceneCoordinate;
+//      QPointF R    = V1-V0;
+//      QPointF P    = scenePosition-V0;
+//      qreal   lenR = R.x() * R.x() + R.y() * R.y();
+//      qreal   lenP = P.x() * P.x() + P.y() * P.y();
+
+//      if ((lenR == 0) || (lenP > lenR)) return false; // scene Position is to far away
+
+//      // now check the direction
+
+//      lenR = sqrt(lenR);
+//      lenP = sqrt(lenP);
+
+//      R /= lenR;
+//      P /= lenP;
+
+//      qreal cosPhi  = QPointF::dotProduct(R,P);
+
+//      if (cosPhi < 0) return false;
+
+//      qreal epsilon = sqrt(1.0-cosPhi*cosPhi) * lenR;
+
+//      return (epsilon < qreal(_pickingRatio));
+//    }
+  }
+
+  return false;
+}
+
+} }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.h
new file mode 100755
index 000000000..d4e5e7ce6
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_ellipse_handle.h
@@ -0,0 +1,96 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointF>
+
+#include <QtGui/QPen>
+
+#include "rubberband_handle.h"
+
+class QGraphicsEllipse;
+class QGraphicsScene;
+
+namespace SituationMap
+{
+namespace RB
+{
+
+/**
+     @class RubberbandEllipseHandle rubberband_line_handle.h
+     @brief Implementation of a line handle for rubberband internal use.
+     @see RubberbandHandle
+   */
+class RubberbandEllipseHandle : public RubberbandHandle
+{
+  Q_OBJECT
+public:
+
+  RubberbandEllipseHandle(Esri::ArcGISRuntime::MapGraphicsView * mapView ,QGraphicsScene * scene);
+  ~RubberbandEllipseHandle();
+
+  bool isPositionInside(const QPointF &scenePosition) const override;
+
+//  virtual void updateCoordinates(const QVector<QPointF> &scenePositionVector);
+//  virtual void updateCoordinate(unsigned index, const QPointF &scenePosition);
+
+  QPointF getRadius();
+
+  void setRect(const RubberbandDrawable::RubberbandCoordinate &center,
+               qreal radiusX, qreal radiusY,
+               qreal sin, qreal cos,
+               const QPointF & sectorStart = QPointF(), const QPointF & sectorEnd = QPointF());
+
+
+  void dottedLine(bool on = true)             { _dottedLine = on; }
+
+protected:
+
+  QGraphicsEllipseItem           *_ellipseSymbol{nullptr};
+  QPen                            _lineStyle;
+  RubberbandDrawable::RubberbandCoordinate   _center;
+  qreal                                      _radiusX{0.0};
+  qreal                                      _radiusY{0.0};
+  qreal                                      _sinRect{0.0};
+  qreal                                      _cosRect{0.0};
+  QPointF                                    _sectorStart;
+  QPointF                                    _sectorEnd;
+
+  bool                            _dottedLine{false};
+
+  void updateGraphic() override;
+
+  void adjustCoordinates()           override;
+  void adjustWindow(const QRectF&) override;
+
+
+}; // RubberbandEllipseHandle
+
+}
+} // namespace SituationMap::RB
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.cpp
new file mode 100755
index 000000000..1b6d114ed
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.cpp
@@ -0,0 +1,634 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**   30.09.2015, JT  : New create method for creating rubberbands fitting to a special sidc code
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#include "rubberband_factory.h"
+#include "rubberband_corridor.h"
+#include <Symbology/sidc_builder_base.h>
+
+#include <cmath>
+#include <Map/coord_translation_functor.h>
+
+namespace SituationMap { namespace RB
+{
+
+  class RubberbandFactory::Defaults
+  {
+     public:
+
+        QColor       _rubberbandDrawColor         = QColor();
+        QColor       _rubberbandFillColor         = QColor();
+        QColor       _rubberbandHandleDrawColor   = QColor();
+        QColor       _rubberbandHandleFillColor   = QColor();
+        QColor       _rubberbandSelectionColor    = QColor();
+        QColor       _rubberbandFrameColor        = QColor();
+        QColor       _rubberbandFrameFillColor    = QColor();
+        int          _rubberbandFrameHandleMargin = 0;
+        QPoint       _rubberbandPreviewOffset     = QPoint();
+        unsigned int _rubberbandPreviewSize       = 0;
+        unsigned int _rubberbandPickingRatio      = 0;
+        unsigned int _rubberbandLineHandleWidth   = 0;
+
+  }; // RubberbandFactory::Defaults
+
+
+  RubberbandFactory::RubberbandFactory( SituationMap::Map * map )
+    : QObject()
+    , _map(map)
+    , _defaults(new Defaults())
+    , _allowMultipleRubberbands(false)
+    , _logger(getLogger("RubberbandFactory"))
+  {}
+
+  RubberbandFactory::~RubberbandFactory() { delete _defaults; }
+
+
+  class SymbolConstruction
+  {
+    public:
+
+      enum class Mode
+      {
+        Unknown = 0,
+        
+        Point,
+
+        ArcCurve,
+        Triangle,
+        MultiPoint,
+
+        PolyLine,
+        PolyLineWidth,
+        
+        Polygon,
+        Rectangle,
+        Circular,
+        Corridor
+      }; // Mode
+
+      Mode         _mode;
+      unsigned int _minPoints;
+      unsigned int _maxPoints;
+
+      explicit SymbolConstruction( const AdvancedSymbology::GeometryType & geomType, const QString & gctString )
+        : _mode(Mode::Unknown), _minPoints(-1), _maxPoints(-1)
+      {
+        if (QLatin1String("gct_arrow")                      == gctString) { _mode = Mode::PolyLine;      _minPoints = 2; _maxPoints = 0; }
+        if (QLatin1String("gct_arrow_with_offset")          == gctString) { _mode = Mode::PolyLineWidth; _minPoints = 2; _maxPoints = 0; }
+        if (QLatin1String("gct_arrow_with_tail")            == gctString) { _mode = Mode::Triangle;      _minPoints = 3; _maxPoints = 3; }
+
+        if (QLatin1String("gct_circle")                     == gctString) { _mode = Mode::MultiPoint;    _minPoints = 2; _maxPoints = 2; }
+        if (QLatin1String("gct_circular")                   == gctString) { _mode = Mode::Circular;      _minPoints = 1; _maxPoints = 1; }
+
+        if (QLatin1String("gct_freehand_arrow")             == gctString) { _mode = Mode::ArcCurve;      _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_freehand_line")              == gctString) { _mode = Mode::ArcCurve;      _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_freehand_reverse_arrow")     == gctString) { _mode = Mode::ArcCurve;      _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_freehand_u")                 == gctString) { _mode = Mode::ArcCurve;      _minPoints = 4; _maxPoints = 4; }
+
+        if (QLatin1String("gct_hook")                       == gctString) { _mode = Mode::MultiPoint;    _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_horns")                      == gctString) { _mode = Mode::MultiPoint;    _minPoints = 4; _maxPoints = 4; }
+
+        if (QLatin1String("gct_open_triangle")              == gctString) { _mode = Mode::Triangle;      _minPoints = 3; _maxPoints = 3; }
+
+        if (QLatin1String("gct_parallel_lines")             == gctString) { _mode = Mode::PolyLineWidth; _minPoints = 2; _maxPoints = 2; }
+        if (QLatin1String("gct_parallel_lines_mid_line")    == gctString) { _mode = Mode::PolyLineWidth; _minPoints = 2; _maxPoints = 2; }
+
+        if (QLatin1String("gct_parallel_lines_with_ticks")  == gctString)
+        {
+          _mode = Mode::MultiPoint;
+          // ESRI implmentation seems to differ from symbology standard and takes always 4 input 
+          // coordinates here to construct the symbol!
+          //
+          // if (AdvancedSymbology::GeometryType::Polygon == geomType) _minPoints = _maxPoints = 4;
+          // else                                                      _minPoints = _maxPoints = 3;
+          _minPoints = _maxPoints = 4;
+        }
+
+        if (QLatin1String("gct_rectangular")                == gctString) { _mode = Mode::Corridor;      _minPoints = 2; _maxPoints = 2; }
+        if (QLatin1String("gct_rectangular_1_pt")           == gctString) { _mode = Mode::Rectangle;     _minPoints = 1; _maxPoints = 1; }
+       
+        if (QLatin1String("gct_t")                          == gctString) { _mode = Mode::MultiPoint;    _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_triple_arrow")               == gctString) { _mode = Mode::MultiPoint;    _minPoints = 3; _maxPoints = 3; }
+        
+        if (QLatin1String("gct_two_line")                   == gctString) { _mode = Mode::Triangle;      _minPoints = 3; _maxPoints = 3; }
+        if (QLatin1String("gct_two_line_3_or_4_pt")         == gctString) { _mode = Mode::MultiPoint;    _minPoints = 3; _maxPoints = 4; }
+        
+        if (QLatin1String("gct_u_or_t_shape")               == gctString) { _mode = Mode::MultiPoint;    _minPoints = 3; _maxPoints = 3; }
+        
+        if (Mode::Unknown == _mode)
+        {
+          // gct string is empty or not supported yet
+          switch (geomType)
+          {
+            case AdvancedSymbology::GeometryType::Point     : { _mode = Mode::Point;         _minPoints = 1; _maxPoints = 1; } break;
+            case AdvancedSymbology::GeometryType::Polyline  : { _mode = Mode::PolyLine;      _minPoints = 2; _maxPoints = 0; } break;
+            case AdvancedSymbology::GeometryType::Polygon   : { _mode = Mode::Polygon;       _minPoints = 3; _maxPoints = 0; } break;
+            case AdvancedSymbology::GeometryType::Undefined : break;
+            default                                         : break;
+          } // switch
+        }
+      } // SymbolConstruction( const QString & gctString )
+
+      ~SymbolConstruction() = default;
+
+      Mode         mode()       const { return _mode;      }
+      unsigned int minPoints()  const { return _minPoints; }
+      unsigned int maxPoints()  const { return _maxPoints; }
+
+      bool unlimitedMaxPoints() const { return (_maxPoints == 0); }
+
+  }; // SymbolConstruction
+
+
+  struct ActivateRubberbandInfo
+  {
+     Rubberband *       _rubberband;
+     SymbolConstruction _symbolConstruction;
+
+     explicit ActivateRubberbandInfo( Rubberband * r, const  SymbolConstruction & sc ) : _rubberband(r), _symbolConstruction(sc)   {;}
+     ~ActivateRubberbandInfo() = default;
+
+     ActivateRubberbandInfo() = delete;
+
+  }; // ActivateRubberbandInfo
+
+
+  QString toString( SymbolConstruction::Mode mode )
+  {
+    switch (mode)
+    {
+       case SymbolConstruction::Mode::Unknown       : return QStringLiteral("Unknown Rubberband");       break;
+       case SymbolConstruction::Mode::Point         : return QStringLiteral("Point Rubberband");         break;
+       case SymbolConstruction::Mode::PolyLine      : return QStringLiteral("Polyline Rubberband");      break;
+       case SymbolConstruction::Mode::PolyLineWidth : return QStringLiteral("PolylineWidth Rubberband"); break;
+       case SymbolConstruction::Mode::Polygon       : return QStringLiteral("Polygon Rubberband");       break;
+       case SymbolConstruction::Mode::Triangle      : return QStringLiteral("Triangle Rubberband");      break;
+       case SymbolConstruction::Mode::ArcCurve      : return QStringLiteral("ArcCurve Rubberband");      break;
+       case SymbolConstruction::Mode::Rectangle     : return QStringLiteral("Rectangle Rubberband");     break;
+       case SymbolConstruction::Mode::Circular      : return QStringLiteral("Circular Rubberband");      break;
+       case SymbolConstruction::Mode::Corridor      : return QStringLiteral("Corridor Rubberband");      break;
+       case SymbolConstruction::Mode::MultiPoint    : return QStringLiteral("MultiPoint Rubberband");    break;
+    }
+    return QString();
+  } // QString toString( SymbolConstruction::Mode mode )
+
+
+  static bool defaultSymbolRubberbandCoordinates( Map * map, Rubberband * rbnd, const QPointF & pixelPos, const SymbolConstruction & symbolConstruction );
+
+
+  Rubberband * RubberbandFactory::createSymbol(const QString & sidc, QObject * parent) const { return createSymbol(sidc,QPoint(-1,-1),parent); }
+
+  Rubberband * RubberbandFactory::createSymbol( const QString & sidc, const QPoint & winPos, QObject * parent ) const
+  {
+     if (Mode::Mode_2D != _map->mode()) return nullptr;
+     
+     const QString                             & baseSymbolCode    = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode( sidc );
+     const AdvancedSymbology::SymbolProperties & symbolProperties  = _map->symbolDictionary().symbolProperties( baseSymbolCode );
+     const AdvancedSymbology::GeometryType     & geomType          = symbolProperties.geometryType();
+
+     SymbolConstruction                          symbolConstruction( geomType, symbolProperties.gctString() );
+
+     Rubberband::currentFactoryMap(_map);
+     Rubberband::allowMultipleRubberbands(_allowMultipleRubberbands);
+     Rubberband *rubberband = nullptr;
+
+     DEBUG_LOG(_logger) << LOGFUNCTION << QStringLiteral(" - %1").arg(toString(geomType), 30);
+     DEBUG_LOG(_logger) << LOGFUNCTION << QStringLiteral(" - %1").arg(symbolProperties.gctString(), 30);
+     DEBUG_LOG(_logger) << LOGFUNCTION << QStringLiteral(" - %1").arg(toString(symbolConstruction.mode()),30);
+
+     bool rubberbandConstructionMode = ((winPos.x() < 0) || (winPos.y() < 0));
+
+     try
+     {
+        switch (geomType)
+        {
+           case AdvancedSymbology::GeometryType::Point : 
+           {
+             rubberband = new RubberbandPointFeature(_map, parent);
+           } break;
+
+           case AdvancedSymbology::GeometryType::Polyline :
+           {
+              switch (symbolConstruction.mode())
+              {
+                 case SymbolConstruction::Mode::PolyLine :
+                 {
+                    RubberbandMultiPointFeature * r = new RubberbandMultiPointFeature(_map,false,parent);
+                    if (r)
+                    {
+                       r->minimumPointCount( symbolConstruction.minPoints() );
+                       r->maximumPointCount( symbolConstruction.maxPoints() );
+                       r->enableFinishAfterConstruction(true);
+                       rubberband = r;
+                    }
+                 } break;
+
+                 case SymbolConstruction::Mode::PolyLineWidth :
+                 {
+                    RubberbandMultiPointFeature * r = new RubberbandPolylineWidth(_map,parent);
+                    if (r)
+                    {
+                       r->minimumPointCount( symbolConstruction.minPoints() );
+                       r->maximumPointCount( symbolConstruction.maxPoints() );
+                       r->enableFinishAfterConstruction(true);
+                       rubberband = r;
+                    }
+                 } break;
+
+                 case SymbolConstruction::Mode::ArcCurve      :
+                 case SymbolConstruction::Mode::MultiPoint    :
+                 case SymbolConstruction::Mode::Triangle      :
+                 {
+                    RubberbandPointCluster * r = new RubberbandPointCluster(_map,parent,false);
+                    if (r)
+                    {
+                       r->minimumPointCount(symbolConstruction.minPoints());
+                       r->maximumPointCount(symbolConstruction.maxPoints());
+                       r->enableFinishAfterConstruction(true);
+
+                       rubberband = r;
+
+                       if ((!symbolConstruction.unlimitedMaxPoints()) && rubberbandConstructionMode)
+                       {
+                          // Rubberband is not active here because we need one position to initialize
+                          // the coordinates
+                          Rubberband::currentFactoryMap(_map);
+
+                          RubberbandPointFeature * askPosition = new RubberbandPointFeature(_map, parent);
+
+                          setDefaults(askPosition);
+
+                          askPosition -> enableFinishAfterConstruction(true);
+                          askPosition -> setUserData( new ActivateRubberbandInfo(rubberband, symbolConstruction) );
+                          askPosition -> setPreviewSidc(sidc);
+                          askPosition -> setAutoDelete(true);
+
+                          connect(askPosition, &SituationMap::RB::Rubberband::apply, this, &RubberbandFactory::onActivateRubberband );
+                          connect(askPosition, &SituationMap::RB::Rubberband::abort, this, &RubberbandFactory::onAbortRubberband    );
+                       }
+                       else rubberband->activate();
+                    }
+                 } break;
+
+                 default: 
+                 {
+                   rubberband = new RubberbandPointCluster(_map,parent); 
+                   if (rubberband) rubberband->activate();
+                 } break;
+              } // switch
+           } break;
+
+           case AdvancedSymbology::GeometryType::Polygon :
+           {
+              switch (symbolConstruction.mode())
+              {
+                 case SymbolConstruction::Mode::Circular : 
+                 {
+                   RubberbandEllipse * r = new RubberbandEllipse(_map, parent);
+                   if (r)
+                   {
+                     r->enableSector(false);
+                     r->constrainOrthogonal(true);
+                     r->constrainQuadratic(true);
+                     r->enableFinishAfterConstruction(true);
+                   }
+                   rubberband = r;
+                 } break;
+
+                 case SymbolConstruction::Mode::Rectangle : 
+                 {
+                   RubberbandRectangle * r = new RubberbandRectangle(_map, parent);
+                   if (r)
+                   {
+                     r->constrainOrthogonal(false);
+                     r->enableFinishAfterConstruction(true);
+                   }
+                   rubberband = r;
+                 } break;
+
+                 case SymbolConstruction::Mode::Corridor :
+                 {
+                   RubberbandCorridor * r = new RubberbandCorridor(_map, RubberbandCorridor::InputMode::InputCenterLine, 0, parent);
+                   if (r)
+                   {
+                     r->setCorridorBorderColor( QColor("Black") );
+                     r->setCorridorFillColor( QColor(255,255,0,100) );
+                     r->minimumPointCount( symbolConstruction.minPoints() );
+                     r->maximumPointCount( symbolConstruction.maxPoints() );
+                     r->enableFinishAfterConstruction(true);
+                    
+                     rubberband = r;
+                   }
+                 } break;
+
+                 case SymbolConstruction::Mode::MultiPoint :
+                 {
+                    RubberbandPointCluster * r = new RubberbandPointCluster(_map,parent,false);
+                    if (r)
+                    {
+                      r->minimumPointCount(symbolConstruction.minPoints());
+                      r->maximumPointCount(symbolConstruction.maxPoints());
+                      r->enableFinishAfterConstruction(true);
+
+                      rubberband = r;
+
+                      if ((!symbolConstruction.unlimitedMaxPoints()) && rubberbandConstructionMode)
+                      {
+                        // Rubberband is not active here because we need one position to initialize
+                        // the coordinates
+                        Rubberband::currentFactoryMap(_map);
+
+                        RubberbandPointFeature * askPosition = new RubberbandPointFeature(_map, parent);
+
+                        setDefaults(askPosition);
+
+                        askPosition -> enableFinishAfterConstruction(true);
+                        askPosition -> setUserData( new ActivateRubberbandInfo(rubberband, symbolConstruction) );
+                        askPosition -> setPreviewSidc(sidc);
+                        askPosition -> setAutoDelete(true);
+
+                        connect(askPosition, &SituationMap::RB::Rubberband::apply, this, &RubberbandFactory::onActivateRubberband );
+                        connect(askPosition, &SituationMap::RB::Rubberband::abort, this, &RubberbandFactory::onAbortRubberband    );
+                      }
+                      else rubberband->activate();
+                    }
+                 } break;
+
+                 case SymbolConstruction::Mode::Polygon :
+                 default:
+                 {
+                    RubberbandMultiPointFeature * rubberArea = new RubberbandMultiPointFeature( _map, parent );
+                    if (rubberArea)
+                    {
+                       rubberArea -> enableClosed(true);
+                    }
+                    rubberband = rubberArea;
+                 } break;
+              } // switch
+           } break;
+
+           default : break;
+
+        } //switch
+     }
+     catch (const SituationMap::Exception &) {;}
+
+     if (rubberband)
+     {
+        setDefaults( rubberband );
+        rubberband -> setAutoDelete(true);
+        rubberband -> setPreviewSidc( sidc );
+
+        if (!rubberbandConstructionMode)
+        {
+          QPointF pixelPos( winPos.x(), winPos.y() );
+          if (!defaultSymbolRubberbandCoordinates(_map, rubberband, pixelPos, symbolConstruction))
+          {
+            ERROR_LOG(_logger) << LOGFUNCTION << "Can't init symbol rubberband coordinate list, undefined proposal.";
+            rubberband->deleteMySelf();
+            rubberband = nullptr;
+          }
+        }
+     }
+
+     return rubberband;
+  } /* RubberbandFactory::create */
+
+
+  static bool defaultSymbolRubberbandCoordinates( Map * map, Rubberband * rbnd, const QPointF & pixelPos, const SymbolConstruction & symbolConstruction )
+  {
+     QVector<QPointF>   pointList;
+
+     pointList.reserve( symbolConstruction.maxPoints() );
+
+     switch (symbolConstruction.mode())
+     {
+       case SymbolConstruction::Mode::ArcCurve:
+       {
+         if (4 == symbolConstruction.maxPoints())
+         {
+           pointList.append(pixelPos + QPointF(-150,-100));
+           pointList.append(pixelPos + QPointF(-100,-100));
+           pointList.append(pixelPos + QPointF(-100, 100));
+           pointList.append(pixelPos + QPointF(-150, 100));
+         }
+
+         if (3 == symbolConstruction.maxPoints())
+         {
+           pointList.append(pixelPos + QPointF(-150, 100));
+           pointList.append(pixelPos + QPointF(+150, -20));
+           pointList.append(pixelPos);
+         }
+       } break;
+
+       case SymbolConstruction::Mode::MultiPoint:
+       {
+         if (4 == symbolConstruction.maxPoints())
+         {
+           pointList.append(pixelPos + QPointF(-100, 100));
+           pointList.append(pixelPos + QPointF( 100, 100));
+           pointList.append(pixelPos + QPointF(-150,-100));
+           pointList.append(pixelPos + QPointF( 150,-100));
+         }
+         if (3 == symbolConstruction.maxPoints())
+         {
+           pointList.append(pixelPos + QPointF(-150,   0));
+           pointList.append(pixelPos + QPointF( 150,   0));
+           pointList.append(pixelPos + QPointF(-150,-100));
+         }
+         if (2 == symbolConstruction.maxPoints())
+         {
+           pointList.append(pixelPos);
+           pointList.append(pixelPos + QPointF(150, 150));
+         }
+       } break;
+
+       case SymbolConstruction::Mode::Polygon:
+       case SymbolConstruction::Mode::Triangle:
+       {
+         pointList.append(pixelPos);
+         pointList.append(pixelPos + QPointF(-150, +150));
+         pointList.append(pixelPos + QPointF(+150, +150));
+       } break;
+
+       case SymbolConstruction::Mode::Point:
+       {
+         pointList.append(pixelPos);
+       } break;
+       
+       case SymbolConstruction::Mode::Circular:
+       case SymbolConstruction::Mode::Rectangle:
+       {
+         pointList.append(pixelPos + QPointF(-150, 150));
+         pointList.append(pixelPos + QPointF( 150, 150));
+         pointList.append(pixelPos + QPointF( 150,-150));
+         pointList.append(pixelPos + QPointF(-150,-150));
+       } break;
+
+       case SymbolConstruction::Mode::PolyLineWidth:
+       {
+         pointList.append(pixelPos + QPointF(  50,   0));
+         pointList.append(pixelPos + QPointF(-150,   0));
+         pointList.append(pixelPos + QPointF(   0, +50));
+       } break;
+
+       case SymbolConstruction::Mode::Corridor:
+       case SymbolConstruction::Mode::PolyLine:
+       {
+         pointList.append(pixelPos);
+         pointList.append(pixelPos + QPointF(150, 150));
+       } break;
+
+       case SymbolConstruction::Mode::Unknown:
+       default:
+       {
+         // empty
+       } break;
+
+     } // switch
+
+     if (!pointList.isEmpty())
+     {
+       for (int i = 0; i < pointList.size(); ++i) { pointList[i] = map->viewPortWindowPointToGeoCoordinate(pointList[i]); }
+
+       if (SymbolConstruction::Mode::Corridor == symbolConstruction.mode())
+       {
+         SituationMap::CoordTranslationFunctor * cf = map->coordTranslationFunctor();
+         QPointF p1 = pointList[0];
+         QPointF p2 = pointList[1];
+
+         if (cf)
+         {
+           p1 = cf->geographicToMap(p1);
+           p2 = cf->geographicToMap(p2);
+         }
+         p1 -= p2;
+         qreal wCorr = sqrt(p1.x()*p1.x()+p1.y()*p1.y()) * 0.15;
+         RubberbandCorridor * rbndCorr = static_cast<RubberbandCorridor*>(rbnd);
+         rbndCorr->setCoordinateVectorWidth(pointList,wCorr);
+       }
+       else rbnd->setCoordinateVector(pointList);
+       return true; 
+     }
+     return false;
+  } /* RubberbandFactory::defaultSymbolRubberbandCoordinates */
+
+
+  void RubberbandFactory::onActivateRubberband( RubberbandBase * rubberband )
+  {
+     if (nullptr == rubberband) return;
+
+     ActivateRubberbandInfo * arbInfo = static_cast<ActivateRubberbandInfo*>( rubberband->userData() );
+
+     if (nullptr == arbInfo) return;
+
+     const QPointF & position = rubberband->singleCoordinate();
+     const QPointF & pixelPos = _map->geoCoordinateToViewPortWindowPoint(position);
+
+     if (defaultSymbolRubberbandCoordinates( _map, arbInfo->_rubberband, pixelPos, arbInfo->_symbolConstruction))
+     {
+       arbInfo->_rubberband->activate();
+     }
+     else
+     {
+       arbInfo->_rubberband->deleteMySelf();
+       ERROR_LOG(_logger) << LOGFUNCTION << "Can't init symbol rubberband coordinate list, undefined proposal.";
+     }
+     delete arbInfo;
+     rubberband->setUserData(nullptr);
+  } /* RubberbandFactory::onActivateRubberband */
+
+
+  void RubberbandFactory::onAbortRubberband( RubberbandBase * rubberband )
+  {
+     if (nullptr == rubberband) return;
+
+     ActivateRubberbandInfo * arbInfo = static_cast<ActivateRubberbandInfo*>(rubberband->userData());
+     if (arbInfo)
+     {
+        arbInfo->_rubberband->deleteMySelf();
+        delete arbInfo;
+     }
+     rubberband->setUserData(nullptr);
+  } /* RubberbandFactory::onAbortRubberband  */
+
+
+  void RubberbandFactory::setRubberbandDrawColor          ( const QColor & c ) { _defaults->_rubberbandDrawColor           = c; }
+  void RubberbandFactory::setRubberbandFillColor          ( const QColor & c ) { _defaults->_rubberbandFillColor           = c; }
+  void RubberbandFactory::setRubberbandHandleDrawColor    ( const QColor & c ) { _defaults->_rubberbandHandleDrawColor     = c; }
+  void RubberbandFactory::setRubberbandHandleFillColor    ( const QColor & c ) { _defaults->_rubberbandHandleFillColor     = c; }
+  void RubberbandFactory::setRubberbandSelectionColor     ( const QColor & c ) { _defaults->_rubberbandSelectionColor      = c; }
+  void RubberbandFactory::setRubberbandFrameColor         ( const QColor & c ) { _defaults->_rubberbandFrameColor          = c; }
+  void RubberbandFactory::setRubberbandFrameFillColor     ( const QColor & c ) { _defaults->_rubberbandFrameFillColor      = c; }
+  void RubberbandFactory::setRubberbandFrameHandleMargin  ( int            m ) { _defaults->_rubberbandFrameHandleMargin   = m; }
+  void RubberbandFactory::setRubberbandPreviewOffset      ( const QPoint & o ) { _defaults->_rubberbandPreviewOffset       = o; }
+  void RubberbandFactory::setRubberbandPreviewSize        ( unsigned int   s ) { _defaults->_rubberbandPreviewSize         = s; }
+  void RubberbandFactory::setRubberbandPickingRatio       ( unsigned int   s ) { _defaults->_rubberbandPickingRatio        = s; }
+  void RubberbandFactory::setRubberbandLineHandleWidth    ( unsigned int   s ) { _defaults->_rubberbandLineHandleWidth     = s; }
+
+
+  void RubberbandFactory::setDefaults(RubberbandBase * rband) const
+  {
+    if (nullptr == rband) return;
+
+    if ( _defaults->_rubberbandDrawColor.isValid()      ) rband->setDrawColor           ( _defaults->_rubberbandDrawColor       );
+    if ( _defaults->_rubberbandFillColor.isValid()      ) rband->setFillColor           ( _defaults->_rubberbandFillColor       );
+    if ( _defaults->_rubberbandHandleDrawColor.isValid()) rband->setHandleDrawColor     ( _defaults->_rubberbandHandleDrawColor );
+    if ( _defaults->_rubberbandHandleFillColor.isValid()) rband->setHandleFillColor     ( _defaults->_rubberbandHandleFillColor );
+    if ( _defaults->_rubberbandSelectionColor.isValid() ) rband->setHandleSelectionColor( _defaults->_rubberbandSelectionColor  );
+    if ( _defaults->_rubberbandFrameColor.isValid()     ) rband->setFrameColor          ( _defaults->_rubberbandFrameColor      );
+    if ( _defaults->_rubberbandFrameFillColor.isValid() ) rband->setFrameFillColor      ( _defaults->_rubberbandFrameFillColor  );
+
+    rband->setFrameHandleMargin( _defaults->_rubberbandFrameHandleMargin );
+ } /* RubberbandFactory::setDefaults */
+
+
+ void RubberbandFactory::setDefaults(Rubberband * rband) const
+ {
+    if (nullptr == rband) return;
+
+    setDefaults( static_cast<RubberbandBase*>(rband) );
+    if (_defaults->_rubberbandPreviewSize       >  0) rband->setPreviewSize      ( _defaults->_rubberbandPreviewSize       );
+    if (_defaults->_rubberbandPickingRatio      >  0) rband->setPickingRatio     ( _defaults->_rubberbandPickingRatio      );
+
+    if (!_defaults->_rubberbandPreviewOffset.isNull()) rband->setPreviewOffset( _defaults->_rubberbandPreviewOffset );
+
+    if (_defaults->_rubberbandLineHandleWidth   >  0) rband->setLineHandleWidth  ( _defaults->_rubberbandLineHandleWidth   );
+
+    RubberbandCorridor *rbCorridor = qobject_cast<RubberbandCorridor*>(rband);
+    if (rbCorridor)
+    {
+      rbCorridor->setCorridorBorderColor(rband->getDrawColor());
+      rbCorridor->setCorridorFillColor(rband->getFillColor());
+    }
+
+  } /* RubberbandFactory::setDefaults */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.h
new file mode 100755
index 000000000..61e777124
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_factory.h
@@ -0,0 +1,290 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "event_dispatcher.h"
+#include "event_delegater.h"
+
+#include "rubberband_base.h"
+#include "rubberband.h"
+#include "rubberband_arrow.h"
+#include "rubberband_corridor.h"
+#include "rubberband_ellipse.h"
+#include "rubberband_free_hand.h"
+#include "rubberband_multi_point_feature.h"
+#include "rubberband_multi_ellipse_feature.h"
+#include "rubberband_point_cluster.h"
+#include "rubberband_point_feature.h"
+#include "rubberband_polyline_width.h"
+#include "rubberband_rectangle.h"
+#include "rubberband_smooth_line.h"
+#include "rubberband_state_select.h"
+#include "rubberband_transform.h"
+#include "rubberband_transform_move.h"
+#include "rubberband_transform_rotate.h"
+#include "rubberband_transform_scale.h"
+
+#include "rubberband_3d.h"
+#include "rubberband_point_feature_3d.h"
+#include "rubberband_multi_point_feature_3d.h"
+
+#include <Common/exception.h>
+#include <Common/situation_map_logging.h>
+
+#include <QtCore/QObject>
+
+namespace SituationMap { namespace RB
+{
+   /**
+      @brief Factory class to create rubberbands
+
+      Rubberbands are used to create or modifiy 2D geometries like lines, circles, polygons etc. on a 2D map view
+
+      Rubberbands are used to create or modifiy 2D geometries like lines, circles, polygons etc. by processing
+      Qt input events like keyboard and mouse events. Following rubberbands are available:
+
+      | Class Name                     | Description                                                                               |
+      | :----------------------------- | : --------------------------------------------------------------------------------------- |
+      |  RubberbandPointFeature        | Rubberband to edit a single position for a point feature.                                 |
+      |  RubberbandPointCluster        | Rubberband to edit multiple positions to define a cluster of point features.              |
+      |  RubberbandMultiPointFeature   | Rubberband to edit a polyline or polygon to define line or areal features.                |
+      |  RubberbandSmoothLine          | Like RubberbandMultiPointFeature with rounded edges.                                      |
+      |  RubberbandPolylineWidth       | Rubberband like RubberbandMultiPointFeature for symbols with additional width coordinate. |
+      |  RubberbandArrow               | Rubberband to edit a polyline with an arrow at the end.                                   |
+      |  RubberbandCorridor            | Rubberband to edit corridors by defining a polyline and a width.                          |
+      |  RubberbandRectangle           | Rubberband to edit a rectangle or square.                                                 |
+      |  RubberbandEllipse             | Rubberband to edit a ellipse or circle.                                                   |
+      |  RubberbandFreeHand            | Rubberband to input a free hand line.                                                     |
+      |  RubberbandStateSelect         | Rubberband to set states to coordinates.                                                  |
+      |  RubberbandTransform           | Rubberband to manipulate moving, rotating and scaling in a single step                    |
+      |  RubberbandTransformMove       | Rubberband to define moving transformations                                               |
+      |  RubberbandTransformRotate     | Rubberband to define rotating transformations                                             |
+      |  RubberbandTransformScale      | Rubberband to define scaling transformations                                              |
+
+      On a 3D map scene following rubberbands are available:
+
+      | Class Name                     | Description                                                                               |
+      | :----------------------------- | : --------------------------------------------------------------------------------------- |
+      |  RubberbandPointFeature3D      | Rubberband to edit a single position for a point feature.                                 |
+      |  RubberbandMultiPointFeature3D | Rubberband to edit a polyline or polygon to define line or areal features.                |
+
+
+      @see Rubberband, RubberbandPointFeature, RubberbandPointCluster, RubberbandMultiPointFeature, RubberbandSmoothLine, RubberbandPolylineWidth
+           RubberbandRectangle, RubberbandEllipse, RubberbandCorridor, RubberbandArrow, RubberbandFreeHand, RubberbandStateSelect
+           RubberbandTransform, RubberbandTransformMove, RubberbandTransformRotate, RubberbandTransformScale,
+           Rubberband3D, RubberbandPointFeature3D, RubberbandMultiPointFeature3D
+
+   */
+   class SITUATIONMAP_EXPORT RubberbandFactory : public QObject
+   {
+      Q_OBJECT
+
+      public:
+
+         explicit RubberbandFactory( SituationMap::Map * map );
+         virtual ~RubberbandFactory();
+
+         /**
+            @brief template methode to create a rubberband instance
+
+            Creates with new a rubberband from type RubberbandClass. RubberbandClass must be inherited
+            from class SiMapRubBnd::Rubberband otherwise a nullptr will be retruned. After use the
+            pointer have to be freed with delete.
+
+            Expample to create a rubberband:
+            @code
+
+              SituationMap::Map & map = ...
+
+              const RubberbandFactory & rubberbandFactory = map.rubberbandFactory();
+
+              RubberbandPointFeature * rubberband = rubberbandFactory.create<RubberbandPointFeature>();
+              if (rubberband != nullptr) doSomething(rubberband);
+
+            @endcode
+
+            @param parent   Parent of rubberband object. If parent is nullptr \c _map will be used as parent
+
+            @see Rubberband, RubberbandPointFeature, RubberbandPointCluster, RubberbandMultiPointFeature, RubberbandRectangle, RubberbandEllipse, RubberbandCorridor, RubberbandArrow
+         */
+         template<class RubberbandClass>  RubberbandClass * create( QObject * parent = nullptr ) const
+         {
+            RubberbandClass * rubberband = nullptr;
+
+            if ((std::is_base_of<Rubberband, RubberbandClass>::value) && (Mode::Mode_2D == _map->mode()))
+            {
+               // be careful it is not thread safe here
+               Rubberband::currentFactoryMap(_map);
+               Rubberband::allowMultipleRubberbands(_allowMultipleRubberbands);
+
+               try
+               {
+                  rubberband = new RubberbandClass( _map, parent );
+               }
+               catch (const SituationMap::Exception &)  {;}
+               setDefaults( rubberband );
+            }
+            return rubberband;
+         }
+
+         /**
+            Creates a new corridor rubberband and defines the input method of the rubberband
+            @param inputMethode Defines the input method of the rubberband
+            @param width        With of a corridor in meters.
+            @param parent       Parent of rubberband object. If parent is nullptr \c _map will be used as parent
+            @see RubberbandCorridor
+         */
+         RubberbandCorridor * create( RubberbandCorridor::InputMode inputMode, qreal width = 0, QObject * parent = nullptr ) const
+         {
+           if (!_map->isReady() || (Mode::Mode_2D != _map->mode()) )
+             return nullptr;
+
+            Rubberband::currentFactoryMap(_map);
+            Rubberband::allowMultipleRubberbands(_allowMultipleRubberbands);
+
+            RubberbandCorridor * rubberband = nullptr;
+            try
+            {
+              rubberband = new RubberbandCorridor( _map, inputMode, width, parent );
+            }
+            catch (const SituationMap::Exception &) {;}
+            setDefaults( rubberband );
+            return rubberband;
+         }
+
+
+         /**
+            Creates a new rubberband fitting to the sidc code
+            @param sidc   sidc of symbol that will be created with rubberband.
+
+            @see RubberbandPointFeature, RubberbandMultiPointFeature
+         */
+         Rubberband * createSymbol( const QString & sidc, QObject * parent = nullptr ) const;
+
+         /**
+           Creates a new rubberband fitting to the sidc code
+           @param sidc   sidc of symbol that will be created with rubberband.
+           @param winPos Default position of the rubberband on window
+
+         @see RubberbandPointFeature, RubberbandMultiPointFeature
+         */
+         Rubberband * createSymbol( const QString & sidc, const QPoint & winPos, QObject * parent = nullptr ) const;
+
+
+         /**
+         @brief template methode to create a rubberband instance in 3D maps
+
+         Creates with new a rubberband from type RubberbandClass. RubberbandClass must be inherited
+         from class SiMapRubBnd::Rubberband otherwise a nullptr will be retruned. After use the
+         pointer have to be freed with delete.
+
+         Expample to create a rubberband:
+         @code
+
+         SituationMap::Map & map = ...
+
+         const RubberbandFactory & rubberbandFactory = map.rubberbandFactory();
+
+         RubberbandPointFeature * rubberband = rubberbandFactory.create<RubberbandPointFeature>();
+         if (rubberband != nullptr) doSomething(rubberband);
+
+         @endcode
+
+         @param parent   Parent of rubberband object. If parent is nullptr \c _map will be used as parent
+
+         @see Rubberband, RubberbandPointFeature, RubberbandPointCluster, RubberbandMultiPointFeature, RubberbandRectangle, RubberbandEllipse, RubberbandCorridor, RubberbandArrow
+         */
+         template<class RubberbandClass>  RubberbandClass * create3D( QObject * parent = nullptr ) const
+         {
+           RubberbandClass * rubberband = nullptr;
+
+           if ((std::is_base_of<Rubberband3D, RubberbandClass>::value) && (Mode::Mode_3D == _map->mode()))
+           {
+             // be careful it is not thread safe here
+             RubberbandBase::currentFactoryMap(_map);
+             RubberbandBase::allowMultipleRubberbands(_allowMultipleRubberbands);
+
+             try
+             {
+               rubberband = new RubberbandClass( _map, parent );
+             }
+             catch (const SituationMap::Exception &)  {;}
+             setDefaults( rubberband );
+           }
+           return rubberband;
+         };
+
+         /**
+           If pass \c true multiple rubberbands per time can be created per map. Creating a rubberbad of the same type twice per time will return one
+           rubberband that is not alive. Default is \c false. In this case creating a second rubberband before the first has finsihed (rubberband is not alive)
+           will retrun \c nullptr.
+         */
+         void allowMultipleRubberbands(bool on)  { _allowMultipleRubberbands = on; }
+
+         bool allowMultipleRubberbands() const   { return _allowMultipleRubberbands; }
+
+         void setRubberbandDrawColor( const QColor & );
+         void setRubberbandFillColor( const QColor & );
+         void setRubberbandHandleDrawColor( const QColor & );
+         void setRubberbandHandleFillColor( const QColor & );
+         void setRubberbandSelectionColor( const QColor & );
+         void setRubberbandFrameColor( const QColor & );
+         void setRubberbandFrameFillColor( const QColor & );
+         void setRubberbandFrameHandleMargin( int );
+         void setRubberbandPreviewOffset( const QPoint & );
+         void setRubberbandPreviewSize( unsigned int );
+         void setRubberbandPickingRatio( unsigned int );
+         void setRubberbandLineHandleWidth( unsigned int );
+
+      signals:
+
+         void rubberbandCreated();
+         void rubberbandDestroyed();
+
+      private:
+
+         class Defaults;
+
+         SituationMap::Map * _map;
+         Defaults          * _defaults;
+         bool                _allowMultipleRubberbands;
+
+         LOGGER_T            _logger;
+
+         void setDefaults( RubberbandBase * ) const;
+         void setDefaults( Rubberband * ) const;
+
+       private slots:
+
+         void onActivateRubberband( RubberbandBase * rubberband );
+         void onAbortRubberband   ( RubberbandBase * rubberband );
+
+   }; /* RubberbandFactory */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.cpp
new file mode 100755
index 000000000..6ff7372ad
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.cpp
@@ -0,0 +1,315 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband frame handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_frame_handle.h"
+
+#include <MathUtils/math_const.h>
+
+#include <Map.h>
+#include <MapGraphicsView.h>
+
+#include <QtWidgets/QGraphicsScene>
+#include <SpatialReference.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+
+
+
+   static QGraphicsPolygonItem * createFrameGraphic( QGraphicsScene * mapScene, qreal zBufferValue )
+   {
+      if (mapScene != nullptr)
+      {
+         QGraphicsPolygonItem * frameSymbol  = new QGraphicsPolygonItem();
+
+         frameSymbol -> setZValue( zBufferValue );
+         frameSymbol -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+
+         mapScene    -> addItem( frameSymbol );
+
+         return frameSymbol;
+      }
+      return nullptr;
+   } /* createFrameGraphic */
+
+
+   class FramePoint : public QPointF
+   {
+      public:
+         Q_DECL_CONSTEXPR FramePoint(const QPointF &p) : QPointF(p) {}
+         Q_DECL_CONSTEXPR FramePoint(qreal x, qreal y) : QPointF(x, y) {}
+
+         FramePoint rotate(const QPointF &center, qreal sinA, qreal cosA) const
+         {
+            qreal cx = x() - center.x();
+            qreal cy = y() - center.y();
+            qreal px = cx*cosA - cy*sinA + center.x();
+            qreal py = cy*cosA + cx*sinA + center.y();
+            return FramePoint(px, py);
+         } // rotate( const QPointF & center, qreal sin qreal cosA )
+
+         FramePoint rotate(const RubberbandHandle::RubberbandCoordinate & center, qreal sinA, qreal cosA) const
+         {
+            return rotate(QPointF(center._mapCoordinate.x(), center._mapCoordinate.y()), sinA, cosA);
+         } /* rotate */
+
+         FramePoint rotate(qreal sinA, qreal cosA) const
+         {
+            return rotate(QPointF(), sinA, cosA);
+         } // rotate( const QPointF & center, qreal sin qreal cosA )
+
+
+   }; /* FramePoint */
+
+
+   RubberbandFrameHandle::RubberbandFrameHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                               , QGraphicsScene                 * scene
+                                               , qreal                            sceneMargin )
+      : RubberbandHandle(mapView,scene)
+      , _frameSymbol(nullptr)
+      , _frameSceneMargin(sceneMargin)
+      , _frameRotationSin(0)
+      , _frameRotationCos(1)
+      , _frameWidth(0)
+      , _frameHeight(0)
+      , _frameCenterCoordinate()
+      , _mapRotateSin(0)
+      , _mapRotateCos(1)
+      , _drawDisabled(false)
+      , _frameLineHandleList()
+   {
+      qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+      _mapRotateSin = sin(mapRotatePhi);
+      _mapRotateCos = cos(mapRotatePhi);
+
+      zBufferPlane( ZBufferPlane::FrameHandle );
+
+      _frameSymbol = createFrameGraphic( _scene, _zBufferValue  );
+      if (_drawDisabled) _frameSymbol->hide();
+      updateGraphic();
+   } /* RubberbandFrameHandle::RubberbandFrameHandle */
+
+
+
+   RubberbandFrameHandle::~RubberbandFrameHandle()
+   {
+      if (_scene)
+      {
+        if (_frameSymbol)
+        {
+           _scene->removeItem(_frameSymbol);
+           delete _frameSymbol;
+        }
+      }
+      _frameSymbol = nullptr;
+   } /* RubberbandFrameHandle::~RubberbandFrameHandle */
+
+
+   void RubberbandFrameHandle::buildFrameVertexCoordinates()
+   {
+      auto length = [](qreal x, qreal y) -> qreal { return sqrt(x*x+y*y); };
+
+      QPointF              center(  _frameCenterCoordinate._mapCoordinate.x(),  _frameCenterCoordinate._mapCoordinate.y());
+      RubberbandCoordinate marginP( _mapView, _frameCenterCoordinate._sceneCoordinate+QPointF(_frameSceneMargin,0) );
+      qreal                margin = length( marginP._mapCoordinate.x()-center.x(), marginP._mapCoordinate.y()-center.y() );
+
+      QPointF vertex[4];
+
+      qreal   frameWidth2  = _frameWidth  * 0.5;
+      qreal   frameHeight2 = _frameHeight * 0.5;
+
+      vertex[0] = QPointF( center.x() - frameWidth2 - margin, center.y() - frameHeight2 - margin );
+      vertex[1] = QPointF( center.x() + frameWidth2 + margin, center.y() - frameHeight2 - margin );
+      vertex[2] = QPointF( center.x() + frameWidth2 + margin, center.y() + frameHeight2 + margin );
+      vertex[3] = QPointF( center.x() - frameWidth2 - margin, center.y() + frameHeight2 + margin );
+
+      for (int i = 0; i < 4; ++i)
+      {
+         const FramePoint & v = FramePoint(vertex[i]).rotate(_frameCenterCoordinate, -_frameRotationSin, _frameRotationCos );
+         _frameVertexCoordinate[i] = RubberbandCoordinate(_mapView, convert(v, _mapView->map()->spatialReference()));
+      }
+      // Now we have the vertex coordinates in map coordinate system
+
+   } /* RubberbandFrameHandle::buildFrameVertexCoordinates */
+
+
+   void RubberbandFrameHandle::adjustCoordinates()
+   {
+      qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+      _mapRotateSin = sin(mapRotatePhi);
+      _mapRotateCos = cos(mapRotatePhi);
+
+      _frameCenterCoordinate.mapToScene(_mapView);
+
+      buildFrameVertexCoordinates();
+      updateFramePolygonItem();
+
+      emit adjusted();
+
+   } /* RubberbandFrameHandle::adjustCoordinates */
+
+
+   void RubberbandFrameHandle::adjustWindow( const QRectF& )
+   {
+      onDo_adjustCoordinates();
+   } /* RubberbandFrameHandle::adjustWindow */
+
+
+   void RubberbandFrameHandle::updateFrameShape( const QVector<RubberbandCoordinate> & vertexList, qreal sinA, qreal cosA  )
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION << "( const QVector<RubberbandCoordinate> & vertexList, qreal sinA, qreal cosA  )";
+
+      qreal sinPhi = sinA * _mapRotateCos - cosA * _mapRotateSin; // Addition-Theorem get rotation of the frame without map rotation
+      qreal cosPhi = cosA * _mapRotateCos + sinA * _mapRotateSin;
+
+      qreal  minX =  std::numeric_limits<qreal>::infinity();
+      qreal  maxX = -std::numeric_limits<qreal>::infinity();
+      qreal  minY =  std::numeric_limits<qreal>::infinity();
+      qreal  maxY = -std::numeric_limits<qreal>::infinity();
+
+      for (const RubberbandCoordinate & vertex : vertexList)
+      {
+         // eliminate rotation from vertex scene coordinate
+         FramePoint xy = FramePoint(vertex._sceneCoordinate.x(),vertex._sceneCoordinate.y()).rotate( -sinPhi, cosPhi );
+         qreal      x  = xy.x();
+         qreal      y  = xy.y();
+
+         if (minX > x) minX = x;
+         if (minY > y) minY = y;
+         if (maxX < x) maxX = x;
+         if (maxY < y) maxY = y;
+      }
+
+      _frameRotationSin = sinA;
+      _frameRotationCos = cosA;
+
+      // calculate rotated coordinates (map rotation) of (minX,minY), (maxX,maxY) and frame scene center
+      FramePoint frameSceneV0     = FramePoint( minX           , minY            ).rotate( sinPhi, cosPhi );
+      FramePoint frameSceneVW     = FramePoint( maxX           , minY            ).rotate( sinPhi, cosPhi );
+      FramePoint frameSceneVH     = FramePoint( minX           , maxY            ).rotate( sinPhi, cosPhi );
+      FramePoint frameSceneCenter = FramePoint( (minX+maxX)*0.5, (minY+maxY)*0.5 ).rotate( sinPhi, cosPhi );
+
+      _frameCenterCoordinate.updateSceneCoordinate( _mapView, frameSceneCenter );
+
+      // Calculate map coordinates of bounding rectangle
+      RubberbandCoordinate frameV0( _mapView, QPointF(frameSceneV0.x(),frameSceneV0.y()) );
+      RubberbandCoordinate frameVW( _mapView, QPointF(frameSceneVW.x(),frameSceneVW.y()) );
+      RubberbandCoordinate frameVH( _mapView, QPointF(frameSceneVH.x(),frameSceneVH.y()) );
+
+
+      auto length = []( qreal x1, qreal y1, qreal x2, qreal y2 ) -> qreal
+      {
+        qreal dx = x2-x1;
+        qreal dy = y2-y1;
+        return sqrt(dx*dx+dy*dy);
+      };
+
+      // get frame width and height in map coordinates
+
+      _frameWidth  = length( frameV0._mapCoordinate.x(), frameV0._mapCoordinate.y(), frameVW._mapCoordinate.x(), frameVW._mapCoordinate.y() );
+      _frameHeight = length( frameV0._mapCoordinate.x(), frameV0._mapCoordinate.y(), frameVH._mapCoordinate.x(), frameVH._mapCoordinate.y() );
+
+      buildFrameVertexCoordinates();
+      updateFramePolygonItem();
+
+   } /* RubberbandFrameHandle::updateFrameShape */
+
+
+   void RubberbandFrameHandle::updateFrameShape()
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION;
+
+      buildFrameVertexCoordinates();
+      updateFramePolygonItem();
+
+   } /* RubberbandFrameHandle::updateFrameShape */
+
+
+   void RubberbandFrameHandle::updateFramePolygonItem()
+   {
+      QPolygonF framePolygon;
+
+      framePolygon.reserve( 4 );
+      for (auto vertex : _frameVertexCoordinate)
+      {
+         framePolygon.append(vertex.mapToScene(_mapView));
+      }
+      framePolygon.append(_frameVertexCoordinate[0]._sceneCoordinate);
+
+      _frameSymbol->setPolygon(framePolygon);
+
+   } /* RubberbandFrameHandle::updateFramePolygonItem */
+
+
+   void RubberbandFrameHandle::updateGraphic()
+   {
+      if (_frameSymbol)
+      {
+         _frameSymbol -> setPen( QPen(QColor("black"),1,Qt::PenStyle::DashDotLine) );
+         _frameSymbol -> setVisible( _isVisible );
+
+         if (isSelected())
+           _frameSymbol -> setBrush( QBrush(_selectionColor) );
+         else
+           _frameSymbol -> setBrush( QBrush(_fillColor) );
+      }
+   } /* RubberbandFrameHandle::updateGraphic */
+
+
+   void RubberbandFrameHandle::updateCoordinate(const QPointF & scenePosition)
+   {
+      _frameCenterCoordinate.updateSceneCoordinate( _mapView, scenePosition );
+      updateFrameShape();
+   } /* RubberbandFrameHandle::updateCoordinate */
+
+
+   void RubberbandFrameHandle::moveCoordinate(const QPointF & sceneDelta)
+   {
+      _frameCenterCoordinate.updateSceneCoordinate( _mapView, _frameCenterCoordinate._sceneCoordinate+sceneDelta );
+      updateFrameShape();
+   } /* RubberbandFrameHandle::moveCoordinate */
+
+
+   RubberbandHandle::RubberbandCoordinate RubberbandFrameHandle::getCoordinate() const  { return _frameCenterCoordinate; }
+
+
+   bool RubberbandFrameHandle::isPositionInside( const QPointF & scenePosition ) const
+   {
+      if (_frameSymbol)
+      {
+         return _frameSymbol->contains( scenePosition );
+      }
+      return false;
+   } /* RubberbandFrameHandle::isPositionInside */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.h
new file mode 100755
index 000000000..227d0d0c1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_frame_handle.h
@@ -0,0 +1,153 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband frame handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointF>
+
+#include <QtWidgets/QGraphicsPolygonItem>
+#include <cmath>
+
+#include <Common/ref_pointer.h>
+
+#include "rubberband_handle.h"
+#include "rubberband_line_handle.h"
+
+class QGraphicsScene;
+
+namespace SituationMap { namespace RB
+{
+
+
+   /**
+     @class RubberbandFrameHandle rubberband_frame_handle.h
+     @brief Implementation of a frame handle for rubberband internal use.
+     @see RubberbandHandle
+   */
+   class RubberbandFrameHandle : public RubberbandHandle
+   {
+      Q_OBJECT
+      public:
+
+         RubberbandFrameHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                              , QGraphicsScene                 * scene
+                              , qreal                            sceneMargin );
+
+         ~RubberbandFrameHandle();
+
+         inline void updateFrameShape(const QVector<RubberbandCoordinate> & vertexList)
+         {
+            updateFrameShape( vertexList, 0.0, 1.0 );
+         } /* updateFrameShape */
+
+
+         void updateFrameShape( const QVector<RubberbandCoordinate> & vertexList, qreal sinA, qreal cosA );
+
+         bool isPositionInside( const QPointF & scenePosition ) const override;
+
+         virtual void updateCoordinate( const QPointF & scenePosition );
+         virtual void moveCoordinate  ( const QPointF & sceneDelta );
+
+         virtual RubberbandCoordinate getCoordinate() const;
+
+         inline qreal  frameRotationAngle() const
+         {
+            qreal phi = acos(_frameRotationCos);
+            return (_frameRotationSin < 0.0) ? -phi : phi;
+         } /* frameRotationAngle */
+
+
+         inline void frameRotationAngle( qreal & sinA, qreal & cosA )
+         {
+            sinA = _frameRotationSin;
+            cosA = _frameRotationCos;
+         } /* frameRotationAngle */
+
+         inline qreal frameSceneMargin() const { return _frameSceneMargin; }
+
+         inline void updateFrameRotationAngle(  qreal sinA, qreal cosA  )
+         {
+            _frameRotationSin = sinA;
+            _frameRotationCos = cosA;
+            updateFrameShape();
+         } /* updateFrameRotationAngle */
+
+
+         inline void updateFrameRotationAngle( qreal x )
+         {
+            _frameRotationSin = sin(x);
+            _frameRotationCos = cos(x);
+            updateFrameShape();
+         } /* updateFrameRotationAngle */
+
+
+         inline void updateFrameSceneMargin(qreal x) { _frameSceneMargin = x; updateFrameShape(); }
+
+
+         inline void drawDisabled(bool v)
+         {
+            _drawDisabled = v;
+            if (_drawDisabled) _frameSymbol->hide();
+            else               _frameSymbol->show();
+         } /* drawDisabled */
+
+
+         inline bool drawDisabled() const { return _drawDisabled; }
+
+
+      protected:
+
+         QGraphicsPolygonItem   * _frameSymbol;
+         qreal                    _frameSceneMargin;
+         qreal                    _frameRotationSin;
+         qreal                    _frameRotationCos;
+         qreal                    _frameWidth;
+         qreal                    _frameHeight;
+         RubberbandCoordinate     _frameCenterCoordinate;
+         RubberbandCoordinate     _frameVertexCoordinate[4];
+         qreal                    _mapRotateSin;
+         qreal                    _mapRotateCos;
+         bool                     _drawDisabled;
+
+         QList<SituationMap::RefPointer<RubberbandLineHandle>>    _frameLineHandleList;
+
+         void updateGraphic() override;
+
+         void updateFrameShape();
+         void updateFramePolygonItem();
+
+         void buildFrameVertexCoordinates();
+
+         void adjustCoordinates()           override;
+         void adjustWindow( const QRectF& ) override;
+
+         QPointF getMapRotation() { return QPointF( _mapRotateCos, _mapRotateSin ); }
+
+   }; /* RubberbandFrameHandle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.cpp
new file mode 100755
index 000000000..07a31cfa3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.cpp
@@ -0,0 +1,267 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_free_hand.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+#include "drawable_line.h"
+#include "drawable_painter_path.h"
+#include "rubberband_handle_proxy.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <MapGraphicsView.h>
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandFreeHand::InternalData
+   {
+         QVector<RubberbandDrawable::RubberbandCoordinate> _coordinateList;
+         QVector<unsigned int>                             _inOneGoIndex;
+         QPoint                                            _lastWindowPos;
+         bool                                              _coordinateRecordingActive = false;
+         SituationMap::RefPointer<DrawableLine>            _cursorPreviewLine;
+         SituationMap::RefPointer<DrawableLine>            _cursorPreviewCloseLine;
+         SituationMap::RefPointer<DrawablePainterPath>     _pathItem;
+   }; /* RubberbandFreeHand::InternalData */
+
+
+   RubberbandFreeHand::RubberbandFreeHand( SituationMap::Map * map, QObject * parent )
+     : Rubberband(map,parent)
+     , _internal(new RubberbandFreeHand::InternalData)
+     , _isClosed(false)
+   {
+   } /* RubberbandFreeHand::RubberbandFreeHand */
+
+
+   RubberbandFreeHand::~RubberbandFreeHand()
+   {
+     delete _internal;
+     _internal = nullptr;
+   } /* RubberbandFreeHand::~RubberbandFreeHand */
+
+
+   bool RubberbandFreeHand::selectAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (Rubberband::selectAction(causer, x, y))
+      {
+         deactivateButtons();
+         _internal->_coordinateRecordingActive = true;
+         _internal->_inOneGoIndex << _internal->_coordinateList.size();
+         return movePickedAction(causer,x,y);
+      }
+      return false;
+   } /* RubberbandFreeHand::selectAction */
+
+
+   bool RubberbandFreeHand::movePickedAction( AbstractEventDispatcher *, int x, int y )
+   {
+      if (_internal->_coordinateRecordingActive)
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+         if (_internal->_coordinateList.isEmpty())
+         {
+            _internal->_lastWindowPos.setX(x);
+            _internal->_lastWindowPos.setY(y);
+            _internal->_coordinateList.append(RubberbandDrawable::RubberbandCoordinate(Rubberband::_internal->_mapView,scenePos));
+            return true;
+         }
+
+         if ((std::abs(_internal->_lastWindowPos.x() - x) > 2) || (std::abs(_internal->_lastWindowPos.y() - y) > 2))
+         {
+            _internal->_lastWindowPos.setX(x);
+            _internal->_lastWindowPos.setY(y);
+
+            _internal->_coordinateList.append(RubberbandDrawable::RubberbandCoordinate(Rubberband::_internal->_mapView,scenePos));
+         }
+
+         update();
+
+         return true;
+      }
+      return false;
+   } /* RubberbandFreeHand::movePickedAction */
+
+
+   bool RubberbandFreeHand::moveAction( AbstractEventDispatcher *, int x, int y )
+   {
+     if (!_internal->_coordinateList.isEmpty())
+     {
+        const RubberbandDrawable::RubberbandCoordinate & firstPos = _internal->_coordinateList.first();
+        const RubberbandDrawable::RubberbandCoordinate & lastPos  = _internal->_coordinateList.last();
+
+        QPointF scenePos(pixel2ScenePosition(x,y));
+
+        if (!_internal->_cursorPreviewLine) _internal->_cursorPreviewLine = new DrawableLine( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene );
+        if ((isClosedEnabled()) && (!_internal->_cursorPreviewCloseLine))
+        {
+           _internal->_cursorPreviewCloseLine = new DrawableLine( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene );
+        }
+        _internal -> _cursorPreviewLine -> setVisibility( true );
+        _internal -> _cursorPreviewLine -> setDrawColor( _handleSelectionColor );
+        _internal -> _cursorPreviewLine -> setLine( lastPos, RubberbandDrawable::RubberbandCoordinate( Rubberband::_internal->_mapView, scenePos ));
+
+        if (_internal->_cursorPreviewCloseLine)
+        {
+          _internal -> _cursorPreviewCloseLine -> setVisibility( true );
+          _internal -> _cursorPreviewCloseLine -> setDrawColor( _handleSelectionColor );
+          _internal -> _cursorPreviewCloseLine -> setLine( firstPos, RubberbandDrawable::RubberbandCoordinate( Rubberband::_internal->_mapView, scenePos ));
+        }
+     }
+     return false;
+   } /* RubberbandFreeHand::moveAction */
+
+
+   bool RubberbandFreeHand::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      _internal->_coordinateRecordingActive = false;
+
+      if (Rubberband::setCoordinateAction(causer,x,y))
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+         activateButtons();
+         _baseInternal->buttonProxyActive( scenePos );
+      }
+      return false;
+   } /* RubberbandFreeHand::setCoordinateAction */
+
+
+   void RubberbandFreeHand::activateButtons()
+   {
+      _baseInternal->_hasUndoButton   = true;
+      _baseInternal->_applyIsPossible = true;
+      _baseInternal->_undoIsPossible  = !_internal->_inOneGoIndex.isEmpty();
+
+      Rubberband::activateButtons();
+   } /* RubberbandFreeHand::activateButtons */
+
+
+   bool RubberbandFreeHand::undoAction( AbstractEventDispatcher*, int, int )
+   {
+      if (!_internal->_inOneGoIndex.isEmpty())
+      {
+         unsigned int coordinateIdx = _internal->_inOneGoIndex.takeLast();
+
+         while (coordinateIdx < (unsigned int)_internal->_coordinateList.size())
+         {
+            _internal->_coordinateList.removeLast();
+         }
+         update();
+         activateButtons();
+      }
+      return true;
+   } /* RubberbandFreeHand::undoAction */
+
+
+   bool RubberbandFreeHand::completeStateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+     if (rubberbandIsAlive())
+     {
+        return applyAndEndAction(causer,x,y);
+     }
+     return false;
+   } /* RubberbandFreeHand::completeStateAction */
+
+
+   unsigned int RubberbandFreeHand::coordinateCount() const
+   {
+      return _internal->_coordinateList.size();
+   } /* RubberbandFreeHand::coordinateCount */
+
+
+   QVector<QPointF> RubberbandFreeHand::coordinateVector( CoordinateSystem cs ) const
+   {
+      QVector<QPointF> coordinateVector;
+      coordinateVector.reserve(_internal->_coordinateList.size());
+
+      for (const RubberbandDrawable::RubberbandCoordinate &pos : qAsConst(_internal->_coordinateList))
+         coordinateVector.push_back(projectCoordinateFromMap( cs, pos._mapCoordinate ));
+
+      return coordinateVector;
+
+   } /* RubberbandFreeHand::coordinateVector */
+
+
+   QPointF RubberbandFreeHand::singleCoordinate(unsigned int idx, CoordinateSystem cs ) const
+   {
+      if (idx >= (unsigned int)_internal->_coordinateList.size()) return QPointF();
+
+      const Esri::ArcGISRuntime::Point & pos = _internal->_coordinateList.at(idx)._mapCoordinate;
+
+      return projectCoordinateFromMap( cs, pos );
+
+   } /* RubberbandFreeHand::singleCoordinate */
+
+
+   void RubberbandFreeHand::update()
+   {
+      if (_internal->_coordinateList.size() > 1)
+      {
+         if (!_internal->_pathItem)
+         {
+            _internal->_pathItem = new DrawablePainterPath( Rubberband::_internal->_mapView );
+         }
+         _internal -> _pathItem -> setVisibility(true);
+         _internal -> _pathItem -> setLineWidth( 2 );
+         _internal -> _pathItem -> enableClosedLine( _isClosed );
+         _internal -> _pathItem -> setDrawColor( _drawColor );
+         _internal -> _pathItem -> setFillColor( _fillColor );
+         _internal -> _pathItem -> setPath( _internal->_coordinateList );
+      }
+      else
+      {
+         if (_internal -> _pathItem) _internal->_pathItem->setVisibility(false);
+         if (_internal->_coordinateList.isEmpty())
+         {
+            if (_internal -> _cursorPreviewLine     ) _internal -> _cursorPreviewLine      -> setVisibility(false);
+            if (_internal -> _cursorPreviewCloseLine) _internal -> _cursorPreviewCloseLine -> setVisibility(false);
+         }
+      }
+      if (!_internal->_coordinateList.isEmpty())
+      {
+         QPointF bottomRight( std::numeric_limits<double>::min(), std::numeric_limits<double>::min() );
+
+         for (const RubberbandDrawable::RubberbandCoordinate &coordinate : qAsConst(_internal->_coordinateList))
+         {
+            const QPointF & p  = coordinate._sceneCoordinate;
+            if (bottomRight.x() < p.x()) bottomRight.setX(p.x());
+            if (bottomRight.y() < p.y()) bottomRight.setY(p.y());
+         }
+
+         if (isButtonBoxPositionFixed())
+         {
+            RubberbandBase::_baseInternal->_buttonBoxSceneAnchor = bottomRight;
+         }
+      }
+   } /* RubberbandFreeHand::update */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.h
new file mode 100755
index 000000000..d5e07c370
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_free_hand.h
@@ -0,0 +1,102 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class for free hand drawing
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   06.10.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointCluster rubberband_point_cluster.h
+     @brief Implementation of a rubberband to input single coodinates for building point feature clusters
+     @see Rubberband, RubberbandPointFeature
+   */
+   class SITUATIONMAP_EXPORT RubberbandFreeHand : public Rubberband
+   {
+       Q_OBJECT
+         /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+         explicit RubberbandFreeHand(  SituationMap::Map * map, QObject * parent = nullptr );
+
+      public:
+
+         ~RubberbandFreeHand();
+         /** @} */
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+         unsigned int coordinateCount() const override;
+
+         virtual QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         virtual QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+          /**
+           If set to true a polygon the rubberband draws a polygon otherwise a polyline.
+         */
+         inline void enableClosed( bool flag )   { _isClosed = flag; }
+
+         /**
+           Gets the value of the close flag
+         */
+         inline bool isClosedEnabled() const    { return _isClosed; }
+
+
+      private:
+
+         virtual void setCoordinateVector( const QVector<QPointF> & /*pntList*/, CoordinateSystem /*cs*/ = CoordinateSystem::Geo ) override {}
+
+      protected:
+
+          /*
+            Forward declaration of internal container class for member variables. The derived classes of Rubberband
+            often have also a declaration of InternalData for there own internal members.
+          */
+          struct InternalData;
+
+          InternalData     * _internal;
+          bool               _isClosed;
+
+          void activateButtons() override;
+          void update() override;
+
+   }; /* RubberbandFreeHand */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.cpp
new file mode 100755
index 000000000..7d80c7da8
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.cpp
@@ -0,0 +1,70 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_handle.h"
+
+namespace SituationMap { namespace RB
+{
+
+
+  RubberbandHandle::RubberbandHandle( QGraphicsView *view )
+    : RubberbandDrawable(view)
+    , _pickingRatio(5)
+    , _isSelected(false)
+    , _isSelectable(true)
+    , _userData(nullptr)
+  {
+  } /* RubberbandHandle::RubberbandHandle */
+
+
+
+   RubberbandHandle::RubberbandHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView )
+      : RubberbandDrawable( mapView )
+      , _pickingRatio(5)
+      , _isSelected(false)
+      , _isSelectable(true)
+      , _userData(nullptr)
+   {
+   } /* RubberbandHandle::RubberbandHandle */
+
+
+   RubberbandHandle::RubberbandHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView, QGraphicsScene * scene)
+     : RubberbandDrawable( mapView, scene )
+      , _pickingRatio(5)
+      , _isSelected(false)
+      , _isSelectable(true)
+      , _userData(nullptr)
+   {
+   } /* RubberbandHandle::RubberbandHandle */
+
+
+   RubberbandHandle::~RubberbandHandle()
+   {
+   } /* RubberbandHandle::~Rubberbandhandle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.h
new file mode 100755
index 000000000..f8017e07f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle.h
@@ -0,0 +1,100 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_drawable.h"
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandHandle rubberband_handle.h
+     @brief Base class of all rubberband handles for rubberband internal use.
+   */
+   class RubberbandHandle : public RubberbandDrawable
+   {
+      Q_OBJECT
+
+      public:
+
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         explicit RubberbandHandle( QGraphicsView * );
+         explicit RubberbandHandle( Esri::ArcGISRuntime::MapGraphicsView * );
+         explicit RubberbandHandle( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
+
+         ~RubberbandHandle();
+         /** @} */
+
+
+         virtual bool isPositionInside( const QPointF & scenePosition ) const = 0;
+
+         inline bool  isSelected() const                         { return _isSelected;                                                    }
+         inline void  setSelection( bool on = true )             { _isSelected = _isSelectable && on; updateGraphic();                    }
+
+         inline bool  isSelectable() const                       { return _isSelectable;                                                  }
+         inline void  setSelectable(bool on = true)              { _isSelectable = on; if (!on) { _isSelected = false; updateGraphic(); } }
+
+         inline void  setSelectionColor( const QColor & col )    { _selectionColor = col; updateGraphic();                                }
+
+         inline void  setUserData( void * ptr )                  { _userData = ptr;                                                       }
+         inline void* userData()                                 { return _userData;                                                      }
+
+         inline unsigned int pickingRatio() const                { return _pickingRatio;                                                  }
+         inline void         setPickingRatio(unsigned int value) { if (value > 5) _pickingRatio = value;                                  }
+
+         inline bool isFirst() const                             { return _is_first;                                                      }
+         inline void setIsFirst(bool on = true)                  { _is_first = on;                                                        }
+
+      protected:
+
+         void updateGraphic() override = 0;
+
+         void adjustCoordinates()           override = 0;
+         void adjustWindow( const QRectF& ) override = 0;
+
+         unsigned int   _pickingRatio;
+         bool           _isSelected;
+         bool           _isSelectable;
+         QColor         _selectionColor;
+         bool           _is_first{false};
+
+      private:
+
+         void         * _userData;
+
+      signals:
+
+         void adjusted();
+
+   }; /* RubberbandHandle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.cpp
new file mode 100755
index 000000000..7b0912b5b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.cpp
@@ -0,0 +1,167 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of class RubberbandHandleProxy to forward adjust signals from view
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   10.07.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_handle_proxy.h"
+
+#include <MathUtils/math_const.h>
+
+#include <QtCore/QRectF>
+
+#define BUG_iOSQz_000005
+
+
+namespace SituationMap { namespace RB
+{
+
+    void RubberbandHandleProxy::init( QWidget * widget )
+    {
+      zBufferPlane( ZBufferPlane::Widget );
+
+      _widgetsProxy  = new QGraphicsProxyWidget();
+      _widgetsProxy -> setWidget( widget );
+      _widgetsProxy -> setZValue( _zBufferValue );
+
+#ifdef BUG_iOSQz_000005
+      // Bug iOSQz-000005 'QGraphicsProxyWidget will crash'
+      // Adding a widget will let the application crash
+      // Workaround: 'proxy->setOpacity(0.99);'
+
+      _widgetsProxy->setOpacity(0.99);
+#endif
+
+      _scene->addItem( _widgetsProxy );
+
+    } /* RubberbandHandleProxy::init */
+
+
+    RubberbandHandleProxy::RubberbandHandleProxy( QGraphicsView * view, QWidget * widget )
+      : RubberbandHandle(view)
+      , _coordinate()
+      , _sceneOffset(0, 0)
+      , _rotateSceneOffset(true)
+      , _restoreView(view)
+    {
+      init( widget );
+    } /* RubberbandHandleProxy::RubberbandHandleProxy */
+
+
+    RubberbandHandleProxy::RubberbandHandleProxy( Esri::ArcGISRuntime::MapGraphicsView * view, QWidget * widget )
+      : RubberbandHandle(view)
+      , _coordinate()
+      , _sceneOffset(0, 0)
+      , _rotateSceneOffset(true)
+      , _restoreView(view)
+    {
+      init( widget );
+    } /* RubberbandHandleProxy::RubberbandHandleProxy */
+
+
+    RubberbandHandleProxy::RubberbandHandleProxy( Esri::ArcGISRuntime::MapGraphicsView * view, QGraphicsScene * scene, QWidget * widget )
+      : RubberbandHandle(view, scene)
+      , _coordinate()
+      , _sceneOffset(0, 0)
+      , _rotateSceneOffset(true)
+      , _restoreView(view)
+    {
+      init( widget );
+    } /* RubberbandHandleProxy::RubberbandHandleProxy */
+
+
+    RubberbandHandleProxy::~RubberbandHandleProxy()
+    {
+      if (_scene)
+      {
+        if (_widgetsProxy)
+        {
+           _widgetsProxy->setWidget(nullptr);
+           _scene->removeItem(_widgetsProxy);
+           delete _widgetsProxy;
+        }
+      }
+      _widgetsProxy = nullptr;
+     
+      if (_restoreView && _restoreView->viewport())
+        _restoreView->viewport()->setCursor(_restoreCursor); // workaround Qt bug. remove when fixed
+
+    } /* RubberbandHandleProxy::~RubberbandHandleProxy */
+
+
+    QPointF RubberbandHandleProxy::getRotatedSceneOffset() const
+    {
+       if ((_mapView) && (_rotateSceneOffset))
+       {
+          auto rotate = [](const QPointF & p, qreal sinA, qreal cosA) -> QPointF { return QPointF(p.x()*cosA+p.y()*sinA,p.y()*cosA-p.x()*sinA); };
+
+          qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+          qreal sinMap = sin(mapRotatePhi);
+          qreal cosMap = cos(mapRotatePhi);
+
+          return rotate( _sceneOffset, sinMap, cosMap );
+       }
+       else return _sceneOffset;
+    } /* RubberbandHandleProxy::getRotatedSceneOffset */
+
+
+    void RubberbandHandleProxy::setPos(const QPointF & pos)
+    {
+      _coordinate.updateSceneCoordinate( _mapView, pos );
+      if (_widgetsProxy)
+      {
+         _widgetsProxy -> setPos(pos+getRotatedSceneOffset());
+         _widgetsProxy -> setZValue( _zBufferValue );
+      }
+    } /* RubberbandHandleProxy::setPos */
+
+
+    bool RubberbandHandleProxy::isPositionInside( const QPointF & scenePosition ) const
+    {
+       const QRectF & bbox = _widgetsProxy->windowFrameGeometry();
+       return bbox.contains(scenePosition);
+    } /* RubberbandHandleProxy::isPositionInside */
+
+
+    void RubberbandHandleProxy::adjustCoordinates()
+    {
+       const QPointF & scenePosition = _coordinate.mapToScene(_mapView);
+       if (_widgetsProxy)
+       {
+          _widgetsProxy -> setZValue( _zBufferValue );
+          _widgetsProxy -> setPos(scenePosition+getRotatedSceneOffset());
+       }
+       emit adjusted();
+    } /* RubberbandHandleProxy::adjustCoordinates */
+
+
+    void RubberbandHandleProxy::adjustWindow( const QRectF & )
+    {
+       onDo_adjustCoordinates();
+    } /* RubberbandHandleProxy::adjustWindow */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.h
new file mode 100755
index 000000000..088dfbb6a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_handle_proxy.h
@@ -0,0 +1,106 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of class RubberbandHandleProxy to forward adjust signals from View
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   10.07.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_handle.h"
+
+#include <QtWidgets/QGraphicsProxyWidget>
+#include <QGraphicsView>
+#include <QPointer>
+
+class QGraphicsView;
+class QGraphicsScene;
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandHandleProxy rubberband_handle_proxy.h
+     @brief Implementation of a procx to handle small menues and other widgets like buttons
+     @see RubberbandHandle
+   */
+   class RubberbandHandleProxy : public RubberbandHandle
+   {
+      Q_OBJECT
+
+      public:
+
+         /**
+            @name Construction & Destruction
+            @{
+         */
+         RubberbandHandleProxy( QGraphicsView *view, QWidget * widget );
+
+         RubberbandHandleProxy( Esri::ArcGISRuntime::MapGraphicsView * view, QWidget * widget );
+         RubberbandHandleProxy( Esri::ArcGISRuntime::MapGraphicsView * view, QGraphicsScene * scene, QWidget * widget  );
+
+         ~RubberbandHandleProxy();
+         /** @} */
+
+         bool isPositionInside( const QPointF & scenePosition ) const  override;
+
+         void setPos(const QPointF & pos);
+
+         const RubberbandCoordinate & getCoordinate() const { return _coordinate; }
+
+         inline void setSceneOffset(const QPointF & offset) { _sceneOffset = offset; }
+
+         inline void show()                      { setVisibility(false); if (_widgetsProxy) { _widgetsProxy->show(); setVisibility(true); } }
+         inline void hide()                      { setVisibility(false); if (_widgetsProxy) { _widgetsProxy->hide(); setVisibility(false); } }
+
+         inline void setRotateSceneOffset(bool on = true) { _rotateSceneOffset = on; }
+
+         inline void setRestoreCursor( const QCursor & cursor ) { _restoreCursor = cursor; } // workaround Qt bug. remove when fixed
+
+       protected:
+
+         RubberbandCoordinate    _coordinate;
+         QGraphicsProxyWidget  * _widgetsProxy = nullptr;
+         QPointF                 _sceneOffset;
+         bool                    _rotateSceneOffset;
+
+         QPointer<QGraphicsView> _restoreView;
+         QCursor                 _restoreCursor; // workaround Qt bug. remove when fixed
+
+         void updateGraphic() override {}
+
+         void adjustCoordinates() override;
+         void adjustWindow( const QRectF& ) override;
+
+      private:
+
+         QPointF getRotatedSceneOffset() const;
+
+      private:
+
+         void init( QWidget * widget );
+
+   }; /* RubberbandHandleProxy */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.cpp
new file mode 100755
index 000000000..36e486482
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.cpp
@@ -0,0 +1,98 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of internal data of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Joerg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   16.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_internal.h"
+#include "rubberband.h"
+
+#include "rubberband_drawable.h"
+#include "rubberband_handle.h"
+#include "rubberband_handle_proxy.h"
+
+#include <Map/map.h>
+#include <MapImpl/map_impl.h>
+
+
+
+
+namespace SituationMap { namespace RB
+{
+
+   Rubberband::InternalData::InternalData( SituationMap::Map * map )
+      : _mapView(nullptr)
+      , _mapScene(nullptr)
+      , _handleList()
+      , _constructionObjectDraw(nullptr)
+      , _connectedPreviewPixmap(nullptr)
+      , _lastClickPosition(-1,-1)
+      , _constrainFailedMarker(nullptr)
+      , _logger(getLogger("Rubberband"))
+    {
+       SituationMap::MapImpl * mapImpl = dynamic_cast<SituationMap::MapImpl*>(map);
+
+       if (mapImpl)
+       {
+          _mapView = mapImpl -> getEsriMapGraphicsView();
+
+          if (_mapView != nullptr)
+          {
+            _mapScene = _mapView -> scene();
+          }
+       }
+    } /* InternalData */
+
+    Rubberband::InternalData::~InternalData()
+    {
+       /* Because of using shared RefPointer we don't need to call delete for every handle,
+        * just clear the handle-list.
+          for (auto handle : _handleList)
+          {
+              handle = nullptr;;
+          }
+       */
+       _handleList.clear();
+
+       delete _constructionObjectDraw;
+
+       _constructionObjectDraw = nullptr;
+
+       if (_mapScene)
+       {
+          if (nullptr != _connectedPreviewPixmap)
+          {    
+             _mapScene->removeItem( _connectedPreviewPixmap );
+             delete _connectedPreviewPixmap;
+             _connectedPreviewPixmap = nullptr;
+          }
+         
+          delete _constrainFailedMarker;
+       }
+       _mapView      = nullptr;
+       _mapScene     = nullptr;
+    } /* ~InternalData */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.h
new file mode 100755
index 000000000..2f7b48483
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_internal.h
@@ -0,0 +1,100 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of internal data of base class for rubberbands
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Joerg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   16.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+
+#include <QtCore/QList>
+#include <QtCore/QPointer>
+#include <QGraphicsScene>
+
+#include <MapGraphicsView.h>
+#include <Common/ref_pointer.h>
+#include <Common/situation_map_logging.h>
+
+#include "rubberband.h"
+
+#include "rubberband_handle.h"
+#include "rubberband_drawable.h"
+
+
+class QHBoxLayout;
+class QWidget;
+class QPushButton;
+class QGraphicsScene;
+
+
+namespace Esri {
+namespace ArcGISRuntime {
+  class MapGraphicsView;
+} }
+
+
+namespace SituationMap
+{
+   class Map;
+   class CoordTranslationFunctor;
+}
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandHandleProxy;
+
+   /**
+     @class Rubberband::InternalData rubberband_internal.h
+     @brief Definition of internal data of rubberband base class.
+   */
+   struct Rubberband::InternalData
+   {
+         Q_DISABLE_COPY(InternalData)
+
+         QPointer<Esri::ArcGISRuntime::MapGraphicsView>      _mapView;
+         QPointer<QGraphicsScene>                            _mapScene;
+
+         QList<SituationMap::RefPointer<RubberbandHandle>>   _handleList;
+         RubberbandDrawable                                * _constructionObjectDraw;
+         QGraphicsPixmapItem                               * _connectedPreviewPixmap;
+
+        
+
+         QPointF                                             _lastClickPosition;
+
+         QGraphicsPixmapItem                               * _constrainFailedMarker;
+
+         LOGGER_T                                            _logger;
+
+         explicit InternalData( SituationMap::Map * map );
+
+         ~InternalData();
+
+         void markFailedConstrains( QPoint pos, bool on );
+   }; /* InternalData */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.cpp
new file mode 100755
index 000000000..8b7f1539b
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.cpp
@@ -0,0 +1,231 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_line_handle.h"
+
+#include <MapGraphicsView.h>
+
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsLineItem>
+
+#include <math.h>
+
+namespace SituationMap { namespace RB
+{
+
+   RubberbandLineHandle::RubberbandLineHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                             , QGraphicsScene                       * scene
+                                             , const QPointF                        & p1
+                                             , const QPointF                        & p2
+                                             , unsigned int                           lineWidth
+                                             , bool                                   dottedLine )
+      : RubberbandHandle(mapView,scene)
+      , _lineSymbol(nullptr)
+      , _lineStyle()
+      , _coordinates()
+      , _dottedLine(dottedLine)
+   {
+      _lineWidth = lineWidth;
+
+      zBufferPlane( ZBufferPlane::LineHandle );
+      _lineStyle.setWidth(_lineWidth);
+
+      if (_scene != nullptr)
+      {
+         QGraphicsLineItem * line = new QGraphicsLineItem();
+
+         _lineSymbol = line;
+
+         _coordinates.resize(2);
+         _coordinates[0].updateSceneCoordinate(mapView,p1);
+         _coordinates[1].updateSceneCoordinate(mapView,p2);
+
+         if (_lineSymbol != nullptr)
+         {
+            _scene    -> addItem( _lineSymbol );
+            line->setLine( _coordinates[0]._sceneCoordinate.x(), _coordinates[0]._sceneCoordinate.y()
+                         , _coordinates[1]._sceneCoordinate.x(), _coordinates[1]._sceneCoordinate.y() );
+
+            line -> setZValue(10);
+            line -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+
+            makeLineStyle( _dottedLine, _lineStyle );
+
+            line -> setPen( _lineStyle );
+         }
+      }
+   } /* RubberbandLineHandle::RubberbandLineHandle */
+
+
+   RubberbandLineHandle::~RubberbandLineHandle()
+   {
+     if (_scene)
+     {
+       if (_lineSymbol)
+       {
+         _scene->removeItem(_lineSymbol);
+         delete _lineSymbol;
+       }
+     }
+     _coordinates.clear();
+
+   } /* RubberbandHandle::~Rubberbandhandle */
+
+   void RubberbandLineHandle::adjustCoordinates()
+   {
+      if (_coordinates.size() >= 2)
+      {
+         _coordinates[0].mapToScene( _mapView );
+         _coordinates[1].mapToScene( _mapView );
+
+         static_cast<QGraphicsLineItem*>(_lineSymbol)->setLine( _coordinates[0]._sceneCoordinate.x(), _coordinates[0]._sceneCoordinate.y()
+                                                              , _coordinates[1]._sceneCoordinate.x(), _coordinates[1]._sceneCoordinate.y() );
+      }
+
+      DEBUG_LOG(_logger) << LOGFUNCTION << " map-coordinate = "   << QString::number(_coordinates[0]._mapCoordinate.x(),'f',15)
+                                                         << " ; " << QString::number(_coordinates[0]._mapCoordinate.y(),'f',15)
+                                        << " scene-coordinate = " << _coordinates[1]._sceneCoordinate.x() << " ; " << _coordinates[1]._sceneCoordinate.y();
+      emit adjusted();
+   } /* RubberbandLineHandle::adjustCoordinates */
+
+
+   void RubberbandLineHandle::adjustWindow( const QRectF& )
+   {
+     onDo_adjustCoordinates();
+   } /* RubberbandLineHandle::adjustWindow */
+
+
+   void RubberbandLineHandle::updateGraphic()
+   {
+      if (_lineSymbol)
+      {
+         QGraphicsLineItem * line = static_cast<QGraphicsLineItem*>( _lineSymbol);
+
+         makeLineStyle( _dottedLine, _lineStyle );
+
+         if (_isSelected)
+         {
+           _lineStyle.setWidth( _lineStyle.width() + 1 );
+           _lineStyle.setColor( _selectionColor );
+         }
+         line -> setPen( _lineStyle );
+         line -> setVisible( _isVisible );
+      }
+   } /* RubberbandLineHandle::updateGraphic */
+
+
+   void RubberbandLineHandle::updateCoordinates(const QVector<QPointF> & scenePositionVector)
+   {
+      if (scenePositionVector.size() == 2)
+      {
+         if (_coordinates.isEmpty()) _coordinates.resize(2);
+         _coordinates[0].updateSceneCoordinate(_mapView,scenePositionVector[0]);
+         _coordinates[1].updateSceneCoordinate(_mapView,scenePositionVector[1]);
+
+         if (_lineSymbol != nullptr)
+         {
+            QGraphicsLineItem * line = static_cast<QGraphicsLineItem*>( _lineSymbol);
+            line->setLine( _coordinates[0]._sceneCoordinate.x(), _coordinates[0]._sceneCoordinate.y()
+                         , _coordinates[1]._sceneCoordinate.x(), _coordinates[1]._sceneCoordinate.y() );
+         }
+      }
+   } /* RubberbandLineHandle::updateCoordinates */
+
+
+   void RubberbandLineHandle::updateCoordinate( unsigned index, const QPointF & scenePosition )
+   {
+      if (index < 2)
+      {
+         _coordinates[index].updateSceneCoordinate(_mapView,scenePosition);
+         QGraphicsLineItem * line = static_cast<QGraphicsLineItem*>( _lineSymbol);
+         line->setLine( _coordinates[0]._sceneCoordinate.x(), _coordinates[0]._sceneCoordinate.y()
+                       , _coordinates[1]._sceneCoordinate.x(), _coordinates[1]._sceneCoordinate.y() );
+      }
+   } /* RubberbandLineHandle::updateCoordinate */
+
+
+   QVector<RubberbandHandle::RubberbandCoordinate> RubberbandLineHandle::getCoordinates() const
+   {
+      return _coordinates;
+   } /* RubberbandLineHandle::getCoordinates */
+
+
+   RubberbandHandle::RubberbandCoordinate RubberbandLineHandle::getCoordinate( unsigned index ) const
+   {
+      if (index < 2)
+      {
+         return _coordinates[index];
+      }
+      return RubberbandCoordinate();
+   } /* RubberbandLineHandle::getCoordinate */
+
+
+   bool RubberbandLineHandle::isPositionInside( const QPointF & scenePosition ) const
+   {
+      if (_lineSymbol)
+      {
+         if (_lineSymbol->contains( scenePosition ))
+         {
+            return true;
+         }
+         else
+         {
+            // Ok, Qt's methodes doesn't work safely
+            // if it fails do some own calculations
+
+            QPointF V0   = _coordinates[0]._sceneCoordinate;
+            QPointF V1   = _coordinates[1]._sceneCoordinate;
+            QPointF R    = V1-V0;
+            QPointF P    = scenePosition-V0;
+            qreal   lenR = R.x() * R.x() + R.y() * R.y();
+            qreal   lenP = P.x() * P.x() + P.y() * P.y();
+
+            if ((lenR == 0) || (lenP > lenR)) return false; // scene Position is to far away
+
+            // now check the direction
+
+            lenR = sqrt(lenR);
+            lenP = sqrt(lenP);
+
+            R /= lenR;
+            P /= lenP;
+
+            qreal cosPhi  = QPointF::dotProduct(R,P);
+
+            if (cosPhi < 0) return false;
+
+            qreal epsilon = sqrt(1.0-cosPhi*cosPhi) * lenR;
+
+            return (epsilon < qreal(_pickingRatio));
+         }
+      }
+      return false;
+   } /* RubberbandLineHandle::isPositionInside */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.h
new file mode 100755
index 000000000..d01f9e520
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_line_handle.h
@@ -0,0 +1,81 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointF>
+
+#include <QtGui/QPen>
+
+#include "rubberband_handle.h"
+
+class QGraphicsItem;
+class QGraphicsScene;
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandLineHandle rubberband_line_handle.h
+     @brief Implementation of a line handle for rubberband internal use.
+     @see RubberbandHandle
+   */
+   class RubberbandLineHandle : public RubberbandHandle
+   {
+      Q_OBJECT
+      public:
+
+         RubberbandLineHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView ,QGraphicsScene * scene , const QPointF & p1, const QPointF & p2, unsigned int lineWidth = 2, bool dottedLine = false );
+         ~RubberbandLineHandle();
+
+         bool isPositionInside( const QPointF & scenePosition ) const override;
+
+         virtual void updateCoordinates( const QVector<QPointF> & scenePositionVector );
+         virtual void updateCoordinate( unsigned index, const QPointF & scenePosition );
+
+         virtual QVector<RubberbandCoordinate> getCoordinates() const;
+         virtual RubberbandCoordinate          getCoordinate( unsigned index ) const;
+
+         void dottedLine(bool on = true)             { _dottedLine = on; }
+
+      protected:
+
+         QGraphicsItem                 * _lineSymbol;
+         QPen                            _lineStyle;
+         QVector<RubberbandCoordinate>   _coordinates;
+         bool                            _dottedLine;
+
+         void updateGraphic() override;
+
+         void adjustCoordinates()           override;
+         void adjustWindow( const QRectF& ) override;
+
+
+   }; /* RubberbandLineHandle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.cpp
new file mode 100755
index 000000000..9e245984d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.cpp
@@ -0,0 +1,1747 @@
+/**
+  * @RDE_HEADER@
+  * Rubberband class to define multiple ellipse/circle
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#include "rubberband_multi_ellipse_feature.h"
+#include "rubberband_frame_handle.h"
+#include "rubberband_line_handle.h"
+//#include "rubberband_ellipse.h"
+#include "rubberband_ellipse_handle.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+#include "rubberband_handle_proxy.h"
+#include "drawable_line.h"
+#include "drawable_ellipse.h"
+#include "drawable_painter_path.h"
+#include "transient_tactical_symbol.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include "winkel_icon.xpm"
+
+//#include <MathUtils/math_const.h>
+#include <MathUtils/simple_helper.h>
+#include <LtsCoordTrans/lts_coord_trans.h>
+#include <MathUtils/matrix2d.h>
+
+#include <Map.h>
+
+#include <QtCore/QMetaMethod>
+
+namespace SituationMap
+{
+namespace RB
+{
+
+struct RubberbandMultiEllipseFeature::InternalData
+{
+  Q_DISABLE_COPY(InternalData)
+
+  QList<SituationMap::RefPointer<RubberbandEllipseHandle>> _ellipseHandleList;
+  SituationMap::RefPointer<RubberbandFrameHandle>          _frameHandle;
+
+  // sector :
+  QPointF                                         _sectorOStart{1, 0};
+  QPointF                                         _sectorOEnd{0, 1};
+  SituationMap::RefPointer<RubberbandPointHandle> _sectorStartHandle;
+  SituationMap::RefPointer<RubberbandPointHandle> _sectorEndHandle;
+  bool                                            _sectorEnabled = false;
+  bool                                            _sectorFixedAngleEnabled{false};
+
+  QPointF                                         _oVec{1,0};    // rb:  // normalized orientation vector according to scene coordinate system
+  // : sector
+
+  // rotationHandle :
+  SituationMap::RefPointer<RubberbandPointHandle> _rotationHandle;
+  unsigned int                                    _rotationHandleSize{0};
+  // : rotationHandle
+
+
+  // Coordinate matrix to describe the change of coordinates of the last user input
+  MathUtils::Matrix2D                             _lastCoordinateChange;
+
+
+  SituationMap::RefPointer<DrawableEllipse>             _previewEllipse;
+  SituationMap::RefPointer<TransientTacticalSymbol>     _previewSymbol;
+
+  QVector<RubberbandMultiEllipseFeature::RadiusWithContraints> _preparedRadiiConstraints;
+
+  bool                                                  _complexGeometry;
+  bool                                                  _addVertexAtEnd;
+  bool                                                  _showCursorPreviewEllipse;
+  bool                                                  _constrainQuadratic{true};
+
+
+  InternalData(QGraphicsScene *scene, bool complexGeometry)
+    : _complexGeometry(complexGeometry)
+    , _addVertexAtEnd(false)
+    , _showCursorPreviewEllipse(false)
+  {
+    Q_UNUSED(scene);
+  } // InternalData
+}; // RubberbandMultiEllipseFeature::InternalData
+
+QPointF rotateVertex(const QPointF &center, qreal x, qreal y, qreal sinA, qreal cosA)
+{
+   return QPointF(x*cosA-y*sinA,y*cosA+x*sinA) + center;
+}
+
+
+RubberbandMultiEllipseFeature::RubberbandMultiEllipseFeature(SituationMap::Map *map, QObject *parent)
+  : RubberbandMultiEllipseFeature(map, false, parent)
+{
+}
+
+
+RubberbandMultiEllipseFeature::RubberbandMultiEllipseFeature(SituationMap::Map *map, bool complexGeometry, QObject *parent)
+  : Rubberband(map, parent)
+  , _internal(new InternalData(Rubberband::_internal->_mapScene, complexGeometry))
+  , _isClosed(false)
+  , _minimumPointCount(2)
+  , _maximumPointCount(0)
+  , _maximumSegmentLength(0.0)
+  , _maximumLength(0.0)
+{
+}
+
+
+RubberbandMultiEllipseFeature::~RubberbandMultiEllipseFeature()
+{
+  delete _internal;
+}
+
+RubberbandFrameHandle *RubberbandMultiEllipseFeature::getFrameHandle() const
+{
+  return _internal->_frameHandle.get();
+}
+
+QPointF RubberbandMultiEllipseFeature::centerCoordinate(CoordinateSystem cs) const
+{
+  if (Rubberband::_internal->_handleList.isEmpty())
+    return {};
+  RubberbandPointHandle *handlePointCenter = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+
+  if (!handlePointCenter)
+    return {};
+
+  return projectCoordinateFromMap(cs, handlePointCenter->getCoordinate()._mapCoordinate);
+}
+
+QVector<QPointF> RubberbandMultiEllipseFeature::radii() const
+{
+  QPointF center = centerCoordinate(CoordinateSystem::Map);
+  if (center.isNull())
+    return {};
+  if (_internal->_ellipseHandleList.isEmpty())
+    return {};
+
+  QVector<QPointF> ret;
+  ret.reserve(_internal->_ellipseHandleList.size());
+
+  for (SituationMap::RefPointer<RubberbandEllipseHandle> handle : qAsConst(_internal->_ellipseHandleList))
+  {
+    if (!handle)
+      continue;
+    ret.append(handle->getRadius());
+  }
+  return ret;
+}
+
+QPointF RubberbandMultiEllipseFeature::getBiggestRadius() const
+{
+  QPointF max(0,0);
+  const QVector<QPointF> &radiiCont = radii();
+
+  for (const QPointF &item : qAsConst(radiiCont))
+  {
+    max.setX( std::max(max.x(), item.x()) );
+    max.setY( std::max(max.y(), item.y()) );
+  }
+  return max;
+}
+
+bool RubberbandMultiEllipseFeature::setCenterAndRadii(const QPointF &center, CoordinateSystem cs,
+                                                     const QVector<QPointF> &radii)
+{
+  if (center.isNull() || radii.isEmpty())
+    return false;
+
+  const QPointF &myCenter = projectCoordinateToMap(cs, center);
+
+  QVector<QPointF> coordinateVector;
+  coordinateVector.reserve(radii.size()+1);
+
+  // Center:
+  coordinateVector.append(myCenter);
+
+  // radii:
+  for (const QPointF& radius : qAsConst(radii))
+    coordinateVector.append(myCenter + radius);
+
+  setCoordinateVector(coordinateVector, CoordinateSystem::Map);
+
+  return true;
+}
+
+bool RubberbandMultiEllipseFeature::setCenterAndRadii2(const QPointF &center, CoordinateSystem cs,
+                                                       const QVector<RubberbandMultiEllipseFeature::RadiusWithContraints> &radiiWithConstraints)
+{
+  if (center.isNull() || radiiWithConstraints.isEmpty())
+    return false;
+
+  const QPointF &myCenter = projectCoordinateToMap(cs, center);
+
+  QVector<QPointF> coordinateVector;
+  coordinateVector.reserve(radiiWithConstraints.size()+1);
+
+  // Center:
+  coordinateVector.append(myCenter);
+
+  // Center with the radii:
+  for (const RubberbandMultiEllipseFeature::RadiusWithContraints& radiusItem : qAsConst(radiiWithConstraints))
+    if (radiusItem.m_radius > 0)
+      coordinateVector.append(myCenter + QPointF(radiusItem.m_radius, radiusItem.m_radius));
+
+
+  Rubberband::_internal->_handleList.clear();
+  for (const auto &p : coordinateVector)
+    constructPoint(p, CoordinateSystem::Map);
+
+  // are we still in construction or in modification?
+  // from scratch: constraints are provided, but no radius
+  // predefined: radius is provided, maybe constraints
+  if (coordinateVector.size() > 1)
+    enableModificationState();
+  update();
+  activateButtons();
+
+  return true;
+}
+
+
+void RubberbandMultiEllipseFeature::prepareFixedNumberOfRadiiWithConstraints(const QVector<RubberbandMultiEllipseFeature::RadiusWithContraints> &radiiContraints)
+{
+  // for creation from scratch, just min/max should be prepared.
+  // for creation with predefined values, the m_radius is relevant.
+  _internal->_preparedRadiiConstraints = radiiContraints;
+}
+
+
+QPointF RubberbandMultiEllipseFeature::getRotatedPoint(const QPointF &sector) const
+{
+  // Rotation of entire Rubberband
+  qreal sinRect = 0, cosRect = 1;
+  getSceneRotation(sinRect, cosRect);
+  const double angleRad = SituationMap::MathUtils::getMathAngle(QPointF(cosRect, sinRect)); // angle rad
+  const double clockwiseAngleRad = ((2*LtsCoordTrans::pi()) - angleRad); // angle in rad;
+
+  // map clockwise rotation
+  QPointF point;
+  point.setX(  sector.x()*std::cos(clockwiseAngleRad) + sector.y()*std::sin(clockwiseAngleRad));
+  point.setY( -sector.x()*std::sin(clockwiseAngleRad) + sector.y()*std::cos(clockwiseAngleRad));
+
+  return point;
+}
+
+void RubberbandMultiEllipseFeature::enableSector(bool on)
+{
+  _internal->_sectorEnabled = on;
+}
+bool RubberbandMultiEllipseFeature::isSectorEnabled() const
+{
+  return _internal->_sectorEnabled;
+}
+
+QPointF RubberbandMultiEllipseFeature::sectorStart() const
+{
+  return getRotatedPoint(_internal->_sectorOStart);
+}
+
+qreal RubberbandMultiEllipseFeature::sectorStartDegMath() const
+{
+  const QPointF &point = sectorStart();
+  return MathUtils::getMathAngle(point) * LtsCoordTrans::rad2deg();
+}
+
+QPointF RubberbandMultiEllipseFeature::sectorEnd() const
+{
+  return getRotatedPoint(_internal->_sectorOEnd);
+}
+
+qreal RubberbandMultiEllipseFeature::sectorEndDegMath() const
+{
+  const QPointF &point = sectorEnd();
+  return MathUtils::getMathAngle(point) * LtsCoordTrans::rad2deg();
+}
+
+void RubberbandMultiEllipseFeature::setSectorStart(qreal sinPhi, qreal cosPhi)
+{
+  _internal->_sectorOStart = QPointF(cosPhi, sinPhi);
+  enableSelectedState();
+  update();
+}
+
+void RubberbandMultiEllipseFeature::setSectorEnd(qreal sinPhi, qreal cosPhi)
+{
+  _internal->_sectorOEnd = QPointF(cosPhi, sinPhi);
+  enableSelectedState();
+  update();
+}
+
+void RubberbandMultiEllipseFeature::setSectorAngleFixed(bool on)
+{
+  _internal->_sectorFixedAngleEnabled = on;
+  update();
+}
+
+bool RubberbandMultiEllipseFeature::isSectorFixedAngeEnabled() const
+{
+  return _internal->_sectorFixedAngleEnabled;
+}
+
+QVector<QPointF> RubberbandMultiEllipseFeature::coordinateVector(CoordinateSystem cs) const
+{
+  QVector<QPointF> coordinateVector;
+  coordinateVector.reserve(Rubberband::_internal->_handleList.size());
+
+  for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+  {
+    RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handle.get());
+
+    coordinateVector.push_back(projectCoordinateFromMap(cs, handlePointPtr->getCoordinate()._mapCoordinate));
+  }
+  return coordinateVector;
+}
+
+QPointF RubberbandMultiEllipseFeature::singleCoordinate(unsigned int idx, CoordinateSystem cs ) const
+{
+   if (idx < (unsigned int)Rubberband::_internal->_handleList.size())
+   {
+      const RubberbandPointHandle * handle = dynamic_cast<const RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx].get());
+
+      return projectCoordinateFromMap( cs, handle->getCoordinate()._mapCoordinate );
+   }
+   return QPointF();
+}
+
+void RubberbandMultiEllipseFeature::setCoordinateVector(const QVector<QPointF> &coordinateVector, CoordinateSystem cs)
+{
+  Rubberband::_internal->_handleList.clear();
+
+  for (const auto &p : coordinateVector)
+    constructPoint(p, cs);
+  enableModificationState();
+  update();
+  activateButtons();
+}
+
+bool RubberbandMultiEllipseFeature::getRadiusXY(const QPointF &scenePos, qreal &radiusX_out, qreal &radiusY_out)
+{
+  if (Rubberband::_internal->_handleList.isEmpty())
+    return false;
+
+  RubberbandPointHandle *handlePointCenter = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+  if (!handlePointCenter)
+    return false;
+
+  const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointCenter->getCoordinate();
+  RubberbandHandle::RubberbandCoordinate currentMapPos(Rubberband::_internal->_mapView, scenePos);
+
+  radiusX_out = fabs(mapCenter._mapCoordinate.x() - currentMapPos._mapCoordinate.x());
+  radiusY_out = fabs(mapCenter._mapCoordinate.y() - currentMapPos._mapCoordinate.y());
+  return true;
+}
+
+void RubberbandMultiEllipseFeature::constructPoint(const QPointF &point, CoordinateSystem cs)
+{
+  const QPointF &mapPos = projectCoordinateToMap(cs, point);
+
+  RubberbandHandle::RubberbandCoordinate coordinate(Rubberband::_internal->_mapView, convert(mapPos, Rubberband::_internal->_mapView->map()->spatialReference()));
+  RubberbandHandle *handlePtr = constructPoint(coordinate._sceneCoordinate);
+  if (handlePtr)
+  {
+    static_cast<RubberbandPointHandle *>(handlePtr)->setCoordinate(coordinate);
+    handlePtr->setSelection(false);
+  }
+}
+
+RubberbandHandle *RubberbandMultiEllipseFeature::constructPoint(const QPointF &scenePos)
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION
+                                            << " RubberbandMultiEllipseFeature::constructPoint, _handleList.size " << Rubberband::_internal->_handleList.size();
+  RubberbandHandle *handlePtr{nullptr};
+
+  if ((_maximumPointCount>0) && ((unsigned int)Rubberband::_internal->_handleList.size() >= _maximumPointCount))
+  {
+    DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " skip due to _maximumPointCount (_sectorInputIsRunning)";
+    return nullptr;
+  }
+
+
+  if (!Rubberband::_internal->_handleList.empty())
+  {
+    handlePtr = Rubberband::_internal->_handleList.first().get();
+    if (handlePtr)
+    {
+      // center == first
+      const RubberbandHandle::RubberbandCoordinate &firstPosCenterPos = static_cast<RubberbandPointHandle *>(handlePtr)->getCoordinate();
+
+      qreal radiusX_out, radiusY_out;
+      if (getRadiusXY(scenePos, radiusX_out, radiusY_out))
+      {
+        bool minMaxOk = checkMinMaxRadiusConstraint(radiusX_out, radiusY_out);
+        if (minMaxOk)
+        {
+          RubberbandEllipseHandle *temp = new RubberbandEllipseHandle(Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene);
+
+          if (_internal->_constrainQuadratic)
+            radiusX_out = radiusY_out = std::max(radiusX_out, radiusY_out);
+
+          temp->setRect(firstPosCenterPos, radiusX_out, radiusY_out, 0, 1);
+
+          QColor fillColor = _fillColor;
+          fillColor.setAlphaF(_fillColor.alphaF()*0.5);
+          temp->setFillColor(fillColor);
+
+          QColor selectionColor = _handleSelectionColor;
+          selectionColor.setAlphaF(_handleSelectionColor.alphaF()*0.5);
+          temp->setSelectionColor(selectionColor);
+
+          _internal->_ellipseHandleList.append(RefPointer<RubberbandEllipseHandle>(static_cast<RubberbandEllipseHandle *>(temp)));
+        } else {
+          DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION
+                                                    << " SKIP RubberbandMultiEllipseFeature::constructPoint, "
+                                                    << ", radiusX_out" << radiusX_out << ", radiusY_out" << radiusY_out;
+          return nullptr;
+        }
+      }
+    }
+  }
+
+  //
+  // RubberbandPointHandle einfügen
+  //
+  handlePtr  = new RubberbandPointHandle(Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, scenePos);
+  handlePtr->setSelection();
+  handlePtr->setIsFirst(Rubberband::_internal->_handleList.empty());    // mark centerPoint with 'isFirst' to simplify later recognation
+  Rubberband::_internal->_handleList.append(SituationMap::RefPointer<RubberbandHandle>(handlePtr));
+
+  // activateButtons?
+  if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+    activateButtons();
+
+  if ((!_maximumPointCount) || ((unsigned int)Rubberband::_internal->_handleList.size() < _maximumPointCount))
+  {
+    if (!_internal->_previewEllipse)
+      _internal->_previewEllipse = new DrawableEllipse(Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene);
+    _internal->_previewEllipse->setVisibility(true);
+  }
+  else
+  {
+    _internal->_previewEllipse = nullptr;
+  }
+  return handlePtr;
+}
+
+bool RubberbandMultiEllipseFeature::checkLengthConstrains(const QPointF &scenePos, const QPointF &deltaScenePos)
+{
+  Q_UNUSED(scenePos);
+  Q_UNUSED(deltaScenePos);
+  return true;
+
+/*
+  if (_internal->_complexGeometry)
+  {
+    markFailedConstrains(QPointF(), false);
+    return true;
+  }
+
+   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   //  Checking constrains for moving selected coordinates (handles)
+   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  bool                                            allHandlesSelected = true;
+  QVector<RubberbandHandle::RubberbandCoordinate> coordinateVector;
+  coordinateVector.reserve(Rubberband::_internal->_handleList.size());
+
+  for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+  {
+    RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handle.get());
+    if (handlePointPtr)
+    {
+      coordinateVector.append(handlePointPtr->getCoordinate());
+      if (handlePointPtr->isSelected())
+      {
+        RubberbandHandle::RubberbandCoordinate &coordinate = coordinateVector.back();
+        coordinate.updateSceneCoordinate(Rubberband::_internal->_mapView, coordinate._sceneCoordinate + deltaScenePos);
+      }
+      else allHandlesSelected = false;
+    }
+  }
+
+  if ((allHandlesSelected) || ((_internal->_frameHandle) && (_internal->_frameHandle->isSelected())))
+  {
+    markFailedConstrains(QPointF(), false);
+    return true;
+  }
+
+  //
+  // check  totalLength
+  //
+  if (_maximumLength > 0.0)
+  {
+    qreal totalLength                              = 0.0;
+    const Esri::ArcGISRuntime::Point *lastMapCoord = nullptr;       // Check Quartz
+    for (int i = 0; i < coordinateVector.size(); ++i)
+    {
+      const RubberbandHandle::RubberbandCoordinate &coordinate = coordinateVector[i];
+      if (lastMapCoord)
+      {
+        qreal x = coordinate._mapCoordinate.x() - lastMapCoord->x();
+        qreal y = coordinate._mapCoordinate.y() - lastMapCoord->y();
+
+        totalLength += sqrt(x * x + y * y);
+      }
+      lastMapCoord = &coordinateVector.at(i)._mapCoordinate;
+    }
+    if (totalLength > _maximumLength)
+    {
+      markFailedConstrains(scenePos, true);
+      return false;
+    }
+  }
+
+  //
+  // check maximumSegmentLength
+  //
+  const RubberbandHandle::RubberbandCoordinate  *mapPointPtr  = nullptr;
+  bool                                           lastSelected = false;
+  auto                                           handleIter   = Rubberband::_internal->_handleList.constBegin();
+
+  for (int i = 0; i < coordinateVector.size(); ++i)
+  {
+    const RubberbandHandle::RubberbandCoordinate &coordinate = coordinateVector[i];
+    bool                                           isSelected = (*handleIter)->isSelected();
+
+    if ((isSelected || lastSelected) && (mapPointPtr))
+    {
+      if (_maximumSegmentLength > 0.0)
+      {
+        qreal x = coordinate._mapCoordinate.x() - mapPointPtr->_mapCoordinate.x();
+        qreal y = coordinate._mapCoordinate.y() - mapPointPtr->_mapCoordinate.y();
+
+        if (sqrt(x * x + y * y) > _maximumSegmentLength)
+        {
+          markFailedConstrains(scenePos, true);
+          return false;
+        }
+      }
+      // looking for identical coordinate with last point
+      qreal x = coordinate._sceneCoordinate.x() - mapPointPtr->_sceneCoordinate.x();
+      qreal y = coordinate._sceneCoordinate.y() - mapPointPtr->_sceneCoordinate.y();
+
+      if ((x * x + y * y) <= 1)
+      {
+        markFailedConstrains(scenePos, true);
+        return false;
+      }
+    }
+    ++handleIter;
+    mapPointPtr  = &coordinateVector.at(i);
+    lastSelected = isSelected;
+  } // for
+
+  markFailedConstrains(QPointF(), false);
+  return true;
+*/
+}
+
+bool RubberbandMultiEllipseFeature::checkMinMaxRadiusConstraint(const QPointF &curScenePos)
+{
+  qreal radiusX_out, radiusY_out;
+  if (!getRadiusXY(curScenePos, radiusX_out, radiusY_out))
+    return true;
+
+  if (_internal->_constrainQuadratic)
+    radiusX_out = radiusY_out = std::max(radiusX_out, radiusY_out);
+
+  return checkMinMaxRadiusConstraint(radiusX_out, radiusY_out);
+}
+
+bool RubberbandMultiEllipseFeature::checkMinMaxRadiusConstraint(qreal radiusX, qreal radiusY, int idxOfConstraint)
+{
+  // Which radius is relevant?
+  if (idxOfConstraint < 0)
+    idxOfConstraint = Rubberband::_internal->_handleList.size() - 1; // '-1' - keep handle for center (isFirst) in mind
+
+  if ((idxOfConstraint < 0) || (idxOfConstraint >= _internal->_preparedRadiiConstraints.size()))
+    return true;
+
+  const RadiusWithContraints &curConstraints = _internal->_preparedRadiiConstraints[idxOfConstraint];
+
+//  qCritical() << " radiusX = " << radiusX;
+//  qCritical() << " radiusY = " << radiusY;
+
+  bool bMinOk = true;
+  double minRadius = curConstraints.m_minRadius;
+  if (minRadius > 0)
+    bMinOk = ((radiusX >= minRadius) && (radiusY >= minRadius));
+
+  bool bMaxOk = true;
+  double maxRadius = curConstraints.m_maxRadius;
+  if (maxRadius > 0)
+    bMaxOk = ((radiusX <= maxRadius) && (radiusY <= maxRadius));
+
+  if (!bMinOk)
+    INFO_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " checkMinMaxRadiusConstraintNew false by bMinOk"
+                                             << ", idxOfConstraint=" << idxOfConstraint
+                                             << ", radiusX=" << radiusX << ", radiusY=" << radiusY
+                                             << ", minRadius=" << minRadius << ", maxRadius=" << maxRadius;
+  if (!bMaxOk)
+    INFO_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " checkMinMaxRadiusConstraintNew false by bMaxOk"
+                                             << ", idxOfConstraint=" << idxOfConstraint
+                                             << ", radiusX=" << radiusX << ", radiusY=" << radiusY
+                                             << ", minRadius=" << minRadius << ", maxRadius=" << maxRadius;
+  return bMinOk && bMaxOk;
+}
+
+bool RubberbandMultiEllipseFeature::checkLengthConstrains(unsigned int checkHandleIdx,  const QPointF &scenePos)
+{
+  Q_UNUSED(checkHandleIdx);
+
+  if (!checkMinMaxRadiusConstraint(scenePos))
+  {
+    markFailedConstrains(scenePos, true);
+    return false;
+  }
+  markFailedConstrains(QPoint(), true);
+
+  return true;
+
+  // return true  -> construct point
+  // return false -> don not construct point
+
+/*
+  if (_internal->_complexGeometry)
+  {
+    markFailedConstrains(QPointF(), false);
+    return true;
+  }
+
+  bool markFailedConstrainsFlag = false;
+
+  // calculate pixel size for later use
+  RubberbandDrawable::RubberbandCoordinate pi1(Rubberband::_internal->_mapView, scenePos);
+  RubberbandDrawable::RubberbandCoordinate pi2(Rubberband::_internal->_mapView, scenePos + QPointF(1, 1));
+
+  qreal piX       = pi2._mapCoordinate.x() - pi1._mapCoordinate.x();
+  qreal piY       = pi2._mapCoordinate.y() - pi1._mapCoordinate.y();
+  qreal pixelSize = sqrt(piX * piX + piY * piY);
+
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  // Checking constrains for adding single coordinate at end of polyline
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  RubberbandHandle::RubberbandCoordinate mapPos(Rubberband::_internal->_mapView, scenePos);
+
+  if ((!Rubberband::_internal->_handleList.empty()) && (_maximumLength > 0.0))
+  {
+    qreal                                                       totalLength = 0.0;
+    RubberbandHandle::RubberbandCoordinate                      mapPoint;
+
+    QList<SituationMap::RefPointer<RubberbandHandle>>::iterator it = Rubberband::_internal->_handleList.begin();
+
+    for (; it != Rubberband::_internal->_handleList.end(); ++it)
+    {
+      RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(it->get());
+      if (handlePointPtr)
+      {
+        if (it != Rubberband::_internal->_handleList.begin())
+        {
+          qreal x = handlePointPtr->getCoordinate()._mapCoordinate.x() - mapPoint._mapCoordinate.x();
+          qreal y = handlePointPtr->getCoordinate()._mapCoordinate.y() - mapPoint._mapCoordinate.y();
+
+          totalLength += sqrt(x * x + y * y);
+        }
+        mapPoint = handlePointPtr->getCoordinate();
+      }
+    }
+    if (totalLength >= _maximumLength)
+    {
+      markFailedConstrains(scenePos, true);
+      return false;
+    }
+
+    qreal x = mapPos._mapCoordinate.x() - mapPoint._mapCoordinate.x();
+    qreal y = mapPos._mapCoordinate.y() - mapPoint._mapCoordinate.y();
+    qreal l = sqrt(x * x + y * y);
+
+    qreal d = _maximumLength - totalLength - l - pixelSize;
+    if (d < 0.0)
+    {
+      qreal scale = (1.0 + d / l);
+      const Esri::ArcGISRuntime::Point newMapCoordinate(mapPoint._mapCoordinate.x() + x * scale,
+                                                        mapPoint._mapCoordinate.y() + y * scale,
+                                                        mapPos._mapCoordinate.spatialReference());
+      mapPos._mapCoordinate = newMapCoordinate;
+      markFailedConstrainsFlag = true;
+      scenePos = mapPos.mapToScene(Rubberband::_internal->_mapView);
+    }
+  }
+
+  // check radius
+  if (!checkMinMaxRadiusConstraint(scenePos))
+  {
+    markFailedConstrains(scenePos, true);
+    return false;
+
+//    markFailedConstrainsFlag = true;
+//    return true;
+  }
+
+  markFailedConstrains(scenePos, markFailedConstrainsFlag);
+
+  return true;
+*/
+}
+
+bool RubberbandMultiEllipseFeature::selectHandles(int x, int y, const QPointF &scenePos)
+{
+  bool               eventHandled = false;
+  RubberbandHandle *handlePtr    = pickHandle(x, y);
+
+  _internal->_addVertexAtEnd = false;
+
+  if (handlePtr && handlePtr->isVisible())
+  {
+    handlePtr->setSelection();
+    enableSelectedState();
+    eventHandled = true;
+  }
+
+  if (!isEnabledSelectedState())
+  {
+    // ok doesn't hit any point or line handle now looking to frame handle
+    if (_internal->_frameHandle && _internal->_frameHandle->isPositionInside(scenePos))
+    {
+      _internal->_frameHandle->setSelection(true);
+      enableSelectedState();
+      eventHandled = true;
+    }
+
+    if (_internal->_rotationHandle && _internal->_rotationHandle->isPositionInside(scenePos))
+    {
+      _internal->_rotationHandle->setSelection(true);
+      enableSelectedState();
+      eventHandled = true;
+    }
+  }
+  return eventHandled;
+}
+
+void RubberbandMultiEllipseFeature::updateHandles(const QPointF &scenePos, const QPointF &deltaMove)
+{
+  Q_UNUSED(deltaMove);
+  bool constrainsComplied = true;
+
+  if (Rubberband::_internal->_handleList.size() < 2)
+    return;
+
+  if ((_internal->_rotationHandle.valid()) && _internal->_rotationHandle->isSelected())
+  {
+    const RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+    if (!handlePointPtr)
+      return;
+    const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointPtr->getCoordinate();
+
+
+    // _internal->_centerScene --> centerScene
+    const QPointF &centerScene                         = mapCenter._sceneCoordinate;
+    const Esri::ArcGISRuntime::Point &centerMapCoords  = mapCenter._mapCoordinate;
+    const QPointF centerMapCoordsAsPointF(centerMapCoords.x(), centerMapCoords.y());
+
+     qreal sinA =   scenePos.x() - centerScene.x(); // _internal->_centerScene.x();
+     qreal cosA = - scenePos.y() + centerScene.y();
+     qreal len  = sqrt(cosA*cosA+sinA*sinA);
+
+     cosA /= len;
+     sinA /= len;
+
+// for circle it´s not really helpfull to rotate the handles -> skip here
+//     for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+//     {
+//        RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+//        if (!handlePointPtr)
+//          continue;
+
+//        QPointF p = MathUtils::rotate( handlePointPtr->getCoordinate()._sceneCoordinate, centerScene, -_internal->_oVec.y(), _internal->_oVec.x() );
+//        p = MathUtils::rotate( p, centerScene, sinA, cosA );
+//        handlePointPtr->updateCoordinate( p );
+
+//        p.setX( handlePointPtr->getCoordinate()._mapCoordinate.x() );
+//        p.setY( handlePointPtr->getCoordinate()._mapCoordinate.y() );
+//     } // for
+
+     qreal dSin = sinA*_internal->_oVec.x() - cosA*_internal->_oVec.y(); // addition theorem
+     qreal dCos = cosA*_internal->_oVec.x() + sinA*_internal->_oVec.y();
+
+     _internal->_lastCoordinateChange.setToIdentity();                             // clear matrix
+     _internal->_lastCoordinateChange.putTranslation( -centerMapCoordsAsPointF );  // move center to (0,0)
+     _internal->_lastCoordinateChange.putRotate( QPointF(dCos, dSin) );            // do rotation
+     _internal->_lastCoordinateChange.putTranslation( centerMapCoordsAsPointF );   // move center back
+
+     _internal->_oVec.setX(cosA);
+     _internal->_oVec.setY(sinA);
+
+     _baseInternal->_lastClickPosition = scenePos;
+  }
+
+  markFailedConstrains( scenePos, !constrainsComplied );
+
+  update();
+}
+
+void RubberbandMultiEllipseFeature::resetAction(AbstractEventDispatcher *causer, int x, int y)
+{
+  if (rubberbandIsAlive())
+  {
+    if (isEnabledConstructionState())
+    {
+      if (_internal->_addVertexAtEnd)
+      {
+        Rubberband::_internal->_handleList.removeLast();
+        //_internal->_lineHandleList.removeLast();
+      }
+    }
+  }
+  Rubberband::resetAction(causer, x, y);
+}
+
+bool RubberbandMultiEllipseFeature::selectAction(AbstractEventDispatcher *, int x, int y)
+{
+  if (rubberbandIsAlive())
+  {
+    DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " selectAction";
+
+    QPointF scenePos(pixel2ScenePosition(x, y));
+
+    // starting a rubberband with radii prepared but without center?
+    if (!_internal->_preparedRadiiConstraints.isEmpty() && Rubberband::_internal->_handleList.isEmpty())
+    {
+      RubberbandDrawable::RubberbandCoordinate rbC(Rubberband::_internal->_mapView, scenePos);
+      setCenterAndRadii2(QPointF(rbC._mapCoordinate.x(), rbC._mapCoordinate.y()), CoordinateSystem::Map,
+                        _internal->_preparedRadiiConstraints);
+      enableSelectedState();
+
+      _internal->_addVertexAtEnd           = true;
+      _internal->_showCursorPreviewEllipse = true;
+
+      return true;
+    }
+
+
+    if (_baseInternal->buttonProxyActive(scenePos))
+      return false;
+
+    if (isEnabledConstructionState())
+      disenableMultiSelectedState();
+
+    _baseInternal->_lastClickPosition = scenePos;
+
+    bool eventHandled = selectHandles(x, y, scenePos);
+    if ((!eventHandled) && (isEnabledConstructionState()))
+    {
+      _internal->_addVertexAtEnd           = true;
+      _internal->_showCursorPreviewEllipse = true;
+
+      deSelectHandles();
+
+      if (checkLengthConstrains(1, scenePos))
+      {
+        constructPoint(scenePos);
+        enableSelectedState();
+        _baseInternal->_lastClickPosition = scenePos;
+      }
+
+      eventHandled = true;
+    }
+    else
+      _internal->_addVertexAtEnd = false;
+
+    if (eventHandled)
+    {
+      update();
+      // deactivateButtons();
+    }
+
+    return eventHandled;
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::setCoordinateAction(AbstractEventDispatcher *causer, int x, int y)
+{
+  Q_UNUSED(causer);
+
+  if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+  {
+    QPointF scenePos(pixel2ScenePosition(x, y));
+    Rubberband::_internal->_lastClickPosition = scenePos;
+
+    if (Rubberband::_internal->_handleList.isEmpty())
+    {
+      disenableSelectedState();
+      disenableMultiSelectedState();
+      return false;
+    }
+  }
+  return false;
+
+
+  // -----------------------------------
+/*
+  markFailedConstrains(QPointF(), false);
+
+  if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+  {
+    bool    eventHandled = false;
+    QPointF scenePos(pixel2ScenePosition(x, y));
+
+    Rubberband::_internal->_lastClickPosition = scenePos;
+
+    if (_internal->_addVertexAtEnd) // isEnabledConstructionState())
+    {
+      if (Rubberband::_internal->_handleList.isEmpty())
+      {
+        disenableSelectedState();
+        disenableMultiSelectedState();
+        return false;
+      }
+
+      if ((!isEnabledSelectedState()) && (_baseInternal->buttonProxyActive(scenePos)))
+      {
+        deSelectHandles();
+        return false;
+      }
+
+      if (checkLengthConstrains(2, scenePos))
+      {
+        QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+
+        for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+        {
+          RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handle.get());
+          if ((handlePointPtr) && ((handlePointPtr->isSelected())))
+          {
+            handlePointPtr->setSelection(false);
+            handlePointPtr->moveCoordinate(deltaMove);
+            eventHandled = true;
+          }
+        }
+      }
+      markFailedConstrains(QPointF(), false);
+
+      if ((_maximumPointCount > 0) && ((unsigned int)Rubberband::_internal->_handleList.size() >= _maximumPointCount))
+      {
+        INFO_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " do Sector now...";
+
+        _internal->_showCursorPreviewEllipse = false;
+        // continue contructionState, so we are able to move the whole object by moving the first handle (center)
+
+        // reset _lastClickPosition to improve ButtonPosition
+        _baseInternal->_lastClickPosition = QPointF(-1,-1);
+
+        // remove former selection:
+        for (SituationMap::RefPointer<RubberbandEllipseHandle> handle : qAsConst(_internal->_ellipseHandleList))
+          if (handle)
+            handle->setSelection(false);
+        deSelectHandles();
+
+        update();
+
+        // do not complete
+        // return false;
+        // completeStateAction(causer, x, y);
+      }
+      if (eventHandled)
+        update();
+      if (_baseInternal->buttonProxyActive(scenePos))
+        return false;
+      updateButtonPosition();
+      activateButtons();
+    }
+    else
+    {
+      if (isEnabledSelectedState())
+      {
+        bool frameIsSelected(((_internal->_frameHandle != nullptr) && (_internal->_frameHandle->isSelected())));
+
+        QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+
+        if (!checkLengthConstrains(scenePos, deltaMove))
+        {
+          for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+          {
+            RubberbandPointHandle *handlePointPtr =  dynamic_cast<RubberbandPointHandle *>(handle.get());
+            if (handlePointPtr)
+              handlePointPtr->setSelection(false);
+          }
+          if (_internal->_frameHandle)
+            _internal->_frameHandle->setSelection(false);
+          updateButtonPosition();
+          activateButtons();
+          disenableSelectedState();
+          disenableMultiSelectedState();
+          markFailedConstrains(QPointF(), false);
+          return true;
+        }
+        markFailedConstrains(QPointF(), false);
+
+        for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+        {
+          RubberbandPointHandle *handlePointPtr =  dynamic_cast<RubberbandPointHandle *>(handle.get());
+          if ((handlePointPtr) && ((handlePointPtr->isSelected()) || (frameIsSelected)))
+          {
+            handlePointPtr->setSelection(false);
+            handlePointPtr->moveCoordinate(deltaMove);
+            eventHandled = true;
+          }
+        }
+        if (frameIsSelected)
+        {
+          _internal->_frameHandle->setSelection(false);
+          eventHandled = true;
+        }
+
+        disenableSelectedState();
+        disenableMultiSelectedState();
+      }
+
+      if (isEnabledConstructionState())
+      {
+        _internal->_addVertexAtEnd        = true;
+        _internal->_showCursorPreviewEllipse = true;
+
+        updatePreviewEllipse(scenePos);
+      }
+      else if (_baseInternal->buttonProxyActive(scenePos))
+        return false;
+
+      if (eventHandled)
+        update();
+      updateButtonPosition();
+      activateButtons();
+
+    }
+    return  eventHandled;
+  }
+  return false;
+*/
+}
+
+void RubberbandMultiEllipseFeature::updatePreviewEllipse(const QPointF &scenePosition)
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " START";
+//  qCritical() << " RubberbandMultiEllipseFeature::updatePreviewEllipse"
+//              << ", scenePosition " << scenePosition
+//              << ", _addVertexAtEnd " << _internal->_addVertexAtEnd
+//              << ", isEnabledConstructionState " << isEnabledConstructionState()
+//              << " _internal->_handleList.size() " <<Rubberband::_internal->_handleList.size()
+//              << " _ellipseHandleList.size() " <<_internal->_ellipseHandleList.size();
+
+  if (isEnabledConstructionState() && (!Rubberband::_internal->_handleList.isEmpty()) && (_internal->_previewEllipse))
+  {
+    // center / first point
+    RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+    if ((handlePointPtr) && (_internal->_addVertexAtEnd))
+    {
+      RubberbandHandle::RubberbandCoordinate mapCenter = handlePointPtr->getCoordinate();
+      RubberbandDrawable::RubberbandCoordinate rbCoordinate(Rubberband::_internal->_mapView, scenePosition);
+
+      _internal->_previewEllipse->setVisibility(_internal->_showCursorPreviewEllipse);
+      _internal->_previewEllipse->setDrawColor(_handleSelectionColor);
+
+      int distX = fabs(mapCenter._mapCoordinate.x() - rbCoordinate._mapCoordinate.x());
+      int distY = fabs(mapCenter._mapCoordinate.y() - rbCoordinate._mapCoordinate.y());
+      if (_internal->_constrainQuadratic)
+        distX = distY = std::max(distX, distY);
+      _internal->_previewEllipse->setRect(QPointF(mapCenter._mapCoordinate.x(), mapCenter._mapCoordinate.y()),
+                                               distX, distY, 0, 1);
+
+      // sync FrameHandle:
+      updateFrameHandle(scenePosition);
+    }
+    else
+    {
+      _internal->_previewEllipse->setVisibility(false);
+    }
+    return;
+  }
+  else
+  {
+    _internal->_previewEllipse = nullptr;
+  }
+}
+
+bool RubberbandMultiEllipseFeature::moveAction(AbstractEventDispatcher *, int x, int y)
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " START";
+
+  adjustConnectedPreviewPixmap(x, y);
+
+  if (rubberbandIsAlive())
+  {
+    QPointF scenePosition(pixel2ScenePosition(x, y));
+
+    //------------------------------
+    // sectorStartHand, _sectorEndHandle
+    {
+      if (_internal->_sectorStartHandle.valid())
+      {
+        if (_internal->_sectorStartHandle->isPositionInside(scenePosition))
+        {
+          _internal->_sectorStartHandle->setSelection(true);
+          _internal->_frameHandle = nullptr;
+          update();
+          return false;
+        }
+        else
+          _internal->_sectorStartHandle->setSelection(false);
+      }
+      if (_internal->_sectorEndHandle.valid())
+      {
+        if (_internal->_sectorEndHandle->isPositionInside(scenePosition))
+        {
+          _internal->_sectorEndHandle->setSelection(true);
+          _internal->_frameHandle = nullptr;
+          update();
+          return false;
+        }
+        else
+          _internal->_sectorEndHandle->setSelection(false);
+      }
+    }
+    //------------------------------
+    //------------------------------
+    //------------------------------
+
+    //------------------------------
+    if (_internal->_rotationHandle.valid())
+      _internal->_rotationHandle->setSelection(_internal->_rotationHandle->isPositionInside(scenePosition));
+
+
+    if (_baseInternal->buttonProxyActive(scenePosition))
+      return false;
+    if (!Rubberband::_internal->_mapView)
+      return false;
+
+    if (!isEnabledMultiSelectedState())
+      deSelectHandles();
+
+    RubberbandHandle *handlePtr = pickHandle(x, y);
+    if (!handlePtr)
+    {
+      _internal->_showCursorPreviewEllipse = isEnabledConstructionState();
+    }
+    else
+    {
+      _internal->_showCursorPreviewEllipse = false;
+
+      // set handlePtr selected...
+      handlePtr->setSelection();
+
+      // and updateFrameHandle if not first handle:
+      RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handlePtr);
+      if (handlePointPtr)
+      {
+        if (handlePointPtr->isFirst())
+          updateFrameHandle({});
+        else
+          updateFrameHandle(handlePointPtr->getCoordinate()._sceneCoordinate);
+      }
+    }
+
+    if (isEnabledConstructionState())
+    {
+      if (checkLengthConstrains(1, scenePosition))
+      {
+        updatePreviewEllipse(scenePosition);
+
+        if (isSignalConnected(QMetaMethod::fromSignal(&RubberbandMultiEllipseFeature::currentCursorPositionChanged)))
+        {
+          RubberbandDrawable::RubberbandCoordinate mapCoord(Rubberband::_internal->_mapView, scenePosition);
+          emit currentCursorPositionChanged(Point3D(mapCoord._mapCoordinate.x(), mapCoord._mapCoordinate.y(), 0.0));
+        }
+      }
+    }
+    return false;
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::movePickedAction(AbstractEventDispatcher *, int x, int y)
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " START"
+                                            << ", isEnabledSelectedState " << isEnabledSelectedState();
+
+  adjustConnectedPreviewPixmap(x, y);
+
+  if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+  {
+    QPointF scenePos(pixel2ScenePosition(x,y));
+
+    updateHandles(scenePos, scenePos-_baseInternal->_lastClickPosition);
+
+
+    if (isEnabledSelectedState())
+    {
+      // sectorHandles:
+      if (!isSectorFixedAngeEnabled())
+      {
+        auto updateHandle = [this](RubberbandPointHandle * handle, const RubberbandHandle::RubberbandCoordinate & pos, QPointF & oVector ) -> bool
+        {
+          if (!handle)
+            return false;
+          if (!handle->isSelected())
+            return false;
+
+          RubberbandPointHandle *handlePointCenter = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+          if (!handlePointCenter)
+            return false;
+          const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointCenter->getCoordinate();
+
+          qreal sinRect = 0;
+          qreal cosRect = 1;
+          getSceneRotation( sinRect, cosRect);
+
+          qreal cosA = pos._mapCoordinate.x() - mapCenter._mapCoordinate.x();
+          qreal sinA = pos._mapCoordinate.y() - mapCenter._mapCoordinate.y();
+          qreal len  = sqrt(cosA*cosA+sinA*sinA);
+
+          cosA /= len;
+          sinA /= len;
+
+          oVector.setX( cosA*cosRect + sinA*sinRect );
+          oVector.setY( sinA*cosRect - cosA*sinRect );
+          update();
+          return true;
+        }; // updateHandle
+
+        RubberbandHandle::RubberbandCoordinate pos(Rubberband::_internal->_mapView, scenePos);
+        updateHandle( _internal->_sectorStartHandle.get(), pos, _internal->_sectorOStart);
+        updateHandle( _internal->_sectorEndHandle.get()  , pos, _internal->_sectorOEnd  );
+      }
+      // // return true;
+      //------------------------------
+      //------------------------------
+      //------------------------------
+
+      // look for (first) selected PointHandle:
+      RubberbandPointHandle *selectedPointHandlePtr{nullptr};
+      for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+      {
+        RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handle.get());
+        if (!handlePointPtr)
+          continue;
+        if (handlePointPtr->isSelected())
+          selectedPointHandlePtr = handlePointPtr;
+      } // for
+      const bool bFirstHandlePointSelected = (selectedPointHandlePtr && selectedPointHandlePtr->isFirst());
+
+
+      RubberbandHandle::RubberbandCoordinate rcNewCorner;
+
+      // nur wenn _constrainQuadratic UND nicht der 'isFirst'/centerPoint
+      if (_internal->_constrainQuadratic && !bFirstHandlePointSelected)
+      {
+        RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+        if (!handlePointPtr)
+          return false;
+
+        const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointPtr->getCoordinate();
+
+        qreal radiusX, radiusY;
+        if (getRadiusXY(scenePos, radiusX, radiusY))
+          radiusX = radiusY = std::max(radiusX, radiusY);
+
+
+        RefPointer<RubberbandHandle> refPtr(selectedPointHandlePtr);
+        int idx = Rubberband::_internal->_handleList.indexOf(refPtr);
+        if (idx > 0)
+        {
+          if (!checkMinMaxRadiusConstraint(radiusX, radiusY, idx-1))
+          {
+            update(); // show/create preview!?
+            return false;
+          }
+        }
+
+        // adjusted coord: (prefer topRight)
+        Esri::ArcGISRuntime::Point newCorner(mapCenter._mapCoordinate.x()+radiusX,
+                                             mapCenter._mapCoordinate.y()+radiusY,
+                                             mapCenter._mapCoordinate.spatialReference());
+
+        rcNewCorner = RubberbandHandle::RubberbandCoordinate(Rubberband::_internal->_mapView, newCorner);
+      }
+
+
+      QPointF deltaMove(scenePos - _baseInternal->_lastClickPosition);
+      if (checkLengthConstrains(scenePos, deltaMove))
+      {
+        const bool frameIsSelected(((_internal->_frameHandle) && (_internal->_frameHandle->isSelected())));
+        const bool moveAll = bFirstHandlePointSelected;
+
+        _baseInternal->_lastClickPosition = scenePos;
+
+        for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+        {
+          RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(handle.get());
+          if ((handlePointPtr) && ((handlePointPtr->isSelected()) || (frameIsSelected||moveAll)))
+          {
+            if (rcNewCorner.isNull())
+              handlePointPtr->moveCoordinate(deltaMove);
+            else
+              handlePointPtr->setCoordinate(rcNewCorner);
+          }
+        }
+        updatePreviewEllipse(scenePos);
+        update();
+      }
+      return true;
+    }
+
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::deleteAction(AbstractEventDispatcher *, int x, int y)
+{
+  if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+  {
+    if (((unsigned int)Rubberband::_internal->_handleList.size() > _minimumPointCount) && (isEnabledSelectedState()))
+    {
+      QList<SituationMap::RefPointer<RubberbandHandle>>               savedHandleList= Rubberband::_internal->_handleList;
+
+      QPointF                                                         scenePosition  = pixel2ScenePosition(x, y);
+      QList<SituationMap::RefPointer<RubberbandHandle>>::iterator     handleIter     = Rubberband::_internal->_handleList.begin();
+
+      while (handleIter != Rubberband::_internal->_handleList.end())
+      {
+        if (handleIter->get()->isPositionInside(scenePosition))
+        {
+          handleIter = Rubberband::_internal->_handleList.erase(handleIter);
+          updateFrameHandle({});
+          continue;
+        }
+        ++handleIter;
+      } // while handleIter
+
+      if (!checkLengthConstrains(scenePosition, QPointF(0, 0)))
+      {
+        // constrain failed, do not delete yet
+        Rubberband::_internal->_handleList = savedHandleList;
+      }
+      update();
+      activateButtons();
+
+      disenableSelectedState();
+      disenableMultiSelectedState();
+    }
+    return true;
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::contextMenuAction(AbstractEventDispatcher *, int, int)
+{
+  return false;
+}
+
+
+bool RubberbandMultiEllipseFeature::completeStateAction(AbstractEventDispatcher *causer, int x, int y)
+{
+  markFailedConstrains(QPointF(), false);
+
+  if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+  {
+    if (isEnabledConstructionState())
+    {
+      if (!_finishAfterConstruction)
+      {
+        if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+        {
+          enableModificationState();
+          _internal->_previewEllipse = nullptr; // remove preview
+        }
+        update();
+        return true;
+      }
+    }
+
+    if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+      return applyAndEndAction(causer, x, y);
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::undoAction(AbstractEventDispatcher * /*causer*/, int, int)
+{
+  if (rubberbandIsAlive())
+  {
+    if (!Rubberband::_internal->_handleList.empty())
+    {
+      if (isEnabledConstructionState())
+      {
+        Rubberband::_internal->_handleList.pop_back();
+        if (!_internal->_ellipseHandleList.empty())
+          _internal->_ellipseHandleList.pop_back();
+
+        if (_internal->_previewEllipse)
+          _internal->_previewEllipse->setVisibility(false);
+
+        update();
+        activateButtons();
+      }
+    }
+    return true;
+  }
+  return false;
+}
+
+bool RubberbandMultiEllipseFeature::applyAndEndAction(AbstractEventDispatcher *causer, int x, int y)
+{
+  if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+    Rubberband::applyAndEndAction(causer, x, y);
+  else abortAction(causer, x, y);
+  return true;
+}
+
+void RubberbandMultiEllipseFeature::constrainQuadratic(bool on)
+{
+  _internal->_constrainQuadratic = on;
+}
+
+void RubberbandMultiEllipseFeature::activateButtons()
+{
+  _baseInternal->_hasUndoButton   = isEnabledConstructionState();
+  _baseInternal->_applyIsPossible = ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount);
+  _baseInternal->_undoIsPossible  = (isEnabledConstructionState() && ((unsigned int)Rubberband::_internal->_handleList.size() > _minimumPointCount));
+
+  Rubberband::activateButtons();
+}
+
+void RubberbandMultiEllipseFeature::update()
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " START";
+
+  Rubberband::update();
+
+  // update _ellipseHandleList according _handleList: (context modification)
+
+  RubberbandHandle::RubberbandCoordinate centerCoord;
+  if (!Rubberband::_internal->_handleList.isEmpty())
+  {
+    RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+    centerCoord = handlePointPtr->getCoordinate();
+  }
+
+  //
+  // adjust EllipseHandles according size, selection, zOrder:
+  //
+  RubberbandPointHandle *selectedHandlePointPtrNotCenter{nullptr};
+  int handleIdxMax = 0;
+  const int handleListSize = Rubberband::_internal->_handleList.size();
+  for (int handleIdx=0; handleIdx < handleListSize; ++handleIdx)
+  {
+    if (handleIdx >= Rubberband::_internal->_handleList.size())
+      continue;
+
+    handleIdxMax = handleIdx;
+
+    RubberbandPointHandle *pointHandle = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList[handleIdx].get());
+    if (!pointHandle)
+      continue;
+
+    if (pointHandle->isSelected() && handleIdx>0)
+      selectedHandlePointPtrNotCenter = pointHandle;
+
+    if (handleIdx==0)
+      continue;
+
+    // --- now we have finished the first iteration ---
+
+    // 2 pointHandles are required for an elli:
+    SituationMap::RefPointer<RubberbandEllipseHandle> ellipseHandle = _internal->_ellipseHandleList[handleIdx-1];
+    if (!ellipseHandle)
+      continue;
+
+    const RubberbandHandle::RubberbandCoordinate &curCoord = pointHandle->getCoordinate();
+    qreal distX = fabs(curCoord._mapCoordinate.x() - centerCoord._mapCoordinate.x());
+    qreal distY = fabs(curCoord._mapCoordinate.y() - centerCoord._mapCoordinate.y());
+    if (_internal->_constrainQuadratic)
+      distX = distY = std::max(distX, distY);
+
+    if (isSectorEnabled())
+    {
+      // _internal->_sectorOStart + _internal->_oVec
+      QPointF sectorStartRotated = getRotatedPoint(_internal->_sectorOStart);
+      QPointF sectorEndRotated   = getRotatedPoint(_internal->_sectorOEnd);
+
+      ellipseHandle->setRect(centerCoord, distX, distY, 0, 1, sectorStartRotated, sectorEndRotated);
+    }
+    else
+      ellipseHandle->setRect(centerCoord, distX, distY, 0, 1);
+
+    // transfer selection:
+    ellipseHandle->setSelection(pointHandle->isSelected());
+
+    // update zOrder
+    ellipseHandle->setZValue(handleListSize-handleIdx);
+
+  } // for
+
+  // Maybe there has ist one RubberbandPointHandle deleted (deleteAction)
+  // remove superfluous ellipse handles
+  // like: 2 RubberbandPointHandle (handleIdxMax==1) -> 1 RubberbandEllipseHandle
+  while (_internal->_ellipseHandleList.size() > handleIdxMax)
+    _internal->_ellipseHandleList.removeLast();
+
+  if (selectedHandlePointPtrNotCenter)
+    updateFrameHandle(selectedHandlePointPtrNotCenter->getCoordinate()._sceneCoordinate);
+
+  // transfer selection:
+  if (_internal->_frameHandle && selectedHandlePointPtrNotCenter)
+    _internal->_frameHandle->setSelection( selectedHandlePointPtrNotCenter->isSelected() );
+
+  updateSectorHandles();
+  updateRotationHandle();
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " END";
+}
+
+
+void RubberbandMultiEllipseFeature::updateFrameHandle(const QPointF &sceneCoordinate)
+{
+  const RubberbandDrawable::RubberbandCoordinate vertex(Rubberband::_internal->_mapView, sceneCoordinate);
+
+  if (//isEnabledModificationState() &&
+      (!vertex.isNull()) &&
+      !Rubberband::_internal->_handleList.isEmpty()
+      )
+  {
+    if (!_internal->_frameHandle)
+    {
+      _internal->_frameHandle = SituationMap::RefPointer<RubberbandFrameHandle>(new RubberbandFrameHandle(Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, _frameHandleMargin));
+      _internal->_frameHandle->setSelectable(false);
+
+      _internal->_frameHandle->setDrawColor(_frameColor);
+      _internal->_frameHandle->setFillColor(_frameFillColor);
+      _internal->_frameHandle->setSelectionColor(_frameSelectionColor);
+      _internal->_frameHandle->updateFrameSceneMargin(_frameHandleMargin);
+      _internal->_frameHandle->drawDisabled((_frameHandleMargin < 0));
+    }
+  } else {
+    _internal->_frameHandle = nullptr;
+  }
+
+  if (_internal->_frameHandle)
+  {
+    const RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+    if (!handlePointPtr)
+      return;
+
+    const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointPtr->getCoordinate();
+    qreal radiusX, radiusY;
+    if (!getRadiusXY(sceneCoordinate, radiusX, radiusY))
+      return;
+
+    if (_internal->_constrainQuadratic)
+      radiusX = radiusY = std::max(radiusX, radiusY);
+
+    RubberbandHandle::RubberbandCoordinate rcNewCorner1(Rubberband::_internal->_mapView,
+                                                        Esri::ArcGISRuntime::Point(mapCenter._mapCoordinate.x()+(radiusX),
+                                                                                   mapCenter._mapCoordinate.y()+(radiusY),
+                                                                                   mapCenter._mapCoordinate.spatialReference()));
+
+    RubberbandHandle::RubberbandCoordinate rcNewCorner2(Rubberband::_internal->_mapView,
+                                                         Esri::ArcGISRuntime::Point(mapCenter._mapCoordinate.x()-(radiusX),
+                                                                                    mapCenter._mapCoordinate.y()-(radiusY),
+                                                                                    mapCenter._mapCoordinate.spatialReference()));
+
+    _internal->_frameHandle->updateFrameShape({rcNewCorner1, rcNewCorner2});
+  }
+}
+
+void RubberbandMultiEllipseFeature::getSceneRotation(qreal &sinA, qreal &cosA) const
+{
+  sinA = -_internal->_oVec.y();
+  cosA =  _internal->_oVec.x();
+}
+
+Esri::ArcGISRuntime::Point addOffsetToMapCoordinate(const Esri::ArcGISRuntime::Point &mapCoordinate,
+                                                    const QPointF &offset)
+{
+  return Esri::ArcGISRuntime::Point(mapCoordinate.x() + offset.x(),
+                                    mapCoordinate.y() + offset.y(),
+                                    mapCoordinate.spatialReference());
+
+}
+
+void RubberbandMultiEllipseFeature::updateSectorHandles()
+{
+   if (Rubberband::_internal->_handleList.isEmpty())
+     return;
+
+   if ((unsigned int)Rubberband::_internal->_handleList.size() < _minimumPointCount)
+     return;
+
+   if (!isSectorEnabled())
+     return;
+
+   auto ellipse = []( qreal a, qreal b, qreal sinA, qreal cosA ) -> QPointF
+   {
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       *
+       * Qt does not use the paramater equation of a ellipse to draw sectors. Instead of a simpler term
+       * is used. For simpleness we use the same of.
+       *
+      qreal    e2   = 1 - (b*b) / (a*a);
+      qreal    cos2 = cosA * cosA;
+      qreal    f    = b / sqrt(1-e2*cos2);
+      return QPointF( f*cosA, f*sinA );
+      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+      return QPointF(a*cosA,b*sinA);
+   };
+
+   auto rotate = [] ( const QPointF & p, qreal sinA, qreal cosA ) -> QPointF { return QPointF( p.x()*cosA - p.y()*sinA, p.y()*cosA + p.x()*sinA ); };
+
+
+   const QPointF &biggestRadius = getBiggestRadius();
+
+   qreal   a      = biggestRadius.x(); // getWidth()  * 0.5;
+   qreal   b      = biggestRadius.y(); // getHeight() * 0.5;
+   QPointF startP = ellipse(a,b,_internal->_sectorOStart.y(),_internal->_sectorOStart.x() );
+   QPointF endP   = ellipse(a,b,_internal->_sectorOEnd.y()  ,_internal->_sectorOEnd.x()   );
+
+   qreal sinRect = 0;
+   qreal cosRect = 1;
+
+   getSceneRotation(sinRect, cosRect);
+
+   startP = rotate(startP, sinRect, cosRect) ; // + getCenter();
+   endP   = rotate(  endP, sinRect, cosRect) ; // + getCenter();
+
+   RubberbandPointHandle *handlePointCenter = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+   if (!handlePointCenter)
+     return;
+   const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointCenter->getCoordinate();
+
+   //   const Esri::ArcGISRuntime::Point &mapStartP = convert( startP, Rubberband::_internal->_mapView->map()->spatialReference() );
+   //   const Esri::ArcGISRuntime::Point &mapEndP   = convert(   endP, Rubberband::_internal->_mapView->map()->spatialReference() );
+   const Esri::ArcGISRuntime::Point &mapStartP = addOffsetToMapCoordinate(mapCenter._mapCoordinate, startP);
+   const Esri::ArcGISRuntime::Point &mapEndP   = addOffsetToMapCoordinate(mapCenter._mapCoordinate, endP);
+
+   if (!_internal->_sectorStartHandle.valid())
+     _internal->_sectorStartHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapStartP );
+   else
+     _internal->_sectorStartHandle->setCoordinate( RubberbandHandle::RubberbandCoordinate(Rubberband::_internal->_mapView, mapStartP) );
+
+   _internal->_sectorStartHandle->setVisibility((!isSectorFixedAngeEnabled())/*_internal->_sectorEnabled*/);
+   _internal->_sectorStartHandle->setDrawColor(Qt::red);
+   _internal->_sectorStartHandle->setFillColor( _handleFillColor );
+   _internal->_sectorStartHandle->setSelectionColor(_handleSelectionColor);
+   _internal->_sectorStartHandle->setSelectable(true);
+
+   if (!_internal->_sectorEndHandle.valid())
+     _internal->_sectorEndHandle = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapEndP );
+   else
+     _internal->_sectorEndHandle->setCoordinate( RubberbandHandle::RubberbandCoordinate(Rubberband::_internal->_mapView, mapEndP) );
+
+   _internal->_sectorEndHandle->setVisibility(!isSectorFixedAngeEnabled()/*_internal->_sectorEnabled*/);
+   _internal->_sectorEndHandle->setDrawColor(Qt::red);
+   _internal->_sectorEndHandle->setFillColor( _handleFillColor );
+   _internal->_sectorEndHandle->setSelectionColor(_handleSelectionColor);
+   _internal->_sectorEndHandle->setSelectable(true);
+}
+
+void RubberbandMultiEllipseFeature::updateRotationHandle()
+{
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " START"
+                                            << ", isSectorFixedAngeEnabled()=" << isSectorFixedAngeEnabled()
+                                            << ", _handleList.size=" << Rubberband::_internal->_handleList.size();
+
+  if (!isSectorEnabled() || !isSectorFixedAngeEnabled() || (Rubberband::_internal->_handleList.size()<2))
+  {
+    _internal->_rotationHandle = nullptr;    // destroy
+  }
+  else
+  {
+    static QPixmap *s_icon = nullptr;
+    if (!s_icon)
+      s_icon = new QPixmap( QPixmap( winkelIcon_xpm ).transformed(QTransform::fromScale(0.5,0.5)) );
+
+    if (!_internal->_rotationHandle)
+    {
+      _internal->_rotationHandleSize = std::max( s_icon->width(), s_icon->height() ) * 0.5;
+
+      _internal->_rotationHandle = new RubberbandPointHandle(Rubberband::_internal->_mapView
+                                                             , Rubberband::_internal->_mapScene
+                                                             , QPointF(100, 100) // , _internal->getScenePositionRotationHandle(),
+                                                             , *s_icon );
+
+      _internal->_rotationHandle->setDrawColor(_handleDrawColor);
+      _internal->_rotationHandle->setFillColor(_handleFillColor);
+      _internal->_rotationHandle->setSelectionColor(_handleSelectionColor);
+    }
+
+    _internal -> _rotationHandle->setSceneOffset(getSceneOffsetRotationHandle( (_frameHandleMargin > 0) ? _frameHandleMargin : 0 ) );
+    _internal -> _rotationHandle->updateCoordinate(getScenePositionRotationHandle());
+  }
+  DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION << " END";
+}
+
+QPointF RubberbandMultiEllipseFeature::getScenePositionRotationHandle() const
+{
+  if (Rubberband::_internal->_handleList.size()<2)
+    return {};
+
+  RubberbandPointHandle *handlePointCenter = dynamic_cast<RubberbandPointHandle *>(Rubberband::_internal->_handleList.first().get());
+  if (!handlePointCenter)
+    return {};
+  const RubberbandHandle::RubberbandCoordinate &mapCenter = handlePointCenter->getCoordinate();
+
+  const QPointF &biggestRadius = getBiggestRadius();
+
+  Esri::ArcGISRuntime::Point handlePosPoint(mapCenter._mapCoordinate.x() + 0,
+                                            mapCenter._mapCoordinate.y() + biggestRadius.y(),
+                                            mapCenter._mapCoordinate.spatialReference());
+
+  RubberbandHandle::RubberbandCoordinate handlePos(Rubberband::_internal->_mapView, handlePosPoint);
+
+  QPointF scenePoint (handlePos._sceneCoordinate);
+  scenePoint.ry() -= _internal->_rotationHandleSize; // keep center of sceneCoordSystem in mind
+
+  qreal sinRect = 0;
+  qreal cosRect = 1;
+  getSceneRotation(sinRect, cosRect);
+
+  scenePoint = MathUtils::rotate(scenePoint, mapCenter._sceneCoordinate, -sinRect, cosRect);  // be carefull the scene coordinate system is contra clockwise -- sinA must be negated
+
+  return scenePoint;
+}
+
+QPointF RubberbandMultiEllipseFeature::getSceneOffsetRotationHandle(qreal margin)
+{
+  qreal sinPhi = _internal->_oVec.y(); // * _mapOVec.x() + _oVec.x() * _mapOVec.y(); // Addition-Theorem
+  qreal cosPhi = _internal->_oVec.x(); // * _mapOVec.x() - _oVec.y() * _mapOVec.y();
+  return  rotateVertex( QPointF(0,0),  0.0,-(margin+_internal->_rotationHandleSize), sinPhi, cosPhi );
+}
+
+
+}
+} // namespace SituationMap::RB
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.h
new file mode 100755
index 000000000..4d80e0e42
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_ellipse_feature.h
@@ -0,0 +1,254 @@
+/**
+  * @RDE_HEADER@
+  * Rubberband class to define multiple ellipse/circle
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include "rubberband.h"
+
+
+namespace SituationMap
+{
+namespace RB
+{
+class RubberbandHandle;
+class RubberbandFrameHandle;
+class DrawableEllipse;
+
+/**
+  @class RubberbandMultiEllipseFeature rubberband_multi_circle_feature.h
+  @brief Implementation of a rubberband to input multi point features, like areals or linears
+  @see Rubberband
+*/
+class SITUATIONMAP_EXPORT RubberbandMultiEllipseFeature : public Rubberband
+{
+  Q_OBJECT
+public:
+
+  /**
+     @name Construction & Destruction
+     @{
+  */
+
+private:
+
+  friend class RubberbandFactory;
+  friend class RubberbandArrow;
+  friend class RubberbandCorridor;
+  friend class RubberbandPolylineWidth;
+  friend class RubberbandSmoothLine;
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Constructor delegation doesn't work with Visual Studio 2013
+
+    explicit RubberbandMultiEllipseFeature(  SituationMap::Map * map );
+    explicit RubberbandMultiEllipseFeature(  SituationMap::Map * map, bool complexGeometry );
+   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  /**
+    Construction of RubberbandMultiEllipseFeature in most common cases. The parameter parent is
+    optional.
+   */
+  explicit RubberbandMultiEllipseFeature(SituationMap::Map *map, QObject *parent = nullptr);
+
+  /**
+    Construction of RubberbandMultiEllipseFeature in case of controlling complex geometry objects, like
+    splines or multi point symbols. In this case set complexGeometry true.
+  */
+  explicit RubberbandMultiEllipseFeature(SituationMap::Map *map, bool complexGeometry, QObject *parent = nullptr);
+
+public:
+
+  ~RubberbandMultiEllipseFeature();
+  /** @} */
+
+  bool selectAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool setCoordinateAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool moveAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool movePickedAction(AbstractEventDispatcher *causer, int x, int y) override;
+  void resetAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool contextMenuAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool completeStateAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool deleteAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool undoAction(AbstractEventDispatcher *causer, int x, int y) override;
+  bool applyAndEndAction(AbstractEventDispatcher *causer, int x, int y) override;
+
+  /**
+    * @brief If set to true only quadratic rectangles can be created.
+    */
+ void constrainQuadratic( bool on );
+
+
+  /**
+     @name Setting Constrains
+     @{
+  */
+
+  /**
+    Defines minimum count of verticies that has to be defined by users input to complete the rubberband with apply signal. The default value is 2.
+   */
+  inline void minimumRadiusCount(unsigned int x)
+  {
+    _minimumPointCount = x+1;
+  }
+
+
+  /**
+    Defines maximum count of verticies that can be aceppted by the rubberband. A values of 0 stands for undefined. The default is 0.
+  */
+  inline void maximumRadiusCount(unsigned int x)
+  {
+    _maximumPointCount = x+1;
+  }
+
+
+  /**
+    Defines the maximum length of a segment (distance between to adjaced verticies). A value of 0 stands for no limit is set. The default is 0.
+   */
+  inline void maximumSegmentLength(qreal x) { _maximumSegmentLength = (x > 0) ? x : 0.0; }
+  inline qreal getMaximumSegmentLength() const { return _maximumSegmentLength; }
+
+  /**
+    Defines the maximum length of the complete polyline. \c enableClosed must be set to false. A value of 0 stands for no limit is set. The default is 0.
+  */
+  inline void maximumLength(qreal x)        { _maximumLength        = (x > 0) ? x : 0.0; }
+  /** @} */
+  inline qreal getMaximumLength() const       { return _maximumLength; }
+
+
+  QPointF centerCoordinate(CoordinateSystem cs = CoordinateSystem::Geo) const;
+
+  /**
+   * @brief radii get vector of radius (QPointF containing radiusX and radius Y in meter)
+   * @return radii
+   */
+  QVector<QPointF> radii() const;
+  QPointF  getBiggestRadius() const;
+
+
+  struct RadiusWithContraints
+  {
+    // to be able to supply int, avoid explicit:
+    RadiusWithContraints(double radius = 0.0, double minRadius = 0.0, double maxRadius = 0.0)
+      : m_radius(radius),
+        m_minRadius(minRadius),
+        m_maxRadius(maxRadius)
+    {}
+    double m_radius{0};
+    double m_minRadius{0};
+    double m_maxRadius{0};
+  };
+
+  bool setCenterAndRadii(const QPointF &center, CoordinateSystem cs, const QVector<QPointF> &radii); // no constraints
+
+  bool setCenterAndRadii2(const QPointF &center, CoordinateSystem cs,
+                         const QVector<RubberbandMultiEllipseFeature::RadiusWithContraints> &radiiWithConstraints);
+
+  void prepareFixedNumberOfRadiiWithConstraints(const QVector<RubberbandMultiEllipseFeature::RadiusWithContraints> &radiiContraints);
+
+
+  // get SectorStartEnd
+  QPointF getRotatedPoint(const QPointF &sector)const;
+
+
+  void enableSector(bool on);
+  bool isSectorEnabled() const;
+
+  /**
+   * @brief sectorStart in mathematical sense (starts counter-clockwise from 3 o'clock)
+   * @return sectorStart
+   */
+  QPointF sectorStart() const;
+
+  qreal sectorStartDegMath() const;  // in mathematical sense (starts counter-clockwise from 3 o'clock)
+
+  /**
+   * @brief sectorEnd in mathematical sense (starts counter-clockwise from 3 o'clock)
+   * @return sectorEnd
+   */
+  QPointF sectorEnd()   const;
+
+  qreal sectorEndDegMath() const;  // in mathematical sense (starts counter-clockwise from 3 o'clock)
+
+  void setSectorStart(qreal sinPhi, qreal cosPhi);
+  void setSectorEnd(qreal sinPhi, qreal cosPhi);
+
+  void setSectorAngleFixed(bool on); // true: start and end sectors positon can't be modifed
+  bool isSectorFixedAngeEnabled() const;
+
+
+  virtual QVector<QPointF> coordinateVector(CoordinateSystem cs = CoordinateSystem::Geo) const override;
+  virtual QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+  virtual void setCoordinateVector(const QVector<QPointF> &, CoordinateSystem cs = CoordinateSystem::Geo) override;
+
+signals:
+
+  /**
+  The signal will be emitted, when the mouse cursor has changed and the rubberband is in construction mode and is accepting new input coordinates.
+  */
+  void currentCursorPositionChanged(const Point3D &mapCoord);
+
+
+protected:
+
+  /*
+     Forward declaration of InternalData to hold private member variables. Be careful the base class Rubberband
+     has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+   */
+  struct InternalData;
+
+  InternalData    *_internal;
+
+  bool             _isClosed{false};
+
+  unsigned int     _minimumRadius = 0;
+  unsigned int     _maximumRadius = 0;
+
+  unsigned int     _minimumPointCount{2}; // 2 Punkte == 1 Kreis
+  unsigned int     _maximumPointCount{0};
+
+  qreal            _maximumSegmentLength;
+  qreal            _maximumLength;
+
+  void activateButtons() override;
+
+  void update() override;
+  void updateFrameHandle(const QPointF &sceneCoordinate); // Unfortunately, RubberbandCoordinate can´t be forwarded, so use sceneCoordinate
+
+  void getSceneRotation(qreal &sinA, qreal &cosA) const;
+  void updateSectorHandles();
+
+  void updateRotationHandle();
+  QPointF getScenePositionRotationHandle() const;
+  QPointF getSceneOffsetRotationHandle(qreal margin);
+
+
+  // some helper methodes
+  bool getRadiusXY(const QPointF &scenePos, qreal &radiusX_out, qreal &radiusY_out);
+
+  RubberbandHandle *constructPoint(const QPointF &scenePos);
+  void constructPoint(const QPointF &point, CoordinateSystem cs);
+
+  bool selectHandles(int x, int y, const QPointF &scenePos);
+  void updateHandles(const QPointF &scenePos, const QPointF &deltaMove);
+
+  bool checkLengthConstrains(unsigned int checkHandleIdx, const QPointF &scenePos);
+  bool checkLengthConstrains(const QPointF &scenePos, const QPointF &deltaScenePos);
+
+
+  bool checkMinMaxRadiusConstraint(const QPointF &curScenePos);
+  bool checkMinMaxRadiusConstraint(qreal radiusX, qreal radiusY, int idxOfConstraint = -1);
+
+  void updatePreviewEllipse(const QPointF &scenePosition);
+
+  RubberbandFrameHandle *getFrameHandle() const;
+
+}; /* RubberbandMultiEllipseFeature */
+
+}
+} /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.cpp
new file mode 100755
index 000000000..329ab7780
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.cpp
@@ -0,0 +1,1137 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define multi point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_multi_point_feature.h"
+#include "rubberband_frame_handle.h"
+#include "rubberband_line_handle.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+#include "rubberband_handle_proxy.h"
+#include "drawable_line.h"
+#include "drawable_painter_path.h"
+#include "transient_tactical_symbol.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <Map.h>
+
+#include <QtCore/QMetaMethod>
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandMultiPointFeature::InternalData
+   {
+         Q_DISABLE_COPY(InternalData)
+
+         QList<SituationMap::RefPointer<RubberbandLineHandle>> _lineHandleList;
+         SituationMap::RefPointer<RubberbandFrameHandle>       _frameHandle;
+
+         SituationMap::RefPointer<DrawablePainterPath>         _fillPath;
+         SituationMap::RefPointer<DrawableLine>                _cursorPreviewLine;
+         SituationMap::RefPointer<DrawableLine>                _cursorPreviewCloseLine;
+         SituationMap::RefPointer<TransientTacticalSymbol>     _previewSymbol;
+
+         bool                                                  _complexGeometry;
+         bool                                                  _addVertexAtEnd;
+         bool                                                  _showCursorPreviewLine;
+         double                                                _checkMaxAngle;
+
+         InternalData(  QGraphicsScene * scene, bool complexGeometry )
+            : _lineHandleList()
+            , _frameHandle()
+            , _fillPath()
+            , _cursorPreviewLine()
+            , _cursorPreviewCloseLine()
+            , _previewSymbol()
+            , _complexGeometry(complexGeometry)
+            , _addVertexAtEnd(false)
+            , _showCursorPreviewLine(false)
+            , _checkMaxAngle(0.0)
+         {
+            Q_UNUSED(scene);
+         } /* InternalData */
+   }; /* RubberbandMultiPointFeature::InternalData */
+
+    RubberbandMultiPointFeature::RubberbandMultiPointFeature(  SituationMap::Map * map, QObject * parent )
+      : RubberbandMultiPointFeature(map, false, parent)
+    {
+    } /* RubberbandMultiPointFeature::RubberbandMultiPointFeature */
+
+
+    RubberbandMultiPointFeature::RubberbandMultiPointFeature( SituationMap::Map * map, bool complexGeometry, QObject * parent )
+      : Rubberband(map,parent)
+      , _internal(new InternalData(Rubberband::_internal->_mapScene, complexGeometry))
+      , _isClosed(false)
+      , _minimumPointCount(2)
+      , _maximumPointCount(0)
+      , _maximumSegmentLength(0.0)
+      , _maximumLength(0.0)
+   {
+   } /* RubberbandMultiPointFeature::RubberbandMultiPointFeature */
+
+
+   RubberbandMultiPointFeature::~RubberbandMultiPointFeature()
+   {
+      delete _internal;
+   } /* RubberbandMultiPointFeature::~RubberbandMultiPointFeature */
+
+
+   void RubberbandMultiPointFeature::setCheckMaxAngle(double phi)
+   {
+      _internal->_checkMaxAngle = ((phi > 0.0) && (phi < M_PI)) ? phi : 0.0;
+ 
+   } // RubberbandMultiPointFeature::setCheckMaxAngle
+
+
+   RubberbandFrameHandle * RubberbandMultiPointFeature::getFrameHandle() const { return _internal->_frameHandle.get(); }
+
+
+   QVector<QPointF> RubberbandMultiPointFeature::coordinateVector( CoordinateSystem cs ) const
+   {
+      QVector<QPointF> coordinateVector;
+      coordinateVector.reserve(Rubberband::_internal->_handleList.size());
+
+      for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+      {
+         RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+         coordinateVector.push_back(projectCoordinateFromMap( cs, handlePointPtr->getCoordinate()._mapCoordinate ));
+      }
+      return coordinateVector;
+   } /* RubberbandMultiPointFeature::coordinateVector */
+
+
+   QPointF RubberbandMultiPointFeature::singleCoordinate(unsigned int idx, CoordinateSystem cs ) const
+   {
+      if (idx < (unsigned int)Rubberband::_internal->_handleList.size())
+      {
+         const RubberbandPointHandle * handle = dynamic_cast<const RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx].get());
+
+         return projectCoordinateFromMap( cs, handle->getCoordinate()._mapCoordinate );
+      }
+      return QPointF();
+   } /* RubberbandMultiPointFeature::singleCoordinate */
+
+
+   void RubberbandMultiPointFeature::setCoordinateVector(const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      Rubberband::_internal->_handleList.clear();
+
+      for (const auto &p : coordinateVector)
+      {
+         constructPoint( p, cs );
+      }
+      enableModificationState();
+      update();
+      activateButtons();
+   } /* RubberbandMultiPointFeature::setCoordinateVector */
+
+
+   void RubberbandMultiPointFeature::constructPoint( const QPointF &point, CoordinateSystem cs )
+   {
+      const QPointF &mapPos = projectCoordinateToMap( cs, point );
+
+      RubberbandHandle::RubberbandCoordinate coordinate( Rubberband::_internal->_mapView, convert(mapPos, Rubberband::_internal->_mapView->map()->spatialReference()) );
+      RubberbandHandle * handlePtr = constructPoint( coordinate._sceneCoordinate );
+      if (handlePtr)
+      {
+         static_cast<RubberbandPointHandle*>(handlePtr)->setCoordinate( coordinate );
+         handlePtr->setSelection(false);
+      }
+   } /* RubberbandMultiPointFeature::constructPoint */
+
+
+   RubberbandHandle * RubberbandMultiPointFeature::constructPoint( QPointF scenePos )
+   {
+      RubberbandHandle * handlePtr;
+
+      if (!Rubberband::_internal->_handleList.empty())
+      {
+         handlePtr = Rubberband::_internal->_handleList.last().get();
+
+         if (handlePtr)
+         {
+            const RubberbandHandle::RubberbandCoordinate && lastPos = static_cast<RubberbandPointHandle*>(handlePtr)->getCoordinate();
+
+            if (isClosedEnabled())
+            {
+               handlePtr = Rubberband::_internal->_handleList.first().get(); // get pointer to first point
+
+               if ((unsigned int)Rubberband::_internal->_handleList.size() == 2)
+               {
+                  const RubberbandHandle::RubberbandCoordinate && firstPos = static_cast<RubberbandPointHandle*>(handlePtr)->getCoordinate();
+
+                  // create line from first point of polyline to new point to close the polyline
+                  handlePtr  = new RubberbandLineHandle( Rubberband::_internal->_mapView
+                                                       , Rubberband::_internal->_mapScene
+                                                       , scenePos
+                                                       , firstPos._sceneCoordinate
+                                                       , _lineHandleWidth
+                                                       , _internal->_complexGeometry );
+                  _internal->_lineHandleList.insert( 0,  SituationMap::RefPointer<RubberbandLineHandle>(static_cast<RubberbandLineHandle*>(handlePtr)) );
+               }
+               else if ((unsigned int)Rubberband::_internal->_handleList.size() > 2)
+               {
+                  // update coordinates
+                  handlePtr = _internal->_lineHandleList.first().get(); // get pointer to first line handle
+                  static_cast<RubberbandLineHandle*>(handlePtr)->updateCoordinate(0,scenePos);
+               }
+            }
+
+            // create line from last point to new point
+            handlePtr  = new RubberbandLineHandle( Rubberband::_internal->_mapView
+                                                 , Rubberband::_internal->_mapScene
+                                                 , lastPos._sceneCoordinate
+                                                 , scenePos
+                                                 , _lineHandleWidth
+                                                 , _internal->_complexGeometry );
+            _internal->_lineHandleList.append( SituationMap::RefPointer<RubberbandLineHandle>(static_cast<RubberbandLineHandle*>(handlePtr)) );
+         }
+      }
+
+      handlePtr  = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, scenePos );
+      handlePtr -> setSelection();
+
+      Rubberband::_internal->_handleList.append( SituationMap::RefPointer<RubberbandHandle>(handlePtr) );
+
+      if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+      {
+         activateButtons();
+      }
+
+      if ((!_maximumPointCount) || ((unsigned int)Rubberband::_internal->_handleList.size() < _maximumPointCount))
+      {
+         if (!_internal->_cursorPreviewLine) _internal->_cursorPreviewLine = new DrawableLine( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene );
+         if ((isClosedEnabled()) && (!_internal->_cursorPreviewCloseLine))
+         {
+            _internal->_cursorPreviewCloseLine = new DrawableLine( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene );
+         }
+         _internal->_cursorPreviewLine -> setVisibility( true );
+         if (_internal->_cursorPreviewCloseLine) _internal -> _cursorPreviewCloseLine -> setVisibility( true );
+      }
+      else
+      {
+         _internal->_cursorPreviewLine      = nullptr;
+         _internal->_cursorPreviewCloseLine = nullptr;
+      }
+      return handlePtr;
+   } /* RubberbandMultiPointFeature::constructPoint */
+
+
+
+   bool RubberbandMultiPointFeature::checkLengthConstrains( const QPointF & scenePos, const QPointF & deltaScenePos )
+   {
+      if (_internal->_complexGeometry) 
+      {
+        markFailedConstrains( QPointF(), false );
+        return true;
+      }
+
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * Checking constrains for moving selected coordinates (handles)
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+      bool                                            allHandlesSelected = true;
+      QVector<RubberbandHandle::RubberbandCoordinate> coordinateVector;
+
+      coordinateVector.reserve( Rubberband::_internal->_handleList.size() );
+
+      for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+      {
+         RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+         if (handlePointPtr)
+         {
+            coordinateVector.append(handlePointPtr->getCoordinate());
+            if (handlePointPtr->isSelected())
+            {
+               RubberbandHandle::RubberbandCoordinate & coordinate = coordinateVector.back();
+               coordinate.updateSceneCoordinate( Rubberband::_internal->_mapView , coordinate._sceneCoordinate + deltaScenePos );
+            }
+            else allHandlesSelected = false;
+         }
+      }
+
+      if ((allHandlesSelected) || ((_internal->_frameHandle) && (_internal->_frameHandle->isSelected()))) 
+      {
+         markFailedConstrains( QPointF(), false );
+         return true;
+      }
+
+      if (_internal->_checkMaxAngle > 0.0)
+      {
+         // Check angle of line segments first
+
+         for (int i = 2; i < coordinateVector.size(); ++i)
+         {
+            const RubberbandHandle::RubberbandCoordinate & p1 = coordinateVector[i - 2];
+            const RubberbandHandle::RubberbandCoordinate & p2 = coordinateVector[i - 1];
+            const RubberbandHandle::RubberbandCoordinate & p3 = coordinateVector[i];
+
+            // build tangent vectors
+            QPointF t1 = QPointF(p2._mapCoordinate.x() - p1._mapCoordinate.x(), p2._mapCoordinate.y() - p1._mapCoordinate.y());
+            QPointF t2 = QPointF(p3._mapCoordinate.x() - p2._mapCoordinate.x(), p3._mapCoordinate.y() - p2._mapCoordinate.y());
+            double  l1 = sqrt(t1.x()*t1.x() + t1.y()*t1.y());
+            double  l2 = sqrt(t2.x()*t2.x() + t2.y()*t2.y());
+
+            if (qFuzzyIsNull(l1) || qFuzzyIsNull(l2))
+            {
+              continue;
+            }
+
+            t1 /= l1;
+            t2 /= l2;
+
+            double phi = acos(t1.x()*t2.x() + t1.y()*t2.y());
+            if (phi > _internal->_checkMaxAngle)
+            {
+              markFailedConstrains(scenePos, true);
+              return false;
+            }
+         }
+      }
+
+
+      if ((!isClosedEnabled()) && (_maximumLength > 0.0))
+      {
+         qreal totalLength                              = 0.0;
+         const Esri::ArcGISRuntime::Point * mapPointPtr = nullptr;      // Check Quartz
+
+         for (int i = 0; i < coordinateVector.size(); ++i)
+         {
+            const RubberbandHandle::RubberbandCoordinate & coordinate = coordinateVector[i];
+            if (mapPointPtr)
+            {
+               qreal x = coordinate._mapCoordinate.x() - mapPointPtr->x();
+               qreal y = coordinate._mapCoordinate.y() - mapPointPtr->y();
+
+               totalLength += sqrt(x*x+y*y);
+            }
+            mapPointPtr = &coordinateVector.at(i)._mapCoordinate;
+         }
+         if (totalLength > _maximumLength)
+         {
+           markFailedConstrains( scenePos, true );
+           return false;
+         }
+      }
+
+      const RubberbandHandle::RubberbandCoordinate * mapPointPtr  = nullptr;
+      bool                                           lastSelected = false;
+      auto                                           handleIter   = Rubberband::_internal->_handleList.constBegin();
+      
+      for (int i = 0; i < coordinateVector.size(); ++i)
+      {
+         const RubberbandHandle::RubberbandCoordinate & coordinate = coordinateVector[i];
+         bool                                           isSelected = (*handleIter)->isSelected();
+
+         if ((isSelected || lastSelected) && (mapPointPtr))
+         {
+            if ((!isClosedEnabled()) && (_maximumSegmentLength > 0.0))
+            {
+               qreal x = coordinate._mapCoordinate.x() - mapPointPtr->_mapCoordinate.x();
+               qreal y = coordinate._mapCoordinate.y() - mapPointPtr->_mapCoordinate.y();
+
+               if (sqrt(x*x+y*y) > _maximumSegmentLength)
+               {
+                 markFailedConstrains( scenePos, true );
+                 return false;
+               }
+            }
+            // looking for identical coordinate with last point
+            qreal x = coordinate._sceneCoordinate.x() - mapPointPtr->_sceneCoordinate.x();
+            qreal y = coordinate._sceneCoordinate.y() - mapPointPtr->_sceneCoordinate.y();
+
+            if ((x*x + y*y) <= 1)
+            { 
+              markFailedConstrains( scenePos, true );
+              return false;
+            }
+         }
+         ++handleIter;
+         mapPointPtr  = &coordinateVector.at(i);
+         lastSelected = isSelected;
+      } // for
+
+      markFailedConstrains( QPointF(), false );
+      return true;
+   } /* RubberbandMultiPointFeature::checkLengthConstrains */
+
+
+   bool RubberbandMultiPointFeature::checkLengthConstrains( unsigned int checkHandleIdx,  QPointF & scenePos )
+   {
+      if (_internal->_complexGeometry) 
+      {
+        markFailedConstrains( QPointF(), false );
+        return true;
+      }
+
+      bool markFailedConstrainsFlag = false;
+
+      // calculate pixel size for later use
+
+      RubberbandDrawable::RubberbandCoordinate pi1( Rubberband::_internal->_mapView,scenePos );
+      RubberbandDrawable::RubberbandCoordinate pi2( Rubberband::_internal->_mapView,scenePos+QPointF(1,1) );
+
+      qreal piX       = pi2._mapCoordinate.x() - pi1._mapCoordinate.x();
+      qreal piY       = pi2._mapCoordinate.y() - pi1._mapCoordinate.y();
+      qreal pixelSize = sqrt(piX*piX+piY*piY);
+
+      /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       * Checking constrains for adding single coordinate at end of polyline
+       * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+      RubberbandHandle::RubberbandCoordinate mapPos( Rubberband::_internal->_mapView, scenePos );
+
+      if ((!Rubberband::_internal->_handleList.empty()) && (_maximumLength > 0.0) && (!isClosedEnabled()))
+      {
+         qreal                                                       totalLength = 0.0;
+         RubberbandHandle::RubberbandCoordinate                      mapPoint;
+
+         QList<SituationMap::RefPointer<RubberbandHandle>>::iterator it = Rubberband::_internal->_handleList.begin();
+
+         for (; it != Rubberband::_internal->_handleList.end(); ++it)
+         {
+            RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(it->get());
+            if (handlePointPtr)
+            {
+               if (it != Rubberband::_internal->_handleList.begin())
+               {
+                  qreal x = handlePointPtr->getCoordinate()._mapCoordinate.x() - mapPoint._mapCoordinate.x();
+                  qreal y = handlePointPtr->getCoordinate()._mapCoordinate.y() - mapPoint._mapCoordinate.y();
+
+                  totalLength += sqrt(x*x+y*y);
+               }
+               mapPoint = handlePointPtr->getCoordinate();
+            }
+         }
+         if (totalLength >= _maximumLength) 
+         {
+           markFailedConstrains( scenePos, true );
+           return false;
+         }
+
+         qreal x = mapPos._mapCoordinate.x() - mapPoint._mapCoordinate.x();
+         qreal y = mapPos._mapCoordinate.y() - mapPoint._mapCoordinate.y();
+         qreal l = sqrt(x*x+y*y);
+
+         qreal d = _maximumLength - totalLength - l - pixelSize;
+         if (d < 0.0)
+         {
+           qreal scale = (1.0 + d/l);
+           const Esri::ArcGISRuntime::Point newMapCoordinate(mapPoint._mapCoordinate.x() + x * scale,
+                                                             mapPoint._mapCoordinate.y() + y * scale,
+                                                             mapPos._mapCoordinate.spatialReference());
+           mapPos._mapCoordinate = newMapCoordinate;
+           markFailedConstrainsFlag = true;
+           scenePos = mapPos.mapToScene( Rubberband::_internal->_mapView );
+         }
+      }
+
+      if (checkHandleIdx <= (unsigned int)Rubberband::_internal->_handleList.size())
+      {
+         unsigned int                  handleListIdx  = Rubberband::_internal->_handleList.size()-checkHandleIdx;
+         const RubberbandPointHandle * handlePointPtr =  dynamic_cast<const RubberbandPointHandle*>(Rubberband::_internal->_handleList.at(handleListIdx).get());
+
+         if ((!isClosedEnabled()) && (_maximumSegmentLength > 0.0))
+         {
+            qreal x = mapPos._mapCoordinate.x() - handlePointPtr->getCoordinate()._mapCoordinate.x();
+            qreal y = mapPos._mapCoordinate.y() - handlePointPtr->getCoordinate()._mapCoordinate.y();
+            qreal l = sqrt(x*x+y*y);
+            qreal d = _maximumSegmentLength - l - pixelSize;
+
+            if (d < 0.0)
+            {
+              qreal scale = (1.0 + d/l);
+              const Esri::ArcGISRuntime::Point newMapCoordinate(handlePointPtr->getCoordinate()._mapCoordinate.x() + x * scale,
+                                                                handlePointPtr->getCoordinate()._mapCoordinate.y() + y * scale,
+                                                                mapPos._mapCoordinate.spatialReference());
+
+              mapPos._mapCoordinate = newMapCoordinate;
+              markFailedConstrainsFlag = true;
+              scenePos = mapPos.mapToScene( Rubberband::_internal->_mapView );
+            }
+         }
+         // looking for identical coordinate with last point
+         qreal x = handlePointPtr->getCoordinate()._sceneCoordinate.x() - scenePos.x();
+         qreal y = handlePointPtr->getCoordinate()._sceneCoordinate.y() - scenePos.y();
+
+         if ((x*x+y*y) <= 1)
+         { 
+            markFailedConstrains( scenePos, true );
+            return false;
+         }
+      }
+
+      markFailedConstrains( scenePos, markFailedConstrainsFlag );
+
+      return true;
+   } /* RubberbandMultiPointFeature::checkLengthConstrains */
+
+
+   bool RubberbandMultiPointFeature::selectHandles(int x, int y, const QPointF & scenePos)
+   {
+      bool               eventHandled = false;
+      RubberbandHandle * handlePtr    = pickHandle(x,y);
+
+      _internal -> _addVertexAtEnd = false;
+
+      if (handlePtr)
+      {
+         handlePtr->setSelection();
+         enableSelectedState();
+         eventHandled = true;
+      }
+      else
+      {
+         if ((_maximumPointCount < 1) || ((unsigned int)Rubberband::_internal->_handleList.size() < _maximumPointCount))
+         {
+            unsigned int lineCounter = 0;
+
+            for (auto lineHandle : qAsConst(_internal->_lineHandleList))
+            {
+               if (lineHandle->isSelected())
+               {
+                  lineHandle->setSelection(false);
+
+                  handlePtr  = new RubberbandLineHandle( Rubberband::_internal->_mapView
+                                                       , Rubberband::_internal->_mapScene
+                                                       , lineHandle->getCoordinate(0)._sceneCoordinate
+                                                       , scenePos
+                                                       , _lineHandleWidth
+                                                       , _internal->_complexGeometry );
+
+                  _internal->_lineHandleList.insert( lineCounter, SituationMap::RefPointer<RubberbandLineHandle>(static_cast<RubberbandLineHandle*>(handlePtr)) );
+                  lineHandle->updateCoordinate( 0, scenePos );
+
+                  handlePtr  = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, scenePos );
+                  handlePtr -> setSelection();
+
+                  unsigned int insertHandleIndex = lineCounter;
+
+                  if (!isClosedEnabled()) insertHandleIndex += 1;
+                  Rubberband::_internal->_handleList.insert( insertHandleIndex, SituationMap::RefPointer<RubberbandHandle>(handlePtr) );
+
+                  enableSelectedState();
+                  eventHandled = true;
+                  break;
+               }
+               ++lineCounter;
+            }
+         }
+      }
+
+      if (!isEnabledSelectedState())
+      {
+         // ok doesn't hit any point or line handle now looking to frame handle
+         if (_internal->_frameHandle != nullptr)
+         {
+            if (_internal->_frameHandle->isPositionInside(scenePos))
+            {
+               _internal->_frameHandle->setSelection(true);
+               enableSelectedState();
+               eventHandled = true;
+            }
+         }
+      }
+      return eventHandled;
+   } /* RubberbandMultiPointFeature::selectHandles */
+
+
+   void RubberbandMultiPointFeature::resetAction(AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         if (isEnabledConstructionState())
+         {
+            if (_internal->_addVertexAtEnd)
+            {
+               Rubberband::_internal->_handleList.removeLast();
+               _internal->_lineHandleList.removeLast();
+            }
+         }
+      }
+      Rubberband::resetAction(causer,x,y);
+   } /* RubberbandMultiPointFeature::resetAction */
+
+
+   bool RubberbandMultiPointFeature::selectAction( AbstractEventDispatcher* , int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+         if (isEnabledConstructionState()) disenableMultiSelectedState();
+
+         _baseInternal->_lastClickPosition = scenePos;
+
+         bool eventHandled = selectHandles( x, y, scenePos );
+
+         if ((!eventHandled) && (isEnabledConstructionState()))
+         {
+            _internal -> _addVertexAtEnd        = true;
+            _internal -> _showCursorPreviewLine = true;
+
+            deSelectHandles();
+
+            if (checkLengthConstrains(1,scenePos))
+            {
+               constructPoint( scenePos );
+               enableSelectedState();
+               _baseInternal->_lastClickPosition = scenePos;
+            }
+
+            eventHandled = true;
+         }
+         else _internal->_addVertexAtEnd = false;
+
+         if (eventHandled)
+         {
+            update();
+            deactivateButtons();
+         }
+
+         return eventHandled;
+      }
+      return false;
+   } /* RubberbandMultiPointFeature::selectAction */
+
+
+   bool RubberbandMultiPointFeature::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      markFailedConstrains( QPointF(), false );
+
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         bool    eventHandled = false;
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         Rubberband::_internal->_lastClickPosition = scenePos;
+
+         if (_internal->_addVertexAtEnd) // isEnabledConstructionState())
+         {
+            if (Rubberband::_internal->_handleList.isEmpty())
+            {
+               disenableSelectedState();
+               disenableMultiSelectedState();
+               return false;
+            }
+
+            if ((!isEnabledSelectedState()) && (_baseInternal->buttonProxyActive(scenePos)))
+            {
+               deSelectHandles();
+               return false;
+            }
+
+            if (checkLengthConstrains(2, scenePos))
+            {
+               QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+
+               for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+               {
+                  RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+                  if ((handlePointPtr) && ((handlePointPtr->isSelected())))
+                  {
+                     handlePointPtr->setSelection(false);
+                     handlePointPtr->moveCoordinate( deltaMove );
+                     eventHandled = true;
+                  }
+               }            
+            }
+            markFailedConstrains( QPointF(), false );
+
+            if ((_maximumPointCount >0) && ((unsigned int)Rubberband::_internal->_handleList.size() >= _maximumPointCount))
+            {
+               completeStateAction(causer,x,y);
+            }
+            if (eventHandled) update();
+            if (_baseInternal->buttonProxyActive(scenePos)) return false;
+            updateButtonPosition();
+            activateButtons();
+         }
+         else
+         {
+            if (isEnabledSelectedState())
+            {
+               bool frameIsSelected( ((_internal->_frameHandle != nullptr) && (_internal->_frameHandle->isSelected())) );
+
+               QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+
+               if (!checkLengthConstrains(scenePos, deltaMove))
+               {
+                 for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+                  {
+                     RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handle.get());
+                     if (handlePointPtr) handlePointPtr->setSelection(false);
+                  }
+                  if (_internal->_frameHandle) _internal->_frameHandle->setSelection(false);
+                  updateButtonPosition();
+                  activateButtons();
+                  disenableSelectedState();
+                  disenableMultiSelectedState();
+                  markFailedConstrains( QPointF(), false );
+                  return true;
+               }
+               markFailedConstrains( QPointF(), false );
+
+               for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+               {
+                  RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handle.get());
+                  if ((handlePointPtr) && ((handlePointPtr->isSelected()) || (frameIsSelected)))
+                  {
+                     handlePointPtr->setSelection(false);
+                     handlePointPtr->moveCoordinate( deltaMove );
+                     eventHandled = true;
+                  }
+               }
+               if (frameIsSelected)
+               {
+                  _internal->_frameHandle->setSelection(false);
+                   eventHandled = true;
+               }
+
+               disenableSelectedState();
+               disenableMultiSelectedState();
+            }
+
+            if (isEnabledConstructionState())
+            {
+               _internal->_addVertexAtEnd        = true;
+               _internal->_showCursorPreviewLine = true;
+
+               updatePreviewLine( scenePos );
+            }
+            else if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+            if (eventHandled) update();
+            updateButtonPosition();
+            activateButtons();
+
+         }
+         return  eventHandled;
+      }
+      return false;
+   } /* RubberbandMultiPointFeature::setCoordinateAction */
+
+
+   void RubberbandMultiPointFeature::updatePreviewLine( const QPointF & scenePosition )
+   {
+      if (isEnabledConstructionState() && (!Rubberband::_internal->_handleList.isEmpty()) && (_internal->_cursorPreviewLine))
+      {
+         RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.last().get());
+         if ((handlePointPtr) && (_internal->_addVertexAtEnd))
+         {
+            RubberbandDrawable::RubberbandCoordinate rbCoordinate( Rubberband::_internal->_mapView, scenePosition );
+
+            _internal->_cursorPreviewLine -> setVisibility( _internal->_showCursorPreviewLine );
+            _internal->_cursorPreviewLine -> setDrawColor( _handleSelectionColor );
+
+            _internal->_cursorPreviewLine->setLine( handlePointPtr->getCoordinate(), rbCoordinate );
+                                                    
+            if (_internal->_cursorPreviewCloseLine)
+            {
+               _internal->_cursorPreviewCloseLine -> setVisibility( _internal->_showCursorPreviewLine );
+               _internal->_cursorPreviewCloseLine -> setDrawColor( _handleSelectionColor );
+
+               handlePointPtr = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList.front().get());
+
+               if (handlePointPtr)
+               {
+                 _internal->_cursorPreviewCloseLine->setLine( handlePointPtr->getCoordinate(), rbCoordinate );
+               }
+            }
+         }
+         else
+         {
+            _internal->_cursorPreviewLine -> setVisibility( false );
+            if (_internal->_cursorPreviewCloseLine) _internal->_cursorPreviewCloseLine -> setVisibility( false );
+         }
+         return;
+      }
+
+      _internal->_cursorPreviewLine      = nullptr;
+      _internal->_cursorPreviewCloseLine = nullptr;
+
+   } /* RubberbandMultiPointFeature::updatePreviewLine */
+
+
+   bool RubberbandMultiPointFeature::moveAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      if (rubberbandIsAlive())
+      {
+         QPointF scenePosition(pixel2ScenePosition(x,y));
+
+         if (_baseInternal->buttonProxyActive(scenePosition)) return false;
+         if (Rubberband::_internal->_mapView == nullptr)      return false;
+
+         if (!isEnabledMultiSelectedState()) deSelectHandles();
+
+         RubberbandHandle * handlePtr = pickHandle(x,y);
+         if (handlePtr == nullptr)
+         {
+            _internal->_showCursorPreviewLine = isEnabledConstructionState();
+            for (auto handle : qAsConst(_internal->_lineHandleList))
+            {
+               handle->setSelection(false);
+               if (handle->isPositionInside(scenePosition))
+                  handle->setSelection();
+            }
+         }
+         else
+         {
+            _internal->_showCursorPreviewLine = false;
+            handlePtr->setSelection();
+         }
+
+         if (isEnabledConstructionState())
+         {
+  
+            if (checkLengthConstrains(1,scenePosition))
+            {
+               updatePreviewLine( scenePosition );
+
+               if (isSignalConnected(QMetaMethod::fromSignal(&RubberbandMultiPointFeature::currentCursorPositionChanged)))
+               {
+                  RubberbandDrawable::RubberbandCoordinate mapCoord(Rubberband::_internal->_mapView, scenePosition);
+                  emit currentCursorPositionChanged( Point3D(mapCoord._mapCoordinate.x(),mapCoord._mapCoordinate.y(),0.0) );
+               }
+            }
+         }
+         
+         return false;
+      }
+      return false;
+   } /* RubberbandMultiPointFeature::moveAction */
+
+
+   bool RubberbandMultiPointFeature::movePickedAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (isEnabledSelectedState())
+         {
+            QPointF scenePos( pixel2ScenePosition(x,y) );
+            QPointF deltaMove( scenePos-_baseInternal->_lastClickPosition );
+
+            if (checkLengthConstrains(scenePos, deltaMove))
+            {
+               bool frameIsSelected( ((_internal->_frameHandle != nullptr) && (_internal->_frameHandle->isSelected())) );
+
+               _baseInternal->_lastClickPosition = scenePos;
+
+               for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+               {
+                  RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+                  if ((handlePointPtr) && ((handlePointPtr->isSelected()) || (frameIsSelected)))
+                  {
+                     handlePointPtr->moveCoordinate( deltaMove );
+                  }
+               }
+               updatePreviewLine(scenePos);
+               update();
+            }
+            return true;
+         }
+      }
+      return false;
+   } /*  RubberbandMultiPointFeature::movePickedAction */
+
+
+   bool RubberbandMultiPointFeature::deleteAction(AbstractEventDispatcher*, int x, int y)
+   {
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (((unsigned int)Rubberband::_internal->_handleList.size() > _minimumPointCount) && (isEnabledSelectedState()))
+         {
+            QList<SituationMap::RefPointer<RubberbandHandle>>               savedHandleList     = Rubberband::_internal->_handleList;
+            QList<SituationMap::RefPointer<RubberbandLineHandle>>           savedLineHandleList = _internal->_lineHandleList;
+
+            QPointF                                                         scenePosition  = pixel2ScenePosition(x,y);
+            QList<SituationMap::RefPointer<RubberbandHandle>>::iterator     handleIter     = Rubberband::_internal->_handleList.begin();
+            QList<SituationMap::RefPointer<RubberbandLineHandle>>::iterator lineHandleIter = _internal->_lineHandleList.begin();
+
+            while (handleIter != Rubberband::_internal->_handleList.end())
+            {
+               if (handleIter->get()->isPositionInside(scenePosition))
+               {
+                  handleIter     = Rubberband::_internal->_handleList.erase(handleIter);
+                  lineHandleIter = _internal->_lineHandleList.erase(lineHandleIter);
+                  if (lineHandleIter != _internal->_lineHandleList.end())
+                  {
+                     if (lineHandleIter != _internal->_lineHandleList.begin())
+                     {
+                        lineHandleIter->get()->updateCoordinate( 0, (lineHandleIter-1)->get()->getCoordinate(1)._sceneCoordinate );
+                     }
+                  }
+                  continue;
+               }
+               ++handleIter;
+               if ((lineHandleIter   != _internal->_lineHandleList.end())
+               &&  (lineHandleIter+1 != _internal->_lineHandleList.end()))
+               {
+                  ++lineHandleIter;
+               }
+            } /* while handleIter */
+
+            if (!checkLengthConstrains(scenePosition, QPointF(0,0)))
+            {
+              // constrain failed, do not delete yet
+              Rubberband::_internal->_handleList = savedHandleList;
+              _internal->_lineHandleList         = savedLineHandleList;
+            }
+            update();
+            activateButtons();
+
+            disenableSelectedState();
+            disenableMultiSelectedState();
+         }
+         return true;
+      }
+      return false;
+   } /* RubberbandMultiPointFeature::deleteAction */
+
+
+   bool RubberbandMultiPointFeature::contextMenuAction(  AbstractEventDispatcher*, int,int )
+   {
+      return false;
+   } /* RubberbandMultiPointFeature::contextMenuAction */
+
+
+   bool RubberbandMultiPointFeature::completeStateAction (  AbstractEventDispatcher * causer, int x, int y )
+   {
+      markFailedConstrains( QPointF(), false );
+
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (isEnabledConstructionState())
+         {
+            if (!_finishAfterConstruction)
+            {
+               if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+               {
+                  enableModificationState();
+                  _internal->_cursorPreviewLine      = nullptr; // remove preview lines
+                  _internal->_cursorPreviewCloseLine = nullptr;
+               }
+               update();
+               return true;
+            }
+         }
+
+         if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount)
+         {
+            return applyAndEndAction(causer,x,y);
+         }
+      }
+      return false;
+   } /* RubberbandMultiPointFeature::completeStateAction */
+
+
+   bool RubberbandMultiPointFeature::undoAction( AbstractEventDispatcher * /*causer*/, int,int )
+   {
+      if (rubberbandIsAlive())
+      {
+         if (!Rubberband::_internal->_handleList.empty())
+         {
+            if (isEnabledConstructionState())
+            {
+               Rubberband::_internal->_handleList.pop_back();
+               if (!_internal->_lineHandleList.empty()) _internal->_lineHandleList.pop_back();
+
+               if (_internal->_cursorPreviewLine)        _internal->_cursorPreviewLine        -> setVisibility( false );
+               if (_internal -> _cursorPreviewCloseLine) _internal -> _cursorPreviewCloseLine -> setVisibility( false );
+
+               update();
+               activateButtons();
+            }
+         }
+         return true;
+      }
+      return false;
+   } /*  RubberbandMultiPointFeature::undoAction */
+
+
+   bool RubberbandMultiPointFeature::applyAndEndAction( AbstractEventDispatcher * causer, int x, int y)
+   {
+      if ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount) Rubberband::applyAndEndAction( causer,x,y );
+      else abortAction(causer,x,y);
+      return true;
+   } /* RubberbandMultiPointFeature::applyAndEndAction */
+
+
+   void RubberbandMultiPointFeature::activateButtons()
+   {
+      _baseInternal->_hasUndoButton   = isEnabledConstructionState();
+      _baseInternal->_applyIsPossible = ((unsigned int)Rubberband::_internal->_handleList.size() >= _minimumPointCount);
+      _baseInternal->_undoIsPossible  = (isEnabledConstructionState() && ((unsigned int)Rubberband::_internal->_handleList.size() > _minimumPointCount));
+
+      Rubberband::activateButtons();
+
+   } /* RubberbandMultiPointFeature::activateButtons */
+
+
+   void RubberbandMultiPointFeature::update()
+   {
+      Rubberband::update();
+
+      DEBUG_LOG(Rubberband::_internal->_logger) << LOGFUNCTION;
+
+      auto   handleLine   = _internal->_lineHandleList.begin();
+      bool   closePolygon = ((unsigned int)Rubberband::_internal->_handleList.size() > 2) && (isClosedEnabled());
+      bool   firstLoop    = !closePolygon;
+
+      QColor lineHandleDrawColor = _drawColor;
+      QColor lineHandleFillColor = _drawColor;
+
+      if (_internal->_complexGeometry)
+      {
+         lineHandleDrawColor.setAlphaF( lineHandleDrawColor.alphaF()*0.5 );
+         lineHandleFillColor.setAlphaF( lineHandleFillColor.alphaF()*0.5 );
+      }
+      else
+      {
+         if (!_previewSidc.isEmpty())
+         {
+            lineHandleDrawColor.setAlphaF( 0.0 );
+            lineHandleFillColor.setAlphaF( 0.0 );
+         }
+      }
+
+      QVector<RubberbandHandle::RubberbandCoordinate> coordinateList;
+      coordinateList.reserve( Rubberband::_internal->_handleList.size() );
+
+      for (auto handlePoint : qAsConst(Rubberband::_internal->_handleList))
+      {
+         RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handlePoint.get());
+         if (handlePointPtr)
+         {
+            if (handleLine != _internal->_lineHandleList.end())
+            {
+               RubberbandHandle::RubberbandCoordinate && pos           =  handlePointPtr->getCoordinate();
+               RubberbandLineHandle                    * handleLinePtr =  dynamic_cast<RubberbandLineHandle*>(handleLine->get());
+
+               if (!firstLoop)
+               {
+                  if (handleLinePtr)
+                  {
+                     handleLinePtr -> updateCoordinate( 1, pos._sceneCoordinate );
+
+                     handleLinePtr -> setDrawColor(lineHandleDrawColor);
+                     handleLinePtr -> setFillColor(lineHandleFillColor);
+                     handleLinePtr -> setSelectionColor(_handleSelectionColor);
+                     handleLinePtr -> setPickingRatio( _pickingRatio );
+                  }
+                  ++handleLine;
+                  if (handleLine != _internal->_lineHandleList.end())
+                  {
+                     handleLinePtr =  dynamic_cast<RubberbandLineHandle*>(handleLine->get());
+                  }
+                  else handleLinePtr = nullptr;
+               }
+               else firstLoop = false;
+
+               if (handleLinePtr) handleLinePtr->updateCoordinate( 0, pos._sceneCoordinate );
+            }
+
+            coordinateList.append( handlePointPtr->getCoordinate() );
+         }
+
+      } /* for handlePoint */
+
+
+      // remove superfluous line handles
+      while (handleLine != _internal->_lineHandleList.end())
+      {
+         handleLine = _internal->_lineHandleList.erase( handleLine );
+      }
+
+
+      if (closePolygon)
+      {
+         SituationMap::RefPointer<RubberbandLineHandle>    & handleLinePtr  = _internal->_lineHandleList.first();
+         SituationMap::RefPointer<RubberbandHandle>        & handlePointPtr = Rubberband::_internal->_handleList.last();
+         RubberbandHandle::RubberbandCoordinate           && pos            = dynamic_cast<RubberbandPointHandle*>(handlePointPtr.get())->getCoordinate();
+
+         handleLinePtr->updateCoordinate( 0, pos._sceneCoordinate );
+
+         if (_fillColor.alpha())
+         {
+            if (!_internal->_fillPath)
+            {
+               _internal->_fillPath  = new DrawablePainterPath( Rubberband::_internal->_mapView );
+               _internal->_fillPath -> setDrawColor( QColor() );
+            }
+            _internal -> _fillPath -> setVisibility( true );
+            _internal -> _fillPath -> setFillColor(_fillColor );
+            _internal -> _fillPath -> setPath( coordinateList );
+         }
+         else _internal->_fillPath = nullptr;
+      }
+      else if (_internal->_fillPath) _internal->_fillPath->setVisibility( false );
+
+      if ((isEnabledModificationState()) && (coordinateList.size() >= 2) && (_internal->_frameHandle == nullptr))
+      {
+         _internal->_frameHandle  = SituationMap::RefPointer<RubberbandFrameHandle>( new RubberbandFrameHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, _frameHandleMargin ));
+      }
+
+
+      if (_internal->_frameHandle != nullptr)
+      {
+         if (coordinateList.size() >= 2)
+         {
+            _internal->_frameHandle -> setDrawColor(_frameColor);
+            _internal->_frameHandle -> setFillColor(_frameFillColor);
+            _internal->_frameHandle -> setSelectionColor(_frameSelectionColor);
+            _internal->_frameHandle -> updateFrameSceneMargin( _frameHandleMargin );
+            _internal->_frameHandle -> updateFrameShape( coordinateList );
+            _internal->_frameHandle -> drawDisabled( (_frameHandleMargin < 0) );
+         }
+         else _internal->_frameHandle = nullptr;
+      }
+
+      if (!_previewSidc.isEmpty())
+      {
+         if (!_internal->_previewSymbol)
+         {
+            _internal->_previewSymbol = new TransientTacticalSymbol( static_cast<MapImpl*>(_baseInternal->_map.data()), _previewSidc );
+         }
+         _internal->_previewSymbol->update( coordinateList );
+      }
+      else _internal->_previewSymbol = nullptr;
+
+   } /* RubberbandMultiPointFeature::update */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.h
new file mode 100755
index 000000000..9d23ecf98
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature.h
@@ -0,0 +1,209 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   10.04.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband.h"
+
+
+namespace SituationMap { namespace RB
+{
+   class RubberbandHandle;
+   class RubberbandFrameHandle;
+
+   /**
+     @class RubberbandMultiPointFeature rubberband_multi_point_feature.h
+     @brief Implementation of a rubberband to input multi point features, like areals or linears
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandMultiPointFeature : public Rubberband
+   {
+      Q_OBJECT
+      public:
+
+         /**
+            @name Construction & Destruction
+            @{
+         */
+
+      private:
+         
+         friend class RubberbandFactory;
+         friend class RubberbandArrow;
+         friend class RubberbandCorridor;
+         friend class RubberbandPolylineWidth;
+         friend class RubberbandSmoothLine;
+
+         /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+           Constructor delegation doesn't work with Visual Studio 2013
+
+           explicit RubberbandMultiPointFeature(  SituationMap::Map * map );
+           explicit RubberbandMultiPointFeature(  SituationMap::Map * map, bool complexGeometry );
+          * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+          
+          /**
+            Construction of RubberbandMultiPointFeature in most common cases. The parameter parent is
+            optional.
+           */
+          explicit RubberbandMultiPointFeature(  SituationMap::Map * map, QObject * parent = nullptr );
+
+          /**
+            Construction of RubberbandMultiPointFeature in case of controlling complex geometry objects, like 
+            splines or multi point symbols. In this case set complexGeometry true.
+          */
+          explicit RubberbandMultiPointFeature(  SituationMap::Map * map, bool complexGeometry, QObject * parent = nullptr );
+
+      public:
+
+         ~RubberbandMultiPointFeature();
+         /** @} */
+        
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         void resetAction         ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool applyAndEndAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+     
+         /**
+           If set to true a polygon the rubberband draws a polygon otherwise a polyline.
+         */
+         inline void enableClosed( bool flag )  
+         { 
+            _isClosed = flag;
+            if (( _isClosed) && (_minimumPointCount < 3)) _minimumPointCount = 3;
+            if ((!_isClosed) && (_minimumPointCount < 2)) _minimumPointCount = 2;
+         } /* enableClosed */
+
+         /**
+           Gets the value of the close flag
+         */
+         inline bool isClosedEnabled() const    { return _isClosed; }
+
+         /**
+            @name Setting Constrains
+            @{
+         */
+
+         /**
+           Defines minimum count of verticies that has to be defined by users input to complete the rubberband with apply signal. The default value is 0.
+          */
+         inline void minimumPointCount( unsigned int x )
+         {
+            if (( _isClosed) && (x < 3)) x = 3;
+            if ((!_isClosed) && (x < 2)) x = 2;
+            _minimumPointCount = x;
+         } /* minimumPointCount */
+
+
+         /**
+           Defines maximum count of verticies that can be aceppted by the rubberband. A values of 0 stands for undefined. The default is 0.
+         */
+         inline void maximumPointCount( unsigned int x )
+         {
+            if (x > 0)
+            {
+               if (( _isClosed) && (x < 3)) x = 3;
+               if ((!_isClosed) && (x < 2)) x = 2;
+            }
+            _maximumPointCount = x;
+         } /* maximumPointCount */
+
+
+         /**
+           Defines the maximum length of a segment (distance between to adjaced verticies). A value of 0 stands for no limit is set. The default is 0.  
+          */
+         inline void maximumSegmentLength( qreal x ) { _maximumSegmentLength = (x > 0) ? x : 0.0; }
+         inline qreal getMaximumSegmentLength() const{ return _maximumSegmentLength; }
+
+         /**
+           Defines the maximum length of the complete polyline. \c enableClosed must be set to false. A value of 0 stands for no limit is set. The default is 0.  
+         */
+         inline void maximumLength( qreal x )        { _maximumLength        = (x > 0) ? x : 0.0; }
+         /** @} */
+         inline qreal getMaximumLength() const       { return _maximumLength; }
+
+  
+         virtual QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+         virtual QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         virtual void setCoordinateVector( const QVector<QPointF> &, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+      
+       signals:
+       
+         /**
+         The signal will be emitted, when the mouse cursor has changed and the rubberband is in construction mode and is accepting new input coordinates.
+         */
+         void currentCursorPositionChanged(const Point3D &mapCoord);
+
+
+      protected:
+
+         /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         bool             _isClosed;
+
+         unsigned int     _minimumPointCount;
+         unsigned int     _maximumPointCount;
+ 
+         qreal            _maximumSegmentLength;
+         qreal            _maximumLength;
+
+         void activateButtons() override;
+
+         void update() override;
+
+         // some helper methodes
+         RubberbandHandle * constructPoint( QPointF scenePos );
+         
+         void constructPoint(const QPointF &point, CoordinateSystem cs );
+         
+         bool selectHandles( int x, int y, const QPointF & scenePos );
+
+         bool checkLengthConstrains( unsigned int checkHandleIdx, QPointF & scenePos );
+         bool checkLengthConstrains( const QPointF & scenePos, const QPointF & deltaScenePos );
+         void updatePreviewLine( const QPointF & scenePosition );
+
+         RubberbandFrameHandle * getFrameHandle() const;
+
+         void setCheckMaxAngle( double phi );
+
+   }; /* RubberbandMultiPointFeature */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.cpp
new file mode 100755
index 000000000..6849b6cf3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.cpp
@@ -0,0 +1,680 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geometry in 3d
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include <limits>
+
+#include "rubberband_multi_point_feature_3d.h"
+#include "rubberband_base_internal.h"
+
+#include "event_mouse_navigator.h"
+
+#include <Map/map.h>
+#include <Map/layer_factory.h>
+
+#include <MapImpl/map_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <MapImpl/screen_to_location_helper.h>
+#include <MapImpl/location_to_elevation_helper.h>
+
+#include <MathUtils/math_const.h>
+
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+#include <GraphicalObjects/graphical_object_path.h>
+
+#include <QtGui/QGuiApplication>
+
+#include <QFuture>
+#include <QFutureWatcher>
+
+#include <IdentifyGraphicsOverlayResult.h>
+#include <Graphic.h>
+#include <AttributeListModel.h>
+
+namespace SituationMap { namespace RB
+{
+
+  class RubberbandMultiPointFeature3D::InternalData
+  {
+    public:
+
+      QVector<GraphicalObjectPictureMarker*>   m_marker;
+      GraphicalObjectPath                     *m_path;
+
+      QVector<QPointF>                         m_coordinates;
+
+      int                                      m_currentIndex;
+      int                                      m_selectionIndex;
+      // 300: TaskWatcher replaced by QFuture + QFutureWatcher (see EventMouseNavigator port)
+      QFuture<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>            m_pickingTask;
+      QFuture<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>            m_selectionTask;
+      QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>    *m_pickingWatcher   = nullptr;
+      QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>    *m_selectionWatcher = nullptr;
+      QPoint                                   m_pickingPoint;
+      QPointF                                * m_startMove;
+      ScreenToLocationHelper                 * m_screenToMap;
+      QPointer<LocationToElevationHelper>      m_toElevation;
+      PositionCont                             m_positionList3D;
+      bool                                     m_doCompleteAction;
+     
+
+      InternalData()
+        : m_marker()
+        , m_path(nullptr)
+        , m_coordinates()
+        , m_currentIndex(-1)
+        , m_selectionIndex(-1)
+        , m_pickingTask()
+        , m_selectionTask()
+        , m_pickingPoint()
+        , m_startMove(nullptr)
+        , m_screenToMap()
+        , m_toElevation(nullptr)
+        , m_positionList3D()
+        , m_doCompleteAction(false)
+      {
+        m_marker.reserve(100);
+        m_coordinates.reserve(100);
+      } // InternalData()
+
+      ~InternalData()
+      {
+        delete m_startMove;
+        for (auto marker : qAsConst(m_marker))
+          delete marker;
+        delete m_path;
+        delete m_screenToMap;
+      } // ~InternalData()
+
+  }; // RubberbandPointFeature3D::InternalData
+
+
+  RubberbandMultiPointFeature3D::RubberbandMultiPointFeature3D(  SituationMap::Map * map, QObject * parent, bool isActive )
+    : Rubberband3D(map,parent,isActive)
+    , _internal( new RubberbandMultiPointFeature3D::InternalData() )
+    , _isClosed(false)
+    , _isCircular(false)
+  {
+    MapImpl                                 *mapImpl = static_cast<MapImpl*>(_baseInternal->_map.data());
+    Esri::ArcGISRuntime::SceneGraphicsView  *view    = mapImpl->getEsriSceneGraphicsView();
+
+    // 300: identifyGraphicsOverlaysCompleted signal removed; picking/selection results arrive via
+    // QFutureWatcher on identifyGraphicsOverlaysAsync() (futures set in selectAction/moveAction).
+    _internal->m_pickingWatcher   = new QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>(this);
+    _internal->m_selectionWatcher = new QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>(this);
+    connect( _internal->m_pickingWatcher, &QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>::finished,
+             this, [this](){ onGetPickingResult(false, _internal->m_pickingWatcher->result());   } );
+    connect( _internal->m_selectionWatcher, &QFutureWatcher<QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult *>>::finished,
+             this, [this](){ onGetPickingResult(true,  _internal->m_selectionWatcher->result()); } );
+    _internal->m_screenToMap = new ScreenToLocationHelper(view);
+    connect( _internal->m_screenToMap, &ScreenToLocationHelper::mouseScenePositionChanged, this, &RubberbandMultiPointFeature3D::onMapPosition  );  // ToDO
+
+  } // RubberbandMultiPointFeature3D::RubberbandMultiPointFeature3D(  SituationMap::Map * map, QObject * parent = nullptr, bool isActive )
+
+
+  RubberbandMultiPointFeature3D::~RubberbandMultiPointFeature3D()
+  {
+    delete _internal;
+    _internal = nullptr;
+  } // RubberbandMultiPointFeature3D::~RubberbandMultiPointFeature3D()
+
+  void RubberbandMultiPointFeature3D::activateButtons()
+  {
+    _baseInternal->_hasUndoButton   = false;
+    _baseInternal->_undoIsPossible  = false;
+    _baseInternal->_applyIsPossible = (_internal->m_coordinates.size() > ((_isClosed && !_isCircular) ? 2 : 1));
+
+    RubberbandBase::activateButtons();
+
+  } /* RubberbandMultiPointFeature3D::activateButtons */
+
+
+  void circleShape( GraphicalObjectPath *pathObj, const PositionCont  &positionList )
+  {
+    if (positionList.size() < 2) return;
+
+    PositionCont circleShape;
+
+    double cx = positionList[0].x();
+    double cy = positionList[0].y();
+    double rx = positionList[1].x()-cx;
+    double ry = positionList[1].y()-cy;
+    
+    double corrLon = cos(cy / 57.2957795147); // correct factor from nautic simulation to get a real circle
+    double dPhi    = MathConst::pi / 50;      // delta angle to rasterize the circle to a polyline
+
+    auto   sqr = [](double x) -> double { return x * x; };
+    double r   = sqrt(sqr(rx*corrLon) + sqr(ry) );
+
+    double phi = 0.0;
+    while (phi < MathConst::pi_two)
+    {
+      double sinPhi = sin(phi);
+      double cosPhi = cos(phi);
+      double px = cx + r * cosPhi / corrLon;
+      double py = cy + r*sinPhi; 
+
+      circleShape.append(Point3D(px, py, 0.0));
+      phi += dPhi;
+    }
+
+    pathObj->setPositions(circleShape);
+
+  } // circleShape
+
+
+  void RubberbandMultiPointFeature3D::onMapPosition(const Point3D &mapCoordinate)
+  {
+    if (_internal->m_currentIndex < 0) return;
+    
+    if (qIsNaN(mapCoordinate.x())) return; // illegal map position
+    if (qIsNaN(mapCoordinate.y())) return;
+
+    if ((!_internal->m_toElevation) && (RubberbandBase::_baseInternal->_map->layerFactory().elevationAvailable()))
+    {
+      _internal->m_toElevation = RubberbandBase::_baseInternal->_map->layerFactory().locationToElevation(); // layerFactory has ownership
+    }
+
+    if ((std::numeric_limits<int>::max()) == _internal->m_currentIndex)
+    {
+      // move all coordinates
+      if (_internal->m_startMove)
+      {
+        QPointF deltaMove = mapCoordinate.toPointF() - *(_internal->m_startMove);
+        
+        _internal->m_positionList3D.clear();
+        _internal->m_positionList3D.reserve(_internal->m_coordinates.size());
+
+        for (int i = 0; i < _internal->m_coordinates.size(); ++i)
+        {
+          const QPointF & pos = _internal->m_coordinates[i] += deltaMove;
+          _internal->m_marker[i]->setOrigin( pos );
+
+          if (_internal->m_toElevation)
+          {
+            QMetaObject::Connection conn;
+        
+            conn = connect(_internal->m_toElevation.data(), &SituationMap::LocationToElevationHelper::elevationCompleted, this, [this,pos,conn](double elevation)
+            {
+              disconnect(conn);
+              _internal->m_positionList3D << Point3D(pos.x(),pos.y(),elevation);
+              if (_internal->m_positionList3D.size() == _internal->m_coordinates.size())
+              {
+                if (_internal->m_path) _internal->m_path->setPositions( _internal->m_positionList3D );
+                update();
+              }
+
+              // qCritical() << "elevation at (" << pos.x() << " , " << pos.y() << ") : " << elevation;
+            
+            });
+            _internal->m_toElevation->locationToElevation(pos);
+          }
+          else
+          {
+            _internal->m_positionList3D << Point3D::fromQPointF(pos);
+          }
+        }
+
+        if (_internal->m_toElevation)
+        { 
+          if (_internal->m_path) _internal->m_path->setPositions( _internal->m_positionList3D );
+          update();
+        }
+      }
+      else _internal->m_startMove = new QPointF(mapCoordinate.toPointF());
+      return;
+    }
+
+    if (_internal->m_currentIndex >= _internal->m_coordinates.size()) return;
+
+    MapImpl                                 *mapImpl       = static_cast<MapImpl*>(_baseInternal->_map.data());
+    Esri::ArcGISRuntime::SceneGraphicsView  *view          = mapImpl->getEsriSceneGraphicsView();
+    Esri::ArcGISRuntime::GraphicsOverlay    *graphicsLayer = mapImpl->getGraphicsLayer(mapImpl->layerFactory().rubberbandLayer());
+
+    if (nullptr == view) return;
+
+    for (int idx = _internal->m_positionList3D.size(); idx <= _internal->m_currentIndex; ++idx)
+    {
+       _internal->m_positionList3D << mapCoordinate;
+    }
+    _internal->m_coordinates[_internal->m_currentIndex]    = mapCoordinate.toPointF();
+    _internal->m_positionList3D[_internal->m_currentIndex] = mapCoordinate;
+
+    // qCritical() << "elevation idx=" << _internal->m_currentIndex <<" at (" << mapCoordinate.x() << " , " << mapCoordinate.y() << ") : " << mapCoordinate.z();
+
+    GraphicalObjectPictureMarker *&marker = _internal->m_marker[_internal->m_currentIndex];
+
+    if (nullptr == marker)
+    {
+      marker = new GraphicalObjectPictureMarker( view, graphicsLayer, QStringLiteral("RubberbandMultiPointFeature3D"), INVALID_MAP_ID );
+
+      marker->setImage(markerImage());
+      marker->setOrigin( mapCoordinate );
+      marker->updateView();
+      marker->setPickable(true);
+     
+      Esri::ArcGISRuntime::Graphic *graphic = marker->graphic();
+      if (graphic)
+      {
+        Esri::ArcGISRuntime::AttributeListModel *attLisModel = graphic->attributes();
+        if (attLisModel)
+        {
+          // qCritical() << "Rubberband3D-Item =" << _internal->m_currentIndex;
+          attLisModel->insertAttribute(QStringLiteral("Rubberband3D-Item"),_internal->m_currentIndex);
+        }
+      }
+    }
+    else marker->setOrigin( mapCoordinate );
+
+    if (_internal->m_coordinates.size() > ((_isClosed && !_isCircular) ? 2 : 1))
+    {
+
+      if (nullptr == _internal->m_path)
+      {
+        bool isPolygon = (_isClosed || _isCircular);
+
+        _internal->m_path = new GraphicalObjectPath(isPolygon ? GraphicalObjectPathType::Polygon : GraphicalObjectPathType::Polyline, view, graphicsLayer, QStringLiteral("RubberbandMultiPointFeature3D"), INVALID_MAP_ID);
+
+        _internal->m_path->rLineStyle().setLineColor(_handleDrawColor);
+        _internal->m_path->rLineStyle().setLinePattern(LinePattern::Solid);
+        _internal->m_path->rLineStyle().setLineWidth(3);
+        _internal->m_path->setPickable(false);
+        if (isPolygon)
+        {
+          _internal->m_path->rFillStyle().setFillColor(_frameFillColor);
+        }
+
+        if (_isCircular)
+        {
+          circleShape(_internal->m_path, _internal->m_positionList3D);
+        }
+        else _internal->m_path->setPositions(_internal->m_positionList3D);
+
+        _internal->m_path->updateView();
+      }
+      else
+      {
+        if (_isCircular)
+        {
+          circleShape(_internal->m_path, _internal->m_positionList3D);
+        }
+        else _internal->m_path->setPositions(_internal->m_positionList3D);
+      }
+    }
+
+    if (_isCircular && (0 == _internal->m_currentIndex) && (1 == _internal->m_coordinates.size()))
+    {
+      _internal->m_coordinates << _internal->m_coordinates.first();
+      _internal->m_positionList3D << _internal->m_positionList3D.first();
+      _internal->m_marker << nullptr;
+      _internal->m_currentIndex++;
+
+      // qCritical() << QCursor::pos() << "    !=    " << view->viewport()->mapToGlobal(_internal->m_pickingPoint);
+
+      _internal->m_doCompleteAction = (QCursor::pos() != view->viewport()->mapToGlobal(_internal->m_pickingPoint));
+
+      if (!_internal->m_doCompleteAction)
+      { 
+        // Click with out moving the mouse, set a default size of the circle and let the user do some editing
+        // The rubberband doesn't complete automatically in this case.
+        _internal->m_screenToMap->screenToLocation(_internal->m_pickingPoint.x()+100, _internal->m_pickingPoint.y());
+      }
+    }
+
+    update();
+
+    if (!QGuiApplication::mouseButtons().testFlag(Qt::MouseButton::LeftButton))
+    {
+      if (_isCircular && _internal->m_doCompleteAction && (1 == _internal->m_currentIndex))
+      {
+        completeStateAction(nullptr, 0, 0);
+      }
+      else
+      {
+        updateButtonPosition();
+        activateButtons();
+      }
+    }
+
+  } // void RubberbandMultiPointFeature3D::onMapPosition(const QPointF &mapCoordinate)
+
+
+  void RubberbandMultiPointFeature3D::onGetPickingResult(bool isSelection, const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult*> &identifyResults)
+  {
+    // 300: TaskWatcher taskId removed. The two QFutureWatchers (see constructor) call this with
+    // isSelection=false for the picking future and isSelection=true for the selection future,
+    // replacing the original m_pickingTask/m_selectionTask taskId() comparisons.
+    if (!isSelection)
+    {
+      for (auto iResult : identifyResults)
+      {
+        const QList<Esri::ArcGISRuntime::Graphic*> &gResults = iResult->graphics();
+        for (auto pickedGraphic : gResults)
+        {
+          if (pickedGraphic->attributes())
+          {
+            bool ok = false;
+            int  pickedIndex = pickedGraphic->attributes()->attributeValue(QStringLiteral("Rubberband3D-Item")).toInt(&ok);
+
+            if (ok)
+            {
+              qCritical() << "Picking index " << pickedIndex;
+              _internal->m_currentIndex = pickedIndex;
+              _internal->m_screenToMap->screenToLocation(_internal->m_pickingPoint.x(), _internal->m_pickingPoint.y());
+
+              if (pickedIndex < _internal->m_marker.size())
+              {
+                GraphicalObjectPictureMarker *&marker = _internal->m_marker[pickedIndex];
+
+                if (marker)
+                {
+                  marker->setImage(markerSelectionImage());
+                  marker->updateView();
+                }
+              }
+              return;
+            }
+          }
+
+        } // foreach pickedGraphic
+      } // foreach iResult
+
+      if ((!_isCircular) || (_internal->m_coordinates.size() < 2))
+      {
+        // add new coordinate and calculate map location
+        _internal->m_currentIndex = _internal->m_marker.size();
+        _internal->m_marker << nullptr;
+        _internal->m_coordinates << QPointF();
+
+        _internal->m_screenToMap->screenToLocation(_internal->m_pickingPoint.x(), _internal->m_pickingPoint.y());
+      }
+    }
+
+    else
+    {
+      for (auto iResult : identifyResults)
+      {
+        const QList<Esri::ArcGISRuntime::Graphic*> &gResults = iResult->graphics();
+        for (auto pickedGraphic : gResults)
+        {
+          if (pickedGraphic->attributes())
+          {
+            bool ok          = false;
+            int  pickedIndex = pickedGraphic->attributes()->attributeValue(QStringLiteral("Rubberband3D-Item")).toInt(&ok);
+
+            if ((ok) && (pickedIndex < _internal->m_marker.size()))
+            {
+              GraphicalObjectPictureMarker *&marker = _internal->m_marker[pickedIndex];
+
+              if (marker)
+              {
+                _internal->m_selectionIndex = pickedIndex;
+                marker->setImage(markerSelectionImage());
+                marker->updateView();
+                return;
+              }
+            }
+          }
+        }
+      }
+    }
+    if ((_internal->m_selectionIndex >= 0) && (_internal->m_selectionIndex < _internal->m_marker.size()))
+    {
+      GraphicalObjectPictureMarker *&marker = _internal->m_marker[_internal->m_selectionIndex];
+
+      if (marker)
+      {
+        marker->setImage(markerImage());
+        marker->updateView();
+      }
+      _internal->m_selectionIndex = -1;
+    }
+  } // void RubberbandMultiPointFeature3D::onGetPickingResult(bool isSelection, const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult*> &identifyResults)
+
+
+  bool RubberbandMultiPointFeature3D::selectAction(AbstractEventDispatcher *, int x, int y)
+  {
+    delete _internal->m_startMove;
+    _internal->m_startMove = nullptr;
+
+    if (rubberbandIsAlive())
+    {
+      if (_baseInternal->buttonProxyActive(QPointF(x,y))) return false;
+
+      MapImpl *mapImpl       = static_cast<MapImpl*>(_baseInternal->_map.data());
+
+      _internal->m_pickingTask.cancel(); // cancel old task
+      _internal->m_pickingPoint = QPoint(x,y);
+      _internal->m_pickingTask  = mapImpl->getEsriGeoView()->identifyGraphicsOverlaysAsync(QPointF(x,y), EventMouseNavigator::pickTolerance(), false, std::numeric_limits<int>::max(), this);
+      _internal->m_pickingWatcher->setFuture(_internal->m_pickingTask);
+      _internal->m_currentIndex = -1;
+
+      return true;
+    }
+    return false;
+  } // bool RubberbandMultiPointFeature3D::selectAction(AbstractEventDispatcher *, int x, int y)
+
+
+  bool RubberbandMultiPointFeature3D::setCoordinateAction(AbstractEventDispatcher *, int x, int y)
+  {
+    delete _internal->m_startMove;
+    _internal->m_startMove = nullptr;
+
+    if (rubberbandIsAlive())
+    {
+      _baseInternal->_lastClickPosition = QPointF(x,y);
+
+      if (_baseInternal->buttonProxyActive(_baseInternal->_lastClickPosition)) return false;
+
+      _internal->m_screenToMap->screenToLocation(x,y);
+
+      if ((_internal->m_currentIndex >= 0) && (_internal->m_currentIndex < _internal->m_marker.size()))
+      {
+        GraphicalObjectPictureMarker *&marker = _internal->m_marker[_internal->m_currentIndex];
+
+        if (marker)
+        {
+          marker->setImage(markerImage());
+          marker->updateView();
+        }
+      }
+
+      return true;
+    }
+    return false;
+  } // bool RubberbandMultiPointFeature3D::setCoordinateAction(AbstractEventDispatcher *, int x, int y)
+
+
+  bool RubberbandMultiPointFeature3D::movePickedAction(AbstractEventDispatcher *, int x, int y)
+  {
+    if (rubberbandIsAlive())
+    {
+      _internal->m_screenToMap->screenToLocation(x,y);
+      return true;
+    }
+    return false;
+  } // bool RubberbandMultiPointFeature3D::movePickedAction(AbstractEventDispatcher *, int x, int y)
+
+
+  bool RubberbandMultiPointFeature3D::moveAction( AbstractEventDispatcher*, int x, int y )
+  {
+    if (rubberbandIsAlive())
+    {
+      if (_baseInternal->buttonProxyActive(QPointF(x,y))) return false;
+
+      MapImpl *mapImpl = static_cast<MapImpl*>(_baseInternal->_map.data());
+
+      _internal->m_selectionTask.cancel(); // cancel old task
+      _internal->m_selectionTask = mapImpl->getEsriGeoView()->identifyGraphicsOverlaysAsync(QPointF(x,y), EventMouseNavigator::pickTolerance(), false, std::numeric_limits<int>::max(), this);
+      _internal->m_selectionWatcher->setFuture(_internal->m_selectionTask);
+
+      if ((_internal->m_selectionIndex >= 0) && (_internal->m_selectionIndex < _internal->m_marker.size()))
+      {
+        GraphicalObjectPictureMarker *&marker = _internal->m_marker[_internal->m_selectionIndex];
+
+        if (marker)
+        {
+          marker->setImage(markerImage());
+          marker->updateView();
+        }
+      }
+      _internal->m_selectionIndex = -1;
+    }
+    return false;
+  } // bool RubberbandMultiPointFeature3D::moveAction(AbstractEventDispatcher*,int,int)
+
+
+
+  bool RubberbandMultiPointFeature3D::completeStateAction ( AbstractEventDispatcher * causer, int x, int y )
+  {
+    if (_internal->m_coordinates.size() > ((_isClosed && !_isCircular) ? 2 : 1))
+    {
+      return applyAndEndAction(causer,x,y);
+    }
+    return false;
+  } // bool RubberbandMultiPointFeature3D::completeStateAction ( AbstractEventDispatcher * causer, int x, int y )
+
+
+  bool RubberbandMultiPointFeature3D::contextMenuAction   ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+  bool RubberbandMultiPointFeature3D::deleteAction        ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+  bool RubberbandMultiPointFeature3D::undoAction          ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+
+
+  unsigned int RubberbandMultiPointFeature3D::coordinateCount() const
+  {
+    return (_internal->m_coordinates.size());
+  } // unsigned int RubberbandMultiPointFeature3D::coordinateCount() const
+
+
+  void RubberbandMultiPointFeature3D::update()
+  {
+    for (auto marker : qAsConst(_internal->m_marker))
+      if (marker) marker->updateView();
+    if (_internal->m_path)
+      _internal->m_path->updateView();
+    
+    externalUpdate();
+
+  } // RubberbandMultiPointFeature3D::update()
+
+
+  QVector<QPointF> RubberbandMultiPointFeature3D::coordinateVector( CoordinateSystem cs ) const
+  {
+    QVector<QPointF> coordinateVector;
+    coordinateVector.reserve(_internal->m_coordinates.size());
+
+    for (const auto &mapCoordinate : qAsConst(_internal->m_coordinates))
+      coordinateVector << projectCoordinateFromMap( cs, mapCoordinate );
+    return coordinateVector;
+  } // QVector<QPointF> RubberbandMultiPointFeature3D::coordinateVector( CoordinateSystem cs ) const
+
+
+  QPointF RubberbandMultiPointFeature3D::singleCoordinate( unsigned int idx, CoordinateSystem cs ) const
+  {
+    if (coordinateCount() > idx)
+      return coordinateVector(cs).at(idx);
+
+    return QPointF();
+  } // QPointF RubberbandMultiPointFeature3D::singleCoordinate( unsigned int idx, CoordinateSystem cs ) const
+
+
+  void RubberbandMultiPointFeature3D::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+  {
+    _internal->m_coordinates.clear();
+    for (const auto &geoCoordinate : coordinateVector)
+      _internal->m_coordinates << projectCoordinateToMap( cs, geoCoordinate );
+
+    if ((!_internal->m_toElevation) && (_baseInternal->_map->layerFactory().elevationAvailable()))
+    {
+      _internal->m_toElevation = _baseInternal->_map->layerFactory().locationToElevation(); // layerFactory has ownership
+    }
+
+    // now get elevations
+    _internal->m_positionList3D.clear();
+    for (const auto &pos : qAsConst(_internal->m_coordinates))
+    {
+      if (_internal->m_toElevation)
+      {
+        QMetaObject::Connection conn;
+        
+        conn = connect(_internal->m_toElevation.data(), &SituationMap::LocationToElevationHelper::elevationCompleted, this, [this,pos,conn](double elevation)
+        {
+          disconnect(conn);
+
+          _internal->m_positionList3D << Point3D(pos.x(),pos.y(),elevation);
+          if (_internal->m_positionList3D.size() == _internal->m_coordinates.size())
+          {
+            if (_internal->m_path) _internal->m_path->setPositions( _internal->m_positionList3D );
+            update();
+          }
+        });
+        _internal->m_toElevation->locationToElevation(pos);
+      }
+      else _internal->m_positionList3D << Point3D::fromQPointF(pos);
+    }
+  } // void RubberbandMultiPointFeature3D::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+
+
+  void RubberbandMultiPointFeature3D::setCoordinateVector(const QVector<Point3D> & coordinateVector, CoordinateSystem cs)
+  {
+    _internal->m_coordinates.clear();
+    _internal->m_positionList3D.clear();
+
+    for (const auto &geoCoordinate : coordinateVector)
+    {
+      const QPointF & projCoordinate =  projectCoordinateToMap( cs, geoCoordinate.toPointF() );
+      _internal->m_coordinates << projCoordinate;
+      _internal->m_positionList3D << Point3D(projCoordinate.x(),projCoordinate.y(),geoCoordinate.z());
+    }
+  } // void RubberbandMultiPointFeature3D::setCoordinateVector(const QVector<Point3D> & coordinateVector, CoordinateSystem cs)
+
+
+  QVector<Point3D> RubberbandMultiPointFeature3D::coordinateVector3D(CoordinateSystem cs) const
+  {
+    QVector<Point3D> coordinateVector;
+
+    coordinateVector.reserve(_internal->m_coordinates.size());
+
+    for (const auto &mapCoordinate : qAsConst(_internal->m_coordinates))
+      coordinateVector << Point3D::fromQPointF( projectCoordinateFromMap(cs,mapCoordinate) );
+
+    return coordinateVector;
+  } //  QVector<Point3D> RubberbandMultiPointFeature3D::coordinateVector3D(CoordinateSystem cs) const
+
+
+  Point3D RubberbandMultiPointFeature3D::singleCoordinate3D(unsigned int idx, CoordinateSystem cs) const
+  {
+    if (coordinateCount() > idx)
+    {
+      return coordinateVector3D(cs).at(idx);
+    }
+    return Point3D();
+  } // Point3D RubberbandMultiPointFeature3D::singleCoordinate3D(unsigned int idx, CoordinateSystem cs) const
+
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.h
new file mode 100755
index 000000000..7af2bf6fa
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_multi_point_feature_3d.h
@@ -0,0 +1,136 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multipoint feature geometry in 3d
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_3d.h"
+
+namespace Esri
+{
+  namespace ArcGISRuntime
+  {
+    class IdentifyGraphicsOverlayResult;
+  }
+}
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointFeature rubberband_point_feature.h
+     @brief Implementation of a rubberband to input single coodinates for building point features
+     @see Rubberband3D
+   */
+   class SITUATIONMAP_EXPORT RubberbandMultiPointFeature3D : public Rubberband3D
+   {
+       Q_OBJECT
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+         friend class RubberbandFactory;
+
+         explicit RubberbandMultiPointFeature3D(  SituationMap::Map * map, QObject * parent = nullptr, bool isActive = true );
+
+      public:
+
+         virtual ~RubberbandMultiPointFeature3D();
+
+         RubberbandMultiPointFeature3D(const RubberbandMultiPointFeature3D &) = delete;
+         RubberbandMultiPointFeature3D & operator = (const RubberbandMultiPointFeature3D &) = delete;
+         /** @} */
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         inline void enableClosed( bool flag )  
+         { 
+           _isClosed = flag;
+         } /* enableClosed */
+
+         /**
+           Gets the value of the close flag
+         */
+         inline bool isClosedEnabled() const    { return _isClosed; }
+
+         unsigned int coordinateCount() const override;
+
+         QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         void setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+         Point3D singleCoordinate3D( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+         QVector<Point3D> coordinateVector3D( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+          void setCoordinateVector( const QVector<Point3D> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+          inline void enableCircular(bool flag)
+          {
+            _isCircular = flag;
+          } // enableCircular
+
+          inline bool isCircularEnabled() const { return _isCircular; }
+
+      protected:
+
+         virtual bool buttonProxyActive( const QPointF & scenePos) const { Q_UNUSED(scenePos); return false; }
+
+         void activateButtons() override;
+
+         void update() override;
+
+         /*
+         Forward declaration of internal container class for member variables. The derived classes of Rubberband
+         often have also a declaration of InternalData for there own internal members.
+         */
+         class InternalData;
+
+         InternalData     * _internal;
+
+         bool               _isClosed;
+         bool               _isCircular;
+
+      protected slots:
+
+        void onGetPickingResult(bool isSelection, const QList<Esri::ArcGISRuntime::IdentifyGraphicsOverlayResult*> &identifyResults);
+        void onMapPosition( const Point3D &mapCoordinate );
+
+   }; /* RubberbandMultiPointFeature3D */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.cpp
new file mode 100755
index 000000000..a398f8e27
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.cpp
@@ -0,0 +1,133 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_point_cluster.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+#include "rubberband_handle_proxy.h"
+#include "transient_tactical_symbol.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandPointCluster::InternalData
+   {
+      Q_DISABLE_COPY(InternalData)
+      InternalData() = default;
+      SituationMap::RefPointer<TransientTacticalSymbol>  _previewSymbol;
+   }; /* RubberbandMultiPointFeature::InternalData */
+
+
+   RubberbandPointCluster::RubberbandPointCluster( SituationMap::Map * map, QObject * parent, bool isActive ) : RubberbandPointCluster( map, INT_MAX, parent, isActive ) {;}
+
+
+   RubberbandPointCluster::RubberbandPointCluster(  SituationMap::Map * map, unsigned int maxCoordinates, QObject * parent, bool isActive )
+      : RubberbandPointFeature(map,parent,isActive), _internal(new InternalData()), _minimalPointCount(1)
+   {
+      _maximalPointCount = maxCoordinates;
+   } /* RubberbandPointCluster::RubberbandPointCluster */
+
+
+   RubberbandPointCluster::~RubberbandPointCluster()
+   {
+      delete _internal;
+   } /* RubberbandPointCluster::~RubberbandPointCluster */
+
+
+   void RubberbandPointCluster::activateButtons()
+   {
+      _baseInternal->_hasUndoButton   = isEnabledConstructionState();
+      _baseInternal->_applyIsPossible = (static_cast<unsigned int>(Rubberband::_internal->_handleList.size()) >= _minimalPointCount);
+      _baseInternal->_undoIsPossible  = (isEnabledConstructionState() && (static_cast<unsigned int>(Rubberband::_internal->_handleList.size()) > _minimalPointCount));
+      Rubberband::activateButtons();  
+   } /* RubberbandMultiPointFeature::activateButton */
+
+
+   void RubberbandPointCluster::setCoordinateVector(const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      RubberbandPointFeature::setCoordinateVector( coordinateVector, cs );
+      enableModificationState();
+      activateButtons();
+   } /* RubberbandPointCluster::setCoordinateVector */
+
+
+   bool RubberbandPointCluster::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      bool ok = false;
+      
+      if (rubberbandIsAlive())
+      {
+         ok = RubberbandPointFeature::setCoordinateAction(causer,x,y);
+         if (ok) activateButtons();
+      }
+      return ok;
+   } /* RubberbandPointCluster::setCoordinateAction */
+
+
+   void RubberbandPointCluster::update()
+   {
+      RubberbandPointFeature::update();
+      if (!_previewSidc.isEmpty())
+      {
+         if (!_internal->_previewSymbol)
+         {
+            _internal->_previewSymbol = new TransientTacticalSymbol( static_cast<MapImpl*>(_baseInternal->_map.data()), _previewSidc );
+         }
+               
+         QVector<RubberbandHandle::RubberbandCoordinate> coordinateList;
+         coordinateList.reserve( Rubberband::_internal->_handleList.size() );
+
+         for (auto handlePoint : qAsConst(Rubberband::_internal->_handleList))
+         {
+            RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handlePoint.get());
+            if (handlePointPtr)
+            {
+               coordinateList.append( handlePointPtr->getCoordinate() );
+            }
+         }
+         _internal->_previewSymbol->update( coordinateList );
+      }
+      else _internal->_previewSymbol = nullptr;
+   } /* RubberbandPointCluster::update */
+
+
+   bool RubberbandPointCluster::deleteAction(AbstractEventDispatcher * causer, int x, int y)
+   {
+     if (rubberbandIsAlive())
+     {
+       if (static_cast<unsigned int>(RubberbandPointFeature::_internal->_handleList.size()) <= _minimalPointCount) return true;
+       return RubberbandPointFeature::deleteAction(causer,x,y);
+     }
+     return false;
+   } /* RubberbandPointCluster::deleteAction */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.h
new file mode 100755
index 000000000..839206aa1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_cluster.h
@@ -0,0 +1,102 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multiple point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   18.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <limits>
+
+#include "rubberband_point_feature.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointCluster rubberband_point_cluster.h
+     @brief Implementation of a rubberband to input single coodinates for building point feature clusters
+     @see Rubberband, RubberbandPointFeature
+   */
+   class SITUATIONMAP_EXPORT RubberbandPointCluster : public RubberbandPointFeature
+   {
+       Q_OBJECT
+        /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+
+         RubberbandPointCluster( SituationMap::Map * map, QObject * parent, bool isActive = true );
+
+         RubberbandPointCluster( SituationMap::Map * map
+                               , unsigned int        maxCoordinates = std::numeric_limits<unsigned int>::max()
+                               , QObject           * parent         = nullptr
+                               , bool                isActive       = true                                     );
+
+      public:
+
+         virtual ~RubberbandPointCluster();
+
+         RubberbandPointCluster(const RubberbandPointCluster &) = delete;
+         RubberbandPointCluster & operator = (const RubberbandPointCluster &) = delete;
+         /** @} */
+
+         bool setCoordinateAction( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         /**
+         Defines the minimum number of coordinates to input. Default is 1
+         */
+         inline void minimumPointCount(unsigned int n) { _minimalPointCount = (n > 0) ? n : 1; }
+
+         /**
+         Returns the setting for minimum number of coordinates to input.
+         */
+         inline unsigned int getMinimumPointCount() { return _minimalPointCount; }
+
+         void setCoordinateVector(const QVector<QPointF> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+      protected:
+
+          /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+          struct InternalData;
+
+          InternalData *   _internal;
+          unsigned int     _minimalPointCount;
+
+          void activateButtons() override;
+
+          void update() override;
+
+   }; /* RubberbandPointCluster */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.cpp
new file mode 100755
index 000000000..b5bdc3acc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.cpp
@@ -0,0 +1,312 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementationof rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_point_feature.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <Map.h>
+#include <MapGraphicsView.h>
+#include <SpatialReference.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   RubberbandPointFeature::RubberbandPointFeature(  SituationMap::Map * map, QObject * parent, bool isActive )
+      : Rubberband(map,parent,isActive), _maximalPointCount(1)
+   {
+   } /* RubberbandPointFeature::RubberbandPointFeature */
+
+
+   RubberbandPointFeature::~RubberbandPointFeature()
+   {
+   } /* RubberbandPointFeature::~RubberbandPointFeature */
+
+
+   QVector<QPointF> RubberbandPointFeature::coordinateVector( CoordinateSystem cs ) const
+   {
+      QVector<QPointF> coordinateVector;
+      coordinateVector.reserve(_internal->_handleList.size());
+
+      for (auto handle : qAsConst(_internal->_handleList))
+      {
+         RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+         coordinateVector.push_back(projectCoordinateFromMap( cs, handlePointPtr->getCoordinate()._mapCoordinate ));
+      }
+      return coordinateVector;
+   } /* RubberbandPointFeature::coordinateVector */
+
+   QVector<QPointF> RubberbandPointFeature::coordinateVectorPixel() const
+   {
+     QVector<QPointF> coordinateVector;
+     coordinateVector.reserve(_internal->_handleList.size());
+
+     for (auto handle : qAsConst(_internal->_handleList))
+     {
+        RubberbandPointHandle *handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+        coordinateVector.push_back(handlePointPtr->getPixelCoordinate());
+     }
+     return coordinateVector;
+   }
+
+
+   QPointF RubberbandPointFeature::singleCoordinate(unsigned int idx, CoordinateSystem cs ) const
+   {
+      if (idx < (unsigned int) _internal->_handleList.size())
+      {
+         const RubberbandPointHandle * handle = dynamic_cast<const RubberbandPointHandle*>(_internal->_handleList[idx].get());
+
+         return projectCoordinateFromMap( cs, handle->getCoordinate()._mapCoordinate );
+      }
+      return QPointF();
+   } /* RubberbandPointFeature::singleCoordinate */
+
+
+   void RubberbandPointFeature::setCoordinateVector(const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      _internal->_handleList.clear();
+
+      for (auto p : coordinateVector)
+      {
+         const QPointF &mapPos = projectCoordinateToMap( cs, p );
+
+         RubberbandPointHandle * handlePointPtr = new RubberbandPointHandle( _internal->_mapView
+                                                                           , _internal->_mapScene
+                                                                           , Esri::ArcGISRuntime::Point(mapPos.x(),mapPos.y(),Rubberband::_internal->_mapView->map()->spatialReference()) );
+         _internal->_handleList.append( SituationMap::RefPointer<RubberbandHandle>(handlePointPtr) );
+      }
+      update();
+   } /* RubberbandPointFeature::setCoordinateVector */
+
+
+   bool RubberbandPointFeature::selectAction( AbstractEventDispatcher * , int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         bool    eventHandled = false;
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+          if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+          _baseInternal->_lastClickPosition = scenePos;
+
+         RubberbandHandle * handlePtr = pickHandle(x,y);
+         if (handlePtr)
+         {
+            handlePtr->setSelection();
+            enableSelectedState();
+            eventHandled = true;
+         }
+
+         if (!isEnabledSelectedState())
+         {
+            if (isEnabledConstructionState())
+            {
+               if (!buttonProxyActive(scenePos))
+               {
+                  RubberbandPointHandle * handlePtr = new RubberbandPointHandle( _internal->_mapView, _internal->_mapScene, scenePos );
+
+                  _internal->_handleList.append( SituationMap::RefPointer<RubberbandHandle>(handlePtr) );
+                  handlePtr->setSelection();
+                  enableSelectedState();
+                  eventHandled = true;
+               }
+            }
+         }
+
+         if (eventHandled)
+         {
+            update();
+            deactivateButtons();
+         }
+
+
+         return  eventHandled;
+      }
+      return false;
+   } /* RubberbandPointFeature::selectAction */
+
+
+
+   bool RubberbandPointFeature::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if ((rubberbandIsAlive()) && (_internal->_mapView) && (_internal->_mapScene))
+      {
+         bool    eventHandled = false;
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         Rubberband::_internal->_lastClickPosition = scenePos;
+
+         if (isEnabledSelectedState())
+         {
+            if (_baseInternal->buttonProxyActive(scenePos)) return false;
+            for (auto handle : qAsConst(_internal->_handleList))
+            {
+               RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+               if ((handlePointPtr) && (handlePointPtr->isSelected()))
+               {
+                  handlePointPtr->setSelection(false);
+                  handlePointPtr->moveCoordinate( scenePos - _baseInternal->_lastClickPosition );
+                  eventHandled = true;
+               }
+            }
+            disenableSelectedState();
+            disenableMultiSelectedState();
+         }
+         else  if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+         if (eventHandled) update();
+
+         if ((isEnabledConstructionState()) && (_internal->_handleList.size() >= static_cast<int>(_maximalPointCount)))
+         {
+            completeStateAction( causer, x, y );
+            eventHandled = true;
+         }
+         return eventHandled;
+      }
+      return false;
+   } /* RubberbandPointFeature::setCoordinateAction */
+
+
+   bool RubberbandPointFeature::moveAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      if (rubberbandIsAlive())
+      {
+         if (!isEnabledMultiSelectedState()) deSelectHandles();
+
+         RubberbandHandle * handlePtr = pickHandle(x,y);
+         if (handlePtr)
+         {
+            handlePtr->setSelection();
+            return false;
+         }
+      }
+      return false;
+   } /* RubberbandPointFeature::moveAction */
+
+
+   bool RubberbandPointFeature::movePickedAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      if ((rubberbandIsAlive()) && (_internal->_mapView) && (_internal->_mapScene))
+      {
+         if (isEnabledSelectedState())
+         {
+            QPointF scenePos(pixel2ScenePosition(x,y));
+            QPointF deltaMove(scenePos-_baseInternal->_lastClickPosition);
+
+            _baseInternal->_lastClickPosition = scenePos;
+            
+            bool eventHandled = false;
+
+            for (auto handle : qAsConst(_internal->_handleList))
+            {
+               RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+               if ((handlePointPtr) && (handlePointPtr->isSelected()))
+               {
+                  handlePointPtr->moveCoordinate( deltaMove );
+                  eventHandled = true;
+               }
+            }
+            if (eventHandled) update();
+         }
+         return false;
+      }
+      return false;
+   } /* RubberbandPointFeature::movePickedAction */
+
+
+   bool RubberbandPointFeature::contextMenuAction( AbstractEventDispatcher*, int , int  )
+   {
+      return rubberbandIsAlive();
+   } /* RubberbandPointFeature::contextMenuAction */
+
+
+   bool RubberbandPointFeature::completeStateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (!_internal->_handleList.empty())
+      {
+         return applyAndEndAction(causer,x,y);
+      }
+      return false;
+   } /* RubberbandPointFeature::completeStateAction */
+
+
+   bool RubberbandPointFeature::undoAction( AbstractEventDispatcher*, int , int )
+   {
+      if (rubberbandIsAlive())
+      {
+         if (!_internal->_handleList.empty())
+         {
+            _internal->_handleList.pop_back();
+            update();
+            activateButtons();
+         }
+         return true;
+      }
+      return false;
+   } /*  RubberbandPointFeature::undoAction */
+
+
+   bool RubberbandPointFeature::deleteAction(AbstractEventDispatcher*, int x, int y)
+   {
+      if ((rubberbandIsAlive()) && (_internal->_mapView) && (_internal->_mapScene))
+      {
+         if ((_internal->_handleList.size() > 1) && (isEnabledSelectedState()))
+         {
+            QPointF                                                     scenePosition  = pixel2ScenePosition(x,y);
+            QList<SituationMap::RefPointer<RubberbandHandle>>::iterator handleIter     = _internal->_handleList.begin();
+
+            while (handleIter != _internal->_handleList.end())
+            {
+               if (handleIter->get()->isPositionInside(scenePosition))
+               {
+                  handleIter = _internal->_handleList.erase(handleIter);
+                  continue;
+               }
+               ++handleIter;
+            }
+            update();
+            activateButtons();
+         }
+         return true;
+      }
+      return false;
+   } /* RubberbandPointFeature::deleteAction */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.h
new file mode 100755
index 000000000..38d425bdc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature.h
@@ -0,0 +1,99 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <limits>
+
+#include "rubberband.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointFeature rubberband_point_feature.h
+     @brief Implementation of a rubberband to input single coodinates for building point features
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandPointFeature : public Rubberband
+   {
+       Q_OBJECT
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+         friend class RubberbandFactory;
+         friend class RubberbandPointCluster;
+
+         explicit RubberbandPointFeature(  SituationMap::Map * map, QObject * parent = nullptr, bool isActive = true );
+
+      public:
+         ~RubberbandPointFeature();
+         /** @} */
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         /**
+           Defines the maximum number of coordinates to input. Default is 1
+         */
+         inline void maximumPointCount(unsigned int n) { _maximalPointCount = (n > 0) ? n : std::numeric_limits<unsigned int>::max(); }
+
+         /**
+           Returns the setting for maximum number of coordinates to input.
+         */
+         inline unsigned int getMaximumPointCount() { return _maximalPointCount; }
+
+
+         QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+         QVector<QPointF> coordinateVectorPixel() const;
+
+         QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         void setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+      protected:
+
+         virtual bool buttonProxyActive( const QPointF & scenePos) const { Q_UNUSED(scenePos); return false; }
+
+
+         unsigned int    _maximalPointCount;
+
+
+   }; /* RubberbandPointFeature */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.cpp
new file mode 100755
index 000000000..a10e4fbd8
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.cpp
@@ -0,0 +1,272 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geometry in 3d
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include <limits>
+
+#include "rubberband_point_feature_3d.h"
+#include "rubberband_base_internal.h"
+
+#include <Map/map.h>
+#include <Map/layer_factory.h>
+
+#include <MapImpl/map_impl.h>
+#include <MapImpl/coordinate_translation.h>
+#include <MapImpl/screen_to_location_helper.h>
+
+#include <GraphicalObjects/graphical_object_picture_marker.h>
+
+#include <QtCore/QPoint>
+
+
+namespace SituationMap { namespace RB
+{
+
+  struct RubberbandPointFeature3D::InternalData
+  {
+      QPoint                         m_screenCordinate = QPoint(std::numeric_limits<int>::min(),std::numeric_limits<int>::min());
+      Point3D                        m_position;
+      GraphicalObjectPictureMarker * m_marker          = nullptr;
+      ScreenToLocationHelper       * m_screenToMap     = nullptr;
+      AbstractEventDispatcher      * m_causer          = nullptr;
+      bool                           m_modifyPosition  = false;
+      bool                           m_positionReady   = false;
+
+      InternalData() = default;
+
+      ~InternalData()
+      {
+        delete m_marker;
+        delete m_screenToMap;
+      }
+  }; // RubberbandPointFeature3D::InternalData
+
+
+  RubberbandPointFeature3D::RubberbandPointFeature3D(  SituationMap::Map * map, QObject * parent, bool isActive )
+    : Rubberband3D(map,parent,isActive)
+    , _internal( new RubberbandPointFeature3D::InternalData() )
+  {
+    MapImpl                                 *mapImpl       = static_cast<MapImpl*>(_baseInternal->_map.data());
+    Esri::ArcGISRuntime::SceneGraphicsView  *view          = mapImpl->getEsriSceneGraphicsView();
+
+    _internal->m_screenToMap = new ScreenToLocationHelper(view);
+    connect( _internal->m_screenToMap, &ScreenToLocationHelper::mouseScenePositionChanged, this, &RubberbandPointFeature3D::onMapPosition  );
+
+  } // RubberbandPointFeature3D::RubberbandPointFeature3D(  SituationMap::Map * map, QObject * parent = nullptr, bool isActive )
+
+
+  RubberbandPointFeature3D::~RubberbandPointFeature3D()
+  {
+    delete _internal;
+    _internal = nullptr;
+  } // RubberbandPointFeature3D::~RubberbandPointFeature3D()
+
+
+  void RubberbandPointFeature3D::enableModificationState()
+  {
+    _internal->m_modifyPosition = true;
+    _internal->m_positionReady  = true;
+  } //  void RubberbandPointFeature3D::enableModificationState()
+
+
+  void RubberbandPointFeature3D::onMapPosition(const Point3D &mapCoordinate)
+  {
+    if (qIsNaN(mapCoordinate.x())) return; // illegal map position
+    if (qIsNaN(mapCoordinate.y())) return;
+
+    _internal->m_position = mapCoordinate;
+
+    if (nullptr == _internal->m_marker)
+    {
+      MapImpl                                 *mapImpl       = static_cast<MapImpl*>(_baseInternal->_map.data());
+      Esri::ArcGISRuntime::SceneGraphicsView  *view          = mapImpl->getEsriSceneGraphicsView();
+      Esri::ArcGISRuntime::GraphicsOverlay    *graphicsLayer = mapImpl->getGraphicsLayer(mapImpl->layerFactory().rubberbandLayer());
+
+      if (nullptr == view) return;
+
+      _internal->m_marker = new GraphicalObjectPictureMarker( view, graphicsLayer, QStringLiteral("RubberbandPointFeature3D"), INVALID_MAP_ID );
+
+      _internal->m_marker->setImage(markerImage());
+    }
+    _internal->m_marker->setOrigin( mapCoordinate );
+
+    update();
+
+    if (_internal->m_causer)
+    {
+      _internal->m_positionReady = true;
+      completeStateAction(_internal->m_causer,_internal->m_screenCordinate.x(), _internal->m_screenCordinate.y());
+    }
+  } // void RubberbandPointFeature3D::onMapPosition(const QPointF &mapCoordinate)
+
+
+  bool RubberbandPointFeature3D::selectAction(AbstractEventDispatcher *, int x, int y)
+  {
+    if (rubberbandIsAlive())
+    {
+      if (nullptr ==_internal->m_causer)
+      {
+        _internal->m_screenCordinate = QPoint(x,y);
+        _internal->m_screenToMap->screenToLocation(x,y);
+      }
+      return true;
+    }
+    return false;
+  } // bool RubberbandPointFeature3D::selectAction(AbstractEventDispatcher *, int x, int y)
+
+
+  bool RubberbandPointFeature3D::setCoordinateAction(AbstractEventDispatcher * causer, int x, int y)
+  {
+    if (rubberbandIsAlive())
+    {
+      _internal->m_causer          = (_internal->m_modifyPosition) ? nullptr : causer;
+      _internal->m_screenCordinate = QPoint(x,y);
+      _internal->m_screenToMap->screenToLocation(x,y);
+
+      return true;
+    }
+    return false;
+  } // bool RubberbandPointFeature3D::setCoordinateAction(AbstractEventDispatcher * causer, int x, int y)
+
+
+  bool RubberbandPointFeature3D::movePickedAction(AbstractEventDispatcher *, int x, int y)
+  {
+    if (rubberbandIsAlive())
+    {
+      if (nullptr == _internal->m_causer)
+      {
+        _internal->m_screenCordinate = QPoint(x,y);
+        _internal->m_screenToMap->screenToLocation(x,y);
+      }
+      return true;
+    }
+    return false;
+  } // bool RubberbandPointFeature3D::movePickedAction(AbstractEventDispatcher *, int x, int y)
+
+
+  bool RubberbandPointFeature3D::moveAction(AbstractEventDispatcher*,int,int)
+  {
+    if (rubberbandIsAlive())
+    {
+    }
+    return false;
+  } // bool RubberbandPointFeature3D::moveAction(AbstractEventDispatcher*,int,int)
+
+
+
+  bool RubberbandPointFeature3D::completeStateAction ( AbstractEventDispatcher * causer, int x, int y )
+  {
+    if (coordinateCount() > 0)
+    {
+      return applyAndEndAction(causer,x,y);
+    }
+    return false;
+  } // bool RubberbandPointFeature3D::completeStateAction ( AbstractEventDispatcher * causer, int x, int y )
+
+
+  bool RubberbandPointFeature3D::contextMenuAction   ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+  bool RubberbandPointFeature3D::deleteAction        ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+  bool RubberbandPointFeature3D::undoAction          ( AbstractEventDispatcher*,int,int ) { return rubberbandIsAlive(); }
+
+
+  unsigned int RubberbandPointFeature3D::coordinateCount() const
+  {
+    return (_internal->m_positionReady) ? 1 : 0;
+  } // unsigned int RubberbandPointFeature3D::coordinateCount() const
+
+
+  void RubberbandPointFeature3D::update()
+  {
+    if (_internal->m_marker) _internal->m_marker->updateView();
+    externalUpdate();
+  } // RubberbandPointFeature3D::update()
+
+
+  QVector<QPointF> RubberbandPointFeature3D::coordinateVector( CoordinateSystem cs ) const
+  {
+    if (coordinateCount() > 0)
+    {
+      const QPointF &geoPos = projectCoordinateFromMap( cs, _internal->m_position.toPointF() );
+      return QVector<QPointF>() << geoPos;
+    }
+    return QVector<QPointF>();
+  } // QVector<QPointF> RubberbandPointFeature3D::coordinateVector( CoordinateSystem cs ) const
+
+
+  QPointF RubberbandPointFeature3D::singleCoordinate( unsigned int idx, CoordinateSystem cs ) const
+  {
+    Q_UNUSED(idx);
+    if (coordinateCount() > 0)
+    {
+      return coordinateVector(cs).value(0);
+    }
+    return QPointF();
+  } // QPointF RubberbandPointFeature3D::singleCoordinate( unsigned int idx, CoordinateSystem cs ) const
+
+
+  void RubberbandPointFeature3D::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+  {
+    if (coordinateVector.size() > 0)
+    {
+      const QPointF &mapPos = projectCoordinateToMap(cs,coordinateVector[0]);
+      onMapPosition( Point3D::fromQPointF(mapPos) );
+    }
+  } // void RubberbandPointFeature3D::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+
+
+  void RubberbandPointFeature3D::setCoordinateVector(const QVector<Point3D> & coordinateVector, CoordinateSystem cs )
+  {
+    if (coordinateVector.size() > 0)
+    {
+      const QPointF &mapPos = projectCoordinateToMap(cs,coordinateVector[0].toPointF());
+      _internal->m_position = Point3D(mapPos.x(),mapPos.y(),coordinateVector[0].z());
+    }
+  } // void RubberbandPointFeature3D::setCoordinateVector(const QVector<Point3D> & coordinateVector, CoordinateSystem cs )
+
+
+  QVector<Point3D> RubberbandPointFeature3D::coordinateVector3D( CoordinateSystem cs ) const
+  {
+    if (coordinateCount() > 0)
+    {
+      const QPointF &geoPos = projectCoordinateFromMap( cs, _internal->m_position.toPointF() );
+      return QVector<Point3D>() << Point3D(geoPos.x(),geoPos.y(),_internal->m_position.z());
+    }
+    return QVector<Point3D>();
+  } // QVector<Point3D> RubberbandPointFeature3D::coordinateVector3D( CoordinateSystem cs ) const
+   
+
+  Point3D RubberbandPointFeature3D::singleCoordinate3D(unsigned int idx , CoordinateSystem cs) const
+  {
+    Q_UNUSED(idx);
+    if (coordinateCount() > 0)
+    {
+      return coordinateVector3D(cs).value(0);
+    }
+    return Point3D();
+  } // Point3D RubberbandPointFeature3D::singleCoordinate3D(unsigned int idx, CoordinateSystem cs) const
+        
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.h
new file mode 100755
index 000000000..ed3f980ee
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_feature_3d.h
@@ -0,0 +1,104 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define point feature geometry in 3d
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_3d.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointFeature rubberband_point_feature.h
+     @brief Implementation of a rubberband to input single coodinates for building point features
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandPointFeature3D : public Rubberband3D
+   {
+       Q_OBJECT
+         /**
+           @name Construction & Destruction
+           @{
+         */
+
+         friend class RubberbandFactory;
+
+         explicit RubberbandPointFeature3D(  SituationMap::Map * map, QObject * parent = nullptr, bool isActive = true );
+
+      public:
+
+         ~RubberbandPointFeature3D();
+         /** @} */
+
+         bool selectAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction    ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction          ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         unsigned int coordinateCount() const override;
+
+         QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         void setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+         Point3D singleCoordinate3D( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+         QVector<Point3D> coordinateVector3D( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+          void setCoordinateVector( const QVector<Point3D> & coordinateVector, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+          void enableModificationState();
+
+      protected:
+
+         virtual bool buttonProxyActive( const QPointF & scenePos) const { Q_UNUSED(scenePos); return false; }
+
+         void update() override;
+
+         /*
+         Forward declaration of internal container class for member variables. The derived classes of Rubberband
+         often have also a declaration of InternalData for there own internal members.
+         */
+         struct InternalData;
+
+         InternalData     * _internal;
+
+      protected slots:
+
+        void onMapPosition( const Point3D &mapCoordinate );
+
+   }; /* RubberbandPointFeature3D */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.cpp
new file mode 100755
index 000000000..55087de3e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.cpp
@@ -0,0 +1,390 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_point_handle.h"
+
+#include <MathUtils/math_const.h>
+
+#include <MapGraphicsView.h>
+
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsEllipseItem>
+
+namespace SituationMap { namespace RB
+{
+
+   RubberbandPointHandle::RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                               , QGraphicsScene                       * scene
+                                               , const QPointF                        & scenePosition )
+      : RubberbandHandle(mapView,scene)
+      , _pointSymbol(nullptr)
+      , _coordinate( mapView, scenePosition )
+      , _sceneOffset(0,0)
+      , _iconPixmap(nullptr)
+      , _boundingRect(nullptr)
+   {
+      zBufferPlane( ZBufferPlane::PointHandle );
+      buildHandle( scenePosition );
+   } /* RubberbandPointHandle::RubberbandPointHandle */
+
+
+   RubberbandPointHandle::RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                               , QGraphicsScene                       * scene
+                                               , const Esri::ArcGISRuntime::Point     & mapCoordinate )
+      : RubberbandHandle(mapView,scene)
+      , _pointSymbol(nullptr)
+      , _coordinate( mapView, mapCoordinate )
+      , _sceneOffset(0,0)
+      , _iconPixmap(nullptr)
+      , _boundingRect(nullptr)
+   {
+      zBufferPlane( ZBufferPlane::PointHandle );
+      buildHandle( _coordinate._sceneCoordinate );
+   } /* RubberbandPointHandle::RubberbandPointHandle */
+
+
+      RubberbandPointHandle::RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                                   , QGraphicsScene                 * scene
+                                                   , const QPointF                  & scenePosition
+                                                   , const QPixmap                  & icon              )
+      : RubberbandHandle(mapView,scene)
+      , _pointSymbol(nullptr)
+      , _coordinate( mapView, scenePosition )
+      , _sceneOffset(0,0)
+      , _iconPixmap( new QPixmap(icon) )
+      , _boundingRect(nullptr)
+   {
+      zBufferPlane( ZBufferPlane::PointHandle );
+      buildHandle( scenePosition );
+   } /* RubberbandPointHandle::RubberbandPointHandle */
+
+
+   RubberbandPointHandle::RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView * mapView
+                                               , QGraphicsScene                       * scene
+                                               , const Esri::ArcGISRuntime::Point     & mapCoordinate
+                                               , const QPixmap                        & icon            )
+      : RubberbandHandle(mapView,scene)
+      , _pointSymbol(nullptr)
+      , _coordinate( mapView, mapCoordinate )
+      , _sceneOffset(0,0)
+      , _iconPixmap( new QPixmap(icon) )
+      , _boundingRect(nullptr)
+   {
+      zBufferPlane( ZBufferPlane::PointHandle );
+      buildHandle( _coordinate._sceneCoordinate );
+   } /* RubberbandPointHandle::RubberbandPointHandle */
+
+
+   void RubberbandPointHandle::setIcon( const QPixmap & icon )
+   {
+      if (_iconPixmap == nullptr)
+      {
+         _iconPixmap  = new QPixmap(icon);
+         if (_pointSymbol)
+         {
+           _scene->removeItem(_pointSymbol);
+           delete _pointSymbol;
+           _pointSymbol = nullptr;
+         }
+         buildHandle( _coordinate._sceneCoordinate );
+         return;
+      }
+
+      *_iconPixmap = icon;
+
+      QGraphicsPixmapItem * iconItem = static_cast<QGraphicsPixmapItem*>( _pointSymbol);
+      if (iconItem)
+      {
+         iconItem->setPixmap( *_iconPixmap );
+         QRectF bbox = iconItem->boundingRect();
+          bbox.moveCenter( _coordinate._sceneCoordinate );
+         if (_boundingRect) _boundingRect->setRect(bbox);
+      }
+      else buildHandle( _coordinate._sceneCoordinate );
+   } /* RubberbandPointHandle::setIcon */
+
+
+   void RubberbandPointHandle::buildHandle( const QPointF & scenePosition )
+   {
+      if (_scene != nullptr)
+      {
+         if (_iconPixmap != nullptr)
+         {
+            if (_iconPixmap->isNull())
+            {
+               delete _iconPixmap;
+               _iconPixmap = nullptr;
+            }
+         }
+
+         if (_iconPixmap == nullptr)
+         {
+            QGraphicsEllipseItem * kuller = new QGraphicsEllipseItem();
+
+            _pointSymbol = kuller;
+
+            if (_pointSymbol != nullptr)
+            {
+               _scene -> addItem( _pointSymbol );
+
+               kuller -> setPos( scenePosition+_sceneOffset );
+               kuller -> setRect( -qreal(_pickingRatio), -qreal(_pickingRatio), qreal(2*_pickingRatio), qreal(2*_pickingRatio) );
+               kuller -> setZValue( _zBufferValue );
+
+               kuller -> setCacheMode(QGraphicsItem::CacheMode::NoCache, QSize(_pickingRatio*2,_pickingRatio*2) );
+               kuller -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+               kuller -> setVisible( _isVisible );
+            }
+         }
+         else
+         {
+            QGraphicsPixmapItem * icon = new QGraphicsPixmapItem(*_iconPixmap);
+
+            _pointSymbol = icon;
+
+            if (_pointSymbol != nullptr)
+            {
+               _scene -> addItem( _pointSymbol );
+
+               qreal xOff = -(_iconPixmap->width()  * 0.5);
+               qreal yOff = -(_iconPixmap->height() * 0.5);
+
+               icon -> setPos( scenePosition+_sceneOffset );
+               icon -> setZValue( _zBufferValue );
+               icon -> setFlags( QGraphicsItem::ItemIgnoresTransformations );
+               icon -> setVisible( _isVisible );
+               icon -> setOffset( xOff, yOff );
+               icon -> setShapeMode( QGraphicsPixmapItem::BoundingRectShape );
+
+               QRectF bbox = icon->boundingRect();
+               bbox.moveCenter( scenePosition );
+
+               _boundingRect  = new QGraphicsRectItem( bbox );
+               _boundingRect -> setZValue(_zBufferValue-1);
+               _boundingRect -> setVisible( _isVisible );
+
+               _scene -> addItem( _boundingRect );
+
+            }
+         }
+      }
+   } /* RubberbandPointHandle::buildHandle */
+
+
+   RubberbandPointHandle::~RubberbandPointHandle()
+   {
+      delete _iconPixmap;
+      if (_scene)
+      {
+        
+        if (nullptr != _boundingRect)
+        {
+          _scene->removeItem(_boundingRect);
+          delete _boundingRect;
+        }
+
+        if (nullptr != _pointSymbol)
+        {
+          _scene->removeItem(_pointSymbol);
+          delete _pointSymbol;
+        }
+      }
+
+      _pointSymbol  = nullptr;
+      _iconPixmap   = nullptr;
+      _boundingRect = nullptr;
+
+   } /* RubberbandHandle::~Rubberbandhandle */
+
+
+   QPointF RubberbandPointHandle::getRotatedSceneOffset() const
+   {
+      auto rotate = [](const QPointF & p, qreal sinA, qreal cosA) -> QPointF { return QPointF(p.x()*cosA+p.y()*sinA,p.y()*cosA-p.x()*sinA); };
+
+      qreal mapRotatePhi = _mapView->mapRotation() * MathConst::pi / 180.0;
+
+      qreal sinMap = sin(mapRotatePhi);
+      qreal cosMap = cos(mapRotatePhi);
+
+      return rotate( _sceneOffset, sinMap, cosMap );
+   } /* RubberbandPointHandle::getRotatedSceneOffset */
+
+
+   void RubberbandPointHandle::adjustCoordinates()
+   {
+      const QPointF & rotatedSceneOffset = getRotatedSceneOffset();
+
+      if (_iconPixmap == nullptr)
+      {
+         static_cast<QGraphicsEllipseItem*>(_pointSymbol)->setPos(_coordinate.mapToScene(_mapView)+rotatedSceneOffset);
+      }
+      else
+      {
+         QGraphicsPixmapItem * icon = static_cast<QGraphicsPixmapItem*>( _pointSymbol);
+
+         const QPointF & scenePosition = _coordinate.mapToScene(_mapView);
+         icon -> setPos( scenePosition+rotatedSceneOffset );
+
+         QRectF bbox = icon->boundingRect();
+         bbox.moveCenter( scenePosition+rotatedSceneOffset );
+         _boundingRect->setRect(bbox);
+      }
+      
+      DEBUG_LOG(_logger) << LOGFUNCTION << " map-coordinate = "   << QString::number(_coordinate._mapCoordinate.x(),'f',15)   
+                                                         << " ; " << QString::number(_coordinate._mapCoordinate.y(),'f',15)
+                                        << " scene-coordinate = " << _coordinate._sceneCoordinate.x() << " ; " << _coordinate._sceneCoordinate.y();
+      emit adjusted();
+   } /* RubberbandPointHandle::onDo_adjustCoordinates */
+
+
+   void RubberbandPointHandle::adjustWindow( const QRectF& )
+   {
+      onDo_adjustCoordinates();
+   } /* RubberbandPointHandle::onDo_adjustWindow */
+
+
+   void RubberbandPointHandle::updateGraphic()
+   {
+      if (_pointSymbol)
+      {
+         if (_pointSymbol != nullptr)
+         {
+            if (_iconPixmap == nullptr)
+            {
+               QGraphicsEllipseItem * kuller = static_cast<QGraphicsEllipseItem*>( _pointSymbol);
+
+               kuller -> setPen( QPen(_drawColor) );
+
+               QRadialGradient gradient(0, 0, _pickingRatio, 0, 0);
+               QColor          gradientColor = (_isSelected) ? _selectionColor : _fillColor;
+
+               gradient.setColorAt( 0, gradientColor);
+               gradient.setColorAt( 1, QColor(gradientColor.red(), gradientColor.green(), gradientColor.blue(), 0) );
+               kuller -> setBrush( QBrush(gradient) );
+               kuller -> setVisible( _isVisible );
+            }
+            else
+            {
+               QGraphicsPixmapItem * icon = static_cast<QGraphicsPixmapItem*>( _pointSymbol);
+
+               _boundingRect -> setPen( QPen(_drawColor) );
+               const QColor &backColor = (_isSelected) ? _selectionColor : _fillColor;
+               _boundingRect -> setBrush( QBrush(backColor) );
+               _boundingRect -> setVisible( _isVisible );
+               icon          -> setVisible( _isVisible );
+            }
+         }
+      }
+   } /* RubberbandPointHandle::updateGraphic */
+
+
+   void RubberbandPointHandle::updateCoordinate(const QPointF & scenePosition)
+   {
+      const QPointF & rotatedSceneOffset = getRotatedSceneOffset();
+
+      _coordinate.updateSceneCoordinate( _mapView, scenePosition );
+
+      if (_pointSymbol != nullptr)
+      {
+         if (_iconPixmap == nullptr)
+         {
+            QGraphicsEllipseItem * kuller = static_cast<QGraphicsEllipseItem*>( _pointSymbol);
+            kuller -> setPos( scenePosition+rotatedSceneOffset );
+         }
+         else
+         {
+            QGraphicsPixmapItem * icon = static_cast<QGraphicsPixmapItem*>( _pointSymbol);
+            icon -> setPos( scenePosition+rotatedSceneOffset );
+
+            QRectF bbox = icon->boundingRect();
+            bbox.moveCenter( scenePosition+rotatedSceneOffset );
+
+            _boundingRect->setRect(bbox);
+         }
+      }
+   } /* RubberbandPointHandle::updateCoordinate */
+
+
+   void RubberbandPointHandle::updateCoordinate()
+   {
+      const QPointF & rotatedSceneOffset = getRotatedSceneOffset();
+
+      if (_pointSymbol != nullptr)
+      {
+         if (_iconPixmap == nullptr)
+         {
+            QGraphicsEllipseItem * kuller = static_cast<QGraphicsEllipseItem*>( _pointSymbol);
+            kuller -> setPos( _coordinate._sceneCoordinate+rotatedSceneOffset );
+         }
+         else
+         {
+            QGraphicsPixmapItem * icon = static_cast<QGraphicsPixmapItem*>( _pointSymbol);
+            icon -> setPos( _coordinate._sceneCoordinate+rotatedSceneOffset );
+
+            QRectF bbox = icon->boundingRect();
+
+            bbox.moveCenter( _coordinate._sceneCoordinate+rotatedSceneOffset );
+            _boundingRect->setRect(bbox);
+         }
+      }
+   } /* RubberbandPointHandle::updateCoordinate */
+
+
+   void RubberbandPointHandle::moveCoordinate(const QPointF & sceneDelta)
+   {
+      _coordinate.updateSceneCoordinate( _mapView, _coordinate._sceneCoordinate+sceneDelta );
+      updateCoordinate();
+   } /* RubberbandPointHandle::moveCoordinate */
+
+
+   void RubberbandPointHandle::setCoordinate(const  RubberbandHandle::RubberbandCoordinate & p)
+   {
+      _coordinate = p;
+      updateCoordinate();
+   } /*  RubberbandPointHandle::setCoordinate */
+
+
+   RubberbandHandle::RubberbandCoordinate RubberbandPointHandle::getCoordinate() const  { return _coordinate; }
+
+   QPointF RubberbandPointHandle::getPixelCoordinate() const
+   {
+     return _coordinate._sceneCoordinate;
+   }
+
+
+   bool RubberbandPointHandle::isPositionInside( const QPointF & scenePosition ) const
+   {
+      if (_pointSymbol)
+      {
+         return _pointSymbol->contains( _coordinate._sceneCoordinate+getRotatedSceneOffset() - scenePosition );
+      }
+      return false;
+   } /* RubberbandPointHandle::isPositionInside */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.h
new file mode 100755
index 000000000..361ad76b1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_point_handle.h
@@ -0,0 +1,114 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of base class for rubberband handles
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <QtCore/QPointF>
+
+#include "rubberband_handle.h"
+
+class QGraphicsItem;
+class QGraphicsScene;
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandPointHandle rubberband_point_handle.h
+     @brief Implementation of a point handle for rubberband internal use.
+     @see RubberbandHandle
+   */
+   class RubberbandPointHandle : public RubberbandHandle
+   {
+      Q_OBJECT
+      public:
+
+         /**
+            @name Construction & Destruction
+            @{
+         */
+         RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView*
+                              , QGraphicsScene*
+                              , const QPointF & scenePosition );
+
+         RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView*
+                              , QGraphicsScene*
+                              , const Esri::ArcGISRuntime::Point & mapCoordinate );
+
+         RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView*
+                              , QGraphicsScene*
+                              , const QPointF & scenePosition
+                              , const QPixmap & icon           );
+
+         RubberbandPointHandle( Esri::ArcGISRuntime::MapGraphicsView*
+                              , QGraphicsScene*
+                              , const Esri::ArcGISRuntime::Point & mapCoordinate
+                              , const QPixmap & icon                        );
+
+         ~RubberbandPointHandle();
+         /** @} */
+
+         void setIcon( const QPixmap & icon );
+
+         bool isPositionInside( const QPointF & scenePosition ) const override;
+         virtual void updateCoordinate( const QPointF & scenePosition );
+         virtual void moveCoordinate( const QPointF & sceneDelta );
+
+         virtual void setCoordinate( const RubberbandCoordinate & );
+         virtual RubberbandCoordinate getCoordinate() const;
+
+         QPointF getPixelCoordinate() const;
+
+         inline void setSceneOffset(const QPointF & offset) { _sceneOffset = offset; }
+
+      protected:
+
+         QGraphicsItem        * _pointSymbol;
+         RubberbandCoordinate   _coordinate;
+         QPointF                _sceneOffset;
+         QPixmap              * _iconPixmap;
+         QGraphicsRectItem    * _boundingRect;
+
+         void updateGraphic() override;
+
+         virtual void updateCoordinate();
+
+         void adjustCoordinates()            override;
+         void adjustWindow( const QRectF & ) override;
+
+      private:
+
+         QPointF getRotatedSceneOffset() const;
+
+         void buildHandle( const QPointF & scenePosition );
+
+
+
+   }; /* RubberbandPointHandle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.cpp
new file mode 100755
index 000000000..f5f4dd405
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.cpp
@@ -0,0 +1,319 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geometry with an additional width coordinate
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Linux, Windows 7, Qt 5.7. ArcGISRuntimeQt 100
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**    7.12.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_polyline_width.h"
+#include "rubberband_point_handle.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <cmath>
+
+#include <Map.h>
+#include <SpatialReference.h>
+
+
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandPolylineWidth::InternalData
+   {
+         SituationMap::RefPointer<RubberbandPointHandle>   _widthItem;
+   }; /* RubberbandPolylineWidth::InternalData*/
+
+
+   RubberbandPolylineWidth::RubberbandPolylineWidth( SituationMap::Map * map, QObject * parent )
+      : RubberbandMultiPointFeature(map,true,parent), _internal( new InternalData() )
+   {
+   } /* RubberbandPolylineWidth::RubberbandPolylineWidth */
+
+
+   RubberbandPolylineWidth::~RubberbandPolylineWidth()
+   {
+     delete _internal;
+   } /* RubberbandPolylineWidth::~RubberbandPolylineWidth */
+
+
+   void RubberbandPolylineWidth::buildWidthItem(const QPointF & mapPos1, const QPointF & mapPos2) const
+   {
+     double  dx           = mapPos2.x() - mapPos1.x();
+     double  dy           = mapPos2.y() - mapPos1.y();
+     QPointF handleMapPos = mapPos1 + QPointF(dx,dy)*0.35 + QPointF(dy,dx)*0.35;
+
+     setUpWidthItem(handleMapPos);
+   } /* RubberbandPolylineWidth::buildWidthItem */
+
+
+   void RubberbandPolylineWidth::setUpWidthItem(const QPointF & mapPos) const
+   {
+     RubberbandHandle::RubberbandCoordinate coordinate( Rubberband::_internal->_mapView, convert(mapPos,Rubberband::_internal->_mapView->map()->spatialReference()) );
+
+     _internal->_widthItem = new RubberbandPointHandle(Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, coordinate._sceneCoordinate);
+   } /* RubberbandPolylineWidth::setUpWidthItem */
+
+
+   QVector<QPointF> RubberbandPolylineWidth::coordinateVector( CoordinateSystem cs  ) const
+   {
+      QVector<QPointF> polylineCoords = RubberbandMultiPointFeature::coordinateVector(cs);
+      if (polylineCoords.size() > 1)
+      {
+        if (_internal->_widthItem == nullptr)
+        {
+           RubberbandPointHandle      * pointHandle1Ptr = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[0].get());
+           RubberbandPointHandle      * pointHandle2Ptr = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[1].get());
+           Esri::ArcGISRuntime::Point   p1 = pointHandle1Ptr->getCoordinate()._mapCoordinate;
+           Esri::ArcGISRuntime::Point   p2 = pointHandle2Ptr->getCoordinate()._mapCoordinate;
+
+           buildWidthItem( QPointF(p1.x(),p1.y()), QPointF(p2.x(),p2.y()) );
+
+        }
+        polylineCoords += projectCoordinateFromMap(cs, _internal->_widthItem->getCoordinate()._mapCoordinate);
+      }
+      return polylineCoords;
+   } /* RubberbandPolylineWidth::coordinateVector */
+
+
+   QPointF RubberbandPolylineWidth::singleCoordinate( unsigned int idx, CoordinateSystem cs ) const
+   {
+     if (static_cast<unsigned int>(Rubberband::_internal->_handleList.size()) == idx)
+     {
+       return projectCoordinateFromMap(cs, _internal->_widthItem->getCoordinate()._mapCoordinate);
+     }
+     return RubberbandMultiPointFeature::singleCoordinate(idx, cs);
+   } /* RubberbandPolylineWidth::singleCoordinate */
+
+
+   void RubberbandPolylineWidth::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      if (coordinateVector.size() > 2)
+      {
+         QVector<QPointF> lineCoords = coordinateVector;
+         setUpWidthItem( projectCoordinateToMap(cs, lineCoords.last()) );
+         lineCoords.removeLast();
+         RubberbandMultiPointFeature::setCoordinateVector(lineCoords, cs);
+
+         return;
+      }
+      if (coordinateVector.size() == 2)
+      {
+         const QPointF & mapP1 = projectCoordinateToMap(cs, coordinateVector[0]);
+         const QPointF & mapP2 = projectCoordinateToMap(cs, coordinateVector[1]);
+
+         buildWidthItem(mapP1, mapP2);
+      }
+      RubberbandMultiPointFeature::setCoordinateVector(coordinateVector,cs);
+   } /* RubberbandPolylineWidth::setCoordinateVector */
+
+
+   bool RubberbandPolylineWidth::selectAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+     if (rubberbandIsAlive() && (nullptr != _internal->_widthItem.get()))
+     {
+        _internal->_widthItem->setSelection(false);
+        QPointF scenePos(pixel2ScenePosition(x, y));
+        if (_baseInternal->buttonProxyActive(scenePos)) return false;
+        if (_internal->_widthItem->isPositionInside(scenePos))
+        {
+          _internal->_widthItem->setSelection();
+          _baseInternal->_lastClickPosition = scenePos;
+          update();
+          return true;
+        }
+     }
+     return RubberbandMultiPointFeature::selectAction(causer,x,y);
+   } /* RubberbandPolylineWidth::selectAction */
+
+
+   bool RubberbandPolylineWidth::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (rubberbandIsAlive() && (nullptr != _internal->_widthItem.get()))
+      {
+         if (_internal->_widthItem->isSelected())
+         {
+            QPointF scenePos(pixel2ScenePosition(x, y));
+            QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+
+            _internal->_widthItem->setSelection(false);
+            _internal->_widthItem->moveCoordinate(deltaMove);
+            update();
+            return true;
+         }
+      }
+      return RubberbandMultiPointFeature::setCoordinateAction(causer, x, y);
+   } /* RubberbandPolylineWidth::setCoordinateAction */
+
+
+   bool RubberbandPolylineWidth::movePickedAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (rubberbandIsAlive() && (nullptr != _internal->_widthItem.get()))
+      {
+         if (_internal->_widthItem->isSelected())
+         {
+            adjustConnectedPreviewPixmap(x, y);
+
+            QPointF scenePos(pixel2ScenePosition(x, y));
+            QPointF deltaMove = scenePos - _baseInternal->_lastClickPosition;
+            _baseInternal->_lastClickPosition = scenePos;
+
+            _internal->_widthItem->moveCoordinate(deltaMove);
+            update();
+            return false;
+         }
+         else
+         {
+           RubberbandPointHandle * handlePoint1Ptr = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[0].get());
+           RubberbandPointHandle * handlePoint2Ptr = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[1].get());
+
+           if (handlePoint1Ptr && handlePoint2Ptr)
+           {
+             const RubberbandDrawable::RubberbandCoordinate & loc1Start = handlePoint1Ptr->getCoordinate();
+             const RubberbandDrawable::RubberbandCoordinate & loc2Start = handlePoint2Ptr->getCoordinate();
+
+             bool ret = RubberbandMultiPointFeature::movePickedAction(causer, x, y);
+
+             const RubberbandDrawable::RubberbandCoordinate & loc1End   = handlePoint1Ptr->getCoordinate();
+             const RubberbandDrawable::RubberbandCoordinate & loc2End   = handlePoint2Ptr->getCoordinate();
+
+             QPointF deltaMove1 = loc1End._sceneCoordinate - loc1Start._sceneCoordinate;
+             QPointF deltaMove2 = loc2End._sceneCoordinate - loc2Start._sceneCoordinate;
+
+
+             if ((fabs(deltaMove1.x()) >= 1) || (fabs(deltaMove1.y()) >= 1) || (fabs(deltaMove2.x()) >= 1) || (fabs(deltaMove2.y()) >= 1))
+             {
+               /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                *
+                * First or second point have been moved. Now recalculate the coordinate of the width handle point as follows:
+                * The width handle "C" and the first two coordinates ("A","B") are providing a triangle:
+                *                   B
+                *                  / \
+                *                 /   \
+                *                /sinB \
+                *               / cosB  \
+                *              /         \
+                *             /           \
+                *         c  /             \ a
+                *           /               \
+                *          /                 \
+                *         /                   \
+                *        /                     \
+                *       / sinA             sinC \
+                *      /  cosA             cosC  \
+                *     A ------------------------- C
+                *                   b
+                * If the coordinates of "A" or "B" are changed, try to keep the ratio of angles and sides of the triangle constant. For this
+                * use some trigonometric identities.
+                * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+               auto rotate = []( const QPointF & p, qreal sinPhi, qreal cosPhi ) -> QPointF
+               {
+                 return QPointF( p.x()*cosPhi - p.y()*sinPhi, p.y()*cosPhi + p.x()*sinPhi );
+               };
+
+               QPointF  A = loc2Start._sceneCoordinate;
+               QPointF  B = loc1Start._sceneCoordinate;
+               QPointF  C = _internal->_widthItem->getCoordinate()._sceneCoordinate;
+
+               qreal a    = QLineF(B,C).length();     // side length of triangle
+               qreal b    = QLineF(A,C).length();
+               qreal c    = QLineF(A,B).length();
+               qreal cosA = (b*b+c*c-a*a)/(b*c*2);   // cosin rule
+               qreal cosB = (a*a+c*c-b*b)/(a*c*2);
+               qreal cosC = (a*a+b*b-c*c)/(a*b*2);
+               qreal sinA = sqrt(1-cosA*cosA);       // pythagorean trigonometric identity
+               qreal sinB = sqrt(1-cosB*cosB);
+               qreal sinC = sqrt(1-cosC*cosC);
+
+               // now we have all angle of the triangle, set A and B to the new coordinates ...
+
+               A = loc2End._sceneCoordinate;
+               B = loc1End._sceneCoordinate;
+
+               // ... and calculate the coordinate of C with the same ratio of angles as before ...
+
+               QPointF AB = B-A;
+
+//               c = QLineF(QPointF(0,0),AB).length();
+
+               if (sinC != 0.0)
+               {
+                 // ... rotate AB and scale it to the right length
+                 C = A + rotate(AB,sinA,cosA) * sinB / sinC;
+
+                 // the RubberbandPointHandle dosn't has a set to set scene coordinate. Using the moveCoordinate methode instead.
+
+                 _internal->_widthItem->moveCoordinate( C - _internal->_widthItem->getCoordinate()._sceneCoordinate );
+               }
+               // else could only happen when the triangle is degenrated to a line
+               update();
+             }
+             return ret;
+           }
+         }
+      }
+      return RubberbandMultiPointFeature::movePickedAction(causer, x, y);
+   } /* RubberbandPolylineWidth::movePickedAction */
+
+
+   bool RubberbandPolylineWidth::moveAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+     if (rubberbandIsAlive() && (nullptr != _internal->_widthItem.get()))
+     {
+       QPointF scenePos(pixel2ScenePosition(x, y));
+       _internal->_widthItem->setSelection( _internal->_widthItem->isPositionInside(scenePos) );
+     }
+     return RubberbandMultiPointFeature::moveAction( causer, x, y);
+
+   } /* RubberbandPolylineWidth::moveAction */
+
+
+   void RubberbandPolylineWidth::update()
+   {
+      if ((_internal->_widthItem.get() == nullptr) && (Rubberband::_internal->_handleList.size() > 1))
+      {
+         RubberbandPointHandle      * pointHandle1Ptr = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[0].get());
+         RubberbandPointHandle      * pointHandle2Ptr = static_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[1].get());
+         Esri::ArcGISRuntime::Point   p1 = pointHandle1Ptr->getCoordinate()._mapCoordinate;
+         Esri::ArcGISRuntime::Point   p2 = pointHandle2Ptr->getCoordinate()._mapCoordinate;
+
+         buildWidthItem(QPointF(p1.x(), p1.y()), QPointF(p2.x(), p2.y()));
+      }
+
+      if (_internal->_widthItem)
+      {
+         Rubberband::_internal->_handleList += static_cast<SituationMap::RefPointer<RubberbandHandle>>(_internal->_widthItem);
+         RubberbandMultiPointFeature::update();
+         Rubberband::_internal->_handleList.removeLast();
+      }
+      else RubberbandMultiPointFeature::update();
+
+   } /* RubberbandPolylineWidth::update */
+
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.h
new file mode 100755
index 000000000..759068155
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_polyline_width.h
@@ -0,0 +1,88 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geometry with an additional width coordinate
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Linux, Windows 7, Qt 5.7. ArcGISRuntimeQt 100
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**    7.12.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_multi_point_feature.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandLineHandle;
+   class RubberbandFrameHandle;
+
+   /**
+     @class RubberbandPolylineWidth rubberband_smooth_line.h
+     @brief Implementation of a multi point feature rubberband with rounded edges.
+     @see RubberbandFactory, Rubberband, RubberbandMultiPointFeature
+
+   */
+   class SITUATIONMAP_EXPORT RubberbandPolylineWidth : public RubberbandMultiPointFeature
+   {
+       Q_OBJECT
+         /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+
+         explicit RubberbandPolylineWidth(  SituationMap::Map * map, QObject * parent = nullptr );
+
+      public:
+     
+         virtual ~RubberbandPolylineWidth();
+         /** @} */
+
+         virtual QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+         virtual QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         virtual void setCoordinateVector( const QVector<QPointF> &, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+         
+         bool selectAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction   ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction         ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+      protected:
+          /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         void update() override;
+         
+         void buildWidthItem(const QPointF & mapPos1, const QPointF & mapPos2) const;
+         void setUpWidthItem(const QPointF & mapPos) const;
+   }; /* RubberbandSmoothLine */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.cpp
new file mode 100755
index 000000000..9abf85b2f
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.cpp
@@ -0,0 +1,1914 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_rectangle.h"
+#include <SpatialReference.h>
+#include "rubberband_point_handle.h"
+#include "rubberband_frame_handle.h"
+#include "rubberband_drawable.h"
+#include "drawable_painter_path.h"
+#include "rubberband_handle_proxy.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+#include <MathUtils/math_const.h>
+#include <MathUtils/simple_helper.h>
+
+#include <Map.h>
+#include <MapGraphicsView.h>
+
+#include <QtCore/QLine>
+
+
+namespace SituationMap { namespace RB
+{
+
+   static bool epsilonEqual( qreal x1, qreal x2, qreal thresholdValue = 0.001 )
+   {
+      return (fabs(x1-x2) < thresholdValue);
+   } /* epsilonEqual */
+
+   static qreal distance(const QPointF & p0, const QPointF & p1)
+   {
+      qreal dx = p1.x() - p0.x();
+      qreal dy = p1.y() - p0.y();
+      return sqrt(dx*dx+dy*dy);
+   } /* distance */
+
+
+   struct RubberbandRectangle::InternalData
+   {
+         Q_DISABLE_COPY(InternalData)
+
+         const int _initialRectPixelSize = 100;
+
+         RubberbandRectangle  * _me;
+
+         bool                   _constrainQuadratic;
+         bool                   _constrainOrthogonal;
+
+         qreal                  _minWidth;
+         qreal                  _maxWidth;
+         qreal                  _minHeight;
+         qreal                  _maxHeight;
+
+         qreal                  _rectWidth;  // referred to map coordinates
+         qreal                  _rectHeight; // referred to map coordinate
+         QPointF                _center;     // center refferd to map coordinates
+
+         QPointF                _oVec;         // normalized orientation vector according to scene coordinate system
+         QPointF                _screenCenter; // center of screen in scene coordinates
+         QPointF                _mapOVec;      // map rotation as normalized orientation vector
+
+         qreal                  _rectWidthScene;  // rectangle width in scene coordinates
+         qreal                  _rectHeightScene; // rectangle height in scene coordinates
+         QPointF                _centerScene;     // rectangle center in scene coordinates
+
+         QPointF                _constructionStart;
+
+         unsigned int           _rotationHandleSize;
+         bool                   _useDottedLineHandle;
+
+         SituationMap::RefPointer<RubberbandDrawable>    _tmpConstruction;
+
+         SituationMap::RefPointer<RubberbandFrameHandle> _frameHandle;
+         SituationMap::RefPointer<RubberbandPointHandle> _pointHandle[4];
+         SituationMap::RefPointer<RubberbandLineHandle>  _lineHandle[4];
+         SituationMap::RefPointer<RubberbandPointHandle> _rotateHandle;
+         
+         QVector<unsigned int>                           _pointIndexVector;
+
+         LOGGER_T                                        _logger;
+
+         ModificationMode                                _modificationMode;
+         MathUtils::Matrix2D                           & _lastCoordinateChange;
+
+         InternalData( MathUtils::Matrix2D &  lastCoordinateChange, RubberbandRectangle * me )
+            : _me(me)
+            , _constrainQuadratic(false)
+            , _constrainOrthogonal(false)
+            , _minWidth(0.0)
+            , _maxWidth(0.0)
+            , _minHeight(0.0)
+            , _maxHeight(0.0)
+            , _rectWidth(0.0)
+            , _rectHeight(0.0)
+            , _center()
+            , _oVec(1,0)
+            , _screenCenter(0,0)
+            , _mapOVec(1,0)
+            , _rectWidthScene(0.0)
+            , _rectHeightScene(0.0)
+            , _centerScene()
+            , _constructionStart()
+            , _rotationHandleSize(0)
+            , _useDottedLineHandle(false)
+            , _tmpConstruction()
+            , _frameHandle()
+            , _pointHandle()
+            , _lineHandle()
+            , _rotateHandle()
+            , _pointIndexVector()
+            , _logger(getLogger("RubberbandRectangle"))
+            , _modificationMode( ModificationMode::NoneRestriction )
+            , _lastCoordinateChange(lastCoordinateChange)
+         {
+         }
+
+         inline static QPointF rotateVertex( const QPointF & center, qreal x, qreal y, qreal sinA, qreal cosA )
+         {
+            return QPointF(x*cosA-y*sinA,y*cosA+x*sinA) + center;
+         } //  rotateVertex
+
+
+         void setScreenCenter( Esri::ArcGISRuntime::MapGraphicsView * mapView );
+
+         void setRotatedFrame( Esri::ArcGISRuntime::MapGraphicsView * mapView );
+
+         void updateFrame( Esri::ArcGISRuntime::MapGraphicsView * mapView, QVector<QPointF> & points );
+
+         void updateFrame( Esri::ArcGISRuntime::MapGraphicsView * mapView, const QVector<RubberbandHandle::RubberbandCoordinate> & coordinateList );
+
+
+         inline QPointF getSceneOffsetRotationHandle(qreal margin)
+         {
+            qreal sinPhi = _oVec.y(); // * _mapOVec.x() + _oVec.x() * _mapOVec.y(); // Addition-Theorem
+            qreal cosPhi = _oVec.x(); // * _mapOVec.x() - _oVec.y() * _mapOVec.y();
+
+            return  rotateVertex( QPointF(0,0),  0.0,-(margin+2*_rotationHandleSize), sinPhi, cosPhi );
+         } /* getSceneOffsetRotationHandle */
+
+
+         inline QPointF getScenePositionRotationHandle()
+         {
+            if ((_pointHandle[2]) && (_pointHandle[3]))
+            {
+               return (_pointHandle[2]->getCoordinate()._sceneCoordinate + _pointHandle[3]->getCoordinate()._sceneCoordinate) * 0.5;
+            }
+
+            QPointF p( 0.0, -_rectHeightScene*0.5);
+            return rotateVertex(_centerScene, p.x(), p.y(), _oVec.y(), _oVec.x() );
+
+         } /* getScenePositionRotationHandle */
+
+
+         inline void verifyConstrains()
+         {
+            if (_constrainQuadratic)
+            {
+               if ((_minWidth > 0) || (_minHeight > 0))
+               {
+                  if (_minWidth < _minHeight) _minWidth  = _minHeight; 
+                  else                        _minHeight = _minWidth;
+               }
+
+               if ((_maxWidth > 0) || (_maxHeight > 0))
+               {
+                  if (_maxWidth < _maxHeight) _maxHeight = _maxWidth;
+                  else                        _maxWidth  = _maxHeight;
+               }
+            }
+         } /* verifyConstrains */
+
+
+         inline void setInitialRectSize(RubberbandRectangle * rubBnd, const QPointF & scenePos)
+         {
+            const QPoint & pixelPos = rubBnd->Rubberband::_internal->_mapView ->  mapFromScene(scenePos);
+            setInitialRectSize( rubBnd, scenePos, pixelPos.x(), pixelPos.y() );
+         } /* setInitialRectSize */
+
+
+
+
+         inline void setInitialRectSize( RubberbandRectangle * rubBnd, const QPointF & scenePos, qreal pixelPosX, qreal pixelPosY )
+         {
+            verifyConstrains();
+            if ((_rectWidthScene <= 0.0) && (_rectHeightScene <= 0.0))
+            {
+               QPointF  rectSize(rubBnd->pixel2ScenePosition(pixelPosX+_initialRectPixelSize,pixelPosY+_initialRectPixelSize));
+
+               _rectWidthScene  = fabs(rectSize.x() - scenePos.x());
+               _rectHeightScene = fabs(rectSize.y() - scenePos.y());
+               setInitialRectSize( rubBnd );
+             }
+         } /* setInitialRectSize */
+
+
+         inline void setInitialRectSize(RubberbandRectangle * rubBnd, qreal sceneWidth, qreal sceneHeight)
+         {
+            verifyConstrains();
+            if ((_rectWidthScene <= 0.0) && (_rectHeightScene <= 0.0))
+            {
+               _rectWidthScene  = sceneWidth;
+               _rectHeightScene = sceneHeight;
+               setInitialRectSize( rubBnd );
+            }
+         } /* setInitialRectSize */
+
+
+         bool minimumSizeReached( int pointHandleIdx = -1, int lineHandleIdx = -1, const QPointF & loc = QPointF() )
+         {
+           qreal min           = 10;
+           bool  result        = false;
+           bool  isPointHandle = ((pointHandleIdx >= 0) && (pointHandleIdx < 4));
+           bool  isLineHandle  = ((lineHandleIdx  >= 0) && (lineHandleIdx  < 4));
+
+           if (isPointHandle ^ isLineHandle)
+           {
+             qreal h      = loc.y() - _centerScene.y();
+             qreal w      = loc.x() - _centerScene.x();
+
+            
+             if (lineHandleIdx >=0)
+             {
+               switch (lineHandleIdx)
+               {
+                 case 0 : if (h >  min) result = true; break;
+                 case 1 : if (w >  min) result = true; break;
+                 case 2 : if (h < -min) result = true; break;
+                 case 3 : if (w < -min) result = true; break;
+               }
+             }
+
+             if (isPointHandle)
+             {
+               switch (pointHandleIdx)
+               {
+                 case 0 : if ((w < -min) && (h >  min)) result = true; break;
+                 case 1 : if ((w >  min) && (h >  min)) result = true; break;
+                 case 2 : if ((w >  min) && (h < -min)) result = true; break;
+                 case 3 : if ((w < -min) && (h < -min)) result = true; break;
+                }
+             }
+              return result;
+           }
+           else
+           {
+             for (const auto &ph : _pointHandle) if (nullptr == ph.get()) return false;
+            
+             min -= 1;
+             if (QLineF( _pointHandle[0].get()->getCoordinate()._sceneCoordinate, _pointHandle[1].get()->getCoordinate()._sceneCoordinate ).length() < min) result = true;
+             if (QLineF( _pointHandle[0].get()->getCoordinate()._sceneCoordinate, _pointHandle[2].get()->getCoordinate()._sceneCoordinate ).length() < min) result = true;
+             if (QLineF( _pointHandle[0].get()->getCoordinate()._sceneCoordinate, _pointHandle[3].get()->getCoordinate()._sceneCoordinate ).length() < min) result = true;
+             if (QLineF( _pointHandle[1].get()->getCoordinate()._sceneCoordinate, _pointHandle[2].get()->getCoordinate()._sceneCoordinate ).length() < min) result = true;
+             if (QLineF( _pointHandle[2].get()->getCoordinate()._sceneCoordinate, _pointHandle[3].get()->getCoordinate()._sceneCoordinate ).length() < min) result = true;
+           }
+           return result;
+         } // minimumSizeReached
+
+      private:
+         inline void setInitialRectSize( RubberbandRectangle * rubBnd )
+         {
+            auto length = [](qreal x, qreal y) -> qreal { return sqrt(x*x+y*y); };
+
+            RubberbandHandle::RubberbandCoordinate   mapPointCenter( rubBnd->Rubberband::_internal->_mapView, _centerScene );
+
+            const Esri::ArcGISRuntime::Point             & mapCenter = mapPointCenter._mapCoordinate;
+
+            const Esri::ArcGISRuntime::Point               mapMaxW( mapCenter.x() + _maxWidth
+                                                                    , mapCenter.y()
+                                                                    , rubBnd->Rubberband::_internal->_mapView->map()->spatialReference() );
+
+            const Esri::ArcGISRuntime::Point               mapMinW( mapCenter.x() + _minWidth
+                                                                    , mapCenter.y()
+                                                                    , rubBnd->Rubberband::_internal->_mapView->map()->spatialReference() );
+
+            const Esri::ArcGISRuntime::Point               mapMaxH( mapCenter.x()
+                                                                    , mapCenter.y() + _maxHeight
+                                                                    , rubBnd->Rubberband::_internal->_mapView->map()->spatialReference() );
+
+            const Esri::ArcGISRuntime::Point               mapMinH( mapCenter.x()
+                                                                    , mapCenter.y() + _minHeight
+                                                                    , rubBnd->Rubberband::_internal->_mapView->map()->spatialReference() );
+
+            RubberbandHandle::RubberbandCoordinate mapPointMaxW( rubBnd->Rubberband::_internal->_mapView, mapMaxW );
+            RubberbandHandle::RubberbandCoordinate mapPointMinW( rubBnd->Rubberband::_internal->_mapView, mapMinW );
+            RubberbandHandle::RubberbandCoordinate mapPointMaxH( rubBnd->Rubberband::_internal->_mapView, mapMaxH );
+            RubberbandHandle::RubberbandCoordinate mapPointMinH( rubBnd->Rubberband::_internal->_mapView, mapMinH );
+
+            qreal maxSceneWidth  = length(mapPointMaxW._sceneCoordinate.x()-_centerScene.x(), mapPointMaxW._sceneCoordinate.y()-_centerScene.y());
+            qreal minSceneWidth  = length(mapPointMinW._sceneCoordinate.x()-_centerScene.x(), mapPointMinW._sceneCoordinate.y()-_centerScene.y());
+            qreal maxSceneHeight = length(mapPointMaxH._sceneCoordinate.x()-_centerScene.x(), mapPointMaxH._sceneCoordinate.y()-_centerScene.y());
+            qreal minSceneHeight = length(mapPointMinH._sceneCoordinate.x()-_centerScene.x(), mapPointMinH._sceneCoordinate.y()-_centerScene.y());
+
+            if ((_maxWidth  > 0) && (_rectWidthScene  > maxSceneWidth )) _rectWidthScene  = maxSceneWidth;
+            if ((_minWidth  > 0) && (_rectWidthScene  < minSceneWidth )) _rectWidthScene  = minSceneWidth;
+            if ((_maxHeight > 0) && (_rectHeightScene > maxSceneHeight)) _rectHeightScene = maxSceneHeight;
+            if ((_minHeight > 0) && (_rectHeightScene < minSceneHeight)) _rectHeightScene = minSceneHeight;
+
+            RubberbandHandle::RubberbandCoordinate  mapRectWidth ( rubBnd->Rubberband::_internal->_mapView, _centerScene + QPointF( _rectWidthScene, 0.0              ));
+            RubberbandHandle::RubberbandCoordinate  mapRectHeight( rubBnd->Rubberband::_internal->_mapView, _centerScene + QPointF( 0.0            , _rectHeightScene ));
+
+            _rectWidth  = length(  mapRectWidth._mapCoordinate.x()-mapCenter.x(),  mapRectWidth._mapCoordinate.y()-mapCenter.y() );
+            _rectHeight = length( mapRectHeight._mapCoordinate.x()-mapCenter.x(), mapRectHeight._mapCoordinate.y()-mapCenter.y() );
+            _center     = QPointF(mapCenter.x(),mapCenter.y());
+
+            rubBnd->_rectangleIsValid = true;
+         } /* setInitialRectSize */
+
+   }; /* InternalData */
+
+
+   void RubberbandRectangle::InternalData::setScreenCenter( Esri::ArcGISRuntime::MapGraphicsView * mapView )
+   {
+     qreal mapRotatePhi = mapView->mapRotation() * MathConst::pi / 180.0;
+
+     _mapOVec      = QPointF( cos(mapRotatePhi), sin(mapRotatePhi) );
+     _screenCenter = QPointF( mapView->viewport()->size().width()* 0.5,  mapView->viewport()->size().height()* 0.5 );
+
+   } /* RubberbandRectangle::InternalData::setScreenCenter */
+
+
+   void RubberbandRectangle::InternalData::setRotatedFrame( Esri::ArcGISRuntime::MapGraphicsView* )
+   {
+      // _center and unrotated _rectWidth and _rectHeight is already set from setInitialRectSize() which has been executed before
+
+      qreal   sinA = -_oVec.y(); // be carefull the scene coordinate system is contra clockwise -- sinA must be negated
+      qreal   cosA =  _oVec.x();
+      qreal   w    = _rectWidth  * 0.5;
+      qreal   h    = _rectHeight * 0.5;
+
+      QPointF p0  = MathUtils::rotate( _center + QPointF(-w,-h ), _center, sinA, cosA );
+      QPointF p1  = MathUtils::rotate( _center + QPointF( w,-h ), _center, sinA, cosA );
+      QPointF p2  = MathUtils::rotate( _center + QPointF( w, h ), _center, sinA, cosA );
+
+      _rectWidth  = distance(p1,p0);
+      _rectHeight = distance(p2,p1);
+
+   } /* RubberbandRectangle::InternalData::setRotatedFrame */
+
+
+   void RubberbandRectangle::InternalData::updateFrame(  Esri::ArcGISRuntime::MapGraphicsView * mapView, QVector<QPointF> & points )
+   {
+      DEBUG_LOG(_logger) << LOGFUNCTION << " RubberbandRectangle::InternalData::updateFrame for map-coordinates " << _oVec.x() << " ; " << _oVec.y();
+
+      qreal cosA = _oVec.x();
+      qreal sinA = _oVec.y(); // be carefull the scene coordinate system is contra clockwise -- sinA must be negated
+
+      qreal xmin =   std::numeric_limits<qreal>::infinity();
+      qreal xmax = - std::numeric_limits<qreal>::infinity();
+      qreal ymin =   std::numeric_limits<qreal>::infinity();
+      qreal ymax = - std::numeric_limits<qreal>::infinity();
+
+      for (unsigned int i = 0; i < 4; ++i)
+      {
+         const QPointF & p = MathUtils::rotate( points[i], points[0], sinA, cosA ); // rotate back to orthogonal position
+         const qreal   & x = p.x();
+         const qreal   & y = p.y();
+
+         if (x < xmin) xmin = x;
+         if (x > xmax) xmax = x;
+         if (y < ymin) ymin = y;
+         if (y > ymax) ymax = y;
+
+         DEBUG_LOG(_logger) << LOGFUNCTION << "   point " << i << " : " << p.x() << " ; " << p.y();
+      }
+
+      // set center, keep in mind that the center point must be rotated to it's real position
+      _center = MathUtils::rotate( QPointF((xmin + xmax)*0.5, (ymin + ymax)*0.5), points[0], -sinA, cosA );
+
+      if (_constrainQuadratic)
+      {
+         double  w = xmax-xmin;
+         double  h = ymax-ymin;
+
+         if (w > h) w = h;
+         if (h > w) h = w;
+
+         if ((_modificationMode != ModificationMode::RotationOnly) && (_modificationMode != ModificationMode::TranslationOnly))
+         {
+            // size of rectangle
+            _rectWidth  = w; w *= 0.5;
+            _rectHeight = h; h *= 0.5;
+         }
+
+         points[0] = MathUtils::rotate( _center + QPointF(-w,-h), _center, -sinA, cosA );
+         points[1] = MathUtils::rotate( _center + QPointF( w,-h), _center, -sinA, cosA );
+         points[2] = MathUtils::rotate( _center + QPointF( w, h), _center, -sinA, cosA );
+         points[3] = MathUtils::rotate( _center + QPointF(-w, h), _center, -sinA, cosA );
+      }
+      else
+      {
+         // size of rectangle
+         _rectWidth  = xmax-xmin;
+         _rectHeight = ymax-ymin;
+      }
+
+      QVector<QPointF>  sceneCoordinates;
+      sceneCoordinates.reserve(4);
+
+      for (unsigned int i = 0; i < 4; ++i)
+      {
+         const QPointF & p = MathUtils::rotate( points[i], points[0], sinA, cosA ); // rotate back to orthogonal position, keep in mind points are map coordinates
+         const qreal   & x = p.x();
+         const qreal   & y = p.y();
+         RubberbandHandle::RubberbandCoordinate point( mapView, Esri::ArcGISRuntime::Point( x, y, mapView->map()->spatialReference() ));
+         sceneCoordinates.append(point._sceneCoordinate );
+      }
+
+      RubberbandHandle::RubberbandCoordinate point( mapView, Esri::ArcGISRuntime::Point( _center.x(), _center.y(), mapView->map()->spatialReference() ));
+
+      _centerScene = point._sceneCoordinate;
+
+      xmin =   std::numeric_limits<qreal>::infinity();
+      xmax = - std::numeric_limits<qreal>::infinity();
+      ymin =   std::numeric_limits<qreal>::infinity();
+      ymax = - std::numeric_limits<qreal>::infinity();
+
+      for (const QPointF & p : qAsConst(sceneCoordinates))
+      {
+         const QPointF & unRotMap = MathUtils::rotate( p, _screenCenter, -_mapOVec.y(), _mapOVec.x() );
+         const qreal   & x        = unRotMap.x();
+         const qreal   & y        = unRotMap.y();
+
+         if (x < xmin) xmin = x;
+         if (x > xmax) xmax = x;
+         if (y < ymin) ymin = y;
+         if (y > ymax) ymax = y;
+      }
+
+
+     // size of scene rectangle
+     _rectWidthScene  = xmax-xmin;
+     _rectHeightScene = ymax-ymin;
+
+
+      DEBUG_LOG(_logger) << LOGFUNCTION << "   center = " << _centerScene.x() << " ; " << _centerScene.y()
+                                        << " _rectWidthScene = " << _rectWidthScene
+                                        << " _rectHeightScene = " << _rectHeightScene;
+
+   } /* RubberbandRectangle::InternalData::updateFrame */
+
+
+   void RubberbandRectangle::InternalData::updateFrame(  Esri::ArcGISRuntime::MapGraphicsView*, const QVector<RubberbandHandle::RubberbandCoordinate> & coordinateList )
+   {
+      if (coordinateList.isEmpty()) return;
+
+      DEBUG_LOG(_logger) << LOGFUNCTION << " RubberbandRectangle::InternalData::updateFrame for scene-coordinates " << _oVec.x() << " ; " << _oVec.y();
+
+      qreal cosA = _oVec.x();
+      qreal sinA = _oVec.y();
+
+      qreal xmin =   std::numeric_limits<qreal>::infinity();
+      qreal xmax = - std::numeric_limits<qreal>::infinity();
+      qreal ymin =   std::numeric_limits<qreal>::infinity();
+      qreal ymax = - std::numeric_limits<qreal>::infinity();
+
+      QVector<QPointF> sceneCoordinates;
+      sceneCoordinates.reserve(4);
+
+      for (unsigned int i = 0; i < 4; ++i)
+      {
+         QPointF p = MathUtils::rotate( coordinateList[i]._sceneCoordinate, coordinateList[0]._sceneCoordinate, -sinA, cosA ); // rotate back to orthogonal position
+
+         sceneCoordinates.append( p );
+
+         const QPointF & unRotMap = MathUtils::rotate( p, _screenCenter, -_mapOVec.y(), _mapOVec.x() );
+         const qreal   & x        = unRotMap.x();
+         const qreal   & y        = unRotMap.y();
+
+         if (x < xmin) xmin = x;
+         if (x > xmax) xmax = x;
+         if (y < ymin) ymin = y;
+         if (y > ymax) ymax = y;
+      }
+
+      // set center, keep in mind that the center point must be rotated to it's real position
+      const QPointF & rotMap = MathUtils::rotate( QPointF((xmin + xmax)*0.5, (ymin + ymax)*0.5), _screenCenter, _mapOVec.y(), _mapOVec.x() );
+
+      _centerScene = MathUtils::rotate( rotMap, coordinateList[0]._sceneCoordinate, sinA, cosA );
+
+     // size of scene rectangle
+     _rectWidthScene  = xmax - xmin;
+     _rectHeightScene = ymax - ymin;
+
+      xmin =  std::numeric_limits<qreal>::infinity();
+      xmax = -std::numeric_limits<qreal>::infinity();
+      ymin =  std::numeric_limits<qreal>::infinity();
+      ymax = -std::numeric_limits<qreal>::infinity();
+
+      QPointF p0(coordinateList[0]._mapCoordinate.x(), coordinateList[0]._mapCoordinate.y());
+
+      for (unsigned int i = 0; i < 4; ++i)
+      {
+        QPointF pi(coordinateList[i]._mapCoordinate.x(), coordinateList[i]._mapCoordinate.y());
+
+        QPointF p = MathUtils::rotate(pi, p0, sinA, cosA); // rotate back to orthogonal position
+
+        const qreal & x = p.x();
+        const qreal & y = p.y();
+
+        if (x < xmin) xmin = x;
+        if (x > xmax) xmax = x;
+        if (y < ymin) ymin = y;
+        if (y > ymax) ymax = y;
+      }
+
+      qreal   sRectWidth  = _rectWidth;
+      qreal   sRectHeight = _rectHeight;
+
+      // size of rectangle
+      _rectWidth  = xmax - xmin;
+      _rectHeight = ymax - ymin;
+
+      QPointF lastCenter = _center;
+
+      _center = MathUtils::rotate(QPointF((xmin + xmax)*0.5, (ymin + ymax)*0.5), p0, -sinA, cosA);
+
+       DEBUG_LOG(_logger) << LOGFUNCTION << " centerScene = " << _centerScene.x() << " ; " << _centerScene.y() << " _rectWidthScene = " << _rectWidthScene << " _rectHeightScene = " << _rectHeightScene;
+       DEBUG_LOG(_logger) << LOGFUNCTION << " center      = " << _center.x()      << " ; " << _center.y()      << " _rectWidth      = " << _rectWidth      << " _rectHeight      = " << _rectHeight     ;
+
+       sRectWidth  = _rectWidth  / sRectWidth;
+       sRectHeight = _rectHeight / sRectHeight;
+
+       if (!_lastCoordinateChange.isRotation()) // _lastCoordinateChange.isIdentity())
+       {
+         // move center to origin
+         _lastCoordinateChange.putTranslation( -lastCenter );
+
+         // do scaling
+         _lastCoordinateChange.putScale( QPointF(sRectWidth,sRectHeight), QPointF(cosA,sinA) );
+
+         // move back to new center
+         _lastCoordinateChange.putTranslation( _center );
+       }
+
+   } /* RubberbandRectangle::InternalData::updateFrame */
+
+
+   RubberbandRectangle::RubberbandRectangle(SituationMap::Map * map, QObject * parent)
+     : Rubberband(map,parent)
+     , _internal(new InternalData(_lastCoordinateChange,this))
+     , _rectangleIsValid(false)
+     , _lastCoordinateChange()
+   {
+   } /* RubberbandRectangle::RubberbandRectangle */
+
+
+   RubberbandRectangle::~RubberbandRectangle()
+   {
+     delete _internal;
+   } /* RubberbandRectangle::~RubberbandRectangle */
+
+
+   void RubberbandRectangle::setModificationMode( ModificationMode mode )   { _internal->_modificationMode = mode; }
+
+
+   bool RubberbandRectangle::rectangleIsValid() const { return _rectangleIsValid; }
+
+
+   void RubberbandRectangle::minWidth(qreal x)   { _internal->_minWidth  = (x > 0) ? x : 0.0; }
+   void RubberbandRectangle::maxWidth(qreal x)   { _internal->_maxWidth  = (x > 0) ? x : 0.0; }
+   void RubberbandRectangle::minHeight(qreal x)  { _internal->_minHeight = (x > 0) ? x : 0.0; }
+   void RubberbandRectangle::maxHeight(qreal x)  { _internal->_maxHeight = (x > 0) ? x : 0.0; }
+
+
+   QPointF RubberbandRectangle::getSceneCenter() const { return _internal->_centerScene; }
+   qreal   RubberbandRectangle::getSceneWidth()  const { return _internal->_rectWidthScene; }
+   qreal   RubberbandRectangle::getSceneHeight() const { return _internal->_rectHeightScene; }
+
+   QPointF RubberbandRectangle::getCenter() const { return _internal->_center; }
+   qreal   RubberbandRectangle::getWidth()  const { return _internal->_rectWidth; }
+   qreal   RubberbandRectangle::getHeight() const { return _internal->_rectHeight; }
+
+   void RubberbandRectangle::getSceneRotation( qreal & sinA, qreal & cosA ) const { sinA = -_internal->_oVec.y()   ; cosA = _internal->_oVec.x();    }
+   void RubberbandRectangle::getMapRotation  ( qreal & sinA, qreal & cosA ) const { sinA = -_internal->_mapOVec.y(); cosA = _internal->_mapOVec.x(); }
+
+   void RubberbandRectangle::useDottedLineHandles(bool on)
+   {
+     _internal->_useDottedLineHandle = on;
+   } /* RubberbandRectangle::useDottedLineHandles */
+
+
+   void RubberbandRectangle::setButtonPosition()
+   {
+      QPointF buttonPos(0, 0);
+
+      if (Rubberband::_internal->_handleList.size() == 4)
+      {
+         for (unsigned int i = 0; i < 4; ++i)
+         {
+            if (Rubberband::_internal->_handleList[i].valid())
+            {
+               RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[i].get());
+               const QPointF         & p = handlePointPtr->getCoordinate()._sceneCoordinate;
+
+               if (i > 0)
+               {
+                  if ((p.x() == buttonPos.x()) && (p.y() >= buttonPos.y()))
+                  {
+                     buttonPos = p;
+                  }
+                  else if (p.x() > buttonPos.x()) buttonPos = p;
+               }
+               else buttonPos = p;
+            }
+         }
+      }
+      else buttonPos = InternalData::rotateVertex( _internal->_centerScene, _internal->_rectWidthScene*0.5, _internal->_rectHeightScene*0.5, _internal->_oVec.y(), fabs(_internal->_oVec.x()) );
+
+      _baseInternal->_buttonProxy->setPos( QPointF(buttonPos.x(),buttonPos.y()) );
+   } /* RubberbandRectangle::setButtonPosition */
+
+
+   void RubberbandRectangle::activateButtons()
+   {
+      if (isEnabledModificationState())
+      {
+         _baseInternal->_hasUndoButton   = false;
+         _baseInternal->_applyIsPossible = true;
+         _baseInternal->_undoIsPossible  = false;
+
+         Rubberband::activateButtons();
+         _baseInternal->_buttonProxy->setRotateSceneOffset(false);
+         setButtonPosition();
+         _baseInternal->_buttonProxy->show();
+      }
+      else Rubberband::deactivateButtons();
+   } /* RubberbandRectangle::activateButtons */
+
+
+
+#include "./Rubberbands/winkel_icon.xpm"
+
+   void RubberbandRectangle::constructHandles()
+   {
+      _internal->setScreenCenter( Rubberband::_internal->_mapView );
+      _internal->verifyConstrains();
+
+      // remove existing handles
+      Rubberband::_internal->_handleList.clear();
+
+      if ((_internal->_modificationMode != ModificationMode::RotationOnly) && (_internal->_modificationMode != ModificationMode::TranslationOnly))
+      {
+         qreal w2   = _internal->_rectWidth  * 0.5;
+         qreal h2   = _internal->_rectHeight * 0.5;
+         qreal sinA = _internal->_oVec.y();
+         qreal cosA = _internal->_oVec.x();
+
+         QPointF p0 = InternalData::rotateVertex( _internal->_center, -w2, -h2, -sinA, cosA );
+         QPointF p1 = InternalData::rotateVertex( _internal->_center,  w2, -h2, -sinA, cosA );
+         QPointF p2 = InternalData::rotateVertex( _internal->_center,  w2,  h2, -sinA, cosA );
+         QPointF p3 = InternalData::rotateVertex( _internal->_center, -w2,  h2, -sinA, cosA );
+
+         RubberbandHandle::RubberbandCoordinate mapP0( Rubberband::_internal->_mapView, Esri::ArcGISRuntime::Point( p0.x(), p0.y(), Rubberband::_internal->_mapView->map()->spatialReference() ));
+         RubberbandHandle::RubberbandCoordinate mapP1( Rubberband::_internal->_mapView, Esri::ArcGISRuntime::Point( p1.x(), p1.y(), Rubberband::_internal->_mapView->map()->spatialReference() ));
+         RubberbandHandle::RubberbandCoordinate mapP2( Rubberband::_internal->_mapView, Esri::ArcGISRuntime::Point( p2.x(), p2.y(), Rubberband::_internal->_mapView->map()->spatialReference() ));
+         RubberbandHandle::RubberbandCoordinate mapP3( Rubberband::_internal->_mapView, Esri::ArcGISRuntime::Point( p3.x(), p3.y(), Rubberband::_internal->_mapView->map()->spatialReference() ));
+
+         _internal->_lineHandle[0] = new RubberbandLineHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP0._sceneCoordinate, mapP1._sceneCoordinate, _lineHandleWidth, _internal->_useDottedLineHandle );
+         _internal->_lineHandle[1] = new RubberbandLineHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP1._sceneCoordinate, mapP2._sceneCoordinate, _lineHandleWidth, _internal->_useDottedLineHandle );
+         _internal->_lineHandle[2] = new RubberbandLineHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP2._sceneCoordinate, mapP3._sceneCoordinate, _lineHandleWidth, _internal->_useDottedLineHandle );
+         _internal->_lineHandle[3] = new RubberbandLineHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP3._sceneCoordinate, mapP0._sceneCoordinate, _lineHandleWidth, _internal->_useDottedLineHandle );
+
+         _internal->_pointHandle[0] = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP0._mapCoordinate );
+         _internal->_pointHandle[1] = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP1._mapCoordinate );
+         _internal->_pointHandle[2] = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP2._mapCoordinate );
+         _internal->_pointHandle[3] = new RubberbandPointHandle( Rubberband::_internal->_mapView, Rubberband::_internal->_mapScene, mapP3._mapCoordinate );
+
+         for (auto ph : _internal->_pointHandle)
+         {
+            Rubberband::_internal->_handleList.append( SituationMap::RefPointer<RubberbandHandle>(ph.get()) );
+
+            ph -> setDrawColor(_handleDrawColor);
+            ph -> setFillColor( _handleFillColor );
+            ph -> setSelectionColor(_handleSelectionColor);
+         }
+
+         for (auto lh : _internal->_lineHandle)
+         {
+            lh -> setDrawColor(_handleDrawColor);
+            lh -> setFillColor( _handleFillColor );
+            lh -> setSelectionColor(_handleSelectionColor);
+         }
+      }
+
+
+      if ((_internal->_modificationMode == ModificationMode::NoneRestriction) || (_internal->_modificationMode == ModificationMode::RotationOnly))
+      {
+         static QPixmap  * icon = nullptr;
+
+         if (icon == nullptr)
+         {
+            icon = new QPixmap( QPixmap( winkelIcon_xpm ).transformed(QTransform::fromScale(0.5,0.5)) );
+         }
+
+         if (!_internal->_constrainOrthogonal)
+         {
+            _internal->_rotationHandleSize = std::max( icon->width(), icon->height() ) * 0.5;
+
+            _internal->_rotateHandle =  new RubberbandPointHandle( Rubberband::_internal->_mapView
+                                                                 , Rubberband::_internal->_mapScene
+                                                                 , _internal->getScenePositionRotationHandle(), *icon );
+
+            _internal->_rotateHandle -> setSceneOffset( _internal->getSceneOffsetRotationHandle( (_frameHandleMargin > 0) ? _frameHandleMargin : 0) );
+            _internal->_rotateHandle -> setDrawColor(_handleDrawColor);
+            _internal->_rotateHandle -> setFillColor( _handleFillColor );
+            _internal->_rotateHandle -> setSelectionColor(_handleSelectionColor );
+         }
+      }
+
+      _internal->_frameHandle = new RubberbandFrameHandle( Rubberband::_internal->_mapView
+                                                         , Rubberband::_internal->_mapScene
+                                                         , _frameHandleMargin               );
+
+
+      _internal->_frameHandle -> setDrawColor( _frameColor );
+      _internal->_frameHandle -> setFillColor( _frameFillColor );
+      _internal->_frameHandle -> setSelectionColor(_frameSelectionColor);
+      _internal->_frameHandle -> setSelectable((_internal->_modificationMode != ModificationMode::ScalingOnly) && (_internal->_modificationMode != ModificationMode::RotationOnly));
+      _internal->_frameHandle -> drawDisabled( true );
+
+      // lambda slot to update screen center and map rotation
+      connect( _internal->_frameHandle.get(), &RubberbandFrameHandle::adjusted, this, [this]()
+      {
+         this->_internal->setScreenCenter( this->Rubberband::_internal->_mapView );
+         this->setButtonPosition();
+      } );
+
+      activateButtons();
+
+   } /* RubberbandRectangle::constructHandles */
+
+
+   QVector<QPointF> RubberbandRectangle::coordinateVector( CoordinateSystem cs )              const  { return rectangleVerticies(cs); }
+   QPointF          RubberbandRectangle::singleCoordinate(unsigned int, CoordinateSystem cs ) const  { return centerPoint(cs);        }
+
+
+   void RubberbandRectangle::setCoordinateVector( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      if (coordinateVector.size() == 4)
+      {
+         rectangleVerticies( coordinateVector, cs );
+      }
+   } /* RubberbandRectangle::setCoordinateVector */
+
+
+   QPointF RubberbandRectangle::centerPoint( CoordinateSystem cs ) const
+   {
+      return projectCoordinateFromMap( cs, _internal->_center );
+   } /* RubberbandRectangle::centerPoint */
+
+
+   void RubberbandRectangle::centerPoint(const QPointF &centerPoint, CoordinateSystem cs )
+   {
+      _internal->_center = projectCoordinateToMap( cs, centerPoint );
+
+      RubberbandHandle::RubberbandCoordinate point( Rubberband::_internal->_mapView,
+                                                    Esri::ArcGISRuntime::Point( _internal->_center.x(),
+                                                                                _internal->_center.y(),
+                                                                                Rubberband::_internal->_mapView->map()->spatialReference() ));
+      _internal->_centerScene = point._sceneCoordinate;
+
+      _internal->setInitialRectSize( this, _internal->_centerScene );
+
+      _internal->setRotatedFrame( Rubberband::_internal->_mapView );
+
+      disenableConstructionState();
+      constructHandles();
+      activateButtons();
+      update();
+   } /* RubberbandRectangle::centerPoint */
+
+
+
+   void RubberbandRectangle::rectangleParameter( QPointF & center, qreal & width, qreal & height, QPointF & direction, CoordinateSystem cs )
+   {
+     center    = projectCoordinateFromMap(cs,_internal->_center);
+     width     = _internal->_rectWidth;
+     height    = _internal->_rectHeight;
+     direction = QPointF(_internal->_oVec.x(),-_internal->_oVec.y());
+
+     // projectCoordinateFromMap( CoordinateSystem::Geo, center );
+   } /* RubberbandRectangle::rectangleParameter */
+
+
+   QVector<QPointF> RubberbandRectangle::rectangleVerticies( CoordinateSystem cs ) const
+   {
+      QVector<QPointF> points(4);
+
+      for ( unsigned int i = 0; i < 4; ++i )
+      {
+        // they may be emtpy (e.g. select action, move mouse but don't release button, hit 'ENTER'
+        if (!_internal->_pointHandle[i])
+          return {};
+         const Esri::ArcGISRuntime::Point & p = _internal->_pointHandle[i]-> getCoordinate()._mapCoordinate;
+
+         if (_internal->_pointIndexVector.size() == 4)
+           points[_internal->_pointIndexVector[i]] = projectCoordinateFromMap( cs,p);
+         else
+           points[i] = projectCoordinateFromMap( cs,p);
+      }
+      return points;
+   } /* RubberbandRectangle::rectangleVerticies */
+
+
+   void RubberbandRectangle::rectangleVerticies( const QVector<QPointF> & coordinateVector, CoordinateSystem cs )
+   {
+      if (coordinateVector.size() == 4)
+      {
+         QVector<QPointF> rectPoints;
+
+         // first do coordinate projection to map coordinate system
+         rectPoints.reserve(4);
+         for (auto loc : coordinateVector)
+         {
+            rectPoints.append( projectCoordinateToMap( cs, loc ) );
+         }
+
+         // here first sort the verticies
+         _internal->_pointIndexVector.clear();
+         for (unsigned int i = 0; i< 4;++i) _internal->_pointIndexVector.append(i);
+
+         // here first sort the verticies
+
+         for (unsigned i = 0; i < 4; ++i)
+         {
+            for (unsigned k = i + 1; k < 4; ++k)
+            {
+               if (rectPoints[k].y() < rectPoints[i].y())
+               {
+                  std::swap(rectPoints[i], rectPoints[k]);
+                  std::swap(_internal->_pointIndexVector[i],_internal->_pointIndexVector[k]);
+               }
+            }
+         }
+
+         if (rectPoints[0].x() > rectPoints[1].x())
+         {
+            std::swap(rectPoints[0], rectPoints[1]);
+            std::swap(_internal->_pointIndexVector[0],_internal->_pointIndexVector[1]);
+         }
+
+         if (rectPoints[3].x() > rectPoints[2].x())
+         {
+            std::swap(rectPoints[3], rectPoints[2]);
+            std::swap(_internal->_pointIndexVector[3],_internal->_pointIndexVector[2]);
+         }
+
+         // Verticies are now sorted in counter clockwise order with beginning
+         // with bottom left verticies as shown in following sketch
+         //
+         //        3                                      2
+         //         X------------------------------------X
+         //         |                                    |
+         //         |                                    |
+         //         |                                    |
+         //         X------------------------------------X
+         //        0                                      1
+         //
+
+         // now check input verticies for beeing a rectangle
+
+         QPointF p1( (rectPoints[0] + rectPoints[3]) * 0.5); // construct 2 helpful points
+         QPointF p2( (rectPoints[1] + rectPoints[2]) * 0.5);
+
+         qreal cosA = p2.x()-p1.x();
+         qreal sinA = p2.y()-p1.y();
+
+         qreal len  = sqrt(cosA*cosA+sinA*sinA);
+
+         auto epsilonThreshold = [this](qreal distance) -> qreal
+         {
+           Esri::ArcGISRuntime::Point p1 = Rubberband::_internal->_mapView->screenToLocation(0, 0);
+           Esri::ArcGISRuntime::Point p2 = Rubberband::_internal->_mapView->screenToLocation(0, 1);
+
+           qreal dx = p2.x() - p1.x();
+           qreal dy = p2.y() - p1.y();
+
+           return sqrt(dx*dx + dy * dy) / distance;
+         };
+
+         qreal eps = epsilonThreshold(len);
+
+         cosA /= len;
+         sinA /= len;
+
+         qreal cosP = rectPoints[1].x()-rectPoints[0].x();
+         qreal sinP = rectPoints[1].y()-rectPoints[0].y();
+
+         len   = sqrt(cosP*cosP+sinP*sinP);
+         cosP /= len;
+         sinP /= len;
+
+         _rectangleIsValid = (epsilonEqual(cosA,cosP,eps) && epsilonEqual(sinA,sinP,eps));
+
+         // be careful _oVec is relative to scene coordinate system and the scene coordinate system is counter clockwise -- sinA must be negated
+
+         if (_internal->_constrainOrthogonal)
+         {
+            _internal->_oVec = QPointF(1,0);
+            if (_rectangleIsValid)
+            {
+               _rectangleIsValid = epsilonEqual( fabs(cosA-1), fabs(sinA), eps );
+            }
+         }
+         else _internal->_oVec = QPointF( cosA, -sinA );
+
+         _internal->updateFrame( Rubberband::_internal->_mapView, rectPoints );
+
+         disenableConstructionState();
+         constructHandles();
+         activateButtons();
+         update();
+
+      }
+   } /* RubberbandRectangle::rectangleVerticies */
+
+
+   void RubberbandRectangle::buildFromRectangleParamter(const QPointF & center, qreal width, qreal height, const QPointF & direction, CoordinateSystem cs)
+   {
+     auto rotate = [](const QPointF & p, qreal sinA, qreal cosA) -> QPointF
+     {
+       return QPointF(p.x()*cosA-p.y()*sinA,p.y()*cosA+p.x()*sinA);
+     };
+
+     qreal dl   = sqrt(direction.x()*direction.x()+direction.y()*direction.y());
+
+     qreal sinA = direction.y()/dl;
+     qreal cosA = direction.x()/dl;
+
+     _internal->_constrainOrthogonal = false;
+     _internal->_oVec                = QPointF( cosA, -sinA );
+
+     _internal->_pointIndexVector.clear();
+
+     QVector<QPointF> rectPoints(4);
+
+     width  *= 0.5;
+     height *= 0.5;
+
+     QPointF centerMapCoordinate = projectCoordinateToMap( cs, center );
+
+     rectPoints[0] = centerMapCoordinate + rotate( QPointF(-width,-height), sinA, cosA );
+     rectPoints[1] = centerMapCoordinate + rotate( QPointF( width,-height), sinA, cosA );
+     rectPoints[2] = centerMapCoordinate + rotate( QPointF( width, height), sinA, cosA );
+     rectPoints[3] = centerMapCoordinate + rotate( QPointF(-width, height), sinA, cosA );
+
+     _internal->updateFrame( Rubberband::_internal->_mapView, rectPoints );
+
+     disenableConstructionState();
+     constructHandles();
+     activateButtons();
+     update();
+
+   } /* RubberbandRectangle::buildFromRectangleParamter */
+
+
+   void RubberbandRectangle::buildRectangleRelativeToBottomLeftCorner(const QPointF & bottomLeft, qreal width, qreal height, const QPointF & direction, CoordinateSystem cs)
+   {
+     auto rotate = [](const QPointF & p, qreal sinA, qreal cosA) -> QPointF
+     {
+       return QPointF(p.x()*cosA-p.y()*sinA,p.y()*cosA+p.x()*sinA);
+     };
+
+     qreal dl   = sqrt(direction.x()*direction.x()+direction.y()*direction.y());
+
+     qreal sinA = direction.y()/dl;
+     qreal cosA = direction.x()/dl;
+
+     _internal->_constrainOrthogonal = false;
+     _internal->_oVec                = QPointF( cosA, -sinA );
+    
+     _internal->_pointIndexVector.clear();
+
+     QVector<QPointF> rectPoints(4);
+
+     QPointF bottomLeftMapCoordinate = projectCoordinateToMap( cs, bottomLeft );
+
+     rectPoints[0] = bottomLeftMapCoordinate;
+     rectPoints[1] = bottomLeftMapCoordinate + rotate( QPointF(width,     0), sinA, cosA );
+     rectPoints[2] = bottomLeftMapCoordinate + rotate( QPointF(width,height), sinA, cosA );
+     rectPoints[3] = bottomLeftMapCoordinate + rotate( QPointF(    0,height), sinA, cosA );
+
+     _internal->updateFrame( Rubberband::_internal->_mapView, rectPoints );
+
+     disenableConstructionState();
+     constructHandles();
+     activateButtons();
+     update();
+    
+   } /* RubberbandRectangle::buildRectangleRelativeToBottomLeftCorner */
+
+
+   void RubberbandRectangle::constrainQuadratic(bool on)
+   {
+      _internal->_constrainQuadratic = on;
+      if (isEnabledModificationState())
+      {
+         constructHandles();
+         activateButtons();
+         update();
+      }
+   } /* RubberbandRectangle::constrainQuadratic */
+
+
+   bool RubberbandRectangle::constrainQuadratic() const { return _internal->_constrainQuadratic; }
+
+
+   void RubberbandRectangle::constrainOrthogonal(bool on)
+   {
+      _internal->_constrainOrthogonal = on;
+
+      if (_internal->_constrainOrthogonal)
+      {
+         _internal->_rotateHandle = nullptr;
+         _internal->_oVec = QPointF(1,0);
+      }
+   } /* RubberbandRectangle::constrainQuadratic */
+
+
+   bool RubberbandRectangle::constrainOrthogonal() const { return _internal->_constrainOrthogonal; }
+
+
+   bool RubberbandRectangle::multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) { return selectAction       ( causer, x, y ); }
+   bool RubberbandRectangle::multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) { return setCoordinateAction( causer, x, y ); }
+
+
+   bool RubberbandRectangle::selectAction( AbstractEventDispatcher *, int x, int y )
+   {
+      if (rubberbandIsAlive())
+      {
+         bool    eventHandled = false;
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         _baseInternal->_lastClickPosition = scenePos;
+
+         if (isEnabledConstructionState())
+         {
+             _internal->_constructionStart = scenePos;
+             enableSelectedState();
+             eventHandled = true;
+         }
+         else
+         {
+            if (_internal->minimumSizeReached()) return true;
+
+            RubberbandHandle * handlePtr = pickHandle(x,y);
+            if (handlePtr)
+            {
+               handlePtr->setSelection();
+               enableSelectedState();
+               eventHandled = true;
+            }
+            else
+            {
+               for (auto lh : _internal->_lineHandle)
+               {
+                  if ((lh.valid()) && (lh->isPositionInside(scenePos)))
+                  {
+                    lh->setSelection(true);
+                    enableSelectedState();
+                    eventHandled = true;
+                  }
+               }
+
+               if ((_internal->_rotateHandle.valid()) && (_internal->_rotateHandle->isPositionInside(scenePos)))
+               {
+                  _internal->_rotateHandle->setSelection(true);
+                  enableSelectedState();
+                  eventHandled = true;
+               }
+            }
+            if (!isEnabledSelectedState())
+            {
+               // ok doesn't hit any point or line handle now looking to frame handle
+               if (_internal->_frameHandle.valid())
+               {
+                  if ((_internal->_frameHandle->isSelectable()) && (_internal->_frameHandle->isPositionInside(scenePos)))
+                  {
+                     _internal->_frameHandle->setSelection(true);
+                     enableSelectedState();
+                     eventHandled = true;
+                  }
+               }
+            }
+         }
+
+         if (eventHandled)
+         {
+            update();
+            deactivateButtons();
+         }
+         return eventHandled;
+      }
+      return false;
+   } /* RubberbandRectangle::selectAction */
+
+
+   bool RubberbandRectangle::moveAction( AbstractEventDispatcher*, int x, int y )
+   {
+      adjustConnectedPreviewPixmap(x,y);
+
+      if (rubberbandIsAlive())
+      {
+         if (!isEnabledSelectedState())
+         {
+            deSelectHandles();
+
+            if (_internal->minimumSizeReached()) return true;
+
+            if ((_internal->_pointHandle[0] == nullptr) && (_internal->_lineHandle[0] == nullptr) && (_internal->_rotateHandle == nullptr) && (_internal->_frameHandle == nullptr))
+            {
+               // constructHandles has not been called jet. Leave function and eat event
+               return false;
+            }
+
+            if (_internal->_rotateHandle.valid())
+            {
+               _internal->_rotateHandle->setSelection(false);
+            }
+            RubberbandHandle * handlePtr = pickHandle(x,y);
+            if (handlePtr)
+            {
+               handlePtr->setSelection();
+               for (auto lh : _internal->_lineHandle)
+                  lh->setSelection( false );
+            }
+            else
+            {
+               QPointF scenePos(pixel2ScenePosition(x,y));
+
+               bool selectRotationHandle =  _internal->_rotateHandle.valid() ? _internal->_rotateHandle->isPositionInside(scenePos) : false;
+
+               if (!selectRotationHandle)
+               {
+                  for (auto lh : _internal->_lineHandle)
+                  {
+                     if (lh != nullptr)
+                     {
+                        bool selectHandle = lh->isPositionInside(scenePos);
+                        lh->setSelection( selectHandle );
+                     }
+                  }
+               }
+               else _internal->_rotateHandle->setSelection(true);
+            }
+         }
+      }
+      return false;
+   } /* RubberbandRectangle::moveAction */
+
+
+   bool RubberbandRectangle::checkMinMaxConstrains(const QPointF & vertexScene, QPointF & deltaMovePtr )
+   {
+      bool ok_x = true;
+      bool ok_y = true;
+      // check min max constrains
+      RubberbandHandle::RubberbandCoordinate vertex( Rubberband::_internal->_mapView, vertexScene );
+
+      qreal mapRectWidth  = 2.0 * fabs(vertex._mapCoordinate.x() - _internal->_center.x());
+      qreal mapRectHeight = 2.0 * fabs(vertex._mapCoordinate.y() - _internal->_center.y());
+
+      if ((_internal->_minWidth  > 0) && (mapRectWidth  < _internal->_minWidth )) { ok_x = false; deltaMovePtr.setX(0); }
+      if ((_internal->_maxWidth  > 0) && (mapRectWidth  > _internal->_maxWidth )) { ok_x = false; deltaMovePtr.setX(0); }
+      if ((_internal->_minHeight > 0) && (mapRectHeight < _internal->_minHeight)) { ok_y = false; deltaMovePtr.setY(0); }
+      if ((_internal->_maxHeight > 0) && (mapRectHeight > _internal->_maxHeight)) { ok_y = false; deltaMovePtr.setY(0); }
+
+      return (ok_x || ok_y);
+
+   } /* RubberbandRectangle::checkMinMaxConstrains */
+
+
+   bool RubberbandRectangle::checkMinMaxConstrains(const QPointF & vertexScene, bool isVertical)
+   {
+     bool ok = true;
+ 
+     if (_internal->_constrainQuadratic)
+     {
+       _internal->verifyConstrains();
+       /*
+       if      (_internal->_minHeight > 0) _internal->_minWidth  = _internal->_minHeight;
+       else if (_internal->_minWidth  > 0) _internal->_minHeight = _internal->_minWidth;
+       if      (_internal->_maxHeight > 0) _internal->_maxWidth  = _internal->_maxHeight;
+       else if (_internal->_maxWidth  > 0) _internal->_maxHeight = _internal->_maxWidth;
+       */
+     }
+
+     // check min max constrains
+     RubberbandHandle::RubberbandCoordinate vertex( Rubberband::_internal->_mapView, vertexScene );
+
+     if (isVertical)
+     {
+        qreal mapRectWidth  = 2.0 * fabs(vertex._mapCoordinate.x() - _internal->_center.x());
+        if ((_internal->_minWidth  > 0) && (mapRectWidth  < _internal->_minWidth )) { ok = false; }
+        if ((_internal->_maxWidth  > 0) && (mapRectWidth  > _internal->_maxWidth )) { ok = false; }
+        return ok;
+     }
+     else
+     {
+        qreal mapRectHeight = 2.0 * fabs(vertex._mapCoordinate.y() - _internal->_center.y());
+        if ((_internal->_minHeight > 0) && (mapRectHeight < _internal->_minHeight)) { ok = false; }
+        if ((_internal->_maxHeight > 0) && (mapRectHeight > _internal->_maxHeight)) { ok = false; }
+        return ok;
+     }
+   } /* RubberbandRectangle::checkMinMaxConstrains */
+
+
+   bool RubberbandRectangle::constrainsSatisfied( RubberbandPointHandle * handlePointPtr, unsigned int handleIdx, QPointF & deltaMove, bool & constrainsComplied )
+   {
+      constrainsComplied = true;
+
+      qreal sinMap = _internal->_mapOVec.y();  // calculate rotation
+      qreal cosMap = _internal->_mapOVec.x();
+      qreal sinRec = _internal->_oVec.y();
+      qreal cosRec = _internal->_oVec.x();
+
+      qreal sinPhi = sinRec * cosMap - cosRec * sinMap; // Addition-Theorem
+      qreal cosPhi = cosRec * cosMap + sinRec * sinMap;
+
+      QPointF rotatedDeltaMove = MathUtils::rotate( deltaMove, QPointF( 0.0, 0.0 ), -sinPhi, cosPhi );  // rotate to orthogonal position relative to rectangle
+
+      if (_internal->_constrainQuadratic)
+      {
+        qreal d = floor(sqrt(0.5*(rotatedDeltaMove.x()*rotatedDeltaMove.x() + rotatedDeltaMove.y()*rotatedDeltaMove.y())));
+
+        switch (handleIdx)
+        {
+          case 0 : rotatedDeltaMove = (rotatedDeltaMove.x() < 0) ? QPointF(-d, d) : QPointF( d,-d); break;
+          case 1 : rotatedDeltaMove = (rotatedDeltaMove.x() > 0) ? QPointF( d, d) : QPointF(-d,-d); break;
+          case 2 : rotatedDeltaMove = (rotatedDeltaMove.x() > 0) ? QPointF( d,-d) : QPointF(-d, d); break;
+          case 3 : rotatedDeltaMove = (rotatedDeltaMove.x() < 0) ? QPointF(-d,-d) : QPointF( d, d); break;
+          default: break;
+        }
+      }
+
+      int dx = int((fabs(rotatedDeltaMove.x()) > 0) ? rotatedDeltaMove.x()/fabs(rotatedDeltaMove.x()) : 0 );
+      int dy = int((fabs(rotatedDeltaMove.y()) > 0) ? rotatedDeltaMove.y()/fabs(rotatedDeltaMove.y()) : 0 );
+
+      QPointF moveStepByStep(0,0);
+      QPointF resultDeltaMove(0,0);
+
+      while (constrainsComplied)
+      {
+         moveStepByStep.setX( moveStepByStep.x() + dx );
+         moveStepByStep.setY( moveStepByStep.y() + dy );
+
+         int endCondition = 2;
+
+         if (fabs(moveStepByStep.x()) >= fabs(rotatedDeltaMove.x())) { moveStepByStep.setX(rotatedDeltaMove.x()); --endCondition; }
+         if (fabs(moveStepByStep.y()) >= fabs(rotatedDeltaMove.y())) { moveStepByStep.setY(rotatedDeltaMove.y()); --endCondition; }
+
+         QPointF loc =  MathUtils::rotate( handlePointPtr-> getCoordinate()._sceneCoordinate, _internal->_centerScene, -sinPhi, cosPhi );  // rotate back to orthogonal position
+
+         loc += moveStepByStep;
+
+         constrainsComplied = _internal->minimumSizeReached( handleIdx, -1, loc );
+      
+         if (constrainsComplied)
+         {
+            QPointF tmpDeltaMove(moveStepByStep);
+
+            constrainsComplied = checkMinMaxConstrains( loc, tmpDeltaMove );
+
+            if (constrainsComplied)
+            {
+              if (fabs(tmpDeltaMove.x()) > fabs(resultDeltaMove.x())) resultDeltaMove.setX( tmpDeltaMove.x() );
+              if (fabs(tmpDeltaMove.y()) > fabs(resultDeltaMove.y())) resultDeltaMove.setY( tmpDeltaMove.y() );
+            }
+         }
+
+         if (0 == endCondition) break;
+
+      } // while
+
+      deltaMove = MathUtils::rotate( resultDeltaMove, QPointF( 0.0, 0.0 ), sinPhi, cosPhi ); 
+
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << " " << handleIdx << " deltaMove " << deltaMove.x() << " ; " << deltaMove.y() << " centerScene "
+                                    << _internal->_centerScene.x() << " ; " << _internal->_centerScene.y() << " --> " << constrainsComplied;
+
+      return (constrainsComplied || !deltaMove.isNull());
+
+   } /* RubberbandRectangle::constrainsSatisfied */
+
+
+   void RubberbandRectangle::adjustNeighbouringPoints( RubberbandPointHandle * handlePointPtr, unsigned int handleIdx, QPointF deltaMove )
+   {
+      // adjust neighbouring point handles
+
+      unsigned int beforeIdx = (handleIdx > 0) ? handleIdx-1 : 3;
+      unsigned int nextIdx   = (handleIdx < 3) ? handleIdx+1 : 0;
+
+      RubberbandPointHandle * beforePoint = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[beforeIdx].get());
+      RubberbandPointHandle * nextPoint   = dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[nextIdx  ].get());
+
+      qreal sinMap = _internal->_mapOVec.y();
+      qreal cosMap = _internal->_mapOVec.x();
+      qreal sinRec = _internal->_oVec.y();
+      qreal cosRec = _internal->_oVec.x();
+
+      qreal sinPhi = sinRec * cosMap - cosRec * sinMap; // Addition-Theorem
+      qreal cosPhi = cosRec * cosMap + sinRec * sinMap;
+
+      QPointF loc       = handlePointPtr -> getCoordinate()._sceneCoordinate;
+      QPointF beforeLoc = beforePoint    -> getCoordinate()._sceneCoordinate;
+      QPointF nextLoc   = nextPoint      -> getCoordinate()._sceneCoordinate;
+
+      loc       = MathUtils::rotate( loc      , _internal->_center, -sinPhi, cosPhi );
+      beforeLoc = MathUtils::rotate( beforeLoc, _internal->_center, -sinPhi, cosPhi );
+      nextLoc   = MathUtils::rotate( nextLoc  , _internal->_center, -sinPhi, cosPhi );
+      deltaMove = MathUtils::rotate( deltaMove, QPointF(0.0, 0.0) , -sinPhi, cosPhi );
+
+      bool beforeIsHorizontal( fabs(loc.x() - beforeLoc.x()) > fabs(loc.y() - beforeLoc.y()) );
+      bool nextIsHorizontal  ( fabs(loc.x() - nextLoc.x())   > fabs(loc.y() - nextLoc.y())   );
+
+#ifdef NEVER
+      qDebug() << "RubberbandRectangle::adjustNeibouringPoints " << deltaMove.x() << " , " << deltaMove.y();
+      qDebug() << "   before is horizontal " << beforeIsHorizontal;
+      qDebug() << "   next   is horizontal " << nextIsHorizontal;
+      qDebug() << "   point                " << loc;
+      qDebug() << "   point before         " << beforeLoc;
+      qDebug() << "   point next           " << nextLoc;
+#endif
+
+      if (beforeIsHorizontal) beforeLoc.setY( beforeLoc.y() + deltaMove.y() );
+      else                    beforeLoc.setX( beforeLoc.x() + deltaMove.x() );
+
+      if (nextIsHorizontal)   nextLoc.setY( nextLoc.y() + deltaMove.y() );
+      else                    nextLoc.setX( nextLoc.x() + deltaMove.x() );
+
+#ifdef NEVER
+      qDebug() << "   point before         " << beforeLoc;
+      qDebug() << "   point next           " << nextLoc;
+#endif
+
+      // rotate back
+      beforeLoc = MathUtils::rotate( beforeLoc, _internal->_center, sinPhi, cosPhi );
+      nextLoc   = MathUtils::rotate( nextLoc  , _internal->_center, sinPhi, cosPhi );
+
+      // store coordinates
+      beforePoint -> updateCoordinate(beforeLoc);
+      nextPoint   -> updateCoordinate(nextLoc  );
+
+   } /* RubberbandRectangle::adjustNeighbouringPoints */
+
+
+   bool RubberbandRectangle::adjustLine( QPointF & deltaMove, bool & constrainsComplied )
+   {
+      constrainsComplied = true;
+      for (unsigned i = 0; i < 4; ++i)
+      {
+         if (_internal->_lineHandle[i]->isSelected())
+         {
+            int idx0  =  i;
+            int idx1  = (i+1) % 4;
+
+            QPointF loc0 =  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx0].get())->getCoordinate()._sceneCoordinate;
+            QPointF loc1 =  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx1].get())->getCoordinate()._sceneCoordinate;
+
+            qreal sinMap = _internal->_mapOVec.y();
+            qreal cosMap = _internal->_mapOVec.x();
+            qreal sinRec = _internal->_oVec.y();
+            qreal cosRec = _internal->_oVec.x();
+
+            qreal sinPhi = sinRec * cosMap - cosRec * sinMap; // Addition-Theorem
+            qreal cosPhi = cosRec * cosMap + sinRec * sinMap;
+
+            loc0      = MathUtils::rotate( loc0     , _internal->_centerScene, -sinPhi, cosPhi );
+            loc1      = MathUtils::rotate( loc1     , _internal->_centerScene, -sinPhi, cosPhi );
+            deltaMove = MathUtils::rotate( deltaMove, QPointF( 0.0, 0.0 )    , -sinPhi, cosPhi );
+
+            bool isVertical((i%2) == 1);
+
+            int  dx                 = int( ( isVertical && (fabs(deltaMove.x()) > 0)) ? deltaMove.x()/fabs(deltaMove.x()) : 0 );
+            int  dy                 = int( (!isVertical && (fabs(deltaMove.y()) > 0)) ? deltaMove.y()/fabs(deltaMove.y()) : 0 );
+            bool doStepByStep       = ((0 != dx) || (0 != dy));
+            
+
+            QPointF moveStepByStep(0,0);
+            QPointF resultDeltaMove(0,0);
+
+            while (doStepByStep)
+            {
+               QPointF stepLoc0( loc0 );
+               QPointF stepLoc1( loc1 );
+
+               if (0 != dx)
+               {
+                 moveStepByStep.setX( moveStepByStep.x() + dx );
+                 if (fabs(moveStepByStep.x()) >= fabs(deltaMove.x())) { moveStepByStep.setX(deltaMove.x()); doStepByStep = false; }
+                 stepLoc0.setX( stepLoc0.x() + moveStepByStep.x() ); stepLoc1.setX( stepLoc1.x() + moveStepByStep.x() );
+               }
+
+               if (0 != dy)
+               {
+                 moveStepByStep.setY( moveStepByStep.y() + dy );
+                 if (fabs(moveStepByStep.y()) >= fabs(deltaMove.y())) { moveStepByStep.setY(deltaMove.y()); doStepByStep = false; }
+                 stepLoc0.setY( stepLoc0.y() + moveStepByStep.y() ); stepLoc1.setY( stepLoc1.y() + moveStepByStep.y() );
+               }
+
+               constrainsComplied = _internal->minimumSizeReached(-1,i,stepLoc0);
+           
+               if (!constrainsComplied) continue;
+
+               constrainsComplied = checkMinMaxConstrains( stepLoc0, isVertical );
+
+               if (!constrainsComplied) continue;
+
+               resultDeltaMove = moveStepByStep;
+
+               if (_internal->_constrainQuadratic)
+               {
+                  qreal h = stepLoc0.y() - _internal->_centerScene.y();
+                  qreal w = stepLoc0.x() - _internal->_centerScene.x();
+
+                  qreal d = fabs( isVertical ? w : h );
+
+                  stepLoc0 = MathUtils::rotate( QPointF(_internal->_centerScene.x() - d, _internal->_centerScene.y() + d ), _internal->_centerScene , sinPhi, cosPhi );
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[0].get())->updateCoordinate( stepLoc0 );
+
+                  stepLoc0 = MathUtils::rotate( QPointF(_internal->_centerScene.x() + d, _internal->_centerScene.y() + d ), _internal->_centerScene , sinPhi, cosPhi );
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[1].get())->updateCoordinate( stepLoc0 );
+
+                  stepLoc0 = MathUtils::rotate( QPointF(_internal->_centerScene.x() + d, _internal->_centerScene.y() - d ), _internal->_centerScene , sinPhi, cosPhi );
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[2].get())->updateCoordinate( stepLoc0 );
+
+                  stepLoc0 = MathUtils::rotate( QPointF(_internal->_centerScene.x() - d, _internal->_centerScene.y() - d ), _internal->_centerScene , sinPhi, cosPhi );
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[3].get())->updateCoordinate( stepLoc0 );
+               }
+               else
+               {
+                  stepLoc0 = MathUtils::rotate( stepLoc0, _internal->_centerScene , sinPhi, cosPhi );
+                  stepLoc1 = MathUtils::rotate( stepLoc1, _internal->_centerScene , sinPhi, cosPhi );
+
+                  // store coordinates
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx0].get())->updateCoordinate(stepLoc0);
+                  dynamic_cast<RubberbandPointHandle*>(Rubberband::_internal->_handleList[idx1].get())->updateCoordinate(stepLoc1);
+               }
+            } // while (doStepByStep)
+
+            deltaMove = MathUtils::rotate( resultDeltaMove, QPointF( 0.0, 0.0 ), sinPhi, cosPhi );
+
+            return (constrainsComplied || !deltaMove.isNull());
+         } // if handle is selected
+      } // for handle-index
+      return true;
+   } /* RubberbandRectangle::adjustLine */
+
+
+   void RubberbandRectangle::updateHandles(const QPointF & scenePos, QPointF deltaMove)
+   {
+      bool constrainsComplied = true;
+
+      if ((_internal->_rotateHandle.valid()) && _internal->_rotateHandle->isSelected())
+      {
+         qreal sinA =   scenePos.x() - _internal->_centerScene.x();
+         qreal cosA = - scenePos.y() + _internal->_centerScene.y();
+         qreal len  = sqrt(cosA*cosA+sinA*sinA);
+
+         cosA /= len;
+         sinA /= len;
+
+         for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+         {
+            RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+            if (handlePointPtr == nullptr) continue;
+
+            QPointF p = MathUtils::rotate( handlePointPtr->getCoordinate()._sceneCoordinate, _internal->_centerScene, -_internal->_oVec.y(), _internal->_oVec.x() );
+            p = MathUtils::rotate( p, _internal->_centerScene, sinA, cosA );
+            handlePointPtr->updateCoordinate( p );
+
+            p.setX( handlePointPtr->getCoordinate()._mapCoordinate.x() );
+            p.setY( handlePointPtr->getCoordinate()._mapCoordinate.y() );
+         }
+
+         qreal dSin = sinA*_internal->_oVec.x() - cosA*_internal->_oVec.y(); // addition theorem
+         qreal dCos = cosA*_internal->_oVec.x() + sinA*_internal->_oVec.y();
+
+         _lastCoordinateChange.setToIdentity();                        // clear matrix
+         _lastCoordinateChange.putTranslation( -_internal->_center );  // move center to (0,0)
+         _lastCoordinateChange.putRotate( QPointF(dCos,dSin) );        // do rotation
+         _lastCoordinateChange.putTranslation( _internal->_center );   // move center back
+
+         _internal->_oVec.setX(cosA);
+         _internal->_oVec.setY(sinA);
+
+         _baseInternal->_lastClickPosition = scenePos;
+      }
+      else
+      {
+         bool frameIsSelected( ((_internal->_frameHandle.valid()) && (_internal->_frameHandle->isSelected())) );
+         bool pointsAdjusted( false );
+
+         unsigned int handleIdx = 0;
+
+         for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+         {
+            RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+            if ((handlePointPtr) && ((handlePointPtr->isSelected()) || (frameIsSelected)))
+            {
+               pointsAdjusted = true;
+
+               if (!frameIsSelected)
+               {
+                  if (constrainsSatisfied( handlePointPtr, handleIdx, deltaMove, constrainsComplied ))
+                  {
+                     adjustNeighbouringPoints( handlePointPtr, handleIdx, deltaMove );
+
+                     /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      * Move selected handle after moving the neighbouring points because
+                      * for larger deltaMove the decision which values have to be modified
+                      * will fail if the handle has already moved to new position.
+                      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                     handlePointPtr->moveCoordinate( deltaMove );
+
+                     if (_internal->_constrainQuadratic) _baseInternal->_lastClickPosition  = scenePos;
+                     else                                _baseInternal->_lastClickPosition += deltaMove;
+                     
+                     break;  // only one handle can be selected at time
+                  }
+               }
+               else handlePointPtr->moveCoordinate( deltaMove ); // frameIsSelected == true
+            }
+            ++handleIdx;
+         }
+
+
+         if (frameIsSelected)
+         {
+            _internal->_centerScene += deltaMove;
+            _baseInternal->_lastClickPosition = scenePos;
+
+            if (Rubberband::_internal->_handleList.isEmpty())
+            {
+               /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                * Rubberband has only frame handle, we have to do some calculations to set the new center point
+                * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+               QPointF lastCenter = _internal->_center;
+
+               RubberbandHandle::RubberbandCoordinate movedCenter(Rubberband::_internal->_mapView, _internal->_centerScene );
+               _internal->_center.setX( movedCenter._mapCoordinate.x() );
+               _internal->_center.setY( movedCenter._mapCoordinate.y() );
+
+               _lastCoordinateChange.setToIdentity();                                   // clear matrix
+               _lastCoordinateChange.putTranslation( _internal->_center - lastCenter ); // set translation
+            }
+         }
+         else if ((!pointsAdjusted) && (adjustLine(deltaMove,constrainsComplied))) _baseInternal->_lastClickPosition += deltaMove;
+      }
+
+      markFailedConstrains( scenePos, !constrainsComplied );
+
+      update();
+
+   } /* RubberbandRectangle::updateHandles */
+
+
+   void RubberbandRectangle::buildTmpConstructionPath( const QPointF    & start
+                                                     , const QPointF    & end
+                                                     , QVector<QPointF> & path
+                                                     , QPointF          & sceneCenter
+                                                     , qreal            & sceneWidth
+                                                     , qreal            & sceneHeight )
+   {
+      _internal->setScreenCenter( Rubberband::_internal->_mapView );
+
+      auto length = [    ]( qreal x, qreal y ) -> qreal   { return sqrt(x*x+y*y); };
+
+      auto rotate = [this]( qreal x, qreal y, bool back ) -> QPointF
+      {
+         qreal sinPhi = (back) ? -_internal->_mapOVec.y() : _internal->_mapOVec.y();
+         qreal cosPhi = _internal->_mapOVec.x();
+
+         qreal px = x*cosPhi + y*sinPhi;
+         qreal py = y*cosPhi - x*sinPhi;
+         return QPointF(px,py);
+      }; // lambda rotate
+
+
+      RubberbandHandle::RubberbandCoordinate   mapPointStart( Rubberband::_internal->_mapView, start );
+
+      const Esri::ArcGISRuntime::Point             & mapStart = mapPointStart._mapCoordinate;
+
+      const Esri::ArcGISRuntime::Point               mapMaxW( mapStart.x() + _internal->_maxWidth
+                                                            , mapStart.y()
+                                                            , Rubberband::_internal->_mapView->map()->spatialReference() );
+
+      const Esri::ArcGISRuntime::Point               mapMinW( mapStart.x() + _internal->_minWidth
+                                                            , mapStart.y()
+                                                            , Rubberband::_internal->_mapView->map()->spatialReference() );
+
+      const Esri::ArcGISRuntime::Point               mapMaxH( mapStart.x()
+                                                            , mapStart.y() + _internal->_maxHeight
+                                                            , Rubberband::_internal->_mapView->map()->spatialReference() );
+
+      const Esri::ArcGISRuntime::Point               mapMinH( mapStart.x()
+                                                            , mapStart.y() + _internal->_minHeight
+                                                            , Rubberband::_internal->_mapView->map()->spatialReference() );
+
+      RubberbandHandle::RubberbandCoordinate   mapPointMaxW( Rubberband::_internal->_mapView, mapMaxW );
+      RubberbandHandle::RubberbandCoordinate   mapPointMinW( Rubberband::_internal->_mapView, mapMinW );
+      RubberbandHandle::RubberbandCoordinate   mapPointMaxH( Rubberband::_internal->_mapView, mapMaxH );
+      RubberbandHandle::RubberbandCoordinate   mapPointMinH( Rubberband::_internal->_mapView, mapMinH );
+
+      qreal maxSceneWidth  = length( mapPointMaxW._sceneCoordinate.x() - mapPointStart._sceneCoordinate.x(), mapPointMaxW._sceneCoordinate.y() - mapPointStart._sceneCoordinate.y() );
+      qreal minSceneWidth  = length( mapPointMinW._sceneCoordinate.x() - mapPointStart._sceneCoordinate.x(), mapPointMinW._sceneCoordinate.y() - mapPointStart._sceneCoordinate.y() );
+      qreal maxSceneHeight = length( mapPointMaxH._sceneCoordinate.x() - mapPointStart._sceneCoordinate.x(), mapPointMaxH._sceneCoordinate.y() - mapPointStart._sceneCoordinate.y() );
+      qreal minSceneHeight = length( mapPointMinH._sceneCoordinate.x() - mapPointStart._sceneCoordinate.x(), mapPointMinH._sceneCoordinate.y() - mapPointStart._sceneCoordinate.y() );
+
+      const QPointF & pe = rotate( end.x() - start.x(), end.y() - start.y(), true );
+
+      qreal w = pe.x();
+      qreal h = pe.y();
+
+      if ((_internal->_minWidth  > 0) && (minSceneWidth  > fabs(w))) w = (w>=0) ? minSceneWidth  : -minSceneWidth;
+      if ((_internal->_maxWidth  > 0) && (maxSceneWidth  < fabs(w))) w = (w>=0) ? maxSceneWidth  : -maxSceneWidth;
+      if ((_internal->_minHeight > 0) && (minSceneHeight > fabs(h))) h = (h>=0) ? minSceneHeight : -minSceneHeight;
+      if ((_internal->_maxHeight > 0) && (maxSceneHeight < fabs(h))) h = (h>=0) ? maxSceneHeight : -maxSceneHeight;
+
+      if (_internal->_constrainQuadratic)
+      {
+         if (fabs(w) > fabs(h))      h = (h >= 0) ? fabs(w) : -fabs(w);
+         else if (fabs(w) < fabs(h)) w = (w >= 0) ? fabs(h) : -fabs(h);
+      }
+
+      path << start;
+      path << start + rotate( w, 0, false );
+      path << start + rotate( w, h, false );
+      path << start + rotate( 0, h, false );
+
+      sceneWidth  = fabs(w);
+      sceneHeight = fabs(h);
+      sceneCenter = start + rotate(w*0.5,h*0.5,false);
+
+   } /* RubberbandRectangle::buildTmpConstructionPath */
+
+
+   void RubberbandRectangle::buildTmpConstruction( SituationMap::RefPointer<RubberbandDrawable> & tmpGraphic, QPointF & start, QPointF & end )
+   {
+      if (!tmpGraphic.valid())
+      {
+         tmpGraphic  = new DrawablePainterPath( Rubberband::_internal->_mapView );
+         tmpGraphic -> setDrawColor( _drawColor );
+         tmpGraphic -> setFillColor( _fillColor );
+         tmpGraphic -> setLineWidth( 1 );
+         tmpGraphic -> zBufferPlane( RubberbandDrawable::ZBufferPlane::Drawables );
+      }
+
+      QVector<QPointF> path;
+      QPointF          sceneCenter;
+      qreal            sceneWidth;
+      qreal            sceneHeight;
+
+      buildTmpConstructionPath( start, end, path, sceneCenter, sceneWidth, sceneHeight );
+
+      DrawablePainterPath * tmpPath = static_cast<DrawablePainterPath*>(tmpGraphic.get());
+
+      tmpPath -> setPath( path );
+      tmpPath -> enableClosedLine(true);
+
+   } /* RubberbandRectangle::buildTmpConstruction */
+
+
+   void RubberbandRectangle::getTmpConstructionParameter( const QPointF & start, const QPointF & end, QPointF & sceneCenter, qreal & sceneWidth, qreal & sceneHeight )
+   {
+      QVector<QPointF> path;
+
+      buildTmpConstructionPath( start, end, path, sceneCenter, sceneWidth, sceneHeight );
+
+   } /* RubberbandRectangle::getTmpConstructionParameter */
+
+
+   bool RubberbandRectangle::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      markFailedConstrains( QPointF(), false );
+
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         Rubberband::_internal->_lastClickPosition = scenePos;
+
+         if (isEnabledConstructionState())
+         {
+            if (_internal->_tmpConstruction.valid())
+            {
+               qreal sceneWidth;
+               qreal sceneHeight;
+
+               getTmpConstructionParameter( _internal->_constructionStart, scenePos, _internal->_centerScene, sceneWidth, sceneHeight );
+               _internal->setInitialRectSize( this, sceneWidth, sceneHeight );
+               _internal->_tmpConstruction = nullptr;
+
+               if (_finishAfterConstruction)
+               {
+                  disenableConstructionState();
+                  constructHandles();
+                  update();
+                  applyAndEndAction(causer,x,y);
+                  return true;
+               }
+            }
+            else
+            {
+               _internal->_centerScene = scenePos;
+
+               _internal->setInitialRectSize( this, scenePos, x, y );
+
+               // now set values in map coordinates
+            }
+
+            _internal->setRotatedFrame( Rubberband::_internal->_mapView );
+
+            disenableSelectedState();
+            disenableConstructionState();
+            constructHandles();
+            update();
+            activateButtons();
+            return true;
+         }
+         else // isEnabledConstructionState()
+         {
+            if (isEnabledSelectedState())
+            {
+               updateHandles( scenePos, scenePos-_baseInternal->_lastClickPosition );
+
+               markFailedConstrains( QPointF(), false );
+
+               for (auto lh : _internal->_lineHandle)
+               {
+                  if (lh.valid()) lh->setSelection(false);
+               }
+               if (_internal->_rotateHandle.valid()) _internal->_rotateHandle->setSelection(false);
+               if (_internal->_frameHandle.valid())  _internal->_frameHandle->setSelection(false);
+
+               disenableSelectedState();
+               disenableMultiSelectedState();
+               updateButtonPosition();
+               update();
+               activateButtons();
+               return true;
+
+            }
+            else if (_baseInternal->buttonProxyActive( scenePos )) return false;
+         }
+
+         updateButtonPosition();
+         if (isEnabledModificationState()) activateButtons();
+      }
+      return false;
+   } /* RubberbandRectangle::setCoordinateAction */
+
+
+   bool RubberbandRectangle::movePickedAction( AbstractEventDispatcher*, int x, int y )
+   {
+      if ((rubberbandIsAlive()) && (Rubberband::_internal->_mapView) && (Rubberband::_internal->_mapScene))
+      {
+         if (isEnabledConstructionState())
+         {
+            QPointF scenePos(pixel2ScenePosition(x,y));
+            if ((_internal->_tmpConstruction.valid()) || ((_internal->_constructionStart - scenePos).manhattanLength() > 5))
+            {
+               buildTmpConstruction( _internal->_tmpConstruction, _internal->_constructionStart, scenePos );
+            }
+            return true;
+         }
+         else
+         {
+            if (isEnabledSelectedState())
+            {
+               QPointF scenePos(pixel2ScenePosition(x,y));
+               updateHandles( scenePos, scenePos-_baseInternal->_lastClickPosition );
+               return true;
+            }
+         }
+      }
+      return false;
+   } /* RubberbandRectangle::movePickedAction */
+
+
+   bool RubberbandRectangle::contextMenuAction( AbstractEventDispatcher * , int , int  )
+   {
+      return rubberbandIsAlive();
+   } /* RubberbandRectangle::contextMenuAction */
+
+
+   bool RubberbandRectangle::completeStateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      if (isEnabledConstructionState())
+      {
+         // Position of rectangle is still unknown, there are no data to apply
+         return abortAction(causer,x,y);
+      }
+      return applyAndEndAction(causer,x,y);
+   } /* RubberbandRectangle::completeStateAction */
+
+
+   bool RubberbandRectangle::undoAction( AbstractEventDispatcher * , int , int )
+   {
+      return rubberbandIsAlive();
+   } /*  RubberbandRectangle::undoAction */
+
+
+   bool RubberbandRectangle::deleteAction(AbstractEventDispatcher * , int , int )
+   {
+      return rubberbandIsAlive();
+   } /* RubberbandRectangle::deleteAction */
+
+
+
+   void RubberbandRectangle::update()
+   {
+      Rubberband::update();
+
+      QVector<RubberbandHandle::RubberbandCoordinate> coordinateList;
+
+      coordinateList.reserve(4);
+
+      if (Rubberband::_internal->_handleList.count() == 4)
+      {
+         for (unsigned int i = 0; i < 4; ++i)
+         {
+            auto                    handlePoint    = Rubberband::_internal->_handleList[i];
+            RubberbandPointHandle * handlePointPtr = dynamic_cast<RubberbandPointHandle*>(handlePoint.get());
+
+            if (handlePointPtr)
+            {
+               const RubberbandHandle::RubberbandCoordinate & pos =  handlePointPtr->getCoordinate();
+
+               _internal->_lineHandle[i] -> updateCoordinate( 0, pos._sceneCoordinate );
+               _internal->_lineHandle[i] -> setDrawColor(_handleDrawColor);
+               _internal->_lineHandle[i] -> setFillColor(_handleFillColor);
+               _internal->_lineHandle[i] -> setSelectionColor(_handleSelectionColor);
+               _internal->_lineHandle[i] -> setPickingRatio( _pickingRatio );
+
+               if (i == 0) _internal->_lineHandle[ 3 ] -> updateCoordinate( 1, pos._sceneCoordinate );
+               else        _internal->_lineHandle[i-1] -> updateCoordinate( 1, pos._sceneCoordinate );
+
+               coordinateList.append(  handlePointPtr->getCoordinate() );
+            }
+         } /* for handlePoint */
+      }
+      if (_internal->_frameHandle.valid())
+      {
+         if (coordinateList.isEmpty())
+         {
+            const QPointF & center = _internal->_center;
+            qreal           w      = _internal->_rectWidth*0.5;
+            qreal           h      = _internal->_rectHeight*0.5;
+            qreal           sinPhi = -_internal->_oVec.y();
+            qreal           cosPhi = _internal->_oVec.x();
+            QPointF         p;
+
+            p = _internal->rotateVertex( center, -w, -h, sinPhi, cosPhi );
+            coordinateList += RubberbandHandle::RubberbandCoordinate( Rubberband::_internal->_mapView, convert(p,Rubberband::_internal->_mapView->map()->spatialReference()) );
+
+            p = _internal->rotateVertex( center,  w, -h, sinPhi, cosPhi );
+            coordinateList += RubberbandHandle::RubberbandCoordinate( Rubberband::_internal->_mapView, convert(p,Rubberband::_internal->_mapView->map()->spatialReference()) );
+
+            p = _internal->rotateVertex( center,  w,  h, sinPhi, cosPhi );
+            coordinateList += RubberbandHandle::RubberbandCoordinate( Rubberband::_internal->_mapView, convert(p,Rubberband::_internal->_mapView->map()->spatialReference()) );
+
+            p = _internal->rotateVertex( center, -w,  h, sinPhi, cosPhi );
+            coordinateList += RubberbandHandle::RubberbandCoordinate( Rubberband::_internal->_mapView, convert(p,Rubberband::_internal->_mapView->map()->spatialReference()) );
+         }
+
+         _internal->_frameHandle -> setDrawColor(_frameColor);
+         _internal->_frameHandle -> setFillColor(_frameFillColor);
+         _internal->_frameHandle -> setSelectionColor(_frameSelectionColor);
+         _internal->_frameHandle -> updateFrameSceneMargin( _frameHandleMargin );
+         _internal->_frameHandle -> updateFrameShape( coordinateList, _internal->_oVec.y(), _internal->_oVec.x() );
+         _internal->_frameHandle -> drawDisabled( (_frameHandleMargin < 0) );
+      }
+
+      _internal -> updateFrame( Rubberband::_internal->_mapView, coordinateList );
+
+      if (_internal->_rotateHandle.valid())
+      {
+         _internal -> _rotateHandle -> setSceneOffset( _internal->getSceneOffsetRotationHandle( (_frameHandleMargin > 0) ? _frameHandleMargin : 0 ) );
+         _internal -> _rotateHandle -> updateCoordinate( _internal->getScenePositionRotationHandle() );
+      }
+
+   } /* RubberbandRectangle::update */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.h
new file mode 100755
index 000000000..1e293b46a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_rectangle.h
@@ -0,0 +1,274 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define point feature geoemtry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband.h"
+
+#include <MathUtils/matrix2d.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandPointHandle;
+
+   /**
+     @class RubberbandRectangle rubberband_rectangle.h
+     @brief Implementation of a rectangle rubberband
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandRectangle : public Rubberband
+   {
+      Q_OBJECT
+
+         /**
+            @name Construction & Destruction
+            @}
+         */
+
+         friend class RubberbandFactory;
+         friend class RubberbandEllipse;
+         friend class RubberbandTransform;
+
+         explicit RubberbandRectangle(  SituationMap::Map * map, QObject * parent = nullptr );
+
+       public:
+
+         ~RubberbandRectangle();
+         /** @} */
+
+         bool selectAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool completeStateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool deleteAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+
+
+         /**
+           @see rectangleVerticies
+         */
+         bool coordinatesAreValid() const override { return rectangleIsValid(); }
+         /**
+           * @brief Get 4 verticies of rectangle
+           */
+         QVector<QPointF> coordinateVector( CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         /**
+           * @brief Get center point of  rectangle, see methode centerPoint
+           */
+         QPointF singleCoordinate( unsigned int idx = 0, CoordinateSystem cs = CoordinateSystem::Geo ) const override;
+
+         /**
+           * @brief Set 4 verticies of rectangle
+           */
+         void setCoordinateVector( const QVector<QPointF> &, CoordinateSystem cs = CoordinateSystem::Geo ) override;
+
+
+         /**
+           * @brief Returns center point of rectangle
+           */
+         QPointF centerPoint( CoordinateSystem cs = CoordinateSystem::Geo ) const;
+
+         /**
+           * @brief Sets center point of rectangle
+           */
+         void centerPoint(const QPointF &centerPoint, CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+           * @brief Get 4 verticies of rectangle
+           */
+         QVector<QPointF> rectangleVerticies( CoordinateSystem cs = CoordinateSystem::Geo ) const;
+
+          /**
+            * @brief Set 4 verticies of rectangle
+            */
+         void rectangleVerticies( const QVector<QPointF> &, CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+           * @brief Returns true if a valid rectangle has been set with method \c rectangleVerticies
+           * The rectangle rubberband is expecting input coordinates defining a rectangle in map coordinate system. Otherwise
+           * a similar as possible rectangle is used for rubberbanding and the coordinates returned by \c coordinateVector()
+           * will be different from input coordinates.
+           */
+         bool rectangleIsValid() const;
+
+         /**
+           * @brief Pass back the rectangle parameter
+           * For convenience some times it would be an asset to get the parameter like center, width, height and rotation. This
+           * function pass back these parameter. A coordinate transformation or projection will \b not be done. All values are related to
+           * the coordinate system of the map.
+           * <b>Warning, if the map coordinate system doesn't use the same geographical projection as the simulation coordinate system
+           * the returned parameter may be all wrong.</b>
+           *
+           * @param center      Center point of the rectangle in map coordinates.
+           * @param width       Width of the rectangle.
+           * @param height      Height of the rectangle.
+           * @param direction   Normalized direction vector related to width axis.
+           */
+         void rectangleParameter( QPointF & center, qreal & width, qreal & height, QPointF & direction, CoordinateSystem cs = CoordinateSystem::Geo  );
+
+         /**
+         * @brief Build rectangle from rectangle parameter
+         * For convenience some times it would be an asset to initialize a rectangle rubberband from rectangle the parameter like width, height and rotation.
+         * A coordinate transformation or projection will \b not be done. All values are related to the coordinate system of the map.
+         * <b>Warning, if the map coordinate system doesn't use the same geographical projection as the simulation coordinate system all parameter may be wrong.</b>
+         *
+         * @param center      Center of the rectangle in \b cs coordinate.
+         * @param width       Width of the rectangle.
+         * @param height      Height of the rectangle.
+         * @param direction   Normalized direction vector related to width axis.
+         * @param cs          Coordinate System.
+         */
+         void buildFromRectangleParamter( const QPointF & center, qreal width, qreal height, const QPointF & direction, CoordinateSystem cs = CoordinateSystem::Geo );
+
+         /**
+         * @brief Build rectangle relative to the bottom left corner
+         * For convenience some times it would be an asset to initialize a rectangle rubberband from rectangle the parameter like width, height and rotation.
+         * A coordinate transformation or projection will \b not be done. All values are related to the coordinate system of the map.
+         * <b>Warning, if the map coordinate system doesn't use the same geographical projection as the simulation coordinate system all parameter may be wrong.</b>
+         *
+         * @param bottomLeft  Bottom left corner of the rectangle in \b cs coordinates.
+         * @param width       Width of the rectangle.
+         * @param height      Height of the rectangle.
+         * @param direction   Normalized direction vector related to width axis.
+         * @param cs          Coordinate System.
+         */
+         void buildRectangleRelativeToBottomLeftCorner( const QPointF & bottomLeft, qreal width, qreal height, const QPointF & direction, CoordinateSystem cs = CoordinateSystem::Geo  );
+
+
+          /**
+            * @brief If set to true only quadratic rectangles can be created.
+            */
+         void constrainQuadratic( bool on );
+
+         /**
+           * @brief Returns the setting for quadratic constrain.
+           */
+         bool constrainQuadratic() const;
+
+         /**
+          * @brief If set to true the rectangle can not be rotated.
+          */
+         void constrainOrthogonal( bool on );
+
+         /**
+          * @brief Returns the setting fpr orthogonsl constrain.
+          */
+         bool constrainOrthogonal() const;
+
+
+         /**
+            @name Setting Constrains for Width and Height
+            To define a constrain value a postive values has to be assigned. Negative values will reset the constrain setting to undefined state.
+            @{
+         */
+         void minWidth ( qreal x );
+         void maxWidth ( qreal x );
+         void minHeight( qreal x );
+         void maxHeight( qreal x );
+         /** @} */
+
+
+      protected:
+
+         /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData * _internal;
+         bool           _rectangleIsValid;
+
+         /*
+            Coordinate matrix to describe the change of coordinates of the last user input
+         */
+         MathUtils::Matrix2D     _lastCoordinateChange;
+
+
+         /*
+           ModificationMode is used internally to restrict input for special purposes. It will be defined
+           by derived class
+         */
+         enum class ModificationMode
+         {
+           NoneRestriction,
+           NoneRotation,
+           TranslationOnly,
+           ScalingOnly,
+           RotationOnly
+         };
+
+         void setModificationMode( ModificationMode );
+
+
+         void activateButtons() override;
+         void constructHandles();
+         void updateHandles( const QPointF & scenePos, QPointF deltaMove );
+
+         bool adjustLine( QPointF & deltaMove, bool & constrainsComplied );
+         void adjustNeighbouringPoints( RubberbandPointHandle * handlePointPtr, unsigned int handleIdx, QPointF deltaMove );
+
+         bool checkMinMaxConstrains(const QPointF & vertexScene, QPointF & deltaMovePtr );
+         bool checkMinMaxConstrains(const QPointF & vertexScene, bool isVertical );
+
+         bool constrainsSatisfied( RubberbandPointHandle * handlePointPtr, unsigned int handleIdx, QPointF & deltaMove, bool & constrainsComplied );
+
+         void useDottedLineHandles( bool on = true );
+
+         void update() override;
+
+         QPointF getSceneCenter() const;
+         qreal   getSceneWidth()  const;
+         qreal   getSceneHeight() const;
+
+         QPointF getCenter() const;
+         qreal   getWidth()  const;
+         qreal   getHeight() const;
+
+         void    getSceneRotation( qreal & sinA, qreal & cosA ) const;
+         void    getMapRotation  ( qreal & sinA, qreal & cosA ) const;
+
+         void buildTmpConstructionPath(const QPointF & start, const QPointF & end, QVector<QPointF> & path, QPointF & sceneCenter, qreal & sceneWidth, qreal & sceneHeight );
+
+         virtual void buildTmpConstruction( SituationMap::RefPointer<RubberbandDrawable> & tmpGraphic, QPointF & start, QPointF & end );
+         virtual void getTmpConstructionParameter( const QPointF & start, const QPointF & end, QPointF & sceneCenter, qreal & sceneWidth, qreal & sceneHeight );
+
+      private:
+
+        void setButtonPosition();
+
+   }; /* RubberbandRectangle */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.cpp
new file mode 100755
index 000000000..09fabf404
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.cpp
@@ -0,0 +1,93 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geometry
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_smooth_line.h"
+#include "rubberband_point_handle.h"
+
+#include "drawable_smooth_path.h"
+
+#include "rubberband_internal.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandSmoothLine::InternalData
+   {
+         SituationMap::RefPointer<DrawableSmoothPath>   _smoothLineItem;
+   }; /* RubberbandSmoothLine::InternalData*/
+
+
+   RubberbandSmoothLine::RubberbandSmoothLine( SituationMap::Map * map, QObject * parent )
+      : RubberbandMultiPointFeature(map,true,parent), _internal( new InternalData() )
+   {
+   } /* RubberbandSmoothLine::RubberbandSmoothLine */
+
+   RubberbandSmoothLine::~RubberbandSmoothLine()
+   {
+     delete _internal;
+   } /* RubberbandSmoothLine::~RubberbandSmoothLine */
+        
+
+   void RubberbandSmoothLine::update()
+   {
+      QVector<RubberbandDrawable::RubberbandCoordinate> vertexVector;
+
+      vertexVector.reserve( Rubberband::_internal->_handleList.size() );
+
+      for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+      {
+         RubberbandPointHandle  * pointHandlePtr  = dynamic_cast<RubberbandPointHandle*>(handle.get());
+
+         if (pointHandlePtr)
+         {
+            vertexVector.append( pointHandlePtr -> getCoordinate() );
+         }
+      }
+      if (vertexVector.size() > 2)
+      {
+         if (!_internal->_smoothLineItem)
+         {
+            _internal->_smoothLineItem  = new DrawableSmoothPath( Rubberband::_internal->_mapView );
+         }
+
+         _internal->_smoothLineItem -> enableClosedLine( isClosedEnabled() );
+         _internal->_smoothLineItem -> setDrawColor( _drawColor );
+         _internal->_smoothLineItem -> setFillColor( _fillColor );
+         _internal->_smoothLineItem -> setVisibility( true );
+         _internal->_smoothLineItem -> setPath( vertexVector );
+      }
+      else if (_internal->_smoothLineItem) _internal->_smoothLineItem->setVisibility( false );
+
+      RubberbandMultiPointFeature::update();
+
+   } /* RubberbandSmoothLine::update */
+         
+  
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.h
new file mode 100755
index 000000000..ce667aa73
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_smooth_line.h
@@ -0,0 +1,72 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define multi point feature geoemtry with rounded edges
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_multi_point_feature.h"
+
+
+namespace SituationMap { namespace RB
+{
+   /**
+     @class RubberbandSmoothLine rubberband_smooth_line.h
+     @brief Implementation of a multi point feature rubberband with rounded edges.
+     @see RubberbandFactory, Rubberband, RubberbandMultiPointFeature
+
+   */
+   class SITUATIONMAP_EXPORT RubberbandSmoothLine : public RubberbandMultiPointFeature
+   {
+       Q_OBJECT
+         /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+
+         explicit RubberbandSmoothLine(  SituationMap::Map * map, QObject * parent = nullptr );
+
+      public:
+     
+         ~RubberbandSmoothLine();
+         /** @} */     
+
+      protected:
+          /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         void update() override;
+         
+   }; /* RubberbandSmoothLine */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.cpp
new file mode 100755
index 000000000..9166acbc3
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.cpp
@@ -0,0 +1,573 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to edit states of point objects
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   19.10.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_state_select.h"
+#include "rubberband_point_handle.h"
+#include "rubberband_drawable.h"
+#include "rubberband_handle_proxy.h"
+#include "rubberband_factory.h"
+
+#include "rubberband_internal.h"
+#include "rubberband_base_internal.h"
+
+
+#include <Map.h>
+#include <MapGraphicsView.h>
+
+#include <QtGui/QCursor>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMenu>
+
+#include "polygon.xpm"
+#include <SpatialReference.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandStateSelect::InternalData
+   {
+         Q_DISABLE_COPY(InternalData)
+
+         InternalData() : _logger(getLogger("RubberbandStateSelect"))
+         {}
+
+         ~InternalData()
+         {
+            delete _stateMenu;
+         }
+
+         QVector<State>                                     _states;
+         QVector<StateItem>                                 _items;
+         QList<SituationMap::RefPointer<RubberbandHandle>>  _stateMenuSelectedHandleList;
+         LOGGER_T                                           _logger;
+
+         const State * getStateFromValue( int stateValue ) const
+         {
+            for (const State &state : _states)
+            {
+               if (state.value() == stateValue) return &state;
+            }
+            return nullptr;
+         } /* getStateFromValue */
+
+         const State * getStateFromItem( const StateItem & item ) const { return  getStateFromValue(item.stateValue()); }
+
+         static QPixmap * _polygonIcon;
+
+         QPushButton * _polygonButton = nullptr;
+         QMenu       * _stateMenu = nullptr;
+         bool          _stateMenuIsActive = false;
+
+   }; /* RubberbandMultiPointFeature::InternalData */
+
+
+   QPixmap * RubberbandStateSelect::InternalData::_polygonIcon = nullptr;
+
+   void RubberbandStateSelect::setIconPolygon(const QPixmap & icon)
+   {
+      if (InternalData::_polygonIcon == nullptr)  InternalData::_polygonIcon  = new QPixmap(icon);
+      else                                       *InternalData::_polygonIcon = icon;
+   } /* RubberbandStateSelect::setIconPolygon */
+
+
+   RubberbandStateSelect::RubberbandStateSelect(  SituationMap::Map * map, QObject * parent )
+      : Rubberband(map,parent), _internal(new InternalData())
+   {
+      delete RubberbandBase::_baseInternal->_undoButton;
+      RubberbandBase::_baseInternal->_undoButton = nullptr;
+
+      _internal->_polygonButton = new QPushButton( (InternalData::_polygonIcon) ? *InternalData::_polygonIcon : QPixmap(polygon_xpm), QString(), RubberbandBase::_baseInternal->_buttonBox );
+
+      RubberbandBase::_baseInternal->_buttonLayout->insertWidget( 0, _internal->_polygonButton );
+
+      connect( _internal->_polygonButton, &QPushButton::clicked, this, &RubberbandStateSelect::onDo_areaSelectionBegin );
+
+      // Check Quartz
+      connect( Rubberband::_internal->_mapView.data(), &Esri::ArcGISRuntime::MapGraphicsView::viewpointChanged,
+               this, &RubberbandStateSelect::onDo_updateButtonFixCoordinates );
+      connect( Rubberband::_internal->_mapView.data(), &Esri::ArcGISRuntime::MapGraphicsView::rectChanged  ,
+               this, &RubberbandStateSelect::onDo_updateButtonFixCoordinates );
+
+
+      setFixedButtonBoxPosition(QPoint(5,5));
+
+   } /* RubberbandStateSelect::RubberbandStateSelect */
+
+
+   bool RubberbandStateSelect::setStateItems( const QVector<State>     & stateVector
+                                            , const QVector<StateItem> & itemVector
+                                            , CoordinateSystem           cs                )
+   {
+      if (stateVector.size() < 2) return false;
+      if (itemVector.isEmpty())   return false;
+
+      // check for all states are valid
+      for (const State & state : qAsConst(_internal->_states))
+      {
+         if (!state.isValid())
+           return false;
+      }
+
+      bool ok = true;
+
+      _internal -> _states = stateVector;
+      _internal -> _items  = itemVector;
+
+      for (QVector<StateItem>::iterator it = _internal->_items.begin(); it != _internal->_items.end(); ++it)
+      {
+         if (it->isValid())
+         {
+            const State * statePtr = _internal->getStateFromItem( *it );
+
+            if (statePtr == nullptr)
+            {
+               ok = false;
+               statePtr = & _internal->_states.first();
+            }
+
+            const QPointF &mapPos = projectCoordinateToMap( cs, it->coordinate() );
+
+            Esri::ArcGISRuntime::Point mapCoordinate( mapPos.x(), mapPos.y(), Rubberband::_internal->_mapView->map()->spatialReference() );
+            RubberbandPointHandle * handlePtr = new RubberbandPointHandle( Rubberband::_internal->_mapView
+                                                                         , Rubberband::_internal->_mapScene
+                                                                         , mapCoordinate
+                                                                         , statePtr->icon()                   );
+            if (handlePtr)
+            {
+               handlePtr->setSelection(false);
+               handlePtr->setUserData( &(*it) );
+               Rubberband::_internal->_handleList.append( SituationMap::RefPointer<RubberbandHandle>(handlePtr) );
+            }
+         }
+         else ok = false;
+      }
+      update();
+      activateButtons();
+      buildStateMenu();
+      return ok;
+   } /*  RubberbandStateSelect::setStateItems */
+
+
+   const QVector<RubberbandStateSelect::StateItem> & RubberbandStateSelect::stateItems() const
+   {
+      return _internal->_items;
+   } /* RubberbandStateSelect::stateItems */
+
+
+   void RubberbandStateSelect::activateButtons()
+   {
+      _baseInternal->_hasUndoButton   = false;
+      _baseInternal->_applyIsPossible = (!Rubberband::_internal->_handleList.isEmpty());
+      _baseInternal->_undoIsPossible  = false;
+      Rubberband::activateButtons();
+   } /* RubberbandStateSelect::activateButton */
+
+
+   void RubberbandStateSelect::toggleState( RubberbandPointHandle * handlePtr )
+   {
+      if (_internal->_states.size() < 2) return;
+      if (handlePtr == nullptr) return;
+
+      StateItem * itemPtr = static_cast<StateItem*>(handlePtr->userData());
+
+      if (itemPtr == nullptr) return;
+
+      if (_internal->_states.size() == 2)
+      {
+         const State * statePtr = _internal -> getStateFromItem( *itemPtr );
+
+         if (statePtr != nullptr)
+         {
+           if (statePtr == &_internal->_states.first()) statePtr = &_internal->_states.last();
+           else                                         statePtr = &_internal->_states.first();
+         }
+         else statePtr = &_internal->_states.first();
+
+         itemPtr->_stateValue = statePtr->value();
+         handlePtr->setIcon( statePtr->icon() );
+      }
+
+   } /* RubberbandStateSelect::toggleState */
+
+
+   void RubberbandStateSelect::setState( RubberbandPointHandle * handlePtr, int stateValue )
+   {
+      if (handlePtr == nullptr) return;
+
+      const State * statePtr = _internal -> getStateFromValue(stateValue);
+      StateItem   * itemPtr  = static_cast<StateItem*>(handlePtr->userData());
+
+      if (itemPtr  == nullptr) return;
+      if (statePtr == nullptr) return;
+
+      itemPtr->_stateValue = stateValue;
+      handlePtr->setIcon( statePtr->icon() );
+
+   } /* RubberbandStateSelect::setState */
+
+
+   void RubberbandStateSelect::buildStateMenu()
+   {
+      if (_internal->_states.isEmpty()) return;
+
+      _internal->_stateMenu = new QMenu();
+
+      for (const State & state : qAsConst(_internal->_states))
+      {
+         QAction * action = _internal->_stateMenu->addAction( state.icon(), state.description() );
+         action -> setData( state.value() );
+
+         connect( action, &QAction::triggered, this, &RubberbandStateSelect::onDo_setState );
+      }
+
+      connect( _internal->_stateMenu, &QMenu::aboutToShow, this, [this]()
+      {
+         this->_internal->_stateMenuSelectedHandleList.clear();
+
+         _baseInternal->_buttonBox->setDisabled(true);
+         for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+         {
+            if (handle->isSelected())
+            {
+               this->_internal->_stateMenuSelectedHandleList << handle;
+            }
+         }
+      } );
+
+      connect( _internal->_stateMenu, &QMenu::aboutToHide, this, [this]()
+      {
+         _baseInternal->_buttonBox->setEnabled(true);
+         deSelectHandles();
+      } );
+
+   } /* RubberbandStateSelect::buildStateMenu */
+
+
+   void RubberbandStateSelect::onDo_setState(bool)
+   {
+       QAction * action = (QAction*) sender();
+
+       if (action == nullptr) return;
+
+       int stateValue = action->data().toInt();
+
+       for (auto handle : qAsConst(_internal->_stateMenuSelectedHandleList))
+          setState( dynamic_cast<RubberbandPointHandle*>(handle.get()), stateValue );
+
+       _internal -> _stateMenuSelectedHandleList.clear();
+       _internal -> _stateMenuIsActive = false;
+
+       update();
+
+   } /* RubberbandStateSelect::onDo_setState */
+
+
+   void RubberbandStateSelect::chooseStateMenu()
+   {
+      // popup a window with states the user can choose
+     _internal->_stateMenu->popup( QCursor::pos() );
+     _internal -> _stateMenuIsActive = true;
+   } /*  RubberbandStateSelect::chooseStateMenu */
+
+
+   bool RubberbandStateSelect::selectAction( AbstractEventDispatcher*, int x, int y )
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << x << " ; " << y;
+
+      _internal->_stateMenuSelectedHandleList.clear();
+
+      if (rubberbandIsAlive())
+      {
+         if (_internal->_stateMenuIsActive) return true;
+
+         QPointF scenePos(pixel2ScenePosition(x,y));
+
+         if (_baseInternal->buttonProxyActive(scenePos)) return false;
+
+         RubberbandHandle * handlePtr = pickHandle(x,y);
+
+         if (handlePtr)
+         {
+            handlePtr->setSelection();
+            enableSelectedState();
+
+            update();
+            deactivateButtons();
+            return true;
+         }
+      }
+      return false;
+   } /* RubberbandStateSelect::selectAction */
+
+
+   bool RubberbandStateSelect::multiSelectActionPress(AbstractEventDispatcher*, int x, int y)
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << x << " ; " << y;
+
+      if (rubberbandIsAlive())
+      {
+         if (_internal -> _stateMenuIsActive) return true;
+
+         RubberbandHandle * handlePtr = pickHandle(x,y);
+
+         if (handlePtr)
+         {
+            handlePtr->setSelection();
+            enableSelectedState();
+            enableMultiSelectedState();
+
+            update();
+            deactivateButtons();
+            return true;
+         }
+      }
+      return false;
+   } /* RubberbandStateSelect::multiSelectActionPress */
+
+
+   bool RubberbandStateSelect::multiSelectActionRelease( AbstractEventDispatcher*, int, int )
+   {
+     return false;
+   } /* RubberbandStateSelect::multiSelectActionRelease */
+
+
+   bool RubberbandStateSelect::setCoordinateAction( AbstractEventDispatcher * causer, int x, int y )
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << x << " ; " << y;
+
+      if (rubberbandIsAlive())
+      {
+         Rubberband::_internal->_lastClickPosition = pixel2ScenePosition(x,y);
+
+         if (_internal->_stateMenuIsActive)
+         {
+            _internal -> _stateMenuIsActive = false;
+            disenableSelectedState();
+            disenableMultiSelectedState();
+            activateButtons();
+            return true;
+         }
+
+         if (isEnabledSelectedState())
+         {
+            bool handlePicked = (pickHandle(x,y) != nullptr);
+            bool toggleMode   = (_internal->_states.size() == 2);
+            bool eventHandled = false;
+
+            if (!toggleMode)
+            {
+               disenableSelectedState();
+               disenableMultiSelectedState();
+
+               chooseStateMenu();
+               return true;
+            }
+            for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+            {
+               RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handle.get());
+               if ((handlePointPtr) && (handlePointPtr->isSelected()))
+               {
+                  handlePointPtr->setSelection(false);
+                  if ((handlePicked) && (toggleMode)) toggleState( handlePointPtr );
+                  eventHandled = true;
+               }
+            }
+
+            disenableSelectedState();
+            disenableMultiSelectedState();
+            activateButtons();
+            return eventHandled;
+         }
+         else Rubberband::setCoordinateAction(causer,x,y);
+      }
+      return false;
+   } /* RubberbandStateSelect::setCoordinateAction */
+
+
+   bool RubberbandStateSelect::moveAction(AbstractEventDispatcher*, int x, int y)
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << x << " ; " << y;
+
+      if (rubberbandIsAlive())
+      {
+         if (_internal -> _stateMenuIsActive) return false;
+
+         bool eventHandled = false;
+
+         QPointF scenePosition(pixel2ScenePosition(x,y));
+
+         if (_baseInternal->buttonProxyActive(scenePosition)) return false;
+
+         if (Rubberband::_internal->_mapView != nullptr)
+         {
+            if (!isEnabledMultiSelectedState()) deSelectHandles();
+
+            RubberbandHandle * handlePtr = pickHandle(x,y);
+            if (handlePtr != nullptr)
+            {
+               handlePtr->setSelection();
+               eventHandled = true;
+            }
+         }
+
+         if (eventHandled) update();
+      }
+      return false;
+   } /* RubberbandStateSelect::moveAction */
+
+
+   bool RubberbandStateSelect::movePickedAction(AbstractEventDispatcher * causer, int x, int y )
+   {
+      DEBUG_LOG(_internal->_logger) << LOGFUNCTION << x << " ; " << y;
+
+      Rubberband::movePickedAction(causer,x,y);
+      return false; // isEnabledSelectedState() || _internal->_stateMenuIsActive;
+   } /* RubberbandStateSelect::movePickedAction */
+
+
+   bool RubberbandStateSelect::contextMenuAction( AbstractEventDispatcher*, int, int )
+   {
+      if (!_internal -> _stateMenuIsActive) chooseStateMenu();
+      return true;
+   } /* RubberbandStateSelect::contextMenuAction */
+
+
+   void RubberbandStateSelect::onDo_areaSelectionBegin()
+   {
+      bool mRbands = _baseInternal->_map->rubberbandFactory().allowMultipleRubberbands();
+      _baseInternal->_map->rubberbandFactory().allowMultipleRubberbands(true);
+      {
+         RB::RubberbandMultiPointFeature * selectionRB = _baseInternal->_map->rubberbandFactory().create<RB::RubberbandMultiPointFeature>(this);
+
+         if (selectionRB == nullptr)
+         {
+            qWarning() << LOGFUNCTION << "Creating rubberband multi points feature failed";
+         }
+         else
+         {
+            selectionRB->setAutoDelete(true);  // when finished  rubberband will commit suicide
+            selectionRB->setDrawColor( QColor(255,0,0,255) );
+            selectionRB->setFillColor( QColor(  0,0,0,100) );
+
+            selectionRB -> enableClosed( true );
+            selectionRB -> enableFinishAfterConstruction( true );
+
+            selectionRB -> setFixedButtonBoxPosition(QPoint(15,15));
+
+            QObject::connect( selectionRB, &RB::Rubberband::apply, this, &RubberbandStateSelect::onDo_areaSelectionApply );
+            QObject::connect( selectionRB, &RB::Rubberband::abort, this, &RubberbandStateSelect::onDo_areaSelectionAbort );
+
+            RubberbandBase::_baseInternal->_buttonBox->setDisabled(true);
+         }
+      }
+      _baseInternal->_map->rubberbandFactory().allowMultipleRubberbands( mRbands );
+   } /* RubberbandStateSelect::onDo_areaSelectionBegin */
+
+
+   void RubberbandStateSelect::onDo_areaSelectionApply( RubberbandBase * selectionRB )
+   {
+      RubberbandBase::_baseInternal->_buttonBox->setEnabled(true);
+      if (selectionRB)
+      {
+         QVector<QPointF> polygonVertexList = selectionRB->coordinateVector( CoordinateSystem::Map );
+
+         // Looking for all handle which are inside polygon and select
+
+         unsigned int hitCounter = 0;
+
+         for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+         {
+            RubberbandPointHandle * handlePointPtr =  dynamic_cast<RubberbandPointHandle*>(handle.get());
+            if (handlePointPtr)
+            {
+               const Esri::ArcGISRuntime::Point &v = handlePointPtr->getCoordinate()._mapCoordinate;
+               bool  inside = false;
+               int   nvert  = polygonVertexList.size();
+
+               for (int i = 0, j = nvert-1; i < nvert; j = i++)
+               {
+                  const QPointF & vertex_i = polygonVertexList[i];
+                  const QPointF & vertex_j = polygonVertexList[j];
+
+                  if ((vertex_i.y()>v.y()) != (vertex_j.y()>v.y()))
+                  {
+                     if (v.x() < (vertex_j.x() - vertex_i.x()) * (v.y() - vertex_i.y()) / (vertex_j.y() - vertex_i.y()) + vertex_i.x())
+                     {
+                        inside = !inside;
+                     }
+                  }
+               }
+               if (inside)
+               {
+                  hitCounter++;
+                  handlePointPtr->setSelection();
+               }
+            }
+         }
+         if (hitCounter > 0)
+         {
+            if (_internal->_states.size() == 2)
+            {
+              for (auto handle : qAsConst(Rubberband::_internal->_handleList))
+               {
+                  if (!handle->isSelected()) continue;
+                  handle->setSelection(false);
+                  toggleState( dynamic_cast<RubberbandPointHandle*>(handle.get()) );
+               }
+            }
+            else
+            {
+               chooseStateMenu();
+               // ????? enableMultiSelectedState();
+            }
+         }
+      }
+   } /* RubberbandStateSelect::onDo_areaSelectionApply */
+
+
+   void RubberbandStateSelect::onDo_areaSelectionAbort( RubberbandBase * )
+   {
+     _baseInternal->_buttonBox->setEnabled(true);
+     /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      * Really nothing else to do here?
+      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+   } /* RubberbandStateSelect::onDo_areaSelectionAbort */
+
+
+   void RubberbandStateSelect::update()
+   {
+      Rubberband::update();
+
+      onDo_updateButtonFixCoordinates();
+
+   } /* RubberbandPointCluster::update */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.h
new file mode 100755
index 000000000..018708c8a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_state_select.h
@@ -0,0 +1,180 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to edit states of point objects
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   18.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband.h"
+
+
+namespace SituationMap { namespace RB
+{
+   class RubberbandPointHandle;
+
+
+   /**
+     @class RubberbandPointCluster rubberband_point_cluster.h
+     @brief Implementation of a rubberband to input single coodinates for building point feature clusters
+     @see Rubberband, RubberbandPointFeature
+   */
+   class SITUATIONMAP_EXPORT RubberbandStateSelect : public Rubberband
+   {
+       Q_OBJECT
+        /**
+            @name Construction & Destruction
+            @{
+         */
+
+         friend class RubberbandFactory;
+
+         explicit RubberbandStateSelect(  SituationMap::Map * map, QObject * parent = nullptr );
+
+      public:
+
+         class State
+         {
+            public:
+               State() = default;
+               State(int value, const QString & description, const QPixmap & icon)
+                 : _description(description), _icon(icon), _value(value), _valid(true)
+               {
+               }
+
+               inline bool            isValid()     const { return _valid;       }
+               inline int             value()       const { return _value;       }
+               inline const QString & description() const { return _description; }
+               inline const QPixmap & icon()        const { return _icon;        }
+
+            protected:
+
+               QString      _description;
+               QPixmap      _icon;
+               int          _value = 0;
+               bool         _valid = false;
+
+         }; /* State */
+
+
+         class StateItem
+         {
+            friend class RubberbandStateSelect;
+
+            public:
+
+              StateItem() : _valid(false), _id(0), _description(), _coordinate(), _stateValue(0)  {;}
+
+              StateItem( quint32 id, const QString &description, const QPointF & coordinate, int stateValue )
+                : _valid(true), _id(id), _description(description), _coordinate(coordinate), _stateValue(stateValue)
+              {
+              } /* StateItem */
+
+              ~StateItem() = default;
+
+              StateItem(const StateItem &) = default;
+              StateItem & operator = (const StateItem &) = default;
+
+              inline bool            isValid()    const { return _valid;      }
+              inline quint32         id()         const { return _id;         }
+              inline const QPointF & coordinate() const { return _coordinate; }
+              inline int             stateValue() const { return _stateValue; }
+
+            protected:
+
+               bool     _valid;
+               quint32  _id;
+               QString  _description;
+               QPointF  _coordinate;
+               int      _stateValue;
+
+         }; /* StateItem */
+
+
+         virtual ~RubberbandStateSelect() = default;
+
+         RubberbandStateSelect(const RubberbandStateSelect &) = delete;
+         RubberbandStateSelect & operator = (const RubberbandStateSelect &) = delete;
+         /** @} */
+
+         bool selectAction            ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionPress  ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool multiSelectActionRelease( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool setCoordinateAction     ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool moveAction              ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool movePickedAction        ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool contextMenuAction       ( AbstractEventDispatcher * causer, int x, int y ) override;
+         bool undoAction              ( AbstractEventDispatcher * causer, int x, int y ) override   { return contextMenuAction(causer,x,y); }
+
+         bool setStateItems( const QVector<State>     & stateVector,
+                             const QVector<StateItem> & itemVector,
+                             CoordinateSystem           cs = CoordinateSystem::Geo );
+
+         const QVector<StateItem> & stateItems() const;
+
+         static void setIconPolygon( const QPixmap & );
+
+      protected:
+
+         /*
+           Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+           has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+         */
+         struct InternalData;
+
+         InternalData *   _internal;
+
+         void activateButtons() override;
+
+         void update() override;
+
+         void applyButtonClicked() override { applyAndEndAction( _windowEventDispatcher, 0.0, 0.0 ); }
+
+         void buildStateMenu();
+         void chooseStateMenu();
+
+         void toggleState( RubberbandPointHandle * handlePtr );
+         void setState( RubberbandPointHandle * handlePtr, int stateValue );
+
+
+
+      protected slots:
+
+         void onDo_areaSelectionBegin();
+         void onDo_areaSelectionApply( RubberbandBase* );
+         void onDo_areaSelectionAbort( RubberbandBase* );
+
+         void onDo_setState( bool );
+
+      private:
+
+         void setCoordinateVector(const QVector<QPointF> &, CoordinateSystem ) override {}
+
+         QVector<QPointF> coordinateVector( CoordinateSystem )               const override { return QVector<QPointF>(); }
+         QPointF          singleCoordinate( unsigned int, CoordinateSystem ) const override { return QPointF();          }
+
+   }; /* RubberbandStateSelect */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.cpp
new file mode 100755
index 000000000..3d8cddd74
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.cpp
@@ -0,0 +1,92 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define moving transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_transform.h"
+
+#include "rubberband_internal.h"
+
+#include <MathUtils/math_const.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   struct RubberbandTransform::InternalData
+   {
+         Q_DISABLE_COPY(InternalData)
+         MathUtils::Matrix2D  _transformCoordinates;
+         LOGGER_T             _logger;
+
+         InternalData()
+           : _transformCoordinates()
+           , _logger(getLogger("RubberbandTransform"))
+         {
+         } /* InternalData */
+   }; /* RubberbandTransform::InternalData */
+
+
+
+
+   RubberbandTransform::RubberbandTransform( SituationMap::Map * map, QObject * parent )
+     : RubberbandRectangle(map,parent)
+     , _internal(new InternalData())
+   {
+   } /* RubberbandTransform::RubberbandTransform */
+
+
+   RubberbandTransform::~RubberbandTransform()
+   {
+     delete _internal;
+     _internal = nullptr;
+   } /* RubberbandTransform::~RubberbandTransform */
+
+
+   const MathUtils::Matrix2D & RubberbandTransform::transformMatrix() const { return _internal->_transformCoordinates; }
+
+
+   void RubberbandTransform::update()
+   {
+     /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      * It is importent here to call RubberbandRectangle::update(); first to do an update, because
+      * in other case the RubberbandRectangle::_lastCoordinateChange variable will have wrong values.
+      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+      RubberbandRectangle::update();
+
+      if (!_lastCoordinateChange.isIdentity())
+      {
+         _internal->_transformCoordinates = _lastCoordinateChange * _internal->_transformCoordinates;
+      }
+      
+      emit updatePreview( this, _lastCoordinateChange );
+      
+      _lastCoordinateChange.setToIdentity();              // reset matrix
+
+   } /* RubberbandTransform::update */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.h
new file mode 100755
index 000000000..dbadbbd2a
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform.h
@@ -0,0 +1,99 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define moving, scale and rotating transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   22.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_rectangle.h"
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandTransform rubberband_transform.h
+     @brief Implementation of a rubberband to move, scale and rotate features
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandTransform : public RubberbandRectangle
+   {
+      Q_OBJECT
+
+         friend class RubberbandFactory;
+
+         friend class RubberbandTransformMove;
+         friend class RubberbandTransformRotate;
+         friend class RubberbandTransformScale;
+
+
+         /**
+            @name Construction & Destruction
+            @}
+         */
+
+         explicit RubberbandTransform(  SituationMap::Map * map, QObject * parent = nullptr );
+
+       public:
+
+         ~RubberbandTransform();
+         /** @} */
+
+         /**
+           Provides the transformation matrix
+         */
+         const MathUtils::Matrix2D & transformMatrix() const;
+
+      signals:
+
+         /**
+           The updatePreview signal is emitted before the rubbberband itself will be redrawn. Connecting this signal can be
+           used to draw an preview e.g in case of transform rubberbands.
+
+            @param rbnd  pointer to this Rubberband
+            @param mat   transformation matrix to transform features for preview
+            @see Rubberband
+         */
+         void updatePreview( Rubberband * rbnd, const MathUtils::Matrix2D & mat );
+
+      protected:
+
+         /*
+            Forward declaration of InternalData to hold private member variables. Becareful the base class Rubberband
+            has similary a class for internal data member with name "InternalData". Don't be confused it is not the same.
+          */
+         struct InternalData;
+
+         InternalData * _internal;
+
+         void update() override;
+
+      private:
+
+        void setButtonPosition();
+
+   }; /* RubberbandTransform */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.cpp
new file mode 100755
index 000000000..b2c810a38
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.cpp
@@ -0,0 +1,48 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define moving transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_transform_move.h"
+
+namespace SituationMap { namespace RB
+{
+
+   RubberbandTransformMove::RubberbandTransformMove( SituationMap::Map * map, QObject * parent )
+     : RubberbandTransform(map,parent)
+   {
+     setModificationMode( ModificationMode::TranslationOnly );
+   } /* RubberbandTransformMove::RubberbandTransformMove */
+
+
+   QPointF RubberbandTransformMove::translationVector() const
+   {
+     const MathUtils::Matrix2D & M = transformMatrix();
+     return  QPointF(M(0,2),M(1,2));
+   } /* RubberbandTransformMove::translationVector() const */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.h
new file mode 100755
index 000000000..492448105
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_move.h
@@ -0,0 +1,67 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define moving transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   17.06.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_transform.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandPointHandle;
+
+   /**
+     @class RubberbandTransformMove rubberband_transform_move.h
+     @brief Implementation of a rubberband to move features
+     @see Rubberband, RubberbandRectangle, RubberbandTransform
+   */
+   class SITUATIONMAP_EXPORT RubberbandTransformMove : public RubberbandTransform
+   {
+      Q_OBJECT
+
+         friend class RubberbandFactory;
+
+         /**
+            @name Construction & Destruction
+            @}
+         */
+
+         explicit RubberbandTransformMove(  SituationMap::Map * map, QObject * parent = nullptr );
+
+         /**
+           Returns vector of translation
+         */
+         QPointF translationVector() const;
+
+       public:
+         /** @} */
+
+   }; /* RubberbandTransformMove */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.cpp
new file mode 100755
index 000000000..ee1295e76
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.cpp
@@ -0,0 +1,62 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define rotating transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_transform_rotate.h"
+
+#include <MathUtils/simple_helper.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+
+   RubberbandTransformRotate::RubberbandTransformRotate( SituationMap::Map * map, QObject * parent )
+     : RubberbandTransform(map,parent)
+   {
+     setModificationMode( ModificationMode::RotationOnly );
+   } /* RubberbandTransformRotate::RubberbandTransformRotate */
+
+   qreal RubberbandTransformRotate::rotationSin() const
+   {
+     return transformMatrix()(0,1);
+   } // RubberbandTransformRotate::rotationSin
+
+  
+   qreal RubberbandTransformRotate::rotationCos() const
+   {
+     return transformMatrix()(0,0);
+   } // RubberbandTransformRotate::rotationCos
+   
+
+   qreal RubberbandTransformRotate::rotationAngle() const
+   {
+     return MathUtils::getMathAngle(rotationSin(),rotationCos());
+   } // RubberbandTransformRotate::rotationAngle
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.h
new file mode 100755
index 000000000..ecf1c86b2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_rotate.h
@@ -0,0 +1,77 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define moving transformation
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_transform.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   class RubberbandPointHandle;
+
+   /**
+     @class RubberbandTransformRotate rubberband_transform_rotate.h
+     @brief Implementation of a rubberband to rotate features
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandTransformRotate : public RubberbandTransform
+   {
+      Q_OBJECT
+
+         friend class RubberbandFactory;
+
+         /**
+            @name Construction & Destruction
+            @}
+         */
+
+         explicit RubberbandTransformRotate(  SituationMap::Map * map, QObject * parent );
+
+       public:
+         /** @} */
+
+         /**
+           Returns sinus of rotation angle
+         */
+         qreal rotationSin() const;
+
+         /**
+           Return cosinus of roation angle
+         */
+         qreal rotationCos() const;
+
+         /**
+           Return rotation angle (math.) in radians
+         */
+         qreal rotationAngle() const;
+
+   }; /* RubberbandTransformRotate */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.cpp
new file mode 100755
index 000000000..6d0d4370d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.cpp
@@ -0,0 +1,47 @@
+/**
+**
+** @RDE_HEADER@
+** Implementation of rubberband class to define scaling transforms
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "rubberband_transform_scale.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+  
+
+   RubberbandTransformScale::RubberbandTransformScale( SituationMap::Map * map, QObject * parent )
+     : RubberbandTransform(map,parent)
+   {
+     setModificationMode( ModificationMode::ScalingOnly );
+   } /* RubberbandTransformScale::RubberbandTransformScale */
+
+
+   qreal  RubberbandTransformScale::scaleX() const { return transformMatrix()(0,0); }
+   qreal  RubberbandTransformScale::scaleY() const { return transformMatrix()(1,1); }
+
+} } /* namespace SituationMap::RB */
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.h
new file mode 100755
index 000000000..190541b33
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/rubberband_transform_scale.h
@@ -0,0 +1,64 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of rubberband class to define scaling transformation
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   07.04.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_transform.h"
+
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class RubberbandTransformScale rubberband_transform_scale.h
+     @brief Implementation of a rubberband to scale features
+     @see Rubberband
+   */
+   class SITUATIONMAP_EXPORT RubberbandTransformScale : public RubberbandTransform
+   {
+      Q_OBJECT
+
+         friend class RubberbandFactory;
+
+         /**
+            @name Construction & Destruction
+            @}
+         */
+
+         explicit RubberbandTransformScale(  SituationMap::Map * map, QObject * parent = nullptr );
+
+       public:
+         /** @} */
+
+
+         qreal scaleX() const; /**< Returns scaling factor in x direction */
+         qreal scaleY() const; /**< Returns scaling factor in y direction */
+
+   }; /* RubberbandTransformRotate */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/sphere_pattern.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/sphere_pattern.xpm
new file mode 100755
index 000000000..b04c1c9b1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/sphere_pattern.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static const char *sphere_pattern_xpm[] = {
+"16 16 13 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #F8F8F8",
+"@	c #DCDCDC",
+"#	c #BFBFBF",
+"$	c #E3E3E3",
+"%	c #929292",
+"&	c #6C6C6C",
+"*	c #484848",
+"=	c #393939",
+"-	c #F3F3F3",
+";	c #B5B5B5",
+">	c #0A0A0A",
+"     ......     ",
+"   .....+....   ",
+"  ..@++++++...  ",
+" ..#$++....++.. ",
+" .%#$+.......+. ",
+"..%#$........+..",
+".&%#@........+..",
+".*%%#$........+.",
+".=&%##@-.....+-.",
+".=*&%##@$--++-@.",
+".;=*&%##@@$$@@#.",
+" .>==&%%######. ",
+" ..>>==&&%%%%.. ",
+"  ..>>>>==*=..  ",
+"   ..;>>>>;..   ",
+"     ......     "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.cpp
new file mode 100755
index 000000000..c0d9dbdad
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.cpp
@@ -0,0 +1,88 @@
+
+/**
+**
+** @RDE_HEADER@
+** Implementation of preview for tactical symbols
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   27.03.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#include "transient_tactical_symbol.h"
+
+#include <Map/situation_map_types.h>
+#include <MapImpl/sidc_symbol_impl.h>
+#include <MapImpl/layer_factory_impl.h>
+
+
+namespace SituationMap { namespace RB
+{
+
+   TransientTacticalSymbol::TransientTacticalSymbol( MapImpl * mapImpl, const QString & sidc )
+   {
+     QString layerIdent;
+     if (mapImpl)
+     {
+       layerIdent = mapImpl->layerFactoryImpl().rubberbandLayer();
+     }
+
+     if (layerIdent.isEmpty())
+     {
+       qWarning() << LOGFUNCTION << "not layername found";
+     }
+
+     _tacticalRubberbandObj  = new SidcSymbolImpl( sidc, QStringLiteral("TransientTacticalSymbol:sidc=%1").arg(sidc)  );
+     _tacticalRubberbandObj -> init( mapImpl, layerIdent );
+     //_tacticalRubberbandObj -> setDrawOrder( 2000 );
+
+   } /* PreviewTaticalSymbol::PreviewTaticalSymbol */
+
+   TransientTacticalSymbol::~TransientTacticalSymbol()
+   {
+     delete _tacticalRubberbandObj;
+   } /* TransientTacticalSymbol::~TransientTacticalSymbol */
+
+
+   void TransientTacticalSymbol::update(const QVector<RubberbandDrawable::RubberbandCoordinate> & coordinateVector)
+   {
+      PositionCont controlPoints;
+      controlPoints.reserve(coordinateVector.size());
+
+      for (const RubberbandDrawable::RubberbandCoordinate &pos : coordinateVector)
+      {
+         const Esri::ArcGISRuntime::Point & p = pos._mapCoordinate;
+
+         controlPoints.append(Point3D(p.x(), p.y(), p.z()));
+      }
+      _tacticalRubberbandObj -> setPositionsTranslated( controlPoints );
+      try
+      {
+        _tacticalRubberbandObj -> updateView();
+      }
+      catch (...)
+      {
+         qWarning() << LOGFUNCTION << "Exception from TacticalAppearance::updateView() catched!!!!";
+      }
+   } /* TransientTacticalSymbol::update */
+
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.h
new file mode 100755
index 000000000..5d2144ed7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/transient_tactical_symbol.h
@@ -0,0 +1,79 @@
+/**
+**
+** @RDE_HEADER@
+** Definition of tansient tactical symbols while rubberband input is done.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   01.09.2015, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include "rubberband_drawable.h"
+
+#include <MapImpl/map_impl.h>
+#include <Common/referenced.h>
+
+#include <QtCore/QObject>
+
+namespace SituationMap { class SidcSymbolImpl; }
+
+namespace SituationMap { namespace RB
+{
+
+   /**
+     @class TransientTacticalSymbol transient_tactical_symbol.h
+     The class \c TransientTacticalSymbol a map object of type RubberbandObjectImpl to display a tactical symbol
+     transiently while rubberband input is done. The tactical symbol is defined by a \a sidc code which is passed 
+     to the ctor as second parameter.
+
+     @see RubberbandObjectImpl
+   */
+   class TransientTacticalSymbol : public QObject,  public SituationMap::Referenced
+   {
+      Q_OBJECT
+      public:
+
+         
+         /**
+           @name Construction & Destruction
+           @{
+         */
+         explicit TransientTacticalSymbol( MapImpl *, const QString & sidc );
+         virtual ~TransientTacticalSymbol();
+
+         TransientTacticalSymbol(const TransientTacticalSymbol &) = delete;
+         TransientTacticalSymbol & operator = (const TransientTacticalSymbol &) = delete;
+         /** @} */
+
+         virtual void update( const QVector<RubberbandDrawable::RubberbandCoordinate> & coordinateVector );
+     
+      protected:
+
+         SidcSymbolImpl  * _tacticalRubberbandObj;
+
+      protected slots:
+
+      
+   }; /* TransientTacticalSymbol */
+
+} } /* namespace SituationMap::RB */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/undo.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/undo.xpm
new file mode 100755
index 000000000..4193abac9
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/undo.xpm
@@ -0,0 +1,134 @@
+/* XPM */
+static const char * undo_xpm[] = {
+"24 24 107 2",
+"  	c None",
+". 	c #BEAD52",
+"+ 	c #D4C15C",
+"@ 	c #CCBA59",
+"# 	c #A49546",
+"$ 	c #F7E16A",
+"% 	c #FEE65E",
+"& 	c #FEE350",
+"* 	c #FEE248",
+"= 	c #FEE34C",
+"- 	c #FEE662",
+"; 	c #DAC75E",
+"> 	c #CBBA57",
+", 	c #FDE456",
+"' 	c #FCDE32",
+") 	c #FCDD2D",
+"! 	c #FCE143",
+"~ 	c #E5D15F",
+"{ 	c #C1B152",
+"] 	c #FBE047",
+"^ 	c #FADB2B",
+"/ 	c #FADE3C",
+"( 	c #BBAB4F",
+"_ 	c #94873F",
+": 	c #F9DF49",
+"< 	c #F8D929",
+"[ 	c #F5DC4B",
+"} 	c #EFD751",
+"| 	c #F6D627",
+"1 	c #EACC25",
+"2 	c #E3C524",
+"3 	c #F1D226",
+"4 	c #F6D72A",
+"5 	c #AA9A46",
+"6 	c #BAAA4B",
+"7 	c #F3D52B",
+"8 	c #F3D424",
+"9 	c #E1C421",
+"0 	c #C0A81C",
+"a 	c #D3BD43",
+"b 	c #EBD242",
+"c 	c #F1D122",
+"d 	c #D3B71E",
+"e 	c #B29B19",
+"f 	c #E7CB37",
+"g 	c #97893C",
+"h 	c #EECF25",
+"i 	c #EECE1F",
+"j 	c #E7C81E",
+"k 	c #D8BB1C",
+"l 	c #ECCE28",
+"m 	c #CDB741",
+"n 	c #EBCC1C",
+"o 	c #EBCD1F",
+"p 	c #CBB84D",
+"q 	c #DCC857",
+"r 	c #B5A447",
+"s 	c #E6CA31",
+"t 	c #E8C919",
+"u 	c #D0B416",
+"v 	c #DFC118",
+"w 	c #E8CA26",
+"x 	c #EACF3B",
+"y 	c #ECD552",
+"z 	c #E3CE59",
+"A 	c #CAB74F",
+"B 	c #E6C71C",
+"C 	c #E6C617",
+"D 	c #BEA51A",
+"E 	c #D3B513",
+"F 	c #E3C314",
+"G 	c #E4C51D",
+"H 	c #E6CA2E",
+"I 	c #DBBC13",
+"J 	c #917F20",
+"K 	c #917E15",
+"L 	c #E0C011",
+"M 	c #DDBF17",
+"N 	c #C0AE49",
+"O 	c #D8BA0E",
+"P 	c #DDBE0E",
+"Q 	c #DEBF12",
+"R 	c #E1C62C",
+"S 	c #E5CE4A",
+"T 	c #D3BF4F",
+"U 	c #928436",
+"V 	c #AC930E",
+"W 	c #DBBB0C",
+"X 	c #DEC01D",
+"Y 	c #E2C93D",
+"Z 	c #CCB84B",
+"` 	c #D7B809",
+" .	c #D8B909",
+"..	c #CCAF09",
+"+.	c #BDA107",
+"@.	c #D6B607",
+"#.	c #CFB007",
+"$.	c #897504",
+"%.	c #D4B405",
+"&.	c #D0B105",
+"*.	c #978004",
+"=.	c #C9AA03",
+"-.	c #D2B203",
+";.	c #D0B003",
+">.	c #A48B03",
+",.	c #968109",
+"'.	c #AD9301",
+"                                                ",
+"                                                ",
+"                              . + @             ",
+"                        # $ % & * = - ;         ",
+"                      > , ' ) ) ) ) ) ! ~       ",
+"                    { ] ^ ^ ^ ^ ^ ^ ^ ^ / (     ",
+"                  _ : < < < < < < < < < < [     ",
+"                  } | | | | | | 1 2 3 | | 4 5   ",
+"                6 7 8 8 8 8 9         0 8 8 a   ",
+"                b c c c c d             e c f   ",
+"              g h i i i j                 k l   ",
+"              m n n n n                     o   ",
+"  p q r       s t t t u                     v   ",
+"    w x y z A B C C C                       D   ",
+"    E F F G H F F F I                       J   ",
+"    K L L L L L L L M N                         ",
+"      O P P P P P P Q R S T U                   ",
+"      V W W W W W W W W W X Y Z                 ",
+"        `  . . . . . . . ...                    ",
+"        +.@.@.@.@.@.@.#.$.                      ",
+"          %.%.%.%.&.*.                          ",
+"          =.-.;.>.                              ",
+"          ,.'.                                  ",
+"                                                "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/winkel_icon.xpm b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/winkel_icon.xpm
new file mode 100755
index 000000000..65ed9a370
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Rubberbands/winkel_icon.xpm
@@ -0,0 +1,84 @@
+/* XPM */
+static const char * winkelIcon_xpm[] = {
+"40 40 41 1",
+" 	c None",
+".	c #250075",
+"+	c #250074",
+"@	c #260074",
+"#	c #250073",
+"$	c #240072",
+"%	c #250071",
+"&	c #22006F",
+"*	c #24006E",
+"=	c #280078",
+"-	c #290076",
+";	c #270076",
+">	c #240073",
+",	c #250072",
+"'	c #240071",
+")	c #240070",
+"!	c #23006E",
+"~	c #23006D",
+"{	c #22006D",
+"]	c #23006C",
+"^	c #21006D",
+"/	c #270075",
+"(	c #230073",
+"_	c #24006F",
+":	c #22006E",
+"<	c #22006C",
+"[	c #240075",
+"}	c #260075",
+"|	c #230070",
+"1	c #24006C",
+"2	c #230072",
+"3	c #260073",
+"4	c #23006F",
+"5	c #230071",
+"6	c #24006D",
+"7	c #210064",
+"8	c #210066",
+"9	c #200065",
+"0	c #210065",
+"a	c #200063",
+"b	c #1D0062",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                 .++                    ",
+"               @+#+$%&*                 ",
+"             =-;#>,')!~{]^              ",
+"             .;/>(>)_:~~~<~<            ",
+"             [}###'|&:~<<~~1!*          ",
+"              .2$3'')4::{~~~~~^         ",
+"                $%'5'  4{6<~~~~_        ",
+"                 4)|      <~~~~!        ",
+"                           :~~~!~       ",
+"                           4{~~~<       ",
+"                            ~~~~{_      ",
+"                             ~~~6~      ",
+"                             ~~~~:      ",
+"                             ]~~{~!     ",
+"                             ~~~{~      ",
+"                             ~~~]!      ",
+"                            ~~~~:|      ",
+"                           {<~~~!       ",
+"                           ~~~~!~       ",
+"                          <~~~~!        ",
+"                       :{{<~~~*]        ",
+"            !::]1!{{{{<~{~~~~]!         ",
+"           ^64~~]!~~~<~~~~~*6{          ",
+"           {!&!]~~~~~~~<]~*~            ",
+"             :*]~~~~~~~<_<              ",
+"               7890009ab                ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        ",
+"                                        "};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/CMakeLists.txt
new file mode 100755
index 000000000..f1a45f753
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/CMakeLists.txt
@@ -0,0 +1,43 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+
+# LIBRARY
+SET(SideBar_SRCS
+  side_bar.cpp
+  side_bar.h
+  side_bar_export.h
+  side_bar_item.cpp
+  side_bar_item.h
+  side_bar_model.cpp
+  side_bar_model.h
+)
+
+SET(SidBar_ICONS
+#  state_icon_b.xpm
+#  state_icon_a.xpm
+#  state_icon_c.xpm
+)
+
+SOURCE_GROUP(SideBar FILES ${SideBar_SRCS})
+NGL_ADD_LIBRARY(WS situationMapSideBar SHARED ${SideBar_SRCS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES(situationMapSideBar
+  PUBLIC
+#    ${CMAKE_CURRENT_SOURCE_DIR}
+#    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+
+NGL_TARGET_LINK_LIBRARIES(situationMapSideBar
+  PRIVATE
+    NGLLogger
+  PUBLIC
+    situationMapCommon
+    Qt6::Core
+    Qt6::Widgets
+)
+
+NGL_INSTALL_TARGET(situationMapSideBar)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.cpp
new file mode 100755
index 000000000..44245dd6c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.cpp
@@ -0,0 +1,416 @@
+/**
+  * @RDE_HEADER@
+  * SideBar
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+
+// Own
+#include "side_bar.h"
+#include "side_bar_model.h"
+
+// Qt
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QTreeView>
+#include <QKeyEvent>
+#include <QSharedPointer>
+#include <QPropertyAnimation>
+#include <QPainter>
+#include <QIcon>
+#include <QTimer>
+
+namespace SituationMap
+{
+
+class SideBar::Private
+{
+public:
+  Private()  = default;
+  ~Private() = default;
+
+
+  SideBarModel     *m_model         = nullptr;
+  QTreeView        *m_view          = nullptr;
+  bool              m_suppressClick = false;
+  QTimer           *m_suppressTimer = nullptr;
+
+  QSharedPointer<QPropertyAnimation> m_sideBarAniOn;
+  QSharedPointer<QPropertyAnimation> m_sideBarAniOff;
+
+
+}; // class SideBar::Private
+//-----------------------------------------------------------------------------
+
+
+
+
+//-----------------------------------------------------------------------------
+QImage SideBar::createImage(const QColor &fgColor,
+                            const QColor &bgColor,
+                            int size)
+{
+  QImage burgerMenueImage(size, size, QImage::Format_ARGB32);
+  if (bgColor.isValid())
+    burgerMenueImage.fill(bgColor);
+  else
+    burgerMenueImage.fill(Qt::transparent);
+
+  QPainter p(&burgerMenueImage);
+
+  {
+    QPen pen(Qt::white);
+    pen.setWidth(size * 0.15);
+    pen.setCapStyle(Qt::PenCapStyle::RoundCap);
+    p.setPen(pen);
+
+    double yFactor = 0.1;
+    p.drawLine(QPointF(size * yFactor, size * 0.25), QPointF(size - size * yFactor, size * 0.25));
+    p.drawLine(QPointF(size * yFactor, size * 0.50), QPointF(size - size * yFactor, size * 0.50));
+    p.drawLine(QPointF(size * yFactor, size * 0.75), QPointF(size - size * yFactor, size * 0.75));
+  }
+
+  {
+    QPen pen(fgColor);
+    pen.setWidth(size * 0.1);
+    pen.setCapStyle(Qt::PenCapStyle::RoundCap);
+    p.setPen(pen);
+
+    double yFactor = 0.1;
+    p.drawLine(QPointF(size * yFactor, size * 0.25), QPointF(size - size * yFactor, size * 0.25));
+    p.drawLine(QPointF(size * yFactor, size * 0.50), QPointF(size - size * yFactor, size * 0.50));
+    p.drawLine(QPointF(size * yFactor, size * 0.75), QPointF(size - size * yFactor, size * 0.75));
+  }
+
+  return burgerMenueImage;
+}
+
+QIcon SideBar::createIcon(const QColor &fgColor,
+                          const QColor &bgColor,
+                          int size)
+{
+  return QIcon(QPixmap::fromImage(SideBar::createImage(fgColor, bgColor, size)));
+}
+
+
+SideBar::SideBar(QWidget *parent)
+  : BaseClass(parent)
+  , d(new Private)
+  , m_logger(getLogger("SideBar"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // Prepare animations:
+  d->m_sideBarAniOn  = QSharedPointer<QPropertyAnimation>(new QPropertyAnimation(this, "pos"));
+  connect(d->m_sideBarAniOn.data(), &QPropertyAnimation::finished, this, &SideBar::onAnimationOnFinished);
+
+  d->m_sideBarAniOff = QSharedPointer<QPropertyAnimation>(new QPropertyAnimation(this, "pos"));
+  connect(d->m_sideBarAniOff.data(), &QPropertyAnimation::finished, this, &SideBar::onAnimationOffFinished);
+
+  QVBoxLayout *layout = new QVBoxLayout();
+  layout->setObjectName(QLatin1String("SideBarLayout"));
+  this->setLayout(layout);
+
+  // 1st row
+  QHBoxLayout *layoutTopRow = new QHBoxLayout();
+  layoutTopRow->setObjectName(QLatin1String("SideBarTopRowLayout"));
+  layout->addLayout(layoutTopRow);
+  layoutTopRow->addStretch(2);
+
+  QPushButton *close = new QPushButton();
+  close->setObjectName(QLatin1String("SideBarCloseButton"));
+  close->setMinimumSize(QSize(0, 0));
+  close->setStyleSheet(QLatin1String("QPushButton {background-color: white; border: 1px solid transparent;}"));
+  close->setIcon(QIcon(QLatin1String("icon:dialog-close.svg")));
+//  close->setIcon(QIcon(QLatin1String("qrc:///icons/svg/dialog-close.svg")));
+  close->setIconSize(QSize(20, 20));
+//  close->setStyleSheet(QLatin1String("QPushButton { image: url(\"icon:dialog-close.svg\"); }"));
+
+
+
+  // lambda :-)
+  connect(close, &QPushButton::clicked, this, [this]()
+  {
+    emit closeRequest();
+    this->hideAnimated();
+  });
+
+
+  layoutTopRow->addWidget(close);
+
+  // 2nd Row
+  d->m_view = new QTreeView(this);
+  if (d->m_view)
+  {
+    d->m_view->setObjectName(QLatin1String("SideBarTreeView"));
+    d->m_view->setMinimumSize(QSize(0, 0));
+    d->m_view->setAlternatingRowColors(true);
+    connect(d->m_view, &QTreeView::clicked, this, &SideBar::onClicked);
+
+    layout->addWidget(d->m_view);
+
+    initModel();
+    d->m_view->setModel(d->m_model);
+  }
+
+  initAppearanceToSideBar(true);
+  //initAppearanceToSideBar(false);
+
+
+  d->m_suppressTimer = new QTimer(this);
+  d->m_suppressTimer->setSingleShot(true);
+  d->m_suppressTimer->setInterval(20);
+  connect(d->m_suppressTimer, &QTimer::timeout, this, [this]() {
+    d->m_suppressClick = false;
+  });
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+SideBar::~SideBar()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+bool SideBar::initAppearanceToSideBar(bool toSideBar)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, toSideBar = " << toSideBar;
+
+  if (toSideBar)
+  {
+    setWindowFlag(Qt::FramelessWindowHint);
+    if (d->m_view)
+      d->m_view->setHeaderHidden(true);       // only TreeView
+
+    this->layout()->setSpacing(0);
+    this->layout()->setContentsMargins(0, 0, 0, 0);
+
+//    d->m_view->setStyleSheet(QLatin1String("QLabel {border: none;}"));
+
+  }
+  else
+  {
+    if (d->m_view)
+      d->m_view->setHeaderHidden(false);
+
+    this->layout()->setSpacing(2);
+    this->layout()->setContentsMargins(-1, -1, -1, -1);  // -1 -> invalid (!?)
+
+  }
+
+  setAutoFillBackground(true);
+  // // this->setStyleSheet(QLatin1String("QWidget {background-color: white;}"));
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void SideBar::setAnimationDuration(int msecs)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  d->m_sideBarAniOn->setDuration(msecs);
+  d->m_sideBarAniOff->setDuration(msecs);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBar::setInvisiblePosition(const QPoint &invisiblePos)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " invisiblePos=" << invisiblePos;
+
+  // x--->
+  d->m_sideBarAniOn->setStartValue(invisiblePos);
+
+  // x<---
+  d->m_sideBarAniOff->setEndValue(invisiblePos);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " invisiblePos=" << invisiblePos;
+}
+
+void SideBar::setVisiblePosition(const QPoint &visiblePos)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " visiblePos=" << visiblePos;
+
+  // --->x
+  d->m_sideBarAniOn->setEndValue(visiblePos);
+
+  // <---x
+  d->m_sideBarAniOff->setStartValue(visiblePos);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " visiblePos=" << visiblePos;
+}
+
+void SideBar::showAnimated()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  this->show();
+  this->raise();
+
+  onAnimationStarted();
+  d->m_sideBarAniOn->start();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool SideBar::isCurrentlyShowing()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_sideBarAniOn->state() == QAbstractAnimation::Running;
+}
+
+void SideBar::hideAnimated()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // use current position (maybe showAnimation is interrupted)
+  d->m_sideBarAniOff->setStartValue(this->pos());
+
+  onAnimationStarted();
+  d->m_sideBarAniOff->start();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool SideBar::isCurrentlyHiding()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return d->m_sideBarAniOff->state() == QAbstractAnimation::Running;
+}
+
+
+bool SideBar::initModel()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  delete d->m_model;
+  d->m_model = new SideBarModel(this);
+  d->m_model->setObjectName(QLatin1String("SideBarModel"));
+
+  connect(d->m_model, &SideBarModel::itemChanged, this, &SideBar::onItemChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+bool SideBar::addCheckableItem(SideBarItem *item)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  item->setCheckable(true);
+  item->setEditable(false);
+
+  d->m_model->addItem(item);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+
+bool SideBar::addWidget(QWidget *widget)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  this->layout()->addWidget(widget);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void SideBar::onItemChanged(QStandardItem *item)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QString itemText(QLatin1String("-"));
+  if (item)
+    itemText = item->text();
+  INFO_LOG(m_logger) << LOGFUNCTION << " itemChanged, itemText='" << itemText << "'";
+
+  // hide if empty:
+  if (d->m_view)
+    d->m_view->setEnabled(d->m_model->rowCount() > 0);
+
+  emit dataChanged();
+
+  // If user clicks checkbox, 'clicked' is also emitted afterwards...
+  // In  this case, avoid evaluating that signal for a small amount on time
+  d->m_suppressClick = true;
+  d->m_suppressTimer->start();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBar::onAnimationOnFinished()
+{
+  onAnimationFinished();
+}
+
+void SideBar::onAnimationOffFinished()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  this->hide();
+  onAnimationFinished();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBar::onClicked(const QModelIndex &index)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  if (!d->m_model)
+    return;
+
+  if (d->m_suppressClick)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_suppressClick";
+    return;
+  }
+
+  QStandardItem *item = d->m_model->itemFromIndex(index);
+  if (!item)
+    return;
+  if (!item->isCheckable())
+    return;
+  if (!item->isEnabled())
+    return;
+
+  if (item->checkState() == Qt::CheckState::Checked)
+    item->setCheckState(Qt::CheckState::Unchecked);
+  else
+    item->setCheckState(Qt::CheckState::Checked);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBar::onAnimationStarted()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  int h = this->parentWidget()->height();
+  this->setFixedHeight(h); // SetFixedSize/setFixedHeight to have smooth animations, especially in case of some JumpPoints
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBar::onAnimationFinished()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  this->setFixedHeight(QWIDGETSIZE_MAX);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.h
new file mode 100755
index 000000000..1f22e96e1
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar.h
@@ -0,0 +1,102 @@
+/**
+  * @RDE_HEADER@
+  * SideBar
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+#pragma once
+
+// Own
+#include "side_bar_export.h"
+#include "side_bar_item.h"
+#include <Common/situation_map_logging.h>
+
+// Qt
+#include <QDialog>
+
+class QModelIndex;
+class QStandardItem;
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+// forward:
+class Map;
+
+
+// using baseclass QDialog -> with background / no transparency
+// using baseclass QWidget -> no background / will be transparent
+class SIDEBAR_EXPORT SideBar : public QDialog
+{
+  using BaseClass = QDialog;
+
+  Q_OBJECT
+
+public:
+  static QImage createImage(const QColor &fgColor
+                            , const QColor &bgColor
+                            , int size);
+
+  static QIcon createIcon(const QColor &fgColor
+                          , const QColor &bgColor
+                          , int size);
+
+
+  explicit SideBar(QWidget *parent = nullptr);
+  virtual ~SideBar();
+
+  // Animation regarding position:
+  virtual void setAnimationDuration(int msecs);
+  virtual void setInvisiblePosition(const QPoint &invisiblePos);
+  virtual void setVisiblePosition(const QPoint &visiblePos);
+
+  virtual void showAnimated();
+  virtual bool isCurrentlyShowing();
+
+  virtual void hideAnimated();
+  virtual bool isCurrentlyHiding();
+
+  virtual bool addCheckableItem(SideBarItem *item);
+
+  virtual bool addWidget(QWidget *widget);
+
+signals:
+  void dataChanged();
+  void closeRequest();
+
+  void positionString(bool onOff);
+
+
+protected Q_SLOTS:
+  void onItemChanged(QStandardItem *item);
+  void onAnimationOnFinished();
+  void onAnimationOffFinished();
+  void onClicked(const QModelIndex &index);
+
+  void onAnimationStarted();
+  void onAnimationFinished();
+
+
+private:
+  bool initAppearanceToSideBar(bool toSideBar = true);
+  bool initModel();
+
+private:
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_export.h
new file mode 100755
index 000000000..ccbd301ad
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_export.h
@@ -0,0 +1,21 @@
+/**
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef SIDEBAR_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define SIDEBAR_EXPORT
+# else
+# if defined(MAKE_SITUATIONMAPSIDEBAR_LIB)
+#   define SIDEBAR_EXPORT Q_DECL_EXPORT
+#  else
+#   define SIDEBAR_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.cpp
new file mode 100755
index 000000000..3894fb2c7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.cpp
@@ -0,0 +1,42 @@
+/**
+  * @RDE_HEADER@
+  * SideBarItem
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+
+// Own
+#include "side_bar_item.h"
+
+
+namespace SituationMap
+{
+
+SideBarItem::SideBarItem(const QString &text)
+  : QObject()
+  , QStandardItem(text)
+  , m_logger(getLogger("SideBarItem"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+SideBarItem::~SideBarItem()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBarItem::doEmitChanged()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  emit changed(this->checkState() == Qt::CheckState::Checked);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.h
new file mode 100755
index 000000000..11614fc0d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_item.h
@@ -0,0 +1,51 @@
+/**
+  * @RDE_HEADER@
+  * SideBarItem
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+#pragma once
+
+// Own
+#include <Common/situation_map_logging.h>
+#include "side_bar_export.h"
+
+
+// Qt
+#include <QStandardItemModel>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+
+class SIDEBAR_EXPORT SideBarItem : public QObject, public QStandardItem
+{
+  Q_OBJECT
+
+public:
+  explicit SideBarItem(const QString &text);
+  virtual ~SideBarItem();
+
+  virtual int type() const
+  {
+    return QStandardItem::UserType + 1;
+  }
+
+  void doEmitChanged();
+
+signals:
+  bool changed(bool);
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+};
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.cpp
new file mode 100755
index 000000000..61fce1555
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.cpp
@@ -0,0 +1,123 @@
+/**
+  * @RDE_HEADER@
+  * SideBarModel
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+
+// Own
+#include "side_bar_model.h"
+#include <Common/situation_map_logging.h>
+
+
+namespace SituationMap
+{
+
+SideBarModel::SideBarModel(QObject *parent)
+  : BaseClass(0, 1, parent)
+  , m_logger(getLogger("SideBarModel"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+//  fillDummyData();
+
+  connect(this, &SideBarModel::itemChanged, this, &SideBarModel::onItemChanged);
+//  connect(this, &SideBarModel::dataChanged, this, &SideBarModel::onDataChanged);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+SideBarModel::~SideBarModel()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBarModel::fillDummyData()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  // remove old entries:
+  removeRows(0, rowCount());
+
+  // setHeader
+  setHeaderData(0, Qt::Horizontal, QStringLiteral("HeaderH"));
+
+  // fill data:
+  QStandardItem *rootItem = invisibleRootItem();
+
+  // be prepared for a tree:
+  {
+    QList<QStandardItem *> itemRow;
+    QStandardItem *item = new QStandardItem(QLatin1String("Entry01"));
+    item->setCheckable(true);
+    itemRow.append(item);
+    rootItem->appendRow(itemRow);
+  }
+
+  {
+    QList<QStandardItem *> itemRow;
+    QStandardItem *item = new QStandardItem(QLatin1String("Entry02"));
+    item->setCheckable(true);
+    itemRow.append(item);
+    rootItem->appendRow(itemRow);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+//void SideBarModel::addItem(QStandardItem *item, QStandardItem *parentItem)
+//{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+//  QList<QStandardItem*> itemRow;
+//  itemRow.append(item);
+
+//  if (parentItem)
+//    parentItem->appendRow(itemRow);
+//  else
+//    invisibleRootItem()->appendRow(itemRow);
+
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+//}
+
+void SideBarModel::addItem(SideBarItem *item, SideBarItem *parentItem)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QList<QStandardItem *> itemRow;
+  itemRow.append(item);
+
+  if (parentItem)
+    parentItem->appendRow(itemRow);
+  else
+    invisibleRootItem()->appendRow(itemRow);
+
+
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void SideBarModel::onItemChanged(QStandardItem *item)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QString itemText(QLatin1String("-"));
+  if (item)
+    itemText = item->text();
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " itemChanged, itemText='" << itemText << "'";
+
+  SideBarItem *sideBarItem = dynamic_cast<SideBarItem *>(item);
+  if (sideBarItem)
+    sideBarItem->doEmitChanged();
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.h
new file mode 100755
index 000000000..8bf171c9e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SideBar/side_bar_model.h
@@ -0,0 +1,67 @@
+/**
+  * @RDE_HEADER@
+  * SideBarModel
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, SLSE, 2015-01-19
+  */
+
+#pragma once
+
+// Own
+#include <Common/situation_map_logging.h>
+#include "side_bar_item.h"
+#include "side_bar_export.h"
+
+
+// Qt
+#include <QStandardItemModel>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SIDEBAR_EXPORT SideBarModel : public QStandardItemModel
+{
+  using BaseClass = QStandardItemModel;
+
+  Q_OBJECT
+
+public:
+  explicit SideBarModel(QObject *parent);
+  virtual ~SideBarModel();
+
+  void fillDummyData();
+
+//  void addItem(QStandardItem *item, QStandardItem *parentItem = nullptr);
+  void addItem(SideBarItem *item, SideBarItem *parentItem = nullptr);
+
+
+
+//  // QAbstractItemModel: reimplemented :
+//  QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
+//  QModelIndex parent(const QModelIndex &child) const;
+
+//  virtual int rowCount(const QModelIndex &parent = QModelIndex()) const = 0;
+//  virtual int columnCount(const QModelIndex &parent = QModelIndex()) const = 0;
+
+//  virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const = 0;
+//  // : reimplemented
+
+signals:
+
+protected Q_SLOTS:
+  void onItemChanged(QStandardItem *item);
+
+
+private:
+  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
+
+};
+
+
+
+} // namespace SituationMap
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/CMakeLists.txt
index d35c353f0..3860bad87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/CMakeLists.txt
@@ -13,6 +13,15 @@ else()
   set(Qt6_Widgets "")
 endif()
 
+# Build this target as separate translation units (NOT a unity build). The Esri ArcGIS
+# SDK header MapTypes.h does Q_DECLARE_METATYPE(Esri::ArcGISRuntime::LoadStatus) at line
+# 525; when this target's sources + moc are concatenated into one unity TU, the moc's
+# meta-object code instantiates QMetaTypeId<Esri::ArcGISRuntime::LoadStatus> before that
+# declaration, so the vendor Q_DECLARE_METATYPE becomes a "specialization after
+# instantiation" redefinition (a Qt6 error). Legacy (Qt5, separate TUs) never hit this.
+# Disabling unity restores the legacy per-TU structure for this target (behavior-neutral).
+set(CMAKE_UNITY_BUILD FALSE)
+
 
 SET(Symbology_SRCS
   sidc_codec.cpp
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h
index 1965b08f4..73fc5afd6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h
@@ -25,7 +25,7 @@ namespace AdvancedSymbology
 template<class PARTICIPANT_ROLE_TYPE = ParticipantManagement::Role>
 AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role)
 {
-  switch (role.underlying())
+  switch (role)
   {
   case ParticipantManagement::Role::Unknown:
     return AdvancedSymbology::Role::Unknown;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/CMakeLists.txt
new file mode 100755
index 000000000..b28a007d7
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/CMakeLists.txt
@@ -0,0 +1,52 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+# Qt6 + ArcGIS 300 migration: Qt5::->Qt6:: and gated on BUILD_ARCGIS (ArcGIS
+# dependent via advancedSymbology / situationMap) to match the migrated
+# Symbology convention.
+#
+# LIBRARY
+
+SET(SymbologyGui_SRCS
+  base_symbol_lookup_dialog.cpp
+  base_symbol_lookup_dialog.h
+  base_symbol_lookup_widget.cpp
+  base_symbol_lookup_widget.h
+  field_table_model.cpp
+  field_table_model.h
+  symbol_modification_widget.h
+  symbol_modification_widget.cpp
+  symbol_modification_dialog.h
+  symbol_modification_dialog.cpp
+)
+
+SOURCE_GROUP(SymbologyGui FILES ${SymbologyGui_SRCS})
+
+NGL_WRAP_UI(SymbologyGui_SRCS
+  base_symbol_lookup_widget.ui
+)
+
+IF(BUILD_ARCGIS)
+NGL_ADD_LIBRARY2(WS advancedSymbologyGui SHARED ${SymbologyGui_SRCS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbologyGui
+  PUBLIC
+     ${CMAKE_CURRENT_SOURCE_DIR}/..
+     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Common
+)
+
+NGL_TARGET_LINK_LIBRARIES(advancedSymbologyGui
+  PRIVATE
+    Qt6::Gui
+    Qt6::Network
+    ArcGIS::ArcGIS   # 300: own sources include ArcGIS (Symbol.h) + arcgisversion.h headers
+  PUBLIC
+    LtsWidgets
+    LtsUtilsSettings
+    advancedSymbology
+    situationMap
+    Qt6::Core
+)
+ENDIF() # BUILD_ARCGIS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.cpp
new file mode 100755
index 000000000..c00c29606
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.cpp
@@ -0,0 +1,329 @@
+/**
+**
+** @RDE_HEADER@
+** PlanEditor.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   13.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#include "base_symbol_filter_proxy.h"
+
+#include <Symbology/symbol_dictionary.h>
+#include <Symbology/sidc_builder_base.h>
+#include <Symbology/sidc_codec.h>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QMimeData>
+#include <QtCore/QSet>
+
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+
+struct BaseSymbolProxyFilter::InternalData
+{
+  QStringList m_sidcList;
+  QStringList m_keyList;
+  // no need for QHash/QSet - element count is very small
+  QVector<AdvancedSymbology::GeometryType> m_geometrySet = {GeometryType::Point, GeometryType::Polyline, GeometryType::Polygon};
+  bool        m_filterParicipantSymbols = false;
+  bool        m_etsSymbols = true;
+  bool        m_xmlSymbols = true;
+  bool        m_esriDictSymbols = true;
+
+}; // class BaseSymbolProxyFilter::InternalData
+
+
+BaseSymbolProxyFilter::BaseSymbolProxyFilter(QObject *parent)
+  : QSortFilterProxyModel(parent)
+  , m_internal(new InternalData())
+{}
+
+BaseSymbolProxyFilter::~BaseSymbolProxyFilter()
+{
+  delete m_internal;
+} // BaseSymbolProxyFilter::~BaseSymbolProxyFilter()
+
+QStringList  BaseSymbolProxyFilter::mimeTypes() const
+{
+  QStringList mineTypeList = QSortFilterProxyModel::mimeTypes();
+  mineTypeList << QStringLiteral("Participant");
+  return mineTypeList;
+} // QStringList  BaseSymbolProxyFilter::mimeTypes() const
+
+
+QMimeData *BaseSymbolProxyFilter::mimeData(const QModelIndexList &indexes) const
+{
+  QMimeData *mimeData = QSortFilterProxyModel::mimeData(indexes);
+  
+  if (mimeData)
+  {
+    const QByteArray &data = QByteArray::number(int(filterParticipants()));
+    mimeData->setData(QStringLiteral("Participant"), data);
+  }
+
+  return mimeData;
+} // QMimeData * BaseSymbolProxyFilter::mimeData(const QModelIndexList &indexes) const
+
+
+void BaseSymbolProxyFilter::updateModel(const QStringList &keyList)
+{
+  m_internal->m_keyList = keyList;
+
+  if (keyList.isEmpty())
+  {
+    m_internal->m_sidcList.clear();
+    invalidateFilter();
+    return;
+  }
+
+  const AdvancedSymbology::SymbolDictionary &dict = symbolDictionary();
+
+  AdvancedSymbology::SearchParameters lookupDefs;
+
+  lookupDefs.tags = keyList;
+  lookupDefs.symbolClasses = QStringList({QStringLiteral("3"), QStringLiteral("4"), QStringLiteral("5")});
+
+  AdvancedSymbology::PropertyResultWatcher *symbolGuard  = new AdvancedSymbology::PropertyResultWatcher(this);
+
+  connect(symbolGuard, &AdvancedSymbology::SymbolResultWatcher::resultReady, this, [this, symbolGuard]()
+  {
+    BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+    if (!sidcLookupModel)
+      return;
+
+    QSharedPointer<AdvancedSymbology::PropertyResult> lookupResult = symbolGuard->propertyResult();
+    const SymbolPropertyList &symbolPropertyList = lookupResult->properties();
+    if (symbolPropertyList.isEmpty())
+      return;
+
+    {
+      m_internal->m_sidcList.clear();
+      for (const AdvancedSymbology::SymbolProperties &prop : symbolPropertyList)
+      {
+        const QString &baseSymbolCode = SidcCodec::encodeBaseSymbolCode(symbolDictionary().symbologyType(), prop.key());
+        QString        sidc           = AdvancedSymbology::SidcBuilderBase::baseSymbolCodeToSidc(baseSymbolCode);
+        
+        if (sidc.isEmpty()) sidc = prop.sidc(); // case of ETS and XML symbol the props.key() is the filename and sidc will be empty
+
+        if (sidcLookupModel->isInModel(sidc))
+        {
+          m_internal->m_sidcList += sidc;
+        }
+      }
+      invalidateFilter();
+    }
+    symbolGuard->deleteLater();
+  });
+
+  symbolGuard->setPropertyResult(dict.searchSymbols(lookupDefs));
+
+} // void BaseSymbolProxyFilter::updateModel( const QStringList & keyList )
+
+
+bool BaseSymbolProxyFilter::filterAcceptsRow(int sourceRow, const QModelIndex &) const
+{
+  BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+  const QString    &sidc           = sidcLookupModel->getSidc(sourceRow);
+
+  bool accept = (m_internal->m_sidcList.isEmpty()) ? true : m_internal->m_sidcList.contains(sidc);
+
+  SidcCodec::SidcType sidcType = SidcCodec::decodeSidcType(sidc);
+
+  accept = (accept) ? (    (!SidcCodec::isCivil(sidc) && m_internal->m_esriDictSymbols)
+                        || (m_internal->m_etsSymbols && (SidcCodec::SidcType::CivilEts == sidcType))
+                        || (m_internal->m_xmlSymbols && (SidcCodec::SidcType::CivilXml == sidcType)) ) : false;
+
+  if (accept)
+  {
+    if (m_internal->m_filterParicipantSymbols)
+      accept = m_internal->m_geometrySet.contains(GeometryType::Point) && sidcLookupModel->isParticipant(sourceRow);
+    else
+      accept = m_internal->m_geometrySet.contains(sidcLookupModel->getSymbolGeometry(sourceRow));
+  }
+  return accept;
+} // bool BaseSymbolProxyFilter::filterAcceptsRow( int sourceRow, const QModelIndex & sourceParent )
+
+
+const AdvancedSymbology::SymbolDictionary &BaseSymbolProxyFilter::symbolDictionary() const
+{
+  BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+  return sidcLookupModel->symbolDictionary();
+} // const AdvancedSymbology::SymbolDictionary & BaseSymbolProxyFilter::symbolDictionary()
+
+
+void BaseSymbolProxyFilter::setSourceModel(BaseSymbolModel *sourceModel)
+{
+  setSourceModel(static_cast<QAbstractItemModel *>(sourceModel));
+} // void BaseSymbolProxyFilter::setSourceModel(  AdvancedSymbologyGui::BaseSymbolModel * sourceModel )
+
+
+bool BaseSymbolProxyFilter::isEmpty() const
+{
+  BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+  return sidcLookupModel->isEmpty();
+} // bool BaseSymbolProxyFilter::isEmpty() const
+
+
+QString BaseSymbolProxyFilter::getSidc(int idx) const
+{
+  const QModelIndex &sourceIndex     = mapToSource(index(idx, 0));
+  BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+  return sidcLookupModel->getSidc(sourceIndex.row());
+} // QString BaseSymbolProxyFilter::getSidc( int idx ) const
+
+
+int BaseSymbolProxyFilter::size() const
+{
+  BaseSymbolModel *sidcLookupModel = static_cast<BaseSymbolModel *>(sourceModel());
+  return sidcLookupModel->size();
+} // int BaseSymbolProxyFilter::size() const
+
+
+const QStringList &BaseSymbolProxyFilter::filterSymbolTags() const
+{
+  return m_internal->m_keyList;
+} // const QStringList & BaseSymbolProxyFilter::filterSymbolTags() const
+
+
+bool BaseSymbolProxyFilter::filterPoints() const
+{
+  return m_internal->m_geometrySet.contains(AdvancedSymbology::GeometryType::Point);
+} // bool BaseSymbolProxyFilter::filterPoints() const
+
+
+bool BaseSymbolProxyFilter::filterLines() const
+{
+  return m_internal->m_geometrySet.contains(AdvancedSymbology::GeometryType::Polyline);
+} // bool BaseSymbolProxyFilter::filterLines() const
+
+
+bool BaseSymbolProxyFilter::filterAreas() const
+{
+  return m_internal->m_geometrySet.contains(AdvancedSymbology::GeometryType::Polygon);
+} // bool BaseSymbolProxyFilter::filterAreas() const
+
+
+bool BaseSymbolProxyFilter::filterParticipants() const
+{
+  return m_internal->m_filterParicipantSymbols;
+} // bool BaseSymbolProxyFilter::filterParticipants() const
+
+
+bool BaseSymbolProxyFilter::filterExtraSymbols() const
+{
+  return m_internal->m_etsSymbols &&  m_internal->m_xmlSymbols;
+} // bool BaseSymbolProxyFilter::filterExtraSymbols() const
+
+bool BaseSymbolProxyFilter::filterEtsSymbols() const
+{
+  return m_internal->m_etsSymbols;
+} // bool BaseSymbolProxyFilter::filterEtsSymbols() const
+
+bool BaseSymbolProxyFilter::filterXmlSymbols() const
+{
+  return m_internal->m_xmlSymbols;
+} // bool BaseSymbolProxyFilter::filterXmlSymbols() const
+
+bool BaseSymbolProxyFilter::filterEsriDictSymbols() const
+{
+  return m_internal->m_esriDictSymbols;
+} // bool BaseSymbolProxyFilter::filterXmlSymbols() const
+
+
+void BaseSymbolProxyFilter::onFilterSymbolTags(const QStringList &keyList)
+{
+  updateModel(keyList);
+} // void BaseSymbolProxyFilter::onFilterSymbolTags(const QStringList &keyList)
+
+void BaseSymbolProxyFilter::onFilterExtraSymbols(bool on)
+{
+  if (m_internal->m_etsSymbols == on && m_internal->m_xmlSymbols == on)
+    return;
+  m_internal->m_etsSymbols = on;
+  m_internal->m_xmlSymbols = on;
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterExtraSymbols(bool on)
+
+
+void BaseSymbolProxyFilter::onFilterEtsSymbols(bool on)
+{
+  if (m_internal->m_etsSymbols == on)
+    return;
+  m_internal->m_etsSymbols = on;
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterEtsSymbols(bool on)
+
+void BaseSymbolProxyFilter::onFilterXmlSymbols(bool on)
+{
+  if (m_internal->m_xmlSymbols == on)
+    return;
+  m_internal->m_xmlSymbols = on;
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterXmlSymbols(bool on)
+
+
+void BaseSymbolProxyFilter::onFilterEsriDictSymbols(bool on)
+{
+  if (m_internal->m_esriDictSymbols == on)
+    return;
+  m_internal->m_esriDictSymbols = on;
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterXmlSymbols(bool on)
+
+void BaseSymbolProxyFilter::onFilterParticipants(bool on)
+{
+  if (m_internal->m_filterParicipantSymbols == on)
+    return;
+  m_internal->m_filterParicipantSymbols = on;
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterParticipants(bool on)
+
+void BaseSymbolProxyFilter::onFilterPoints(bool on)
+{
+  if (on) m_internal->m_geometrySet.push_back(AdvancedSymbology::GeometryType::Point);
+  else    m_internal->m_geometrySet.removeAll(AdvancedSymbology::GeometryType::Point);
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterPoints(bool on)
+
+
+void BaseSymbolProxyFilter::onFilterLines(bool on)
+{
+  if (on) m_internal->m_geometrySet.push_back(AdvancedSymbology::GeometryType::Polyline);
+  else    m_internal->m_geometrySet.removeAll(AdvancedSymbology::GeometryType::Polyline);
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterLines(bool on)
+
+
+void BaseSymbolProxyFilter::onFilterAreas(bool on)
+{
+  if (on) m_internal->m_geometrySet.push_back(AdvancedSymbology::GeometryType::Polygon);
+  else    m_internal->m_geometrySet.removeAll(AdvancedSymbology::GeometryType::Polygon);
+  invalidateFilter();
+} // void BaseSymbolProxyFilter::onFilterAreas(bool on)
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.h
new file mode 100755
index 000000000..7fc220d08
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_filter_proxy.h
@@ -0,0 +1,142 @@
+/**
+**
+** @RDE_HEADER@
+** PlanEditor.
+** $Id$
+** $HeadURL$
+** $Author$
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Hardware-Environment: Intel-PC
+** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
+**
+** Language ........: C++ 11
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Author ...........: Jörg Turla, SPD G, Tel. 3132
+**
+** -----------------------------------------------------------------------------------------------
+**
+** Notes .........:
+**
+**   13.06.2016, JT  : First edition for use with Qt5
+**
+** -----------------------------------------------------------------------------------------------
+*/
+
+
+#pragma once
+
+#include "base_symbol_model.h"
+
+#include <QString>
+#include <QStringList>
+#include <QSortFilterProxyModel>
+
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+/**
+   @brief Filter proxy to BaseSymbolModel to retain list of symbols
+
+   To retain the full list of symbols to a smaller list which can be easier handled
+   by the user a QSortFilterProxyModel is used.
+
+   @see BaseSymbolModel, BaseSymbolLookupWidget
+
+ */
+
+class ADVANCED_SYMBOLOGY_GUI_EXPORT BaseSymbolProxyFilter : public QSortFilterProxyModel
+{
+  Q_OBJECT
+
+public:
+
+  explicit BaseSymbolProxyFilter(QObject *parent = nullptr);
+
+  ~BaseSymbolProxyFilter();
+
+  const AdvancedSymbology::SymbolDictionary &symbolDictionary() const;
+
+  void setSourceModel(AdvancedSymbology::Gui::BaseSymbolModel *sourceModel);
+
+  int size() const;
+
+  bool isEmpty() const;
+
+  /**
+     Provides the code of the symbol as string.
+     @param idx row number of the symbol
+     @return full concret sidc of symbol
+   */
+  QString getSidc(int idx) const;
+
+  /**
+     Provides current constraints to filter full symbol list of BaseSymbolModel
+     @{
+   */
+  const QStringList &filterSymbolTags() const;
+
+  bool filterExtraSymbols() const;
+  bool filterEtsSymbols() const;
+  bool filterXmlSymbols() const;
+  bool filterEsriDictSymbols() const;
+
+  bool filterParticipants() const;
+
+  bool filterPoints() const;
+  bool filterLines()  const;
+  bool filterAreas()  const;
+  /* @} */
+
+  QStringList  mimeTypes() const override;
+  QMimeData  * mimeData(const QModelIndexList &indexes) const override;
+
+protected:
+
+  struct InternalData;
+
+  InternalData *m_internal;
+
+  /**
+     Internal update of filtering tags by using the dictionary (is called from \ c onFilterSymbolTags).
+   */
+  void updateModel(const QStringList &keyList);
+
+  /**
+     Overriden from QSortFilterProxyModel to associate source model with filter model.
+   */
+  void setSourceModel(QAbstractItemModel *sourceModel) override { QSortFilterProxyModel::setSourceModel(sourceModel); }
+
+  /**
+     Overriden from QSortFilterProxyModel to do the filtering.
+   */
+  bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+public slots:
+
+  /**
+    Define constraints to filter full symbol list of BaseSymbolModel
+    @{
+    */
+  void onFilterSymbolTags(const QStringList &keyList);
+
+  void onFilterExtraSymbols(bool on);
+  void onFilterEtsSymbols(bool on);
+  void onFilterXmlSymbols(bool on);
+  void onFilterEsriDictSymbols(bool on);
+
+  void onFilterParticipants(bool on);
+
+  void onFilterPoints(bool on);
+  void onFilterLines(bool on);
+  void onFilterAreas(bool on);
+  /* @} */
+}; // BaseSymbolProxyFilter
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.cpp
new file mode 100755
index 000000000..2aa107603
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.cpp
@@ -0,0 +1,210 @@
+/**
+  * @RDE_HEADER@
+  * Dialog for selecting (base) symbols
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLE, 12.12.2019
+  */
+
+#include "base_symbol_lookup_dialog.h"
+#include "base_symbol_lookup_widget.h"
+#include <LtsWidgets/lts_dialog_button_box.h>
+#include <LtsUtilsSettings/settings.h>
+
+#include <Symbology/symbol_dictionary.h>
+#include <SymbologyImpl/symbol_dictionary_impl.h>
+#include <SymbologyImpl/base_symbol_model.h>
+
+#include <Symbology/sidc_builder_base.h> // for baseSymbolCodeToSidc
+
+#include <QVBoxLayout>
+#include <QHash>
+#include <QPointer>
+
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupDialog::Private
+//------------------------------------------------------------------------------
+struct BaseSymbolLookupDialog::Private
+{
+public:
+  Private() = default;
+
+  ~Private()
+  {
+    delete m_baseSymbolWidget;
+    delete m_buttonBox;
+  }
+  BaseSymbolLookupWidget       *m_baseSymbolWidget = nullptr;
+  LtsWidgets::LtsDialogButtonBox *m_buttonBox        = nullptr;
+};
+
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupDialog
+//------------------------------------------------------------------------------
+BaseSymbolLookupDialog::BaseSymbolLookupDialog(QWidget *parent)
+  : BaseClass(parent, LtsWidgets::Behaviour::Modal)
+  , m_logger(getLogger("BaseSymbolLookupDialog"))
+  , d(new Private())
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool BaseSymbolLookupDialog::participantMode() const
+{
+  if (!d->m_baseSymbolWidget)
+    return false;
+  return d->m_baseSymbolWidget->participantMode();
+}
+void BaseSymbolLookupDialog::setParticipantMode(bool onOff)
+{
+  if (!d->m_baseSymbolWidget)
+    return;
+  d->m_baseSymbolWidget->setParticipantMode(onOff);
+}
+
+void BaseSymbolLookupDialog::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes)
+{
+  if (!d->m_baseSymbolWidget)
+    return;
+  d->m_baseSymbolWidget->setValidBaseSymbolCodes(validBaseSymbolCodes);
+}
+
+bool BaseSymbolLookupDialog::init(AdvancedSymbology::SymbolDictionary &symbolDictionary)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
+
+  bool  enableEtsSymbols =  ps->value(QStringLiteral("SituationMap"), QStringLiteral("enableEtsSymbols"), true).toBool();
+
+  // setup:
+  delete d->m_baseSymbolWidget;
+  delete d->m_buttonBox;
+
+  AdvancedSymbology::SymbolDictionaryImpl &sdi = static_cast<AdvancedSymbology::SymbolDictionaryImpl &>(symbolDictionary);
+  AdvancedSymbology::BaseSymbolModel *bsmEsri = sdi.getBaseSymbolModelEsri();
+  AdvancedSymbology::BaseSymbolModel *bsmXml  = sdi.getBaseSymbolModelXML();
+  AdvancedSymbology::BaseSymbolModel *bsmEts  = sdi.getBaseSymbolModelEts();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " bsmEsri rowCount" << bsmEsri->rowCount();
+  const SymbologyType symbologyType = sdi.symbologyType();
+  AdvancedSymbology::Gui::MODEL_CONT modelCont;
+  modelCont.append(AdvancedSymbology::Gui::ModelItem(AdvancedSymbology::Gui::SYMBOL_TYPE::ESRI, toString(symbologyType),                bsmEsri));
+  modelCont.append(AdvancedSymbology::Gui::ModelItem(AdvancedSymbology::Gui::SYMBOL_TYPE::XML,  QLatin1String("User-defined Symbols"), bsmXml));
+  if (enableEtsSymbols )
+    modelCont.append(AdvancedSymbology::Gui::ModelItem(AdvancedSymbology::Gui::SYMBOL_TYPE::ETS,  QLatin1String("Ets"),                  bsmEts));
+
+  d->m_baseSymbolWidget = new AdvancedSymbology::Gui::BaseSymbolLookupWidget(modelCont, this);
+
+  connect(d->m_baseSymbolWidget, &AdvancedSymbology::Gui::BaseSymbolLookupWidget::symbolClicked,       this, &BaseSymbolLookupDialog::onSymbolClicked);
+  connect(d->m_baseSymbolWidget, &AdvancedSymbology::Gui::BaseSymbolLookupWidget::symbolDoubleClicked, this, &BaseSymbolLookupDialog::onSymbolDoubleClicked);
+
+
+  d->m_buttonBox = new LtsWidgets::LtsDialogButtonBox(this);
+
+  connect(d->m_buttonBox->getButton(LtsWidgets::DialogButton::Ok),    &QPushButton::clicked, this, &BaseSymbolLookupDialog::apply);
+  connect(d->m_buttonBox->getButton(LtsWidgets::DialogButton::Close), &QPushButton::clicked, this, &BaseSymbolLookupDialog::close);
+
+  d->m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setEnabled(false); // until an item is selected
+
+
+  // setup layout:
+  QVBoxLayout *layout = new QVBoxLayout();
+
+  layout->addWidget(d->m_baseSymbolWidget, 2);
+  layout->addWidget(d->m_buttonBox);
+  setLayout(layout);
+
+  setMinimumWidth(800);
+  resize(sizeHint().height(), minimumWidth());
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+BaseSymbolLookupDialog::~BaseSymbolLookupDialog()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QString BaseSymbolLookupDialog::getCurrentBaseSymbolCode() const
+{
+  if (!d->m_baseSymbolWidget)
+    return QString();
+  return d->m_baseSymbolWidget->getCurrentBaseSymbolCode();
+}
+
+bool BaseSymbolLookupDialog::setCurrentSidc(const QString &sidc)
+{
+  if (!d->m_baseSymbolWidget)
+    return false;
+  bool success = d->m_baseSymbolWidget->setCurrentSidc(sidc);
+//  d->m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setEnabled(success);
+  return success;
+}
+
+void BaseSymbolLookupDialog::onSymbolClicked(const QString &baseSymbolCode, const QString &sidc)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, "
+                      << " baseSymbolCode='" << baseSymbolCode << "'"
+                      << " sidc='" << sidc << "'";
+
+  d->m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setEnabled(!sidc.isEmpty());
+
+//  slotChangesMade();
+}
+
+void BaseSymbolLookupDialog::onSymbolDoubleClicked(const QString &baseSymbolCode, const QString &sidc)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, "
+                      << " baseSymbolCode='" << baseSymbolCode << "'"
+                      << " sidc='" << sidc << "'";
+  apply();
+}
+
+void BaseSymbolLookupDialog::apply()
+{
+  if (!d->m_baseSymbolWidget)
+    return ;
+  QSharedPointer<BaseSymbolItem> bsi = d->m_baseSymbolWidget->getCurrentBaseSymbolItem();
+  if (!bsi)
+    return;
+
+  const QString &curBsc = bsi->baseSymbolCode();
+  const QString &curSidc = bsi->sidc();
+
+  emit lookupAppliedBaseSymbolCode(curBsc);
+  emit lookupAppliedCompleteSidc(curSidc);
+  accept();
+}
+
+BaseSymbolLookupDialog *BaseSymbolLookupDialog::showInstance()
+{
+  static QPointer<BaseSymbolLookupDialog> s_BaseSymbolLookupDialog;
+
+  if (!s_BaseSymbolLookupDialog)
+    s_BaseSymbolLookupDialog = createDlg();
+
+  return s_BaseSymbolLookupDialog;
+}
+
+BaseSymbolLookupDialog *BaseSymbolLookupDialog::createDlg(QWidget *parent)
+{
+  AdvancedSymbology::Gui::BaseSymbolLookupDialog *dlg = new AdvancedSymbology::Gui::BaseSymbolLookupDialog(parent);
+  dlg->init(AdvancedSymbology::SymbolDictionary::dictionary(AdvancedSymbology::SymbolDictionary::defaultSymbologyType()));
+  return dlg;
+}
+
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.h
new file mode 100755
index 000000000..9fead78c2
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_dialog.h
@@ -0,0 +1,76 @@
+/**
+  * @RDE_HEADER@
+  * Dialog for selecting (base) symbols
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLE, 12.12.2019
+  */
+
+#pragma once
+
+#include <SymbologyGui/advancedsymbologygui_export.h>
+#include <Symbology/symbology_type.h>
+#include <Common/situation_map_logging.h>
+#include <LtsWidgets/lts_frameless_dialog.h>
+
+
+namespace AdvancedSymbology
+{
+class SymbolDictionary;
+
+
+namespace Gui
+{
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupDialog
+//------------------------------------------------------------------------------
+class ADVANCEDSYMBOLOGYGUI_EXPORT BaseSymbolLookupDialog : public LtsWidgets::LtsFramelessDialog
+{
+  Q_OBJECT
+  using BaseClass = LtsWidgets::LtsFramelessDialog;
+
+public:
+  static BaseSymbolLookupDialog *showInstance();
+
+  static BaseSymbolLookupDialog *createDlg(QWidget *parent = nullptr);
+
+
+  explicit BaseSymbolLookupDialog(QWidget *parent = nullptr);
+  ~BaseSymbolLookupDialog();
+
+  bool init(SymbolDictionary &symbolDictionary);
+
+  bool participantMode() const;
+  void setParticipantMode(bool onOff);
+
+  void setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes);
+
+  QString getCurrentBaseSymbolCode() const;
+  bool setCurrentSidc(const QString &sidc);
+
+Q_SIGNALS:
+  void lookupAppliedBaseSymbolCode(const QString &sidc);
+  void lookupAppliedCompleteSidc(const QString &sidc);
+
+protected:
+  void apply();
+
+protected Q_SLOTS:
+  void onSymbolDoubleClicked(const QString &baseSymbolCode, const QString &sidc);
+  void onSymbolClicked(const QString &baseSymbolCode, const QString &sidc);
+
+private:
+  SituationMap::LOGGER_T m_logger;
+
+  struct Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+}; // BaseSymbolLookupDialog
+
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.cpp
new file mode 100755
index 000000000..f745a763c
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.cpp
@@ -0,0 +1,482 @@
+/**
+  * @RDE_HEADER@
+  * Widget for selecting (base) symbols
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLE, 12.12.2019
+  */
+
+#include "base_symbol_lookup_widget.h"
+#include "ui_base_symbol_lookup_widget.h"
+
+#include <Symbology/sidc_builder_base.h>          // for concreteSidcToBaseSymbolCode
+#include <SymbologyImpl/base_symbol_model.h>
+
+// Lts
+//#include <LtsWidgets/lts_combo_box.h>
+#include "LtsDataView/lts_data_view.h"
+
+// Qt
+#include <QMap>
+#include <QtCore/QMimeData>
+#include <QtCore/QSignalBlocker>
+
+#include <QtGui/QDrag>
+
+#include <QtGui/QPixmap>
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QCheckBox>
+// Qt6: QDesktopWidget removed (was unused here)
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
+
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupWidget::Private
+//------------------------------------------------------------------------------
+struct BaseSymbolLookupWidget::Private
+{
+  MODEL_CONT                            modelContainer;
+
+  QMap<SYMBOL_TYPE, int>                m_symbologyTypeToIdx;
+  QMap<int, SYMBOL_TYPE>                m_idxToSymbologyType;
+  QMap<int, LtsDataView::LtsDataView *> m_idxToDataViewCont; // tabIdx -> view
+  QMap<int, BaseSymbolModel *>          m_idxToModel; // tabIdx -> view
+
+  bool                                  m_participantMode = false;
+  QCheckBox                            *m_cbPoint = nullptr;
+  QCheckBox                            *m_cbLine = nullptr;
+  QCheckBox                            *m_cbArea = nullptr;
+  QSet<QString>                         m_validBaseSymbolCodes;
+};
+
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupWidget
+//------------------------------------------------------------------------------
+BaseSymbolLookupWidget::BaseSymbolLookupWidget(const MODEL_CONT &modelCont, QWidget *parent)
+  : QWidget(parent)
+  , m_logger(getLogger("BaseSymbolLookupWidget"))
+  , m_ui(new Ui::BaseSymbolLookupWidget)
+  , d(new Private())
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_ui->setupUi(this);
+
+  // clear, we use our own widgets:
+  m_ui->tabWidget->removeTab(0);
+
+  d->modelContainer = modelCont;
+
+  for (const auto &modelData : qAsConst(d->modelContainer))
+  {
+    if (!modelData.m_baseSymbolModel)
+      continue;
+
+    LtsDataView::LtsDataView *dv = new LtsDataView::LtsDataView(this);
+
+    BaseSymbolProxyModel *proxy = new BaseSymbolProxyModel(this);
+    proxy->setSourceModel(modelData.m_baseSymbolModel);
+    proxy->setDynamicSortFilter(false);
+    dv->setModel(proxy);
+
+    // connect:
+    connect(dv, &LtsDataView::LtsDataView::clicked,       this, &BaseSymbolLookupWidget::onClicked);
+    connect(dv, &LtsDataView::LtsDataView::doubleClicked, this, &BaseSymbolLookupWidget::onDoubleClicked);
+
+    if (modelData.m_symbolType == SYMBOL_TYPE::ESRI)
+    {
+      // ESRI -> add some cbs for Point, Line, Area:
+      // HBox with 3 cbs:
+      QHBoxLayout *layoutGeomSelect = new QHBoxLayout();
+      d->m_cbPoint = new QCheckBox(tr("Point"), this);
+      d->m_cbLine  = new QCheckBox(tr("Line"), this);
+      d->m_cbArea  = new QCheckBox(tr("Area"), this);
+      layoutGeomSelect->addWidget(d->m_cbPoint, 0);
+      layoutGeomSelect->addWidget(d->m_cbLine, 0);
+      layoutGeomSelect->addWidget(d->m_cbArea, 0);
+      layoutGeomSelect->addStretch(9);
+
+      d->m_cbPoint->setChecked(proxy->filterPoints());
+      d->m_cbLine->setChecked(proxy->filterLines());
+      d->m_cbArea->setChecked(proxy->filterAreas());
+      connect(d->m_cbPoint, &QCheckBox::toggled, proxy, &BaseSymbolProxyModel::onFilterPoints);
+      connect(d->m_cbLine,  &QCheckBox::toggled, proxy, &BaseSymbolProxyModel::onFilterLines);
+      connect(d->m_cbArea,  &QCheckBox::toggled, proxy, &BaseSymbolProxyModel::onFilterAreas);
+
+      // VBox with layoutGeomSelect and LtsDataView
+      QVBoxLayout *layout = new QVBoxLayout();
+      layout->addLayout(layoutGeomSelect);
+      layout->addWidget(dv);
+
+      // wrap within a widget:
+      QWidget *w = new QWidget();
+      w->setLayout(layout);
+
+      int idx = m_ui->tabWidget->addTab(w, modelData.m_name);
+      d->m_symbologyTypeToIdx[modelData.m_symbolType] = idx;
+      d->m_idxToSymbologyType[idx] = modelData.m_symbolType;
+      d->m_idxToDataViewCont[idx] = dv;
+      d->m_idxToModel[idx] = modelData.m_baseSymbolModel;
+    }
+    else
+    {
+      const int idx = m_ui->tabWidget->addTab(dv, modelData.m_name);
+      d->m_symbologyTypeToIdx[modelData.m_symbolType] = idx;
+      d->m_idxToSymbologyType[idx] = modelData.m_symbolType;
+      d->m_idxToDataViewCont[idx] = dv;
+      d->m_idxToModel[idx] = modelData.m_baseSymbolModel;
+    }
+
+    showHideColumns(modelData.m_symbolType);
+
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+BaseSymbolLookupWidget::~BaseSymbolLookupWidget()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  delete d;
+  delete m_ui;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void BaseSymbolLookupWidget::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes)
+{
+  d->m_validBaseSymbolCodes = validBaseSymbolCodes;
+
+  const int tabCount = m_ui->tabWidget->count();
+  for (int tabIdx = 0; tabIdx < tabCount; ++tabIdx)
+  {
+    LtsDataView::LtsDataView *dv = d->m_idxToDataViewCont[tabIdx];
+    if (!dv)
+      continue;
+
+    BaseSymbolProxyModel *proxy = qobject_cast<BaseSymbolProxyModel *>(dv->proxyModel());
+    if (proxy)
+      proxy->setValidBaseSymbolCodes(d->m_validBaseSymbolCodes);
+  } // for
+}
+
+bool BaseSymbolLookupWidget::participantMode() const
+{
+  return d->m_participantMode;
+}
+
+void BaseSymbolLookupWidget::setParticipantMode(bool onOff)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, participantMode =" << onOff;
+  d->m_participantMode = onOff;
+  if (d->m_participantMode)
+  {
+    d->m_cbPoint->setChecked(true);
+    d->m_cbLine->setChecked(false);
+    d->m_cbArea->setChecked(false);
+  }
+  else
+  {
+    d->m_cbPoint->setChecked(true);
+    d->m_cbLine->setChecked(true);
+    d->m_cbArea->setChecked(true);
+  }
+
+  d->m_cbPoint->setVisible(!d->m_participantMode);
+  d->m_cbLine->setVisible(!d->m_participantMode);
+  d->m_cbArea->setVisible(!d->m_participantMode);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+void BaseSymbolLookupWidget::showHideColumns(SYMBOL_TYPE symType)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, symType=" << static_cast<int>(symType);
+  if (!d->m_symbologyTypeToIdx.contains(symType))
+    return;
+
+  const int idx = d->m_symbologyTypeToIdx[symType];
+  LtsDataView::LtsDataView *dv = d->m_idxToDataViewCont[idx];
+  if (!dv)
+    return;
+
+#ifdef LTS_DEBUG
+  const bool showAll = QGuiApplication::keyboardModifiers().testFlag(Qt::KeyboardModifier::ControlModifier);
+#else
+  const bool showAll = false;
+#endif //   LTS_DEBUG
+
+  switch (symType)
+  {
+  case SYMBOL_TYPE::ESRI:
+//    dv->setColumnHidden(BaseSymbolModel::Columns::ID,             !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::ORIGINAL_KEY,   !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::KEY,            !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::OPERATOR_NAME,  !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::LAST_MODIFIED,  !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SIDC,           !showAll);
+
+
+    dv->setColumnHidden(BaseSymbolModel::Columns::SEARCH_ICON,        !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FETCH_ICON,         !showAll);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_BASE_SYMBOL,   !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_PREVIEW,       !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_IMAGE,         !showAll);
+
+    dv->setColumnHidden(BaseSymbolModel::Columns::XML_SYMBOL_SIZE,    !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::CATEGORY,           !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SYMBOLCLASS,        !showAll);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::TAGS,               !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GCTSTRING,          !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GEOMETRYTYPE,       !showAll);
+    break;
+
+  case SYMBOL_TYPE::XML:
+//    dv->setColumnHidden(BaseSymbolModel::Columns::ID,                 !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::ORIGINAL_KEY,       !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::KEY,                !showAll);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::OPERATOR_NAME,      !showAll);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::LAST_MODIFIED,      !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SIDC,               !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SYMBOL_SET,         true);
+
+    dv->setColumnHidden(BaseSymbolModel::Columns::SEARCH_ICON,        !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FETCH_ICON,         !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_BASE_SYMBOL,   !showAll);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_PREVIEW,       !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_IMAGE,         !showAll);
+
+//    dv->setColumnHidden(BaseSymbolModel::Columns::XML_SYMBOL_SIZE,    !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::CATEGORY,           !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SYMBOLCLASS,        !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::TAGS,               !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GCTSTRING,          !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GEOMETRYTYPE,       !showAll);
+    break;
+
+  case SYMBOL_TYPE::ETS:
+//    dv->setColumnHidden(BaseSymbolModel::Columns::ID,                 !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::ORIGINAL_KEY,       true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::KEY,                true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::OPERATOR_NAME,      true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::LAST_MODIFIED,      true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SIDC,               !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SYMBOL_SET,         true);
+
+    dv->setColumnHidden(BaseSymbolModel::Columns::SEARCH_ICON,        true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FETCH_ICON,         true);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_BASE_SYMBOL,   !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_PREVIEW,       true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::FIND_IMAGE,         true);
+
+    dv->setColumnHidden(BaseSymbolModel::Columns::XML_SYMBOL_SIZE,    true);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::CATEGORY,           !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::SYMBOLCLASS,        true);
+//    dv->setColumnHidden(BaseSymbolModel::Columns::TAGS,               !showAll);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GCTSTRING,          true);
+    dv->setColumnHidden(BaseSymbolModel::Columns::GEOMETRYTYPE,       true);
+    break;
+  } // switch
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+bool BaseSymbolLookupWidget::setCurrentTab(SYMBOL_TYPE symType)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START, symType=" << static_cast<int>(symType);
+  if (!d->m_symbologyTypeToIdx.contains(symType))
+    return false;
+  const int idx = d->m_symbologyTypeToIdx[symType];
+  m_ui->tabWidget->setCurrentIndex(idx);
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return true;
+}
+
+void BaseSymbolLookupWidget::showEvent(QShowEvent *event)
+{
+  Q_UNUSED(event);
+  showHideColumns(SYMBOL_TYPE::ESRI);
+  showHideColumns(SYMBOL_TYPE::XML);
+  showHideColumns(SYMBOL_TYPE::ETS);
+}
+
+
+QSharedPointer<BaseSymbolItem> BaseSymbolLookupWidget::getCurrentBaseSymbolItem() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  const int tabIdx = m_ui->tabWidget->currentIndex();
+  LtsDataView::LtsDataView *dv = d->m_idxToDataViewCont[tabIdx];
+  BaseSymbolModel *bsm       = d->m_idxToModel[tabIdx];
+
+  if (!dv || !bsm)
+    return nullptr;
+
+  // found :-)
+  QItemSelectionModel *selectModel = dv->selectionModel();
+
+  if (!selectModel || !selectModel->hasSelection())
+    return nullptr;
+
+  const QItemSelection &selectionSource = dv->mapSelectionToSource(selectModel->selection());
+  const int row = selectionSource.indexes().first().row();  // assume singleSelection
+
+  return bsm->getRowData(row);
+}
+
+QString BaseSymbolLookupWidget::getCurrentBaseSymbolCode() const
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  QSharedPointer<BaseSymbolItem> bsi = getCurrentBaseSymbolItem();
+  if (bsi)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " m_id" << bsi->m_id
+                        << ", baseSymbolCode" << bsi->baseSymbolCode();
+    return bsi->baseSymbolCode();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return QString();
+}
+
+QString BaseSymbolLookupWidget::getCurrentSidc() const
+{
+  QSharedPointer<BaseSymbolItem> bsi = getCurrentBaseSymbolItem();
+  if (bsi)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION
+                        << " m_id" << bsi->m_id
+                        << ", sidc" << bsi->sidc();
+    return bsi->sidc();
+  }
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return QString();
+}
+
+bool BaseSymbolLookupWidget::setCurrentSidc(const QString &sidc)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " sidc='" << sidc << "'";
+
+  if (sidc.isEmpty())
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " sidc is empty, maybe not set...";
+    return false;
+  }
+
+  if (!SidcCodec::isEncoded(sidc))
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " sidc isn't encoded: '" << sidc << "'";
+    return false;
+  }
+
+  SYMBOL_TYPE symType = SYMBOL_TYPE::ESRI;
+  QString baseSymbolCode = sidc;
+
+  const SidcCodec::SidcType sidcType = SidcCodec::decodeSidcType(sidc);
+  switch (sidcType)
+  {
+  case SidcCodec::SidcType::None:
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " SidcType::None isn't supported. Sidc= '" << sidc << "'";
+    return false;
+  }
+  case SidcCodec::SidcType::Complete:
+    baseSymbolCode = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(sidc);
+  case SidcCodec::SidcType::Base:
+    break;
+  case SidcCodec::SidcType::CivilEts:
+    symType = SYMBOL_TYPE::ETS;
+    break;
+  case SidcCodec::SidcType::CivilXml:
+    symType = SYMBOL_TYPE::XML;
+    break;
+  default :
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " SidcType is unknown. Sidc= '" << sidc << "'";
+    return false;
+  }
+  } // switch
+
+
+  // switch to model/view/tabIdx
+
+  if (!d->m_symbologyTypeToIdx.contains(symType))
+    return false;
+
+  const int                tabIdx = d->m_symbologyTypeToIdx[symType];
+  BaseSymbolModel        *bsm   = d->m_idxToModel[tabIdx];
+  LtsDataView::LtsDataView *dv    = d->m_idxToDataViewCont[tabIdx];
+
+  if (!bsm || !dv)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " switch to model/view/tabIndex failed, sidc '" << sidc << "'";
+    return false;
+  }
+
+  // switch to tabIdx
+  m_ui->tabWidget->setCurrentIndex(tabIdx);
+
+  // switch to model/view
+  const int row = bsm->findRowForBaseSymbolCode(baseSymbolCode);
+  if (row >= 0)
+  {
+    const QModelIndex sourceIdx = bsm->index(row, 0);
+    dv->selectRow(dv->proxyModel()->mapFromSource(sourceIdx));
+    dv->scrollTo(dv->proxyModel()->mapFromSource(sourceIdx));
+  }
+
+  INFO_LOG(m_logger) << LOGFUNCTION << " sidc='" << sidc << "'"
+                       << " tabIdx = " << tabIdx
+                       << " findRowForBaseSymbolCode -> row = " << row;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+  return (row >= 0);
+}
+
+void BaseSymbolLookupWidget::onClicked(const QModelIndex &index)
+{
+  Q_UNUSED(index);
+
+  QSharedPointer<BaseSymbolItem> bsi = getCurrentBaseSymbolItem();
+  if (!bsi)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " item not found";
+    return;
+  }
+  const QString &curBsc = bsi->baseSymbolCode();
+  const QString &curSidc = bsi->sidc();
+  emit symbolClicked(curBsc, curSidc);
+}
+
+void BaseSymbolLookupWidget::onDoubleClicked(const QModelIndex &index)
+{
+  Q_UNUSED(index);
+
+  QSharedPointer<BaseSymbolItem> bsi = getCurrentBaseSymbolItem();
+  if (!bsi)
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " item not found";
+    return;
+  }
+  const QString &curBsc = bsi->baseSymbolCode();
+  const QString &curSidc = bsi->sidc();
+  emit symbolDoubleClicked(curBsc, curSidc);
+}
+
+
+} // namespace Gui
+} // namespace AdvancedSymbology
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.h
new file mode 100755
index 000000000..782f376bc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.h
@@ -0,0 +1,104 @@
+/**
+  * @RDE_HEADER@
+  * Widget for selecting (base) symbols
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  * Created by Norbert Thoden, NLE, 12.12.2019
+  */
+
+#pragma once
+
+#include <SymbologyGui/advancedsymbologygui_export.h>
+#include <Common/situation_map_logging.h>
+
+#include <QWidget>
+#include <QVector>
+
+
+namespace Ui
+{
+class BaseSymbolLookupWidget;
+}
+
+
+namespace AdvancedSymbology
+{
+class BaseSymbolModel;
+class BaseSymbolItem;
+namespace Gui
+{
+
+enum class SYMBOL_TYPE
+{
+  ESRI = 0,
+  XML,
+  ETS
+};
+
+struct ModelItem
+{
+  ModelItem(SYMBOL_TYPE symbolType = SYMBOL_TYPE::ESRI,
+            const QString &name = QString(),
+            BaseSymbolModel  *baseSymbolModel = nullptr)
+    : m_symbolType(symbolType),
+      m_name(name),
+      m_baseSymbolModel(baseSymbolModel)
+  {}
+  SYMBOL_TYPE         m_symbolType;
+  QString             m_name;
+  BaseSymbolModel  *m_baseSymbolModel = nullptr;
+};
+
+using MODEL_CONT = QVector<ModelItem>;
+
+
+//------------------------------------------------------------------------------
+// BaseSymbolLookupWidget
+//------------------------------------------------------------------------------
+class ADVANCEDSYMBOLOGYGUI_EXPORT BaseSymbolLookupWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit BaseSymbolLookupWidget(const MODEL_CONT &modelCont, QWidget *parent);
+  ~BaseSymbolLookupWidget();
+
+  bool participantMode() const;
+  void setParticipantMode(bool onOff);
+
+  void setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes);
+
+  QSharedPointer<BaseSymbolItem> getCurrentBaseSymbolItem() const;
+  QString getCurrentBaseSymbolCode() const;   // encoded, baseSymbolCode
+  QString getCurrentSidc() const;             // encoded, complete
+  bool setCurrentSidc(const QString &sidc);   // encoded, baseSymbolCode or complete Sidc
+
+Q_SIGNALS:
+  void symbolClicked(const QString &baseSymbolCode, const QString &sidc);
+  void symbolDoubleClicked(const QString &baseSymbolCode, const QString &sidc);
+
+protected:
+  bool setCurrentTab(SYMBOL_TYPE symType);
+  void showHideColumns(SYMBOL_TYPE symType);
+
+protected Q_SLOTS:
+  void showEvent(QShowEvent *event) override;
+
+  void onClicked(const QModelIndex &index);
+  void onDoubleClicked(const QModelIndex &index);
+
+private:
+  SituationMap::LOGGER_T m_logger;
+
+  Ui::BaseSymbolLookupWidget *m_ui;
+
+  struct Private;
+  /**
+      * The private d->pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.ui b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.ui
new file mode 100755
index 000000000..ec83a4540
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/base_symbol_lookup_widget.ui
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BaseSymbolLookupWidget</class>
+ <widget class="QWidget" name="BaseSymbolLookupWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>840</width>
+    <height>463</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.cpp
new file mode 100755
index 000000000..21e05ba86
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.cpp
@@ -0,0 +1,126 @@
+/**
+  *
+  * @RDE_HEADER@
+  * Helper model for SymbolModificationWidget
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#include "field_table_model.h"
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+
+int FieldTableModel::columnCount(const QModelIndex &parent) const
+{
+  return parent.isValid() ? 0 : 2;
+}
+
+int FieldTableModel::rowCount(const QModelIndex &parent) const
+{
+  return parent.isValid() ? 0 : m_fieldKeys.size();
+}
+
+QVariant FieldTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+  if (role != Qt::DisplayRole) return QVariant();
+  if (Qt::Orientation::Horizontal == orientation)
+  {
+    switch (section)
+    {
+    case 0  : return tr("Field Title");
+    case 1  : return tr("Value");
+    default : break;
+    }
+  }
+  return QVariant();
+} // QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
+
+
+QVariant FieldTableModel::data(const QModelIndex &index, int role) const
+{
+  if (index.row() >= 0 && index.row() < m_fieldKeys.size() &&
+      role == Qt::DisplayRole)
+  {
+    const QString &key = m_fieldKeys.at(index.row());
+    switch (index.column())
+    {
+    case 0  : return key;
+    case 1  : return m_fieldValueMap[key];
+    default : QVariant();
+    }
+  }
+  return QVariant();
+} // QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override
+
+bool FieldTableModel::setFieldAttrMap(const QMap<QString, QVariant> &fieldAttrMap)
+{
+  beginResetModel();
+  {
+    m_fieldKeys = fieldAttrMap.keys();
+    m_fieldKeys.sort();
+    m_fieldValueMap = fieldAttrMap;
+  }
+  endResetModel();
+  return true;
+} // bool setFieldAttrMap( const QMap<QString,QVariant> & fieldAttrMap )
+
+
+void FieldTableModel::setFieldAttribute(const QString &key, const QString &value)
+{
+  beginResetModel();
+  {
+    m_fieldValueMap[key] = value;
+    if (!m_fieldKeys.contains(key))
+    {
+      m_fieldKeys += key;
+      m_fieldKeys.sort();
+    }
+  }
+  endResetModel();
+} // void setFieldAttribute( const QString & key, const QString & value )
+
+
+void FieldTableModel::setFieldAttribute(SituationMap::Participant::TextModifier textMod, const QString &value)
+{
+  const QString &key = participantAttributeKey(textMod);
+  if (!key.isEmpty()) setFieldAttribute(key, value);
+} // void setFieldAttribute(SituationMap::TextModifier textMod, const QString & value)
+
+
+void FieldTableModel::removeFieldAttrMap(const QString &key)
+{
+  if (m_fieldKeys.contains(key))
+  {
+    beginResetModel();
+    {
+      m_fieldKeys.removeAll(key);
+      m_fieldValueMap.remove(key);
+    }
+    endResetModel();
+  }
+} // void removeFieldAttrMap( const QString & key )
+
+
+QString FieldTableModel::fieldAttribute(const QString &key) const
+{
+  return m_fieldValueMap.value(key).toString();
+} // void fieldAttribute( const QString & key )
+
+QString FieldTableModel::fieldAttribute(SituationMap::Participant::TextModifier textMod)
+{
+  const QString &key = participantAttributeKey(textMod);
+  if (key.isEmpty()) return QString();
+  return fieldAttribute(key);
+} // QString fieldAttribute( SituationMap::TextModifier textMod )
+
+QString FieldTableModel::participantAttributeKey(SituationMap::Participant::TextModifier textMod)
+{
+  return SituationMap::Participant::toString(textMod);
+} // QString participantAttributeKey(SituationMap::TextModifier textMod)
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.h
new file mode 100755
index 000000000..805a6bd78
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/field_table_model.h
@@ -0,0 +1,47 @@
+/**
+  *
+  * @RDE_HEADER@
+  * Helper model for SymbolModificationWidget
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <QAbstractTableModel>
+#include <SituationMap/MapObjects/participant.h>
+
+namespace AdvancedSymbology
+{
+namespace  Gui
+{
+
+class FieldTableModel : public QAbstractTableModel
+{
+  Q_OBJECT
+public:
+  using QAbstractTableModel::QAbstractTableModel;
+
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+  int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+  const QMap<QString, QVariant> &fieldAttrMap() const { return m_fieldValueMap; }
+  bool setFieldAttrMap(const QMap<QString, QVariant> &fieldAttrMap);
+  void setFieldAttribute(const QString &key, const QString &value);
+  void setFieldAttribute(SituationMap::Participant::TextModifier textMod, const QString &value);
+  void removeFieldAttrMap(const QString &key);
+  QString fieldAttribute(const QString &key) const;
+  QString fieldAttribute(SituationMap::Participant::TextModifier textMod);
+
+private:
+  static QString participantAttributeKey(SituationMap::Participant::TextModifier textMod);
+private:
+  QStringList             m_fieldKeys;
+  QMap<QString, QVariant> m_fieldValueMap;
+
+}; // FieldTableModel
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.cpp
new file mode 100755
index 000000000..c9499d411
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.cpp
@@ -0,0 +1,137 @@
+/**
+* @RDE_HEADER@
+* symbol_modification_dialog for sidc configuration
+* $Id$
+* $HeadURL$
+* $Author$
+* Created by Karwat, SLSE, 2017-09-07
+*/
+
+#include "symbol_modification_dialog.h"
+#include "symbol_modification_widget.h"
+#include <QtWidgets/QVBoxLayout>
+
+
+namespace AdvancedSymbology
+{
+namespace Gui
+{
+
+//Dialog
+
+SymbolModificationDialog::SymbolModificationDialog(SituationMap::Map *map, bool isParticipant, QWidget *parent)
+  : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel)
+{
+  initLayout(map, isParticipant);
+}
+
+/*
+ * TODO: FIXME: Warum ist das ein OkCancel Dialog aber Ok wird gehided und Cancel dann wieder zu close umbenannt?
+ * Warum ist das nicht gleich ein CloseONly Dialog?
+ */
+void SymbolModificationDialog::removeOkAndApplyButtons()
+{
+  m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setVisible(false);
+  m_buttonBox->getButton(LtsWidgets::DialogButton::Apply)->setVisible(false);
+  m_buttonBox->getButton(LtsWidgets::DialogButton::Close)->setText(tr("Close"));
+}
+
+void SymbolModificationDialog::initLayout(SituationMap::Map *map, bool isParticipant)
+{
+
+  QVBoxLayout *layout = new QVBoxLayout(this);
+  m_symbolModificationWidget = new SymbolModificationWidget(map, isParticipant, map->symbolDictionary(), this);
+  connect(m_symbolModificationWidget, &SymbolModificationWidget::changed, this, &SymbolModificationDialog::changed);
+  connect(m_symbolModificationWidget, &SymbolModificationWidget::changed, this, &SymbolModificationDialog::slotChangesMade);
+  m_buttonBox->connectButton(LtsWidgets::DialogButton::No, m_symbolModificationWidget, &SymbolModificationWidget::onRevert);
+  m_buttonBox->setText(LtsWidgets::DialogButton::No, tr("Revert"));
+  layout->addWidget(m_symbolModificationWidget, 2);
+}
+
+
+
+void SymbolModificationDialog::aboutToClose() { emit signalAboutToClose(); }
+bool SymbolModificationDialog::apply()
+{
+  //const QString & sidc = getCurrentSidc();
+
+  //if (sidc.isEmpty()) return false;
+
+  //emit lookupApplied( sidc );
+  return true;
+} // SymbolModificationDialog::apply()
+
+
+void SymbolModificationDialog::retranslate()
+{
+  // lupdate doesn't like translate(tr("foo")) ...
+  const QString txt(tr("Symbol Modification"));
+  translate(txt);
+
+} // SymbolModificationDialog::retranslate()
+
+
+
+//Frameless
+SymbolModificationDialogFrameless::SymbolModificationDialogFrameless(SituationMap::Map *map, bool isParticipant, QWidget *parent)
+  : LtsWidgets::LtsFramelessDialog(parent)
+  , m_buttonBox(nullptr)
+{
+  initLayout(map, isParticipant, map->symbolDictionary());
+}
+
+SymbolModificationDialogFrameless::SymbolModificationDialogFrameless(SymbolDictionary &symbolDictionary, bool isParticipant, QWidget *parent)
+  : LtsWidgets::LtsFramelessDialog(parent)
+  , m_buttonBox(nullptr)
+{
+  initLayout(nullptr, isParticipant, symbolDictionary);
+}
+
+
+void SymbolModificationDialogFrameless::initLayout(SituationMap::Map *map, bool isParticipant, SymbolDictionary &symbolDictionary)
+{
+  QVBoxLayout *layout = new QVBoxLayout(this);
+  m_buttonBox = new LtsWidgets::LtsDialogButtonBox(this);
+  m_symbolModificationWidget = new SymbolModificationWidget(map, isParticipant, symbolDictionary, this);
+  connect(m_symbolModificationWidget, &SymbolModificationWidget::changed, this, &SymbolModificationDialogFrameless::sidcChanged);
+
+  layout->addWidget(m_symbolModificationWidget, 2);
+  layout->addWidget(m_buttonBox);
+
+  connect(m_buttonBox->getButton(LtsWidgets::DialogButton::Ok), &QPushButton::clicked, this, &SymbolModificationDialogFrameless::apply);
+  connect(m_buttonBox->getButton(LtsWidgets::DialogButton::Close), &QPushButton::clicked, this, &SymbolModificationDialogFrameless::onClose);
+  m_buttonBox->connectButton(LtsWidgets::DialogButton::No, m_symbolModificationWidget, &SymbolModificationWidget::onRevert);
+  m_buttonBox->setText(LtsWidgets::DialogButton::No, tr("Revert"));
+  setMinimumWidth(800);
+  setMinimumHeight(300);
+  resize(minimumHeight(), minimumWidth());
+}
+
+
+void SymbolModificationDialogFrameless::setSidc(const QString &sidc)
+{
+  m_symbolModificationWidget->setSidc(sidc);
+  m_oldSidc = sidc;
+}
+
+void SymbolModificationDialogFrameless::apply()
+{
+  emit sidcOnClose(m_newSidc);
+  close();
+}
+
+void SymbolModificationDialogFrameless::onClose()
+{
+  emit sidcOnClose(m_oldSidc);
+  close();
+}
+
+void SymbolModificationDialogFrameless::sidcChanged()
+{
+  const QString &newSidc  = m_symbolModificationWidget->modifiedSidc();
+  m_newSidc = newSidc;
+  emit changed();
+}
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.h
new file mode 100755
index 000000000..a856ea879
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_dialog.h
@@ -0,0 +1,86 @@
+/**
+*
+* @RDE_HEADER@
+* symbol_modification_dialog for sidc configuration
+* $Id$
+* $HeadURL$
+* $Author$
+* Created by Karwat, SLSE, 2017-09-07
+*/
+
+#pragma once
+
+#include <SymbologyGui/advancedsymbologygui_export.h>
+
+#include <LtsWidgets/lts_dialog.h>
+
+#include "symbol_modification_widget.h"
+
+
+
+namespace AdvancedSymbology
+{
+class SymbolDictionary;
+
+namespace Gui
+{
+
+class ADVANCEDSYMBOLOGYGUI_EXPORT SymbolModificationDialog : public LtsWidgets::LtsDialog
+{
+  Q_OBJECT
+
+public:
+
+  explicit SymbolModificationDialog(SituationMap::Map *map, bool isParticipant, QWidget *parent = nullptr);
+
+  SymbolModificationWidget *getWidget() { return m_symbolModificationWidget; }
+  void removeOkAndApplyButtons();
+
+signals:
+  void changed();
+  void signalAboutToClose();
+
+protected:
+
+  bool apply() override;
+
+  void aboutToClose() override;
+
+private:
+  void retranslate() override;
+  void initLayout(SituationMap::Map *map, bool isParticipant);
+
+  SymbolModificationWidget   *m_symbolModificationWidget;
+}; // SymbolModificationDialog
+
+class ADVANCEDSYMBOLOGYGUI_EXPORT SymbolModificationDialogFrameless : public LtsWidgets::LtsFramelessDialog
+{
+  Q_OBJECT
+
+public:
+  explicit SymbolModificationDialogFrameless(SituationMap::Map *map, bool isParticipant, QWidget *parent = nullptr);
+  explicit SymbolModificationDialogFrameless(SymbolDictionary &symbolDictionary, bool isParticipant, QWidget *parent = nullptr);
+
+  void setSidc(const QString &sidc);
+
+
+signals:
+  void changed();
+  void sidcOnClose(const QString &);
+
+protected slots:
+  void apply(); //next override
+  void onClose();
+  void sidcChanged();
+
+private:
+  void initLayout(SituationMap::Map *map, bool isParticipant, SymbolDictionary &symbolDictionary);
+  SymbolModificationWidget       *m_symbolModificationWidget;
+  LtsWidgets::LtsDialogButtonBox *m_buttonBox;
+  QString m_newSidc;
+  QString m_oldSidc;
+
+}; // SymbolModificationDialogFrameless
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.cpp
new file mode 100755
index 000000000..e989b9404
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.cpp
@@ -0,0 +1,1301 @@
+/**
+*
+* @RDE_HEADER@
+* symbol_modification_wdiget for sidc configuration
+* $Id$
+* $HeadURL$
+* $Author$
+* Created by Karwat, SLSE, 2017-09-07
+*/
+
+
+#include "symbol_modification_widget.h"
+
+#include "field_table_model.h"
+
+#include <Map/party_id_to_color_functor.h>
+
+#include <Symbology/symbol_dictionary.h>
+#include <Symbology/sidc_definitions.h>
+#include <Symbology/sidc_builder.h>
+
+// Lts
+#include <LtsWidgets/lts_combo_box.h>
+
+// Qt
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QPointer>
+
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QHeaderView>
+
+
+namespace AdvancedSymbology
+{
+namespace  Gui
+{
+
+class SidcWithIcon : public QWidget
+{
+
+public:
+
+  explicit SidcWithIcon(QWidget *parent = nullptr) : QWidget(parent)
+  {
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    //    layout->setContentsMargins(0,0,0,0);
+    //    layout->setSpacing(0);
+
+
+    m_lbImage = new QLabel(this);
+    //    m_lbImage->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+    //    m_lbImage->setMaximumSize(QSize(100,100));
+    layout->addWidget(m_lbImage);
+
+    m_lbText = new QLabel(this);
+    //    m_lbText->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+    //    m_lbImage->setMaximumSize(QSize(100,100));
+    layout->addWidget(m_lbText);
+
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    // setMaximumHeight(100);
+    // setMaximumWidth(300);
+  } // SidcWithIcon(QWidget* parent = nullptr)
+
+  void setImage(const QImage &img) { m_lbImage->setPixmap(QPixmap::fromImage(img).scaledToHeight(100)); }
+
+  void setText(const QString &text)   { m_lbText->setText(text); }
+
+private:
+
+  QLabel *m_lbImage;
+  QLabel *m_lbText;
+
+}; //  SidcWithIcon
+
+
+
+
+//---------------------------------
+// EnumComboBox
+//---------------------------------
+
+using MyComboBox = LtsWidgets::LtsComboBox;
+
+
+template <typename T> class EnumComboBox : public MyComboBox
+{
+
+public:
+
+  explicit EnumComboBox(QWidget *parent = nullptr) : MyComboBox(parent)  {;}
+
+  void insertNumberedItem(int idx, T value)
+  {
+    insertNumberedItem(idx, AdvancedSymbology::SidcDefinitions::toPixmap(value), AdvancedSymbology::SidcDefinitions::toString(value), static_cast<int>(value));
+  } // void insertNumberedItem( int idx, T value )
+
+
+  void insertNumberedItem(int idx, const QString &text, int value)
+  {
+    MyComboBox::insertItem(idx, QStringLiteral("%1 %2").arg(value).arg(text), value);
+  } // void insertNumberedItem( int idx, const QString & text, int value )
+
+
+  void insertNumberedItem(int idx, const QPixmap & pixmap, const QString &text, int value)
+  {
+    MyComboBox::insertItem(idx, pixmap, QStringLiteral("%1 %2").arg(value).arg(text), value);
+  } // void insertNumberedItem( int idx, const QString & text, int value )
+
+
+  void insertItems(const QVector<T> &items)
+  {
+    MyComboBox::clear();
+
+    int idx = 0;
+    for (const auto &item : items)
+      insertNumberedItem(idx++, item);
+    if (MyComboBox::count() > 0)
+      setCurrentIndex(0);
+  } // void insertItems( const QVector<T> & items )
+
+
+  T   currentValue()      const   { return static_cast<T>(currentData().toInt()); }
+  int currentValueAsInt() const   { return currentData().toInt();                      }
+
+
+  bool setCurrent(const T &newCurrentValue)
+  {
+    QVariant newCurVar(static_cast<int>(newCurrentValue));
+    MyComboBox::setCurrentIndex(findData(newCurVar));
+    return true;
+  } // bool setCurrent( const T & newCurrentValue )
+
+signals:
+
+  void changed(T newValue);
+
+protected Q_SLOTS:
+
+  void onCurrentIndexChanged(int)  { emit changed(currentValue()); }
+
+}; //  template <typename T> class EnumComboBox
+
+
+
+
+
+class SymbolModificationWidget::Internal
+{
+public:
+
+  QPointer<SituationMap::Map>                                        m_map;
+
+  AdvancedSymbology::SidcDefinitions                                 m_sidcDefinitions;
+  AdvancedSymbology::SidcBuilder                                     m_sidcBuilder;
+  AdvancedSymbology::SymbolDictionary                               &m_dict;
+  AdvancedSymbology::SymbologyType                                   m_symbologyType;
+
+  bool                                                               m_isParticipant;
+
+  QString                                                            m_originalSidc;
+  QString                                                            m_lastModifiedSidc;
+  QString                                                            m_baseSymbolCode;
+  QString                                                            m_modifiedSidc;
+
+  QTabWidget                                                        *m_tabWidget;
+  QStackedWidget                                                    *m_tabSidcEdit;
+  QWidget                                                           *m_tabFieldEdit;
+  QWidget                                                           *m_tabPreview;
+
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::Context>         *m_cbContext_MIL2525D;
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::Identity>        *m_cbIdentity_MIL2525D;
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::SymbolSet>       *m_cbSymbolSet_MIL2525D;
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::Status>          *m_cbStatus_MIL2525D;
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::HQTFDummy>       *m_cbHQTFDummy_MIL2525D;
+
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::AmplifierGroup>  *m_cbAmplifierGroup_MIL2525D;
+  EnumComboBox<int>                                                 *m_cbAmplifierDescriptor_MIL2525D;
+  EnumComboBox<unsigned int>                                        *m_cbSector1Modifier_MIL2525D;
+  EnumComboBox<unsigned int>                                        *m_cbSector2Modifier_MIL2525D;
+
+  EnumComboBox<AdvancedSymbology::SidcDefinitions::Identity>        *m_cbIdentity_APP6;
+  MyComboBox                                                        *m_cbSize_APP6;
+  MyComboBox                                                        *m_cbSizeHQ_APP6;
+  MyComboBox                                                        *m_cbSizeTF_APP6;
+  MyComboBox                                                        *m_cbSizeFDHQ_APP6;
+  MyComboBox                                                        *m_cbSizeFDTF_APP6;
+  MyComboBox                                                        *m_cbSizeFD_APP6;
+  MyComboBox                                                        *m_cbMobility_APP6;
+  MyComboBox                                                        *m_cbStatus_APP6;
+  MyComboBox                                                        *m_cbOrderOfBattle_APP6;
+
+  MyComboBox                                                        *m_cbFieldTitle;
+  QLineEdit                                                         *m_leFieldValue;
+  QTableView                                                        *m_fieldTable;
+  FieldTableModel                                                   *m_fieldTableModel;
+
+
+  explicit Internal(SituationMap::Map *map, SymbolDictionary &symbolDictionary)
+    : m_map(map)
+    , m_sidcDefinitions((map) ? & map->symbolDictionary() : & symbolDictionary)
+    , m_sidcBuilder((map) ? & map->symbolDictionary() : & symbolDictionary)
+    , m_dict(symbolDictionary)
+    , m_symbologyType(AdvancedSymbology::SymbologyType::None)
+    , m_isParticipant(false)
+    , m_originalSidc()
+    , m_lastModifiedSidc()
+    , m_baseSymbolCode()
+    , m_modifiedSidc()
+    , m_tabWidget(nullptr)
+    , m_tabSidcEdit(nullptr)
+    , m_tabFieldEdit(nullptr)
+    , m_tabPreview(nullptr)
+    , m_cbContext_MIL2525D(nullptr)
+    , m_cbIdentity_MIL2525D(nullptr)
+    , m_cbSymbolSet_MIL2525D(nullptr)
+    , m_cbStatus_MIL2525D(nullptr)
+    , m_cbHQTFDummy_MIL2525D(nullptr)
+    , m_cbAmplifierGroup_MIL2525D(nullptr)
+    , m_cbAmplifierDescriptor_MIL2525D(nullptr)
+    , m_cbSector1Modifier_MIL2525D(nullptr)
+    , m_cbSector2Modifier_MIL2525D(nullptr)
+    , m_cbIdentity_APP6(nullptr)
+    , m_cbSize_APP6(nullptr)
+    , m_cbSizeHQ_APP6(nullptr)
+    , m_cbSizeTF_APP6(nullptr)
+    , m_cbSizeFDHQ_APP6(nullptr)
+    , m_cbSizeFDTF_APP6(nullptr)
+    , m_cbSizeFD_APP6(nullptr)
+    , m_cbMobility_APP6(nullptr)
+    , m_cbStatus_APP6(nullptr)
+    , m_cbOrderOfBattle_APP6(nullptr)
+    , m_cbFieldTitle(nullptr)
+    , m_leFieldValue(nullptr)
+    , m_fieldTable(nullptr)
+    , m_fieldTableModel(nullptr)
+  {
+  } // explicit Internal()
+
+  ~Internal() = default;
+
+ 
+}; // SymbolModificationWidget::Internal
+
+
+enum class SymbologyTypeStackIndex
+{
+  APP6 = 0,
+  MIL2525D = 1
+}; // SymbologyTypeStackIndex
+
+
+//---------------------------------
+// SymbolModificationWidget
+//---------------------------------
+SymbolModificationWidget::SymbolModificationWidget(SituationMap::Map *map, bool isParticipant, SymbolDictionary &symbolDictionary, QWidget *parent)
+  : QWidget(parent)
+  , m_internal(new Internal(map, symbolDictionary))
+{
+  m_internal->m_isParticipant = isParticipant;
+
+  QVBoxLayout *layout      = new QVBoxLayout(this);
+  QHBoxLayout *layoutCtrl  = new QHBoxLayout();
+
+  m_internal->m_tabWidget     = new QTabWidget(this);
+
+  m_internal->m_tabSidcEdit        = new QStackedWidget(m_internal->m_tabWidget);
+  m_internal->m_tabFieldEdit       = new QWidget(m_internal->m_tabWidget);
+  m_internal->m_tabPreview         = new QWidget(m_internal->m_tabWidget);
+
+  m_internal->m_tabWidget->setTabsClosable(false);
+  m_internal->m_tabWidget->setMovable(false);
+  m_internal->m_tabWidget->setTabBarAutoHide(true);
+
+  m_internal->m_tabSidcEdit -> setObjectName(QStringLiteral("SymbolModificationWidgetSymbolSidcEdit"));
+  m_internal->m_tabFieldEdit-> setObjectName(QStringLiteral("SymbolModificationWidgetSymbolFieldEdit"));
+  m_internal->m_tabPreview  -> setObjectName(QStringLiteral("SymbolModificationWidgetSymbolPreview"));
+
+  m_internal->m_tabSidcEdit        -> setEnabled(false);
+  m_internal->m_tabFieldEdit       -> setEnabled(false);
+  m_internal->m_tabPreview         -> setEnabled(false);
+  
+  m_internal->m_tabSidcEdit        -> hide();
+  m_internal->m_tabFieldEdit       -> hide();
+  m_internal->m_tabPreview         -> hide();
+
+  layout->setContentsMargins(10, 10, 10, 10);
+  layout->addSpacing(10);
+  layout->addWidget(m_internal->m_tabWidget);
+  layout->addSpacing(10);
+  layout->addLayout(layoutCtrl);
+
+  //  d->m_preview = new QVBoxLayout();
+  //  d->m_preview->setObjectName(QLatin1String("previewCol"));
+  //  layout->addLayout(d->m_preview, 0, 0);
+
+  /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+  QWidget * sidcEditAPP6     = new QWidget(m_internal->m_tabSidcEdit);
+  QWidget * sidcEditMIL2525D = new QWidget(m_internal->m_tabSidcEdit);
+  
+
+  m_internal->m_tabSidcEdit->addWidget(sidcEditAPP6);     // SymbologyTypeStackIndex::APP6
+  m_internal->m_tabSidcEdit->addWidget(sidcEditMIL2525D); // SymbologyTypeStackIndex::MIL2525D
+ 
+  buildSidcModifierTab_APP6(sidcEditAPP6);
+  buildSidcModifierTab_MIL2525D( sidcEditMIL2525D );
+  
+
+  buildFieldModifierTab(m_internal->m_tabFieldEdit);
+
+  
+  buildPreview(m_internal->m_tabPreview);
+  
+
+} // SymbolModificationWidget::SymbolModificationWidget
+
+void SymbolModificationWidget::retranslate()
+{
+  // FIXME: UI Retranslation does not work with the entire Plan Editor, as there are no UIs ...
+  //translate(m_ui, tr("??"));
+}
+
+void SymbolModificationWidget::buildSidcModifierTab_MIL2525D(QWidget *widget)
+{
+  QHBoxLayout *layout           = new QHBoxLayout(widget);
+  QFormLayout *layoutEditLeft   = new QFormLayout();
+  QFormLayout *layoutEditRight  = new QFormLayout();
+
+  layout->addStretch(2);
+  layout->addLayout(layoutEditLeft);
+  layout->addStretch(2);
+  QFrame *separator = new QFrame(widget);
+  separator->setFrameStyle(QFrame::HLine | QFrame::Plain);
+  layout->addWidget(separator);
+  layout->addStretch(2);
+  layout->addLayout(layoutEditRight);
+  layout->addStretch(2);
+
+  // Context
+  m_internal->m_cbContext_MIL2525D = new EnumComboBox<AdvancedSymbology::SidcDefinitions::Context>(widget);
+  m_internal->m_cbContext_MIL2525D->insertItems(AdvancedSymbology::SidcDefinitions::contexts());
+
+  connect(m_internal->m_cbContext_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onContextChanged);
+
+  // Identity
+  m_internal->m_cbIdentity_MIL2525D = new EnumComboBox<AdvancedSymbology::SidcDefinitions::Identity>(widget);
+  m_internal->m_cbIdentity_MIL2525D->insertItems(AdvancedSymbology::SidcDefinitions::identities());
+
+  connect(m_internal->m_cbIdentity_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onIdentityChanged);
+
+  // Status
+  m_internal->m_cbStatus_MIL2525D = new EnumComboBox<AdvancedSymbology::SidcDefinitions::Status>(widget);
+  m_internal->m_cbStatus_MIL2525D->insertItems(AdvancedSymbology::SidcDefinitions::statuss());
+
+  connect(m_internal->m_cbStatus_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onStatusChanged);
+
+  // HQTFDummy
+  m_internal->m_cbHQTFDummy_MIL2525D = new EnumComboBox<AdvancedSymbology::SidcDefinitions::HQTFDummy>(widget);
+  m_internal->m_cbHQTFDummy_MIL2525D->insertItems(AdvancedSymbology::SidcDefinitions::hQTFDummy());
+
+  connect(m_internal->m_cbHQTFDummy_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onHQTFDummyChanged);
+
+  layoutEditLeft->setHorizontalSpacing(10);
+  layoutEditLeft->setLabelAlignment(Qt::AlignRight);
+
+  layoutEditLeft->addRow(tr("Context"), m_internal->m_cbContext_MIL2525D);
+  layoutEditLeft->addRow(tr("Identity"), m_internal->m_cbIdentity_MIL2525D);
+  layoutEditLeft->addRow(tr("Status"), m_internal->m_cbStatus_MIL2525D);
+  layoutEditLeft->addRow(tr("HqTfDummy"), m_internal->m_cbHQTFDummy_MIL2525D);
+
+  // AmplifierGroup
+  m_internal->m_cbAmplifierGroup_MIL2525D = new EnumComboBox<AdvancedSymbology::SidcDefinitions::AmplifierGroup>(widget);
+  m_internal->m_cbAmplifierGroup_MIL2525D->insertItems(AdvancedSymbology::SidcDefinitions::amplifierGroups());
+
+  connect(m_internal->m_cbAmplifierGroup_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onAmplifierGroupChanged, Qt::DirectConnection);   // as soon as possible!!!
+
+  // AmplifierDescriptor
+  m_internal->m_cbAmplifierDescriptor_MIL2525D = new EnumComboBox<int>(widget);
+  // to fill->use slot of primary ComboBox:
+  onAmplifierGroupChanged();
+
+  connect(m_internal->m_cbAmplifierDescriptor_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onAmplifierDesriptorChanged);
+
+  // Sector1Modifier
+  m_internal->m_cbSector1Modifier_MIL2525D = new EnumComboBox<unsigned int>(widget);
+  connect(m_internal->m_cbSector1Modifier_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onSector1ModifierChanged);
+
+  // Sector2Modifier
+  m_internal->m_cbSector2Modifier_MIL2525D = new EnumComboBox<unsigned int>(widget);
+  connect(m_internal->m_cbSector2Modifier_MIL2525D
+          , static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged)
+          , this
+          , &SymbolModificationWidget::onSector2ModifierChanged);
+
+
+  layoutEditRight->setHorizontalSpacing(10);
+  layoutEditRight->setLabelAlignment(Qt::AlignRight);
+
+  layoutEditRight->addRow(tr("AmplifierGroup"), m_internal->m_cbAmplifierGroup_MIL2525D);
+  layoutEditRight->addRow(tr("AmplifierDescriptor"), m_internal->m_cbAmplifierDescriptor_MIL2525D);
+  separator = new QFrame(widget);
+  separator->setFrameStyle(QFrame::HLine | QFrame::Plain);
+  layoutEditRight->addRow(separator);
+  layoutEditRight->addRow( tr("Sector 1 Modifier"), m_internal->m_cbSector1Modifier_MIL2525D );
+  layoutEditRight->addRow( tr("Sector 2 Modifier"), m_internal->m_cbSector2Modifier_MIL2525D );
+
+} // void SymbolModificationWidget::buildSidcModifierTab_MIL2525D( QWidget * widget )
+
+
+void SymbolModificationWidget::buildSidcModifierTab_APP6(QWidget * widget)
+{
+  QFormLayout *layout = new QFormLayout(widget);
+
+  // Identity
+  m_internal->m_cbIdentity_APP6 = new EnumComboBox<AdvancedSymbology::SidcDefinitions::Identity>(widget);
+  m_internal->m_cbIdentity_APP6->insertItems(AdvancedSymbology::SidcDefinitions::identities());
+
+  m_internal->m_cbStatus_APP6        = new MyComboBox(widget);
+  m_internal->m_cbOrderOfBattle_APP6 = new MyComboBox(widget);
+  m_internal->m_cbSize_APP6          = new MyComboBox(widget);
+  m_internal->m_cbSizeHQ_APP6        = new MyComboBox(widget);
+  m_internal->m_cbSizeTF_APP6        = new MyComboBox(widget);
+  m_internal->m_cbSizeFDHQ_APP6      = new MyComboBox(widget);
+  m_internal->m_cbSizeFDTF_APP6      = new MyComboBox(widget);
+  m_internal->m_cbSizeFD_APP6        = new MyComboBox(widget);
+  m_internal->m_cbMobility_APP6      = new MyComboBox(widget);
+
+  // Size/Mobility
+  // Zwei abhaengige ComboBoxen
+  m_internal->m_cbStatus_APP6->addItem(tr("Anticipated/Planned"), QVariant(QLatin1Char('A')));
+  m_internal->m_cbStatus_APP6->addItem(tr("Present")            , QVariant(QLatin1Char('P')));
+
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("None")                   , QVariant(QLatin1Char('*')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Air OB")                 , QVariant(QLatin1Char('A')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Electronic OB")          , QVariant(QLatin1Char('E')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Civilian OB")            , QVariant(QLatin1Char('C')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Ground OB")              , QVariant(QLatin1Char('G')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Maritime OB")            , QVariant(QLatin1Char('M')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Strategic Force Related"), QVariant(QLatin1Char('S')));
+  m_internal->m_cbOrderOfBattle_APP6->addItem(tr("Control Markings")       , QVariant(QLatin1Char('X')));
+
+  m_internal->m_cbSize_APP6->addItem(tr("None")            , QStringLiteral("--"));
+  m_internal->m_cbSize_APP6->addItem(tr("Team/Crew")       , QStringLiteral("_A"));
+  m_internal->m_cbSize_APP6->addItem(tr("Squad")           , QStringLiteral("_B"));
+  m_internal->m_cbSize_APP6->addItem(tr("Platoon")         , QStringLiteral("_C"));
+  m_internal->m_cbSize_APP6->addItem(tr("Company")         , QStringLiteral("_D"));
+  m_internal->m_cbSize_APP6->addItem(tr("Battalion")       , QStringLiteral("_E"));
+  m_internal->m_cbSize_APP6->addItem(tr("Regiment/Group")  , QStringLiteral("_F"));
+  m_internal->m_cbSize_APP6->addItem(tr("Brigade")         , QStringLiteral("_H"));
+  m_internal->m_cbSize_APP6->addItem(tr("Division")        , QStringLiteral("_I"));
+  m_internal->m_cbSize_APP6->addItem(tr("Corps/Mef")       , QStringLiteral("_J"));
+  m_internal->m_cbSize_APP6->addItem(tr("Army")            , QStringLiteral("_K"));
+  m_internal->m_cbSize_APP6->addItem(tr("Army Group/Front"), QStringLiteral("_L"));
+  m_internal->m_cbSize_APP6->addItem(tr("Region")          , QStringLiteral("-M"));
+ 
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("None")             , QStringLiteral("--"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("Headquarters (HQ)"), QStringLiteral("A-"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Team/Crew")     , QStringLiteral("AA"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Squad")         , QStringLiteral("AB"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Section")       , QStringLiteral("AC"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Platoon")       , QStringLiteral("AD"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Company")       , QStringLiteral("AE"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Battalion")     , QStringLiteral("AF"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Regiment/Group"), QStringLiteral("AG"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Brigade")       , QStringLiteral("AH"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Division")      , QStringLiteral("AI"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Corp/MEF")      , QStringLiteral("AJ"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Army")          , QStringLiteral("AK"));
+  m_internal->m_cbSizeHQ_APP6->addItem(tr("HQ Region")        , QStringLiteral("AM"));
+
+  m_internal->m_cbSizeTF_APP6->addItem(tr("None")              , QStringLiteral("--"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("Task Force (TF) HQ"), QStringLiteral("B-"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Team/Crew")      , QStringLiteral("BA"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Squad")          , QStringLiteral("BB"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Section")        , QStringLiteral("BC"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Platoon")        , QStringLiteral("BD"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Company")        , QStringLiteral("BE"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Battalion")      , QStringLiteral("BF"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Regiment/Group") , QStringLiteral("BG"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Brigade")        , QStringLiteral("BH"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Division")       , QStringLiteral("BI"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Corp/MEF")       , QStringLiteral("BJ"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Army")           , QStringLiteral("BK"));
+  m_internal->m_cbSizeTF_APP6->addItem(tr("TF Region")         , QStringLiteral("BM"));
+
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("None")                , QStringLiteral("--"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("Feint Dummy (FD) HQ") , QStringLiteral("C-"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Team/Crew")     , QStringLiteral("CA"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Squad")         , QStringLiteral("CB"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Section")       , QStringLiteral("CC"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Platoon)")      , QStringLiteral("CD"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Company")       , QStringLiteral("CE"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Battalion")     , QStringLiteral("CF"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Regiment/Group"), QStringLiteral("CG"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Brigade")       , QStringLiteral("CH"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Division")      , QStringLiteral("CI"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Corp/MEF")      , QStringLiteral("CJ"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Army")          , QStringLiteral("CK"));
+  m_internal->m_cbSizeFDHQ_APP6->addItem(tr("FD HQ Region")        , QStringLiteral("CM"));
+
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("None")                   , QStringLiteral("--"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("Feint Dummy (FD/TF) HQ") , QStringLiteral("D-"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Team/Crew")     , QStringLiteral("DA"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Squad")         , QStringLiteral("DB"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Section")       , QStringLiteral("DC"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Platoon)")      , QStringLiteral("DD"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Company")       , QStringLiteral("DE"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Battalion")     , QStringLiteral("DF"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Regiment/Group"), QStringLiteral("DG"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Brigade")       , QStringLiteral("DH"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Division")      , QStringLiteral("DI"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Corp/MEF")      , QStringLiteral("DJ"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Army")          , QStringLiteral("DK"));
+  m_internal->m_cbSizeFDTF_APP6->addItem(tr("FD/TF HQ Region")        , QStringLiteral("DM"));
+
+
+  m_internal->m_cbSizeFD_APP6->addItem(tr("None")             , QStringLiteral("--"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("Feint Dummy (FD)") , QStringLiteral("F-"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Team/Crew")     , QStringLiteral("FA"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Squad")         , QStringLiteral("FB"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Section")       , QStringLiteral("FC"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Platoon)")      , QStringLiteral("FD"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Company")       , QStringLiteral("FE"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Battalion")     , QStringLiteral("FF"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Regiment/Group"), QStringLiteral("FG"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Brigade")       , QStringLiteral("FH"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Division")      , QStringLiteral("FI"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Corp/MEF")      , QStringLiteral("FJ"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Army")          , QStringLiteral("FK"));
+  m_internal->m_cbSizeFD_APP6->addItem(tr("FD Region")        , QStringLiteral("FM"));
+
+
+  m_internal->m_cbMobility_APP6->addItem(tr("None")                                     , QStringLiteral("--"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Equipment")                       , QStringLiteral("M-"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Fixed Wing")                      , QStringLiteral("MF"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Helicopter")                      , QStringLiteral("MH"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Missile")                         , QStringLiteral("MM"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Wheeled / Limited Cross Country") , QStringLiteral("MO"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Cross Country")                   , QStringLiteral("MP"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Wheeled and Tracked Combination") , QStringLiteral("MR"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Towed")                           , QStringLiteral("MS"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Rail")                            , QStringLiteral("MT"));
+  m_internal->m_cbMobility_APP6->addItem(tr("Mobility Space")                           , QStringLiteral("S-"));
+
+  layout->addRow(tr("APP6 Affiliation")           , m_internal->m_cbIdentity_APP6);
+  layout->addRow(tr("APP6 Size")                  , m_internal->m_cbSize_APP6);
+  layout->addRow(tr("APP6 Headquarters (HQ)")     , m_internal->m_cbSizeHQ_APP6);
+  layout->addRow(tr("APP6 Task Force (TF) HQ")    , m_internal->m_cbSizeTF_APP6);
+  layout->addRow(tr("APP6 Feint Dummy (FD) HQ")   , m_internal->m_cbSizeFDHQ_APP6);
+  layout->addRow(tr("APP6 Feint Dummy (FD/TF) HQ"), m_internal->m_cbSizeFDTF_APP6);
+  layout->addRow(tr("APP6 Feint Dummy (FD)")      , m_internal->m_cbSizeFD_APP6);
+  layout->addRow(tr("Mobility")                   , m_internal->m_cbMobility_APP6);
+  layout->addRow(tr("APP6 Status")                , m_internal->m_cbStatus_APP6);
+  layout->addRow(tr("APP6 Order Of Battle")       , m_internal->m_cbOrderOfBattle_APP6);
+
+  connect( m_internal->m_cbIdentity_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [this](int)
+  {
+    if (!m_internal->m_tabWidget->isEnabled()) return;
+
+    m_internal->m_lastModifiedSidc = modifiedSidc();
+
+    QChar code = QLatin1Char('*');
+    
+    switch (m_internal->m_cbIdentity_APP6->currentValue())
+    {
+      case SidcDefinitions::Identity::Pending       : code = QLatin1Char('P'); break;
+      case SidcDefinitions::Identity::Unknown       : code = QLatin1Char('U'); break;
+      case SidcDefinitions::Identity::AssumedFriend : code = QLatin1Char('A'); break;
+      case SidcDefinitions::Identity::Friend        : code = QLatin1Char('F'); break;
+      case SidcDefinitions::Identity::Neutral       : code = QLatin1Char('N'); break;
+      case SidcDefinitions::Identity::SuspectJoker  : code = QLatin1Char('S'); break;
+      case SidcDefinitions::Identity::HostileFaker  : code = QLatin1Char('H'); break;
+    }
+    
+    QString rawSidc = SidcCodec::decodeRawSidc(modifiedSidc());
+    rawSidc[1] = code;
+    m_internal->m_modifiedSidc = SidcCodec::encodeComplete(SymbologyType::APP6B, rawSidc);
+
+    emitChanged();
+  });
+
+
+  connect(m_internal->m_cbSize_APP6    , static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbSizeHQ_APP6  , static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbSizeTF_APP6  , static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbSizeFDHQ_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbSizeFDTF_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbSizeFD_APP6  , static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+  connect(m_internal->m_cbMobility_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &SymbolModificationWidget::onChangeApp6SizeMobility);
+
+
+  connect(m_internal->m_cbStatus_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [this]()
+  {
+    if (!m_internal->m_tabWidget->isEnabled()) return;
+
+    m_internal->m_lastModifiedSidc = modifiedSidc();
+
+    QChar code = m_internal->m_cbStatus_APP6->currentData().toChar();
+
+    QString rawSidc = SidcCodec::decodeRawSidc(modifiedSidc());
+    rawSidc[3] = code;
+    m_internal->m_modifiedSidc = SidcCodec::encodeComplete(SymbologyType::APP6B, rawSidc);
+
+    emitChanged();
+  });
+
+  connect(m_internal->m_cbOrderOfBattle_APP6, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [this]()
+  {
+    if (!m_internal->m_tabWidget->isEnabled()) return;
+
+    m_internal->m_lastModifiedSidc = modifiedSidc();
+
+    QChar code = m_internal->m_cbOrderOfBattle_APP6->currentData().toChar();
+
+    QString rawSidc = SidcCodec::decodeRawSidc(modifiedSidc());
+    rawSidc[14] = code;
+    m_internal->m_modifiedSidc = SidcCodec::encodeComplete(SymbologyType::APP6B, rawSidc);
+
+    emitChanged();
+  });
+} // void SymbolModificationWidget::buildSidcModifierTab_APP6(QWidget * widget)
+
+
+void SymbolModificationWidget::buildFieldModifierTab(QWidget *widget)
+{
+  QVBoxLayout *layout          = new QVBoxLayout(widget);
+  QHBoxLayout *layoutFieldEdit = new QHBoxLayout();
+
+  m_internal->m_cbFieldTitle = new MyComboBox(widget);
+  m_internal->m_leFieldValue = new QLineEdit(widget);
+  QPushButton *pbAdd         = new QPushButton( QIcon(QStringLiteral("icon:add.svg")), QString(), widget );
+  QPushButton *pbDel         = new QPushButton( QIcon(QStringLiteral("icon:remove.svg")), QString(), widget );
+
+  layoutFieldEdit->addWidget(new QLabel(tr("Field"), widget));
+  layoutFieldEdit->addWidget(m_internal->m_cbFieldTitle, 2);
+  layoutFieldEdit->addWidget(new QLabel(tr("Value"), widget));
+  layoutFieldEdit->addWidget(m_internal->m_leFieldValue, 3);
+  layoutFieldEdit->addWidget(pbAdd);
+  layoutFieldEdit->addWidget(pbDel);
+
+  m_internal->m_fieldTableModel = new FieldTableModel(widget);
+
+  m_internal->m_fieldTable  = new QTableView(widget);
+  m_internal->m_fieldTable->setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
+  m_internal->m_fieldTable->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
+  m_internal->m_fieldTable->setModel(m_internal->m_fieldTableModel);
+  m_internal->m_fieldTable->setAlternatingRowColors(true);
+  m_internal->m_fieldTable->setShowGrid(false);
+
+  QHeaderView *header = m_internal->m_fieldTable->horizontalHeader();
+
+  header->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch);
+  header->setSectionResizeMode(1, QHeaderView::ResizeMode::Stretch);
+
+  layout->addLayout(layoutFieldEdit);
+  layout->addWidget(m_internal->m_fieldTable, 2);
+
+  connect(pbAdd, &QPushButton::clicked, this, &SymbolModificationWidget::onFieldAttributeAdd);
+  connect(pbDel, &QPushButton::clicked, this, &SymbolModificationWidget::onFieldAttributeRemove);
+
+  connect(m_internal->m_leFieldValue, &QLineEdit::returnPressed, this, [this]() { onFieldAttributeAdd(true); });
+  connect(m_internal->m_fieldTable, &QTableView::clicked, this, &SymbolModificationWidget::onFieldItemActived);
+  connect(m_internal->m_fieldTable, &QTableView::activated, this, &SymbolModificationWidget::onFieldItemActived);
+
+  // Qt6: QComboBox::activated(const QString&) removed -> use the activated(int) overload and
+  // map the index to its item text (the slot expects the field-title string).
+  connect(m_internal->m_cbFieldTitle, &QComboBox::activated,
+          this, [this](int index){ onSetFieldTitle(m_internal->m_cbFieldTitle->itemText(index)); });
+
+} // void SymbolModificationWidget::buildFieldModifierTab( QWidget * widget )
+
+
+void SymbolModificationWidget::emitChanged()
+{
+  emit changed();
+} // void SymbolModificationWidget::emitChanged()
+
+
+void SymbolModificationWidget::buildPreview(QWidget *widget)
+{
+  delete m_previewTab;
+
+  m_previewTab = new PreviewTab(widget);
+
+  m_previewTab->lbBaseSymbolName->setAlignment(Qt::AlignCenter);
+
+  m_previewTab->lbSidcOutImg->setAlignment(Qt::AlignCenter);
+  m_previewTab->lbSidcInImg ->setAlignment(Qt::AlignCenter);
+
+  m_previewTab->layout->addWidget(m_previewTab->lbBaseSymbolName);
+  m_previewTab->layout->addLayout(m_previewTab->layoutPreview, 2);
+  m_previewTab->layout->addLayout(m_previewTab->layoutPreview);
+
+  m_previewTab->layoutPreview->setHorizontalSpacing(10);
+  m_previewTab->layoutPreview->setVerticalSpacing(10);
+  m_previewTab->layoutPreview->setLabelAlignment(Qt::AlignRight);
+
+  m_previewTab->layoutPreview->addRow(tr("Base Symbol Code"), m_previewTab->lbBaseSymbolId);
+
+
+  QFrame *separator = new QFrame(widget);
+  separator->setFrameStyle(QFrame::HLine | QFrame::Plain);
+  m_previewTab->layoutPreview->addRow(separator);
+  m_previewTab->layoutPreview->addRow(tr("Modified SIDC"), m_previewTab->lbSidcOutTxt);
+  m_previewTab->layoutPreview->addWidget(m_previewTab->lbSidcOutImg);
+
+  separator = new QFrame(widget);
+  separator->setFrameStyle(QFrame::HLine | QFrame::Plain);
+  m_previewTab->layoutPreview->addRow(separator);
+  m_previewTab->layoutPreview->addRow(tr("Original SIDC"), m_previewTab->lbSidcInTxt);
+  m_previewTab->layoutPreview->addWidget(m_previewTab->lbSidcInImg);
+
+  connect(this, &SymbolModificationWidget::changed,
+           this, &SymbolModificationWidget::updatePreviewTab);
+
+} // void SymbolModificationWidget::buildPreview(QWidget * widget)
+
+void SymbolModificationWidget::updatePreviewTab()
+{
+  if (!m_previewTab)
+    return;
+
+  const QString &originalSidc = this->originalSidc();
+  const QString &modifiedSidc = this->modifiedSidc();
+
+  if (originalSidc.isEmpty())
+    return;
+
+  m_previewTab->lbBaseSymbolId  ->setText(SidcCodec::decodeRawSidc(m_internal->m_baseSymbolCode));
+  m_previewTab->lbBaseSymbolName->setText(this->symbolName());
+
+  m_previewTab->lbSidcInTxt ->setText(SidcCodec::decodeRawSidc(originalSidc));
+  m_previewTab->lbSidcOutTxt->setText(SidcCodec::decodeRawSidc(modifiedSidc));
+
+  setSymbolPixmap(m_previewTab->lbSidcInImg, originalSidc);
+  if (originalSidc == modifiedSidc)
+    m_previewTab->lbSidcOutImg->setPixmap(QPixmap());
+  else
+    setSymbolPixmap(m_previewTab->lbSidcOutImg, modifiedSidc);
+}
+
+SymbolModificationWidget::~SymbolModificationWidget()
+{
+  delete m_internal;
+  m_internal = nullptr;
+}
+
+
+static void fillUpComboBox(const AdvancedSymbology::SymbolDictionary &dict, const QString &baseSymbolCode, unsigned int sector, QComboBox *cb)
+{
+  cb->clear();
+
+  cb->addItem(QIcon(),  QStringLiteral("0 Not Applicable"), 0);
+  const QList<AdvancedSymbology::ModifierData> &modifierList = dict.symbolModifierList(baseSymbolCode, sector);
+  for (const auto &modifier : modifierList)
+  {
+    const QString &modName = QString::number(modifier.m_modifierValue) + QLatin1Char(' ') + modifier.m_modifierName;
+    cb->addItem(QIcon(modifier.m_modifierIcon), modName, modifier.m_modifierValue);
+  }
+} // static void fillUpComboBox(const QString & baseSymbolCode, unsigned int sector, QComboBox * cb)
+
+
+SymbologyType SymbolModificationWidget::symbologyType() const
+{
+  return m_internal->m_symbologyType;
+} // SymbologyType SymbolModificationWidget::symbologyType() const
+
+
+bool SymbolModificationWidget::setSidc(const QString &sidc)
+{
+  if (sidc.isEmpty())
+    return false;
+
+  const AdvancedSymbology::SymbolDictionary &dict = m_internal->m_dict;
+
+  if (!m_internal->m_sidcBuilder.setSidc(sidc))
+  {
+    m_internal->m_tabWidget->setEnabled(false);
+    return false;
+  }
+
+  m_internal->m_symbologyType = SidcCodec::decodeSymbologyType(sidc);
+  
+  switch (m_internal->m_symbologyType)
+  {
+    case SymbologyType::None     : return false;
+
+    case SymbologyType::APP6B    : m_internal->m_tabSidcEdit->setCurrentIndex(static_cast<int>(SymbologyTypeStackIndex::APP6)); break;
+
+    case SymbologyType::APP6D    :
+    case SymbologyType::MIL2525C :
+    case SymbologyType::MIL2525D : m_internal->m_tabSidcEdit->setCurrentIndex(static_cast<int>(SymbologyTypeStackIndex::MIL2525D)); break;
+  }
+
+
+  m_internal->m_tabWidget->setEnabled(true);
+
+  m_internal->m_originalSidc     = m_internal->m_sidcBuilder.toSidc();
+  m_internal->m_lastModifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  m_internal->m_modifiedSidc     = m_internal->m_sidcBuilder.toSidc();
+
+  if (SidcCodec::isCivil(sidc))
+  {
+    m_internal->m_tabSidcEdit ->setEnabled(false);
+    m_internal->m_tabFieldEdit->setEnabled(false);
+    m_internal->m_tabPreview  ->setEnabled(false);
+
+    m_internal->m_tabSidcEdit ->hide();
+    m_internal->m_tabFieldEdit->hide();
+    m_internal->m_tabPreview  ->hide();
+
+    m_internal->m_tabWidget->removeTab(m_internal->m_tabWidget->indexOf(m_internal->m_tabSidcEdit));
+    m_internal->m_tabWidget->removeTab(m_internal->m_tabWidget->indexOf(m_internal->m_tabFieldEdit));
+    m_internal->m_tabWidget->removeTab(m_internal->m_tabWidget->indexOf(m_internal->m_tabPreview));
+
+    return false; // ToDo: implement buildParticipantTab and return true here
+  }
+
+  m_internal->m_tabWidget->addTab(m_internal->m_tabSidcEdit, tr("Sector A and B Attributes"));
+ 
+  m_internal->m_tabSidcEdit ->setEnabled(true);
+  m_internal->m_tabFieldEdit->setEnabled(true);
+
+  if (m_internal->m_isParticipant)
+  {  
+    m_internal->m_tabWidget->removeTab(m_internal->m_tabWidget->indexOf(m_internal->m_tabFieldEdit));
+
+    m_internal->m_tabFieldEdit->setEnabled(false);
+    m_internal->m_tabFieldEdit->hide();
+  }
+  else
+  {
+    m_internal->m_tabWidget->addTab(m_internal->m_tabFieldEdit, tr("Field Modifier"));
+    m_internal->m_tabFieldEdit->setEnabled(true);
+  }
+
+  #ifdef LTS_DEBUG
+    m_internal->m_tabWidget->addTab(m_internal->m_tabPreview, tr("Preview"));
+    m_internal->m_tabPreview->setEnabled(true);
+  #endif
+
+  const QString &baseSymbolCode = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(sidc);
+  const QString &baseSymbolKey  = SidcCodec::decodeRawSidc(baseSymbolCode);
+  
+ 
+  fillUpComboBox(dict, baseSymbolKey, 1, m_internal->m_cbSector1Modifier_MIL2525D);
+  fillUpComboBox(dict, baseSymbolKey, 2, m_internal->m_cbSector2Modifier_MIL2525D);
+
+  m_internal->m_cbSector1Modifier_MIL2525D->setEnabled((m_internal->m_cbSector1Modifier_MIL2525D->count() > 0));
+  m_internal->m_cbSector2Modifier_MIL2525D->setEnabled((m_internal->m_cbSector2Modifier_MIL2525D->count() > 0));
+ 
+  m_internal->m_baseSymbolCode = baseSymbolCode;
+
+  if (!analyze(m_internal->m_symbologyType,sidc))
+    return false;
+
+  const AdvancedSymbology::SymbolProperties &symbolProps = dict.symbolProperties(baseSymbolCode);
+
+  if (symbolProps.geometryType() != AdvancedSymbology::GeometryType::Point)
+  {
+    const QString &widgetName = m_internal->m_tabPreview->objectName();
+    m_internal->m_tabPreview->setStyleSheet(QLatin1String("QWidget#") + widgetName + QLatin1String(" { background-color: lightgrey }"));
+  }
+  else
+    m_internal->m_tabPreview->setStyleSheet(QString());
+
+  QStringList fieldKeys = dict.symbologyAttributeKeyList();
+
+  fieldKeys.sort();
+
+  m_internal->m_cbFieldTitle->clear();
+  for (const auto &fieldKey : qAsConst(fieldKeys))
+    m_internal->m_cbFieldTitle->addItem(fieldKey);
+
+  if (m_internal->m_tabWidget->isEnabled())
+    emitChanged();
+
+  return true;
+} // bool SymbolModificationWidget::setSidc( const QString & sidc )
+
+
+const QMap<QString, QVariant> SymbolModificationWidget::fieldAttributes()
+{
+  return m_internal->m_fieldTableModel->fieldAttrMap();
+} // const QMap<QString, QVariant> SymbolModificationWidget::fieldAttributes()
+
+
+bool SymbolModificationWidget::setFieldAttributes(const QMap<QString, QVariant> &fieldAttrMap)
+{
+  return m_internal->m_fieldTableModel->setFieldAttrMap(fieldAttrMap);
+} // bool SymbolModificationWidget::setFieldAttributes(const QString & symbolFieldAttr)
+
+
+bool SymbolModificationWidget::analyze(SymbologyType symbologyType, const QString &sidc)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return false;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  m_internal->m_sidcBuilder.setSidc(sidc);
+
+  switch (symbologyType)
+  {
+    case SymbologyType::None    : break;
+    case SymbologyType::APP6B   : break;
+    case SymbologyType::MIL2525C: break;
+
+    case SymbologyType::APP6D   :
+    case SymbologyType::MIL2525D:
+    {
+      m_internal->m_cbContext_MIL2525D->setCurrent(m_internal->m_sidcBuilder.standardIdentity().context);
+      m_internal->m_cbIdentity_MIL2525D->setCurrent(m_internal->m_sidcBuilder.standardIdentity().identity);
+
+      m_internal->m_cbStatus_MIL2525D->setCurrent(m_internal->m_sidcBuilder.status());
+
+      m_internal->m_cbHQTFDummy_MIL2525D->setCurrent(m_internal->m_sidcBuilder.hqTfFd());
+
+      m_internal->m_cbAmplifierGroup_MIL2525D->setCurrent(m_internal->m_sidcBuilder.amplifierGroup());
+
+      int idxAmpDescr = m_internal->m_cbAmplifierDescriptor_MIL2525D->findData(m_internal->m_sidcBuilder.amplifier2ndDigit());
+
+      m_internal->m_cbAmplifierDescriptor_MIL2525D->setCurrentIndex(idxAmpDescr);
+
+      int idxMod1 = m_internal->m_cbSector1Modifier_MIL2525D->findData(m_internal->m_sidcBuilder.sectorModifier1Digit());
+      int idxMod2 = m_internal->m_cbSector2Modifier_MIL2525D->findData(m_internal->m_sidcBuilder.sectorModifier2Digit());
+
+      m_internal->m_cbSector1Modifier_MIL2525D->setCurrentIndex(idxMod1);
+      m_internal->m_cbSector2Modifier_MIL2525D->setCurrentIndex(idxMod2);
+    } break;
+  }
+  
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+
+  emitChanged(); // to update previewIcon (sidcNew)
+
+  return true; // (m_internal->m_sidcDelta.toSidc() == sidc);
+} // bool SymbolModificationWidget::setSidc( const QString & sidc )
+
+
+QString SymbolModificationWidget::originalSidc()     const { return m_internal->m_originalSidc;     }
+QString SymbolModificationWidget::modifiedSidc()     const { return m_internal->m_modifiedSidc;     }
+QString SymbolModificationWidget::lastModifiedSidc() const { return m_internal->m_lastModifiedSidc; }
+
+
+QString SymbolModificationWidget::symbolName() const
+{
+  const QString                             &baseSymbolCode = AdvancedSymbology::SidcBuilderBase::concreteSidcToBaseSymbolCode(originalSidc());
+  const AdvancedSymbology::SymbolDictionary &dict           = m_internal->m_dict;
+  const AdvancedSymbology::SymbolProperties &symbolProps    = dict.symbolProperties(baseSymbolCode);
+  return symbolProps.name();
+} // QString SymbolModificationWidget::symbolName() const
+
+
+void SymbolModificationWidget::setSymbolPixmap(QLabel *label, const QString &sidc)
+{
+  label->setPixmap(QPixmap());  // first clear pixmap on label
+
+  AdvancedSymbology::SymbolResultWatcher *symbolGuard = new AdvancedSymbology::SymbolResultWatcher(this);
+
+  QObject::connect(symbolGuard, &AdvancedSymbology::SymbolResultWatcher::resultReady, this, [label, symbolGuard]()
+  {
+    QSharedPointer<AdvancedSymbology::SymbolResult> symbolResult = symbolGuard->symbolResult();
+    if (symbolResult)
+    {
+      QPixmap  symbolPixmap = QPixmap::fromImage(symbolResult->symbolImage().image());
+
+      if (symbolPixmap.width()  > 200) symbolPixmap = symbolPixmap.scaledToWidth(200, Qt::TransformationMode::SmoothTransformation);
+      if (symbolPixmap.height() > 100) symbolPixmap = symbolPixmap.scaledToHeight(100, Qt::TransformationMode::SmoothTransformation);
+
+      label->setPixmap(symbolPixmap);
+    }
+  });
+
+  const AdvancedSymbology::SymbolDataToRender symDataToRender(sidc, 200);
+
+  symbolGuard->setSymbolResult(m_internal->m_dict.findImage(symDataToRender));
+
+} // void SymbolModificationWidget::setSymbolPixmap( QLabel * label, const QString & sidc )
+
+
+void SymbolModificationWidget::onRevert()
+{
+  const QString &restoreSidc = originalSidc();
+  analyze(SidcCodec::decodeSymbologyType(restoreSidc),restoreSidc);
+} // void SymbolModificationWidget::onRevert()
+
+
+void SymbolModificationWidget::onContextChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  AdvancedSymbology::SidcDefinitions::StandardIdentity si = m_internal->m_sidcBuilder.standardIdentity();
+  si.context = m_internal->m_cbContext_MIL2525D->currentValue();
+  m_internal->m_sidcBuilder.setStandardIdentity(si);
+
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+
+  emitChanged();
+} // void SymbolModificationWidget::onContextChanged()
+
+
+void SymbolModificationWidget::onIdentityChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  AdvancedSymbology::SidcDefinitions::StandardIdentity si = m_internal->m_sidcBuilder.standardIdentity();
+  si.identity = m_internal->m_cbIdentity_MIL2525D->currentValue();
+  m_internal->m_sidcBuilder.setStandardIdentity(si);
+
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+
+  emitChanged();
+} // void SymbolModificationWidget::onIdentityChanged()
+
+
+void SymbolModificationWidget::onSymbolSetChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  m_internal->m_sidcBuilder.setSymbolSet(m_internal->m_cbSymbolSet_MIL2525D->currentValue());
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} // void SymbolModificationWidget::onSymbolSetChanged()
+
+
+void SymbolModificationWidget::onStatusChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  m_internal->m_sidcBuilder.setStatus(m_internal->m_cbStatus_MIL2525D->currentValue());
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} //  void SymbolModificationWidget::onStatusChanged()
+
+
+void SymbolModificationWidget::onHQTFDummyChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  m_internal->m_sidcBuilder.setHqTfFd(m_internal->m_cbHQTFDummy_MIL2525D->currentValue());
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} // void SymbolModificationWidget::onHQTFDummyChanged()
+
+
+void SymbolModificationWidget::onAmplifierGroupChanged()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  const AdvancedSymbology::SidcDefinitions::AmplifierGroup &amplifierGroup = m_internal->m_cbAmplifierGroup_MIL2525D->currentValue();
+
+  // First, renew the secondary comboBox!!!
+  // Remember, this is of type QComboBox
+  m_internal->m_cbAmplifierDescriptor_MIL2525D->clear();
+
+
+  m_internal->m_cbAmplifierDescriptor_MIL2525D->blockSignals(true);
+  {
+    int idx = 0;
+
+    switch (amplifierGroup)
+    {
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Unknown: break;
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Echelon_BrigadeAndBelow:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::EchelonBrigadeAndBelow> &items = AdvancedSymbology::SidcDefinitions::echelonBrigadeAndBelows();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, QString(AdvancedSymbology::SidcDefinitions::toString(item)), static_cast<int>(item));
+    }
+    break;
+
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Echelon_DivisionAndAbove:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::EchelonDivisionAndAbove> &items = AdvancedSymbology::SidcDefinitions::echelonDivisionAndAboves();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, AdvancedSymbology::SidcDefinitions::toString(item), static_cast<int>(item));
+    }
+    break;
+
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Mobility_OnLand:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::MobilityOnLand> &items = AdvancedSymbology::SidcDefinitions::mobilityOnLands();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, AdvancedSymbology::SidcDefinitions::toString(item), static_cast<int>(item));
+    }
+    break;
+
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Mobility_OnWater:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::MobilityOnWater> &items = AdvancedSymbology::SidcDefinitions::mobilityOnWaters();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, AdvancedSymbology::SidcDefinitions::toString(item), static_cast<int>(item));
+    }
+    break;
+
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Mobility_OnSnow:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::MobilityOnSnow> &items = AdvancedSymbology::SidcDefinitions::mobilityOnSnows();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, AdvancedSymbology::SidcDefinitions::toString(item), static_cast<int>(item));
+    }
+    break;
+
+    case AdvancedSymbology::SidcDefinitions::AmplifierGroup::Naval_TowedArry:
+    {
+      const QVector<AdvancedSymbology::SidcDefinitions::NavalTowedArray> &items = AdvancedSymbology::SidcDefinitions::navalTowedArrays();
+      for (const auto &item : items)
+        m_internal->m_cbAmplifierDescriptor_MIL2525D->insertNumberedItem(idx++, AdvancedSymbology::SidcDefinitions::toString(item), static_cast<int>(item));
+    }
+    break;
+
+    } // switch
+  }
+  m_internal->m_cbAmplifierDescriptor_MIL2525D->blockSignals(false);
+
+
+  m_internal->m_sidcBuilder.setAmplifierGroup(amplifierGroup);
+
+  if (m_internal->m_cbAmplifierDescriptor_MIL2525D->count() > 0)
+  {
+    m_internal->m_cbAmplifierDescriptor_MIL2525D->setEnabled(true);
+
+    unsigned int ampDescr = m_internal->m_sidcBuilder.amplifier2ndDigit();
+    int          index    = m_internal->m_cbAmplifierDescriptor_MIL2525D->findData(ampDescr);
+
+    m_internal->m_cbAmplifierDescriptor_MIL2525D->setCurrentIndex(index);
+  }
+  else m_internal->m_cbAmplifierDescriptor_MIL2525D->setEnabled(false);
+
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+
+  emitChanged();
+
+} // void SymbolModificationWidget::onAmplifierGroupChanged()
+
+
+void SymbolModificationWidget::onAmplifierDesriptorChanged(int index)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  unsigned int ampDescr = m_internal->m_cbAmplifierDescriptor_MIL2525D->itemData(index).toUInt();
+  m_internal->m_sidcBuilder.setAmplifier2ndDigit(ampDescr);
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} // void SymbolModificationWidget::onAmplifierDesriptorChanged( int index )
+
+
+void SymbolModificationWidget::onSector1ModifierChanged(int index)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  unsigned int sectorModifier = m_internal->m_cbSector1Modifier_MIL2525D->itemData(index).toUInt();
+  m_internal->m_sidcBuilder.setSectorModifier1Digit(sectorModifier);
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} // void SymbolModificationWidget::onSector1ModifierChanged( int )
+
+
+void SymbolModificationWidget::onSector2ModifierChanged(int index)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  unsigned int sectorModifier = m_internal->m_cbSector2Modifier_MIL2525D->itemData(index).toUInt();
+  m_internal->m_sidcBuilder.setSectorModifier2Digit(sectorModifier);
+  m_internal->m_modifiedSidc = m_internal->m_sidcBuilder.toSidc();
+  emitChanged();
+} // void SymbolModificationWidget::onSector2ModifierChanged( int )
+
+
+void SymbolModificationWidget::onFieldAttributeAdd(bool)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  const QString &value = m_internal->m_leFieldValue->text();
+
+  if (!value.isEmpty())
+  {
+    const QString &key = m_internal->m_cbFieldTitle->currentText();
+    m_internal->m_fieldTableModel->setFieldAttribute(key, value);
+    emitChanged();
+  }
+  else onFieldAttributeRemove(true);
+} // void SymbolModificationWidget::onFieldAttributeAdd()
+
+
+void SymbolModificationWidget::onFieldAttributeRemove(bool)
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  const AdvancedSymbology::SymbolDictionary &dict = m_internal->m_dict;
+  const QString                              &key  = m_internal->m_cbFieldTitle->currentText();
+
+  if (dict.symbologyAttributeKeyList().contains(key))
+  {
+    m_internal->m_fieldTableModel->removeFieldAttrMap(key);
+    emitChanged();
+  }
+} // void PlanEditor::SymbolModificationWidget::onFieldAttributeRemove()
+
+
+void SymbolModificationWidget::onSetFieldTitle(const QString &fieldTitel)
+{
+  const AdvancedSymbology::SymbolDictionary &dict = m_internal->m_dict;
+
+  if (dict.symbologyAttributeKeyList().contains(fieldTitel))
+    m_internal->m_leFieldValue->setText(m_internal->m_fieldTableModel->fieldAttribute(fieldTitel));
+}// void SymbolModificationWidget::onSetFieldTitle(const QString &)
+
+
+void SymbolModificationWidget::onFieldItemActived(const QModelIndex &index)
+{
+  const AdvancedSymbology::SymbolDictionary &dict = m_internal->m_dict;
+  const QString key = m_internal->m_fieldTableModel->data(m_internal->m_fieldTableModel->index(index.row(), 0)).toString();
+  const QString val = m_internal->m_fieldTableModel->data(m_internal->m_fieldTableModel->index(index.row(), 1)).toString();
+
+  if (dict.symbologyAttributeKeyList().contains(key))
+  {
+    m_internal->m_leFieldValue->setText(val);
+    m_internal->m_cbFieldTitle->setCurrentText(key);
+  }
+} // void SymbolModificationWidget::onFieldItemActived( const QModelIndex & index )
+
+
+void SymbolModificationWidget::onChangeApp6SizeMobility()
+{
+  if (!m_internal->m_tabWidget->isEnabled()) return;
+
+  m_internal->m_lastModifiedSidc = modifiedSidc();
+
+  MyComboBox * cb = qobject_cast<MyComboBox*>(sender());
+  if (cb)
+  {
+    QString rawSidc = SidcCodec::decodeRawSidc(modifiedSidc());
+    QString code = cb->currentData().toString();
+
+    rawSidc[10] = code[0];
+    rawSidc[11] = code[1];
+
+    m_internal->m_modifiedSidc = SidcCodec::encodeComplete(SymbologyType::APP6B, rawSidc);
+
+    if (cb != m_internal->m_cbSize_APP6)     m_internal->m_cbSize_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbSizeHQ_APP6)   m_internal->m_cbSizeHQ_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbSizeTF_APP6)   m_internal->m_cbSizeTF_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbSizeFDHQ_APP6) m_internal->m_cbSizeFDHQ_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbSizeFDTF_APP6) m_internal->m_cbSizeFDTF_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbSizeFD_APP6)   m_internal->m_cbSizeFD_APP6->setCurrentIndex(0);
+    if (cb != m_internal->m_cbMobility_APP6) m_internal->m_cbMobility_APP6->setCurrentIndex(0);
+
+    emitChanged();
+  }
+} // void SymbolModificationWidget::onChangeApp6SizeMobility(int)
+
+
+} // namespace Gui
+} // namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.h
new file mode 100755
index 000000000..9d3f86f00
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyGui/symbol_modification_widget.h
@@ -0,0 +1,135 @@
+/**
+* @RDE_HEADER@
+* symbol_modification_wdiget for sidc configuration
+* $Id$
+* $HeadURL$
+* $Author$
+* Created by Karwat, SLSE, 2017-09-07
+*/
+
+#pragma once
+
+#include <SymbologyGui/advancedsymbologygui_export.h>
+
+
+#include <QWidget>
+#include <Map/map.h>
+#include <MapObjects/participant.h>
+#include <Common/simple_value.h>
+
+#include <QtCore/QMap>
+#include <QVBoxLayout>
+#include <QFormLayout>
+#include <QLabel>
+
+class QLabel;
+class QBoxLayout;
+
+namespace AdvancedSymbology
+{
+
+namespace Gui
+{
+
+class ADVANCEDSYMBOLOGYGUI_EXPORT SymbolModificationWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+
+  explicit SymbolModificationWidget(SituationMap::Map *map, bool isParticipant, SymbolDictionary &symbolDictionary, QWidget *parent = nullptr);
+  ~SymbolModificationWidget();
+
+  bool setSidc(const QString &sidc);
+  bool setFieldAttributes(const QMap<QString, QVariant> &fieldAttrMap);
+
+  const QMap<QString, QVariant> fieldAttributes();
+  bool analyze(SymbologyType symbologyType, const QString &sidc);
+  QString originalSidc()     const;
+  QString modifiedSidc()     const;
+  QString lastModifiedSidc() const;
+  QString symbolName() const;
+
+  SymbologyType symbologyType() const;
+
+protected:
+
+  void retranslate();
+
+  void setSymbolPixmap(QLabel *, const QString &sidc);
+
+  void buildSidcModifierTab_MIL2525D(QWidget *widget);
+  void buildSidcModifierTab_APP6(QWidget *widget);
+
+  void buildFieldModifierTab(QWidget *widget);
+  void buildParticipantTab(QWidget *widget);
+  void buildPreview(QWidget *widget);
+
+  void emitChanged();
+
+  class Internal;
+
+  Internal *m_internal;
+
+  struct PreviewTab
+  {
+    explicit PreviewTab(QWidget *widget)
+      : layout(new QVBoxLayout(widget))
+      , layoutPreview(new QFormLayout())
+      , lbBaseSymbolId(new QLabel(widget))
+      , lbBaseSymbolName(new QLabel(widget))
+      , lbSidcOutTxt(new QLabel(widget))
+      , lbSidcInTxt(new QLabel(widget))
+      , lbSidcOutImg(new QLabel(widget))
+      , lbSidcInImg(new QLabel(widget))
+    {}
+    QVBoxLayout *layout;
+    QFormLayout *layoutPreview;
+
+    QLabel *lbBaseSymbolId;
+    QLabel *lbBaseSymbolName;
+    QLabel *lbSidcOutTxt;
+    QLabel *lbSidcInTxt;
+    QLabel *lbSidcOutImg;
+    QLabel *lbSidcInImg;
+  };
+  PreviewTab *m_previewTab = nullptr;
+
+
+signals:
+
+  void changed();
+
+
+public Q_SLOTS:
+
+  void updatePreviewTab();
+  void onRevert();
+
+
+private Q_SLOTS:
+  
+  void onContextChanged();
+  void onIdentityChanged();
+  void onSymbolSetChanged();
+  void onStatusChanged();
+
+  void onHQTFDummyChanged();
+
+  void onAmplifierGroupChanged();
+  void onAmplifierDesriptorChanged(int);
+
+  void onSector1ModifierChanged(int);
+  void onSector2ModifierChanged(int);
+
+  void onFieldAttributeAdd(bool);
+  void onFieldAttributeRemove(bool);
+
+  void onSetFieldTitle(const QString &);
+  void onFieldItemActived(const QModelIndex &);
+
+  void onChangeApp6SizeMobility();
+};
+} //namespace Gui
+
+} //namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/CMakeLists.txt
index 7630e8ad5..f6d5e6b1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/CMakeLists.txt
@@ -72,5 +72,6 @@ endif()
 
 NGL_INSTALL_TARGET(advancedSymbologyXML)
 
-# Gui subdirectory requires situationMapGeometryModel and advancedSymbology - deferred
-# ADD_SUBDIRECTORY(Gui)
+# Gui subdirectory (advancedSymbologyXML_Gui) — consumed by planEditor; its deps
+# (situationMapGeometryModel, advancedSymbology) are built, so enable it (legacy built it too).
+ADD_SUBDIRECTORY(Gui)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.cpp
new file mode 100755
index 000000000..0f5e4f808
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.cpp
@@ -0,0 +1,102 @@
+/**
+  * @RDE_HEADER@
+  * MouseMoveOverlay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#include "mouse_move_overlay.h"
+
+// Own
+#include <MapImpl/map_impl.h>
+
+// ESRI
+#include <Map.h>
+#include <CoordinateConversion.h>
+#include <GeometryEngine.h>
+
+// Qt
+#include <QDebug>
+#include <QGraphicsSceneHoverEvent>
+
+
+namespace SituationMap
+{
+
+class MouseMoveOverlay::Private
+{
+public:
+  Private()     = default;
+  ~Private()    = default;
+
+  // ESRI data:
+  EsriRuntimeQt::Map             *m_map     = nullptr;
+
+  // OWN data:
+  SituationMap::MapImpl          *m_mapImpl = nullptr;
+
+}; // class MouseMoveOverlay::Private
+//-----------------------------------------------------------------------------
+
+
+
+
+MouseMoveOverlay::MouseMoveOverlay(MapImpl *mapImpl)
+  : QGraphicsItem()
+  , d(new Private)
+{
+  qDebug() << LOGFUNCTION;
+
+  // object to be called:
+  d->m_mapImpl = mapImpl;
+
+  if (d->m_mapImpl)
+    d->m_map = d->m_mapImpl->getEsriMap();
+
+  setAcceptHoverEvents(true);
+}
+
+MouseMoveOverlay::~MouseMoveOverlay()
+{
+  qDebug() << LOGFUNCTION;
+  delete d;
+}
+
+QRectF MouseMoveOverlay::boundingRect() const
+{
+  if (d->m_map)
+    return QRect(0, 0, d->m_map->width(), d->m_map->height());
+  return QRect(); // fallback
+}
+
+void MouseMoveOverlay::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+  // No need to paint
+  Q_UNUSED(painter)
+  Q_UNUSED(option)
+  Q_UNUSED(widget)
+}
+
+
+void MouseMoveOverlay::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+//  qDebug() << LOGFUNCTION;
+
+  if (d->m_map)
+  {
+    if (!d->m_map->isReady())
+      return;
+
+    QPointF scenePoint = event->scenePos();
+    int scenePointX = scenePoint.x();
+    int scenePointY = scenePoint.y();
+    if (scenePointX < 0 || scenePointY < 0)
+      return;
+
+    d->m_mapImpl->onHandleMouseMove(scenePointX, scenePointY);
+  }
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.h
new file mode 100755
index 000000000..2cdc0d3dc
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/mouse_move_overlay.h
@@ -0,0 +1,57 @@
+/**
+  * @RDE_HEADER@
+  * MouseMoveOverlay
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+#include <QGraphicsItem>
+
+namespace EsriRuntimeQt
+{
+class MapGraphicsView;
+}
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class MapImpl;
+
+class MouseMoveOverlay : public QGraphicsItem
+{
+  //    Q_OBJECT
+public:
+
+  explicit MouseMoveOverlay(MapImpl *mapImpl);
+  virtual ~MouseMoveOverlay();
+
+signals:
+  //    void mousePositionChanged(const QPointF& screenPos, QPointF& mapPos);
+  //    void mousePositionChanged();
+
+protected:
+  QRectF boundingRect() const;
+  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+  void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+
+private :
+
+  MouseMoveOverlay(const MouseMoveOverlay &other)           = delete;
+  MouseMoveOverlay &operator=(const MouseMoveOverlay &other) = delete;
+
+  class Private;
+  /**
+      * The private d-pointer to not break BC when changing internals of this class
+     */
+  Private *d = nullptr;
+};
+
+
+
+} // namespace SituationMap
+
+
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.cpp
new file mode 100755
index 000000000..4ed27702e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.cpp
@@ -0,0 +1,268 @@
+/**
+  * @RDE_HEADER@
+  * Class MovementTrack
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+// Own
+#include "movement_track.h"
+
+#include <LtsCoordTrans/lts_coord_trans.h>
+
+// Qt
+#include <QVector>
+#include <QJsonObject>
+#include <QJsonArray>
+
+
+namespace SituationMap
+{
+int MovementTrack::m_count = 0;
+
+MovementTrack::MovementTrack(int trackId)
+//  : m_logger(getLogger("MovementTrack", trackId))
+  : m_logger(getLogger("MovementTrack"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " trackId/participantId=" << trackId
+                      << " m_count=" << m_count;
+  ++m_count;
+
+  m_trackId         = trackId;
+  m_active          = true;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_trackId=" << m_trackId << " m_count=" << m_count;
+}
+
+MovementTrack::~MovementTrack()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_trackId=" << m_trackId << " m_count=" << m_count;
+  --m_count;
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_trackId=" << m_trackId << " m_count=" << m_count;
+}
+
+void MovementTrack::setActive(bool active)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START " << " active=" << active << " m_count=" << m_count;
+  m_active = active;
+}
+
+bool MovementTrack::addPosition(const COORD_T &newPosition,
+                                qint64 currentTimeMsec, double minDistance, int maxNumberOfPositions)
+{
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
+                      << " currentTimeMsec=" << currentTimeMsec
+                      << " newPosition=" << newPosition
+                      << " #ofCoords=" << m_cont.size();
+  bool success = false;
+
+  // Very first access?
+  if (m_cont.isEmpty())
+  {
+    m_cont.insert(currentTimeMsec, newPosition);
+    success = true;
+  }
+  else
+  {
+    // Avoid identical values:
+    const COORD_T &lastPosition = m_cont.last();
+
+    // isEmpty already checked:
+    if (lastPosition != newPosition)
+    {
+      const double distance = LtsCoordTrans::distance(lastPosition.x(), lastPosition.y(),
+                                                            newPosition.x(), newPosition.y());
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " distance " << distance;
+
+      if (distance > minDistance)
+      {
+        m_cont.insert(currentTimeMsec, newPosition);
+        success = true;
+      }
+    } // if (lastPosition != newPosition)
+  }
+
+  if (!m_cont.isEmpty() &&
+      (m_cont.size() > maxNumberOfPositions) && (maxNumberOfPositions > 0))
+  {
+    // see QTBUG-59373
+    m_cont.erase(m_cont.begin());
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END " << "success=" << success << " #ofCoords=" << m_cont.size();
+  return success;
+}
+
+bool MovementTrack::removeEntriesNewer(qint64 currentTimeMsec)
+{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_active=" << m_active << " m_count=" << m_count;
+
+  bool modified = false;
+  QMapIterator<KEY_T, COORD_T> mapIt(m_cont);
+  mapIt.toBack();
+
+  while (mapIt.hasPrevious())
+  {
+    mapIt.previous();
+    if (mapIt.key() > currentTimeMsec)
+    {
+      m_cont.remove(mapIt.key());
+      modified = true;
+    }
+    else
+      break;
+  } // while
+
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_active=" << m_active << " m_count=" << m_count << " modified=" << modified;
+  return modified;
+}
+
+bool MovementTrack::removeEntriesOlder(qint64 currentTimeMsec, qint64 maxAgeMsec)
+{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_active=" << m_active << " m_count=" << m_count << " currentTimeMsec=" << currentTimeMsec << " maxAgeMsec=" << maxAgeMsec;
+
+  bool modified = false;
+  auto it = m_cont.begin();
+  while (it != m_cont.end())
+  {
+    const KEY_T &ageMsec = currentTimeMsec - it.key();
+    if (ageMsec > maxAgeMsec)
+    {
+      it = m_cont.erase(it);
+      modified = true;
+    }
+    else
+      ++it;
+  } // while
+
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " m_active=" << m_active << " m_count=" << m_count << " modified=" << modified;
+  return modified;
+}
+
+QVector<MovementTrack::COORD_T> MovementTrack::getTrack() const
+{
+  QVector<MovementTrack::COORD_T> ret;
+  ret.reserve(m_cont.size());
+  for (const auto &pos : m_cont)
+    ret.push_back(pos);
+  return ret;
+}
+
+QVector<MovementTrack::COORD_T> MovementTrack::getVisibleTrack(qint64 currentTimeMsec,
+                                                               qint64 maxAgeMsec,
+                                                               qint64 maxViewAgeMsec)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " m_trackId=" << m_trackId << " currentTimeMsec=" << currentTimeMsec << " maxAgeMsec=" << maxAgeMsec << " maxViewAgeMsec=" << maxViewAgeMsec;
+
+
+  removeEntriesOlder(currentTimeMsec, maxAgeMsec);
+
+  // Auch wenn keine neuen Positionen eingegangen sind,
+  // hat sich die Spur evtl. wegen der modifizierten Zeit 'currentTimeMsec'
+  // geändert:
+  // uebertragen in validCoords
+
+  QVector<MovementTrack::COORD_T> validCoords;
+  validCoords.reserve(m_cont.size());
+  for (auto it = m_cont.cbegin(); it != m_cont.cend(); ++it)
+  {
+    const KEY_T &ageMsec = currentTimeMsec - it.key();
+    if (ageMsec > maxViewAgeMsec && maxViewAgeMsec > 0)
+      continue;
+
+    if (ageMsec < 0)
+    {
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " age is negative!!! - "
+                            << " currentTimeMsec=" << currentTimeMsec
+                            << " m_trackId=" << m_trackId
+                            << " ageMsec=" << ageMsec
+                            << " - "
+                            << " size = " << m_cont.size()
+                            << ", dis = " << std::distance(m_cont.cbegin(), it);
+      if (ageMsec < -1500)
+        WARNING_LOG(m_logger) << LOGFUNCTION << " age is negative!!! - "
+                              << " currentTimeMsec=" << currentTimeMsec
+                              << " m_trackId=" << m_trackId
+                              << " ageMsec=" << ageMsec
+                              << " - "
+                              << " size = " << m_cont.size()
+                              << ", dis = " << std::distance(m_cont.cbegin(), it);
+
+    }
+
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " m_trackId=" << m_trackId << " ageMsec=" << ageMsec << " coord=" << it.value();
+    validCoords.push_back(it.value());
+  } // for
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " validCoords.size()/m_cont.size(): " << validCoords.size() << " / " << m_cont.size();
+
+  return validCoords;
+}
+
+QSharedPointer<MovementTrack> MovementTrack::read(const QJsonObject &json)
+{
+  if (!json.contains(QLatin1String("trackId")))
+    return nullptr;
+
+  int  trackId = -1;
+  if (json.contains(QLatin1String("trackId")))
+    trackId = json[QLatin1String("trackId")].toInt();
+
+  if (trackId < 0)
+    return nullptr;
+
+  QSharedPointer<MovementTrack> mt =
+      QSharedPointer<MovementTrack>(new MovementTrack(trackId));
+
+  // active
+  if (json.contains(QLatin1String("active")))
+    mt->setActive(json[QLatin1String("active")].toBool());
+
+  // coordinates
+  QJsonArray jArray = json[QLatin1String("coordinates")].toArray();
+  for (int idx = 0; idx < jArray.size(); ++idx)
+  {
+    const QJsonObject &objTemp = jArray[idx].toObject();
+    const KEY_T &timeMsec = objTemp[QLatin1String("pointInTimeMsec")].toDouble();  // toDouble!!!
+
+    Point3D p3D;
+    p3D.rx() =  objTemp[QLatin1String("loc_x_lon")].toDouble();
+    p3D.ry() =  objTemp[QLatin1String("loc_y_lat")].toDouble();
+    if (json.contains(QLatin1String("loc_z")))
+      p3D.rz() =  objTemp[QLatin1String("loc_z")].toDouble();
+    mt->addPosition(p3D, timeMsec, 0, 0);
+  } // for
+
+  return mt;
+}
+
+QJsonObject MovementTrack::toJsonObject() const
+{
+  QJsonObject json;
+
+  json[QLatin1String("trackId")]        = m_trackId;
+  json[QLatin1String("active")]         = m_active;
+
+  QJsonArray jArray;
+  QMapIterator<KEY_T, COORD_T> it(m_cont);
+  while (it.hasNext())
+  {
+    it.next();
+    const KEY_T &key      = it.key();
+    const COORD_T &coord  = it.value();
+
+    QJsonObject jsonCoord;
+    jsonCoord[QLatin1String("loc_x_lon")] = coord.x();
+    jsonCoord[QLatin1String("loc_y_lat")] = coord.y();
+    jsonCoord[QLatin1String("loc_z")]     = coord.z();
+    jsonCoord[QLatin1String("pointInTimeMsec")] = key;
+    jArray.append(jsonCoord);
+  }
+  json[QLatin1String("coordinates")] = jArray;
+  return json;
+}
+
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.h
new file mode 100755
index 000000000..a3566b0b8
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track.h
@@ -0,0 +1,85 @@
+/**
+  * @RDE_HEADER@
+  * Class MovementTrack
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+
+// Own
+#include <Map/point3D.h>
+#include <Common/situation_map_logging.h>
+#include <situation_map_export.h>
+
+
+// Qt
+#include <QMap>
+#include <QSharedPointer>
+
+
+class QJsonObject;
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT MovementTrack
+{
+
+public:
+
+  using KEY_T           = qint64;               // msec
+  using COORD_T         = Point3D;              // lon, lat
+  using CONT_T          = QMap<KEY_T, COORD_T>; // ordered by time [msec]
+
+public:
+  /// Constructor
+  explicit MovementTrack(int trackId);
+
+  /// Destructor
+  virtual ~MovementTrack();
+
+  int trackId() const               {    return m_trackId;        }
+  int size() const                  {    return m_cont.size();    }
+  void clear()                      {    m_cont.clear();          }
+
+  void setActive(bool active);
+  bool isActive() const             {    return m_active;         }
+
+  bool addPosition(const COORD_T &newPosition,
+                   qint64 currentTimeMsec, double minDistance, int maxNumberOfPositions);
+
+  const COORD_T lastPosition() const
+  {
+    if (this->m_cont.empty())
+      return COORD_T();
+    return this->m_cont.last();
+  }
+
+  bool removeEntriesOlder(qint64 currentTimeMsec, qint64 maxAgeMsec);
+  bool removeEntriesNewer(qint64 currentTimeMsec);
+
+  QVector<COORD_T> getTrack() const;
+  QVector<COORD_T> getVisibleTrack(qint64 currentTimeMsec, qint64 maxAgeMsec, qint64 maxViewAgeMsec);
+
+
+  static QSharedPointer<MovementTrack> read(const QJsonObject &json);
+  QJsonObject toJsonObject() const;
+
+protected:
+  static int                               m_count;
+  int                                      m_trackId;           // UniqueMapId
+  bool                                     m_active;
+
+  CONT_T                                   m_cont;
+
+
+private:
+  LOGGER_T                                 m_logger;            ///< Interface to the Logging-Facility
+};
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.cpp
new file mode 100755
index 000000000..3d91de3bb
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.cpp
@@ -0,0 +1,338 @@
+/**
+  * @RDE_HEADER@
+  * Class MovementTrackManager
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+
+// Own
+#include "movement_track_manager.h"
+
+
+// Qt
+#include <QVector>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>
+
+namespace SituationMap
+{
+
+MovementTrackManager::MovementTrackManager(QObject *parent)
+  : BaseClass(parent)
+  , m_logger(getLogger("MovementTrackManager"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  init();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+MovementTrackManager::~MovementTrackManager()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " size=" <<  m_cont.size();
+  m_cont.clear();
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
+}
+
+void MovementTrackManager::init()
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  m_cont.clear();
+  m_currentTimeMsec               = 0;
+  m_maxNumberOfTracks             = 10;
+  m_maxNumberOfPointsPerTrack     = 600;            // 600
+
+  //                                min  sec  msec
+  m_maxAgeMsec                    = 30 * 60 * 1000; // (30Min * 60 * 1000= 1 800 000sec)
+  m_maxViewAgeMsec                = 30 * 60 * 1000; // (30Min * 60 * 1000= 1 800 000sec)
+
+  m_minDistance                   = 2;              // 2 Meter
+
+  // just for testing:
+  // m_maxNumberOfTracks             = 3;
+  // m_maxAgeMsec                    = 6000 * 60 * 1000;
+  // m_maxViewAgeMsec                = 6000 * 60 * 1000;
+  // m_maxNumberOfPointsPerTrack     = 10;
+  // m_minDistance                   = 0;
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
+}
+
+QSet<int> MovementTrackManager::setCurrentTimeMsec(qint64 timeMsec)
+{
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " timeMsec=" << timeMsec;
+
+  QSet<int> modifiedMapObjects;
+
+  if (m_currentTimeMsec == timeMsec)
+    return modifiedMapObjects;
+
+  // forward or backward?
+  bool forward = timeMsec > m_currentTimeMsec;
+  m_currentTimeMsec = timeMsec;
+
+
+  QVectorIterator<DATA_T> vecIt(m_cont);
+  while (vecIt.hasNext())
+  {
+    DATA_T item = vecIt.next();
+
+    if (!item)
+      continue;
+
+    bool mod;
+    if (forward)
+      mod = item->removeEntriesOlder(timeMsec, m_maxAgeMsec);
+    else
+      mod = item->removeEntriesNewer(timeMsec);  // set time backward -> remove all entries whose time is too new
+
+    if (mod)
+    {
+      int trackId = item->trackId();
+      DEBUG_LOG(m_logger) << LOGFUNCTION << " Track changes, simId/trackId=" << trackId
+                          << " (m_maxAgeMsec=" << m_maxAgeMsec << ")"
+                          << " (m_maxViewAgeMsec=" << m_maxViewAgeMsec << ")";
+      modifiedMapObjects.insert(trackId);
+    }
+  } // while
+
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " timeMsec=" << timeMsec << " modifiedMapObjects=" << modifiedMapObjects.size();
+  return modifiedMapObjects;
+}
+
+
+bool MovementTrackManager::addTrack(int trackId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " size=" << m_cont.size() << " trackId=" << trackId;
+
+  if (hasTrack(trackId))
+    return false;
+
+  m_cont.push_back(DATA_T(new MovementTrack(trackId)));
+
+  if (!m_cont.isEmpty() && (m_cont.size() > m_maxNumberOfTracks))
+  {
+    const int trackIdSave = m_cont.first()->trackId();
+    m_cont.pop_front();
+    emit trackRemoved(trackIdSave);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END " << " size=" << m_cont.size() << " trackId=" << trackId;
+  return true;
+}
+
+MovementTrackManager::DATA_T MovementTrackManager::getTrack(int trackId) const
+{
+  QVectorIterator<DATA_T> vecIt(m_cont);
+  while (vecIt.hasNext())
+  {
+    DATA_T item = vecIt.next();
+
+    if (item && item->trackId() == trackId)
+      return item;
+  } // while
+
+  return nullptr;
+}
+
+void MovementTrackManager::removeTrack(int trackId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " size=" << m_cont.size() << " trackId=" << trackId;
+
+  for (int idx = m_cont.size() - 1; idx >= 0; --idx)
+  {
+    const DATA_T &item = m_cont.at(idx);
+    if (item && item->trackId() == trackId)
+    {
+      m_cont.removeAt(idx);
+      emit trackRemoved(trackId);
+    }
+  } // for
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " size=" << m_cont.size() << " trackId=" << trackId;
+}
+
+void MovementTrackManager::activateTrack(int trackId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " size=" << m_cont.size() << " trackId=" << trackId;
+
+  // Eintrag finden
+  DATA_T track = getTrack(trackId);
+
+  if (track)
+  {
+    if (!track->isActive())
+    {
+      track->setActive(true);
+      emit trackActivityChanged(trackId, true);
+    }
+  }
+  else
+  {
+    addTrack(trackId); // new Track -> active
+    emit trackActivityChanged(trackId, true);
+  }
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " size=" << m_cont.size() << " trackId=" << trackId;
+}
+
+void MovementTrackManager::deactivateTrack(int trackId)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " size=" << m_cont.size() << " trackId=" << trackId;
+
+  // 1. find track and save:
+  DATA_T savedTrack = getTrack(trackId);
+  if (!savedTrack)
+    return;
+
+  if (!savedTrack->isActive())  // is already deactivated
+    return;
+
+  // 2. remove track:
+  for (int idx = m_cont.size() - 1; idx >= 0; --idx)
+  {
+    const DATA_T &item = m_cont.at(idx);
+    if (item && item->trackId() == trackId)
+      m_cont.removeAt(idx);
+  } // for
+
+  // 3. re-add savedTrack:
+  savedTrack->setActive(false);
+  m_cont.push_front(savedTrack); // front -> remove candidate / Guez: was push_back!?
+
+  emit trackActivityChanged(trackId, false);
+
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " size=" << m_cont.size() << " trackId=" << trackId;
+}
+
+bool MovementTrackManager::addPosition(int trackId, const MovementTrack::COORD_T &coord, qint64 timeMsec)
+{
+  DATA_T track = getTrack(trackId);
+  if (track.isNull())
+    return false;
+  return track->addPosition(coord, timeMsec, m_minDistance, m_maxNumberOfPointsPerTrack);
+}
+
+PositionCont MovementTrackManager::activeAndVisibleTrack(int trackId) const
+{
+  DATA_T track = getTrack(trackId);
+  if (!track || !track->isActive())
+    return PositionCont();
+
+  return track->getVisibleTrack(m_currentTimeMsec, m_maxAgeMsec, m_maxViewAgeMsec);
+}
+
+void MovementTrackManager::emit_activeSimIdsChanged(const QVector<int32_t> &activeSimIds)
+{
+  emit activeSimIdsChanged(activeSimIds);
+}
+
+bool MovementTrackManager::read(const QJsonObject &json)
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+
+  this->init();
+
+  if (json.contains(QLatin1String("currentTimeMsec")))
+    this->setCurrentTimeMsec(json[QLatin1String("currentTimeMsec")].toDouble());  // qint64 -> toDouble
+  if (json.contains(QLatin1String("maxAgeMsec")))
+    this->setMaxAgeMsec(json[QLatin1String("maxAgeMsec")].toDouble());            // qint64 -> toDouble
+  if (json.contains(QLatin1String("maxViewAgeMsec")))
+    this->setMaxViewAgeMsec(json[QLatin1String("maxViewAgeMsec")].toDouble());    // qint64 -> toDouble
+
+  if (json.contains(QLatin1String("minDistance")))
+    this->setMinDistance(json[QLatin1String("minDistance")].toInt());
+  if (json.contains(QLatin1String("maxNumberOfTracks")))
+    this->setMaxNumberOfTracks(json[QLatin1String("maxNumberOfTracks")].toInt());
+  if (json.contains(QLatin1String("maxNumberOfPointsPerTrack")))
+    this->setMaxNumberOfPointsPerTrack(json[QLatin1String("maxNumberOfPointsPerTrack")].toInt());
+
+
+  // coords
+  const QJsonArray &jArray = json[QLatin1String("movementTracks")].toArray();
+
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " movementTrack QJsonArray size=" <<  jArray.size();
+
+  for (int idx = 0; idx < jArray.size(); ++idx)
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " movementTrack QJsonArray, idx=" << idx;
+
+    const QJsonObject &objTemp = jArray[idx].toObject();
+    const QSharedPointer<MovementTrack> &mt = MovementTrack::read(objTemp);
+    if (!mt)
+      continue;
+    if (mt->trackId() >= 0)
+      m_cont.append(mt);
+
+  } // for
+
+  // send signals for all tracks:
+  for (const QSharedPointer<MovementTrack> &mt : qAsConst(m_cont))
+  {
+    DEBUG_LOG(m_logger) << LOGFUNCTION << " emit trackActivityChanged,"
+                        << " mt->trackId()=" << mt->trackId()
+                        << " mt->isActive()=" << mt->isActive();
+    emit trackActivityChanged(mt->trackId(), mt->isActive());
+  }
+
+  return true;
+}
+
+QJsonObject MovementTrackManager::toJsonObject() const
+{
+  QJsonObject json;
+
+  json[QLatin1String("currentTimeMsec")]            = m_currentTimeMsec;
+  json[QLatin1String("maxAgeMsec")]                 = m_maxAgeMsec;
+  json[QLatin1String("maxViewAgeMsec")]             = m_maxViewAgeMsec;
+  json[QLatin1String("minDistance")]                = m_minDistance;
+  json[QLatin1String("maxNumberOfTracks")]          = m_maxNumberOfTracks;
+  json[QLatin1String("maxNumberOfPointsPerTrack")]  = m_maxNumberOfPointsPerTrack;
+
+  QJsonArray jArray;
+  for (const auto &item : m_cont)
+  {
+    if (!item)
+      continue;
+    QJsonObject objTemp = item->toJsonObject();
+    jArray.append(objTemp);
+  }
+  json[QLatin1String("movementTracks")] = jArray;
+  return json;
+}
+
+QByteArray MovementTrackManager::toJson() const
+{
+  // final - toJson
+  QJsonDocument jDoc(toJsonObject());
+  return jDoc.toJson();
+}
+
+QVector<int> MovementTrackManager::activeTrackIds() const
+{
+  QVector<int> trackIds;
+  trackIds.reserve(m_cont.size());
+
+  for (const auto &item : m_cont)
+  {
+    if (item && item->isActive())
+      trackIds.append(item->trackId());
+  }
+  return trackIds;
+}
+
+QVector<int> MovementTrackManager::deactiveTrackIds() const
+{
+  QVector<int> deactiveTrackIds;
+  deactiveTrackIds.reserve(m_cont.size());
+
+  for (const auto &item : m_cont)
+  {
+    if (item && !item->isActive())
+      deactiveTrackIds.append(item->trackId());
+  }
+  return deactiveTrackIds;
+}
+
+} // namespace GDW_CTC
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.h
new file mode 100755
index 000000000..c6a6f3e4d
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/movement_track_manager.h
@@ -0,0 +1,114 @@
+/**
+  * @RDE_HEADER@
+  * Class MovementTrackManager
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+
+#pragma once
+
+
+// Own
+#include "movement_track.h"
+#include <Map/situation_map_types.h>
+
+
+// Qt
+#include <QObject>
+#include <QMap>
+#include <QSharedPointer>
+#include <QVector>
+
+
+//----------------------------------------------------------------------------
+namespace SituationMap
+{
+
+class SITUATIONMAP_EXPORT MovementTrackManager : public QObject
+{
+  Q_OBJECT
+
+public:
+  using COORD_T = MovementTrack::COORD_T;
+  using BaseClass = QObject;
+
+  /// Constructor
+  explicit MovementTrackManager(QObject *parent = nullptr);
+
+  /// Destructor
+  virtual ~MovementTrackManager();
+
+  void init();
+
+  qint64 currentTimeMsec()                          {     return m_currentTimeMsec;               }
+  QSet<int> setCurrentTimeMsec(qint64 timeMsec);
+
+  qint64 maxAgeMsec()                               {     return m_maxAgeMsec;                    }
+  void setMaxAgeMsec(qint64 timeMsec)               {     m_maxAgeMsec = timeMsec;                }
+
+  qint64 maxViewAgeMsec()                           {     return m_maxViewAgeMsec;                }
+  void setMaxViewAgeMsec(qint64 maxViewAgeMsec)     {    m_maxViewAgeMsec = maxViewAgeMsec;       }
+
+  int maxNumberOfTracks() const                     {    return m_maxNumberOfTracks;              }
+  void setMaxNumberOfTracks(int maxNumberOfTracks)  {    m_maxNumberOfTracks = maxNumberOfTracks; }
+
+  int maxNumberOfPointsPerTrack() const             {    return m_maxNumberOfPointsPerTrack;      }
+  void setMaxNumberOfPointsPerTrack(int maxPoints)  {    m_maxNumberOfPointsPerTrack = maxPoints; }
+
+  int minDistance() const                           {    return m_minDistance;                    }
+  void setMinDistance(int minDistance)              {    m_minDistance = minDistance;             }
+
+
+
+  bool addPosition(int trackId, const COORD_T &coord, qint64 timeMsec); // if track exists
+  void removeTrack(int trackId);
+
+  void activateTrack(int trackId);
+  void deactivateTrack(int trackId);
+
+  bool hasTrack(int trackId) const                  { return getTrack(trackId) != nullptr; }
+  int size() const                                  { return m_cont.size();     }
+
+  QVector<int> activeTrackIds() const;
+  QVector<int> deactiveTrackIds() const;
+  PositionCont activeAndVisibleTrack(int trackId) const;
+
+  void emit_activeSimIdsChanged(const QVector<int32_t> &activeSimIds);
+
+  bool read(const QJsonObject &json);
+  QJsonObject toJsonObject() const;
+  QByteArray toJson() const;
+
+
+Q_SIGNALS:
+  void trackActivityChanged(int trackId, bool active);
+  void trackRemoved(int trackId);
+
+  void activeSimIdsChanged(const QVector<int32_t> &activeSimIds);
+
+private:
+  bool addTrack(int trackId);
+
+  using DATA_T = QSharedPointer<MovementTrack>;
+  using CONT_T = QVector<DATA_T>;
+
+  DATA_T getTrack(int trackId) const;
+
+
+protected:
+  CONT_T           m_cont;
+
+  qint64           m_currentTimeMsec;
+  qint64           m_maxAgeMsec;
+  qint64           m_maxViewAgeMsec;
+  int              m_minDistance;
+  int              m_maxNumberOfTracks;
+  int              m_maxNumberOfPointsPerTrack;
+
+
+private:
+  LOGGER_T    m_logger;            ///< Interface to the Logging-Facility
+};
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.cpp
new file mode 100755
index 000000000..dc2e4fd09
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.cpp
@@ -0,0 +1,75 @@
+/**
+  * @RDE_HEADER@
+  * TerrainProfileDialog/ Höhendialog
+  * $Id: zwmsui_TerrainProfileDialog.cpp 21168 2014-10-27 07:35:54Z ehrlicher $
+  * $HeadURL: svn://slssvn/TDS/branches/product/devel/vor_cleanup_zw_zs/ZW/ZWMS/ZWMSUI/zwmsui_TerrainProfileDialog.cpp $
+  * $Author: ehrlicher $
+  */
+
+#include "terrain_profile_dialog.h"
+#include "ui_terrain_profile_dialog.h"
+
+//#include <LtsCoordTrans/lts_coord_trans.h>
+#include <Map/map.h>
+
+namespace SituationMap
+{
+TerrainProfileDialog::TerrainProfileDialog(QWidget *parent, LtsWidgets::ButtonCombination buttonCombination)
+  : LtsWidgets::LtsDialog(parent, buttonCombination)
+  , m_ui(new Ui::TerrainProfile)
+  , m_logger(getLogger("TerrainProfileDialog"))
+{
+  m_ui->setupUi(this);
+
+  connect(m_ui->heightPlotWidget, &LtsHeightPlotWidget::mousePositionChanged, this, &TerrainProfileDialog::onUpdatePosition);
+
+  // SIGNAL-SIGNAL um die Informationen nach aussen zu tragen
+  connect(m_ui->heightPlotWidget, &LtsHeightPlotWidget::mousePositionChanged, this, &TerrainProfileDialog::mousePositionChanged);
+  connect(m_ui->heightPlotWidget, &LtsHeightPlotWidget::startLineOfSight, this, &TerrainProfileDialog::startLineOfSight);
+  connect(m_ui->heightPlotWidget, &LtsHeightPlotWidget::stopLineOfSight, this, &TerrainProfileDialog::stopLineOfSight);
+
+  setOnlineHelpFilename(QStringLiteral("Situation-Start_Terrain_Profil"));
+}
+
+TerrainProfileDialog::~TerrainProfileDialog()
+{
+  delete m_ui;
+}
+
+void TerrainProfileDialog::setMap(Map *map)
+{
+  m_map = map;
+}
+
+void TerrainProfileDialog::retranslate()
+{
+  translate(m_ui, QString(), false, tr("Terrain Profile"));
+}
+
+void TerrainProfileDialog::setData(const QVector<heightData> &data)
+{
+  m_ui->heightPlotWidget->setData(data);
+}
+
+void TerrainProfileDialog::setMarks(const QVector<QPointF> &data)
+{
+  m_ui->heightPlotWidget->setMarks(data);
+}
+
+void TerrainProfileDialog::setMarkerPen(const QPen &pen)
+{
+  m_ui->heightPlotWidget->setMarkerPen(pen);
+}
+
+void TerrainProfileDialog::onUpdatePosition(const QPointF &position, double curHeight, double mouseHeight)
+{
+  QString str;   //  = LtsCoordTrans::UtmCoordinate::fromGeographic(position).mgrs();
+  if (m_map)
+    str = m_map->mapToMgrsString(position);
+
+  m_ui->lblPosition->setText(str);
+  m_ui->lblHeight->setText(QString::number(curHeight, 'f', 2));
+  m_ui->lblHeightCursor->setText(QString::number(mouseHeight, 'f', 2));
+}
+
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.h
new file mode 100755
index 000000000..d9f6407e0
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.h
@@ -0,0 +1,61 @@
+/**
+  * @RDE_HEADER@
+  * TerrainProfileDialog/ Höhendialog
+  * $Id: zwmsui_TerrainProfileDialog.h 4471 2010-06-15 06:56:51Z ehrlicher $
+  * $HeadURL: svn://slssvn/TDS/branches/product/devel/vor_cleanup_zw_zs/ZW/ZWMS/ZWMSUI/zwmsui_TerrainProfileDialog.h $
+  * $Author: ehrlicher $
+  */
+
+#pragma once
+
+#include <LtsWidgets/lts_dialog.h>
+#include <Common/situation_map_logging.h>
+#include <situation_map_export.h>
+
+namespace Ui
+{
+class TerrainProfile;
+}
+
+namespace QtCore
+{
+class QList;
+class QPair;
+class QPointF;
+}
+
+namespace SituationMap
+{
+class Map;
+
+class SITUATIONMAP_EXPORT TerrainProfileDialog final : public LtsWidgets::LtsDialog
+{
+  Q_OBJECT
+
+public:
+  using heightData = QPair<QPointF, double>;
+
+public:
+  explicit TerrainProfileDialog(QWidget *parent = nullptr, LtsWidgets::ButtonCombination buttonCombination = LtsWidgets::ButtonCombination::CloseOnly);
+  ~TerrainProfileDialog();
+  void setMap(Map *map);
+
+  void setData(const QVector<heightData> &data);
+  void setMarks(const QVector<QPointF> &data);
+  void setMarkerPen(const QPen &pen);
+  void retranslate() override;
+
+signals:
+  void mousePositionChanged(const QPointF &curPoint);
+  void startLineOfSight(const QPointF &startPoint);
+  void stopLineOfSight();
+
+protected slots:
+  void onUpdatePosition(const QPointF &position, double curHeight, double mouseHeight);
+
+private:
+  Ui::TerrainProfile  *m_ui;
+  Map                 *m_map    = nullptr;
+  LOGGER_T             m_logger;
+};
+} // namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.ui b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.ui
new file mode 100755
index 000000000..158f3bd77
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Utils/terrain_profile_dialog.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TerrainProfile</class>
+ <widget class="QWidget" name="TerrainProfile">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Terrain Profile</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Position:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblPosition">
+       <property name="text">
+        <string notr="true">XXXXX YYYYY</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>17</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Height:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblHeight">
+       <property name="text">
+        <string notr="true">xxxx m</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>17</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Cursor height:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblHeightCursor">
+       <property name="text">
+        <string notr="true">xxxx m</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="LtsHeightPlotWidget" name="heightPlotWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LtsHeightPlotWidget</class>
+   <extends>QWidget</extends>
+   <header>LtsWidgets/lts_height_plot_widget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/situation_map_export.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/situation_map_export.h
new file mode 100755
index 000000000..d8e20d986
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/situation_map_export.h
@@ -0,0 +1,34 @@
+/**
+  * @RDE_HEADER@
+  * Export definitions
+  * $Id$
+  * $HeadURL$
+  * $Author$
+  */
+#pragma once
+
+#include <qglobal.h>
+
+#ifndef SITUATIONMAP_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define SITUATIONMAP_EXPORT
+# else
+#  if defined(MAKE_SITUATIONMAP_LIB)
+#   define SITUATIONMAP_EXPORT Q_DECL_EXPORT
+#  else
+#   define SITUATIONMAP_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
+
+#ifndef SITMAPGUIPLUGIN_EXPORT
+# ifdef BUILD_STATIC_LIBRARIES
+#  define SITMAPGUIPLUGIN_EXPORT
+# else
+#  if defined(MAKE_SITMAPGUIPLUGIN_LIB)
+#   define SITMAPGUIPLUGIN_EXPORT Q_DECL_EXPORT
+#  else
+#   define SITMAPGUIPLUGIN_EXPORT Q_DECL_IMPORT
+#  endif
+# endif
+#endif
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
index 8e8eda8b9..6b01ae67b 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
@@ -31,7 +31,8 @@ LogViewField::LogViewField(const QString& a_name, const E_FieldKind a_kind, cons
     m_HasContent(true),
     m_bDeleteXdr(false),
     m_Kind(a_kind),
-    m_XdrElement(a_xdrElement)
+    m_XdrElement(a_xdrElement),
+    m_logger(getLogger("LogViewField"))
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
index c776bc3e7..473c9ce43 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
@@ -134,5 +134,6 @@ namespace N_LogView
     const LogViewXdrElement *m_XdrElement;
 
   private:
+    NGL::INGLLogger &m_logger;
   };
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
index a01a4278f..651c1cea8 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
@@ -21,6 +21,7 @@
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
+#include <QtCore/QStringList>
 #include <QtCore/QTimer>
 #include <QtGui/QAction>
 #include <QtWidgets/QApplication>
@@ -72,6 +73,7 @@ LogViewGui::LogViewGui(QWidget* a_parent)
   , m_InjectionThread(nullptr)
   , m_replayTimer(new QTimer(this))
   , m_currentReplayRow(-1)
+  , m_logger(getLogger("LogViewGui"))
 {
   setWindowIcon(QIcon(QLatin1String(":icons/16x16/rde_16x16.png")));
 
@@ -655,10 +657,10 @@ void LogViewGui::updateLogfile()
 
       QString filePath(fileInfo.absolutePath() + QLatin1Char('/'));
       const QString baseName = fileInfo.baseName();
-      const QVector<QStringRef> parts = baseName.splitRef(QLatin1Char('_'));
+      const QStringList parts = baseName.split(QLatin1Char('_'));
 
-      for (int iterator = 0; iterator < parts.size() - 2; ++iterator) 
-        filePath += parts.at(iterator).toString() + QLatin1Char('_');
+      for (int iterator = 0; iterator < parts.size() - 2; ++iterator)
+        filePath += parts.at(iterator) + QLatin1Char('_');
 
       QString nextFile(filePath + nextDate + QLatin1Char('.') + fileInfo.completeSuffix());
       QString checkFile(filePath + checkDate + QLatin1Char('.') + fileInfo.completeSuffix());
@@ -912,9 +914,9 @@ void LogViewGui::startInjectionThread()
   settings.beginGroup(QLatin1String("LogFiles"));
   QString filePath = settings.value(QLatin1String("Dir")).toString();
   QString exerciseName;
-  QVector<QStringRef> parts = filePath.splitRef(QLatin1Char('/'));
+  QStringList parts = filePath.split(QLatin1Char('/'));
   if (parts.size() >= 2)
-    exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2).toString();
+    exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2);
 
   QString portFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("PrtCnv") + exerciseName + QLatin1String(".dat");
   QFileInfo checkPortFile(portFilePath);
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
index 8aa778097..d7b4e4a0f 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
@@ -122,6 +122,7 @@ protected:
   QAction *m_reloadAction;
   QTimer *m_replayTimer;
   int m_currentReplayRow;
+  NGL::INGLLogger &m_logger;
 protected:
   void readTelegramsFromLogFile(const QString& a_fileName, const qint64 a_filePos = 0);
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
index 494ebb53a..faefb51b2 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
@@ -28,6 +28,7 @@ LogViewInjectionThread::LogViewInjectionThread()
   , m_SendingPossible(false)
   , m_Socket(nullptr)
   , m_Timer(nullptr)
+  , m_logger(getLogger("LogViewInjectionThread"))
 {
   
   QSettings settings;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
index 5e11a854e..af94bc3c9 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
@@ -54,6 +54,7 @@ namespace N_LogView
     QTimer *m_Timer;
 
   private:
+    NGL::INGLLogger &m_logger;
   protected:
   protected slots:
     void tryToConnect();
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp
index fa0eb528c..655706be8 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp
@@ -48,7 +48,8 @@ int main(int argc, char *argv[])
   settings.endGroup();
 
   QScreen *screen = QGuiApplication::screens().value(screenNbr, QGuiApplication::primaryScreen());
-  N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(screen);
+  Q_UNUSED(screen) // Qt6 removed QDesktopWidget (legacy passed QApplication::desktop()->screen(screenNbr) as the QWidget parent). The window is created parentless; LogViewGui restores its own size/position from QSettings (move(POS)).
+  N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(nullptr);
   logViewGui->show();
   int ret = app.exec();
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
index 26e266b31..7ba669ece 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
@@ -55,7 +55,7 @@ QVariant ParticipantModel::data(const QModelIndex &index, int role) const
         break;
       }
     }
-    if (role == Qt::BackgroundColorRole)
+    if (role == Qt::BackgroundRole)
     {
       if (p.first == 0)
         return QVariant();  
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
index 3a8c0b05e..3e0419915 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QtGui/QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QSortFilterProxyModel>
 #include <set>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
index 18c265b17..80d3d67b7 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
@@ -25,6 +25,7 @@
 
 #include "LogViewField.hpp"
 #include <QtCore/QDateTime>
+#include <QtCore/QLocale>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtWidgets/QMessageBox>
@@ -73,6 +74,7 @@ LogViewTelegram::LogViewTelegram(const LogViewTelegram &o)
   , m_data(o.m_data)
   , m_json(o.m_json)
   , m_TetraTelegram(nullptr)
+  , m_logger(getLogger("LogViewTelegram"))
 {
   if (!m_data.isEmpty())
     m_TetraTelegram = new N_CoPrtCnv::CoPrtCnvRadioTelegram(m_data);
@@ -100,6 +102,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
   , m_LogTime(0)
   , m_GpsTime(0)
   , m_TetraTelegram(nullptr)
+  , m_logger(getLogger("LogViewTelegram"))
 {
   const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
   if (waitTime > 0)
@@ -143,6 +146,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
   , m_GpsTime(0)
   , m_data(a_telegramData)
   , m_TetraTelegram(nullptr)
+  , m_logger(getLogger("LogViewTelegram"))
 {
   const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
   if (waitTime > 0)
@@ -1522,7 +1526,7 @@ void LogViewTelegram::updateJsonValue(const QStringList &path, const QJsonValue
   if (!key.startsWith(indexMarker))
     return;
 
-  const int arrayIdx = key.midRef(indexMarker.size()).toInt();
+  const int arrayIdx = key.mid(indexMarker.size()).toInt();
   while (arr.size() <= arrayIdx)
     arr.append(QJsonValue());
 
@@ -1630,7 +1634,7 @@ void LogViewTelegram::showMessageBox(const QString& a_errorText, const QString&
         QLatin1String("gesendete") : QLatin1String("gelesene"));
   QMessageBox::warning(QApplication::topLevelWidgets()[0], a_title,
       QString::fromUtf8("Das %5 Telegramm mit Protokoll %6 von %1 (Unix-Zeit: %2) und Länge %3 ist fehlerhaft:<br><br><b>%4</b>")
-      .arg(dt.toString(Qt::SystemLocaleLongDate)).arg(logTimeSec).arg(m_data.size()).arg(a_errorText, destStr).arg(m_Protocol));
+      .arg(QLocale::system().toString(dt, QLocale::LongFormat)).arg(logTimeSec).arg(m_data.size()).arg(a_errorText, destStr).arg(m_Protocol));
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp
index f55658d94..da137bdb9 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp
@@ -362,6 +362,8 @@ namespace N_LogView
     uint8_t getData(const uint16_t a_offset) const;
 
   private:
+    NGL::INGLLogger &m_logger;
+
     friend class LogViewTabWidget;
 
   };
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
index 0c247a0b5..874070d31 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
@@ -50,6 +50,7 @@ namespace N_LogView
 LogViewTelegramDialog::LogViewTelegramDialog(QWidget *a_parent, const bool a_readonly)
   : QDialog(a_parent)
   , m_ReadOnly(a_readonly)
+  , m_logger(getLogger("LogViewTelegramDialog"))
 {
   setAttribute(Qt::WA_DeleteOnClose);
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp
index f866225c2..01556fd18 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp
@@ -69,6 +69,8 @@ private:
   QLineEdit *m_NameEdit = nullptr;
   QLineEdit *m_WaitTimeEdit = nullptr;
   bool m_ReadOnly = false;
+
+  NGL::INGLLogger &m_logger;
 };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
index ed042e35f..60848f742 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
@@ -57,6 +57,7 @@ TelegramEdit::TelegramEdit(QWidget *parent)
   , m_DoLoop(false)
   , m_InjectionThread(nullptr)
   , m_EditModel(new TelegramEditModel(this))
+  , m_logger(getLogger("LogViewTelegramEdit"))
 {
   m_addTeleAction->setShortcut(tr("Ctrl+A"));
   m_editTeleAction->setShortcut(tr("Ctrl+E"));
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
index aff434734..f4f9b03cd 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "LogViewTelegram.hpp"
-#include <QtGui/QModelIndex>
+#include <QtCore/QModelIndex>
 
 class QAction;
 class QTableView;
@@ -60,6 +60,9 @@ protected:
   int m_curEditTelegramRow;
 
   TelegramEditModel *m_EditModel;
+
+  NGL::INGLLogger &m_logger;
+
   static QString s_DIR();
   static QString s_EDIT_TELEGRAM_GROUP();
   static QString s_TELEGRAMLIST_FILE_ID();
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
index 28a9ba2fa..5d9dc8578 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
@@ -87,16 +87,16 @@ bool LogViewTetraTelegramsParser::parse(const QString &filename)
   const QString content = QString::fromUtf8(f.readAll());
   f.close();
 
-  const QVector<QStringRef> lines = content.splitRef(QLatin1Char('\n'));
-  QVector<QStringRef> linesTrimmed;
+  const QStringList lines = content.split(QLatin1Char('\n'));
+  QStringList linesTrimmed;
   linesTrimmed.reserve(lines.size());
-  for (const QStringRef &line : lines)
+  for (const QString &line : lines)
     linesTrimmed += line.trimmed();
 
   int i = 0;
   while (i < linesTrimmed.size())
   {
-    const QStringRef &line = linesTrimmed.at(i);
+    const QString &line = linesTrimmed.at(i);
     if (line.startsWith(QLatin1String("struct")))
     {
       i = parseStruct(linesTrimmed, i);
@@ -136,22 +136,22 @@ void LogViewTetraTelegramsParser::insertPod(const QString &type, int byteLen, bo
 }
 
 
-int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, int iStartPos)
+int LogViewTetraTelegramsParser::parseStruct(const QStringList &lines, int iStartPos)
 {
-  const QVector<QStringRef> tokens = tokenize(lines.at(iStartPos));
+  const QStringList tokens = tokenize(lines.at(iStartPos));
   if (tokens.size() < 2)
     return -1;
-  const QStringRef &structType = tokens.at(1);
-  if (structType.endsWith(QLatin1Char(';')))  
-    return iStartPos; 
+  const QString &structType = tokens.at(1);
+  if (structType.endsWith(QLatin1Char(';')))
+    return iStartPos;
 
   StructInformation si;
-  si.type = structType.toString();
+  si.type = structType;
   if (tokens.size() > 2)
   {
     if (tokens.at(2) != QLatin1String(":"))
     {
-      WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
+      WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos) << "', line: " << iStartPos + 1;
       return -1;
     }
 
@@ -159,29 +159,29 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
     {
       if (!si.baseStruct.isEmpty())
       {
-        WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
+        WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos) << "', line: " << iStartPos + 1;
         return -1;
       }
-      QStringRef base = tokens.at(i);
+      QString base = tokens.at(i);
       if (base == QLatin1String("public") ||
           base == QLatin1String("protected") ||
           base == QLatin1String("private"))
         continue;
       if (base.endsWith(QLatin1Char(',')))
         base.chop(1);
-      if (base.endsWith(QLatin1Char('>')))  
+      if (base.endsWith(QLatin1Char('>')))
       {
         si.isVisible = true;
         continue;
       }
-      si.baseStruct = tokens.at(i).toString();
+      si.baseStruct = tokens.at(i);
     }
   }
 
   int i = iStartPos + 1;
   while (i < lines.size())
   {
-    const QVector<QStringRef> tokens = tokenize(lines.at(i));
+    const QStringList tokens = tokenize(lines.at(i));
     if (!validStructTokens(tokens))
     {
       ++i;
@@ -204,17 +204,17 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
       const int parserCommentPos = tokens.at(2) == QLatin1String("=") ? 4 : 2;
       if (tokens.size() > parserCommentPos)
       {
-        const QStringRef &comment = tokens.at(parserCommentPos);
-        DEBUG_LOG(m_logger) << "comment: " << comment.toString();
+        const QString &comment = tokens.at(parserCommentPos);
+        DEBUG_LOG(m_logger) << "comment: " << comment;
         if (comment.startsWith(QLatin1String("//@array: ")))
         {
-          const QStringRef hint = comment.mid(QLatin1String("//@array: ").size());
-          QString structStr = QLatin1String("struct ") + si.type + QLatin1String("::") + tokens.at(0).toString() + QLatin1Char('\n') + hint.toString();
+          const QString hint = comment.mid(QLatin1String("//@array: ").size());
+          QString structStr = QLatin1String("struct ") + si.type + QLatin1String("::") + tokens.at(0) + QLatin1Char('\n') + hint;
           structStr.replace(QLatin1Char(';'), QLatin1String(";\n"));
           DEBUG_LOG(m_logger) << "structStr: " << structStr;
-          parseStruct(structStr.splitRef(QLatin1Char('\n')), 0);
+          parseStruct(structStr.split(QLatin1Char('\n')), 0);
 
-          mi.type = si.type + QLatin1String("::") + tokens.at(0).toString();
+          mi.type = si.type + QLatin1String("::") + tokens.at(0);
           mi.isArray = true;
         }
         if (comment == QLatin1String("//@invisible"))
@@ -222,13 +222,13 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
       }
     }
 
-    QStringRef name = tokens.at(1);
+    QString name = tokens.at(1);
     if (name.endsWith(QLatin1Char(';')))
       name.chop(1);
     if (mi.type.isEmpty())
-      mi.type += tokens.at(0).toString();
+      mi.type += tokens.at(0);
     categorizeMember(mi);
-    mi.name = name.toString();
+    mi.name = name;
     if (mi.isEnum && !mi.type.contains(QLatin1String("::")))
     {
       
@@ -265,29 +265,29 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
   return i;
 }
 
-int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int iStartPos, const QString &ns, StructInformation *si)
+int LogViewTetraTelegramsParser::parseEnum(const QStringList &lines, int iStartPos, const QString &ns, StructInformation *si)
 {
-  const QVector<QStringRef> tokens = tokenize(lines.at(iStartPos));
+  const QStringList tokens = tokenize(lines.at(iStartPos));
   if (tokens.size() < 2)
     return -1;
-  QStringRef enumName = tokens.at(1);
+  QString enumName = tokens.at(1);
   if (enumName == QLatin1String("class"))
   {
     if (tokens.size() < 3)
       return -1;
     enumName = tokens.at(2);
   }
-  if (enumName.endsWith(QLatin1Char(';')))  
-    return iStartPos; 
+  if (enumName.endsWith(QLatin1Char(';')))
+    return iStartPos;
 
   EnumInformation ei;
-  ei.type = enumName.toString();
+  ei.type = enumName;
   ei.ns = ns;
 
   int i = iStartPos + 1;
   while (i < lines.size())
   {
-    const QVector<QStringRef> tokens = tokenize(lines.at(i).split(QStringLiteral("//")).first());
+    const QStringList tokens = tokenize(lines.at(i).split(QStringLiteral("//")).first());
     if (tokens.isEmpty() ||
         (tokens.at(0) == QLatin1String("{")))
     {
@@ -308,19 +308,19 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
         else
           mi.type = ns + QStringLiteral("::") + ei.type;
         mi.isEnum = true;
-        mi.name = tokens.at(1).toString();
+        mi.name = tokens.at(1);
         si->member.push_back(std::move(mi));
         break;
       }
-      WARNING_LOG(m_logger) << "Could not parse enum: '" << lines.at(i).toString() << "', line: " << i + 1;
+      WARNING_LOG(m_logger) << "Could not parse enum: '" << lines.at(i) << "', line: " << i + 1;
       return -1;
     }
 
     EnumValue ev;
-    ev.key = tokens.at(0).toString();
+    ev.key = tokens.at(0);
     if (tokens.size() == 3)
     {
-      QStringRef value = tokens.at(2);
+      QString value = tokens.at(2);
       if (value.endsWith(QLatin1Char(',')))
         value.chop(1);
       ev.value = value.toInt();
@@ -346,28 +346,28 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
   return i;
 }
 
-int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &lines, int iStartPos)
+int LogViewTetraTelegramsParser::parseConstraint(const QStringList &lines, int iStartPos)
 {
-  const QVector<QStringRef> tokens = tokenize(lines.at(iStartPos));
+  const QStringList tokens = tokenize(lines.at(iStartPos));
   if (tokens.size() != 4)
   {
-    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
+    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos) << "'";
     return -1;
   }
-  const QStringRef &cs = tokens.at(3);
+  const QString &cs = tokens.at(3);
   if (!cs.startsWith(QLatin1String("Constraints<")) || !cs.endsWith(QLatin1Char('>')))
   {
-    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
+    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos) << "'";
     return -1;
   }
-  QStringRef structName = cs.mid(QLatin1String("Constraints<").size());
+  QString structName = cs.mid(QLatin1String("Constraints<").size());
   structName.chop(1);
-  DEBUG_LOG(m_logger) << "Constraint: " << structName.toString();
+  DEBUG_LOG(m_logger) << "Constraint: " << structName;
 
   int i = iStartPos + 1;
   while (i < lines.size())
   {
-    const QVector<QStringRef> tokens = tokenize(lines.at(i));
+    const QStringList tokens = tokenize(lines.at(i));
     if (tokens.isEmpty() ||
         (tokens.at(0) == QLatin1String("{")))
     {
@@ -381,14 +381,14 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
       ++i;
       continue;
     }
-    const QVector<QStringRef> parts = tokens.at(6).split(QLatin1String("::"));
+    const QStringList parts = tokens.at(6).split(QLatin1String("::"));
     if (parts.size() != 2)
     {
-      WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(i).toString() << "'";
+      WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(i) << "'";
       return -1;
     }
 
-    QStringRef enumKey = parts.at(1);
+    QString enumKey = parts.at(1);
     if (enumKey.endsWith(QLatin1Char(';')))
       enumKey.chop(1);
     bool bFound = false;
@@ -396,14 +396,14 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
     {
       if (v.key == enumKey)
       {
-        m_visibleTelegrams.insert(v.value, structName.toString());
+        m_visibleTelegrams.insert(v.value, structName);
         bFound = true;
         break;
       }
     }
     if (!bFound)
     {
-      WARNING_LOG(m_logger) << "Could not find enum value '" << enumKey.toString() << "' in enum TelegramId";
+      WARNING_LOG(m_logger) << "Could not find enum value '" << enumKey << "' in enum TelegramId";
       return -1;
     }
     ++i;
@@ -434,7 +434,7 @@ void LogViewTetraTelegramsParser::categorizeMember(MemberInformation &mi) const
   mi.isBinary = (mi.type == QLatin1String("std::vector<unsigned char>") || mi.type == QLatin1String("QByteArray"));
 }
 
-static inline void bracketCount(const QStringRef &str, int &cntLt, int &cntGt)
+static inline void bracketCount(const QString &str, int &cntLt, int &cntGt)
 {
   cntLt = 0;
   cntGt = 0;
@@ -447,21 +447,33 @@ static inline void bracketCount(const QStringRef &str, int &cntLt, int &cntGt)
   }
 }
 
-QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line) const
+QStringList LogViewTetraTelegramsParser::tokenize(const QString &line) const
 {
-  QVector<QStringRef> ret = line.split(QLatin1Char(' '), QString::SkipEmptyParts);
+  QStringList ret = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
+  // QStringRef is gone in Qt6: remember the offset of each token within
+  // the original line so the merge logic below can rebuild substrings
+  // (the equivalent of QStringRef(token.string(), position, length)).
+  QVector<int> positions;
+  positions.reserve(ret.size());
+  int from = 0;
+  for (const QString &t : ret)
+  {
+    const int pos = line.indexOf(t, from);
+    positions.push_back(pos);
+    from = pos + t.size() + 1;
+  }
   int i = 0;
   while (i < ret.size())
   {
-    const QStringRef &token = ret.at(i);
+    const QString &token = ret.at(i);
     if (token.startsWith(QLatin1String("//")))
     {
-      
+
       if (i == ret.size() - 1)
         break;
-      const QStringRef &lastToken = ret.last();
-      const QStringRef newToken = QStringRef(token.string(), token.position(), lastToken.position() - token.position() + lastToken.size());
-      DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
+      const QString &lastToken = ret.last();
+      const QString newToken = line.mid(positions.at(i), positions.last() - positions.at(i) + lastToken.size());
+      DEBUG_LOG(m_logger) << "New Token: " << newToken;
       ret.resize(i + 1);
       ret[i] = newToken;
       break;
@@ -476,9 +488,9 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
       ++i;
       continue;
     }
-    const QStringRef &nextToken = ret.at(i + 1);
-    const QStringRef newToken = QStringRef(token.string(), token.position(), nextToken.position() - token.position() + nextToken.size());
-    DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
+    const QString &nextToken = ret.at(i + 1);
+    const QString newToken = line.mid(positions.at(i), positions.at(i + 1) - positions.at(i) + nextToken.size());
+    DEBUG_LOG(m_logger) << "New Token: " << newToken;
     ret.removeAt(i + 1);
     ret[i] = newToken;
   }
@@ -486,7 +498,7 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
   return ret;
 }
 
-bool LogViewTetraTelegramsParser::validStructTokens(const QVector<QStringRef> &tokens)
+bool LogViewTetraTelegramsParser::validStructTokens(const QStringList &tokens)
 {
   if (tokens.isEmpty() ||
       (tokens.at(0) == QLatin1String("{")) ||
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
index 57a3c3d36..ef64a6fe7 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
@@ -5,6 +5,7 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <QtCore/QVector>
 #include "logger.h"
 
@@ -72,17 +73,18 @@ public:
   static QString getInnerType(const QString &type);
 private:
   void insertPod(const QString &type, int byteLen, bool isSigned, bool isIntegral, bool isBoolean = false);
-  int parseStruct(const QVector<QStringRef> &lines, int iStartPos);
-  int parseEnum(const QVector<QStringRef> &lines, int iStartPos, const QString &ns, StructInformation *si = nullptr);
-  int parseConstraint(const QVector<QStringRef> &lines, int iStartPos);
+  int parseStruct(const QStringList &lines, int iStartPos);
+  int parseEnum(const QStringList &lines, int iStartPos, const QString &ns, StructInformation *si = nullptr);
+  int parseConstraint(const QStringList &lines, int iStartPos);
   void categorizeMember(MemberInformation &mi) const;
-  QVector<QStringRef> tokenize(const QStringRef &line) const;
-  static bool validStructTokens(const QVector<QStringRef> &tokens);
+  QStringList tokenize(const QString &line) const;
+  static bool validStructTokens(const QStringList &tokens);
 private:
   EnumInformation m_telegramIdEnum;
   QVector<EnumInformation> m_enums;
   QHash<QString, StructInformation> m_structs;
   QHash<QString, PodInformation> m_pods;
   QHash<int, QString> m_visibleTelegrams;
+  NGL::INGLLogger &m_logger;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
index ce8fa7ad8..26b7a34f7 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
@@ -30,6 +30,7 @@ LogViewWidget::LogViewWidget(LogViewField* a_field, QWidget* a_widget, QWidget*
   , m_Widget(a_widget)
   , m_Field(a_field)
   , m_Parent(a_parent)
+  , m_logger(getLogger("LogViewWidget"))
 {
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp
index 203e4d50d..f7701373c 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp
@@ -77,6 +77,7 @@ protected:
   LogViewField *m_Field;
 
   QWidget *m_Parent;
+  NGL::INGLLogger &m_logger;
 };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp
index 4af097dbe..80228f21e 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp
@@ -54,6 +54,8 @@ namespace N_LogView
     QString m_Name;
     E_ElementKind m_Kind;
     QString getKindName() const;
+
+    NGL::INGLLogger &m_logger;
   };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
index e4386d2da..82ebd1cf9 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
@@ -37,6 +37,7 @@ LogViewXdrParser::LogViewXdrParser()
   , m_WordListIndex(0)
   , m_ActElement(nullptr)
   , m_State(e_ParseMain)
+  , m_logger(getLogger("LogViewXdrParser"))
 {}
 
 LogViewXdrParser::~LogViewXdrParser()
@@ -317,15 +318,15 @@ void LogViewXdrParser::parseDefine(const QString &a_line)
   int sepPos = line.indexOf(QLatin1Char(' '));
   if (sepPos >= 0)
   {
-    const QString name = line.leftRef(sepPos).trimmed().toString();
-    QStringRef substitution = line.midRef(sepPos).trimmed();
+    const QString name = line.left(sepPos).trimmed();
+    QString substitution = line.mid(sepPos).trimmed();
     sepPos = substitution.indexOf(QLatin1Char(' '));
     if (sepPos >= 0)
       substitution = substitution.left(sepPos).trimmed();
 
     
     bool ok = false;
-    const int64_t value = calcValue(substitution.toString(), ok);
+    const int64_t value = calcValue(substitution, ok);
     if (ok)
     {
       
@@ -352,7 +353,7 @@ void LogViewXdrParser::parseEnum(const QString &a_line, const uint16_t a_enumSiz
         if (a_line.endsWith(QLatin1String(" {")))
         {
           m_State = e_ParseEnum;
-          const QString name = a_line.leftRef(a_line.length()-2).trimmed().toString();
+          const QString name = a_line.left(a_line.length()-2).trimmed();
           m_ActElement = new LogViewXdrStruct(name, LogViewXdrElement::e_KindEnum, a_enumSize);
           if (!addToElementMap(name, m_ActElement))
           {
@@ -617,8 +618,8 @@ bool LogViewXdrParser::parseEnumLine(const QString& a_line, QString& a_name, QSt
   int sepPos = line.lastIndexOf(QLatin1Char('='));
   if (-1 != sepPos)
   {
-    a_name = line.leftRef(sepPos).trimmed().toString();
-    a_value = line.midRef(sepPos+1).trimmed().toString();
+    a_name = line.left(sepPos).trimmed();
+    a_value = line.mid(sepPos+1).trimmed();
     return true; 
   }
   else
@@ -870,7 +871,7 @@ void LogViewXdrParser::fillWordList(const QString& a_line)
   line.replace(QLatin1Char('}'), QLatin1String(" } "));
   line.replace(QLatin1Char(':'), QLatin1String(" : "));
   line.replace(QLatin1Char(';'), QLatin1String(" ; "));
-  m_WordList = line.split(QLatin1Char(' '), QString::SkipEmptyParts);
+  m_WordList = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
   m_WordListIndex = 0;
   
   
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp
index ea7c6a23f..5c87b501c 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp
@@ -174,6 +174,7 @@ namespace N_LogView
     bool addToElementMap(const QString& a_name, LogViewXdrElement* a_element);
 
   private:
+    NGL::INGLLogger &m_logger;
   };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/CMakeLists.txt
index a680dfbee..7f9f31c46 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/CMakeLists.txt
@@ -15,6 +15,7 @@ NGL_TARGET_LINK_LIBRARIES(PrtCnvLastTest
   Qt6::Core
   Qt6::Network
   CoPrtCnv
+  PrtCnvLib
   NGLLogger
   ngltools
 )
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
index f11c41730..510996b5f 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
@@ -30,8 +30,8 @@ TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short i
   , m_secondFragment(0)
   , m_timer(nullptr)
   , m_SendCounter(0)
-  ),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+{
   connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
   connect(m_socket, &QTcpSocket::disconnected,  this, &TetraIF::onDisconnected);
   connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
index f048bca8b..bb13f56f1 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
@@ -95,9 +95,13 @@ endif()
 # SV: logView
 NGL_ADD_LIBRARY2(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
 if(HAVE_POPPLER_QT6)
-  target_compile_definitions(nglwidgets PRIVATE HAVE_POPPLER_QT6)
-  target_include_directories(nglwidgets PRIVATE ${POPPLER_QT6_INCLUDE_DIRS})
-  target_link_libraries(nglwidgets PRIVATE ${POPPLER_QT6_LIBRARIES})
+  # nglpdfwidget.h is a public header that conditionally includes poppler and
+  # declares poppler-typed methods under HAVE_POPPLER_QT6, so consumers that
+  # include it must see the same definition: propagate the define, the poppler
+  # include dir and the lib on the PUBLIC interface (build-only; no behavior change).
+  target_compile_definitions(nglwidgets PUBLIC HAVE_POPPLER_QT6)
+  target_include_directories(nglwidgets PUBLIC ${POPPLER_QT6_INCLUDE_DIRS})
+  target_link_libraries(nglwidgets PUBLIC ${POPPLER_QT6_LIBRARIES})
 endif()
 if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(nglwidgets
@@ -114,7 +118,10 @@ endif()
 NGL_INSTALL_TARGET(nglwidgets)
 
 # Unit test for PDFWidget
-IF(BUILD_TESTING AND TARGET nglwidgets AND QT6_GUI_AVAILABLE)
+# Only buildable when Poppler-Qt6 is available: the nglwidgets lib compiles
+# nglpdfwidget.cpp (defining NGL::PDFWidget) only under HAVE_POPPLER_QT6, so the
+# test cannot link otherwise.
+IF(BUILD_TESTING AND TARGET nglwidgets AND QT6_GUI_AVAILABLE AND HAVE_POPPLER_QT6)
   FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Test)
   ADD_EXECUTABLE(test_nglpdfwidget test_nglpdfwidget.cpp)
   TARGET_LINK_LIBRARIES(test_nglpdfwidget PRIVATE nglwidgets Qt6::Test ${Qt6_Widgets})
diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake
index 258b7ab2b..cbbf3c052 100755
--- a/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake
+++ b/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake
@@ -112,12 +112,27 @@ IF(NOT TARGET ArcGIS::ArcGIS)
   # saw <Symbol.h> etc. Base-state defect carried over from the legacy Qt5 file
   # (identical overwrite of the Qt5 include dirs), never surfaced because the
   # ArcGIS-ON GROUP5 path was never validated in this pipeline.
-  SET_PROPERTY(TARGET ArcGIS::ArcGIS APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-    $<TARGET_PROPERTY:Qt6::Core,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:Qt6::Location,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:Qt6::Network,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:Qt6::Sensors,INTERFACE_INCLUDE_DIRECTORIES>
-    )
+  #
+  # Only propagate the include dirs of Qt6 component targets that actually exist.
+  # On a reconfigure the top-level find_package(Qt6 ... Positioning ...) is
+  # short-circuited by the cached Qt6_*_DIR values, so the Qt6::Location /
+  # Qt6::Sensors imported targets are NOT re-created even though the components
+  # are "found" (Qt6Location_DIR/Qt6Sensors_DIR stay cached). A bare
+  # $<TARGET_PROPERTY:Qt6::Location,...> on a missing target is a hard
+  # "target not found" error at generate time. Guarding on TARGET keeps the
+  # interface complete whenever the targets exist and skips them (instead of
+  # crashing) when a reconfigure left them absent.
+  SET(_arcgis_qt6_incs "")
+  FOREACH(_arcgis_qt6_comp Core Location Network Sensors)
+    IF(TARGET Qt6::${_arcgis_qt6_comp})
+      LIST(APPEND _arcgis_qt6_incs
+        $<TARGET_PROPERTY:Qt6::${_arcgis_qt6_comp},INTERFACE_INCLUDE_DIRECTORIES>)
+    ENDIF()
+  ENDFOREACH()
+  IF(_arcgis_qt6_incs)
+    SET_PROPERTY(TARGET ArcGIS::ArcGIS APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+      ${_arcgis_qt6_incs})
+  ENDIF()
 
   IF (UNIX)
     IF(ARCGIS_COMMON_LIBRARY_RELEASE)
diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindKDReports.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindKDReports.cmake
index 84970ca43..dad5c5122 100755
--- a/qt6-after/qt6-migrated-legatus/cmake/FindKDReports.cmake
+++ b/qt6-after/qt6-migrated-legatus/cmake/FindKDReports.cmake
@@ -55,6 +55,27 @@ IF(KDReports_FOUND)
   SET_PROPERTY(TARGET KDReports::KDReports PROPERTY IMPORTED_LOCATION                    "${KDREPORTS_LIBRARY}")
   SET_PROPERTY(TARGET KDReports::KDReports PROPERTY INTERFACE_COMPILE_DEFINITIONS        "")
   SET_PROPERTY(TARGET KDReports::KDReports APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_qt_prefix}::Core ${_qt_prefix}::Gui ${_qt_prefix}::PrintSupport ${_qt_prefix}::Widgets)
+
+  # KDReports headers use Qt5-style bare includes (#include <QPrinter>, ...). In Qt6
+  # the forwarding headers live in <QtPrefix>/include/QtPrintSupport. The Qt6::PrintSupport
+  # target may resolve to a no-include stub in this build, so expose the module include
+  # dir directly to guarantee the bare include resolves for every KDReports consumer.
+  SET(_kd_qt6_prefix "")
+  IF(DEFINED Qt6_DIR AND EXISTS "${Qt6_DIR}")
+    GET_FILENAME_COMPONENT(_kd_qt6_prefix "${Qt6_DIR}/../../.." ABSOLUTE)
+  ENDIF()
+  SET(_kd_printsupport_inc "")
+  IF(_kd_qt6_prefix AND EXISTS "${_kd_qt6_prefix}/include/QtPrintSupport")
+    SET(_kd_printsupport_inc "${_kd_qt6_prefix}/include/QtPrintSupport")
+  ELSE()
+    FIND_PATH(_kd_printsupport_inc QPrinter
+      PATHS /usr/include/x86_64-linux-gnu/qt6/QtPrintSupport /usr/include/qt6/QtPrintSupport
+      NO_DEFAULT_PATH)
+  ENDIF()
+  IF(_kd_printsupport_inc AND NOT _kd_printsupport_inc-NOTFOUND)
+    SET_PROPERTY(TARGET KDReports::KDReports APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_kd_printsupport_inc}")
+    MESSAGE(STATUS "KDReports: exposing Qt6 QtPrintSupport include dir: ${_kd_printsupport_inc}")
+  ENDIF()
 ELSE()
   IF(NOT TARGET KDReports::KDReports)
     ADD_LIBRARY(KDReports::KDReports UNKNOWN IMPORTED)
diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
index 0990f2616..c515ffb7f 100644
--- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
+++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
@@ -55,18 +55,18 @@ namespace GuezNasat
 {
 inline std::ostream& operator<<(std::ostream& os, const NasatAircraft& aircraft)
 {
-    os << "NasatAircraft{id=" << aircraft.id() << ", name=" << aircraft.name().toStdString() 
-       << ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId()
-       << ", simulationActive=" << aircraft.simulationActive() << "}";
+    os << "NasatAircraft{id=" << aircraft.id << ", name=" << aircraft.name.toStdString() 
+       << ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId
+       << ", simulationActive=" << aircraft.simulationActive << "}";
     return os;
 }
 
 inline std::ostream& operator<<(std::ostream& os, const NasatAircraftParticipant& participant)
 {
-    os << "NasatAircraftParticipant{id=" << participant.id() 
-       << ", nasatAircraftId=" << participant.nasatAircraftId() 
-       << ", exerciseId=" << participant.exerciseId()
-       << ", participantId=" << participant.participantId() << "}";
+    os << "NasatAircraftParticipant{id=" << participant.id 
+       << ", nasatAircraftId=" << participant.nasatAircraftId 
+       << ", exerciseId=" << participant.exerciseId
+       << ", participantId=" << participant.participantId << "}";
     return os;
 }
 } // namespace GuezNasat
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h
index 88aa46b44..dfd08d6c4 100755
--- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h
+++ b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h
@@ -126,7 +126,7 @@ public:
 
 private:
   static QMap<MountingPointType, MpNameImageData> &getImageTableInternal();
-  static void insertHelper(MountingPointType::type type,
+  static void insertHelper(MountingPointType type,   // Qt6: legacy MountingPointType_def::type -> enum class MountingPointType (no nested ::type)
                            const QString &name,
                            const QString &colorCodeGray,
                            const QString &colorCodeGreen,
diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp
index e1cfae2c1..f0d888222 100644
--- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp
+++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp
@@ -1,36 +1,7 @@
 #pragma once
 
-// STUB-Header: Diese Datei wird normalerweise von DDS/Codegenerator generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-#include "pdm_types.h"
-
-namespace ProjectDataManagement
-{
-
-// EventType wird bereits in pdm_types.h definiert
-
-// STUB: EventType_def - Platzhalter für DDS-generierten Typ
-// Wird in AlarmManagement für Event-Typisierung verwendet
-struct EventType_def
-{
-    int value{0};
-    
-    EventType_def() = default;
-    explicit EventType_def(int v) : value(v) {}
-    explicit EventType_def(EventType t) : value(static_cast<int>(t)) {}
-    
-    bool operator==(const EventType_def& other) const { return value == other.value; }
-    bool operator!=(const EventType_def& other) const { return value != other.value; }
-    bool operator<(const EventType_def& other) const { return value < other.value; }
-};
-
-// STUB: EventData - Basisstruktur für Event-Daten
-struct EventData
-{
-    EventType_def eventType;
-    QString description;
-    qint64 timestamp{0};
-};
-
-} // namespace ProjectDataManagement
\ No newline at end of file
+// Thin wrapper around the DDS-generated ProjectDataManagement types.
+// The real types (PdmEventType, VulnerabilityClass, VulnerabilityState, ...) are
+// generated into build4/Lts/Services/ProjectDataManagement/pdm_enums.hpp by the
+// RTI code generator. Include that header so consumers get the actual enum types.
+#include <ProjectDataManagement/pdm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/install_arcgis.sh b/qt6-after/qt6-migrated-legatus/install_arcgis.sh
index 3c2edf883..5d1598a0e 100755
--- a/qt6-after/qt6-migrated-legatus/install_arcgis.sh
+++ b/qt6-after/qt6-migrated-legatus/install_arcgis.sh
@@ -47,4 +47,37 @@ else
     ls -la "${ARCGIS_DEST}/" || true
 fi
 
+# Run configure.sh to properly set up the SDK
+# According to README.txt, this is required after extracting/copying the SDK
+# It (a) headlessly accepts the Esri Master License Agreement and (b) writes
+# $HOME/.config/EsriRuntimeQt/ArcGIS Runtime SDK for Qt 300.0.0.ini with the
+# InstallDir. The ArcGIS runtime reads that ini at startup; without it the 300
+# SDK refuses to initialize and the Situation map view will not load.
+CONFIGURE_SCRIPT="${ARCGIS_DEST}/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/configure.sh"
+if [ -x "${CONFIGURE_SCRIPT}" ]; then
+    echo "=== Running ArcGIS SDK Configuration ==="
+    echo "Running configure.sh with -a flag to accept EULA for headless install"
+
+    # Run configure.sh with -a to accept EULA automatically (headless install)
+    # The -np flag skips postInstall.sh which integrates with Qt Creator
+    # Remove -np if Qt Creator integration is needed.
+    #
+    # configure.sh is mounted read-only (new_docker_build.sh mounts external:ro),
+    # so its `sed -i` on ideintegration/*.pri (Qt Creator IDE patching only) fails
+    # with "Read-only file system" and exits 1. That step is NOT used by the CMake
+    # build (which consumes ArcGISRuntime.cmake, not the .pri files), and the
+    # runtime .ini is written to $HOME before it runs. So treat a non-zero exit
+    # as a warning, not fatal, or the whole build aborts before cmake.
+    if ! "${CONFIGURE_SCRIPT}" -a -np; then
+        echo "WARNING: configure.sh returned non-zero (expected: sed -i on the read-only external mount fails)."
+        echo "  The runtime .ini (InstallDir) was written to \$HOME before that step; the .pri"
+        echo "  patching is Qt Creator-only and not needed for the CMake build. Continuing."
+    else
+        echo "✓ ArcGIS SDK configuration complete"
+    fi
+else
+    echo "WARNING: configure.sh not found or not executable at ${CONFIGURE_SCRIPT}"
+    echo "SDK may not be properly configured for use"
+fi
+
 echo "=== ArcGIS SDK Setup Complete ==="
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh
index 173b70e54..90e82395b 100755
--- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh
+++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh
@@ -51,6 +51,7 @@ Build groups:
   --group9 / --no-group9   Enable/disable LTS Tools Group 9 (R,S,T,V,W) build
   --group10 / --no-group10 Enable/disable LTS Projects build
   --group11 / --no-group11 Enable/disable LTS Application build
+  --group12 / --no-group12 Enable/disable runtime GUI/Data plugin build (OperatorApplication runtime deps)
   --build-viewer-only      Build only Viewer module targets (skip Groups 1-4, implies --group5 --codification; ctest runs)
 
 Test execution:
@@ -87,6 +88,7 @@ Environment variable overrides:
   BUILD_GROUP9=ON|OFF
   BUILD_GROUP10=ON|OFF
   BUILD_GROUP11=ON|OFF
+  BUILD_GROUP12=ON|OFF
   RUN_CTEST=ON|OFF
   TESTS_ONLY=ON|OFF
   INTEGRATION_TEST=ON|OFF
@@ -117,6 +119,7 @@ Defaults:
   BUILD_GROUP9=OFF
   BUILD_GROUP10=OFF
   BUILD_GROUP11=OFF
+  BUILD_GROUP12=OFF
   RUN_CTEST=ON
   TESTS_ONLY=OFF
   INTEGRATION_TEST=OFF
@@ -769,6 +772,12 @@ while [[ $# -gt 0 ]]; do
     --no-group11)
       BUILD_GROUP11=OFF
       ;;
+    --group12)
+      BUILD_GROUP12=ON
+      ;;
+    --no-group12)
+      BUILD_GROUP12=OFF
+      ;;
     --build-viewer-only)
       BUILD_VIEWER_ONLY=ON
       BUILD_GROUP5=ON
@@ -1003,6 +1012,7 @@ GROUP6_TARGETS=(
   displayPanelSimulator
   LicenceEditor
   localDomainFinder
+  LogView
   LogViewer
   CoPrtCnv
   PrtCnvLib
@@ -1065,6 +1075,229 @@ GROUP11_TARGETS=(
   aarApp
 )
 
+# Group 12: runtime GUI/Data plugins. OperatorApplication's plugin loader
+# (Lts/Common/LtsPluginManager/lts_plugin_loader.cpp) scans <appdir>/../lib for
+# *Plugin*.so and matches the IID metadata against apps.json plugin requirements;
+# without these the app reports "App Requirements check failed" at startup.
+# Plugin outputs land in build4/lib, the directory the loader scans.
+# Excluded (environmental floors, not migration regressions):
+#   cesPluginGeoPairing - needs the external Schusstafel.h header (missing)
+#   BldInfoGuiPlugin    - links BuildingViewerCommon (dtEntity/OSG SDK absent)
+GROUP12_TARGETS=(
+  AesAirSupportGuiPlugin
+  AesBcContaminationGuiPlugin
+  AesBorderlineGuiPlugin
+  AesChargeAdministrationGuiPlugin
+  AesChargeEffectGuiPlugin
+  AesDangerAreaGuiPlugin
+  AesDataPlugin
+  AesExplosionGuiPlugin
+  AesFunctionalAreaGuiPlugin
+  AesGasPipeGuiPlugin
+  AesInfoGuiPlugin
+  AesMineAreaGuiPlugin
+  AesMineCorridorGuiPlugin
+  AesMineSingleVirtualGuiPlugin
+  AesNContaminationGuiPlugin
+  AesTechnicalAreaGuiPlugin
+  AlmConfigAlarmGuiPlugin
+  AlmDataPlugin
+  AlmEmergencyCallGuiPlugin
+  AlmOnlineReportsGuiPlugin
+  AppStarterGuiPlugin
+  AsbDataPlugin
+  AsbForeignDataPluginThp
+  AsbSymEditGuiPlugin
+  AsbSymbolProxyGuiPlugin
+  AsmDataPlugin
+  AsmGuiPlugin
+  AvmDataPlugin
+  AvmElokaGuiPlugin
+  BatGuiPlugin
+  BldDataPlugin
+  CdsSimulationGuiPlugin
+  CesDataPlugin
+  CesParticipantMoveGuiPlugin
+  CesParticipantUASGuiPlugin
+  CmoDataPlugin
+  DevGuiPlugin
+  EfmDataPlugin
+  EfmSoundAreaGuiPlugin
+  EscDataPlugin
+  EscEffectShowGuiPlugin
+  EsmComboBoxGuiPlugin
+  EsmDataPlugin
+  EsmEffectShowGuiPlugin
+  EvlDataPlugin
+  EvlEditGuiPlugin
+  EvlSanNineLinerEditGuiPlugin
+  ExmDataPlugin
+  ExmEditGuiPlugin
+  ExmWatchGuiPlugin
+  FlmComboBoxGuiPlugin
+  FlmDataPlugin
+  FlmExplorerGuiPlugin
+  FspGuiPlugin
+  GimDataPlugin
+  GimInfoGuiPlugin
+  GimPairingGuiPlugin
+  GnaDataPlugin
+  GnaNasatGuiPlugin
+  GnaNasatPartGuiPlugin
+  GuiElementPlugin
+  IsmAvcGuiPlugin
+  IsmComboBoxGuiPlugin
+  IsmDataPlugin
+  IsmDataPluginThp
+  IsmExerciseAssignmentClassicGuiPlugin
+  IsmResGuiPlugin
+  MdmDataPlugin
+  MdmMeteoDataGuiPlugin
+  MrkDataPlugin
+  MrkEditGuiPlugin
+  MsgDataPlugin
+  MsgMessageingGuiPlugin
+  MvsVideoTeamGuiPlugin
+  NmeNotificationGuiPlugin
+  NomDataPlugin
+  NomEditGuiPlugin
+  ObdBaseDownloaderGuiPlugin
+  ObdDataPlugin
+  OpmComboBoxGuiPlugin
+  OpmDataPlugin
+  OpmEditGuiPlugin
+  OpmLoginGuiPlugin
+  OpmOverviewGuiPlugin
+  OpmSettingsGuiPlugin
+  OscDataPlugin
+  OscParticipantInfoGuiPlugin
+  OscSystemGuiPlugin
+  OscTerminalGuiPlugin
+  PdmChargeTableGuiPlugin
+  PdmComboBoxGuiPlugin
+  PdmDataPlugin
+  PlanOverlaysGuiPlugin
+  PpmComboBoxGuiPlugin
+  PpmDataPlugin
+  PpmOperationalPlaningGuiPlugin
+  PpmParticipantEditGuiPlugin
+  PpmParticipantInfoGuiPlugin
+  PpmParticipantTemplatesGuiPlugin
+  PpmPartyEditGuiPlugin
+  PpmTypeEditGuiPlugin
+  PpmUasGuiPlugin
+  PreDataPlugin
+  PreEditGuiPlugin
+  PreScriptTimelineGuiPlugin
+  ProjectAhtcPlugin
+  ProjectComMasterPlugin
+  ProjectDemoTabletPlugin
+  ProjectEtsPlugin
+  ProjectGuezPlugin
+  ProjectL400P2Plugin
+  ProjectLegatusPlugin
+  ProjectQatarMOUTPlugin
+  ProjectQatarPlugin
+  PwsGuiPlugin
+  RecordReplayPlugin
+  RepDataPlugin
+  RmeDarkStylePlugin
+  RmeLightStylePlugin
+  SaaDataPlugin
+  SaaGuiPlugin
+  ScmDataPlugin
+  ScmEditGuiPlugin
+  ScrScreenRecordingGuiPlugin
+  SitmapGuiPlugin
+  SituationMapScriptFilterGuiPlugin
+  SrmDataPlugin
+  SrmReplayManagementGuiPlugin
+  SrpDataPlugin
+  SrpReplayControlGuiPlugin
+  TabDataPlugin
+  TabNotificationGuiPlugin
+  TabOcSfmMessagingGuiPlugin
+  TabocDataPlugin
+  TabocGuiPlugin
+  TgtDataPlugin
+  TgtTargetGuiPlugin
+  Thp2ManagementGuiPlugin
+  Thp2UsbManagementGuiPlugin
+  TlnDataPlugin
+  TlnEventTimelineGuiPlugin
+  VkbPlugin
+  WhmDataPlugin
+  WhmGuiPlugin
+  aesRecordReplayPlugin
+  aesTopicTypePlugin
+  almRecordReplayPlugin
+  almTopicTypePlugin
+  asmTopicTypePlugin
+  avmCombatNetRadioGuiPlugin
+  avmMenuEditGuiPlugin
+  avmTopicTypePlugin
+  avmTrainingVoiceGuiPlugin
+  bldRecordReplayPlugin
+  bldTopicTypePlugin
+  cesPluginArtillerySound
+  cesPluginBasic
+  cesPluginCES_FunctionalAreas
+  cesPluginCES_Jamming
+  cesPluginCES_MissionPlan
+  cesPluginCES_NBC
+  cesPluginCesBuildings
+  cesPluginExplosions
+  cesPluginMineAreas
+  cesPluginMineLayingArtillery
+  cesPluginParticipantBuildings
+  cesPluginVirtualMines
+  cesRecordReplayPlugin
+  cesTopicTypePlugin
+  cmoTopicTypePlugin
+  codTopicTypePlugin
+  coreTopicTypePlugin
+  eemTopicTypePlugin
+  escTopicTypePlugin
+  esmTopicTypePlugin
+  evlTopicTypePlugin
+  exmTopicTypePlugin
+  flmTopicTypePlugin
+  fltTopicTypePlugin
+  gimRecordReplayPlugin
+  gimTopicTypePlugin
+  gnaRecordReplayPlugin
+  gnaTopicTypePlugin
+  ismTopicTypePlugin
+  ltswidgetsplugin
+  mdmTopicTypePlugin
+  mrkTopicTypePlugin
+  msgTopicTypePlugin
+  nmeTopicTypePlugin
+  nomTopicTypePlugin
+  obdTopicTypePlugin
+  opmTopicTypePlugin
+  oscTopicTypePlugin
+  ossRecordReplayPlugin
+  ossTopicTypePlugin
+  pdmTopicTypePlugin
+  ppmRecordReplayPlugin
+  ppmTopicTypePlugin
+  preTopicTypePlugin
+  repTopicTypePlugin
+  scmTopicTypePlugin
+  somTopicTypePlugin
+  srpTopicTypePlugin
+  tabPluginAdler
+  tabPluginDebugJsonDir
+  tabPluginHla
+  tabPluginWlsTetra
+  tabRecordReplayPlugin
+  tabTopicTypePlugin
+  tabocTopicTypePlugin
+  tgtTopicTypePlugin
+  whgTopicTypePlugin
+)
+
 require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE"
 
 if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then
@@ -1101,6 +1334,7 @@ log_group "Build Group 8 (LTS Tools J,M,N,P,Q)" "$BUILD_GROUP8"
 log_group "Build Group 9 (LTS Tools R,S,T,V,W)" "$BUILD_GROUP9"
 log_group "Build Group 10 (LTS Projects)" "$BUILD_GROUP10"
 log_group "Build Group 11 (LTS Application)" "$BUILD_GROUP11"
+log_group "Build Group 12 (GUI/Data Plugins)" "$BUILD_GROUP12"
 log_info "BUILD_VIEWER_ONLY=${BUILD_VIEWER_ONLY}"
 log_info "RUN_CTEST=${RUN_CTEST}"
 log_info "TESTS_ONLY=${TESTS_ONLY}"
@@ -1138,6 +1372,7 @@ GROUP8_TARGETS_STRING="$(join_by ' ' "${GROUP8_TARGETS[@]}")"
 GROUP9_TARGETS_STRING="$(join_by ' ' "${GROUP9_TARGETS[@]}")"
 GROUP10_TARGETS_STRING="$(join_by ' ' "${GROUP10_TARGETS[@]}")"
 GROUP11_TARGETS_STRING="$(join_by ' ' "${GROUP11_TARGETS[@]}")"
+GROUP12_TARGETS_STRING="$(join_by ' ' "${GROUP12_TARGETS[@]}")"
 
 HOST_TEMP_DIR="$(mktemp -d)"
 CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh"
@@ -1316,6 +1551,7 @@ read -r -a GROUP8_ARRAY <<< "${GROUP8_TARGETS}"
 read -r -a GROUP9_ARRAY <<< "${GROUP9_TARGETS}"
 read -r -a GROUP10_ARRAY <<< "${GROUP10_TARGETS}"
 read -r -a GROUP11_ARRAY <<< "${GROUP11_TARGETS}"
+read -r -a GROUP12_ARRAY <<< "${GROUP12_TARGETS}"
 
 if [[ "${TESTS_ONLY}" != "ON" ]]; then
   if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
@@ -1336,6 +1572,7 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then
   run_build_group "Group 8 (LTS Tools J,M,N,P,Q)" "${BUILD_GROUP8}" "group8_build.log" "${GROUP8_ARRAY[@]}"
   run_build_group "Group 9 (LTS Tools R,S,T,V,W)" "${BUILD_GROUP9}" "group9_build.log" "${GROUP9_ARRAY[@]}"
   run_build_group "Group 10 (LTS Projects)" "${BUILD_GROUP10}" "group10_build.log" "${GROUP10_ARRAY[@]}"
+  run_build_group "Group 12 (GUI/Data Plugins)" "${BUILD_GROUP12}" "group12_build.log" "${GROUP12_ARRAY[@]}"
   run_build_group "Group 11 (LTS Application)" "${BUILD_GROUP11}" "group11_build.log" "${GROUP11_ARRAY[@]}"
 else
   log_info "TESTS_ONLY enabled - skipping all build groups"
@@ -1379,6 +1616,7 @@ docker run --rm \
   -e BUILD_GROUP9 \
   -e BUILD_GROUP10 \
   -e BUILD_GROUP11 \
+  -e BUILD_GROUP12 \
   -e BUILD_VIEWER_ONLY \
   -e RUN_CTEST \
   -e TESTS_ONLY \
@@ -1401,6 +1639,7 @@ docker run --rm \
   -e GROUP9_TARGETS="${GROUP9_TARGETS_STRING}" \
   -e GROUP10_TARGETS="${GROUP10_TARGETS_STRING}" \
   -e GROUP11_TARGETS="${GROUP11_TARGETS_STRING}" \
+  -e GROUP12_TARGETS="${GROUP12_TARGETS_STRING}" \
   -v "${WORKSPACE_ROOT_HOST}:/workspace" \
   -v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
   -v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \